diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-23 18:50:52 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-12-23 18:50:52 +0100 |
commit | c827b7e42ac7fb33713211b2fd7e0e5648fa1202 (patch) | |
tree | df393c5f417ee38fbf8766fc9a72d2187b9e74db /extra | |
parent | 974aa5156f1b16ee7a9369badf73021b2e1e5aa5 (diff) | |
parent | d4cde61aa9a5ccdde242a2bfe9eb7973a49acb49 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/fcitx/PKGBUILD
extra/graphite/PKGBUILD
extra/subversion/PKGBUILD
Diffstat (limited to 'extra')
-rw-r--r-- | extra/e_dbus/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/ecore/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/edje/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/eet/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/eeze/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/efreet/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/eina/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/eio/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/elementary/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/embryo/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/emotion/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/enlightenment17/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/ethumb/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/evas/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/evas_generic_loaders/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/exo/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch | 61 | ||||
-rw-r--r-- | extra/graphite/PKGBUILD | 22 | ||||
-rw-r--r-- | extra/harfbuzz/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libreoffice/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/serf/PKGBUILD | 27 | ||||
-rw-r--r-- | extra/subversion/PKGBUILD | 33 | ||||
-rw-r--r-- | extra/subversion/subversion-kwallet.patch | 22 |
23 files changed, 210 insertions, 84 deletions
diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD index 02b2ac1a7..f530373a7 100644 --- a/extra/e_dbus/PKGBUILD +++ b/extra/e_dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172972 2012-12-07 19:30:17Z ronald $ +# $Id: PKGBUILD 173760 2012-12-22 16:25:57Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=e_dbus -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="D-Bus integration with Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'dbus-core') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('1bd664721ea4910fb61cff3f4b16863ecdbd0772') +sha1sums=('1e17b6697502c85153e74ffaecbcb3410628063f') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD index 4ade54ed1..4b7da5fc4 100644 --- a/extra/ecore/PKGBUILD +++ b/extra/ecore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172964 2012-12-07 19:25:18Z ronald $ +# $Id: PKGBUILD 173752 2012-12-22 16:20:53Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ecore -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="OS abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst' makedepends=('subversion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('c6ee8092af99842631e49566f6be32b6149eaaca') +sha1sums=('673c3ef55b0482188b85f997af77bf8fb83791b5') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index 4f5655242..7399aa3e8 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173171 2012-12-12 00:31:43Z eric $ +# $Id: PKGBUILD 173756 2012-12-22 16:23:23Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=edje -pkgver=1.7.3 -pkgrel=2 +pkgver=1.7.4 +pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc') install=edje.install options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('7882ee5cdf67a53a543b06d27a9f06f833b1b5da') +sha1sums=('a5138ea6cf94a4219a542b571ef17cfc70b32711') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD index 70d7aa9cc..f8cf9f055 100644 --- a/extra/eet/PKGBUILD +++ b/extra/eet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172961 2012-12-07 19:23:17Z ronald $ +# $Id: PKGBUILD 173749 2012-12-22 16:18:57Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libjpeg>=7' 'openssl' 'eina') options=(!libtool) source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('42265eb508a17e3684a01429593da138da369718') +sha1sums=('ce4f05e180ce4a833d019fc618c7acd5aceca96d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD index cf143a109..05ca12764 100644 --- a/extra/eeze/PKGBUILD +++ b/extra/eeze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172966 2012-12-07 19:26:35Z ronald $ +# $Id: PKGBUILD 173754 2012-12-22 16:22:10Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eeze -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Manipulate devices using udev and sysfs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'eina' 'udev') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('3b3edfa7eed63f4b74184939578f16d866fa2bb2') +sha1sums=('95d333cc105c9c6285722cd0de26427c6585f986') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD index 85e883555..dda77cf67 100644 --- a/extra/efreet/PKGBUILD +++ b/extra/efreet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172971 2012-12-07 19:29:41Z ronald $ +# $Id: PKGBUILD 173759 2012-12-22 16:25:20Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=efreet -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="FreeDesktop.Org specifications for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('eina' 'ecore' 'e_dbus') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('3161ca46a1fed410340924f43ee773c52ff5e553') +sha1sums=('eac167d8cd9f7902a1884dd1633a4a06a5a4e4ef') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD index 79d5bea5d..6054b2702 100644 --- a/extra/eina/PKGBUILD +++ b/extra/eina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172960 2012-12-07 19:22:39Z ronald $ +# $Id: PKGBUILD 173748 2012-12-22 16:18:19Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="A core data structure and common utility library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b668b23cd0f88b0857a7b140eca645783b770108') +sha1sums=('7f98af625b4908fe941589ef5634b16fe897bd0e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD index d00dc09a2..645de65ab 100644 --- a/extra/eio/PKGBUILD +++ b/extra/eio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172965 2012-12-07 19:26:00Z ronald $ +# $Id: PKGBUILD 173753 2012-12-22 16:21:34Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eio -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Async IO library using Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('aaf54bfaee1ddae9bbff89da0178b56605df6048') +sha1sums=('67d03ddcc9d15a8510a59f8d63bb9f83a9317dc5') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index b300c82ad..c8242e03b 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172973 2012-12-07 19:30:53Z ronald $ +# $Id: PKGBUILD 173761 2012-12-22 16:26:33Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=elementary -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b7c3f346dbeb1d3ee43f140fd2a93384c20a92bb') +sha1sums=('1189c619b38444f48893c0be63cd0b03f18d640d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD index 7ba24de06..3b2660c5a 100644 --- a/extra/embryo/PKGBUILD +++ b/extra/embryo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172967 2012-12-07 19:27:09Z ronald $ +# $Id: PKGBUILD 173755 2012-12-22 16:22:44Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'eina') options=('!libtool') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('9850e01d65aeb724fa53e5d9d351cf94eb6957f5') +sha1sums=('f82ffaa0f2935c25e71dbdaf65885e55e114fe8e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD index ba5f1f076..f1f95e356 100644 --- a/extra/emotion/PKGBUILD +++ b/extra/emotion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172969 2012-12-07 19:28:30Z ronald $ +# $Id: PKGBUILD 173757 2012-12-22 16:24:05Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=emotion -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('gstreamer0.10' 'edje' 'eeze') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('9aebc9ee614e68b3ccb69e10f42ae2989d0d29a0') +sha1sums=('5bdd5512c3e6459f3d4f3effb5b4d3ea2b06bff8') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index 812428464..87d35704a 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 173313 2012-12-18 19:57:25Z ronald $ +# $Id: PKGBUILD 173762 2012-12-22 16:29:18Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.0omega -_pkgver=0.17.0-omega +pkgver=0.17.0 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') @@ -19,15 +18,15 @@ provides=('notification-daemon' 'e') backup=('etc/enlightenment/sysactions.conf') options=('!libtool' '!emptydirs') install=enlightenment17.install -source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz +source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('4c94f470d74133ebf2a5254683d0510bf3ece55f' +sha1sums=('be8228200c1a7caeba914ae77927bda62e3a1776' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') build() { - cd "$srcdir/$_pkgname-$_pkgver" + cd "$srcdir/$_pkgname-$pkgver" export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" @@ -63,7 +62,7 @@ build() { } package() { - cd $srcdir/$_pkgname-$_pkgver + cd $srcdir/$_pkgname-$pkgver make DESTDIR=$pkgdir install diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD index 8a4ed56ae..242788dcf 100644 --- a/extra/ethumb/PKGBUILD +++ b/extra/ethumb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172970 2012-12-07 19:29:06Z ronald $ +# $Id: PKGBUILD 173758 2012-12-22 16:24:44Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ethumb -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Thumbnailing library and D-Bus service using EFL" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libexif' 'e_dbus' 'emotion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('decee66729d0deccb4f836967c4492172a8d3875') +sha1sums=('65110fe9e0aa10a10855dd3a5adb80a38e445222') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index fb7ca9d5d..268b64545 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172963 2012-12-07 19:24:28Z ronald $ +# $Id: PKGBUILD 173751 2012-12-22 16:20:08Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa' optdepends=("evas_generic_loaders") options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('ffa9b12d34e801112cf081a3c024eca5ef86ed8a') +sha1sums=('d9d081d5ff44d3cebc5790a5edb47bd4092856ee') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index 554fb0d69..d62668461 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172962 2012-12-07 19:23:53Z ronald $ +# $Id: PKGBUILD 173750 2012-12-22 16:19:33Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('2aeee66f9f6ce8a2a7daf0eebf75681f0e89730d') +sha1sums=('e40a1976374448c6918378130b0efacb3358b1f5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index d70b1aa6e..f5d868ff6 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,27 +1,33 @@ -# $Id: PKGBUILD 173049 2012-12-09 18:14:06Z foutrelis $ +# $Id: PKGBUILD 173786 2012-12-22 22:26:11Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=exo pkgver=0.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" license=('GPL2' 'LGPL') groups=('xfce4') depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' ) -makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth') +makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth' 'xfce4-dev-tools') optdepends=('perl-uri: for mail-compose helper script') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896') +source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2 + drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch) +sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896' + '9983b3206391f0e86816d70ded4fc5ddd48ac27dd29b266d4ba4a930ca663626') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix launching of .desktop files (https://bugs.archlinux.org/task/33125) + patch -Np1 -i "$srcdir/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch" + NOCONFIGURE=1 xdt-autogen + # Python 2 fix export PYTHON=python2 diff --git a/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch b/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch new file mode 100644 index 000000000..a9edca3d7 --- /dev/null +++ b/extra/exo/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch @@ -0,0 +1,61 @@ +From a54bc42cb5f06f06141d8ed2434719bf7c200aaf Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Sun, 23 Dec 2012 00:09:34 +0200 +Subject: [PATCH] Drop HAVE_GIO_UNIX ifdef and load gio-unix-2.0 pkg + +This restores exo-open's .desktop file launching functionality. +--- + configure.ac.in | 1 + + exo-open/main.c | 9 --------- + 2 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 0c8b3a1..ec9be67 100644 +--- a/configure.ac.in ++++ b/configure.ac +@@ -159,6 +159,7 @@ dnl *** Check for required packages *** + dnl *********************************** + XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) + XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0]) ++XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0]) + XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) + XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) +diff --git a/exo-open/main.c b/exo-open/main.c +index 059fad4..da78f6a 100644 +--- a/exo-open/main.c ++++ b/exo-open/main.c +@@ -32,9 +32,7 @@ + + #include <glib/gstdio.h> + #include <gio/gio.h> +-#ifdef HAVE_GIO_UNIX + #include <gio/gdesktopappinfo.h> +-#endif + #include <exo/exo.h> + + +@@ -143,7 +141,6 @@ usage (void) + static gboolean + exo_open_launch_desktop_file (const gchar *arg) + { +-#ifdef HAVE_GIO_UNIX + GFile *gfile; + gchar *contents; + gsize length; +@@ -191,12 +188,6 @@ exo_open_launch_desktop_file (const gchar *arg) + #endif + + return result; +-#else /* !HAVE_GIO_UNIX */ +- g_critical (_("Launching desktop files is not supported when %s is compiled " +- "without GIO-Unix features."), g_get_prgname ()); +- +- return FALSE; +-#endif + } + + +-- +1.8.0.2 + diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index d27b87d9a..5e504f972 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,31 +1,37 @@ -# $Id: PKGBUILD 142675 2011-11-12 18:27:50Z ibiru $ +# $Id: PKGBUILD 173763 2012-12-22 16:44:26Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.0.3 -pkgrel=1.1 +pkgver=1.2.0 +pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') -url="http://graphite.sil.org/" +url="http://projects.palaso.org/projects/graphitedev" pkgdesc='reimplementation of the SIL Graphite text processing engine' -license=('custom_SIL Dual license') +license=('LGPL' 'GPL' 'custom') depends=('gcc-libs') -makedepends=('cmake' 'freetype2') +makedepends=('cmake' 'freetype2' 'python2') +# 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly options=('!libtool' '!emptydirs') source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") -md5sums=('3bf481ca95109b14435125c0dd1f2217') +md5sums=('f5ef3f7f10fa8c3542c6a085a233080b') build() { cd "${srcdir}" + sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py} mkdir build cd build cmake -G "Unix Makefiles" ../graphite2-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DGRAPHITE2_COMPARE_RENDERER=OFF make + make docs } check() { cd "${srcdir}"/build + sed -i "s:python:python2:g" tests/CTestTestfile.cmake ctest } diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index c531090ac..c1ec92531 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 173026 2012-12-08 21:00:09Z heftig $ +# $Id: PKGBUILD 173764 2012-12-22 16:44:27Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=harfbuzz pkgver=0.9.9 -pkgrel=1 +pkgrel=2 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" license=('MIT') -depends=('icu' 'glib2' 'freetype2' 'graphite') +depends=('icu' 'glib2' 'freetype2' 'graphite>=1.2.0') makedepends=('icu' 'cairo' 'glib2' 'freetype2') optdepends=('cairo: hb-view program') options=(!libtool) diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 6ef1f4fb4..3df07831f 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 173675 2012-12-20 19:05:46Z andyrtr $ +# $Id: PKGBUILD 173765 2012-12-22 16:44:33Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -26,7 +26,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=3.6.4.3 pkgver=3.6.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -38,7 +38,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite>=1.2.0' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -275,7 +275,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1.1" 'clucene' 'lcms2' + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite>=1.2.0' "icu>=50.1.1" 'clucene' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD new file mode 100644 index 000000000..4dc7caa81 --- /dev/null +++ b/extra/serf/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 173790 2012-12-23 03:50:15Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +pkgname=serf +pkgver=1.1.1 +pkgrel=1 +pkgdesc="High-performance asynchronous HTTP client library" +url="http://code.google.com/p/serf/" +arch=('i686' 'x86_64') +license=('Apache') +depends=('apr' 'apr-util' 'openssl' 'zlib') +source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('1ec4689ef57e7c28e7371df00d0ccc3e32ef6457') +options=('!libtool') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr --with-openssl=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + rm "${pkgdir}"/usr/lib/libserf-1.a +} diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 3ca41dae4..5ce8be215 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 170250 2012-11-06 11:27:11Z stephane $ +# $Id: PKGBUILD 173791 2012-12-23 03:50:49Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.7 -pkgrel=2 +pkgver=1.7.8 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file') +depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' @@ -28,35 +28,40 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve.conf svnserve.tmpfiles svnserve.service - subversion-1.7.6-kwallet-gcc47.patch + subversion-kwallet.patch subversion.rpath.fix.patch) -sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951' - '3df83e46277f0f08868236a6b6e6c0f0d7ef9278' +sha1sums=('12c7d8d5414bba74c9777c4d1dae74f152df63c2' + '24f8e82fa131c1a1b924d71046f8d38cb00645a7' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' '9f6790d842cf3e0228b007483a43e39a42724068' - 'aa0d01e606de2ebc5eed9c533d218d37a217c50c' + 'f2aed28a2e34b8631ee9b69175bac1bac59327ce' '3d1e28408a9abb42af2e531adc0d01ce21acfad6') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 - patch -p0 -i ../subversion.rpath.fix.patch + patch -Np0 -i ../subversion.rpath.fix.patch sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch + + # FS#33081 + patch -Np0 -i ../subversion-kwallet.patch if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --disable-javahl --with-gnome-keyring --with-kwallet + --disable-javahl --with-gnome-keyring --with-kwallet \ + --disable-static else ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-apxs \ - --enable-javahl --with-gnome-keyring --with-kwallet + --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ + --enable-javahl --with-gnome-keyring --with-kwallet \ + --disable-static fi make external-all diff --git a/extra/subversion/subversion-kwallet.patch b/extra/subversion/subversion-kwallet.patch new file mode 100644 index 000000000..d2bf17101 --- /dev/null +++ b/extra/subversion/subversion-kwallet.patch @@ -0,0 +1,22 @@ +Index: subversion/libsvn_auth_kwallet/kwallet.cpp +=================================================================== +--- subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1421011) ++++ subversion/libsvn_auth_kwallet/kwallet.cpp (working copy) +@@ -253,7 +253,7 @@ kwallet_password_get(svn_boolean_t *done, + } + } + +- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); ++ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); + + return SVN_NO_ERROR; + } +@@ -327,7 +327,7 @@ kwallet_password_set(svn_boolean_t *done, + } + } + +- apr_pool_cleanup_register(pool, parameters, kwallet_terminate, NULL); ++ apr_pool_cleanup_register(pool, parameters, kwallet_terminate, apr_pool_cleanup_null); + + return SVN_NO_ERROR; + }
\ No newline at end of file |