From 164067832916c8e59219e1b0f30d7d04618a536e Mon Sep 17 00:00:00 2001 From: root Date: Sun, 22 Jan 2012 23:15:13 +0000 Subject: Sun Jan 22 23:15:13 UTC 2012 --- extra/audacious/PKGBUILD | 8 ++++---- extra/clutter-gtk2/PKGBUILD | 11 +++++++---- extra/clutter-gtk2/libm.patch | 39 +++++++++++++++++++++++++++++++++++++++ extra/gnome-shell/PKGBUILD | 14 +++++--------- extra/gnutls/PKGBUILD | 8 ++++---- extra/iptraf-ng/PKGBUILD | 20 ++++++++++---------- extra/pixman/PKGBUILD | 6 +++--- extra/rxvt-unicode/ChangeLog | 3 +++ extra/rxvt-unicode/PKGBUILD | 8 ++++---- extra/scribus/PKGBUILD | 12 ++++++------ extra/sdl_image/PKGBUILD | 6 +++--- 11 files changed, 88 insertions(+), 47 deletions(-) create mode 100644 extra/clutter-gtk2/libm.patch (limited to 'extra') diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 28686cfd4..4cd60ea5e 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 146058 2012-01-04 19:41:50Z bisson $ +# $Id: PKGBUILD 147042 2012-01-21 01:22:07Z bisson $ # Contributor: Alexander Fehr # Contributor: Giovanni Scafora # Maintainer: Gaetan Bisson pkgname=audacious -pkgver=3.1.2 +pkgver=3.2 pkgrel=1 -pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' +pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' license=('GPL3') arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') optdepends=('unzip: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('ebaaefcfa291a1f97d2dae1b2d7f0cacb545dc7f') +sha1sums=('3ebc4dcdcf5da960ba400078023e167e02105e84') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/clutter-gtk2/PKGBUILD b/extra/clutter-gtk2/PKGBUILD index 3b6d7c4f8..5a3fb66b0 100644 --- a/extra/clutter-gtk2/PKGBUILD +++ b/extra/clutter-gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 113313 2011-03-08 12:29:48Z heftig $ +# $Id: PKGBUILD 147074 2012-01-21 15:12:46Z ibiru $ # Maintainer: Jan "heftig" Steffens pkgname=clutter-gtk2 _pkgbasename=clutter-gtk pkgver=0.10.8 -pkgrel=1 +pkgrel=2 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -13,13 +13,16 @@ license=('LGPL') depends=('clutter' 'gtk2') makedepends=('gobject-introspection' 'gtk-doc') source=(http://www.clutter-project.org/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2 - gir.patch) + gir.patch + libm.patch) sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814' - 'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66') + 'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66' + '7d5532702eb3c18fff2144f8d501f77d3d9c9c23e6904374f05634fea2d7a8ef') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" patch -Np1 -i "$srcdir/gir.patch" + patch -Np1 -i "$srcdir/libm.patch" autoreconf -i ./configure --prefix=/usr make diff --git a/extra/clutter-gtk2/libm.patch b/extra/clutter-gtk2/libm.patch new file mode 100644 index 000000000..17e47ef40 --- /dev/null +++ b/extra/clutter-gtk2/libm.patch @@ -0,0 +1,39 @@ +diff -Nur clutter-gtk-0.10.8.orig/configure.ac clutter-gtk-0.10.8/configure.ac +--- clutter-gtk-0.10.8.orig/configure.ac 2012-01-21 14:52:17.627228994 +0000 ++++ clutter-gtk-0.10.8/configure.ac 2012-01-21 15:04:37.317308303 +0000 +@@ -57,6 +57,9 @@ + LT_PREREQ([2.2.6]) + LT_INIT([disable-static]) + ++AC_CHECK_LIBM ++AC_SUBST(LIBM) ++ + m4_define([clutter_req_version], [1.2.0]) + m4_define([gtk_req_version], [2.19.5]) + m4_define([flavour_default], [x11]) +diff -Nur clutter-gtk-0.10.8.orig/examples/Makefile.am clutter-gtk-0.10.8/examples/Makefile.am +--- clutter-gtk-0.10.8.orig/examples/Makefile.am 2012-01-21 14:52:17.600561077 +0000 ++++ clutter-gtk-0.10.8/examples/Makefile.am 2012-01-21 15:00:04.549770032 +0000 +@@ -22,18 +22,18 @@ + + gtk_clutter_test_SOURCES = gtk-clutter-test.c + gtk_clutter_test_DEPENDENCIES = $(common_deps) +-gtk_clutter_test_LDADD = $(common_ldadd) ++gtk_clutter_test_LDADD = $(common_ldadd) $(LIBM) + + gtk_clutter_events_SOURCES = gtk-clutter-events.c + gtk_clutter_events_DEPENDENCIES = $(common_deps) +-gtk_clutter_events_LDADD = $(common_ldadd) ++gtk_clutter_events_LDADD = $(common_ldadd) $(LIBM) + + gtk_clutter_multistage_SOURCES = gtk-clutter-multistage.c + gtk_clutter_multistage_DEPENDENCIES = $(common_deps) +-gtk_clutter_multistage_LDADD = $(common_ldadd) ++gtk_clutter_multistage_LDADD = $(common_ldadd) $(LIBM) + + gtk_clutter_viewport_SOURCES = gtk-clutter-viewport.c + gtk_clutter_viewport_DEPENDENCIES = $(common_deps) +-gtk_clutter_viewport_LDADD = $(common_ldadd) ++gtk_clutter_viewport_LDADD = $(common_ldadd) $(LIBM) + + EXTRA_DIST = redhand.png diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 219ad0edb..dd0ecc6be 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146931 2012-01-19 10:12:16Z ibiru $ +# $Id: PKGBUILD 146998 2012-01-20 11:30:17Z ibiru $ # Maintainer: Ionut Biru # Contributor: Flamelab pkgname=gnutls -pkgver=3.0.11 +pkgver=3.0.12 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install -options=('!libtool' '!zipman') +options=('!libtool' '!zipman' '!makeflags') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') makedepends=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('ca3370b39f7910538a0d6c02bec7a142') +md5sums=('685fe5c00786c04b39e9aac362fa0cac') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD index 0af3de2e1..b6f9dfcb9 100644 --- a/extra/iptraf-ng/PKGBUILD +++ b/extra/iptraf-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121278 2011-04-30 08:10:51Z ibiru $ +# $Id: PKGBUILD 147066 2012-01-21 14:18:43Z ibiru $ # Maintainer: Ionut Biru # Maintainer: sh0 pkgname=iptraf-ng -pkgver=1.0.2 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)" url="https://fedorahosted.org/iptraf-ng/" arch=('i686' 'x86_64') @@ -12,20 +12,20 @@ depends=('ncurses') license=('GPL2') replaces=('iptraf') options=('!libtool') -source=(https://fedorahosted.org/releases/i/p/iptraf-ng/${pkgname}-${pkgver}.tar.gz) -md5sums=('b2adbbbee4c269fb97a1951981c9047c') +source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('79a3787027515f688a35173ffbee6432') build() { cd "$srcdir/$pkgname-$pkgver" + sed s/ncurses5-config/ncursesw5-config/ -i configure.ac + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + --localstatedir=/var make CFLAGS="$CFLAGS" } package() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR=$pkgdir install - install -dm755 "${pkgdir}/var/lib/iptraf" + install -dm755 "$pkgdir/var/lib/iptraf" } - -# vim: ts=2: ft=sh diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index 28754057a..d956f7741 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142423 2011-11-09 10:25:24Z jgc $ +# $Id: PKGBUILD 147073 2012-01-21 15:12:23Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=pixman -pkgver=0.24.0 +pkgver=0.24.2 pkgrel=1 pkgdesc="Pixman library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177') +sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/rxvt-unicode/ChangeLog b/extra/rxvt-unicode/ChangeLog index f343b86cb..ba267d49e 100644 --- a/extra/rxvt-unicode/ChangeLog +++ b/extra/rxvt-unicode/ChangeLog @@ -1,3 +1,6 @@ +2012-01-22 Angel Velasquez + * Version bump to 9.15 + 2011-12-02 Angel Velasquez * Version bump to 9.14 diff --git a/extra/rxvt-unicode/PKGBUILD b/extra/rxvt-unicode/PKGBUILD index 2d2a89d30..3d976c041 100644 --- a/extra/rxvt-unicode/PKGBUILD +++ b/extra/rxvt-unicode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145618 2011-12-24 05:53:53Z angvp $ +# $Id: PKGBUILD 147102 2012-01-22 04:46:15Z angvp $ # Maintainer: Angel Velasquez # Contributor: tobias # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=rxvt-unicode -pkgver=9.14 +pkgver=9.15 pkgrel=1 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)" arch=('i686' 'x86_64') @@ -15,9 +15,9 @@ optdepends=('gtk2-perl: to use the urxvt-tabbed') changelog=ChangeLog source=(http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2 \ ${pkgname}.desktop) -md5sums=('022235a9a8b012c29e72c49177be6ce4' +md5sums=('15595aa326167ac5eb68c28d95432faf' '3de6c13126a45bc3bc9f6bba077a1311') -sha1sums=('e303b7591225b06bc04e18a875461438c635014e' +sha1sums=('e6fdf091860ecb458730dc68b0176f67f207a2f7' '962aebc88982dbeb62a7c4a051ff567e015f61a0') build() { diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD index 4e81935e3..5af43d7ed 100644 --- a/extra/scribus/PKGBUILD +++ b/extra/scribus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102618 2010-12-08 18:20:12Z dgriffiths $ +# $Id: PKGBUILD 146995 2012-01-20 06:04:00Z remy $ # Contributor: Ronald van Haren # Contributor: tobias # Contributor: Ben # Maintainer: Daniel J Griffiths pkgname=scribus -pkgver=1.3.9 +pkgver=1.4.0 pkgrel=1 pkgdesc="A desktop publishing program" arch=('i686' 'x86_64') @@ -16,10 +16,10 @@ depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \ 'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \ 'desktop-file-utils' 'shared-mime-info') makedepends=('cmake') -options=(!libtool !makeflags) -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a54dbf2e10cd88d683d0d34565d29378') -sha1sums=('86bc4db2d8fbb91fe94f8535327991e9128c5862') +options=(!libtool) +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz) +md5sums=('ae19e62399941fb8e868d8e762caf494') +sha1sums=('0e3afb98a56084c2938a8402df2d89214c42b809') build() { cd "${srcdir}" diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD index 74a1b777c..7643e2ba8 100644 --- a/extra/sdl_image/PKGBUILD +++ b/extra/sdl_image/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146687 2012-01-16 11:34:55Z heftig $ +# $Id: PKGBUILD 147083 2012-01-21 17:53:25Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Tom Newsom pkgname=sdl_image -pkgver=1.2.11 +pkgver=1.2.12 pkgrel=1 pkgdesc="A simple library to load images of various formats as SDL surfaces" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib') options=('!libtool') url="http://www.libsdl.org/projects/SDL_image/" source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz) -md5sums=('1210d7a7e87ab95abebb4f3e79a0fd31') +md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') build() { cd "$srcdir/SDL_image-$pkgver" -- cgit v1.2.3-54-g00ecf From c6c657b8bcf062b5d19eff6298b7754c11838080 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 23 Jan 2012 23:15:06 +0000 Subject: Mon Jan 23 23:15:06 UTC 2012 --- community-staging/armagetronad/PKGBUILD | 42 + .../armagetronad/armagetronad.desktop | 11 + community-staging/armagetronad/gcc43.patch | 210 ++ community-staging/calibre/PKGBUILD | 73 + community-staging/calibre/calibre-mount-helper | 28 + community-staging/calibre/calibre.install | 12 + .../calibre/desktop_integration.patch | 68 + community-staging/critter/PKGBUILD | 42 + .../critter/criticalmass-1.0.2-libpng15.patch | 31 + community-staging/critter/critter-gcc43.patch | 69 + community-staging/critter/critter.desktop | 9 + community-staging/devil/PKGBUILD | 33 + community-staging/devil/devil.install | 11 + community-staging/devil/libpng14.patch | 33 + community-staging/metapixel/PKGBUILD | 32 + .../metapixel/metapixel-1.0.2-libpng-1.5.patch | 174 ++ community-staging/openttd/PKGBUILD | 38 + community-staging/openttd/openttd.install | 17 + community-staging/warzone2100/PKGBUILD | 29 + community/chromaprint/PKGBUILD | 26 + community/duplicity/PKGBUILD | 13 +- .../duplicity/duplicity-0.6.17-fix-memleak.patch | 29 + community/libfaketime/PKGBUILD | 16 +- .../libfaketime-0.9.1-fix-README-NEWS.patch | 29 + .../libfaketime-0.9.1-fix-as-needed.patch | 39 + community/libvisual-projectm/PKGBUILD | 38 +- .../libvisual-projectm-gcc-4.6.patch | 11 + community/picard/PKGBUILD | 7 +- core/mdadm/PKGBUILD | 18 +- core/udev/PKGBUILD | 16 +- .../PKGBUILD | 4 +- .../PKGBUILD | 2 +- .../PKGBUILD | 8 +- cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD | 53 + cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD | 292 ++ .../mips64el-unknown-linux-gnu-gcc/gcc-ada.install | 20 + .../gcc-fortran.install | 16 + .../mips64el-unknown-linux-gnu-gcc/gcc-go.install | 20 + .../gcc-hash-style-both.patch | 122 + .../gcc-libs.install | 16 + cross/mips64el-unknown-linux-gnu-gcc/gcc.install | 20 + .../gcc_mips64el_lib.patch | 25 + .../gcc_pure64.patch | 26 + cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD | 24 +- extra/gstreamer0.10-ffmpeg/PKGBUILD | 6 +- extra/gstreamer0.10-python/PKGBUILD | 6 +- extra/kdeplasma-applets-networkmanagement/PKGBUILD | 8 +- extra/libgee/PKGBUILD | 6 +- extra/poppler/PKGBUILD | 8 +- extra/sg3_utils/PKGBUILD | 6 +- extra/xterm/PKGBUILD | 6 +- multilib/lib32-kmod/PKGBUILD | 41 + multilib/lib32-udev/PKGBUILD | 11 +- staging/at-spi/PKGBUILD | 37 + staging/at-spi/at-spi.install | 17 + staging/cairomm/PKGBUILD | 27 + staging/gstreamer0.10-good/PKGBUILD | 54 + .../gstreamer0.10-good-plugins.install | 19 + staging/poppler/PKGBUILD | 8 +- staging/vlc/PKGBUILD | 74 + staging/vlc/vlc.install | 18 + ~mtjm/cups-usblp/PKGBUILD | 134 + ~mtjm/cups-usblp/cups | 68 + ~mtjm/cups-usblp/cups-avahi.patch | 3156 ++++++++++++++++++++ ~mtjm/cups-usblp/cups-no-export-ssllibs.patch | 12 + ~mtjm/cups-usblp/cups-no-gcrypt.patch | 38 + ~mtjm/cups-usblp/cups.install | 26 + ~mtjm/cups-usblp/cups.logrotate | 8 + ~mtjm/cups-usblp/cups.pam | 3 + 69 files changed, 5564 insertions(+), 85 deletions(-) create mode 100644 community-staging/armagetronad/PKGBUILD create mode 100644 community-staging/armagetronad/armagetronad.desktop create mode 100644 community-staging/armagetronad/gcc43.patch create mode 100644 community-staging/calibre/PKGBUILD create mode 100644 community-staging/calibre/calibre-mount-helper create mode 100644 community-staging/calibre/calibre.install create mode 100644 community-staging/calibre/desktop_integration.patch create mode 100644 community-staging/critter/PKGBUILD create mode 100644 community-staging/critter/criticalmass-1.0.2-libpng15.patch create mode 100644 community-staging/critter/critter-gcc43.patch create mode 100644 community-staging/critter/critter.desktop create mode 100644 community-staging/devil/PKGBUILD create mode 100644 community-staging/devil/devil.install create mode 100644 community-staging/devil/libpng14.patch create mode 100644 community-staging/metapixel/PKGBUILD create mode 100644 community-staging/metapixel/metapixel-1.0.2-libpng-1.5.patch create mode 100644 community-staging/openttd/PKGBUILD create mode 100644 community-staging/openttd/openttd.install create mode 100644 community-staging/warzone2100/PKGBUILD create mode 100644 community/chromaprint/PKGBUILD create mode 100644 community/duplicity/duplicity-0.6.17-fix-memleak.patch create mode 100644 community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch create mode 100644 community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch create mode 100644 community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch create mode 100644 cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD create mode 100644 cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD create mode 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install create mode 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install create mode 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install create mode 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch create mode 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install create mode 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc.install create mode 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch create mode 100644 cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch create mode 100644 multilib/lib32-kmod/PKGBUILD create mode 100644 staging/at-spi/PKGBUILD create mode 100644 staging/at-spi/at-spi.install create mode 100644 staging/cairomm/PKGBUILD create mode 100644 staging/gstreamer0.10-good/PKGBUILD create mode 100644 staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install create mode 100644 staging/vlc/PKGBUILD create mode 100644 staging/vlc/vlc.install create mode 100644 ~mtjm/cups-usblp/PKGBUILD create mode 100644 ~mtjm/cups-usblp/cups create mode 100644 ~mtjm/cups-usblp/cups-avahi.patch create mode 100644 ~mtjm/cups-usblp/cups-no-export-ssllibs.patch create mode 100644 ~mtjm/cups-usblp/cups-no-gcrypt.patch create mode 100644 ~mtjm/cups-usblp/cups.install create mode 100644 ~mtjm/cups-usblp/cups.logrotate create mode 100644 ~mtjm/cups-usblp/cups.pam (limited to 'extra') diff --git a/community-staging/armagetronad/PKGBUILD b/community-staging/armagetronad/PKGBUILD new file mode 100644 index 000000000..94dfc61af --- /dev/null +++ b/community-staging/armagetronad/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 62638 2012-01-23 01:56:45Z svenstaro $ +# Maintainer: Mateusz Herych +# Contributor: Filippo 'JoeyrS' Civiletti + +pkgname=armagetronad +pkgver=0.2.8.3.1 +pkgrel=3 +pkgdesc='A Tron Clone in 3D.' +arch=('i686' 'x86_64') +url='http://armagetronad.net/' +license=('GPL') +depends=('sdl_image' 'libxml2' 'sdl_mixer' 'mesa' 'ftgl') +source=(http://downloads.sourceforge.net/sourceforge/armagetronad/armagetronad-$pkgver.src.tar.gz + armagetronad.desktop + gcc43.patch) +md5sums=('ed8dbdec493de5cd4535a787f35eed1b' + '29d1b1231acadff12cf3014a3867ba5c' + '9045d99559ef33fc18136630e8de916c') + +build() { + cd armagetronad-$pkgver + + # python2 fix + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' language/update.py + + sed -i 's|FTGL.h|ftgl.h|g' configure + sed -i 's|png_check_sig|png_sig_cmp|g' configure + patch -p1 < ../gcc43.patch + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --disable-games \ + --enable-automakedefaults + make + make DESTDIR=$pkgdir install + install -D -m 644 $srcdir/armagetronad.desktop $pkgdir/usr/share/applications/armagetronad.desktop + rm -rf $pkgdir/usr/share/applnk + rm $pkgdir/usr/bin/armagetronad-uninstall + mv $pkgdir/usr/bin/armagetronad $pkgdir/usr/bin/armagetronad_bin + printf "#!/bin/bash\n/usr/bin/armagetronad_bin --configdir /etc/armagetronad --datadir /usr/share/armagetronad" > $pkgdir/usr/bin/armagetronad + chmod +x $pkgdir/usr/bin/armagetronad +} diff --git a/community-staging/armagetronad/armagetronad.desktop b/community-staging/armagetronad/armagetronad.desktop new file mode 100644 index 000000000..125b4261d --- /dev/null +++ b/community-staging/armagetronad/armagetronad.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Armagetronad +GenericName=3D Tron clone +GenericName[pl]=Klon gry Tron w 3D +Exec=armagetronad +Icon=/usr/share/armagetronad/desktop/icons/small/armagetronad.png +Categories=Game; +Terminal=false +Type=Application +Encoding=UTF-8 +StartupNotify=false diff --git a/community-staging/armagetronad/gcc43.patch b/community-staging/armagetronad/gcc43.patch new file mode 100644 index 000000000..358f48221 --- /dev/null +++ b/community-staging/armagetronad/gcc43.patch @@ -0,0 +1,210 @@ +diff -ur a/src/network/md5.cpp b/src/network/md5.cpp +--- a/src/network/md5.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/network/md5.cpp 2009-08-24 20:21:51.000000000 +0200 +@@ -75,7 +75,7 @@ + */ + + #include "md5.h" +- ++#include + #include + #include + +Tylko w b/src/network: md5.cpp~ +diff -ur a/src/network/nNetwork.cpp b/src/network/nNetwork.cpp +--- a/src/network/nNetwork.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/network/nNetwork.cpp 2009-08-24 20:20:40.000000000 +0200 +@@ -24,7 +24,7 @@ + *************************************************************************** + + */ +- ++#include + #include "tMemManager.h" + #include "tInitExit.h" + #include "nSimulatePing.h" +Tylko w b/src/network: nNetwork.cpp~ +diff -ur a/src/network/nNetwork.h b/src/network/nNetwork.h +--- a/src/network/nNetwork.h 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/network/nNetwork.h 2009-08-24 20:21:18.000000000 +0200 +@@ -27,7 +27,7 @@ + + #ifndef ArmageTron_NET_H + #define ArmageTron_NET_H +- ++#include + #include "tError.h" + #include "tString.h" + #include "tHeap.h" +Tylko w b/src/network: nNetwork.h~ +diff -ur a/src/network/nSocket.h b/src/network/nSocket.h +--- a/src/network/nSocket.h 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/network/nSocket.h 2009-08-24 20:22:09.000000000 +0200 +@@ -33,7 +33,7 @@ + + #ifndef NET_SOCKET_H + #define NET_SOCKET_H +- ++#include + #include + #include "tConsole.h" + #include "tException.h" +Tylko w b/src/network: nSocket.h~ +diff -ur a/src/render/rModel.h b/src/render/rModel.h +--- a/src/render/rModel.h 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/render/rModel.h 2009-08-24 20:20:57.000000000 +0200 +@@ -27,7 +27,7 @@ + + #ifndef ArmageTron_MODEL_H + #define ArmageTron_MODEL_H +- ++#include + #include "defs.h" + #include "tArray.h" + #include "tLinkedList.h" +Tylko w b/src/render: rModel.h~ +diff -ur a/src/tools/tArray.cpp b/src/tools/tArray.cpp +--- a/src/tools/tArray.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tArray.cpp 2009-08-24 20:22:25.000000000 +0200 +@@ -27,7 +27,7 @@ + */ + + #define NO_MALLOC_REPLACEMENT +- ++#include + #include "tMemManager.h" + #include + #include +Tylko w b/src/tools: tArray.cpp~ +diff -ur a/src/tools/tCommandLine.cpp b/src/tools/tCommandLine.cpp +--- a/src/tools/tCommandLine.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tCommandLine.cpp 2009-08-24 20:24:19.000000000 +0200 +@@ -30,7 +30,7 @@ + #ifndef TCOMMANDLINE_H_INCLUDED + #include "tCommandLine.h" + #endif +- ++#include + #include "tLocale.h" + #include "tConfiguration.h" + #include "tException.h" +Tylko w b/src/tools: tCommandLine.cpp~ +diff -ur a/src/tools/tConfiguration.cpp b/src/tools/tConfiguration.cpp +--- a/src/tools/tConfiguration.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tConfiguration.cpp 2009-08-24 20:22:42.000000000 +0200 +@@ -24,7 +24,7 @@ + *************************************************************************** + + */ +- ++#include + #include "config.h" + #include + #include +Tylko w b/src/tools: tConfiguration.cpp~ +diff -ur a/src/tools/tCrypt.cpp b/src/tools/tCrypt.cpp +--- a/src/tools/tCrypt.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tCrypt.cpp 2009-08-24 20:22:54.000000000 +0200 +@@ -24,7 +24,7 @@ + *************************************************************************** + + */ +- ++#include + #include "tCrypt.h" + #include "tMemManager.h" + +Tylko w b/src/tools: tCrypt.cpp~ +diff -ur a/src/tools/tDirectories.cpp b/src/tools/tDirectories.cpp +--- a/src/tools/tDirectories.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tDirectories.cpp 2009-08-24 20:23:06.000000000 +0200 +@@ -27,7 +27,7 @@ + */ + + #include "config.h" +- ++#include + #include + #include + #include +Tylko w b/src/tools: tDirectories.cpp~ +diff -ur a/src/tools/tError.cpp b/src/tools/tError.cpp +--- a/src/tools/tError.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tError.cpp 2009-08-24 20:28:01.000000000 +0200 +@@ -24,8 +24,9 @@ + *************************************************************************** + + */ +- ++#include + #include "config.h" ++#include + #include + #if HAVE_UNISTD_H + #include +Tylko w b/src/tools: tError.cpp~ +diff -ur a/src/tools/tLocale.cpp b/src/tools/tLocale.cpp +--- a/src/tools/tLocale.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tLocale.cpp 2009-08-24 20:23:49.000000000 +0200 +@@ -30,7 +30,7 @@ + #include "tConsole.h" + #include "tDirectories.h" + #include "tSafePTR.h" +- ++#include + #include + #include + #include +Tylko w b/src/tools: tLocale.cpp~ +diff -ur a/src/tools/tMemManager.cpp b/src/tools/tMemManager.cpp +--- a/src/tools/tMemManager.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tMemManager.cpp 2009-08-24 20:24:42.000000000 +0200 +@@ -29,7 +29,7 @@ + #define NO_MALLOC_REPLACEMENT + + #include "defs.h" +- ++#include + #include + #include + #include // need basic C IO since STL IO does memory management +Tylko w b/src/tools: tMemManager.cpp~ +diff -ur a/src/tools/tRandom.cpp b/src/tools/tRandom.cpp +--- a/src/tools/tRandom.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tRandom.cpp 2009-08-24 20:24:31.000000000 +0200 +@@ -29,7 +29,7 @@ + #ifndef TRANDOM_H_INCLUDED + #include "tRandom.h" + #endif +- ++#include + #ifdef HAVE_STDLIB + #include + #endif +Tylko w b/src/tools: tRandom.cpp~ +diff -ur a/src/tools/tString.cpp b/src/tools/tString.cpp +--- a/src/tools/tString.cpp 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tools/tString.cpp 2009-08-24 20:24:03.000000000 +0200 +@@ -24,7 +24,7 @@ + *************************************************************************** + + */ +- ++#include + #include "tMemManager.h" + #include "tString.h" + #include "tLocale.h" +Tylko w b/src/tools: tString.cpp~ +diff -ur a/src/tron/gAIBase.h b/src/tron/gAIBase.h +--- a/src/tron/gAIBase.h 2009-08-24 20:08:14.000000000 +0200 ++++ b/src/tron/gAIBase.h 2009-08-24 20:21:33.000000000 +0200 +@@ -29,7 +29,7 @@ + #define ArmageTron_AIBASE_H + + #include "rSDL.h" +- ++#include + #include "eTimer.h" + #include "ePath.h" + #include "ePlayer.h" +Tylko w b/src/tron: gAIBase.h~ diff --git a/community-staging/calibre/PKGBUILD b/community-staging/calibre/PKGBUILD new file mode 100644 index 000000000..5f43241ff --- /dev/null +++ b/community-staging/calibre/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 62598 2012-01-22 12:14:47Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Petrov Roman +# Contributor: Andrea Fagiani + +pkgname=calibre +pkgver=0.8.36 +pkgrel=3 +pkgdesc="Ebook management application" +arch=('i686' 'x86_64') +url="http://calibre-ebook.com/" +license=('GPL3') +depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' + 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' + 'python-imaging' 'desktop-file-utils' 'shared-mime-info' + 'python-dnspython' 'unrar' 'python2-pyqt' 'icu') +makedepends=('python2-pycountry') +optdepends=('ipython: to use calibre-debug') +install=calibre.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" + 'desktop_integration.patch' + 'calibre-mount-helper') +md5sums=('cc009c02fa0db088d074fef8b983e78a' + '253ce4fe5d01f8ff76b63cd3825755ea' + '675cd87d41342119827ef706055491e7') + +build() { + cd "${srcdir}/${pkgname}" + + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ + $(find . -regex ".*.py\|.*.recipe") + + python2 setup.py build +# python2 setup.py resources + python2 setup.py translations +} + +package() { + cd "${srcdir}/${pkgname}" + + patch -Np1 -i "${srcdir}/desktop_integration.patch" + + # More on desktop integration (e.g. enforce arch defaults) + sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ + -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ + -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ + -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py + + # Fix the environment module location + sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + + install -d "${pkgdir}/usr/lib/python2.7/site-packages" + python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" + + find "${pkgdir}" -type d -empty -delete + + # Decompress the man pages so makepkg will do it for us. + for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do + bzip2 -d "${decom}" + done + + # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ + rm -rf ${pkgdir}/usr/bin/calibre-mount-helper + install -m 755 ${srcdir}/calibre-mount-helper "${pkgdir}/usr/bin" +} diff --git a/community-staging/calibre/calibre-mount-helper b/community-staging/calibre/calibre-mount-helper new file mode 100644 index 000000000..00cac4270 --- /dev/null +++ b/community-staging/calibre/calibre-mount-helper @@ -0,0 +1,28 @@ +#!/bin/sh -e +# Replacement for upstream mount helper using udisks/eject +# (C) 2010 Martin Pitt + +ACTION="$1" +DEV="$2" + +case "$ACTION" in + mount) + udisks --mount "$DEV" + + # check if mount worked. If not, fail + # udisks does return 0 even if mount failed + mount | grep -q "$DEV" || exit 0 + ;; + + eject) + eject "$DEV" + ;; + + cleanup) + ;; + + *) + echo "unknown action" >&2 + exit 1 +esac + diff --git a/community-staging/calibre/calibre.install b/community-staging/calibre/calibre.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/community-staging/calibre/calibre.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/calibre/desktop_integration.patch b/community-staging/calibre/desktop_integration.patch new file mode 100644 index 000000000..4dbf53757 --- /dev/null +++ b/community-staging/calibre/desktop_integration.patch @@ -0,0 +1,68 @@ +--- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200 ++++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200 +@@ -339,51 +339,39 @@ + + with TemporaryDirectory() as tdir: + with CurrentDir(tdir): +- render_img('mimetypes/lrf.png', 'calibre-lrf.png') +- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) +- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrs', +- '128')) +- render_img('lt.png', 'calibre-gui.png') +- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True) +- self.icon_resources.append(('apps', 'calibre-gui', '128')) +- render_img('viewer.png', 'calibre-viewer.png') +- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '128')) ++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') ++ os.mkdir(dir) ++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) ++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) ++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) + + mimetypes = set([]) + for x in all_input_formats(): + mt = guess_type('dummy.'+x)[0] +- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: ++ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: + mimetypes.add(mt) + + def write_mimetypes(f): + f.write('MimeType=%s;\n'%';'.join(mimetypes)) + +- f = open('calibre-lrfviewer.desktop', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../applications') ++ os.mkdir(dir) ++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') + f.write(VIEWER) + f.close() +- f = open('calibre-ebook-viewer.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') + f.write(EVIEWER) + write_mimetypes(f) + f.close() +- f = open('calibre-gui.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') + f.write(GUI) + write_mimetypes(f) + f.close() +- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', +- 'calibre-ebook-viewer.desktop') +- for x in des: +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] +- check_call(' '.join(cmd), shell=True) +- self.menu_resources.append(x) +- check_call(['xdg-desktop-menu', 'forceupdate']) +- f = open('calibre-mimetypes', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') ++ os.makedirs(dir) ++ f = open(os.path.join(dir, 'calibre.xml'), 'wb') + f.write(MIME) + f.close() +- self.mime_resources.append('calibre-mimetypes') +- check_call('xdg-mime install ./calibre-mimetypes', shell=True) + except Exception: + if self.opts.fatal_errors: + raise diff --git a/community-staging/critter/PKGBUILD b/community-staging/critter/PKGBUILD new file mode 100644 index 000000000..429ab1ebf --- /dev/null +++ b/community-staging/critter/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 62631 2012-01-22 22:37:03Z lcarlier $ +# Contributor: Allan McRae +# Maintainer: Daniel J Griffiths + +pkgname=critter +_origname=CriticalMass +pkgver=1.0.2 +pkgrel=6 +pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/criticalmass" +license=('GPL') +depends=('sdl_image' 'sdl_mixer' 'mesa') +source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2 + critter-gcc43.patch + criticalmass-1.0.2-libpng15.patch + critter.desktop) +md5sums=('e2aff114bffa717fb79c82e1dc473ebe' + 'e936920acce56bfa3b0123ca8b1193a6' + '76448ba5b7a42aec8fd2a5d1bc31b8e2' + '98c17809aed964c445adad09827035df') + +build() { + cd ${srcdir}/$_origname-${pkgver} + + patch -Np1 -i ../critter-gcc43.patch + patch -Np0 -i ../criticalmass-1.0.2-libpng15.patch + sed -i 's|-lpng12|-lpng15|g' configure + + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/$_origname-${pkgver} + + make DESTDIR=${pkgdir} install + + install -Dm644 critter.png ${pkgdir}/usr/share/pixmaps/critter.png + install -Dm644 ../critter.desktop \ + ${pkgdir}/usr/share/applications/critter.desktop +} diff --git a/community-staging/critter/criticalmass-1.0.2-libpng15.patch b/community-staging/critter/criticalmass-1.0.2-libpng15.patch new file mode 100644 index 000000000..ac1b8c0c6 --- /dev/null +++ b/community-staging/critter/criticalmass-1.0.2-libpng15.patch @@ -0,0 +1,31 @@ +--- game/main.cpp ++++ game/main.cpp +@@ -28,6 +28,8 @@ + #include + #include + ++#include ++ + void migrateConfig( void) + { + //if onlineCheck is not set, default it to true +--- utilssdl/PNG.cpp ++++ utilssdl/PNG.cpp +@@ -45,7 +45,7 @@ + { + png_size_t check; + +- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); ++ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png))); + if( check != length) + { + png_error( png, "Write Error"); +@@ -72,7 +72,7 @@ + return false; + } + +- if( setjmp(_png->jmpbuf)) ++ if( setjmp(png_jmpbuf(_png))) + { + fclose( fp); + png_destroy_write_struct(&_png, (png_infopp)NULL); diff --git a/community-staging/critter/critter-gcc43.patch b/community-staging/critter/critter-gcc43.patch new file mode 100644 index 000000000..ade42d8e4 --- /dev/null +++ b/community-staging/critter/critter-gcc43.patch @@ -0,0 +1,69 @@ +diff -Naur CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp CriticalMass-1.0.2/tinyxml/tinyxml.cpp +--- CriticalMass-1.0.2-old/tinyxml/tinyxml.cpp 2003-03-03 12:34:58.000000000 +1000 ++++ CriticalMass-1.0.2/tinyxml/tinyxml.cpp 2008-04-01 22:26:47.000000000 +1000 +@@ -22,7 +22,8 @@ + */ + + #include "tinyxml.h" +- ++#include ++#include + + TiXmlNode::TiXmlNode( NodeType _type ) + { +diff -Naur CriticalMass-1.0.2-old/tinyxml/tinyxmlparser.cpp CriticalMass-1.0.2/tinyxml/tinyxmlparser.cpp +--- CriticalMass-1.0.2-old/tinyxml/tinyxmlparser.cpp 2003-03-03 12:34:58.000000000 +1000 ++++ CriticalMass-1.0.2/tinyxml/tinyxmlparser.cpp 2008-04-01 22:27:02.000000000 +1000 +@@ -24,7 +24,7 @@ + + #include "tinyxml.h" + #include +- ++#include + const char* TiXmlBase::SkipWhiteSpace( const char* p ) + { + while ( p && *p && +diff -Naur CriticalMass-1.0.2-old/utils/ResourceManager.cpp CriticalMass-1.0.2/utils/ResourceManager.cpp +--- CriticalMass-1.0.2-old/utils/ResourceManager.cpp 2005-01-02 12:59:29.000000000 +1000 ++++ CriticalMass-1.0.2/utils/ResourceManager.cpp 2008-04-01 22:27:19.000000000 +1000 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + #include + #include +diff -Naur CriticalMass-1.0.2-old/utils/Value.hpp CriticalMass-1.0.2/utils/Value.hpp +--- CriticalMass-1.0.2-old/utils/Value.hpp 2004-12-18 12:41:24.000000000 +1000 ++++ CriticalMass-1.0.2/utils/Value.hpp 2008-04-01 22:27:39.000000000 +1000 +@@ -17,6 +17,7 @@ + + #include + #include ++#include + + #include + +diff -Naur CriticalMass-1.0.2-old/utils/zStream.cpp CriticalMass-1.0.2/utils/zStream.cpp +--- CriticalMass-1.0.2-old/utils/zStream.cpp 2005-08-01 06:06:14.000000000 +1000 ++++ CriticalMass-1.0.2/utils/zStream.cpp 2008-04-01 22:28:03.000000000 +1000 +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + ofstream &operator<<( ofstream &outfile, Uint32 i) + { +diff -Naur CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp +--- CriticalMass-1.0.2-old/utils/zStreamBufferImplZLib.cpp 2005-08-01 06:06:14.000000000 +1000 ++++ CriticalMass-1.0.2/utils/zStreamBufferImplZLib.cpp 2008-04-01 22:28:23.000000000 +1000 +@@ -14,6 +14,7 @@ + // + #include + #include ++#include + + bool ziStreamBufferImplZLib::init( void) + { diff --git a/community-staging/critter/critter.desktop b/community-staging/critter/critter.desktop new file mode 100644 index 000000000..ded5a9fbf --- /dev/null +++ b/community-staging/critter/critter.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Critical Mass +Comment=SDL/OpenGL space shoot'em up game +Exec=critter +Icon=critter +Terminal=false +Type=Application +StartupNotify=true +Categories=Game; diff --git a/community-staging/devil/PKGBUILD b/community-staging/devil/PKGBUILD new file mode 100644 index 000000000..11ed311ba --- /dev/null +++ b/community-staging/devil/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 62634 2012-01-22 22:50:07Z lcarlier $ +# Maintainer: Laurent Carlier +# Contributor: damir +# Contributor: TheHoff + +pkgname=devil +pkgver=1.7.8 +pkgrel=10 +pkgdesc="Library for reading several different image formats" +arch=('i686' 'x86_64') +url="http://openil.sourceforge.net/" +depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr') +install=devil.install +options=('!libtool' '!docs' '!emptydirs') +license=('GPL') +source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch) +md5sums=('7918f215524589435e5ec2e8736d5e1d' + '0f839ccefd43b0ee8b4b3f99806147fc') + +build() { + cd ${srcdir}/devil-$pkgver + + patch -Np1 -i ${srcdir}/libpng14.patch + + ./configure --prefix=/usr --enable-ILU + make +} + +package() { + cd ${srcdir}/devil-$pkgver + + make prefix=${pkgdir}/usr install +} diff --git a/community-staging/devil/devil.install b/community-staging/devil/devil.install new file mode 100644 index 000000000..8336ac3d1 --- /dev/null +++ b/community-staging/devil/devil.install @@ -0,0 +1,11 @@ +infodir=usr/share/info + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null +} diff --git a/community-staging/devil/libpng14.patch b/community-staging/devil/libpng14.patch new file mode 100644 index 000000000..b8434692b --- /dev/null +++ b/community-staging/devil/libpng14.patch @@ -0,0 +1,33 @@ +diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c +--- devil-1.7.8.orig/src-IL/src/il_icon.c 2009-03-08 09:10:09.000000000 +0200 ++++ devil-1.7.8/src-IL/src/il_icon.c 2010-01-17 00:54:09.000000000 +0200 +@@ -525,7 +525,7 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +- png_set_gray_1_2_4_to_8(ico_png_ptr); ++ png_set_expand_gray_1_2_4_to_8(ico_png_ptr); + } + + // Expand RGB images with transparency to full alpha channels +diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c +--- devil-1.7.8.orig/src-IL/src/il_png.c 2009-03-08 09:10:09.000000000 +0200 ++++ devil-1.7.8/src-IL/src/il_png.c 2010-01-17 00:55:26.000000000 +0200 +@@ -105,7 +105,7 @@ + Read = iread(Signature, 1, 8); + iseek(-Read, IL_SEEK_CUR); + +- return png_check_sig(Signature, 8); ++ return png_sig_cmp(Signature, 0, 8) == 0; + } + + +@@ -278,7 +278,7 @@ + + // Expand low-bit-depth grayscale images to 8 bits + if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + // Expand RGB images with transparency to full alpha channels diff --git a/community-staging/metapixel/PKGBUILD b/community-staging/metapixel/PKGBUILD new file mode 100644 index 000000000..7767059ee --- /dev/null +++ b/community-staging/metapixel/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 62646 2012-01-23 04:17:52Z lfleischer $ +# Maintainer: Lukas Fleischer +# Contributor: Daniel Isenmann + +pkgname=metapixel +pkgver=1.0.2 +pkgrel=3 +pkgdesc='A program for generating photomosaics.' +arch=('i686' 'x86_64') +url='http://www.complang.tuwien.ac.at/schani/metapixel/' +license=('GPL') +depends=('giflib' 'libjpeg' 'libpng' 'perl') +source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz" + 'metapixel-1.0.2-libpng-1.5.patch') +md5sums=('af5d77d38826756af213a08e3ada9941' + '1832a79790b07402735bfeb9f71f36e9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -dm0755 "${pkgdir}/usr/share/man/man1" + + make PREFIX="${pkgdir}/usr" install +} diff --git a/community-staging/metapixel/metapixel-1.0.2-libpng-1.5.patch b/community-staging/metapixel/metapixel-1.0.2-libpng-1.5.patch new file mode 100644 index 000000000..ed787452f --- /dev/null +++ b/community-staging/metapixel/metapixel-1.0.2-libpng-1.5.patch @@ -0,0 +1,174 @@ +--- metapixel-1.0.2.orig/rwimg/rwpng.c ++++ metapixel-1.0.2/rwimg/rwpng.c +@@ -57,19 +57,39 @@ + data->end_info = png_create_info_struct(data->png_ptr); + assert(data->end_info != 0); + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + +- png_init_io(data->png_ptr, data->file); +- ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_init_io(data->png_ptr, data->file); ++ png_read_info(data->png_ptr, data->info_ptr); ++#else ++ png_init_io(data->png_ptr, data->file); + png_read_info(data->png_ptr, data->info_ptr); ++#endif + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ *width = png_get_image_width(data->png_ptr, data->info_ptr); ++ *height = png_get_image_height(data->png_ptr, data->info_ptr); ++ { ++ png_byte value = png_get_bit_depth(data->png_ptr, data->info_ptr); ++ assert(value == 8 || value == 16); ++ value = png_get_color_type(data->png_ptr, data->info_ptr); ++ assert(value == PNG_COLOR_TYPE_RGB || value == PNG_COLOR_TYPE_RGB_ALPHA); ++ value = png_get_interlace_type(data->png_ptr, data->info_ptr); ++ assert(value == PNG_INTERLACE_NONE); ++ } ++#else + *width = data->info_ptr->width; + *height = data->info_ptr->height; +- + assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16); + assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA); + assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE); ++#endif + + data->have_read = 0; + +@@ -81,32 +101,51 @@ + { + png_data_t *data = (png_data_t*)_data; + int i; +- int bps, spp; ++ int bps, spp, width; + unsigned char *row; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if(png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB) ++#else + if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB) ++#endif + spp = 3; + else + spp = 4; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if(png_get_bit_depth(data->png_ptr, data->info_ptr) == 16) ++#else + if (data->info_ptr->bit_depth == 16) ++#endif + bps = 2; + else + bps = 1; + +- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps); ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ width = png_get_image_width(data->png_ptr, data->info_ptr); ++#else ++ width = data->info_ptr->width: ++#endif ++ ++ row = (unsigned char*)malloc(width * spp * bps); + + for (i = 0; i < num_lines; ++i) + { + int j, channel; + + png_read_row(data->png_ptr, (png_bytep)row, 0); +- for (j = 0; j < data->info_ptr->width; ++j) ++ for (j = 0; j < width; ++j) + for (channel = 0; channel < 3; ++channel) +- lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; ++ lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; + } + + free(row); +@@ -119,7 +158,11 @@ + { + png_data_t *data = (png_data_t*)_data; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + + if (data->have_read) +@@ -148,7 +191,11 @@ + data->info_ptr = png_create_info_struct(data->png_ptr); + assert(data->info_ptr != 0); + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + + if (pixel_stride == 4) +@@ -156,6 +203,16 @@ + + png_init_io(data->png_ptr, data->file); + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_set_IHDR(data->png_ptr, data->info_ptr, ++ width, height, 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, ++ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); ++ ++ /* Maybe does not need following. */ ++ png_set_tRNS(data->png_ptr, data->info_ptr, NULL, 0, NULL); ++ png_set_PLTE(data->png_ptr, data->info_ptr, NULL, 0); ++ png_set_invalid(data->png_ptr, data->info_ptr, 0); ++#else + data->info_ptr->width = width; + data->info_ptr->height = height; + data->info_ptr->valid = 0; +@@ -168,6 +225,7 @@ + data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT; + data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT; + data->info_ptr->interlace_type = PNG_INTERLACE_NONE; ++#endif + + png_write_info(data->png_ptr, data->info_ptr); + +@@ -182,7 +240,11 @@ + png_data_t *data = (png_data_t*)_data; + int i; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + + for (i = 0; i < num_lines; ++i) +@@ -194,7 +256,11 @@ + { + png_data_t *data = (png_data_t*)_data; + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((data->png_ptr)))) ++#else + if (setjmp(data->png_ptr->jmpbuf)) ++#endif + assert(0); + + png_write_end(data->png_ptr, data->info_ptr); diff --git a/community-staging/openttd/PKGBUILD b/community-staging/openttd/PKGBUILD new file mode 100644 index 000000000..ee2ec74e6 --- /dev/null +++ b/community-staging/openttd/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 62632 2012-01-22 22:37:56Z lcarlier $ +# Maintainer: Vesa Kaihlavirta + +pkgname=openttd +pkgver=1.1.5 +pkgrel=1 +pkgdesc='An engine for running Transport Tycoon Deluxe.' +arch=('i686' 'x86_64') +url='http://www.openttd.org' +license=('GPL') +depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop-file-utils') +install=openttd.install +optdepends=('openttd-opengfx: free graphics' + 'openttd-opensfx: free soundset') +source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") +md5sums=('aea731c9f87c53955269446d580ee19e') + +build() { + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix-dir=/usr \ + --binary-name=${pkgname} \ + --binary-dir=bin \ + --data-dir=share/${pkgname} \ + --install-dir=${pkgdir} \ + --doc-dir=share/doc/${pkgname} \ + --menu-name="OpenTTD" \ + --personal-dir=.${pkgname} + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make install +} diff --git a/community-staging/openttd/openttd.install b/community-staging/openttd/openttd.install new file mode 100644 index 000000000..85b22a1c5 --- /dev/null +++ b/community-staging/openttd/openttd.install @@ -0,0 +1,17 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + update-desktop-database > /dev/null 2>&1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} diff --git a/community-staging/warzone2100/PKGBUILD b/community-staging/warzone2100/PKGBUILD new file mode 100644 index 000000000..0fe2c8341 --- /dev/null +++ b/community-staging/warzone2100/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 62625 2012-01-22 20:35:31Z lcarlier $ +# Maintainer: Vesa Kaihlavirta +# Contributor: Angelo Theodorou + +pkgname=warzone2100 +pkgver=2.3.9 +pkgrel=2 +pkgdesc="3D realtime strategy game on a future Earth" +url="http://wz2100.net/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'mesa' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') +makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip') +source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz") +md5sums=('7185090a089c9c0e0eca7535a8f25dca') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr --with-distributor="Arch linux" + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community/chromaprint/PKGBUILD b/community/chromaprint/PKGBUILD new file mode 100644 index 000000000..ea7e1ef90 --- /dev/null +++ b/community/chromaprint/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 62590 2012-01-22 09:25:04Z bisson $ +# Contributor: Wieland Hoffmann +# Maintainer: Gaetan Bisson + +pkgname=chromaprint +pkgver=0.6 +pkgrel=2 +pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' +url='http://acoustid.org/chromaprint/' +arch=('i686' 'x86_64') +license=('LGPL') +depends=('ffmpeg') +makedepends=('cmake') +source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON . + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index adcaa6edb..955bd64db 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 60285 2011-12-08 22:52:59Z lfleischer $ +# $Id: PKGBUILD 62636 2012-01-23 00:53:34Z lfleischer $ # Maintainer: Kaiting Chen # Contributor: Aaron Schaefer pkgname=duplicity pkgver=0.6.17 -pkgrel=3 +pkgrel=4 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' arch=('i686' 'x86_64') url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" - 'botobackend.patch') + 'botobackend.patch' + 'duplicity-0.6.17-fix-memleak.patch') md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f' - '49bbdc327230fe5985d18eaae37eec0c') + '49bbdc327230fe5985d18eaae37eec0c' + 'b77e98d006842414fdda9662c8081d3b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,6 +29,9 @@ build() { # add hotfix issued by upstream (FS#27390) patch -p0 -i ../botobackend.patch + # fix a memory leak (upstream bug #908228) + patch -p0 -i ../duplicity-0.6.17-fix-memleak.patch + python2 setup.py install --root="$pkgdir" --optimize=1 # fix broken documentation permissions until upstream does (FS#27301) diff --git a/community/duplicity/duplicity-0.6.17-fix-memleak.patch b/community/duplicity/duplicity-0.6.17-fix-memleak.patch new file mode 100644 index 000000000..1c4c8daff --- /dev/null +++ b/community/duplicity/duplicity-0.6.17-fix-memleak.patch @@ -0,0 +1,29 @@ +=== modified file 'duplicity/util.py' +--- duplicity/util.py 2011-08-23 18:14:17 +0000 ++++ duplicity/util.py 2012-01-20 21:50:01 +0000 +@@ -71,6 +71,10 @@ + else: + raise + ++class BlackHoleList(list): ++ def append(self, x): ++ pass ++ + class FakeTarFile: + debug = 0 + def __iter__(self): +@@ -83,7 +87,12 @@ + # yet. So we want to ignore ReadError exceptions, which are used to signal + # this. + try: +- return tarfile.TarFile("arbitrary", mode, fp) ++ tf = tarfile.TarFile("arbitrary", mode, fp) ++ # Now we cause TarFile to not cache TarInfo objects. It would end up ++ # consuming a lot of memory over the lifetime of our long-lasting ++ # signature files otherwise. ++ tf.members = BlackHoleList() ++ return tf + except tarfile.ReadError: + return FakeTarFile() + + diff --git a/community/libfaketime/PKGBUILD b/community/libfaketime/PKGBUILD index a95ab380d..447f4b364 100644 --- a/community/libfaketime/PKGBUILD +++ b/community/libfaketime/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 47438 2011-05-23 06:26:34Z lfleischer $ +# $Id: PKGBUILD 62627 2012-01-22 21:34:26Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Dan Serban # Contributor: Ross Melin pkgname=libfaketime -pkgver=0.8.1 +pkgver=0.9.1 pkgrel=1 pkgdesc='Report fake dates and times to programs without having to change the system-wide time.' arch=('i686' 'x86_64') url='http://www.code-wizards.com/projects/libfaketime/' license=('GPL2') -source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('113d75d73e39f0f5022dc7385628d57c') +source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'libfaketime-0.9.1-fix-as-needed.patch' + 'libfaketime-0.9.1-fix-README-NEWS.patch') +md5sums=('ce3f996dfd5826b4ac62f1a7cc36ea27' + '90873e4df35283463ef54b159c318686' + 'b1b641a8e2298aa1646982e3bde96117') build() { cd "${pkgname}-${pkgver}" + + patch -p1 -i ../libfaketime-0.9.1-fix-as-needed.patch + patch -p1 -i ../libfaketime-0.9.1-fix-README-NEWS.patch + make } diff --git a/community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch b/community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch new file mode 100644 index 000000000..3d47c5404 --- /dev/null +++ b/community/libfaketime/libfaketime-0.9.1-fix-README-NEWS.patch @@ -0,0 +1,29 @@ +From c0c19a71c5481f3082afee2ac7962bd7abfcf134 Mon Sep 17 00:00:00 2001 +From: Lukas Fleischer +Date: Sun, 22 Jan 2012 22:19:50 +0100 +Subject: [PATCH] Makefile: Fix installation of "README" and "NEWS" + +Initialize "INSTALL" in the top-level Makefile in order to avoid broken +install(1) invocations such as: + + dm0755 "/build/pkg/usr/share/doc/faketime/" + /bin/sh: dm0755: command not found + +Signed-off-by: Lukas Fleischer +--- + Makefile | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/Makefile b/Makefile +index f90e18e..d0225ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,3 +1,5 @@ ++INSTALL = install ++ + all: + $(MAKE) -C src all + $(MAKE) -C test all +-- +1.7.8.4 + diff --git a/community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch b/community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch new file mode 100644 index 000000000..870349145 --- /dev/null +++ b/community/libfaketime/libfaketime-0.9.1-fix-as-needed.patch @@ -0,0 +1,39 @@ +From f0ee2ee1e0a2fa5f11614a55ab8543380faa9695 Mon Sep 17 00:00:00 2001 +From: Lukas Fleischer +Date: Sun, 22 Jan 2012 21:47:52 +0100 +Subject: [PATCH] Fix linking with "-Wl,--as-needed" + +Reorder linker flags in order to ensure proper linking when using +"--Wl,--as-needed". Read http://www.gentoo.org/proj/en/qa/asneeded.xml, +especially "Importance of linking order" for details: + + Basically, what the linker does is look for the symbols missing in a + given file (either an object file, a static archive or a library) + only in the files coming after it. When using the normal linking, + without --as-needed, this is not a problem, although there might be + some internal drawbacks on the linking stage, the files are linked + together without considering ordering. But with the flag, the + libraries that aren't used for resolving symbols are discarded and + thus not linked. + +Signed-off-by: Lukas Fleischer +--- + src/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 9118815..d4a04b5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -69,7 +69,7 @@ ${OBJ}: faketime.c + ${CC} -o $@ -c ${CFLAGS} ${EXTRA_FLAGS} $< + + lib%.so.${SONAME}: %.o +- ${CC} -o $@ -Wl,-soname,$@ ${LDFLAGS} $< ++ ${CC} -o $@ -Wl,-soname,$@ $< ${LDFLAGS} + + clean: + @rm -f ${OBJ} ${LIBS} +-- +1.7.8.4 + diff --git a/community/libvisual-projectm/PKGBUILD b/community/libvisual-projectm/PKGBUILD index ea201188d..76635d757 100644 --- a/community/libvisual-projectm/PKGBUILD +++ b/community/libvisual-projectm/PKGBUILD @@ -1,26 +1,36 @@ -# $Id: PKGBUILD 61634 2009-12-20 18:27:47Z andrea $ +# $Id: PKGBUILD 62640 2012-01-23 02:32:15Z lfleischer $ +# Maintainer: Lukas Fleischer # Contributor: Alexander Baldeck pkgname=libvisual-projectm pkgver=2.0.1 -pkgrel=1 -pkgdesc="ProjectM XMMS plugin" +pkgrel=3 +pkgdesc='ProjectM XMMS plugin.' arch=('i686' 'x86_64') -url="http://projectm.sourceforge.net/" +url='http://projectm.sourceforge.net/' license=('GPL') depends=('projectm>=2.0.1' 'libvisual' 'sdl') makedepends=('pkgconfig' 'cmake' 'libxext') options=('!libtool') -source=(http://downloads.sourceforge.net/projectm/projectM_libvisual-${pkgver}-Source.tar.gz) -md5sums=('35e09b09210d48b437e3574bd00b15a8') +source=("http://downloads.sourceforge.net/projectm/projectM_libvisual-${pkgver}-Source.tar.gz" + 'libvisual-projectm-gcc-4.6.patch') +md5sums=('35e09b09210d48b437e3574bd00b15a8' + 'a1fa2fd4fc85b1f27e32d400e17a3196') build() { - cd ${srcdir} - mkdir build - cd build - cmake ../projectM_libvisual-${pkgver}-Source \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release || return 1 - make || return - make DESTDIR=${pkgdir} install || return + cd "${srcdir}" + + # fix build failure with GCC 4.6 (taken from SVN, revision 1355) + (cd "projectM_libvisual-${pkgver}-Source" && patch -p3 -i ../libvisual-projectm-gcc-4.6.patch) + + mkdir build && cd build + + cmake "../projectM_libvisual-${pkgver}-Source" \ + -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } diff --git a/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch b/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch new file mode 100644 index 000000000..0e1234f83 --- /dev/null +++ b/community/libvisual-projectm/libvisual-projectm-gcc-4.6.patch @@ -0,0 +1,11 @@ +--- trunk/src/projectM-libvisual/actor_projectM.cpp 2009/02/20 19:07:44 1210 ++++ trunk/src/projectM-libvisual/actor_projectM.cpp 2011/05/06 12:04:58 1355 +@@ -209,7 +209,7 @@ + * we aren't with projectm, so just ignore :) */ + extern "C" VisPalette *lv_projectm_palette (VisPluginData *plugin) + { +- return NULL; ++ return (VisPalette *) NULL; + } + + /* This is where the real rendering happens! This function is what we call, many times diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD index 9937c04db..a93739555 100644 --- a/community/picard/PKGBUILD +++ b/community/picard/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 58419 2011-11-12 17:18:36Z ibiru $ +# $Id: PKGBUILD 62594 2012-01-22 09:34:17Z bisson $ # Maintainer: Gaetan Bisson # Maintainer: Mateusz Herych # Contributor: sysrq pkgname=picard pkgver=0.16 -pkgrel=3 +pkgrel=4 pkgdesc='Official MusicBrainz tagger' url='http://musicbrainz.org/doc/MusicBrainz_Picard' license=('GPL') arch=('i686' 'x86_64') depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg') -optdepends=('libdiscid: CD-Lookup feature') +optdepends=('libdiscid: CD lookup' + 'chromaprint: fingerprinting') source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") sha1sums=('274071410550ee29051bb0137d72602921a015f9') diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 790e9f4d0..5c7819708 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 138138 2011-09-17 10:36:09Z tpowa $ +# $Id: PKGBUILD 147125 2012-01-22 11:01:03Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Judd Vinet pkgname=mdadm -pkgver=3.2.2 -pkgrel=4 +pkgver=3.2.3 +pkgrel=1 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') -url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/" +url="http://neil.brown.name/blog/mdadm" groups=('base') conflicts=('mkinitcpio<0.7') depends=('glibc') @@ -18,23 +18,21 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm_install mdadm_hook mdadm_udev_install - disable-werror.patch - linux-3.0.patch) + disable-werror.patch) + install=mdadm.install replaces=('raidtools') -md5sums=('12ee2fbf3beddb60601fb7a4c4905651' +md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f' '6df172c8f77b280018cf87eb3d313f29' '00cbed931db4f15b6ce49e3e7d433966' '9b01e96b6c3c218fb61628c9281fe688' 'c8c0713f5c7da51822ee6f3911473a1c' 'cd258e1bf430c02a25f40b4329df9f57' - '4ad87b74a4bc9a34621280abe0e0c3e4' - 'c499b3edbf2c400c8a1984e18c7ce7fa') + '4ad87b74a4bc9a34621280abe0e0c3e4') build() { cd $srcdir/$pkgname-$pkgver patch -Np0 -i ../disable-werror.patch - patch -Np1 -i ../linux-3.0.patch make CXFLAGS="$CFLAGS" # build static mdassemble for Arch's initramfs make MDASSEMBLE_AUTO=1 mdassemble diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index be706f13f..47ef4f793 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147038 2012-01-21 00:32:06Z dreisner $ +# $Id: PKGBUILD 147123 2012-01-22 11:00:58Z tpowa $ # Maintainer: Tom Gundersen # Contributor: Aaron Griffin # Contributor: Tobias Powalowski @@ -6,23 +6,20 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=177 -pkgrel=3 +pkgver=178 +pkgrel=1 arch=(i686 x86_64) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" license=('GPL') groups=('base') options=(!makeflags !libtool) makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz - 0001-udevd-kill-hanging-event-processes-after-30-seconds.patch) +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz) +md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') build() { cd $srcdir/$pkgbase-$pkgver - # deal with broken drivers waiting for firmware to be loaded - patch -p1 -i ../0001-udevd-kill-hanging-event-processes-after-30-seconds.patch - ./configure --prefix=/usr \ --with-rootprefix= \ --sysconfdir=/etc \ @@ -103,5 +100,4 @@ package_udev-compat() { mknod cpu/microcode c 10 184 } -md5sums=('b4e00faf8153fd7202a7ef609284b0c3' - '3e40dca1c4f8194b4633e3befb4da4d4') +md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD index 3c61dbfca..ca0ca775e 100644 --- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD +++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core-shared/PKGBUILD @@ -16,7 +16,7 @@ pkgdesc="The GNU Compiler Collection for the MIPS/Loongson2f architecture (share url="http://www.gnu.org/software/binutils/" arch=('i686' 'x86_64') license=('GPL') -depends=('libmpc' 'sh' "cross-${_target}-binutils" 'cloog' 'ppl') +depends=('libmpc' 'sh' "${_target}-binutils" 'cloog' 'ppl') makedepends=("cross-${_target}-glibc-headers" "cross-${_target}-gcc-core") options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip') @@ -28,7 +28,7 @@ build() { mkdir gcc-build && cd gcc-build mkdir ${_target} - Copy headers for libgcc2 +# Copy headers for libgcc2 cp -av /usr/${_target}/usr/include ${_target}/include CC_FOR_BUILD=${CHOST}-gcc \ diff --git a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD index da49a903f..831236d42 100644 --- a/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD +++ b/cross/cross-mips64el-unknown-linux-gnu-gcc-core/PKGBUILD @@ -16,7 +16,7 @@ pkgdesc="The GNU Compiler Collection for the MIPS/Loongson2f architecture (stati url="http://www.gnu.org/software/binutils/" arch=('i686' 'x86_64') license=('GPL') -depends=('libmpc' 'sh' "cross-${_target}-binutils" 'cloog' 'ppl') +depends=('libmpc' 'sh' "${_target}-binutils" 'cloog' 'ppl') options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip') source=("ftp://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/${_pkgname}-${pkgver}.tar.bz2") md5sums=('028115c4fbfb6cfd75d6369f4a90d87e') diff --git a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD index a83a1238a..7fed7839a 100644 --- a/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD +++ b/cross/cross-mips64el-unknown-linux-gnu-glibc-headers/PKGBUILD @@ -21,7 +21,7 @@ url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=("${_target}-devel") depends=("${_target}-linux-api-headers>=3.1.6" 'tzdata') -makedepends=("cross-${_target}-binutils" +makedepends=("${_target}-binutils" "cross-${_target}-gcc-core") options=('!strip') install=glibc.install @@ -187,8 +187,12 @@ package() { # This will help gcc-shared to find headers for libgcc2 msg2 "Symlinking headers" - rm -r ${pkgdir}${_sysroot}/include +# rm -r ${pkgdir}${_sysroot}/include ln -s ${_sysroot}/usr/include ${pkgdir}${_sysroot}/include + ln -s ${_sysroot}/usr/lib/crt1.o ${pkgdir}${_sysroot}/lib/ + ln -s ${_sysroot}/usr/lib/crti.o ${pkgdir}${_sysroot}/lib/ + ln -s ${_sysroot}/usr/lib/crtn.o ${pkgdir}${_sysroot}/lib/ + ln -s ${_sysroot}/usr/lib/libc.so ${pkgdir}${_sysroot}/lib/ } md5sums=('6ffdf5832192b92f98bdd125317c0dfc' diff --git a/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD new file mode 100644 index 000000000..0349036ec --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD @@ -0,0 +1,53 @@ +# Contributor: Vojtech Horky + +_pkgname=binutils +_target="mips64el-unknown-linux-gnu" +_sysroot="/usr/${_target}" + +unset CFLAGS CXXFLAGS LDFLAGS + +pkgname=${_target}-binutils +pkgver=2.22 +pkgrel=1 +pkgdesc="A set of programs to assemble and manipulate binary and object files for the MIPS architecture" +url="http://www.gnu.org/software/binutils/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('zlib') +provices=("cross-${pkgname}") +source=("ftp://ftp.gnu.org/gnu/binutils/${_pkgname}-${pkgver}.tar.bz2") +md5sums=('ee0f10756c84979622b992a4a61ea3f5') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + + CFLAGS=" -pipe "\ + CXXFLAGS=" -pipe "\ + ./configure --build=${CHOST} \ + --host=${CHOST} \ + --target=${_target} \ + --prefix=/usr \ + --disable-nls \ + --disable-multilib \ + --disable-werror \ + --enable-ld=yes \ + --enable-gold=no \ + --with-sysroot=${_sysroot} + + make +} + +package() { + + cd ${srcdir}/${_pkgname}-${pkgver} +# Compat symlinks + ln -s ${_sysroot}/usr/lib ${pkgdir}${_sysroot}/lib + ln -s ${_sysroot}/lib ${pkgdir}${_sysroot}/lib32 + + make DESTDIR=${pkgdir} install + + rm -r ${pkgdir}/usr/{lib,share} + +# Create include dir so gcc-core doesn't complain + mkdir -p ${pkgdir}${_sysroot}/usr/include +} diff --git a/cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD new file mode 100644 index 000000000..975db9f9d --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-gcc/PKGBUILD @@ -0,0 +1,292 @@ +# $Id: PKGBUILD 145914 2012-01-04 01:24:56Z allan $ +# Maintainer: Allan McRae + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: libtool requires rebuilt with each new gcc version +_pkgname=gcc +_target="mips64el-unknown-linux-gnu" +_sysroot="/usr/${_target}" +_ARCH=mips + +unset LDFLAGS CFLAGS CXXFLAGS + +# Split package names must be changed manually +pkgname=("${_target}-gcc" "${_target}-gcc-libs" "${_target}-gcc-fortran" "${_target}-gcc-objc") # "gcc-ada" "gcc-go") +pkgver=4.6.2 +pkgrel=5 +_snapshot=4.6-20111223 +_libstdcppmanver=20111215 # Note: check source directory name when updating this +pkgdesc="The GNU Compiler Collection for MIPS/Loongson2f processors" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL' 'custom') +url="http://gcc.gnu.org" +makedepends=("${_target}-binutils>=2.22" "libmpc" "cloog" "ppl" + "cross-${_target}-gcc-core-shared" + "${_target}-glibc") +checkdepends=('dejagnu') +options=('!libtool' '!emptydirs' '!strip') +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2 + gcc_pure64.patch + gcc_mips64el_lib.patch + gcc-hash-style-both.patch) + +if [ -n "${_snapshot}" ]; then + _basedir="${srcdir}/gcc-${_snapshot}" +else + _basedir="${srcdir}/gcc-${pkgver}" +fi + +build() { + if [ ${NOEXTRACT} -eq 0 ]; then + cd ${_basedir} + + # Do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + if [ "${CARCH}" = "x86_64" ]; then + patch -Np1 -i ${srcdir}/gcc_pure64.patch + fi + patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch + patch -Np0 -i ${srcdir}/gcc_mips64el_lib.patch + + echo ${pkgver} > gcc/BASE-VER + + mkdir ${srcdir}/gcc-build + fi + + cd ${srcdir}/gcc-build + + CC_FOR_BUILD=${CHOST}-gcc \ + CFLAGS=" -pipe " \ + LDFLAGS= \ + CFLAGS_FOR_TARGET=" -EL -march=loongson2f -mabi=n32 " \ + CXXFLAGS_FOR_TARGET=" -EL -march=loongson2f -mabi=n32 " \ + LDFLAGS_FOR_TARGET=" -EL " \ + ${_basedir}/configure --prefix=/usr \ + --build=${CHOST} \ + --host=${CHOST} \ + --target=${_target} \ + --libexecdir=/usr/lib \ + --with-sysroot=${_sysroot} \ + --with-arch=loongson2f \ + --with-abi=n32 \ + --with-bugurl=https://bugs.parabolagnulinux.org/ \ + --enable-languages=c,c++,fortran,lto,objc,obj-c++ \ + --enable-shared \ + --enable-threads=posix \ + --with-system-zlib \ + --enable-__cxa_atexit \ + --disable-libunwind-exceptions \ + --enable-clocale=gnu \ + --enable-gnu-unique-object \ + --enable-linker-build-id \ + --with-ppl \ + --enable-cloog-backend=isl \ + --enable-lto \ + --enable-gold \ + --enable-ld=default \ + --enable-plugin \ + --with-plugin-ld=ld.gold \ + --disable-multilib \ + --disable-libssp \ + --disable-libstdcxx-pch \ + --enable-checking=release + + make +} + +check() { + cd gcc-build + + # increase stack size to prevent test failures + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 + ulimit -s 32768 + + # do not abort on error as some are "expected" + make -k check || true + ${_basedir}/contrib/test_summary +} + + +package_mips64el-unknown-linux-gnu-gcc-libs() +{ + pkgdesc="Runtime libraries shipped by GCC" + groups=("${_target}-devel") + depends=("${_target}-glibc>=2.14") + install=gcc-libs.install + + cd gcc-build + make -j1 -C ${_target}/libgcc DESTDIR=${pkgdir} install-shared + for lib in libmudflap libgomp libstdc++-v3/src; do + make -j1 -C $_target/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + done + make -j1 -C $_target/libstdc++-v3/po DESTDIR=${pkgdir} install + make -j1 -C $_target/libgomp DESTDIR=${pkgdir} install-info + + make -j1 DESTDIR=${pkgdir} install-target-libquadmath + make -j1 DESTDIR=${pkgdir} install-target-libgfortran + make -j1 DESTDIR=${pkgdir} install-target-libobjc + + # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} + rm -rf ${pkgdir}${_sysroot}/usr/lib{,32}/{gcc/,libgfortran.spec} + + rm -rf ${pkgdir}/usr/share + + # remove static libraries + find ${pkgdir} -name *.a -delete + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/${_target}-gcc-libs/RUNTIME.LIBRARY.EXCEPTION +} + +package_mips64el-unknown-linux-gnu-gcc() +{ + pkgdesc="The GNU Compiler Collection - C and C++ frontends" + depends=("${_target}-gcc-libs=$pkgver-$pkgrel" "${_target}-binutils>=2.22" 'libmpc' 'cloog' 'ppl') + groups=("${_target}-devel") + replaces=("cross-${_target}-gcc-core" + "cross-${_target}-gcc-core-shared") + install=gcc.install + + cd gcc-build + + # unfortunately it is much, much easier to install the lot and clean-up the mess... + make -j1 DESTDIR=${pkgdir} install + + rm -rf ${pkgdir}/usr/share + + rm -f $pkgdir/usr/bin/{{$_target-,}gfortran,{$_target-,}gccgo,gnat*} + rm -f $pkgdir${_sysroot}/lib{,32}/*.so* + rm -f $pkgdir${_sysroot}/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a + rm -f $pkgdir${_sysroot}/lib{,32}/libgfortran.spec + rm -rf $pkgdir/usr/lib{,32}/gcc/$_target/${pkgver}/{ada{include,lib},finclude,include/objc} + rm -f $pkgdir/usr/lib{,32}/gcc/$_target/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} + rm -f $pkgdir/usr/lib{,32}/gcc/$_target/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} + rm -rf $pkgdir/usr/lib{,32}/go + + # many packages require these symlinks + install -dm755 ${pkgdir}/lib + + ln -sf /usr/bin/cpp ${pkgdir}/lib/${_target}-cpp + ln -sf ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc + ln -sf ${_target}-g++ ${pkgdir}/usr/bin/${_target}-c++ + + # install gengtype for plugin support + install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$_target/${pkgver}/ + install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$_target/${pkgver}/ + + # POSIX conformance launcher scripts for c89 and c99 + cat > $pkgdir/usr/bin/${_target}-c89 <<"EOF" +#!/bin/sh +fl="-std=c89" +for opt; do + case "$opt" in + -ansi|-std=c89|-std=iso9899:1990) fl="";; + -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 + exit 1;; + esac +done +exec mips64el-unknown-linux-gnu-gcc $fl ${1+"$@"} +EOF + + cat > $pkgdir/usr/bin/${_target}-c99 <<"EOF" +#!/bin/sh +fl="-std=c99" +for opt; do + case "$opt" in + -std=c99|-std=iso9899:1999) fl="";; + -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 + exit 1;; + esac +done +exec mips64el-unknown-linux-gnu-gcc $fl ${1+"$@"} +EOF + + chmod 755 $pkgdir/usr/bin/${_target}-c{8,9}9 + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/${_target}-gcc/RUNTIME.LIBRARY.EXCEPTION +} + +package_mips64el-unknown-linux-gnu-gcc-fortran() +{ + pkgdesc="Fortran front-end for GCC" + depends=("${_target}-gcc=$pkgver-$pkgrel") + install=gcc-fortran.install + + cd gcc-build + make -j1 DESTDIR=${pkgdir} install-target-libquadmath + make -j1 DESTDIR=$pkgdir install-target-libgfortran + make -j1 -C $_target/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS + make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} + install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$_target/$pkgver/f951 + + # remove libraries included in gcc-libs + rm -f ${pkgdir}${_sysroot}/lib{,32}/lib{gfortran,quadmath}.so* + rm -fr ${pkgdir}/usr/share + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/${_target}-gcc-fortran/RUNTIME.LIBRARY.EXCEPTION +} + +package_mips64el-unknown-linux-gnu-gcc-objc() +{ + pkgdesc="Objective-C front-end for GCC" + depends=("${_target}-gcc=$pkgver-$pkgrel") + + cd gcc-build + make -j1 DESTDIR=$pkgdir install-target-libobjc + install -dm755 $pkgdir/usr/lib/gcc/$_target/$pkgver/ + install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$_target/$pkgver/ + + # remove libraries included in gcc-libs + rm -f ${pkgdir}${_sysroot}/lib{,32}/libobjc.so* + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/${_target}-gcc-objc/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-ada() +{ + pkgdesc="Ada front-end for GCC (GNAT)" + depends=("${_target}-gcc=$pkgver-$pkgrel") + install=gcc-ada.install + + cd gcc-build/gcc + make -j1 DESTDIR=$pkgdir ada.install-{common,info} + install -m755 gnat1 $pkgdir/usr/lib/gcc/$_target/$pkgver + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-go() +{ + pkgdesc="Go front-end for GCC" + depends=("${_target}-gcc=$pkgver-$pkgrel") + install=gcc-go.install + + cd gcc-build + make -j1 DESTDIR=$pkgdir install-target-libgo + make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} + install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$_target/$pkgver/go1 + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION +} +md5sums=('4755b9f6ac0abecbaa2097ed9738406a' + '450772ce32daed97d7383199f8797f33' + '4030ee1c08dd1e843c0225b772360e76' + '67e337993d821d72fccacbed52d48c34' + '4df25b623799b148a0703eaeec8fdf3f') diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install new file mode 100644 index 000000000..df0553a4f --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-gcc/gcc-ada.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install new file mode 100644 index 000000000..b15d89a97 --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-gcc/gcc-fortran.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +file="gfortran.info" + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null +} diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install new file mode 100644 index 000000000..7dc50dee5 --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-gcc/gcc-go.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gccgo.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch b/cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch new file mode 100644 index 000000000..8b59f4535 --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-gcc/gcc-hash-style-both.patch @@ -0,0 +1,122 @@ +--- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 +@@ -41,7 +41,7 @@ + + #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER + +-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ ++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ + %{O*:-O3} %{!O*:-O1} \ + %{shared:-shared} \ + %{!shared: \ +--- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 ++++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -78,7 +78,7 @@ + %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" + + #undef LINK_SPEC +-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ ++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 ++++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -104,7 +104,7 @@ + { "dynamic_linker", LINUX_DYNAMIC_LINKER } + + #undef LINK_SPEC +-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ ++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +--- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -64,7 +64,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "\ ++#define LINK_SPEC "--hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 ++++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 +@@ -389,11 +389,11 @@ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) + + +-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" + +-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" + +--- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 ++++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 +@@ -830,7 +830,7 @@ + #define LINUX_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) + +-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" + +--- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -77,7 +77,7 @@ + + #undef LINK_SPEC + #define LINK_SPEC \ +- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ ++ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{static:-static} \ +--- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 ++++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -113,7 +113,7 @@ + { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ + { "link_arch", LINK_ARCH_SPEC }, + +-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ ++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -121,7 +121,7 @@ + %{static:-static}} \ + " + +-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -193,7 +193,7 @@ + #else /* !SPARC_BI_ARCH */ + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +--- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 ++++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -74,7 +74,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ ++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ + %{!mno-relax:%{!r:-relax}} \ + %{!shared: \ + %{!static: \ diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install new file mode 100644 index 000000000..23553b8f0 --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-gcc/gcc-libs.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +filelist=(libgomp.info libquadmath.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc.install b/cross/mips64el-unknown-linux-gnu-gcc/gcc.install new file mode 100644 index 000000000..3407a5e1f --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-gcc/gcc.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch b/cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch new file mode 100644 index 000000000..425758e88 --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-gcc/gcc_mips64el_lib.patch @@ -0,0 +1,25 @@ +--- gcc/config/mips/t-linux64.orig 2011-04-09 20:28:51.729723495 -0300 ++++ gcc/config/mips/t-linux64 2011-04-09 20:29:06.913724013 -0300 +@@ -18,7 +18,7 @@ + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64 + + EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o + +--- gcc/config/mips/linux64.h.orig 2011-04-09 20:27:06.909723735 -0300 ++++ gcc/config/mips/linux64.h 2011-04-09 20:28:16.033723803 -0300 +@@ -35,9 +35,9 @@ + %{!shared: \ + %{profile:-lc_p} %{!profile:-lc}}" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) diff --git a/cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch b/cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch new file mode 100644 index 000000000..8c0baf8e2 --- /dev/null +++ b/cross/mips64el-unknown-linux-gnu-gcc/gcc_pure64.patch @@ -0,0 +1,26 @@ +diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h +--- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 ++++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 +@@ -49,8 +49,8 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #undef LINK_SPEC + #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ +diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 +--- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 ++++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 +@@ -6,7 +6,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib32 + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib diff --git a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD index e5e37beee..18de66776 100644 --- a/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD +++ b/cross/mips64el-unknown-linux-gnu-glibc/PKGBUILD @@ -4,11 +4,21 @@ # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: valgrind requires rebuilt with each major glibc version +# NOTE: I had to run this after installing target-glibc to build target-gcc: +# for lib in /usr/${_target}/usr/lib/*; do +# ln -s ${lib} /usr/${_target}/lib/$(basename ${lib} +# done +# gcc build should probably add a -B flag to usr/lib instead + _pkgname=glibc _target="mips64el-unknown-linux-gnu" _sysroot="/usr/${_target}" _ARCH=mips +# Disable this after building final gcc +# Otherwise you'll get ld: missing libc.so errors +BOOTSTRAPING=true + unset CFLAGS CXXFLAGS LDFLAGS pkgname=${_target}-glibc @@ -21,7 +31,7 @@ url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=("${_target}-devel") depends=("${_target}-linux-api-headers>=3.1.6" 'tzdata') -makedepends=("cross-${_target}-binutils" +makedepends=("${_target}-binutils" "cross-${_target}-gcc-core-shared" "cross-${_target}-glibc-headers") backup=(etc/gai.conf @@ -174,7 +184,7 @@ build() { # --libdir=${_sysroot}/usr/lib \ # --libexecdir=${_sysroot}/usr/lib \ - + # build libraries with hardening disabled echo "build-programs=no" >> configparms make @@ -202,6 +212,16 @@ package() { rm -f ${pkgdir}${_sysroot}/etc/ld.so.{cache,conf} +# Compat symlinks + ln -s ${_sysroot}/usr/lib ${pkgdir}${_sysroot}/lib + ln -s ${_sysroot}/lib ${pkgdir}${_sysroot}/lib32 + +# Fix libc.so to find correct libraries + if ${BOOTSTRAPING}; then + sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libc.so + sed -i "s|/lib|${_sysroot}&|g" ${pkgdir}${_sysroot}/usr/lib/libpthreads.so + fi + install -dm755 ${pkgdir}${_sysroot}/etc/rc.d install -dm755 ${pkgdir}${_sysroot}/usr/sbin install -dm755 ${pkgdir}${_sysroot}/usr/lib/locale diff --git a/extra/gstreamer0.10-ffmpeg/PKGBUILD b/extra/gstreamer0.10-ffmpeg/PKGBUILD index eed8e4f3d..0e4dade8f 100644 --- a/extra/gstreamer0.10-ffmpeg/PKGBUILD +++ b/extra/gstreamer0.10-ffmpeg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138452 2011-09-23 18:40:52Z ibiru $ +# $Id: PKGBUILD 147131 2012-01-22 11:26:07Z andyrtr $ # Maintainer: Jan de Groot pkgname=gstreamer0.10-ffmpeg -pkgver=0.10.12 +pkgver=0.10.13 pkgrel=1 pkgdesc="Gstreamer FFMpeg Plugin" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.gstreamer.net" groups=('gstreamer0.10-plugins') options=('!libtool') source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2) -sha256sums=('b17707102b4bfa5e0d5095be3608ee2d4388268eab822c9a0ce7a18011bdd73b') +sha256sums=('76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62') build() { cd "${srcdir}/gst-ffmpeg-${pkgver}" diff --git a/extra/gstreamer0.10-python/PKGBUILD b/extra/gstreamer0.10-python/PKGBUILD index a4e6c86ec..2af9448a8 100644 --- a/extra/gstreamer0.10-python/PKGBUILD +++ b/extra/gstreamer0.10-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 109061 2011-02-05 16:24:50Z andyrtr $ +# $Id: PKGBUILD 147133 2012-01-22 11:30:42Z andyrtr $ # Maintainer: Jan de Groot pkgname=gstreamer0.10-python -pkgver=0.10.21 +pkgver=0.10.22 pkgrel=1 pkgdesc="Python bindings for GStreamer 0.10" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('pygobject>=2.20.0' 'gstreamer0.10-base>=0.10.32') makedepends=('pkgconfig') options=('!libtool') source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2) -md5sums=('31340ae3e877797a10d088a226d74b16') +md5sums=('937152fe896241f827689f4b53e79b22') build() { cd "${srcdir}/gst-python-${pkgver}" diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index 8dd7c0a3a..4b83ae0f5 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,12 +4,12 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0rc3 -_pkgver=0.8.98 +pkgver=0.9.0rc4 +_pkgver=0.8.99 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') -url="http://www.kde.org/" +url='https://projects.kde.org/projects/extragear/base/networkmanagement' license=('GPL') depends=('kdebase-workspace' 'networkmanager') makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info' @@ -18,7 +18,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("http://download.kde.org/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2") -sha1sums=('f46274c4cca722f37eef7418144c0c04bfe21e24') +sha1sums=('18d625a25b90f9591a5cfdabcf77269eb3ba33e0') build() { cd "${srcdir}" diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD index 8dc909b3d..6e974845c 100644 --- a/extra/libgee/PKGBUILD +++ b/extra/libgee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142433 2011-11-09 18:26:23Z ibiru $ +# $Id: PKGBUILD 147137 2012-01-22 20:17:23Z ibiru $ # Maintainer : Ionut Biru # Contributor: Sergej Pupykin pkgname=libgee -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc="GObject collection library" url="http://live.gnome.org/Libgee" @@ -13,7 +13,7 @@ depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/$pkgname-$pkgver.tar.xz) -sha256sums=('6b1ef59e26dd10feed279fdd7cc49c3391e124d31c46ac56c410ba0ce3bd1716') +sha256sums=('55f39f3b28e676f6cbd9377d83edd031084436a4da41280a9503c94faffb1665') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index bb1327fdd..bda699447 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145182 2011-12-19 11:45:17Z jgc $ +# $Id: PKGBUILD 147127 2012-01-22 11:06:04Z andyrtr $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.18.2 +pkgver=0.18.3 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -14,14 +14,14 @@ _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 git-fixes.patch) -md5sums=('38616927823ef01937aab26872e957e4' +md5sums=('d70d2d63d8acd29c97185f7e5f09c9b4' '9dc64c254a31e570507bdd4ad4ba629a' 'af56b7b1b24a08f7498a0c7f5e862b93') build() { cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac - patch -Np1 -i "${srcdir}/git-fixes.patch" + #patch -Np1 -i "${srcdir}/git-fixes.patch" autoreconf -fi diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD index eca1068a5..7392bd2d6 100644 --- a/extra/sg3_utils/PKGBUILD +++ b/extra/sg3_utils/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 109019 2011-02-05 11:24:51Z andyrtr $ +#$Id: PKGBUILD 147121 2012-01-22 10:55:51Z andyrtr $ # Maintainer: Daniel Isenmann pkgname=sg3_utils -pkgver=1.30 +pkgver=1.33 pkgrel=1 pkgdesc="Generic SCSI utilities" arch=(i686 x86_64) @@ -11,7 +11,7 @@ license=('GPL' 'custom:BSD') depends=('glibc') options=('!libtool') source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz) -md5sums=('8acb9328abe17d012db8c5f95f1d7d75') +md5sums=('261e39f7161337330ba6bd57999be801') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 77c59507d..d9a74afbd 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145186 2011-12-19 11:53:19Z jgc $ +# $Id: PKGBUILD 147119 2012-01-22 10:53:02Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xterm -pkgver=276 +pkgver=278 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('50ca8ee40e8a0992019f8f35042c9abb' +md5sums=('3eeddfe35cb0a2db1924cfe0c20be443' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/multilib/lib32-kmod/PKGBUILD b/multilib/lib32-kmod/PKGBUILD new file mode 100644 index 000000000..5f860b7b3 --- /dev/null +++ b/multilib/lib32-kmod/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 146696 2012-01-16 19:19:14Z dreisner $ +# Maintainer: Dave Reisner + +pkgname=lib32-kmod +_pkgbasename=kmod +pkgver=4 +pkgrel=1 +pkgdesc="Linux kernel module handling" +arch=('x86_64') +url="http://git.profusion.mobi/cgit.cgi/kmod.git" +license=('GPL2') +depends=('lib32-glibc' 'lib32-zlib' "$_pkgbasename") +makedepends=('gcc-multilib') +options=('!libtool') +source=("http://packages.profusion.mobi/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz") +md5sums=('e14450a066a48accd0af1995b3c0232d') + +build() { + cd "$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure \ + --libdir=/usr/lib32 \ + --sysconfdir=/etc \ + --disable-tools \ + --with-rootprefix= \ + --with-zlib + + make +} + +package() { + make -C "$_pkgbasename-$pkgver" DESTDIR="$pkgdir" install + + # nuke manpages and headers + rm -rf "$pkgdir"/usr/{share,include,bin} +} + +# vim: ft=sh syn=sh et diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD index 36240f6c1..a99efb154 100644 --- a/multilib/lib32-udev/PKGBUILD +++ b/multilib/lib32-udev/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 60965 2011-12-19 19:41:38Z lcarlier $ +# $Id: PKGBUILD 62609 2012-01-22 19:02:33Z lcarlier $ # Maintainer: Aaron Griffin # Maintainer: Tobias Powalowski # Maintainer: Thomas Bächler pkgname=('lib32-udev') -pkgver=175 +pkgver=178 pkgrel=1 arch=('x86_64') pkgdesc="The userspace dev tools (udev) (32-bit)" url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') options=(!makeflags !libtool) -depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') +depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'lib32-kmod' 'lib32-util-linux' 'udev') makedepends=('gcc-multilib' 'gperf') -#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) -source=(http://people.freedesktop.org/~kay/udev/udev-$pkgver.tar.bz2) -md5sums=('2fc9c1efcbde98e3d73ffee7a77aea47') +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.xz) +md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') build() { export CC="gcc -m32" diff --git a/staging/at-spi/PKGBUILD b/staging/at-spi/PKGBUILD new file mode 100644 index 000000000..8cb6c20e9 --- /dev/null +++ b/staging/at-spi/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 147108 2012-01-22 10:16:03Z andyrtr $ +# Maintainer: Jan de Groot + +pkgname=at-spi +pkgver=1.32.0 +pkgrel=5 +pkgdesc="Assistive Technology Service Provider Interface" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libbonobo' 'libxtst' 'gtk2' 'gconf') +makedepends=('pkgconfig' 'python2' 'intltool' 'libice' 'libsm') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=at-spi.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039') + +# !! make sure you 'pacman -Rsc python' from your chroot before building the package or it would use python3 instead of the wanted python2 !! + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/at-spi \ + --enable-relocate + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain at-spi "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas +} diff --git a/staging/at-spi/at-spi.install b/staging/at-spi/at-spi.install new file mode 100644 index 000000000..b4c75b51c --- /dev/null +++ b/staging/at-spi/at-spi.install @@ -0,0 +1,17 @@ +pkgname=at-spi + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/staging/cairomm/PKGBUILD b/staging/cairomm/PKGBUILD new file mode 100644 index 000000000..d8c952616 --- /dev/null +++ b/staging/cairomm/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147110 2012-01-22 10:23:49Z andyrtr $ +# Maintainer: Kevin +# Contributor: criminy + +pkgname=cairomm +pkgver=1.10.0 +pkgrel=2 +pkgdesc="C++ bindings to Cairo vector graphics library" +arch=('i686' 'x86_64') +url="http://www.cairographics.org" +license=('LGPL' 'MPL') +depends=('cairo' 'libsigc++') +makedepends=('pkgconfig') +source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz) +options=('!libtool' '!emptydirs') +sha1sums=('f08bf8a331067f0d1e876523f07238fba6b26b99') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gstreamer0.10-good/PKGBUILD b/staging/gstreamer0.10-good/PKGBUILD new file mode 100644 index 000000000..66e079f98 --- /dev/null +++ b/staging/gstreamer0.10-good/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 147113 2012-01-22 10:40:14Z andyrtr $ +# Maintainer: Jan de Groot + +pkgbase=gstreamer0.10-good +pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') +pkgver=0.10.30 +pkgrel=2 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') +url="http://gstreamer.freedesktop.org/" +options=(!libtool !emptydirs) +source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2) +sha256sums=('b12cba90b27d8423cd0a808939098d19db3996cfb9bf528507c6321782e095f6') + +build() { + cd "${srcdir}/gst-plugins-good-${pkgver}" + sed -i '/AC_PATH_XTRA/d' configure.ac + autoreconf + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --disable-schemas-install \ + --disable-hal \ + --disable-esd \ + --with-package-name="GStreamer Good Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + + make + sed -e 's/gst sys ext/gst/' -i Makefile +} + +package_gstreamer0.10-good() { + depends=('gstreamer0.10-base>=0.10.34' 'bzip2') + pkgdesc="GStreamer Multimedia Framework Good plugin libraries" + + cd "${srcdir}/gst-plugins-good-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}/etc/gconf" +} + +package_gstreamer0.10-good-plugins() { + depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') + pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" + groups=('gstreamer0.10-plugins') + replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') + conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') + install=gstreamer0.10-good-plugins.install + + cd "${srcdir}/gst-plugins-good-${pkgver}" + make -C sys DESTDIR="${pkgdir}" install + make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas" +} diff --git a/staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install new file mode 100644 index 000000000..e343beea5 --- /dev/null +++ b/staging/gstreamer0.10-good/gstreamer0.10-good-plugins.install @@ -0,0 +1,19 @@ +pkgname=gstreamer0.10-good-plugins + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + pre_remove + fi +} + +post_upgrade() { + post_install +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD index a34a01a83..d05f4945e 100644 --- a/staging/poppler/PKGBUILD +++ b/staging/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147049 2012-01-21 04:25:49Z eric $ +# $Id: PKGBUILD 147129 2012-01-22 11:12:11Z andyrtr $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.18.2 +pkgver=0.18.3 pkgrel=2 arch=(i686 x86_64) license=('GPL') @@ -14,14 +14,14 @@ _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 git-fixes.patch) -md5sums=('38616927823ef01937aab26872e957e4' +md5sums=('d70d2d63d8acd29c97185f7e5f09c9b4' '9dc64c254a31e570507bdd4ad4ba629a' 'af56b7b1b24a08f7498a0c7f5e862b93') build() { cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac - patch -Np1 -i "${srcdir}/git-fixes.patch" + #patch -Np1 -i "${srcdir}/git-fixes.patch" autoreconf -fi diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD new file mode 100644 index 000000000..52303eec2 --- /dev/null +++ b/staging/vlc/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 147135 2012-01-22 12:28:59Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Sarah Hay +# Contributor: Martin Sandsmark + +pkgname=vlc +pkgver=1.1.13 +pkgrel=2 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') +url="http://www.videolan.org/vlc/" +license=('GPL') +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' 'xcb-util-keysyms' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' + 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' + 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' + 'lirc-utils' 'gnutls' 'libcaca') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'libpulse: PulseAudio support' + 'vdpau-video: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') +backup=('usr/share/vlc/http/.hosts' + 'usr/share/vlc/http/dialogs/.hosts' + 'usr/share/vlc/lua/http/.hosts' + 'usr/share/vlc/lua/http/dialogs/.hosts') +options=('!libtool') +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('9678fb7a04808b6e0de63746d35e4bb1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-faad \ + --enable-v4l \ + --enable-snapshot \ + --enable-dbus-control \ + --enable-nls \ + --enable-lirc \ + --enable-pvr \ + --enable-ncurses \ + --with-live555-tree=/usr/lib/live \ + --enable-upnp \ + --enable-realrtsp + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + for res in 16 32 48 128; do + install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + done +} diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install new file mode 100644 index 000000000..dc4961cae --- /dev/null +++ b/staging/vlc/vlc.install @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/~mtjm/cups-usblp/PKGBUILD b/~mtjm/cups-usblp/PKGBUILD new file mode 100644 index 000000000..43687b104 --- /dev/null +++ b/~mtjm/cups-usblp/PKGBUILD @@ -0,0 +1,134 @@ +# $Id: PKGBUILD 135897 2011-08-20 06:24:46Z andyrtr $ +# Maintainer: Andreas Radke + +_pkgname="cups" +pkgname="cups-usblp" +pkgver=1.5.0 +pkgrel=1.1 +pkgdesc="The CUPS Printing System - daemon package, with usblp backend" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://www.cups.org/" +depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'dbus-core' 'hicolor-icon-theme') +makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' + 'xinetd' 'gzip' 'autoconf' 'php' 'dbus-core' 'avahi' 'hicolor-icon-theme') +optdepends=('php: for included phpcups.so module' + 'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' + 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' + 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly' + 'xdg-utils: xdg .desktop file support') +provides=("${_pkgname}=${pkgver}") +conflicts=("${_pkgname}") +backup=(etc/cups/cupsd.conf + etc/cups/mime.convs + etc/cups/mime.types + etc/cups/snmp.conf + etc/cups/printers.conf + etc/cups/classes.conf + etc/cups/client.conf + etc/cups/subscriptions.conf + etc/dbus-1/system.d/cups.conf + etc/logrotate.d/cups + etc/pam.d/cups + etc/xinetd.d/cups-lpd) +install=cups.install +source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 + cups-avahi.patch + cups-no-export-ssllibs.patch + cups-no-gcrypt.patch + cups cups.logrotate cups.pam) +#options=('!emptydirs') +md5sums=('e54ed09ede2340fc3014913333520fe4' + 'e0843e8d8c345792ac73a185260e69fe' + '9b8467a1e51d360096b70e2c3c081e6c' + '3733c23e77eb503bd94cc368e02830dc' + '9657daa21760bb0b5fa3d8b51d5e01a1' + 'f861b18f4446c43918c8643dcbbd7f6d' + '96f82c38f3f540b53f3e5144900acf17') + +# move client.conf man page for next update to the client pkg. + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + # Avahi support in the dnssd backend. patch from Debian based on the Fedora work but brings it in a single file http://patch-tracker.debian.org/package/cups + patch -Np1 -i ${srcdir}/cups-avahi.patch + + # Do not export SSL libs in cups-config + patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch" + + patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch" + + # Rebuild configure script for --enable-avahi. + aclocal -I config-scripts + autoconf -I config-scripts + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir=/usr/lib \ + --with-logdir=/var/log/cups \ + --with-docdir=/usr/share/cups/doc \ + --with-cups-user=daemon \ + --with-cups-group=lp \ + --enable-pam=yes \ + --disable-ldap \ + --enable-raw-printing \ + --enable-dbus --with-dbusdir=/etc/dbus-1 \ + --enable-ssl=yes --enable-gnutls \ + --enable-threads \ + --enable-avahi\ + --with-php=/usr/bin/php-cgi \ + --with-pdftops=pdftops \ + --with-optim="$CFLAGS" \ + --disable-libusb + make +} + +check() { + cd "$srcdir/$_pkgname-$pkgver" + #httpAddrGetList(workstation64): FAIL + #1 TESTS FAILED! + #make[1]: *** [testhttp] Error 1 + make -k check || /bin/true +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + make BUILDROOT=${pkgdir} install-data install-exec + + # this one we ship in the libcups pkg + rm -f ${pkgdir}/usr/bin/cups-config + + # kill the sysv stuff + rm -rf ${pkgdir}/etc/rc*.d + rm -rf ${pkgdir}/etc/init.d + install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd + install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups + install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups + + # fix perms on /var/spool and /etc + chmod 755 ${pkgdir}/var/spool + chmod 755 ${pkgdir}/etc + + # serial backend needs to run as root (http://bugs.archlinux.org/task/20396) + chmod 700 ${pkgdir}/usr/lib/cups/backend/serial + + # install ssl directory where to store the certs, solves some samba issues + install -dm700 -g lp ${pkgdir}/etc/cups/ssl + # remove directory from package, we create it in cups rc.d file + rm -rf ${pkgdir}/var/run +# install -dm511 -g lp ${pkgdir}/var/run/cups/certs + + # install some more configuration files that will get filled by cupsd + touch ${pkgdir}/etc/cups/printers.conf + touch ${pkgdir}/etc/cups/classes.conf + touch ${pkgdir}/etc/cups/client.conf + echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf + echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf + touch ${pkgdir}/etc/cups/subscriptions.conf + chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf} + + # fix .desktop file + sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop + + # compress some driver files, adopted from Fedora + find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f +} diff --git a/~mtjm/cups-usblp/cups b/~mtjm/cups-usblp/cups new file mode 100644 index 000000000..744c8e663 --- /dev/null +++ b/~mtjm/cups-usblp/cups @@ -0,0 +1,68 @@ +#!/bin/bash + +daemon_name=cupsd + +. /etc/rc.conf +. /etc/rc.d/functions +#. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/~mtjm/cups-usblp/cups-avahi.patch b/~mtjm/cups-usblp/cups-avahi.patch new file mode 100644 index 000000000..7e9c8ecea --- /dev/null +++ b/~mtjm/cups-usblp/cups-avahi.patch @@ -0,0 +1,3156 @@ +Description: Avahi support +Bug: http://www.cups.org/str.php?L3066 +Author: Tim Waugh +Origin: git clone http://twaugh.fedorapeople.org/cups-avahi.git (Aug 11, 2011) + +--- a/backend/dnssd.c ++++ b/backend/dnssd.c +@@ -15,14 +15,21 @@ + * + * Contents: + * ++ * next_txt_record() - Get next TXT record from a cups_txt_records_t. ++ * parse_txt_record_pair() - Read key/value pair in cups_txt_records_t. + * main() - Browse for printers. + * browse_callback() - Browse devices. + * browse_local_callback() - Browse local devices. + * compare_devices() - Compare two devices. + * exec_backend() - Execute the backend that corresponds to the + * resolved service name. ++ * device_type() - Get DNS-SD type enumeration from string. + * get_device() - Create or update a device. + * query_callback() - Process query data. ++ * avahi_client_callback() - Avahi client callback function. ++ * avahi_query_callback() - Avahi query callback function. ++ * avahi_browse_callback() - Avahi browse callback function. ++ * find_device() - Find a device from its name and domain. + * sigterm_handler() - Handle termination signals... + * unquote() - Unquote a name string. + */ +@@ -33,7 +40,18 @@ + + #include "backend-private.h" + #include +-#include ++#ifdef HAVE_DNSSD ++# include ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include ++# include ++# include ++# include ++# include ++# include ++#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX ++#endif /* HAVE_AVAHI */ + + + /* +@@ -53,7 +71,12 @@ + + typedef struct + { ++#ifdef HAVE_DNSSD + DNSServiceRef ref; /* Service reference for resolve */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ int resolved; /* Did we resolve the device? */ ++#endif /* HAVE_AVAHI */ + char *name, /* Service name */ + *domain, /* Domain name */ + *fullName, /* Full name */ +@@ -65,6 +88,20 @@ + sent; /* Did we list the device? */ + } cups_device_t; + ++typedef struct ++{ ++ char key[256]; ++ char value[256]; ++ ++#ifdef HAVE_DNSSD ++ const uint8_t *data; ++ const uint8_t *datanext; ++ const uint8_t *dataend; ++#else /* HAVE_AVAHI */ ++ AvahiStringList *txt; ++#endif /* HAVE_DNSSD */ ++} cups_txt_records_t; ++ + + /* + * Local globals... +@@ -78,6 +115,7 @@ + * Local functions... + */ + ++#ifdef HAVE_DNSSD + static void browse_callback(DNSServiceRef sdRef, + DNSServiceFlags flags, + uint32_t interfaceIndex, +@@ -93,12 +131,6 @@ + const char *regtype, + const char *replyDomain, + void *context); +-static int compare_devices(cups_device_t *a, cups_device_t *b); +-static void exec_backend(char **argv); +-static cups_device_t *get_device(cups_array_t *devices, +- const char *serviceName, +- const char *regtype, +- const char *replyDomain); + static void query_callback(DNSServiceRef sdRef, + DNSServiceFlags flags, + uint32_t interfaceIndex, +@@ -107,9 +139,118 @@ + uint16_t rrclass, uint16_t rdlen, + const void *rdata, uint32_t ttl, + void *context); ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++static void avahi_client_callback (AvahiClient *client, ++ AvahiClientState state, ++ void *context); ++static void avahi_browse_callback (AvahiServiceBrowser *browser, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiBrowserEvent event, ++ const char *serviceName, ++ const char *regtype, ++ const char *replyDomain, ++ AvahiLookupResultFlags flags, ++ void *context); ++#endif /* HAVE_AVAHI */ ++ ++static cups_device_t * find_device (cups_array_t *devices, ++ cups_txt_records_t *txt, ++ cups_device_t *dkey); ++static int compare_devices(cups_device_t *a, cups_device_t *b); ++static void exec_backend(char **argv); ++static cups_device_t *get_device(cups_array_t *devices, ++ const char *serviceName, ++ const char *regtype, ++ const char *replyDomain); + static void sigterm_handler(int sig); + static void unquote(char *dst, const char *src, size_t dstsize); + ++#ifdef HAVE_AVAHI ++static AvahiSimplePoll *simple_poll = NULL; ++static int avahi_got_callback; ++#endif /* HAVE_AVAHI */ ++ ++ ++/* ++ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t. ++ */ ++ ++static cups_txt_records_t * ++next_txt_record (cups_txt_records_t *txt) ++{ ++#ifdef HAVE_DNSSD ++ txt->data = txt->datanext; ++#else /* HAVE_AVAHI */ ++ txt->txt = avahi_string_list_get_next (txt->txt); ++ if (txt->txt == NULL) ++ return NULL; ++#endif /* HAVE_DNSSD */ ++ ++ return txt; ++} ++ ++ ++/* ++ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t. ++ */ ++ ++static int ++parse_txt_record_pair (cups_txt_records_t *txt) ++{ ++#ifdef HAVE_DNSSD ++ uint8_t datalen; ++ uint8_t *data = txt->data; ++ char *ptr; ++ ++ /* ++ * Read a key/value pair starting with an 8-bit length. Since the ++ * length is 8 bits and the size of the key/value buffers is 256, we ++ * don't need to check for overflow... ++ */ ++ ++ datalen = *data++; ++ if (!datalen || (data + datalen) >= txt->dataend) ++ return NULL; ++ txt->datanext = data + datalen; ++ ++ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) ++ *ptr++ = *data; ++ *ptr = '\0'; ++ ++ if (data < txt->datanext && *data == '=') ++ { ++ data++; ++ ++ if (data < datanext) ++ memcpy (txt->value, data, txt->datanext - data); ++ value[txt->datanext - data] = '\0'; ++ } ++ else ++ return 1; ++#else /* HAVE_AVAHI */ ++ char *key, *value; ++ size_t len; ++ avahi_string_list_get_pair (txt->txt, &key, &value, &len); ++ if (len > sizeof (txt->value) - 1) ++ len = sizeof (txt->value) - 1; ++ ++ memcpy (txt->value, value, len); ++ txt->value[len] = '\0'; ++ len = strlen (key); ++ if (len > sizeof (txt->key) - 1) ++ len = sizeof (txt->key) - 1; ++ ++ memcpy (txt->key, key, len); ++ txt->key[len] = '\0'; ++ avahi_free (key); ++ avahi_free (value); ++#endif /* HAVE_AVAHI */ ++ ++ return 0; ++} ++ + + /* + * 'main()' - Browse for printers. +@@ -120,6 +261,13 @@ + char *argv[]) /* I - Command-line arguments */ + { + const char *name; /* Backend name */ ++ cups_array_t *devices; /* Device array */ ++ cups_device_t *device; /* Current device */ ++ char uriName[1024]; /* Unquoted fullName for URI */ ++#ifdef HAVE_DNSSD ++ int fd; /* Main file descriptor */ ++ fd_set input; /* Input set for select() */ ++ struct timeval timeout; /* Timeout for select() */ + DNSServiceRef main_ref, /* Main service reference */ + fax_ipp_ref, /* IPP fax service reference */ + ipp_ref, /* IPP service reference */ +@@ -133,12 +281,11 @@ + pdl_datastream_ref, /* AppSocket service reference */ + printer_ref, /* LPD service reference */ + riousbprint_ref; /* Remote IO service reference */ +- int fd; /* Main file descriptor */ +- fd_set input; /* Input set for select() */ +- struct timeval timeout; /* Timeout for select() */ +- cups_array_t *devices; /* Device array */ +- cups_device_t *device; /* Current device */ +- char uriName[1024]; /* Unquoted fullName for URI */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ AvahiClient *client; ++ int error; ++#endif /* HAVE_AVAHI */ + #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) + struct sigaction action; /* Actions for POSIX signals */ + #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ +@@ -198,6 +345,49 @@ + * Browse for different kinds of printers... + */ + ++#ifdef HAVE_AVAHI ++ if ((simple_poll = avahi_simple_poll_new ()) == NULL) ++ { ++ perror ("ERROR: Unable to create avahi simple poll object"); ++ return (1); ++ } ++ ++ client = avahi_client_new (avahi_simple_poll_get (simple_poll), ++ 0, avahi_client_callback, NULL, &error); ++ if (!client) ++ { ++ perror ("DEBUG: Unable to create avahi client"); ++ return (0); ++ } ++ ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_fax-ipp._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_ipp._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_ipp-tls._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_pdl-datastream._tcp", ++ NULL, 0, ++ avahi_browse_callback, ++ devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_printer._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ "_riousbprint._tcp", NULL, 0, ++ avahi_browse_callback, devices); ++#endif /* HAVE_AVAHI */ ++#ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) + { + perror("ERROR: Unable to create service connection"); +@@ -258,6 +448,7 @@ + riousbprint_ref = main_ref; + DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, + "_riousbprint._tcp", NULL, browse_callback, devices); ++#endif /* HAVE_DNSSD */ + + /* + * Loop until we are killed... +@@ -265,6 +456,9 @@ + + while (!job_canceled) + { ++ int announce = 0; ++ ++#ifdef HAVE_DNSSD + FD_ZERO(&input); + FD_SET(fd, &input); + +@@ -284,11 +478,35 @@ + } + else + { ++ announce = 1; ++ } ++#else /* HAVE_AVAHI */ ++ int r; ++ avahi_got_callback = 0; ++ r = avahi_simple_poll_iterate (simple_poll, 1); ++ if (r != 0 && r != EINTR) ++ { ++ /* ++ * We've been told to exit the loop. Perhaps the connection to ++ * avahi failed. ++ */ ++ ++ break; ++ } ++ ++ if (avahi_got_callback) ++ announce = 1; ++#endif /* HAVE_DNSSD */ ++ ++ if (announce) ++ { + /* + * Announce any devices we've found... + */ + ++#ifdef HAVE_DNSSD + DNSServiceErrorType status; /* DNS query status */ ++#endif /* HAVE_DNSSD */ + cups_device_t *best; /* Best matching device */ + char device_uri[1024]; /* Device URI */ + int count; /* Number of queries */ +@@ -302,6 +520,7 @@ + if (device->sent) + sent ++; + ++#ifdef HAVE_DNSSD + if (device->ref) + count ++; + +@@ -333,14 +552,23 @@ + count ++; + } + } +- else if (!device->sent) ++ else ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ if (!device->resolved) ++ continue; ++ else ++#endif /* HAVE_AVAHI */ ++ if (!device->sent) + { ++#ifdef HAVE_DNSSD + /* + * Got the TXT records, now report the device... + */ + + DNSServiceRefDeallocate(device->ref); + device->ref = 0; ++#endif /* HAVE_DNSSD */ + + if (!best) + best = device; +@@ -401,6 +629,7 @@ + } + + ++#ifdef HAVE_DNSSD + /* + * 'browse_callback()' - Browse devices. + */ +@@ -489,6 +718,7 @@ + device->fullName); + device->sent = 1; + } ++#endif /* HAVE_DNSSD */ + + + /* +@@ -569,6 +799,41 @@ + + + /* ++ * 'device_type()' - Get DNS-SD type enumeration from string. ++ */ ++ ++static int ++device_type (const char *regtype) ++{ ++#ifdef HAVE_AVAHI ++ if (!strcmp(regtype, "_ipp._tcp")) ++ return (CUPS_DEVICE_IPP); ++ else if (!strcmp(regtype, "_ipps._tcp") || ++ !strcmp(regtype, "_ipp-tls._tcp")) ++ return (CUPS_DEVICE_IPPS); ++ else if (!strcmp(regtype, "_fax-ipp._tcp")) ++ return (CUPS_DEVICE_FAX_IPP); ++ else if (!strcmp(regtype, "_printer._tcp")) ++ return (CUPS_DEVICE_PDL_DATASTREAM); ++#else ++ if (!strcmp(regtype, "_ipp._tcp.")) ++ return (CUPS_DEVICE_IPP); ++ else if (!strcmp(regtype, "_ipps._tcp.") || ++ !strcmp(regtype, "_ipp-tls._tcp.")) ++ return (CUPS_DEVICE_IPPS); ++ else if (!strcmp(regtype, "_fax-ipp._tcp.")) ++ return (CUPS_DEVICE_FAX_IPP); ++ else if (!strcmp(regtype, "_printer._tcp.")) ++ return (CUPS_DEVICE_PRINTER); ++ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) ++ return (CUPS_DEVICE_PDL_DATASTREAM); ++#endif /* HAVE_AVAHI */ ++ ++ return (CUPS_DEVICE_RIOUSBPRINT); ++} ++ ++ ++/* + * 'get_device()' - Create or update a device. + */ + +@@ -589,20 +854,7 @@ + */ + + key.name = (char *)serviceName; +- +- if (!strcmp(regtype, "_ipp._tcp.")) +- key.type = CUPS_DEVICE_IPP; +- else if (!strcmp(regtype, "_ipps._tcp.") || +- !strcmp(regtype, "_ipp-tls._tcp.")) +- key.type = CUPS_DEVICE_IPPS; +- else if (!strcmp(regtype, "_fax-ipp._tcp.")) +- key.type = CUPS_DEVICE_FAX_IPP; +- else if (!strcmp(regtype, "_printer._tcp.")) +- key.type = CUPS_DEVICE_PRINTER; +- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) +- key.type = CUPS_DEVICE_PDL_DATASTREAM; +- else +- key.type = CUPS_DEVICE_RIOUSBPRINT; ++ key.type = device_type (regtype); + + for (device = cupsArrayFind(devices, &key); + device; +@@ -622,8 +874,14 @@ + free(device->domain); + device->domain = strdup(replyDomain); + ++#ifdef HAVE_DNSSD + DNSServiceConstructFullName(fullName, device->name, regtype, + replyDomain); ++#else /* HAVE_AVAHI */ ++ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, ++ serviceName, regtype, replyDomain); ++#endif /* HAVE_DNSSD */ ++ + free(device->fullName); + device->fullName = strdup(fullName); + } +@@ -643,6 +901,9 @@ + device->domain = strdup(replyDomain); + device->type = key.type; + device->priority = 50; ++#ifdef HAVE_AVAHI ++ device->resolved = 0; ++#endif /* HAVE_AVAHI */ + + cupsArrayAdd(devices, device); + +@@ -650,13 +911,20 @@ + * Set the "full name" of this service, which is used for queries... + */ + ++#ifdef HAVE_DNSSD + DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); ++#else /* HAVE_AVAHI */ ++ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, ++ serviceName, regtype, replyDomain); ++#endif /* HAVE_DNSSD */ ++ + device->fullName = strdup(fullName); + + return (device); + } + + ++#ifdef HAVE_DNSSD + /* + * 'query_callback()' - Process query data. + */ +@@ -680,7 +948,7 @@ + *ptr; /* Pointer into string */ + cups_device_t dkey, /* Search key */ + *device; /* Device */ +- ++ cups_txt_records_t txt; + + fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " + "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " +@@ -714,94 +982,233 @@ + if ((ptr = strstr(name, "._")) != NULL) + *ptr = '\0'; + +- if (strstr(fullName, "_ipp._tcp.")) +- dkey.type = CUPS_DEVICE_IPP; +- else if (strstr(fullName, "_ipps._tcp.") || +- strstr(fullName, "_ipp-tls._tcp.")) +- dkey.type = CUPS_DEVICE_IPPS; +- else if (strstr(fullName, "_fax-ipp._tcp.")) +- dkey.type = CUPS_DEVICE_FAX_IPP; +- else if (strstr(fullName, "_printer._tcp.")) +- dkey.type = CUPS_DEVICE_PRINTER; +- else if (strstr(fullName, "_pdl-datastream._tcp.")) +- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; ++ dkey.type = device_type (fullName); ++ ++ txt.data = rdata; ++ txt.dataend = rdata + rdlen; ++ device = find_device ((cups_array_t *) context, &txt, &dkey); ++ if (!device) ++ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); ++} ++#endif /* HAVE_DNSSD */ ++ ++ ++#ifdef HAVE_AVAHI ++/* ++ * 'avahi_client_callback()' - Avahi client callback function. ++ */ ++ ++static void ++avahi_client_callback(AvahiClient *client, ++ AvahiClientState state, ++ void *context) ++{ ++ /* ++ * If the connection drops, quit. ++ */ ++ ++ if (state == AVAHI_CLIENT_FAILURE) ++ { ++ fprintf (stderr, "ERROR: Avahi connection failed\n"); ++ avahi_simple_poll_quit (simple_poll); ++ } ++} ++ ++ ++/* ++ * 'avahi_query_callback()' - Avahi query callback function. ++ */ ++ ++static void ++avahi_query_callback(AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ AvahiClient *client; ++ cups_device_t key, ++ *device; ++ char uqname[1024], ++ *ptr; ++ cups_txt_records_t txtr; ++ ++ client = avahi_service_resolver_get_client (resolver); ++ if (event != AVAHI_RESOLVER_FOUND) ++ { ++ if (event == AVAHI_RESOLVER_FAILURE) ++ { ++ fprintf (stderr, "ERROR: %s\n", ++ avahi_strerror (avahi_client_errno (client))); ++ } ++ ++ avahi_service_resolver_free (resolver); ++ return; ++ } ++ ++ /* ++ * Set search key for device. ++ */ ++ ++ key.name = uqname; ++ unquote (uqname, name, sizeof (uqname)); ++ if ((ptr = strstr(name, "._")) != NULL) ++ *ptr = '\0'; ++ ++ key.domain = (char *) domain; ++ key.type = device_type (type); ++ ++ /* ++ * Find the device and the the TXT information. ++ */ ++ ++ txtr.txt = txt; ++ device = find_device ((cups_array_t *) context, &txtr, &key); ++ if (device) ++ { ++ /* ++ * Let the main loop know to announce the device. ++ */ ++ ++ device->resolved = 1; ++ avahi_got_callback = 1; ++ } + else +- dkey.type = CUPS_DEVICE_RIOUSBPRINT; ++ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); ++ ++ avahi_service_resolver_free (resolver); ++} ++ ++ ++/* ++ * 'avahi_browse_callback()' - Avahi browse callback function. ++ */ ++ ++static void ++avahi_browse_callback(AvahiServiceBrowser *browser, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiBrowserEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ AvahiClient *client = avahi_service_browser_get_client (browser); ++ ++ switch (event) ++ { ++ case AVAHI_BROWSER_FAILURE: ++ fprintf (stderr, "ERROR: %s\n", ++ avahi_strerror (avahi_client_errno (client))); ++ avahi_simple_poll_quit (simple_poll); ++ return; ++ ++ case AVAHI_BROWSER_NEW: ++ /* ++ * This object is new on the network. ++ */ ++ ++ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) ++ { ++ /* ++ * This comes from the local machine so ignore it. ++ */ ++ ++ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); ++ } ++ else ++ { ++ /* ++ * Create a device entry for it if it doesn't yet exist. ++ */ ++ ++ get_device ((cups_array_t *)context, name, type, domain); ++ ++ /* ++ * Now look for a TXT entry. ++ */ ++ ++ if (avahi_service_resolver_new (client, interface, protocol, ++ name, type, domain, ++ AVAHI_PROTO_UNSPEC, 0, ++ avahi_query_callback, context) == NULL) ++ { ++ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", ++ name, avahi_strerror (avahi_client_errno (client))); ++ } ++ } ++ ++ break; ++ ++ case AVAHI_BROWSER_REMOVE: ++ case AVAHI_BROWSER_ALL_FOR_NOW: ++ case AVAHI_BROWSER_CACHE_EXHAUSTED: ++ break; ++ } ++} ++#endif /* HAVE_AVAHI */ ++ + +- for (device = cupsArrayFind(devices, &dkey); ++/* ++ * 'find_device()' - Find a device from its name and domain. ++ */ ++ ++static cups_device_t * ++find_device (cups_array_t *devices, ++ cups_txt_records_t *txt, ++ cups_device_t *dkey) ++{ ++ cups_device_t *device; ++ char *ptr; ++ ++ for (device = cupsArrayFind(devices, dkey); + device; + device = cupsArrayNext(devices)) + { +- if (_cups_strcasecmp(device->name, dkey.name) || +- _cups_strcasecmp(device->domain, dkey.domain)) ++ if (_cups_strcasecmp(device->name, dkey->name) || ++ _cups_strcasecmp(device->domain, dkey->domain)) + { + device = NULL; + break; + } +- else if (device->type == dkey.type) ++ else if (device->type == dkey->type) + { + /* + * Found it, pull out the priority and make and model from the TXT + * record and save it... + */ + +- const uint8_t *data, /* Pointer into data */ +- *datanext, /* Next key/value pair */ +- *dataend; /* End of entire TXT record */ +- uint8_t datalen; /* Length of current key/value pair */ +- char key[256], /* Key string */ +- value[256], /* Value string */ +- make_and_model[512], ++ char make_and_model[512], + /* Manufacturer and model */ + model[256], /* Model */ +- device_id[2048];/* 1284 device ID */ +- ++ device_id[2048]; /* 1284 device ID */ + + device_id[0] = '\0'; + make_and_model[0] = '\0'; + + strcpy(model, "Unknown"); + +- for (data = rdata, dataend = data + rdlen; +- data < dataend; +- data = datanext) ++ for (;;) + { +- /* +- * Read a key/value pair starting with an 8-bit length. Since the +- * length is 8 bits and the size of the key/value buffers is 256, we +- * don't need to check for overflow... +- */ +- +- datalen = *data++; +- +- if (!datalen || (data + datalen) >= dataend) +- break; +- +- datanext = data + datalen; +- +- for (ptr = key; data < datanext && *data != '='; data ++) +- *ptr++ = *data; +- *ptr = '\0'; ++ char *key; ++ char *value; + +- if (data < datanext && *data == '=') +- { +- data ++; +- +- if (data < datanext) +- memcpy(value, data, datanext - data); +- value[datanext - data] = '\0'; ++ if (parse_txt_record_pair (txt)) ++ goto next; + +- fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n", +- key, value); +- } +- else +- { +- fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n", +- key); +- continue; +- } +- +- if (!_cups_strncasecmp(key, "usb_", 4)) ++ key = txt->key; ++ value = txt->value; ++ if (!strncasecmp(key, "usb_", 4)) + { + /* + * Add USB device ID information... +@@ -856,6 +1263,10 @@ + if (device->type == CUPS_DEVICE_PRINTER) + device->sent = 1; + } ++ ++ next: ++ if (next_txt_record (txt) == NULL) ++ break; + } + + if (device->device_id) +@@ -905,11 +1316,9 @@ + } + } + +- if (!device) +- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); ++ return device; + } + +- + /* + * 'sigterm_handler()' - Handle termination signals... + */ +--- a/config-scripts/cups-dnssd.m4 ++++ b/config-scripts/cups-dnssd.m4 +@@ -23,6 +23,21 @@ + DNSSDLIBS="" + DNSSD_BACKEND="" + ++AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], ++ [if test x$enable_avahi = xyes; then ++ AC_MSG_CHECKING(for Avahi) ++ if $PKGCONFIG --exists avahi-client; then ++ AC_MSG_RESULT(yes) ++ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" ++ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" ++ DNSSD_BACKEND="dnssd" ++ AC_DEFINE(HAVE_AVAHI) ++ enable_dnssd=no ++ else ++ AC_MSG_RESULT(no) ++ fi ++ fi]) ++ + if test x$enable_dnssd != xno; then + AC_CHECK_HEADER(dns_sd.h, [ + case "$uname" in +--- a/config.h.in ++++ b/config.h.in +@@ -390,6 +390,13 @@ + + + /* ++ * Do we have Avahi for DNS Service Discovery? ++ */ ++ ++#undef HAVE_AVAHI ++ ++ ++/* + * Do we have ? + */ + +--- a/cups/http-support.c ++++ b/cups/http-support.c +@@ -43,6 +43,10 @@ + * http_copy_decode() - Copy and decode a URI. + * http_copy_encode() - Copy and encode a URI. + * http_resolve_cb() - Build a device URI for the given service name. ++ * avahi_resolve_uri_client_cb() ++ * - Avahi client callback for resolving URI. ++ * avahi_resolve_uri_resolver_cb() ++ * - Avahi resolver callback for resolving URI. + */ + + /* +@@ -60,6 +64,11 @@ + # include + # endif /* WIN32 */ + #endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include ++# include ++# include ++#endif /* HAVE_AVAHI */ + + + /* +@@ -127,6 +136,24 @@ + void *context); + #endif /* HAVE_DNSSD */ + ++#ifdef HAVE_AVAHI ++static void avahi_resolve_uri_client_cb(AvahiClient *client, ++ AvahiClientState state, ++ void *simple_poll); ++static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context); ++#endif /* HAVE_AVAHI */ + + /* + * 'httpAssembleURI()' - Assemble a uniform resource identifier from its +@@ -1431,6 +1458,9 @@ + + if (strstr(hostname, "._tcp")) + { ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) ++ char *regtype, /* Pointer to type in hostname */ ++ *domain; /* Pointer to domain in hostname */ + #ifdef HAVE_DNSSD + # ifdef WIN32 + # pragma comment(lib, "dnssd.lib") +@@ -1449,6 +1479,17 @@ + fd_set input_set; /* Input set for select() */ + struct timeval stimeout; /* Timeout value for select() */ + #endif /* HAVE_POLL */ ++#else /* HAVE_AVAHI */ ++ AvahiSimplePoll *simple_poll; ++ AvahiClient *client; ++ int error; ++ struct ++ { ++ AvahiSimplePoll *poll; ++ _http_uribuf_t uribuf; ++ } user_data; ++#endif /* HAVE_DNSSD */ ++ + + if (options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname); +@@ -1485,9 +1526,16 @@ + if (domain) + *domain++ = '\0'; + ++#ifdef HAVE_DNSSD + uribuf.buffer = resolved_uri; + uribuf.bufsize = resolved_size; + uribuf.options = options; ++#else ++ user_data.uribuf.buffer = resolved_uri; ++ user_data.uribuf.bufsize = resolved_size; ++ user_data.uribuf.options = options; ++#endif ++ + resolved_uri[0] = '\0'; + + DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", " +@@ -1501,6 +1549,7 @@ + + uri = NULL; + ++#ifdef HAVE_DNSSD + if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) + { + localref = ref; +@@ -1608,6 +1657,36 @@ + + DNSServiceRefDeallocate(ref); + } ++#else /* HAVE_AVAHI */ ++ if ((simple_poll = avahi_simple_poll_new ()) != NULL) ++ { ++ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), ++ 0, avahi_resolve_uri_client_cb, ++ &simple_poll, &error)) != NULL) ++ { ++ user_data.poll = simple_poll; ++ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, hostname, ++ regtype, domain, AVAHI_PROTO_UNSPEC, 0, ++ avahi_resolve_uri_resolver_cb, ++ &user_data) != NULL) ++ { ++ avahi_simple_poll_loop (simple_poll); ++ ++ /* ++ * Collect the result. ++ */ ++ ++ if (resolved_uri[0]) ++ uri = resolved_uri; ++ } ++ ++ avahi_client_free (client); ++ } ++ ++ avahi_simple_poll_free (simple_poll); ++ } ++#endif /* HAVE_DNSSD */ + + if (options & _HTTP_RESOLVE_STDERR) + { +@@ -1619,13 +1698,13 @@ + fputs("STATE: -connecting-to-device,offline-report\n", stderr); + } + +-#else ++#else /* HAVE_DNSSD || HAVE_AVAHI */ + /* + * No DNS-SD support... + */ + + uri = NULL; +-#endif /* HAVE_DNSSD */ ++#endif /* HAVE_DNSSD || HAVE_AVAHI */ + + if ((options & _HTTP_RESOLVE_STDERR) && !uri) + _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer.")); +@@ -1895,6 +1974,116 @@ + #endif /* HAVE_DNSSD */ + + ++#ifdef HAVE_AVAHI ++/* ++ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI. ++ */ ++ ++static void ++avahi_resolve_uri_client_cb (AvahiClient *client, ++ AvahiClientState state, ++ void *simple_poll) ++{ ++ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " ++ "simple_poll=%p)\n", client, state, simple_poll)); ++ ++ /* ++ * If the connection drops, quit. ++ */ ++ ++ if (state == AVAHI_CLIENT_FAILURE) ++ avahi_simple_poll_quit (simple_poll); ++} ++ ++ ++/* ++ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving ++ * URI. ++ */ ++ ++static void ++avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, ++ AvahiIfIndex interface, ++ AvahiProtocol protocol, ++ AvahiResolverEvent event, ++ const char *name, ++ const char *type, ++ const char *domain, ++ const char *host_name, ++ const AvahiAddress *address, ++ uint16_t port, ++ AvahiStringList *txt, ++ AvahiLookupResultFlags flags, ++ void *context) ++{ ++ const char *scheme; /* URI scheme */ ++ char rp[256]; /* Remote printer */ ++ AvahiStringList *pair; ++ char *value; ++ size_t valueLen = 0; ++ char addr[AVAHI_ADDRESS_STR_MAX]; ++ struct ++ { ++ AvahiSimplePoll *poll; ++ _http_uribuf_t uribuf; ++ } *poll_uribuf = context; ++ ++ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " ++ "interface=%d, protocol=%d, event=%d, name=\"%s\", " ++ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " ++ "port=%d, txt=%p, flags=%d, context=%p)\n", ++ resolver, interface, protocol, event, name, type, domain, ++ host_name, address, port, txt, flags, context)); ++ ++ if (event != AVAHI_RESOLVER_FOUND) ++ { ++ avahi_service_resolver_free (resolver); ++ avahi_simple_poll_quit (poll_uribuf->poll); ++ return; ++ } ++ ++ /* ++ * Figure out the scheme from the full name... ++ */ ++ ++ if (strstr(type, "_ipp.")) ++ scheme = "ipp"; ++ else if (strstr(type, "_printer.")) ++ scheme = "lpd"; ++ else if (strstr(type, "_pdl-datastream.")) ++ scheme = "socket"; ++ else ++ scheme = "riousbprint"; ++ ++ /* ++ * Extract the "remote printer key from the TXT record... ++ */ ++ ++ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) ++ { ++ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); ++ rp[0] = '/'; ++ memcpy (rp + 1, value, valueLen); ++ rp[valueLen + 1] = '\0'; ++ } ++ else ++ rp[0] = '\0'; ++ ++ /* ++ * Assemble the final device URI... ++ */ ++ ++ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); ++ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, ++ poll_uribuf->uribuf.bufsize, scheme, NULL, ++ addr, port, rp); ++ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", ++ poll_uribuf->uribuf.buffer)); ++ avahi_simple_poll_quit (poll_uribuf->poll); ++} ++#endif /* HAVE_AVAHI */ ++ ++ + /* + * End of "$Id: http-support.c 9820 2011-06-10 22:06:26Z mike $". + */ +--- a/scheduler/Makefile ++++ b/scheduler/Makefile +@@ -17,6 +17,7 @@ + + CUPSDOBJS = \ + auth.o \ ++ avahi.o \ + banners.o \ + cert.o \ + classes.o \ +@@ -39,7 +40,8 @@ + server.o \ + statbuf.o \ + subscriptions.o \ +- sysman.o ++ sysman.o \ ++ timeout.o + LIBOBJS = \ + filter.o \ + mime.o \ +--- /dev/null ++++ b/scheduler/avahi.c +@@ -0,0 +1,445 @@ ++/* ++ * "$Id$" ++ * ++ * Avahi poll implementation for the CUPS scheduler. ++ * ++ * Copyright (C) 2010 Red Hat, Inc. ++ * Authors: ++ * Tim Waugh ++ * ++ * Distribution and use rights are outlined in the file "LICENSE.txt" ++ * "LICENSE" which should have been included with this file. If this ++ * file is missing or damaged, see the license at "http://www.cups.org/". ++ * ++ * Contents: ++ * ++ * watch_read_cb - Read callback for file descriptor ++ * watch_write_cb - Write callback for file descriptor ++ * watched_fd_add_select() - Call cupsdAddSelect() as needed ++ * watch_new() - Create a new file descriptor watch ++ * watch_free() - Free a file descriptor watch ++ * watch_update() - Update watched events for a file descriptor ++ * watch_get_events() - Get events that happened for a file descriptor ++ * timeout_cb() - Run a timed Avahi callback ++ * timeout_new() - Set a wakeup time ++ * timeout_update() - Update the expiration time for a timeout ++ * timeout_free() - Free a timeout ++ * compare_watched_fds() - Compare watched file descriptors for array sorting ++ * compare_timeouts() - Compare timeouts for array sorting ++ * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS ++ * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS ++ * avahi_cups_poll_get() - Get the abstract poll API structure ++ */ ++ ++#include ++ ++#ifdef HAVE_AVAHI /* Applies to entire file... */ ++ ++/* ++ * Include necessary headers... ++ */ ++ ++#include "cupsd.h" ++ ++#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) ++# include ++#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ ++ ++#ifdef HAVE_AVAHI ++# include ++#endif /* HAVE_AVAHI */ ++ ++ ++typedef struct ++{ ++ AvahiCupsPoll *cups_poll; ++ ++ int fd; ++ AvahiWatchEvent occurred; ++ cups_array_t *watches; ++} cupsd_watched_fd_t; ++ ++struct AvahiWatch ++{ ++ cupsd_watched_fd_t *watched_fd; ++ ++ AvahiWatchEvent events; ++ AvahiWatchCallback callback; ++ void *userdata; ++}; ++ ++struct AvahiTimeout ++{ ++ AvahiCupsPoll *cups_poll; ++ AvahiTimeoutCallback callback; ++ void *userdata; ++ cupsd_timeout_t *cupsd_timeout; ++}; ++ ++/* ++ * Local functions... ++ */ ++ ++static AvahiWatch * watch_new(const AvahiPoll *api, ++ int fd, ++ AvahiWatchEvent events, ++ AvahiWatchCallback callback, ++ void *userdata); ++static void watch_free(AvahiWatch *watch); ++static void watch_update(AvahiWatch *watch, ++ AvahiWatchEvent events); ++static AvahiWatchEvent watch_get_events(AvahiWatch *watch); ++static int compare_watches(AvahiWatch *p0, ++ AvahiWatch *p1); ++ ++ ++/* ++ * 'watch_read_cb' - Read callback for file descriptor ++ */ ++ ++static void ++watch_read_cb (void *userdata) ++{ ++ AvahiWatch *watch; ++ cupsd_watched_fd_t *watched_fd = userdata; ++ watched_fd->occurred |= AVAHI_WATCH_IN; ++ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); ++ watch; ++ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) { ++ if (watch->events & watched_fd->occurred) { ++ (watch->callback) (watch, watched_fd->fd, ++ AVAHI_WATCH_IN, watch->userdata); ++ watched_fd->occurred &= ~AVAHI_WATCH_IN; ++ break; ++ } ++ } ++} ++ ++ ++/* ++ * 'watch_write_cb' - Write callback for file descriptor ++ */ ++ ++static void ++watch_write_cb (void *userdata) ++{ ++ AvahiWatch *watch; ++ cupsd_watched_fd_t *watched_fd = userdata; ++ watched_fd->occurred |= AVAHI_WATCH_OUT; ++ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); ++ watch; ++ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) { ++ if (watch->events & watched_fd->occurred) { ++ (watch->callback) (watch, watched_fd->fd, ++ AVAHI_WATCH_OUT, watch->userdata); ++ watched_fd->occurred &= ~AVAHI_WATCH_OUT; ++ break; ++ } ++ } ++} ++ ++ ++/* ++ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed ++ */ ++ ++static int /* O - Watches? */ ++watched_fd_add_select (cupsd_watched_fd_t *watched_fd) ++{ ++ AvahiWatch *watch; ++ cupsd_selfunc_t read_cb = NULL, write_cb = NULL; ++ ++ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); ++ watch; ++ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) { ++ if (watch->events & (AVAHI_WATCH_IN | ++ AVAHI_WATCH_ERR | ++ AVAHI_WATCH_HUP)) { ++ read_cb = (cupsd_selfunc_t)watch_read_cb; ++ if (write_cb != NULL) ++ break; ++ } ++ ++ if (watch->events & AVAHI_WATCH_OUT) { ++ write_cb = (cupsd_selfunc_t)watch_write_cb; ++ if (read_cb != NULL) ++ break; ++ } ++ } ++ ++ if (read_cb || write_cb) ++ cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd); ++ else ++ cupsdRemoveSelect (watched_fd->fd); ++ ++ return (read_cb || write_cb); ++} ++ ++/* ++ * 'watch_new' - Create a new file descriptor watch ++ */ ++ ++static AvahiWatch * ++watch_new (const AvahiPoll *api, ++ int fd, ++ AvahiWatchEvent events, ++ AvahiWatchCallback callback, ++ void *userdata) ++{ ++ cupsd_watched_fd_t key, *watched_fd; ++ AvahiCupsPoll *cups_poll = api->userdata; ++ AvahiWatch *watch = malloc(sizeof(AvahiWatch)); ++ if (watch == NULL) ++ return (NULL); ++ ++ watch->events = events; ++ watch->callback = callback; ++ watch->userdata = userdata; ++ ++ key.fd = fd; ++ watched_fd = cupsArrayFind (cups_poll->watched_fds, &key); ++ if (watched_fd == NULL) { ++ watched_fd = malloc(sizeof(cupsd_watched_fd_t)); ++ if (watched_fd == NULL) { ++ free (watch); ++ return (NULL); ++ } ++ ++ watched_fd->fd = fd; ++ watched_fd->occurred = 0; ++ watched_fd->cups_poll = cups_poll; ++ watched_fd->watches = cupsArrayNew ((cups_array_func_t)compare_watches, ++ NULL); ++ } ++ ++ watch->watched_fd = watched_fd; ++ cupsArrayAdd(watched_fd->watches, watch); ++ watched_fd_add_select (watched_fd); ++ return (watch); ++} ++ ++ ++/* ++ * 'watch_free' - Free a file descriptor watch ++ */ ++ ++static void ++watch_free (AvahiWatch *watch) ++{ ++ cupsd_watched_fd_t *watched_fd = watch->watched_fd; ++ AvahiCupsPoll *cups_poll = watched_fd->cups_poll; ++ ++ cupsArrayRemove (watched_fd->watches, watch); ++ free (watch); ++ ++ if (!watched_fd_add_select (watched_fd)) { ++ /* No more watches */ ++ cupsArrayRemove (cups_poll->watched_fds, watched_fd); ++ free (watched_fd); ++ } ++} ++ ++ ++/* ++ * 'watch_update' - Update watched events for a file descriptor ++ */ ++ ++static void ++watch_update (AvahiWatch *watch, ++ AvahiWatchEvent events) ++{ ++ watch->events = events; ++ watched_fd_add_select (watch->watched_fd); ++} ++ ++ ++/* ++ * 'watch_get_events' - Get events that happened for a file descriptor ++ */ ++ ++static AvahiWatchEvent ++watch_get_events (AvahiWatch *watch) ++{ ++ return (watch->watched_fd->occurred); ++} ++ ++ ++/* ++ * 'compare_watches' - Compare watches for array sorting ++ */ ++ ++static int ++compare_watches (AvahiWatch *p0, ++ AvahiWatch *p1) ++{ ++ if (p0->watched_fd->fd < p1->watched_fd->fd) ++ return (-1); ++ ++ return ((p0->watched_fd->fd == p1->watched_fd->fd) ? 0 : 1); ++} ++ ++ ++/* ++ * 'timeout_cb()' - Run a timed Avahi callback ++ */ ++ ++static void ++timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata) ++{ ++ AvahiTimeout *timeout = userdata; ++ (timeout->callback) (timeout, timeout->userdata); ++} ++ ++ ++/* ++ * 'timeout_new' - Set a wakeup time ++ */ ++ ++static AvahiTimeout * ++timeout_new (const AvahiPoll *api, ++ const struct timeval *tv, ++ AvahiTimeoutCallback callback, ++ void *userdata) ++{ ++ AvahiTimeout *timeout; ++ AvahiCupsPoll *cups_poll = api->userdata; ++ ++ timeout = malloc(sizeof(AvahiTimeout)); ++ if (timeout == NULL) ++ return (NULL); ++ ++ timeout->cups_poll = cups_poll; ++ timeout->callback = callback; ++ timeout->userdata = userdata; ++ timeout->cupsd_timeout = cupsdAddTimeout (tv, ++ (cupsd_timeoutfunc_t)timeout_cb, ++ timeout); ++ cupsArrayAdd (cups_poll->timeouts, timeout); ++ return (timeout); ++} ++ ++ ++/* ++ * 'timeout_update' - Update the expiration time for a timeout ++ */ ++ ++static void ++timeout_update (AvahiTimeout *timeout, ++ const struct timeval *tv) ++{ ++ cupsdUpdateTimeout (timeout->cupsd_timeout, tv); ++} ++ ++ ++/* ++ * ' timeout_free' - Free a timeout ++ */ ++ ++static void ++timeout_free (AvahiTimeout *timeout) ++{ ++ cupsArrayRemove (timeout->cups_poll->timeouts, timeout); ++ cupsdRemoveTimeout (timeout->cupsd_timeout); ++ free (timeout); ++} ++ ++ ++/* ++ * 'compare_watched_fds' - Compare watched file descriptors for array sorting ++ */ ++static int ++compare_watched_fds(cupsd_watched_fd_t *p0, ++ cupsd_watched_fd_t *p1) ++{ ++ if (p0->fd != p1->fd) ++ return (p0->fd < p1->fd ? -1 : 1); ++ ++ if (p0 == p1) ++ return (0); ++ ++ return (p0 < p1 ? -1 : 1); ++} ++ ++ ++/* ++ * 'compare_timeouts' - Compare timeouts for array sorting ++ */ ++static int ++compare_timeouts(AvahiTimeout *p0, ++ AvahiTimeout *p1) ++{ ++ /* ++ * Just compare pointers to make it a stable sort. ++ */ ++ ++ if (p0->cupsd_timeout < p1->cupsd_timeout) ++ return (-1); ++ return ((p0->cupsd_timeout == p1->cupsd_timeout) ? 0 : 1); ++} ++ ++ ++/* ++ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS ++ */ ++ ++AvahiCupsPoll * ++avahi_cups_poll_new (void) ++{ ++ AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll)); ++ if (cups_poll == NULL) ++ return (NULL); ++ ++ cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds, ++ NULL); ++ cups_poll->timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, ++ NULL); ++ ++ cups_poll->api.userdata = cups_poll; ++ cups_poll->api.watch_new = watch_new; ++ cups_poll->api.watch_free = watch_free; ++ cups_poll->api.watch_update = watch_update; ++ cups_poll->api.watch_get_events = watch_get_events; ++ ++ cups_poll->api.timeout_new = timeout_new; ++ cups_poll->api.timeout_update = timeout_update; ++ cups_poll->api.timeout_free = timeout_free; ++ ++ return (cups_poll); ++} ++ ++ ++/* ++ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS ++ */ ++void ++avahi_cups_poll_free (AvahiCupsPoll *cups_poll) ++{ ++ cupsd_watched_fd_t *watched_fd; ++ ++ for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds); ++ watched_fd; ++ watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)){ ++ cupsArrayClear (watched_fd->watches); ++ } ++ ++ cupsArrayClear (cups_poll->watched_fds); ++ cupsArrayClear (cups_poll->timeouts); ++} ++ ++ ++/* ++ * 'avahi_cups_poll_get' - Get the abstract poll API structure ++ */ ++ ++const AvahiPoll * ++avahi_cups_poll_get (AvahiCupsPoll *cups_poll) ++{ ++ return (&cups_poll->api); ++} ++ ++ ++#endif /* HAVE_AVAHI ... from top of file */ ++ ++/* ++ * End of "$Id$". ++ */ +--- /dev/null ++++ b/scheduler/avahi.h +@@ -0,0 +1,49 @@ ++/* ++ * "$Id$" ++ * ++ * Avahi poll implementation for the CUPS scheduler. ++ * ++ * Copyright (C) 2010 Red Hat, Inc. ++ * Authors: ++ * Tim Waugh ++ * ++ * Distribution and use rights are outlined in the file "LICENSE.txt" ++ * which should have been included with this file. If this file is ++ * file is missing or damaged, see the license at "http://www.cups.org/". ++ */ ++ ++#include ++ ++#ifdef HAVE_AVAHI ++# include ++# include ++#endif /* HAVE_AVAHI */ ++ ++#ifdef HAVE_AUTHORIZATION_H ++# include ++#endif /* HAVE_AUTHORIZATION_H */ ++ ++ ++#ifdef HAVE_AVAHI ++typedef struct ++{ ++ AvahiPoll api; ++ cups_array_t *watched_fds; ++ cups_array_t *timeouts; ++} AvahiCupsPoll; ++#endif /* HAVE_AVAHI */ ++ ++/* ++ * Prototypes... ++ */ ++ ++#ifdef HAVE_AVAHI ++extern AvahiCupsPoll * avahi_cups_poll_new(void); ++extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll); ++extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll); ++#endif /* HAVE_AVAHI */ ++ ++ ++/* ++ * End of "$Id$". ++ */ +--- a/scheduler/cupsd.h ++++ b/scheduler/cupsd.h +@@ -140,6 +140,15 @@ + + typedef void (*cupsd_selfunc_t)(void *data); + ++#ifdef HAVE_AVAHI ++/* ++ * Timeout callback function type... ++ */ ++ ++typedef struct _cupsd_timeout_s cupsd_timeout_t; ++typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data); ++#endif /* HAVE_AVAHI */ ++ + + /* + * Globals... +@@ -173,6 +182,11 @@ + /* Running from launchd */ + #endif /* HAVE_LAUNCH_H */ + ++#ifdef HAVE_AVAHI ++VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */ ++#endif /* HAVE_AVAHI */ ++ ++ + + /* + * Prototypes... +@@ -242,6 +256,20 @@ + extern void cupsdStartServer(void); + extern void cupsdStopServer(void); + ++#ifdef HAVE_AVAHI ++extern void cupsdInitTimeouts(void); ++extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv, ++ cupsd_timeoutfunc_t cb, ++ void *data); ++extern cupsd_timeout_t *cupsdNextTimeout (long *delay); ++extern void cupsdRunTimeout (cupsd_timeout_t *timeout); ++extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout, ++ const struct timeval *tv); ++extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout); ++#endif /* HAVE_AVAHI */ ++ ++extern int cupsdRemoveFile(const char *filename); ++ + + /* + * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $". +--- a/scheduler/main.c ++++ b/scheduler/main.c +@@ -122,6 +122,10 @@ + cupsd_listener_t *lis; /* Current listener */ + time_t current_time, /* Current time */ + activity, /* Client activity timer */ ++#ifdef HAVE_AVAHI ++ avahi_client_time, /* Time for next Avahi client ++ check */ ++#endif /* HAVE_AVAHI */ + browse_time, /* Next browse send time */ + senddoc_time, /* Send-Document time */ + expire_time, /* Subscription expire time */ +@@ -148,6 +152,10 @@ + int launchd_idle_exit; + /* Idle exit on select timeout? */ + #endif /* HAVE_LAUNCHD */ ++#ifdef HAVE_AVAHI ++ cupsd_timeout_t *tmo; /* Next scheduled timed callback */ ++ long tmo_delay; /* Time before it must be called */ ++#endif /* HAVE_AVAHI */ + + + #ifdef HAVE_GETEUID +@@ -527,6 +535,14 @@ + + httpInitialize(); + ++#ifdef HAVE_AVAHI ++ /* ++ * Initialize timed callback structures. ++ */ ++ ++ cupsdInitTimeouts(); ++#endif /* HAVE_AVAHI */ ++ + cupsdStartServer(); + + /* +@@ -657,6 +673,9 @@ + */ + + current_time = time(NULL); ++#ifdef HAVE_AVAHI ++ avahi_client_time = current_time; ++#endif /* HAVE_AVAHI */ + browse_time = current_time; + event_time = current_time; + expire_time = current_time; +@@ -871,6 +890,26 @@ + } + #endif /* __APPLE__ */ + ++#ifdef HAVE_AVAHI ++ /* ++ * If a timed callback is due, run it. ++ */ ++ ++ tmo = cupsdNextTimeout (&tmo_delay); ++ if (tmo && tmo_delay == 0) ++ cupsdRunTimeout (tmo); ++ ++ /* ++ * Try to restart the Avahi client every 10 seconds if needed... ++ */ ++ ++ if ((current_time - avahi_client_time) >= 10) ++ { ++ avahi_client_time = current_time; ++ cupsdStartAvahiClient(); ++ } ++#endif /* HAVE_AVAHI */ ++ + #ifndef __APPLE__ + /* + * Update the network interfaces once a minute... +@@ -1815,6 +1854,10 @@ + cupsd_job_t *job; /* Job information */ + cupsd_subscription_t *sub; /* Subscription information */ + const char *why; /* Debugging aid */ ++#ifdef HAVE_AVAHI ++ cupsd_timeout_t *tmo; /* Timed callback */ ++ long tmo_delay; /* Seconds before calling it */ ++#endif /* HAVE_AVAHI */ + + + /* +@@ -1857,6 +1900,19 @@ + } + #endif /* __APPLE__ */ + ++#ifdef HAVE_AVAHI ++ /* ++ * See if there are any scheduled timed callbacks to run. ++ */ ++ ++ tmo = cupsdNextTimeout (&tmo_delay); ++ if (tmo) ++ { ++ timeout = tmo_delay; ++ why = "run a timed callback"; ++ } ++#endif /* HAVE_AVAHI */ ++ + /* + * Check whether we are accepting new connections... + */ +--- /dev/null ++++ b/scheduler/timeout.c +@@ -0,0 +1,195 @@ ++/* ++ * "$Id$" ++ * ++ * Timeout functions for the Common UNIX Printing System (CUPS). ++ * ++ * Copyright (C) 2010 Red Hat, Inc. ++ * Authors: ++ * Tim Waugh ++ * ++ * Distribution and use rights are outlined in the file "LICENSE.txt" ++ * which should have been included with this file. If this file is ++ * file is missing or damaged, see the license at "http://www.cups.org/". ++ * ++ * Contents: ++ * ++ * cupsdInitTimeouts() - Initialise timeout structure. ++ * cupsdAddTimeout() - Add a timed callback. ++ * cupsdNextTimeout() - Find the next enabled timed callback. ++ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it. ++ * cupsdRemoveTimeout() - Discard a timed callback. ++ * compare_timeouts() - Compare timed callbacks for array sorting. ++ */ ++ ++#include ++ ++#ifdef HAVE_AVAHI /* Applies to entire file... */ ++ ++/* ++ * Include necessary headers... ++ */ ++ ++#include "cupsd.h" ++ ++#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) ++# include ++#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ ++ ++#ifdef HAVE_AVAHI ++# include ++#endif /* HAVE_AVAHI */ ++ ++ ++struct _cupsd_timeout_s ++{ ++ struct timeval when; ++ int enabled; ++ cupsd_timeoutfunc_t callback; ++ void *data; ++}; ++ ++/* ++ * Local functions... ++ */ ++ ++/* ++ * 'compare_timeouts()' - Compare timed callbacks for array sorting. ++ */ ++ ++static int ++compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1) ++{ ++ if (!p0->enabled || !p1->enabled) ++ { ++ if (!p0->enabled && !p1->enabled) ++ return (0); ++ ++ return (p0->enabled ? -1 : 1); ++ } ++ ++ return (avahi_timeval_compare (&p0->when, &p1->when)); ++} ++ ++ ++/* ++ * 'cupsdInitTimeouts()' - Initialise timeout structures. ++ */ ++ ++void ++cupsdInitTimeouts(void) ++{ ++ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL); ++} ++ ++ ++/* ++ * 'cupsdAddTimeout()' - Add a timed callback. ++ */ ++ ++cupsd_timeout_t * /* O - Timeout handle */ ++cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */ ++ cupsd_timeoutfunc_t cb, /* I - Callback function */ ++ void *data) /* I - User data */ ++{ ++ cupsd_timeout_t *timeout; ++ ++ timeout = malloc (sizeof(cupsd_timeout_t)); ++ if (timeout != NULL) ++ { ++ timeout->enabled = (tv != NULL); ++ if (tv) ++ { ++ timeout->when.tv_sec = tv->tv_sec; ++ timeout->when.tv_usec = tv->tv_usec; ++ } ++ ++ timeout->callback = cb; ++ timeout->data = data; ++ cupsArrayAdd (Timeouts, timeout); ++ } ++ ++ return timeout; ++} ++ ++ ++/* ++ * 'cupsdNextTimeout()' - Find the next enabled timed callback. ++ */ ++ ++cupsd_timeout_t * /* O - Next enabled timeout or NULL */ ++cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */ ++{ ++ cupsd_timeout_t *first = cupsArrayFirst (Timeouts); ++ struct timeval curtime; ++ ++ if (first && !first->enabled) ++ first = NULL; ++ ++ if (first && delay) ++ { ++ gettimeofday (&curtime, NULL); ++ if (avahi_timeval_compare (&curtime, &first->when) > 0) ++ { ++ *delay = 0; ++ } else { ++ *delay = 1 + first->when.tv_sec - curtime.tv_sec; ++ if (first->when.tv_usec < curtime.tv_usec) ++ (*delay)--; ++ } ++ } ++ ++ return (first); ++} ++ ++ ++/* ++ * 'cupsdRunTimeout()' - Run a timed callback. ++ */ ++ ++void ++cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ ++{ ++ if (!timeout) ++ return; ++ timeout->enabled = 0; ++ if (!timeout->callback) ++ return; ++ timeout->callback (timeout, timeout->data); ++} ++ ++/* ++ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it. ++ */ ++ ++void ++cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */ ++ const struct timeval *tv) /* I - Absolute time or NULL */ ++{ ++ cupsArrayRemove (Timeouts, timeout); ++ timeout->enabled = (tv != NULL); ++ if (tv) ++ { ++ timeout->when.tv_sec = tv->tv_sec; ++ timeout->when.tv_usec = tv->tv_usec; ++ } ++ cupsArrayAdd (Timeouts, timeout); ++} ++ ++ ++/* ++ * 'cupsdRemoveTimeout()' - Discard a timed callback. ++ */ ++ ++void ++cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ ++{ ++ cupsArrayRemove (Timeouts, timeout); ++ free (timeout); ++} ++ ++ ++#endif /* HAVE_AVAHI ... from top of file */ ++ ++/* ++ * End of "$Id$". ++ */ +--- a/cgi-bin/admin.c ++++ b/cgi-bin/admin.c +@@ -1643,7 +1643,7 @@ + else + local_protocols[0] = '\0'; + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + if (cgiGetVariable("BROWSE_LOCAL_DNSSD")) + { + if (local_protocols[0]) +@@ -1651,7 +1651,7 @@ + else + strcat(local_protocols, "dnssd"); + } +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + #ifdef HAVE_LDAP + if (cgiGetVariable("BROWSE_LOCAL_LDAP")) +@@ -2718,9 +2718,9 @@ + #endif /* HAVE_GSSAPI */ + cgiSetVariable("KERBEROS", ""); + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + cgiSetVariable("HAVE_DNSSD", "1"); +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + #ifdef HAVE_LDAP + cgiSetVariable("HAVE_LDAP", "1"); +--- a/scheduler/client.c ++++ b/scheduler/client.c +@@ -4987,7 +4987,7 @@ + !strncmp(host, "[::1]:", 6)); + } + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + /* + * Check if the hostname is something.local (Bonjour); if so, allow it. + */ +@@ -4996,7 +4996,7 @@ + (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) || + !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8))) + return (1); +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + /* + * Check if the hostname is an IP address... +--- a/scheduler/dirsvc.c ++++ b/scheduler/dirsvc.c +@@ -27,6 +27,7 @@ + * ldap_connect() - Start new LDAP connection + * ldap_reconnect() - Reconnect to LDAP Server + * ldap_disconnect() - Disconnect from LDAP Server ++ * cupsdStartAvahiClient() - Start an Avahi client if needed + * cupsdStartBrowsing() - Start sending and receiving broadcast + * information. + * cupsdStartPolling() - Start polling servers as needed. +@@ -45,6 +46,8 @@ + * printer. + * dnssdPackTxtRecord() - Pack an array of key/value pairs into the TXT + * record format. ++ * avahiPackTxtRecord() - Pack an array of key/value pairs into an ++ * AvahiStringList. + * dnssdRegisterCallback() - DNSServiceRegister callback. + * dnssdRegisterPrinter() - Start sending broadcast information for a + * printer or update the broadcast contents. +@@ -83,6 +86,7 @@ + */ + + #include "cupsd.h" ++#include + #include + + #ifdef HAVE_DNSSD +@@ -97,6 +101,17 @@ + # endif /* HAVE_SYSTEMCONFIGURATION */ + # endif /* __APPLE__ */ + #endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include ++#endif /* HAVE_AVAHI */ ++ ++ ++#ifdef HAVE_DNSSD ++typedef char *cupsd_txt_record_t; ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++typedef AvahiStringList *cupsd_txt_record_t; ++#endif /* HAVE_AVAHI */ + + + /* +@@ -159,27 +174,39 @@ + static void update_smb(int onoff); + + ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) ++static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p, ++ int for_lpd); ++static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b); ++static void dnssdDeregisterPrinter(cupsd_printer_t *p); ++static void dnssdRegisterPrinter(cupsd_printer_t *p); ++static void dnssdStop(void); ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ ++ + #ifdef HAVE_DNSSD + # ifdef HAVE_COREFOUNDATION + static void dnssdAddAlias(const void *key, const void *value, + void *context); + # endif /* HAVE_COREFOUNDATION */ +-static char *dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p, +- int for_lpd); +-static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b); +-static void dnssdDeregisterPrinter(cupsd_printer_t *p); +-static char *dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2], +- int count); + static void dnssdRegisterCallback(DNSServiceRef sdRef, + DNSServiceFlags flags, + DNSServiceErrorType errorCode, + const char *name, const char *regtype, + const char *domain, void *context); +-static void dnssdRegisterPrinter(cupsd_printer_t *p); +-static void dnssdStop(void); + static void dnssdUpdate(void); + #endif /* HAVE_DNSSD */ + ++#ifdef HAVE_AVAHI ++static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2], ++ int count); ++static void avahi_entry_group_cb (AvahiEntryGroup *group, ++ AvahiEntryGroupState state, ++ void *userdata); ++static void avahi_client_cb (AvahiClient *client, ++ AvahiClientState state, ++ void *userdata); ++#endif /* HAVE_AVAHI */ ++ + #ifdef HAVE_LDAP + static const char * const ldap_attrs[] =/* CUPS LDAP attributes */ + { +@@ -283,10 +310,10 @@ + ldap_dereg_printer(p); + #endif /* HAVE_LDAP */ + +-#ifdef HAVE_DNSSD +- if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) ++ if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD)) + dnssdDeregisterPrinter(p); +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + } + + +@@ -702,10 +729,10 @@ + slpRegisterPrinter(p); */ + #endif /* HAVE_LIBSLP */ + +-#ifdef HAVE_DNSSD +- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) ++ if ((BrowseLocalProtocols & BROWSE_DNSSD)) + dnssdRegisterPrinter(p); +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + } + + +@@ -1419,6 +1446,27 @@ + #endif /* HAVE_LDAP */ + + ++#ifdef HAVE_AVAHI ++/* ++ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed ++ */ ++ ++void ++cupsdStartAvahiClient(void) ++{ ++ if (!AvahiCupsClient && !AvahiCupsClientConnecting) ++ { ++ if (!AvahiCupsPollHandle) ++ AvahiCupsPollHandle = avahi_cups_poll_new (); ++ ++ if (AvahiCupsPollHandle) ++ avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle), ++ AVAHI_CLIENT_NO_FAIL, avahi_client_cb, NULL, NULL); ++ } ++} ++#endif /* HAVE_AVAHI */ ++ ++ + /* + * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information. + */ +@@ -1542,13 +1590,16 @@ + else + BrowseSocket = -1; + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD) + { ++#ifdef HAVE_DNSSD + DNSServiceErrorType error; /* Error from service creation */ ++#endif /* HAVE_DNSSD */ + cupsd_listener_t *lis; /* Current listening socket */ + + ++#ifdef HAVE_DNSSD + /* + * First create a "master" connection for all registrations... + */ +@@ -1573,6 +1624,7 @@ + fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); + + cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL); ++#endif /* HAVE_DNSSD */ + + /* + * Then get the port we use for registrations. If we are not listening +@@ -1606,9 +1658,16 @@ + */ + + cupsdUpdateDNSSDName(); ++ ++#ifdef HAVE_AVAHI ++ cupsdStartAvahiClient (); ++#endif /* HAVE_AVAHI */ ++ ++#ifdef HAVE_DNSSD + } +- } + #endif /* HAVE_DNSSD */ ++ } ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + #ifdef HAVE_LIBSLP + if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) +@@ -1834,10 +1893,10 @@ + BrowseSocket = -1; + } + +-#ifdef HAVE_DNSSD +- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) ++ if ((BrowseLocalProtocols & BROWSE_DNSSD)) + dnssdStop(); +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + #ifdef HAVE_LIBSLP + if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) && +@@ -1902,7 +1961,7 @@ + } + + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + /* + * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing... + */ +@@ -1910,8 +1969,14 @@ + void + cupsdUpdateDNSSDName(void) + { ++#ifdef HAVE_DNSSD + DNSServiceErrorType error; /* Error from service creation */ + char webif[1024]; /* Web interface share name */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ int ret; /* Error from service creation */ ++ char webif[AVAHI_LABEL_MAX]; /* Web interface share name */ ++#endif /* HAVE_AVAHI */ + # ifdef HAVE_SYSTEMCONFIGURATION + SCDynamicStoreRef sc; /* Context for dynamic store */ + CFDictionaryRef btmm; /* Back-to-My-Mac domains */ +@@ -2042,6 +2107,7 @@ + else + strlcpy(webif, "CUPS Web Interface", sizeof(webif)); + ++#ifdef HAVE_DNSSD + if (WebIFRef) + DNSServiceRefDeallocate(WebIFRef); + +@@ -2054,9 +2120,45 @@ + NULL)) != kDNSServiceErr_NoError) + cupsdLogMessage(CUPSD_LOG_ERROR, + "DNS-SD web interface registration failed: %d", error); ++#endif /* HAVE_DNSSD */ ++ ++#ifdef HAVE_AVAHI ++ if (!AvahiCupsClient) ++ /* ++ * Client not yet running. ++ */ ++ return; ++ ++ if (AvahiWebIFGroup) ++ avahi_entry_group_reset (AvahiWebIFGroup); ++ else ++ AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient, ++ avahi_entry_group_cb, ++ NULL); ++ ++ if (AvahiWebIFGroup) ++ { ++ ret = avahi_entry_group_add_service (AvahiWebIFGroup, ++ AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ 0, /* flags */ ++ webif, /* name */ ++ "_http._tcp", /* type */ ++ NULL, /* domain */ ++ NULL, /* host */ ++ DNSSDPort, /* port */ ++ "path=/", NULL); ++ if (ret == 0) ++ ret = avahi_entry_group_commit (AvahiWebIFGroup); ++ ++ if (ret != 0) ++ cupsdLogMessage (CUPSD_LOG_ERROR, ++ "Avahi web interface registration failed: %d", ret); ++ } ++#endif /* HAVE_AVAHI */ + } + } +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + + #ifdef HAVE_LDAP +@@ -2334,13 +2436,15 @@ + "Bad Back to My Mac domain in dynamic store!"); + } + # endif /* HAVE_COREFOUNDATION */ ++#endif /* HAVE_DNSSD */ + + ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + /* + * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info. + */ + +-static char * /* O - TXT record */ ++static cupsd_txt_record_t /* O - TXT record */ + dnssdBuildTxtRecord( + int *txt_len, /* O - TXT record length */ + cupsd_printer_t *p, /* I - Printer information */ +@@ -2379,7 +2483,12 @@ + keyvalue[i ][0] = "ty"; + keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown"; + +- snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName); ++ snprintf(admin_hostname, sizeof(admin_hostname), ++ "%s.local" ++#ifdef HAVE_DNSSD ++ "." /* terminating dot no good for Avahi */ ++#endif /* HAVE_DNSSD */ ++ , DNSSDHostName); + httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str), + "http", NULL, admin_hostname, DNSSDPort, "/%s/%s", + (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", +@@ -2462,7 +2571,12 @@ + * Then pack them into a proper txt record... + */ + ++#ifdef HAVE_DNSSD + return (dnssdPackTxtRecord(txt_len, keyvalue, i)); ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ return (avahiPackTxtRecord(keyvalue, i)); ++#endif /* HAVE_AVAHI */ + } + + +@@ -2474,7 +2588,16 @@ + dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */ + cupsd_printer_t *b)/* I - Second printer */ + { +- return (_cups_strcasecmp(a->reg_name, b->reg_name)); ++ if (!a->reg_name) ++ if (!b->reg_name) ++ return 0; ++ else ++ return -1; ++ else ++ if (!b->reg_name) ++ return 1; ++ else ++ return (_cups_strcasecmp(a->reg_name, b->reg_name)); + } + + +@@ -2489,6 +2612,10 @@ + { + cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name); + ++#ifdef HAVE_DNSSD ++ if (!DNSSDRef) ++ return; ++ + /* + * Closing the socket deregisters the service + */ +@@ -2524,6 +2651,24 @@ + free(p->printer_txt); + p->printer_txt = NULL; + } ++#endif /* HAVE_DNSSD */ ++ ++#ifdef HAVE_AVAHI ++ if (p->avahi_group) ++ { ++ avahi_entry_group_reset (p->avahi_group); ++ avahi_entry_group_free (p->avahi_group); ++ p->avahi_group = NULL; ++ ++ if (p->ipp_txt) ++ avahi_string_list_free (p->ipp_txt); ++ ++ if (p->printer_txt) ++ avahi_string_list_free (p->printer_txt); ++ ++ p->ipp_txt = p->printer_txt = NULL; ++ } ++#endif /* HAVE_AVAHI */ + + /* + * Remove the printer from the array of DNS-SD printers, then clear the +@@ -2533,8 +2678,10 @@ + cupsArrayRemove(DNSSDPrinters, p); + cupsdClearString(&p->reg_name); + } ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + ++#ifdef HAVE_DNSSD + /* + * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the + * TXT record format. +@@ -2644,8 +2791,10 @@ + LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED; + } + } ++#endif /* HAVE_DNSSD */ + + ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + /* + * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer + * or update the broadcast contents. +@@ -2654,20 +2803,40 @@ + static void + dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */ + { ++#ifdef HAVE_DNSSD + DNSServiceErrorType se; /* dnssd errors */ + char *ipp_txt, /* IPP TXT record buffer */ + *printer_txt, /* LPD TXT record buffer */ +- name[1024], /* Service name */ +- *nameptr; /* Pointer into name */ ++ name[1024]; /* Service name */ + int ipp_len, /* IPP TXT record length */ + printer_len, /* LPD TXT record length */ + printer_port; /* LPD port number */ ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ int ret; /* Error code */ ++ AvahiStringList *ipp_txt, /* IPP TXT record */ ++ *printer_txt; /* LPD TXT record */ ++ char name[AVAHI_LABEL_MAX], /* Service name */ ++ fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */ ++ char *regtype_copy, /* Writeable copy of reg type */ ++ *subtype, /* Current service sub type */ ++ *nextsubtype; /* Next service sub type */ ++#endif /* HAVE_AVAHI */ ++ char *nameptr; /* Pointer into name */ + const char *regtype; /* Registration type */ + + ++#ifdef HAVE_DNSSD ++ if (!DNSSDRef) ++ return; ++ + cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name, + !p->ipp_ref ? "new" : "update"); +- ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name, ++ !p->avahi_group ? "new" : "update"); ++#endif /* HAVE_AVAHI */ + /* + * If per-printer sharing was just disabled make sure we're not + * registered before returning. +@@ -2686,12 +2855,36 @@ + if (p->info && strlen(p->info) > 0) + { + if (DNSSDComputerName) +- snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName); ++ { ++ /* ++ * Make sure there is room for at least 15 characters of ++ * DNSSDComputerName. ++ */ ++ ++ assert(sizeof(name) >= 15 + 4); ++ nameptr = name + strlcpy(name, p->info, ++ sizeof(name) - 4 - ++ strnlen(DNSSDComputerName, 15)); ++ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name)); ++ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name)); ++ } + else + strlcpy(name, p->info, sizeof(name)); + } + else if (DNSSDComputerName) +- snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName); ++ { ++ /* ++ * Make sure there is room for at least 15 characters of ++ * DNSSDComputerName. ++ */ ++ ++ assert(sizeof(name) >= 15 + 4); ++ nameptr = name + strlcpy(name, p->info, ++ sizeof(name) - 4 - ++ strnlen(DNSSDComputerName, 15)); ++ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name)); ++ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name)); ++ } + else + strlcpy(name, p->name, sizeof(name)); + +@@ -2712,6 +2905,7 @@ + * Register IPP and (optionally) LPD... + */ + ++#ifdef HAVE_DNSSD + ipp_len = 0; /* anti-compiler-warning-code */ + ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0); + +@@ -2884,6 +3078,209 @@ + + if (printer_txt) + free(printer_txt); ++#endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ if (!AvahiCupsClient) ++ /* ++ * Client not running yet. The client callback will call us again later. ++ */ ++ return; ++ ++ ipp_txt = dnssdBuildTxtRecord(NULL, p, 0); ++ printer_txt = dnssdBuildTxtRecord(NULL, p, 1); ++ regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType; ++ ++ if (p->avahi_group && p->ipp_txt && ipp_txt && ++ !avahi_string_list_equal (p->ipp_txt, ipp_txt)) ++ { ++ /* ++ * Update the existing registration... ++ */ ++ ++ avahi_string_list_free (p->ipp_txt); ++ ++ if (p->printer_txt) ++ avahi_string_list_free (p->printer_txt); ++ ++ /* ++ * Update the service group entry. ++ */ ++ ++ regtype_copy = strdup (regtype); ++ subtype = strchr (regtype_copy, ','); ++ if (subtype) ++ *subtype = '\0'; ++ ++ cupsdLogMessage (CUPSD_LOG_DEBUG, ++ "Updating TXT record for %s (%s)", name, regtype_copy); ++ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group, ++ AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ 0, name, ++ regtype_copy, ++ NULL, ipp_txt); ++ free (regtype_copy); ++ ++ if (ret < 0) ++ goto update_failed; ++ ++ p->ipp_txt = ipp_txt; ++ ipp_txt = NULL; ++ ++ if (BrowseLocalProtocols & BROWSE_LPD) ++ { ++ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group, ++ AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ 0, name, ++ "_printer._tcp", NULL, ++ printer_txt); ++ if (ret < 0) ++ goto update_failed; ++ ++ p->printer_txt = printer_txt; ++ printer_txt = NULL; ++ } ++ ++ ret = avahi_entry_group_commit (p->avahi_group); ++ if (ret < 0) ++ { ++ update_failed: ++ cupsdLogMessage (CUPSD_LOG_ERROR, ++ "Failed to update TXT record for %s: %d", ++ name, ret); ++ avahi_entry_group_reset (p->avahi_group); ++ avahi_entry_group_free (p->avahi_group); ++ p->avahi_group = NULL; ++ ipp_txt = p->ipp_txt; ++ p->ipp_txt = NULL; ++ } ++ } ++ ++ if (!p->avahi_group) ++ { ++ /* ++ * Initial registration. Use the _fax subtype for fax queues... ++ */ ++ ++ p->avahi_group = avahi_entry_group_new (AvahiCupsClient, ++ avahi_entry_group_cb, ++ p); ++ ++ cupsdLogMessage(CUPSD_LOG_DEBUG, ++ "Registering Avahi printer %s with name \"%s\" and " ++ "type \"%s\"", p->name, name, regtype); ++ ++ if (!p->avahi_group) ++ { ++ ret = 0; ++ goto add_failed; ++ } ++ ++ /* ++ * Add each service type (DNSSDRegType may contain several, ++ * separated by commas). ++ */ ++ ++ subtype = regtype_copy = strdup (regtype); ++ while (subtype && *subtype) ++ { ++ nextsubtype = strchr (subtype, ','); ++ if (nextsubtype) ++ *nextsubtype++ = '\0'; ++ ++ if (subtype == regtype_copy) ++ { ++ /* ++ * Main type entry. ++ */ ++ ++ cupsdLogMessage (CUPSD_LOG_DEBUG, ++ "Adding TXT record for %s (%s)", name, regtype_copy); ++ ret = avahi_entry_group_add_service_strlst (p->avahi_group, ++ AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ 0, name, regtype_copy, ++ NULL, NULL, ++ DNSSDPort, ++ ipp_txt); ++ } ++ else ++ { ++ /* ++ * Sub-type entry. ++ */ ++ ++ snprintf (fullsubtype, sizeof(fullsubtype), ++ "%s._sub.%s", subtype, regtype_copy); ++ cupsdLogMessage (CUPSD_LOG_DEBUG, ++ "Adding TXT record for %s (%s)", name, fullsubtype); ++ ret = avahi_entry_group_add_service_subtype (p->avahi_group, ++ AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ 0, name, ++ regtype_copy, ++ NULL, fullsubtype); ++ } ++ ++ if (ret < 0) ++ { ++ free (regtype_copy); ++ goto add_failed; ++ } ++ ++ subtype = nextsubtype; ++ } ++ ++ free (regtype_copy); ++ p->ipp_txt = ipp_txt; ++ ipp_txt = NULL; ++ ++ if (BrowseLocalProtocols & BROWSE_LPD) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, ++ "Registering Avahi printer %s with name \"%s\" and " ++ "type \"_printer._tcp\"", p->name, name); ++ ++ ret = avahi_entry_group_add_service_strlst (p->avahi_group, ++ AVAHI_IF_UNSPEC, ++ AVAHI_PROTO_UNSPEC, ++ 0, name, ++ "_printer._tcp", NULL, NULL, ++ 515, ++ printer_txt); ++ if (ret < 0) ++ goto add_failed; ++ ++ p->printer_txt = printer_txt; ++ printer_txt = NULL; ++ } ++ ++ ret = avahi_entry_group_commit (p->avahi_group); ++ ++ if (ret < 0) ++ { ++ add_failed: ++ cupsdLogMessage (CUPSD_LOG_ERROR, ++ "Failed to add Avahi entry for %s: %d", ++ name, ret); ++ if (p->avahi_group) ++ { ++ avahi_entry_group_reset (p->avahi_group); ++ avahi_entry_group_free (p->avahi_group); ++ p->avahi_group = NULL; ++ } ++ ipp_txt = p->ipp_txt; ++ p->ipp_txt = NULL; ++ } ++ } ++ ++ if (ipp_txt) ++ avahi_string_list_free (ipp_txt); ++ ++ if (printer_txt) ++ avahi_string_list_free (printer_txt); ++#endif /* HAVE_AVAHI */ + } + + +@@ -2896,6 +3293,10 @@ + { + cupsd_printer_t *p; /* Current printer */ + ++#ifdef HAVE_DNSSD ++ if (!DNSSDRef) ++ return; ++#endif /* HAVE_DNSSD */ + + /* + * De-register the individual printers +@@ -2906,6 +3307,7 @@ + p = (cupsd_printer_t *)cupsArrayNext(Printers)) + dnssdDeregisterPrinter(p); + ++#ifdef HAVE_DNSSD + /* + * Shutdown the rest of the service refs... + */ +@@ -2926,14 +3328,17 @@ + + DNSServiceRefDeallocate(DNSSDRef); + DNSSDRef = NULL; ++#endif /* HAVE_DNSSD */ + + cupsArrayDelete(DNSSDPrinters); + DNSSDPrinters = NULL; + + DNSSDPort = 0; + } ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + ++#ifdef HAVE_DNSSD + /* + * 'dnssdUpdate()' - Handle DNS-SD queries. + */ +@@ -2955,6 +3360,147 @@ + #endif /* HAVE_DNSSD */ + + ++#ifdef HAVE_AVAHI ++/* ++ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an ++ * AvahiStringList. ++ */ ++ ++static AvahiStringList * /* O - new string list */ ++avahiPackTxtRecord(char *keyvalue[][2], /* I - Table of key value pairs */ ++ int count) /* I - Number of items in table */ ++{ ++ AvahiStringList *strlst = NULL; ++ char **elements; ++ size_t len; ++ int i = 0; ++ ++ elements = malloc ((1 + count) * sizeof (char *)); ++ if (!elements) ++ goto cleanup; ++ ++ for (i = 0; i < count; i++) ++ { ++ len = (1 + strlen (keyvalue[i][0]) + ++ (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1)); ++ elements[i] = malloc (len * sizeof (char)); ++ if (!elements[i]) ++ goto cleanup; ++ ++ snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]); ++ } ++ ++ strlst = avahi_string_list_new_from_array ((const char **) elements, count); ++ ++cleanup: ++ while (--i >= 0) ++ free (elements[i]); ++ ++ free (elements); ++ return (strlst); ++} ++ ++ ++/* ++ * 'avahi_entry_group_cb()' - Avahi entry group callback function. ++ */ ++static void ++avahi_entry_group_cb (AvahiEntryGroup *group, ++ AvahiEntryGroupState state, ++ void *userdata) ++{ ++ char *name; ++ ++ if (userdata) ++ name = ((cupsd_printer_t *) userdata)->reg_name; ++ else ++ name = "CUPS web interface"; ++ ++ switch (state) ++ { ++ case AVAHI_ENTRY_GROUP_UNCOMMITED: ++ case AVAHI_ENTRY_GROUP_REGISTERING: ++ break; ++ ++ case AVAHI_ENTRY_GROUP_ESTABLISHED: ++ cupsdLogMessage (CUPSD_LOG_DEBUG, ++ "Avahi entry group established for %s", name); ++ break; ++ ++ default: ++ cupsdLogMessage (CUPSD_LOG_DEBUG, ++ "Avahi entry group %s has state %d", ++ name, state); ++ break; ++ } ++} ++ ++ ++/* ++ * 'avahi_client_cb()' - Avahi client callback function. ++ */ ++static void ++avahi_client_cb (AvahiClient *client, ++ AvahiClientState state, ++ void *userdata) ++{ ++ cupsd_printer_t *printer; ++ switch (state) ++ { ++ case AVAHI_CLIENT_S_RUNNING: ++ /* ++ * Avahi client started successfully. ++ */ ++ AvahiCupsClient = client; ++ AvahiCupsClientConnecting = 0; ++ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started"); ++ ++ cupsdUpdateDNSSDName (); ++ ++ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers); ++ printer; ++ printer = (cupsd_printer_t *)cupsArrayNext(Printers)) ++ if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) && ++ (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT | ++ CUPS_PRINTER_SCANNER))) && printer->shared) ++ dnssdRegisterPrinter (printer); ++ ++ break; ++ ++ case AVAHI_CLIENT_CONNECTING: ++ /* ++ * No Avahi daemon, client is waiting. ++ */ ++ AvahiCupsClientConnecting = 1; ++ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting"); ++ break; ++ ++ case AVAHI_CLIENT_FAILURE: ++ /* ++ * Avahi client failed, close it to allow a clean restart. ++ */ ++ cupsdLogMessage (CUPSD_LOG_ERROR, ++ "Avahi client failed, " ++ "closing client to allow a clean restart"); ++ ++ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers); ++ printer; ++ printer = (cupsd_printer_t *)cupsArrayNext(Printers)) ++ dnssdDeregisterPrinter (printer); ++ ++ avahi_client_free(client); ++ AvahiCupsClientConnecting = 0; ++ AvahiCupsClient = NULL; ++ ++ break; ++ ++ default: ++ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state); ++ } ++} ++#endif /* HAVE_AVAHI */ ++ ++ + /* + * 'get_auth_info_required()' - Get the auth-info-required value to advertise. + */ +--- a/scheduler/dirsvc.h ++++ b/scheduler/dirsvc.h +@@ -31,6 +31,10 @@ + # endif /* HAVE_LDAP_SSL_H */ + #endif /* HAVE_LDAP */ + ++#ifdef HAVE_AVAHI ++# include ++#endif /* HAVE_AVAHI */ ++ + /* + * Browse protocols... + */ +@@ -131,19 +135,22 @@ + VAR cupsd_statbuf_t *PollStatusBuffer VALUE(NULL); + /* Status buffer for pollers */ + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + VAR char *DNSSDComputerName VALUE(NULL), + /* Computer/server name */ + *DNSSDHostName VALUE(NULL), + /* Hostname */ + *DNSSDRegType VALUE(NULL); + /* Bonjour registration type */ +-VAR cups_array_t *DNSSDAlias VALUE(NULL); +- /* List of dynamic ServerAlias's */ + VAR int DNSSDPort VALUE(0); + /* Port number to register */ + VAR cups_array_t *DNSSDPrinters VALUE(NULL); + /* Printers we have registered */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ ++ ++#ifdef HAVE_DNSSD ++VAR cups_array_t *DNSSDAlias VALUE(NULL); ++ /* List of dynamic ServerAlias's */ + VAR DNSServiceRef DNSSDRef VALUE(NULL), + /* Master DNS-SD service reference */ + WebIFRef VALUE(NULL), +@@ -152,6 +159,17 @@ + /* Remote printer browse reference */ + #endif /* HAVE_DNSSD */ + ++#ifdef HAVE_AVAHI ++VAR AvahiCupsPoll *AvahiCupsPollHandle VALUE(NULL); ++ /* AvahiCupsPoll object */ ++VAR AvahiClient *AvahiCupsClient VALUE(NULL); ++ /* AvahiClient object */ ++VAR int AvahiCupsClientConnecting VALUE(0); ++ /* Is AvahiClient object connecting? */ ++VAR AvahiEntryGroup *AvahiWebIFGroup VALUE(NULL); ++ /* Web interface entry group */ ++#endif /* HAVE_AVAHI */ ++ + #ifdef HAVE_LIBSLP + VAR SLPHandle BrowseSLPHandle VALUE(NULL); + /* SLP API handle */ +@@ -195,13 +213,14 @@ + extern void cupsdRestartPolling(void); + extern void cupsdSaveRemoteCache(void); + extern void cupsdSendBrowseList(void); ++extern void cupsdStartAvahiClient(void); + extern void cupsdStartBrowsing(void); + extern void cupsdStartPolling(void); + extern void cupsdStopBrowsing(void); + extern void cupsdStopPolling(void); +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + extern void cupsdUpdateDNSSDName(void); +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + #ifdef HAVE_LDAP + extern void cupsdUpdateLDAPBrowse(void); + #endif /* HAVE_LDAP */ +--- a/scheduler/ipp.c ++++ b/scheduler/ipp.c +@@ -6087,7 +6087,7 @@ + ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time", + ippTimeToDate(curtime)); + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + if (!ra || cupsArrayFind(ra, "printer-dns-sd-name")) + { + if (printer->reg_name) +@@ -6097,7 +6097,7 @@ + ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE, + "printer-dns-sd-name", 0); + } +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + if (!ra || cupsArrayFind(ra, "printer-error-policy")) + ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME, +--- a/scheduler/printers.c ++++ b/scheduler/printers.c +@@ -883,9 +883,9 @@ + cupsdClearString(&p->alert); + cupsdClearString(&p->alert_description); + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + cupsdClearString(&p->pdl); +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + + cupsArrayDelete(p->filetypes); + +@@ -3765,7 +3765,7 @@ + attr->values[i].string.text = _cupsStrAlloc(mimetype); + } + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + { + char pdl[1024]; /* Buffer to build pdl list */ + mime_filter_t *filter; /* MIME filter looping var */ +@@ -3821,7 +3821,7 @@ + + cupsdSetString(&p->pdl, pdl); + } +-#endif /* HAVE_DNSSD */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ + } + + +--- a/scheduler/printers.h ++++ b/scheduler/printers.h +@@ -16,6 +16,9 @@ + #ifdef HAVE_DNSSD + # include + #endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++# include "avahi.h" ++#endif /* HAVE_AVAHI */ + #include + + +@@ -95,16 +98,23 @@ + time_t marker_time; /* Last time marker attributes were updated */ + _ppd_cache_t *pc; /* PPD cache and mapping data */ + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + char *reg_name, /* Name used for service registration */ +- *pdl, /* pdl value for TXT record */ +- *ipp_txt, /* IPP TXT record contents */ ++ *pdl; /* pdl value for TXT record */ ++#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ ++#ifdef HAVE_DNSSD ++ char *ipp_txt, /* IPP TXT record contents */ + *printer_txt; /* LPD TXT record contents */ + int ipp_len, /* IPP TXT record length */ + printer_len; /* LPD TXT record length */ + DNSServiceRef ipp_ref, /* Reference for _ipp._tcp,_cups */ + printer_ref; /* Reference for _printer._tcp */ + #endif /* HAVE_DNSSD */ ++#ifdef HAVE_AVAHI ++ AvahiStringList *ipp_txt, /* IPP TXT record */ ++ *printer_txt; /* LPD TXT record */ ++ AvahiEntryGroup *avahi_group; /* Avahi entry group */ ++#endif /* HAVE_AVAHI */ + }; + + +--- a/scheduler/conf.c ++++ b/scheduler/conf.c +@@ -650,7 +650,7 @@ + Browsing = CUPS_DEFAULT_BROWSING; + DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED; + +-#ifdef HAVE_DNSSD ++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) + cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups"); + #endif /* HAVE_DNSSD */ + diff --git a/~mtjm/cups-usblp/cups-no-export-ssllibs.patch b/~mtjm/cups-usblp/cups-no-export-ssllibs.patch new file mode 100644 index 000000000..9be3c819b --- /dev/null +++ b/~mtjm/cups-usblp/cups-no-export-ssllibs.patch @@ -0,0 +1,12 @@ +diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4 +--- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200 ++++ cups-1.5b1/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200 +@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES) + AC_SUBST(SSLFLAGS) + AC_SUBST(SSLLIBS) + +-EXPORT_SSLLIBS="$SSLLIBS" ++EXPORT_SSLLIBS="" + AC_SUBST(EXPORT_SSLLIBS) + + diff --git a/~mtjm/cups-usblp/cups-no-gcrypt.patch b/~mtjm/cups-usblp/cups-no-gcrypt.patch new file mode 100644 index 000000000..42f71d0d4 --- /dev/null +++ b/~mtjm/cups-usblp/cups-no-gcrypt.patch @@ -0,0 +1,38 @@ +diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4 +--- cups-1.5.0.orig//config-scripts/cups-ssl.m4 2011-01-11 08:05:58.000000000 +0100 ++++ cups-1.5.0/config-scripts/cups-ssl.m4 2011-08-02 10:44:26.011047900 +0200 +@@ -96,7 +96,6 @@ + dnl Then look for GNU TLS... + if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then + AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) +- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) + if $PKGCONFIG --exists gnutls; then + have_ssl=1 + SSLLIBS=`$PKGCONFIG --libs gnutls` +@@ -110,16 +109,6 @@ + AC_DEFINE(HAVE_SSL) + AC_DEFINE(HAVE_GNUTLS) + fi +- +- if test $have_ssl = 1; then +- if $PKGCONFIG --exists gcrypt; then +- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" +- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" +- elif test "x$LIBGCRYPTCONFIG" != x; then +- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`" +- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`" +- fi +- fi + fi + + dnl Check for the OpenSSL library last... +--- cups-1.5.0.orig//cups/http-private.h 2011-01-22 01:07:22.000000000 +0100 ++++ cups-1.5.0/cups/http-private.h 2011-08-02 10:42:43.341604107 +0200 +@@ -93,7 +93,6 @@ + # elif defined HAVE_GNUTLS + # include + # include +-# include + # elif defined(HAVE_CDSASSL) + # include + # include diff --git a/~mtjm/cups-usblp/cups.install b/~mtjm/cups-usblp/cups.install new file mode 100644 index 000000000..47c3d9b82 --- /dev/null +++ b/~mtjm/cups-usblp/cups.install @@ -0,0 +1,26 @@ +post_install() { + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi + echo ">> If you use an HTTPS connection to CUPS, the first time you access" + echo ">> the interface it may take a very long time before the site comes up." + echo ">> This is because the first request triggers the generation of the CUPS" + echo ">> SSL certificates which can be a very time-consuming job." +} + +post_upgrade() { + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi + if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then + # important upgrade notice + echo "daemon script has been renamed to /etc/rc.d/cupsd" + echo "change your entry in /etc/rc.conf" + fi +} + +post_remove() { + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + fi +} diff --git a/~mtjm/cups-usblp/cups.logrotate b/~mtjm/cups-usblp/cups.logrotate new file mode 100644 index 000000000..9c49bbdaf --- /dev/null +++ b/~mtjm/cups-usblp/cups.logrotate @@ -0,0 +1,8 @@ +/var/log/cups/*log { + missingok + notifempty + delaycompress + postrotate + /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/~mtjm/cups-usblp/cups.pam b/~mtjm/cups-usblp/cups.pam new file mode 100644 index 000000000..53724d1f8 --- /dev/null +++ b/~mtjm/cups-usblp/cups.pam @@ -0,0 +1,3 @@ +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so -- cgit v1.2.3-54-g00ecf From 2aa2acfff38de7de825868995e49792ecfc03126 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 Jan 2012 23:15:03 +0000 Subject: Tue Jan 24 23:15:02 UTC 2012 --- community-staging/gdk-pixbuf/PKGBUILD | 43 +++ .../gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch | 48 ++++ .../gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch | 19 ++ .../gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch | 134 +++++++++ .../gdk-pixbuf/gdk-pixbuf-0.22.0.patch | 129 +++++++++ community-staging/gdk-pixbuf/libpng15.patch | 30 ++ community-staging/libharu/PKGBUILD | 34 +++ community-staging/libharu/libpng15.patch | 302 +++++++++++++++++++++ community-staging/mapnik/PKGBUILD | 51 ++++ community-staging/mapnik/mapnik.install | 11 + community-staging/openmotif/PKGBUILD | 45 +++ community-staging/python2-matplotlib/PKGBUILD | 52 ++++ community-staging/python2-matplotlib/setup.cfg | 83 ++++++ community-staging/qpxtool/PKGBUILD | 28 ++ community-staging/qpxtool/libpng15.patch | 127 +++++++++ community-staging/rawstudio/PKGBUILD | 36 +++ community-staging/rawstudio/libpng15.patch | 40 +++ community-staging/rawstudio/rawstudio.install | 11 + community/libircclient/PKGBUILD | 4 +- community/packagekit/PKGBUILD | 43 +-- community/packagekit/alpm.patch | 230 +++++++++++++--- community/tinyproxy/PKGBUILD | 7 +- community/tinyproxy/tinyproxy | 6 +- community/tinyproxy/tinyproxy.install | 9 + core/btrfs-progs/PKGBUILD | 31 +++ core/iproute2/PKGBUILD | 14 +- core/iproute2/fix-ip-l.patch | 27 ++ extra/freeglut/PKGBUILD | 25 +- extra/gptfdisk/PKGBUILD | 6 +- extra/memcached/PKGBUILD | 6 +- extra/perl-alien-sdl/PKGBUILD | 10 +- multilib/lib32-sdl_image/PKGBUILD | 6 +- staging/avahi/PKGBUILD | 75 +++++ staging/avahi/gnome-nettool.png | Bin 0 -> 4509 bytes staging/avahi/install | 21 ++ staging/avahi/rc.d.patch | 11 + staging/bmp/0.9.7.1-visualization.patch | 12 + staging/bmp/PKGBUILD | 34 +++ staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch | 108 ++++++++ staging/bmp/bmp.install | 11 + staging/gtk-engines/PKGBUILD | 28 ++ staging/gtkhtml/PKGBUILD | 31 +++ staging/gtkmm/PKGBUILD | 38 +++ staging/gtksourceview2/PKGBUILD | 28 ++ staging/imlib2/PKGBUILD | 38 +++ staging/libgnomecanvas/PKGBUILD | 27 ++ staging/opengtl/PKGBUILD | 32 +++ staging/pekwm/PKGBUILD | 45 +++ staging/pekwm/libpng-1.4.patch | 21 ++ staging/pekwm/pekwm.desktop | 8 + staging/pilot-link/PKGBUILD | 32 +++ staging/pilot-link/pilot-link-png14.patch | 100 +++++++ staging/pygtk/PKGBUILD | 37 +++ staging/pygtk/python27.patch | 50 ++++ staging/skanlite/PKGBUILD | 30 ++ staging/xawtv/PKGBUILD | 29 ++ staging/xorg-xcursorgen/PKGBUILD | 28 ++ testing/gcc/PKGBUILD | 260 ++++++++++++++++++ testing/gcc/gcc-ada.install | 20 ++ testing/gcc/gcc-fortran.install | 16 ++ testing/gcc/gcc-go.install | 20 ++ testing/gcc/gcc-hash-style-both.patch | 122 +++++++++ testing/gcc/gcc-libs.install | 16 ++ testing/gcc/gcc.install | 20 ++ testing/gcc/gcc_pure64.patch | 26 ++ 65 files changed, 2927 insertions(+), 94 deletions(-) create mode 100644 community-staging/gdk-pixbuf/PKGBUILD create mode 100644 community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch create mode 100644 community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch create mode 100644 community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch create mode 100644 community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0.patch create mode 100644 community-staging/gdk-pixbuf/libpng15.patch create mode 100644 community-staging/libharu/PKGBUILD create mode 100644 community-staging/libharu/libpng15.patch create mode 100644 community-staging/mapnik/PKGBUILD create mode 100644 community-staging/mapnik/mapnik.install create mode 100644 community-staging/openmotif/PKGBUILD create mode 100644 community-staging/python2-matplotlib/PKGBUILD create mode 100644 community-staging/python2-matplotlib/setup.cfg create mode 100644 community-staging/qpxtool/PKGBUILD create mode 100644 community-staging/qpxtool/libpng15.patch create mode 100644 community-staging/rawstudio/PKGBUILD create mode 100644 community-staging/rawstudio/libpng15.patch create mode 100644 community-staging/rawstudio/rawstudio.install create mode 100644 community/tinyproxy/tinyproxy.install create mode 100644 core/btrfs-progs/PKGBUILD create mode 100644 core/iproute2/fix-ip-l.patch create mode 100644 staging/avahi/PKGBUILD create mode 100644 staging/avahi/gnome-nettool.png create mode 100644 staging/avahi/install create mode 100644 staging/avahi/rc.d.patch create mode 100644 staging/bmp/0.9.7.1-visualization.patch create mode 100644 staging/bmp/PKGBUILD create mode 100644 staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch create mode 100644 staging/bmp/bmp.install create mode 100644 staging/gtk-engines/PKGBUILD create mode 100644 staging/gtkhtml/PKGBUILD create mode 100644 staging/gtkmm/PKGBUILD create mode 100644 staging/gtksourceview2/PKGBUILD create mode 100644 staging/imlib2/PKGBUILD create mode 100644 staging/libgnomecanvas/PKGBUILD create mode 100644 staging/opengtl/PKGBUILD create mode 100644 staging/pekwm/PKGBUILD create mode 100644 staging/pekwm/libpng-1.4.patch create mode 100644 staging/pekwm/pekwm.desktop create mode 100644 staging/pilot-link/PKGBUILD create mode 100644 staging/pilot-link/pilot-link-png14.patch create mode 100644 staging/pygtk/PKGBUILD create mode 100644 staging/pygtk/python27.patch create mode 100644 staging/skanlite/PKGBUILD create mode 100644 staging/xawtv/PKGBUILD create mode 100644 staging/xorg-xcursorgen/PKGBUILD create mode 100644 testing/gcc/PKGBUILD create mode 100644 testing/gcc/gcc-ada.install create mode 100644 testing/gcc/gcc-fortran.install create mode 100644 testing/gcc/gcc-go.install create mode 100644 testing/gcc/gcc-hash-style-both.patch create mode 100644 testing/gcc/gcc-libs.install create mode 100644 testing/gcc/gcc.install create mode 100644 testing/gcc/gcc_pure64.patch (limited to 'extra') diff --git a/community-staging/gdk-pixbuf/PKGBUILD b/community-staging/gdk-pixbuf/PKGBUILD new file mode 100644 index 000000000..8c9a1bced --- /dev/null +++ b/community-staging/gdk-pixbuf/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 62652 2012-01-23 09:38:23Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: dorphell +# Contributor: Judd Vinet + +pkgname=gdk-pixbuf +pkgver=0.22.0 +pkgrel=9 +pkgdesc="Image loading and manipulation library" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL' 'LGPL') +depends=('gtk' 'libtiff' 'libpng') +makedepends=('libxt') +options=('!libtool') +source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.24/${pkgname}-${pkgver}.tar.bz2 + gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch + gdk-pixbuf-0.22.0-bmp_secure.patch + gdk-pixbuf-0.22.0-loaders.patch + gdk-pixbuf-0.22.0.patch + libpng15.patch) +md5sums=('05fcb68ceaa338614ab650c775efc2f2' + 'd1fb93f1ae994875158a7e0c108c36f8' + '5f59d5772b1482d885a180dbc581cf84' + '3cf31ae0509747f72ac27a9fd96109c2' + 'e0f5f301ce958b7cea0be631ed7b8e56' + '16db4dc83d507ebcf15d1beb753a77bc') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + export SED=/bin/sed + patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch + patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch + patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch + patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch + patch -Np1 -i ${srcdir}/libpng15.patch + libtoolize --force --copy --automake + autoreconf --force --install + ./configure --prefix=/usr --disable-gtk-doc + make + make DESTDIR=${pkgdir} install + rm -rf ${pkgdir}/usr/share/gnome +} diff --git a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch new file mode 100644 index 000000000..ffb4378aa --- /dev/null +++ b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch @@ -0,0 +1,48 @@ +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c 2002-09-27 23:12:40.000000000 +0200 ++++ gdk-pixbuf-0.22.0.patched/gdk-pixbuf/io-bmp.c 2005-03-30 01:33:06.000000000 +0200 +@@ -31,8 +31,6 @@ + #include "gdk-pixbuf-private.h" + #include "gdk-pixbuf-io.h" + +- +- + #if 0 + /* If these structures were unpacked, they would define the two headers of the + * BMP file. After them comes the palette, and then the image data. +@@ -206,7 +204,7 @@ + + if (State == NULL) + return NULL; +- ++ + while (feof(f) == 0) { + length = fread(membuf, 1, sizeof (membuf), f); + if (length > 0) +@@ -245,11 +243,26 @@ + static gboolean + grow_buffer (struct bmp_progressive_state *State) + { +- guchar *tmp = realloc (State->buff, State->BufferSize); ++ guchar *tmp; ++ ++ if (State->BufferSize == 0) { ++#if 0 ++ g_set_error (error, ++ GDK_PIXBUF_ERROR, ++ GDK_PIXBUF_ERROR_CORRUPT_IMAGE, ++ _("BMP image has bogus header data")); ++#endif ++ State->read_state = READ_STATE_ERROR; ++ return FALSE; ++ } ++ ++ tmp = realloc (State->buff, State->BufferSize); ++ + if (!tmp) { + State->read_state = READ_STATE_ERROR; + return FALSE; + } ++ + State->buff = tmp; + return TRUE; + } diff --git a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch new file mode 100644 index 000000000..29471f147 --- /dev/null +++ b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-bmp_secure.patch @@ -0,0 +1,19 @@ +Index: io-bmp.c +=================================================================== +RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-bmp.c,v +retrieving revision 1.41 +diff -u -p -r1.41 io-bmp.c +--- gdk-pixbuf/io-bmp.c 13 Aug 2004 02:26:57 -0000 1.41 ++++ gdk-pixbuf/io-bmp.c 20 Aug 2004 00:18:14 -0000 +@@ -876,8 +876,10 @@ DoCompressed(struct bmp_progressive_stat + guchar c; + gint idx; + +- if (context->compr.y >= context->Header.height) ++ if (context->compr.y >= context->Header.height) { ++ context->BufferDone = 0; + return TRUE; ++ } + + y = context->compr.y; + diff --git a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch new file mode 100644 index 000000000..068653808 --- /dev/null +++ b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0-loaders.patch @@ -0,0 +1,134 @@ +diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-ico.c 2002-09-27 17:19:15.000000000 -0500 ++++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-ico.c 2005-10-27 11:28:23.000000000 -0500 +@@ -330,6 +330,9 @@ + + State->HeaderSize+=I; + ++ if (State->HeaderSize < 0) ++ return FALSE; ++ + if (State->HeaderSize>State->BytesInHeaderBuf) { + guchar *tmp=realloc(State->HeaderBuf,State->HeaderSize); + if (!tmp) +diff -NurdB gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-xpm.c 2001-03-01 15:16:28.000000000 -0500 ++++ gdk-pixbuf-0.22.0-patched/gdk-pixbuf/io-xpm.c 2005-10-27 11:29:14.000000000 -0500 +@@ -243,8 +243,8 @@ + break; + else { + if (numnames > 0) { +- space -= 1; +- strcat (color, " "); ++ strncat (color, " ", space); ++ space -= MIN (space, 1); + } + + strncat (color, temp, space); +@@ -281,7 +281,8 @@ + /* Fall through to the xpm_read_string. */ + + case op_body: +- xpm_read_string (h->infile, &h->buffer, &h->buffer_size); ++ if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size)) ++ return NULL; + return h->buffer; + + default: +@@ -317,13 +318,6 @@ + return NULL; + } + +-/* Destroy notification function for the pixbuf */ +-static void +-free_buffer (guchar *pixels, gpointer data) +-{ +- free (pixels); +-} +- + static gboolean + xpm_color_parse (const char *spec, XColor *color) + { +@@ -342,7 +336,8 @@ + gchar pixel_str[32]; + GHashTable *color_hash; + _XPMColor *colors, *color, *fallbackcolor; +- guchar *pixels, *pixtmp; ++ guchar *pixtmp; ++ GdkPixbuf* pixbuf; + + fallbackcolor = NULL; + +@@ -352,16 +347,33 @@ + return NULL; + } + sscanf (buffer, "%d %d %d %d", &w, &h, &n_col, &cpp); +- if (cpp >= 32) { +- g_warning ("XPM has more than 31 chars per pixel."); ++ if (cpp <= 0 || cpp >= 32) { ++ g_warning ("XPM has invalid number of chars per pixel."); + return NULL; + } ++ if (n_col <= 0 || ++ n_col >= G_MAXINT / (cpp + 1) || ++ n_col >= G_MAXINT / sizeof (_XPMColor)) { ++ g_warning ("XPM file has invalid number of colors"); ++ return NULL; ++ } + + /* The hash is used for fast lookups of color from chars */ + color_hash = g_hash_table_new (g_str_hash, g_str_equal); + +- name_buf = g_new (gchar, n_col * (cpp + 1)); +- colors = g_new (_XPMColor, n_col); ++ name_buf = g_new (gchar, n_col * (cpp + 1)); ++ if (!name_buf) { ++ g_warning ("Cannot allocate memory for loading XPM image"); ++ g_hash_table_destroy (color_hash); ++ return NULL; ++ } ++ colors = g_new (_XPMColor, n_col); ++ if (!colors) { ++ g_warning ("Cannot allocate memory for loading XPM image"); ++ g_hash_table_destroy (color_hash); ++ g_free (name_buf); ++ return NULL; ++ } + + for (cnt = 0; cnt < n_col; cnt++) { + gchar *color_name; +@@ -397,12 +409,8 @@ + fallbackcolor = color; + } + +- if (is_trans) +- pixels = malloc (w * h * 4); +- else +- pixels = malloc (w * h * 3); +- +- if (!pixels) { ++ pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, is_trans, 8, w, h); ++ if (!pixbuf) { + g_hash_table_destroy (color_hash); + g_free (colors); + g_free (name_buf); +@@ -410,7 +418,7 @@ + } + + wbytes = w * cpp; +- pixtmp = pixels; ++ pixtmp = pixbuf->pixels; + + for (ycnt = 0; ycnt < h; ycnt++) { + buffer = (*get_buf) (op_body, handle); +@@ -443,9 +451,7 @@ + g_free (colors); + g_free (name_buf); + +- return gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, is_trans, 8, +- w, h, is_trans ? (w * 4) : (w * 3), +- free_buffer, NULL); ++ return pixbuf; + } + + /* Shared library entry point for file loading */ diff --git a/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0.patch b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0.patch new file mode 100644 index 000000000..8e0f55680 --- /dev/null +++ b/community-staging/gdk-pixbuf/gdk-pixbuf-0.22.0.patch @@ -0,0 +1,129 @@ +--- configure.in ++++ configure.in +@@ -21,6 +21,7 @@ + AC_PROG_CC + AC_ISC_POSIX + AM_PROG_CC_STDC ++AM_PROG_AS + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET +@@ -147,18 +148,18 @@ + dnl Test for libtiff + if test -z "$LIBTIFF"; then + AC_CHECK_LIB(tiff, TIFFReadScanline, +- AC_CHECK_HEADER(tiffio.h, ++ [AC_CHECK_HEADER(tiffio.h, + TIFF='tiff'; LIBTIFF='-ltiff', +- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), +- AC_CHECK_LIB(tiff, TIFFWriteScanline, +- AC_CHECK_HEADER(tiffio.h, ++ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], ++ [AC_CHECK_LIB(tiff, TIFFWriteScanline, ++ [AC_CHECK_HEADER(tiffio.h, + TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz', +- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), +- AC_CHECK_LIB(tiff34, TIFFFlushData, +- AC_CHECK_HEADER(tiffio.h, ++ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], ++ [AC_CHECK_LIB(tiff34, TIFFFlushData, ++ [AC_CHECK_HEADER(tiffio.h, + TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz', +- AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), +- AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm) ++ AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], ++ AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm) + fi + + dnl Test for libjpeg +@@ -191,9 +192,9 @@ + dnl Test for libpng + if test -z "$LIBPNG"; then + AC_CHECK_LIB(png, png_read_info, +- AC_CHECK_HEADER(png.h, ++ [AC_CHECK_HEADER(png.h, + png_ok=yes, +- png_ok=no), ++ png_ok=no)], + AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm) + if test "$png_ok" = yes; then + AC_MSG_CHECKING([for png_structp in png.h]) +--- doc/Makefile.am ++++ doc/Makefile.am +@@ -156,7 +156,7 @@ + done; \ + fi) + # echo '-- Installing $(srcdir)/html/index.sgml' ; \ +-# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ ++# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); + + # + # Require gtk-doc when making dist +--- gdk-pixbuf.m4 ++++ gdk-pixbuf.m4 +@@ -9,7 +9,7 @@ + dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS + dnl +-AC_DEFUN(AM_PATH_GDK_PIXBUF, ++AC_DEFUN([AM_PATH_GDK_PIXBUF], + [dnl + dnl Get the cflags and libraries from the gdk-pixbuf-config script + dnl +--- gdk-pixbuf/Makefile.am ++++ gdk-pixbuf/Makefile.am +@@ -18,7 +18,7 @@ + + libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS) + +-libexecdir = $(libdir)/gdk-pixbuf/loaders ++loaderdir = $(libdir)/gdk-pixbuf/loaders + + # + # The PNG plugin. +@@ -118,7 +118,7 @@ + + if BUILD_DYNAMIC_MODULES + +-libexec_LTLIBRARIES = \ ++loader_LTLIBRARIES = \ + $(PNG_LIB) \ + $(JPEG_LIB) \ + $(GIF_LIB) \ +@@ -134,7 +134,7 @@ + extra_sources = + + else +-libexec_LTLIBRARIES = ++loader_LTLIBRARIES = + + extra_sources = $(libpixbufloader_png_la_SOURCES) \ + $(libpixbufloader_jpeg_la_SOURCES) \ +@@ -159,7 +159,7 @@ + -I$(top_builddir)/gdk-pixbuf \ + $(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) + +-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\"" ++AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" + + LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS) + +@@ -211,7 +211,7 @@ + gdk-pixbuf-parse-color.c \ + $(extra_sources) + +-libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS) ++libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) + libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS) + + +--- gdk-pixbuf/io-bmp.c ++++ gdk-pixbuf/io-bmp.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include "gdk-pixbuf-private.h" + #include "gdk-pixbuf-io.h" + diff --git a/community-staging/gdk-pixbuf/libpng15.patch b/community-staging/gdk-pixbuf/libpng15.patch new file mode 100644 index 000000000..e667288f8 --- /dev/null +++ b/community-staging/gdk-pixbuf/libpng15.patch @@ -0,0 +1,30 @@ +diff -wbBur gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c +--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c 2001-01-24 23:59:23.000000000 +0300 ++++ gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c 2012-01-23 13:33:08.000000000 +0400 +@@ -175,7 +175,7 @@ + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); + return NULL; + } +@@ -311,7 +311,7 @@ + return NULL; + } + +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + if (lc->png_info_ptr) + png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL); + g_free(lc); +@@ -366,7 +366,7 @@ + lc->max_row_seen_in_chunk = -1; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + return FALSE; + } else { + png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size); diff --git a/community-staging/libharu/PKGBUILD b/community-staging/libharu/PKGBUILD new file mode 100644 index 000000000..862dab0ce --- /dev/null +++ b/community-staging/libharu/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 62648 2012-01-23 08:59:04Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer : SpepS +# Contributor: Auguste +# Contributor: Jose Negron + +pkgname=libharu +pkgver=2.2.1 +pkgrel=2 +pkgdesc="C/C++ library for generating PDF documents" +url="http://libharu.org/wiki/Main_Page" +arch=('i686' 'x86_64') +license=('custom:ZLIB') +depends=('libpng' 'gcc-libs') +options=(!libtool) +source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz" + libpng15.patch) +md5sums=('63da8e087744f1d6cf16f9501b1cb766' + '3793dd30017474bcd277af3b419bc0f6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/libpng15.patch + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + # license + install -d "$pkgdir/usr/share/licenses/$pkgname" + sed -n '102,120p' README > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-staging/libharu/libpng15.patch b/community-staging/libharu/libpng15.patch new file mode 100644 index 000000000..05a8d39fc --- /dev/null +++ b/community-staging/libharu/libpng15.patch @@ -0,0 +1,302 @@ +diff -wbBur libharu-2.2.1/src/hpdf_image_png.c libharu-2.2.1.my/src/hpdf_image_png.c +--- libharu-2.2.1/src/hpdf_image_png.c 2010-02-08 12:27:51.000000000 +0300 ++++ libharu-2.2.1.my/src/hpdf_image_png.c 2012-01-23 12:53:05.000000000 +0400 +@@ -110,13 +110,13 @@ + { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); + png_bytep* row_pointers = HPDF_GetMem (image->mmgr, +- info_ptr->height * sizeof (png_bytep)); ++ png_image_height(png_ptr, info_ptr) * sizeof (png_bytep)); + + if (row_pointers) { + HPDF_UINT i; + +- HPDF_MemSet (row_pointers, 0, info_ptr->height * sizeof (png_bytep)); +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ HPDF_MemSet (row_pointers, 0, png_image_height(png_ptr, info_ptr) * sizeof (png_bytep)); ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + row_pointers[i] = HPDF_GetMem (image->mmgr, len); + + if (image->error->error_no != HPDF_OK) +@@ -126,7 +126,7 @@ + if (image->error->error_no == HPDF_OK) { + png_read_image(png_ptr, row_pointers); + if (image->error->error_no == HPDF_OK) { /* add this line */ +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + if (HPDF_Stream_Write (image->stream, row_pointers[i], len) != + HPDF_OK) + break; +@@ -135,7 +135,7 @@ + } + + /* clean up */ +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + HPDF_FreeMem (image->mmgr, row_pointers[i]); + } + +@@ -156,7 +156,7 @@ + if (buf_ptr) { + HPDF_UINT i; + +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + png_read_rows(png_ptr, (png_byte**)&buf_ptr, NULL, 1); + if (image->error->error_no != HPDF_OK) + break; +@@ -183,13 +183,13 @@ + HPDF_UINT i, j; + png_bytep *row_ptr; + +- row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep)); ++ row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep)); + if (!row_ptr) { + return HPDF_FAILD_TO_ALLOC_MEM; + } else { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); + +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + row_ptr[i] = HPDF_GetMem(image->mmgr, len); + if (!row_ptr[i]) { + for (; i >= 0; i--) { +@@ -207,19 +207,19 @@ + goto Error; + } + +- for (j = 0; j < info_ptr->height; j++) { +- for (i = 0; i < info_ptr->width; i++) { +- smask_data[info_ptr->width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF; ++ for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) { ++ for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) { ++ smask_data[png_image_width(png_ptr, info_ptr) * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF; + } + +- if (HPDF_Stream_Write (image->stream, row_ptr[j], info_ptr->width) != HPDF_OK) { ++ if (HPDF_Stream_Write (image->stream, row_ptr[j], png_image_width(png_ptr, info_ptr)) != HPDF_OK) { + ret = HPDF_FILE_IO_ERROR; + goto Error; + } + } + + Error: +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + HPDF_FreeMem (image->mmgr, row_ptr[i]); + } + +@@ -245,13 +245,13 @@ + return HPDF_INVALID_PNG_IMAGE; + } + +- row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep)); ++ row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep)); + if (!row_ptr) { + return HPDF_FAILD_TO_ALLOC_MEM; + } else { + png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr); + +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + row_ptr[i] = HPDF_GetMem(image->mmgr, len); + if (!row_ptr[i]) { + for (; i >= 0; i--) { +@@ -271,12 +271,12 @@ + + switch (color_type) { + case PNG_COLOR_TYPE_RGB_ALPHA: +- row_len = 3 * info_ptr->width * sizeof(png_byte); +- for (j = 0; j < info_ptr->height; j++) { +- for (i = 0; i < info_ptr->width; i++) { ++ row_len = 3 * png_image_width(png_ptr, info_ptr) * sizeof(png_byte); ++ for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) { ++ for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) { + row = row_ptr[j]; + memmove(row + (3 * i), row + (4*i), 3); +- smask_data[info_ptr->width * j + i] = row[4 * i + 3]; ++ smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[4 * i + 3]; + } + + if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) { +@@ -286,12 +286,12 @@ + } + break; + case PNG_COLOR_TYPE_GRAY_ALPHA: +- row_len = info_ptr->width * sizeof(png_byte); +- for (j = 0; j < info_ptr->height; j++) { +- for (i = 0; i < info_ptr->width; i++) { ++ row_len = png_image_width(png_ptr, info_ptr) * sizeof(png_byte); ++ for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) { ++ for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) { + row = row_ptr[j]; + row[i] = row[2 * i]; +- smask_data[info_ptr->width * j + i] = row[2 * i + 1]; ++ smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[2 * i + 1]; + } + + if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) { +@@ -306,7 +306,7 @@ + } + + Error: +- for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) { ++ for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) { + HPDF_FreeMem (image->mmgr, row_ptr[i]); + } + +@@ -448,7 +448,7 @@ + } + + /* 16bit images are not supported. */ +- if (info_ptr->bit_depth == 16) { ++ if (png_get_bit_depth(png_ptr, info_ptr) == 16) { + png_set_strip_16(png_ptr); + } + +@@ -458,7 +458,7 @@ + } + + /* check palette-based images for transparent areas and load them immediately if found */ +- if (xref && PNG_COLOR_TYPE_PALETTE & info_ptr->color_type) { ++ if (xref && PNG_COLOR_TYPE_PALETTE & png_get_color_type(png_ptr, info_ptr)) { + png_bytep trans; + int num_trans; + HPDF_Dict smask; +@@ -478,10 +478,10 @@ + smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT; + ret = HPDF_Dict_AddName (smask, "Type", "XObject"); + ret += HPDF_Dict_AddName (smask, "Subtype", "Image"); +- ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height); ++ ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)); + ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray"); +- ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)); + + if (ret != HPDF_OK) { + HPDF_Dict_Free(smask); +@@ -489,7 +489,7 @@ + goto Exit; + } + +- smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height); ++ smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)); + if (!smask_data) { + HPDF_Dict_Free(smask); + ret = HPDF_FAILD_TO_ALLOC_MEM; +@@ -503,7 +503,7 @@ + goto Exit; + } + +- if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) { ++ if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) { + HPDF_FreeMem(image->mmgr, smask_data); + HPDF_Dict_Free(smask); + ret = HPDF_FILE_IO_ERROR; +@@ -513,9 +513,9 @@ + + + ret += CreatePallet(image, png_ptr, info_ptr); +- ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height); +- ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)); + ret += HPDF_Dict_Add (image, "SMask", smask); + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); +@@ -526,7 +526,7 @@ + + /* read images with alpha channel right away + we have to do this because image transparent mask must be added to the Xref */ +- if (xref && PNG_COLOR_MASK_ALPHA & info_ptr->color_type) { ++ if (xref && PNG_COLOR_MASK_ALPHA & png_get_color_type(png_ptr, info_ptr)) { + HPDF_Dict smask; + png_bytep smask_data; + +@@ -539,10 +539,10 @@ + smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT; + ret = HPDF_Dict_AddName (smask, "Type", "XObject"); + ret += HPDF_Dict_AddName (smask, "Subtype", "Image"); +- ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height); ++ ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)); + ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray"); +- ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)); + + if (ret != HPDF_OK) { + HPDF_Dict_Free(smask); +@@ -550,7 +550,7 @@ + goto Exit; + } + +- smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height); ++ smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)); + if (!smask_data) { + HPDF_Dict_Free(smask); + ret = HPDF_FAILD_TO_ALLOC_MEM; +@@ -564,7 +564,7 @@ + goto Exit; + } + +- if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) { ++ if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) { + HPDF_FreeMem(image->mmgr, smask_data); + HPDF_Dict_Free(smask); + ret = HPDF_FILE_IO_ERROR; +@@ -572,14 +572,14 @@ + } + HPDF_FreeMem(image->mmgr, smask_data); + +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) { + ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray"); + } else { + ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB"); + } +- ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width); +- ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height); +- ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth); ++ ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)); ++ ret += HPDF_Dict_AddNumber (image, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)); + ret += HPDF_Dict_Add (image, "SMask", smask); + + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); +@@ -589,9 +589,9 @@ + /* if the image has color palette, copy the pallet of the image to + * create color map. + */ +- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) + ret = CreatePallet(image, png_ptr, info_ptr); +- else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) ++ else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY) + ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray"); + else + ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB"); +@@ -617,16 +617,16 @@ + } + + /* setting the info of the image. */ +- if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width) ++ if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr)) + != HPDF_OK) + goto Exit; + +- if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height) ++ if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr)) + != HPDF_OK) + goto Exit; + + if (HPDF_Dict_AddNumber (image, "BitsPerComponent", +- (HPDF_UINT)info_ptr->bit_depth) != HPDF_OK) ++ (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)) != HPDF_OK) + goto Exit; + + /* clean up */ diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD new file mode 100644 index 000000000..815ffd88f --- /dev/null +++ b/community-staging/mapnik/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 62650 2012-01-23 09:28:07Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: David Dent +# Contributor: orbisvicis + +pkgname=mapnik +pkgver=0.7.1 +pkgrel=13 +pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." +arch=('i686' 'x86_64') +url="http://mapnik.org/" +license=('LGPL') +depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' + 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' + 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') + # already in core ('zlib' 'sqlite3') +optdepends=('libxslt: Web Map Service' + 'python-lxml: Web Map Service' + 'python-imaging: Web Map Service' + 'python-nose: Web Map Service' + 'apache: Web Map Service' + 'mod_fastcgi: Web Map Service - or:' + 'mod_fcgid: Web Map Service - or:' + 'mod_wsgi: Web Map Service' + ) +makedepends=('scons' 'boost') # already in core ('pkg-config') +conflicts=('mapnik-svn') +install="mapnik.install" +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('8f65fda2a792518d6f6be8a85f62fc73') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 + sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct + sed -i 's|png_ptr->io_ptr|png_get_io_ptr(png_ptr)|g' src/png_reader.cpp + sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct + + scons configure \ + PREFIX="/usr" \ + INPUT_PLUGINS=all \ + DESTDIR="$pkgdir" + scons +} +package(){ + cd "$srcdir/$pkgname-$pkgver" + scons install + # fix permissions on SCons-autogenerated files + chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py" +} diff --git a/community-staging/mapnik/mapnik.install b/community-staging/mapnik/mapnik.install new file mode 100644 index 000000000..46f265d5b --- /dev/null +++ b/community-staging/mapnik/mapnik.install @@ -0,0 +1,11 @@ +post_install() { + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/openmotif/PKGBUILD b/community-staging/openmotif/PKGBUILD new file mode 100644 index 000000000..d7b0f2a89 --- /dev/null +++ b/community-staging/openmotif/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 62656 2012-01-23 10:44:50Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Enrico Morelli + +pkgname=openmotif +pkgver=2.3.3 +pkgrel=2 +pkgdesc="Open Motif" +arch=('i686' 'x86_64') +url="http://www.motifzone.org/" +license=('GPL') +depends=(libxext libxp libxft libxt libxmu libpng libjpeg) +makedepends=(xbitmaps xproto printproto xextproto automake) +conflicts=(lesstif) +options=('!libtool') +source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/openmotif-$pkgver.tar.gz) +md5sums=('fd27cd3369d6c7d5ef79eccba524f7be') + +build() { + _automakever=1.11 + + cd $srcdir/openmotif-$pkgver + + sed -i 's|.*demos.*||g' Makefile.in Makefile.am + sed -i 's|doc \\|doc|g' Makefile.in Makefile.am + sed -i 's#if (!png_check_sig(sig, 8))#if (png_sig_cmp(sig, 0, 8))#' lib/Xm/Png.c + + ln -s -f /usr/share/automake-${_automakever}/compile compile + ln -s -f /usr/share/libtool/config/config.guess config.guess + ln -s -f /usr/share/libtool/config/config.sub config.sub + ln -s -f /usr/share/automake-${_automakever}/depcomp depcomp + ln -s -f /usr/share/automake-${_automakever}/install-sh install-sh + ln -s -f /usr/share/automake-${_automakever}/missing missing + ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh + touch NEWS AUTHORS + + [ $NOEXTRACT -eq 1 ] || autoreconf -i + [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" + [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr + make -j1 + + make DESTDIR=$pkgdir install + # cleanup + (cd $pkgdir/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3) +} diff --git a/community-staging/python2-matplotlib/PKGBUILD b/community-staging/python2-matplotlib/PKGBUILD new file mode 100644 index 000000000..2c647212e --- /dev/null +++ b/community-staging/python2-matplotlib/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 62667 2012-01-24 00:10:45Z stephane $ +# Maintainer: Stéphane Gaudreault +# Contributor: Stefan Husmann +# Contributor: Angel 'angvp' Velasquez +# Contributor: Douglas Soares de Andrade + +pkgname=python2-matplotlib +pkgver=1.1.0 +pkgrel=2 +pkgdesc="A python plotting library, making publication quality plots" +arch=('i686' 'x86_64') +url="http://matplotlib.sourceforge.net/" +backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc) +depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-qt') +optdepends=('pygtk: for use with the GTK or GTKAgg backend' + 'tk: used by the TkAgg backend' + 'wxpython: for use with the WXAgg backend') +makedepends=('pygtk' 'tk' 'wxpython') +provides=('matplotlib' "python-matplotlib=${pkgver}") +replaces=('python-matplotlib') +conflicts=('python-matplotlib') +source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz" + setup.cfg) +sha1sums=('435b4f04a7e099b79f66451d69ad0b5ce66030ae' + 'bcb5a83db9d95c96a57ca518fa6bd1897b23558f') +license=('custom') + +build() { + cd "${srcdir}/matplotlib-${pkgver}" + + cp ../setup.cfg . + + # remove internal copy of pyparsing + rm lib/matplotlib/pyparsing.py + sed -i "s/matplotlib.pyparsing/pyparsing/g" lib/matplotlib/{mathtext,fontconfig_pattern}.py + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \ + -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file} + done + + python2 setup.py build +} + +package() { + cd "${srcdir}/matplotlib-${pkgver}" + python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr + + install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m 644 doc/users/license.rst "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/community-staging/python2-matplotlib/setup.cfg b/community-staging/python2-matplotlib/setup.cfg new file mode 100644 index 000000000..4b82986e9 --- /dev/null +++ b/community-staging/python2-matplotlib/setup.cfg @@ -0,0 +1,83 @@ +# Rename this file to setup.cfg to modify matplotlib's +# build options. + +[egg_info] +tag_svn_revision = 1 + +[directories] +# Uncomment to override the default basedir in setupext.py. +# This can be a single directory or a space-delimited list of directories. +#basedirlist = /usr + +[status] +# To suppress display of the dependencies and their versions +# at the top of the build log, uncomment the following line: +#suppress = True +# +# Uncomment to insert lots of diagnostic prints in extension code +#verbose = True + +[provide_packages] +# By default, matplotlib checks for a few dependencies and +# installs them if missing. This feature can be turned off +# by uncommenting the following lines. Acceptible values are: +# True: install, overwrite an existing installation +# False: do not install +# auto: install only if the package is unavailable. This +# is the default behavior +# +## Date/timezone support: +#pytz = False +#dateutil = False + +[gui_support] +# Matplotlib supports multiple GUI toolkits, including Cocoa, +# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of +# these toolkits requires AGG, the Anti-Grain Geometry library, +# which is provided by matplotlib and built by default. +# +# Some backends are written in pure Python, and others require +# extension code to be compiled. By default, matplotlib checks +# for these GUI toolkits during installation and, if present, +# compiles the required extensions to support the toolkit. GTK +# support requires the GTK runtime environment and PyGTK. Wx +# support requires wxWidgets and wxPython. Tk support requires +# Tk and Tkinter. The other GUI toolkits do not require any +# extension code, and can be used as long as the libraries are +# installed on your system. +# +# You can uncomment any the following lines if you know you do +# not want to use the GUI toolkit. Acceptible values are: +# True: build the extension. Exits with a warning if the +# required dependencies are not available +# False: do not build the extension +# auto: build if the required dependencies are available, +# otherwise skip silently. This is the default +# behavior +# +gtk = True +gtkagg = True +tkagg = True +wxagg = True +macosx = False + +[rc_options] +# User-configurable options +# +# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo, +# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg. +# +# The Agg, Ps, Pdf and SVG backends do not require external +# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg +# if you have disabled the relevent extension modules. Agg will be used +# by default. +# +backend = Qt4Agg +# +# The numerix module was historically used to provide +# compatibility between the Numeric, numarray, and NumPy array +# packages. Now that NumPy has emerge as the universal array +# package for python, numerix is not really necessary and is +# maintained to provide backward compatibility. Do not change +# this unless you have a compelling reason to do so. +numerix = numpy diff --git a/community-staging/qpxtool/PKGBUILD b/community-staging/qpxtool/PKGBUILD new file mode 100644 index 000000000..47c3e14a3 --- /dev/null +++ b/community-staging/qpxtool/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 62654 2012-01-23 09:59:30Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Krzysztof Stasiorowski + +pkgname=qpxtool +pkgver=0.7.1_002 +pkgrel=3 +pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings." +arch=('i686' 'x86_64') +url="http://qpxtool.sourceforge.net/" +license=('GPL') +depends=('qt') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + libpng15.patch) +md5sums=('755321a0196b16d06857550aac74ff50' + 'ab9af7610277652c77c6d114422b2266') + +build() { + cd $srcdir/$pkgname-$pkgver + # Fix strict aliasing warnings + export CFLAGS="$CFLAGS -fno-strict-aliasing" + sed -i 's|lib64|lib|' configure + patch -p1 <$srcdir/libpng15.patch + ./configure --prefix=/usr + make + mkdir -p $pkgdir/usr/bin + make DESTDIR=$pkgdir install +} diff --git a/community-staging/qpxtool/libpng15.patch b/community-staging/qpxtool/libpng15.patch new file mode 100644 index 000000000..05e6f49d2 --- /dev/null +++ b/community-staging/qpxtool/libpng15.patch @@ -0,0 +1,127 @@ +diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp +--- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp 2009-11-25 10:55:44.000000000 +0300 ++++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp 2012-01-23 13:53:37.000000000 +0400 +@@ -129,28 +129,28 @@ + + png_read_info(png_ptr, info_ptr); + +- printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height); ++ printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr)); + +- if (info_ptr->width != 3744U || info_ptr->height != rows ) { ++ if (png_get_image_width(png_ptr, info_ptr) != 3744U || png_get_image_height(png_ptr, info_ptr) != rows ) { + printf("Image should be 3744 x %d", rows); + return 1; + } + +-// width = info_ptr->width; +-// height = info_ptr->height; +-// bit_depth = info_ptr->bit_depth; ++// width = png_get_image_width(png_ptr, info_ptr); ++// height = png_get_image_height(png_ptr, info_ptr); ++// bit_depth = png_get_bit_depth(png_ptr, info_ptr); + + number_of_passes = png_set_interlace_handling(png_ptr); + png_read_update_info(png_ptr, info_ptr); + +- printf("Color type: [%d] ", info_ptr->color_type); +- switch (info_ptr->color_type) { ++ printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr)); ++ switch (png_get_color_type(png_ptr, info_ptr)) { + case PNG_COLOR_TYPE_GRAY: + printf("PNG_COLOR_TYPE_GRAY\n"); + break; + case PNG_COLOR_TYPE_PALETTE: + printf("PNG_COLOR_TYPE_PALETTE\n"); +- if (!(info_ptr->valid & PNG_INFO_PLTE)) { ++ if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE))) { + printf("PNG color type is indexed, but no palette found!"); + goto err_read_png; + } +@@ -168,49 +168,53 @@ + printf("unlnown PNG color type!\n"); + goto err_read_png; + } +- printf("Bit depth : %d\n", info_ptr->bit_depth); +- if (info_ptr->bit_depth != 8) { ++ printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr)); ++ if (png_get_bit_depth(png_ptr, info_ptr) != 8) { + printf("Unsupported bit depth!\n"); + goto err_read_png; + } +- if (info_ptr->valid & PNG_INFO_PLTE) { +- printf("Palette : %d colors\n", info_ptr->num_palette); ++ ++ int num_palette; ++ png_colorp plte; ++ png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette); ++ ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { ++ printf("Palette : %d colors\n", num_palette); + } else { + printf("Palette : NO\n"); + } +- printf("ROW bytes : %ld\n", info_ptr->rowbytes); +- ++ printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr)); + + raw_row_pointer = buf; +- png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes); ++ png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr, info_ptr)); + for (row=0; rowwidth < 3744U) ++ if (png_get_image_width(png_ptr, info_ptr) < 3744U) + memset(raw_row_pointer, 0, 3744); + +- switch (info_ptr->color_type) { ++ switch (png_get_color_type(png_ptr, info_ptr)) { + case PNG_COLOR_TYPE_GRAY: +- for (col=0; colwidth; col++) { ++ for (col=0; colwidth; col++) { ++ for (col=0; colpalette[c].red; +- g = info_ptr->palette[c].green; +- b = info_ptr->palette[c].blue; ++ r = plte[c].red; ++ g = plte[c].green; ++ b = plte[c].blue; + c = (r*11 + g*16 + b*5) / 32; + raw_row_pointer[col] = c ^ 0xFF; + } + break; + case PNG_COLOR_TYPE_RGB: +- for (col=0; colwidth; col++) { ++ for (col=0; colwidth; col++) { ++ for (col=0; colwidth; col++) { ++ for (col=0; col +# Maintainer: Daniel J Griffiths +# Contributor: Roman Kyrylych +# Contributor: cdhotfire + +pkgname=rawstudio +pkgver=2.0 +pkgrel=5 +pkgdesc="An open source raw-image converter written in GTK+" +arch=('i686' 'x86_64') +license=('GPL') +url="http://rawstudio.org/" +depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' + 'raptor1' 'lcms' 'gtk2') +install=${pkgname}.install +options=('!libtool') +source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz + libpng15.patch) +md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' + '2f8b7acbe10d8096ce613cbea7986fd3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/libpng15.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install + mkdir $pkgdir/usr/lib/rawstudio + mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio + ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins +} diff --git a/community-staging/rawstudio/libpng15.patch b/community-staging/rawstudio/libpng15.patch new file mode 100644 index 000000000..6d3b85968 --- /dev/null +++ b/community-staging/rawstudio/libpng15.patch @@ -0,0 +1,40 @@ +diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp +--- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp 2011-02-24 01:35:18.000000000 +0300 ++++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp 2012-01-23 15:03:22.000000000 +0400 +@@ -102,8 +102,8 @@ + { + *linear_guess = FALSE; + RSColorSpace* profile = NULL; +- const gchar *icc_profile_title; +- const gchar *icc_profile; ++ png_charp icc_profile_title; ++ png_bytep icc_profile; + guint icc_profile_size; + png_structp png_ptr = png_create_read_struct( + PNG_LIBPNG_VER_STRING, +@@ -125,11 +125,11 @@ + + int compression_type; + /* Extract embedded ICC profile */ +- if (info_ptr->valid & PNG_INFO_iCCP) ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) + { + png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, +- (png_charpp) &icc_profile_title, &compression_type, +- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); ++ &icc_profile_title, &compression_type, ++ &icc_profile, (png_uint_32*) &icc_profile_size); + if (retval != 0) + { + RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); +diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c +--- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c 2011-03-26 04:52:29.000000000 +0300 ++++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c 2012-01-23 15:04:59.000000000 +0400 +@@ -23,6 +23,7 @@ + #include + #include "config.h" + #include ++#include + + #define RS_TYPE_PNGFILE (rs_pngfile_type) + #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) diff --git a/community-staging/rawstudio/rawstudio.install b/community-staging/rawstudio/rawstudio.install new file mode 100644 index 000000000..261adb7b4 --- /dev/null +++ b/community-staging/rawstudio/rawstudio.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q || true +} + +post_upgrade() { + update-desktop-database -q || true +} + +post_remove() { + update-desktop-database -q || true +} diff --git a/community/libircclient/PKGBUILD b/community/libircclient/PKGBUILD index 4608c5424..72a698e73 100644 --- a/community/libircclient/PKGBUILD +++ b/community/libircclient/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: coolkehon pkgname=libircclient -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="A small but powerful library, which implements client-server IRC protocol." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.ulduzsoft.com/libircclient/" depends=('glibc') license=('GPL') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('fd1f33181c50823f105df6400eb7746d') +md5sums=('eb6a2c4e91862cc10de3b13b198cfa23') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index a66ae29ab..5638b68d5 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 62160 2012-01-17 00:26:49Z jconder $ +# $Id: PKGBUILD 62671 2012-01-24 01:58:04Z jconder $ # Maintainer: Jonathan Conder pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') pkgver=0.6.21 -pkgrel=1 +pkgrel=2 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64') url="http://www.packagekit.org" license=('GPL') makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' 'networkmanager' 'pacman' 'pm-utils' 'polkit' 'python2' 'qt' - 'shared-mime-info' 'sqlite3' 'udev') + 'shared-mime-info' 'sqlite3' 'udev') options=('!libtool') source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz" 'alpm.patch') sha256sums=('68e5d4d07adf50b1fae6cbc0963555345ba7fc12d86d3e3387874547a5448b8e' - 'fbe54a89c3495376a0b939b67fec5b2e57bed46e92b3f4816d797745882481e6') + '44e7adbff7e2255fd9712eef33df866c3a868b3758ceff4adeef209927a97716') build() { cd "$srcdir/PackageKit-$pkgver" @@ -30,23 +30,24 @@ build() { # TODO: remove when upstream is patched autoreconf ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/PackageKit \ - --disable-static \ - --disable-gtk-doc \ - --disable-tests \ - --disable-local \ - --disable-browser-plugin \ - --disable-gstreamer-plugin \ - --disable-gtk-module \ - --disable-command-not-found \ - --disable-cron \ - --disable-debuginfo-install \ - --enable-pm-utils \ - --disable-dummy \ - --enable-alpm \ - --with-default-backend=alpm + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/PackageKit \ + --enable-strict \ + --disable-static \ + --disable-gtk-doc \ + --disable-tests \ + --disable-local \ + --disable-browser-plugin \ + --disable-gstreamer-plugin \ + --disable-gtk-module \ + --disable-command-not-found \ + --disable-cron \ + --disable-debuginfo-install \ + --enable-pm-utils \ + --disable-dummy \ + --enable-alpm \ + --with-default-backend=alpm make -s } diff --git a/community/packagekit/alpm.patch b/community/packagekit/alpm.patch index d39ce14e1..997d252b2 100644 --- a/community/packagekit/alpm.patch +++ b/community/packagekit/alpm.patch @@ -19,7 +19,7 @@ index 5a5468a..d8c3dfc 100644 -DPK_BACKEND_DEFAULT_LOGFILE=\"$(PK_BACKEND_DEFAULT_LOGFILE)\" \ -DALPM_CACHE_PATH=\"$(ALPM_CACHE_PATH)\" \ diff --git a/backends/alpm/pk-backend-alpm.c b/backends/alpm/pk-backend-alpm.c -index ba993f0..93f6d95 100644 +index ba993f0..5c6b629 100644 --- a/backends/alpm/pk-backend-alpm.c +++ b/backends/alpm/pk-backend-alpm.c @@ -22,10 +22,13 @@ @@ -219,6 +219,18 @@ index ba993f0..93f6d95 100644 } void +@@ -380,3 +442,11 @@ pk_backend_finish (PkBackend *self, GError *error) + pk_backend_thread_finished (self); + return (error == NULL); + } ++ ++void ++pk_backend_transaction_start (PkBackend *self) ++{ ++ g_return_if_fail (self != NULL); ++ ++ pk_backend_configure_environment (self); ++} diff --git a/backends/alpm/pk-backend-alpm.h b/backends/alpm/pk-backend-alpm.h index 23a2724..ecd6d0f 100644 --- a/backends/alpm/pk-backend-alpm.h @@ -234,7 +246,7 @@ index 23a2724..ecd6d0f 100644 extern gchar *xfercmd; extern alpm_list_t *holdpkgs; diff --git a/backends/alpm/pk-backend-config.c b/backends/alpm/pk-backend-config.c -index 21a4c54..a51a984 100644 +index 21a4c54..d62b927 100644 --- a/backends/alpm/pk-backend-config.c +++ b/backends/alpm/pk-backend-config.c @@ -28,29 +28,44 @@ @@ -480,14 +492,14 @@ index 21a4c54..a51a984 100644 + } + + /* this also allows e.g. NeverEver, so put prefixes last */ -+ if (g_str_has_prefix (list, "Never") == 0) { ++ if (g_str_has_prefix (list, "Never")) { + if (package) { + *level &= ~ALPM_SIG_PACKAGE; + } + if (database) { + *level &= ~ALPM_SIG_DATABASE; + } -+ } else if (g_str_has_prefix (list, "Optional") == 0) { ++ } else if (g_str_has_prefix (list, "Optional")) { + if (package) { + *level |= ALPM_SIG_PACKAGE; + *level |= ALPM_SIG_PACKAGE_OPTIONAL; @@ -496,7 +508,7 @@ index 21a4c54..a51a984 100644 + *level |= ALPM_SIG_DATABASE; + *level |= ALPM_SIG_DATABASE_OPTIONAL; + } -+ } else if (g_str_has_prefix (list, "Required") == 0) { ++ } else if (g_str_has_prefix (list, "Required")) { + if (package) { + *level |= ALPM_SIG_PACKAGE; + *level &= ~ALPM_SIG_PACKAGE_OPTIONAL; @@ -505,7 +517,7 @@ index 21a4c54..a51a984 100644 + *level |= ALPM_SIG_DATABASE; + *level &= ~ALPM_SIG_DATABASE_OPTIONAL; + } -+ } else if (g_str_has_prefix (list, "TrustedOnly") == 0) { ++ } else if (g_str_has_prefix (list, "TrustedOnly")) { + if (package) { + *level &= ~ALPM_SIG_PACKAGE_MARGINAL_OK; + *level &= ~ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -514,7 +526,7 @@ index 21a4c54..a51a984 100644 + *level &= ~ALPM_SIG_DATABASE_MARGINAL_OK; + *level &= ~ALPM_SIG_DATABASE_UNKNOWN_OK; + } -+ } else if (g_str_has_prefix (list, "TrustAll") == 0) { ++ } else if (g_str_has_prefix (list, "TrustAll")) { + if (package) { + *level |= ALPM_SIG_PACKAGE_MARGINAL_OK; + *level |= ALPM_SIG_PACKAGE_UNKNOWN_OK; @@ -843,7 +855,7 @@ index cb8b8dc..412f59c 100644 -gboolean pk_backend_configure (const gchar *filename, GError **error); +alpm_handle_t *pk_backend_configure (const gchar *filename, GError **error); diff --git a/backends/alpm/pk-backend-databases.c b/backends/alpm/pk-backend-databases.c -index f6ab06e..ac530c7 100644 +index f6ab06e..a123297 100644 --- a/backends/alpm/pk-backend-databases.c +++ b/backends/alpm/pk-backend-databases.c @@ -26,7 +26,15 @@ @@ -873,7 +885,13 @@ index f6ab06e..ac530c7 100644 g_object_unref (output); g_object_unref (os); -@@ -128,37 +136,65 @@ disabled_repos_configure (GHashTable *table, GError **error) +@@ -124,41 +132,91 @@ disabled_repos_free (GHashTable *table) + } + + static gboolean +-disabled_repos_configure (GHashTable *table, GError **error) ++disabled_repos_configure (GHashTable *table, gboolean only_trusted, ++ GError **error) { const alpm_list_t *i; @@ -896,6 +914,7 @@ index f6ab06e..ac530c7 100644 - const gchar *repo = alpm_db_get_name (db); + for (i = configured; i != NULL; i = i->next) { + PkBackendRepo *repo = (PkBackendRepo *) i->data; ++ alpm_siglevel_t level = repo->level; + alpm_db_t *db; - if (g_hash_table_lookup (table, repo) == NULL) { @@ -904,12 +923,16 @@ index f6ab06e..ac530c7 100644 + if (g_hash_table_lookup (table, repo->name) != NULL) { + /* repo is disabled */ continue; ++ } else if (!only_trusted) { ++ level &= ~ALPM_SIG_PACKAGE; ++ level &= ~ALPM_SIG_DATABASE; ++ level &= ~ALPM_SIG_USE_DEFAULT; } - if (alpm_db_unregister (db) < 0) { - g_set_error (error, ALPM_ERROR, pm_errno, "[%s]: %s", - repo, alpm_strerrorlast ()); -+ db = alpm_db_register_sync (alpm, repo->name, repo->level); ++ db = alpm_db_register_sync (alpm, repo->name, level); + if (db == NULL) { + enum _alpm_errno_t errno = alpm_errno (alpm); + g_set_error (error, ALPM_ERROR, errno, "[%s]: %s", @@ -942,7 +965,7 @@ index f6ab06e..ac530c7 100644 + + value = g_hash_table_lookup (levels, i->data); + if (value != NULL) { -+ repo->level = *(alpm_siglevel_t *)value; ++ repo->level = *(alpm_siglevel_t *) value; + } else { + repo->level = ALPM_SIG_USE_DEFAULT; + } @@ -950,11 +973,36 @@ index f6ab06e..ac530c7 100644 + configured = alpm_list_add (configured, repo); + } +} ++ ++gboolean ++pk_backend_disable_signatures (PkBackend *self, GError **error) ++{ ++ g_return_val_if_fail (self != NULL, FALSE); ++ ++ return disabled_repos_configure (disabled, FALSE, error); ++} ++ ++gboolean ++pk_backend_enable_signatures (PkBackend *self, GError **error) ++{ ++ g_return_val_if_fail (self != NULL, FALSE); ++ ++ return disabled_repos_configure (disabled, TRUE, error); ++} + gboolean pk_backend_initialize_databases (PkBackend *self, GError **error) { -@@ -179,11 +215,21 @@ pk_backend_initialize_databases (PkBackend *self, GError **error) +@@ -169,7 +227,7 @@ pk_backend_initialize_databases (PkBackend *self, GError **error) + return FALSE; + } + +- if (!disabled_repos_configure (disabled, error)) { ++ if (!disabled_repos_configure (disabled, TRUE, error)) { + return FALSE; + } + +@@ -179,11 +237,21 @@ pk_backend_initialize_databases (PkBackend *self, GError **error) void pk_backend_destroy_databases (PkBackend *self) { @@ -976,7 +1024,7 @@ index f6ab06e..ac530c7 100644 } static gboolean -@@ -210,11 +256,12 @@ pk_backend_get_repo_list_thread (PkBackend *self) +@@ -210,11 +278,12 @@ pk_backend_get_repo_list_thread (PkBackend *self) gpointer key, value; g_return_val_if_fail (self != NULL, FALSE); @@ -991,7 +1039,12 @@ index f6ab06e..ac530c7 100644 const gchar *repo = alpm_db_get_name (db); if (pk_backend_cancelled (self)) { -@@ -269,7 +316,7 @@ pk_backend_repo_enable_thread (PkBackend *self) +@@ -265,11 +334,11 @@ pk_backend_repo_enable_thread (PkBackend *self) + + if (g_hash_table_remove (disabled, repo)) { + /* reload configuration to preserve ordering */ +- if (disabled_repos_configure (disabled, &error)) { ++ if (disabled_repos_configure (disabled, TRUE, &error)) { pk_backend_repo_list_changed (self); } } else { @@ -1000,7 +1053,7 @@ index f6ab06e..ac530c7 100644 g_set_error (&error, ALPM_ERROR, code, "[%s]: %s", repo, alpm_strerror (code)); } -@@ -292,21 +339,23 @@ pk_backend_repo_disable_thread (PkBackend *self) +@@ -292,21 +361,23 @@ pk_backend_repo_disable_thread (PkBackend *self) GError *error = NULL; g_return_val_if_fail (self != NULL, FALSE); @@ -1028,7 +1081,7 @@ index f6ab06e..ac530c7 100644 } else { g_hash_table_insert (disabled, g_strdup (repo), GINT_TO_POINTER (1)); -@@ -316,7 +365,7 @@ pk_backend_repo_disable_thread (PkBackend *self) +@@ -316,7 +387,7 @@ pk_backend_repo_disable_thread (PkBackend *self) } if (i == NULL) { @@ -1038,16 +1091,22 @@ index f6ab06e..ac530c7 100644 alpm_strerror (code)); } diff --git a/backends/alpm/pk-backend-databases.h b/backends/alpm/pk-backend-databases.h -index f9eb2f9..2636cae 100644 +index f9eb2f9..d9b9e78 100644 --- a/backends/alpm/pk-backend-databases.h +++ b/backends/alpm/pk-backend-databases.h -@@ -24,6 +24,10 @@ +@@ -24,6 +24,16 @@ #include #include +void pk_backend_configure_repos (alpm_list_t *repos, + GHashTable *servers, + GHashTable *levels); ++ ++gboolean pk_backend_disable_signatures (PkBackend *self, ++ GError **error); ++ ++gboolean pk_backend_enable_signatures (PkBackend *self, ++ GError **error); + gboolean pk_backend_initialize_databases (PkBackend *self, GError **error); @@ -1472,10 +1531,18 @@ index 28dcf65..d736e37 100644 -const gchar *alpm_pkg_get_group (pmpkg_t *pkg); +const gchar *alpm_pkg_get_group (alpm_pkg_t *pkg); diff --git a/backends/alpm/pk-backend-install.c b/backends/alpm/pk-backend-install.c -index 65a6c11..5b5e2b2 100644 +index 65a6c11..d0cbca2 100644 --- a/backends/alpm/pk-backend-install.c +++ b/backends/alpm/pk-backend-install.c -@@ -32,15 +32,19 @@ +@@ -25,6 +25,7 @@ + #include + + #include "pk-backend-alpm.h" ++#include "pk-backend-databases.h" + #include "pk-backend-error.h" + #include "pk-backend-install.h" + #include "pk-backend-transaction.h" +@@ -32,15 +33,19 @@ static gint alpm_add_file (const gchar *filename) { @@ -1498,7 +1565,7 @@ index 65a6c11..5b5e2b2 100644 alpm_pkg_free (pkg); return -1; } -@@ -61,8 +65,9 @@ pk_backend_transaction_add_targets (PkBackend *self, GError **error) +@@ -61,8 +66,9 @@ pk_backend_transaction_add_targets (PkBackend *self, GError **error) for (; *paths != NULL; ++paths) { if (alpm_add_file (*paths) < 0) { @@ -1510,6 +1577,40 @@ index 65a6c11..5b5e2b2 100644 return FALSE; } } +@@ -89,17 +95,32 @@ pk_backend_simulate_install_files_thread (PkBackend *self) + static gboolean + pk_backend_install_files_thread (PkBackend *self) + { ++ gboolean only_trusted; + GError *error = NULL; + + g_return_val_if_fail (self != NULL, FALSE); + ++ only_trusted = pk_backend_get_bool (self, "only_trusted"); ++ ++ if (!only_trusted && !pk_backend_disable_signatures (self, &error)) { ++ goto out; ++ } ++ + if (pk_backend_transaction_initialize (self, 0, &error) && + pk_backend_transaction_add_targets (self, &error) && + pk_backend_transaction_simulate (self, &error)) { + pk_backend_transaction_commit (self, &error); + } + +- return pk_backend_transaction_finish (self, error); ++out: ++ pk_backend_transaction_end (self, (error == NULL) ? &error : NULL); ++ ++ if (!only_trusted) { ++ GError **e = (error == NULL) ? &error : NULL; ++ pk_backend_enable_signatures (self, e); ++ } ++ ++ return pk_backend_finish (self, error); + } + + void diff --git a/backends/alpm/pk-backend-packages.c b/backends/alpm/pk-backend-packages.c index e9a7c94..2d057aa 100644 --- a/backends/alpm/pk-backend-packages.c @@ -2002,10 +2103,15 @@ index 592472d..c4e80ae 100644 break; } diff --git a/backends/alpm/pk-backend-sync.c b/backends/alpm/pk-backend-sync.c -index 9e1e02b..c770159 100644 +index 9e1e02b..d2f363b 100644 --- a/backends/alpm/pk-backend-sync.c +++ b/backends/alpm/pk-backend-sync.c -@@ -30,41 +30,13 @@ +@@ -26,45 +26,18 @@ + #include + + #include "pk-backend-alpm.h" ++#include "pk-backend-databases.h" + #include "pk-backend-error.h" #include "pk-backend-sync.h" #include "pk-backend-transaction.h" @@ -2048,7 +2154,7 @@ index 9e1e02b..c770159 100644 packages = pk_backend_get_strv (self, "package_ids"); -@@ -75,9 +47,28 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error) +@@ -75,9 +48,28 @@ pk_backend_transaction_sync_targets (PkBackend *self, GError **error) gchar *repo = package[PK_PACKAGE_ID_DATA]; gchar *name = package[PK_PACKAGE_ID_NAME]; @@ -2080,7 +2186,7 @@ index 9e1e02b..c770159 100644 g_strfreev (package); return FALSE; } -@@ -93,23 +84,27 @@ pk_backend_download_packages_thread (PkBackend *self) +@@ -93,23 +85,27 @@ pk_backend_download_packages_thread (PkBackend *self) { alpm_list_t *cachedirs; const gchar *directory; @@ -2114,7 +2220,7 @@ index 9e1e02b..c770159 100644 if (pk_backend_transaction_initialize (self, flags, &error) && pk_backend_transaction_sync_targets (self, &error) && -@@ -118,7 +113,7 @@ pk_backend_download_packages_thread (PkBackend *self) +@@ -118,7 +114,7 @@ pk_backend_download_packages_thread (PkBackend *self) } if (directory != NULL) { @@ -2123,7 +2229,40 @@ index 9e1e02b..c770159 100644 } return pk_backend_transaction_finish (self, error); -@@ -190,16 +185,17 @@ pk_backend_install_packages (PkBackend *self, gboolean only_trusted, +@@ -155,17 +151,31 @@ pk_backend_simulate_install_packages_thread (PkBackend *self) + static gboolean + pk_backend_install_packages_thread (PkBackend *self) + { ++ gboolean only_trusted; + GError *error = NULL; + + g_return_val_if_fail (self != NULL, FALSE); + ++ only_trusted = pk_backend_get_bool (self, "only_trusted"); ++ ++ if (!only_trusted && !pk_backend_disable_signatures (self, &error)) { ++ goto out; ++ } ++ + if (pk_backend_transaction_initialize (self, 0, &error) && + pk_backend_transaction_sync_targets (self, &error) && + pk_backend_transaction_simulate (self, &error)) { + pk_backend_transaction_commit (self, &error); + } + +- return pk_backend_transaction_finish (self, error); ++ pk_backend_transaction_end (self, (error == NULL) ? &error : NULL); ++out: ++ if (!only_trusted) { ++ GError **e = (error == NULL) ? &error : NULL; ++ pk_backend_enable_signatures (self, e); ++ } ++ ++ return pk_backend_finish (self, error); + } + + void +@@ -190,16 +200,17 @@ pk_backend_install_packages (PkBackend *self, gboolean only_trusted, } static gboolean @@ -2144,7 +2283,7 @@ index 9e1e02b..c770159 100644 const gchar *rname = alpm_pkg_get_name (rpkg); if (pk_backend_cancelled (self)) { -@@ -208,7 +204,7 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) +@@ -208,7 +219,7 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) continue; } @@ -2153,15 +2292,29 @@ index 9e1e02b..c770159 100644 return FALSE; } } -@@ -224,6 +220,7 @@ pk_backend_update_packages_thread (PkBackend *self) +@@ -219,13 +230,21 @@ pk_backend_replaces_dependencies (PkBackend *self, pmpkg_t *pkg) + static gboolean + pk_backend_update_packages_thread (PkBackend *self) + { ++ gboolean only_trusted; + const alpm_list_t *i; + alpm_list_t *asdeps = NULL; GError *error = NULL; g_return_val_if_fail (self != NULL, FALSE); + g_return_val_if_fail (alpm != NULL, FALSE); g_return_val_if_fail (localdb != NULL, FALSE); ++ only_trusted = pk_backend_get_bool (self, "only_trusted"); ++ ++ if (!only_trusted && !pk_backend_disable_signatures (self, &error)) { ++ goto out; ++ } ++ if (!pk_backend_transaction_initialize (self, 0, &error) || -@@ -233,8 +230,8 @@ pk_backend_update_packages_thread (PkBackend *self) + !pk_backend_transaction_sync_targets (self, &error) || + !pk_backend_transaction_simulate (self, &error)) { +@@ -233,8 +252,8 @@ pk_backend_update_packages_thread (PkBackend *self) } /* change the install reason of packages that replace dependencies */ @@ -2172,7 +2325,7 @@ index 9e1e02b..c770159 100644 const gchar *name = alpm_pkg_get_name (pkg); if (pk_backend_cancelled (self)) { -@@ -254,7 +251,8 @@ pk_backend_update_packages_thread (PkBackend *self) +@@ -254,14 +273,22 @@ pk_backend_update_packages_thread (PkBackend *self) for (i = asdeps; i != NULL; i = i->next) { const gchar *name = (const gchar *) i->data; @@ -2182,6 +2335,21 @@ index 9e1e02b..c770159 100644 } out: ++ pk_backend_transaction_end (self, (error == NULL) ? &error : NULL); ++ ++ if (!only_trusted) { ++ GError **e = (error == NULL) ? &error : NULL; ++ pk_backend_enable_signatures (self, e); ++ } ++ + alpm_list_free_inner (asdeps, g_free); + alpm_list_free (asdeps); + +- return pk_backend_transaction_finish (self, error); ++ return pk_backend_finish (self, error); + } + + void diff --git a/backends/alpm/pk-backend-transaction.c b/backends/alpm/pk-backend-transaction.c index fdb840e..76402f0 100644 --- a/backends/alpm/pk-backend-transaction.c diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index 968279a76..478eb7fce 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 61689 2012-01-06 19:23:37Z lfleischer $ +# $Id: PKGBUILD 62660 2012-01-23 13:31:10Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Andrea Zucchelli pkgname=tinyproxy pkgver=1.8.3 -pkgrel=2 +pkgrel=3 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64') url='https://banu.com/tinyproxy/' license=('GPL') makedepends=('asciidoc') +install="${pkgname}.install" backup=('etc/tinyproxy/tinyproxy.conf') source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2" 'tinyproxy' 'tinyproxy.tmpfiles.conf') md5sums=('292ac51da8ad6ae883d4ebf56908400d' - '464b5d60b1c9cbae26367fe2337c2d77' + '90eb2b3371e56d5a784fd826d4a6e5f8' '3c2764578f26581346fe312da0519a3e') build() { diff --git a/community/tinyproxy/tinyproxy b/community/tinyproxy/tinyproxy index 86ba7b77c..5580ea804 100755 --- a/community/tinyproxy/tinyproxy +++ b/community/tinyproxy/tinyproxy @@ -8,11 +8,7 @@ PID=$(pidof -o %PPID /usr/sbin/tinyproxy) start() { stat_busy "Starting Tinyproxy" - if [ ! -d /var/run/tinyproxy ]; then - mkdir -p /var/run/tinyproxy && chown nobody:nobody /var/run/tinyproxy - fi - - [ -z "$PID" ] && rm -f /var/run/tinyproxy.pid && \ + [ -z "$PID" ] && rm -f /var/run/tinyproxy/tinyproxy.pid && \ /usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf 2>/dev/null if [ $? -gt 0 ]; then diff --git a/community/tinyproxy/tinyproxy.install b/community/tinyproxy/tinyproxy.install new file mode 100644 index 000000000..85f3dfc41 --- /dev/null +++ b/community/tinyproxy/tinyproxy.install @@ -0,0 +1,9 @@ +post_install() { + if [ ! -d /var/run/tinyproxy ]; then + install -dm0770 -o nobody -g nobody /var/run/tinyproxy + fi +} + +post_upgrade() { + post_install "$@" +} diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD new file mode 100644 index 000000000..343cb55c3 --- /dev/null +++ b/core/btrfs-progs/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147160 2012-01-23 15:27:41Z ibiru $ +# Maintainer: Tom Gundersen +# Contributor: Tobias Powalowski +pkgname=btrfs-progs +pkgver=0.19.20120110 +pkgrel=2 +pkgdesc="btrfs filesystem utilities" +arch=(i686 x86_64) +depends=('glibc' 'e2fsprogs') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) +url="http://btrfs.wiki.kernel.org/" +replaces=('btrfs-progs-unstable') +conflicts=('btrfs-progs-unstable') +provides=('btrfs-progs-unstable') +license=('GPL2') + +build() { + cd $srcdir/$pkgname + make CFLAGS="$CFLAGS" all convert +} + +package() { + cd $srcdir/$pkgname + make prefix=$pkgdir/usr install + # fix manpage + mkdir -p $pkgdir/usr/share/ + mv $pkgdir/usr/man $pkgdir/usr/share/man + mkdir -p ${pkgdir}/sbin + ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs +} +md5sums=('a3f6fbeb166f8e6b5c06833888d4ecf2') diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index cbf7e9c4b..b017ba58b 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146447 2012-01-11 15:20:57Z stephane $ +# $Id: PKGBUILD 147158 2012-01-23 15:27:38Z ibiru $ # Maintainer: Ronald van Haren # Contributor: Judd Vinet pkgname=iproute2 pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') @@ -19,10 +19,11 @@ options=('!makeflags') backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz - iproute2-fhs.patch) + iproute2-fhs.patch + fix-ip-l.patch) sha1sums=('1e217f22b0bbfc870ddf746de883ee375cd9e533' - '2416b11252364d7a6c742eabb4a6924a75637a46') - + '2416b11252364d7a6c742eabb4a6924a75637a46' + '2ec5513c44f89046438d65e2cda1a014010e3b73') build() { cd $srcdir/$pkgname-$pkgver @@ -30,6 +31,9 @@ build() { # set correct fhs structure patch -Np1 -i "$srcdir/iproute2-fhs.patch" + #upstream fixes + patch -Np1 -i "$srcdir/fix-ip-l.patch" + ./configure make diff --git a/core/iproute2/fix-ip-l.patch b/core/iproute2/fix-ip-l.patch new file mode 100644 index 000000000..7f1749cbb --- /dev/null +++ b/core/iproute2/fix-ip-l.patch @@ -0,0 +1,27 @@ +From 5aa08f6bf4107f8aec43c0678466a314dbd0d054 Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger +Date: Fri, 20 Jan 2012 08:16:02 -0800 +Subject: [PATCH] ip: make 'ip l' be 'ip link' + +Restore compatiablity for those lazy typists. +--- + ip/ip.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ip/ip.c b/ip/ip.c +index 7b4bacb..20dc3b5 100644 +--- a/ip/ip.c ++++ b/ip/ip.c +@@ -72,8 +72,8 @@ static const struct cmd { + { "neighbour", do_ipneigh }, + { "ntable", do_ipntable }, + { "ntbl", do_ipntable }, +- { "l2tp", do_ipl2tp }, + { "link", do_iplink }, ++ { "l2tp", do_ipl2tp }, + { "tunnel", do_iptunnel }, + { "tunl", do_iptunnel }, + { "tuntap", do_iptuntap }, +-- +1.7.6.5 + diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD index ac748f8ee..afd3f36bf 100644 --- a/extra/freeglut/PKGBUILD +++ b/extra/freeglut/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62079 2010-01-01 23:53:58Z eric $ +# $Id: PKGBUILD 147152 2012-01-23 14:30:00Z heftig $ # Maintainer: Eric Belanger # Contributor: Tom Newsom pkgname=freeglut -pkgver=2.6.0 +pkgver=2.8.0 pkgrel=1 pkgdesc="Provides functionality for small OpenGL programs" arch=('i686' 'x86_64') @@ -14,19 +14,18 @@ replaces=('glut') provides=('glut') conflicts=('glut') options=('!libtool') -source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz \ - 2.6.0-GFX_radeon.patch) -md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3') -sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' '2e392c7d0b60016ec89e6a5edf504f5722351b95') +source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz) +md5sums=('5db8651af306bc403fbfd36934a20e1d') +sha1sums=('4debbe559c6c9841ce1abaddc9d461d17c6083b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" -# fixes an issue with the radeon[hd] ATI opensource drivers -# ref: http://bugs.gentoo.org/show_bug.cgi?id=295163 - patch -p0 -i "${srcdir}/2.6.0-GFX_radeon.patch" || return 1 + ./configure --prefix=/usr --disable-static + make all +} - ./configure --prefix=/usr || return 1 - make all || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index 7a5410ff0..12bc4baa8 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139468 2011-10-02 00:35:06Z foutrelis $ +# $Id: PKGBUILD 147145 2012-01-23 07:56:33Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Tobias Powalowski # Contributor: Hokum pkgname=gptfdisk -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=1 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('3285608c8c3087040d3bec9db1b287fae3cfc4c1') +sha256sums=('b1159027ca459661f04bc3bac8e79381895933ee214c4d6dba49b7d27204e5d3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 7eadae184..c706303b4 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142481 2011-11-10 15:13:21Z dan $ +# $Id: PKGBUILD 147164 2012-01-23 19:16:26Z dan $ # Maintainer: Dan McGee # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.10 +pkgver=1.4.11 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=('2cc3de341b561464da29fc5d5e2a4facc0f6aafc151f0e1d94228705e0758fdf' +sha256sums=('e3dcc4ff29d2b3f3c66f2b5b95a1bcef0163a65b588d6ba92a56cd6c8d73e83e' '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a' '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb') diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD index 25bd18eeb..1fe3bd4c6 100644 --- a/extra/perl-alien-sdl/PKGBUILD +++ b/extra/perl-alien-sdl/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 124820 2011-05-24 15:44:07Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 147156 2012-01-23 14:30:07Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Sarah Hay @@ -8,17 +8,17 @@ pkgname=perl-alien-sdl _realname=Alien-SDL -pkgver=1.426 +pkgver=1.430 pkgrel=1 pkgdesc="Building, finding and using SDL binaries" arch=(i686 x86_64) license=(PerlArtistic GPL) url="http://search.cpan.org/dist/Alien-SDL/" -depends=(sdl=1.2.14 perl-file-sharedir perl-capture-tiny) +depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny) makedepends=(perl-file-which perl-text-patch) options=(!emptydirs) source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz) -md5sums=('ab5e1167934418f4a7b3285a9d05c89b') +md5sums=('9d7774212fb4e1c46325746c953a808b') package() { cd "$srcdir/$_realname-$pkgver" diff --git a/multilib/lib32-sdl_image/PKGBUILD b/multilib/lib32-sdl_image/PKGBUILD index a0df01c37..bf60a1817 100644 --- a/multilib/lib32-sdl_image/PKGBUILD +++ b/multilib/lib32-sdl_image/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62238 2012-01-18 17:43:15Z svenstaro $ +# $Id: PKGBUILD 62665 2012-01-23 18:29:11Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: SpepS _pkgbasename=sdl_image pkgname=lib32-$_pkgbasename -pkgver=1.2.11 +pkgver=1.2.12 pkgrel=1 pkgdesc="A simple library to load images of various formats as SDL surfaces (32-bit)" arch=('x86_64') @@ -14,7 +14,7 @@ depends=('lib32-sdl' 'lib32-libpng' 'lib32-libjpeg' 'lib32-libtiff' 'lib32-zlib' makedepends=('gcc-multilib') options=('!libtool') source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz) -md5sums=('1210d7a7e87ab95abebb4f3e79a0fd31') +md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') build() { export CC='gcc -m32' diff --git a/staging/avahi/PKGBUILD b/staging/avahi/PKGBUILD new file mode 100644 index 000000000..b917e9248 --- /dev/null +++ b/staging/avahi/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 147194 2012-01-24 04:55:03Z bisson $ +# Contributor: Douglas Soares de Andrade +# Maintainer: Gaetan Bisson + +pkgname=avahi +pkgver=0.6.30 +pkgrel=7 +pkgdesc='A multicast/unicast DNS-SD framework' +arch=('i686' 'x86_64') +url='http://www.avahi.org/' +license=('LGPL') +depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' + 'gtk2: gtk2 bindings' + 'qt3: qt3 bindings' + 'qt: qt bindings' + 'pygtk: avahi-bookmarks, avahi-discover' + 'twisted: avahi-bookmarks' + 'mono: mono bindings' + 'dbus-python: avahi-discover' + 'nss-mdns: NSS support for mDNS') +makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' + 'gtk-sharp-2' 'gobject-introspection' 'gtk3') +backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) +install=install +conflicts=('howl' 'mdnsresponder') +provides=('howl' 'mdnsresponder') +replaces=('howl' 'mdnsresponder') +options=('!libtool') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" + 'gnome-nettool.png' + 'rc.d.patch') +sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -p1 -i "../rc.d.patch" + + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 + PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png + + cd "${pkgdir}" + sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + # howl and mdnsresponder compatability + (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) + (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) +} diff --git a/staging/avahi/gnome-nettool.png b/staging/avahi/gnome-nettool.png new file mode 100644 index 000000000..227d0678a Binary files /dev/null and b/staging/avahi/gnome-nettool.png differ diff --git a/staging/avahi/install b/staging/avahi/install new file mode 100644 index 000000000..7c75c3dd4 --- /dev/null +++ b/staging/avahi/install @@ -0,0 +1,21 @@ +post_install() { + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + + cat < The following daemons may be added to DAEMONS in /etc/rc.conf: +==> avahi-daemon: the mdns responder, you probably want this. +==> dbus needs to be running when you start it. +==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns +==> configuration on dhcp-less networks. + +==> To use some of the client applications you will have to install python. +==> In addition, pygtk is required for the graphical ones and +==> twisted for avahi-bookmarks. +EOF +} + +post_remove() { + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null +} diff --git a/staging/avahi/rc.d.patch b/staging/avahi/rc.d.patch new file mode 100644 index 000000000..fd735734b --- /dev/null +++ b/staging/avahi/rc.d.patch @@ -0,0 +1,11 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 +@@ -33,6 +33,7 @@ + + case "$1" in + start) ++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then diff --git a/staging/bmp/0.9.7.1-visualization.patch b/staging/bmp/0.9.7.1-visualization.patch new file mode 100644 index 000000000..ac03323f6 --- /dev/null +++ b/staging/bmp/0.9.7.1-visualization.patch @@ -0,0 +1,12 @@ +--- beep/vis.c 2004-12-04 10:04:29.000000000 +0100 ++++ beep/vis.c 2005-02-17 12:02:25.391044008 +0100 +@@ -223,7 +223,8 @@ vis_draw(Widget * w) + /* FIXME: The check "shouldn't" be neccessary? */ + /* if (GTK_IS_WINDOW(vis->vs_window)) { */ + GDK_THREADS_ENTER(); +- gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, ++ if (GDK_IS_DRAWABLE(vis->vs_window)) ++ gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, + vis->vs_widget.x, vis->vs_widget.y, + vis->vs_widget.width, vis->vs_widget.height, + GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data, diff --git a/staging/bmp/PKGBUILD b/staging/bmp/PKGBUILD new file mode 100644 index 000000000..028372325 --- /dev/null +++ b/staging/bmp/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 147143 2012-01-23 05:18:22Z eric $ +# Maintainer: Kevin Piche +# Contributor: Ben + +pkgname=bmp +pkgver=0.9.7.1 +pkgrel=9 +pkgdesc="gtk2 port of xmms" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/beepmp/" +license=('GPL') +depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils') +makedepends=('libxt') +options=('!libtool') +install=bmp.install +source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \ + ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) +md5sums=('c25d5a8d49cc5851d13d525a20023c4c' + 'fa1bdf5a8d03e8539a6bed5caa471176' + '42ad4109ddb66024d4c6d1f3e572ab86') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../${pkgver}-visualization.patch + patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch + LIBS+="-lm" ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch new file mode 100644 index 000000000..4c1e46da9 --- /dev/null +++ b/staging/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch @@ -0,0 +1,108 @@ +Patch taken from xmms-crossfade 3.10 tarball. Required for crossfade to +work. http://www.eisenlohr.org/xmms-crossfade/ + +diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c +--- bmp-0.9.7.1/beep/mainwin.c 2005-05-09 10:45:39.000000000 +0200 ++++ bmp-0.9.7.1.patched/beep/mainwin.c 2005-11-25 00:03:59.000000000 +0100 +@@ -655,9 +655,11 @@ + mainwin_set_shade(!cfg.player_shaded); + } + ++gboolean is_quitting = FALSE; + void + mainwin_quit_cb(void) + { ++ is_quitting = TRUE; + gtk_widget_hide(equalizerwin); + gtk_widget_hide(playlistwin); + gtk_widget_hide(mainwin); +@@ -1318,7 +1320,7 @@ + change_song(guint pos) + { + if (bmp_playback_get_playing()) +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + + playlist_set_position(pos); + bmp_playback_initiate(); +diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c +--- bmp-0.9.7.1/beep/playback.c 2005-01-26 06:56:15.000000000 +0100 ++++ bmp-0.9.7.1.patched/beep/playback.c 2005-11-25 00:03:59.000000000 +0100 +@@ -89,7 +89,7 @@ + return; + + if (bmp_playback_get_playing()) +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + + vis_clear_data(mainwin_vis); + vis_clear_data(playlistwin_vis); +@@ -135,6 +135,15 @@ + get_current_input_plugin()->pause(ip_data.paused); + } + ++gboolean input_stopped_for_restart = FALSE; ++void ++bmp_playback_stop_for_restart(void) ++{ ++ input_stopped_for_restart = TRUE; ++ bmp_playback_stop(); ++ input_stopped_for_restart = FALSE; ++} ++ + void + bmp_playback_stop(void) + { +diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h +--- bmp-0.9.7.1/beep/playback.h 2004-12-04 10:04:26.000000000 +0100 ++++ bmp-0.9.7.1.patched/beep/playback.h 2005-11-25 00:03:59.000000000 +0100 +@@ -26,6 +26,7 @@ + void bmp_playback_initiate(void); + void bmp_playback_pause(void); + void bmp_playback_stop(void); ++void bmp_playback_stop_for_restart(void); + gboolean bmp_playback_play_file(const gchar * filename); + gboolean bmp_playback_get_playing(void); + gboolean bmp_playback_get_paused(void); +diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c +--- bmp-0.9.7.1/beep/playlist.c 2005-08-11 09:25:51.000000000 +0200 ++++ bmp-0.9.7.1.patched/beep/playlist.c 2005-11-25 00:03:59.000000000 +0100 +@@ -817,7 +817,7 @@ + if (bmp_playback_get_playing()) { + /* We need to stop before changing playlist_position */ + PLAYLIST_UNLOCK(); +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + PLAYLIST_LOCK(); + restart_playing = TRUE; + } +@@ -868,7 +868,7 @@ + if (bmp_playback_get_playing()) { + /* We need to stop before changing playlist_position */ + PLAYLIST_UNLOCK(); +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + PLAYLIST_LOCK(); + restart_playing = TRUE; + } +@@ -1018,7 +1018,7 @@ + if (bmp_playback_get_playing()) { + /* We need to stop before changing playlist_position */ + PLAYLIST_UNLOCK(); +- bmp_playback_stop(); ++ bmp_playback_stop_for_restart(); + PLAYLIST_LOCK(); + restart_playing = TRUE; + } +@@ -1047,7 +1047,10 @@ + { + GList *plist_pos_list; + +- bmp_playback_stop(); ++ if (cfg.repeat) ++ bmp_playback_stop_for_restart(); ++ else ++ bmp_playback_stop(); + + PLAYLIST_LOCK(); + plist_pos_list = find_playlist_position_list(); diff --git a/staging/bmp/bmp.install b/staging/bmp/bmp.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/staging/bmp/bmp.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/gtk-engines/PKGBUILD b/staging/gtk-engines/PKGBUILD new file mode 100644 index 000000000..0883d0ab4 --- /dev/null +++ b/staging/gtk-engines/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 147188 2012-01-24 03:20:02Z eric $ +# Maintainer: Jan de Groot + +pkgname=gtk-engines +pkgver=2.20.2 +pkgrel=2 +pkgdesc="Theme engines for GTK+ 2" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('gtk2>=2.22.0') +makedepends=('pkg-config' 'intltool') +options=('!libtool') +url="http://live.gnome.org/GnomeArt" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2) +conflicts=('lighthouse-gtk2' 'clearlooks-gtk2') +replaces=('lighthouse-gtk2') +sha256sums=('15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-animation + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gtkhtml/PKGBUILD b/staging/gtkhtml/PKGBUILD new file mode 100644 index 000000000..45bc4353c --- /dev/null +++ b/staging/gtkhtml/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147192 2012-01-24 04:25:29Z eric $ +# Maintainer: Jan de Groot + +pkgname=gtkhtml +pkgver=3.32.2 +pkgrel=3 +pkgdesc="A lightweight HTML renderer/editor widget for GTK2" +arch=(i686 x86_64) +license=('GPL') +depends=('gconf' 'gtk2' 'gnome-icon-theme' 'enchant' 'iso-codes' 'libsoup') +makedepends=('intltool') +url="http://www.gnome.org" +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.32/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gtkhtml \ + --localstatedir=/var --disable-static \ + --disable-deprecated-warning-flags + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}/usr/bin/gtkhtml-editor-test" +} diff --git a/staging/gtkmm/PKGBUILD b/staging/gtkmm/PKGBUILD new file mode 100644 index 000000000..40eae3010 --- /dev/null +++ b/staging/gtkmm/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 147190 2012-01-24 04:22:44Z eric $ +# Contributor: Tom Newsom +# Maintainer: Jan de Groot + +pkgbase=gtkmm +pkgname=('gtkmm' 'gtkmm-docs') +pkgver=2.24.2 +pkgrel=2 +arch=('i686' 'x86_64') +makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs') +license=('LGPL') +options=('!libtool' '!emptydirs') +url="http://gtkmm.sourceforge.net/" +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz) +sha256sums=('c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr + make +} + +package_gtkmm() { + pkgdesc="C++ bindings for gtk2" + depends=('gtk2' 'pangomm' 'atkmm') + cd "${srcdir}/${pkgbase}-${pkgver}" + + sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile + + make DESTDIR="${pkgdir}" install +} + +package_gtkmm-docs() { + pkgdesc="Developer documentation for gtkmm v2" + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C docs DESTDIR="${pkgdir}" install +} diff --git a/staging/gtksourceview2/PKGBUILD b/staging/gtksourceview2/PKGBUILD new file mode 100644 index 000000000..6f0777cb6 --- /dev/null +++ b/staging/gtksourceview2/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 147186 2012-01-24 03:16:31Z eric $ +# Maintainer: Jan de Groot + +pkgname=gtksourceview2 +pkgver=2.10.5 +pkgrel=2 +pkgdesc="A text widget adding syntax highlighting and more to GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk2>=2.22.0' 'libxml2>=2.7.7') +makedepends=('intltool' 'pkg-config') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2) +sha256sums=('c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e') + +build() { + cd "${srcdir}/gtksourceview-${pkgver}" + sed -i 's#python#python2#' gtksourceview/language-specs/convert.py + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/gtksourceview-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/imlib2/PKGBUILD b/staging/imlib2/PKGBUILD new file mode 100644 index 000000000..33e0b8bca --- /dev/null +++ b/staging/imlib2/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 147170 2012-01-23 21:18:18Z eric $ +# Maintainer: Ronald van Haren +# Contributor: Arjan Timmerman +# Contributor: Tom Newsom + +pkgname=imlib2 +pkgver=1.4.5 +pkgrel=2 +pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" +url="http://sourceforge.net/projects/enlightenment/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo') +options=('!libtool') +source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2") +sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # disable optimizations, they cause problems (e.g. FS#12268) + [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx" + [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64" + + # Configure and Build + ./configure --prefix=/usr \ + --sysconfdir=/etc/imlib2 \ + --x-libraries=/usr/lib $EXTRAOPTS + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # Install License + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/staging/libgnomecanvas/PKGBUILD b/staging/libgnomecanvas/PKGBUILD new file mode 100644 index 000000000..42ba98b4d --- /dev/null +++ b/staging/libgnomecanvas/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147184 2012-01-24 03:06:37Z eric $ +# Maintainer: Jan de Groot + +pkgname=libgnomecanvas +pkgver=2.30.3 +pkgrel=2 +pkgdesc="The GNOME Canvas library" +arch=(i686 x86_64) +license=('LGPL') +depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21') +makedepends=('pkg-config' 'intltool') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static \ + --enable-glade + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/opengtl/PKGBUILD b/staging/opengtl/PKGBUILD new file mode 100644 index 000000000..30d4c64d7 --- /dev/null +++ b/staging/opengtl/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147180 2012-01-24 01:25:15Z foutrelis $ +# Maintainer: Ronald van Haren +# Contributor: Andries Radu + +pkgname=opengtl +pkgver=0.9.16 +pkgrel=1 +pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" +url="http://www.opengtl.org" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gcc-libs' 'llvm') +makedepends=('cmake' 'libpng') +optdepends=('libpng: for using the png extension') +source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2) +sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../OpenGTL-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/pekwm/PKGBUILD b/staging/pekwm/PKGBUILD new file mode 100644 index 000000000..68cba0015 --- /dev/null +++ b/staging/pekwm/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 147166 2012-01-23 20:22:29Z eric $ +# Maintainer: Kevin Piche +# Contributor: Eddie Lozon + +pkgname=pekwm +pkgver=0.1.13 +pkgrel=2 +pkgdesc="A small, fast, functional, and flexible window manager" +arch=(i686 x86_64) +license=('GPL') +url="http://pekwm.org/" +depends=('gcc-libs' 'libjpeg>=7' 'libpng' 'libxft' 'libxinerama' 'libxpm' +'libxrandr') +backup=(etc/pekwm/config + etc/pekwm/vars + etc/pekwm/autoproperties + etc/pekwm/start + etc/pekwm/keys + etc/pekwm/mouse + etc/pekwm/menu) +source=(http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2 +pekwm.desktop libpng-1.4.patch) +md5sums=('51a3f9030817df0304cc1da5110e493a' '5a78fc6653fbb0b7282ecf7f1f81e2c5' + '075bf1b9d32bf94780329499e4fa40e3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" +# patch -p1 < ../libpng-1.4.patch || return 1 + # Default settings: + # --enable-shape --enable-xinerama --enable-menus \ + # --enable-harbour --disable-debug --disable-pedantic \ + # --enable-xft --enable-image-xpm --enable-image-jpeg \ + # --enable-image-png --enable-xrandr + ./configure --prefix=/usr --sysconfdir=/etc + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/xsessions/${pkgname}.desktop" +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/pekwm/libpng-1.4.patch b/staging/pekwm/libpng-1.4.patch new file mode 100644 index 000000000..bc4df2c4d --- /dev/null +++ b/staging/pekwm/libpng-1.4.patch @@ -0,0 +1,21 @@ +diff -Naur pekwm-0.1.11-orig/src/PImageLoaderPng.cc pekwm-0.1.11/src/PImageLoaderPng.cc +--- pekwm-0.1.11-orig/src/PImageLoaderPng.cc 2010-01-22 01:57:08.000000000 -0500 ++++ pekwm-0.1.11/src/PImageLoaderPng.cc 2010-01-22 02:00:02.000000000 -0500 +@@ -108,7 +108,7 @@ + + // gray -> 8 bit gray + if (color_type == PNG_COLOR_TYPE_GRAY && (bpp < 8)) { +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + } + + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { +@@ -179,7 +179,7 @@ + + status = fread(sig, 1, PImageLoaderPng::PNG_SIG_BYTES, fp); + if (status == PImageLoaderPng::PNG_SIG_BYTES) { +- return (png_check_sig(sig, PImageLoaderPng::PNG_SIG_BYTES) != 0); ++ return (png_sig_cmp(sig, 0, PImageLoaderPng::PNG_SIG_BYTES) == 0); + } + return false; + } diff --git a/staging/pekwm/pekwm.desktop b/staging/pekwm/pekwm.desktop new file mode 100644 index 000000000..2f59528bd --- /dev/null +++ b/staging/pekwm/pekwm.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Pekwm +Comment=The pekwm window manager +Exec=pekwm +# no icon yet, only the top three are currently used +Icon= +Type=Application diff --git a/staging/pilot-link/PKGBUILD b/staging/pilot-link/PKGBUILD new file mode 100644 index 000000000..28fa36618 --- /dev/null +++ b/staging/pilot-link/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147174 2012-01-23 21:43:03Z eric $ +# Maintainer: dale + +# todo: add perl support, DESTDIR has no affect on perl +# and it seems that moving the files manually doesn't work + +pkgname=pilot-link +pkgver=0.12.5 +pkgrel=3 +pkgdesc="A suite of tools for connecting to PalmOS handheld devices" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('readline>=6.0' 'libpng>=1.5.0' 'libusb-compat' 'popt' 'bluez>=4.59') +options=('!libtool') +url="http://www.pilot-link.org/" +source=(http://downloads.pilot-link.org/${pkgname}-${pkgver}.tar.bz2 + pilot-link-png14.patch) +md5sums=('568c55bf504b044f6fbd50baa407c990' + 'a21a2eeb01544a8a261a75e64a3120c3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/pilot-link-png14.patch" + ./configure --prefix=/usr --enable-conduits --enable-libusb \ + --with-libiconv --with-libpng + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/pilot-link/pilot-link-png14.patch b/staging/pilot-link/pilot-link-png14.patch new file mode 100644 index 000000000..9d753332e --- /dev/null +++ b/staging/pilot-link/pilot-link-png14.patch @@ -0,0 +1,100 @@ +diff -ru pilot-link-0.12.4/src/pilot-read-notepad.c pilot-link-0.12.4.png14/src/pilot-read-notepad.c +--- pilot-link-0.12.4/src/pilot-read-notepad.c 2007-02-05 00:06:02.000000000 +0100 ++++ pilot-link-0.12.4.png14/src/pilot-read-notepad.c 2010-01-17 15:04:33.000000000 +0100 +@@ -39,10 +39,6 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) +- #define png_voidp_NULL (png_voidp)NULL +- #define png_error_ptr_NULL (png_error_ptr)NULL +-#endif + #endif + + const char *progname; +@@ -166,8 +162,8 @@ + width = n->body.width + 8; + + png_ptr = png_create_write_struct +- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ ( PNG_LIBPNG_VER_STRING, NULL, ++ NULL, NULL); + + if(!png_ptr) + return; +diff -ru pilot-link-0.12.4/src/pilot-read-palmpix.c pilot-link-0.12.4.png14/src/pilot-read-palmpix.c +--- pilot-link-0.12.4/src/pilot-read-palmpix.c 2007-02-05 00:06:03.000000000 +0100 ++++ pilot-link-0.12.4.png14/src/pilot-read-palmpix.c 2010-01-17 15:03:20.000000000 +0100 +@@ -42,10 +42,6 @@ + + #ifdef HAVE_PNG + #include "png.h" +-#if (PNG_LIBPNG_VER < 10201) +- #define png_voidp_NULL (png_voidp)NULL +- #define png_error_ptr_NULL (png_error_ptr)NULL +-#endif + #endif + + const char *progname; +@@ -223,8 +219,8 @@ + png_infop info_ptr; + + png_ptr = png_create_write_struct +- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ ( PNG_LIBPNG_VER_STRING, NULL, ++ NULL, NULL); + + if(!png_ptr) + return; +diff -ru pilot-link-0.12.4/src/pilot-read-screenshot.c pilot-link-0.12.4.png14/src/pilot-read-screenshot.c +--- pilot-link-0.12.4/src/pilot-read-screenshot.c 2006-11-02 15:54:31.000000000 +0100 ++++ pilot-link-0.12.4.png14/src/pilot-read-screenshot.c 2010-01-17 15:03:52.000000000 +0100 +@@ -40,10 +40,6 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) +-# define png_voidp_NULL (png_voidp)NULL +-# define png_error_ptr_NULL (png_error_ptr)NULL +-# endif + #endif + + #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) +@@ -87,8 +83,8 @@ + gray_buf = malloc( state->w ); + + png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, NULL, ++ NULL, NULL); + + if (!png_ptr) + return; +diff -ru pilot-link-0.12.4/src/pilot-read-veo.c pilot-link-0.12.4.png14/src/pilot-read-veo.c +--- pilot-link-0.12.4/src/pilot-read-veo.c 2007-02-05 00:06:03.000000000 +0100 ++++ pilot-link-0.12.4.png14/src/pilot-read-veo.c 2010-01-17 15:04:14.000000000 +0100 +@@ -41,10 +41,6 @@ + + #ifdef HAVE_PNG + # include "png.h" +-# if (PNG_LIBPNG_VER < 10201) +-# define png_voidp_NULL (png_voidp)NULL +-# define png_error_ptr_NULL (png_error_ptr)NULL +-# endif + #endif + + #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4)) +@@ -856,8 +852,8 @@ + png_infop info_ptr; + + png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, png_voidp_NULL, +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, NULL, ++ NULL, NULL); + + if (!png_ptr) + return; diff --git a/staging/pygtk/PKGBUILD b/staging/pygtk/PKGBUILD new file mode 100644 index 000000000..a231b87ef --- /dev/null +++ b/staging/pygtk/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 147168 2012-01-23 21:15:41Z eric $ +# Maintainer: Jan de Groot +# Contributor: Sarah Hay + +pkgname=pygtk +pkgver=2.24.0 +pkgrel=3 +pkgdesc="Python bindings for the GTK widget set" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('libglade' 'python2-cairo' 'pygobject') +makedepends=('python2-numpy' 'pygobject2-devel') +optdepends=('python2-numpy') +options=('!libtool') +url="http://www.pygtk.org/" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + python27.patch) +sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912' + '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + #https://bugzilla.gnome.org/show_bug.cgi?id=623965 + patch -Np1 -i "${srcdir}/python27.patch" + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" + + sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py +} diff --git a/staging/pygtk/python27.patch b/staging/pygtk/python27.patch new file mode 100644 index 000000000..9bbe2b5ae --- /dev/null +++ b/staging/pygtk/python27.patch @@ -0,0 +1,50 @@ +diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c +index c0e1493..aa8cf10 100644 +--- a/gtk/gtkmodule.c ++++ b/gtk/gtkmodule.c +@@ -227,8 +227,12 @@ init_gtk(void) + pygtk_add_stock_items(d); + + /* extension API */ +- PyDict_SetItemString(d, "_PyGtk_API", +- o=PyCObject_FromVoidPtr(&functions, NULL)); ++#if PY_VERSION_HEX >= 0x02070000 ++ o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL); ++#else ++ o = PyCObject_FromVoidPtr(&functions, NULL); ++#endif ++ PyDict_SetItemString(d, "_PyGtk_API", o); + Py_DECREF(o); + + PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning", +diff --git a/gtk/pygtk.h b/gtk/pygtk.h +index 573c3b9..e4c680f 100644 +--- a/gtk/pygtk.h ++++ b/gtk/pygtk.h +@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; + + + /* a function to initialise the pygtk functions */ ++ ++/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */ ++#if PY_VERSION_HEX >= 0x02070000 ++#define init_pygtk() G_STMT_START { \ ++ void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \ ++ if (!capsule) { \ ++ return; \ ++ } \ ++ _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \ ++} G_STMT_END ++#else /* PY_VERSION_HEX */ ++/* Python 2.6 and earlier use the CObject API */ + #define init_pygtk() G_STMT_START { \ + PyObject *pygtk = PyImport_ImportModule("gtk"); \ + if (pygtk != NULL) { \ +@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; + return; \ + } \ + } G_STMT_END ++#endif /* PY_VERSION_HEX */ + + #endif + diff --git a/staging/skanlite/PKGBUILD b/staging/skanlite/PKGBUILD new file mode 100644 index 000000000..2690b7308 --- /dev/null +++ b/staging/skanlite/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 147182 2012-01-24 01:29:19Z foutrelis $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=skanlite +pkgver=0.8 +pkgrel=2 +pkgdesc="Image Scanning Application for KDE" +arch=('i686' 'x86_64') +url='http://kde-apps.org/content/show.php?content=109803' +license=('GPL') +depends=('kdebase-runtime' 'libksane') +makedepends=('pkgconfig' 'cmake' 'automoc4') +source=("http://downloads.sourceforge.net/sanewidget/${pkgname}-${pkgver}.tar.bz2") +md5sums=('baa43dbc78be696e121969b0a3d88929') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/xawtv/PKGBUILD b/staging/xawtv/PKGBUILD new file mode 100644 index 000000000..d2db8af63 --- /dev/null +++ b/staging/xawtv/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 147176 2012-01-23 23:36:01Z eric $ +# Maintainer: Jan de Groot +# Contributor: Sarah Hay +# Contributor: Jason Chu + +pkgname=xawtv +pkgver=3.101 +pkgrel=2 +pkgdesc="A simple Xaw-based TV program which uses the bttv driver or video4linux" +arch=('i686' 'x86_64') +url="http://git.linuxtv.org/xawtv3.git" +license=('GPL') +depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'lirc-utils' 'libxft' 'libxaw' 'xorg-fonts-misc' 'libxxf86vm') +makedepends=('mesa') +source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2) +md5sums=('330ce1789595e370be34ad4cae3dc3fa') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + autoconf + autoheader + ./configure --prefix=/usr --disable-motif --disable-quicktime + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/xorg-xcursorgen/PKGBUILD b/staging/xorg-xcursorgen/PKGBUILD new file mode 100644 index 000000000..630794be0 --- /dev/null +++ b/staging/xorg-xcursorgen/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 147178 2012-01-24 01:21:47Z eric $ +# Maintainer: Jan de Groot + +pkgname=xorg-xcursorgen +pkgver=1.0.4 +pkgrel=3 +pkgdesc="Create an X cursor file from PNG images" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libx11' 'libxcursor' 'libpng') +makedepends=('xorg-util-macros') +groups=('xorg-apps' 'xorg') +source=(http://xorg.freedesktop.org/archive/individual/app/xcursorgen-${pkgver}.tar.bz2) +sha1sums=('244c180aae8cc07175b93f314d5bbbf24171658a') + +build() { + cd "${srcdir}/xcursorgen-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xcursorgen-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD new file mode 100644 index 000000000..8b41189ca --- /dev/null +++ b/testing/gcc/PKGBUILD @@ -0,0 +1,260 @@ +# $Id: PKGBUILD 147172 2012-01-23 21:35:31Z allan $ +# Maintainer: Allan McRae + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: libtool requires rebuilt with each new gcc version + +pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') +pkgver=4.6.2 +pkgrel=6 +_snapshot=4.6-20120120 +_libstdcppmanver=20111215 # Note: check source directory name when updating this +pkgdesc="The GNU Compiler Collection" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL' 'custom') +url="http://gcc.gnu.org" +makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') +checkdepends=('dejagnu') +options=('!libtool' '!emptydirs') +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2 + gcc_pure64.patch + gcc-hash-style-both.patch) +md5sums=('f7ca5d9f7a07216577f81318b7cf56ef' + '450772ce32daed97d7383199f8797f33' + '4030ee1c08dd1e843c0225b772360e76' + '4df25b623799b148a0703eaeec8fdf3f') + +if [ -n "${_snapshot}" ]; then + _basedir="${srcdir}/gcc-${_snapshot}" +else + _basedir="${srcdir}/gcc-${pkgver}" +fi + +build() { + cd ${_basedir} + + # Do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + if [ "${CARCH}" = "x86_64" ]; then + patch -Np1 -i ${srcdir}/gcc_pure64.patch + fi + patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch + + echo ${pkgver} > gcc/BASE-VER + + cd ${srcdir} + mkdir gcc-build && cd gcc-build + + ${_basedir}/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ + --enable-shared --enable-threads=posix \ + --with-system-zlib --enable-__cxa_atexit \ + --disable-libunwind-exceptions --enable-clocale=gnu \ + --disable-libstdcxx-pch --enable-libstdcxx-time \ + --enable-gnu-unique-object --enable-linker-build-id \ + --with-ppl --enable-cloog-backend=isl \ + --enable-lto --enable-gold --enable-ld=default \ + --enable-plugin --with-plugin-ld=ld.gold \ + --disable-multilib --disable-libssp \ + --enable-checking=release + make +} + +check() { + cd gcc-build + + # increase stack size to prevent test failures + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 + ulimit -s 32768 + + # do not abort on error as some are "expected" + make -k check || true + ${_basedir}/contrib/test_summary +} + +package_gcc-libs() +{ + pkgdesc="Runtime libraries shipped by GCC" + groups=('base') + depends=('glibc>=2.14') + install=gcc-libs.install + + cd gcc-build + make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared + for lib in libmudflap libgomp libstdc++-v3/src; do + make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + done + make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install + make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info + + make -j1 DESTDIR=${pkgdir} install-target-libquadmath + make -j1 DESTDIR=${pkgdir} install-target-libgfortran + make -j1 DESTDIR=${pkgdir} install-target-libobjc + + # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} + rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} + + # remove static libraries + find ${pkgdir} -name *.a -delete + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc() +{ + pkgdesc="The GNU Compiler Collection - C and C++ frontends" + depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl') + groups=('base-devel') + install=gcc.install + + cd gcc-build + + # unfortunately it is much, much easier to install the lot and clean-up the mess... + make -j1 DESTDIR=${pkgdir} install + rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} + rm $pkgdir/usr/lib/*.so* + rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a + rm $pkgdir/usr/lib/libgfortran.spec + rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} + rm -r $pkgdir/usr/lib/go + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info + rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo + rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + rm $pkgdir/usr/share/man/man3/ffi* + + # many packages require these symlinks + install -dm755 ${pkgdir}/lib + ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp + ln -sf gcc ${pkgdir}/usr/bin/cc + ln -sf g++ ${pkgdir}/usr/bin/c++ + + # install gengtype for plugin support + install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ + install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ + + # plugin headers are all over the place at the moment... + for i in common objc pragma pretty-print; do + ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h + done + + # POSIX conformance launcher scripts for c89 and c99 + cat > $pkgdir/usr/bin/c89 <<"EOF" +#!/bin/sh +fl="-std=c89" +for opt; do + case "$opt" in + -ansi|-std=c89|-std=iso9899:1990) fl="";; + -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 + exit 1;; + esac +done +exec gcc $fl ${1+"$@"} +EOF + + cat > $pkgdir/usr/bin/c99 <<"EOF" +#!/bin/sh +fl="-std=c99" +for opt; do + case "$opt" in + -std=c99|-std=iso9899:1999) fl="";; + -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 + exit 1;; + esac +done +exec gcc $fl ${1+"$@"} +EOF + + chmod 755 $pkgdir/usr/bin/c{8,9}9 + + # install the libstdc++ man pages + install -dm755 ${pkgdir}/usr/share/man/man3 + install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/ + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-fortran() +{ + pkgdesc="Fortran front-end for GCC" + depends=("gcc=$pkgver-$pkgrel") + install=gcc-fortran.install + + cd gcc-build + make -j1 DESTDIR=${pkgdir} install-target-libquadmath + make -j1 DESTDIR=$pkgdir install-target-libgfortran + make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS + make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} + install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 + + # remove libraries included in gcc-libs + rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* + rm ${pkgdir}/usr/share/info/libquadmath.info + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-objc() +{ + pkgdesc="Objective-C front-end for GCC" + depends=("gcc=$pkgver-$pkgrel") + + cd gcc-build + make -j1 DESTDIR=$pkgdir install-target-libobjc + install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ + install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ + + # remove libraries included in gcc-libs + rm ${pkgdir}/usr/lib/libobjc.so* + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-ada() +{ + pkgdesc="Ada front-end for GCC (GNAT)" + depends=("gcc=$pkgver-$pkgrel") + install=gcc-ada.install + + cd gcc-build/gcc + make -j1 DESTDIR=$pkgdir ada.install-{common,info} + install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-go() +{ + pkgdesc="Go front-end for GCC" + depends=("gcc=$pkgver-$pkgrel") + install=gcc-go.install + + cd gcc-build + make -j1 DESTDIR=$pkgdir install-target-libgo + make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} + install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION +} diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install new file mode 100644 index 000000000..df0553a4f --- /dev/null +++ b/testing/gcc/gcc-ada.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install new file mode 100644 index 000000000..b15d89a97 --- /dev/null +++ b/testing/gcc/gcc-fortran.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +file="gfortran.info" + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null +} diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install new file mode 100644 index 000000000..7dc50dee5 --- /dev/null +++ b/testing/gcc/gcc-go.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gccgo.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch new file mode 100644 index 000000000..8b59f4535 --- /dev/null +++ b/testing/gcc/gcc-hash-style-both.patch @@ -0,0 +1,122 @@ +--- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 +@@ -41,7 +41,7 @@ + + #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER + +-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ ++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ + %{O*:-O3} %{!O*:-O1} \ + %{shared:-shared} \ + %{!shared: \ +--- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 ++++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -78,7 +78,7 @@ + %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" + + #undef LINK_SPEC +-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ ++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 ++++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -104,7 +104,7 @@ + { "dynamic_linker", LINUX_DYNAMIC_LINKER } + + #undef LINK_SPEC +-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ ++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +--- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -64,7 +64,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "\ ++#define LINK_SPEC "--hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 ++++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 +@@ -389,11 +389,11 @@ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) + + +-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" + +-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" + +--- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 ++++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 +@@ -830,7 +830,7 @@ + #define LINUX_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) + +-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" + +--- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -77,7 +77,7 @@ + + #undef LINK_SPEC + #define LINK_SPEC \ +- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ ++ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{static:-static} \ +--- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 ++++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -113,7 +113,7 @@ + { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ + { "link_arch", LINK_ARCH_SPEC }, + +-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ ++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -121,7 +121,7 @@ + %{static:-static}} \ + " + +-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -193,7 +193,7 @@ + #else /* !SPARC_BI_ARCH */ + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +--- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 ++++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -74,7 +74,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ ++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ + %{!mno-relax:%{!r:-relax}} \ + %{!shared: \ + %{!static: \ diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install new file mode 100644 index 000000000..23553b8f0 --- /dev/null +++ b/testing/gcc/gcc-libs.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +filelist=(libgomp.info libquadmath.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install new file mode 100644 index 000000000..3407a5e1f --- /dev/null +++ b/testing/gcc/gcc.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch new file mode 100644 index 000000000..8c0baf8e2 --- /dev/null +++ b/testing/gcc/gcc_pure64.patch @@ -0,0 +1,26 @@ +diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h +--- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 ++++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 +@@ -49,8 +49,8 @@ + When the -shared link option is used a final link is not being + done. */ + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" +-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" ++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" + + #undef LINK_SPEC + #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ +diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 +--- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 ++++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 +@@ -6,7 +6,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = ../lib ../lib32 + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib -- cgit v1.2.3-54-g00ecf From a61c6fb05ec1cbc6845b2ed4077ce0c5950c36ed Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Jan 2012 23:14:53 +0000 Subject: Wed Jan 25 23:14:53 UTC 2012 --- community-staging/freedroidrpg/PKGBUILD | 35 ++++ .../freedroidrpg/freedroidrpg.desktop | 11 ++ community-staging/freedroidrpg/freedroidrpg.jpg | Bin 0 -> 12697 bytes community-staging/gnash/PKGBUILD | 89 +++++++++ community-staging/gnash/gentoo-ffmpeg-0.8.patch | 204 +++++++++++++++++++++ community-staging/gnash/gnash-gtk.install | 12 ++ community-staging/gnash/nodebug.patch | 48 +++++ community-staging/gnash/xul8.patch | 44 +++++ community-staging/netsurf/PKGBUILD | 45 +++++ community-staging/netsurf/PKGBUILD.wip | 59 ++++++ community-staging/netsurf/netsurf.desktop | 127 +++++++++++++ community-staging/netsurf/netsurf.install | 15 ++ community/cegui/PKGBUILD | 9 +- community/libmicrohttpd/PKGBUILD | 6 +- community/lightspark/PKGBUILD | 10 +- community/megaglest/PKGBUILD | 6 +- community/miredo/PKGBUILD | 6 +- community/portmidi/PKGBUILD | 13 +- community/portmidi/portmidi-217-build-fix.patch | 29 +++ community/sigil/PKGBUILD | 10 +- community/tmux/PKGBUILD | 6 +- extra/akonadi/PKGBUILD | 8 +- extra/python-egenix-mx-base/PKGBUILD | 7 +- extra/qwtplot3d/PKGBUILD | 14 +- extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch | 34 ++++ extra/time/PKGBUILD | 4 +- libre/your-freedom/PKGBUILD | 2 +- multilib-staging/lib32-libcanberra/PKGBUILD | 63 +++++++ multilib/lib32-sdl/PKGBUILD | 23 +-- staging/evince/PKGBUILD | 36 ++++ staging/evince/evince.install | 19 ++ staging/glade-perl/PKGBUILD | 27 +++ staging/gnome-desktop2/PKGBUILD | 35 ++++ staging/gnome-python/PKGBUILD | 69 +++++++ staging/inkscape/PKGBUILD | 57 ++++++ staging/inkscape/install | 13 ++ staging/inkscape/libpng15.patch | 40 ++++ staging/lablgtk2/PKGBUILD | 30 +++ staging/libbonoboui/PKGBUILD | 28 +++ staging/libgnomeui/PKGBUILD | 28 +++ staging/libgtkhtml/PKGBUILD | 27 +++ staging/pygtksourceview2/PKGBUILD | 27 +++ staging/sane/PKGBUILD | 57 ++++++ staging/sane/libv4l-0.8.3.patch | 64 +++++++ staging/sane/sane.install | 7 + staging/sane/sane.xinetd | 11 ++ staging/sane/xerox_mfp_fix_usb_devices.patch | 67 +++++++ staging/sdl_image/PKGBUILD | 29 +++ staging/tracker/PKGBUILD | 84 +++++++++ staging/tracker/tracker.install | 13 ++ staging/wesnoth/PKGBUILD | 47 +++++ staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch | 70 +++++++ staging/wesnoth/wesnoth-libpng-1.4.0.patch | 24 +++ staging/wesnoth/wesnoth.install | 9 + staging/wesnoth/wesnoth.tmpfiles.conf | 1 + staging/xsane/PKGBUILD | 68 +++++++ staging/xsane/xsane-0.995-xdg-open.patch | 12 ++ staging/xsane/xsane.install | 16 ++ testing/curl/PKGBUILD | 66 +++++++ testing/curl/curlbuild.h | 9 + testing/curl/fix-J-with-O-regression.patch | 142 ++++++++++++++ testing/libarchive/PKGBUILD | 26 ++- testing/libarchive/interpret-non-posix-zips.patch | 165 +++++++++++++++++ testing/libarchive/test-with-zip-mtime.patch | 23 +++ testing/systemd/PKGBUILD | 20 +- testing/systemd/systemd.install | 2 +- testing/udev/PKGBUILD | 7 +- testing/wireless_tools/PKGBUILD | 29 +++ 68 files changed, 2357 insertions(+), 86 deletions(-) create mode 100644 community-staging/freedroidrpg/PKGBUILD create mode 100644 community-staging/freedroidrpg/freedroidrpg.desktop create mode 100644 community-staging/freedroidrpg/freedroidrpg.jpg create mode 100644 community-staging/gnash/PKGBUILD create mode 100644 community-staging/gnash/gentoo-ffmpeg-0.8.patch create mode 100644 community-staging/gnash/gnash-gtk.install create mode 100644 community-staging/gnash/nodebug.patch create mode 100644 community-staging/gnash/xul8.patch create mode 100644 community-staging/netsurf/PKGBUILD create mode 100644 community-staging/netsurf/PKGBUILD.wip create mode 100644 community-staging/netsurf/netsurf.desktop create mode 100644 community-staging/netsurf/netsurf.install create mode 100644 community/portmidi/portmidi-217-build-fix.patch create mode 100644 extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch create mode 100644 multilib-staging/lib32-libcanberra/PKGBUILD create mode 100644 staging/evince/PKGBUILD create mode 100644 staging/evince/evince.install create mode 100644 staging/glade-perl/PKGBUILD create mode 100644 staging/gnome-desktop2/PKGBUILD create mode 100644 staging/gnome-python/PKGBUILD create mode 100644 staging/inkscape/PKGBUILD create mode 100644 staging/inkscape/install create mode 100644 staging/inkscape/libpng15.patch create mode 100644 staging/lablgtk2/PKGBUILD create mode 100644 staging/libbonoboui/PKGBUILD create mode 100644 staging/libgnomeui/PKGBUILD create mode 100644 staging/libgtkhtml/PKGBUILD create mode 100644 staging/pygtksourceview2/PKGBUILD create mode 100644 staging/sane/PKGBUILD create mode 100644 staging/sane/libv4l-0.8.3.patch create mode 100644 staging/sane/sane.install create mode 100644 staging/sane/sane.xinetd create mode 100644 staging/sane/xerox_mfp_fix_usb_devices.patch create mode 100644 staging/sdl_image/PKGBUILD create mode 100644 staging/tracker/PKGBUILD create mode 100644 staging/tracker/tracker.install create mode 100644 staging/wesnoth/PKGBUILD create mode 100644 staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch create mode 100644 staging/wesnoth/wesnoth-libpng-1.4.0.patch create mode 100644 staging/wesnoth/wesnoth.install create mode 100644 staging/wesnoth/wesnoth.tmpfiles.conf create mode 100644 staging/xsane/PKGBUILD create mode 100644 staging/xsane/xsane-0.995-xdg-open.patch create mode 100644 staging/xsane/xsane.install create mode 100644 testing/curl/PKGBUILD create mode 100644 testing/curl/curlbuild.h create mode 100644 testing/curl/fix-J-with-O-regression.patch create mode 100644 testing/libarchive/interpret-non-posix-zips.patch create mode 100644 testing/libarchive/test-with-zip-mtime.patch create mode 100644 testing/wireless_tools/PKGBUILD (limited to 'extra') diff --git a/community-staging/freedroidrpg/PKGBUILD b/community-staging/freedroidrpg/PKGBUILD new file mode 100644 index 000000000..1b8ac1ed3 --- /dev/null +++ b/community-staging/freedroidrpg/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 62710 2012-01-24 22:18:23Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: nut543 + +#pkgbase=freedroidrpg +#pkgname=('freedroidrpg' 'freedroidrpg-data') +pkgname='freedroidrpg' +pkgver=0.15 +pkgrel=2 +arch=('i686' 'x86_64') +# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') +depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') +optdepends=('python2' 'espeak') +pkgdesc="a mature science fiction role playing game set in the future" +url="http://freedroid.sourceforge.net" +license=("GPL") +source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz + freedroidrpg.jpg + freedroidrpg.desktop) +md5sums=('003a3f34619cfaa87add2030fea5d120' + 'b73d9dac44c7e83a6c80fbe4eb96ba79' + '9a10c2a2064439cdcff5b945dfb1c3ac') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir/ install + install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg + install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop +} diff --git a/community-staging/freedroidrpg/freedroidrpg.desktop b/community-staging/freedroidrpg/freedroidrpg.desktop new file mode 100644 index 000000000..33ee2f5b8 --- /dev/null +++ b/community-staging/freedroidrpg/freedroidrpg.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=freedroidrpg +Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG +Exec=freedroidRPG +Encoding=UTF-8 +Icon=/usr/share/icons/freedroidrpg.jpg +Categories=Game;RolePlaying; +Terminal=false +StartupNotify=false diff --git a/community-staging/freedroidrpg/freedroidrpg.jpg b/community-staging/freedroidrpg/freedroidrpg.jpg new file mode 100644 index 000000000..4daa89313 Binary files /dev/null and b/community-staging/freedroidrpg/freedroidrpg.jpg differ diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD new file mode 100644 index 000000000..348db3561 --- /dev/null +++ b/community-staging/gnash/PKGBUILD @@ -0,0 +1,89 @@ +# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgbase=gnash +pkgname=(gnash-common gnash-gtk) +pkgver=0.8.9 +pkgrel=9 +arch=(i686 x86_64) +url="http://www.gnu.org/software/gnash/" +license=(GPL3) +makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils + pkgconfig boost) +options=(!libtool !emptydirs) +source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 + gentoo-ffmpeg-0.8.patch xul8.patch nodebug.patch) +sha256sums=('f90dbdc6f03d787b239b9edacbea077b46d69ae9d85f08af23f256af389c48bd' + '5e6b9c2ccb0f6dda70745712dddf302d2b42895feda850f2ed126bf53d8815ca' + 'd484f1c21ef71847a2d4b3dd254d1fa93a58719d45bc9df8b8deabee388ce4e9' + '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551') + +build() { + cd "$srcdir/gnash-$pkgver" + + # Consolidated gentoo patches for ffmpeg compatibility + # as of 2011-10-31 + patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch" + + # Patch for compatibility with newer xulrunner headers + patch -Np1 -i "$srcdir/xul8.patch" + + # Disable very, very verbose debugging (gigabytes of logs) + patch -Np1 -i "$srcdir/nodebug.patch" + + ./autogen.sh + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-plugins-install=system \ + --with-npapi-plugindir=/usr/lib/mozilla/plugins \ + --enable-gui=sdl,gtk \ + --enable-renderer=agg \ + --enable-media=gst,ffmpeg \ + --enable-hwaccel=vaapi + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_gnash-common() { + pkgdesc="A GNU Flash movie player" + depends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + boost-libs) + backup=(etc/gnashrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install + + # Split gnash-gtk + mkdir -p "$srcdir"/gtk/{bin,man1,share} + mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/" + mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/" + mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/" + mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/" +} + +package_gnash-gtk() { + pkgdesc="A GNU Flash movie player" + depends=("gnash-common=$pkgver" + gtk2 libldap hicolor-icon-theme desktop-file-utils) + install=gnash-gtk.install + backup=(etc/gnashpluginrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install-plugin + + install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}} + mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/" + mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/" + mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/" + mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/" +} diff --git a/community-staging/gnash/gentoo-ffmpeg-0.8.patch b/community-staging/gnash/gentoo-ffmpeg-0.8.patch new file mode 100644 index 000000000..d74bcc8e0 --- /dev/null +++ b/community-staging/gnash/gentoo-ffmpeg-0.8.patch @@ -0,0 +1,204 @@ +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-10-31 17:25:56.057379760 +0100 +@@ -29,7 +29,7 @@ + + //#define GNASH_DEBUG_AUDIO_DECODING + +-#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2 ++#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3 + + namespace gnash { + namespace media { +@@ -549,8 +549,12 @@ + #endif + + // older ffmpeg versions didn't accept a const input.. ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = inputSize; + int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize, +- input, inputSize); ++ &pkt); + + #ifdef GNASH_DEBUG_AUDIO_DECODING + log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) " +@@ -658,13 +662,13 @@ + { + if ( _needsParsing ) + { +- return av_parser_parse(_parser, _audioCodecCtx, ++ return av_parser_parse2(_parser, _audioCodecCtx, + // as of 2008-10-28 SVN, ffmpeg doesn't + // accept a pointer to pointer to const.. + const_cast(outFrame), + outFrameSize, + input, inputSize, +- 0, 0); // pts & dts ++ 0, 0, AV_NOPTS_VALUE); // pts & dts + } + else + { +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-10-31 17:25:51.210668136 +0100 +@@ -46,8 +46,10 @@ + { + if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) { + if ( ! _context ) { +- _context = audio_resample_init( +- 2, ctx->channels, 44100, ctx->sample_rate ++ _context = av_audio_resample_init( ++ 2, ctx->channels, 44100, ctx->sample_rate, ++ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, ++ 16, 10, 0, 0.8 + ); + } + +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-10-31 17:25:57.720728522 +0100 +@@ -387,7 +387,7 @@ + + log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d", + _inputFmt->name, _formatCtx->nb_streams); +- ++ /* + if ( _formatCtx->title[0] ) + log_debug(_(" Title:'%s'"), _formatCtx->title); + if ( _formatCtx->author[0] ) +@@ -398,7 +398,7 @@ + log_debug(_(" Comment:'%s'"), _formatCtx->comment); + if ( _formatCtx->album[0] ) + log_debug(_(" Album:'%s'"), _formatCtx->album); +- ++ */ + // Find first audio and video stream + for (unsigned int i = 0; i < static_cast(_formatCtx->nb_streams); i++) + { +@@ -415,7 +415,7 @@ + } + + switch (enc->codec_type) { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + if (_audioStreamIndex < 0) { + _audioStreamIndex = i; + _audioStream = _formatCtx->streams[i]; +@@ -425,7 +425,7 @@ + } + break; + +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + if (_videoStreamIndex < 0) { + _videoStreamIndex = i; + _videoStream = _formatCtx->streams[i]; +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-10-31 17:25:54.590699488 +0100 +@@ -356,8 +356,12 @@ + + int bytes = 0; + // no idea why avcodec_decode_video wants a non-const input... +- avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes, +- input, input_size); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = input_size; ++ avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes, ++ &pkt); + + if (!bytes) { + log_error("Decoding of a video frame failed"); +diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4 +--- gnash-0.8.9/macros/ffmpeg.m4 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/macros/ffmpeg.m4 2011-10-31 17:25:49.700654130 +0100 +@@ -22,6 +22,7 @@ + backupLIBS="$LIBS" + backupCFLAGS="$CFLAGS" + avcodec_h="" ++ avcodec_version_h="" + ffmpeg_top_incl="" + + dnl If the user specify an path to include headers from, we assume it's the full +@@ -46,6 +47,9 @@ + else + AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header]) + fi ++ if test -f ${with_ffmpeg_incl}/version.h; then ++ avcodec_version_h=${with_ffmpeg_incl}/version.h ++ fi + fi + ]) + +@@ -66,6 +70,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`" + avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h" ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -83,6 +90,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`" + avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -182,14 +192,24 @@ + dnl a modified form of grepping may be better, making sure all old kinds of + dnl version numbering fail gracefully. + ++ versionfile="" ++ + dnl Check avcodec version number, if it was found +- if test x"${avcodec_h}" != x; then ++ if test x"${avcodec_version_h}" != x; then ++ versionfile=${avcodec_version_h} ++ else ++ if test x"${avcodec_h}" != x; then ++ versionfile=${avcodec_h} ++ fi ++ fi ++ ++ if test x"${versionfile}" != x; then + + AC_MSG_CHECKING([ffmpeg version]) + +- ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"` + + if test x"${ffmpeg_major_version}" != x ; then + +@@ -198,15 +218,15 @@ + else + + dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1 +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"` + + if test x"${ffmpeg_version}" = x ; then + + dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` + + if test x"${ffmpeg_version}" = x ; then +- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'` + fi + fi + diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/community-staging/gnash/gnash-gtk.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/gnash/nodebug.patch b/community-staging/gnash/nodebug.patch new file mode 100644 index 000000000..ca160b898 --- /dev/null +++ b/community-staging/gnash/nodebug.patch @@ -0,0 +1,48 @@ +diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h +--- gnash-0.8.9/libbase/log.h 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-nodebug/libbase/log.h 2012-01-18 09:39:02.004103494 +0100 +@@ -331,27 +331,27 @@ + + // Define to 0 to completely remove parse debugging at compile-time + #ifndef VERBOSE_PARSE +-#define VERBOSE_PARSE 1 ++#define VERBOSE_PARSE 0 + #endif + + // Define to 0 to completely remove action debugging at compile-time + #ifndef VERBOSE_ACTION +-#define VERBOSE_ACTION 1 ++#define VERBOSE_ACTION 0 + #endif + + // Define to 0 to remove ActionScript errors verbosity at compile-time + #ifndef VERBOSE_ASCODING_ERRORS +-#define VERBOSE_ASCODING_ERRORS 1 ++#define VERBOSE_ASCODING_ERRORS 0 + #endif + + // Define to 0 this to remove invalid SWF verbosity at compile-time + #ifndef VERBOSE_MALFORMED_SWF +-#define VERBOSE_MALFORMED_SWF 1 ++#define VERBOSE_MALFORMED_SWF 0 + #endif + + // Define to 0 this to remove Networking verbosity at compile-time + #ifndef VERBOSE_NETWORKING +-#define VERBOSE_NETWORKING 1 ++#define VERBOSE_NETWORKING 0 + #endif + + #if VERBOSE_PARSE +diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp +--- gnash-0.8.9/libcore/vm/ActionExec.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp 2012-01-18 09:40:25.653458508 +0100 +@@ -46,7 +46,7 @@ + // too much information for my tastes. I really want just + // to see how stack changes while executing actions... + // --strk Fri Jun 30 02:28:46 CEST 2006 +-# define DEBUG_STACK 1 ++//# define DEBUG_STACK 1 + + // Max number of stack item to dump. 0 for unlimited. + # define STACK_DUMP_LIMIT 32 diff --git a/community-staging/gnash/xul8.patch b/community-staging/gnash/xul8.patch new file mode 100644 index 000000000..7bd708b2d --- /dev/null +++ b/community-staging/gnash/xul8.patch @@ -0,0 +1,44 @@ +diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp +--- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-11-18 16:25:55.198007371 +0100 +@@ -238,7 +238,7 @@ + return NS_PluginInitialize(); + } + +-char * ++const char * + NP_GetMIMEDescription(void) + { + return NPP_GetMIMEDescription(); +diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp +--- gnash-0.8.9/plugin/npapi/plugin.cpp 2011-03-18 14:44:30.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp 2011-11-18 16:35:42.496794816 +0100 +@@ -128,10 +128,10 @@ + } + + /// \brief Return the MIME Type description for this plugin. +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- return const_cast(MIME_TYPES_DESCRIPTION); ++ return MIME_TYPES_DESCRIPTION; + } + + static bool waitforgdb = false; +diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp +--- gnash-0.8.9/plugin/npapi/test.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/test.cpp 2011-11-18 16:37:06.997539299 +0100 +@@ -408,10 +408,10 @@ + { + } + +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- char *x = 0; ++ const char *x = 0; + return x; + } + diff --git a/community-staging/netsurf/PKGBUILD b/community-staging/netsurf/PKGBUILD new file mode 100644 index 000000000..b43fdcdfb --- /dev/null +++ b/community-staging/netsurf/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 62700 2012-01-24 21:17:57Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Paulo Matias +# Contributor: Georgij Kondratjev +# Contributor: Daniel J Griffiths +pkgname=netsurf +pkgver=2.8 +pkgrel=3 +pkgdesc="Lightweight and fast web browser" +arch=('x86_64' 'i686') +url="http://www.netsurf-browser.org/" +license=('GPL') +depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub') +makedepends=('re2c' 'lcms') +provides=('netsurf') +conflicts=('netsurf') +install=netsurf.install +source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" + "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz" + "$pkgname.desktop") +md5sums=('4f28912e5df4b826b819e175265bcc9c' + '49c41f281f3e9ca28a24da505fad2e3a' + '85e0af265e77607596fd90db9ac707ad') + +build() { + cd "$srcdir/$pkgname" + + sed 's:libpng:libpng15:' -i gtk/Makefile.target + sed 's:libpng:libpng15:' -i monkey/Makefile.target + make PREFIX=/usr TARGET=gtk +} + +package() { + cd "$srcdir/$pkgname" + + make install PREFIX=/usr DESTDIR="$pkgdir" + install -Dm644 "../$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "../$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/netsurf/PKGBUILD.wip b/community-staging/netsurf/PKGBUILD.wip new file mode 100644 index 000000000..592ca0268 --- /dev/null +++ b/community-staging/netsurf/PKGBUILD.wip @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 62434 2012-01-20 02:23:51Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Paulo Matias +# Contributor: Georgij Kondratjev +# Contributor: Daniel J Griffiths +pkgname=netsurf +pkgver=2.8 +pkgrel=3 +pkgdesc="Lightweight and fast web browser" +arch=('x86_64' 'i686') +url="http://www.netsurf-browser.org/" +license=('GPL') +depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub' 'libpng') +makedepends=('re2c' 'lcms' 'setconf') +provides=('netsurf') +conflicts=('netsurf') +install=netsurf.install +source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" + "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz" + "$pkgname.desktop") +md5sums=('4f28912e5df4b826b819e175265bcc9c' + '49c41f281f3e9ca28a24da505fad2e3a' + '85e0af265e77607596fd90db9ac707ad') + +build() { + cd "$srcdir/$pkgname" + + #sed 's:libpng:libpng15:' -i gtk/Makefile.target + #setconf Makefile.defaults NETSURF_USE_PNG NO + #setconf Makefile.defaults NETSURF_USE_RSVG NO + #setconf Makefile.defaults NETSURF_USE_MNG NO + #setconf Makefile.defaults NETSURF_USE_BMP NO + #setconf Makefile.defaults NETSURF_USE_GIF NO + #setconf Makefile.defaults NETSURF_USE_JPEG NO + + #setconf gtk/Makefile.target NETSURF_FEATURE_RSVG_CFLAGS "-DWITH_RSVG -pthread -lrsvg-2 -lgio-2.0 -lgdk_pixbuf-2.0 -lcairo -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -pthread -I/usr/include/librsvg-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/cairo -I/usr/include/libpng -I/usr/include/pixman-1 -I/usr/include/freetype2" + #sed 's:$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG)):#:' -i gtk/Makefile.target + + setconf Makefile.defaults CFLAGS "-lm" + + #sed 's:$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):echo $(LDFLAGS)\n\t$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):' -i Makefile + + #LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk + LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk +} + +package() { + cd "$srcdir/$pkgname" + + make install PREFIX=/usr DESTDIR="$pkgdir" + install -Dm644 "../$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "../$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/netsurf/netsurf.desktop b/community-staging/netsurf/netsurf.desktop new file mode 100644 index 000000000..aca4deefc --- /dev/null +++ b/community-staging/netsurf/netsurf.desktop @@ -0,0 +1,127 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=Netsurf +Name[ar]=صافي تصفح +Name[ast]=Netsurf +Name[ca]=Netsurf +Name[cs]=Netsurf +Name[da]=Netsurf +Name[de]=Netsurf +Name[el]=καθαρού σερφ +Name[en_GB]=Netsurf +Name[es]=Netsurf +Name[et]=Netsurf +Name[fi]=Netsurf +Name[fr]=Netsurf +Name[gl]=Netsurf +Name[he]=Netsurf +Name[hr]=Netsurf +Name[hu]=Netsurf +Name[id]=Netsurf +Name[it]=Netsurf +Name[ja]=Netsurf +Name[ko]=인터넷 서핑 +Name[lt]=Netsurf +Name[nl]=Netsurf +Name[no]=Netsurf +Name[pl]=Netsurf +Name[pt]=Netsurf +Name[pt_BR]=Netsurf +Name[ro]=Netsurf +Name[ru]=Netsurf +Name[sk]=Netsurf +Name[sr]=нетсурф +Name[sr@latin]=Netsurf +Name[sv]=Netsurf +Name[tr]=Netsurf +Name[ug]=Netsurf +Name[uk]=Інтернет серфінгу +Name[zh_CN]=Netsurf 网冲浪 +Name[zh_TW]=Netsurf 網衝浪 +GenericName=Web Browser +GenericName[ar]=متصفح الوب +GenericName[ast]=Restolador +GenericName[ca]=Navegador web +GenericName[cs]=Internetový prohlížeč +GenericName[da]=Webbrowser +GenericName[de]=Internetbetrachter +GenericName[el]=Περιηγητής Ιστού +GenericName[en_GB]=Web Browser +GenericName[es]=Navegador web +GenericName[et]=Veebibrauser +GenericName[fi]=Verkkoselain +GenericName[fr]=Navigateur Internet +GenericName[gl]=Navegador web +GenericName[he]=דפדפן +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[id]=Peramban Web +GenericName[it]=Browser web +GenericName[ja]=ウェブブラウザ +GenericName[ko]=웹 브라우저 +GenericName[lt]=Interneto naršyklė +GenericName[nl]=Webbrowser +GenericName[no]=Nettleser +GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ +GenericName[pl]=Przeglądarka internetowa +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador web +GenericName[ro]=Navigator web +GenericName[ru]=Интернет-обозреватель +GenericName[sk]=Internetový prehliadač +GenericName[sr]=Интернет прегледник +GenericName[sr@latin]=Internet preglednik +GenericName[sv]=Webbläsare +GenericName[tr]=Web Tarayıcı +GenericName[ug]=توركۆرگۈ +GenericName[uk]=Переглядач Веб +GenericName[zh_CN]=网页浏览器 +GenericName[zh_TW]=網頁瀏覽器 +Comment=Lightweight web browser +Comment[ar]=منصفح الوب الخفيف +Comment[ast]=Restolador llixeru +Comment[ca]=Navegador web lleuger +Comment[cs]=Odlehčený prohlížeč +Comment[da]=Letvægtig webbrowser +Comment[de]=Schlanker Internetbetrachter +Comment[el]=Ελαφρύς περιηγητής ιστού +Comment[en_GB]=Lightweight web browser +Comment[es]=Navegador web ligero +Comment[et]=Kergekaaluline veebibrauser +Comment[fi]=Kevyt verkkoselain +Comment[fr]=Navigateur Internet léger +Comment[gl]=Navegador web lixeiro +Comment[he]=דפדפן קל משקל +Comment[hr]=Lagani web preglednik +Comment[hu]=Könnyűsúlyú webböngésző +Comment[id]=Peramban web ringan +Comment[it]=Browser web leggero +Comment[ja]=軽量級ウェブブラウザ +Comment[ko]=가벼운 웹 브라우저 +Comment[lt]=Paprasta interneto naršyklė +Comment[nl]=Lichtgewicht webbrowser +Comment[no]=Lettvektig nettleser +Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ +Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej +Comment[pt]=Navegador Web rápido +Comment[pt_BR]=Navegador web leve +Comment[ro]=Mic navigator web +Comment[ru]=Легковесный Интернет-обозреватель +Comment[sk]=Ľahký internetový prehliadač +Comment[sr]=Једноставан Интернет прегледник +Comment[sr@latin]=Jednostavan Internet preglednik +Comment[sv]=Resurssnål webbläsare +Comment[tr]=Hafif web tarayıcı +Comment[ug]=يېنىك توركۆرگۈ +Comment[uk]=Легкий переглядач Веб +Comment[zh_CN]=轻量级网页浏览器 +Comment[zh_TW]=輕量級網頁瀏覽器 +Categories=GTK;Network;WebBrowser; +MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo; +Exec=netsurf %U +Icon=netsurf +Terminal=false +StartupNotify=true +X-Osso-Type=application/x-executable +X-Osso-Service=netsurf diff --git a/community-staging/netsurf/netsurf.install b/community-staging/netsurf/netsurf.install new file mode 100644 index 000000000..966f361ea --- /dev/null +++ b/community-staging/netsurf/netsurf.install @@ -0,0 +1,15 @@ +post_upgrade() { + echo "Updating icon cache" + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + echo "Updating mime entries" + update-desktop-database -q +} +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 704b9ea0c..770d47ef4 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 55877 2011-09-24 16:48:18Z stephane $ +# $Id: PKGBUILD 62687 2012-01-24 14:37:57Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Juergen Hoetzel # Contributor: William Rea , # Contributor: Bjorn Lindeijer pkgname=cegui -pkgver=0.7.5 -pkgrel=5 +pkgver=0.7.6 +pkgrel=1 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" @@ -15,7 +15,8 @@ license=("MIT") depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') makedepends=('python2' 'doxygen') source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) -md5sums=('38c79d1fdfaaa10f481c99a2ac479516') +options=(!libtool) +md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3') build() { cd $srcdir/CEGUI-${pkgver} diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 11fe6c362..7c3836f47 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59260 2011-11-22 06:42:34Z spupykin $ +# $Id: PKGBUILD 62677 2012-01-24 12:51:51Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Norberto Lopes # Contributor: Kao Dome @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock pkgname=libmicrohttpd -pkgver=0.9.17 +pkgver=0.9.18 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('d6802049c806e903ef1fa9c5b847e555') +md5sums=('af0f282b92413f414cb6daf2d2f618c7') build() { cd ${pkgname}-${pkgver} diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index d85d74344..33cb3d7c6 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jan "heftig" Steffens pkgname=lightspark -pkgver=0.5.3 -pkgrel=2 +pkgver=0.5.4 +pkgrel=1 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64') url='http://lightspark.sourceforge.net' @@ -15,12 +15,12 @@ optdepends=('gnash-gtk: fallback support') install="lightspark.install" source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz" 'llvm29.diff') -md5sums=('2d4519c61aabc34cbba97120f5c01d18' +md5sums=('1101e1d1cb1b55b84b9214ef02217ec3' '5f717d1d9ead478184ca68f6ac068099') build() { - cd lightspark-${pkgver} - patch -Np0 -i ${srcdir}/llvm29.diff + #cd lightspark-${pkgver} + #patch -Np0 -i ${srcdir}/llvm29.diff cd ${srcdir} rm -rf build diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 3fbd4d977..6df58d747 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62066 2012-01-15 14:56:57Z svenstaro $ +# $Id: PKGBUILD 62705 2012-01-24 21:51:26Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Larry Hajali pkgname=megaglest -pkgver=3.6.0.2 +pkgver=3.6.0.3 pkgrel=1 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' ' 'libircclient' 'miniupnpc' 'wxgtk') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('9d840a04b41aef2cba503de7bf433b8d') +md5sums=('e939cbbb85c35e66c67ec2aa6f6b7f0b') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index ae678386f..31dae918c 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 59154 2011-11-21 12:39:37Z spupykin $ +# $Id: PKGBUILD 62679 2012-01-24 12:52:57Z spupykin $ # Maintainer: Sergej Pupykin pkgname=miredo -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="Teredo client and server." arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2 miredo.install miredo.rc.d miredo-server.rc.d) -md5sums=('6ba484ad5e331514a8a3452da2b144e7' +md5sums=('1281e7e75bddbde244cd778d99fa22d4' '51ab6d091192605ee9206944869cb2ab' 'd1b655d7a851cdb46c91c3418ed1962f' 'c5a9be5c3175fecec387f1710bfd2788' diff --git a/community/portmidi/PKGBUILD b/community/portmidi/PKGBUILD index 255c2e077..a513305dc 100644 --- a/community/portmidi/PKGBUILD +++ b/community/portmidi/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 31348 2010-10-30 15:46:33Z lfleischer $ +# $Id: PKGBUILD 62694 2012-01-24 20:35:44Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: SpepS # Contributor: Denis Martinez pkgname=portmidi pkgver=217 -pkgrel=2 +pkgrel=3 pkgdesc="Platform independent library for real-time MIDI input/output." arch=('i686' 'x86_64') url='http://portmedia.sourceforge.net/' license=('GPL') depends=('alsa-lib') makedepends=('cmake' 'java-environment') -source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip") -md5sums=('03f46fd3947e2ef4c8c465baaf832241') +source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip" + 'portmidi-217-build-fix.patch') +md5sums=('03f46fd3947e2ef4c8c465baaf832241' + '59cb428b29a33bab3bb5811cda479a9b') build() { cd "${srcdir}/${pkgname}" @@ -21,6 +23,9 @@ build() { sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py mkdir -p pm_java/Release + # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118) + patch -p1 -i ../portmidi-217-build-fix.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \ diff --git a/community/portmidi/portmidi-217-build-fix.patch b/community/portmidi/portmidi-217-build-fix.patch new file mode 100644 index 000000000..3e2dfef29 --- /dev/null +++ b/community/portmidi/portmidi-217-build-fix.patch @@ -0,0 +1,29 @@ +diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt +--- portmidi.orig/pm_java/CMakeLists.txt 2009-11-04 16:20:44.000000000 +0100 ++++ portmidi/pm_java/CMakeLists.txt 2012-01-24 21:13:08.513182169 +0100 +@@ -15,13 +15,11 @@ if(UNIX) + add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class + COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java + MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java +- DEPENDS pmdefaults/PmDefaults.java +- WORKING_DIRECTORY pm_java) ++ DEPENDS pmdefaults/PmDefaults.java) + add_custom_command(OUTPUT pmdefaults/PmDefaults.class + COMMAND javac -classpath . pmdefaults/PmDefaults.java + MAIN_DEPENDENCY pmdefaults/PmDefaults.java +- DEPENDS pmdefaults/PmDefaultsFrame.java +- WORKING_DIRECTORY pm_java) ++ DEPENDS pmdefaults/PmDefaultsFrame.java) + add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar + COMMAND cp pmdefaults/portmusic_logo.png . + COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar +@@ -31,8 +29,7 @@ if(UNIX) + COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} + COMMAND rm portmusic_logo.png + MAIN_DEPENDENCY pmdefaults/PmDefaults.class +- DEPENDS ${PMDEFAULTS_ALL_CLASSES} +- WORKING_DIRECTORY pm_java) ++ DEPENDS ${PMDEFAULTS_ALL_CLASSES}) + add_custom_target(pmdefaults_target ALL + DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) + # message(STATUS "add_custom_target: pmdefaults.jar") diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 272fa4291..c3d982595 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61097 2011-12-21 20:52:48Z andrea $ +# $Id: PKGBUILD 62685 2012-01-24 13:11:44Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Larry Hajali pkgname=sigil -pkgver=0.4.2 -pkgrel=3 +pkgver=0.5.0 +pkgrel=1 pkgdesc="A WYSIWYG ebook editor" arch=('i686' 'x86_64') url="http://code.google.com/p/sigil/" @@ -14,7 +14,7 @@ makedepends=('cmake') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip" "${pkgname}.desktop") -md5sums=('ce27976254236f8b11b787fd05be9acb' +md5sums=('8deb8ae451d485698ab9330dccfe46e5' 'fef6aa492af487ccccd6b133635cee5a') build() { @@ -28,7 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON .. - make + make } package() { diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD index c2c1efe37..560d82af7 100644 --- a/community/tmux/PKGBUILD +++ b/community/tmux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51497 2011-07-10 19:49:12Z spupykin $ +# $Id: PKGBUILD 62681 2012-01-24 12:53:39Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: TDY # Contributor: Grigorios Bouzakis pkgname=tmux -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="A terminal multiplexer" url="http://tmux.sourceforge.net/" @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses' 'libevent') source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz LICENSE) -md5sums=('3d4b683572af34e83bc8b183a8285263' +md5sums=('3e37db24aa596bf108a0442a81c845b3' '71601bc37fa44e4395580b321963018e') build() { diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 97712e104..773c4e06e 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 144041 2011-12-02 20:54:07Z ibiru $ +# $Id: PKGBUILD 147227 2012-01-24 20:32:45Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=akonadi -pkgver=1.6.2 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') url='http://pim.kde.org/akonadi' @@ -13,7 +13,7 @@ depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('07e2aa2e6953ac518f9306911747e264') +md5sums=('804309dca70ede35b4a654ab764e9079') build() { cd "${srcdir}" diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD index dcde4e180..bcd412b82 100644 --- a/extra/python-egenix-mx-base/PKGBUILD +++ b/extra/python-egenix-mx-base/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 140254 2011-10-11 00:44:55Z stephane $ +# $Id: PKGBUILD 147244 2012-01-25 02:07:03Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: Douglas Soares de Andrade pkgname=python-egenix-mx-base _origname=egenix-mx-base -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="A collection of Python tools" arch=('i686' 'x86_64') license=('custom') url="http://www.egenix.com/products/python/mxBase/" depends=('python2') -makedepends=('python2-distribute') replaces=('egenix-mx-base') provides=('egenix-mx-base') source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz") -sha1sums=('a82f7f155ea92f26f40a6a3bf9160bfac7c52a00') +sha1sums=('9faaf608a29b80d9a8daf16b8b3578e896b6395b') build() { cd "${srcdir}/${_origname}-${pkgver}" diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD index 8bd7c546b..b72402f4a 100644 --- a/extra/qwtplot3d/PKGBUILD +++ b/extra/qwtplot3d/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 131790 2011-07-15 09:16:14Z ronald $ -# Maintainer: damir +# $Id: PKGBUILD 147208 2012-01-24 18:38:05Z ronald $ +# Maintainer: Ronald van Haren +# Contributor: damir pkgname=qwtplot3d pkgver=0.2.7 -pkgrel=3 +pkgrel=4 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets" arch=("i686" "x86_64") license=('custom:zlib') url="http://qwtplot3d.sourceforge.net/" depends=('qt' 'qwt' 'mesa') source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz" - qwtplot3d-gcc44.patch) -sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215') + qwtplot3d-gcc44.patch qwtplot3d-qt-4.8.0.patch) +sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' + '52fa169b651a98550f8a8391ddf52e0eaeb2c215' + '8dcafdc9753b0f2eeea2f1e96efa6e8d3d956005') build() { cd ${srcdir}/${pkgname} patch -p1 < ../qwtplot3d-gcc44.patch + patch -p1 < ../qwtplot3d-qt-4.8.0.patch # build qwt: qmake qwtplot3d.pro diff --git a/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch new file mode 100644 index 000000000..ae10f48f0 --- /dev/null +++ b/extra/qwtplot3d/qwtplot3d-qt-4.8.0.patch @@ -0,0 +1,34 @@ +diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io_gl2ps.h +--- qwtplot3d/include/qwt3d_io_gl2ps.h 2005-07-10 16:54:52.000000000 +0300 ++++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h 2012-01-21 22:15:20.000000000 +0200 +@@ -2,12 +2,7 @@ + #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code + + #include +- +-#if QT_VERSION < 0x040000 +-#include +-#else +-#include +-#endif ++#include + + #include "qwt3d_types.h" + #include "qwt3d_io.h" +diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h +--- qwtplot3d/include/qwt3d_openglhelper.h 2005-07-19 17:40:28.000000000 +0300 ++++ qwtplot3d.patched/include/qwt3d_openglhelper.h 2012-01-21 22:29:56.000000000 +0200 +@@ -2,11 +2,8 @@ + #define __openglhelper_2003_06_06_15_49__ + + #include "qglobal.h" +-#if QT_VERSION < 0x040000 +-#include +-#else +-#include +-#endif ++#include ++#include + + namespace Qwt3D + { diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD index 8b1a81e6e..3bd8b4197 100644 --- a/extra/time/PKGBUILD +++ b/extra/time/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 131069 2011-07-10 01:00:33Z stephane $ +# $Id: PKGBUILD 147242 2012-01-25 01:42:55Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: Daniel J Griffiths # Contributor: damir pkgname=time pkgver=1.7 -pkgrel=5 +pkgrel=6 pkgdesc="Utility for monitoring a program's use of system resources" arch=('i686' 'x86_64') url="http://www.gnu.org/directory/time.html" diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 68fe8b673..fe0e79220 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -9,6 +9,7 @@ license=('GPL3') groups=('base') install=${pkgname}.install source=(https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt) +md5sums=('3f67515fda1c9b4e4d1a988d3c03bb9a') build() { cd ${srcdir} @@ -23,4 +24,3 @@ package() { sort -u )) } -md5sums=('980d8ab2f9886d648a700a7a909488d9') diff --git a/multilib-staging/lib32-libcanberra/PKGBUILD b/multilib-staging/lib32-libcanberra/PKGBUILD new file mode 100644 index 000000000..eecaeabfb --- /dev/null +++ b/multilib-staging/lib32-libcanberra/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 62699 2012-01-24 21:00:53Z heftig $ +# Maintainer: Florian Pritz +# Contributor: Jan de Groot + +_pkgbasename=libcanberra +pkgbase=lib32-$_pkgbasename +pkgname=(lib32-libcanberra lib32-libcanberra-pulse) +pkgver=0.28 +pkgrel=2 +pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)" +arch=(x86_64) +license=('LGPL') +depends=('lib32-libvorbis' 'lib32-libtool' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-tdb' + $_pkgbasename) +makedepends=('gtk-doc' lib32-libpulse gcc-multilib libtool-multilib) +options=(!emptydirs) +url=http://0pointer.de/lennart/projects/libcanberra +source=("$url/$_pkgbasename-$pkgver.tar.gz") +md5sums=('c198b4811598c4c161ff505e4531b02c') + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ + --disable-static --with-builtin=dso --enable-null --disable-oss \ + --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \ + --libdir=/usr/lib32 + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_lib32-libcanberra() { + optdepends=("$pkgbase-pulse: PulseAudio driver") + + cd "$srcdir/$_pkgbasename-$pkgver" + + make -j1 DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/lib32/libcanberra-gtk.la" + rm -f "${pkgdir}/usr/lib32/gtk-2.0/modules/"*.la + + + # Split libcanberra-pulse + mkdir pulse-plugin + mv "${pkgdir}"/usr/lib32/${_pkgbasename}-${pkgver}/${_pkgbasename}-pulse.* pulse-plugin + + rm -rf "${pkgdir}"/{etc,usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}} +} + +package_lib32-libcanberra-pulse() { + pkgdesc="PulseAudio plugin for libcanberra (32-bit)" + depends=("$pkgbase=$pkgver-$pkgrel" 'lib32-libpulse') + + cd "$srcdir/$_pkgbasename-$pkgver" + + mkdir -p "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" + mv pulse-plugin/* "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" +} diff --git a/multilib/lib32-sdl/PKGBUILD b/multilib/lib32-sdl/PKGBUILD index 51eda45e5..a4520d40f 100644 --- a/multilib/lib32-sdl/PKGBUILD +++ b/multilib/lib32-sdl/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 33692 2010-11-27 16:54:21Z heftig $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 62690 2012-01-24 18:20:52Z bluewind $ +# Maintainer: Jan "heftig" Steffens +# Contributor: Allan McRae # Contributor: dorphell _pkgbasename=sdl pkgname=lib32-$_pkgbasename -pkgver=1.2.14 -pkgrel=8 +pkgver=1.2.15 +pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)" arch=('x86_64') url="http://www.libsdl.org" @@ -14,13 +15,9 @@ depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-joystick-crash.diff - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-fix-disappearing-cursor.patch) -md5sums=('e52086d1b508fa0b76c52ee30b55bec4' - '9d8890b3817736a5d365f7497f096634' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'a6cf3e71b653aa97d0d8ae6c0a789807') + sdl-1.2.14-fix-mouse-clicking.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' + '04d8c179f125e04bcd4c9d60e013c2d7') build() { export CC="gcc -m32" @@ -28,11 +25,9 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch ./configure --prefix=/usr --disable-nasm --enable-alsa \ - --with-x --disable-rpath --libdir=/usr/lib32 + --with-x --disable-rpath --libdir=/usr/lib32 --disable-static make } diff --git a/staging/evince/PKGBUILD b/staging/evince/PKGBUILD new file mode 100644 index 000000000..3920b1772 --- /dev/null +++ b/staging/evince/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 147248 2012-01-25 02:33:36Z eric $ +# Maintainer: Jan de Groot + +pkgname=evince +pkgver=3.2.1 +pkgrel=3 +pkgdesc="Simply a document viewer" +url="http://projects.gnome.org/evince/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') +optdepends=('texlive-bin: DVI support') +groups=('gnome-extra') +install=evince.install +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/evince \ + --disable-static --enable-nautilus \ + --enable-pdf --enable-tiff \ + --enable-djvu --enable-dvi \ + --enable-t1lib --enable-comics \ + --disable-scrollkeeper --disable-schemas-compile \ + --enable-introspection + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/evince/evince.install b/staging/evince/evince.install new file mode 100644 index 000000000..9643a9ba0 --- /dev/null +++ b/staging/evince/evince.install @@ -0,0 +1,19 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall evince + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/glade-perl/PKGBUILD b/staging/glade-perl/PKGBUILD new file mode 100644 index 000000000..47a027b19 --- /dev/null +++ b/staging/glade-perl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147196 2012-01-24 05:13:43Z eric $ +# Maintainer: Jan de Groot + +pkgname=glade-perl +_realname=Gtk2-GladeXML +pkgver=1.007 +pkgrel=5 +pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" +arch=(i686 x86_64) +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('libglade' 'gtk2-perl' 'perl') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('e6ca234e2a9f0221263acd2a593c583b') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gnome-desktop2/PKGBUILD b/staging/gnome-desktop2/PKGBUILD new file mode 100644 index 000000000..130dbeaff --- /dev/null +++ b/staging/gnome-desktop2/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 147230 2012-01-24 20:46:21Z heftig $ +# Maintainer: Jan "heftig" Steffens +# Contributor: Jan de Groot + +_pkgname=gnome-desktop +pkgname=${_pkgname}2 +pkgver=2.32.1 +pkgrel=2 +pkgdesc="Library with common API for various GNOME modules (legacy version)" +arch=(i686 x86_64) +license=(GPL LGPL) +depends=(gconf gtk2 startup-notification) +makedepends=(gnome-doc-utils intltool) +url="http://www.gnome.org" +options=(!libtool !emptydirs) +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2) +sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-gnome-distributor="Archlinux" \ + --disable-scrollkeeper \ + --disable-gnome-about --disable-desktop-docs + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/gnome-python/PKGBUILD b/staging/gnome-python/PKGBUILD new file mode 100644 index 000000000..7e6fce33b --- /dev/null +++ b/staging/gnome-python/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 147212 2012-01-24 19:17:06Z eric $ +# Maintainer: Jan de Groot +# Contributor: Sarah Hay + +pkgbase=gnome-python +pkgname=('gnome-python' 'python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs') +pkgver=2.28.1 +pkgrel=8 +arch=(i686 x86_64) +license=('LGPL') +makedepends=('pygtk' 'pyorbit' 'libgnomeui') +options=('!libtool') +url="http://www.pygtk.org/" +source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.28/gnome-python-${pkgver}.tar.bz2) +sha256sums=('759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8') + +build() { + cd "${srcdir}/gnome-python-${pkgver}" + PYTHON=python2 ./configure --prefix=/usr + make +} + +package_gnome-python() { + pkgdesc="PyGNOME Python extension module" + depends=('python2-bonobo' 'python2-gconf' 'python2-libgnome' 'python2-gnomecanvas' 'python2-gnomevfs') + + cd "${srcdir}/gnome-python-${pkgver}" + make install-pkgconfigDATA DESTDIR="${pkgdir}" +} + +package_python2-bonobo(){ + pkgdesc="Python bindings for interacting with Bonobo" + depends=('pygtk' 'libbonoboui' 'pyorbit' 'python2-gnomecanvas') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C bonobo install DESTDIR="${pkgdir}" +} + +package_python2-gconf(){ + pkgdesc="Python bindings for interacting with GConf" + depends=('pygtk' 'gconf') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C gconf install DESTDIR="${pkgdir}" +} + +package_python2-libgnome() { + pkgdesc="Python bindings for libgnome" + depends=('pygtk' 'libgnomeui' 'python2-gnomevfs' 'python2-gnomecanvas' 'python2-bonobo') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C gnome install DESTDIR="${pkgdir}" +} + +package_python2-gnomecanvas() { + pkgdesc="Python bindings for the GNOME Canvas" + depends=('pygtk' 'libgnomecanvas') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C gnomecanvas install DESTDIR="${pkgdir}" +} + +package_python2-gnomevfs() { + pkgdesc="Python bindings for interacting with gnome-vfs" + depends=('python2' 'libbonobo' 'gnome-vfs') + + cd "${srcdir}/gnome-python-${pkgver}" + make -C gnomevfs install DESTDIR="${pkgdir}" +} diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD new file mode 100644 index 000000000..b2adc74f2 --- /dev/null +++ b/staging/inkscape/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 147200 2012-01-24 06:18:56Z bisson $ +# Contributor: tobias +# Contributor: Tobias Kieslich +# Maintainer: Gaetan Bisson + +pkgname=inkscape +pkgver=0.48.2 +pkgrel=6 +pkgdesc='Vector graphics editor using the SVG file format' +url='http://inkscape.sourceforge.net/' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +makedepends=('boost' 'pkg-config' 'intltool') +depends=('gc' 'gtkmm' 'poppler-glib' 'libxslt' 'gsl' 'popt' 'python2' + 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') +optdepends=('pstoedit: latex formulas' + 'texlive-core: latex formulas' + 'python2-numpy: some extensions' + 'python-lxml: some extensions and filters' + 'pyxml: some extensions' + 'uniconvertor: reading/writing to some proprietary formats') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'libpng15.patch') +sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3' + 'd6512f3cb38ca8e2436dc485aa652490d17b3a52') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py + sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py + sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp + sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py + sed -i 's|"python"|"python2"|g' src/main.cpp + + patch -p1 -i ../libpng15.patch + + ./configure --prefix=/usr \ + --with-python \ + --with-perl \ + --without-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/inkscape/install b/staging/inkscape/install new file mode 100644 index 000000000..6e803bf1d --- /dev/null +++ b/staging/inkscape/install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} diff --git a/staging/inkscape/libpng15.patch b/staging/inkscape/libpng15.patch new file mode 100644 index 000000000..e24913ed6 --- /dev/null +++ b/staging/inkscape/libpng15.patch @@ -0,0 +1,40 @@ +--- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp ++++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp +@@ -1443,7 +1443,7 @@ + return NULL; + } + // Set error handler +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return NULL; + } +--- inkscape-0.48.1/src/helper/png-write.cpp ++++ inkscape-0.48.1-mod//src/helper/png-write.cpp +@@ -165,7 +165,7 @@ + /* Set error handling. REQUIRED if you aren't supplying your own + * error hadnling functions in the png_create_write_struct() call. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file */ + fclose(fp); + png_destroy_write_struct(&png_ptr, &info_ptr); +--- inkscape-0.48.1/src/sp-image.cpp ++++ inkscape-0.48.1-mod//src/sp-image.cpp +@@ -386,9 +386,13 @@ + + #if defined(PNG_iCCP_SUPPORTED) + { +- char* name = 0; ++ png_charp name = 0; + int compression_type = 0; +- char* profile = 0; ++#if (PNG_LIBPNG_VER < 10500) ++ png_charp profile = 0; ++#else ++ png_bytep profile = 0; ++#endif + png_uint_32 proflen = 0; + if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { + // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/staging/lablgtk2/PKGBUILD b/staging/lablgtk2/PKGBUILD new file mode 100644 index 000000000..64af43ec5 --- /dev/null +++ b/staging/lablgtk2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 147254 2012-01-25 04:37:32Z eric $ +#Maintainer: Tobias Powalowski + +pkgname=lablgtk2 +pkgver=2.14.2 +pkgrel=5 +pkgdesc=" An Objective Caml interface to gtk2" +arch=(i686 x86_64) +license=('LGPL') +url="http://lablgtk.forge.ocamlcore.org/" +depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourceview2') +makedepends=('ocaml') +optdepends=('ocaml: for using the tools') +DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u') +source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz) +options=(!makeflags) +md5sums=('bad77680a72dab8b915cae99d1ec9b1f') + +build() { + cd "${srcdir}/lablgtk-${pkgver}" + ./configure --prefix=/usr + make world + make opt +} + +package() { + cd "${srcdir}/lablgtk-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/" +} diff --git a/staging/libbonoboui/PKGBUILD b/staging/libbonoboui/PKGBUILD new file mode 100644 index 000000000..e6c53e0ec --- /dev/null +++ b/staging/libbonoboui/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 147198 2012-01-24 05:15:13Z eric $ +# Maintainer: Jan de Groot + +pkgname=libbonoboui +pkgver=2.24.5 +pkgrel=2 +pkgdesc="User Interface library for Bonobo" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('libgnomecanvas' 'libgnome') +makedepends=('intltool' 'pkg-config') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/share/applications/bonobo-browser.desktop" +} diff --git a/staging/libgnomeui/PKGBUILD b/staging/libgnomeui/PKGBUILD new file mode 100644 index 000000000..1fd98234d --- /dev/null +++ b/staging/libgnomeui/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 147218 2012-01-24 19:35:41Z eric $ +# Maintainer: Jan de Groot + +pkgname=libgnomeui +pkgver=2.24.4 +pkgrel=2 +pkgdesc="User Interface library for GNOME" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('libbonoboui>=2.24.3' 'libgnome-keyring>=2.31.92' 'libsm') +makedepends=('intltool' 'pkg-config') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('a64dcb5af190ec0bfe2ba647ab09a90e4187336fa417d301abfb736be41283b2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/libgnomeui + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libgtkhtml/PKGBUILD b/staging/libgtkhtml/PKGBUILD new file mode 100644 index 000000000..15a82f102 --- /dev/null +++ b/staging/libgtkhtml/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147216 2012-01-24 19:34:31Z eric $ +# Maintainer: Jan de Groot + +pkgname=libgtkhtml +pkgver=2.11.1 +pkgrel=4 +pkgdesc="An HTML library for GTK" +arch=(i686 x86_64) +license=('LGPL') +depends=('gtk2>=2.22.1' 'libxml2>=2.7.8') +makedepends=('perlxml') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2) +md5sums=('a1d1a197dcff8c4571659deef5495e24') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/pygtksourceview2/PKGBUILD b/staging/pygtksourceview2/PKGBUILD new file mode 100644 index 000000000..794456360 --- /dev/null +++ b/staging/pygtksourceview2/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147214 2012-01-24 19:17:55Z eric $ +# Maintainer: Jan de Groot + +pkgname=pygtksourceview2 +pkgver=2.10.1 +pkgrel=4 +pkgdesc="Python bindings for gtksourceview2" +arch=(i686 x86_64) +license=('GPL') +depends=('gtksourceview2>=2.10.0' 'pygtk>=2.17.0') +makedepends=('intltool' 'pkg-config') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2) +sha256sums=('b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974') + +build() { + cd "${srcdir}/pygtksourceview-${pkgver}" + PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static --disable-docs + make +} + +package() { + cd "${srcdir}/pygtksourceview-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/sane/PKGBUILD b/staging/sane/PKGBUILD new file mode 100644 index 000000000..a5ea125be --- /dev/null +++ b/staging/sane/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 147246 2012-01-25 02:31:45Z eric $ +# Maintainer: Tobias Powalowski +# Contributor: Sarah Hay +# Contributor: Simo L. +# Contributor: eric + +pkgname=sane +pkgver=1.0.22 +pkgrel=5 +pkgdesc="Scanner Access Now Easy" +url="http://www.sane-project.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libieee1284' 'libusb-compat' 'v4l-utils' 'avahi' 'bash') +makedepends=('texlive-latexextra') +install=$pkgname.install +backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) +source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz + 'sane.xinetd' + 'libv4l-0.8.3.patch' + 'xerox_mfp_fix_usb_devices.patch') +md5sums=('fadf56a60f4776bfb24491f66b617cf5' + 'da946cc36fb83612162cf9505986d4b2' + 'e645a8921cff9f18ffbdabb2ed885060' + 'cfef73e7db7c28308914d3db6767d852') +options=(!libtool) + +build() { + cd "${srcdir}/${pkgname}-backends-${pkgver}" + + patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch + # fix https://bugs.archlinux.org/task/26114 + patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-docdir=/usr/share/doc/sane \ + --enable-avahi \ + --disable-locking + make +} + +package () { + cd "${srcdir}/${pkgname}-backends-${pkgver}" + make DESTDIR="${pkgdir}" install + # fix hp officejets + echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf" + # install udev files + install -D -m0644 tools/udev/libsane.rules \ + "${pkgdir}/lib/udev/rules.d/53-sane.rules" + # fix udev rules + sed -i 's|NAME="%k", ||g' "${pkgdir}/lib/udev/rules.d/53-sane.rules" + + # install xinetd file + install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" +} diff --git a/staging/sane/libv4l-0.8.3.patch b/staging/sane/libv4l-0.8.3.patch new file mode 100644 index 000000000..4e240e0cf --- /dev/null +++ b/staging/sane/libv4l-0.8.3.patch @@ -0,0 +1,64 @@ +From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen +Date: Mon, 14 Mar 2011 13:35:05 +0100 +Subject: [PATCH] patch: v4l + +Squashed commit of the following: + +commit 23381932c76846191b42a48e505b37cd74711265 +Author: Julien BLACHE +Date: Wed Feb 16 19:37:43 2011 +0100 + + Fix v4l build with libv4l 0.8.3+ + + (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953) + + Conflicts: + + ChangeLog + + Signed-off-by: Nils Philippsen +--- + backend/v4l.c | 3 +-- + backend/v4l.h | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/backend/v4l.c b/backend/v4l.c +index 6510ef0..38595ed 100644 +--- a/backend/v4l.c ++++ b/backend/v4l.c +@@ -84,9 +84,8 @@ + #include "../include/sane/sanei_config.h" + #define V4L_CONFIG_FILE "v4l.conf" + +-#include "v4l.h" +- + #include ++#include "v4l.h" + + static const SANE_Device **devlist = NULL; + static int num_devices; +diff --git a/backend/v4l.h b/backend/v4l.h +index 588b96e..6aee586 100644 +--- a/backend/v4l.h ++++ b/backend/v4l.h +@@ -29,6 +29,7 @@ + #ifndef v4l_h + #define v4l_h + ++#ifndef __LINUX_VIDEODEV_H + /* Kernel interface */ + /* Only the stuff we need. For more features, more defines are needed */ + +@@ -165,7 +166,7 @@ struct video_channel + + + /* end of kernel interface */ +- ++#endif /* !__LINUX_VIDEODEV_H */ + + #include <../include/sane/sane.h> + +-- +1.7.4 + diff --git a/staging/sane/sane.install b/staging/sane/sane.install new file mode 100644 index 000000000..5ec361eea --- /dev/null +++ b/staging/sane/sane.install @@ -0,0 +1,7 @@ +post_install() { + /bin/cat < +Date: Tue Mar 8 17:57:19 2011 +0300 + + keep usb device by default (correct for bug introduced by tcp sub-backend + +diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c +index e08b50f..d4672a7 100644 +--- a/backend/xerox_mfp.c ++++ b/backend/xerox_mfp.c +@@ -37,10 +37,10 @@ + static const SANE_Device **devlist = NULL; /* sane_get_devices array */ + static struct device *devices_head = NULL; /* sane_get_devices list */ + +-transport available_transports[] = { ++enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX }; ++transport available_transports[TRANSPORTS_MAX] = { + { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device }, + { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device }, +- { 0 } + }; + + static int resolv_state(int state) +@@ -824,7 +824,13 @@ free_devices (void) + devices_head = NULL; + } + +-/* SANE API ignores return code of this callback */ ++static transport *tr_from_devname(SANE_String_Const devname) ++{ ++ if (strncmp("tcp", devname, 3) == 0) ++ return &available_transports[TRANSPORT_TCP]; ++ return &available_transports[TRANSPORT_USB]; ++} ++ + static SANE_Status + list_one_device (SANE_String_Const devname) + { +@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname) + return SANE_STATUS_GOOD; + } + +- for (tr = available_transports; tr->ttype; tr++) { +- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) +- break; +- } +- if (!tr->ttype) +- return SANE_STATUS_INVAL; ++ tr = tr_from_devname(devname); + + dev = calloc (1, sizeof (struct device)); + if (dev == NULL) +@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname) + static SANE_Status + list_conf_devices (UNUSED (SANEI_Config * config), const char *devname) + { +- transport *tr; +- +- for (tr = available_transports; tr->ttype; tr++) { +- if (!strncmp (devname, tr->ttype, strlen(tr->ttype))) +- return tr->configure_device(devname, list_one_device); +- } +- return SANE_STATUS_INVAL; ++ return tr_from_devname(devname)->configure_device(devname, list_one_device); + } + + SANE_Status diff --git a/staging/sdl_image/PKGBUILD b/staging/sdl_image/PKGBUILD new file mode 100644 index 000000000..b42e26880 --- /dev/null +++ b/staging/sdl_image/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 147224 2012-01-24 20:21:56Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae +# Contributor: Tom Newsom + +pkgname=sdl_image +pkgver=1.2.12 +pkgrel=2 +pkgdesc="A simple library to load images of various formats as SDL surfaces" +arch=('i686' 'x86_64') +license=('custom') +depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib') +options=('!libtool') +url="http://www.libsdl.org/projects/SDL_image/" +source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz) +md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') + +build() { + cd "$srcdir/SDL_image-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/SDL_image-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/staging/tracker/PKGBUILD b/staging/tracker/PKGBUILD new file mode 100644 index 000000000..6de2cd899 --- /dev/null +++ b/staging/tracker/PKGBUILD @@ -0,0 +1,84 @@ +# $Id: PKGBUILD 147228 2012-01-24 20:33:45Z heftig $ +# Maintainer: Jan "heftig" Steffens +# Contributor: Sergej Pupykin +# Contributor: Alexander Fehr + +pkgbase=tracker +pkgname=(tracker libtracker-sparql) +pkgver=0.12.9 +_tver=${pkgver%.*} +pkgrel=2 +pkgdesc="All-in-one indexer, search tool and metadata database" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' + 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' + 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' + 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' + 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala') +url="http://www.gnome.org" +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) +sha256sums=('ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/tracker \ + --disable-unit-tests \ + --enable-libflac \ + --enable-libvorbis + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_tracker() { + depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' + 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' + 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('giflib: extractor for GIF data' + 'gstreamer0.10-base: video extractor' + 'totem-plparser: playlist support' + 'nautilus: nautilus-extension' + 'libvorbis: Vorbis metadata extractor' + 'flac: FLAC metadata extractor' + 'taglib: writeback for audio files' + 'gnome-panel: tracker-search-bar') + groups=('gnome-extra') + install=tracker.install + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + +### Split libtracker-sparql + + mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver + mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig} + mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi} + + mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib" + + mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \ + "$srcdir/sparql/usr/lib/tracker-$_tver" + + mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \ + "$srcdir/sparql/usr/share/vala/vapi" + + mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc + mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir +} + +package_libtracker-sparql() { + pkgdesc="$pkgdesc (SPARQL library)" + depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + + mv "$srcdir"/sparql/* "$pkgdir" +} diff --git a/staging/tracker/tracker.install b/staging/tracker/tracker.install new file mode 100644 index 000000000..95114273e --- /dev/null +++ b/staging/tracker/tracker.install @@ -0,0 +1,13 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/wesnoth/PKGBUILD b/staging/wesnoth/PKGBUILD new file mode 100644 index 000000000..325ed58e7 --- /dev/null +++ b/staging/wesnoth/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 147232 2012-01-24 22:47:27Z eric $ +# Maintainer: Jan de Groot +# Contributor: Tobias Powalowski +# Contributor: Jacobo Arvelo +# Contributor: Douglas Soares de Andrade + +pkgname=wesnoth +pkgver=1.8.6 +pkgrel=4 +pkgdesc="A turn-based strategy game on a fantasy world" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.wesnoth.org/" +depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core' 'python2') +makedepends=('boost') +install=wesnoth.install +options=(!emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + wesnoth-libpng-1.4.0.patch + wesnoth-1.8.6-boost-foreach.patch + wesnoth.tmpfiles.conf) +md5sums=('f1c3179869b01b61e253e74aeb241034' + '3b0d2edcb45e8ecc8c790f92bdcb0087' + 'dc414ab7e1334941548e9db6db9c2460' + 'b8122f5054e3895c9c054e87460869dc') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch" + patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch" + ./autogen.sh + ./configure --prefix=/usr --localstatedir=/var --enable-tools \ + --enable-editor --enable-server --with-fifodir=/run/wesnothd + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install-exec + install -dm755 "$pkgdir/usr/lib/tmpfiles.d/" + install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" + + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint" +} diff --git a/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch new file mode 100644 index 000000000..5aee3118c --- /dev/null +++ b/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch @@ -0,0 +1,70 @@ +--- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200 ++++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200 +@@ -238,6 +238,17 @@ void ttree_view_node::clear() + + struct ttree_view_node_implementation + { ++ template ++ static W* find_at_aux(It begin, It end, ++ const tpoint& coordinate, const bool must_be_active) { ++ for (It it = begin; it != end; ++it) { ++ if(W* widget = it->find_at(coordinate, must_be_active)) { ++ return widget; ++ } ++ } ++ return NULL; ++ } ++ + template + static W* find_at( + typename tconst_duplicator::type& +@@ -255,13 +266,9 @@ struct ttree_view_node_implementation + } + + typedef typename tconst_duplicator::type thack; +- foreach(thack& node, tree_view_node.children_) { +- if(W* widget = node.find_at(coordinate, must_be_active)) { +- return widget; +- } +- } +- +- return NULL; ++ return find_at_aux(tree_view_node.children_.begin(), ++ tree_view_node.children_.end(), ++ coordinate, must_be_active); + } + }; + +@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size + return size; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz + size.x += (get_indention_level() - 1) * tree_view().indention_step_size_; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s + + DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n"; + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; diff --git a/staging/wesnoth/wesnoth-libpng-1.4.0.patch b/staging/wesnoth/wesnoth-libpng-1.4.0.patch new file mode 100644 index 000000000..338f467af --- /dev/null +++ b/staging/wesnoth/wesnoth-libpng-1.4.0.patch @@ -0,0 +1,24 @@ +diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 +@@ -174,8 +174,8 @@ + //TODO: review whether providing NULL error handlers is something + //sensible + png_struct* png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, reinterpret_cast(png_voidp_NULL), +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, reinterpret_cast(NULL), ++ NULL, NULL); + if(!png_ptr) + throw exploder_failure("Unable to initialize the png write structure"); + +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600 +@@ -15,6 +15,7 @@ + #include "exploder_utils.hpp" + #include "game_config.hpp" + #include "serialization/string_utils.hpp" ++#include + #include + + exploder_point::exploder_point(const std::string &s) diff --git a/staging/wesnoth/wesnoth.install b/staging/wesnoth/wesnoth.install new file mode 100644 index 000000000..4f1e419ae --- /dev/null +++ b/staging/wesnoth/wesnoth.install @@ -0,0 +1,9 @@ +# arg 1: the new package version +post_install() { +cat << EOF +Note: +==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma" +==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth +==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output. +EOF +} diff --git a/staging/wesnoth/wesnoth.tmpfiles.conf b/staging/wesnoth/wesnoth.tmpfiles.conf new file mode 100644 index 000000000..3ec0f6013 --- /dev/null +++ b/staging/wesnoth/wesnoth.tmpfiles.conf @@ -0,0 +1 @@ +D /run/wesnothd 0700 root root - diff --git a/staging/xsane/PKGBUILD b/staging/xsane/PKGBUILD new file mode 100644 index 000000000..aa022720b --- /dev/null +++ b/staging/xsane/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 147252 2012-01-25 03:22:07Z eric $ +# Maintainer: Tobias Powalowski +# Contributor: Sarah Hay + +pkgbase=xsane +pkgname=('xsane' 'xsane-gimp') +pkgver=0.998 +pkgrel=2 +arch=(i686 x86_64) +url="http://www.xsane.org" +license=('GPL2') +makedepends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg' 'gimp') +source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz + xsane-0.995-xdg-open.patch) +md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa' + '15541ff0ddc10acfa2059cf99d5478eb') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora + patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch" + sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c + + ./configure --prefix=/usr --mandir=/usr/share/man --enable-gimp + make + mv src/xsane src/xsane-gimp + + # build again with gimp enabled + make clean + ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp + make +} + +package_xsane() { + pkgdesc="A GTK-based X11 frontend for SANE and plugin for Gimp." + install=$pkgname.install + depends=('gtk2' 'lcms' 'sane' 'zlib' 'libjpeg') + optdepends=('xsane-gimp: for gimp plugin support') + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install +} + +package_xsane-gimp() { + pkgdesc="XSane Gimp plugin" + depends=('xsane' 'gimp') + cd "$srcdir/$pkgbase-$pkgver" + install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp" + + ## For making Gimp Plugin available + /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" + cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/" + /bin/ln -s ../../../../bin/xsane-gimp xsane + +# http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup +# when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora, +# gentoo has something similar +#%post gimp +#107 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then +#108 %{_sbindir}/gimp-plugin-mgr --install xsane +#109 fi +#110 +#111 %preun gimp +#112 if [ $1 = 0 ]; then +#113 if [ -x "%{_sbindir}/gimp-plugin-mgr" ]; then +#114 %{_sbindir}/gimp-plugin-mgr --uninstall xsane +#115 fi +#116 fi +} diff --git a/staging/xsane/xsane-0.995-xdg-open.patch b/staging/xsane/xsane-0.995-xdg-open.patch new file mode 100644 index 000000000..db1f9bd68 --- /dev/null +++ b/staging/xsane/xsane-0.995-xdg-open.patch @@ -0,0 +1,12 @@ +diff -up xsane-0.995/src/xsane.h.xdg-open xsane-0.995/src/xsane.h +--- xsane-0.995/src/xsane.h.xdg-open 2007-08-13 09:20:32.000000000 +0200 ++++ xsane-0.995/src/xsane.h 2007-11-23 11:50:49.000000000 +0100 +@@ -251,7 +251,7 @@ + # elif defined(HAVE_OS2_H) + # define DEFAULT_BROWSER "netscape" + # else +-# define DEFAULT_BROWSER "netscape" ++# define DEFAULT_BROWSER "xdg-open" + # endif + #endif + diff --git a/staging/xsane/xsane.install b/staging/xsane/xsane.install new file mode 100644 index 000000000..aa3e3b8f8 --- /dev/null +++ b/staging/xsane/xsane.install @@ -0,0 +1,16 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_install() { + echo "NOTE:" + echo " If you experience any problems after installing xsane " + echo " it may help to remove the setup and preferences files" + echo " of xsane:" + echo "" + echo " \$ rm -rf ~/.sane/xsane" + echo "" +} + +post_upgrade() { + post_install $1 +} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD new file mode 100644 index 000000000..4762c277c --- /dev/null +++ b/testing/curl/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 147206 2012-01-24 17:51:49Z dreisner $ +# Maintainer: Dave Reisner +# Contributor: Angel Velasquez +# Contributor: Eric Belanger +# Contributor: Lucien Immink +# Contributor: Daniel J Griffiths + +pkgname=curl +pkgver=7.24.0 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + fix-J-with-O-regression.patch + curlbuild.h) +md5sums=('b93420f80a2baaa61a0f45214eddc2ba' + '710242df6bc318d16eea611e7d1b1410' + 'aa4539ec4f4a2dad1663dc22dd3ab0a1' + '751bd433ede935c8fae727377625a8ae') + +ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') +case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; +esac + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/testing/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/testing/curl/fix-J-with-O-regression.patch b/testing/curl/fix-J-with-O-regression.patch new file mode 100644 index 000000000..4b7de1a23 --- /dev/null +++ b/testing/curl/fix-J-with-O-regression.patch @@ -0,0 +1,142 @@ +From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Sun, 20 Nov 2011 23:33:46 +0100 +Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes! + +A regression between 7.22.0 and 7.23.0 -- downloading a file with the +flags -O and -J results in the content being written to stdout if and +only if there was no Content-Disposition header in the http response. If +there is a C-D header with a filename attribute, the output is correctly +written. + +Reported by: Dave Reisner +Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html +--- + src/tool_cb_hdr.c | 3 +- + src/tool_operate.c | 59 ++++++++++++++++++++++---------------------- + src/tool_operhlp.c | 18 +++++++++++++ + tests/data/Makefile.am | 2 +- + tests/data/test1210 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 112 insertions(+), 33 deletions(-) + create mode 100644 tests/data/test1210 + +diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c +index fb24b45..dea7338 100644 +--- a/src/tool_cb_hdr.c ++++ b/src/tool_cb_hdr.c +@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata) + } + #endif + +- if(!outs->filename && (cb > 20) && +- checkprefix("Content-disposition:", str)) { ++ if((cb > 20) && checkprefix("Content-disposition:", str)) { + const char *p = str + 20; + + /* look for the 'filename=' parameter +diff --git a/src/tool_operate.c b/src/tool_operate.c +index 7ab815f..1e88120 100644 +--- a/src/tool_operate.c ++++ b/src/tool_operate.c +@@ -576,41 +576,40 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) + + if((urlnode->flags & GETOUT_USEREMOTE) + && config->content_disposition) { +- /* Our header callback sets the filename */ ++ /* Our header callback MIGHT set the filename */ + DEBUGASSERT(!outs.filename); + } +- else { +- if(config->resume_from_current) { +- /* We're told to continue from where we are now. Get the size +- of the file as it is now and open it for append instead */ +- struct_stat fileinfo; +- /* VMS -- Danger, the filesize is only valid for stream files */ +- if(0 == stat(outfile, &fileinfo)) +- /* set offset to current file size: */ +- config->resume_from = fileinfo.st_size; +- else +- /* let offset be 0 */ +- config->resume_from = 0; +- } + +- if(config->resume_from) { +- /* open file for output: */ +- FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); +- if(!file) { +- helpf(config->errors, "Can't open '%s'!\n", outfile); +- res = CURLE_WRITE_ERROR; +- goto quit_urls; +- } +- outs.fopened = TRUE; +- outs.stream = file; +- outs.init = config->resume_from; +- } +- else { +- outs.stream = NULL; /* open when needed */ ++ if(config->resume_from_current) { ++ /* We're told to continue from where we are now. Get the size ++ of the file as it is now and open it for append instead */ ++ struct_stat fileinfo; ++ /* VMS -- Danger, the filesize is only valid for stream files */ ++ if(0 == stat(outfile, &fileinfo)) ++ /* set offset to current file size: */ ++ config->resume_from = fileinfo.st_size; ++ else ++ /* let offset be 0 */ ++ config->resume_from = 0; ++ } ++ ++ if(config->resume_from) { ++ /* open file for output: */ ++ FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); ++ if(!file) { ++ helpf(config->errors, "Can't open '%s'!\n", outfile); ++ res = CURLE_WRITE_ERROR; ++ goto quit_urls; + } +- outs.filename = outfile; +- outs.s_isreg = TRUE; ++ outs.fopened = TRUE; ++ outs.stream = file; ++ outs.init = config->resume_from; ++ } ++ else { ++ outs.stream = NULL; /* open when needed */ + } ++ outs.filename = outfile; ++ outs.s_isreg = TRUE; + } + + if(uploadfile && !stdin_upload(uploadfile)) { +diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c +index 808d2d5..4c1697b 100644 +--- a/src/tool_operhlp.c ++++ b/src/tool_operhlp.c +@@ -178,6 +178,24 @@ CURLcode get_url_file_name(char **filename, const char *url) + return CURLE_OUT_OF_MEMORY; + } + } ++ ++ /* in case we built debug enabled, we allow an environment variable ++ * named CURL_TESTDIR to prefix the given file name to put it into a ++ * specific directory ++ */ ++#ifdef DEBUGBUILD ++ { ++ char *tdir = curlx_getenv("CURL_TESTDIR"); ++ if(tdir) { ++ char buffer[512]; /* suitably large */ ++ snprintf(buffer, sizeof(buffer), "%s/%s", tdir, *filename); ++ Curl_safefree(*filename); ++ *filename = strdup(buffer); /* clone the buffer */ ++ curl_free(tdir); ++ } ++ } ++#endif ++ + return CURLE_OK; + } + +-- +1.7.7.3 diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD index a40ad46f7..28229f186 100644 --- a/testing/libarchive/PKGBUILD +++ b/testing/libarchive/PKGBUILD @@ -1,16 +1,23 @@ -# $Id: PKGBUILD 146572 2012-01-13 16:55:27Z dreisner $ +# $Id: PKGBUILD 147250 2012-01-25 03:21:31Z dreisner $ # Maintainer: Dan McGee + pkgname=libarchive pkgver=3.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.googlecode.com/" license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz") -md5sums=('ca4090f0099432a9ac5a8b6618dc3892') -sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7') +source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" + 'interpret-non-posix-zips.patch' + 'test-with-zip-mtime.patch') +md5sums=('ca4090f0099432a9ac5a8b6618dc3892' + 'f02b88eb10877c7a7d527ed89c662e44' + '8366def6d7d70d424fa28a986c78c015') +sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7' + '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc' + 'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -18,6 +25,12 @@ PKGEXT='.pkg.tar.gz' build() { cd "$srcdir/$pkgname-$pkgver" + # http://code.google.com/p/libarchive/issues/detail?id=225 + patch -Np0 <"$srcdir/interpret-non-posix-zips.patch" + + # http://code.google.com/p/libarchive/issues/detail?id=231 + patch -Np0 <"$srcdir/test-with-zip-mtime.patch" + ./configure --prefix=/usr --without-xml2 make } @@ -25,8 +38,7 @@ build() { check() { cd "$srcdir/$pkgname-$pkgver" - # currently fails on i686 in a minor test involving atime updates (#60) - make check || : + make check } package() { diff --git a/testing/libarchive/interpret-non-posix-zips.patch b/testing/libarchive/interpret-non-posix-zips.patch new file mode 100644 index 000000000..63bc439d9 --- /dev/null +++ b/testing/libarchive/interpret-non-posix-zips.patch @@ -0,0 +1,165 @@ +Index: libarchive/archive_read_support_format_zip.c +=================================================================== +--- libarchive/archive_read_support_format_zip.c (revision 4189) ++++ libarchive/archive_read_support_format_zip.c (revision 4190) +@@ -217,14 +217,13 @@ + } + + /* +- * TODO: This is a performance sink because it forces +- * the read core to drop buffered data from the start +- * of file, which will then have to be re-read again +- * if this bidder loses. ++ * TODO: This is a performance sink because it forces the read core to ++ * drop buffered data from the start of file, which will then have to ++ * be re-read again if this bidder loses. + * +- * Consider passing in the winning bid value to subsequent +- * bidders so that this bidder in particular can avoid +- * seeking if it knows it's going to lose anyway. ++ * We workaround this a little by passing in the best bid so far so ++ * that later bidders can do nothing if they know they'll never ++ * outbid. But we can certainly do better... + */ + static int + archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid) +@@ -311,19 +310,29 @@ + external_attributes = archive_le32dec(p + 38); + zip_entry->local_header_offset = archive_le32dec(p + 42); + ++ /* If we can't guess the mode, leave it zero here; ++ when we read the local file header we might get ++ more information. */ ++ zip_entry->mode = 0; + if (zip_entry->system == 3) { + zip_entry->mode = external_attributes >> 16; +- } else { +- zip_entry->mode = AE_IFREG | 0777; + } + +- /* Do we need to parse filename here? */ +- /* Or can we wait until we read the local header? */ ++ /* We don't read the filename until we get to the ++ local file header. Reading it here would speed up ++ table-of-contents operations (removing the need to ++ find and read local file header to get the ++ filename) at the cost of requiring a lot of extra ++ space. */ ++ /* We don't read the extra block here. We assume it ++ will be duplicated at the local file header. */ + __archive_read_consume(a, + 46 + filename_length + extra_length + comment_length); + } + +- /* TODO: Sort zip entries. */ ++ /* TODO: Sort zip entries by file offset so that we ++ can optimize get_next_header() to use skip instead of ++ seek. */ + + return ARCHIVE_OK; + } +@@ -434,6 +443,11 @@ + return (30); + } + ++ /* TODO: It's worth looking ahead a little bit for a valid ++ * PK signature. In particular, that would make it possible ++ * to read some UUEncoded SFX files or SFX files coming from ++ * a network socket. */ ++ + return (0); + } + +Index: libarchive/test/test_compat_zip_6.zip.uu +=================================================================== +--- libarchive/test/test_compat_zip_6.zip.uu (revision 0) ++++ libarchive/test/test_compat_zip_6.zip.uu (revision 4190) +@@ -0,0 +1,10 @@ ++begin 755 test_compat_zip_6.zip ++M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E'1S;VUE('1E>'0- ++M"E!+`0(4"PH``````'@3-T`````````````````6````````````$``````` ++M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+ ++M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E ++M'102P4&``````(``@"=````B``````` ++` ++end +Index: libarchive/test/test_compat_zip.c +=================================================================== +--- libarchive/test/test_compat_zip.c (revision 4189) ++++ libarchive/test/test_compat_zip.c (revision 4190) +@@ -348,6 +348,53 @@ + free(p); + } + ++/* ++ * Issue 225: Errors extracting MSDOS Zip archives with directories. ++ */ ++static void ++compat_zip_6_verify(struct archive *a) ++{ ++ struct archive_entry *ae; ++ ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); ++ assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); ++ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); ++ assertEqualInt(1327314468, archive_entry_mtime(ae)); ++ assertEqualInt(0, archive_entry_size(ae)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); ++ assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); ++ assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); ++ assertEqualInt(1327314476, archive_entry_mtime(ae)); ++ assertEqualInt(11, archive_entry_size(ae)); ++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); ++} ++ ++static void ++test_compat_zip_6(void) ++{ ++ const char *refname = "test_compat_zip_6.zip"; ++ struct archive *a; ++ void *p; ++ size_t s; ++ ++ extract_reference_file(refname); ++ p = slurpfile(&s, refname); ++ ++ assert((a = archive_read_new()) != NULL); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7)); ++ compat_zip_6_verify(a); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); ++ ++ assert((a = archive_read_new()) != NULL); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7)); ++ compat_zip_6_verify(a); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); ++} ++ + DEFINE_TEST(test_compat_zip) + { + test_compat_zip_1(); +@@ -355,6 +402,7 @@ + test_compat_zip_3(); + test_compat_zip_4(); + test_compat_zip_5(); ++ test_compat_zip_6(); + } + + +Index: Makefile.am +=================================================================== +--- Makefile.am (revision 4189) ++++ Makefile.am (revision 4190) +@@ -462,6 +462,7 @@ + libarchive/test/test_compat_zip_3.zip.uu \ + libarchive/test/test_compat_zip_4.zip.uu \ + libarchive/test/test_compat_zip_5.zip.uu \ ++ libarchive/test/test_compat_zip_6.zip.uu \ + libarchive/test/test_fuzz_1.iso.Z.uu \ + libarchive/test/test_fuzz.cab.uu \ + libarchive/test/test_fuzz.lzh.uu \ diff --git a/testing/libarchive/test-with-zip-mtime.patch b/testing/libarchive/test-with-zip-mtime.patch new file mode 100644 index 000000000..79e2f3c7e --- /dev/null +++ b/testing/libarchive/test-with-zip-mtime.patch @@ -0,0 +1,23 @@ +Index: libarchive/test/test_compat_zip.c +=================================================================== +--- libarchive/test/test_compat_zip.c (revision 4197) ++++ libarchive/test/test_compat_zip.c (revision 4198) +@@ -359,12 +359,16 @@ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); + assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); +- assertEqualInt(1327314468, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* TODO: A more complex assert would work here; we could ++ verify that it's within +/- 24 hours of a particular value. */ ++ /* assertEqualInt(1327314468, archive_entry_mtime(ae)); */ + assertEqualInt(0, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); + assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); +- assertEqualInt(1327314476, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* assertEqualInt(1327314476, archive_entry_mtime(ae)); */ + assertEqualInt(11, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + } diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index f1cfcbd5f..4e1d95a74 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146660 2012-01-15 17:04:30Z dreisner $ +# $Id: PKGBUILD 147240 2012-01-25 01:22:21Z dreisner $ # Maintainer: Dave Reisner pkgname=systemd -pkgver=38 -pkgrel=3 +pkgver=39 +pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -16,7 +16,6 @@ optdepends=('cryptsetup: required for encrypted block devices' 'initscripts-systemd: native boot and initialization scripts' 'python2-cairo: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') -groups=('systemd') options=('!libtool') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf @@ -28,13 +27,9 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/systemd/systemd-logind.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release" - '0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch' - '0001-units-make-sure-syslog-socket-goes-away-early-during.patch') -md5sums=('68c66dce5a28c0efd7c210af5d11efed' - '752636def0db3c03f121f8b4f44a63cd' - '07437e70be65ef14fd4f13c5ec5bd1fe' - 'c567ce597f68c07b9bc5b7e835f80f7d') + "os-release") +md5sums=('7179b34f6f6553d2a36551ac1dec5f0d' + '752636def0db3c03f121f8b4f44a63cd') build() { cd "$pkgname-$pkgver" @@ -44,9 +39,6 @@ build() { sed -i -e '/^Environ.*LANG/s/^/#/' \ -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 - patch -Np1 < "$srcdir/0001-tmpfiles-fix-parsing-of-proc-net-unix-on-32Bit-machi.patch" - patch -Np1 < "$srcdir/0001-units-make-sure-syslog-socket-goes-away-early-during.patch" - ./configure --sysconfdir=/etc \ --libexecdir=/usr/lib \ --libdir=/usr/lib \ diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install index 4850c879e..f31642e13 100644 --- a/testing/systemd/systemd.install +++ b/testing/systemd/systemd.install @@ -2,7 +2,7 @@ checkgroups() { if ! getent group lock >/dev/null; then - sbin/groupadd -g 54 lock + groupadd -g 54 lock fi } diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD index 2a3787ae9..2a30f0dce 100644 --- a/testing/udev/PKGBUILD +++ b/testing/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147057 2012-01-21 10:00:01Z tpowa $ +# $Id: PKGBUILD 147236 2012-01-24 23:31:40Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Aaron Griffin # Contributor: Tobias Powalowski @@ -6,7 +6,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=178 +pkgver=179 pkgrel=1 arch=(i686 x86_64) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -15,7 +15,6 @@ groups=('base') options=(!makeflags !libtool) makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz) -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') build() { cd $srcdir/$pkgbase-$pkgver @@ -100,4 +99,4 @@ package_udev-compat() { mknod cpu/microcode c 10 184 } -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') +md5sums=('7d2880f66ea39146aae928f19ff3ca09') diff --git a/testing/wireless_tools/PKGBUILD b/testing/wireless_tools/PKGBUILD new file mode 100644 index 000000000..16062dd2a --- /dev/null +++ b/testing/wireless_tools/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 147204 2012-01-24 11:13:02Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: Giovanni Scafora +# Contributor: Jason Chu + +pkgname=wireless_tools +pkgver=29 +pkgrel=6 +pkgdesc='Wireless Tools' +url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html' +arch=('i686' 'x86_64') +license=('GPL') +source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz") +sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710') + +build() { + cd "${srcdir}/${pkgname}.${pkgver}" + make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}.${pkgver}" + make \ + INSTALL_DIR="${pkgdir}/usr/sbin" \ + INSTALL_LIB="${pkgdir}/usr/lib" \ + INSTALL_INC="${pkgdir}/usr/include" \ + INSTALL_MAN="${pkgdir}/usr/share/man" \ + install +} -- cgit v1.2.3-54-g00ecf From 3741146d50cb93e8985f8aac937e36d35ee76446 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 Jan 2012 23:14:55 +0000 Subject: Thu Jan 26 23:14:55 UTC 2012 --- community-staging/coq/PKGBUILD | 37 ++ community-staging/luakit/PKGBUILD | 32 ++ community-staging/luakit/luakit.install | 14 + community-staging/nestopia/ChangeLog | 12 + community-staging/nestopia/PKGBUILD | 46 ++ community-staging/nestopia/nestopia | 10 + .../nestopia_bogus_error_on_save_settings.patch | 11 + community-staging/nvclock/PKGBUILD | 45 ++ .../nvclock/nvclock-0.8b4-buildfix.patch | 16 + .../nvclock/nvclock-0.8b4-linkfix.patch | 18 + .../nvclock/nvclock.desktop-use-gksu.patch | 11 + community-staging/nvclock/nvclock.install | 11 + community-staging/prboom/PKGBUILD | 33 ++ community-staging/prboom/libpng-1.4.patch | 21 + community-staging/sage-mathematics/PKGBUILD | 105 ++++ .../sage-mathematics/SAGE-notebook.desktop | 19 + .../sage-mathematics/sage-mathematics.install | 56 ++ community-staging/torcs/PKGBUILD | 12 +- community/alsa-tools/PKGBUILD | 6 +- community/deadbeef/PKGBUILD | 17 +- .../deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch | 118 ++++ .../deadbeef-0.5.1-ffmpeg-version-check-fix.patch | 25 + community/electricsheep/PKGBUILD | 12 +- community/electricsheep/PKGBUILD.svn | 60 ++ .../electricsheep-pref-segfault.patch | 270 +++++++++ community/fceux/PKGBUILD | 45 ++ community/fceux/fceux.desktop | 9 + community/fceux/fceux.install | 13 + community/fceux/fceux.png | Bin 0 -> 583 bytes community/libee/PKGBUILD | 28 + community/libestr/PKGBUILD | 25 + community/mednafen/ChangeLog | 6 + community/mednafen/PKGBUILD | 26 + community/nestopia/ChangeLog | 12 + community/nestopia/PKGBUILD | 46 ++ community/nestopia/nestopia | 10 + .../nestopia_bogus_error_on_save_settings.patch | 11 + community/parrot/PKGBUILD | 10 +- community/rsyslog/PKGBUILD | 11 +- community/setconf/PKGBUILD | 8 +- community/vidalia/PKGBUILD | 32 ++ community/vidalia/vidalia.install | 11 + core/curl/PKGBUILD | 20 +- core/gcc/PKGBUILD | 16 +- core/libarchive/PKGBUILD | 26 +- core/libarchive/interpret-non-posix-zips.patch | 165 ++++++ core/libarchive/test-with-zip-mtime.patch | 23 + core/udev/PKGBUILD | 7 +- core/wireless_tools/PKGBUILD | 30 +- extra/gdb/PKGBUILD | 9 +- extra/glsof/PKGBUILD | 10 +- extra/gtk-xfce-engine/PKGBUILD | 40 +- extra/gtk2/PKGBUILD | 15 +- multilib-testing/lib32-glibc/PKGBUILD | 26 +- .../lib32-glibc/glibc-2.15-regex.patch | 16 + .../glibc-2.15-strcmp-disable-avx.patch | 48 ++ multilib/gcc-multilib/PKGBUILD | 16 +- staging/digikam/PKGBUILD | 105 ++++ staging/digikam/boost148.patch | 65 +++ staging/digikam/digikam.install | 12 + staging/digikam/kipi-plugins.install | 12 + staging/digikam/libkipi140.patch | 63 +++ staging/ffmpegthumbnailer/PKGBUILD | 34 ++ .../ffmpegthumbnailer/ffmpegthumbnailer.desktop | 4 + staging/gnome-perl/PKGBUILD | 27 + staging/gnome-sharp/PKGBUILD | 70 +++ staging/gnomecanvas-perl/PKGBUILD | 27 + staging/kdelibs/PKGBUILD | 65 +++ staging/kdelibs/archlinux-menu.patch | 22 + staging/kdelibs/fix-knotify-filepath.patch | 13 + staging/kdelibs/kde-applications-menu.patch | 22 + staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch | 32 ++ staging/kdelibs/kdelibs.install | 13 + staging/libdmapsharing/PKGBUILD | 25 + staging/libgpod/PKGBUILD | 30 + staging/unison/PKGBUILD | 51 ++ staging/unison/unison-ssh-ocaml.patch | 25 + staging/unison/unison.desktop | 13 + staging/unison/unison.install | 28 + testing/glibc/PKGBUILD | 223 ++++++++ testing/glibc/glibc-2.10-bz4781.patch | 42 ++ testing/glibc/glibc-2.10-dont-build-timezone.patch | 13 + ....12.2-ignore-origin-of-privileged-program.patch | 26 + testing/glibc/glibc-2.14-libdl-crash.patch | 132 +++++ .../glibc/glibc-2.14-reexport-rpc-interface.patch | 26 + .../glibc-2.14-reinstall-nis-rpc-headers.patch | 28 + testing/glibc/glibc-2.14-revert-4768ae77.patch | 37 ++ testing/glibc/glibc-2.15-lddebug-scopes.patch | 27 + testing/glibc/glibc-2.15-regex.patch | 16 + testing/glibc/glibc-2.15-revert-c5a0802a.patch | 229 ++++++++ testing/glibc/glibc-2.15-strcmp-disable-avx.patch | 48 ++ testing/glibc/glibc-__i686.patch | 13 + testing/glibc/glibc.install | 20 + testing/glibc/locale-gen | 42 ++ testing/glibc/locale.gen.txt | 23 + testing/glibc/nscd | 40 ++ testing/kactivities/PKGBUILD | 29 + testing/kdeaccessibility-jovie/PKGBUILD | 34 ++ .../kdeaccessibility-jovie.install | 11 + testing/kdeaccessibility-kaccessible/PKGBUILD | 30 + testing/kdeaccessibility-kmag/PKGBUILD | 33 ++ .../kdeaccessibility-kmag.install | 11 + testing/kdeaccessibility-kmousetool/PKGBUILD | 33 ++ .../kdeaccessibility-kmousetool.install | 11 + testing/kdeaccessibility-kmouth/PKGBUILD | 33 ++ .../kdeaccessibility-kmouth.install | 11 + testing/kdeadmin/PKGBUILD | 81 +++ testing/kdeadmin/kdeadmin.install | 11 + testing/kdeadmin/syslog-path.patch | 11 + testing/kdeartwork/PKGBUILD | 104 ++++ testing/kdebase-konsole/PKGBUILD | 30 + testing/kdebase-runtime/PKGBUILD | 24 +- testing/kdebase-workspace/PKGBUILD | 80 +++ testing/kdebase-workspace/fixpath.patch | 34 ++ testing/kdebase-workspace/kde-np.pam | 8 + testing/kdebase-workspace/kde.pam | 8 + .../kdebase-workspace/kdebase-workspace.install | 25 + testing/kdebase-workspace/kdm | 36 ++ testing/kdebase-workspace/kdm-xinitrd.patch | 18 + testing/kdebase-workspace/kscreensaver.pam | 1 + testing/kdebase-workspace/terminate-server.patch | 11 + testing/kdebase/PKGBUILD | 125 +++++ testing/kdebase/fix-controlclick-selection.patch | 11 + testing/kdebase/kdebase-dolphin.install | 11 + testing/kdebase/kdebase-konqueror.install | 12 + testing/kdebase/kdebase.install | 11 + testing/kdebindings-kimono/PKGBUILD | 32 ++ testing/kdebindings-kross/PKGBUILD | 52 ++ testing/kdebindings-perlkde/PKGBUILD | 31 ++ testing/kdebindings-perlqt/PKGBUILD | 31 ++ testing/kdebindings-python/PKGBUILD | 34 ++ testing/kdebindings-qtruby/PKGBUILD | 31 ++ testing/kdebindings-qyoto/PKGBUILD | 31 ++ testing/kdebindings-smokegen/PKGBUILD | 30 + testing/kdebindings-smokekde/PKGBUILD | 32 ++ testing/kdebindings-smokeqt/PKGBUILD | 32 ++ testing/kdeedu-analitza/PKGBUILD | 30 + testing/kdeedu-blinken/PKGBUILD | 31 ++ testing/kdeedu-blinken/kdeedu-blinken.install | 11 + testing/kdeedu-cantor/PKGBUILD | 34 ++ testing/kdeedu-cantor/kdeedu-cantor.install | 12 + testing/kdeedu-kalgebra/PKGBUILD | 31 ++ testing/kdeedu-kalgebra/kdeedu-kalgebra.install | 12 + testing/kdeedu-kalzium/PKGBUILD | 31 ++ testing/kdeedu-kalzium/kdeedu-kalzium.install | 11 + testing/kdeedu-kanagram/PKGBUILD | 31 ++ testing/kdeedu-kanagram/kdeedu-kanagram.install | 11 + testing/kdeedu-kbruch/PKGBUILD | 31 ++ testing/kdeedu-kbruch/kdeedu-kbruch.install | 11 + testing/kdeedu-kgeography/PKGBUILD | 31 ++ .../kdeedu-kgeography/kdeedu-kgeography.install | 11 + testing/kdeedu-khangman/PKGBUILD | 31 ++ testing/kdeedu-khangman/kdeedu-khangman.install | 11 + testing/kdeedu-kig/PKGBUILD | 34 ++ testing/kdeedu-kig/kdeedu-kig.install | 12 + testing/kdeedu-kiten/PKGBUILD | 31 ++ testing/kdeedu-kiten/kdeedu-kiten.install | 11 + testing/kdeedu-klettres/PKGBUILD | 31 ++ testing/kdeedu-klettres/kdeedu-klettres.install | 11 + testing/kdeedu-kmplot/PKGBUILD | 31 ++ testing/kdeedu-kmplot/kdeedu-kmplot.install | 12 + testing/kdeedu-kstars/PKGBUILD | 32 ++ testing/kdeedu-kstars/kdeedu-kstars.install | 11 + testing/kdeedu-ktouch/PKGBUILD | 31 ++ testing/kdeedu-ktouch/kdeedu-ktouch.install | 11 + testing/kdeedu-kturtle/PKGBUILD | 31 ++ testing/kdeedu-kturtle/kdeedu-kturtle.install | 11 + testing/kdeedu-kwordquiz/PKGBUILD | 31 ++ testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install | 12 + testing/kdeedu-marble/PKGBUILD | 32 ++ testing/kdeedu-marble/kdeedu-marble.install | 12 + testing/kdeedu-parley/PKGBUILD | 31 ++ testing/kdeedu-parley/kdeedu-parley.install | 12 + testing/kdeedu-rocs/PKGBUILD | 31 ++ testing/kdeedu-step/PKGBUILD | 31 ++ testing/kdeedu-step/kdeedu-step.install | 11 + testing/kdegames/PKGBUILD | 516 +++++++++++++++++ testing/kdegames/kdegames-kbattleship.install | 24 + testing/kdegames/kdegames-kfourinline.install | 12 + testing/kdegames/kdegames-kigo.install | 12 + testing/kdegames/kdegames-kolf.install | 12 + testing/kdegames/kdegames-kpatience.install | 12 + testing/kdegames/kdegames-kreversi.install | 22 + testing/kdegames/kdegames-kspaceduel.install | 12 + testing/kdegames/kdegames-ksquares.install | 22 + testing/kdegames/kdegames-ktuberling.install | 12 + testing/kdegames/kdegames-lskat.install | 12 + testing/kdegames/kdegames-palapeli.install | 13 + testing/kdegames/kdegames.install | 11 + testing/kdegraphics-gwenview/PKGBUILD | 32 ++ .../kdegraphics-gwenview.install | 12 + testing/kdegraphics-kamera/PKGBUILD | 30 + testing/kdegraphics-kcolorchooser/PKGBUILD | 31 ++ .../kdegraphics-kcolorchooser.install | 11 + testing/kdegraphics-kgamma/PKGBUILD | 33 ++ testing/kdegraphics-kolourpaint/PKGBUILD | 31 ++ .../kdegraphics-kolourpaint.install | 12 + testing/kdegraphics-kruler/PKGBUILD | 31 ++ .../kdegraphics-kruler/kdegraphics-kruler.install | 12 + testing/kdegraphics-ksaneplugin/PKGBUILD | 31 ++ testing/kdegraphics-ksnapshot/PKGBUILD | 32 ++ .../kdegraphics-ksnapshot.install | 12 + testing/kdegraphics-mobipocket/PKGBUILD | 32 ++ .../kdegraphics-mobipocket.install | 11 + testing/kdegraphics-okular/PKGBUILD | 34 ++ .../kdegraphics-okular/kdegraphics-okular.install | 12 + testing/kdegraphics-strigi-analyzer/PKGBUILD | 31 ++ testing/kdegraphics-svgpart/PKGBUILD | 31 ++ testing/kdegraphics-thumbnailers/PKGBUILD | 31 ++ testing/kdelibs/PKGBUILD | 28 +- testing/kdemultimedia/PKGBUILD | 108 ++++ .../kdemultimedia-dragonplayer.install | 12 + testing/kdemultimedia/kdemultimedia.install | 11 + testing/kdemultimedia/mplayerthumbs.config | 2 + testing/kdenetwork/PKGBUILD | 110 ++++ testing/kdenetwork/kdenetwork-kget.install | 12 + testing/kdenetwork/kdenetwork-kopete.install | 12 + testing/kdenetwork/kdenetwork-kppp.install | 12 + testing/kdenetwork/kdenetwork.install | 11 + testing/kdepim-runtime/PKGBUILD | 32 ++ testing/kdepim-runtime/kdepim-runtime.install | 12 + testing/kdepim/PKGBUILD | 244 ++++++++ testing/kdepim/kdepim-kleopatra.install | 12 + testing/kdepim/kdepim-kmail.install | 12 + testing/kdepim/kdepim-korganizer.install | 12 + testing/kdepim/kdepim.install | 11 + testing/kdepimlibs/PKGBUILD | 32 ++ testing/kdepimlibs/kdepimlibs.install | 11 + testing/kdeplasma-addons/PKGBUILD | 619 +++++++++++++++++++++ .../kdeplasma-addons-applets-lancelot.install | 12 + .../kdeplasma-addons-applets.install | 11 + testing/kdesdk-kate/PKGBUILD | 60 ++ testing/kdesdk-kate/kdebase-kwrite.install | 12 + testing/kdesdk-kate/kdesdk-kate.install | 13 + .../kdesdk-kate/pkgbuild-syntax-highlight.patch | 11 + testing/kdesdk/PKGBUILD | 258 +++++++++ testing/kdesdk/fix-python2-path.patch | 32 ++ testing/kdesdk/kdesdk-cervisia.install | 12 + testing/kdesdk/kdesdk-kcachegrind.install | 12 + testing/kdesdk/kdesdk-kompare.install | 12 + testing/kdesdk/kdesdk-kuiviewer.install | 12 + testing/kdesdk/kdesdk-lokalize.install | 12 + testing/kdesdk/kdesdk-okteta.install | 12 + testing/kdesdk/kdesdk-umbrello.install | 12 + testing/kdesdk/kdesdk.install | 11 + testing/kdetoys/PKGBUILD | 56 ++ testing/kdetoys/kdetoys.install | 11 + testing/kdeutils-filelight/PKGBUILD | 35 ++ .../kdeutils-filelight/kdeutils-filelight.install | 12 + testing/kdeutils-kcalc/PKGBUILD | 33 ++ testing/kdeutils-kcalc/kdeutils-kcalc.install | 11 + testing/kdeutils-kcharselect/PKGBUILD | 32 ++ testing/kdeutils-kdf/PKGBUILD | 33 ++ testing/kdeutils-kdf/kdeutils-kdf.install | 11 + testing/kdeutils-kfloppy/PKGBUILD | 33 ++ testing/kdeutils-kfloppy/kdeutils-kfloppy.install | 12 + testing/kdeutils-kgpg/PKGBUILD | 33 ++ testing/kdeutils-kgpg/kdeutils-kgpg.install | 12 + testing/kdeutils-kremotecontrol/PKGBUILD | 35 ++ .../kdeutils-kremotecontrol.install | 11 + testing/kdeutils-ksecrets/PKGBUILD | 31 ++ .../kdeutils-ksecrets/kdeutils-ksecrets.install | 12 + testing/kdeutils-ktimer/PKGBUILD | 33 ++ testing/kdeutils-ktimer/kdeutils-ktimer.install | 11 + testing/kdeutils-kwallet/PKGBUILD | 33 ++ testing/kdeutils-kwallet/kdeutils-kwallet.install | 12 + testing/kdeutils-printer-applet/PKGBUILD | 38 ++ testing/kdeutils-superkaramba/PKGBUILD | 31 ++ .../kdeutils-superkaramba.install | 12 + testing/kdeutils-sweeper/PKGBUILD | 33 ++ testing/kdewebdev/PKGBUILD | 70 +++ .../kdewebdev/kdewebdev-kimagemapeditor.install | 12 + testing/kdewebdev/kdewebdev.install | 11 + testing/libkdcraw/PKGBUILD | 32 ++ testing/libkdcraw/libkdcraw.install | 11 + testing/libkdeedu/PKGBUILD | 31 ++ testing/libkdeedu/libkdeedu.install | 11 + testing/libkexiv2/PKGBUILD | 31 ++ testing/libkipi/PKGBUILD | 32 ++ testing/libkipi/libkipi.install | 11 + testing/libksane/PKGBUILD | 32 ++ testing/libksane/libksane.install | 11 + 282 files changed, 9397 insertions(+), 145 deletions(-) create mode 100644 community-staging/coq/PKGBUILD create mode 100644 community-staging/luakit/PKGBUILD create mode 100644 community-staging/luakit/luakit.install create mode 100644 community-staging/nestopia/ChangeLog create mode 100644 community-staging/nestopia/PKGBUILD create mode 100644 community-staging/nestopia/nestopia create mode 100644 community-staging/nestopia/nestopia_bogus_error_on_save_settings.patch create mode 100644 community-staging/nvclock/PKGBUILD create mode 100644 community-staging/nvclock/nvclock-0.8b4-buildfix.patch create mode 100644 community-staging/nvclock/nvclock-0.8b4-linkfix.patch create mode 100644 community-staging/nvclock/nvclock.desktop-use-gksu.patch create mode 100644 community-staging/nvclock/nvclock.install create mode 100644 community-staging/prboom/PKGBUILD create mode 100644 community-staging/prboom/libpng-1.4.patch create mode 100644 community-staging/sage-mathematics/PKGBUILD create mode 100644 community-staging/sage-mathematics/SAGE-notebook.desktop create mode 100644 community-staging/sage-mathematics/sage-mathematics.install create mode 100644 community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch create mode 100644 community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch create mode 100644 community/electricsheep/PKGBUILD.svn create mode 100644 community/electricsheep/electricsheep-pref-segfault.patch create mode 100644 community/fceux/PKGBUILD create mode 100644 community/fceux/fceux.desktop create mode 100644 community/fceux/fceux.install create mode 100644 community/fceux/fceux.png create mode 100644 community/libee/PKGBUILD create mode 100644 community/libestr/PKGBUILD create mode 100644 community/mednafen/ChangeLog create mode 100755 community/mednafen/PKGBUILD create mode 100644 community/nestopia/ChangeLog create mode 100644 community/nestopia/PKGBUILD create mode 100644 community/nestopia/nestopia create mode 100644 community/nestopia/nestopia_bogus_error_on_save_settings.patch create mode 100644 community/vidalia/PKGBUILD create mode 100644 community/vidalia/vidalia.install create mode 100644 core/libarchive/interpret-non-posix-zips.patch create mode 100644 core/libarchive/test-with-zip-mtime.patch create mode 100644 multilib-testing/lib32-glibc/glibc-2.15-regex.patch create mode 100644 multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch create mode 100644 staging/digikam/PKGBUILD create mode 100644 staging/digikam/boost148.patch create mode 100644 staging/digikam/digikam.install create mode 100644 staging/digikam/kipi-plugins.install create mode 100644 staging/digikam/libkipi140.patch create mode 100644 staging/ffmpegthumbnailer/PKGBUILD create mode 100644 staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop create mode 100644 staging/gnome-perl/PKGBUILD create mode 100644 staging/gnome-sharp/PKGBUILD create mode 100644 staging/gnomecanvas-perl/PKGBUILD create mode 100644 staging/kdelibs/PKGBUILD create mode 100644 staging/kdelibs/archlinux-menu.patch create mode 100644 staging/kdelibs/fix-knotify-filepath.patch create mode 100644 staging/kdelibs/kde-applications-menu.patch create mode 100644 staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch create mode 100644 staging/kdelibs/kdelibs.install create mode 100644 staging/libdmapsharing/PKGBUILD create mode 100644 staging/libgpod/PKGBUILD create mode 100644 staging/unison/PKGBUILD create mode 100644 staging/unison/unison-ssh-ocaml.patch create mode 100644 staging/unison/unison.desktop create mode 100644 staging/unison/unison.install create mode 100644 testing/glibc/PKGBUILD create mode 100644 testing/glibc/glibc-2.10-bz4781.patch create mode 100644 testing/glibc/glibc-2.10-dont-build-timezone.patch create mode 100644 testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch create mode 100644 testing/glibc/glibc-2.14-libdl-crash.patch create mode 100644 testing/glibc/glibc-2.14-reexport-rpc-interface.patch create mode 100644 testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch create mode 100644 testing/glibc/glibc-2.14-revert-4768ae77.patch create mode 100644 testing/glibc/glibc-2.15-lddebug-scopes.patch create mode 100644 testing/glibc/glibc-2.15-regex.patch create mode 100644 testing/glibc/glibc-2.15-revert-c5a0802a.patch create mode 100644 testing/glibc/glibc-2.15-strcmp-disable-avx.patch create mode 100644 testing/glibc/glibc-__i686.patch create mode 100644 testing/glibc/glibc.install create mode 100755 testing/glibc/locale-gen create mode 100644 testing/glibc/locale.gen.txt create mode 100755 testing/glibc/nscd create mode 100644 testing/kactivities/PKGBUILD create mode 100644 testing/kdeaccessibility-jovie/PKGBUILD create mode 100644 testing/kdeaccessibility-jovie/kdeaccessibility-jovie.install create mode 100644 testing/kdeaccessibility-kaccessible/PKGBUILD create mode 100644 testing/kdeaccessibility-kmag/PKGBUILD create mode 100644 testing/kdeaccessibility-kmag/kdeaccessibility-kmag.install create mode 100644 testing/kdeaccessibility-kmousetool/PKGBUILD create mode 100644 testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install create mode 100644 testing/kdeaccessibility-kmouth/PKGBUILD create mode 100644 testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install create mode 100644 testing/kdeadmin/PKGBUILD create mode 100644 testing/kdeadmin/kdeadmin.install create mode 100644 testing/kdeadmin/syslog-path.patch create mode 100644 testing/kdeartwork/PKGBUILD create mode 100644 testing/kdebase-konsole/PKGBUILD create mode 100644 testing/kdebase-workspace/PKGBUILD create mode 100644 testing/kdebase-workspace/fixpath.patch create mode 100644 testing/kdebase-workspace/kde-np.pam create mode 100644 testing/kdebase-workspace/kde.pam create mode 100644 testing/kdebase-workspace/kdebase-workspace.install create mode 100644 testing/kdebase-workspace/kdm create mode 100644 testing/kdebase-workspace/kdm-xinitrd.patch create mode 100644 testing/kdebase-workspace/kscreensaver.pam create mode 100644 testing/kdebase-workspace/terminate-server.patch create mode 100644 testing/kdebase/PKGBUILD create mode 100644 testing/kdebase/fix-controlclick-selection.patch create mode 100644 testing/kdebase/kdebase-dolphin.install create mode 100644 testing/kdebase/kdebase-konqueror.install create mode 100644 testing/kdebase/kdebase.install create mode 100644 testing/kdebindings-kimono/PKGBUILD create mode 100644 testing/kdebindings-kross/PKGBUILD create mode 100644 testing/kdebindings-perlkde/PKGBUILD create mode 100644 testing/kdebindings-perlqt/PKGBUILD create mode 100644 testing/kdebindings-python/PKGBUILD create mode 100644 testing/kdebindings-qtruby/PKGBUILD create mode 100644 testing/kdebindings-qyoto/PKGBUILD create mode 100644 testing/kdebindings-smokegen/PKGBUILD create mode 100644 testing/kdebindings-smokekde/PKGBUILD create mode 100644 testing/kdebindings-smokeqt/PKGBUILD create mode 100644 testing/kdeedu-analitza/PKGBUILD create mode 100644 testing/kdeedu-blinken/PKGBUILD create mode 100644 testing/kdeedu-blinken/kdeedu-blinken.install create mode 100644 testing/kdeedu-cantor/PKGBUILD create mode 100644 testing/kdeedu-cantor/kdeedu-cantor.install create mode 100644 testing/kdeedu-kalgebra/PKGBUILD create mode 100644 testing/kdeedu-kalgebra/kdeedu-kalgebra.install create mode 100644 testing/kdeedu-kalzium/PKGBUILD create mode 100644 testing/kdeedu-kalzium/kdeedu-kalzium.install create mode 100644 testing/kdeedu-kanagram/PKGBUILD create mode 100644 testing/kdeedu-kanagram/kdeedu-kanagram.install create mode 100644 testing/kdeedu-kbruch/PKGBUILD create mode 100644 testing/kdeedu-kbruch/kdeedu-kbruch.install create mode 100644 testing/kdeedu-kgeography/PKGBUILD create mode 100644 testing/kdeedu-kgeography/kdeedu-kgeography.install create mode 100644 testing/kdeedu-khangman/PKGBUILD create mode 100644 testing/kdeedu-khangman/kdeedu-khangman.install create mode 100644 testing/kdeedu-kig/PKGBUILD create mode 100644 testing/kdeedu-kig/kdeedu-kig.install create mode 100644 testing/kdeedu-kiten/PKGBUILD create mode 100644 testing/kdeedu-kiten/kdeedu-kiten.install create mode 100644 testing/kdeedu-klettres/PKGBUILD create mode 100644 testing/kdeedu-klettres/kdeedu-klettres.install create mode 100644 testing/kdeedu-kmplot/PKGBUILD create mode 100644 testing/kdeedu-kmplot/kdeedu-kmplot.install create mode 100644 testing/kdeedu-kstars/PKGBUILD create mode 100644 testing/kdeedu-kstars/kdeedu-kstars.install create mode 100644 testing/kdeedu-ktouch/PKGBUILD create mode 100644 testing/kdeedu-ktouch/kdeedu-ktouch.install create mode 100644 testing/kdeedu-kturtle/PKGBUILD create mode 100644 testing/kdeedu-kturtle/kdeedu-kturtle.install create mode 100644 testing/kdeedu-kwordquiz/PKGBUILD create mode 100644 testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install create mode 100644 testing/kdeedu-marble/PKGBUILD create mode 100644 testing/kdeedu-marble/kdeedu-marble.install create mode 100644 testing/kdeedu-parley/PKGBUILD create mode 100644 testing/kdeedu-parley/kdeedu-parley.install create mode 100644 testing/kdeedu-rocs/PKGBUILD create mode 100644 testing/kdeedu-step/PKGBUILD create mode 100644 testing/kdeedu-step/kdeedu-step.install create mode 100644 testing/kdegames/PKGBUILD create mode 100644 testing/kdegames/kdegames-kbattleship.install create mode 100644 testing/kdegames/kdegames-kfourinline.install create mode 100644 testing/kdegames/kdegames-kigo.install create mode 100644 testing/kdegames/kdegames-kolf.install create mode 100644 testing/kdegames/kdegames-kpatience.install create mode 100644 testing/kdegames/kdegames-kreversi.install create mode 100644 testing/kdegames/kdegames-kspaceduel.install create mode 100644 testing/kdegames/kdegames-ksquares.install create mode 100644 testing/kdegames/kdegames-ktuberling.install create mode 100644 testing/kdegames/kdegames-lskat.install create mode 100644 testing/kdegames/kdegames-palapeli.install create mode 100644 testing/kdegames/kdegames.install create mode 100644 testing/kdegraphics-gwenview/PKGBUILD create mode 100644 testing/kdegraphics-gwenview/kdegraphics-gwenview.install create mode 100644 testing/kdegraphics-kamera/PKGBUILD create mode 100644 testing/kdegraphics-kcolorchooser/PKGBUILD create mode 100644 testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install create mode 100644 testing/kdegraphics-kgamma/PKGBUILD create mode 100644 testing/kdegraphics-kolourpaint/PKGBUILD create mode 100644 testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install create mode 100644 testing/kdegraphics-kruler/PKGBUILD create mode 100644 testing/kdegraphics-kruler/kdegraphics-kruler.install create mode 100644 testing/kdegraphics-ksaneplugin/PKGBUILD create mode 100644 testing/kdegraphics-ksnapshot/PKGBUILD create mode 100644 testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install create mode 100644 testing/kdegraphics-mobipocket/PKGBUILD create mode 100644 testing/kdegraphics-mobipocket/kdegraphics-mobipocket.install create mode 100644 testing/kdegraphics-okular/PKGBUILD create mode 100644 testing/kdegraphics-okular/kdegraphics-okular.install create mode 100644 testing/kdegraphics-strigi-analyzer/PKGBUILD create mode 100644 testing/kdegraphics-svgpart/PKGBUILD create mode 100644 testing/kdegraphics-thumbnailers/PKGBUILD create mode 100644 testing/kdemultimedia/PKGBUILD create mode 100644 testing/kdemultimedia/kdemultimedia-dragonplayer.install create mode 100644 testing/kdemultimedia/kdemultimedia.install create mode 100644 testing/kdemultimedia/mplayerthumbs.config create mode 100644 testing/kdenetwork/PKGBUILD create mode 100644 testing/kdenetwork/kdenetwork-kget.install create mode 100644 testing/kdenetwork/kdenetwork-kopete.install create mode 100644 testing/kdenetwork/kdenetwork-kppp.install create mode 100644 testing/kdenetwork/kdenetwork.install create mode 100644 testing/kdepim-runtime/PKGBUILD create mode 100644 testing/kdepim-runtime/kdepim-runtime.install create mode 100644 testing/kdepim/PKGBUILD create mode 100644 testing/kdepim/kdepim-kleopatra.install create mode 100644 testing/kdepim/kdepim-kmail.install create mode 100644 testing/kdepim/kdepim-korganizer.install create mode 100644 testing/kdepim/kdepim.install create mode 100644 testing/kdepimlibs/PKGBUILD create mode 100644 testing/kdepimlibs/kdepimlibs.install create mode 100644 testing/kdeplasma-addons/PKGBUILD create mode 100644 testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install create mode 100644 testing/kdeplasma-addons/kdeplasma-addons-applets.install create mode 100644 testing/kdesdk-kate/PKGBUILD create mode 100644 testing/kdesdk-kate/kdebase-kwrite.install create mode 100644 testing/kdesdk-kate/kdesdk-kate.install create mode 100644 testing/kdesdk-kate/pkgbuild-syntax-highlight.patch create mode 100644 testing/kdesdk/PKGBUILD create mode 100644 testing/kdesdk/fix-python2-path.patch create mode 100644 testing/kdesdk/kdesdk-cervisia.install create mode 100644 testing/kdesdk/kdesdk-kcachegrind.install create mode 100644 testing/kdesdk/kdesdk-kompare.install create mode 100644 testing/kdesdk/kdesdk-kuiviewer.install create mode 100644 testing/kdesdk/kdesdk-lokalize.install create mode 100644 testing/kdesdk/kdesdk-okteta.install create mode 100644 testing/kdesdk/kdesdk-umbrello.install create mode 100644 testing/kdesdk/kdesdk.install create mode 100644 testing/kdetoys/PKGBUILD create mode 100644 testing/kdetoys/kdetoys.install create mode 100644 testing/kdeutils-filelight/PKGBUILD create mode 100644 testing/kdeutils-filelight/kdeutils-filelight.install create mode 100644 testing/kdeutils-kcalc/PKGBUILD create mode 100644 testing/kdeutils-kcalc/kdeutils-kcalc.install create mode 100644 testing/kdeutils-kcharselect/PKGBUILD create mode 100644 testing/kdeutils-kdf/PKGBUILD create mode 100644 testing/kdeutils-kdf/kdeutils-kdf.install create mode 100644 testing/kdeutils-kfloppy/PKGBUILD create mode 100644 testing/kdeutils-kfloppy/kdeutils-kfloppy.install create mode 100644 testing/kdeutils-kgpg/PKGBUILD create mode 100644 testing/kdeutils-kgpg/kdeutils-kgpg.install create mode 100644 testing/kdeutils-kremotecontrol/PKGBUILD create mode 100644 testing/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install create mode 100644 testing/kdeutils-ksecrets/PKGBUILD create mode 100644 testing/kdeutils-ksecrets/kdeutils-ksecrets.install create mode 100644 testing/kdeutils-ktimer/PKGBUILD create mode 100644 testing/kdeutils-ktimer/kdeutils-ktimer.install create mode 100644 testing/kdeutils-kwallet/PKGBUILD create mode 100644 testing/kdeutils-kwallet/kdeutils-kwallet.install create mode 100644 testing/kdeutils-printer-applet/PKGBUILD create mode 100644 testing/kdeutils-superkaramba/PKGBUILD create mode 100644 testing/kdeutils-superkaramba/kdeutils-superkaramba.install create mode 100644 testing/kdeutils-sweeper/PKGBUILD create mode 100644 testing/kdewebdev/PKGBUILD create mode 100644 testing/kdewebdev/kdewebdev-kimagemapeditor.install create mode 100644 testing/kdewebdev/kdewebdev.install create mode 100644 testing/libkdcraw/PKGBUILD create mode 100644 testing/libkdcraw/libkdcraw.install create mode 100644 testing/libkdeedu/PKGBUILD create mode 100644 testing/libkdeedu/libkdeedu.install create mode 100644 testing/libkexiv2/PKGBUILD create mode 100644 testing/libkipi/PKGBUILD create mode 100644 testing/libkipi/libkipi.install create mode 100644 testing/libksane/PKGBUILD create mode 100644 testing/libksane/libksane.install (limited to 'extra') diff --git a/community-staging/coq/PKGBUILD b/community-staging/coq/PKGBUILD new file mode 100644 index 000000000..15223d9d4 --- /dev/null +++ b/community-staging/coq/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: George Giorgidze + +pkgname=coq +pkgver=8.3pl3 +pkgrel=2 +pkgdesc='Formal proof management system.' +arch=('i686' 'x86_64') +url='http://coq.inria.fr/' +license=('GPL') +options=('!emptydirs') +depends=('gtk2' 'lablgtk2' 'ocaml') +makedepends=('camlp5-transitional' 'netpbm' 'hevea') +source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz") +md5sums=('37e9a52110a025128667c03fed75f9c2') + +build() { + cd coq-${pkgver} + + ./configure \ + -prefix '/usr' \ + -mandir '/usr/share/man' \ + -opt \ + -with-doc yes + + make world + + make doc-html +} + +package() { + cd coq-${pkgver} + + make COQINSTALLPREFIX=${pkgdir} install + + make COQINSTALLPREFIX=${pkgdir} install-doc-html +} diff --git a/community-staging/luakit/PKGBUILD b/community-staging/luakit/PKGBUILD new file mode 100644 index 000000000..e92f5a99f --- /dev/null +++ b/community-staging/luakit/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: J. W. Birdsong + +pkgname=luakit +pkgver=2011.07.22 +pkgrel=3 +pkgdesc='Highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit. "Stable" release.' +arch=('i686' 'x86_64') +url='http://www.luakit.org/projects/luakit' +license=('GPL3') +depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils') +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}-r1") +md5sums=('4937deb6bc81416e2deb037f4a5763e4') + +build() { + cd mason-larobina-luakit-* + + # Add missing library to PKGS in config.mk + sed -i 's|PKGS := .*|& javascriptcoregtk-1.0|' config.mk + + make PREFIX=/usr DESTDIR=${pkgdir} all +} + +package() { + cd mason-larobina-luakit-* + + make PREFIX=/usr DESTDIR=${pkgdir} install +} diff --git a/community-staging/luakit/luakit.install b/community-staging/luakit/luakit.install new file mode 100644 index 000000000..2c37d0597 --- /dev/null +++ b/community-staging/luakit/luakit.install @@ -0,0 +1,14 @@ +post_install() { + echo 'Configs are located in /etc/xdg/luakit/*.lua' + echo 'Copy to ~/.config/luakit/ (this folder is created on 1st start of Luakit) for local config.' + echo 'Or edit in place for global changes.' + echo 'You NEED to replace local configs after each update' +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + post_upgrade +} diff --git a/community-staging/nestopia/ChangeLog b/community-staging/nestopia/ChangeLog new file mode 100644 index 000000000..5077d00b2 --- /dev/null +++ b/community-staging/nestopia/ChangeLog @@ -0,0 +1,12 @@ +2008-12-16 Tiago Pierezan Camargo + + * PKGBUILD: Minor corrections. + +2008-12-04 Tiago Pierezan Camargo + + * PKGBUILD (source): Package adopted. + Variable/version cleanup. + Patch to remove bogus error messages on program exit. + New dependency: mesa. + Renamed executable to nestopia. + diff --git a/community-staging/nestopia/PKGBUILD b/community-staging/nestopia/PKGBUILD new file mode 100644 index 000000000..0c3429e04 --- /dev/null +++ b/community-staging/nestopia/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 62377 2012-01-19 18:15:07Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Tiago Pierezan Camargo +# Contributor: robb_force + +pkgname=nestopia +pkgver=1.40h +pkgrel=5 +pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' +url='http://rbelmont.mameworld.info/?page_id=200' +license=('GPL') +arch=('i686' 'x86_64') +depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa') +makedepends=('unzip') +# rbelmont.mameworld.info blocks some user-agents +DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') +source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip" + "http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip" + "nestopia" + "nestopia_bogus_error_on_save_settings.patch") +md5sums=('526c99a06d2b257135e7047b0ed95ae0' + 'f9a9a905bada67e11dac1364612d0b35' + 'abc2f030dd291f58d65c9095ef024225' + '0160078c9afcbb1a6ac389c3989929f7') + +build() { + cd ${srcdir} + # remove a bogus error message on exit + patch -p0 < nestopia_bogus_error_on_save_settings.patch + make -j1 + + # Install the nestopia script that copies required files to ~/.nestopia + install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname} + + # Older releases used a .sh file. Make a symlink to make everyone happy + cd ${pkgdir}/usr/bin + ln -s ${pkgname} ${pkgname}.sh + + # Install the required files and executable in /usr/share + cd ${srcdir} + install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin + install -dm775 ${pkgdir}/usr/share/${pkgname}/ + install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/ + install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/ +} diff --git a/community-staging/nestopia/nestopia b/community-staging/nestopia/nestopia new file mode 100644 index 000000000..52bd2b2b3 --- /dev/null +++ b/community-staging/nestopia/nestopia @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ ! -e $HOME/.nestopia ]; then + echo "Running NEStopia for the first time..." + echo "Copying required files to ~/.nestopia..." + mkdir $HOME/.nestopia + cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/ +fi + +nestopia-bin "$@" diff --git a/community-staging/nestopia/nestopia_bogus_error_on_save_settings.patch b/community-staging/nestopia/nestopia_bogus_error_on_save_settings.patch new file mode 100644 index 000000000..63f33bc72 --- /dev/null +++ b/community-staging/nestopia/nestopia_bogus_error_on_save_settings.patch @@ -0,0 +1,11 @@ +--- source/linux/settings.cpp.old 2008-10-23 05:45:58.000000000 +0200 ++++ source/linux/settings.cpp 2008-12-04 23:17:59.000000000 +0100 +@@ -16,7 +16,7 @@ + using namespace LinuxNst; + + #define READ_SETTING(x) fread(&x, sizeof(x), 1, f) +-#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n" ++#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n" + + static int rates[4] = { 11025, 22050, 44100, 48000 }; + diff --git a/community-staging/nvclock/PKGBUILD b/community-staging/nvclock/PKGBUILD new file mode 100644 index 000000000..509837a56 --- /dev/null +++ b/community-staging/nvclock/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 62728 2012-01-25 08:47:31Z lfleischer $ +# Maintainer: Lukas Fleischer +# Contributor: Markus Meissner +# Contributor: Andreas Radke + +pkgname=nvclock +pkgver=0.8b4 +pkgrel=3 +pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.' +arch=('i686' 'x86_64') +url='http://www.linuxhardware.org/nvclock/' +license=('GPL') +depends=('gtk2') +optdepends=('gksu: to start nvclock via the desktop menu entry') +install='nvclock.install' +options=('!makeflags') +source=("http://www.linuxhardware.org/${pkgname}/${pkgname}${pkgver}.tar.gz" + 'nvclock-0.8b4-buildfix.patch' + 'nvclock-0.8b4-linkfix.patch' + 'nvclock.desktop-use-gksu.patch') +md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11' + '1da24b50dd6a8c4704fa550a3e1a8b53' + 'b812646787ea44e693fd2288612f25ad' + '98fc1995721d0b0e8ff6d448869eee6d') + +build(){ + cd "${srcdir}/${pkgname}${pkgver}" + + # build and link fixes from Fedora + patch -Np1 -i "${srcdir}/nvclock-0.8b4-buildfix.patch" + patch -Np1 -i "${srcdir}/nvclock-0.8b4-linkfix.patch" + + # Make ".desktop" file use gksu(1). + patch -Np0 -i "${srcdir}/nvclock.desktop-use-gksu.patch" + + sed -i 's:${prefix}/man:${prefix}\/share\/man:' "${srcdir}/${pkgname}${pkgver}/Makefile.in" + + ./configure --prefix=/usr --bindir=/usr/bin + make +} + +package() { + cd "${srcdir}/${pkgname}${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/nvclock/nvclock-0.8b4-buildfix.patch b/community-staging/nvclock/nvclock-0.8b4-buildfix.patch new file mode 100644 index 000000000..cdc9f5c88 --- /dev/null +++ b/community-staging/nvclock/nvclock-0.8b4-buildfix.patch @@ -0,0 +1,16 @@ +diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in +--- nvclock0.8b4.orign/src/Makefile.in 2009-01-03 18:02:54.000000000 +0100 ++++ nvclock0.8b4/src/Makefile.in 2009-01-07 11:37:39.000000000 +0100 +@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app + install: install-recursive install-app + install-app: + mkdir -p $(bindir) +- $(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock +- $(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer ++ $(INSTALL) -c nvclock $(bindir)/nvclock ++ $(INSTALL) -c smartdimmer $(bindir)/smartdimmer + + + uninstall: uninstall-recursive uninstall-app + + diff --git a/community-staging/nvclock/nvclock-0.8b4-linkfix.patch b/community-staging/nvclock/nvclock-0.8b4-linkfix.patch new file mode 100644 index 000000000..0029d1c74 --- /dev/null +++ b/community-staging/nvclock/nvclock-0.8b4-linkfix.patch @@ -0,0 +1,18 @@ +diff -upNr nvclock0.8b4.orign/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in +--- nvclock0.8b4.orign/src/gtk/Makefile.in 2008-05-11 12:25:46.000000000 +0200 ++++ nvclock0.8b4/src/gtk/Makefile.in 2010-02-13 19:56:24.204078277 +0100 +@@ -20,12 +20,12 @@ endif + ifeq ($(HAVE_NVCONTROL), yes) + DEPS=$(libbackend) $(libnvcontrol) + INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. -I../.. +- LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol ++ LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -lX11 -lXext -ldl + OBJECTS=banner.o gl.o hw.o main.o settings.o + else + DEPS=$(libbackend) + INCLUDES=-I./backend -I./nvcontrol -I.. -I../.. +- LIBS=@GTK_LIBS@ -L../backend -lbackend ++ LIBS=@GTK_LIBS@ -L../backend -lbackend -lX11 -lXext -ldl + OBJECTS=banner.o hw.o main.o settings.o + endif + diff --git a/community-staging/nvclock/nvclock.desktop-use-gksu.patch b/community-staging/nvclock/nvclock.desktop-use-gksu.patch new file mode 100644 index 000000000..a372f5de8 --- /dev/null +++ b/community-staging/nvclock/nvclock.desktop-use-gksu.patch @@ -0,0 +1,11 @@ +--- nvclock.desktop.orig 2011-01-16 15:15:55.764977836 +0100 ++++ nvclock.desktop 2011-01-16 15:16:07.827408839 +0100 +@@ -2,7 +2,7 @@ + Encoding=UTF-8 + Name=NVCLOCK + Comment=Overclock and Monitor NVIDIA cards +-Exec=nvclock_gtk ++Exec=gksu nvclock_gtk + Icon=nvclock.png + Terminal=false + Type=Application diff --git a/community-staging/nvclock/nvclock.install b/community-staging/nvclock/nvclock.install new file mode 100644 index 000000000..d59dca6e8 --- /dev/null +++ b/community-staging/nvclock/nvclock.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-staging/prboom/PKGBUILD b/community-staging/prboom/PKGBUILD new file mode 100644 index 000000000..37f3f5537 --- /dev/null +++ b/community-staging/prboom/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 62722 2012-01-25 08:09:55Z lfleischer $ +# Maintainer: Lukas Fleischer +# Contributor: Thayer Williams +# Contributor: dale + +pkgname=prboom +pkgver=2.5.0 +pkgrel=6 +pkgdesc='A game engine which provides a program to play Doom levels.' +url='http://prboom.sourceforge.net/' +license=('GPL2') +arch=('i686' 'x86_64') +depends=('libpng' 'mesa' 'sdl_mixer' 'sdl_net') +source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" + 'libpng-1.4.patch') +md5sums=('a8a15f61fa2626ab98051ab2703378c4' + 'ba53474db8e747035ca2320a445e4ae0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../libpng-1.4.patch + + ./configure --prefix=/usr --disable-i386-asm + sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + diff --git a/community-staging/prboom/libpng-1.4.patch b/community-staging/prboom/libpng-1.4.patch new file mode 100644 index 000000000..a2215e37b --- /dev/null +++ b/community-staging/prboom/libpng-1.4.patch @@ -0,0 +1,21 @@ +diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c +--- prboom-2.5.0-orig/src/SDL/i_sshot.c 2010-01-24 23:26:03.000000000 -0500 ++++ prboom-2.5.0/src/SDL/i_sshot.c 2010-01-24 23:28:42.000000000 -0500 +@@ -231,7 +231,7 @@ + if (fp) + { + png_struct *png_ptr = png_create_write_struct( +- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); ++ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); + + if (png_ptr) + { +@@ -279,7 +279,7 @@ + break; + } + } +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + } + fclose(fp); + } diff --git a/community-staging/sage-mathematics/PKGBUILD b/community-staging/sage-mathematics/PKGBUILD new file mode 100644 index 000000000..4b4dff9ad --- /dev/null +++ b/community-staging/sage-mathematics/PKGBUILD @@ -0,0 +1,105 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Osman Ugus +# Contributor: Stefan Husmann +# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD + +pkgname=sage-mathematics +pkgver=4.7.2 +pkgrel=3 +pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' +url='http://www.sagemath.org' +arch=('i686' 'x86_64') +license=('GPL') +#depends=('readline') +depends=('ppl') +makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core') +optdepends=('imagemagick: some plotting functionality benefits from it' + 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' + 'sage-mathematics-spkgs: original packages used to build additional packages') +options=('!makeflags') +install="${pkgname}.install" +source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" + 'SAGE-notebook.desktop') +md5sums=('b3073997e6c7ec00a269f84ff2e54973' + 'dc391f12b7d17dd37326343ec0e99bbd') + +build() { + cd sage-${pkgver} + + # modularization of sage, sort of :) + # fixes the following error: + # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook + # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash + # this is for people who have custom kernels (sage works this around by checking uname -r) + #mkdir -p spkg/installed + #touch spkg/installed/readline-6.1 + mkdir -p spkg/installed + touch spkg/installed/ppl-0.11.2 + + # fix "missing sage.all error" during build + unset CFLAGS + unset CXXFLAGS + + # fix build errors + unset LDFLAGS + + # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS + export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') + export MAKE="make -j${SAGE_BUILD_THREADS}" + + # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran + export SAGE_FORTRAN='/usr/bin/gfortran' + export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so' + + # disable building with debugging support + export SAGE_DEBUG='no' + + # enable fat binaries (disables processor specific optimizations) + # comment out if you're only building it for yourself + export SAGE_FAT_BINARY='yes' + + # can't write to root in a clean chroot + export DOT_SAGE='/build/src/' + + # only build sage, no documents + #make build + make +} + +<< COMMENT +check() { + cd sage-${pkgver} + + # uncomment if we want to run all the tests (warning: very long) + #make ptestlong +} +COMMENT + +package() { + cd sage-${pkgver} + + # cp because make install is experimental and will corrupt the install + install -d ${pkgdir}/opt/sage + cp -r * ${pkgdir}/opt/sage + + # move SageTeX files to more appropriate directory + install -d ${pkgdir}/usr/share + mv ${pkgdir}/opt/sage/local/share/texmf \ + ${pkgdir}/usr/share + + desktop-file-install ${srcdir}/SAGE-notebook.desktop \ + --dir ${pkgdir}/usr/share/applications + + # create link to main binary + install -d ${pkgdir}/usr/bin + ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage + + # remove build logs + rm -f ${pkgdir}/opt/sage/install.log + rm -rf ${pkgdir}/opt/sage/spkg/logs + + # remove source packages, since they are rarely needed, they are 300mb in size (compressed) + # no need to package them together, put into sage-mathematics-spkgs + rm -f ${pkgdir}/opt/sage/spkg/base/*spkg + rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg +} diff --git a/community-staging/sage-mathematics/SAGE-notebook.desktop b/community-staging/sage-mathematics/SAGE-notebook.desktop new file mode 100644 index 000000000..26a35d3ac --- /dev/null +++ b/community-staging/sage-mathematics/SAGE-notebook.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Version=1.0 +Name=SAGE +Comment=SAGE NOTEBOOK +Comment[en_US]=SAGE NOTEBOOK +Exec=/opt/sage/sage -notebook +GenericName= +GenericName[de]= +Icon=/opt/sage/data/extcode/notebook/images/sageicon.png +MimeType= +Name[de]=SAGE +StartupNotify=true +Terminal=true +Type=Application +Categories=Science;Math; +X-DCOP-ServiceType= +X-KDE-SubstituteUID=false +X-KDE-Username= +GenericName[en_US]= diff --git a/community-staging/sage-mathematics/sage-mathematics.install b/community-staging/sage-mathematics/sage-mathematics.install new file mode 100644 index 000000000..6caa5299e --- /dev/null +++ b/community-staging/sage-mathematics/sage-mathematics.install @@ -0,0 +1,56 @@ +post_install() { + cd /opt/sage + + # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership + # the files it writes to ~/.sage can be safely ignored + HOME=/tmp ./sage -c + + # add sagemath user for the daemon + useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath + + # Update LaTeX db to point to SageTeX + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + else + echo 'Warning: could not find /usr/bin/texhash' + echo 'SageTeX has been installed but you need to run:' + echo '# texhash /usr/share/texmf' + echo 'So that LaTeX will be able to find it.' + fi + +echo ' + ___ +/ (_) o | +\__ _ _ __ | +/ / |/ | | / \_| | | +\___/ | |_/|/\__/ \_/|/o + /| /| + \| \| + ________________________________ +< sage-mathematics, I mean, MOO! > + -------------------------------- + \ ^__^ + \ (oo)\_______ + (__)\ )\/\ + ||----w | + || || +' + +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + # Update LaTeX db to remove SageTeX entries + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + fi + + # remove the sagemath daemon user + userdel sagemath + + # clean up left overs + rm -rf /opt/sage +} diff --git a/community-staging/torcs/PKGBUILD b/community-staging/torcs/PKGBUILD index e24b071bc..b8bd4a905 100644 --- a/community-staging/torcs/PKGBUILD +++ b/community-staging/torcs/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 62516 2012-01-20 09:52:55Z spupykin $ +# $Id: PKGBUILD 62730 2012-01-25 09:04:37Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Shahar Weiss pkgname=torcs -pkgver=1.3.2_test2 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") arch=('i686' 'x86_64') -depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'torcs-data' - 'libvorbis') +depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis') makedepends=('plib') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 torcs.desktop torcs-gcc.patch) -md5sums=('7851c1149587451bd64a6a55d785af40' +md5sums=('254b8f4c14d067dd63da8d54d3cfdba8' '328e419e9f985c3e7b69924fe299330d' '5ae7e903df37300d3b8744328c756bff') @@ -28,6 +27,7 @@ build() { } package() { + depends=(${depends[@]} "torcs-data=$pkgver") cd $srcdir/$pkgname-${pkgver/_/-} make DESTDIR=${pkgdir} install install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png diff --git a/community/alsa-tools/PKGBUILD b/community/alsa-tools/PKGBUILD index 1e097048e..c49246f5d 100644 --- a/community/alsa-tools/PKGBUILD +++ b/community/alsa-tools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59642 2011-11-28 23:44:29Z seblu $ +# $Id: PKGBUILD 62752 2012-01-25 20:12:30Z seblu $ #Maintainer: Sebastien Luttringer #Contributor: Jochen Immend�rfer pkgname=alsa-tools -pkgver=1.0.24.1 +pkgver=1.0.25 pkgrel=1 pkgdesc='ALSA tools package' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL2') depends=('fltk' 'alsa-lib' 'gtk2') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2") -md5sums=('08fe93a12006093e590d7ecc02b119dd') +md5sums=('57bfec98a814d12e0f7ab379aaeccd87') build() { for f in $(find "$srcdir/$pkgname-$pkgver" -type f -name configure ); do diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 1320b04d8..1ea5f1978 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58389 2011-11-12 17:16:28Z ibiru $ +# $Id: PKGBUILD 62726 2012-01-25 08:16:40Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Alexey Yakovenko pkgname=deadbeef pkgver=0.5.1 -pkgrel=3 +pkgrel=4 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64') url='http://deadbeef.sourceforge.net' @@ -32,11 +32,18 @@ optdepends=('libsamplerate: for Resampler plugin' 'libzip: for vfs_zip plugin') options=('!libtool') install='deadbeef.install' -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch") +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch' + 'deadbeef-0.5.1-ffmpeg-version-check-fix.patch') +md5sums=('be8359d1bd9cf7679cf2ca748996e726' + 'd1c913c0ccefef33012732cf0ae49f7f' + '6d22855f61f4d2fea4b343dca76d5e85') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/ffmpeg.patch + + patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch + patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-version-check-fix.patch ./configure --prefix=/usr make @@ -47,5 +54,3 @@ package () { make prefix="${pkgdir}/usr" install } -md5sums=('be8359d1bd9cf7679cf2ca748996e726' - '6cc7623734af310095534c361c9f64e8') diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch new file mode 100644 index 000000000..db1c79638 --- /dev/null +++ b/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch @@ -0,0 +1,118 @@ +From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001 +From: Igor Murzov +Date: Mon, 4 Jul 2011 16:47:25 +0400 +Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT() + +For ffmpeg < 0.5. Copied from libavutil 0.5. + +ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc + +fixes build with lavc 53. + +ffmpeg: fix erroneous version comparisons + +Comparing versions this way: (x.y < x1.y1) is obviously equivalent to +(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1). + +ffmpeg: use av_register_protocol2() if available + +fixes usage with ffmpeg-0.8 +--- + plugins/ffmpeg/ffmpeg.c | 37 ++++++++++++++++++++++++++++++------- + 1 files changed, 30 insertions(+), 7 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index cd7edf4..0cb9955 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -44,6 +44,10 @@ + #define av_register_protocol register_protocol + #endif + ++#ifndef AV_VERSION_INT ++#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) ++#endif ++ + #endif + + //#define trace(...) { fprintf(stderr, __VA_ARGS__); } +@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { + for (i = 0; i < info->fctx->nb_streams; i++) + { + info->ctx = info->fctx->streams[i]->codec; +- if (info->ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (info->ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + info->codec = avcodec_find_decoder (info->ctx->codec_id); + if (info->codec != NULL) { +@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) { + int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; + int len; + //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size); +-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25) +- len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); +-#else ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0) + len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt); ++#else ++ len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); + #endif + trace ("out: out_size=%d, len=%d\n", out_size, len); + if (len <= 0) { +@@ -418,7 +427,7 @@ static const char *map[] = { + + static int + ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) { +-#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43 ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0) + if (!strlen (fctx->title)) { + // title is empty, this call will set track title to filename without extension + deadbeef->pl_add_meta (it, "title", NULL); +@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams +@@ -704,7 +718,11 @@ ffmpeg_start (void) { + ffmpeg_init_exts (); + avcodec_init (); + av_register_all (); ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); ++#else + av_register_protocol (&vfswrapper); ++#endif + return 0; + } + +@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) { + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL) +-- +1.7.8.4 + diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch new file mode 100644 index 000000000..af8c282c0 --- /dev/null +++ b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch @@ -0,0 +1,25 @@ +From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001 +From: Igor Murzov +Date: Thu, 7 Jul 2011 22:31:44 +0400 +Subject: [PATCH 2/2] ffmpeg: version check fix + +--- + plugins/ffmpeg/ffmpeg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c +index 0cb9955..37c7e80 100644 +--- a/plugins/ffmpeg/ffmpeg.c ++++ b/plugins/ffmpeg/ffmpeg.c +@@ -718,7 +718,7 @@ ffmpeg_start (void) { + ffmpeg_init_exts (); + avcodec_init (); + av_register_all (); +-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0) + av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); + #else + av_register_protocol (&vfswrapper); +-- +1.7.8.4 + diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index da38ae549..7cccb9b67 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 58393 2011-11-12 17:16:52Z ibiru $ +# $Id: PKGBUILD 62754 2012-01-25 20:28:55Z ebelanger $ # Maintainer: Eric Bélanger pkgname=electricsheep pkgver=2.7b12 -pkgrel=4 +pkgrel=5 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64') url="http://community.electricsheep.org/" license=('GPL') -depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade') +depends=('curl' 'flam3' 'ffmpeg' 'mplayer' 'libglade') makedepends=('xscreensaver') optdepends=('xscreensaver: to use electricsheep with xscreensaver') source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - electricsheep-ffmpeg.patch) + electricsheep-ffmpeg.patch electricsheep-pref-segfault.patch) sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32' - 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825') + 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825' + 'bdf0f66fdbb5741671e8bb127bd76ef236d0e44a') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch" + patch -p1 -i "${srcdir}/electricsheep-pref-segfault.patch" ./configure --prefix=/usr make } diff --git a/community/electricsheep/PKGBUILD.svn b/community/electricsheep/PKGBUILD.svn new file mode 100644 index 000000000..2fc8a26ff --- /dev/null +++ b/community/electricsheep/PKGBUILD.svn @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 57680 2011-11-01 05:03:57Z ebelanger $ +# Maintainer: Eric Bélanger +# Contributor: Alexander Rødseth +pkgname=electricsheep +pkgver=2.7b34 +pkgrel=1 +pkgdesc="Screensaver that realize the collective dream of computers all over the internet" +arch=('x86_64' 'i686') +url="http://community.electricsheep.org/" +license=('GPL') +depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade' 'tinyxml' 'boost' 'gtk2' 'lua') +#subversion libgtk2.0 libgl1-mesa libavcodec libavformat libswscale liblua5 libcurl4-openssl libxml2 libjpeg8 libgtop2 libboost libboost-filesystem libboost-thread libtinyxml libglut3 +makedepends=('xscreensaver') +optdepends=('xscreensaver: to use electricsheep with xscreensaver') +_fixed_revision=107 + +build() { + cd "$srcdir" + + msg2 "Checking out svn revision $_fixed_revision (in lack of a Linux release for $pkgver)..." + if [[ -d "$pkgname/.svn" ]]; then + (cd "$pkgname" && svn up -r $_fixed_revision) + else + svn co \ + http://electricsheep.googlecode.com/svn/trunk/ \ + --config-dir ./ -r $_fixed_revision "$pkgname" + fi + + msg2 "Setting up build directory..." + rm -rf "$srcdir/$pkgname-build" + cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build" + cd "$srcdir/$pkgname-build/client_generic" + + #patch -p1 -i ../electricsheep-ffmpeg.patch + msg2 "Configuring..." + ./autogen.sh + ./configure --prefix=/usr + + msg2 "Compiling..." + make +} + +package() { + cd "$srcdir/$pkgname-build/client_generic" + + install -d "$pkgdir/usr/share/applications/screensavers" + install -d "$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" + make DESTDIR="$pkgdir" \ + GNOME_SCREENSAVER_DATADIR="$pkgdir/usr/share/applications/screensavers" \ + GNOME_SCREENSAVER_PRIVEXEDIR="$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" \ + install + install -Dm644 electricsheep.desktop.kde \ + "$pkgdir/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" + install -Dm644 electricsheep.xml \ + "$pkgdir/usr/share/xscreensaver/config/electricsheep.xml" + install -Dm755 electricsheep-saver \ + "$pkgdir/usr/bin/electricsheep-saver" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/electricsheep/electricsheep-pref-segfault.patch b/community/electricsheep/electricsheep-pref-segfault.patch new file mode 100644 index 000000000..83bcd8a0f --- /dev/null +++ b/community/electricsheep/electricsheep-pref-segfault.patch @@ -0,0 +1,270 @@ +diff -Naur electricsheep-2.7b12/electricsheep.c electricsheep-2.7~b12+svn20091224/electricsheep.c +--- electricsheep-2.7b12/electricsheep.c 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/electricsheep.c 2009-12-24 18:03:01.000000000 -0500 +@@ -564,6 +566,12 @@ + n++; + } + } ++ if (n < 1) { ++ if (debug) { ++ fprintf(logout, "median rank undefined\n"); ++ } ++ return; ++ } + qsort(tms, n, sizeof(int), compare_ints); + if (0 && debug) { + for (i = 0; i < n; i++) +@@ -1915,7 +1923,7 @@ + if (-1 == (decoder_pid = fork())) { + perror("decoder fork"); + } else if (0 == decoder_pid) { +- char *argv[20]; ++ char *argv[25]; + int c = 0; + /* child */ + snprintf(fps, 24, "%g", prefs.frame_rate); +@@ -1934,6 +1942,7 @@ + cleanup_and_exit(1); + } + argv[c++] = "mplayer"; ++ argv[c++] = "-nolirc"; + argv[c++] = "-cache"; + argv[c++] = "8192"; + argv[c++] = "-really-quiet"; +diff -Naur electricsheep-2.7b12/electricsheep.h electricsheep-2.7~b12+svn20091224/electricsheep.h +--- electricsheep-2.7b12/electricsheep.h 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/electricsheep.h 2009-12-24 18:03:01.000000000 -0500 +@@ -74,4 +74,4 @@ + void init_list_cmd (char *buf); + void get_end_element(void *userData, const char *name); + void character_handler(void *userData, const XML_Char *s, int len); +-char *encry(char *pw); ++char *encry(char *pw, char *nick); +diff -Naur electricsheep-2.7b12/electricsheep-preferences.c electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c +--- electricsheep-2.7b12/electricsheep-preferences.c 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c 2009-12-24 18:03:01.000000000 -0500 +@@ -108,8 +108,9 @@ + prefs.password = strdup(""); + } else { + char *pw = (char*)gtk_entry_get_text(password_entry); ++ pw = strdup(pw); + if (strcmp(pw, pw_marker)) +- prefs.password = encry(pw); ++ prefs.password = encry(pw, prefs.nick); + } + prefs.video_driver = (char*)gtk_entry_get_text(video_driver_entry); + prefs.frame_rate = gtk_spin_button_get_value(frame_rate_spin); +@@ -207,72 +208,72 @@ + void get_widgets(GladeXML *xml) { + title_label = (GtkLabel *) glade_xml_get_widget(xml, "titleLabel"); + if (NULL == title_label) { +- fprintf(stderr, "titleLabel not found\n"); ++ fprintf(logout, "titleLabel not found\n"); + exit(1); + } + test_label = (GtkLabel *) glade_xml_get_widget(xml, "testLabel"); + if (NULL == test_label) { +- fprintf(stderr, "testLabel not found\n"); ++ fprintf(logout, "testLabel not found\n"); + exit(1); + } + test_button = (GtkButton *) glade_xml_get_widget(xml, "testButton"); + if (NULL == test_button) { +- fprintf(stderr, "testButton not found\n"); ++ fprintf(logout, "testButton not found\n"); + exit(1); + } + nick_entry = (GtkEntry *) glade_xml_get_widget(xml, "nickEntry"); + if (NULL == nick_entry) { +- fprintf(stderr, "nickEntry not found\n"); ++ fprintf(logout, "nickEntry not found\n"); + exit(1); + } + url_entry = (GtkEntry *) glade_xml_get_widget(xml, "urlEntry"); + if (NULL == url_entry) { +- fprintf(stderr, "urlEntry not found\n"); ++ fprintf(logout, "urlEntry not found\n"); + exit(1); + } + password_entry = (GtkEntry *) glade_xml_get_widget(xml, "passEntry"); + if (NULL == password_entry) { +- fprintf(stderr, "passEntry not found\n"); ++ fprintf(logout, "passEntry not found\n"); + exit(1); + } + video_driver_entry = (GtkEntry *) glade_xml_get_widget(xml, "vdEntry"); + if (NULL == video_driver_entry) { +- fprintf(stderr, "vdEntry not found\n"); ++ fprintf(logout, "vdEntry not found\n"); + exit(1); + } + frame_rate_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "frameSpin"); + if (NULL == frame_rate_spin) { +- fprintf(stderr, "frameSpin not found\n"); ++ fprintf(logout, "frameSpin not found\n"); + exit(1); + } + nrepeats_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "repeatSpin"); + if (NULL == nrepeats_spin) { +- fprintf(stderr, "repeatSpin not found\n"); ++ fprintf(logout, "repeatSpin not found\n"); + exit(1); + } + cache_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "cacheSpin"); + if (NULL == cache_spin) { +- fprintf(stderr, "cacheSpin not found\n"); ++ fprintf(logout, "cacheSpin not found\n"); + exit(1); + } + no_animation_check = (GtkCheckButton *) glade_xml_get_widget(xml, "noanimCheck"); + if (NULL == no_animation_check) { +- fprintf(stderr, "noanimCheck not found\n"); ++ fprintf(logout, "noanimCheck not found\n"); + exit(1); + } + standalone_check = (GtkCheckButton *) glade_xml_get_widget(xml, "standaloneCheck"); + if (NULL == standalone_check) { +- fprintf(stderr, "standaloneCheck not found\n"); ++ fprintf(logout, "standaloneCheck not found\n"); + exit(1); + } + hide_errors_check = (GtkCheckButton *) glade_xml_get_widget(xml, "hideCheck"); + if (NULL == hide_errors_check) { +- fprintf(stderr, "hideCheck not found\n"); ++ fprintf(logout, "hideCheck not found\n"); + exit(1); + } + save_frames_check = (GtkCheckButton *) glade_xml_get_widget(xml, "saveCheck"); + if (NULL == save_frames_check) { +- fprintf(stderr, "saveCheck not found\n"); ++ fprintf(logout, "saveCheck not found\n"); + exit(1); + } + } +diff -Naur electricsheep-2.7b12/utils.c electricsheep-2.7~b12+svn20091224/utils.c +--- electricsheep-2.7b12/utils.c 2009-07-09 04:10:05.000000000 -0400 ++++ electricsheep-2.7~b12+svn20091224/utils.c 2009-12-24 18:03:01.000000000 -0500 +@@ -69,19 +70,23 @@ + } + } + +-char *encry(char *pw) { ++ ++char *encry(char *pw, char *nick) { ++ static char *salt = "sh33p"; + unsigned char digest[16]; + char md5_pw[33]; ++ char *pw_salted = malloc(strlen(pw) + strlen(salt) + strlen(nick) + 1); + int i, j; +- md5_buffer(pw, strlen(pw), digest); ++ sprintf(pw_salted, "%s%s%s", pw, salt, nick); ++ md5_buffer(pw_salted, strlen(pw_salted), digest); + for (i = 0, j = 0; i < sizeof(digest); i++) { + char *hex_digits = "0123456789ABCDEF"; +- + md5_pw[j++] = hex_digits[digest[i] >> 4]; + md5_pw[j++] = hex_digits[digest[i] & 0x0F]; + } + md5_pw[j] = 0; + free(pw); ++ free(pw_salted); + return strdup(md5_pw); + } + +@@ -97,10 +102,11 @@ + free(prefs->url); + prefs->url = strdup(atts[i+1]); + } else if (!strcmp("password", atts[i])) { +- free(prefs->password); +- prefs->password = encry(strdup(atts[i+1])); ++ free(prefs->password); ++ /* assume nick comes before pw in the xml XXX */ ++ prefs->password = encry(strdup(atts[i+1]), prefs->nick); + } else if (!strcmp("password_md5", atts[i])) { +- free(prefs->password); ++ free(prefs->password); + prefs->password = strdup(atts[i+1]); + } else if (!strcmp("video_driver", atts[i])) { + free(prefs->video_driver); +@@ -133,7 +139,7 @@ + } else if (!strcmp("version", atts[i])) { + // nothing to check + } else { +- fprintf(stderr, "ignoring attribute %s\n", atts[i]); ++ fprintf(logout, "ignoring attribute %s\n", atts[i]); + } + i += 2; + } +@@ -146,7 +152,7 @@ + if (argc > 2) + strcpy(rc_file, argv[2]); + else { +- fprintf(stderr, ++ fprintf(logout, + "%s: --preferences option requires a file name argument.\n", + argv[0]); + exit(1); +@@ -155,7 +161,7 @@ + } + hom = getenv("HOME"); + if (!hom) { +- fprintf(stderr, "%s: HOME envar not defined\n", argv[0]); ++ fprintf(logout, "%s: HOME envar not defined\n", argv[0]); + exit(1); + } + snprintf(rc_file, PATH_MAX, "%s/.electricsheep/preferences.xml", hom); +@@ -281,15 +287,15 @@ + + int mysystem(char *cmd, char *msg) { + int n; +- if (0) fprintf(stderr, "subprocess; (%s)\n", cmd); ++ if (0) fprintf(logout, "subprocess; (%s)\n", cmd); + if (0 != (n = interruptable_system(cmd))) { + if (SIGINT != n) { + if (!prefs.hide_errors) +- fprintf(stderr, "subprocess error: %s, %d=%d<<8+%d\n", ++ fprintf(logout, "subprocess error: %s, %d=%d<<8+%d\n", + msg, n, n>>8, n&255); + return 1; + } +- fprintf(stderr, "control-c during %s, exiting\n", msg); ++ fprintf(logout, "control-c during %s, exiting\n", msg); + cleanup_and_exit(1); + } + return 0; +@@ -325,7 +331,7 @@ + int bytes_read; + void *buff = XML_GetBuffer(parser, XML_BUFF_SIZE); + if (buff == NULL) { +- fprintf(stderr, "unable to allocate buffer.\n"); ++ fprintf(logout, "unable to allocate buffer.\n"); + exit(1); + } + +@@ -334,7 +340,7 @@ + break; + + if (! XML_ParseBuffer(parser, bytes_read, bytes_read == 0)) { +- fprintf(stderr, "parse error.\n"); ++ fprintf(logout, "parse error.\n"); + exit(1); + } + } +@@ -441,7 +447,7 @@ + + void init_curl_cmd(int registration) { + +- if (debug) fprintf(stderr, "init_curl_cmd %d\n", registration); ++ if (debug) fprintf(logout, "init_curl_cmd %d\n", registration); + + if (prefs.proxy_name) { + snprintf(curl_cmd, MAXBUF, "nice -n %d curl --location --proxy %s", +@@ -472,7 +478,7 @@ + } + } + server = dream_server; +- if (debug) fprintf(stderr, "curl_cmd = %s\nserver = %s\n", curl_cmd, server); ++ if (debug) fprintf(logout, "curl_cmd = %s\nserver = %s\n", curl_cmd, server); + } + + void init_list_cmd (char *buf) { diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD new file mode 100644 index 000000000..fcfe064ee --- /dev/null +++ b/community/fceux/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 57567 2011-10-30 20:09:10Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Eric Belanger +# Contributor: Jo Christian Bergskås +pkgname=fceux +pkgver=2.1.5 +pkgrel=3 +arch=('x86_64' 'i686') +url="http://fceux.com/" +pkgdesc="Fast and ultra-compatible NES/Famicom emulator" +license=('GPL') +depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils') +makedepends=('scons' 'mesa' 'lua') +optdepends=('xchm: for viewing the manual') +provides=('fceu' 'gfceux') +replaces=('fceu' 'gfceux') +install=fceux.install +source=("http://downloads.sourceforge.net/fceultra/$pkgname-$pkgver.src.tar.bz2" + "fceux.desktop" + "fceux.png") +md5sums=('e8b20e62bbbb061b1a59d51b47c827bd' + '3c6a259d88825ff1b9387d191a6c970e' + '3fe753731ac46b5fee528b1f73abd3e3') + +build() { + cd "$srcdir/fceu${pkgver}" + + sed -i "s|/usr/local|$pkgdir/usr|" SConstruct + scons OPENGL=0 install +} + +package() { + cd "$srcdir/fceu${pkgver}" + + install -Dm644 bin/$pkgname.chm \ + "$pkgdir/usr/share/doc/$pkgname/$pkgname.chm" + install -Dm644 $srcdir/fceux.desktop \ + "$pkgdir/usr/share/applications/fceux.desktop" + install -Dm644 $srcdir/fceux.png \ + "$pkgdir/usr/share/pixmaps/fceux.png" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/fceux/fceux.desktop b/community/fceux/fceux.desktop new file mode 100644 index 000000000..c20271a77 --- /dev/null +++ b/community/fceux/fceux.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Fceux +GenericName=NES/Famicom emulator +Exec=fceux +Icon=fceux +Type=Application +Categories=Game;Emulator; +Encoding=UTF-8 +MimeType=application/x-nes;application/x-nes-rom diff --git a/community/fceux/fceux.install b/community/fceux/fceux.install new file mode 100644 index 000000000..ad97d7bab --- /dev/null +++ b/community/fceux/fceux.install @@ -0,0 +1,13 @@ +post_upgrade() { + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/fceux/fceux.png b/community/fceux/fceux.png new file mode 100644 index 000000000..1cf27b1fd Binary files /dev/null and b/community/fceux/fceux.png differ diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD new file mode 100644 index 000000000..dec3ed023 --- /dev/null +++ b/community/libee/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 62738 2012-01-25 15:37:48Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Brian Knox + +pkgname=libee +pkgver=0.3.1 +pkgrel=3 +pkgdesc="event expression library inspired by CEE" +url="http://www.libee.org/" +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('libestr') +makedepends=() +optdepends=() +options=(!libtool) +source=("http://www.libee.org/files/download/libee-$pkgver.tar.gz") +md5sums=('61403a9a62b984381cf48454664f915e') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make -j1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/community/libestr/PKGBUILD b/community/libestr/PKGBUILD new file mode 100644 index 000000000..adb612d56 --- /dev/null +++ b/community/libestr/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 62740 2012-01-25 15:38:28Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Brian Knox + +pkgname=libestr +pkgver=0.1.2 +pkgrel=2 +pkgdesc="essentials for string handling (and a bit more)" +url="http://libestr.adiscon.com/" +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=() +options=(!libtool) +source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz") +md5sums=('30ec4054155dc7d7e9b06418181c4f12') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog new file mode 100644 index 000000000..a3097076c --- /dev/null +++ b/community/mednafen/ChangeLog @@ -0,0 +1,6 @@ +2011-05-17 Angel Velasquez + * Updated to 0.8.D.3 + * Removed fix_build patch + * Cleaned PKGBUILD + * Adding ChangeLog + diff --git a/community/mednafen/PKGBUILD b/community/mednafen/PKGBUILD new file mode 100755 index 000000000..88e469afc --- /dev/null +++ b/community/mednafen/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Angel Velasquez +# Contributor: Daenyth +# Contributor: kagan +pkgname=mednafen +pkgver=0.8.D.3 +pkgrel=1 +pkgdesc="A command-line multi-system gaming emulator" +url="http://mednafen.sourceforge.net/" +license=(GPL) +arch=('i686' 'x86_64') +depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib') +makedepends=('pkgconfig' 'mesa') +changelog=ChangeLog +source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2) +md5sums=('57d22805071becd81858b0c088a275e5') + +build() { + cd $srcdir/$pkgname + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname + make DESTDIR=$pkgdir install +} diff --git a/community/nestopia/ChangeLog b/community/nestopia/ChangeLog new file mode 100644 index 000000000..5077d00b2 --- /dev/null +++ b/community/nestopia/ChangeLog @@ -0,0 +1,12 @@ +2008-12-16 Tiago Pierezan Camargo + + * PKGBUILD: Minor corrections. + +2008-12-04 Tiago Pierezan Camargo + + * PKGBUILD (source): Package adopted. + Variable/version cleanup. + Patch to remove bogus error messages on program exit. + New dependency: mesa. + Renamed executable to nestopia. + diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD new file mode 100644 index 000000000..0cff030f3 --- /dev/null +++ b/community/nestopia/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 53185 2011-07-31 19:02:49Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Tiago Pierezan Camargo +# Contributor: robb_force + +pkgname=nestopia +pkgver=1.40h +pkgrel=4 +pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' +url='http://rbelmont.mameworld.info/?page_id=200' +license=('GPL') +arch=('i686' 'x86_64') +depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa') +makedepends=('unzip') +# rbelmont.mameworld.info blocks some user-agents +DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') +source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip" + "http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip" + "nestopia" + "nestopia_bogus_error_on_save_settings.patch") +md5sums=('526c99a06d2b257135e7047b0ed95ae0' + 'f9a9a905bada67e11dac1364612d0b35' + 'abc2f030dd291f58d65c9095ef024225' + '0160078c9afcbb1a6ac389c3989929f7') + +build() { + cd ${srcdir} + # remove a bogus error message on exit + patch -p0 < nestopia_bogus_error_on_save_settings.patch + make -j1 + + # Install the nestopia script that copies required files to ~/.nestopia + install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname} + + # Older releases used a .sh file. Make a symlink to make everyone happy + cd ${pkgdir}/usr/bin + ln -s ${pkgname} ${pkgname}.sh + + # Install the required files and executable in /usr/share + cd ${srcdir} + install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin + install -dm775 ${pkgdir}/usr/share/${pkgname}/ + install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/ + install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/ +} diff --git a/community/nestopia/nestopia b/community/nestopia/nestopia new file mode 100644 index 000000000..52bd2b2b3 --- /dev/null +++ b/community/nestopia/nestopia @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ ! -e $HOME/.nestopia ]; then + echo "Running NEStopia for the first time..." + echo "Copying required files to ~/.nestopia..." + mkdir $HOME/.nestopia + cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/ +fi + +nestopia-bin "$@" diff --git a/community/nestopia/nestopia_bogus_error_on_save_settings.patch b/community/nestopia/nestopia_bogus_error_on_save_settings.patch new file mode 100644 index 000000000..63f33bc72 --- /dev/null +++ b/community/nestopia/nestopia_bogus_error_on_save_settings.patch @@ -0,0 +1,11 @@ +--- source/linux/settings.cpp.old 2008-10-23 05:45:58.000000000 +0200 ++++ source/linux/settings.cpp 2008-12-04 23:17:59.000000000 +0100 +@@ -16,7 +16,7 @@ + using namespace LinuxNst; + + #define READ_SETTING(x) fread(&x, sizeof(x), 1, f) +-#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n" ++#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n" + + static int rates[4] = { 11025, 22050, 44100, 48000 }; + diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 7c6f440b5..0f0d9d4be 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58586 2011-11-16 05:16:04Z spupykin $ +# $Id: PKGBUILD 62750 2012-01-25 18:56:38Z spupykin $ # Maintainer: Sergej Pupykin # Contributer: mpie pkgname=parrot -pkgver=3.10.0 -_rel=devel -#_rel=stable +pkgver=4.0.0 +#_rel=devel +_rel=stable pkgrel=2 pkgdesc="standalone virtual machine that can be used to execute bytecode compiled dynamic languages" arch=(i686 x86_64) @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=(!emptydirs !makeflags) source=(ftp://ftp.parrot.org/pub/parrot/releases/${_rel}/$pkgver/parrot-$pkgver.tar.gz) -md5sums=('36a839beaef511f178b0607a03f1ff0f') +md5sums=('fc613c41771baf79307c519072302299') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 7d098c9b6..f91a9e5d5 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 58329 2011-11-11 14:26:11Z spupykin $ +# $Id: PKGBUILD 62742 2012-01-25 15:39:27Z spupykin $ # Maintainer: Sergej Pupykin pkgname=rsyslog -pkgver=5.8.6 +pkgver=6.2.0 pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') license=('GPL3') -depends=('zlib') +depends=('zlib' 'libestr' 'libee') makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') optdepends=('postgresql-libs: PostgreSQL Database Support' 'libmysqlclient: MySQL Database Support' 'net-snmp' 'gnutls') -backup=('etc/rsyslog.conf' \ +backup=('etc/rsyslog.conf' 'etc/logrotate.d/rsyslog' 'etc/conf.d/rsyslog') options=('strip' 'zipman' '!libtool') @@ -22,13 +22,14 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('c46db0496066b82faf735bd4222208d7' +md5sums=('03e237abaa5d47f92c6e655f92f22532' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') build() { cd ${srcdir}/${pkgname}-${pkgver} + export LDFLAGS="-lestr" ./configure --prefix=/usr \ --enable-mysql \ --enable-pgsql \ diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index e8dcf7cec..7c1f188be 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# $Id: PKGBUILD 62734 2012-01-25 13:50:09Z arodseth $ # Maintainer: Alexander Rødseth pkgname=setconf pkgver=0.3.2 -pkgrel=1 -pkgdesc="Utility to easily change settings in Makefiles and other configuration files" +pkgrel=3 +pkgdesc="Utility to easily change settings in Makefiles and configuration files" arch=('x86_64' 'i686') url="http://setconf.roboticoverlords.org/" license=('GPL') depends=('pcre' 'gc') -makedepends=('shedskin>=0.1.2') +makedepends=('shedskin>=0.9.1') source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") sha256sums=('8b18e11da7adf78f2e21c39cfa949b178fa1b2f85e691b85be123023b7303f03') diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD new file mode 100644 index 000000000..9bb33a812 --- /dev/null +++ b/community/vidalia/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 62747 2012-01-25 18:13:51Z tredaelli $ +# Maintainer: Timothy Redaelli +# Contributor: Rorschach + +pkgname=vidalia +pkgver=0.2.15 +pkgrel=1 +pkgdesc="Controller GUI for Tor" +url="https://www.torproject.org/vidalia" +arch=('i686' 'x86_64') +license=('GPL') +depends=('qt' 'tor') +makedepends=('cmake') +install=vidalia.install +source=("https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz") +md5sums=(845b627eb2534aa5da29efd6c8d30978) + +build() { + [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh + + cd "$srcdir" + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr ../$pkgname-$pkgver + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir/" install + install -Dm644 ../$pkgname-$pkgver/doc/vidalia.1 "$pkgdir"/usr/share/man/man1/vidalia.1 || return 1 +} diff --git a/community/vidalia/vidalia.install b/community/vidalia/vidalia.install new file mode 100644 index 000000000..58b897a0a --- /dev/null +++ b/community/vidalia/vidalia.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index e39cc6cf3..6ce1c9c25 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143109 2011-11-23 02:58:17Z dreisner $ +# $Id: PKGBUILD 147269 2012-01-25 13:57:06Z dreisner $ # Maintainer: Dave Reisner # Contributor: Angel Velasquez # Contributor: Eric Belanger @@ -6,20 +6,19 @@ # Contributor: Daniel J Griffiths pkgname=curl -pkgver=7.23.1 -pkgrel=2 +pkgver=7.24.0 +pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') -makedepends=('perl-libwww') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} fix-J-with-O-regression.patch curlbuild.h) -md5sums=('8e23151f569fb54afef093ac0695077d' - '5d8eb7e2e38be0fb00a043f714f6d49f' +md5sums=('b93420f80a2baaa61a0f45214eddc2ba' + '710242df6bc318d16eea611e7d1b1410' 'aa4539ec4f4a2dad1663dc22dd3ab0a1' '751bd433ede935c8fae727377625a8ae') @@ -33,11 +32,7 @@ case $ptrsize in esac build() { - cd "$srcdir/$pkgname-$pkgver" - - # upstream bugfix - # http://curl.haxx.se/mail/archive-2011-11/0030.html - patch -Np1 < "$srcdir/fix-J-with-O-regression.patch" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ @@ -52,11 +47,12 @@ build() { --without-libidn \ --with-random=/dev/urandom \ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 6bd6f5cac..2a0bdbb2f 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145915 2012-01-04 01:24:59Z allan $ +# $Id: PKGBUILD 147558 2012-01-25 22:42:47Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,8 +6,8 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.6.2 -pkgrel=5 -_snapshot=4.6-20111223 +pkgrel=6 +_snapshot=4.6-20120120 _libstdcppmanver=20111215 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('4755b9f6ac0abecbaa2097ed9738406a' +md5sums=('f7ca5d9f7a07216577f81318b7cf56ef' '450772ce32daed97d7383199f8797f33' '4030ee1c08dd1e843c0225b772360e76' '4df25b623799b148a0703eaeec8fdf3f') @@ -59,11 +59,12 @@ build() { --enable-shared --enable-threads=posix \ --with-system-zlib --enable-__cxa_atexit \ --disable-libunwind-exceptions --enable-clocale=gnu \ + --disable-libstdcxx-pch --enable-libstdcxx-time \ --enable-gnu-unique-object --enable-linker-build-id \ --with-ppl --enable-cloog-backend=isl \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ - --disable-multilib --disable-libssp --disable-libstdcxx-pch \ + --disable-multilib --disable-libssp \ --enable-checking=release make } @@ -144,6 +145,11 @@ package_gcc() install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ + # plugin headers are all over the place at the moment... + for i in common objc pragma pretty-print; do + ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h + done + # POSIX conformance launcher scripts for c89 and c99 cat > $pkgdir/usr/bin/c89 <<"EOF" #!/bin/sh diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 75c87cf45..1be3116b4 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,16 +1,23 @@ -# $Id: PKGBUILD 146703 2012-01-16 19:48:41Z dreisner $ +# $Id: PKGBUILD 147657 2012-01-26 02:44:17Z dreisner $ # Maintainer: Dan McGee + pkgname=libarchive pkgver=3.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.googlecode.com/" license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz") -md5sums=('ca4090f0099432a9ac5a8b6618dc3892') -sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7') +source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" + 'interpret-non-posix-zips.patch' + 'test-with-zip-mtime.patch') +md5sums=('ca4090f0099432a9ac5a8b6618dc3892' + 'f02b88eb10877c7a7d527ed89c662e44' + '8366def6d7d70d424fa28a986c78c015') +sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7' + '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc' + 'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -18,6 +25,12 @@ PKGEXT='.pkg.tar.gz' build() { cd "$srcdir/$pkgname-$pkgver" + # http://code.google.com/p/libarchive/issues/detail?id=225 + patch -Np0 <"$srcdir/interpret-non-posix-zips.patch" + + # http://code.google.com/p/libarchive/issues/detail?id=231 + patch -Np0 <"$srcdir/test-with-zip-mtime.patch" + ./configure --prefix=/usr --without-xml2 make } @@ -25,8 +38,7 @@ build() { check() { cd "$srcdir/$pkgname-$pkgver" - # currently fails on i686 in a minor test involving atime updates (#60) - make check || : + make check } package() { diff --git a/core/libarchive/interpret-non-posix-zips.patch b/core/libarchive/interpret-non-posix-zips.patch new file mode 100644 index 000000000..63bc439d9 --- /dev/null +++ b/core/libarchive/interpret-non-posix-zips.patch @@ -0,0 +1,165 @@ +Index: libarchive/archive_read_support_format_zip.c +=================================================================== +--- libarchive/archive_read_support_format_zip.c (revision 4189) ++++ libarchive/archive_read_support_format_zip.c (revision 4190) +@@ -217,14 +217,13 @@ + } + + /* +- * TODO: This is a performance sink because it forces +- * the read core to drop buffered data from the start +- * of file, which will then have to be re-read again +- * if this bidder loses. ++ * TODO: This is a performance sink because it forces the read core to ++ * drop buffered data from the start of file, which will then have to ++ * be re-read again if this bidder loses. + * +- * Consider passing in the winning bid value to subsequent +- * bidders so that this bidder in particular can avoid +- * seeking if it knows it's going to lose anyway. ++ * We workaround this a little by passing in the best bid so far so ++ * that later bidders can do nothing if they know they'll never ++ * outbid. But we can certainly do better... + */ + static int + archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid) +@@ -311,19 +310,29 @@ + external_attributes = archive_le32dec(p + 38); + zip_entry->local_header_offset = archive_le32dec(p + 42); + ++ /* If we can't guess the mode, leave it zero here; ++ when we read the local file header we might get ++ more information. */ ++ zip_entry->mode = 0; + if (zip_entry->system == 3) { + zip_entry->mode = external_attributes >> 16; +- } else { +- zip_entry->mode = AE_IFREG | 0777; + } + +- /* Do we need to parse filename here? */ +- /* Or can we wait until we read the local header? */ ++ /* We don't read the filename until we get to the ++ local file header. Reading it here would speed up ++ table-of-contents operations (removing the need to ++ find and read local file header to get the ++ filename) at the cost of requiring a lot of extra ++ space. */ ++ /* We don't read the extra block here. We assume it ++ will be duplicated at the local file header. */ + __archive_read_consume(a, + 46 + filename_length + extra_length + comment_length); + } + +- /* TODO: Sort zip entries. */ ++ /* TODO: Sort zip entries by file offset so that we ++ can optimize get_next_header() to use skip instead of ++ seek. */ + + return ARCHIVE_OK; + } +@@ -434,6 +443,11 @@ + return (30); + } + ++ /* TODO: It's worth looking ahead a little bit for a valid ++ * PK signature. In particular, that would make it possible ++ * to read some UUEncoded SFX files or SFX files coming from ++ * a network socket. */ ++ + return (0); + } + +Index: libarchive/test/test_compat_zip_6.zip.uu +=================================================================== +--- libarchive/test/test_compat_zip_6.zip.uu (revision 0) ++++ libarchive/test/test_compat_zip_6.zip.uu (revision 4190) +@@ -0,0 +1,10 @@ ++begin 755 test_compat_zip_6.zip ++M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E'1S;VUE('1E>'0- ++M"E!+`0(4"PH``````'@3-T`````````````````6````````````$``````` ++M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+ ++M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E ++M'102P4&``````(``@"=````B``````` ++` ++end +Index: libarchive/test/test_compat_zip.c +=================================================================== +--- libarchive/test/test_compat_zip.c (revision 4189) ++++ libarchive/test/test_compat_zip.c (revision 4190) +@@ -348,6 +348,53 @@ + free(p); + } + ++/* ++ * Issue 225: Errors extracting MSDOS Zip archives with directories. ++ */ ++static void ++compat_zip_6_verify(struct archive *a) ++{ ++ struct archive_entry *ae; ++ ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); ++ assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); ++ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); ++ assertEqualInt(1327314468, archive_entry_mtime(ae)); ++ assertEqualInt(0, archive_entry_size(ae)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); ++ assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); ++ assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); ++ assertEqualInt(1327314476, archive_entry_mtime(ae)); ++ assertEqualInt(11, archive_entry_size(ae)); ++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); ++} ++ ++static void ++test_compat_zip_6(void) ++{ ++ const char *refname = "test_compat_zip_6.zip"; ++ struct archive *a; ++ void *p; ++ size_t s; ++ ++ extract_reference_file(refname); ++ p = slurpfile(&s, refname); ++ ++ assert((a = archive_read_new()) != NULL); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7)); ++ compat_zip_6_verify(a); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); ++ ++ assert((a = archive_read_new()) != NULL); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7)); ++ compat_zip_6_verify(a); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); ++} ++ + DEFINE_TEST(test_compat_zip) + { + test_compat_zip_1(); +@@ -355,6 +402,7 @@ + test_compat_zip_3(); + test_compat_zip_4(); + test_compat_zip_5(); ++ test_compat_zip_6(); + } + + +Index: Makefile.am +=================================================================== +--- Makefile.am (revision 4189) ++++ Makefile.am (revision 4190) +@@ -462,6 +462,7 @@ + libarchive/test/test_compat_zip_3.zip.uu \ + libarchive/test/test_compat_zip_4.zip.uu \ + libarchive/test/test_compat_zip_5.zip.uu \ ++ libarchive/test/test_compat_zip_6.zip.uu \ + libarchive/test/test_fuzz_1.iso.Z.uu \ + libarchive/test/test_fuzz.cab.uu \ + libarchive/test/test_fuzz.lzh.uu \ diff --git a/core/libarchive/test-with-zip-mtime.patch b/core/libarchive/test-with-zip-mtime.patch new file mode 100644 index 000000000..79e2f3c7e --- /dev/null +++ b/core/libarchive/test-with-zip-mtime.patch @@ -0,0 +1,23 @@ +Index: libarchive/test/test_compat_zip.c +=================================================================== +--- libarchive/test/test_compat_zip.c (revision 4197) ++++ libarchive/test/test_compat_zip.c (revision 4198) +@@ -359,12 +359,16 @@ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); + assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); +- assertEqualInt(1327314468, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* TODO: A more complex assert would work here; we could ++ verify that it's within +/- 24 hours of a particular value. */ ++ /* assertEqualInt(1327314468, archive_entry_mtime(ae)); */ + assertEqualInt(0, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); + assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); +- assertEqualInt(1327314476, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* assertEqualInt(1327314476, archive_entry_mtime(ae)); */ + assertEqualInt(11, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + } diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 47ef4f793..85be39214 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147123 2012-01-22 11:00:58Z tpowa $ +# $Id: PKGBUILD 147273 2012-01-25 16:27:42Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Aaron Griffin # Contributor: Tobias Powalowski @@ -6,7 +6,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=178 +pkgver=179 pkgrel=1 arch=(i686 x86_64) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -15,7 +15,6 @@ groups=('base') options=(!makeflags !libtool) makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz) -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') build() { cd $srcdir/$pkgbase-$pkgver @@ -100,4 +99,4 @@ package_udev-compat() { mknod cpu/microcode c 10 184 } -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') +md5sums=('7d2880f66ea39146aae928f19ff3ca09') diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD index 3c95a98e7..cb6de3cd9 100644 --- a/core/wireless_tools/PKGBUILD +++ b/core/wireless_tools/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 142302 2011-11-08 06:06:08Z tomegun $ -# Maintainer: Giovanni Scafora -# Contributer: Jason Chu +# $Id: PKGBUILD 147661 2012-01-26 03:32:18Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: Giovanni Scafora +# Contributor: Jason Chu pkgname=wireless_tools pkgver=29 -pkgrel=5 -pkgdesc="Wireless Tools" +pkgrel=6 +pkgdesc='Wireless Tools' +url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html' arch=('i686' 'x86_64') -url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" license=('GPL') -depends=('glibc') -source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${pkgver}.tar.gz") -md5sums=('e06c222e186f7cc013fd272d023710cb') +source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz") +sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710') build() { - cd ${srcdir}/wireless_tools.${pkgver} - make + cd "${srcdir}/${pkgname}.${pkgver}" + make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}" } package() { - cd ${srcdir}/wireless_tools.${pkgver} - make INSTALL_DIR="${pkgdir}/usr/sbin" \ + cd "${srcdir}/${pkgname}.${pkgver}" + make \ + INSTALL_DIR="${pkgdir}/usr/sbin" \ INSTALL_LIB="${pkgdir}/usr/lib" \ INSTALL_INC="${pkgdir}/usr/include" \ - INSTALL_MAN="${pkgdir}/usr/share/man" install + INSTALL_MAN="${pkgdir}/usr/share/man" \ + install } diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD index 1e54dc324..32952b819 100644 --- a/extra/gdb/PKGBUILD +++ b/extra/gdb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137004 2011-09-05 05:59:05Z allan $ +# $Id: PKGBUILD 147258 2012-01-25 06:03:18Z allan $ # Maintainer: Allan McRae # Contributor: Jan de Groot pkgname=gdb -pkgver=7.3.1 +pkgver=7.4 pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64') @@ -14,8 +14,9 @@ makedepends=('texinfo') backup=('etc/gdb/gdbinit') options=('!libtool') install=gdb.install -source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b89a5fac359c618dda97b88645ceab47') +source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('95a9a8305fed4d30a30a6dc28ff9d060' + 'd5ac067e8dca336cf4586e4e2269d3b2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD index 195b91483..71b97318c 100644 --- a/extra/glsof/PKGBUILD +++ b/extra/glsof/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146281 2012-01-08 05:34:24Z eric $ +# $Id: PKGBUILD 147275 2012-01-25 16:46:28Z eric $ # Maintainer: Eric Bélanger pkgname=glsof -pkgver=1.7.0 -_fmver=1.7.0 +pkgver=1.8.0 +_fmver=1.8.0 _qver=1.0.0 pkgrel=1 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility" @@ -15,14 +15,14 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver} if [ "$CARCH" = "i686" ]; then source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \ glsof-filemonitor glsof-queries) - sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae' + sha1sums=('a70c8d3877c13af8bd8e7e319a1709c1b90eedc6' 'd5a17d66dd02cd78bad5ffdda0b936c7848e4890' '197b58f40880995d6442fd42a58fa1f4594fd19d' '2797c326904af16a254c3e39b8c529ea14ef37e5') elif [ "$CARCH" = "x86_64" ]; then source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \ glsof-filemonitor glsof-queries) - sha1sums=('00db4305995a67cea6bc12bfe7ef3984d07434ae' + sha1sums=('a70c8d3877c13af8bd8e7e319a1709c1b90eedc6' 'c5dd12e9b2860f1c427ed7cd482e898978051d2c' '197b58f40880995d6442fd42a58fa1f4594fd19d' '2797c326904af16a254c3e39b8c529ea14ef37e5') diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD index 753327495..7c7212ff5 100644 --- a/extra/gtk-xfce-engine/PKGBUILD +++ b/extra/gtk-xfce-engine/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 145294 2011-12-21 11:46:17Z foutrelis $ +# $Id: PKGBUILD 147260 2012-01-25 08:34:39Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: tobias -pkgname=gtk-xfce-engine +pkgbase=gtk-xfce-engine +pkgname=('gtk2-xfce-engine' 'gtk3-xfce-engine') pkgver=2.99.0 -pkgrel=1 -pkgdesc="Xfce Gtk+-2.0 and Gtk+-3.0 engines" +pkgrel=2 arch=('i686' 'x86_64') url="http://www.xfce.org/" license=('GPL2') groups=('xfce4') -depends=('gtk2' 'gtk3') -makedepends=('pkgconfig') +makedepends=('gtk2' 'gtk3') options=('!libtool') -source=(http://archive.xfce.org/src/xfce/$pkgname/2.99/$pkgname-$pkgver.tar.bz2) +source=(http://archive.xfce.org/src/xfce/$pkgbase/2.99/$pkgbase-$pkgver.tar.bz2) sha256sums=('27bee5a68527d214cfda9b99d4ba68d39b6d341202bc728d0ddd170a73cde154') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" ./configure \ --prefix=/usr \ @@ -29,9 +28,30 @@ build() { make } -package() { - cd "$srcdir/$pkgname-$pkgver" +package_gtk2-xfce-engine() { + pkgdesc="Xfce Gtk+-2.0 engine" + depends=('gtk2') + provides=("gtk-xfce-engine=$pkgver-$pkgrel") + conflicts=('gtk-xfce-engine') + replaces=('gtk-xfce-engine') + + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir" install + + # Remove gtk3 engine and themes + find "$pkgdir" -name gtk-3.0 -exec rm -r {} + +} + +package_gtk3-xfce-engine() { + pkgdesc="Xfce Gtk+-3.0 engine" + depends=('gtk3') + conflicts=('gtk-xfce-engine<=2.99.0-1') + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + + # Remove gtk2 engine and themes + find "$pkgdir" -name gtk-2.0 -exec rm -r {} + } # vim:set ts=2 sw=2 et: diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index dc8cc3ea2..40d39206d 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142844 2011-11-16 23:13:07Z ibiru $ +# $Id: PKGBUILD 147271 2012-01-25 15:45:40Z ibiru $ # Maintainer: Jan de Groot pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.8 -pkgrel=2 +pkgver=2.24.9 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,16 +12,13 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool' '!docs') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - xid-collision-debug.patch - revert-iconview.patch) -sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba') + xid-collision-debug.patch) +sha256sums=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { cd "$srcdir/gtk+-$pkgver" patch -Np1 -i "$srcdir/xid-collision-debug.patch" - patch -Np1 -i "$srcdir/revert-iconview.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index b537d6891..a14489c72 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 62106 2012-01-16 01:54:58Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 62757 2012-01-26 04:37:18Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.15 -pkgrel=3.1 +pkgrel=4 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -27,9 +27,10 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.14-revert-4768ae77.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch + glibc-2.15-regex.patch glibc-2.15-lddebug-scopes.patch glibc-2.15-revert-c5a0802a.patch - glibc-2.15-math64crash.patch + glibc-2.15-strcmp-disable-avx.patch lib32-glibc.conf) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '4dadb9203b69a3210d53514bb46f41c3' @@ -40,9 +41,10 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7da8c554a3b591c7401d7023b1928afc' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' + 'b3526cbd5e29773560dba725db99af5a' '3c219ddfb619b6df903cac4cc42c611d' '7ae3e426251ae33e73dbad71f9c91378' - 'dc7550e659ddd685bd78a930d15a01f2' + '7a44dd821835e4984aa75ad44fad3baf' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -79,6 +81,10 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + # Fix up regcomp/regexec + # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 + patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch + # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch @@ -87,9 +93,13 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=769421 patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch - # revert optimized math routines that can cause crashes (FS#27736, FS#27743) - # obviously not a real fix... - patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch + # Disable AVX in strcmp as this breaks Xen + # http://sourceware.org/bugzilla/show_bug.cgi?id=13583 + patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch + + # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743) + # http://sourceware.org/bugzilla/show_bug.cgi?id=13618 + rm sysdeps/x86_64/fpu/multiarch/* cd ${srcdir} mkdir glibc-build diff --git a/multilib-testing/lib32-glibc/glibc-2.15-regex.patch b/multilib-testing/lib32-glibc/glibc-2.15-regex.patch new file mode 100644 index 000000000..6385f2c08 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.15-regex.patch @@ -0,0 +1,16 @@ +diff --git a/posix/regex_internal.c b/posix/regex_internal.c +index bc19243..124f8cc 100644 +--- a/posix/regex_internal.c ++++ b/posix/regex_internal.c +@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx) + } + + static unsigned char +-internal_function __attribute ((pure)) ++internal_function + re_string_fetch_byte_case (re_string_t *pstr) + { + if (BE (!pstr->mbs_allocated, 1)) +-- +1.7.3.4 + diff --git a/multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch b/multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch new file mode 100644 index 000000000..7f1f5b8f2 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch @@ -0,0 +1,48 @@ +diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S +index f93c83d..d8aa889 100644 +--- a/sysdeps/x86_64/multiarch/strcmp.S ++++ b/sysdeps/x86_64/multiarch/strcmp.S +@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strcasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strcasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strncasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strncasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) + # include "strcmp-sse42.S" + + +-# ifdef HAVE_AVX_SUPPORT +-# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L +-# define LABEL(l) .L##l##_avx +-# define GLABEL(l) l##_avx +-# define USE_AVX 1 +-# undef STRCMP_SSE42 +-# define STRCMP_SSE42 STRCMP_AVX +-# define SECTION avx +-# include "strcmp-sse42.S" +-# endif +-# endif +- +- + # undef ENTRY + # define ENTRY(name) \ + .type STRCMP_SSE2, @function; \ diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index f66432820..da692dc93 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 62202 2012-01-18 10:46:56Z heftig $ +# $Id: PKGBUILD 62758 2012-01-26 04:44:57Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Allan McRae @@ -8,8 +8,8 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.6.2 -pkgrel=5.1 -_snapshot=4.6-20111223 +pkgrel=6 +_snapshot=4.6-20120120 _libstdcppmanver=20111215 pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') @@ -24,7 +24,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2 gcc_pure64-multilib.patch gcc-hash-style-both.patch) -md5sums=('4755b9f6ac0abecbaa2097ed9738406a' +md5sums=('f7ca5d9f7a07216577f81318b7cf56ef' '450772ce32daed97d7383199f8797f33' '7da5b7ab75b3c29993f953b18bc38579' '4df25b623799b148a0703eaeec8fdf3f') @@ -60,11 +60,12 @@ build() { --enable-shared --enable-threads=posix \ --with-system-zlib --enable-__cxa_atexit \ --disable-libunwind-exceptions --enable-clocale=gnu \ + --disable-libstdcxx-pch --enable-libstdcxx-time \ --enable-gnu-unique-object --enable-linker-build-id \ --with-ppl --enable-cloog-backend=isl \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ - --enable-multilib --disable-libssp --disable-libstdcxx-pch \ + --enable-multilib --disable-libssp \ --enable-checking=release --with-fpmath=sse make } @@ -181,6 +182,11 @@ package_gcc-multilib() install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ + # plugin headers are all over the place at the moment... + for i in common objc pragma pretty-print; do + ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h + done + # POSIX conformance launcher scripts for c89 and c99 cat > $pkgdir/usr/bin/c89 <<"EOF" #!/bin/sh diff --git a/staging/digikam/PKGBUILD b/staging/digikam/PKGBUILD new file mode 100644 index 000000000..96ef60e83 --- /dev/null +++ b/staging/digikam/PKGBUILD @@ -0,0 +1,105 @@ +# $Id: PKGBUILD 147663 2012-01-26 04:48:55Z eric $ +# Maintainer: Ronald van Haren +# Contributor: Andrea Scarpino +# Contributor: Tobias Powalowski + +pkgbase=digikam +pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') +pkgver=2.5.0 +pkgrel=2 +pkgdesc="Digital photo management application for KDE" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.digikam.org/" +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" + "boost148.patch" "libkipi140.patch") +sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383' + '93853084905b21309c46ce7d585021e76283d429' + '8a8f624fd0ca768a9dcd706405eb6e4944892d87') +build() { + cd "${srcdir}" + + pushd ${pkgname}-${pkgver}/core + patch -Np0 -i ${srcdir}/boost148.patch + patch -Np1 -i ${srcdir}/libkipi140.patch + popd + + mkdir build + cd build + # Use internal lensfun (FS#21816) + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DLENSFUN_LIBRARY="" \ + -DLENSFUN_INCLUDE_DIR="" + make +} + +package_digikam() { + pkgdesc="Digital photo management application for KDE" + depends=('kdebase-runtime' 'kdepimlibs' 'libgphoto2' 'opencv' 'liblqr' + 'libkipi' 'libkexiv2' 'libkdcraw' 'libkface' 'libkgeomap') + optdepends=('kipi-plugins: for more extras and plugins') + install=digikam.install + + cd "${srcdir}"/build/core + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc + 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() { + pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures" + depends=('kdelibs' 'opencv') + + cd "${srcdir}"/build/extra/libkface + make DESTDIR="${pkgdir}" install +} + +package_libkgeomap() { + pkgdesc="A wrapper around world map components for browsing and arranging photos on a map" + depends=('kdelibs' 'kdeedu-marble' 'libkexiv2') + + cd "${srcdir}"/build/extra/libkgeomap + make DESTDIR="${pkgdir}" install +} + +package_libkvkontakte() { + pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network" + depends=('kdelibs' 'qjson') + + cd "${srcdir}"/build/extra/libkvkontakte + make DESTDIR="${pkgdir}" install +} + +package_libmediawiki() { + pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org" + depends=('kdelibs') + + cd "${srcdir}"/build/extra/libmediawiki + make DESTDIR="${pkgdir}" install +} + +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' 'libkexiv2') + optdepends=('libkgeomap' + 'libmediawiki' + 'libgpod' + 'hugin') + install=kipi-plugins.install + + cd "${srcdir}"/build/extra/kipi-plugins + make DESTDIR="${pkgdir}" install +} diff --git a/staging/digikam/boost148.patch b/staging/digikam/boost148.patch new file mode 100644 index 000000000..6d3ff585b --- /dev/null +++ b/staging/digikam/boost148.patch @@ -0,0 +1,65 @@ +diff -u libs/database/imagehistory/imagehistorygraph_boost.h ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h +--- libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 08:32:19.837388059 -0500 ++++ ../../digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 09:17:27.798341897 -0500 +@@ -1198,7 +1198,7 @@ + { + boost::dag_shortest_paths(graph, v, + // we provide a constant weight of 1 +- weight_map(boost::ref_property_map(weight)). ++ weight_map(boost::ref_property_map::edge_descriptor,int>(weight)). + // Store distance and predecessors in QMaps, wrapped to serve as property maps + distance_map(VertexIntMapAdaptor(distances)). + predecessor_map(VertexVertexMapAdaptor(predecessors)) +@@ -1218,7 +1218,7 @@ + { + boost::dag_shortest_paths(graph, v, + // we provide a constant weight of 1 +- weight_map(boost::ref_property_map(weight)). ++ weight_map(boost::ref_property_map::edge_descriptor,int>(weight)). + // Invert the default compare method: With greater, we get the longest path + distance_compare(std::greater()). + // will be returned if a node is unreachable +@@ -1384,14 +1384,15 @@ + template + class lessThanMapEdgeToTarget + { ++ typedef typename boost::graph_traits::edge_descriptor edge_descriptor; + public: + lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan) + : g(g), vertexLessThan(vertexLessThan) {} + const GraphType& g; + VertexLessThan vertexLessThan; +- bool operator()(const Edge& a, const Edge& b) ++ bool operator()(const edge_descriptor& a, const edge_descriptor& b) + { +- return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g)); ++ return vertexLessThan(boost::target(a, g), boost::target(b, g)); + } + }; + +@@ -1402,20 +1403,21 @@ + { + typedef std::pair > VertexInfo; + +- QList outEdges; ++ typedef typename boost::graph_traits::edge_descriptor edge_descriptor; ++ QList outEdges; + std::vector stack; + + boost::put(color, u, boost::gray_color); + vis.discover_vertex(u, g); + +- outEdges = toEdgeList(boost::out_edges(u, g)); ++ outEdges = toList(boost::out_edges(u, g)); + // Sort edges. The lessThan we have takes vertices, so we use a lessThan which + // maps the given edges to their targets, and calls our vertex lessThan. + qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget(g, lessThan)); + +- foreach(const Edge& e, outEdges) ++ foreach(const edge_descriptor& e, outEdges) + { +- Vertex v = boost::target(e.toEdge(), g); ++ Vertex v = boost::target(e, g); + vis.examine_edge(e, g); + boost::default_color_type v_color = boost::get(color, v); + if (v_color == boost::white_color) diff --git a/staging/digikam/digikam.install b/staging/digikam/digikam.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/digikam/digikam.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/staging/digikam/kipi-plugins.install b/staging/digikam/kipi-plugins.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/staging/digikam/kipi-plugins.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/staging/digikam/libkipi140.patch b/staging/digikam/libkipi140.patch new file mode 100644 index 000000000..a221b5847 --- /dev/null +++ b/staging/digikam/libkipi140.patch @@ -0,0 +1,63 @@ +diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp +index 0f4030a..b8efb35 100644 +--- a/utilities/setup/setupplugins.cpp ++++ b/utilities/setup/setupplugins.cpp +@@ -6,8 +6,8 @@ + * Date : 2004-01-02 + * Description : setup Kipi plugins tab. + * +- * Copyright (C) 2004-2011 by Gilles Caulier +- * Copyright (C) 2011 by Andi Clemens ++ * Copyright (C) 2004-2012 by Gilles Caulier ++ * Copyright (C) 2011-2012 by Andi Clemens + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General +@@ -100,6 +100,11 @@ SetupPlugins::SetupPlugins(QWidget* parent) + + panel->setLayout(mainLayout); + ++#if KIPI_VERSION < 0x010400 ++ d->checkAllBtn->setVisible(false); ++ d->clearBtn->setVisible(false); ++#endif ++ + initPlugins(); + + // -------------------------------------------------------- +@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins() + void SetupPlugins::slotCheckAll() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotCheckAll(); ++#endif + QApplication::restoreOverrideCursor(); + } + + void SetupPlugins::slotClear() + { + QApplication::setOverrideCursor(Qt::WaitCursor); ++#if KIPI_VERSION >= 0x010400 + d->kipiConfig->slotClear(); ++#endif + QApplication::restoreOverrideCursor(); + } + +diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h +index 271a569..114e0fa 100644 +--- a/utilities/setup/setupplugins.h ++++ b/utilities/setup/setupplugins.h +@@ -6,8 +6,8 @@ + * Date : 2004-01-02 + * Description : setup Kipi plugins tab. + * +- * Copyright (C) 2004-2011 by Gilles Caulier +- * Copyright (C) 2011 by Andi Clemens ++ * Copyright (C) 2004-2012 by Gilles Caulier ++ * Copyright (C) 2011-2012 by Andi Clemens + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + + diff --git a/staging/ffmpegthumbnailer/PKGBUILD b/staging/ffmpegthumbnailer/PKGBUILD new file mode 100644 index 000000000..7cc1baea4 --- /dev/null +++ b/staging/ffmpegthumbnailer/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ +# Maintainer: Ronald van Haren +# Contributor: boromil@gmail.com + +pkgname=ffmpegthumbnailer +pkgver=2.0.7 +pkgrel=3 +pkgdesc="Lightweight video thumbnailer that can be used by file managers." +url="http://code.google.com/p/ffmpegthumbnailer/" +license=('GPL2') +arch=('i686' 'x86_64') +depends=('ffmpeg' 'libjpeg' 'libpng') +optdepends=('gvfs: support for gio uris') +source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" + 'ffmpegthumbnailer.desktop') +options=('!libtool') +sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73' + 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --enable-gio + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # FS#24105: Generate thumbnails in nautilus + install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \ + "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop" +} diff --git a/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop new file mode 100644 index 000000000..79203e5bc --- /dev/null +++ b/staging/ffmpegthumbnailer/ffmpegthumbnailer.desktop @@ -0,0 +1,4 @@ +[Thumbnailer Entry] +TryExec=ffmpegthumbnailer +Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10 +MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v; diff --git a/staging/gnome-perl/PKGBUILD b/staging/gnome-perl/PKGBUILD new file mode 100644 index 000000000..a5c2d68ad --- /dev/null +++ b/staging/gnome-perl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147560 2012-01-25 23:03:24Z eric $ +# Maintainer: Jan de Groot + +pkgname=gnome-perl +_realname=Gnome2 +pkgver=1.042 +pkgrel=7 +pkgdesc="Perl bindings for libgnome" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('gnomecanvas-perl' 'gnome-vfs-perl' 'libgnomeui' 'perl') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('eb7b624114e45e54e022a633ffc1cce6') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/gnome-sharp/PKGBUILD b/staging/gnome-sharp/PKGBUILD new file mode 100644 index 000000000..a02143afc --- /dev/null +++ b/staging/gnome-sharp/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 147553 2012-01-25 22:28:03Z eric $ +# Maintainer: tobias + +pkgbase=gnome-sharp +pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp') +pkgver=2.24.2 +pkgrel=2 +arch=(i686 x86_64) +license=(LGPL) +url="http://gtk-sharp.sourceforge.net" +makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2) +md5sums=('3b38f53960c736d4afb8f04204efe98b') + +build() { + # get rid of that .wapi errors; thanks to brice + export MONO_SHARED_DIR="${srcdir}/weird" + mkdir -p "${MONO_SHARED_DIR}" + + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package_gnome-sharp() { + pkgdesc="GNOME bindings for C#" + depends=('art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp') +} + +package_art-sharp() { + pkgdesc="Mono bindings for libart" + depends=('gtk-sharp-2' 'libart-lgpl') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C art install DESTDIR="${pkgdir}" +} + +package_gconf-sharp() { + pkgdesc="Mono bindings for GConf" + depends=('gtk-sharp-2' 'gconf') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C gconf/GConf install DESTDIR="${pkgdir}" + make -C gconf/tools install DESTDIR="${pkgdir}" +} + +package_gconf-sharp-peditors() { + pkgdesc="Mono bindings for GConf - Property Editing classes" + depends=('gconf-sharp' 'libgnome-sharp') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C gconf/GConf.PropertyEditors install DESTDIR="${pkgdir}" +} + +package_libgnome-sharp() { + pkgdesc="Mono bindings for libgnome" + depends=('art-sharp' 'gnome-vfs-sharp' 'libgnomeui') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C gnome install DESTDIR="${pkgdir}" +} + +package_gnome-vfs-sharp() { + pkgdesc="Mono bindings for GNOME-VFS" + depends=('gtk-sharp-2' 'gnome-vfs') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C gnomevfs install DESTDIR="${pkgdir}" +} diff --git a/staging/gnomecanvas-perl/PKGBUILD b/staging/gnomecanvas-perl/PKGBUILD new file mode 100644 index 000000000..2bdc00f77 --- /dev/null +++ b/staging/gnomecanvas-perl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 147550 2012-01-25 21:35:36Z eric $ +# Maintainer: Jan de Groot + +pkgname=gnomecanvas-perl +_realname=Gnome2-Canvas +pkgver=1.002 +pkgrel=9 +pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://gtk2-perl.sourceforge.net/" +makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') +depends=('gtk2-perl' 'libgnomecanvas' 'perl') +options=(!emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz) +md5sums=('93405a987ba4bbd03c2f91592b88f5cb') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD new file mode 100644 index 000000000..ddb31c773 --- /dev/null +++ b/staging/kdelibs/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdelibs +pkgver=4.7.4 +pkgrel=6 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' + 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' + 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' + 'docbook-xsl' 'qtwebkit') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell') +replaces=('kdelibs-experimental') +install='kdelibs.install' +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch') +sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + '3312f6005aa56a9b992c74008fe5b314f1c8ffba' + '9cb83cb7f6394549354c6837977f9e9529127041') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # avoid file conflict with gnome-menus + patch -p1 -i "${srcdir}"/kde-applications-menu.patch + # add Archlinux menu entry + patch -p1 -i "${srcdir}"/archlinux-menu.patch + + # https://bugs.kde.org/show_bug.cgi?id=285028 + patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch + + patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ + -DKDE_DEFAULT_HOME='.kde4' \ + -DWITH_FAM=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # cert bundle seems to be hardcoded + # link it to the one from ca-certificates + rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt +} diff --git a/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch new file mode 100644 index 000000000..546784fa2 --- /dev/null +++ b/staging/kdelibs/archlinux-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 ++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 +@@ -16,11 +16,19 @@ + + + ++ Arch Linux + Applications + + + + ++ Arch Linux ++ Archlinux.directory ++ ++ Archlinux ++ ++ ++ + Applications + kde-unknown.directory + diff --git a/staging/kdelibs/fix-knotify-filepath.patch b/staging/kdelibs/fix-knotify-filepath.patch new file mode 100644 index 000000000..2cd995e97 --- /dev/null +++ b/staging/kdelibs/fix-knotify-filepath.patch @@ -0,0 +1,13 @@ +diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp +index 88d18b6..0e76658 100644 +--- a/knotify/config/knotifyconfigactionswidget.cpp ++++ b/knotify/config/knotifyconfigactionswidget.cpp +@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay( ) + KUrl soundURL = m_ui.Sound_select->url(); + if ( soundURL.isRelative() ) + { +- QString soundString = soundURL.toLocalFile(); ++ QString soundString = m_ui.Sound_select->text(); + // we need a way to get the application name in order to ba able to do this : + /*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile); + search = KGlobal::mainComponent().dirs()->findResource("data", search); diff --git a/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/staging/kdelibs/kde-applications-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 ++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 +@@ -69,7 +69,7 @@ + if (WIN32) + install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) + else (WIN32) +-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) ++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) + endif (WIN32) + install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 ++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 +@@ -302,7 +302,7 @@ + if (!m_trackId.isEmpty()) + g_vfolder->setTrackId(m_trackId); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); + entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch new file mode 100644 index 000000000..bdcd39a6c --- /dev/null +++ b/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch @@ -0,0 +1,32 @@ +From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001 +From: Johannes Huber +Date: Thu, 5 Jan 2012 10:06:05 +0100 +Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2. + +--- + cmake/modules/FindXine.cmake | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake +index 37c58c6..d71969a 100644 +--- a/cmake/modules/FindXine.cmake ++++ b/cmake/modules/FindXine.cmake +@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine + ${PC_LIBXINE_LIBRARY_DIRS} + ) + +-find_program(XINECONFIG_EXECUTABLE NAMES xine-config ++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config + HINTS + ${PC_LIBXINE_PREFIX}/bin + ) + + if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) +- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) ++ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) + if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 + set(XINE_VERSION_OK TRUE) + string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) +-- +1.7.8.2 + diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/staging/kdelibs/kdelibs.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/libdmapsharing/PKGBUILD b/staging/libdmapsharing/PKGBUILD new file mode 100644 index 000000000..743d5a07c --- /dev/null +++ b/staging/libdmapsharing/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 147655 2012-01-26 01:47:40Z eric $ +#Maintainer: Ionut Biru +pkgname=libdmapsharing +pkgver=2.9.12 +pkgrel=2 +pkgdesc="A library that implements the DMAP family of protocols" +arch=('i686' 'x86_64') +url="http://www.flyn.org/projects/libdmapsharing/index.html" +license=('LGPL2.1') +depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2') +options=('!libtool') +source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz) +md5sums=('ec34948df21e9ba0656c917b10fed1c3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --with-mdns=avahi + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/libgpod/PKGBUILD b/staging/libgpod/PKGBUILD new file mode 100644 index 000000000..511feb174 --- /dev/null +++ b/staging/libgpod/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 147659 2012-01-26 02:50:58Z eric $ +# Maintainer: Daniel Isenmann +# Contributor: William Rea + +pkgname=libgpod +pkgver=0.8.2 +pkgrel=3 +pkgdesc="A shared library to access the contents of an iPod" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') +makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2') +optdepends=('gtk-sharp-2: Mono bindings') +url="http://www.gtkpod.org/libgpod/" +source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --enable-udev --with-python=/usr/bin/python2 + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install +} + diff --git a/staging/unison/PKGBUILD b/staging/unison/PKGBUILD new file mode 100644 index 000000000..83c4cc1c5 --- /dev/null +++ b/staging/unison/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 147256 2012-01-25 05:10:29Z eric $ +#Maintainer: Tobias Powalowski + +pkgname=unison +pkgver=2.40.63 +pkgrel=3 +pkgdesc="Unison is a file-synchronization tool" +arch=(i686 x86_64) +license=('GPL2') +url="http://www.cis.upenn.edu/~bcpierce/unison" +depends=('glibc') +makedepends=('ocaml' 'lablgtk2' 'imagemagick') +optdepends=('gtk2: for gtk2 support') +source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz + $pkgname.desktop) +md5sums=('3281207850cf6f0a17fe73f371893bd3' + '2daecba7705455a8e4b769e48b059872') +options=(!makeflags) + +build() { + cd "$srcdir/$pkgname-$pkgver" + CFLAGS="" + make clean + make mkProjectInfo + make UISTYLE=text DEBUGGING=false THREADS=true + mv unison unison-text + + # clean the builddir and rebuild with gtk support + # broken at the moment! + # make clean + # make mkProjectInfo + # make UISTYLE=gtk DEBUGGING=false THREADS=true + # install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk + # clean the builddir and rebuild with gtk2 support + make clean + make mkProjectInfo + make UISTYLE=gtk2 DEBUGGING=false THREADS=true +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -Dm755 unison-text "$pkgdir"/usr/bin/unison + install -Dm755 unison "$pkgdir"/usr/bin/unison-gtk2 + # install a .desktop file; create a compliant icon from ico file and install the png + install -Dm644 ../$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop + convert win32rc/U.ico unison.png + install -Dm644 ${pkgname}-1.png "$pkgdir"/usr/share/pixmaps/$pkgname.png + # make symlink for .desktop file + cd "$pkgdir"/usr/bin + ln -s unison-gtk2 unison-x11 +} diff --git a/staging/unison/unison-ssh-ocaml.patch b/staging/unison/unison-ssh-ocaml.patch new file mode 100644 index 000000000..1b9c66c7f --- /dev/null +++ b/staging/unison/unison-ssh-ocaml.patch @@ -0,0 +1,25 @@ +Index: src/terminal.ml +=================================================================== +--- src/terminal.ml (révision 463) ++++ src/terminal.ml (copie de travail) +@@ -191,7 +191,6 @@ + exit 127 + end + | childPid -> +- Unix.close slaveFd; + (Some masterFd, childPid) + end + +Index: src/update.mli +=================================================================== +--- src/update.mli (révision 463) ++++ src/update.mli (copie de travail) +@@ -1,7 +1,7 @@ + (* Unison file synchronizer: src/update.mli *) + (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *) + +-module NameMap : Map.S with type key = Name.t ++module NameMap : MyMap.S with type key = Name.t + + type archive = + ArchiveDir of Props.t * archive NameMap.t diff --git a/staging/unison/unison.desktop b/staging/unison/unison.desktop new file mode 100644 index 000000000..3a7e1d762 --- /dev/null +++ b/staging/unison/unison.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=unison +Name[de]=unison +Comment=File synchronisation tool for X11 +Comment[de]=Datei Abgleicher und Synchronisierer +TryExec=unison-x11 +Exec=unison-x11 +Terminal=false +Type=Application +Categories=GTK;Application;Network; +Icon=unison.png +StartupNotify=true diff --git a/staging/unison/unison.install b/staging/unison/unison.install new file mode 100644 index 000000000..a3790ab7d --- /dev/null +++ b/staging/unison/unison.install @@ -0,0 +1,28 @@ +# arg 1: the new package version +post_install() { + echo "NOTE:" + echo " For gtk1 frontend please add 'gtk' package." + echo " For gtk2 frontend please add 'gtk2' package." + echo " Default X11 frontend is set to gtk2. " + echo "" + echo " If you want to default to gtk1 unison:" + echo " 'rm /usr/bin/unison-x11'" + echo " 'ln -s /usr/bin/unison-gtk /usr/bin/unison-x11'" + echo "" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +# arg 1: the old package version +post_remove() { + /bin/true +} diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD new file mode 100644 index 000000000..3b2e90eab --- /dev/null +++ b/testing/glibc/PKGBUILD @@ -0,0 +1,223 @@ +# $Id: PKGBUILD 147653 2012-01-26 00:36:18Z allan $ +# Maintainer: Allan McRae + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: valgrind requires rebuilt with each major glibc version + +pkgname=glibc +pkgver=2.15 +pkgrel=4 +_glibcdate=20111227 +pkgdesc="GNU C Library" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL' 'LGPL') +groups=('base') +depends=('linux-api-headers>=3.1.6' 'tzdata') +makedepends=('gcc>=4.6') +backup=(etc/gai.conf + etc/locale.gen + etc/nscd.conf) +options=('!strip') +install=glibc.install +source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz + glibc-2.10-dont-build-timezone.patch + glibc-2.10-bz4781.patch + glibc-__i686.patch + glibc-2.12.2-ignore-origin-of-privileged-program.patch + glibc-2.14-libdl-crash.patch + glibc-2.14-revert-4768ae77.patch + glibc-2.14-reexport-rpc-interface.patch + glibc-2.14-reinstall-nis-rpc-headers.patch + glibc-2.15-regex.patch + glibc-2.15-lddebug-scopes.patch + glibc-2.15-revert-c5a0802a.patch + glibc-2.15-strcmp-disable-avx.patch + nscd + locale.gen.txt + locale-gen) +md5sums=('6ffdf5832192b92f98bdd125317c0dfc' + '4dadb9203b69a3210d53514bb46f41c3' + '0c5540efc51c0b93996c51b57a8540ae' + '40cd342e21f71f5e49e32622b25acc52' + 'b042647ea7d6f22ad319e12e796bd13e' + '6970bcfeb3bf88913436d5112d16f588' + '7da8c554a3b591c7401d7023b1928afc' + 'c5de2a946215d647c8af5432ec4b0da0' + '55febbb72139ac7b65757df085024b83' + 'b3526cbd5e29773560dba725db99af5a' + '3c219ddfb619b6df903cac4cc42c611d' + '7ae3e426251ae33e73dbad71f9c91378' + '7a44dd821835e4984aa75ad44fad3baf' + 'b587ee3a70c9b3713099295609afde49' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') + +mksource() { + git clone git://sourceware.org/git/glibc.git + pushd glibc + #git checkout -b glibc-2.15-arch origin/release/2.15/master + git checkout -b glibc-2.15-arch origin/master + popd + tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* +} + +build() { + cd ${srcdir}/glibc + + # timezone data is in separate package (tzdata) + patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 + patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 + # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html + patch -Np1 -i ${srcdir}/glibc-__i686.patch + + # http://www.exploit-db.com/exploits/15274/ + # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch + + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) + # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html + patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + + # Revert commit causing issues with crappy DNS servers... + # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER! + # Note that both these patches appear not to fix the issue completely: + # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch + + # re-export RPC interface until libtirpc is ready as a replacement + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + + # Fix up regcomp/regexec + # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 + patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch + + # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch + + # revert commit c5a0802a - causes various hangs + # https://bugzilla.redhat.com/show_bug.cgi?id=769421 + patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch + + # Disable AVX in strcmp as this breaks Xen + # http://sourceware.org/bugzilla/show_bug.cgi?id=13583 + patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch + + # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743) + # http://sourceware.org/bugzilla/show_bug.cgi?id=13618 + rm sysdeps/x86_64/fpu/multiarch/* + + install -dm755 ${pkgdir}/etc + touch ${pkgdir}/etc/ld.so.conf + + cd ${srcdir} + mkdir glibc-build + cd glibc-build + + if [[ ${CARCH} = "i686" ]]; then + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + fi + + echo "slibdir=/lib" >> configparms + + # remove hardening options from CFLAGS for building libraries + CFLAGS=${CFLAGS/-fstack-protector/} + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/glibc/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --with-headers=/usr/include \ + --enable-add-ons=nptl,libidn \ + --enable-kernel=2.6.27 \ + --with-tls --with-__thread \ + --enable-bind-now --without-gd \ + --without-cvs --disable-profile \ + --enable-multi-arch + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms + make + + # re-enable hardening for programs + sed -i "s#=no#=yes#" configparms + echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + make + + # remove harding in preparation to run test-suite + sed -i '2,4d' configparms +} + +check() { + cd ${srcdir}/glibc-build + + # some errors are expected - manually check log files + make -k check || true +} + +package() { + cd ${srcdir}/glibc-build + make install_root=${pkgdir} install + + rm -f ${pkgdir}/etc/ld.so.{cache,conf} + + install -dm755 ${pkgdir}/etc/rc.d + install -dm755 ${pkgdir}/usr/sbin + install -dm755 ${pkgdir}/usr/lib/locale + install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf + install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin + install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf + + sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf + + # create /etc/locale.gen + install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen + sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED + sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED + sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED + cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen + + if [[ ${CARCH} = "x86_64" ]]; then + # fix for the linker + sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd + # Comply with multilib binaries, they look for the linker in /lib64 + mkdir ${pkgdir}/lib64 + cd ${pkgdir}/lib64 + ln -v -s ../lib/ld* . + fi + + # Do not strip the following files for improved debugging support + # ("improved" as in not breaking gdb and valgrind...): + # ld-${pkgver}.so + # libc-${pkgver}.so + # libpthread-${pkgver}.so + # libthread_db-1.0.so + + cd $pkgdir + strip $STRIP_BINARIES sbin/{ldconfig,sln} \ + usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \ + usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \ + usr/lib/getconf/* \ + usr/sbin/{iconvconfig,nscd} + [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 + + strip $STRIP_STATIC usr/lib/*.a + + strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \ + lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ + lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ + lib/{libmemusage,libpcprofile,libSegFault}.so \ + usr/lib/{pt_chown,{audit,gconv}/*.so} +} diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch new file mode 100644 index 000000000..cf1a97a18 --- /dev/null +++ b/testing/glibc/glibc-2.10-bz4781.patch @@ -0,0 +1,42 @@ +diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -120,9 +120,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (eip); + /* Note: %esi is zero. */ + movl %esi,%ebp /* terminate the stack frame */ + #ifdef RESET_PID +@@ -155,7 +152,6 @@ + jmp L(haspid) + .previous + #endif +- cfi_endproc; + + cfi_startproc + PSEUDO_END (BP_SYM (__clone)) +diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -89,9 +89,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (rip); + /* Clear the frame pointer. The ABI suggests this be done, to mark + the outermost frame obviously. */ + xorl %ebp, %ebp +@@ -116,7 +113,6 @@ + /* Call exit with return value from function call. */ + movq %rax, %rdi + call HIDDEN_JUMPTARGET (_exit) +- cfi_endproc; + + cfi_startproc; + PSEUDO_END (BP_SYM (__clone)) diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch new file mode 100644 index 000000000..d3abeff17 --- /dev/null +++ b/testing/glibc/glibc-2.10-dont-build-timezone.patch @@ -0,0 +1,13 @@ +timezone data has been split into the package sys-libs/timezone-data + +--- glibc-2.4/Makeconfig ++++ glibc-2.4/Makeconfig +@@ -931,7 +931,7 @@ + stdlib stdio-common libio malloc string wcsmbs time dirent \ + grp pwd posix io termios resource misc socket sysvipc gmon \ + gnulib iconv iconvdata wctype manual shadow gshadow po argp \ +- crypt nss localedata timezone rt conform debug \ ++ crypt nss localedata rt conform debug \ + $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) + + ifndef avoid-generated diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch new file mode 100644 index 000000000..ce089b49c --- /dev/null +++ b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch @@ -0,0 +1,26 @@ +From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Thu, 9 Dec 2010 15:00:59 +0100 +Subject: [PATCH 1/1] Ignore origin of privileged program + +--- + ChangeLog | 5 +++++ + elf/dl-object.c | 3 +++ + 2 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/elf/dl-object.c b/elf/dl-object.c +index 22a1635..7674d49 100644 +--- a/elf/dl-object.c ++++ b/elf/dl-object.c +@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, + out: + new->l_origin = origin; + } ++ else if (INTUSE(__libc_enable_secure) && type == lt_executable) ++ /* The origin of a privileged program cannot be trusted. */ ++ new->l_origin = (char *) -1; + + return new; + } +-- +1.7.2 diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch new file mode 100644 index 000000000..6c9d2718e --- /dev/null +++ b/testing/glibc/glibc-2.14-libdl-crash.patch @@ -0,0 +1,132 @@ +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 73b2a2f..9bd91e3 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -1,5 +1,5 @@ + /* Close a shared object opened by `_dl_open'. +- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) + if (map->l_direct_opencount > 0 || map->l_type != lt_loaded + || dl_close_state != not_pending) + { +- if (map->l_direct_opencount == 0) +- { +- if (map->l_type == lt_loaded) +- dl_close_state = rerun; +- else if (map->l_type == lt_library) +- { +- struct link_map **oldp = map->l_initfini; +- map->l_initfini = map->l_orig_initfini; +- _dl_scope_free (oldp); +- } +- } ++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) ++ dl_close_state = rerun; + + /* There are still references to this object. Do nothing more. */ + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) +diff --git a/elf/dl-deps.c b/elf/dl-deps.c +index 9e30594..3890d00 100644 +--- a/elf/dl-deps.c ++++ b/elf/dl-deps.c +@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, + nneeded * sizeof needed[0]); + atomic_write_barrier (); + l->l_initfini = l_initfini; ++ l->l_free_initfini = 1; + } + + /* If we have no auxiliary objects just go on to the next map. */ +@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); + l_initfini[nlist] = NULL; + atomic_write_barrier (); + map->l_initfini = l_initfini; ++ map->l_free_initfini = 1; + if (l_reldeps != NULL) + { + atomic_write_barrier (); +@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); + _dl_scope_free (old_l_reldeps); + } + if (old_l_initfini != NULL) +- map->l_orig_initfini = old_l_initfini; ++ _dl_scope_free (old_l_initfini); + +diff --git a/elf/dl-libc.c b/elf/dl-libc.c +index 7be9483..a13fce3 100644 +--- a/elf/dl-libc.c ++++ b/elf/dl-libc.c +@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) + + for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) + { +- /* Remove all additional names added to the objects. */ + for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) + { + struct libname_list *lnp = l->l_libname->next; + + l->l_libname->next = NULL; + ++ /* Remove all additional names added to the objects. */ + while (lnp != NULL) + { + struct libname_list *old = lnp; +@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) + if (! old->dont_free) + free (old); + } ++ ++ /* Free the initfini dependency list. */ ++ if (l->l_free_initfini) ++ free (l->l_initfini); + } + + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 +diff --git a/elf/rtld.c b/elf/rtld.c +index 4a9109e..617e30e 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + lnp->dont_free = 1; + lnp = lnp->next; + } ++ l->l_free_initfini = 0; + + if (l != &GL(dl_rtld_map)) + _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +diff --git a/include/link.h b/include/link.h +index e877104..051b99a 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -1,6 +1,6 @@ + /* Data structure for communication from the run-time dynamic linker for + loaded ELF shared objects. +- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -192,6 +192,9 @@ struct link_map + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ ++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be ++ freed, ie. not allocated with ++ the dummy malloc in ld.so. */ + + /* Collected information about own RPATH directories. */ + struct r_search_path_struct l_rpath_dirs; +@@ -240,9 +243,6 @@ struct link_map + + /* List of object in order of the init and fini calls. */ + struct link_map **l_initfini; +- /* The init and fini list generated at startup, saved when the +- object is also loaded dynamically. */ +- struct link_map **l_orig_initfini; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch new file mode 100644 index 000000000..e2beea881 --- /dev/null +++ b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch @@ -0,0 +1,26 @@ +diff --git a/include/libc-symbols.h b/include/libc-symbols.h +index 67e1ca2..5e7cca5 100644 +--- a/include/libc-symbols.h ++++ b/include/libc-symbols.h +@@ -635,7 +635,7 @@ for linking") + # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) + # define libc_hidden_def(name) hidden_def (name) + # define libc_hidden_weak(name) hidden_weak (name) +-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) ++# define libc_hidden_nolink(name, version) hidden_def (name) + # define libc_hidden_ver(local, name) hidden_ver (local, name) + # define libc_hidden_data_def(name) hidden_data_def (name) + # define libc_hidden_data_weak(name) hidden_data_weak (name) +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index 5134ce9..40c73d1 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ + des_crypt.h) + headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ + $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h +-headers = rpc/netdb.h ++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) + install-others = $(inst_sysconfdir)/rpc + generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ + $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch new file mode 100644 index 000000000..eb0fd822d --- /dev/null +++ b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch @@ -0,0 +1,28 @@ +From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Tue, 17 May 2011 17:42:30 +0200 +Subject: [PATCH] Reinstall NIS RPC headers + +--- + nis/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nis/Makefile b/nis/Makefile +index b5c9609..d2934d9 100644 +--- a/nis/Makefile ++++ b/nis/Makefile +@@ -23,9 +23,9 @@ subdir := nis + + aux := nis_hash + ++headers := $(wildcard rpcsvc/*.[hx]) + distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ +- nisplus-parser.h nis_xdr.h nss \ +- $(wildcard rpcsvc/*.[hx]) ++ nisplus-parser.h nis_xdr.h nss + + # These are the databases available for the nis (and perhaps later nisplus) + # service. This must be a superset of the services in nss. +-- +1.7.5.4 + diff --git a/testing/glibc/glibc-2.14-revert-4768ae77.patch b/testing/glibc/glibc-2.14-revert-4768ae77.patch new file mode 100644 index 000000000..11f087cb7 --- /dev/null +++ b/testing/glibc/glibc-2.14-revert-4768ae77.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; diff --git a/testing/glibc/glibc-2.15-lddebug-scopes.patch b/testing/glibc/glibc-2.15-lddebug-scopes.patch new file mode 100644 index 000000000..808cf8d7c --- /dev/null +++ b/testing/glibc/glibc-2.15-lddebug-scopes.patch @@ -0,0 +1,27 @@ +From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Fri, 7 Oct 2011 09:31:27 +0200 +Subject: [PATCH] Horrible workaround for horribly broken software + +--- + elf/rtld.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 978c609..8422b9f 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\ + char *copy = malloc (len); + if (copy == NULL) + _dl_fatal_printf ("out of memory\n"); +- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len); ++ l->l_libname->name = memcpy (copy, dsoname, len); ++ if (GLRO(dl_debug_mask)) ++ l->l_name = copy; + } + + /* Add the vDSO to the object list. */ +-- +1.7.3.4 + diff --git a/testing/glibc/glibc-2.15-regex.patch b/testing/glibc/glibc-2.15-regex.patch new file mode 100644 index 000000000..6385f2c08 --- /dev/null +++ b/testing/glibc/glibc-2.15-regex.patch @@ -0,0 +1,16 @@ +diff --git a/posix/regex_internal.c b/posix/regex_internal.c +index bc19243..124f8cc 100644 +--- a/posix/regex_internal.c ++++ b/posix/regex_internal.c +@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx) + } + + static unsigned char +-internal_function __attribute ((pure)) ++internal_function + re_string_fetch_byte_case (re_string_t *pstr) + { + if (BE (!pstr->mbs_allocated, 1)) +-- +1.7.3.4 + diff --git a/testing/glibc/glibc-2.15-revert-c5a0802a.patch b/testing/glibc/glibc-2.15-revert-c5a0802a.patch new file mode 100644 index 000000000..f532b95e8 --- /dev/null +++ b/testing/glibc/glibc-2.15-revert-c5a0802a.patch @@ -0,0 +1,229 @@ +diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000 +@@ -137,7 +137,6 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 18f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx + movl %ebp, %edx + xorl %esi, %esi +@@ -151,9 +150,6 @@ __pthread_cond_wait: + sete 16(%esp) + je 19f + +- cmpl $-EAGAIN, %eax +- je 91f +- + /* Normal and PI futexes dont mix. Use normal futex functions only + if the kernel does not support the PI futex functions. */ + cmpl $-ENOSYS, %eax +@@ -398,78 +394,6 @@ __pthread_cond_wait: + #endif + call __lll_unlock_wake + jmp 11b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- +- /* Get internal lock. */ +- movl $1, %edx +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %edx, (%ebx) +-#else +- cmpxchgl %edx, cond_lock(%ebx) +-#endif +- jz 92f +- +-#if cond_lock == 0 +- movl %ebx, %edx +-#else +- leal cond_lock(%ebx), %edx +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_lock_wait +- +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- addl $1, cond_futex(%ebx) +- movl cond_futex(%ebx), %ebp +- +- /* Unlock. */ +- LOCK +-#if cond_lock == 0 +- subl $1, (%ebx) +-#else +- subl $1, cond_lock(%ebx) +-#endif +- je 93f +-#if cond_lock == 0 +- movl %ebx, %eax +-#else +- leal cond_lock(%ebx), %eax +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_unlock_wake +- +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorl %ecx, %ecx +- movl dep_mutex(%ebx), %edi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -642,10 +566,6 @@ __condvar_w_cleanup: + .long .LcleanupEND-.Lsub_cond_futex + .long __condvar_w_cleanup-.LSTARTCODE + .uleb128 0 +- .long .LcleanupSTART2-.LSTARTCODE +- .long .LcleanupEND2-.LcleanupSTART2 +- .long __condvar_w_cleanup-.LSTARTCODE +- .uleb128 0 + .long .LcallUR-.LSTARTCODE + .long .LENDCODE-.LcallUR + .long 0 +Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig +diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000 +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + + #include + +@@ -137,14 +136,11 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 61f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi + movl $SYS_futex, %eax + syscall + + movl $1, %r8d +- cmpq $-EAGAIN, %rax +- je 91f + #ifdef __ASSUME_REQUEUE_PI + jmp 62f + #else +@@ -331,70 +327,6 @@ __pthread_cond_wait: + + 13: movq %r10, %rax + jmp 14b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- movq 8(%rsp), %rdi +- +- /* Get internal lock. */ +- movl $1, %esi +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %esi, (%rdi) +-#else +- cmpxchgl %esi, cond_lock(%rdi) +-#endif +- jz 92f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- cmpq $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- callq __lll_lock_wait +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- incl cond_futex(%rdi) +- movl cond_futex(%rdi), %edx +- +- /* Release internal lock. */ +- LOCK +-#if cond_lock == 0 +- decl (%rdi) +-#else +- decl cond_lock(%rdi) +-#endif +- jz 93f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- cmpq $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- /* The call preserves %rdx. */ +- callq __lll_unlock_wake +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorq %r10, %r10 +- movq dep_mutex(%rdi), %r8 +- leaq cond_futex(%rdi), %rdi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -547,15 +479,11 @@ __condvar_cleanup1: + .uleb128 .LcleanupSTART-.LSTARTCODE + .uleb128 .LcleanupEND-.LcleanupSTART + .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 +- .uleb128 .LcleanupSTART2-.LSTARTCODE +- .uleb128 .LcleanupEND2-.LcleanupSTART2 +- .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 ++ .uleb128 0 + .uleb128 .LcallUR-.LSTARTCODE + .uleb128 .LENDCODE-.LcallUR + .uleb128 0 +- .uleb128 0 ++ .uleb128 0 + .Lcstend: + + +Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig +Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej diff --git a/testing/glibc/glibc-2.15-strcmp-disable-avx.patch b/testing/glibc/glibc-2.15-strcmp-disable-avx.patch new file mode 100644 index 000000000..7f1f5b8f2 --- /dev/null +++ b/testing/glibc/glibc-2.15-strcmp-disable-avx.patch @@ -0,0 +1,48 @@ +diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S +index f93c83d..d8aa889 100644 +--- a/sysdeps/x86_64/multiarch/strcmp.S ++++ b/sysdeps/x86_64/multiarch/strcmp.S +@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strcasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strcasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strncasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strncasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) + # include "strcmp-sse42.S" + + +-# ifdef HAVE_AVX_SUPPORT +-# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L +-# define LABEL(l) .L##l##_avx +-# define GLABEL(l) l##_avx +-# define USE_AVX 1 +-# undef STRCMP_SSE42 +-# define STRCMP_SSE42 STRCMP_AVX +-# define SECTION avx +-# include "strcmp-sse42.S" +-# endif +-# endif +- +- + # undef ENTRY + # define ENTRY(name) \ + .type STRCMP_SSE2, @function; \ diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch new file mode 100644 index 000000000..28d5dd424 --- /dev/null +++ b/testing/glibc/glibc-__i686.patch @@ -0,0 +1,13 @@ +diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile +--- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 ++++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 +@@ -1,6 +1,7 @@ + # The mpn functions need a #define for asm syntax flavor. +-# Every i386 port in use uses gas syntax (I think). +-asm-CPPFLAGS += -DGAS_SYNTAX ++# Every i386 port in use uses gas syntax (I think). Don't replace ++# __i686 in __i686.get_pc_thunk.bx. ++asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 + + # The i386 `long double' is a distinct type we support. + long-double-fcts = yes diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install new file mode 100644 index 000000000..7f85ade96 --- /dev/null +++ b/testing/glibc/glibc.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) + +post_upgrade() { + sbin/ldconfig -r . + [ -x sbin/init ] && sbin/init u + usr/sbin/locale-gen + + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen new file mode 100755 index 000000000..5aff344c4 --- /dev/null +++ b/testing/glibc/locale-gen @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +LOCALEGEN=/etc/locale.gen +LOCALES=/usr/share/i18n/locales +if [ -n "$POSIXLY_CORRECT" ]; then + unset POSIXLY_CORRECT +fi + + +[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; + +# Remove all old locale dir and locale-archive before generating new +# locale data. +rm -rf /usr/lib/locale/* || true + +umask 022 + +is_entry_ok() { + if [ -n "$locale" -a -n "$charset" ] ; then + true + else + echo "error: Bad entry '$locale $charset'" + false + fi +} + +echo "Generating locales..." +while read locale charset; do \ + case $locale in \#*) continue;; "") continue;; esac; \ + is_entry_ok || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ + echo -n ".$charset"; \ + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ + echo -n '...'; \ + if [ -f $LOCALES/$locale ]; then input=$locale; else \ + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ + localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ + echo ' done'; \ +done < $LOCALEGEN +echo "Generation complete." diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt new file mode 100644 index 000000000..ccdd81734 --- /dev/null +++ b/testing/glibc/locale.gen.txt @@ -0,0 +1,23 @@ +# Configuration file for locale-gen +# +# lists of locales that are to be generated by the locale-gen command. +# +# Each line is of the form: +# +# +# +# where is one of the locales given in /usr/share/i18n/locales +# and is one of the character sets listed in /usr/share/i18n/charmaps +# +# Examples: +# en_US ISO-8859-1 +# en_US.UTF-8 UTF-8 +# de_DE ISO-8859-1 +# de_DE@euro ISO-8859-15 +# +# The locale-gen command will generate all the locales, +# placing them in /usr/lib/locale. +# +# A list of supported locales is included in this file. +# Uncomment the ones you need. +# diff --git a/testing/glibc/nscd b/testing/glibc/nscd new file mode 100755 index 000000000..8b14f2a3f --- /dev/null +++ b/testing/glibc/nscd @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/nscd` +case "$1" in + start) + stat_busy "Starting nscd" + # create necessary directories if they don't already exist + mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null + # remove stale files + rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null + [ -z "$PID" ] && /usr/sbin/nscd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon nscd + stat_done + fi + ;; + stop) + stat_busy "Stopping nscd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon nscd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/kactivities/PKGBUILD b/testing/kactivities/PKGBUILD new file mode 100644 index 000000000..65f6d7003 --- /dev/null +++ b/testing/kactivities/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 147575 2012-01-25 23:15:01Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kactivities +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='API for using and interacting with Activities' +url='http://kde.org/' +license=('GPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('ac64d13f767c06bfcf2040fcdf94a78410ad035d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/testing/kdeaccessibility-jovie/PKGBUILD b/testing/kdeaccessibility-jovie/PKGBUILD new file mode 100644 index 000000000..7dda45235 --- /dev/null +++ b/testing/kdeaccessibility-jovie/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 147585 2012-01-25 23:21:40Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeaccessibility-jovie +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='A text to speech application' +url='http://kde.org/applications/utilities/jovie/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdebase-runtime' 'speech-dispatcher') +makedepends=('cmake' 'automoc4') +replaces=('kdeaccessibility-kttsd') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.bz2") +sha1sums=('aef47e440183323c5a62d3f45aaece7215817917') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../jovie-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/testing/kdeaccessibility-jovie/kdeaccessibility-jovie.install b/testing/kdeaccessibility-jovie/kdeaccessibility-jovie.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeaccessibility-jovie/kdeaccessibility-jovie.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/kdeaccessibility-kaccessible/PKGBUILD b/testing/kdeaccessibility-kaccessible/PKGBUILD new file mode 100644 index 000000000..178a4b15a --- /dev/null +++ b/testing/kdeaccessibility-kaccessible/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 147586 2012-01-25 23:22:10Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeaccessibility-kaccessible +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Provides accessibility services like focus tracking and a screenreader' +url='http://accessibility.kde.org/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdelibs' 'speech-dispatcher') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.bz2") +sha1sums=('16451b090fe1ed345b5c1d3426bf0123eda08859') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kaccessible-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/testing/kdeaccessibility-kmag/PKGBUILD b/testing/kdeaccessibility-kmag/PKGBUILD new file mode 100644 index 000000000..67ef40dd2 --- /dev/null +++ b/testing/kdeaccessibility-kmag/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 147587 2012-01-25 23:22:42Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeaccessibility-kmag +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Screen Magnifier' +url='http://kde.org/applications/utilities/kmag/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.bz2") +sha1sums=('7f281e2ac07aeb8d31249e6e0b27661a87f98a0c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmag-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/testing/kdeaccessibility-kmag/kdeaccessibility-kmag.install b/testing/kdeaccessibility-kmag/kdeaccessibility-kmag.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeaccessibility-kmag/kdeaccessibility-kmag.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/kdeaccessibility-kmousetool/PKGBUILD b/testing/kdeaccessibility-kmousetool/PKGBUILD new file mode 100644 index 000000000..fbdaf0720 --- /dev/null +++ b/testing/kdeaccessibility-kmousetool/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 147588 2012-01-25 23:23:14Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeaccessibility-kmousetool +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Clicks the mouse for you, reducing the effects of RSI' +url='http://kde.org/applications/utilities/kmousetool/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.bz2") +sha1sums=('121fce8fd61772d044a48885918d2c0b500bb646') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmousetool-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install b/testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.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/kdeaccessibility-kmouth/PKGBUILD b/testing/kdeaccessibility-kmouth/PKGBUILD new file mode 100644 index 000000000..09a838a85 --- /dev/null +++ b/testing/kdeaccessibility-kmouth/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 147589 2012-01-25 23:23:37Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeaccessibility-kmouth +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='Speech Synthesizer Frontend' +url='http://kde.org/applications/utilities/kmouth/' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.bz2") +sha1sums=('43ff583d0628005087c948362b1e64dc4d359d88') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmouth-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + cd $srcdir/build/doc + make DESTDIR=$pkgdir install +} diff --git a/testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install b/testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeaccessibility-kmouth/kdeaccessibility-kmouth.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/kdeadmin/PKGBUILD b/testing/kdeadmin/PKGBUILD new file mode 100644 index 000000000..12d154e47 --- /dev/null +++ b/testing/kdeadmin/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 147590 2012-01-25 23:24:27Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgbase=kdeadmin +pkgname=('kdeadmin-kcron' + 'kdeadmin-ksystemlog' + 'kdeadmin-kuser' + 'kdeadmin-system-config-printer-kde') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeadmin') +makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'syslog-path.patch') +sha1sums=('a7cf29130bd83615bdc01f54a465cef8c492c527' + '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + patch -p1 -i ${srcdir}/syslog-path.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_strigi-analyzer=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package_kdeadmin-kcron() { + pkgdesc='Configure and schedule tasks' + depends=('kdelibs') + cd $srcdir/build/kcron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcron + make DESTDIR=$pkgdir install +} + +package_kdeadmin-ksystemlog() { + pkgdesc='System log viewer tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/ksystemlog/" + cd $srcdir/build/ksystemlog + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksystemlog + make DESTDIR=$pkgdir install +} + +package_kdeadmin-kuser() { + pkgdesc='User Manager' + depends=('kdepim-runtime') + url="http://kde.org/applications/system/kuser/" + install='kdeadmin.install' + cd $srcdir/build/kuser + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kuser + make DESTDIR=$pkgdir install +} + +package_kdeadmin-system-config-printer-kde() { + pkgdesc='Configure local and remote Printers' + depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt' + 'cups' 'python2-gobject2') + url="http://kde.org/applications/system/printerapplet/" + cd $srcdir/build/system-config-printer-kde + make DESTDIR=$pkgdir install + + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py +} diff --git a/testing/kdeadmin/kdeadmin.install b/testing/kdeadmin/kdeadmin.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeadmin/kdeadmin.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/kdeadmin/syslog-path.patch b/testing/kdeadmin/syslog-path.patch new file mode 100644 index 000000000..8a9142bf6 --- /dev/null +++ b/testing/kdeadmin/syslog-path.patch @@ -0,0 +1,11 @@ +--- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100 ++++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100 +@@ -39,7 +39,7 @@ + SystemConfiguration() : + GenericLogModeConfiguration( + QLatin1String( SYSTEM_LOG_MODE_ID ), +- QStringList() << QLatin1String( "/var/log/syslog" ), ++ QStringList() << QLatin1String( "/var/log/messages.log" ), + QList() << INFORMATION_LOG_LEVEL_ID + ) { + diff --git a/testing/kdeartwork/PKGBUILD b/testing/kdeartwork/PKGBUILD new file mode 100644 index 000000000..3c85469db --- /dev/null +++ b/testing/kdeartwork/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 147591 2012-01-25 23:25:21Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgbase=kdeartwork +pkgname=('kdeartwork-aurorae' + 'kdeartwork-colorschemes' + 'kdeartwork-desktopthemes' + 'kdeartwork-emoticons' + 'kdeartwork-iconthemes' + 'kdeartwork-kscreensaver' + 'kdeartwork-sounds' + 'kdeartwork-styles' + 'kdeartwork-wallpapers' + 'kdeartwork-weatherwallpapers') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeartwork') +makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' + 'libkexiv2') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('08c6e127ad1931a13ea1dde25189a49de089fa89') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeartwork-aurorae() { + pkgdesc='An Aurorae theme based on the Oxygen plasma theme' + cd $srcdir/build/aurorae + make DESTDIR=$pkgdir install +} + +package_kdeartwork-colorschemes() { + pkgdesc='KDE color schemes' + replaces=('kdeaccessibility-colorschemes') + cd $srcdir/build/ColorSchemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-desktopthemes() { + pkgdesc='KDE desktop themes' + cd $srcdir/build/desktopthemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-emoticons() { + pkgdesc='KDE emoticons' + cd $srcdir/build/emoticons + make DESTDIR=$pkgdir install +} + +package_kdeartwork-iconthemes() { + pkgdesc='KDE icon themes' + replaces=('kdeaccessibility-iconthemes') + cd $srcdir/build/IconThemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-kscreensaver() { + pkgdesc='KDE screensaver' + depends=('kdebase-workspace' 'libkexiv2') + cd $srcdir/build/kscreensaver + make DESTDIR=$pkgdir install +} + +package_kdeartwork-sounds() { + pkgdesc='KDE sounds' + cd $srcdir/build/sounds + make DESTDIR=$pkgdir install +} + +package_kdeartwork-styles() { + pkgdesc='KDE styles' + depends=('kdebase-workspace') + cd $srcdir/build/styles + make DESTDIR=$pkgdir install + cd $srcdir/build/kwin-styles + make DESTDIR=$pkgdir install +} + +package_kdeartwork-wallpapers() { + pkgdesc='KDE wallpapers' + cd $srcdir/build/wallpapers + make DESTDIR=$pkgdir install + cd $srcdir/build/HighResolutionWallpapers + make DESTDIR=$pkgdir install +} + +package_kdeartwork-weatherwallpapers() { + pkgdesc='KDE weather wallpapers' + cd $srcdir/build/WeatherWallpapers + make DESTDIR=$pkgdir install +} diff --git a/testing/kdebase-konsole/PKGBUILD b/testing/kdebase-konsole/PKGBUILD new file mode 100644 index 000000000..bd62084fe --- /dev/null +++ b/testing/kdebase-konsole/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 147592 2012-01-25 23:29:28Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebase-konsole +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://kde.org/applications/system/konsole/' +pkgdesc="Terminal" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2") +sha1sums=('f99abc20fd0042be62e48308f334b66a6a3135d7') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../konsole-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdebase-runtime/PKGBUILD b/testing/kdebase-runtime/PKGBUILD index 56c5e03ca..0a4d591f0 100644 --- a/testing/kdebase-runtime/PKGBUILD +++ b/testing/kdebase-runtime/PKGBUILD @@ -1,30 +1,26 @@ -# $Id: PKGBUILD 146249 2012-01-07 05:13:26Z eric $ +# $Id: PKGBUILD 147564 2012-01-25 23:09:19Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-runtime -pkgver=4.7.4 -pkgrel=3 +pkgver=4.8.0 +pkgrel=1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' - 'xorg-xauth' 'hicolor-icon-theme') -makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib') + 'xorg-xauth') +makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen' + 'xine-lib') optdepends=('htdig: to build the search index in khelpcenter' 'rarian: needed by khelpcenter' 'gdb: drkonq crash handler') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2" - 'libqzeitgeist08.patch') -sha1sums=('bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6' - '164c9e4305029cb68a2101cfeeb76c7066c2fd39') +source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2") +sha1sums=('5e1e98535529a67f8d20e8c76d051c81604d7064') build() { - cd "${srcdir}"/kde-runtime-${pkgver} - patch -p1 -i "${srcdir}"/libqzeitgeist08.patch - cd "${srcdir}" mkdir build cd build @@ -40,4 +36,8 @@ package() { make DESTDIR="$pkgdir" install rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" + + # Fix Python2 path + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen } diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD new file mode 100644 index 000000000..b4f171fad --- /dev/null +++ b/testing/kdebase-workspace/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 147576 2012-01-25 23:16:04Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=kdebase-workspace +_pkgname=kde-workspace +pkgver=4.8.0 +pkgrel=1 +pkgdesc="KDE Base Workspace" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde') +# note on libxdamage: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxdamage +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' + 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' + 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' + 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres' 'libxtst') +makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') +optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +install="${pkgname}.install" +backup=('usr/share/config/kdm/kdmrc' + 'etc/pam.d/kde' + 'etc/pam.d/kde-np' + 'etc/pam.d/kscreensaver') +options=('emptydirs') +source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" + 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('4c471b159315b084c65196b0c93c34981a9105c5' + '5db3a245201bd4a50e65aa2ef583cf5490e4f646' + 'e4198a443703f749b58a4fec88362fced1b45789' + '264e395c2c44cdda5a242c6dee649afab44cd6e5' + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'd7b5883f7e65c6839b1f65f94d58026673dd0226' + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + 'd509dac592bd8b310df27991b208c95b6d907514') + +build() { + cd "${srcdir}"/${_pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/kdm-xinitrd.patch + patch -p0 -i "${srcdir}"/fixpath.patch + patch -p0 -i "${srcdir}"/terminate-server.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xmms=OFF \ + -DWITH_Googlegadgets=OFF \ + -DWITH_libgps=OFF \ + -DWITH_OpenGLES=ON \ + -DKWIN_BUILD_WITH_OPENGLES=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm + install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde + install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np + install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver + install -d -m755 "${pkgdir}"/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/ + install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} + + install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm +} diff --git a/testing/kdebase-workspace/fixpath.patch b/testing/kdebase-workspace/fixpath.patch new file mode 100644 index 000000000..be2b8383e --- /dev/null +++ b/testing/kdebase-workspace/fixpath.patch @@ -0,0 +1,34 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -34,22 +34,6 @@ + MALLOC_CHECK_=2 + export MALLOC_CHECK_ + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do diff --git a/testing/kdebase-workspace/kde-np.pam b/testing/kdebase-workspace/kde-np.pam new file mode 100644 index 000000000..dfedb8edf --- /dev/null +++ b/testing/kdebase-workspace/kde-np.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth required pam_nologin.so +auth required pam_permit.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so +-session optional pam_systemd.so diff --git a/testing/kdebase-workspace/kde.pam b/testing/kdebase-workspace/kde.pam new file mode 100644 index 000000000..9ec074d06 --- /dev/null +++ b/testing/kdebase-workspace/kde.pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so +-session optional pam_systemd.so diff --git a/testing/kdebase-workspace/kdebase-workspace.install b/testing/kdebase-workspace/kdebase-workspace.install new file mode 100644 index 000000000..f7d6d305b --- /dev/null +++ b/testing/kdebase-workspace/kdebase-workspace.install @@ -0,0 +1,25 @@ +post_install() { + groupadd -g 135 kdm &>/dev/null + useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null + getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_remove() { + if getent passwd kdm >/dev/null 2>&1; then + userdel kdm + fi + if getent group kdm >/dev/null 2>&1; then + groupdel kdm + fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/testing/kdebase-workspace/kdm b/testing/kdebase-workspace/kdm new file mode 100644 index 000000000..799d58f4b --- /dev/null +++ b/testing/kdebase-workspace/kdm @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/kdm) +case "$1" in + start) + stat_busy "Starting KDE Desktop Manager" + [ -z "$PID" ] && /usr/bin/kdm &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon kdm + stat_done + fi + ;; + stop) + stat_busy "Stopping KDE Desktop Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kdm + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/kdebase-workspace/kdm-xinitrd.patch b/testing/kdebase-workspace/kdm-xinitrd.patch new file mode 100644 index 000000000..f5fc0e571 --- /dev/null +++ b/testing/kdebase-workspace/kdm-xinitrd.patch @@ -0,0 +1,18 @@ +--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 ++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 +@@ -742,6 +742,15 @@ + "[ -f /etc/xprofile ] && . /etc/xprofile\n" + "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" + "\n" ++"# run all system xinitrc shell scripts.\n" ++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" ++" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" ++" if [ -x \"$i\" ]; then\n" ++" . \"$i\"\n" ++" fi\n" ++" done\n" ++"fi\n" ++"\n" + "if [ -d /etc/X11/Xresources ]; then\n" + " for i in /etc/X11/Xresources/*; do\n" + " [ -f $i ] && xrdb -merge $i\n" diff --git a/testing/kdebase-workspace/kscreensaver.pam b/testing/kdebase-workspace/kscreensaver.pam new file mode 100644 index 000000000..b4d80c21f --- /dev/null +++ b/testing/kdebase-workspace/kscreensaver.pam @@ -0,0 +1 @@ +auth required pam_unix_auth.so diff --git a/testing/kdebase-workspace/terminate-server.patch b/testing/kdebase-workspace/terminate-server.patch new file mode 100644 index 000000000..094591317 --- /dev/null +++ b/testing/kdebase-workspace/terminate-server.patch @@ -0,0 +1,11 @@ +--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 ++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 +@@ -1448,7 +1448,7 @@ + + Key: TerminateServer + Type: bool +-Default: false ++Default: true + User: core + Instance: #:*/! + Merge: xdm diff --git a/testing/kdebase/PKGBUILD b/testing/kdebase/PKGBUILD new file mode 100644 index 000000000..e49b92dce --- /dev/null +++ b/testing/kdebase/PKGBUILD @@ -0,0 +1,125 @@ +# $Id: PKGBUILD 147577 2012-01-25 23:17:43Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgbase=kdebase +pkgname=('kdebase-dolphin' + 'kdebase-kdepasswd' + 'kdebase-kdialog' + 'kdebase-keditbookmarks' + 'kdebase-kfind' + 'kdebase-konq-plugins' + 'kdebase-konqueror' + 'kdebase-lib' + 'kdebase-plasma') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') +source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2" + 'fix-controlclick-selection.patch') +sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3' + 'b29c42301b84475f95f19ff9edb22d2134df9c1c') + +build() { + cd "${srcdir}"/kde-baseapps-${pkgver} + patch -p1 -i "${srcdir}"/fix-controlclick-selection.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../kde-baseapps-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdebase-dolphin() { + pkgdesc='File Manager' + depends=('kdebase-runtime' 'kdebase-lib') + optdepends=('kdegraphics-svgpart: thumbailers for SVG files' + 'kdegraphics-thumbnailers: thumbnailers for graphics file' + 'ruby: servicemenu installation') + url="http://kde.org/applications/system/dolphin/" + install=kdebase-dolphin.install + cd $srcdir/build/dolphin + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dolphin + make DESTDIR=$pkgdir install +} + +package_kdebase-kdepasswd() { + pkgdesc='Change Password' + depends=('kdebase-runtime' 'kdebase-lib') + cd $srcdir/build/kdepasswd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdepasswd + make DESTDIR=$pkgdir install +} + +package_kdebase-kdialog() { + pkgdesc='A utility for displaying dialog boxes from shell scripts' + depends=('kdebase-runtime') + cd $srcdir/build/kdialog + make DESTDIR=$pkgdir install +} + +package_kdebase-keditbookmarks() { + pkgdesc='Bookmark Organizer and Editor' + depends=('kdebase-runtime') + cd $srcdir/build/keditbookmarks + make DESTDIR=$pkgdir install +} + +package_kdebase-kfind() { + pkgdesc='Find Files/Folders' + depends=('kdebase-runtime' 'kdebase-lib') + url="http://kde.org/applications/utilities/kfind/" + install='kdebase.install' + cd $srcdir/build/kfind + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfind + make DESTDIR=$pkgdir install +} + +package_kdebase-konq-plugins() { + pkgdesc='Extra plugins for Konqueror' + depends=('kdebase-konqueror' 'tidyhtml') + replaces=('konq-plugins') + install='kdebase.install' + cd $srcdir/build/konq-plugins + make DESTDIR=$pkgdir install +} + +package_kdebase-konqueror() { + pkgdesc='KDE File Manager & Web Browser' + depends=('kdebase-dolphin' 'kdebase-keditbookmarks') + optdepends=('kwebkitpart: to enable webkit engine') + url="http://kde.org/applications/internet/konqueror/" + install='kdebase-konqueror.install' + conflicts=('kdebase-nsplugins') + replaces=('kdebase-nsplugins') + for i in konqueror doc/konqueror nsplugins; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdebase-lib() { + pkgdesc='KDE libraries for the basic desktop applications' + groups=() + depends=('kdelibs') + cd $srcdir/build/lib + make DESTDIR=$pkgdir install +} + +package_kdebase-plasma() { + pkgdesc='Display the contents of folders (User´s home folder as default)' + depends=('kdebase-workspace' 'kdebase-lib') + cd $srcdir/build/plasma + make DESTDIR=$pkgdir install +} diff --git a/testing/kdebase/fix-controlclick-selection.patch b/testing/kdebase/fix-controlclick-selection.patch new file mode 100644 index 000000000..a51161326 --- /dev/null +++ b/testing/kdebase/fix-controlclick-selection.patch @@ -0,0 +1,11 @@ +--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp ++++ b/dolphin/src/kitemviews/kitemlistcontroller.cpp +@@ -471,7 +471,7 @@ bool KItemListController::mousePressEven + (!shiftOrControlPressed && !pressedItemAlreadySelected); + if (clearSelection) { + m_selectionManager->clearSelection(); +- } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) { ++ } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) { + // The user might want to start dragging multiple items, but if he clicks the item + // in order to trigger it instead, the other selected items must be deselected. + // However, we do not know yet what the user is going to do. diff --git a/testing/kdebase/kdebase-dolphin.install b/testing/kdebase/kdebase-dolphin.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/testing/kdebase/kdebase-dolphin.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdebase/kdebase-konqueror.install b/testing/kdebase/kdebase-konqueror.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/testing/kdebase/kdebase-konqueror.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/kdebase/kdebase.install b/testing/kdebase/kdebase.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdebase/kdebase.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/kdebindings-kimono/PKGBUILD b/testing/kdebindings-kimono/PKGBUILD new file mode 100644 index 000000000..89affca1b --- /dev/null +++ b/testing/kdebindings-kimono/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147593 2012-01-25 23:29:57Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebindings-kimono +pkgver=4.8.0 +pkgrel=1 +pkgdesc=".NET/Mono bindings for the KDE libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-qyoto' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') +conflicts=('kdebindings-csharp') +source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2") +sha1sums=('b46842ce2b3c1aa3620277a461c3d127843d6a4d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kimono-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Soprano=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdebindings-kross/PKGBUILD b/testing/kdebindings-kross/PKGBUILD new file mode 100644 index 000000000..957c4d5ca --- /dev/null +++ b/testing/kdebindings-kross/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 147594 2012-01-25 23:30:26Z andrea $ +# Maintainer: Andrea Scarpino + +pkgbase=kdebindings-kross +pkgname=('kdebindings-kross-python' +# 'kdebindings-kross-ruby' + 'kdebindings-kross-java') +pkgver=4.8.0 +pkgrel=1 +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') +source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2") +sha1sums=('2b2ac36b1597e180c1e3923c00f4ca465bd99a03') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kross-interpreters-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_ruby=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package_kdebindings-kross-python() { + pkgdesc="Python2 language interpreters to enable in-process scripting with Kross" + depends=('kdelibs' 'python2') + + cd "${srcdir}"/build/python + make DESTDIR="${pkgdir}" install +} + +package_kdebindings-kross-java() { + pkgdesc="Java language interpreters to enable in-process scripting with Kross" + depends=('kdelibs' 'java-environment') + + cd "${srcdir}"/build/java + make DESTDIR="${pkgdir}" install +} + +package_kdebindings-kross-ruby() { + pkgdesc="Ruby language interpreters to enable in-process scripting with Kross" + depends=('kdelibs' 'ruby') + + cd "${srcdir}"/build/ruby + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdebindings-perlkde/PKGBUILD b/testing/kdebindings-perlkde/PKGBUILD new file mode 100644 index 000000000..d28d90146 --- /dev/null +++ b/testing/kdebindings-perlkde/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147595 2012-01-25 23:30:52Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebindings-perlkde +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Perl bindings for the KDE libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-perlqt' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' + 'kdegraphics-okular' 'kdesdk-kate') +source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") +sha1sums=('e9c46cec78f42a29befbc26dfa428d6a28027754') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../perlkde-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdebindings-perlqt/PKGBUILD b/testing/kdebindings-perlqt/PKGBUILD new file mode 100644 index 000000000..35597454b --- /dev/null +++ b/testing/kdebindings-perlqt/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147571 2012-01-25 23:13:05Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebindings-perlqt +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Perl bindings for the Qt libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-smokeqt' 'perl-list-moreutils') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") +sha1sums=('db11f9625d6c531d9b4cf0d50c36e405600a7717') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../perlqt-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdebindings-python/PKGBUILD b/testing/kdebindings-python/PKGBUILD new file mode 100644 index 000000000..a95919dcd --- /dev/null +++ b/testing/kdebindings-python/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 147572 2012-01-25 23:13:32Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebindings-python +pkgver=4.8.0 +pkgrel=1 +pkgdesc="KDE bindings for Python" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") +sha1sums=('cf204efebc1eda6de7f4405dbf5037bdaffd30e9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../pykde4-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} diff --git a/testing/kdebindings-qtruby/PKGBUILD b/testing/kdebindings-qtruby/PKGBUILD new file mode 100644 index 000000000..e704314ac --- /dev/null +++ b/testing/kdebindings-qtruby/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147574 2012-01-25 23:14:35Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebindings-qtruby +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Qt bindings for ruby" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-smokeqt' 'ruby') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-ruby') +source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") +sha1sums=('9b8e9ab4926929909861f6557dea908d328a1dd2') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../qtruby-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdebindings-qyoto/PKGBUILD b/testing/kdebindings-qyoto/PKGBUILD new file mode 100644 index 000000000..2d09d02eb --- /dev/null +++ b/testing/kdebindings-qyoto/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147573 2012-01-25 23:14:08Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebindings-qyoto +pkgver=4.8.0 +pkgrel=1 +pkgdesc=".NET/Mono bindings for the Qt libraries" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-smokeqt' 'mono') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +conflicts=('kdebindings-csharp') +source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") +sha1sums=('3e5abc08b5a097e332449f15c50975402934d60a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../qyoto-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdebindings-smokegen/PKGBUILD b/testing/kdebindings-smokegen/PKGBUILD new file mode 100644 index 000000000..23a6998d0 --- /dev/null +++ b/testing/kdebindings-smokegen/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 147566 2012-01-25 23:10:31Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebindings-smokegen +pkgver=4.8.0 +pkgrel=1 +pkgdesc="A general purpose C++ parser with a plugin infrastructure" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") +sha1sums=('9b4f0af954e845eecea8e7ed388e01cffb8974d2') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokegen-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdebindings-smokekde/PKGBUILD b/testing/kdebindings-smokekde/PKGBUILD new file mode 100644 index 000000000..d779b8ded --- /dev/null +++ b/testing/kdebindings-smokekde/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147570 2012-01-25 23:12:36Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebindings-smokekde +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Language independent library for KDE bindings" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-smokeqt') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' + 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") +sha1sums=('04f01d14cfc395fcf675b7a22202b41351f471f9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokekde-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdebindings-smokeqt/PKGBUILD b/testing/kdebindings-smokeqt/PKGBUILD new file mode 100644 index 000000000..797647835 --- /dev/null +++ b/testing/kdebindings-smokeqt/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147567 2012-01-25 23:10:57Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdebindings-smokeqt +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Language independent library for Qt bindings" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') +makedepends=('cmake' 'automoc4') +conflicts=('kdebindings-smoke') +source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") +sha1sums=('9ad56f1441c92b6d24b7e9ec19fe62da34820731') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../smokeqt-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Qwt5=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-analitza/PKGBUILD b/testing/kdeedu-analitza/PKGBUILD new file mode 100644 index 000000000..5b7311cd5 --- /dev/null +++ b/testing/kdeedu-analitza/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 147584 2012-01-25 23:21:17Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-analitza +pkgver=4.8.0 +pkgrel=1 +pkgdesc="A library to add mathematical features to your program" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.bz2") +sha1sums=('2681b114deab6f3fd215e0348e34c63116ddd31c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../analitza-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-blinken/PKGBUILD b/testing/kdeedu-blinken/PKGBUILD new file mode 100644 index 000000000..157c841ad --- /dev/null +++ b/testing/kdeedu-blinken/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147596 2012-01-25 23:31:20Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-blinken +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Memory Enhancement Game" +url="http://kde.org/applications/education/blinken/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2") +sha1sums=('7283a49de949e15f9c9ab06dfa133012a4090a7c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../blinken-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-blinken/kdeedu-blinken.install b/testing/kdeedu-blinken/kdeedu-blinken.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-blinken/kdeedu-blinken.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/kdeedu-cantor/PKGBUILD b/testing/kdeedu-cantor/PKGBUILD new file mode 100644 index 000000000..c0e77dd68 --- /dev/null +++ b/testing/kdeedu-cantor/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 147597 2012-01-25 23:31:46Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-cantor +pkgver=4.8.0 +pkgrel=1 +pkgdesc="KDE Frontend to Mathematical Software" +url="http://kde.org/applications/education/cantor/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza') +makedepends=('cmake' 'automoc4' 'r') +optdepends=('maxima: Maxima backend' + 'octave: Octave backend' + 'r: R backend') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2") +sha1sums=('b0ef9cb3c25e4909b6855317425e9d9f12697dff') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../cantor-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-cantor/kdeedu-cantor.install b/testing/kdeedu-cantor/kdeedu-cantor.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdeedu-cantor/kdeedu-cantor.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/kdeedu-kalgebra/PKGBUILD b/testing/kdeedu-kalgebra/PKGBUILD new file mode 100644 index 000000000..63e37479c --- /dev/null +++ b/testing/kdeedu-kalgebra/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147598 2012-01-25 23:32:10Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kalgebra +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Graph Calculator" +url="http://kde.org/applications/education/kalgebra/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") +sha1sums=('45903803c0c0f3e05c30e7543ee3ebc891b60e4b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kalgebra-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kalgebra/kdeedu-kalgebra.install b/testing/kdeedu-kalgebra/kdeedu-kalgebra.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdeedu-kalgebra/kdeedu-kalgebra.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/kdeedu-kalzium/PKGBUILD b/testing/kdeedu-kalzium/PKGBUILD new file mode 100644 index 000000000..ac5a24ea8 --- /dev/null +++ b/testing/kdeedu-kalzium/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147599 2012-01-25 23:32:42Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kalzium +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Periodic Table of Elements" +url="http://kde.org/applications/education/kalzium/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdelibs' 'avogadro' 'ocaml' 'facile') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") +sha1sums=('0d4f9d3a148052c93068d4c2c0ed22969ac05202') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kalzium-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kalzium/kdeedu-kalzium.install b/testing/kdeedu-kalzium/kdeedu-kalzium.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-kalzium/kdeedu-kalzium.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/kdeedu-kanagram/PKGBUILD b/testing/kdeedu-kanagram/PKGBUILD new file mode 100644 index 000000000..695ca5e8b --- /dev/null +++ b/testing/kdeedu-kanagram/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147600 2012-01-25 23:33:23Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kanagram +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Letter Order Game" +url="http://kde.org/applications/education/kanagram/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") +sha1sums=('85daff6309edf72f93fe0f692413216313c98dbd') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kanagram-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kanagram/kdeedu-kanagram.install b/testing/kdeedu-kanagram/kdeedu-kanagram.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-kanagram/kdeedu-kanagram.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/kdeedu-kbruch/PKGBUILD b/testing/kdeedu-kbruch/PKGBUILD new file mode 100644 index 000000000..2c8e2e227 --- /dev/null +++ b/testing/kdeedu-kbruch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147601 2012-01-25 23:33:52Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kbruch +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Exercise Fractions" +url="http://kde.org/applications/education/kbruch/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") +sha1sums=('0f602d0dd1355dbf84c26f813458bdeb0508f4f8') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kbruch-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kbruch/kdeedu-kbruch.install b/testing/kdeedu-kbruch/kdeedu-kbruch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-kbruch/kdeedu-kbruch.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/kdeedu-kgeography/PKGBUILD b/testing/kdeedu-kgeography/PKGBUILD new file mode 100644 index 000000000..3d5efab4d --- /dev/null +++ b/testing/kdeedu-kgeography/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147602 2012-01-25 23:34:20Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kgeography +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Geography Trainer" +url="http://kde.org/applications/education/kgeography/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") +sha1sums=('07d77cd5182e0594273aa713ad62134232868c08') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kgeography-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kgeography/kdeedu-kgeography.install b/testing/kdeedu-kgeography/kdeedu-kgeography.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-kgeography/kdeedu-kgeography.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/kdeedu-khangman/PKGBUILD b/testing/kdeedu-khangman/PKGBUILD new file mode 100644 index 000000000..1d33727e0 --- /dev/null +++ b/testing/kdeedu-khangman/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147603 2012-01-25 23:35:02Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-khangman +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Hangman Game" +url="http://kde.org/applications/education/khangman/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2") +sha1sums=('2deaab70f8ed414a4ddb21aeb91627dac74986a6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../khangman-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-khangman/kdeedu-khangman.install b/testing/kdeedu-khangman/kdeedu-khangman.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-khangman/kdeedu-khangman.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/kdeedu-kig/PKGBUILD b/testing/kdeedu-kig/PKGBUILD new file mode 100644 index 000000000..d99d9dec7 --- /dev/null +++ b/testing/kdeedu-kig/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 147604 2012-01-25 23:35:28Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kig +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Interactive Geometry" +url="http://kde.org/applications/education/kig/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2") +sha1sums=('141a4c9230ab134dcf7016c2880357d9e52b8f69') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kig-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py +} diff --git a/testing/kdeedu-kig/kdeedu-kig.install b/testing/kdeedu-kig/kdeedu-kig.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdeedu-kig/kdeedu-kig.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/kdeedu-kiten/PKGBUILD b/testing/kdeedu-kiten/PKGBUILD new file mode 100644 index 000000000..f7e20eeb8 --- /dev/null +++ b/testing/kdeedu-kiten/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147605 2012-01-25 23:36:01Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kiten +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Japanese Reference/Study Tool" +url="http://kde.org/applications/education/kiten/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2") +sha1sums=('4068f2bcca69150a9b340a6d47ec4902d9dbacc9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kiten-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kiten/kdeedu-kiten.install b/testing/kdeedu-kiten/kdeedu-kiten.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-kiten/kdeedu-kiten.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/kdeedu-klettres/PKGBUILD b/testing/kdeedu-klettres/PKGBUILD new file mode 100644 index 000000000..5f58ccf94 --- /dev/null +++ b/testing/kdeedu-klettres/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147606 2012-01-25 23:36:46Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-klettres +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Learn The Alphabet" +url="http://kde.org/applications/education/klettres/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2") +sha1sums=('9d2c13dd14db79451db8afdc184f264b1ba29d81') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../klettres-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-klettres/kdeedu-klettres.install b/testing/kdeedu-klettres/kdeedu-klettres.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-klettres/kdeedu-klettres.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/kdeedu-kmplot/PKGBUILD b/testing/kdeedu-kmplot/PKGBUILD new file mode 100644 index 000000000..24270fc4d --- /dev/null +++ b/testing/kdeedu-kmplot/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147607 2012-01-25 23:37:15Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kmplot +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Mathematical Function Plotter" +url="http://kde.org/applications/education/kmplot/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") +sha1sums=('914151c41fba93cb1d0cd659fb3e392c0de1b5f8') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kmplot-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kmplot/kdeedu-kmplot.install b/testing/kdeedu-kmplot/kdeedu-kmplot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdeedu-kmplot/kdeedu-kmplot.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/kdeedu-kstars/PKGBUILD b/testing/kdeedu-kstars/PKGBUILD new file mode 100644 index 000000000..f47971e89 --- /dev/null +++ b/testing/kdeedu-kstars/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147608 2012-01-25 23:37:44Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kstars +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Desktop Planetarium" +url="http://kde.org/applications/education/kstars/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2") +sha1sums=('249f80cdd5198c5c22ce75cea4d1718d5865a3c9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kstars-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xplanet=OFF + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kstars/kdeedu-kstars.install b/testing/kdeedu-kstars/kdeedu-kstars.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-kstars/kdeedu-kstars.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/kdeedu-ktouch/PKGBUILD b/testing/kdeedu-ktouch/PKGBUILD new file mode 100644 index 000000000..20b5dbbbf --- /dev/null +++ b/testing/kdeedu-ktouch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147609 2012-01-25 23:38:37Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-ktouch +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Touch Typing Tutor" +url="http://kde.org/applications/education/ktouch/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") +sha1sums=('e1e1338e67c0c02c4573a4aa95a721c8f674f2c6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ktouch-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-ktouch/kdeedu-ktouch.install b/testing/kdeedu-ktouch/kdeedu-ktouch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-ktouch/kdeedu-ktouch.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/kdeedu-kturtle/PKGBUILD b/testing/kdeedu-kturtle/PKGBUILD new file mode 100644 index 000000000..a2569a0b8 --- /dev/null +++ b/testing/kdeedu-kturtle/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147610 2012-01-25 23:39:04Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kturtle +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Educational Programming Environment" +url="http://kde.org/applications/education/kturtle/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") +sha1sums=('3da036991fed5840fb45d033efe0082570e804d9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kturtle-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kturtle/kdeedu-kturtle.install b/testing/kdeedu-kturtle/kdeedu-kturtle.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-kturtle/kdeedu-kturtle.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/kdeedu-kwordquiz/PKGBUILD b/testing/kdeedu-kwordquiz/PKGBUILD new file mode 100644 index 000000000..3ae7b51e0 --- /dev/null +++ b/testing/kdeedu-kwordquiz/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147611 2012-01-25 23:39:29Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-kwordquiz +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Flash Card Trainer" +url="http://kde.org/applications/education/kwordquiz/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") +sha1sums=('34eec78fe68aef8b7166ca6cca84ed58290484b9') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kwordquiz-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/testing/kdeedu-kwordquiz/kdeedu-kwordquiz.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdeedu-kwordquiz/kdeedu-kwordquiz.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/kdeedu-marble/PKGBUILD b/testing/kdeedu-marble/PKGBUILD new file mode 100644 index 000000000..4a6f53e5e --- /dev/null +++ b/testing/kdeedu-marble/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147579 2012-01-25 23:18:40Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-marble +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Desktop Globe" +url="http://kde.org/applications/education/marble/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4' 'gpsd') +optdepends=('gpsd: gps support') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2") +sha1sums=('6c3c6b03c9d8e92730d6955adcbdb5de42fda43d') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../marble-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-marble/kdeedu-marble.install b/testing/kdeedu-marble/kdeedu-marble.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdeedu-marble/kdeedu-marble.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/kdeedu-parley/PKGBUILD b/testing/kdeedu-parley/PKGBUILD new file mode 100644 index 000000000..0d68cc678 --- /dev/null +++ b/testing/kdeedu-parley/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147612 2012-01-25 23:40:06Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-parley +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Vocabulary Trainer" +url="http://kde.org/applications/education/parley/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libkdeedu') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2") +sha1sums=('800eea4d6339da608cc720b5d6186de9a43b70ce') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../parley-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-parley/kdeedu-parley.install b/testing/kdeedu-parley/kdeedu-parley.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdeedu-parley/kdeedu-parley.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/kdeedu-rocs/PKGBUILD b/testing/kdeedu-rocs/PKGBUILD new file mode 100644 index 000000000..c43b9d002 --- /dev/null +++ b/testing/kdeedu-rocs/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147613 2012-01-25 23:40:47Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-rocs +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Rocs Graph Theory" +url="http://kde.org/applications/education/rocs/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'boost-libs') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2") +sha1sums=('d29daa9633e2ba6e2d3e0c7155ade752216a8969') +options=('!makeflags') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../rocs-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-step/PKGBUILD b/testing/kdeedu-step/PKGBUILD new file mode 100644 index 000000000..c33f01d37 --- /dev/null +++ b/testing/kdeedu-step/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147614 2012-01-25 23:41:13Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdeedu-step +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Interactive Physical Simulator" +url="http://kde.org/applications/education/step/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2") +sha1sums=('08fff354effdc6f10e3b55ab011f8393a19de9fd') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../step-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdeedu-step/kdeedu-step.install b/testing/kdeedu-step/kdeedu-step.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdeedu-step/kdeedu-step.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/kdegames/PKGBUILD b/testing/kdegames/PKGBUILD new file mode 100644 index 000000000..d9e46478b --- /dev/null +++ b/testing/kdegames/PKGBUILD @@ -0,0 +1,516 @@ +# $Id: PKGBUILD 147615 2012-01-25 23:42:53Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgbase=kdegames +pkgname=('kdegames-bomber' + 'kdegames-bovo' + 'kdegames-granatier' + 'kdegames-kajongg' + 'kdegames-kapman' + 'kdegames-katomic' + 'kdegames-kbattleship' + 'kdegames-kblackbox' + 'kdegames-kblocks' + 'kdegames-kbounce' + 'kdegames-kbreakout' + 'kdegames-kdiamond' + 'kdegames-kfourinline' + 'kdegames-kgoldrunner' + 'kdegames-kigo' + 'kdegames-killbots' + 'kdegames-kiriki' + 'kdegames-kjumpingcube' + 'kdegames-klines' + 'kdegames-klickety' + 'kdegames-kmahjongg' + 'kdegames-kmines' + 'kdegames-knetwalk' + 'kdegames-kolf' + 'kdegames-kollision' + 'kdegames-konquest' + 'kdegames-kpatience' + 'kdegames-kreversi' + 'kdegames-kshisen' + 'kdegames-ksirk' + 'kdegames-kspaceduel' + 'kdegames-ksquares' + 'kdegames-ksudoku' + 'kdegames-ktron' + 'kdegames-ktuberling' + 'kdegames-kubrick' + 'kdegames-libkdegames' + 'kdegames-libkmahjongg' + 'kdegames-lskat' + 'kdegames-palapeli') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegames') +makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' + 'openal') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('714a775811dae11ca85ce1113d673894b0afdcdd') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package_kdegames-bomber() { + pkgdesc='Arcade Bombing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bomber/" + install='kdegames.install' + cd $srcdir/build/bomber + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bomber + make DESTDIR=$pkgdir install +} + +package_kdegames-bovo() { + pkgdesc='Five-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bovo/" + install='kdegames.install' + cd $srcdir/build/bovo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bovo + make DESTDIR=$pkgdir install +} + +package_kdegames-granatier() { + pkgdesc='Granatier' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') + url="http://kde.org/applications/games/granatier/" + install='kdegames.install' + cd $srcdir/build/granatier + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/granatier + make DESTDIR=$pkgdir install +} + +package_kdegames-kajongg() { + pkgdesc='The ancient Chinese board game for 4 players' + depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted') + url="http://www.kde.org/applications/games/kajongg/" + install='kdegames.install' + cd $srcdir/build/kajongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kajongg + make DESTDIR=$pkgdir install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdegames-kapman() { + pkgdesc='Eat pills escaping ghosts' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kapman/" + install='kdegames.install' + cd $srcdir/build/kapman + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kapman + make DESTDIR=$pkgdir install +} + +package_kdegames-katomic() { + pkgdesc='Sokoban-like Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/katomic/" + install='kdegames.install' + cd $srcdir/build/katomic + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/katomic + make DESTDIR=$pkgdir install +} + +package_kdegames-kbattleship() { + pkgdesc='Battleship Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kbattleship/" + install='kdegames-kbattleship.install' + cd $srcdir/build/kbattleship + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbattleship + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \ + $pkgdir/usr/share/ggz/kbattleship.dsc +} + +package_kdegames-kblackbox() { + pkgdesc='Blackbox Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblackbox/" + install='kdegames.install' + cd $srcdir/build/kblackbox + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblackbox + make DESTDIR=$pkgdir install +} + +package_kdegames-kblocks() { + pkgdesc='Falling Blocks Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblocks/" + install='kdegames.install' + cd $srcdir/build/kblocks + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblocks + make DESTDIR=$pkgdir install +} + +package_kdegames-kbounce() { + pkgdesc='Ball Bouncing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbounce/" + install='kdegames.install' + cd $srcdir/build/kbounce + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbounce + make DESTDIR=$pkgdir install +} + +package_kdegames-kbreakout() { + pkgdesc='Breakout-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbreakout/" + install='kdegames.install' + cd $srcdir/build/kbreakout + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbreakout + make DESTDIR=$pkgdir install +} + +package_kdegames-kdiamond() { + pkgdesc='Three-in-a-row game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kdiamond/" + install='kdegames.install' + cd $srcdir/build/kdiamond + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdiamond + make DESTDIR=$pkgdir install +} + +package_kdegames-kfourinline() { + pkgdesc='Four-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kfourinline/" + install='kdegames-kfourinline.install' + cd $srcdir/build/kfourinline + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfourinline + make DESTDIR=$pkgdir install +} + +package_kdegames-kgoldrunner() { + pkgdesc='A game of action and puzzle-solving' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') + url="http://kde.org/applications/games/kgoldrunner/" + install='kdegames.install' + cd $srcdir/build/kgoldrunner + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgoldrunner + make DESTDIR=$pkgdir install +} + +package_kdegames-kigo() { + pkgdesc='Go Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo') + url="http://kde.org/applications/games/kigo/" + install='kdegames-kigo.install' + cd $srcdir/build/kigo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kigo + make DESTDIR=$pkgdir install +} + +package_kdegames-killbots() { + pkgdesc='Killbots' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/killbots/" + install='kdegames.install' + cd $srcdir/build/killbots + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/killbots + make DESTDIR=$pkgdir install +} + +package_kdegames-kiriki() { + pkgdesc='Yahtzee-like Dice Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kiriki/" + install='kdegames.install' + cd $srcdir/build/kiriki + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kiriki + make DESTDIR=$pkgdir install +} + +package_kdegames-kjumpingcube() { + pkgdesc='Territory Capture Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kjumpingcube/" + install='kdegames.install' + cd $srcdir/build/kjumpingcube + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kjumpingcube + make DESTDIR=$pkgdir install +} + +package_kdegames-klickety() { + pkgdesc='Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + replaces=('kdegames-ksame') + conflicts=('kdegames-ksame') + url="http://kde.org/applications/games/ksame/" + install='kdegames.install' + cd $srcdir/build/klickety + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klickety + make DESTDIR=$pkgdir install +} + +package_kdegames-klines() { + pkgdesc='Tactical Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/klines/" + install='kdegames.install' + cd $srcdir/build/klines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klines + make DESTDIR=$pkgdir install +} + +package_kdegames-kmahjongg() { + pkgdesc='Mahjongg Solitaire' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kmahjongg/" + install='kdegames.install' + cd $srcdir/build/kmahjongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-kmines() { + pkgdesc='Minesweeper-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kmines/" + install='kdegames.install' + cd $srcdir/build/kmines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmines + make DESTDIR=$pkgdir install +} + +package_kdegames-knetwalk() { + pkgdesc='Network Construction Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/knetwalk/" + install='kdegames.install' + cd $srcdir/build/knetwalk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/knetwalk + make DESTDIR=$pkgdir install +} + +package_kdegames-kolf() { + pkgdesc='Miniature Golf' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kolf/" + install='kdegames-kolf.install' + cd $srcdir/build/kolf + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kolf + make DESTDIR=$pkgdir install +} + +package_kdegames-kollision() { + pkgdesc='A simple ball dodging game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kollision/" + install='kdegames.install' + cd $srcdir/build/kollision + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kollision + make DESTDIR=$pkgdir install +} + +package_kdegames-konquest() { + pkgdesc='Galactic Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/konquest/" + install='kdegames.install' + cd $srcdir/build/konquest + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/konquest + make DESTDIR=$pkgdir install +} + +package_kdegames-kpatience() { + pkgdesc='Patience Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kpatience/" + install='kdegames-kpatience.install' + replaces=('kdegames-kpat') + cd $srcdir/build/kpat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kpat + make DESTDIR=$pkgdir install +} + +package_kdegames-kreversi() { + pkgdesc='Reversi Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kreversi/" + install='kdegames-kreversi.install' + cd $srcdir/build/kreversi + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kreversi + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \ + $pkgdir/usr/share/ggz/kreversi.dsc +} + +package_kdegames-kshisen() { + pkgdesc='Shisen-Sho Mahjongg-like Tile Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kshisen/" + install='kdegames.install' + cd $srcdir/build/kshisen + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kshisen + make DESTDIR=$pkgdir install +} + +package_kdegames-ksirk() { + pkgdesc='World Domination Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksirk/" + install='kdegames.install' + cd $srcdir/build/ksirk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksirk + make DESTDIR=$pkgdir install +} + +package_kdegames-kspaceduel() { + pkgdesc='Space Arcade Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kspaceduel/" + install='kdegames-kspaceduel.install' + cd $srcdir/build/kspaceduel + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kspaceduel + make DESTDIR=$pkgdir install +} + +package_kdegames-ksquares() { + pkgdesc='Connect the dots to create squares' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/ksquares/" + install='kdegames-ksquares.install' + cd $srcdir/build/ksquares + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksquares + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \ + $pkgdir/usr/share/ggz/ksquares.dsc +} + +package_kdegames-ksudoku() { + pkgdesc='KSudoku, Sudoku game & more for KDE' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksudoku/" + install='kdegames.install' + cd $srcdir/build/ksudoku + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksudoku + make DESTDIR=$pkgdir install +} + +package_kdegames-ktron() { + pkgdesc='Tron-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktron/" + install='kdegames.install' + cd $srcdir/build/ktron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktron + make DESTDIR=$pkgdir install +} + +package_kdegames-ktuberling() { + pkgdesc='Picture Game for Children' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktuberling/" + install='kdegames-ktuberling.install' + cd $srcdir/build/ktuberling + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktuberling + make DESTDIR=$pkgdir install +} + +package_kdegames-kubrick() { + pkgdesc='A 3-D game based on Rubik´s Cube' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kubrick/" + install='kdegames.install' + cd $srcdir/build/kubrick + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kubrick + make DESTDIR=$pkgdir install +} + +package_kdegames-libkdegames() { + pkgdesc='KDE game library' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkdegames + make DESTDIR=$pkgdir install + for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do + install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i) + done +} + +package_kdegames-libkmahjongg() { + pkgdesc='Library used for loading and rendering of Mahjongg tilesets' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-lskat() { + pkgdesc='Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/lskat/" + install='kdegames-lskat.install' + cd $srcdir/build/lskat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/lskat + make DESTDIR=$pkgdir install +} + +package_kdegames-palapeli() { + pkgdesc='Jigsaw puzzle game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/palapeli/" + install='kdegames-palapeli.install' + cd $srcdir/build/palapeli + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/palapeli + make DESTDIR=$pkgdir install +} diff --git a/testing/kdegames/kdegames-kbattleship.install b/testing/kdegames/kdegames-kbattleship.install new file mode 100644 index 000000000..ac4516ed0 --- /dev/null +++ b/testing/kdegames/kdegames-kbattleship.install @@ -0,0 +1,24 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kbattleship.dsc ]; then + ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/testing/kdegames/kdegames-kfourinline.install b/testing/kdegames/kdegames-kfourinline.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/testing/kdegames/kdegames-kfourinline.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/kdegames/kdegames-kigo.install b/testing/kdegames/kdegames-kigo.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/testing/kdegames/kdegames-kigo.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/kdegames/kdegames-kolf.install b/testing/kdegames/kdegames-kolf.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/testing/kdegames/kdegames-kolf.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/kdegames/kdegames-kpatience.install b/testing/kdegames/kdegames-kpatience.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/testing/kdegames/kdegames-kpatience.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/kdegames/kdegames-kreversi.install b/testing/kdegames/kdegames-kreversi.install new file mode 100644 index 000000000..4623e6e49 --- /dev/null +++ b/testing/kdegames/kdegames-kreversi.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kreversi.dsc ]; then + ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/testing/kdegames/kdegames-kspaceduel.install b/testing/kdegames/kdegames-kspaceduel.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/testing/kdegames/kdegames-kspaceduel.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/kdegames/kdegames-ksquares.install b/testing/kdegames/kdegames-ksquares.install new file mode 100644 index 000000000..5a619897d --- /dev/null +++ b/testing/kdegames/kdegames-ksquares.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/ksquares.dsc ]; then + ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/testing/kdegames/kdegames-ktuberling.install b/testing/kdegames/kdegames-ktuberling.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/testing/kdegames/kdegames-ktuberling.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/kdegames/kdegames-lskat.install b/testing/kdegames/kdegames-lskat.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/testing/kdegames/kdegames-lskat.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/kdegames/kdegames-palapeli.install b/testing/kdegames/kdegames-palapeli.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/testing/kdegames/kdegames-palapeli.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdegames/kdegames.install b/testing/kdegames/kdegames.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdegames/kdegames.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/kdegraphics-gwenview/PKGBUILD b/testing/kdegraphics-gwenview/PKGBUILD new file mode 100644 index 000000000..500a9d90a --- /dev/null +++ b/testing/kdegraphics-gwenview/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147617 2012-01-25 23:45:05Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-gwenview +pkgver=4.8.0 +pkgrel=1 +pkgdesc="A fast and easy to use image viewer for KDE" +url="http://kde.org/applications/graphics/gwenview/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-lib' 'libkipi') +makedepends=('cmake' 'automoc4') +optdepends=('kipi-plugins: extra plugins to share photos') +install=$pkgname.install +source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") +sha1sums=('ea1bc5dec79fb0810fc4629e8cf023c78f12ef0b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../gwenview-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-gwenview/kdegraphics-gwenview.install b/testing/kdegraphics-gwenview/kdegraphics-gwenview.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdegraphics-gwenview/kdegraphics-gwenview.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/kdegraphics-kamera/PKGBUILD b/testing/kdegraphics-kamera/PKGBUILD new file mode 100644 index 000000000..d04a69378 --- /dev/null +++ b/testing/kdegraphics-kamera/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 147618 2012-01-25 23:45:36Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-kamera +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Configure Kamera" +url="http://kde.org/applications/graphics/kamera/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'gphoto2') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2") +sha1sums=('1693f435764124651d17579449aa4bfadff3701b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kamera-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-kcolorchooser/PKGBUILD b/testing/kdegraphics-kcolorchooser/PKGBUILD new file mode 100644 index 000000000..8fd63d7e6 --- /dev/null +++ b/testing/kdegraphics-kcolorchooser/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147619 2012-01-25 23:45:59Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-kcolorchooser +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Color Chooser" +url="http://kde.org/applications/graphics/kcolorchooser/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") +sha1sums=('84ab09ba2e0dbe8077a91d3496b6c65f54b636fc') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kcolorchooser-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.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/kdegraphics-kgamma/PKGBUILD b/testing/kdegraphics-kgamma/PKGBUILD new file mode 100644 index 000000000..82b13e171 --- /dev/null +++ b/testing/kdegraphics-kgamma/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 147620 2012-01-25 23:46:24Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-kgamma +pkgver=4.8.0 +pkgrel=1 +pkgdesc="A monitor calibration tool" +url="http://kde.org/applications/graphics/kgamma/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +# note on libxxf86vm: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxxf86vm +depends=('kdebase-runtime' 'libxxf86vm') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") +sha1sums=('ff86fb416475aefa69d58c3c69f5426b32ea63ae') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kgamma-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-kolourpaint/PKGBUILD b/testing/kdegraphics-kolourpaint/PKGBUILD new file mode 100644 index 000000000..0d1b1aa90 --- /dev/null +++ b/testing/kdegraphics-kolourpaint/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147621 2012-01-25 23:46:46Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-kolourpaint +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Paint Program" +url="http://kde.org/applications/graphics/kolourpaint/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'qimageblitz') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") +sha1sums=('2d8c32fb16a8b4f479906557b5eb88c519e2c08e') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kolourpaint-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdegraphics-kolourpaint/kdegraphics-kolourpaint.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/kdegraphics-kruler/PKGBUILD b/testing/kdegraphics-kruler/PKGBUILD new file mode 100644 index 000000000..4d0f721ef --- /dev/null +++ b/testing/kdegraphics-kruler/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147622 2012-01-25 23:47:12Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-kruler +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Screen Ruler" +url="http://kde.org/applications/graphics/kruler/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2") +sha1sums=('e453a29c327e13458c32abd86ce7b98454b859f2') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kruler-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-kruler/kdegraphics-kruler.install b/testing/kdegraphics-kruler/kdegraphics-kruler.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdegraphics-kruler/kdegraphics-kruler.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/kdegraphics-ksaneplugin/PKGBUILD b/testing/kdegraphics-ksaneplugin/PKGBUILD new file mode 100644 index 000000000..a13e7b916 --- /dev/null +++ b/testing/kdegraphics-ksaneplugin/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147623 2012-01-25 23:47:38Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-ksaneplugin +pkgver=4.8.0 +pkgrel=1 +pkgdesc="A scan plugin that implements the scanning" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('libksane') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") +sha1sums=('0110854a69395bc4402caf2b91fc3cf44a4200ad') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ksaneplugin-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-ksnapshot/PKGBUILD b/testing/kdegraphics-ksnapshot/PKGBUILD new file mode 100644 index 000000000..e6ae19e79 --- /dev/null +++ b/testing/kdegraphics-ksnapshot/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147624 2012-01-25 23:48:00Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-ksnapshot +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Screen Capture Program" +url="http://kde.org/applications/graphics/ksnapshot/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdelibs' 'libkipi') +makedepends=('cmake' 'automoc4') +optdepends=('kipi-plugins') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") +sha1sums=('a95584fd44401d130815c1ec79c21532197dbef8') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../ksnapshot-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdegraphics-ksnapshot/kdegraphics-ksnapshot.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/kdegraphics-mobipocket/PKGBUILD b/testing/kdegraphics-mobipocket/PKGBUILD new file mode 100644 index 000000000..a0e15ff11 --- /dev/null +++ b/testing/kdegraphics-mobipocket/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147625 2012-01-25 23:48:24Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-mobipocket +pkgver=4.8.0 +pkgrel=1 +pkgdesc="A collection of plugins to handle mobipocket files" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4' 'kdegraphics-okular') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('86ae995f7278f14e1169335b24fe7a61069c39a2') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-mobipocket/kdegraphics-mobipocket.install b/testing/kdegraphics-mobipocket/kdegraphics-mobipocket.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/testing/kdegraphics-mobipocket/kdegraphics-mobipocket.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdegraphics-okular/PKGBUILD b/testing/kdegraphics-okular/PKGBUILD new file mode 100644 index 000000000..28bef76ae --- /dev/null +++ b/testing/kdegraphics-okular/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 147568 2012-01-25 23:11:25Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-okular +pkgver=4.8.0 +pkgrel=1 +pkgdesc='Document Viewer' +arch=('i686' 'x86_64') +url="http://kde.org/applications/graphics/okular/" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' + 'ebook-tools' 'libspectre') +makedepends=('cmake' 'automoc4') +optdepends=('kdegraphics-mobipocket: mobipocket support') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") +sha1sums=('c112a490cd1245041c9d81b9377838fd0de4d60c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../okular-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-okular/kdegraphics-okular.install b/testing/kdegraphics-okular/kdegraphics-okular.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdegraphics-okular/kdegraphics-okular.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/kdegraphics-strigi-analyzer/PKGBUILD b/testing/kdegraphics-strigi-analyzer/PKGBUILD new file mode 100644 index 000000000..57ff195c6 --- /dev/null +++ b/testing/kdegraphics-strigi-analyzer/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147626 2012-01-25 23:48:49Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-strigi-analyzer +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Strigi analyzers for various graphics file formats" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('9c607105f30c13e83fac3430649696a19e1c4d7b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-svgpart/PKGBUILD b/testing/kdegraphics-svgpart/PKGBUILD new file mode 100644 index 000000000..623c6726b --- /dev/null +++ b/testing/kdegraphics-svgpart/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147627 2012-01-25 23:49:14Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-svgpart +pkgver=4.8.0 +pkgrel=1 +pkgdesc="A KPart for viewving SVGs" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") +sha1sums=('bd432a31976cb64c41035382a8133332aa184c2a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../svgpart-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdegraphics-thumbnailers/PKGBUILD b/testing/kdegraphics-thumbnailers/PKGBUILD new file mode 100644 index 000000000..76968f8ee --- /dev/null +++ b/testing/kdegraphics-thumbnailers/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 147628 2012-01-25 23:49:39Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=kdegraphics-thumbnailers +pkgver=4.8.0 +pkgrel=1 +pkgdesc="Thumbnailers for various graphics file formats" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('libkexiv2' 'libkdcraw') +makedepends=('cmake' 'automoc4') +replaces=('kdegraphics-libs') +conflicts=('kdegraphics-libs') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('acaf1e7f44c3e65619ece032b9165ade65e418b5') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdelibs/PKGBUILD b/testing/kdelibs/PKGBUILD index 019a971bf..1fffc9820 100644 --- a/testing/kdelibs/PKGBUILD +++ b/testing/kdelibs/PKGBUILD @@ -1,30 +1,28 @@ -# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $ +# $Id: PKGBUILD 147561 2012-01-25 23:07:57Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdelibs -pkgver=4.7.4 -pkgrel=5 +pkgver=4.8.0 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') -depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' - 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' - 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' - 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' - 'docbook-xsl' 'qtwebkit') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell') +depends=('strigi' 'attica' 'libxss' 'xz' 'soprano' 'krb5' 'grantlee' + 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'docbook-xsl' + 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit') +makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell') replaces=('kdelibs-experimental') -install='kdelibs.install' +install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kde-applications-menu.patch' 'archlinux-menu.patch' - 'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch') -sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8' + 'fix-knotify-filepath.patch') +sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - '3312f6005aa56a9b992c74008fe5b314f1c8ffba' - '9cb83cb7f6394549354c6837977f9e9529127041') + '3312f6005aa56a9b992c74008fe5b314f1c8ffba') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -37,8 +35,6 @@ build() { # https://bugs.kde.org/show_bug.cgi?id=285028 patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch - patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch - cd "${srcdir}" mkdir build cd build diff --git a/testing/kdemultimedia/PKGBUILD b/testing/kdemultimedia/PKGBUILD new file mode 100644 index 000000000..d90c2b9ab --- /dev/null +++ b/testing/kdemultimedia/PKGBUILD @@ -0,0 +1,108 @@ +# $Id: PKGBUILD 147629 2012-01-25 23:50:14Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgbase=kdemultimedia +pkgname=('kdemultimedia-dragonplayer' + 'kdemultimedia-ffmpegthumbs' + 'kdemultimedia-juk' + 'kdemultimedia-kioslave' + 'kdemultimedia-kmix' + 'kdemultimedia-kscd' + 'kdemultimedia-mplayerthumbs') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') +makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer' + 'pulseaudio' 'libmusicbrainz3') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'mplayerthumbs.config') +sha1sums=('210bfd435c8e6f52aa78ab46f9487a159ab2ac83' + 'ba016fa2563c14ffcba852c62506b66bfc6ee683') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdemultimedia-dragonplayer() { + pkgdesc='Video Player' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/dragonplayer/" + install='kdemultimedia-dragonplayer.install' + cd $srcdir/build/dragonplayer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dragonplayer + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-ffmpegthumbs() { + pkgdesc='Video Files (ffmpegthumbs)' + depends=('kdebase-runtime' 'ffmpeg') + install='kdemultimedia.install' + cd $srcdir/build/ffmpegthumbs + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-juk() { + pkgdesc='Music Player' + depends=('kdebase-runtime' 'tunepimp') + url="http://kde.org/applications/multimedia/juk" + install='kdemultimedia.install' + cd $srcdir/build/juk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/juk + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kioslave() { + pkgdesc='Audio CD Browser' + depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') + conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + for i in kioslave doc/kioslave libkcddb libkcompactdisc; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdemultimedia-kmix() { + pkgdesc='Sound Mixer' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/kmix" + install='kdemultimedia.install' + cd $srcdir/build/kmix + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmix + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kscd() { + pkgdesc='CD Player' + depends=('kdebase-runtime' 'libmusicbrainz3') + url="http://kde.org/applications/multimedia/kscd" + install='kdemultimedia.install' + cd $srcdir/build/kscd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/cddbretrieval + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-mplayerthumbs() { + pkgdesc='Video Files (MPlayerThumbs)' + depends=('kdebase-runtime' 'mplayer') + replaces=('mplayerthumbs') + conflicts=('mplayerthumbs') + cd $srcdir/build/mplayerthumbs + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs +} diff --git a/testing/kdemultimedia/kdemultimedia-dragonplayer.install b/testing/kdemultimedia/kdemultimedia-dragonplayer.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/testing/kdemultimedia/kdemultimedia-dragonplayer.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/kdemultimedia/kdemultimedia.install b/testing/kdemultimedia/kdemultimedia.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdemultimedia/kdemultimedia.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/kdemultimedia/mplayerthumbs.config b/testing/kdemultimedia/mplayerthumbs.config new file mode 100644 index 000000000..761a17953 --- /dev/null +++ b/testing/kdemultimedia/mplayerthumbs.config @@ -0,0 +1,2 @@ +[MPlayerThumbsCfg] +backend=0 diff --git a/testing/kdenetwork/PKGBUILD b/testing/kdenetwork/PKGBUILD new file mode 100644 index 000000000..44bce80b7 --- /dev/null +++ b/testing/kdenetwork/PKGBUILD @@ -0,0 +1,110 @@ +# $Id: PKGBUILD 147630 2012-01-25 23:51:01Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgbase=kdenetwork +pkgname=('kdenetwork-filesharing' + 'kdenetwork-kdnssd' + 'kdenetwork-kget' + 'kdenetwork-kopete' + 'kdenetwork-kppp' + 'kdenetwork-krdc' + 'kdenetwork-krfb') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdenetwork') +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' + 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' + 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' + 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('51ea55dbcbece59535af61f7450e8ac2aa1db28b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ + -DWITH_Xmms=OFF \ + -DWITH_LibMeanwhile=OFF + make +} + +package_kdenetwork-filesharing() { + pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' + depends=('kdelibs' 'smbclient') + install='kdenetwork.install' + cd $srcdir/build/filesharing + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kdnssd() { + pkgdesc='Monitors the network for DNS-SD services' + depends=('kdelibs') + cd $srcdir/build/kdnssd + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kget() { + pkgdesc='Download Manager' + depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms') + url="http://kde.org/applications/internet/kget/" + install='kdenetwork-kget.install' + cd $srcdir/build/kget + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kget + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kopete() { + pkgdesc='Instant Messenger' + depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' + 'libidn' 'qimageblitz' 'libgadu' 'mediastreamer') + url="http://kde.org/applications/internet/kopete/" + install='kdenetwork-kopete.install' + cd $srcdir/build/kopete + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kopete + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kppp() { + pkgdesc='Internet Dial-Up Tool' + depends=('kdebase-runtime' 'ppp') + url="http://kde.org/applications/internet/kppp/" + install='kdenetwork-kppp.install' + cd $srcdir/build/kppp + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kppp + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krdc() { + pkgdesc='Remote Desktop Client' + depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4') + optdepends=('kdebase-keditbookmarks: to edit bookmarks') + url="http://kde.org/applications/internet/krdc/" + cd $srcdir/build/krdc + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krdc + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krfb() { + pkgdesc='Desktop Sharing' + # note on libxdamage: + # not detected by namcap because libgl depends on it + # but nvidia providing libgl does not depend on libxdamage + depends=('kdebase-runtime' 'libvncserver' 'libxdamage') + cd $srcdir/build/krfb + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krfb + make DESTDIR=$pkgdir install +} diff --git a/testing/kdenetwork/kdenetwork-kget.install b/testing/kdenetwork/kdenetwork-kget.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/testing/kdenetwork/kdenetwork-kget.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/kdenetwork/kdenetwork-kopete.install b/testing/kdenetwork/kdenetwork-kopete.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/testing/kdenetwork/kdenetwork-kopete.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/kdenetwork/kdenetwork-kppp.install b/testing/kdenetwork/kdenetwork-kppp.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/testing/kdenetwork/kdenetwork-kppp.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/kdenetwork/kdenetwork.install b/testing/kdenetwork/kdenetwork.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdenetwork/kdenetwork.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/kdepim-runtime/PKGBUILD b/testing/kdepim-runtime/PKGBUILD new file mode 100644 index 000000000..66cdc8bec --- /dev/null +++ b/testing/kdepim-runtime/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147565 2012-01-25 23:09:59Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=kdepim-runtime +pkgver=4.8.0 +pkgrel=1 +pkgdesc='KDE PIM Runtime Environment' +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('kdepimlibs' 'kdebase-runtime') +makedepends=('cmake' 'automoc4' 'boost') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('1cf75a92ddd0c18891163cd9d7f2290afae17472') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdepim-runtime/kdepim-runtime.install b/testing/kdepim-runtime/kdepim-runtime.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/testing/kdepim-runtime/kdepim-runtime.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file diff --git a/testing/kdepim/PKGBUILD b/testing/kdepim/PKGBUILD new file mode 100644 index 000000000..97e382ce6 --- /dev/null +++ b/testing/kdepim/PKGBUILD @@ -0,0 +1,244 @@ +# $Id: PKGBUILD 147631 2012-01-25 23:52:13Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgbase=kdepim +pkgname=('kdepim-akonadiconsole' + 'kdepim-akregator' + 'kdepim-blogilo' + 'kdepim-console' + 'kdepim-kaddressbook' + 'kdepim-kalarm' + 'kdepim-kjots' + 'kdepim-kleopatra' + 'kdepim-kmail' + 'kdepim-knode' + 'kdepim-knotes' + 'kdepim-kontact' + 'kdepim-korganizer' + 'kdepim-kresources' + 'kdepim-ktimetracker' + 'kdepim-libkdepim') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdepim') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' + 'kde-agent') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('61509f42a96193ae2a9b9f8560dccb73d739f356') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF + make +} + +package_kdepim-akonadiconsole() { + pkgdesc='Akonadi Management and Debugging Console' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + install='kdepim.install' + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install +} + +package_kdepim-akregator() { + pkgdesc='A Feed Reader for KDE' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/akregator/" + install='kdepim.install' + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install +} + +package_kdepim-blogilo() { + pkgdesc='A KDE Blogging Client' + depends=('kdepim-runtime') + url="http://kde.org/applications/internet/blogilo/" + replaces=('blogilo') + conflicts=('blogilo') + install='kdepim.install' + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install +} + +package_kdepim-console() { + pkgdesc='Command line tool for accessing calendar files' + depends=('kdepim-runtime') + url='http://pim.kde.org' + install='kdepim.install' + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kaddressbook() { + pkgdesc='Contact Manager' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kaddressbook/" + install='kdepim.install' + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kalarm() { + pkgdesc='Personal Alarm Scheduler' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kalarm/" + install='kdepim.install' + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kjots() { + pkgdesc='Note Taker' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" + install='kdepim.install' + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kleopatra() { + pkgdesc='Certificate Manager and Unified Crypto GUI' + depends=('kdepim-libkdepim') + install=kdepim-kleopatra.install + url="http://kde.org/applications/utilities/kleopatra/" + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kmail() { + pkgdesc='Mail Client' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/kmail/" + install='kdepim-kmail.install' + conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ + mailfilteragent ontologies kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-knode() { + pkgdesc='News Reader' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/knode/" + install='kdepim.install' + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knotes() { + pkgdesc='Popup Notes' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/knotes/" + install='kdepim.install' + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kontact() { + pkgdesc='Personal Information Manager' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kontact/" + install='kdepim.install' + conflcits=('kdepim-kontactinterfaces') + replaces=('kdepim-kontactinterfaces') + for i in kontact/src doc/kontact \ + kontact/plugins/summary kontact/plugins/specialdates; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-korganizer() { + pkgdesc='Calendar and Scheduling Program' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/korganizer" + install='kdepim-korganizer.install' + cd "${srcdir}"/build/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/korganizer + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kresources() { + pkgdesc='KDE PIM resources' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktimetracker() { + pkgdesc='Personal Time Tracker' + depends=('kdepim-kresources') + url="http://kde.org/applications/utilities/ktimetracker/" + install='kdepim.install' + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/ktimetracker + make DESTDIR="${pkgdir}" install +} + +package_kdepim-libkdepim() { + pkgdesc='Library for KDE PIM' + groups=() + depends=('kde-agent' 'kdepim-runtime') + url='http://pim.kde.org' + conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-strigi-analyzer' 'kdepim-akonadi') + replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-strigi-analyzer' 'kdepim-akonadi') + for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \ + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + messagecomposer messagecore messagelist messageviewer icons \ + strigi-analyzer templateparser plugins/messageviewer \ + plugins/ktexteditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} diff --git a/testing/kdepim/kdepim-kleopatra.install b/testing/kdepim/kdepim-kleopatra.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/testing/kdepim/kdepim-kleopatra.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/kdepim/kdepim-kmail.install b/testing/kdepim/kdepim-kmail.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/testing/kdepim/kdepim-kmail.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/kdepim/kdepim-korganizer.install b/testing/kdepim/kdepim-korganizer.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/testing/kdepim/kdepim-korganizer.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/kdepim/kdepim.install b/testing/kdepim/kdepim.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdepim/kdepim.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/kdepimlibs/PKGBUILD b/testing/kdepimlibs/PKGBUILD new file mode 100644 index 000000000..4a61dc0f8 --- /dev/null +++ b/testing/kdepimlibs/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 147562 2012-01-25 23:08:24Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=kdepimlibs +pkgver=4.8.0 +pkgrel=1 +pkgdesc="KDE PIM Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') +makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') +install='kdepimlibs.install' +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('22409015a8047e3a78711093e3363775e8434fba') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/testing/kdepimlibs/kdepimlibs.install b/testing/kdepimlibs/kdepimlibs.install new file mode 100644 index 000000000..99262607c --- /dev/null +++ b/testing/kdepimlibs/kdepimlibs.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file diff --git a/testing/kdeplasma-addons/PKGBUILD b/testing/kdeplasma-addons/PKGBUILD new file mode 100644 index 000000000..d09e62e4c --- /dev/null +++ b/testing/kdeplasma-addons/PKGBUILD @@ -0,0 +1,619 @@ +# $Id: PKGBUILD 147632 2012-01-25 23:53:16Z andrea $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgbase=kdeplasma-addons +pkgname=('kdeplasma-addons-applets-bball' + 'kdeplasma-addons-applets-binary-clock' + 'kdeplasma-addons-applets-blackboard' + 'kdeplasma-addons-applets-bookmarks' + 'kdeplasma-addons-applets-bubblemon' + 'kdeplasma-addons-applets-calculator' + 'kdeplasma-addons-applets-charselect' + 'kdeplasma-addons-applets-comic' + 'kdeplasma-addons-applets-community' + 'kdeplasma-addons-applets-dict' + 'kdeplasma-addons-applets-eyes' + 'kdeplasma-addons-applets-fifteenpuzzle' + 'kdeplasma-addons-applets-filewatcher' + 'kdeplasma-addons-applets-frame' + 'kdeplasma-addons-applets-fuzzy-clock' + 'kdeplasma-addons-applets-icontasks' + 'kdeplasma-addons-applets-incomingmsg' + 'kdeplasma-addons-applets-kdeobservatory' + 'kdeplasma-addons-applets-kimpanel' + 'kdeplasma-addons-applets-knowledgebase' + 'kdeplasma-addons-applets-kolourpicker' + 'kdeplasma-addons-applets-konqprofiles' + 'kdeplasma-addons-applets-konsoleprofiles' + 'kdeplasma-addons-applets-lancelot' + 'kdeplasma-addons-applets-leavenote' + 'kdeplasma-addons-applets-life' + 'kdeplasma-addons-applets-luna' + 'kdeplasma-addons-applets-magnifique' + 'kdeplasma-addons-applets-mediaplayer' + 'kdeplasma-addons-applets-microblog' + 'kdeplasma-addons-applets-news' + 'kdeplasma-addons-applets-notes' + 'kdeplasma-addons-applets-nowplaying' + 'kdeplasma-addons-applets-paste' + 'kdeplasma-addons-applets-pastebin' + 'kdeplasma-addons-applets-plasmaboard' + 'kdeplasma-addons-applets-previewer' + 'kdeplasma-addons-applets-qalculate' + 'kdeplasma-addons-applets-rememberthemilk' + 'kdeplasma-addons-applets-rssnow' + 'kdeplasma-addons-applets-showdashboard' + 'kdeplasma-addons-applets-showdesktop' + 'kdeplasma-addons-applets-social-news' + 'kdeplasma-addons-applets-spellcheck' + 'kdeplasma-addons-applets-systemloadviewer' + 'kdeplasma-addons-applets-timer' + 'kdeplasma-addons-applets-unitconverter' + 'kdeplasma-addons-applets-weather' + 'kdeplasma-addons-applets-weatherstation' + 'kdeplasma-addons-applets-webslice' + 'kdeplasma-addons-containments' + 'kdeplasma-addons-libs' + 'kdeplasma-addons-runners-audioplayercontrol' + 'kdeplasma-addons-runners-browserhistory' + 'kdeplasma-addons-runners-characters' + 'kdeplasma-addons-runners-contacts' + 'kdeplasma-addons-runners-converter' + 'kdeplasma-addons-runners-datetime' + 'kdeplasma-addons-runners-events' + 'kdeplasma-addons-runners-katesessions' + 'kdeplasma-addons-runners-konquerorsessions' + 'kdeplasma-addons-runners-konsolesessions' + 'kdeplasma-addons-runners-kopete' + 'kdeplasma-addons-runners-mediawiki' + 'kdeplasma-addons-runners-spellchecker' + 'kdeplasma-addons-wallpapers-mandelbrot' + 'kdeplasma-addons-wallpapers-marble' + 'kdeplasma-addons-wallpapers-pattern' + 'kdeplasma-addons-wallpapers-potd' + 'kdeplasma-addons-wallpapers-virus' + 'kdeplasma-addons-wallpapers-weather') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +groups=('kde' 'kdeplasma-addons') +makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' + 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('0049d6977cb89f303468813811f3fde2807fd8db') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeplasma-addons-applets-bball() { + pkgdesc='A bouncy ball for plasma' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/bball + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-binary-clock() { + pkgdesc='Time displayed in binary format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/binary-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-blackboard() { + pkgdesc='Black Board' + depends=('kdebase-workspace') + cd $srcdir/build/applets/blackboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bookmarks() { + pkgdesc='Quick Access to the Bookmarks' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bookmarks + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bubblemon() { + pkgdesc='A pretty bubble that monitors your system.' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bubblemon + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-calculator() { + pkgdesc='Calculate simple sums' + depends=('kdebase-workspace') + cd $srcdir/build/applets/calculator + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-charselect() { + pkgdesc='View, select, and copy characters from a font collection' + depends=('kdebase-workspace') + cd $srcdir/build/applets/charselect + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-comic() { + pkgdesc='View comic strips from the Internet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/comic + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-community() { + pkgdesc='Communicate using the Social Desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/community + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-dict() { + pkgdesc='Look up the meaning of words and their translation into different languages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/dict + make DESTDIR=$pkgdir install + # FIXME + # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz + rm -rf $pkgdir/usr/share/icons +} + +package_kdeplasma-addons-applets-eyes() { + pkgdesc='XEyes clone' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/eyes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fifteenpuzzle() { + pkgdesc='Put the pieces in order' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/fifteenPuzzle + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-filewatcher() { + pkgdesc='Watch for changes in specified files' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fileWatcher + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-frame() { + pkgdesc='Display your favorite pictures' + depends=('kdebase-workspace' 'libkexiv2') + cd $srcdir/build/applets/frame + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fuzzy-clock() { + pkgdesc='Time displayed in a less precise format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fuzzy-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-icontasks() { + pkgdesc='Switch between running applications' + depends=('kdebase-workspace') + cd $srcdir/build/applets/icontasks + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-incomingmsg() { + pkgdesc='Notification of new messages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/incomingmsg + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kdeobservatory() { + pkgdesc='Visualize the KDE ecosystem' + depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qwt') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/kdeobservatory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kimpanel() { + pkgdesc='A generic input method panel for Oriental languages' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + optdepends=('scim: SCIM backend' + 'fcitx: FCITX backend' + 'ibus: IBUS backend') + cd $srcdir/build/applets/kimpanel + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-knowledgebase() { + pkgdesc='Opendesktop Knowledgebase' + depends=('kdebase-workspace') + cd $srcdir/build/applets/knowledgebase + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kolourpicker() { + pkgdesc='Pick a color from the desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/kolourpicker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konqprofiles() { + pkgdesc='List and launch Konqueror profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konqprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konsoleprofiles() { + pkgdesc='List and launch Konsole profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konsoleprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-lancelot() { + pkgdesc='Launcher to start applications' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + replaces=('lancelot') + provides=('lancelot') + conflicts=('lancelot') + install='kdeplasma-addons-applets-lancelot.install' + cd $srcdir/build/applets/lancelot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-leavenote() { + pkgdesc='Leave notes for users while they are away' + depends=('kdebase-workspace') + cd $srcdir/build/applets/leavenote + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-life() { + pkgdesc='Life' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/life + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-luna() { + pkgdesc='Display moon phases for your location' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/luna + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-magnifique() { + pkgdesc='A magnification glass for the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/magnifique + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-mediaplayer() { + pkgdesc='Widget that can play video and sound' + depends=('kdebase-workspace') + cd $srcdir/build/applets/mediaplayer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-microblog() { + pkgdesc='Update and view your microblog status.' + depends=('kdebase-workspace' 'kdeplasma-addons-libs' 'qoauth' 'qca-ossl') + cd $srcdir/build/applets/microblog + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-news() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-notes() { + pkgdesc='Desktop sticky notes' + depends=('kdebase-workspace') + cd $srcdir/build/applets/notes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-nowplaying() { + pkgdesc='Displays currently playing audio' + depends=('kdebase-workspace') + cd $srcdir/build/applets/nowplaying + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-paste() { + pkgdesc='Paste text snippets' + depends=('kdebase-workspace') + cd $srcdir/build/applets/paste + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-pastebin() { + pkgdesc='Paste text/images to a remote server' + depends=('kdebase-workspace') + cd $srcdir/build/applets/pastebin + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-plasmaboard() { + pkgdesc='A virtual, on-screen keyboard' + depends=('kdebase-workspace') + cd $srcdir/build/applets/plasmaboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-previewer() { + pkgdesc='Preview This File' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/previewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-qalculate() { + pkgdesc='A powerful mathematical equation solver' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/qalculate + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rememberthemilk() { + pkgdesc='Remember The Milk Todo list applet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/rememberthemilk + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rssnow() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/rssnow + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdashboard() { + pkgdesc='Show the Plasma widget dashboard above other windows' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdashboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdesktop() { + pkgdesc='Show the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdesktop + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-social-news() { + pkgdesc='Stay informed with the Social Desktop' + replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/social-news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-spellcheck() { + pkgdesc='Fast spell checking' + depends=('kdebase-workspace') + cd $srcdir/build/applets/spellcheck + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-systemloadviewer() { + pkgdesc='Tiny CPU/RAM/Swap monitor' + depends=('kdebase-workspace') + cd $srcdir/build/applets/systemloadviewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-timer() { + pkgdesc='Countdown over a specified time period' + depends=('kdebase-workspace') + cd $srcdir/build/applets/timer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-unitconverter() { + pkgdesc='Plasmoid for converting units' + depends=('kdebase-workspace') + cd $srcdir/build/applets/unitconverter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weather() { + pkgdesc='Displays Weather information' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weather + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weatherstation() { + pkgdesc='Weather reports with an LCD display style' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weatherstation + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-webslice() { + pkgdesc='Show a part of a webpage' + depends=('kdebase-workspace') + cd $srcdir/build/applets/webslice + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-containments() { + pkgdesc='Activities types for Plasma shells' + depends=('kdebase-workspace') + cd $srcdir/build/containments + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-libs() { + pkgdesc='Plasma Addon Library' + depends=('kdebase-workspace') + groups=() + replaces=('kdeplasma-addons-dataengines') + provides=('kdeplasma-addons-dataengines') + conflicts=('kdeplasma-addons-dataengines') + cd $srcdir/build/libs + make DESTDIR=$pkgdir install + cd $srcdir/build/dataengines + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-audioplayercontrol() { + pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)' + depends=('kdebase-workspace') + cd $srcdir/build/runners/audioplayercontrol + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-browserhistory() { + pkgdesc='Searches in Konqueror´s history' + depends=('kdebase-workspace') + cd $srcdir/build/runners/browserhistory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-characters() { + pkgdesc='special Characters' + depends=('kdebase-workspace') + cd $srcdir/build/runners/characters + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-contacts() { + pkgdesc='Finds entries in your address book' + depends=('kdebase-workspace') + cd $srcdir/build/runners/contacts + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-converter() { + pkgdesc='Convert values to different units' + depends=('kdebase-workspace') + cd $srcdir/build/runners/converter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-datetime() { + pkgdesc='The current date and time, locally or in any timezone' + depends=('kdebase-workspace') + cd $srcdir/build/runners/datetime + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-events() { + pkgdesc='Calendar Events runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/events + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-katesessions() { + pkgdesc='Matches Kate Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/katesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konquerorsessions() { + pkgdesc='Matches Konqueror Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konquerorsessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konsolesessions() { + pkgdesc='Matches Konsole Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konsolesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-kopete() { + pkgdesc='Kopete Contact runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/kopete + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-mediawiki() { + pkgdesc='Search on Wikitravel' + depends=('kdebase-workspace') + cd $srcdir/build/runners/mediawiki + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-spellchecker() { + pkgdesc='Check the spelling of a word' + depends=('kdebase-workspace') + cd $srcdir/build/runners/spellchecker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-mandelbrot() { + pkgdesc='Mandelbrot' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/mandelbrot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-marble() { + pkgdesc='Globe' + depends=('kdebase-workspace' 'kdeedu-marble') + cd $srcdir/build/wallpapers/marble + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-pattern() { + pkgdesc='Pattern' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/pattern + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-potd() { + pkgdesc='Picture of the Day' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/wallpapers/potd + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-virus() { + pkgdesc='Virus' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/virus + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-weather() { + pkgdesc='Weather' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/wallpapers/weather + make DESTDIR=$pkgdir install +} diff --git a/testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/testing/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file diff --git a/testing/kdeplasma-addons/kdeplasma-addons-applets.install b/testing/kdeplasma-addons/kdeplasma-addons-applets.install new file mode 100644 index 000000000..c4ef46ba8 --- /dev/null +++ b/testing/kdeplasma-addons/kdeplasma-addons-applets.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file diff --git a/testing/kdesdk-kate/PKGBUILD b/testing/kdesdk-kate/PKGBUILD new file mode 100644 index 000000000..04337dca7 --- /dev/null +++ b/testing/kdesdk-kate/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 147569 2012-01-25 23:12:03Z andrea $ +# Maintainer: Andrea Scarpino + +pkgbase=kdesdk-kate +pkgname=('kdebase-kwrite' + 'kdesdk-kate') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +makedepends=('kdelibs ''cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2" + 'pkgbuild-syntax-highlight.patch') +sha1sums=('01cfffa6e905103c1b23d4006ba5a26844cc97aa' + '0a928253bd2077f0264d96a6c8823c69c47b6a8d') + +build() { + cd "${srcdir}"/kate-${pkgver} + patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../kate-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_KTEXTEDITOR=OFF + make +} + +package_kdebase-kwrite() { + pkgdesc="Text Editor" + depends=('kdebase-runtime') + groups=('kde' 'kdebase') + url="http://www.kde.org/applications/utilities/kwrite/" + install='kdebase-kwrite.install' + + cd "${srcdir}"/build/kwrite + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/part + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/kwrite + make DESTDIR="${pkgdir}" install +} + +package_kdesdk-kate() { + pkgdesc="Advanced Text Editor" + depends=('kdebase-kwrite') + groups=('kde' 'kdesdk') + url="http://www.kde.org/applications/utilities/kate/" + install='kdesdk-kate.install' + + cd "${srcdir}"/build/kate + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/kate + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdesdk-kate/kdebase-kwrite.install b/testing/kdesdk-kate/kdebase-kwrite.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdesdk-kate/kdebase-kwrite.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/kdesdk-kate/kdesdk-kate.install b/testing/kdesdk-kate/kdesdk-kate.install new file mode 100644 index 000000000..0446d161b --- /dev/null +++ b/testing/kdesdk-kate/kdesdk-kate.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdesdk-kate/pkgbuild-syntax-highlight.patch b/testing/kdesdk-kate/pkgbuild-syntax-highlight.patch new file mode 100644 index 000000000..27729d1ad --- /dev/null +++ b/testing/kdesdk-kate/pkgbuild-syntax-highlight.patch @@ -0,0 +1,11 @@ +--- kate-4.7.80/part/syntax/data/bash.xml~ 2011-11-20 06:14:30.581097154 +0000 ++++ kate-4.7.80/part/syntax/data/bash.xml 2011-11-20 06:14:45.494553146 +0000 +@@ -8,7 +8,7 @@ + + + ]> +- ++ + +