[arch-commits] Commit in perl-uri/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 04:23:00 Author: remy Revision: 120483 Update to version 1.58 Modified: perl-uri/trunk/PKGBUILD --+ PKGBUILD | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 01:28:50 UTC (rev 120482) +++ PKGBUILD2011-04-24 08:23:00 UTC (rev 120483) @@ -5,26 +5,27 @@ pkgname=perl-uri _realname=URI -pkgver=1.54 +pkgver=1.58 pkgrel=1 pkgdesc="Uniform Resource Identifiers (absolute and relative)" arch=(any) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/"; depends=('perl>=5.10.0') +provides=('perl-uri-escape=3.30') options=(!emptydirs) source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-$pkgver.tar.gz) -md5sums=('dabc621fd116064395483d80c329095b') +md5sums=('540575aee18616ad9a21e0af7a1e7b18') build() { cd ${srcdir}/${_realname}-$pkgver # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 - make install DESTDIR=${pkgdir} || return 1 + perl Makefile.PL INSTALLDIRS=vendor + make +} - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete +package() { + cd ${srcdir}/${_realname}-$pkgver + make install DESTDIR=${pkgdir} } # vim: ts=2 sw=2 et ft=sh
[arch-commits] Commit in perl-uri/repos (extra-any)
Date: Sunday, April 24, 2011 @ 04:23:04 Author: remy Revision: 120484 archrelease: remove extra-any Deleted: perl-uri/repos/extra-any/
[arch-commits] Commit in perl-uri/repos (extra-any)
Date: Sunday, April 24, 2011 @ 04:23:18 Author: remy Revision: 120485 archrelease: copy trunk to extra-any Added: perl-uri/repos/extra-any/
[arch-commits] Commit in ca-certificates-java/trunk (3 files)
Date: Sunday, April 24, 2011 @ 06:24:08 Author: pierre Revision: 120486 upstream update Modified: ca-certificates-java/trunk/PKGBUILD ca-certificates-java/trunk/init-jks-keystore ca-certificates-java/trunk/jks-keystore.hook.patch -+ PKGBUILD| 16 init-jks-keystore |8 jks-keystore.hook.patch |4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 08:23:18 UTC (rev 120485) +++ PKGBUILD2011-04-24 10:24:08 UTC (rev 120486) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot pkgname=ca-certificates-java -pkgver=20100412 -pkgrel=3 +pkgver=20110421~nmu1 +pkgrel=1 pkgdesc='Common CA certificates (JKS keystore)' arch=('any') url='http://packages.qa.debian.org/c/ca-certificates-java.html' @@ -13,9 +13,9 @@ install='ca-certificates-java.install' source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz"; 'jks-keystore.hook.patch' 'init-jks-keystore') -md5sums=('16a5d04148d17923a4d838214dd9b867' - '301bfcf5ca39f22673f069eb7dd66dbb' - '82dcec93bb328ae68db33c8177fb3858') +md5sums=('34078ed264e401ffb5b176d3b98ec214' + '26303bb23b9eb7d7a7cdd6eca78e257e' + '8fca365914fc1fd9c44e26587424dc23') build() { cd ${srcdir} @@ -29,11 +29,11 @@ alias=$(basename $crt .crt | tr A-Z a-z | tr -cs a-z0-9 _) alias=${alias%*_} echo "IMPORT: $crt, alias=$alias" - if keytool -importcert -trustcacerts -keystore cacerts \ + if LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -importcert -trustcacerts -keystore cacerts \ -storepass 'changeit' -noprompt \ -alias "$alias" -file "/usr/share/ca-certificates/$crt" > keytool.log 2>&1; then cat keytool.log - elif keytool -importcert -trustcacerts -keystore cacerts \ + elif LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -importcert -trustcacerts -keystore cacerts \ -providerClass sun.security.pkcs11.SunPKCS11 \ -providerArg '/usr/lib/jvm/java-6-openjdk/jre/lib/security/nss.cfg' \ -storepass 'changeit' -noprompt \ @@ -44,7 +44,7 @@ cat keytool.log else cat keytool.log - #false + false fi done } Modified: init-jks-keystore === --- init-jks-keystore 2011-04-24 08:23:18 UTC (rev 120485) +++ init-jks-keystore 2011-04-24 10:24:08 UTC (rev 120486) @@ -12,7 +12,7 @@ # aliases of pregenerated files pregenerated=$(mktemp) -LANG=C LC_ALL=C keytool -list -keystore $KEYSTORE -storepass "$storepass" \ +LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -list -keystore $KEYSTORE -storepass "$storepass" \ | awk -F, '/^Certificate fingerprint/ { print s } { s=$1 } ' \ | sort > $pregenerated @@ -25,7 +25,7 @@ case "$line" in !*) # remove untrusted certificate - if LANG=C LC_ALL=C keytool -delete -keystore $KEYSTORE \ + if LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -delete -keystore $KEYSTORE \ -storepass "$storepass" -alias "$alias" >/dev/null then echo " removed untrusted certificate $pem" @@ -41,12 +41,12 @@ continue fi if ! grep -q "^${alias}$" $pregenerated; then - if LANG=C LC_ALL=C keytool -importcert -trustcacerts -keystore $KEYSTORE \ + if LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -importcert -trustcacerts -keystore $KEYSTORE \ -noprompt -storepass "$storepass" \ -alias "$alias" -file "$cacertdir/$pem" > $log 2>&1 then echo " added certificate $pem" - elif LANG=C LC_ALL=C keytool -importcert -trustcacerts -keystore $KEYSTORE \ + elif LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 keytool -importcert -trustcacerts -keystore $KEYSTORE \ -providerClass sun.security.pkcs11.SunPKCS11 \ -providerArg '/usr/lib/jvm/java-6-openjdk/jre/lib/security/nss.cfg' \ -noprompt -storepass "$storepass" \ Modified: jks-keystore.hook.patch === --- jks-keystore.hook.patch 2011-04-24 08:23:18 UTC (rev 120485) +++ jks-keystore.hook.patch 2011-04-24 10:24:08 UTC (rev 120486) @@ -23,7 +23,7 @@ pem=${l
[arch-commits] Commit in ca-certificates-java/repos (testing-any)
Date: Sunday, April 24, 2011 @ 06:24:25 Author: pierre Revision: 120487 archrelease: remove testing-any Deleted: ca-certificates-java/repos/testing-any/
[arch-commits] Commit in ca-certificates-java/repos (testing-any)
Date: Sunday, April 24, 2011 @ 06:24:38 Author: pierre Revision: 120488 archrelease: copy trunk to testing-any Added: ca-certificates-java/repos/testing-any/
[arch-commits] Commit in gnutls/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 09:19:44 Author: andyrtr Revision: 120489 upgpkg: gnutls 2.12.3-1 upstream update 2.12.3 Modified: gnutls/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 10:24:38 UTC (rev 120488) +++ PKGBUILD2011-04-24 13:19:44 UTC (rev 120489) @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot pkgname=gnutls -pkgver=2.12.2 +pkgver=2.12.3 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool' '!zipman') depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ca6903d99b2aca2a6a326bc8df805b61') +md5sums=('04b72b022b42b10df12cbbae051e2d55') build() { cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in gnutls/repos (extra-i686)
Date: Sunday, April 24, 2011 @ 09:19:49 Author: andyrtr Revision: 120490 archrelease: remove extra-i686 Deleted: gnutls/repos/extra-i686/
[arch-commits] Commit in gnutls/repos (extra-i686)
Date: Sunday, April 24, 2011 @ 09:20:09 Author: andyrtr Revision: 120491 archrelease: copy trunk to extra-i686 Added: gnutls/repos/extra-i686/
[arch-commits] Commit in gnutls/repos (extra-x86_64)
Date: Sunday, April 24, 2011 @ 09:20:13 Author: andyrtr Revision: 120492 archrelease: remove extra-x86_64 Deleted: gnutls/repos/extra-x86_64/
[arch-commits] Commit in gnutls/repos (extra-x86_64)
Date: Sunday, April 24, 2011 @ 09:20:36 Author: andyrtr Revision: 120493 archrelease: copy trunk to extra-x86_64 Added: gnutls/repos/extra-x86_64/
[arch-commits] Commit in kernel26-lts/trunk (PKGBUILD buildfix-gcc46.diff)
Date: Sunday, April 24, 2011 @ 10:38:05 Author: andyrtr Revision: 120494 upgpkg: kernel26-lts 2.6.32.39-1 update to 2.6.32.39; add a gcc46 buildfix Added: kernel26-lts/trunk/buildfix-gcc46.diff Modified: kernel26-lts/trunk/PKGBUILD -+ PKGBUILD| 15 ++- buildfix-gcc46.diff | 32 2 files changed, 42 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 13:20:36 UTC (rev 120493) +++ PKGBUILD2011-04-24 14:38:05 UTC (rev 120494) @@ -5,8 +5,8 @@ pkgname=('kernel26-lts' 'kernel26-lts-headers') # Build stock -lts kernel _kernelname=${pkgname#kernel26} _basekernel=2.6.32 -pkgver=${_basekernel}.38 -pkgrel=2 +pkgver=${_basekernel}.39 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') url="http://www.kernel.org"; @@ -16,14 +16,16 @@ # the main kernel config files config config.x86_64 # standard config files for mkinitcpio ramdisk -${pkgname}.preset) +${pkgname}.preset + buildfix-gcc46.diff) options=(!strip) md5sums=('260551284ac224c3a43c4adac7df4879' - '91c3e7a802b95bd2f400748acc91d5b3' + '6cd1e135751b51946f56a2fb49ed05a3' '30851deee235a7486bd408cbe8eb2d71' '3298f542840c52a8b8abc1b3795e455b' 'cd1a62e81eb9e910779f3eb18a6e28c6' - '2cbfeb3e2a18d45f82f613e97fc23355') + '2cbfeb3e2a18d45f82f613e97fc23355' +'bb7410d7b740dfad0385a07b66e6621f') build() { cd ${srcdir}/linux-$_basekernel @@ -35,6 +37,9 @@ # fix 22343 udev crashes patch -Np1 -i ${srcdir}/libata-alignment.patch + # fix build with gcc46 - http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.38.y.git;a=commitdiff;h=b1d670f1#patch1 + patch -Np1 -i ${srcdir}/buildfix-gcc46.diff + if [ "$CARCH" = "x86_64" ]; then cat ../config.x86_64 >./.config else Added: buildfix-gcc46.diff === --- buildfix-gcc46.diff (rev 0) +++ buildfix-gcc46.diff 2011-04-24 14:38:05 UTC (rev 120494) @@ -0,0 +1,32 @@ +From b1d670f10e8078485884f0cf7e384d890909aeaa Mon Sep 17 00:00:00 2001 +From: Greg Rose +Date: Tue, 16 Nov 2010 19:41:36 -0800 +Subject: [PATCH] Remove extra struct page member from the buffer info + structure + +declaration. + +Reported-by: Andi Kleen +Signed-off-by: Greg Rose +Tested-by: Emil Tantilov +Signed-off-by: Jeff Kirsher +--- + drivers/net/igbvf/igbvf.h |1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h +index 63284e3..9d4d63e 100644 +--- a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h +@@ -126,7 +126,6 @@ struct igbvf_buffer { + unsigned int page_offset; + }; + }; +- struct page *page; + }; + + union igbvf_desc { +-- +1.7.4.5 + +
[arch-commits] Commit in kernel26-lts/repos (testing-i686)
Date: Sunday, April 24, 2011 @ 10:38:23 Author: andyrtr Revision: 120495 archrelease: copy trunk to testing-i686 Added: kernel26-lts/repos/testing-i686/
[arch-commits] Commit in kernel26-lts/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 10:38:40 Author: andyrtr Revision: 120496 archrelease: copy trunk to testing-x86_64 Added: kernel26-lts/repos/testing-x86_64/
[arch-commits] Commit in tumbler/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 10:50:22 Author: andyrtr Revision: 120497 upgpkg: tumbler 0.1.21-3 make ffmpegthumbnailer an optional dependency; FS#23567 Modified: tumbler/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 14:38:40 UTC (rev 120496) +++ PKGBUILD2011-04-24 14:50:22 UTC (rev 120497) @@ -4,14 +4,15 @@ pkgname=tumbler pkgver=0.1.21 -pkgrel=2 +pkgrel=3 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/xfce/tumbler/"; license=('GPL2' 'LGPL') arch=('i686' 'x86_64') groups=('xfce4') -depends=('poppler-glib' 'dbus-glib' 'ffmpegthumbnailer') -makedepends=( 'intltool' 'gtk-doc') +depends=('poppler-glib' 'dbus-glib') +makedepends=('intltool' 'ffmpegthumbnailer') +optdepends=('ffmpegthumbnailer:for video thunbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2) md5sums=('2ef0d30750f95efe345de4655049d4f6') @@ -22,8 +23,7 @@ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ --disable-static \ - --disable-debug \ - --enable-gtk-doc + --disable-debug make }
[arch-commits] Commit in tumbler/repos (extra-i686)
Date: Sunday, April 24, 2011 @ 10:50:31 Author: andyrtr Revision: 120498 archrelease: remove extra-i686 Deleted: tumbler/repos/extra-i686/
[arch-commits] Commit in tumbler/repos (extra-i686)
Date: Sunday, April 24, 2011 @ 10:50:48 Author: andyrtr Revision: 120499 archrelease: copy trunk to extra-i686 Added: tumbler/repos/extra-i686/
[arch-commits] Commit in tumbler/repos (extra-x86_64)
Date: Sunday, April 24, 2011 @ 10:50:52 Author: andyrtr Revision: 120500 archrelease: remove extra-x86_64 Deleted: tumbler/repos/extra-x86_64/
[arch-commits] Commit in tumbler/repos (extra-x86_64)
Date: Sunday, April 24, 2011 @ 10:51:09 Author: andyrtr Revision: 120501 archrelease: copy trunk to extra-x86_64 Added: tumbler/repos/extra-x86_64/
[arch-commits] Commit in xf86-input-joystick/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 10:51:16 Author: jgc Revision: 120502 upgpkg: xf86-input-joystick 1.6.0-1 Update to 1.6.0, fixes crashes with new xorg-server Modified: xf86-input-joystick/trunk/PKGBUILD --+ PKGBUILD | 27 ++- 1 file changed, 6 insertions(+), 21 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 14:51:09 UTC (rev 120501) +++ PKGBUILD2011-04-24 14:51:16 UTC (rev 120502) @@ -2,8 +2,7 @@ # Maintainer: Jan de Groot pkgname=xf86-input-joystick -_gitdate=20110318 -pkgver=1.5.99_git${_gitdate} # see configure.ac +pkgver=1.6.0 pkgrel=1 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64) @@ -14,35 +13,21 @@ conflicts=('xorg-server<1.10.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2 +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 50-joystick.conf LICENSE) -sha1sums=('e1eb55c0556984530ab87836b5ade78085c7201b' +sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780' 'e1ff3699a0470c6bb78a53f718df9d8521621e11' 'ee4c79491b36a680ed9d86f5fc41ae447f26353e') -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/${pkgname}-${_gitdate} - pushd /tmp/${pkgname}-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-joystick - cd xf86-input-joystick - git archive --prefix=xf86-video-joystick-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2 - popd -} - build() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# ./configure --prefix=/usr - cd ${srcdir}/xf86-video-joystick-${_gitdate} - ./autogen.sh --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/xf86-video-joystick-${_gitdate} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install
[arch-commits] Commit in xf86-input-joystick/repos (extra-i686)
Date: Sunday, April 24, 2011 @ 10:51:18 Author: jgc Revision: 120503 archrelease: remove extra-i686 Deleted: xf86-input-joystick/repos/extra-i686/
[arch-commits] Commit in xf86-input-joystick/repos (extra-i686)
Date: Sunday, April 24, 2011 @ 10:51:23 Author: jgc Revision: 120504 archrelease: copy trunk to extra-i686 Added: xf86-input-joystick/repos/extra-i686/
[arch-commits] Commit in xf86-input-joystick/repos (extra-x86_64)
Date: Sunday, April 24, 2011 @ 10:51:24 Author: jgc Revision: 120505 archrelease: remove extra-x86_64 Deleted: xf86-input-joystick/repos/extra-x86_64/
[arch-commits] Commit in xf86-input-joystick/repos (extra-x86_64)
Date: Sunday, April 24, 2011 @ 10:51:31 Author: jgc Revision: 120506 archrelease: copy trunk to extra-x86_64 Added: xf86-input-joystick/repos/extra-x86_64/
[arch-commits] Commit in qt3/trunk (PKGBUILD gcc-4.6.patch)
Date: Sunday, April 24, 2011 @ 11:55:09 Author: andrea Revision: 120507 fix build with gcc 4.6 (FS#23915) Added: qt3/trunk/gcc-4.6.patch Modified: qt3/trunk/PKGBUILD ---+ PKGBUILD | 37 - gcc-4.6.patch | 33 + 2 files changed, 57 insertions(+), 13 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 14:51:31 UTC (rev 120506) +++ PKGBUILD2011-04-24 15:55:09 UTC (rev 120507) @@ -17,7 +17,11 @@ optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt3-png14.patch qt.profile \ qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \ - qt-font-default-subst.diff mysql.patch eastern_asian_languagues.diff qt-odbc.patch) + qt-font-default-subst.diff +mysql.patch +eastern_asian_languagues.diff +qt-odbc.patch +gcc-4.6.patch) options=(!libtool) md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85' '1dc671df42b9030dbdf68bb61cd3375e' @@ -28,7 +32,8 @@ '9370d82e85f2c799335ed0dcc1d53189' '7d40ed1bd40d33d8b9b27a2076a5d22a' '616f1f3029cf8375256ad6a406de3549' - '2178ca88dfd75a230918593b30eb0dbe') + '2178ca88dfd75a230918593b30eb0dbe' + '75177de5b08e1efd437c887c6e606c5b') # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ # other qt-patches come from fedora and gentoo @@ -42,24 +47,26 @@ cd ${srcdir}/$pkgfqn # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do -patch -Np0 -i $i || return 1 +patch -Np0 -i $i done # apply other qt patches and one security fix from debian/gentoo for i in ../qt-patches/*; do -patch -Np1 -i $i || return 1 +patch -Np1 -i $i done # fix utf8 bug - patch -Np0 -i ../utf8-bug-qt3.diff || return 1 + patch -Np0 -i ../utf8-bug-qt3.diff # fix asia fonts - patch -Np0 -i ../qt-font-default-subst.diff || return 1 + patch -Np0 -i ../qt-font-default-subst.diff # fix segfaults on exit when using mysql DB driver - patch -Np0 -i ../mysql.patch || return 1 + patch -Np0 -i ../mysql.patch # fix CJK font/chars select error (FS#11245) - patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1 + patch -p1 -i ${srcdir}/eastern_asian_languagues.diff # fix build problem against new unixODBC - patch -p1 -i ${srcdir}/qt-odbc.patch || return 1 + patch -p1 -i ${srcdir}/qt-odbc.patch + # fix build with gcc 4.6.0 + patch -p1 -i ${srcdir}/gcc-4.6.patch - patch -p0 -i ${srcdir}/qt3-png14.patch || return 1 + patch -p0 -i ${srcdir}/qt3-png14.patch # start compiling qt sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix rm -rf doc/html examples tutorial @@ -91,7 +98,7 @@ [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile cd ${srcdir}/$pkgfqn - make -C qmake || return 1 + make -C qmake cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql @@ -100,7 +107,11 @@ cd ${srcdir}/$pkgfqn # fix the broken makefiles #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile - make || return 1 + make +} + +package() { + cd ${srcdir}/$pkgfqn make INSTALL_ROOT=${pkgdir} install rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations} sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl @@ -110,7 +121,7 @@ rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH # install man pages - mkdir -p ${pkgdir}/opt/qt/man + install -d -m755 ${pkgdir}/opt/qt/man cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/ install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ Added: gcc-4.6.patch === --- gcc-4.6.patch (rev 0) +++ gcc-4.6.patch 2011-04-24 15:55:09 UTC (rev 120507) @@ -0,0 +1,33 @@ +diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h +--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef2008-01-15 13:09:13.0 -0600 qt-x11-free-3.3.8b/src/tools/qmap.h2011-01-30 21:14:29.275088725 -0600 +@@ -49,6 +49,7 @@ + #include "qvaluelist.h" + #endif // QT_H + ++#include + #ifndef QT_NO_STL + #include + #include +diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h +--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.0 -0600 qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 +@@ -47,6 +47,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include + #ifndef QT_NO_STL + #inc
[arch-commits] Commit in qt3/repos (extra-i686)
Date: Sunday, April 24, 2011 @ 11:55:45 Author: andrea Revision: 120508 archrelease: remove extra-i686 Deleted: qt3/repos/extra-i686/
[arch-commits] Commit in qt3/repos (extra-i686)
Date: Sunday, April 24, 2011 @ 11:55:58 Author: andrea Revision: 120509 archrelease: copy trunk to extra-i686 Added: qt3/repos/extra-i686/
[arch-commits] Commit in qt3/repos (extra-x86_64)
Date: Sunday, April 24, 2011 @ 11:56:01 Author: andrea Revision: 120510 archrelease: remove extra-x86_64 Deleted: qt3/repos/extra-x86_64/
[arch-commits] Commit in qt3/repos (extra-x86_64)
Date: Sunday, April 24, 2011 @ 11:56:14 Author: andrea Revision: 120511 archrelease: copy trunk to extra-x86_64 Added: qt3/repos/extra-x86_64/
[arch-commits] Commit in rasqal-compat/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 13:16:36 Author: andyrtr Revision: 120512 upgpkg: rasqal-compat 0.9.21-2 split into library and devel files to avoid files conflicts Modified: rasqal-compat/trunk/PKGBUILD --+ PKGBUILD | 29 ++--- 1 file changed, 22 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 15:56:14 UTC (rev 120511) +++ PKGBUILD2011-04-24 17:16:36 UTC (rev 120512) @@ -2,18 +2,16 @@ # Maintainer: AndyRTR # Contributor: Lawrence Lee -pkgname=rasqal-compat +pkgbase=rasqal-compat +pkgname=('rasqal-compat' 'rasqal-compat-devel') _pkgname=rasqal pkgver=0.9.21 -pkgrel=1 -pkgdesc="a free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" +pkgrel=2 url="http://librdf.org/rasqal"; license=('GPL' 'LGPL') arch=('i686' 'x86_64') -depends=('raptor1>=1.4.21' 'mpfr') options=('!libtool') -conflicts=('rasqal') -provides=("rasqal=${pkgver}") +makedepends=('raptor1>=1.4.21' 'mpfr') source=(http://download.librdf.org/source/${_pkgname}-${pkgver}.tar.gz) md5sums=('55b67ec92a059ef8979d46486b00a032') @@ -25,7 +23,24 @@ make } -package() { +package_rasqal-compat() { + + pkgdesc="a free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings; compatibility version providing an older API" + depends=('raptor1>=1.4.21' 'mpfr') + cd ${srcdir}/${_pkgname}-${pkgver} + make -C src DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib/librasqal.so + rm -rf ${pkgdir}/usr/{bin,include,share} +} + +package_rasqal-compat-devel() { + + pkgdesc="a free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings; compatibility version providing an older API - devel files" + depends=('rasqal-compat') + + cd ${srcdir}/${_pkgname}-${pkgver} make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib/librasqal.so.* + rm -rf ${pkgdir}/usr/share }
[arch-commits] Commit in rasqal-compat/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:16:40 Author: andyrtr Revision: 120513 archrelease: remove testing-x86_64 Deleted: rasqal-compat/repos/testing-x86_64/
[arch-commits] Commit in rasqal-compat/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:16:57 Author: andyrtr Revision: 120514 archrelease: copy trunk to testing-x86_64 Added: rasqal-compat/repos/testing-x86_64/
[arch-commits] Commit in redland-compat/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 13:19:06 Author: andyrtr Revision: 120515 upgpkg: redland-compat 1.0.12-2 split into library and devel files to avoid files conflicts Modified: redland-compat/trunk/PKGBUILD --+ PKGBUILD | 78 + 1 file changed, 22 insertions(+), 56 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 17:16:57 UTC (rev 120514) +++ PKGBUILD2011-04-24 17:19:06 UTC (rev 120515) @@ -3,28 +3,26 @@ # Contributor: Francois Charette pkgbase=redland-compat -_pkgbase=redland -pkgname=('redland-compat' 'redland-compat-storage-mysql' 'redland-compat-storage-postgresql' 'redland-compat-storage-virtuoso' 'redland-compat-storage-sqlite') +pkgname=('redland-compat' 'redland-compat-devel') pkgver=1.0.12 -pkgrel=1 +pkgrel=2 url="http://librdf.org/"; license=("GPL") arch=('i686' 'x86_64') -makedepends=('rasqal-compat>=0.9.21' 'raptor1>=1.4.21' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') -options=('!libtool') -source=(http://download.librdf.org/source/$_pkgbase-$pkgver.tar.gz +makedepends=('rasqal-compat-devel>=0.9.21-2' 'raptor1>=1.4.21' 'libtool' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +options=('!libtool' '!emptydirs') +source=(http://download.librdf.org/source/"${pkgbase/-compat/}"-$pkgver.tar.gz rpath.diff) md5sums=('40f37a5ad97fdfbf984f78dcea0c6115' 'acc85e784f01a656bd56777f95880787') build() { - cd ${srcdir}/${_pkgbase}-${pkgver} + cd ${srcdir}/"${pkgname/-compat/}"-${pkgver} ./configure --prefix=/usr \ --enable-release \ --disable-static \ - --with-raptor=system \ - --with-rasqal=system \ - --with-sqlite=3 + --with-sqlite=3 \ + --disable-modular # nuke rpath patch -Np0 -i ${srcdir}/rpath.diff @@ -33,56 +31,24 @@ } package_redland-compat() { - pkgdesc="Library that provides a high-level interface to RDF data" - depends=('rasqal-compat>=0.9.21' 'raptor1>=1.4.21' 'libtool') - conflicts=('redland') - provides=("redland=${pkgver}") - - cd ${srcdir}/${_pkgbase}-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/lib/redland -} -package_redland-compat-storage-mysql() { - pkgdesc="MySQL storage support for Redland" - depends=('redland-compat' 'libmysqlclient') - conflicts=('redland-storage-mysql') - provides=("redland-storage-mysql=${pkgver}") + pkgdesc="Library that provides a high-level interface to RDF data; compatibility version providing an older API" + depends=('rasqal-compat>=0.9.21' 'raptor1>=1.4.21' 'libtool' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') - cd ${srcdir}/${_pkgbase}-${pkgver} - install -dm755 ${pkgdir}/usr/lib/redland - install -m755 src/.libs/librdf_storage_mysql.so ${pkgdir}/usr/lib/redland/librdf_storage_mysql.so + cd ${srcdir}/"${pkgbase/-compat/}"-${pkgver} + make -C src DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib/librdf.so + rm -rf ${pkgdir}/usr/{include,share} } -package_redland-compat-storage-postgresql() { - pkgdesc="PostgreSQL storage support for Redland" - depends=('redland-compat' 'postgresql-libs') - conflicts=('redland-storage-postgresql') - provides=("redland-storage-postgresql=${pkgver}") +package_redland-compat-devel() { - cd ${srcdir}/${_pkgbase}-${pkgver} - install -dm755 ${pkgdir}/usr/lib/redland - install -m755 src/.libs/librdf_storage_postgresql.so ${pkgdir}/usr/lib/redland/ -} - -package_redland-compat-storage-virtuoso() { - pkgdesc="Virtuoso storage support for Redland" - depends=('redland-compat' 'unixodbc' 'db') - conflicts=('redland-storage-virtuoso') - provides=("redland-storage-virtuoso=${pkgver}") - - cd ${srcdir}/${_pkgbase}-${pkgver} - install -dm755 ${pkgdir}/usr/lib/redland - install -m755 src/.libs/librdf_storage_virtuoso.so ${pkgdir}/usr/lib/redland/ -} - -package_redland-compat-storage-sqlite() { - pkgdesc="SQLite storage support for Redland" - depends=('redland-compat' 'sqlite3' 'db') - conflicts=('redland-storage-sqlite') - provides=("redland-storage-sqlite=${pkgver}") + pkgdesc="Library that provides a high-level interface to RDF data; compatibility version providing an older API - devel files" + depends=('redland-compat') - cd ${srcdir}/${_pkgbase}-${pkgver} - install -dm755 ${pkgdir}/usr/lib/redland - install -m755 src/.libs/librdf_storage_sqlite.so ${pkgdir}/usr/lib/redland/ + cd ${srcdir}/"${pkgbase/-compat/}"-${pkgver} + #make -C src DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib/librdf.so.* + rm -rf ${pkgdir}/usr/share }
[arch-commits] Commit in redland-compat/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:19:10 Author: andyrtr Revision: 120516 archrelease: remove testing-x86_64 Deleted: redland-compat/repos/testing-x86_64/
[arch-commits] Commit in redland-compat/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:19:30 Author: andyrtr Revision: 120517 archrelease: copy trunk to testing-x86_64 Added: redland-compat/repos/testing-x86_64/
[arch-commits] Commit in rasqal-compat/repos (testing-i686)
Date: Sunday, April 24, 2011 @ 13:31:02 Author: andyrtr Revision: 120518 archrelease: remove testing-i686 Deleted: rasqal-compat/repos/testing-i686/
[arch-commits] Commit in rasqal-compat/repos (testing-i686)
Date: Sunday, April 24, 2011 @ 13:31:19 Author: andyrtr Revision: 120519 archrelease: copy trunk to testing-i686 Added: rasqal-compat/repos/testing-i686/
[arch-commits] Commit in rasqal-compat/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:31:23 Author: andyrtr Revision: 120520 archrelease: remove testing-x86_64 Deleted: rasqal-compat/repos/testing-x86_64/
[arch-commits] Commit in rasqal-compat/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:31:40 Author: andyrtr Revision: 120521 archrelease: copy trunk to testing-x86_64 Added: rasqal-compat/repos/testing-x86_64/
[arch-commits] Commit in redland-compat/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 13:36:18 Author: andyrtr Revision: 120522 upgpkg: redland-compat 1.0.12-3 add replaces Modified: redland-compat/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 17:31:40 UTC (rev 120521) +++ PKGBUILD2011-04-24 17:36:18 UTC (rev 120522) @@ -5,7 +5,7 @@ pkgbase=redland-compat pkgname=('redland-compat' 'redland-compat-devel') pkgver=1.0.12 -pkgrel=2 +pkgrel=3 url="http://librdf.org/"; license=("GPL") arch=('i686' 'x86_64') @@ -34,6 +34,7 @@ pkgdesc="Library that provides a high-level interface to RDF data; compatibility version providing an older API" depends=('rasqal-compat>=0.9.21' 'raptor1>=1.4.21' 'libtool' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') + replaces=('redland-compat-storage-mysql' 'redland-compat-storage-postgresql' 'redland-compat-storage-virtuoso' 'redland-compat-storage-sqlite') cd ${srcdir}/"${pkgbase/-compat/}"-${pkgver} make -C src DESTDIR=${pkgdir} install
[arch-commits] Commit in redland-compat/repos (testing-i686)
Date: Sunday, April 24, 2011 @ 13:36:22 Author: andyrtr Revision: 120523 archrelease: remove testing-i686 Deleted: redland-compat/repos/testing-i686/
[arch-commits] Commit in redland-compat/repos (testing-i686)
Date: Sunday, April 24, 2011 @ 13:36:38 Author: andyrtr Revision: 120524 archrelease: copy trunk to testing-i686 Added: redland-compat/repos/testing-i686/
[arch-commits] Commit in redland-compat/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:36:43 Author: andyrtr Revision: 120525 archrelease: remove testing-x86_64 Deleted: redland-compat/repos/testing-x86_64/
[arch-commits] Commit in redland-compat/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:37:00 Author: andyrtr Revision: 120526 archrelease: copy trunk to testing-x86_64 Added: redland-compat/repos/testing-x86_64/
[arch-commits] Commit in soprano/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 13:41:42 Author: andyrtr Revision: 120527 upgpkg: soprano 2.6.0-3 rebuild for split redland/rasqal compat libs Modified: soprano/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 17:37:00 UTC (rev 120526) +++ PKGBUILD2011-04-24 17:41:42 UTC (rev 120527) @@ -4,13 +4,13 @@ pkgname=soprano pkgver=2.6.0 -pkgrel=2 +pkgrel=3 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') -depends=('qt' 'clucene' 'redland-compat-storage-virtuoso' 'libiodbc' 'raptor1') -makedepends=('cmake' 'openjdk6' 'doxygen') +depends=('qt' 'clucene' 'redland-compat' 'libiodbc' 'raptor1') +makedepends=('cmake' 'openjdk6' 'doxygen' 'redland-compat-devel>=>=1.0.12-3' 'rasqal-compat-devel>=>=0.9.21-2') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";) md5sums=('03ae49e87c6ec99e57d0433c2650846f')
[arch-commits] Commit in soprano/repos (testing-i686)
Date: Sunday, April 24, 2011 @ 13:41:45 Author: andyrtr Revision: 120528 archrelease: remove testing-i686 Deleted: soprano/repos/testing-i686/
[arch-commits] Commit in soprano/repos (testing-i686)
Date: Sunday, April 24, 2011 @ 13:42:03 Author: andyrtr Revision: 120529 archrelease: copy trunk to testing-i686 Added: soprano/repos/testing-i686/
[arch-commits] Commit in soprano/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:42:07 Author: andyrtr Revision: 120530 archrelease: remove testing-x86_64 Deleted: soprano/repos/testing-x86_64/
[arch-commits] Commit in soprano/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 13:42:24 Author: andyrtr Revision: 120531 archrelease: copy trunk to testing-x86_64 Added: soprano/repos/testing-x86_64/
[arch-commits] Commit in aufs2/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 14:43:57 Author: tpowa Revision: 120532 upgpkg: aufs2 2.6.38_20110314-5 rebuild against 2.6.38.4 Modified: aufs2/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 17:42:24 UTC (rev 120531) +++ PKGBUILD2011-04-24 18:43:57 UTC (rev 120532) @@ -3,7 +3,7 @@ pkgname=aufs2 pkgver=2.6.38_20110314 -pkgrel=4 +pkgrel=5 #_kernver=${pkgver%_*}-ARCH _kernver=2.6.38-ARCH pkgdesc="Another Unionfs Implementation"
[arch-commits] Commit in aufs2/repos (testing-i686)
Date: Sunday, April 24, 2011 @ 14:44:10 Author: tpowa Revision: 120533 archrelease: copy trunk to testing-i686 Added: aufs2/repos/testing-i686/
[arch-commits] Commit in aufs2/repos (testing-x86_64)
Date: Sunday, April 24, 2011 @ 14:44:23 Author: tpowa Revision: 120534 archrelease: copy trunk to testing-x86_64 Added: aufs2/repos/testing-x86_64/
[arch-commits] Commit in gnome-control-center/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 16:16:48 Author: ibiru Revision: 120535 improve packaging. FS#23918 FS#23908 Modified: gnome-control-center/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 18:44:23 UTC (rev 120534) +++ PKGBUILD2011-04-24 20:16:48 UTC (rev 120535) @@ -6,7 +6,9 @@ pkgrel=2 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gconf' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper') +depends=('gtk3' 'gsettings-desktop-schemas' 'gconf' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice') +optdepends=('mesa-demos: provides glxinfo for graphics information' +'apg: adds password generation for user accounts') makedepends=('gnome-doc-utils' 'intltool' 'networkmanager') url="http://www.gnome.org"; groups=('gnome')
[arch-commits] Commit in gdm/trunk (PKGBUILD)
Date: Sunday, April 24, 2011 @ 16:26:30 Author: ibiru Revision: 120536 improve packging. FS#23908 Modified: gdm/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2011-04-24 20:16:48 UTC (rev 120535) +++ PKGBUILD2011-04-24 20:26:30 UTC (rev 120536) @@ -10,7 +10,7 @@ backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf') groups=('gnome-extra') options=('!libtool') -depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit') +depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb') makedepends=('intltool' 'gnome-doc-utils' 'xorg-server') conflicts=('fast-user-switch-applet') replaces=('fast-user-switch-applet')