From 9b4356a4ce894946739f7fff9411f62be0fbc122 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 5 Aug 2012 00:04:11 +0000 Subject: Sun Aug 5 00:04:11 UTC 2012 --- community-testing/qtcurve-kde4/PKGBUILD | 11 ++- .../qtcurve-kde4/fix-kwin_decoration-macro.patch | 15 ++++ community-testing/r8168-lts/PKGBUILD | 6 +- community/conntrack-tools/PKGBUILD | 6 +- community/dmd/PKGBUILD | 13 ++- community/ecryptfs-utils/PKGBUILD | 6 +- community/gmic/PKGBUILD | 15 ++-- community/gmic/opencv-buildfix.patch | 93 ++++++---------------- community/keepalived/PKGBUILD | 6 +- community/libcec/PKGBUILD | 10 +-- community/pari/PKGBUILD | 7 +- community/pd/PKGBUILD | 6 +- extra/mercurial/PKGBUILD | 6 +- extra/mysql/PKGBUILD | 15 ++-- libre/kdelibs-libre/PKGBUILD | 6 +- multilib/lib32-libphobos/PKGBUILD | 7 +- staging/ifuse/PKGBUILD | 26 ++++++ testing/bison/PKGBUILD | 8 +- testing/flex/PKGBUILD | 6 +- testing/logrotate/PKGBUILD | 24 +++--- testing/logrotate/noasprintf.patch | 53 ++++++++++++ testing/logrotate/paths.patch | 25 ++++++ 22 files changed, 219 insertions(+), 151 deletions(-) create mode 100644 community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch create mode 100644 staging/ifuse/PKGBUILD create mode 100644 testing/logrotate/noasprintf.patch create mode 100644 testing/logrotate/paths.patch diff --git a/community-testing/qtcurve-kde4/PKGBUILD b/community-testing/qtcurve-kde4/PKGBUILD index 3ad2e7135..817439c93 100644 --- a/community-testing/qtcurve-kde4/PKGBUILD +++ b/community-testing/qtcurve-kde4/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74739 2012-08-02 16:18:09Z svenstaro $ +# $Id: PKGBUILD 74750 2012-08-03 09:56:11Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=qtcurve-kde4 pkgver=1.8.13 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') groups=('qtcurve') license=('GPL') @@ -14,15 +14,18 @@ url='http://www.kde-look.org/content/show.php?content=40492' depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2" - 'bypass-kde-config.patch') + 'bypass-kde-config.patch' + 'fix-kwin_decoration-macro.patch') md5sums=('94ba22bc487a18f585249c2967878189' - '3f6681147cc361bd2bfd4d7477f2a8d0') + '3f6681147cc361bd2bfd4d7477f2a8d0' + '7366e45ef9f24f53a36f87a539a937d6') build() { cd "${srcdir}"/QtCurve-KDE4-${pkgver} # Bypass KDE prefix detection by kde4-config, see: # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667 patch -p1 -i "${srcdir}"/bypass-kde-config.patch + patch -p1 -i "${srcdir}"/fix-kwin_decoration-macro.patch cd "${srcdir}" mkdir build diff --git a/community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch b/community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch new file mode 100644 index 000000000..6202e7b87 --- /dev/null +++ b/community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch @@ -0,0 +1,15 @@ +diff -Naur a/kwin/qtcurvehandler.cpp b/kwin/qtcurvehandler.cpp +--- a/kwin/qtcurvehandler.cpp 2012-08-02 13:36:58.811347708 +0000 ++++ b/kwin/qtcurvehandler.cpp 2012-08-02 13:38:03.240996792 +0000 +@@ -489,6 +489,11 @@ + + extern "C" + { ++ KWIN_EXPORT int decoration_version() ++ { ++ return KWIN_DECORATION_API_VERSION; ++ } ++ + KDE_EXPORT KDecorationFactory *create_factory() + { + KWinQtCurve::handler = new KWinQtCurve::QtCurveHandler(); diff --git a/community-testing/r8168-lts/PKGBUILD b/community-testing/r8168-lts/PKGBUILD index 1278371e7..f7a332181 100644 --- a/community-testing/r8168-lts/PKGBUILD +++ b/community-testing/r8168-lts/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73215 2012-07-04 00:45:12Z dreisner $ +# $Id: PKGBUILD 74765 2012-08-03 18:03:24Z tpowa $ # Maintainer: Massimiliano Torromeo pkgname=r8168-lts _pkgname=r8168 pkgver=8.031.00 -pkgrel=2 +pkgrel=4 pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" url="http://www.realtek.com.tw" license=("GPL") @@ -17,10 +17,10 @@ md5sums=('ec1654f02e2dad930bbeb0210ddab7e5') sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779') _extramodules=extramodules-3.0-lts -_kernver="$(cat /usr/lib/modules/$_extramodules/version || true)" build() { cd "$_pkgname-$pkgver" + local _kernver="$(cat /usr/lib/modules/$_extramodules/version)" make -C /usr/lib/modules/$_kernver/build \ SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD index 9630101af..ef1d82740 100644 --- a/community/conntrack-tools/PKGBUILD +++ b/community/conntrack-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72966 2012-06-25 17:24:52Z seblu $ +# $Id: PKGBUILD 74777 2012-08-04 01:09:31Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Valere Monseur # Contributor: Alessandro Sagratini # Contributor: Kevin Edmonds pkgname=conntrack-tools -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b 'conntrackd.conf' 'conntrackd.service' '01-config-file-path.patch') -md5sums=('48d414cb7a354001babf184ae6c16db9' +md5sums=('a8afc813e16265655f83991fc0df35b6' '478fe76da0202fcb5249bf65968d1c26' 'd3e73e81b54e3e8166d357d434680684' 'bd135eaefb47923bb8e8d26f084d3e9d' diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index 840f9311c..ecdb153f1 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72013 2012-06-05 15:38:07Z svenstaro $ +# $Id: PKGBUILD 74747 2012-08-03 04:26:36Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Chris Brannon # Contributor: Andrea Scarpino @@ -7,15 +7,15 @@ pkgname=('dmd' 'libphobos') pkgbase=dmd -pkgver=2.059 -pkgrel=3 +pkgver=2.060 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.digitalmars.com/d/2.0/" source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip tools-${pkgver}.tar.gz::https://github.com/D-Programming-Language/tools/tarball/v${pkgver}) -md5sums=('803b182e71c4b021dfd1811066201140' - '1605a9cff8ac7b2228dad5f4f217dfec') license=('custom') +md5sums=('6cf237d16625bf37a757a413963fa999' + '1e75b64dbf725dc8f6fc9e60ded5bef8') [[ $CARCH == "x86_64" ]] && _archbits="64" [[ $CARCH == "i686" ]] && _archbits="32" @@ -84,6 +84,5 @@ package_libphobos() { find $pkgdir/usr -type f | xargs chmod 0644 - install -Dm644 $srcdir/dmd2/src/druntime/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-druntime - install -Dm644 $srcdir/dmd2/src/phobos/phoboslicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos + install -Dm644 $srcdir/dmd2/src/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD index 2eddb8588..3a892f8db 100644 --- a/community/ecryptfs-utils/PKGBUILD +++ b/community/ecryptfs-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73892 2012-07-16 14:01:48Z tredaelli $ +# $Id: PKGBUILD 74760 2012-08-03 12:32:39Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Richard Murri # Contributor: Michal Krenek pkgname=ecryptfs-utils -pkgver=99 +pkgver=100 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" @@ -14,7 +14,7 @@ makedepends=('swig' 'intltool' 'gettext') depends=('keyutils' 'nss' 'python2') source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz") options=(!libtool) -md5sums=('17ef9190c6d078845e19d3e9a7d8ef7a') +md5sums=('efaa5eabbd368268874536036397f73b') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 46d2a241e..0729d863a 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70246 2012-05-03 01:48:06Z foutrelis $ +# $Id: PKGBUILD 74752 2012-08-03 10:54:18Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan "heftig" Steffens # Contributor: farid @@ -6,18 +6,18 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.1.2 -pkgrel=2 +pkgver=1.5.1.7 +pkgrel=1 pkgdesc="image procession framework" arch=('i686' 'x86_64') license=('custom:CeCILL') url="http://gmic.sourceforge.net" -makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick') +makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagemagick' 'qt') options=('docs' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" opencv-buildfix.patch) -md5sums=('1599803b0c60aa834cdc4f6200db5335' - '62515a0e477e71e11ee24f66b5799937') +md5sums=('da53449144f0edc9431358118e574e7c' + '8d1cf5000239099255d25c7d3dbe5728') build() { cd "$srcdir/gmic-$pkgver" @@ -32,9 +32,6 @@ package_gmic() { cd "$srcdir/gmic-$pkgver" make -C src install DESTDIR="$pkgdir" USR=/usr install -Dm644 COPYING "$pkgdir/usr/share/licenses/gmic/LICENSE" - mkdir -p $pkgdir/usr/share/bash-completion/completions/ - mv $pkgdir/etc/bash_completion.d/gmic $pkgdir/usr/share/bash-completion/completions/gmic - rm -rf $pkgdir/etc/bash_completion.d } package_gimp-plugin-gmic() { diff --git a/community/gmic/opencv-buildfix.patch b/community/gmic/opencv-buildfix.patch index 69778ac93..b204cb721 100644 --- a/community/gmic/opencv-buildfix.patch +++ b/community/gmic/opencv-buildfix.patch @@ -1,79 +1,32 @@ -diff -wbBur gmic-1.5.1.1/src/CImg.h gmic-1.5.1.1.my/src/CImg.h ---- gmic-1.5.1.1/src/CImg.h 2012-04-06 17:47:06.000000000 +0400 -+++ gmic-1.5.1.1.my/src/CImg.h 2012-04-10 02:10:19.000000000 +0400 -@@ -243,7 +243,11 @@ - #define _cimg_redefine_False - #endif - #include -+#undef True -+#undef False - #include "cv.h" -+#define True 1 -+#define False 0 - #include "highgui.h" - #endif - -diff -wbBur gmic-1.5.1.1/src/Makefile gmic-1.5.1.1.my/src/Makefile ---- gmic-1.5.1.1/src/Makefile 2012-04-06 17:47:05.000000000 +0400 -+++ gmic-1.5.1.1.my/src/Makefile 2012-04-10 02:39:09.000000000 +0400 -@@ -164,12 +164,12 @@ - # Flags to enable native support of webcams, using the OpenCV library. - # This requires the presence of the OpenCV include and library files. - # (package 'libcv3-2-dev' on Debian). --OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv -+OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv` - ifeq ($(OS),Darwin) --OPENCV_LDFLAGS = `pkg-config opencv --libs` # Use this for OpenCV 2.2.0 ! -+OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui - else --OPENCV_LDFLAGS = -lcv -lhighgui --# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui # Use this for OpenCV 2.2.0 ! -+OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -+# OPENCV_LDFLAGS = `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui - endif - - # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library. -@@ -270,7 +270,6 @@ - $(MAKE) bashcompletion - $(MAKE) gimp - $(MAKE) lib -- $(MAKE) zart - else - ifeq ($(OS),Darwin) - @echo "**" -@@ -297,7 +296,7 @@ +diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile +--- gmic-1.5.1.7/src/Makefile 2012-07-26 12:59:34.000000000 +0400 ++++ gmic-1.5.1.7.q/src/Makefile 2012-08-03 14:03:10.000000000 +0400 +@@ -296,7 +296,7 @@ zart: lib ifneq ($(OS),Darwin) - cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart + cd ../zart && qmake zart.pro && $(MAKE) && strip zart else - cd ../zart && qmake zart_mac.pro && $(MAKE) + cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" endif -@@ -386,16 +385,13 @@ - # Install/uninstall/clean. - install: - mkdir -p $(DESTDIR)$(PLUGINDIR)/ -- cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/ -+ - mkdir -p $(DESTDIR)$(USR)/bin/ - cp -f gmic $(DESTDIR)$(USR)/bin/ - mkdir -p $(DESTDIR)$(USR)/include/ - cp -f gmic.h $(DESTDIR)$(USR)/include/ - ifneq ($(OS),Darwin) - mkdir -p $(DESTDIR)$(USR)/share -- mkdir -p $(DESTDIR)$(USR)/share/zart -- cp -f ../zart/haar*.xml $(DESTDIR)$(USR)/share/zart -- cp -f ../zart/zart $(DESTDIR)$(USR)/bin/zart - mkdir -p $(DESTDIR)$(USR)/lib - cp -f libgmic.so $(DESTDIR)$(USR)/lib/libgmic.so.1.5.1.1 - ln -s libgmic.so.1.5.1.1 $(DESTDIR)$(USR)/lib/libgmic.so.1.5.1 -@@ -420,8 +416,6 @@ - rm -rf $(DESTDIR)$(USR)/share/doc/gmic/ - rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz - rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz -- rm -f $(DESTDIR)$(USR)/bin/zart -- rm -rf $(DESTDIR)$(USR)/share/zart/ +@@ -403,6 +403,7 @@ + mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz + cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz ++ if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi + if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi + if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi - distclean: clean +diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro +--- gmic-1.5.1.7/zart/zart.pro 2012-07-26 12:59:33.000000000 +0400 ++++ gmic-1.5.1.7.q/zart/zart.pro 2012-08-03 12:32:27.000000000 +0400 +@@ -34,7 +34,7 @@ + FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui + !macx { +- LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml -lfftw3 ++ LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -lfftw3 + } else { + LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3 + } diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index d02b20888..7f7b7b0f1 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73694 2012-07-14 12:56:44Z seblu $ +# $Id: PKGBUILD 74779 2012-08-04 01:16:35Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli pkgname=keepalived -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' 'keepalived.service' 'keepalived.conf') -md5sums=('1516a2fa0793184ff5c7ad77bac79460' +md5sums=('86d39fb62be4e2eef4417af4298dec48' '0d7ea6296bce403a5d24be305a0a9d73' '7a327df915700dcd45a049d099c9c42b' '9c8142da8730ad27a345587dea83ced7') diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index 923548cc8..7ad92a44d 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74248 2012-07-23 06:33:04Z idevolder $ +# $Id: PKGBUILD 74756 2012-08-03 11:00:41Z idevolder $ # Maintainer: BlackIkeEagle # Contributor: Philippe Cherel pkgname=libcec -pkgver=1.7.1 -pkgrel=2 +pkgver=1.8.0 +pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') url="https://github.com/Pulse-Eight/libcec" license=('GPL') depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-cd67a27 -sha256sums=('a560a792376bce73526f32ede89985b923d899cdf2f739be99e466b322b3211d') +_srcfolder=Pulse-Eight-libcec-b0a5e4f +sha256sums=('3725d19cabec4bbd4142fd735bda43d33aad2a4a62b20ef337f395b549e7adec') options=(!libtool) build() { diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index 35f4fe186..efc846ca4 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 64451 2012-02-13 22:53:47Z bisson $ +# $Id: PKGBUILD 74773 2012-08-04 00:52:49Z bisson $ # Maintainer: Gaetan Bisson pkgname=pari -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc='Computer algebra system designed for fast computations in number theory' url='http://pari.math.u-bordeaux.fr/' @@ -12,10 +12,11 @@ depends=('gmp' 'readline' 'libx11') makedepends=('perl' 'texlive-core') optdepends=('perl: gphelp, tex2mail') source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz") -sha1sums=('c83314bb993161a60e1e46ae7616072858414354') +sha1sums=('3efe590e885a7dde521b8553762d3207b919e69f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed 's/\$addlib64/ /' -i config/get_libpth ./Configure --prefix=/usr --with-gmp --with-readline make all } diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD index 18449382a..9e16275df 100644 --- a/community/pd/PKGBUILD +++ b/community/pd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74397 2012-07-26 14:58:32Z speps $ +# $Id: PKGBUILD 74762 2012-08-03 14:09:42Z speps $ # Maintainer : speps # Contributor: TDY # Contributor: Shinlun Hsieh # Contributor: Andrea Scarpino pkgname=pd -pkgver=0.43.3 +pkgver=0.43.4 _ver=${pkgver%.*}-${pkgver##*.} pkgrel=1 pkgdesc="The Pure Data real-time music and multimedia environment" @@ -15,7 +15,7 @@ license=('custom:BSD') depends=('jack' 'fftw' 'tk') provides=('puredata') source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz") -md5sums=('c0a565d3be92844780a86524598a5137') +md5sums=('9f174836ad5715ff3f65fd9b9f9a18ce') build() { cd "$srcdir/pd-$_ver/src" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 60740c4fb..c5ab2c39f 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162864 2012-07-02 14:49:26Z giovanni $ +# $Id: PKGBUILD 164703 2012-08-03 16:21:32Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.2.3 +pkgver=2.3 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('f4c70af3892d964b83b2718bde44c2f8' +md5sums=('8d9f776e432239571dfab2b5f88b3675' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index d595f927f..c7be9147d 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 163038 2012-07-06 07:38:34Z andrea $ +# $Id: PKGBUILD 164697 2012-08-03 07:57:29Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Douglas Soares de Andrade pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.25.a -_pkgver=5.5.25a +pkgver=5.5.27 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="https://www.mysql.com/products/community/" makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') -source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${_pkgver}.tar.gz" +source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('0841fbc79872c5f467d8c8842f45257a' +md5sums=('82baf46acfced6eef072e9d8a479c86e' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') @@ -27,7 +26,7 @@ build() { # CFLAGS/CXXFLAGS as suggested upstream - cmake ../${pkgbase}-${_pkgver} \ + cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -78,7 +77,7 @@ package_libmysqlclient(){ install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ install -d "${pkgdir}"/usr/share/man/man1 for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done } @@ -92,7 +91,7 @@ package_mysql-clients(){ # install man pages install -d "${pkgdir}"/usr/share/man/man1 for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done # provided by mysql diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 0d3517f1c..46dad6a6a 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164627 2012-08-01 15:06:16Z andrea $ +# $Id: PKGBUILD 164759 2012-08-04 18:47:16Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -15,7 +15,7 @@ depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit' - 'media-player-info') + 'media-player-info' 'libxtst') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell') provides=("kdelibs=$pkgver") replaces=('kdelibs') diff --git a/multilib/lib32-libphobos/PKGBUILD b/multilib/lib32-libphobos/PKGBUILD index 2b6acfd17..3b2604c00 100644 --- a/multilib/lib32-libphobos/PKGBUILD +++ b/multilib/lib32-libphobos/PKGBUILD @@ -7,15 +7,15 @@ pkgname=('lib32-libphobos') _pkgname=dmd -pkgver=2.059 +pkgver=2.060 pkgrel=1 pkgdesc="The phobos D standard library for DMD (32-bit)" arch=('x86_64') url="http://www.digitalmars.com/d/2.0/" source=(http://ftp.digitalmars.com/$_pkgname.$pkgver.zip) makedepends=('dmd') -md5sums=('803b182e71c4b021dfd1811066201140') license=('custom') +md5sums=('6cf237d16625bf37a757a413963fa999') build() { cd $srcdir/dmd2/src/ @@ -31,6 +31,5 @@ package() { install -Dm644 $srcdir/dmd2/src/druntime/lib/libdruntime-linux32.a $pkgdir/usr/lib32/libdruntime.a install -Dm644 $srcdir/dmd2/src/phobos/generated/linux/release/32/libphobos2.a $pkgdir/usr/lib32/libphobos2.a - install -Dm644 $srcdir/dmd2/src/druntime/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-druntime - install -Dm644 $srcdir/dmd2/src/phobos/phoboslicense.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-phobos + install -Dm644 $srcdir/dmd2/src/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/staging/ifuse/PKGBUILD b/staging/ifuse/PKGBUILD new file mode 100644 index 000000000..6ee370576 --- /dev/null +++ b/staging/ifuse/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 74529 2012-07-29 23:09:58Z tomegun $ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=ifuse +pkgver=1.1.2 +pkgrel=2 +pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' +url='http://libimobiledevice.org/' +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('libimobiledevice' 'fuse') +source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") +md5sums=('4152526b2ac3c505cb41797d997be14d') + +build() { + cd "${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD index e2f861d0b..069d61071 100644 --- a/testing/bison/PKGBUILD +++ b/testing/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164337 2012-07-31 00:34:31Z allan $ +# $Id: PKGBUILD 164715 2012-08-04 00:56:52Z allan $ # Maintainer: Allan McRae # Contributor: Eric Belanger pkgname=bison -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('1fc1b9bc689e7fc5622d32c93cce746f' - '44d571e9b271fbcf283c1795c28f70aa') +md5sums=('dea291996f98c34c3fd8e389a9cf6ea1' + 'e6d78e6423e9e29f3b6c5deee839b41c') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/testing/flex/PKGBUILD b/testing/flex/PKGBUILD index d51091dc7..1c9e16129 100644 --- a/testing/flex/PKGBUILD +++ b/testing/flex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163839 2012-07-21 10:43:39Z allan $ +# $Id: PKGBUILD 164717 2012-08-04 01:16:51Z allan $ # Maintainer: Allan McRae # Contributor: judd pkgname=flex -pkgver=2.5.36 +pkgver=2.5.37 pkgrel=1 pkgdesc="A tool for generating text-scanning programs" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('glibc' 'm4' 'sh') install=flex.install source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 lex.sh) -md5sums=('5e637290609fd3c2f1f2e75ac2bce1c5' +md5sums=('c75940e1fc25108f2a7b3ef42abdae06' 'f725259ec23a9e87ee29e2ef82eda9a5') build() { diff --git a/testing/logrotate/PKGBUILD b/testing/logrotate/PKGBUILD index 99a621b50..7ad4ebd03 100644 --- a/testing/logrotate/PKGBUILD +++ b/testing/logrotate/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162025 2012-06-18 22:17:58Z pierre $ +# $Id: PKGBUILD 164699 2012-08-03 08:05:59Z pierre $ # Maintainer: Pierre Schmitz pkgname=logrotate -pkgver=3.8.1 -pkgrel=2 +pkgver=3.8.2 +pkgrel=1 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64') url="https://fedorahosted.org/logrotate/" @@ -12,23 +12,21 @@ groups=('base') depends=('popt' 'cron' 'gzip') backup=('etc/logrotate.conf') source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz" - 'logrotate-3.8.1-noasprintf.patch' + 'noasprintf.patch' + 'paths.patch' 'logrotate.conf' 'logrotate.cron.daily') -md5sums=('bd2e20d8dc644291b08f9215397d28a5' - 'fc8e4e15211d8aefd431d0e2e96223c4' +md5sums=('ddd4dcf28c38b3ac6bc6ff4e0148308a' + 'cd76976b5ce37d328b452c806b55a015' + 'e76526bcd6fc33c9d921e1cb1eff1ffb' '462a5f364717461537eb2ae6394ad23e' 'aa8ac8283908b6114483a293adcb650f') build() { cd "$srcdir/${pkgname}-${pkgver}" - patch -p1 -i "$srcdir"/logrotate-3.8.1-noasprintf.patch - - sed -e 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\ - -e 's|#define COMPRESS_COMMAND .*|#define COMPRESS_COMMAND "/usr/bin/gzip"|'\ - -e 's|#define UNCOMPRESS_COMMAND .*|#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"|'\ - -i config.h + patch -p0 -i "$srcdir/noasprintf.patch" + patch -p0 -i "$srcdir/paths.patch" make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS" } @@ -40,7 +38,7 @@ check() { package() { cd "$srcdir/${pkgname}-${pkgver}" - make PREFIX="$pkgdir" MANDIR="usr/share/man" install + make PREFIX="$pkgdir" MANDIR="/usr/share/man" install install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate" diff --git a/testing/logrotate/noasprintf.patch b/testing/logrotate/noasprintf.patch new file mode 100644 index 000000000..3df943b64 --- /dev/null +++ b/testing/logrotate/noasprintf.patch @@ -0,0 +1,53 @@ +--- config.c 2011-06-21 04:12:02.000000000 -0400 ++++ config.c 2011-07-12 13:47:36.274319050 -0400 +@@ -41,39 +41,6 @@ + #include "asprintf.c" + #endif + +-#if !defined(asprintf) +-#include +- +-int asprintf(char **string_ptr, const char *format, ...) +-{ +- va_list arg; +- char *str; +- int size; +- int rv; +- +- va_start(arg, format); +- size = vsnprintf(NULL, 0, format, arg); +- size++; +- va_start(arg, format); +- str = malloc(size); +- if (str == NULL) { +- va_end(arg); +- /* +- * Strictly speaking, GNU asprintf doesn't do this, +- * but the caller isn't checking the return value. +- */ +- fprintf(stderr, "failed to allocate memory\\n"); +- exit(1); +- } +- rv = vsnprintf(str, size, format, arg); +- va_end(arg); +- +- *string_ptr = str; +- return (rv); +-} +- +-#endif +- + #if !defined(strndup) + char *strndup(const char *s, size_t n) + { +--- logrotate.h 2011-06-21 04:12:02.000000000 -0400 ++++ logrotate.h 2011-07-12 13:47:38.949285608 -0400 +@@ -66,8 +66,5 @@ extern int numLogs; + extern int debug; + + int readAllConfigPaths(const char **paths); +-#if !defined(asprintf) +-int asprintf(char **string_ptr, const char *format, ...); +-#endif + + #endif diff --git a/testing/logrotate/paths.patch b/testing/logrotate/paths.patch new file mode 100644 index 000000000..83166b095 --- /dev/null +++ b/testing/logrotate/paths.patch @@ -0,0 +1,25 @@ +--- config.h 2012-08-01 12:56:47.000000000 +0200 ++++ config.h 2012-08-03 09:53:05.025039199 +0200 +@@ -27,11 +27,11 @@ + * Default settings for Linux - leave these last. + */ + #ifndef DEFAULT_MAIL_COMMAND +-#define DEFAULT_MAIL_COMMAND "/bin/mail" ++#define DEFAULT_MAIL_COMMAND "/usr/bin/mail" + #endif + + #ifndef COMPRESS_COMMAND +-#define COMPRESS_COMMAND "/bin/gzip" ++#define COMPRESS_COMMAND "/usr/bin/gzip" + #endif + + #ifndef COMPRESS_EXT +@@ -39,7 +39,7 @@ + #endif + + #ifndef UNCOMPRESS_COMMAND +-#define UNCOMPRESS_COMMAND "/bin/gunzip" ++#define UNCOMPRESS_COMMAND "/usr/bin/gunzip" + #endif + + #ifndef STATEFILE -- cgit v1.2.3-54-g00ecf