diff --git a/burg-bzr/PKGBUILD b/burg-bzr/PKGBUILD index a02888b44..c26064567 100755 --- a/burg-bzr/PKGBUILD +++ b/burg-bzr/PKGBUILD @@ -1,10 +1,8 @@ # -# Platform Packages for Chakra, part of chakra-project.org +# Core Packages for Chakra, part of chakra-project.org # -# maintainer (x86_64): Giuseppe Calà - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +# maintainer (i686): Phil Miller pkgname=burg-bzr pkgver=1844 diff --git a/burg-emu/PKGBUILD b/burg-emu/PKGBUILD new file mode 100755 index 000000000..2971d7bf1 --- /dev/null +++ b/burg-emu/PKGBUILD @@ -0,0 +1,48 @@ +# +# Core Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +pkgname=burg-emu +pkgver=1844 +pkgrel=1 +pkgdesc="A brand-new boot loader based on GRUB (emulator)" +url="https://launchpad.net/burg" +license="GPL3" +arch=('i686' 'x86_64') +depends=('ruby' 'python2' 'gettext' 'freetype2' 'sdl' 'ncurses' 'burg-bzr') +makedepends=('bzr') +conflicts=(burg-emu-fixed) +replaces=(burg-emu-fixed) +provides=('burg-emu') +install='burg-emu.install' + +_bzrmod=burg +_bzrtrunk=lp:${_bzrmod} + +build() { + cd $srcdir/ + +msg "Connecting to the server...." + if [ ! -d ./${_bzrmod} ]; then + bzr branch ${_bzrtrunk} -r ${pkgver} + else + cd ${_bzrmod} && bzr pull -r ${pkgver} + fi + msg "BZR checkout done or server timeout" + cd "${srcdir}/${_bzrmod}" + sed -i 's|python|python2|' ${srcdir}/${_bzrmod}/autogen.sh + ./autogen.sh || return 1 +} +package() { +provides=('burg-emu') +install='burg-emu.install' +msg "Removing old build directory..." +rm -rf $srcdir/$_bzrmod-emu-build +msg "Creating build directory..." +mkdir $srcdir/$_bzrmod-emu-build +cd $srcdir/$_bzrmod-emu-build +$srcdir/$_bzrmod/configure --with-platform=emu --disable-grub-emu-usb --prefix=/opt/burg-emu || return 1 +make || return 1 +make install DESTDIR=$pkgdir || return 11 +} diff --git a/burg-emu/burg-emu.install b/burg-emu/burg-emu.install new file mode 100755 index 000000000..42a72ed09 --- /dev/null +++ b/burg-emu/burg-emu.install @@ -0,0 +1,12 @@ +post_install() { + + echo -e "\033[0;31m IMPORTANT" + echo -e "\033[0;0m Run \033[0;32m '/opt/burg-emu/bin/burg-emu' \033[0;0m as root to set burg look" + echo -e "\033[0;0m In burg-emu press \033[0;32m 'h' \033[0;0m for a list of shortcuts" +} + + +post_upgrade() { + post_install +} + diff --git a/burg-themes/PKGBUILD b/burg-themes/PKGBUILD index 79b93bcde..a68a31b81 100755 --- a/burg-themes/PKGBUILD +++ b/burg-themes/PKGBUILD @@ -1,14 +1,12 @@ # -# Platform Packages for Chakra, part of chakra-project.org +# Core Packages for Chakra, part of chakra-project.org # -# contributor (x86_64): Giuseppe Calà - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +# maintainer (i686): Phil Miller pkgname=burg-themes pkgver=20100623 -pkgrel=2 +pkgrel=1 pkgdesc="Themes for Burg Bootloader" arch=('any') url="https://launchpad.net/burg" @@ -16,11 +14,13 @@ license=('GPL') depends=('zip' 'unzip') backup=('boot/burg/gui.cfg' 'boot/burg/burgenv' ) source=(http://burg.googlecode.com/files/burg-theme-$pkgver.zip + http://chakra-project.org/sources/burg-themes/neda-0.1.tar.gz add-chakra-class.patch large_chakra.png grey_chakra.png small_chakra.png) md5sums=('dffc236d8766e575982b9310d9d02ee1' + '4912263a4fcd48c6acb0d0bc2a193416' '3322ad1e3544c53efb1f612e14100a08' 'd2ea7d992b299e0a791ec61456deb97f' '7571a9950ce4fb656e0452d4f69c60e8' @@ -31,6 +31,9 @@ install='burg-themes.install' package() { mkdir -p $pkgdir/boot/burg unzip burg-theme-$pkgver.zip -d $pkgdir/boot/burg + + msg "add neda theme" + cp -vR $srcdir/neda $pkgdir/boot/burg/themes msg "Applying patch..." cd $pkgdir/boot/burg diff --git a/bzr/PKGBUILD b/bzr/PKGBUILD index 23e31472b..f347fe516 100644 --- a/bzr/PKGBUILD +++ b/bzr/PKGBUILD @@ -9,18 +9,21 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=bzr -pkgver=2.2.0 -pkgrel=2 +pkgver=2.2.2 +pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" arch=('i686' 'x86_64') url="http://www.bazaar-vcs.org" license=('GPL') depends=('python2') -source=(http://launchpad.net/bzr/2.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) -md5sums=('e47fa50e1fedc01c4761925e9d0d39ac') +source=(http://launchpad.net/bzr/2.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz + bzr-2.2.2-python-2.7.patch) +md5sums=('d1bfa2fd1aad282c423c78d62ebacb21' + '0f0d8e0d31032cde59565b6c74a37e41') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ${startdir}/bzr-2.2.2-python-2.7.patch || return 1 sed -i 's|man/man1|share/man/man1|' setup.py python2 setup.py install --prefix=/usr --root=${pkgdir} diff --git a/bzr/bzr-2.2.2-python-2.7.patch b/bzr/bzr-2.2.2-python-2.7.patch new file mode 100644 index 000000000..88e67e0c2 --- /dev/null +++ b/bzr/bzr-2.2.2-python-2.7.patch @@ -0,0 +1,40 @@ +=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py' +--- bzrlib/transport/http/_urllib2_wrappers.py 2010-05-08 05:56:28 +0000 ++++ bzrlib/transport/http/_urllib2_wrappers.py 2010-09-15 02:43:44 +0000 +@@ -75,6 +75,26 @@ + ) + + ++class addinfourl(urllib2.addinfourl): ++ '''Replacement addinfourl class compatible with python-2.7's xmlrpclib ++ ++ In python-2.7, xmlrpclib expects that the response object that it receives ++ has a getheader method. httplib.HTTPResponse provides this but ++ urllib2.addinfourl does not. Add the necessary functions here, ported to ++ use the internal data structures of addinfourl. ++ ''' ++ ++ def getheader(self, name, default=None): ++ if self.headers is None: ++ raise httplib.ResponseNotReady() ++ return self.headers.getheader(name, default) ++ ++ def getheaders(self): ++ if self.headers is None: ++ raise httplib.ResponseNotReady() ++ return self.headers.items() ++ ++ + class _ReportingFileSocket(object): + + def __init__(self, filesock, report_activity=None): +@@ -656,7 +676,7 @@ + r = response + r.recv = r.read + fp = socket._fileobject(r, bufsize=65536) +- resp = urllib2.addinfourl(fp, r.msg, req.get_full_url()) ++ resp = addinfourl(fp, r.msg, req.get_full_url()) + resp.code = r.status + resp.msg = r.reason + resp.version = r.version + diff --git a/gobject-introspection/PKGBUILD b/gobject-introspection/PKGBUILD index 7d5488f40..f3427a6d5 100644 --- a/gobject-introspection/PKGBUILD +++ b/gobject-introspection/PKGBUILD @@ -1,17 +1,20 @@ -# $Id: PKGBUILD 72907 2010-03-21 15:29:35Z ibiru $ -# Maintainer: Jan de Groot +# +# Chakra Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa pkgname=gobject-introspection -pkgver=0.9.10 -pkgrel=2 +pkgver=0.10.0 +pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" arch=('x86_64' 'i686') license=('LGPL' 'GPL') -depends=('libffi>=3.0.8' 'glib2>=2.23.5' 'python2') +depends=('libffi>=3.0.8' 'glib2>=2.23.5' 'python') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.9/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4bf244db75df04499dea704e7734376c0fc5a3a17fb59be2123c8d76111e6fb8') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('8af5a4ff16df4b7f08db2eabc09396e15a19dde85a7d288fa26b9cdca280b9fa') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/initscripts/PKGBUILD b/initscripts/PKGBUILD index 0f1cdd9d2..40e98cb11 100644 --- a/initscripts/PKGBUILD +++ b/initscripts/PKGBUILD @@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=initscripts pkgver=2010.07 -pkgrel=1.1 +pkgrel=2 pkgdesc="System initialization/bootup scripts" arch=('i686' 'x86_64') url="http://www.chakra-project.org" @@ -23,10 +23,10 @@ optdepends=('bridge-utils: Network bridging support' 'wireless_tools: Wireless networking') provides=("initscripts=${pkgver}") install=initscripts.install -source=(http://chakra-project.org/sources/initscripts/initscripts-${pkgver}-1.tar.gz) -md5sums=('69cd2fe4de9cf606145c7449abf72171') +source=(http://chakra-project.org/sources/initscripts/initscripts-${pkgver}-2.tar.gz) +md5sums=('ba097b052aa713456c9898c07851675f') build() { - cd ${srcdir}/initscripts-${pkgver}-1/ + cd ${srcdir}/initscripts-${pkgver}-2/ DESTDIR=${pkgdir} ./install.sh } diff --git a/linux-2.6-CHAKRA/PATCHCFG b/linux-2.6-CHAKRA/PATCHCFG index c7af6ca1c..7e75bc718 100644 --- a/linux-2.6-CHAKRA/PATCHCFG +++ b/linux-2.6-CHAKRA/PATCHCFG @@ -20,7 +20,7 @@ PATCHES=( http://chakra-project.org/sources/kernel26/patches/36/aufs2.1/aufs2-kbuild.patch%1 http://chakra-project.org/sources/kernel26/patches/36/aufs2.1/aufs2-base.patch%1 http://chakra-project.org/sources/kernel26/patches/36/aufs2.1/aufs2-standalone.patch%1 - http://chakra-project.org/sources/kernel26/patches/36/aufs2.1/aufs2.1-2010-11-22.patch%1 + http://chakra-project.org/sources/kernel26/patches/36/aufs2.1/aufs2.1-standalone.tree-36-20101220.patch.bz2%1 # squashfs with lzma http://chakra-project.org/sources/kernel26/patches/36/squashfs-lzma/kernel-squashfs-lzma-v1.7-2.6.36.patch.bz2%1 # sched_autogroup @@ -28,7 +28,7 @@ PATCHES=( ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.36.2-1-CHAKRA" +PATCHNAME="patch-2.6.36.2-2-CHAKRA" # Run this before applying patches pre_apply() { diff --git a/udev/PKGBUILD b/udev/PKGBUILD index 7d3a42713..e2626b1e9 100644 --- a/udev/PKGBUILD +++ b/udev/PKGBUILD @@ -6,7 +6,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=164 +pkgver=165 pkgrel=1 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" @@ -14,13 +14,13 @@ license=('GPL') groups=('base') # older initscripts versions required start_udev options=(!makeflags !libtool) -makedepends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') +makedepends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection>=0.10.0') source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2 80-drivers.rules 81-chakra.rules load-modules.sh cdsymlinks.sh) -md5sums=('cd285a85f969518a671834de2f4d6614' +md5sums=('74c62aa82969278960b7ee81e94b6d8f' '4427855146513a4703ab5c7eb8a0156e' 'a2bf84747f44915ec9c5e6e88b077845' 'f91fddc67609b45b244a624977c4247b' @@ -28,16 +28,14 @@ md5sums=('cd285a85f969518a671834de2f4d6614' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix="" --mandir=/usr/share/man\ - --includedir=/usr/include\ - --libexecdir=/lib/udev\ - --datarootdir=/usr/share + ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ + --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system make } package_udev() { pkgdesc="The userspace dev tools (udev)" - depends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2' + depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' 'module-init-tools>=3.11') install=udev.install backup=(etc/udev/udev.conf @@ -47,11 +45,6 @@ package_udev() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install - # Fix pkgconfig path - install -d -m755 $pkgdir/usr/lib - mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib - # Fix ConsoleKit path - mv $pkgdir/lib/ConsoleKit $pkgdir/usr/lib # Replace original 80-drivers.rules with custom one. install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules # Install our rule for permissions and symlinks @@ -108,8 +101,6 @@ package_udev() { s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' $i done - - mv "${pkgdir}/lib/girepository-1.0" "${pkgdir}/usr/lib/" } package_udev-compat() { diff --git a/udev/udev.install b/udev/udev.install index 0b061a2be..cdde9d744 100644 --- a/udev/udev.install +++ b/udev/udev.install @@ -28,7 +28,7 @@ post_install() { mknod -m644 ${ROOTDIR}/dev/null c 1 3 fi if [ ! -c ${ROOTDIR}/dev/zero ]; then - rm ${ROOTDIR}/dev/zero + rm -f ${ROOTDIR}/dev/zero mknod -m644 ${ROOTDIR}/dev/zero c 1 5 fi if [ -n "${ROOTDIR}" ]; then