diff options
-rw-r--r-- | community-staging/pidgin-otr/PKGBUILD | 31 | ||||
-rw-r--r-- | community/cclive/PKGBUILD | 10 | ||||
-rw-r--r-- | community/luakit/PKGBUILD | 17 | ||||
-rw-r--r-- | community/openocd/PKGBUILD | 26 | ||||
-rw-r--r-- | community/optipng/PKGBUILD | 6 | ||||
-rw-r--r-- | core/dnsutils/PKGBUILD | 11 | ||||
-rw-r--r-- | extra/calligra/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/djvulibre/PKGBUILD | 53 | ||||
-rw-r--r-- | extra/djvulibre/install | 13 | ||||
-rw-r--r-- | extra/feh/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/live-media/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/php/PKGBUILD | 6 | ||||
-rw-r--r-- | testing/patch/PKGBUILD | 34 | ||||
-rw-r--r-- | testing/patch/patch-2.6.1-get-arg.patch | 12 | ||||
-rw-r--r-- | testing/qt/PKGBUILD | 132 | ||||
-rw-r--r-- | testing/qt/assistant.desktop | 9 | ||||
-rw-r--r-- | testing/qt/designer.desktop | 11 | ||||
-rw-r--r-- | testing/qt/improve-cups-support.patch | 84 | ||||
-rw-r--r-- | testing/qt/linguist.desktop | 10 | ||||
-rw-r--r-- | testing/qt/qt.install | 12 | ||||
-rw-r--r-- | testing/qt/qtconfig.desktop | 10 | ||||
-rw-r--r-- | testing/sudo/PKGBUILD | 6 |
22 files changed, 430 insertions, 83 deletions
diff --git a/community-staging/pidgin-otr/PKGBUILD b/community-staging/pidgin-otr/PKGBUILD new file mode 100644 index 000000000..df801a787 --- /dev/null +++ b/community-staging/pidgin-otr/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 76188 2012-09-13 07:35:32Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Bug <Bug2000@gmail.com> +# Contributor: Marcel Wysocki <maci@satgnu.net> + +pkgname=pidgin-otr +pkgver=4.0.0 +pkgrel=1 +pkgdesc='Off-the-Record Messaging plugin for Pidgin.' +arch=('i686' 'x86_64') +license=('GPL') +url='http://www.cypherpunks.ca/otr/' +depends=('libotr>=4.0.0' 'pidgin' 'perlxml') +makedepends=('intltool') +source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"{,.asc}) +md5sums=('eadb953376acc474e56041d4c12aa2c8' + '8c70a2fc6f5f0480f32178742ba96498') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index db5f0e385..81158416c 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 73985 2012-07-18 01:06:14Z ibiru $ +# $Id: PKGBUILD 76190 2012-09-13 07:56:23Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.7.9 -pkgrel=2 +pkgver=0.7.10 +pkgrel=1 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64') url='http://cclive.sourceforge.net/' license=('GPL3') depends=('boost-libs' 'pcre' 'curl' 'libquvi') makedepends=('boost') -source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") -md5sums=('2c7a3bbc2d6fdcfebb60cb3ae57944b5') +source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz") +md5sums=('dee09cd1b5638078037b8a2945ebac52') build() { cd $pkgname-$pkgver diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index 82744de47..89484ec7d 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -1,10 +1,11 @@ +# $Id: PKGBUILD 76198 2012-09-13 13:06:35Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com> pkgname=luakit -pkgver=2012.03.25 -pkgrel=2 +pkgver=2012.09.13 +pkgrel=1 pkgdesc='Fast, small, webkit based browser framework extensible by Lua' arch=('i686' 'x86_64') url='http://www.luakit.org/projects/luakit' @@ -12,20 +13,16 @@ license=('GPL3') depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils' 'luajit') makedepends=('git' 'help2man') options=(!makeflags) -conflicts=('luakit-git' 'luakit-develop-git') install='luakit.install' -source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}" - 0001-Dont-mark-desktop-file-as-executable.patch) -md5sums=('e25aaeacfa5758127b3f677eafba9aa2' - 'a1caf95b03659cd02a392a376a13edd7') +source=($pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$pkgver) +md5sums=('5de91907c44286c9b5a21319fa7cb67f') build() { cd mason-larobina-luakit-* - patch -Np1 -i $srcdir/0001-Dont-mark-desktop-file-as-executable.patch - make USE_LUAJIT=1 PREFIX=/usr DESTDIR=${pkgdir} all + make USE_LUAJIT=1 PREFIX=/usr DESTDIR=$pkgdir all } package() { cd mason-larobina-luakit-* - make PREFIX=/usr DESTDIR=${pkgdir} install + make PREFIX=/usr DESTDIR=$pkgdir install } diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD index 889755cbc..798eeccc5 100644 --- a/community/openocd/PKGBUILD +++ b/community/openocd/PKGBUILD @@ -1,33 +1,31 @@ +# $Id: PKGBUILD 76200 2012-09-13 18:36:22Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Matthias Bauch <matthias.bauch@gmail.com> # Contributor: Laszlo Papp <djszapi2 at gmail com> # Contributor: Samuel Tardieu <sam@rfc1149.net> pkgname=openocd -pkgver=0.5.0 -pkgrel=2 -pkgdesc="Debugging, in-system programming and boundary-scan testing for embedded target devices" +pkgver=0.6.0 +pkgrel=1 +pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices' arch=('i686' 'x86_64') -url="http://openocd.berlios.de" +url='http://openocd.berlios.de' license=('GPL') depends=('libftdi') options=(!strip !libtool) install=openocd.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('43434c2b5353c9b853278b8bff22cb1a') +md5sums=('824cbe192ca2c79055b6ae82579123cf') -# what features should be enabled on build -# 'ecos','zy1000' seams not to be supported on linux - -_features=(parport ft2232_libftdi amtjtagaccel ep93xx at91rm9200 gw16012 presto_libftdi usbprog oocd_trace jlink vsllink rlink arm-jtag-ew buspirate) +_features=(parport ft2232_libftdi amtjtagaccel ep93xxat91rm9200gw16012 presto_libftdi usbprog oocd_trace jlink vsllink rlink arm-jtag-ew buspirate) build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror - make + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD index 37853da52..1070611b5 100644 --- a/community/optipng/PKGBUILD +++ b/community/optipng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68497 2012-03-26 08:52:32Z lfleischer $ +# $Id: PKGBUILD 76192 2012-09-13 08:01:17Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=optipng -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=1 pkgdesc='Compresses PNG files to a smaller size, without losing any information.' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://optipng.sourceforge.net/' license=('ZLIB') depends=('glibc') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('b6181d566998ad489397b985ebfc4a03') +md5sums=('3bf5ff3e1dff99adb3c0b3dd9fd99f8a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index 50549af98..72eeb78ec 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,15 +1,12 @@ -# $Id: PKGBUILD 164066 2012-07-26 15:21:23Z bisson $ +# $Id: PKGBUILD 166636 2012-09-13 23:21:14Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> pkgname=dnsutils - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1.P2 -_pkgver=9.9.1-P2 +_pkgver=9.9.1-P3 +pkgver=${_pkgver//-/.} pkgrel=1 - pkgdesc='DNS utilities: dig host nslookup' url='http://www.isc.org/software/bind/' license=('custom:ISC') @@ -18,7 +15,7 @@ options=('!makeflags') depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') -sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7' +sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799' 'b465ef6160b004838f04de9978fe1be8422af777') replaces=('bind-tools' 'host') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index ea67c706d..9b85d9dfe 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165807 2012-08-30 18:32:15Z andrea $ +# $Id: PKGBUILD 166615 2012-09-13 08:59:14Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -21,7 +21,7 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' @@ -32,7 +32,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'openjpeg' 'kdegraphics-okular' 'pstoedit') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('7bc75d770bfd7ffd5f70386c25970888') +md5sums=('b4f1532d802a6c97fbcfa6a0467b7216') build() { mkdir build @@ -199,7 +199,7 @@ package_calligra-krita() { package_calligra-sheets() { pkgdesc="Write spreadsheet documents" - depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime' 'eigen2') + depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime') optdepends=('calligra-filters: import/export filters' 'calligra-plugins: extra calligra plugins' 'calligra-tools: extra calligra tools') diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD index 75cd92aef..572a6c552 100644 --- a/extra/djvulibre/PKGBUILD +++ b/extra/djvulibre/PKGBUILD @@ -1,41 +1,38 @@ -# $Id: PKGBUILD 148700 2012-02-05 11:47:29Z ibiru $ +# $Id: PKGBUILD 166638 2012-09-14 01:48:24Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: mgushee pkgname=djvulibre -pkgver=3.5.24 -pkgrel=3 +pkgver=3.5.25.3 +_major=3.5.25 +pkgrel=1 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents" -arch=("i686" "x86_64") -license=('GPL') -url="http://djvu.sourceforge.net/" -depends=('gcc-libs' 'libtiff>=4.0.0' 'bash' 'hicolor-icon-theme') -makedepends=('pkg-config') +url='http://djvu.sourceforge.net/' +arch=('i686' 'x86_64') +license=('GPL2') +options=('!libtool') +makedepends=('librsvg') +depends=('libtiff' 'hicolor-icon-theme') +source=("http://downloads.sourceforge.net/project/djvu/DjVuLibre/${_major}/djvulibre-${pkgver}.tar.gz") +sha1sums=('ad35056aabb1950f385360ff59520a82a6f779ec') + +conflicts=('libdjvu') provides=("libdjvu=${pkgver}") replaces=('libdjvu') -conflicts=('libdjvu') -optdepends=('djview4: Viewer application') -options=('!libtool') -install=djvulibre.install -source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz - git-fixes.patch) -md5sums=('af83d27af5083198432a178d22b259c5' - 'ff3798e383e9c3fae407455d8a51deec') + +install=install build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr --disable-desktopfiles - make + cd "${srcdir}/${pkgname}-${_major}" + ./configure --prefix=/usr --disable-desktopfiles + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - #Install icons for mime-types. - install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48,64x64}/mimetypes - for sz in 22 32 48 64; do - install -m644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png" - done + cd "${srcdir}/${pkgname}-${_major}" + make DESTDIR="${pkgdir}" install + for sz in 22 32 48 64; do + install -Dm644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png" + done } diff --git a/extra/djvulibre/install b/extra/djvulibre/install new file mode 100644 index 000000000..c25173d65 --- /dev/null +++ b/extra/djvulibre/install @@ -0,0 +1,13 @@ +post_install() { + if [[ -x usr/bin/gtk-update-icon-cache ]]; then + gtk-update-icon-cache -q -f usr/share/icons/hicolor + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index b39d3d841..046e975d4 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165670 2012-08-28 15:59:06Z bisson $ +# $Id: PKGBUILD 166623 2012-09-13 11:39:21Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('396d3507010a52e8a384fdbae452e291d5504971') +sha1sums=('09f2c03b0fc6b9e37fb998e42e3f7626b9fdfbad') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index cebde2649..ff03a1326 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166562 2012-09-11 07:22:15Z giovanni $ +# $Id: PKGBUILD 166619 2012-09-13 09:11:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.09.11 +pkgver=2012.09.12 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('2ea74ee10caa15d79f0a2ea3681703f2') +md5sums=('88ceec23abb1df597e333945e95120fd') build() { cd ${srcdir}/live diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 8e4e6cd4e..fefd39393 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165374 2012-08-16 20:54:57Z pierre $ +# $Id: PKGBUILD 166634 2012-09-13 22:05:22Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.6 +pkgver=5.4.7 pkgrel=1 arch=('i686' 'x86_64') license=('PHP') @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('c9aa0f4996d1b91ee9e45afcfaeb5d2e' +md5sums=('9cd421f1cc8fa8e7f215e44a1b06199f' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '6d46667e00d65933ec0c958279c0a803' diff --git a/testing/patch/PKGBUILD b/testing/patch/PKGBUILD new file mode 100644 index 000000000..7266d17e2 --- /dev/null +++ b/testing/patch/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 166613 2012-09-13 04:53:23Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=patch +pkgver=2.7 +pkgrel=1 +pkgdesc="A utility to apply patch files to original sources" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/patch/patch.html" +license=('GPL') +groups=('base-devel') +depends=('glibc') +makedepends=('ed') +optdepends=('ed: for patch -e functionality') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('d443f9d9a7d1bf1715831883917699d9' + '874fb55b72bc5c3c44794645b04e69a9') + +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 +} diff --git a/testing/patch/patch-2.6.1-get-arg.patch b/testing/patch/patch-2.6.1-get-arg.patch new file mode 100644 index 000000000..45f3bc8a5 --- /dev/null +++ b/testing/patch/patch-2.6.1-get-arg.patch @@ -0,0 +1,12 @@ +diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c +--- patch-2.6.1/src/patch.c.get-arg 2010-07-27 18:05:26.217150510 +0100 ++++ patch-2.6.1/src/patch.c 2010-07-27 18:05:47.464150892 +0100 +@@ -558,7 +558,7 @@ static struct option const longopts[] = + {"remove-empty-files", no_argument, NULL, 'E'}, + {"force", no_argument, NULL, 'f'}, + {"fuzz", required_argument, NULL, 'F'}, +- {"get", no_argument, NULL, 'g'}, ++ {"get", required_argument, NULL, 'g'}, + {"input", required_argument, NULL, 'i'}, + {"ignore-whitespace", no_argument, NULL, 'l'}, + #ifdef ENABLE_MERGE diff --git a/testing/qt/PKGBUILD b/testing/qt/PKGBUILD new file mode 100644 index 000000000..d9a30c3cc --- /dev/null +++ b/testing/qt/PKGBUILD @@ -0,0 +1,132 @@ +# $Id: PKGBUILD 166631 2012-09-13 15:17:13Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=qt +pkgname=('qt' 'qt-private-headers') +pkgver=4.8.3 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL') +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' + 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient') +options=('!libtool') +_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" +source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop' + 'improve-cups-support.patch') +md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd' + 'c439c7731c25387352d8453ca7574971') + +build() { + cd "${srcdir}"/${_pkgfqn} + + # (FS#28381) (KDEBUG#180051) + patch -p1 -i "${srcdir}"/improve-cups-support.patch + + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc/xdg \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg + make +} + +package_qt() { + pkgdesc='A cross-platform application and UI framework' + depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libfbclient: Firebird/iBase driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') + install='qt.install' + + cd "${srcdir}"/${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -p -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ + "${pkgdir}/usr/share/applications/" + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt-private-headers(){ + pkgdesc="Qt private headers for development" + depends=("qt=${pkgver}") + + install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} + + for i in QtCore QtDeclarative QtGui QtScript; do + cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ + "${pkgdir}"/usr/include/${i}/ + done + + for i in corelib declarative gui script; do + cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ + done +} diff --git a/testing/qt/assistant.desktop b/testing/qt/assistant.desktop new file mode 100644 index 000000000..a9e98c44b --- /dev/null +++ b/testing/qt/assistant.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples +Exec=/usr/bin/assistant +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/testing/qt/designer.desktop b/testing/qt/designer.desktop new file mode 100644 index 000000000..9b7b6e9aa --- /dev/null +++ b/testing/qt/designer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/testing/qt/improve-cups-support.patch b/testing/qt/improve-cups-support.patch new file mode 100644 index 000000000..e0305e11b --- /dev/null +++ b/testing/qt/improve-cups-support.patch @@ -0,0 +1,84 @@ +diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp +--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100 +@@ -569,6 +569,32 @@ + void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups) + { + options.duplex->setEnabled(cups && cups->ppdOption("Duplex")); ++ ++ if (cups) { ++ const ppd_option_t* duplex = cups->ppdOption("Duplex"); ++ if (duplex) { ++ // copy default ppd duplex to qt dialog ++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) ++ options.duplexShort->setChecked(true); ++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) ++ options.duplexLong->setChecked(true); ++ else ++ options.noDuplex->setChecked(true); ++ } ++ ++ if (cups->currentPPD()) { ++ // set default color ++ if (cups->currentPPD()->color_device) ++ options.color->setChecked(true); ++ else ++ options.grayscale->setChecked(true); ++ } ++ ++ // set collation ++ const ppd_option_t *collate = cups->ppdOption("Collate"); ++ if (collate) ++ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0); ++ } + } + #endif + +diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp +--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100 ++++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100 +@@ -627,6 +627,44 @@ + && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) { + setOutputFormat(QPrinter::PdfFormat); + } ++ ++#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) ++ // fill in defaults from ppd file ++ QCUPSSupport cups; ++ ++ int printernum = -1; ++ for (int i = 0; i < cups.availablePrintersCount(); i++) { ++ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name) ++ printernum = i; ++ } ++ if (printernum >= 0) { ++ cups.setCurrentPrinter(printernum); ++ ++ const ppd_option_t* duplex = cups.ppdOption("Duplex"); ++ if (duplex) { ++ // copy default ppd duplex to qt dialog ++ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) ++ setDuplex(DuplexShortSide); ++ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) ++ setDuplex(DuplexLongSide); ++ else ++ setDuplex(DuplexNone); ++ } ++ ++ if (cups.currentPPD()) { ++ // set default color ++ if (cups.currentPPD()->color_device) ++ setColorMode(Color); ++ else ++ setColorMode(GrayScale); ++ } ++ ++ // set collation ++ const ppd_option_t *collate = cups.ppdOption("Collate"); ++ if (collate) ++ setCollateCopies(qstrcmp(collate->defchoice, "True")==0); ++ } ++#endif + } + + /*! diff --git a/testing/qt/linguist.desktop b/testing/qt/linguist.desktop new file mode 100644 index 000000000..8cbe86599 --- /dev/null +++ b/testing/qt/linguist.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications +Exec=/usr/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/testing/qt/qt.install b/testing/qt/qt.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/testing/qt/qt.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/qt/qtconfig.desktop b/testing/qt/qtconfig.desktop new file mode 100644 index 000000000..46dcf9e3d --- /dev/null +++ b/testing/qt/qtconfig.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Config +Comment=Configure Qt behavior, styles, fonts +Exec=/usr/bin/qtconfig +Icon=qtlogo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD index 27774513f..b597c137a 100644 --- a/testing/sudo/PKGBUILD +++ b/testing/sudo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166016 2012-09-04 05:55:15Z foutrelis $ +# $Id: PKGBUILD 166625 2012-09-13 12:56:03Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_sudover=1.8.6 +_sudover=1.8.6p1 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -16,7 +16,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz sudo.pam) -sha256sums=('93c4481ae5261ca0e988d069179fef40032729b94a110ceb2a3e92ca7842d2d3' +sha256sums=('70d6a3ceb6168c879a80a5fa03cdd06178b95d0ecb6bf87aa0bc7c159da944cc' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') build() { |