From 8ca6e900e4bfed57ac432505cebaaaa794dc54b2 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 18 Dec 2010 20:39:30 +0000 Subject: [PATCH 01/10] Compile gobject-introspection against new python --- gobject-introspection/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gobject-introspection/PKGBUILD b/gobject-introspection/PKGBUILD index 41ff51bcb..7d5488f40 100644 --- a/gobject-introspection/PKGBUILD +++ b/gobject-introspection/PKGBUILD @@ -3,12 +3,12 @@ pkgname=gobject-introspection pkgver=0.9.10 -pkgrel=1 +pkgrel=2 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' 'python') +depends=('libffi>=3.0.8' 'glib2>=2.23.5' 'python2') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.9/${pkgname}-${pkgver}.tar.bz2) sha256sums=('4bf244db75df04499dea704e7734376c0fc5a3a17fb59be2123c8d76111e6fb8') From e037e68ee4b2228b52c150a82a50bb8db666ef3f Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 18 Dec 2010 21:18:56 +0000 Subject: [PATCH 02/10] Rebuild SVN against new python --- subversion/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subversion/PKGBUILD b/subversion/PKGBUILD index 5c2bb2dcb..69d451772 100644 --- a/subversion/PKGBUILD +++ b/subversion/PKGBUILD @@ -4,12 +4,12 @@ pkgname=subversion pkgver=1.6.9 -pkgrel=5 +pkgrel=6 pkgdesc="Replacement for CVS, another versioning system (svn)" arch=('i686' 'x86_64') license=('apache' 'bsd') depends=('neon' 'apr-util') -makedepends=('heimdal' 'python' 'perl' 'swig' 'ruby' +makedepends=('heimdal' 'python2' 'perl' 'swig' 'ruby' 'autoconf' 'sqlite3' 'db' 'e2fsprogs') # 'java-runtime' 'kdelibs' 'libgnome-keyring' 'apache' source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 svnserve svn svnserve.conf svnmerge.py @@ -48,8 +48,8 @@ build() { make DESTDIR=${pkgdir} swig-py || return 1 make install-swig-py DESTDIR=${pkgdir} || return 1 - mkdir -p ${pkgdir}/usr/lib/python2.6 || return 1 - mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.6/site-packages \ + mkdir -p ${pkgdir}/usr/lib/python2.7 || return 1 + mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages \ || return 1 mkdir -p ${pkgdir}/usr/share/subversion || return 1 From c7b2c66c5b68825b970468db578c4c7ed95755b0 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 18 Dec 2010 21:51:40 +0000 Subject: [PATCH 03/10] Rebuild libxml2 against python2.7 --- libxml2/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libxml2/PKGBUILD b/libxml2/PKGBUILD index d61e61ef6..4b8a69a64 100644 --- a/libxml2/PKGBUILD +++ b/libxml2/PKGBUILD @@ -4,12 +4,12 @@ pkgname=libxml2 pkgver=2.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) license=('custom') depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7') -makedepends=('python') +makedepends=('python2') options=('!libtool') url="http://www.xmlsoft.org/" source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz From 3c219e6d36007d3a313126fc53bbc9c02c4ecc93 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 18 Dec 2010 22:00:47 +0000 Subject: [PATCH 04/10] Compile libxslt against new python2.7 --- libxslt/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libxslt/PKGBUILD b/libxslt/PKGBUILD index 9c1a44716..78fb20676 100644 --- a/libxslt/PKGBUILD +++ b/libxslt/PKGBUILD @@ -4,13 +4,13 @@ pkgname=libxslt pkgver=1.1.26 -pkgrel=1 +pkgrel=2 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64') url="http://xmlsoft.org/XSLT/" license=('custom') depends=('libxml2>=2.7.6' 'libgcrypt>=1.4.4') -makedepends=('python>=2.6') +makedepends=('python2') options=('!libtool') source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz) md5sums=('e61d0364a30146aaa3001296f853b2b9') From 450d1dd5117df19e2544d5f8792a7b6c3d30ea47 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 19 Dec 2010 00:01:44 +0000 Subject: [PATCH 05/10] Git vs 2.7 --- bzr/PKGBUILD | 6 +++--- git/PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bzr/PKGBUILD b/bzr/PKGBUILD index 959469ece..23e31472b 100644 --- a/bzr/PKGBUILD +++ b/bzr/PKGBUILD @@ -10,19 +10,19 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=bzr pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A decentralized revision control system (bazaar)" arch=('i686' 'x86_64') url="http://www.bazaar-vcs.org" license=('GPL') -depends=('python') +depends=('python2') source=(http://launchpad.net/bzr/2.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) md5sums=('e47fa50e1fedc01c4761925e9d0d39ac') build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i 's|man/man1|share/man/man1|' setup.py - python setup.py install --prefix=/usr --root=${pkgdir} + python2 setup.py install --prefix=/usr --root=${pkgdir} # bash-completion install -D -m644 contrib/bash/bzr ${pkgdir}/etc/bash_completion.d/bzr diff --git a/git/PKGBUILD b/git/PKGBUILD index 747d735de..80fbf42f4 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=git pkgver=1.7.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) url="http://git-scm.com/" From 76cb1ade08997bea48909c2a61bca63b59e8033c Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 19 Dec 2010 02:24:38 +0000 Subject: [PATCH 06/10] Boost vs 2.7 --- boost/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boost/PKGBUILD b/boost/PKGBUILD index 636ad89b4..f85cd3c2c 100644 --- a/boost/PKGBUILD +++ b/boost/PKGBUILD @@ -16,12 +16,12 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=boost pkgver=1.44.0 _boostver=1_44_0 -pkgrel=1 +pkgrel=2 pkgdesc="Free peer-reviewed portable C++ source libraries" arch=('i686' 'x86_64') url="http://www.boost.org/" depends=('bzip2' 'zlib') -makedepends=('python>=2.6') +makedepends=('python2') optdepends=('python: for python bindings') source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${_boostver}.tar.gz) license=('custom') @@ -61,7 +61,7 @@ build() { cflags=-fno-strict-aliasing \ --prefix=${pkgdir}/usr \ -sPYTHON_ROOT=/usr \ - -sPYTHON_VERSION=2.6 \ + -sPYTHON_VERSION=2.7 \ -sTOOLS=gcc \ --layout=tagged \ install || return 1 From 32c7942a5b6698ebc8f7ed2be3478ed12d54fc4c Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 19 Dec 2010 11:37:33 +0000 Subject: [PATCH 07/10] Fix libusb, step 1: update libusb in core --- libusb/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libusb/PKGBUILD b/libusb/PKGBUILD index 2c8dd4991..00e94d25c 100644 --- a/libusb/PKGBUILD +++ b/libusb/PKGBUILD @@ -3,17 +3,18 @@ # Contributor: arjan pkgname=libusb -pkgver=0.1.12 -pkgrel=4 +pkgver=1.0.8 +pkgrel=3 pkgdesc="Library to enable user space application programs to communicate with USB devices" arch=('i686' 'x86_64') groups=('base') depends=('gcc-libs' 'sh') url="http://libusb.sourceforge.net/" license=('LGPL') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('caf182cbc7565dac0fd72155919672e6') +source=(http://downloads.sourceforge.net/libusb/libusb-$pkgver.tar.bz2) +md5sums=('37d34e6eaa69a4b645a19ff4ca63ceef') options=('!libtool') +replace=('libusb1') build() { cd $srcdir/$pkgname-$pkgver From 17128f8380ac79eaa9c16c4687637fb35814b5d6 Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 20 Dec 2010 22:22:40 +0000 Subject: [PATCH 08/10] Fix python binding, step 1, compile python --- python/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/PKGBUILD b/python/PKGBUILD index 1405f6735..a08cf1dc2 100644 --- a/python/PKGBUILD +++ b/python/PKGBUILD @@ -6,7 +6,7 @@ pkgname=python pkgver=2.7.1 -pkgrel=2 +pkgrel=3 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') From 18643537e0ba663d73b7a8d5a5188cfc50521450 Mon Sep 17 00:00:00 2001 From: Manuel Date: Tue, 21 Dec 2010 22:09:37 +0000 Subject: [PATCH 09/10] Upgrade swig --- swig/PKGBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/swig/PKGBUILD b/swig/PKGBUILD index 424db3e97..0c3ef105e 100644 --- a/swig/PKGBUILD +++ b/swig/PKGBUILD @@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=swig -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="A compiler that makes it easy to integrate C and C++ code with scripting languages" arch=('i686' 'x86_64') @@ -16,8 +16,8 @@ url="http://www.swig.org/" license=('custom') depends=('gcc-libs' 'zlib') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('36ee2d9974be46a9f0a36460af928eb9') -sha1sums=('60faa84a326e5aa8a94f290e9debed4551c1b1e7') +md5sums=('df4465a62ccc5f0120fee0890ea1a31f') +sha1sums=('da5a1e396597be683a62d349d71802c33fb0f644') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,3 +31,4 @@ package() { install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -D -m644 LICENSE-UNIVERSITIES "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-UNIVERSITIES" } + From b61e9dba3d8a2876fd7a77cba3f2cbb9bbc32e29 Mon Sep 17 00:00:00 2001 From: philm Date: Wed, 22 Dec 2010 01:50:09 +0100 Subject: [PATCH 10/10] update gcc and git --- gcc/PKGBUILD | 28 ++++++++++++++-------------- git/PKGBUILD | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gcc/PKGBUILD b/gcc/PKGBUILD index 490ed9037..5c14c087e 100644 --- a/gcc/PKGBUILD +++ b/gcc/PKGBUILD @@ -12,27 +12,27 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf # NOTE: libtool requires rebuilt with each new gcc version pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada') -pkgver=4.5.1 -pkgrel=4 -#_snapshot=4.5-20100610 -_libstdcppmanver=20100719 # Note: check source directory name when updating this +pkgver=4.5.2 +pkgrel=1 +#_snapshot=4.5.2-RC-20101208 +_libstdcppmanver=4.5.2 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.20.1' 'libmpc>=0.8.2-2' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada') +makedepends=('binutils>=2.20.1' 'libmpc>=0.8.2-1' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada') options=('!libtool' '!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada}-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada}-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,testsuite}-${_snapshot}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api-${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('dc8959e31b01a65ce10d269614815054' - 'b294953ff0bb2f20c7acb2bf005d832a' - '7567c2f8df8a8bf61b48fe414b88de65' - '3c11b7037896e967eddf8178af2ddd98' - 'c92111e2e22fc60d1e0adb1b5c7fa4f9' - '226ae0c6364cfe2c1f7ac88d06088d5a' +md5sums=('aa9e36bec080452372bfba793428ee82' + '9821f1c61e43755866861485ff364e90' + '8cc545fda70085c78076d79e0e23962a' + '3561c6585e9062105cc3591a8c39d7dc' + 'ee24023972f337fbc22202d6d219a727' + '2776eab5ebb7f9cc62dd2199a3a24382' '4030ee1c08dd1e843c0225b772360e76' '6fd395bacbd7b6e47c7b74854b478363') @@ -110,7 +110,7 @@ package_gcc-libs() package_gcc() { - depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils') + depends=('binutils>=2.20.1' 'libmpc>=0.8.1-1' 'cloog-ppl>=0.15.9-2' 'elfutils') groups=('base-devel') install=gcc.install diff --git a/git/PKGBUILD b/git/PKGBUILD index 80fbf42f4..1d026c94c 100644 --- a/git/PKGBUILD +++ b/git/PKGBUILD @@ -8,8 +8,8 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=git -pkgver=1.7.3.3 -pkgrel=2 +pkgver=1.7.3.4 +pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) url="http://git-scm.com/" @@ -31,12 +31,12 @@ source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" \ git-daemon git-daemon.conf) -md5sums=('0430440eeb7c037afd4254bc6fd2cce8' - '554b648ee9859c73955978e65d9a8c94' +md5sums=('3a2602016f98c529cda7b9fad1a6e216' + 'ec0883134fa00628d9057d1551d9c739' 'd777ff1a239b3d810dcf5d89f9d894af' '9d065134210aa0dd3f2b40d12d915040') -sha256sums=('c707c14ed5d2fc9dd9166fead73ca213d88f3264086a5892ca2139e7d9d437a0' - 'c01796a53d0f4c03cd77fb1a39517e664fca2ca7f77512963fd8c9cc95dd2b41' +sha256sums=('3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171' + '2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75' 'd2741714a477029ca1ed63f8584040bcba6a53b2332028f9005feef4ae500113' '6e1475974fae315c55da344c0527923061ad7d9478d39396d147aea497f501b7')