From 11357a5ab02a7d536375fb8333b2fb67278b4a36 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 23 Jun 2012 00:01:51 +0000 Subject: Sat Jun 23 00:01:50 UTC 2012 --- community/choqok/PKGBUILD | 4 +-- community/gluon/PKGBUILD | 30 +++++++++++-------- community/gluon/gcc47.patch | 31 +++++++++++++++++++ community/klavaro/PKGBUILD | 8 ++--- community/pragha/PKGBUILD | 6 ++-- community/python-gnutls/PKGBUILD | 7 ++--- ...isd-fix-typo-in-topology-generator-BZ-731.patch | 30 +++++++++++++++++++ community/quagga/PKGBUILD | 13 ++++---- core/man-db/PKGBUILD | 9 +++--- extra/imagemagick/PKGBUILD | 19 ++++++------ libre/python-reportlab-libre/PKGBUILD | 7 +++-- .../kdeplasma-applets-networkmanagement/PKGBUILD | 35 ++++++++++++++++++++++ .../kdeplasma-applets-networkmanagement.install | 11 +++++++ testing/libusbx/PKGBUILD | 32 ++++++++++++++++++++ 14 files changed, 194 insertions(+), 48 deletions(-) create mode 100644 community/gluon/gcc47.patch create mode 100644 community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch create mode 100644 testing/kdeplasma-applets-networkmanagement/PKGBUILD create mode 100644 testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install create mode 100644 testing/libusbx/PKGBUILD diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD index 00151541c..eae93565d 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67102 2012-03-04 10:12:03Z andrea $ +# $Id: PKGBUILD 72717 2012-06-21 07:02:11Z andrea $ # Maintainer: Peter Richard Lewis # Contributor: Andrea Scarpino # Contributor: Emanuele Rossi @@ -6,7 +6,7 @@ pkgname=choqok pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="A Twitter/identi.ca/laconica client for KDE" url='http://choqok.gnufolks.org/' license=('GPL') diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD index b16442551..12d20a320 100644 --- a/community/gluon/PKGBUILD +++ b/community/gluon/PKGBUILD @@ -1,33 +1,37 @@ -# $Id: PKGBUILD 61254 2011-12-26 12:01:45Z andrea $ +# $Id: PKGBUILD 72719 2012-06-21 07:09:44Z andrea $ # Maintainer: Sven-Hendrik Haase # Contributor: Ivan Sichmann Freitas pkgname=gluon pkgver=0.71.0 _pkgver=0.71 -pkgrel=3 +pkgrel=4 pkgdesc="A free and open source platform for creating and distributing games" arch=('i686' 'x86_64') url="http://gluon.gamingfreedom.org/" license=('LGPL') -depends=('qt' 'kdebase-runtime' 'libsndfile' 'openal' 'alure' 'attica') +depends=('kdelibs' 'libsndfile' 'alure') makedepends=('cmake' 'automoc4' 'mesa' 'kdevplatform') install=gluon.install -source=("http://download.kde.org/download.php?url=unstable/$pkgname/$_pkgver/src/$pkgname-$pkgver.tar.gz") -md5sums=('e4f284c0ae00e5b8a58cc3e6201857fe') +source=("http://download.kde.org/unstable/$pkgname/$_pkgver/src/$pkgname-$pkgver.tar.gz" + 'gcc47.patch') +md5sums=('e4f284c0ae00e5b8a58cc3e6201857fe' + '92adbf8b23f4af2a15a005b031c81c5f') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir"/$pkgname-$pkgver + patch -p1 -i "$srcdir"/gcc47.patch - [[ -d build ]] && rm -rf build - mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. + cd "$srcdir" + mkdir build + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make } package() { - cd "$srcdir/$pkgname-$pkgver" - - cd build - make DESTDIR="$pkgdir/" install + cd "$srcdir"/build + make DESTDIR="$pkgdir" install } diff --git a/community/gluon/gcc47.patch b/community/gluon/gcc47.patch new file mode 100644 index 000000000..1f2a22306 --- /dev/null +++ b/community/gluon/gcc47.patch @@ -0,0 +1,31 @@ +From: Christoph Feck +Date: Fri, 23 Mar 2012 22:35:09 +0000 +Subject: Fix includes +X-Git-Url: http://quickgit.kde.org/?p=gluon.git&a=commitdiff&h=bccbda88a6bc53ac20091bb6aefd2f1b501ba31a +--- +Fix includes +--- + + +--- a/input/linux/detectlinux.cpp ++++ b/input/linux/detectlinux.cpp +@@ -26,6 +26,7 @@ + + #include + ++#include + // #include + + using namespace GluonInput; + +--- a/input/linux/inputthread.cpp ++++ b/input/linux/inputthread.cpp +@@ -30,6 +30,7 @@ + // #include + + #include ++#include + #include + #include + #include + diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD index 5240c6e87..68b9e87b7 100644 --- a/community/klavaro/PKGBUILD +++ b/community/klavaro/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 63462 2012-02-04 10:23:11Z stativ $ +# $Id: PKGBUILD 72725 2012-06-21 14:59:35Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=klavaro -pkgver=1.9.4 +pkgver=1.9.5 pkgrel=1 pkgdesc="Free touch typing tutor program" arch=('i686' 'x86_64') @@ -11,11 +11,11 @@ depends=('curl' 'gtkdatabox' 'hicolor-icon-theme') makedepends=('intltool') install=$pkgname.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('5f988f7e117958e70a3c4cd621e8a909') +md5sums=('02d20bd9c2237653dd7d4dd87833ecee') build() { cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr + CFLAGS="-lgmodule-2.0" ./configure --prefix=/usr make } diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 4446c8045..c0c3379f1 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72685 2012-06-19 16:24:42Z ttopper $ +# $Id: PKGBUILD 72729 2012-06-21 16:19:43Z ttopper $ # Maintainer: Thorsten Töpper # Contributor: Alois Nespor # Contributor: JerichoKru pkgname=pragha -pkgver=1.1.0 +pkgver=1.1.0.1 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=("https://github.com/downloads/matiasdelellis/pragha/$pkgname-$pkgver.tar.bz2") -sha1sums=('255b3a5ff05f5a59311434184c943fcd4b8bb89a') +sha1sums=('2db115a7f263ea8bcac446590ccc32cae7542c93') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/python-gnutls/PKGBUILD b/community/python-gnutls/PKGBUILD index 992a476ef..44e0d11fc 100644 --- a/community/python-gnutls/PKGBUILD +++ b/community/python-gnutls/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56532 2011-10-07 21:32:13Z spupykin $ +# $Id: PKGBUILD 72721 2012-06-21 11:07:34Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Hugo Doria # Contributor: N3RD3X pkgname=python-gnutls -pkgver=1.2.2 +pkgver=1.2.4 pkgrel=1 pkgdesc="Python wrapper for the GNUTLS library" arch=('i686' 'x86_64') @@ -12,10 +12,9 @@ url="http://cheeseshop.python.org/pypi/python-gnutls" depends=('python2' 'gnutls') license=('LGPL') source=(http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('1ca32b3e2d22ca33a15222191efc04aa') +md5sums=('e3536c421291a791869d875a41dcb26a') build() { cd ${srcdir}/${pkgname}-${pkgver} -# sed -i "s|openpgp_\(privkey_sign_hash\)|\1|g" gnutls/library/functions.py python2 setup.py install --root=${pkgdir} } diff --git a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch new file mode 100644 index 000000000..dda3c48c4 --- /dev/null +++ b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch @@ -0,0 +1,30 @@ +From a47c5838e9f445ab887ad927706b11ccbb181364 Mon Sep 17 00:00:00 2001 +From: David Lamparter +Date: Thu, 21 Jun 2012 09:55:38 +0200 +Subject: [PATCH] isisd: fix typo in topology generator (BZ#731) + +There was a "lsp->" missing before "level" in line 2416. +(introduced by git commit e38e0df) + +Reported-by: Seblu +Signed-off-by: David Lamparter +--- + isisd/isis_lsp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c +index 5c1e993..082e9dc 100644 +--- a/isisd/isis_lsp.c ++++ b/isisd/isis_lsp.c +@@ -2413,7 +2413,7 @@ top_lsp_refresh (struct thread *thread) + isis_dynhn_insert (lsp->lsp_header->lsp_id, lsp->tlv_data.hostname, + IS_LEVEL_1); + +- lsp->lsp_header->lsp_bits = lsp_bits_generate (level, ++ lsp->lsp_header->lsp_bits = lsp_bits_generate (lsp->level, + lsp->area->overload_bit); + rem_lifetime = lsp_rem_lifetime (lsp->area, IS_LEVEL_1); + lsp->lsp_header->rem_lifetime = htons (rem_lifetime); +-- +1.7.11 + diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 0e4ead5f6..68590da61 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 70110 2012-04-29 20:23:17Z seblu $ +# $Id: PKGBUILD 72737 2012-06-21 19:55:00Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga -pkgver=0.99.20.1 +pkgver=0.99.21 pkgrel=1 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') @@ -14,13 +14,16 @@ backup=() install=quagga.install source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" 'quagga.rc' - 'quagga.conf') -md5sums=('270ddd464407f8ce6fa8ada8bc1abbd7' + 'quagga.conf' + '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch') +md5sums=('99840adbe57047c90dfba6b6ed9aec7f' '71d474228a1e02d698cd24e9fd55ca38' - '0c4f2dd13c7dac1b73de923d1d5e4e17') + '0c4f2dd13c7dac1b73de923d1d5e4e17' + 'c80174f7bdd32cd84550d52451e8f495') build() { cd $pkgname-$pkgver + patch -p 1 -i "$srcdir/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch" ./configure --prefix=/usr --sysconfdir=/etc/quagga --localstatedir=/run/quagga \ --enable-exampledir=/usr/share/doc/quagga/examples \ --enable-vtysh \ diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index 830a0f4cf..b6bf77d6d 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150921 2012-02-23 15:44:07Z andyrtr $ +# $Id: PKGBUILD 162129 2012-06-21 16:20:53Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Sergej Pupykin pkgname=man-db -pkgver=2.6.1 +pkgver=2.6.2 pkgrel=1 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64') @@ -18,10 +18,11 @@ conflicts=('man') provides=('man') replaces=('man') install=${pkgname}.install -source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz +source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig} convert-mans man-db.cron.daily) options=('!libtool') -md5sums=('79658e8695c7b9b3be1ee340d78a4692' +md5sums=('647c48d46c464419185d031d04481ee5' + 'a9de1f9bbe620a5a9b9f5da8c58cd96c' '2b7662a7d5b33fe91f9f3e034361a2f6' 'd30c39ae47560304471b5461719e0f03') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 870220505..0ae2005c5 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 160487 2012-06-02 10:26:25Z bluewind $ +# $Id: PKGBUILD 162136 2012-06-22 03:39:00Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.7.5 +pkgver=6.7.7.7 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ - 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') + 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('44b307c97c9bc27f60963306c82e2de5e37dcfb5' +sha1sums=('d45a936b59afa3bc484c0ea1b512f8fc026c14e4' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -23,22 +23,22 @@ build() { patch -p0 -i ../perlmagick.rpath.patch ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ + --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr \ --without-gvc --without-djvu --without-autotrace --without-webp \ - --without-jbig --without-fpx --without-dps --without-fftw --without-lqr + --without-jbig --without-fpx --without-dps --without-fftw make } check() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make check +# make check } package_imagemagick() { pkgdesc="An image viewing/manipulation program" - depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext') + depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') optdepends=('ghostscript: for Ghostscript support' 'openexr: for OpenEXR support' 'libwmf: for WMF support' @@ -54,7 +54,6 @@ package_imagemagick() { 'etc/ImageMagick/mime.xml' 'etc/ImageMagick/policy.xml' 'etc/ImageMagick/quantization-table.xml' - 'etc/ImageMagick/sRGB.icc' 'etc/ImageMagick/thresholds.xml' 'etc/ImageMagick/type.xml' 'etc/ImageMagick/type-dejavu.xml' diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD index e0dfc9d9c..122d74bf2 100644 --- a/libre/python-reportlab-libre/PKGBUILD +++ b/libre/python-reportlab-libre/PKGBUILD @@ -3,16 +3,17 @@ # Contributor: William Rea # Maintainer (Parabola): fauno # Contributor: borgo +# Contributor (Parabola): André Silva pkgname=python-reportlab-libre _origname=reportlab pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc="A proven industry-strength PDF generating solution" arch=('i686' 'x86_64') depends=('python2' 'freetype2' 'ttf-bitstream-vera' 'gsfonts' 'python-imaging') license=('custom') -source=(http://www.reportlab.org/ftp/${_origname}-$pkgver.tar.gz +source=(http://www.reportlab.com/ftp/${_origname}-$pkgver.tar.gz free-fonts.patch) url="http://www.reportlab.org/rl_toolkit.html" md5sums=('cdf8b87a6cf1501de1b0a8d341a217d3' @@ -34,6 +35,6 @@ build() { rm -f reportlab/fonts/Vera* reportlab/fonts/bitstream-vera-license.txt patch -p1 -i $srcdir/free-fonts.patch - python2 setup.py install --root=$pkgdir + python2 setup.py install --root=$pkgdir --optimize=1 install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt } diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD new file mode 100644 index 000000000..3d3ad47bd --- /dev/null +++ b/testing/kdeplasma-applets-networkmanagement/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 105813 2011-01-12 00:25:58Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Jakub Schmidtke + +pkgname=kdeplasma-applets-networkmanagement +epoch=1 +pkgver=0.9.0.3 +pkgrel=1 +pkgdesc="KDE control panel and widget network connections" +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/extragear/base/networkmanagement' +license=('GPL') +depends=('kdebase-workspace' 'networkmanager') +makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info' + 'openconnect') +optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers' + 'openconnect: Cisco AnyConnect compatible VPN client') +install=${pkgname}.install +source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2") +sha256sums=('d8ad2dd89521dbe21e17131ef24bd7d792e90a150e15f0fbdab1bfa4a46e00f7') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../networkmanagement-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install b/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/libusbx/PKGBUILD b/testing/libusbx/PKGBUILD new file mode 100644 index 000000000..e71668459 --- /dev/null +++ b/testing/libusbx/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 162126 2012-06-21 06:54:30Z tpowa $ +# Maintainer: Tobias Powalowski +pkgname=libusbx +pkgver=1.0.12 +pkgrel=1 +depends=('glibc') +pkgdesc="Library that provides generic access to USB device" +arch=(i686 x86_64) +url="http://libusbx.org" +license=('LGPL') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +options=(!libtool) +replaces=('libusb1' 'libusb') +provides=("libusb=$pkgver") +conflicts=("libusb") +md5sums=('c41352ac755c7992edfcbb2ea4ad1349') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} -- cgit v1.2.3-54-g00ecf