diff options
40 files changed, 781 insertions, 119 deletions
diff --git a/community/acpitool/PKGBUILD b/community/acpitool/PKGBUILD index 7fc0ac9d3..6302b6098 100644 --- a/community/acpitool/PKGBUILD +++ b/community/acpitool/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 54004 2011-08-11 17:55:53Z spupykin $ +# $Id: PKGBUILD 58302 2011-11-10 17:58:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> # Contributor: Milosz Piglas <archeofuture@gmail.com> pkgname=acpitool pkgver=0.5.1 -pkgrel=3 +pkgrel=5 pkgdesc="ACPI client - replacement for apm tool" url="http://sourceforge.net/projects/acpitool/" arch=('i686' 'x86_64') license=('GPL') depends=('gcc-libs') source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2 - linux-3.0.patch) + linux-3.0.patch + sysfs-battery.patch) md5sums=('9e4ec55201be0be71ffbc56d38b42b57' - 'eb149edb32be6cdf20a7d16beb3e9f70') + 'eb149edb32be6cdf20a7d16beb3e9f70' + '969fc4929cc215756db27168646c2b7a') build() { cd "$srcdir/$pkgname-$pkgver" patch -p1 <$srcdir/linux-3.0.patch + patch -p1 <$srcdir/sysfs-battery.patch ./configure --prefix=/usr make } diff --git a/community/acpitool/sysfs-battery.patch b/community/acpitool/sysfs-battery.patch new file mode 100644 index 000000000..4f6898a78 --- /dev/null +++ b/community/acpitool/sysfs-battery.patch @@ -0,0 +1,52 @@ +diff -wbBur acpitool-0.5.1/src/acpitool.h acpitool-0.5.1.my/src/acpitool.h +--- acpitool-0.5.1/src/acpitool.h 2008-10-16 19:38:12.000000000 +0400 ++++ acpitool-0.5.1.my/src/acpitool.h 2011-11-10 21:55:23.000000000 +0400 +@@ -29,11 +29,11 @@ + + struct Battery_Info { + int Battery_Present; +- char Charging_State[12]; +- char Remaining_Cap[10]; +- char Design_Cap[10]; +- char LastFull_Cap[10]; +- char Present_Rate[10]; ++ char Charging_State[13]; ++ char Remaining_Cap[13]; ++ char Design_Cap[13]; ++ char LastFull_Cap[13]; ++ char Present_Rate[13]; + char Technology[13]; + char Model[13]; + char Serial[13]; +diff -wbBur acpitool-0.5.1/src/battery.cpp acpitool-0.5.1.my/src/battery.cpp +--- acpitool-0.5.1/src/battery.cpp 2009-08-13 23:42:43.000000000 +0400 ++++ acpitool-0.5.1.my/src/battery.cpp 2011-11-10 21:48:22.000000000 +0400 +@@ -614,7 +614,7 @@ + } + + memset(str, '\0', 100); +- for(int t=0; t<5; t++) ++ for(int t=0; t<1; t++) + fgets(str, 100, power_fp); /* skip first 5 lines */ + + /* get battery status (full, charging, ...) */ +@@ -664,8 +664,8 @@ + + + +- fgets(str, 100, power_fp); /* skip 1 line */ +- ++ fgets(str, 100, power_fp); /* cycle count - skip 1 line */ ++ fgets(str, 100, power_fp); /* voltage_min - skip 1 line */ + + /* get voltage_now */ + memset(str, '\0', 100); +@@ -756,7 +756,7 @@ + else + strncpy(batt_info->Model, "unknown", 7); + +- fgets(str, 100, power_fp); ++ fgets(str, 100, power_fp); /* manufacturer - skip 1 line */ + + /* get serial */ + memset(str, '\0', 100); diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index 38164439b..b812f13dc 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -2,9 +2,9 @@ # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=ginac -pkgver=1.6.1 -pkgrel=2 -pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.' +pkgver=1.6.2 +pkgrel=1 +pkgdesc='A library designed to allow the creation of integrated systems that embed symbolic manipulations.' arch=('i686' 'x86_64') url='http://www.ginac.de' license=('GPL') @@ -12,7 +12,7 @@ depends=('cln') makedepends=('transfig' 'doxygen' 'texlive-bin') options=('!libtool') source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2") -md5sums=('d383f3ee50f88ffa1b3966fdb11d0f12') +md5sums=('4cfdd286ab0c32981ec1c9c779e87eb9') build() { cd ginac-${pkgver} diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index 459f288bd..401074d56 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,37 +1,44 @@ +# $Id: PKGBUILD 58293 2011-11-10 12:03:04Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=tar pkgname=haskell-tar pkgver=0.3.1.0 -pkgrel=4.2 +pkgrel=5 pkgdesc="Reading, writing and manipulating \".tar\" archive files." url="http://hackage.haskell.org/package/tar" license=('custom:BSD3') -arch=('i686' 'x86_64') +arch=('x86_64' 'i686') depends=('ghc=7.0.3-2' sh) options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") +install=haskell-tar.install md5sums=('10b54856495f9ef0a42aa270085c7d5e') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd "$srcdir/tar-$pkgver" + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$srcdir/tar-$pkgver" + + install -Dm 744 register.sh \ + "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m 744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/tar" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } +# vim:set ts=2 sw=2 et: diff --git a/community/haskell-tar/haskell-tar.install b/community/haskell-tar/haskell-tar.install index e8c2f6293..7e0383621 100644 --- a/community/haskell-tar/haskell-tar.install +++ b/community/haskell-tar/haskell-tar.install @@ -1,18 +1,24 @@ HS_DIR=usr/share/haskell/haskell-tar + post_install() { ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + post_remove } + pre_upgrade() { ${HS_DIR}/unregister.sh } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + post_install } + pre_remove() { - ${HS_DIR}/unregister.sh + pre_upgrade } + post_remove() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +# vim:set ts=2 sw=2 et: diff --git a/community/raw-thumbnailer/PKGBUILD b/community/raw-thumbnailer/PKGBUILD index e6d85babd..09aba9d1b 100644 --- a/community/raw-thumbnailer/PKGBUILD +++ b/community/raw-thumbnailer/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 22594 2010-07-23 08:17:42Z lcarlier $ -# Maintainer: pressh <pressh at gmail dot com> +# $Id: PKGBUILD 58310 2011-11-10 20:50:33Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com pkgname=raw-thumbnailer -pkgver=0.2 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="A lightweight and fast raw image thumbnailer that can be used by file managers." url="http://code.google.com/p/raw-thumbnailer/" license=('GPL2') arch=('i686' 'x86_64') depends=('libopenraw') source=(http://raw-thumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('f107575aa32a0d53802cf5beead18bf8') +sha1sums=('f34012062c0b1eaa10525722c36bd027b11ade2e') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index bc08d2ef9..78b42754c 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool') install=simple-scan.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('175a852f132f85e861ded99d546137fb4299ad9ce2836eaac9d645fbfcbefbac') +sha256sums=('10fba94b60cd5159d54d3491f228ac9fe83ac0ab02b983d7cd8390aa26cf2ecc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index e0b22e2e4..51267430a 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 54970 2011-08-29 09:48:35Z spupykin $ +# $Id: PKGBUILD 58295 2011-11-10 13:02:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd -pkgver=3.2.8.1 -pkgrel=8 +pkgver=3.2.9 +pkgrel=1 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64') url="http://unrealircd.com" license=('GPL2') -depends=(openssl curl) -conflicts=(ircd) -provides=(ircd) +depends=('openssl' 'curl') +makedepends=('c-ares') +conflicts=('ircd') +provides=('ircd') backup=(etc/unrealircd/unrealircd.conf) source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.rc arch-fixes.patch) -md5sums=('7b741e94e867c0a7370553fd01506c66' +md5sums=('bde023695347969f545ce5f2a9ac9aed' '0d728240132a97a2cef61be9558750b1' '77807313c4578f2c30286b9f9e3fb21c') @@ -37,7 +38,8 @@ build() { --enable-dynamic-linking \ --enable-ziplinks \ --enable-ssl \ - --enable-libcurl=/usr + --enable-libcurl=/usr \ + --with-system-cares make make IRCDDIR=$pkgdir/etc/unrealircd BINDIR=$pkgdir/usr/bin install diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index e12295d43..1016c2578 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138192 2011-09-18 13:23:24Z bisson $ +# $Id: PKGBUILD 142478 2011-11-10 14:19:09Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,7 +7,7 @@ pkgname=bitlbee pkgver=3.0.3 -pkgrel=4 +pkgrel=5 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64') url='http://www.bitlbee.org/' @@ -15,9 +15,11 @@ license=('GPL') depends=('openssl' 'glib2' 'libotr') optdepends=('xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" + 'msn.patch' 'xinetd' 'rc.d') sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff' + 'e5880344ff96e6f061d850e7207f5f0bb31fb82b' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' 'be09d29af3853825778331df451f16ca9e452d03') @@ -26,6 +28,8 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../msn.patch ./configure --prefix=/usr \ --etcdir=/etc/bitlbee \ diff --git a/extra/bitlbee/msn.patch b/extra/bitlbee/msn.patch new file mode 100644 index 000000000..e126784bf --- /dev/null +++ b/extra/bitlbee/msn.patch @@ -0,0 +1,29 @@ +--- bitlbee-3.0.3.old/protocols/msn/soap.h 2011-06-12 08:53:51.000000000 -0300 ++++ bitlbee-3.0.3/protocols/msn/soap.h 2011-11-09 21:35:56.000000000 -0200 +@@ -115,7 +115,7 @@ int msn_soapq_flush( struct im_connectio + "<wst:RequestType>http://schemas.xmlsoap.org/ws/2004/04/security/trust/Issue</wst:RequestType>" \ + "<wsp:AppliesTo>" \ + "<wsa:EndpointReference>" \ +- "<wsa:Address>contacts.msn.com</wsa:Address>" \ ++ "<wsa:Address>local-bay.contacts.msn.com</wsa:Address>" \ + "</wsa:EndpointReference>" \ + "</wsp:AppliesTo>" \ + "<wsse:PolicyReference xmlns=\"http://schemas.xmlsoap.org/ws/2003/06/secext\" URI=\"MBI\"></wsse:PolicyReference>" \ +@@ -198,7 +198,7 @@ int msn_soap_oim_send_queue( struct im_c + "</soap:Body>" \ + "</soap:Envelope>" + +-#define SOAP_MEMLIST_URL "http://contacts.msn.com/abservice/SharingService.asmx" ++#define SOAP_MEMLIST_URL "http://local-bay.contacts.msn.com/abservice/SharingService.asmx" + #define SOAP_MEMLIST_ACTION "http://www.msn.com/webservices/AddressBook/FindMembership" + + #define SOAP_MEMLIST_PAYLOAD \ +@@ -233,7 +233,7 @@ int msn_soap_memlist_request( struct im_ + int msn_soap_memlist_edit( struct im_connection *ic, const char *handle, gboolean add, int list ); + + +-#define SOAP_ADDRESSBOOK_URL "http://contacts.msn.com/abservice/abservice.asmx" ++#define SOAP_ADDRESSBOOK_URL "http://local-bay.contacts.msn.com/abservice/abservice.asmx" + #define SOAP_ADDRESSBOOK_ACTION "http://www.msn.com/webservices/AddressBook/ABFindAll" + + #define SOAP_ADDRESSBOOK_PAYLOAD \ diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index f88924eea..6665c8603 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 139601 2011-10-03 17:47:38Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142485 2011-11-10 18:57:46Z ronald $ +# Maintainer: Andrea Scarpino <ronald@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.2.0 -pkgrel=1 +pkgver=2.3.0 +pkgrel=2 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('be6100de4961a8cb99a8d9d1688a0460') +sha1sums=('15b8b16d7cce6ac50fb958d30166214f2f2b83ee') build() { cd "${srcdir}" @@ -43,6 +44,10 @@ package_digikam() { make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/po make DESTDIR="${pkgdir}" install + + # these are in oxygen-icons + rm -rf ${pkgdir}/usr/share/icons + } package_libkface() { @@ -80,7 +85,7 @@ package_libmediawiki() { package_kipi-plugins() { pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'qjson' 'libkvkontakte') + 'opencv' 'qjson' 'libkvkontakte' 'libkexiv2') optdepends=('libkgeomap' 'libmediawiki' 'libgpod' diff --git a/extra/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD new file mode 100644 index 000000000..bb5c2d2b5 --- /dev/null +++ b/extra/fprintd/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 142462 2011-11-10 09:32:21Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Nikolay Rysev <mad.f3ka@gmail.com> + +pkgname=fprintd +pkgver=0.4.1 +pkgrel=3 +pkgdesc="D-Bus service to access fingerprint readers" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/fprint/fprintd" +license=(GPL) +depends=(libfprint dbus-glib polkit) +makedepends=(intltool gtk-doc) +groups=(fprint) +options=(!libtool) +_snap=V_${pkgver//./_} +source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2) +md5sums=('58fcac035c181dce8f49c374181aa2ae') + +build() { + cd "$srcdir/$_snap" + ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --disable-static + make +} + +package() { + cd "$srcdir/$_snap" + make DESTDIR="$pkgdir" pammoddir="/lib/security" install +} diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD new file mode 100644 index 000000000..e86ec45dc --- /dev/null +++ b/extra/libfprint/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 142461 2011-11-10 09:30:27Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Thomas Baechler <thomas@archlinux.org> + +pkgname=libfprint +pkgver=0.4.0 +pkgrel=1 +pkgdesc="Library for fingerprint readers" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/fprint/libfprint" +license=(LGPL) +depends=(libusb nss gdk-pixbuf2) +groups=(fprint) +options=(!libtool !emptydirs) +_snap=$pkgname-48ec64f68330452b011d14be67653f1d48fb1405 +source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2) +md5sums=('858a0f0d7abd21ac494f9bec904dc156') + +build() { + cd "$srcdir/$_snap" + ./autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static \ + --disable-examples-build --disable-x11-examples-build + make +} + +package() { + cd "$srcdir/$_snap" + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir/lib/udev/rules.d" + mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/" +} diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 6277b3d20..3908113b7 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141252 2011-10-27 12:55:01Z juergen $ +# $Id: PKGBUILD 142503 2011-11-10 20:08:23Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.24.0 -pkgrel=7 +pkgver=5.25.1 +pkgrel=1 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') @@ -17,7 +17,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('13586c1221bb5f36067a4cce1e6d5fb31e44e41c' +sha1sums=('9c9ea66434c9ca96549092c3640c3ba5a4fba44b' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 6f04d328a..7eadae184 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142440 2011-11-09 20:39:02Z dan $ +# $Id: PKGBUILD 142481 2011-11-10 15:13:21Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=1 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64) @@ -16,7 +16,7 @@ source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz memcached.conf memcached.sh) changelog=ChangeLog -sha256sums=('854a5fa6dfde478d1bb440498e378bd073f303d51bb82c611001eecdec9b4a79' +sha256sums=('2cc3de341b561464da29fc5d5e2a4facc0f6aafc151f0e1d94228705e0758fdf' '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a' '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb') diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 358af059c..3a719ec0e 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141897 2011-11-02 20:59:04Z ibiru $ +# $Id: PKGBUILD 142489 2011-11-10 19:42:01Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,8 +6,8 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.1.95 -pkgrel=2 +pkgver=0.9.2.0 +pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64') license=('GPL') @@ -15,10 +15,10 @@ url="http://www.gnome.org/projects/NetworkManager/" depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf' 'iso-codes') makedepends=('intltool' 'gnome-bluetooth') optdepends=('gnome-bluetooth: for PAN/DUN support') -options=('!libtool') +options=('!libtool' '!emptydirs') install=network-manager-applet.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('6a0e1f72b5c9ad040451263f9b8723ac6a8dfb59772d8c8258cafc0d2b2390fc') +sha256sums=('ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index 1ab5f76a9..9a18dddc4 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141466 2011-10-30 15:23:37Z ibiru $ +# $Id: PKGBUILD 142493 2011-11-10 19:42:06Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('3e48b04a5cfffb3c83bb7b1df77cb015b58e8335c975596a916c7caf1bb87102') +sha256sums=('169094ae93f982a45e4c57fa7226637eb948ae309a2a6ece88e179ce798a86c0') build() { cd "${srcdir}/NetworkManager-openconnect-${pkgver}" diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index f19622319..96053ed65 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141468 2011-10-30 15:23:39Z ibiru $ +# $Id: PKGBUILD 142495 2011-11-10 19:42:11Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('2c988bfcfe8bc011a26cd2e7f58ea528ef6d923d4af74d5c7633dd26d1bb792f') +sha256sums=('a23705a0ece4d9c5438ca7c3905abc25a43aaf3a49cabb9ef21d043c338a2744') build() { cd "${srcdir}/NetworkManager-openvpn-${pkgver}" diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index 15eec8c67..9e79dccf1 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141470 2011-10-30 15:23:41Z ibiru $ +# $Id: PKGBUILD 142497 2011-11-10 19:42:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) -sha256sums=('83d432e24f2a6a011068d725591f7a95175a5e68b5b1af398f67db657659ca10') +sha256sums=('2b340db7f63d39aa781099b888d4e3352e8eaa14ec4d46154bf504262fda42ba') build() { cd "${srcdir}/NetworkManager-pptp-${pkgver}" diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index 903e74947..e69ef38ef 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141472 2011-10-30 15:23:43Z ibiru $ +# $Id: PKGBUILD 142499 2011-11-10 19:42:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('92f8d701eef988b68462fd36f8fed0f974aee0b2f1c651d188b5ed67b701ea69') +sha256sums=('d74bda9df11f4d3f0589d08c7f6247dc884de6daa1bab8d9c33636bc09752e40') build() { cd "${srcdir}/NetworkManager-vpnc-${pkgver}" diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index eaeb11572..4dd030d1d 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141464 2011-10-30 15:23:34Z ibiru $ +# $Id: PKGBUILD 142491 2011-11-10 19:42:04Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -6,7 +6,7 @@ # Contributor: Valentine Sinitsyn <e_val@inbox.ru> pkgname=networkmanager -pkgver=0.9.1.95 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') @@ -18,13 +18,14 @@ optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' 'iptables: Connection sharing' 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support') + 'bluez: Bluetooth support' + 'openresolv: openresolv support') options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz NetworkManager.conf disable_set_hostname.patch) -sha256sums=('4702c25324fc6c0e860a9be9860b898ce444333d084b0d5b86b069bbd5fee468' +sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') @@ -44,6 +45,7 @@ build() { --with-dhcpcd=/sbin/dhcpcd \ --with-iptables=/usr/sbin/iptables \ --with-systemdsystemunitdir=/lib/systemd/system \ + --with-resolvconf=/usr/sbin/resolvconf \ --disable-static \ --enable-more-warnings=no \ --disable-wimax diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 3bccb3bec..25103ab3b 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141249 2011-10-27 10:32:50Z ronald $ +# $Id: PKGBUILD 142507 2011-11-10 20:30:04Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r -pkgver=2.13.2 +pkgver=2.14.0 pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64') @@ -20,9 +20,10 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" 'r.desktop' 'r.png') install=r.install -sha1sums=('3c8e3055b2d76cf79627325af8846848ca9a7e90' +sha1sums=('0f46bf75a7c150350b1142c29a98e7994d2b4bef' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978') + build() { cd ${srcdir}/R-${pkgver} sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD index 49c5e4a33..c7fbd8446 100644 --- a/extra/rest/PKGBUILD +++ b/extra/rest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141264 2011-10-27 16:23:45Z ibiru $ +# $Id: PKGBUILD 142505 2011-11-10 20:16:20Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=rest -pkgver=0.7.11 +pkgver=0.7.12 pkgrel=1 pkgdesc="A helper library for RESTful services." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glib2' 'libxml2' 'libsoup-gnome') makedepends=('gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('3a57a56433761c87ccdbfe6d57119361dc004286356c12815dc7a22b7b315490') +sha256sums=('16ffa4929078dabfcfac31f9ce942072ebab67e3339ce9f378127457b03baf3a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index 4837acf97..d32a60fc4 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131054 2011-07-09 22:10:28Z ronald $ +# $Id: PKGBUILD 142487 2011-11-10 19:40:07Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=stellarium -pkgver=0.11.0 +pkgver=0.11.1 pkgrel=1 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64") @@ -14,7 +14,7 @@ makedepends=('cmake' 'boost') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) -sha1sums=('e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e' +sha1sums=('e721a9cef0c736354c477fdb25cce607a9a3b52e' 'c9cc79212542238227b5bd6af99f60fe056f4ab2' 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') @@ -36,6 +36,3 @@ package() { install -Dm644 ${srcdir}/stellarium.png \ ${pkgdir}/usr/share/pixmaps/stellarium.png } -sha1sums=('e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e' - 'c9cc79212542238227b5bd6af99f60fe056f4ab2' - 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index fb41750cf..eda488048 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -3,12 +3,12 @@ # Maintainer (Parabola): xihh pkgname=ghostscript-libre -pkgver=9.02 -pkgrel=2 +pkgver=9.04 +pkgrel=5 pkgdesc="An interpreter for the PostScript language without non-free files" arch=('i686' 'x86_64') license=('GPL3') #non free files removed -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community? makedepends=('gtk2' 'gnutls') optdepends=('texlive-core: needed for dvipdf' 'gtk2: needed for gsx') @@ -16,17 +16,18 @@ conflicts=('ghostscript') replaces=('ghostscript-lrpng' 'ghostscript') provides=('ghostscript-lprng' "ghostscript=$pkgver") url="http://www.ghostscript.com/" -source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz + ghostscript-cups-rgbw.patch) options=('!libtool' '!makeflags') -md5sums=('f67151444bd56a7904579fc75a083dd6') build() { cd ${srcdir}/ghostscript-${pkgver} + + # fix broken color printing https://bugs.archlinux.org/task/25519 + patch -Np1 -i ${srcdir}/ghostscript-cups-rgbw.patch # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat tiff - # delete non-free packages - grep -l "are not altered" Resource/CMap/* | xargs rm -fv + rm -rf jpeg libpng zlib jasper expat tiff freetype lcms ./configure --prefix=/usr \ --enable-dynamic \ @@ -36,7 +37,11 @@ build() { --with-x \ --with-drivers=ALL\ --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --disable-compile-inits # needed for linking with system-zlib + --with-install-cups \ + --enable-fontconfig \ + --enable-freetype \ + --without-luratech \ + --disable-compile-inits #--help # needed for linking with system-zlib make # Build IJS @@ -65,3 +70,5 @@ package() { cd ${srcdir}/ghostscript-${pkgver}/ijs make DESTDIR=${pkgdir} install } +md5sums=('ac8f77c94a6b5d5f0170c2e6db38c6bb' + 'fd89baafac6589dc93ba71a48c2ba9b4') diff --git a/libre/ghostscript-libre/SRCBUILD b/libre/ghostscript-libre/SRCBUILD new file mode 100644 index 000000000..dc28e857e --- /dev/null +++ b/libre/ghostscript-libre/SRCBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer (Parabola): xihh + +pkgname=ghostscript-libre +pkgver=9.04 +pkgrel=5 +pkgdesc="An interpreter for the PostScript language without non-free files" +arch=('any') +license=('GPL3') #non free files removed +url="http://www.ghostscript.com/" +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) +md5sums=('9f6899e821ab6d78ab2c856f10fa3023') +options=(!strip !docs !libtool !emptydirs !zipman !purge) + +build() { + cd ${srcdir}/ghostscript-${pkgver} + + export PKGEXT=.src.tar.xz + + # delete non-free packages + grep -l "are not altered" Resource/CMap/* | xargs rm -fv +} + +package() { + cd ${srcdir} + export PKGEXT=.src.tar.xz + export PKGDEST=${startdir} + + mv ghostscript-${pkgver} ${pkgdir}/ + +} diff --git a/libre/ghostscript-libre/ghostscript-cups-rgbw.patch b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch new file mode 100644 index 000000000..00f99c844 --- /dev/null +++ b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch @@ -0,0 +1,264 @@ +diff -up ghostscript-9.04/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcups.c +--- ghostscript-9.04/cups/gdevcups.c.cups-rgbw 2011-08-05 12:12:21.000000000 +0100 ++++ ghostscript-9.04/cups/gdevcups.c 2011-08-22 10:54:24.614010581 +0100 +@@ -225,6 +225,7 @@ typedef struct gx_device_cups_s + unsigned short EncodeLUT[gx_max_color_value + 1];/* RGB value to output color LUT */ + int Density[CUPS_MAX_VALUE + 1];/* Density LUT */ + int Matrix[3][3][CUPS_MAX_VALUE + 1];/* Color transform matrix LUT */ ++ int user_icc; + int cupsRasterVersion; + + /* Used by cups_put_params(): */ +@@ -426,6 +427,7 @@ gx_device_cups gs_cups_device = + {0x00}, /* EncodeLUT */ + {0x00}, /* Density */ + {0x00}, /* Matrix */ ++ 0, + 3 /* cupsRasterVersion */ + }; + +@@ -1182,15 +1184,18 @@ cups_map_cmyk(gx_device *pdev, /* I - D + + case CUPS_CSPACE_RGB : + case CUPS_CSPACE_RGBW : ++ c0 = c + k; ++ c1 = m + k; ++ c2 = y + k; + if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) { +- c0 = c; +- c1 = m; +- c2 = y; +- c3 = k; +- } else { +- c0 = c + k; +- c1 = m + k; +- c2 = y + k; ++ if ((k >= frac_1 - 1) || ++ ((c0 >= frac_1) && (c1 >= frac_1) && (c2 >= frac_1))) { ++ c0 = frac_1; ++ c1 = frac_1; ++ c2 = frac_1; ++ c3 = frac_1; ++ } else ++ c3 = 0; + } + + if (c0 < 0) +@@ -1212,11 +1217,12 @@ cups_map_cmyk(gx_device *pdev, /* I - D + out[2] = frac_1 - (frac)cups->Density[c2]; + + if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) { +- if (c3 < 0) +- c3 = 0; +- else if (c3 > frac_1) +- c3 = frac_1; +- out[3] = frac_1 - (frac)cups->Density[c3]; ++ if (c3 == 0) ++ out[3] = frac_1; ++ else if (c3 == frac_1) ++ out[3] = 0; ++ else ++ out[3] = frac_1; + } + break; + +@@ -2034,10 +2040,15 @@ cups_map_color_rgb(gx_device *pdev, + * cups->DecodeLUT actually maps to RGBW, not CMYK... + */ + +- k = cups->DecodeLUT[c3]; +- c = cups->DecodeLUT[c0] + k - gx_max_color_value; +- m = cups->DecodeLUT[c1] + k - gx_max_color_value; +- y = cups->DecodeLUT[c2] + k - gx_max_color_value; ++ if (c3 == 0) { ++ c = 0; ++ m = 0; ++ y = 0; ++ } else { ++ c = cups->DecodeLUT[c0]; ++ m = cups->DecodeLUT[c1]; ++ y = cups->DecodeLUT[c2]; ++ } + + if (c > gx_max_color_value) + prgb[0] = gx_max_color_value; +@@ -2282,20 +2293,20 @@ cups_map_rgb_color(gx_device *pdev, + switch (cups->header.cupsBitsPerColor) + { + default : +- i = 0x0e; ++ i = 0x00; + break; + case 2 : +- i = 0xfc; ++ i = 0x00; + break; + case 4 : +- i = 0xfff0; ++ i = 0x0000; + break; + case 8 : +- i = 0xffffff00; ++ i = 0x00000000; + break; + #ifdef GX_COLOR_INDEX_TYPE + case 16 : +- i = 0xffffffffffff0000; ++ i = 0x0000000000000000; + break; + #endif /* GX_COLOR_INDEX_TYPE */ + } +@@ -2929,7 +2940,10 @@ cups_put_params(gx_device *pdev, /* + int xflip = 0, + yflip = 0; + int found = 0; +- ++ gs_param_string icc_pro_dummy; ++ int old_cmps = cups->color_info.num_components; ++ int old_depth = cups->color_info.depth; ++ + #ifdef DEBUG + dprintf2("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist); + #endif /* DEBUG */ +@@ -3024,6 +3038,11 @@ cups_put_params(gx_device *pdev, /* + margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0; + color_set = param_read_int(plist, "cupsColorSpace", &intval) == 0 || + param_read_int(plist, "cupsBitsPerColor", &intval) == 0; ++ ++ if (!cups->user_icc) { ++ cups->user_icc = param_read_string(plist, "OutputICCProfile", &icc_pro_dummy) == 0; ++ } ++ + /* We set the old dimensions to 1 if we have a color depth change, so + that memory reallocation gets forced. This is perhaps not the correct + approach to prevent crashes like in bug 690435. We keep it for the +@@ -3134,12 +3153,20 @@ cups_put_params(gx_device *pdev, /* + if ((code = gdev_prn_put_params(pdev, plist)) < 0) + return (code); + ++ /* If cups_set_color_info() changed the color model of the device we want to ++ * force the raster memory to be recreated/reinitialized ++ */ ++ if (cups->color_info.num_components != old_cmps || cups->color_info.depth != old_depth) { ++ width_old = 0; ++ height_old = 0; ++ } ++ else { + /* pdev->width/height may have been changed by the call to + * gdev_prn_put_params() + */ +- width_old = pdev->width; +- height_old = pdev->height; +- ++ width_old = pdev->width; ++ height_old = pdev->height; ++ } + /* + * Update margins/sizes as needed... + */ +@@ -4044,22 +4071,88 @@ cups_set_color_info(gx_device *pdev) /* + for (k = 0; k <= CUPS_MAX_VALUE; k ++) + cups->Density[k] = k; + } +- /* Set up the ICC profile for ghostscript to use based upon the color space. +- This is different than the PPD profile above which appears to be some sort +- of matrix based TRC profile */ +- switch (cups->header.cupsColorSpace) { +- /* Use RGB profile for this */ +- case CUPS_CSPACE_RGBW: +- if (pdev->icc_struct == NULL) { +- pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); +- } +- if (pdev->icc_struct->device_profile[gsDEFAULTPROFILE] == NULL) { +- code = gsicc_set_device_profile(pdev, pdev->memory, +- DEFAULT_RGB_ICC, gsDEFAULTPROFILE); +- } +- break; +- default: +- break; ++ if (!cups->user_icc) { ++ /* Set up the ICC profile for ghostscript to use based upon the color space. ++ This is different than the PPD profile above which appears to be some sort ++ of matrix based TRC profile */ ++ switch (cups->header.cupsColorSpace) ++ { ++ default : ++ case CUPS_CSPACE_RGBW : ++ case CUPS_CSPACE_RGB : ++ case CUPS_CSPACE_RGBA : ++ case CUPS_CSPACE_CMY : ++ case CUPS_CSPACE_YMC : ++# ifdef CUPS_RASTER_HAVE_COLORIMETRIC ++ case CUPS_CSPACE_CIELab : ++ case CUPS_CSPACE_ICC1 : ++ case CUPS_CSPACE_ICC2 : ++ case CUPS_CSPACE_ICC3 : ++ case CUPS_CSPACE_ICC4 : ++ case CUPS_CSPACE_ICC5 : ++ case CUPS_CSPACE_ICC6 : ++ case CUPS_CSPACE_ICC7 : ++ case CUPS_CSPACE_ICC8 : ++ case CUPS_CSPACE_ICC9 : ++ case CUPS_CSPACE_ICCA : ++ case CUPS_CSPACE_ICCB : ++ case CUPS_CSPACE_ICCC : ++ case CUPS_CSPACE_ICCD : ++ case CUPS_CSPACE_ICCE : ++ case CUPS_CSPACE_ICCF : ++# endif /* CUPS_RASTER_HAVE_COLORIMETRIC */ ++ if (!pdev->icc_struct || (pdev->icc_struct && ++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsRGB)) { ++ ++ if (pdev->icc_struct) { ++ rc_decrement(pdev->icc_struct, "cups_set_color_info"); ++ } ++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); ++ ++ code = gsicc_set_device_profile(pdev, pdev->memory, ++ (char *)DEFAULT_RGB_ICC, gsDEFAULTPROFILE); ++ } ++ break; ++ ++ case CUPS_CSPACE_W : ++ case CUPS_CSPACE_WHITE : ++ case CUPS_CSPACE_K : ++ case CUPS_CSPACE_GOLD : ++ case CUPS_CSPACE_SILVER : ++ if (!pdev->icc_struct || (pdev->icc_struct && ++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsGRAY)) { ++ ++ if (pdev->icc_struct) { ++ rc_decrement(pdev->icc_struct, "cups_set_color_info"); ++ } ++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); ++ ++ code = gsicc_set_device_profile(pdev, pdev->memory->non_gc_memory, ++ (char *)DEFAULT_GRAY_ICC, gsDEFAULTPROFILE); ++ } ++ break; ++ case CUPS_CSPACE_KCMYcm : ++# ifdef CUPS_RASTER_HAVE_COLORIMETRIC ++ case CUPS_CSPACE_CIEXYZ : ++#endif ++ case CUPS_CSPACE_CMYK : ++ case CUPS_CSPACE_YMCK : ++ case CUPS_CSPACE_KCMY : ++ case CUPS_CSPACE_GMCK : ++ case CUPS_CSPACE_GMCS : ++ if (!pdev->icc_struct || (pdev->icc_struct && ++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsCMYK)) { ++ ++ if (pdev->icc_struct) { ++ rc_decrement(pdev->icc_struct, "cups_set_color_info"); ++ } ++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); ++ ++ code = gsicc_set_device_profile(pdev, pdev->memory, ++ (char *)DEFAULT_CMYK_ICC, gsDEFAULTPROFILE); ++ } ++ break; ++ } + } + } + + diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index b43796397..10ffbf6a5 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -9,11 +9,11 @@ pkgrel=3 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64') -depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib') +depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18' 'libsigsegv' 'zziplib') makedepends=('perl' 'clisp' 'ffcall' 'pkg-config') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') -conflicts=('pdfjam' 'texlive-bin') +conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.19') replaces=('texlive-bin') options=('!libtool') url='http://tug.org/texlive/' @@ -22,10 +22,10 @@ source=('texmf.cnf' 'fix-fontforge-encoding.patch' '09-texlive-fonts.conf' 'archlinux-build.patch' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz' - 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz' + 'ftp://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz' + 'ftp://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz' # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2" - 'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' + 'ftp://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' ) backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/chktex/chktexrc \ diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD index 72c1a8186..d91909319 100644 --- a/social/tinc/PKGBUILD +++ b/social/tinc/PKGBUILD @@ -1,17 +1,14 @@ pkgname=tinc pkgver=1.0.16 -pkgrel=1 +pkgrel=2 pkgdesc="VPN (Virtual Private Network) daemon" -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url="http://www.tinc-vpn.org/" license=('GPL') depends=('lzo2' 'zlib' 'openssl') source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz tincd.conf tincd.rcd) -md5sums=('f1c7ed94878725fb2cf4efb02bf160da' - '9b40646cd898709e90ae3c32baecb075' - '75516d05803ee6c6b22516e10129ad99') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,5 +25,8 @@ package() { install -d $pkgdir/etc/{tinc,rc.d,conf.d} install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd - install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd + install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd.conf } +md5sums=('f1c7ed94878725fb2cf4efb02bf160da' + 'b1b0c4a37c007aa8703128269ea9a3e8' + '89a91a80c1dee4b365958bd9e6242d5a') diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf index 84547936c..3b8a867be 100644 --- a/social/tinc/tincd.conf +++ b/social/tinc/tincd.conf @@ -1 +1,2 @@ NETNAME=yournetname +OPTIONS="-R -U nobody" diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd index f0a456e17..d790ef86f 100644 --- a/social/tinc/tincd.rcd +++ b/social/tinc/tincd.rcd @@ -13,6 +13,7 @@ case "$1" in stat_busy "Starting ${daemon_name}" [ -z "$PID" ] && \ /usr/sbin/tincd -n ${NETNAME} \ + ${OPTIONS} \ --pidfile=/var/run/tinc.${NETNAME} &> /dev/null if [ $? -gt 0 ]; then diff --git a/staging/koffice/PKGBUILD b/staging/koffice/PKGBUILD index 8a01a346e..04ee16493 100644 --- a/staging/koffice/PKGBUILD +++ b/staging/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142363 2011-11-08 21:20:27Z ronald $ +# $Id: PKGBUILD 142476 2011-11-10 12:11:05Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > diff --git a/testing/dhcpcd/PKGBUILD b/testing/dhcpcd/PKGBUILD index 11da0f20b..04e12bff5 100644 --- a/testing/dhcpcd/PKGBUILD +++ b/testing/dhcpcd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142367 2011-11-08 21:52:38Z ronald $ +# $Id: PKGBUILD 142451 2011-11-10 07:06:35Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD new file mode 100644 index 000000000..57aecb648 --- /dev/null +++ b/testing/gtk2/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 142501 2011-11-10 19:53:45Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gtk2 +pkgname=('gtk2' 'gtk-update-icon-cache') +pkgver=2.24.8 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' + 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') +options=('!libtool' '!docs') +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz + xid-collision-debug.patch) +sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + +build() { + cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-xinput=yes + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package_gtk2() { + pkgdesc="GTK+ is a multi-platform toolkit (v2)" + install=gtk2.install + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + backup=(etc/gtk-2.0/gtkrc) + + cd "${srcdir}/gtk+-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert + echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" + #split this out to use with gtk3 too + rm ${pkgdir}/usr/bin/gtk-update-icon-cache +} +package_gtk-update-icon-cache() { + pkgdesc="The GTK+ update icon cache tool" + depends=('gdk-pixbuf2') + + cd "${srcdir}/gtk+-${pkgver}/gtk" + + install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache +} diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install new file mode 100644 index 000000000..4e2b72f1b --- /dev/null +++ b/testing/gtk2/gtk2.install @@ -0,0 +1,16 @@ +post_install() { + usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f etc/gtk-2.0/gtk.immodules &>/dev/null + rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null +} diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch new file mode 100644 index 000000000..d61238c3b --- /dev/null +++ b/testing/gtk2/xid-collision-debug.patch @@ -0,0 +1,15 @@ +--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 ++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 +@@ -56,10 +56,10 @@ + if (!display_x11->xid_ht) + display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, + (GEqualFunc) gdk_xid_equal); +- ++/* + if (g_hash_table_lookup (display_x11->xid_ht, xid)) + g_warning ("XID collision, trouble ahead"); +- ++*/ + g_hash_table_insert (display_x11->xid_ht, xid, data); + } + diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD new file mode 100644 index 000000000..cbdb700c3 --- /dev/null +++ b/testing/proftpd/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 142449 2011-11-10 05:57:41Z eric $ +# Maintainer: +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=proftpd +pkgver=1.3.4 +pkgrel=1 +pkgdesc="A high-performance, scalable FTP server" +arch=('i686' 'x86_64') +url="http://www.proftpd.org" +license=('GPL') +depends=('libldap' 'libmysqlclient' 'postgresql-libs') +backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') +source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} + 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') +md5sums=('7734142c7fa7212ab9f188a617a4be87' + '0426c03ca88f1b8794006916ac6466ce' + '99f6f9a989e70e3fa50809fc2bbbbb0a' + 'ddb09eb13131becdf0e081eef413116b' + '71d5932b0461c318ed68c2c0c2660736') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --disable-pam \ + --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ + --sysconfdir=/etc \ + --localstatedir=/var/run \ + --enable-ctrls \ + --enable-ipv6 \ + --with-includes=/usr/include/mysql:/usr/include/postgresql \ + --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ + --enable-nls + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" + + install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" + install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" + install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" + install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" +} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd new file mode 100755 index 000000000..357a7663d --- /dev/null +++ b/testing/proftpd/proftpd @@ -0,0 +1,41 @@ +#!/bin/bash + +# source application-specific settings +PROFTPD_ARGS= +[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting ProFTPd Server" + /usr/sbin/proftpd ${PROFTPD_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon proftpd + stat_done + fi + ;; + stop) + stat_busy "Stopping ProFTPd Server" + [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/proftpd.pid + rm_daemon proftpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d new file mode 100644 index 000000000..1a5a8a201 --- /dev/null +++ b/testing/proftpd/proftpd.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to proftpd +# +PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate new file mode 100644 index 000000000..7b6d7a87b --- /dev/null +++ b/testing/proftpd/proftpd.logrotate @@ -0,0 +1,5 @@ +/var/log/xferlog { + postrotate + /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true + endscript +} |