From 1d2f1a1e70011a41d17f2f16d5e90c491ccdabb8 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 11 Sep 2011 23:14:33 +0000 Subject: Sun Sep 11 23:14:33 UTC 2011 --- extra/gptfdisk/PKGBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'extra/gptfdisk/PKGBUILD') diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index e376be4fc..4ba3370bc 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129374 2011-06-27 05:53:20Z foutrelis $ -# Maintainer: Evangelos Foutras +# $Id: PKGBUILD 137793 2011-09-11 03:49:47Z foutrelis $ +# Maintainer: Evangelos Foutras # Contributor: Tobias Powalowski # Contributor: Hokum pkgname=gptfdisk -pkgver=0.7.2 +pkgver=0.8.0 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) -md5sums=('31deeb7acb5104d56ba2ddeafd907513') +md5sums=('f38e33a9bc644ec1dee50fdc3dfe4d69') build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,10 +26,10 @@ build() { package () { cd "$srcdir/$pkgname-$pkgver" - install -d "$pkgdir"/{sbin,usr/share/{man/man8,gdisk}} - install -t "$pkgdir/sbin" gdisk sgdisk fixparts - install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,sgdisk}.8 - install -m644 -t "$pkgdir/usr/share/gdisk" README NEWS + install -d "$pkgdir"/{sbin,usr/share/{doc/gdisk,man/man8}} + install -t "$pkgdir/sbin" gdisk cgdisk sgdisk fixparts + install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,cgdisk,sgdisk}.8 + install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From b3a841a1f66eff75be29fba090b83ce4322d4721 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 12 Sep 2011 23:14:44 +0000 Subject: Mon Sep 12 23:14:44 UTC 2011 --- community-staging/cuneiform/PKGBUILD | 36 ++++ community/box2d/PKGBUILD | 8 +- community/fb-client/PKGBUILD | 4 +- community/fdm/PKGBUILD | 44 ++--- community/libconfig/PKGBUILD | 6 +- community/librep/PKGBUILD | 6 +- community/rep-gtk/PKGBUILD | 6 +- community/sawfish/PKGBUILD | 8 +- community/xlockmore/PKGBUILD | 8 +- core/libnl/PKGBUILD | 16 +- extra/aspell-de/PKGBUILD | 11 +- extra/dnsmasq/PKGBUILD | 23 ++- extra/dnsmasq/dnsmasq.confd | 9 + extra/dnsmasq/dnsmasq.install | 21 +++ extra/dnsmasq/dnsmasq.service | 13 ++ extra/dnsmasq/rc.dnsmasq | 47 +++-- extra/dvd+rw-tools/PKGBUILD | 23 ++- extra/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch | 13 ++ .../dvd+rw-tools-7.0-glibc2.6.90.patch | 11 ++ extra/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch | 11 ++ extra/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch | 11 ++ extra/fcgi/PKGBUILD | 14 +- extra/feh/PKGBUILD | 6 +- extra/freetds/PKGBUILD | 6 +- extra/gptfdisk/PKGBUILD | 8 +- extra/kdebase-workspace/PKGBUILD | 17 +- .../important-performance-bugfix.patch | 91 ++++++++++ extra/kdeplasma-applets-networkmanagement/PKGBUILD | 6 +- extra/mod_dnssd/PKGBUILD | 14 +- extra/oxine/PKGBUILD | 25 +-- extra/perl-socket6/PKGBUILD | 49 ++++++ extra/php/PKGBUILD | 44 ++--- extra/php/php.ini.patch | 4 +- extra/unixodbc/PKGBUILD | 15 +- extra/xine-lib/PKGBUILD | 9 +- kde-unstable/kdebase-workspace/PKGBUILD | 13 +- .../important-performance-bugfix.patch | 91 ++++++++++ multilib/lib32-glibc/PKGBUILD | 29 +-- .../glibc-2.13-dlclose-search-reset.patch | 196 +++++++++++++++++++++ ...-2.14-avoid-assertion-on-empty-dns-answer.patch | 26 +++ multilib/libtool-multilib/PKGBUILD | 28 +-- staging/dvdauthor/PKGBUILD | 29 +++ staging/imagemagick/PKGBUILD | 81 +++++++++ staging/imagemagick/perlmagick.rpath.patch | 10 ++ staging/inkscape/PKGBUILD | 52 ++++++ staging/inkscape/install | 13 ++ staging/obex-data-server/PKGBUILD | 28 +++ staging/psiconv/PKGBUILD | 30 ++++ staging/pstoedit/PKGBUILD | 34 ++++ staging/pstoedit/pstoedit-3.50-parallel.patch | 47 +++++ staging/pstoedit/pstoedit-3.50-plugin-close.patch | 14 ++ staging/transcode/PKGBUILD | 80 +++++++++ staging/transcode/transcode-1.1.5-jpeg-7.patch | 16 ++ staging/transcode/transcode-1.1.5-mpa.patch | 10 ++ staging/xine-lib/PKGBUILD | 56 ++++++ .../xine-lib-1.1.1-configure-no-mcpu-march.patch | 13 ++ staging/xine-lib/xine-lib-1.1.19-xvmc.patch | 17 ++ 57 files changed, 1354 insertions(+), 202 deletions(-) create mode 100644 community-staging/cuneiform/PKGBUILD create mode 100644 extra/dnsmasq/dnsmasq.confd create mode 100644 extra/dnsmasq/dnsmasq.install create mode 100644 extra/dnsmasq/dnsmasq.service create mode 100644 extra/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch create mode 100644 extra/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch create mode 100644 extra/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch create mode 100644 extra/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch create mode 100644 extra/kdebase-workspace/important-performance-bugfix.patch create mode 100644 extra/perl-socket6/PKGBUILD create mode 100644 kde-unstable/kdebase-workspace/important-performance-bugfix.patch create mode 100644 multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch create mode 100644 multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch create mode 100644 staging/dvdauthor/PKGBUILD create mode 100644 staging/imagemagick/PKGBUILD create mode 100644 staging/imagemagick/perlmagick.rpath.patch create mode 100644 staging/inkscape/PKGBUILD create mode 100644 staging/inkscape/install create mode 100644 staging/obex-data-server/PKGBUILD create mode 100644 staging/psiconv/PKGBUILD create mode 100644 staging/pstoedit/PKGBUILD create mode 100644 staging/pstoedit/pstoedit-3.50-parallel.patch create mode 100644 staging/pstoedit/pstoedit-3.50-plugin-close.patch create mode 100644 staging/transcode/PKGBUILD create mode 100644 staging/transcode/transcode-1.1.5-jpeg-7.patch create mode 100644 staging/transcode/transcode-1.1.5-mpa.patch create mode 100644 staging/xine-lib/PKGBUILD create mode 100644 staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch create mode 100644 staging/xine-lib/xine-lib-1.1.19-xvmc.patch (limited to 'extra/gptfdisk/PKGBUILD') diff --git a/community-staging/cuneiform/PKGBUILD b/community-staging/cuneiform/PKGBUILD new file mode 100644 index 000000000..ebe5b67a0 --- /dev/null +++ b/community-staging/cuneiform/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 55404 2011-09-12 04:01:02Z allan $ +# Maintainer: Sergej Pupykin +# Contributor: Maxim Vuets + +pkgname=cuneiform +pkgver=1.1.0 +_dpkgver=1.1 +pkgrel=2 +pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." +arch=('i686' 'x86_64') +url="https://launchpad.net/cuneiform-linux" +license=('BSD') +depends=('imagemagick') +makedepends=('cmake') +source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2) +md5sums=('09fd160cdfc512f26442a7e91246598d') + +_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" + +build() { + cd "${_SRC_ROOT}" + sed -i 's#lib64#lib#' install_files.cmake + mkdir builddir + cd builddir + + cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "${_SRC_ROOT}"/builddir + make DESTDIR="${pkgdir}" install + + install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ + "${pkgdir}/usr/share/licenses/cuneiform/license.txt" +} diff --git a/community/box2d/PKGBUILD b/community/box2d/PKGBUILD index 661d4b240..1ec4e1925 100644 --- a/community/box2d/PKGBUILD +++ b/community/box2d/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 31825 2010-11-06 13:26:28Z svenstaro $ +# $Id: PKGBUILD 55402 2011-09-12 02:48:21Z svenstaro $ # Maintainer: Sven-Hendrik Haase pkgname=box2d -pkgver=2.1.2 -pkgrel=3 +pkgver=2.2.0 +pkgrel=1 pkgdesc="2D rigid body simulation library for games" url="http://www.box2d.org/" license=('zlib') @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') makedepends=('cmake') optdepends=() source=(http://box2d.googlecode.com/files/Box2D_v${pkgver}.zip) -md5sums=('59d142cd8d4d73e8832c7b67591f590c') +md5sums=('220f1d604444d00844cc91933c07ecd8') build() { cd ${srcdir}/Box2D_v${pkgver}/Box2D/ diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 1f4965a70..3b52e6968 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Florian "Bluewind" Pritz pkgname=fb-client -pkgver=0.8.1 +pkgver=0.9 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ license=('GPL3') depends=('curl') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz) -md5sums=('be2ecf1ffd02048d48a54083320e0445') +md5sums=('51d65d794e9bad66e06e252f90ce92fb') build() { cd "$srcdir/fb-$pkgver" diff --git a/community/fdm/PKGBUILD b/community/fdm/PKGBUILD index 5f1b8960a..5546042ad 100644 --- a/community/fdm/PKGBUILD +++ b/community/fdm/PKGBUILD @@ -1,39 +1,33 @@ -# $Id: PKGBUILD 14180 2010-04-01 23:59:34Z andrea $ -# Maintainer: +# $Id: PKGBUILD 55396 2011-09-11 20:59:09Z bisson $ +# Maintainer: Gaetan Bisson # Contributor: Jeff Mickey # Contributor: Grigorios Bouzakis pkgname=fdm pkgver=1.6 -pkgrel=2 -pkgdesc="A program to fetch and deliver mail" -arch=('i686' 'x86_64') -url="http://fdm.sourceforge.net" +pkgrel=3 +pkgdesc='Program to fetch and deliver mail' +url='http://fdm.sourceforge.net/' license=('BSD') -depends=('openssl' 'tdb') +arch=('i686' 'x86_64') options=('!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'GNUmakefile.patch' - 'LICENSE') -md5sums=('b2b9bfe95217b290142bde1621eb9a37' - '52955d31121a6365914a0d063be5b32b' - 'b0043d5c7160e5f797048d0d584ef4fa') +depends=('openssl' 'tdb' 'zlib') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'GNUmakefile.patch') +sha1sums=('fb8042f2355062848ff142c9604069b6657e6a82' + '0bddf0b0403ccee62190355f43fae84932c37436') build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i $srcdir/GNUmakefile.patch || return 1 - - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../GNUmakefile.patch + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -D -m 644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install -# Examples - mkdir -p "$pkgdir/usr/share/doc/$pkgname/examples" - mv "$srcdir/$pkgname-$pkgver/examples" "$pkgdir/usr/share/doc/$pkgname/" + install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" + sed '3,17p;d' fdm.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + mv examples "${pkgdir}/usr/share/doc/${pkgname}" } diff --git a/community/libconfig/PKGBUILD b/community/libconfig/PKGBUILD index 64fd9a145..901b7e443 100644 --- a/community/libconfig/PKGBUILD +++ b/community/libconfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 43902 2011-03-31 09:30:15Z spupykin $ +# $Id: PKGBUILD 55398 2011-09-11 21:17:02Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Roman Kyrylych # Contributor: scippio pkgname=libconfig -pkgver=1.4.7 +pkgver=1.4.8 pkgrel=1 pkgdesc="C/C++ Configuration File Library" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('gcc-libs' 'texinfo') install=libconfig.install options=('!libtool' '!emptydirs' 'zipman') source=(http://www.hyperrealm.com/libconfig/$pkgname-$pkgver.tar.gz) -md5sums=('d57da7a91aadbfd53afedb5c1bade5f4') +md5sums=('36788da452e9fcfc8efb7661ef5d31ef') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD index 0350d8be4..c784160b8 100644 --- a/community/librep/PKGBUILD +++ b/community/librep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46413 2011-05-07 10:04:19Z shusmann $ +# $Id: PKGBUILD 55390 2011-09-11 18:27:38Z shusmann $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel pkgname=librep -pkgver=0.92.0 +pkgver=0.92.1b pkgrel=1 pkgdesc="A Lisp system for UNIX" license=('GPL2') @@ -13,7 +13,7 @@ depends=('gmp' 'gdbm' 'libffi') install=${pkgname}.install options=('!emptydirs' '!libtool') source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('70f7b641cf3628443fea77a1191d9eb93a86d700') +sha1sums=('f75e1197646bbf1594fc4765802aab0bffe1bb02') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/rep-gtk/PKGBUILD b/community/rep-gtk/PKGBUILD index 9b34f1e12..09b8dafd2 100644 --- a/community/rep-gtk/PKGBUILD +++ b/community/rep-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46416 2011-05-07 10:06:27Z shusmann $ +# $Id: PKGBUILD 55391 2011-09-11 18:32:16Z shusmann $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel pkgname=rep-gtk -pkgver=0.90.6 +pkgver=0.90.7 pkgrel=1 pkgdesc="Binding of the GTK and GDK libraries for the librep Lisp environment" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://sawfish.wikia.com/wiki/Rep-GTK" license=('GPL') depends=('librep' 'gtk2') source=(http://download.tuxfamily.org/librep/rep-gtk/${pkgname}-${pkgver}.tar.xz) -sha1sums=('15222f11a91f5190cf3fad22af20932ea6851788') +sha1sums=('30736e88533e176f88677723f12095be983e1926') options=('!libtool') build() { diff --git a/community/sawfish/PKGBUILD b/community/sawfish/PKGBUILD index a170930fd..495031682 100644 --- a/community/sawfish/PKGBUILD +++ b/community/sawfish/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54530 2011-08-19 20:28:11Z shusmann $ +# $Id: PKGBUILD 55392 2011-09-11 18:41:44Z shusmann $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel pkgname=sawfish -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.2 +pkgrel=1 pkgdesc="An extensible window manager using a Lisp-based scripting language" arch=('i686' 'x86_64') url="http://sawfish.wikia.com/wiki/Main_Page" @@ -12,7 +12,7 @@ license=('GPL') depends=('libsm' 'rep-gtk' 'hicolor-icon-theme') install=${pkgname}.install source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('f93549382a438c1e7044624403876b345edae4b6') +sha1sums=('d4716516fb0020bb728291c6defa1f421a33e5dc') options=('!libtool') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index 23bfef4e6..b3c03b06d 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53311 2011-08-02 18:29:53Z spupykin $ +# $Id: PKGBUILD 55400 2011-09-11 21:18:11Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: dorphell pkgname=xlockmore -pkgver=5.33 -pkgrel=2 +pkgver=5.34 +pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64) license=('BSD') @@ -13,7 +13,7 @@ url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 \ LICENSE) -md5sums=('8ae31d03f836e768cd888198c5f1a5f8' +md5sums=('ed464197e8684a243e56aab7919a52d8' 'a64afab4283f53972a6702c2e59850d7') build() { diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index 2c835283b..18803a30f 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 77938 2010-04-19 05:37:53Z allan $ +# $Id: PKGBUILD 137795 2011-09-11 08:35:21Z pierre $ # Maintainer: Jan de Groot # Contributor: William Rea pkgname=libnl pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Library for applications dealing with netlink sockets" arch=('i686' 'x86_64') url="http://www.infradead.org/~tgr/libnl/" license=('GPL') depends=('glibc') -source=(ftp://ftp.archlinux.org/other/libnl/${pkgname}-${pkgver}.tar.gz - fix-compilation.patch) +source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz" + 'fix-compilation.patch') md5sums=('ae970ccd9144e132b68664f98e7ceeb1' 'e1f5e82c8aa1b3ad025c7b588178de1e') build() { cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 + patch -Np1 -i ${srcdir}/fix-compilation.patch + ./configure --prefix=/usr + make } package() { cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/extra/aspell-de/PKGBUILD b/extra/aspell-de/PKGBUILD index 4e2c6febf..7d15c7fe8 100644 --- a/extra/aspell-de/PKGBUILD +++ b/extra/aspell-de/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 116607 2011-03-24 12:52:36Z andrea $ +# $Id: PKGBUILD 137818 2011-09-11 20:26:33Z pierre $ # Maintainer: # Contributor: Simo Leone # Contributor: Tobias Kieslich pkgname=aspell-de -pkgver=20100727 -pkgrel=3 +pkgver=20110609 +pkgrel=1 pkgdesc="German dictionary for aspell" arch=('i686' 'x86_64') url="http://j3e.de/ispell/igerman98/index.html" license=('GPL2') depends=('aspell') -source=(http://j3e.de/ispell/igerman98/dict/igerman98-${pkgver}.tar.bz2) -md5sums=('53a66eccaf15fa92d4e5085e7938ee69') -sha1sums=('7cfde06b3086b03b9d400998a7254598a5b72564') +source=("http://j3e.de/ispell/igerman98/dict/igerman98-${pkgver}.tar.bz2") +md5sums=('6e7ea765b6188c08d470111e221cc91a') build() { cd "${srcdir}/igerman98-${pkgver}" diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 889033fb9..2f965ee0e 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 136349 2011-08-27 02:25:00Z dreisner $ +# $Id: PKGBUILD 137814 2011-09-11 16:06:30Z dreisner $ # Maintainer: Dave Reisner # Contributor: Paul Mattal # Contributor: Tom Newsom pkgname=dnsmasq pkgver=2.58 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64') license=('GPL') depends=('glibc' 'bash' 'dbus-core') makedepends=('libcap>=2.16') -backup=('etc/dnsmasq.conf') -install= -source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" - 'rc.dnsmasq') +install=$pkgname.install +backup=('etc/dnsmasq.conf' + 'etc/conf.d/dnsmasq') +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" + 'dnsmasq.confd' + 'rc.dnsmasq' + 'dnsmasq.service') md5sums=('14c5c81debb324adc261db971730f4c6' - 'e956eee1ec24212a3254d2b168187495') + '66479e99123faeab83ebaed709ef95b5' + '818c122ea4d81868a75afad109411170' + 'f329d86f8ba1cd85f9b6ee59e0ce3791') build() { cd "$srcdir/$pkgname-$pkgver" @@ -35,9 +40,11 @@ package() { install -dm755 "$pkgdir"/var/{db,lib/misc} install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq + install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq" + install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf - install -Dm644 "contrib/systemd/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service + install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/dnsmasq/dnsmasq.confd b/extra/dnsmasq/dnsmasq.confd new file mode 100644 index 000000000..933b92850 --- /dev/null +++ b/extra/dnsmasq/dnsmasq.confd @@ -0,0 +1,9 @@ +# +# runtime config for dnsmasq +# + +# if unset, dnsmasq will run as nobody. +DNSMASQ_USER=dnsmasq + +# other runtime options. treated as an array. +DNSMASQ_OPTS=() diff --git a/extra/dnsmasq/dnsmasq.install b/extra/dnsmasq/dnsmasq.install new file mode 100644 index 000000000..c2edb7db5 --- /dev/null +++ b/extra/dnsmasq/dnsmasq.install @@ -0,0 +1,21 @@ +#!/bin/sh + +add_dnsmasq_user() { + if ! getent passwd dnsmasq >/dev/null; then + useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq + fi +} + +post_install() { + add_dnsmasq_user +} + +post_upgrade() { + add_dnsmasq_user +} + +post_remove() { + if getent passwd dnsmasq >/dev/null; then + userdel dnsmasq + fi +} diff --git a/extra/dnsmasq/dnsmasq.service b/extra/dnsmasq/dnsmasq.service new file mode 100644 index 000000000..b09cb24b9 --- /dev/null +++ b/extra/dnsmasq/dnsmasq.service @@ -0,0 +1,13 @@ +[Unit] +Description=A lightweight DHCP and caching DNS server + +[Service] +Type=dbus +BusName=uk.org.thekelleys.dnsmasq +ExecStartPre=/usr/sbin/dnsmasq --test +ExecStart=/usr/sbin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target +Alias=dbus-uk.org.thekelleys.dnsmasq diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq index 167607294..2ded33695 100755 --- a/extra/dnsmasq/rc.dnsmasq +++ b/extra/dnsmasq/rc.dnsmasq @@ -2,35 +2,52 @@ . /etc/rc.conf . /etc/rc.d/functions +. /etc/conf.d/dnsmasq -PID=`pidof -o %PPID /usr/sbin/dnsmasq` -case "$1" in +pidfile=/run/dnsmasq.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case $1 in start) stat_busy "Starting DNS/DHCP daemon" - [ -z "$PID" ] && /usr/sbin/dnsmasq - if [ $? -gt 0 ] ; then - stat_fail + if [[ -z $PID ]] && /usr/sbin/dnsmasq --test && + /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \ + "--pid-file=$pidfile" \ + "${DNSMASQ_OPTS[@]}"; then + add_daemon dnsmasq + stat_done else - add_daemon dnsmasq # create the 'state' dir - stat_done + stat_fail fi ;; stop) stat_busy "Stopping DNS/DHCP daemon" - [ "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dnsmasq # remove the 'state' dir + if [[ $PID ]] && kill "$PID" &> /dev/null; then + # dnsmasq doesn't clean up after itself + rm -f "$pidfile" + rm_daemon dnsmasq stat_done + else + stat_fail fi ;; restart) $0 stop - sleep 5 + sleep 1 $0 start ;; + checkconfig) + # diagnostics will be printed, with zero/non-zero exit + /usr/sbin/dnsmasq --test + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 " esac -exit 0 + diff --git a/extra/dvd+rw-tools/PKGBUILD b/extra/dvd+rw-tools/PKGBUILD index 7e973b374..27c8c9122 100644 --- a/extra/dvd+rw-tools/PKGBUILD +++ b/extra/dvd+rw-tools/PKGBUILD @@ -1,23 +1,34 @@ -# $Id: PKGBUILD 137728 2011-09-10 14:21:31Z pierre $ +# $Id: PKGBUILD 137803 2011-09-11 11:04:53Z pierre $ # Maintainer: damir pkgname=dvd+rw-tools pkgver=7.1 -pkgrel=3 +pkgrel=4 pkgdesc="dvd burning tools" arch=('i686' 'x86_64') license=('GPL') url="http://fy.chalmers.se/~appro/linux/DVD+RW" depends=('cdrkit' 'gcc-libs') source=("http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${pkgver}.tar.gz" - 'buildpatch-7.0-3-20080108-karolina.patch') + 'dvd+rw-tools-7.0-dvddl.patch' + 'dvd+rw-tools-7.0-glibc2.6.90.patch' + 'dvd+rw-tools-7.0-wctomb.patch' + 'dvd+rw-tools-7.0-wexit.patch') md5sums=('8acb3c885c87f6838704a0025e435871' - '54b4dc52f5380216d4d9fc2dd2086d31') + '65d30aa98ff314f256d0a1afb9e3edf6' + '1be5401035ca850edb7e522f22aead4b' + '3ba1af063b30f942e1cd2004044702d3' + 'b2c66b6c6243b207fbe4f6ae34fa6cba') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix build, thank you Karolina - patch -Np1 -i "${srcdir}/buildpatch-7.0-3-20080108-karolina.patch" + # patches from Gentoo/Fedora + # see https://bugs.gentoo.org/257360, https://bugzilla.redhat.com/show_bug.cgi?id=426068 + # and https://bugzilla.redhat.com/show_bug.cgi?id=243036 + patch -p0 -i "${srcdir}/dvd+rw-tools-7.0-dvddl.patch" + patch -p1 -i "${srcdir}/dvd+rw-tools-7.0-glibc2.6.90.patch" + patch -p0 -i "${srcdir}/dvd+rw-tools-7.0-wctomb.patch" + patch -p1 -i "${srcdir}/dvd+rw-tools-7.0-wexit.patch" make } diff --git a/extra/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch b/extra/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch new file mode 100644 index 000000000..c1c6fb333 --- /dev/null +++ b/extra/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch @@ -0,0 +1,13 @@ +--- ./growisofs_mmc.cpp.joe 2006-04-27 20:45:00.788446635 +0200 ++++ ./growisofs_mmc.cpp 2006-04-27 20:46:01.666824300 +0200 +@@ -1412,9 +1412,7 @@ + blocks += 15, blocks &= ~15; + + if (blocks <= split) +- fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n" +- " use single layer media for this recording\n"), +- exit (FATAL_START(EMEDIUMTYPE)); ++ fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n"); + + blocks /= 16; + blocks += 1; diff --git a/extra/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch b/extra/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch new file mode 100644 index 000000000..49742d3c4 --- /dev/null +++ b/extra/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch @@ -0,0 +1,11 @@ +diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx +--- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 2007-08-15 12:56:17.000000000 +0200 ++++ dvd+rw-tools-7.0/transport.hxx 2007-08-15 12:56:42.000000000 +0200 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/extra/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch b/extra/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch new file mode 100644 index 000000000..56bd72575 --- /dev/null +++ b/extra/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch @@ -0,0 +1,11 @@ +--- transport.hxx~ 2008-03-25 21:24:47.000000000 -0400 ++++ transport.hxx 2008-03-25 21:25:36.000000000 -0400 +@@ -116,7 +116,7 @@ + extern "C" char *plusminus_locale() + { static class __plusminus { + private: +- char str[4]; ++ char str[MB_LEN_MAX]; + public: + __plusminus() { setlocale(LC_CTYPE,ENV_LOCALE); + int l = wctomb(str,(wchar_t)(unsigned char)'±'); diff --git a/extra/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch b/extra/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch new file mode 100644 index 000000000..e7910cbdd --- /dev/null +++ b/extra/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch @@ -0,0 +1,11 @@ +--- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit 2007-06-21 12:42:30.000000000 +0200 ++++ dvd+rw-tools-7.0/dvd+rw-format.cpp 2007-06-21 12:44:13.000000000 +0200 +@@ -245,7 +245,7 @@ int main (int argc, char *argv[]) + alarm(1); + while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ; + if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n"); +- exit (0); ++ exit (WEXITSTATUS(i)); + } + #endif + diff --git a/extra/fcgi/PKGBUILD b/extra/fcgi/PKGBUILD index d6024ec72..39584d9b9 100644 --- a/extra/fcgi/PKGBUILD +++ b/extra/fcgi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 87808 2010-08-18 10:56:40Z jgc $ +# $Id: PKGBUILD 137828 2011-09-11 21:00:11Z pierre $ # Maintainer: tobias # Modified by: eliott # Original by Benjamin Andresen, klapmuetz [at] gmail [dot] com pkgname=fcgi pkgver=2.4.0 -pkgrel=6 +pkgrel=7 depends=('gcc-libs') pkgdesc="FASTCgi(fcgi) islanguage independent, high performant extension to CGI" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') options=('!libtool' '!makeflags') url="http://www.fastcgi.com" -source=(http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz - gcc44-fix-include.patch) +source=("http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz" + 'gcc44-fix-include.patch') md5sums=('d15060a813b91383a9f3c66faf84867e' 'a8028462163755f3ce457a5c641f237b') @@ -26,6 +26,10 @@ build() { automake --foreign ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -Dm644 LICENSE.TERMS "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 9039c42b7..9c1924ec3 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137062 2011-09-05 19:40:28Z bisson $ +# $Id: PKGBUILD 137830 2011-09-11 21:00:49Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andrea Scarpino # Contributor: dorphell # Contributor: Tom Newsom pkgname=feh -pkgver=1.16 +pkgver=1.16.1 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('4793cecb7986335c096bb3c8adf0c364c36d8a34') +sha1sums=('f016043826cf30d33675fceba24d9753206d947a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD index 2912f9b39..1b8b9050d 100644 --- a/extra/freetds/PKGBUILD +++ b/extra/freetds/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Aaron Malone pkgname=freetds -pkgver=0.82 -pkgrel=5 +pkgver=0.91 +pkgrel=1 pkgdesc='Library for accessing Sybase and MS SQL Server databases' url='http://www.freetds.org' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ backup=('etc/freetds/freetds.conf' 'etc/freetds/locales.conf' 'etc/freetds/pool.conf') source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgver}.tar.gz") -md5sums=('3df6b2e83fd420e90f1becbd1162990a') +md5sums=('b14db5823980a32f0643d1a84d3ec3ad') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index 4ba3370bc..fe091914d 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137793 2011-09-11 03:49:47Z foutrelis $ +# $Id: PKGBUILD 137816 2011-09-11 20:07:54Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Tobias Powalowski # Contributor: Hokum pkgname=gptfdisk pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64') url="http://www.rodsbooks.com/gdisk/" @@ -27,8 +27,8 @@ package () { cd "$srcdir/$pkgname-$pkgver" install -d "$pkgdir"/{sbin,usr/share/{doc/gdisk,man/man8}} - install -t "$pkgdir/sbin" gdisk cgdisk sgdisk fixparts - install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,cgdisk,sgdisk}.8 + install -t "$pkgdir/sbin" {,c,s}gdisk fixparts + install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8 install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS } diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 040355421..c83933c40 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137511 2011-09-08 09:01:46Z andrea $ +# $Id: PKGBUILD 137806 2011-09-11 11:17:09Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.7.1 -pkgrel=4 +pkgrel=6 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -17,8 +17,8 @@ groups=('kde') depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python'i - 'networkmanager') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python' + 'networkmanager') optdepends=('kde-wallpapers: officials KDE wallapers') replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') @@ -30,7 +30,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch') + 'fixpath.patch' 'terminate-server.patch' + 'important-performance-bugfix.patch') sha1sums=('c7867d2f788086078abbcff53a035a6131232539' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -38,7 +39,8 @@ sha1sums=('c7867d2f788086078abbcff53a035a6131232539' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + '4fa046db21e3203771fd29bc0e1c32918862b894') build() { cd ${srcdir}/${_pkgname}-${pkgver} @@ -46,6 +48,9 @@ build() { patch -p0 -i ${srcdir}/fixpath.patch patch -p0 -i ${srcdir}/terminate-server.patch + # Already fixed upstream + patch -p1 -i "${srcdir}"/important-performance-bugfix.patch + cd ${srcdir} mkdir build cd build diff --git a/extra/kdebase-workspace/important-performance-bugfix.patch b/extra/kdebase-workspace/important-performance-bugfix.patch new file mode 100644 index 000000000..a34c77e5c --- /dev/null +++ b/extra/kdebase-workspace/important-performance-bugfix.patch @@ -0,0 +1,91 @@ +commit e142a1a142cbc8b87f021223e6abc947f456a7f9 +Author: Thomas Lübking +Date: Thu Sep 8 22:20:35 2011 +0200 + + replace non-const QVector::operator[] accesses with const ::at() to avoid maaany deep vecor copies + +diff --git a/kwin/effects.cpp b/kwin/effects.cpp +index e0c76cb..f5863fc0 100644 +--- a/kwin/effects.cpp ++++ b/kwin/effects.cpp +@@ -200,7 +200,7 @@ void EffectsHandlerImpl::reconfigure() + void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->prePaintScreen(data, time); ++ loaded_effects.at(current_paint_screen++).second->prePaintScreen(data, time); + --current_paint_screen; + } + // no special final code +@@ -209,7 +209,7 @@ void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) + void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& data) + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->paintScreen(mask, region, data); ++ loaded_effects.at(current_paint_screen++).second->paintScreen(mask, region, data); + --current_paint_screen; + } else + scene->finalPaintScreen(mask, region, data); +@@ -218,7 +218,7 @@ void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& + void EffectsHandlerImpl::postPaintScreen() + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->postPaintScreen(); ++ loaded_effects.at(current_paint_screen++).second->postPaintScreen(); + --current_paint_screen; + } + // no special final code +@@ -227,7 +227,7 @@ void EffectsHandlerImpl::postPaintScreen() + void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->prePaintWindow(w, data, time); ++ loaded_effects.at(current_paint_window++).second->prePaintWindow(w, data, time); + --current_paint_window; + } + // no special final code +@@ -236,7 +236,7 @@ void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& dat + void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->paintWindow(w, mask, region, data); ++ loaded_effects.at(current_paint_window++).second->paintWindow(w, mask, region, data); + --current_paint_window; + } else + scene->finalPaintWindow(static_cast(w), mask, region, data); +@@ -245,7 +245,7 @@ void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, + void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, double opacity, double frameOpacity) + { + if (current_paint_effectframe < loaded_effects.size()) { +- loaded_effects[current_paint_effectframe++].second->paintEffectFrame(frame, region, opacity, frameOpacity); ++ loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame(frame, region, opacity, frameOpacity); + --current_paint_effectframe; + } else { + const EffectFrameImpl* frameImpl = static_cast(frame); +@@ -256,7 +256,7 @@ void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, do + void EffectsHandlerImpl::postPaintWindow(EffectWindow* w) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->postPaintWindow(w); ++ loaded_effects.at(current_paint_window++).second->postPaintWindow(w); + --current_paint_window; + } + // no special final code +@@ -273,7 +273,7 @@ bool EffectsHandlerImpl::provides(Effect::Feature ef) + void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) + { + if (current_draw_window < loaded_effects.size()) { +- loaded_effects[current_draw_window++].second->drawWindow(w, mask, region, data); ++ loaded_effects.at(current_draw_window++).second->drawWindow(w, mask, region, data); + --current_draw_window; + } else + scene->finalDrawWindow(static_cast(w), mask, region, data); +@@ -282,7 +282,7 @@ void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, W + void EffectsHandlerImpl::buildQuads(EffectWindow* w, WindowQuadList& quadList) + { + if (current_build_quads < loaded_effects.size()) { +- loaded_effects[current_build_quads++].second->buildQuads(w, quadList); ++ loaded_effects.at(current_build_quads++).second->buildQuads(w, quadList); + --current_build_quads; + } + } diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index be8b6ac18..28849d7db 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=git20110907 -_commit=d119e72811b25d167ee646d831b0aa4bb48f2a15 +pkgver=git20110911 +_commit=6028b72a14f7fa714e6b4b101d51a4fb4bda3168 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('54c37656f4795cef3cf69254758db094') +md5sums=('8c8d92af3409be5a4faac21b25d0b5d0') build() { cd "${srcdir}" diff --git a/extra/mod_dnssd/PKGBUILD b/extra/mod_dnssd/PKGBUILD index 7c1ddc18d..52a6e65e5 100644 --- a/extra/mod_dnssd/PKGBUILD +++ b/extra/mod_dnssd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: $ +# $Id: PKGBUILD 137844 2011-09-12 03:00:03Z eric $ # Maintainer: Jan de Groot # Contributor: tardo # Contributor: William Rea pkgname=mod_dnssd pkgver=0.6 -pkgrel=3 +pkgrel=4 pkgdesc="Zeroconf module for Apache2" arch=('i686' 'x86_64') url="http://0pointer.de/lennart/projects/mod_dnssd" @@ -16,8 +16,12 @@ md5sums=('bed3d95a98168bf0515922d1c05020c5') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-lynx || return 1 - make || return 1 + ./configure --prefix=/usr --disable-lynx + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" install -m755 -d "${pkgdir}/usr/lib/httpd/modules" - install -m755 src/.libs/mod_dnssd.so "${pkgdir}/usr/lib/httpd/modules/" || return 1 + install -m755 src/.libs/mod_dnssd.so "${pkgdir}/usr/lib/httpd/modules/" } diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD index f1fb5eb5e..e3dc227bc 100644 --- a/extra/oxine/PKGBUILD +++ b/extra/oxine/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 59896 2009-11-29 15:47:18Z jgc $ +# $Id: PKGBUILD 137856 2011-09-12 03:56:43Z eric $ # Maintainer: Alexander Baldeck # Contributor: Rouslan Solomakhin # Contributor: dorphell + pkgname=oxine pkgver=0.7.1 -pkgrel=3 -pkgdesc="oxine is a lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems." +pkgrel=4 +pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems" arch=('i686' 'x86_64') -depends=('xine-lib>=1.1.16.3' 'libexif>=0.6.17' 'eject' 'libcdio>=0.82' 'curl>=7.19.4' 'libxinerama' 'libsm' 'libxtst') -makedepends=('pkgconfig') -license=('GPL') url="http://oxine.sourceforge.net/" +license=('GPL') +depends=('xine-lib' 'libexif' 'eject' 'libcdio' 'curl' 'libxtst') source=(http://downloads.sourceforge.net/sourceforge/oxine/${pkgname}-${pkgver}.tar.gz) md5sums=('2a2d05ee21892624e35cf539e532c0dd') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-hal \ - --without-imagemagick --disable-gdkpixbuf || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + sed -i 's|#include ||' configure src/download.c + ./configure --prefix=/usr --disable-hal --without-jsw --disable-extractor \ + --without-imagemagick --disable-gdkpixbuf --disable-weather + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/perl-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD new file mode 100644 index 000000000..be7ac34f0 --- /dev/null +++ b/extra/perl-socket6/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Florian Pritz +# Generator : CPANPLUS::Dist::Arch 1.18 + +pkgname='perl-socket6' +pkgver='0.23' +pkgrel='1' +pkgdesc="getaddrinfo/getnameinfo support module" +arch=('i686' 'x86_64') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl') +makedepends=() +url='http://search.cpan.org/dist/Socket6' +source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz') +md5sums=('2c02adb13c449d48d232bb704ddbd492') +sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9') +_distdir="${srcdir}/Socket6-0.23" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$_distdir" + make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 18c9a5570..54fac2ee4 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136443 2011-08-29 12:25:25Z pierre $ +# $Id: PKGBUILD 137805 2011-09-11 11:11:53Z pierre $ # Maintainer: Pierre Schmitz pkgbase=php @@ -8,10 +8,8 @@ pkgname=('php' 'php-fpm' 'php-embed' 'php-pear' - 'php-curl' 'php-enchant' 'php-gd' - 'php-gmp' 'php-intl' 'php-ldap' 'php-mcrypt' @@ -25,13 +23,13 @@ pkgname=('php' 'php-xsl') pkgver=5.3.8 _suhosinver=5.3.7-0.9.10 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' - 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" @@ -39,7 +37,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'logrotate.d.php-fpm') md5sums=('704cd414a0565d905e1074ffdc1fadfb' '08582e502fed8221c6577042ca45ddb8' - '39eaa70d276fc3d45d6bcf6cd5ae1106' + '65606c606df97a0760dfe5aaf9893afc' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' '09005dabd90c48ddd392b3dbf05f8a82' @@ -212,10 +210,10 @@ build() { package_php() { pkgdesc='An HTML-embedded scripting language' - depends=('pcre' 'libxml2' 'bzip2' 'openssl') - replaces=('php-fileinfo') - provides=('php-fileinfo') - conflicts=('php-fileinfo') + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') backup=('etc/php/php.ini') cd ${srcdir}/build-php @@ -228,19 +226,21 @@ package_php() { # remove static modules rm -f ${pkgdir}/usr/lib/php/modules/*.a # remove modules provided by sub packages - rm -f ${pkgdir}/usr/lib/php/modules/{curl,enchant,gd,gmp,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include } package_php-cgi() { pkgdesc='CGI and FCGI SAPI for PHP' - depends=('php' 'pcre' 'libxml2') + depends=('php') install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi } package_php-apache() { pkgdesc='Apache SAPI for PHP' - depends=('php' 'apache' 'pcre' 'libxml2') + depends=('php' 'apache') backup=('etc/httpd/conf/extra/php5_module.conf') install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so @@ -262,7 +262,7 @@ package_php-fpm() { package_php-embed() { pkgdesc='Embed SAPI for PHP' - depends=('php' 'pcre' 'libxml2') + depends=('php') install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h @@ -270,7 +270,7 @@ package_php-embed() { package_php-pear() { pkgdesc='PHP Extension and Application Repository' - depends=('php' 'bash') + depends=('php') backup=('etc/php/pear.conf') cd ${srcdir}/build-pear @@ -281,12 +281,6 @@ package_php-pear() { done < <(find ${pkgdir} -name '.*') } -package_php-curl() { - depends=('php' 'curl') - pkgdesc='curl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/curl.so ${pkgdir}/usr/lib/php/modules/curl.so -} - package_php-enchant() { depends=('php' 'enchant') pkgdesc='enchant module for PHP' @@ -299,12 +293,6 @@ package_php-gd() { install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so } -package_php-gmp() { - depends=('php' 'gmp') - pkgdesc='gmp module for PHP' - install -D -m755 ${srcdir}/build-php/modules/gmp.so ${pkgdir}/usr/lib/php/modules/gmp.so -} - package_php-intl() { depends=('php' 'icu') pkgdesc='intl module for PHP' @@ -318,7 +306,7 @@ package_php-ldap() { } package_php-mcrypt() { - depends=('php' 'libmcrypt' 'libtool') + depends=('php' 'libmcrypt' 'libltdl') pkgdesc='mcrypt module for PHP' install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so } diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch index 356e190b4..46c842921 100644 --- a/extra/php/php.ini.patch +++ b/extra/php/php.ini.patch @@ -81,7 +81,7 @@ +;extension=bcmath.so +;extension=bz2.so +;extension=calendar.so -+;extension=curl.so ++extension=curl.so +;extension=dba.so +;extension=enchant.so +;extension=exif.so @@ -92,7 +92,7 @@ +;extension=iconv.so +;extension=imap.so +;extension=intl.so -+;extension=json.so ++extension=json.so +;extension=ldap.so +;extension=mcrypt.so +;extension=mssql.so diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD index fbb4bdc26..fa76fd234 100644 --- a/extra/unixodbc/PKGBUILD +++ b/extra/unixodbc/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 78429 2010-04-23 18:51:55Z andyrtr $ +# $Id: PKGBUILD 137809 2011-09-11 11:42:08Z pierre $ # Maintainer: AndyRTR - # Contributor: Judd Vinet # Contributor: Tom Newsom pkgname=unixodbc pkgver=2.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://www.unixodbc.org/" backup=('etc/odbc.ini' 'etc/odbcinst.ini') -depends=('readline>=6.0' 'libtool') +depends=('readline' 'libltdl') options=('!libtool') -source=(http://www.unixodbc.org/unixODBC-$pkgver.tar.gz) +source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz") md5sums=('f2ad22cbdffe836c58987ed2332c2e99') build() { cd ${srcdir}/unixODBC-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } package() { cd ${srcdir}/unixODBC-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index ecaf308d2..15236bda8 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 134420 2011-08-03 19:34:12Z eric $ +# $Id: PKGBUILD 137836 2011-09-11 23:43:47Z eric $ # Maintainer: Eric Bélanger pkgname=xine-lib pkgver=1.1.19 -pkgrel=3 +pkgrel=4 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" license=('LGPL' 'GPL') -depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama') -makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' 'libmodplug' +depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') +makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib') optdepends=('imagemagick: for using the imagemagick plugin' \ 'smbclient: for using the smb plugin' \ @@ -19,7 +19,6 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'mesa: for using the opengl plugin' \ 'libpulse: for using the pulseaudio plugin' \ 'speex: for using the speex plugin' \ - 'libmodplug: for using the modplug plugin' \ 'v4l-utils: for using the v4l plugin' \ 'wavpack: for using the wavpack plugin' \ 'faad2: for using the faad plugin' \ diff --git a/kde-unstable/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD index 650265a83..ccf43537a 100644 --- a/kde-unstable/kdebase-workspace/PKGBUILD +++ b/kde-unstable/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137512 2011-09-08 10:05:49Z andrea $ +# $Id: PKGBUILD 137807 2011-09-11 11:17:41Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.7.1 -pkgrel=5 +pkgrel=7 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -30,7 +30,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch') + 'fixpath.patch' 'terminate-server.patch' + 'important-performance-bugfix.patch') sha1sums=('c7867d2f788086078abbcff53a035a6131232539' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -38,7 +39,8 @@ sha1sums=('c7867d2f788086078abbcff53a035a6131232539' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + '4fa046db21e3203771fd29bc0e1c32918862b894') build() { cd "${srcdir}"/${_pkgname}-${pkgver} @@ -46,6 +48,9 @@ build() { patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch + # Already fixed upstream + patch -p1 -i "${srcdir}"/important-performance-bugfix.patch + cd "${srcdir}" mkdir build cd build diff --git a/kde-unstable/kdebase-workspace/important-performance-bugfix.patch b/kde-unstable/kdebase-workspace/important-performance-bugfix.patch new file mode 100644 index 000000000..a34c77e5c --- /dev/null +++ b/kde-unstable/kdebase-workspace/important-performance-bugfix.patch @@ -0,0 +1,91 @@ +commit e142a1a142cbc8b87f021223e6abc947f456a7f9 +Author: Thomas Lübking +Date: Thu Sep 8 22:20:35 2011 +0200 + + replace non-const QVector::operator[] accesses with const ::at() to avoid maaany deep vecor copies + +diff --git a/kwin/effects.cpp b/kwin/effects.cpp +index e0c76cb..f5863fc0 100644 +--- a/kwin/effects.cpp ++++ b/kwin/effects.cpp +@@ -200,7 +200,7 @@ void EffectsHandlerImpl::reconfigure() + void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->prePaintScreen(data, time); ++ loaded_effects.at(current_paint_screen++).second->prePaintScreen(data, time); + --current_paint_screen; + } + // no special final code +@@ -209,7 +209,7 @@ void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) + void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& data) + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->paintScreen(mask, region, data); ++ loaded_effects.at(current_paint_screen++).second->paintScreen(mask, region, data); + --current_paint_screen; + } else + scene->finalPaintScreen(mask, region, data); +@@ -218,7 +218,7 @@ void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& + void EffectsHandlerImpl::postPaintScreen() + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->postPaintScreen(); ++ loaded_effects.at(current_paint_screen++).second->postPaintScreen(); + --current_paint_screen; + } + // no special final code +@@ -227,7 +227,7 @@ void EffectsHandlerImpl::postPaintScreen() + void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->prePaintWindow(w, data, time); ++ loaded_effects.at(current_paint_window++).second->prePaintWindow(w, data, time); + --current_paint_window; + } + // no special final code +@@ -236,7 +236,7 @@ void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& dat + void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->paintWindow(w, mask, region, data); ++ loaded_effects.at(current_paint_window++).second->paintWindow(w, mask, region, data); + --current_paint_window; + } else + scene->finalPaintWindow(static_cast(w), mask, region, data); +@@ -245,7 +245,7 @@ void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, + void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, double opacity, double frameOpacity) + { + if (current_paint_effectframe < loaded_effects.size()) { +- loaded_effects[current_paint_effectframe++].second->paintEffectFrame(frame, region, opacity, frameOpacity); ++ loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame(frame, region, opacity, frameOpacity); + --current_paint_effectframe; + } else { + const EffectFrameImpl* frameImpl = static_cast(frame); +@@ -256,7 +256,7 @@ void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, do + void EffectsHandlerImpl::postPaintWindow(EffectWindow* w) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->postPaintWindow(w); ++ loaded_effects.at(current_paint_window++).second->postPaintWindow(w); + --current_paint_window; + } + // no special final code +@@ -273,7 +273,7 @@ bool EffectsHandlerImpl::provides(Effect::Feature ef) + void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) + { + if (current_draw_window < loaded_effects.size()) { +- loaded_effects[current_draw_window++].second->drawWindow(w, mask, region, data); ++ loaded_effects.at(current_draw_window++).second->drawWindow(w, mask, region, data); + --current_draw_window; + } else + scene->finalDrawWindow(static_cast(w), mask, region, data); +@@ -282,7 +282,7 @@ void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, W + void EffectsHandlerImpl::buildQuads(EffectWindow* w, WindowQuadList& quadList) + { + if (current_build_quads < loaded_effects.size()) { +- loaded_effects[current_build_quads++].second->buildQuads(w, quadList); ++ loaded_effects.at(current_build_quads++).second->buildQuads(w, quadList); + --current_build_quads; + } + } diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index c4b759ef9..b06cd23f4 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54541 2011-08-20 07:14:05Z allan $ +# $Id: PKGBUILD 55393 2011-09-11 20:34:00Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,8 +9,8 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.14 -pkgrel=5 -_glibcdate=20110617 +pkgrel=6 +_glibcdate=20110908 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc" @@ -18,28 +18,29 @@ license=('GPL' 'LGPL') depends=("glibc>=$pkgver") makedepends=('gcc-multilib>=4.6') options=('!strip' '!emptydirs') -source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz +source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz glibc-2.10-dont-build-timezone.patch glibc-2.10-bz4781.patch glibc-__i686.patch glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch + glibc-2.13-dlclose-search-reset.patch glibc-2.14-libdl-crash.patch - #glibc-2.14-fix-resolver-crash-typo.patch - glibc-2.14-revert-4462fad3.patch + glibc-2.14-avoid-assertion-on-empty-dns-answer.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch lib32-glibc.conf) -md5sums=('e441d745609d93c907b72548ba646dad' +md5sums=('069069eb9100cc7affd7ad884cb3c3e9' '4dadb9203b69a3210d53514bb46f41c3' '0c5540efc51c0b93996c51b57a8540ae' '40cd342e21f71f5e49e32622b25acc52' 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' + '22d09c58718fb3d1d31c3a6c14ca6886' 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' + '13728807283f111e5d9d38cf38e0a461' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' '6e052f1cb693d5d3203f50f9d4e8c33b') @@ -68,15 +69,17 @@ build() { # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + # https://bugzilla.redhat.com/show_bug.cgi?id=593675 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.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 - # This fixes the main segfault but not the assert fail (FS#24615) - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 - #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch - # resort to reverting the bad commit completely for the moment - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + # 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-avoid-assertion-on-empty-dns-answer.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...) diff --git a/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch b/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch new file mode 100644 index 000000000..3ad8b418a --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch @@ -0,0 +1,196 @@ +From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Wed, 26 May 2010 18:28:59 +0200 +Subject: [PATCH] Fix scope handling during dl_close + +--- + ChangeLog | 12 ++++++++++++ + elf/Makefile | 10 +++++++++- + elf/dl-close.c | 7 +++++++ + elf/unload8.c | 33 +++++++++++++++++++++++++++++++++ + elf/unload8mod1.c | 7 +++++++ + elf/unload8mod1x.c | 1 + + elf/unload8mod2.c | 7 +++++++ + elf/unload8mod3.c | 27 +++++++++++++++++++++++++++ + 8 files changed, 103 insertions(+), 1 deletions(-) + create mode 100644 elf/unload8.c + create mode 100644 elf/unload8mod1.c + create mode 100644 elf/unload8mod1x.c + create mode 100644 elf/unload8mod2.c + create mode 100644 elf/unload8mod3.c + +diff --git a/elf/Makefile b/elf/Makefile +index 59e835f..65b6deb 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -89,6 +89,7 @@ distribute := rtld-Rules \ + unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ + unload6mod1.c unload6mod2.c unload6mod3.c \ + unload7mod1.c unload7mod2.c \ ++ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ + tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ + tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ + tst-auditmod4a.c tst-auditmod4b.c \ +@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ + tst-dlmodcount tst-dlopenrpath tst-deep1 \ + tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ +- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ ++ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ + tst-audit1 tst-audit2 \ + tst-stackguard1 tst-addr1 tst-thrlock \ + tst-unique1 tst-unique2 +@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ + unload6mod1 unload6mod2 unload6mod3 \ + unload7mod1 unload7mod2 \ ++ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ + order2mod1 order2mod2 order2mod3 order2mod4 \ + tst-unique1mod1 tst-unique1mod2 \ + tst-unique2mod1 tst-unique2mod2 +@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl) + $(objpfx)unload6mod3.so: $(libdl) + $(objpfx)unload7mod1.so: $(libdl) + $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so ++$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so ++$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so ++$(objpfx)unload8mod3.so: $(libdl) + $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so + $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so + $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so +@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl) + $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so + unload7-ENV = MALLOC_PERTURB_=85 + ++$(objpfx)unload8: $(libdl) ++$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so ++ + ifdef libdl + $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a + $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 700e765..f47d5f8 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) + + imap->l_scope_max = new_size; + } ++ else if (new_list != NULL) ++ { ++ /* We didn't change the scope array, so reset the search ++ list. */ ++ imap->l_searchlist.r_list = NULL; ++ imap->l_searchlist.r_nlist = 0; ++ } + + /* The loader is gone, so mark the object as not having one. + Note: l_idx != IDX_STILL_USED -> object will be removed. */ +diff --git a/elf/unload8.c b/elf/unload8.c +new file mode 100644 +index 0000000..f984a38 +--- /dev/null ++++ b/elf/unload8.c +@@ -0,0 +1,33 @@ ++#include ++#include ++ ++int ++main (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod1.so failed"); ++ return 1; ++ } ++ ++ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); ++ if (h2 == NULL) ++ { ++ puts ("dlopen unload8mod1x.so failed"); ++ return 1; ++ } ++ dlclose (h2); ++ ++ int (*mod1) (void) = dlsym (h, "mod1"); ++ if (mod1 == NULL) ++ { ++ puts ("dlsym failed"); ++ return 1; ++ } ++ ++ mod1 (); ++ dlclose (h); ++ ++ return 0; ++} +diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c +new file mode 100644 +index 0000000..fe7e81c +--- /dev/null ++++ b/elf/unload8mod1.c +@@ -0,0 +1,7 @@ ++extern void mod2 (void); ++ ++void ++mod1 (void) ++{ ++ mod2 (); ++} +diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c +new file mode 100644 +index 0000000..835b634 +--- /dev/null ++++ b/elf/unload8mod1x.c +@@ -0,0 +1 @@ ++int mod1x; +diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c +new file mode 100644 +index 0000000..2fd8b67 +--- /dev/null ++++ b/elf/unload8mod2.c +@@ -0,0 +1,7 @@ ++extern void mod3 (void); ++ ++void ++mod2 (void) ++{ ++ mod3 (); ++} +diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c +new file mode 100644 +index 0000000..d49e22b +--- /dev/null ++++ b/elf/unload8mod3.c +@@ -0,0 +1,27 @@ ++#include ++#include ++#include ++ ++void ++mod3_fini2 (void) ++{ ++} ++ ++void ++mod3_fini (void) ++{ ++ mod3_fini2 (); ++} ++ ++void ++mod3 (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod2.so failed"); ++ exit (1); ++ } ++ ++ atexit (mod3_fini); ++} +-- +1.7.3.4 + diff --git a/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch new file mode 100644 index 000000000..ef91116e5 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch @@ -0,0 +1,26 @@ +From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab +Date: Thu, 1 Sep 2011 10:46:14 +0200 +Subject: [PATCH] Avoid assertion failure when first DNS answer was empty + +--- + ChangeLog | 4 ++++ + resolv/res_query.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/resolv/res_query.c b/resolv/res_query.c +index 2f7cfaa..2ded9fb 100644 +--- a/resolv/res_query.c ++++ b/resolv/res_query.c +@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, + && *resplen2 > (int) sizeof (HEADER)) + { + /* Special case of partial answer. */ +- assert (hp != hp2); ++ assert (n == 0 || hp != hp2); + hp = hp2; + } + else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) +-- +1.7.3.4 + diff --git a/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD index 77ca73c32..b10e9c329 100644 --- a/multilib/libtool-multilib/PKGBUILD +++ b/multilib/libtool-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55288 2011-09-08 23:39:10Z heftig $ +# $Id: PKGBUILD 55394 2011-09-11 20:34:04Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Allan McRae # Contributor: judd @@ -6,15 +6,15 @@ # NOTE: requires rebuild with each new gcc version pkgbase=libtool-multilib -pkgname=(libtool-multilib lib32-libtool) +pkgname=(libtool-multilib lib32-libltdl) pkgver=2.4 -pkgrel=4 +pkgrel=5 pkgdesc="A generic library support script for multilib" arch=('x86_64') url="http://www.gnu.org/software/libtool" license=('GPL') _gccver=4.6.1 -makedepends=(sh tar "gcc-multilib=$_gccver") +makedepends=("gcc-multilib=$_gccver") options=('!libtool') source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz) md5sums=('4e6144439d95d7332dc50ace6dd24c55') @@ -48,21 +48,25 @@ check() { } package_libtool-multilib() { + depends=('sh' "libltdl=$pkgver" "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver") groups=('multilib-devel') - depends=(sh tar "gcc-multilib=$_gccver" "lib32-libtool=$pkgver-$pkgrel") + install=libtool.install provides=("libtool=$pkgver-$pkgrel") conflicts=(libtool) - install=libtool.install cd "$srcdir/libtool-64" - make DESTDIR="$pkgdir" install + make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ + install-data-local + rm -rf ${pkgdir}/usr/share/libtool/libltdl/ } -package_lib32-libtool() { - pkgdesc="A generic library support script (32-bit)" - depends=(lib32-glibc) +package_lib32-libltdl() { + pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)" + depends=(lib32-glibc libltdl) + replaces=(lib32-libtool) + provides=("lib32-libtool=$pkgver-$pkgrel") + conflicts=(lib32-libtool) cd "$srcdir/libtool-32" - make DESTDIR="$pkgdir" install - rm -r "$pkgdir"/usr/{bin,include,share} + make DESTDIR="$pkgdir" install-libLTLIBRARIES } diff --git a/staging/dvdauthor/PKGBUILD b/staging/dvdauthor/PKGBUILD new file mode 100644 index 000000000..5f06234be --- /dev/null +++ b/staging/dvdauthor/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 137846 2011-09-12 03:23:19Z allan $ +# Maintainer: Giovanni Scafora +# Contributor: Travis Willard +# Contributor: Jaroslaw Swierczynski +# Contributor: Nicolai Lissner + +pkgname=dvdauthor +pkgver=0.7.0 +pkgrel=2 +pkgdesc="DVD authoring tools" +arch=('i686' 'x86_64') +url="http://dvdauthor.sourceforge.net/" +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('33a447fb98ab3293ac40f869eedc17ff') + +build() { + cd "${srcdir}/${pkgname}" + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD new file mode 100644 index 000000000..284b8eed7 --- /dev/null +++ b/staging/imagemagick/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 137838 2011-09-12 00:54:46Z eric $ +# Maintainer: Eric Bélanger + +pkgbase=imagemagick +pkgname=('imagemagick' 'imagemagick-doc') +pkgver=6.7.2.5 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.imagemagick.org/" +license=('custom') +depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo') +makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') +source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ + perlmagick.rpath.patch) +md5sums=('ce0294e6bc7ca3ece03a432518143a29' + 'ff9974decbfe9846f8e347239d87e4eb') +sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560' + '23405f80904b1de94ebd7bd6fe2a332471b8c283') + +build() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + + sed '/AC_PATH_XTRA/d' -i configure.ac + autoreconf + patch -Np0 -i ../perlmagick.rpath.patch + + LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \ + ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ + --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ + --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" \ + --without-gvc --without-djvu --without-autotrace --without-webp \ + --without-jbig --without-fpx --without-dps --without-fftw --without-lqr + make +} + +package_imagemagick() { + pkgdesc="An image viewing/manipulation program" + optdepends=('ghostscript: for Ghostscript support' + 'openexr: for OpenEXR support' + 'libwmf: for WMF support' + 'librsvg: for SVG support' + 'libxml2: for XML support' + 'jasper: for JPEG-2000 support' + 'libpng: for PNG support') + backup=('etc/ImageMagick/coder.xml' + 'etc/ImageMagick/colors.xml' + 'etc/ImageMagick/delegates.xml' + 'etc/ImageMagick/log.xml' + 'etc/ImageMagick/magic.xml' + 'etc/ImageMagick/mime.xml' + 'etc/ImageMagick/policy.xml' + 'etc/ImageMagick/sRGB.icm' + 'etc/ImageMagick/thresholds.xml' + 'etc/ImageMagick/type.xml' + 'etc/ImageMagick/type-dejavu.xml' + 'etc/ImageMagick/type-ghostscript.xml' + 'etc/ImageMagick/type-windows.xml') + options=('!makeflags' '!docs' 'libtool') + + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make DESTDIR="${pkgdir}" install + chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" + +#Cleaning + find "${pkgdir}" -name '*.bs' -delete + rm -f "${pkgdir}"/usr/lib/*.la +} + +package_imagemagick-doc() { + pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" + depends=() + options=('!makeflags') + + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make DESTDIR="${pkgdir}" install-data-html + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" +} diff --git a/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch new file mode 100644 index 000000000..958c0f2ee --- /dev/null +++ b/staging/imagemagick/perlmagick.rpath.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 ++++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 +@@ -10067,6 +10067,7 @@ + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) ++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD new file mode 100644 index 000000000..fc0a05d64 --- /dev/null +++ b/staging/inkscape/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 137854 2011-09-12 03:46:01Z bisson $ +# Contributor: tobias +# Contributor: Tobias Kieslich +# Maintainer: Gaetan Bisson + +pkgname=inkscape +pkgver=0.48.2 +pkgrel=2 +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' 'pyxml' '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' + 'uniconvertor: reading/writing to some proprietary formats') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3') + +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 + + ./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/obex-data-server/PKGBUILD b/staging/obex-data-server/PKGBUILD new file mode 100644 index 000000000..25b4c9bf3 --- /dev/null +++ b/staging/obex-data-server/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 137852 2011-09-12 03:35:14Z allan $ +# Maintainer: Andrea Scarpino +# Contributor: Geoffroy Carrier +# Contributor: Roman Kyrylych +# Contributor: Keerthi + +pkgname=obex-data-server +pkgver=0.4.6 +pkgrel=2 +pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" +arch=('i686' 'x86_64') +url="http://wiki.muiline.com/obex-data-server" +license=('GPL') +depends=('dbus-glib' 'openobex' 'imagemagick') +source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") +md5sums=('961ca5db6fe9c97024e133cc6203cc4d') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/staging/psiconv/PKGBUILD b/staging/psiconv/PKGBUILD new file mode 100644 index 000000000..474feade1 --- /dev/null +++ b/staging/psiconv/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 137848 2011-09-12 03:27:09Z allan $ +# Maintainer: Giovanni Scafora +# Contributor: Tom Newsom + +pkgname=psiconv +pkgver=0.9.8 +pkgrel=8 +pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" +arch=('i686' 'x86_64') +url="http://software.frodo.looijaard.name/psiconv/" +license=('GPL') +depends=('imagemagick') +makedepends=('bc') +backup=('etc/psiconv/psiconv.conf') +options=('!libtool') +source=(http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz) +md5sums=('8d7548e3c6b9cd408544736133728acd') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/staging/pstoedit/PKGBUILD b/staging/pstoedit/PKGBUILD new file mode 100644 index 000000000..1f61e7e80 --- /dev/null +++ b/staging/pstoedit/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 137850 2011-09-12 03:31:42Z allan $ +# Maintainer: Ronald van Haren +# Contributor: damir +# Contributor: Tobias Powalowski + +pkgname=pstoedit +pkgver=3.60 +pkgrel=2 +pkgdesc="Translates PostScript and PDF graphics into other vector formats" +arch=('i686' 'x86_64') +url="http://www.pstoedit.net/" +license=('GPL') +depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick') +makedepends=('ghostscript') +options=('!libtool' '!makeflags') +source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz" + 'pstoedit-3.50-parallel.patch' 'pstoedit-3.50-plugin-close.patch') +sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2' + '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a' + '54bbe019de66eb4cb8525371462595d21fbd074e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's/-pedantic//' configure + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/pstoedit/pstoedit-3.50-parallel.patch b/staging/pstoedit/pstoedit-3.50-parallel.patch new file mode 100644 index 000000000..4f1f73b04 --- /dev/null +++ b/staging/pstoedit/pstoedit-3.50-parallel.patch @@ -0,0 +1,47 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index d6178df..66f377b 100755 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES= \ + $(sample_drivers_src) + libp2edrvstd_la_LIBADD=-L. libpstoedit.la + libp2edrvstd_la_LDFLAGS=-no-undefined -module ++libp2edrvstd_la_DEPENDENCIES = libpstoedit.la + + #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp + #libp2edrvplugins_la_LIBADD= +@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module + libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp + libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la + libp2edrvlplot_la_LDFLAGS=-no-undefined -module ++libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la + + libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp + libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la + libp2edrvswf_la_LDFLAGS=-no-undefined -module ++libp2edrvswf_la_DEPENDENCIES = libpstoedit.la + + # note the __ stand for ++ - automake treats all no alphanums chars as _ + libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp + libp2edrvmagick___la_LIBADD=-L. libpstoedit.la + libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS} -module ++libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la + # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long + + if USE_EMFBYSOURCE +@@ -113,6 +117,7 @@ else + libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp + libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module + endif ++libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la + + libpstoedit_la_SOURCES = \ + dynload.cpp dynload.h \ +@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined + + pstoedit_SOURCES = cmdmain.cpp + pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS} ++pstoedit_DEPENDENCIES = libpstoedit.la + + pkginclude_HEADERS = \ + pstoedit.h \ diff --git a/staging/pstoedit/pstoedit-3.50-plugin-close.patch b/staging/pstoedit/pstoedit-3.50-plugin-close.patch new file mode 100644 index 000000000..6787d6aef --- /dev/null +++ b/staging/pstoedit/pstoedit-3.50-plugin-close.patch @@ -0,0 +1,14 @@ +http://bugzilla.redhat.com/507035 + +diff --git a/src/dynload.cpp b/src/dynload.cpp +index c0db355..7c073ef 100644 +--- a/src/dynload.cpp ++++ b/src/dynload.cpp +@@ -147,7 +147,6 @@ void DynLoader::close() + + DynLoader::~DynLoader() + { +- close(); + libname=0; + } + diff --git a/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD new file mode 100644 index 000000000..ab57f20d8 --- /dev/null +++ b/staging/transcode/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 137842 2011-09-12 02:25:43Z eric $ +# Maintainer: +# Contributor: Sarah Hay +# Contributor: roberto + +pkgname=transcode +_sripver=0.3-4 +pkgver=1.1.5 +pkgrel=6 +pkgdesc="A video/DVD ripper and encoder for the terminal/console" +arch=('i686' 'x86_64') +url="http://tcforge.berlios.de/" +license=('GPL') +depends=('imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' + 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') +makedepends=('nasm') +options=('!libtool' '!makeflags') +source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2 + http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz + transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch) +md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' + 'c0bd49a88f667c68c4430ad25bbed510' + 'af4056b7530a6f147594f676849e7c7b' + 'c299cfc6c4be6a5512d1a129f04e5450') +sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' + 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' + '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' + '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 < ../transcode-1.1.5-jpeg-7.patch + patch -p1 < ../transcode-1.1.5-mpa.patch + + # building from here + ./configure --prefix=/usr \ + --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \ + --enable-lame --enable-ogg --enable-vorbis --enable-theora \ + --enable-libdv --enable-libxml2 --enable-v4l \ + --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \ + --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \ + --enable-xvid --enable-x264 --enable-alsa \ + --enable-libmpeg2 --enable-libmpeg2convert \ + --with-libxml2-prefix=/usr \ + --with-mjpegtools-prefix=/usr \ + --with-imagemagick-prefix=/usr \ + --with-libdv-includes=/usr \ + --with-libpostproc-includes=/usr/include/libpostproc \ + --with-ogg-prefix=/usr \ + --with-lame-libs=/usr \ + --with-lzo-libs=/usr/lib \ + --with-libavcodec-prefix=/usr \ + --with-libavcodec-includes=/usr/include \ + --with-libavcodec-libs=/usr/lib + + make + ############################################################################## + # this imports the latest subtitleripper sources and replaces the internal + mkdir contrib + mv "${srcdir}/subtitleripper" contrib/subrip + # removes dependency on libppm, make it dependend on netpbm just failed, argh... + cd contrib/subrip + sed -e 's|^\(.*lppm.*\)$|#\1|' \ + -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ + -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ + -i Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + cd contrib/subrip + install -m 755 pgm2txt "${pkgdir}/usr/bin/" + install -m 755 srttool "${pkgdir}/usr/bin/" + install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" + install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/" + install -m 755 vobsub2pgm "${pkgdir}/usr/bin/" +} diff --git a/staging/transcode/transcode-1.1.5-jpeg-7.patch b/staging/transcode/transcode-1.1.5-jpeg-7.patch new file mode 100644 index 000000000..288932a61 --- /dev/null +++ b/staging/transcode/transcode-1.1.5-jpeg-7.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/show_bug.cgi?id=294488 + +Patch by: Salah Coronya + +Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore. + +--- export/export_jpg.c ++++ export/export_jpg.c +@@ -91,6 +91,7 @@ + + jpeg_set_quality(&encinfo, quality, TRUE); + encinfo.raw_data_in = TRUE; ++ encinfo.do_fancy_downsampling = FALSE; + encinfo.in_color_space = JCS_YCbCr; + + encinfo.comp_info[0].h_samp_factor = 2; diff --git a/staging/transcode/transcode-1.1.5-mpa.patch b/staging/transcode/transcode-1.1.5-mpa.patch new file mode 100644 index 000000000..e7fb0fc1c --- /dev/null +++ b/staging/transcode/transcode-1.1.5-mpa.patch @@ -0,0 +1,10 @@ +--- transcode-1.1.5-old/export/aud_aux.c 2010-07-04 12:44:31.867550180 -0500 ++++ transcode-1.1.5/export/aud_aux.c 2010-07-04 13:41:01.253292529 -0500 +@@ -347,6 +347,7 @@ + //-- set parameters (bitrate, channels and sample-rate) -- + //-------------------------------------------------------- + memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all ++ mpa_ctx.codec_type = CODEC_TYPE_AUDIO; + mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. + mpa_ctx.channels = vob->dm_chan; // channels + mpa_ctx.sample_rate = vob->a_rate; diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD new file mode 100644 index 000000000..b2bb443c8 --- /dev/null +++ b/staging/xine-lib/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 137840 2011-09-12 01:59:41Z eric $ +# Maintainer: Eric Bélanger + +pkgname=xine-lib +pkgver=1.1.19 +pkgrel=5 +pkgdesc="A multimedia playback engine" +arch=('i686' 'x86_64') +url="http://www.xine-project.org" +license=('LGPL' 'GPL') +depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') +makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' + 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib') +optdepends=('imagemagick: for using the imagemagick plugin' \ + 'smbclient: for using the smb plugin' \ + 'jack: for using the jack plugin' \ + 'vcdimager: for using the vcd plugin' \ + 'gdk-pixbuf2: for using the gdk-pixbuf plugin' \ + 'mesa: for using the opengl plugin' \ + 'libpulse: for using the pulseaudio plugin' \ + 'speex: for using the speex plugin' \ + 'v4l-utils: for using the v4l plugin' \ + 'wavpack: for using the wavpack plugin' \ + 'faad2: for using the faad plugin' \ + 'libmng: for using the mng plugin' \ + 'aalib: for using the aalib plugin') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2 + xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch) +md5sums=('a410a0f0617e1d6309f0cbe907f73f8a' + '9776df4eb54d2f1f68d8268adbc3b5c2' + '8662fb124870b1dd7effe4ff5e2a2e3d') +sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0' + '121a8358d7919b2e51067412373f52848290338a' + '920bf27e6e3523dfe4cc9c802ff713e9688a3f34') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch + patch -p0 < ../xine-lib-1.1.19-xvmc.patch + sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \ + configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h + + libtoolize --force --copy + aclocal -I m4 + autoconf + automake --add-missing + + ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch new file mode 100644 index 000000000..4b6ba9e35 --- /dev/null +++ b/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch @@ -0,0 +1,13 @@ +--- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100 ++++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100 +@@ -161,10 +161,6 @@ + ;; + + esac +- if test x"$archopt_val" != x; then +- CFLAGS="$sarchopt=$archopt_val $CFLAGS" +- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS" +- fi + fi + else + dnl we have the Intel compiler diff --git a/staging/xine-lib/xine-lib-1.1.19-xvmc.patch b/staging/xine-lib/xine-lib-1.1.19-xvmc.patch new file mode 100644 index 000000000..bef8b0bac --- /dev/null +++ b/staging/xine-lib/xine-lib-1.1.19-xvmc.patch @@ -0,0 +1,17 @@ +Quoting ChangeLog of X11's videoproto package: +vldXvMC.h: stop uselessly including XvMClib.h + +--- src/video_out/xxmc.h ++++ src/video_out/xxmc.h +@@ -77,10 +77,10 @@ + #include + #include + #include ++#include + #ifdef HAVE_VLDXVMC + #include + #else +- #include + #include + #endif + -- cgit v1.2.3-54-g00ecf