From ed51a8c1611ffa602f5f9628c858f6edbc218fc8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 7 Sep 2012 00:03:53 +0000 Subject: Fri Sep 7 00:03:53 UTC 2012 --- gnome-unstable/at-spi2-atk/PKGBUILD | 6 ++-- gnome-unstable/at-spi2-core/PKGBUILD | 6 ++-- gnome-unstable/atk/PKGBUILD | 6 ++-- gnome-unstable/glib2/PKGBUILD | 6 ++-- gnome-unstable/gobject-introspection/PKGBUILD | 6 ++-- gnome-unstable/gtk3/PKGBUILD | 42 +++++++++++++++++++++++++++ gnome-unstable/gtk3/gtk3.install | 16 ++++++++++ gnome-unstable/gtk3/settings.ini | 2 ++ gnome-unstable/gtk3/wacom.patch | 12 ++++++++ gnome-unstable/harfbuzz/PKGBUILD | 29 ++++++++++++++++++ gnome-unstable/pango/PKGBUILD | 30 +++++++++++++++++++ gnome-unstable/pango/pango.install | 21 ++++++++++++++ 12 files changed, 167 insertions(+), 15 deletions(-) create mode 100644 gnome-unstable/gtk3/PKGBUILD create mode 100644 gnome-unstable/gtk3/gtk3.install create mode 100644 gnome-unstable/gtk3/settings.ini create mode 100644 gnome-unstable/gtk3/wacom.patch create mode 100644 gnome-unstable/harfbuzz/PKGBUILD create mode 100644 gnome-unstable/pango/PKGBUILD create mode 100644 gnome-unstable/pango/pango.install (limited to 'gnome-unstable') diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD index 064730448..d8166dc4f 100644 --- a/gnome-unstable/at-spi2-atk/PKGBUILD +++ b/gnome-unstable/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165756 2012-08-29 12:54:52Z jgc $ +# $Id: PKGBUILD 166313 2012-09-05 21:38:40Z jgc $ # Maintainer: Ionut Biru pkgname=at-spi2-atk -pkgver=2.5.90 +pkgver=2.5.91 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('373c46988fca380e36530c554bea470e05a2aa311292ee134746f856c5baf57e') +sha256sums=('0eeb0ca540c171aa44586c59db52dccb443e4d80acbba719ff6d599350da2c54') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD index df54a00c9..79cb9b14e 100644 --- a/gnome-unstable/at-spi2-core/PKGBUILD +++ b/gnome-unstable/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165752 2012-08-29 12:07:43Z jgc $ +# $Id: PKGBUILD 166311 2012-09-05 21:32:53Z jgc $ # Maintainer: Ionut Biru pkgname=at-spi2-core -pkgver=2.5.5 +pkgver=2.5.91 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9b4cd2d8abec1680c635c07e8b28144d2c3f07c5c3abad1a02a84015ea3dca25') +sha256sums=('bb7a9a0a3daa95c2c95bef0390623f724e3ecb87710805d0b88e923010bbdff1') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/atk/PKGBUILD b/gnome-unstable/atk/PKGBUILD index 0b6d74640..0c4433192 100644 --- a/gnome-unstable/atk/PKGBUILD +++ b/gnome-unstable/atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165747 2012-08-29 11:56:13Z jgc $ +# $Id: PKGBUILD 166309 2012-09-05 21:23:58Z jgc $ # Maintainer: Jan de Groot pkgname=atk -pkgver=2.5.4 +pkgver=2.5.91 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) url='http://www.gtk.org/' -sha256sums=('af6d6d8ec4543f338bf2476974de69891b7419913dd1cf4a94d53696bcc14aab') +sha256sums=('0b4e2a436a8f17730c1e7d11e42b53b0ef2a18a00c6067524d34e2c0a6b5bbbe') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/glib2/PKGBUILD b/gnome-unstable/glib2/PKGBUILD index 77d416a11..240eddf37 100644 --- a/gnome-unstable/glib2/PKGBUILD +++ b/gnome-unstable/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165744 2012-08-29 11:46:05Z jgc $ +# $Id: PKGBUILD 166301 2012-09-05 19:51:18Z jgc $ # Maintainer: Jan de Groot pkgname=glib2 -pkgver=2.33.10 +pkgver=2.33.12 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -16,7 +16,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.ta glib2.sh glib2.csh revert-warn-glib-compile-schemas.patch) -sha256sums=('6caf18eb963aa2c3c7c0dc63201021bc29e7972c60d191f566e8971af77e9505' +sha256sums=('a97dfd3fd36bcdc26f6726cbbcd3bc2353028a7ecd5dbe7ab3a4dc80d672a2e9' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') diff --git a/gnome-unstable/gobject-introspection/PKGBUILD b/gnome-unstable/gobject-introspection/PKGBUILD index 039beeb78..71d453354 100644 --- a/gnome-unstable/gobject-introspection/PKGBUILD +++ b/gnome-unstable/gobject-introspection/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165750 2012-08-29 12:01:00Z jgc $ +# $Id: PKGBUILD 166305 2012-09-05 20:36:25Z jgc $ # Maintainer: Jan de Groot pkgname=gobject-introspection -pkgver=1.33.9 +pkgver=1.33.10 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://live.gnome.org/GObjectIntrospection" @@ -12,7 +12,7 @@ depends=('glib2' 'python2') makedepends=('cairo') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4d8283bcbf30f78e13e2d085a8be9a41a8b197a22ad48dc913e6ea7bec3fe8b0') +sha256sums=('b000d5a6edeeff11040e07a733b31725feffdc9ff73a10862ede911c868ffdd7') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD new file mode 100644 index 000000000..be5c21b17 --- /dev/null +++ b/gnome-unstable/gtk3/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 166315 2012-09-05 21:51:12Z jgc $ +# Maintainer: Ionut Biru + +pkgname=gtk3 +pkgver=3.5.16 +pkgrel=1 +pkgdesc="GObject-based multi-platform GUI toolkit (v3)" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +install=gtk3.install +depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk') +makedepends=('gobject-introspection') +options=('!libtool') +backup=(etc/gtk-3.0/settings.ini) +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz + settings.ini wacom.patch) +sha256sums=('de013edc80684393487f893ff42003c692746df50783b54f6c0aa560ae43c1ae' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') +build() { + cd "gtk+-$pkgver" + + # Partially revert BGO#673440 in order to fix BGO#674157 + patch -Np1 -i ../wacom.patch + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-gtk2-dependency \ + --disable-schemas-compile + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd "gtk+-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" +} diff --git a/gnome-unstable/gtk3/gtk3.install b/gnome-unstable/gtk3/gtk3.install new file mode 100644 index 000000000..ca20d2865 --- /dev/null +++ b/gnome-unstable/gtk3/gtk3.install @@ -0,0 +1,16 @@ +post_install() { + /usr/bin/gtk-query-immodules-3.0 --update-cache + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache +} + +post_remove() { + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/gtk3/settings.ini b/gnome-unstable/gtk3/settings.ini new file mode 100644 index 000000000..039000d38 --- /dev/null +++ b/gnome-unstable/gtk3/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-fallback-icon-theme = gnome diff --git a/gnome-unstable/gtk3/wacom.patch b/gnome-unstable/gtk3/wacom.patch new file mode 100644 index 000000000..79ad84fc6 --- /dev/null +++ b/gnome-unstable/gtk3/wacom.patch @@ -0,0 +1,12 @@ +diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c +--- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c 2012-05-02 14:45:04.000000000 +0200 ++++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c 2012-05-03 18:34:18.034807644 +0200 +@@ -331,6 +331,8 @@ + input_source = GDK_SOURCE_ERASER; + else if (strstr (tmp_name, "cursor")) + input_source = GDK_SOURCE_CURSOR; ++ else if (strstr (tmp_name, "finger")) ++ input_source = GDK_SOURCE_TOUCHSCREEN; + else if (strstr (tmp_name, "wacom") || + strstr (tmp_name, "pen")) + input_source = GDK_SOURCE_PEN; diff --git a/gnome-unstable/harfbuzz/PKGBUILD b/gnome-unstable/harfbuzz/PKGBUILD new file mode 100644 index 000000000..3ceed5738 --- /dev/null +++ b/gnome-unstable/harfbuzz/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Jan de Groot + +pkgname=harfbuzz +pkgver=0.9.4 +pkgrel=1 +pkgdesc="OpenType text shaping engine." +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/HarfBuzz" +license=('MIT') +depends=('icu' 'glib2' 'freetype2') +makedepends=('icu' 'cairo' 'glib2' 'freetype2') +optdepends=('cairo: hb-view program') +options=(!libtool) +source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/harfbuzz/COPYING" +} diff --git a/gnome-unstable/pango/PKGBUILD b/gnome-unstable/pango/PKGBUILD new file mode 100644 index 000000000..0826ef16b --- /dev/null +++ b/gnome-unstable/pango/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 166307 2012-09-05 21:16:30Z jgc $ +# Maintainer: Jan de Groot + +pkgname=pango +pkgver=1.31.1 +pkgrel=1 +pkgdesc="A library for layout and rendering of text" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('libthai' 'cairo' 'libxft' 'harfbuzz') +makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection') +options=('!libtool') +install=pango.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) +url="http://www.pango.org/" +sha256sums=('b87ecdde5bf6f9a407162155edbba452923e79f86bcf8a09d6ca1916222c9f81') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-included-modules=basic-fc + make +} + +package() { + cd ${pkgname}-${pkgver} + make -j1 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/pango" +} diff --git a/gnome-unstable/pango/pango.install b/gnome-unstable/pango/pango.install new file mode 100644 index 000000000..73b0f5bf1 --- /dev/null +++ b/gnome-unstable/pango/pango.install @@ -0,0 +1,21 @@ +# arg 1: the new package version +post_install() { + # we need to ldconfig first, in case xfree86's libs aren't + # in ld.so.cache yet + sbin/ldconfig -r . + usr/bin/pango-querymodules >etc/pango/pango.modules +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ -f usr/etc/pango/pango.modules ]; then + rm usr/etc/pango/pango.modules + fi + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + rm etc/pango/pango.modules +} -- cgit v1.2.3-54-g00ecf From c85b504e8916411d424cd3fc654ff879237d529e Mon Sep 17 00:00:00 2001 From: root Date: Sat, 8 Sep 2012 00:04:17 +0000 Subject: Sat Sep 8 00:04:17 UTC 2012 --- community/geos/PKGBUILD | 7 +- community/geos/geos.changelog | 2 + community/qlandkartegt/PKGBUILD | 6 +- community/qlandkartegt/qlandkartegt.changelog | 3 + community/skrooge/PKGBUILD | 6 +- community/skrooge/skrooge.changelog | 3 + community/zathura/PKGBUILD | 5 +- core/iw/PKGBUILD | 6 +- core/less/PKGBUILD | 10 +- extra/ebook-tools/PKGBUILD | 8 +- extra/fontconfig/PKGBUILD | 45 +- extra/fontconfig/fontconfig.install | 101 +--- extra/fping/PKGBUILD | 6 +- extra/icedtea-web-java7/PKGBUILD | 31 +- extra/icedtea-web/PKGBUILD | 32 +- extra/kwebkitpart/PKGBUILD | 8 +- extra/mysql/PKGBUILD | 6 +- extra/qscintilla/PKGBUILD | 9 +- extra/sbc/PKGBUILD | 25 + extra/swt/PKGBUILD | 6 +- extra/tomcat-native/PKGBUILD | 4 +- extra/vim/PKGBUILD | 14 +- extra/xchm/PKGBUILD | 8 +- extra/xchm/xchm.install | 4 +- gnome-unstable/clutter/PKGBUILD | 28 ++ gnome-unstable/gcr/PKGBUILD | 33 ++ gnome-unstable/gcr/gcr.install | 14 + gnome-unstable/gjs/PKGBUILD | 26 ++ gnome-unstable/json-glib/PKGBUILD | 31 ++ gnome-unstable/polkit/PKGBUILD | 39 ++ gnome-unstable/polkit/autogen.sh | 123 +++++ gnome-unstable/polkit/logind+ConsoleKit.patch | 638 ++++++++++++++++++++++++++ gnome-unstable/polkit/polkit.install | 18 + gnome-unstable/polkit/polkit.pam | 7 + libre/cups-filters-libre/PKGBUILD | 10 +- libre/kdebase-konqueror-libre/PKGBUILD | 6 +- libre/kdebase-runtime-libre/PKGBUILD | 6 +- libre/kdelibs-libre/PKGBUILD | 8 +- libre/kdenetwork-kopete-libre/PKGBUILD | 6 +- libre/kdeutils-ark-libre/PKGBUILD | 6 +- libre/tp_smapi-libre/PKGBUILD | 63 +++ libre/tp_smapi-libre/tp_smapi.install | 13 + pcr/mesa-git/PKGBUILD | 503 ++++++++++++-------- testing/libmpc/PKGBUILD | 9 +- 44 files changed, 1558 insertions(+), 384 deletions(-) create mode 100644 community/geos/geos.changelog create mode 100644 extra/sbc/PKGBUILD create mode 100644 gnome-unstable/clutter/PKGBUILD create mode 100644 gnome-unstable/gcr/PKGBUILD create mode 100644 gnome-unstable/gcr/gcr.install create mode 100644 gnome-unstable/gjs/PKGBUILD create mode 100644 gnome-unstable/json-glib/PKGBUILD create mode 100644 gnome-unstable/polkit/PKGBUILD create mode 100755 gnome-unstable/polkit/autogen.sh create mode 100644 gnome-unstable/polkit/logind+ConsoleKit.patch create mode 100644 gnome-unstable/polkit/polkit.install create mode 100644 gnome-unstable/polkit/polkit.pam create mode 100644 libre/tp_smapi-libre/PKGBUILD create mode 100644 libre/tp_smapi-libre/tp_smapi.install (limited to 'gnome-unstable') diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD index be7875459..7266aabe3 100644 --- a/community/geos/PKGBUILD +++ b/community/geos/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71674 2012-05-31 23:36:16Z jlichtblau $ +# $Id: PKGBUILD 75948 2012-09-06 19:45:39Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea # Contributor: Alexander Rødseth pkgname=geos -pkgver=3.3.4 +pkgver=3.3.5 pkgrel=1 pkgdesc="C++ port of the Java Topology Suite" arch=('x86_64' 'i686') @@ -13,8 +13,9 @@ url="http://trac.osgeo.org/geos/" license=('LGPL') depends=('gcc-libs' 'bash') options=('!libtool' '!emptydirs') +changelog=$pkgname.changelog source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('cd5400aa5f3fe32246dfed5d238c5017e1808162c865c016480b3e6c07271904') +sha256sums=('3b513fbe2d155364d61e76d9c250d6d8e75b5166783a233596c744373cb5874f') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/geos/geos.changelog b/community/geos/geos.changelog new file mode 100644 index 000000000..ea7b3b411 --- /dev/null +++ b/community/geos/geos.changelog @@ -0,0 +1,2 @@ +2012-09-06 Jaroslav Lichtblau + * geos 3.3.5-1 diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 49fbff6b5..7ee43a4d0 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73400 2012-07-07 07:56:30Z jlichtblau $ +# $Id: PKGBUILD 75950 2012-09-06 20:00:35Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: Matthias Maennich # Contributor: pkgname=qlandkartegt -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('439137d4864217c350678d8357c07a0f80455f2cff35a736dd6b58a2d3d683b4' +sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index abf10ce78..47c05ab04 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2012-09-06 Jaroslav Lichtblau + * qlandkartegt 1.5.1-1 + 2012-07-07 Jaroslav Lichtblau * qlandkartegt 1.5.0-1 diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index 15c721641..20a00cb2a 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75731 2012-08-29 20:24:22Z jlichtblau $ +# $Id: PKGBUILD 75946 2012-09-06 19:40:02Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: Ray Rashif # Contributor: Andrea Scarpino # Contributor: neuromante pkgname=skrooge -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'docbook-xsl') install=$pkgname.install changelog=$pkgname.changelog source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('d96cd0ac7d503e22ae809f4646ad6008818485804c4569adbddcfd5e953743a2') +sha256sums=('251ffca5ad8e3696901fb29df2714fcb30541fe9e3107b9de2c2cb9f6b47cee9') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog index f866264c2..9c6ad4384 100644 --- a/community/skrooge/skrooge.changelog +++ b/community/skrooge/skrooge.changelog @@ -1,3 +1,6 @@ +2012-09-06 Jaroslav Lichtblau + * skrooge 1.3.3-1 + 2012-08-29 Jaroslav Lichtblau * skrooge 1.3.2-1 diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index 4fc673922..38c71a492 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75892 2012-09-05 01:14:27Z dwallace $ +# $Id: PKGBUILD 75944 2012-09-06 14:39:06Z dwallace $ # Maintainer: Daniel Wallace # Maintainer: Sergej Pupykin # Contributor: ML pkgname=zathura pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="a document viewer" arch=('i686' 'x86_64') url="http://pwmt.org/projects/zathura/" @@ -21,6 +21,7 @@ md5sums=('2b606a5db61c80b0f1208e9f1df468c2' build() { cd $srcdir/zathura-$pkgver + sed -i 's/rst2man/&2/' config.mk make ZATHURA_GTK_VERSION=2 } diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index 189ef3e55..73f18b65a 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164233 2012-07-28 01:51:21Z eric $ +# $Id: PKGBUILD 166323 2012-09-06 08:36:59Z thomas $ # Maintainer: Thomas Bächler pkgname=iw -pkgver=3.4 +pkgver=3.6 pkgrel=1 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") @@ -11,7 +11,7 @@ license=("GPL") depends=("libnl") makedepends=("linux-api-headers") source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('989b5677588e32de6eda97bf978810b366a7620f78f26f9cc61c15bdb434218a') +sha256sums=('df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD index 4b1289429..36a8ebf50 100644 --- a/core/less/PKGBUILD +++ b/core/less/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149934 2012-02-11 23:29:36Z allan $ +# $Id: PKGBUILD 166324 2012-09-06 11:47:33Z allan $ # Maintainer: Allan McRae # Contributor: judd pkgname=less -pkgver=444 -pkgrel=3 +pkgver=451 +pkgrel=1 pkgdesc="A terminal based program for viewing text files" license=('GPL3') arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ url="http://www.greenwoodsoftware.com/less" groups=('base') depends=('ncurses' 'pcre') source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('56f9f76ffe13f70155f47f6b3c87d421' - 'd5fafbd94a9cfdeaad0c82143a033fe5') +md5sums=('765f082658002b2b46b86af4a0da1842' + 'a5493f4598ba7c9f81782683f3c27119') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD index 812beb3af..439163598 100644 --- a/extra/ebook-tools/PKGBUILD +++ b/extra/ebook-tools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143766 2011-11-29 01:07:45Z giovanni $ +# $Id: PKGBUILD 166337 2012-09-06 15:49:53Z giovanni $ # Maintainer: Giovanni Scafora pkgname=ebook-tools -pkgver=0.2.1 -pkgrel=4 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Tools for accessing and converting various ebook file formats" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/ebook-tools/" @@ -11,7 +11,7 @@ license=('custom') depends=('libzip' 'libxml2' 'convertlit') makedepends=('pkgconfig' 'cmake') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('cabbd2ef9148a61ca5f6e60ca63e6045') +md5sums=('67bce67ceb72dcc3578d6a81ef92b29b') build() { cd "${srcdir}" diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 7f6a2ca12..f69861820 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 150857 2012-02-23 13:01:06Z ibiru $ +# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $ # Maintainer: Jan de Groot + pkgname=fontconfig -pkgver=2.8.0 +pkgver=2.10.1 pkgrel=2 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) @@ -11,27 +12,43 @@ depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz - 29-replace-bitmap-fonts.conf - 30-urw-aliases.patch) -md5sums=('77e15a92006ddc2adbb06f840d591c0e' - 'f6b67e8cc79197ed6abd4701911e83da' - '51bc6cb633b50f3c28793361738aac5b') + 29-replace-bitmap-fonts.conf) +md5sums=('c94e380eea42f2f23ca9537035ef1899' + 'f6b67e8cc79197ed6abd4701911e83da') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/30-urw-aliases.patch" - # enable Position Independent Code for prelinking - export CFLAGS="$CFLAGS -fPIC" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + + # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well + libtoolize -f + autoreconf -f + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-templatedir=/etc/fonts/conf.avail \ + --with-xmldir=/etc/fonts \ + --localstatedir=/var \ + --disable-static \ + --with-default-fonts=/usr/share/fonts \ + --with-add-fonts=/usr/share/fonts make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -m644 "$srcdir/29-replace-bitmap-fonts.conf" \ - "$pkgdir/etc/fonts/conf.avail" - rm -f "$pkgdir"/etc/fonts/conf.d/*.conf + + # not upstream, not in FC and not in Gentoo, this should probably go upstream + # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back + install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail" + pushd $pkgdir/etc/fonts/conf.d + ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf . + popd #Install license install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" diff --git a/extra/fontconfig/fontconfig.install b/extra/fontconfig/fontconfig.install index 20feb6e52..3a0ca573b 100644 --- a/extra/fontconfig/fontconfig.install +++ b/extra/fontconfig/fontconfig.install @@ -1,100 +1,39 @@ -configs=('20-fix-globaladvance.conf' - '20-unhint-small-vera.conf' - '29-replace-bitmap-fonts.conf' - '30-metric-aliases.conf' - '30-urw-aliases.conf' - '40-nonlatin.conf' - '45-latin.conf' - '49-sansserif.conf' - '50-user.conf' - '51-local.conf' - '60-latin.conf' - '65-fonts-persian.conf' - '65-nonlatin.conf' - '69-unifont.conf' - '80-delicious.conf' - '90-synthetic.conf') - post_install() { - echo -n "updating font cache... " - /sbin/ldconfig -r . - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - ln -sf ../conf.avail/${config} . - done - popd > /dev/null - /usr/bin/fc-cache -f - echo "done." -} - -post_upgrade() { - rm -f /etc/fonts/conf.d/10-bitmaps.conf cat << _EOF - -===> Important Fontconfig configuration change <=== - - The way fontconfig is configured has been changed. - Configuration is done via /etc/fonts/conf.avail and conf.d. + + Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d. Read /etc/fonts/conf.d/README for more information. Configuration via /etc/fonts/local.conf is still possible, but is no longer recommended for options available in conf.avail. -_EOF - - if [ `vercmp 2.4.1-1 $2` -gt 0 ]; then - # Upgrade from old version, place all symlinks. pre-symlink package version - echo -n "Linking configuration files... " - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - ln -sf ../conf.avail/${config} . - done - popd > /dev/null - echo "done." - fi + Main systemwide configuration should be done by symlinks + (especially for autohinting, sub-pixel and lcdfilter): + + cd /etc/fonts/conf.d + ln -s ../conf.avail/XX-foo.conf + + Check also https://wiki.archlinux.org/index.php/Font_Configuration + and https://wiki.archlinux.org/index.php/Fonts. - if [ `vercmp 2.6.0-1 $2` -gt 0 ]; then - # pre-2.6.0 versions have missing config - echo -n "Adding missing configuration files... " - pushd /etc/fonts/conf.d > /dev/null - ln -sf ../conf.avail/30-metric-aliases.conf . - ln -sf ../conf.avail/40-nonlatin.conf . - ln -sf ../conf.avail/45-latin.conf . - popd > /dev/null - echo "done." - fi +_EOF - # Remove dead links - echo -n "Removing outdated configuration files... " - for config in /etc/fonts/conf.d/*; do - if [ ! -f ${config} ]; then - rm -f ${config} - fi - done - echo "done." - echo -n "updating font cache... " /usr/bin/fc-cache -f echo "done." } -pre_upgrade() { - # Link new config files not present on system yet - echo -n "Symlinking new configuration files... " - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - if [ ! -f ../conf.avail/${config} ]; then - ln -sf ../conf.avail/${config} . - fi - done - popd > /dev/null +post_upgrade() { + echo -n "updating font cache... " + /usr/bin/fc-cache -f echo "done." } post_remove() { - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - rm -f ${config} - done - popd > /dev/null + cat << _EOF + + Check for dead symlinks and leftover files + in /etc/fonts/conf.d/ + +_EOF } diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index 0383b1d05..01300dc14 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165451 2012-08-20 08:01:40Z giovanni $ +# $Id: PKGBUILD 166333 2012-09-06 15:45:17Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Tom Newsom pkgname=fping -pkgver=3.3 +pkgver=3.4 pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('3260bdc49e72ccc9dc63b1e2fb02eae5') +md5sums=('a4bc97804e630dbf26dfac8f28c78091') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 415e603af..39bd6c1cb 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,32 +3,33 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz - fix_firefox_crash.diff) -sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6' - '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3') +makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) +sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk build() { - cd "${srcdir}"/icedtea-web* - - # fix firefox crash - https://bugs.archlinux.org/task/30969 - patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff - - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh + # extract it + cd "$srcdir" + LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz + cd "${srcdir}"/icedtea-web* ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ - --with-jdk-home=${_jvmdir} + --with-jdk-home=${_jvmdir} \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany \ + --with-gtk=2 make } diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 1d90a13db..0d1537aba 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 164729 2012-08-04 08:45:39Z andyrtr $ +# $Id: PKGBUILD 166335 2012-09-06 15:46:37Z andyrtr $ # Maintainer: Andreas Radke pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz - fix_firefox_crash.diff) -sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6' - '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3') +makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +noextract=$pkgname-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) +sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f') _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk build() { - cd "$srcdir/$pkgname-$pkgver" + # extract it + cd "$srcdir" + LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/$pkgname-$pkgver.tar.gz - # fix firefox crash - https://bugs.archlinux.org/task/30969 - patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff - - ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ - --datarootdir=/usr/share + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=${_jvmdir} \ + --datarootdir=/usr/share \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany \ + --with-gtk=2 make } diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index 9ecc4d9c7..1a2185e75 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163018 2012-07-05 19:22:35Z andrea $ +# $Id: PKGBUILD 166348 2012-09-06 20:40:12Z andrea $ # Maintainer: Andrea Scarpino pkgname=kwebkitpart -pkgver=1.2.0.20120705 +pkgver=1.3.0 pkgrel=1 pkgdesc="A WebKit browser component for KDE" url="http://opendesktop.org/content/show.php?content=127960" @@ -11,8 +11,8 @@ license=('LGPL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('659f9737bcc79f0bfbd08ff37ad0e232') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('27f72c8044fc798add9f4cbf9c799154') build() { cd "${srcdir}" diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 973985940..f68f66b5d 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165439 2012-08-19 15:29:10Z andrea $ +# $Id: PKGBUILD 166364 2012-09-06 22:13:20Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.27 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL') url="https://www.mysql.com/products/community/" @@ -37,7 +37,7 @@ build() { -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/mysql/docs \ -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ -DINSTALL_SCRIPTDIR=bin \ -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_DOCREADMEDIR=share/mysql \ diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 0f573142c..395fe2873 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 162741 2012-06-29 11:34:22Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino +# $Id: PKGBUILD 166361 2012-09-06 21:54:10Z andrea $ +# Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.6.2 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -52,7 +51,7 @@ package_qscintilla() { } package_python-qscintilla-common() { - pkgdest="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" + pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" depends=('qscintilla') cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python diff --git a/extra/sbc/PKGBUILD b/extra/sbc/PKGBUILD new file mode 100644 index 000000000..70a61c17b --- /dev/null +++ b/extra/sbc/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 166341 2012-09-06 18:04:29Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=sbc +pkgver=1.0 +pkgrel=1 +pkgdesc="Bluetooth Subband Codec (SBC) library" +arch=('i686' 'x86_64') +url="http://www.bluez.org/" +license=('GPL' 'LGPL') +depends=('glibc') +options=(!libtool) +source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.xz) +md5sums=('aa2bc39c4a09aade064efea4bbbc4b2d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static --disable-tester + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index 332cb5a36..638587d1e 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 161779 2012-06-13 21:37:16Z guillaume $ +# $Id: PKGBUILD 166346 2012-09-06 20:23:30Z guillaume $ # Maintainer: Guillaume ALAUX pkgname=swt pkgver=3.7.2 -pkgrel=1 +pkgrel=2 _date=201202080800 pkgdesc="An open source widget toolkit for Java" arch=('i686' 'x86_64') url="http://www.eclipse.org/swt/" license=('EPL') -depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') +depends=('java-runtime>=7' 'gtk2>=2.20.1' 'libxtst') optdepends=('libgnomeui' 'mesa' 'libwebkit') makedepends=('java-environment' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') if [ "${CARCH}" = "i686" ]; then diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 98952ae13..277778cfc 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua pkgname=tomcat-native -pkgver=1.1.23 +pkgver=1.1.24 pkgrel=1 pkgdesc="The Apache Tomcat Native Library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=("Apache") depends=('apr' 'openssl') makedepends=('java-environment') source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) -md5sums=('f2a55b5a19adbe491edc98e0c11d9028') +md5sums=('cfd4762f2da19ba79d1b6a2a948c9d21') build() { cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index d0c30fd0b..e55352c56 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163486 2012-07-13 05:33:54Z tdziedzic $ +# $Id: PKGBUILD 166321 2012-09-06 07:34:07Z tdziedzic $ # Contributor: Jan "heftig" Steffens # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=600 -__hgrev=11d40fc82f11 +_patchlevel=659 +__hgrev=1052677493be _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -sha1sums=('a1c54bde75476ace5d24d4c17f7a81818e80dfda' - '14d62fe89d8292a6d2f7c46e8c61bd59bbd01083' +sha1sums=('5f9bc51f6935368edda0aab6251d2c5cd5350acd' + 'cb2b2c50a9582e27fe71ac77fc9191122adf0a44' '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' '3494baf53a63581ba69f86a81293640ff681c5c5' '25dd3c2ce436e73a367c8f73b68f7f6889682437' @@ -57,9 +57,9 @@ mksource() { build() { # remove -O2 because there is a crash with python because of it # fedora br: https://bugzilla.redhat.com/show_bug.cgi?id=817196 - export CFLAGS="${CFLAGS/-O2 /}" + #export CFLAGS="${CFLAGS/-O2 /}" - cd "${srcdir}" + #cd "${srcdir}" cp -a ${pkgname}-${pkgver} vim-build diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD index 938ef597b..23934a11a 100644 --- a/extra/xchm/PKGBUILD +++ b/extra/xchm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144000 2011-12-01 15:58:58Z giovanni $ +# $Id: PKGBUILD 166331 2012-09-06 15:41:21Z giovanni $ # Maintainer: Giovanni Scafora pkgname=xchm -pkgver=1.20 -pkgrel=2 +pkgver=1.21 +pkgrel=1 pkgdesc="A cross-platform GUI front-end to chmlib" arch=('i686' 'x86_64') url="http://xchm.sourceforge.net/" @@ -13,7 +13,7 @@ install=xchm.install source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz" 'xchm.desktop' 'xchm.xml') -md5sums=('85943645d20af536704a20b58ebd5849' +md5sums=('9bfe439ce94554ebae95d84f7a1db8e7' '31fb9692b9ee9f2a205f58b9ff4bc4fe' '4102b0a393f5c60236143cc034664dd0') diff --git a/extra/xchm/xchm.install b/extra/xchm/xchm.install index 1ad77f9aa..df90cb5ac 100644 --- a/extra/xchm/xchm.install +++ b/extra/xchm/xchm.install @@ -1,5 +1,5 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null } @@ -9,7 +9,7 @@ post_upgrade() { } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null } diff --git a/gnome-unstable/clutter/PKGBUILD b/gnome-unstable/clutter/PKGBUILD new file mode 100644 index 000000000..b1608804d --- /dev/null +++ b/gnome-unstable/clutter/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 166355 2012-09-06 21:24:56Z jgc $ +# Maintainer: Jan de Groot +# Contributor: Sergej Pupykin +# Contributor: William Rea + +pkgname=clutter +pkgver=1.11.14 +pkgrel=1 +pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" +arch=('i686' 'x86_64') +url="http://clutter-project.org/" +options=('!libtool') +license=('LGPL') +depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi') +makedepends=('gobject-introspection' 'mesa') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('2da2c220dd966a2657eb6f02e835e2527bc1b5a10cc649b70a8906e08a61a832') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --enable-introspection + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gcr/PKGBUILD b/gnome-unstable/gcr/PKGBUILD new file mode 100644 index 000000000..ace88daa9 --- /dev/null +++ b/gnome-unstable/gcr/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 166366 2012-09-06 22:17:08Z jgc $ +# Maintainer: Ionut Biru + +pkgname=gcr +pkgver=3.5.90 +pkgrel=1 +pkgdesc="A library for bits of crypto UI and parsing" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +install=gcr.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('279a5b6db60bec078a0bef9b52a43713d715b622fc4e3c4695982a4a030462ce') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexec=/usr/lib/gcr \ + --disable-static \ + --disable-update-mime \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gcr/gcr.install b/gnome-unstable/gcr/gcr.install new file mode 100644 index 000000000..8677671c4 --- /dev/null +++ b/gnome-unstable/gcr/gcr.install @@ -0,0 +1,14 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade () { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gjs/PKGBUILD b/gnome-unstable/gjs/PKGBUILD new file mode 100644 index 000000000..83ef5bd13 --- /dev/null +++ b/gnome-unstable/gjs/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 166357 2012-09-06 21:31:23Z jgc $ +# Maintainer: Ionut Biru + +pkgname=gjs +pkgver=1.33.10 +pkgrel=1 +pkgdesc="Javascript Bindings for GNOME" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Gjs" +license=('GPL') +depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b856e329eac8208e6618d7e5a7176828ffcc8bb8bb72cf13c34d66524d0ecafd') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's|python|python2|' scripts/make-tests + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/json-glib/PKGBUILD b/gnome-unstable/json-glib/PKGBUILD new file mode 100644 index 000000000..15103ec4e --- /dev/null +++ b/gnome-unstable/json-glib/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 166351 2012-09-06 20:52:29Z jgc $ +# Maintainer: Ionut Biru + +pkgname=json-glib +pkgver=0.15.2 +pkgrel=1 +pkgdesc="JSON library built on GLib" +arch=('i686' 'x86_64') +url="http://live.gnome.org/JsonGlib" +license=('GPL') +depends=('glib2') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde') + +build(){ + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} + +check(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} diff --git a/gnome-unstable/polkit/PKGBUILD b/gnome-unstable/polkit/PKGBUILD new file mode 100644 index 000000000..fc3d4d3ba --- /dev/null +++ b/gnome-unstable/polkit/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 166359 2012-09-06 21:43:48Z jgc $ +# Maintainer: Jan de Groot + +pkgname=polkit +pkgver=0.107 +pkgrel=1 +pkgdesc="Application development toolkit for controlling system-wide privileges" +arch=(i686 x86_64) +license=('LGPL') +url="http://www.freedesktop.org/wiki/Software/PolicyKit" +depends=('glib2' 'pam' 'expat' 'libsystemd' 'js') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection') +replaces=('policykit') +options=('!libtool') +install=polkit.install +source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz + polkit.pam) +md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1' + '6564f95878297b954f0572bc1610dd15') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --disable-static --enable-gtk-doc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + chown 102 "$pkgdir/etc/polkit-1/rules.d" + chown 102 "$pkgdir/usr/share/polkit-1/rules.d" + + install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" +} diff --git a/gnome-unstable/polkit/autogen.sh b/gnome-unstable/polkit/autogen.sh new file mode 100755 index 000000000..d08b00a49 --- /dev/null +++ b/gnome-unstable/polkit/autogen.sh @@ -0,0 +1,123 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +DIE=0 + +(test -f $srcdir/configure.ac) || { + echo -n "**Error**: Directory $srcdir does not look like the" + echo " top-level package directory" + exit 1 +} + +olddir=`pwd` +cd "$srcdir" + +touch ChangeLog + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have autoconf installed." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && { + (libtoolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have libtool installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + } +} + +(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have gtk-doc installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" + DIE=1 +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have automake installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + NO_AUTOMAKE=yes +} + + +# if no automake, don't bother testing for aclocal +test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: Missing aclocal. The version of automake" + echo "installed doesn't appear recent enough." + echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + + +# if no automake, don't bother testing for autoreconf +test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have autoreconf installed." + echo "You can get autoreconf from ..." + DIE=1 +} + + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "**Warning**: I am going to run configure with no arguments." + echo "If you wish to pass any to it, please specify them on the" + echo $0 " command line." + echo +fi + +case $CC in +xlc ) + am_opt=--include-deps;; +esac + + aclocalinclude="$ACLOCAL_FLAGS" + + echo "Running autoreconf on test/mocklibc ..." + (cd "test/mocklibc"; autoreconf --install) + + if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then + if test -z "$NO_LIBTOOLIZE" ; then + echo "Running libtoolize..." + libtoolize --force --copy + fi + fi + echo "Running aclocal $aclocalinclude ..." + aclocal $aclocalinclude + if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then + echo "Running autoheader..." + autoheader + fi + echo "Running automake --gnu -Wno-portability $am_opt ..." + automake --add-missing --gnu -Wno-portability $am_opt + echo "Running autoconf ..." + autoconf + +intltoolize --copy --force --automake || exit 1 + +cd "$olddir" + +conf_flags="--enable-maintainer-mode --enable-gtk-doc" + +if test x$NOCONFIGURE = x; then + echo "Running $srcdir/configure $conf_flags $@ ..." + $srcdir/configure $conf_flags "$@" \ + && echo "Now type make to compile." || exit 1 +else + echo "Skipping configure process." +fi diff --git a/gnome-unstable/polkit/logind+ConsoleKit.patch b/gnome-unstable/polkit/logind+ConsoleKit.patch new file mode 100644 index 000000000..042d1043a --- /dev/null +++ b/gnome-unstable/polkit/logind+ConsoleKit.patch @@ -0,0 +1,638 @@ +From ba143769e17e4bbc1f2b0c88e735f993dfb3c873 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Tue, 7 Aug 2012 21:06:18 +0200 +Subject: [PATCH] session tracking: always require consolekit + +Only systemd is now optional at compile-time, and if enabled we fallback to consolekit +at runtime, if not booted with systemd. + +Bits-stolen-from: Jan Alexander Steffens +Signed-off-by: Tom Gundersen +--- + configure.ac | 6 +- + src/polkit/polkitunixsession-systemd.c | 96 ++++++- + src/polkitbackend/polkitbackendjsauthority.c | 10 +- + .../polkitbackendsessionmonitor-systemd.c | 313 +++++++++++++++++++-- + 4 files changed, 380 insertions(+), 45 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7a0d938..1d1e4ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -163,15 +163,15 @@ AC_ARG_ENABLE([libsystemd-login], + [enable_libsystemd_login=auto]) + if test "$enable_libsystemd_login" != "no"; then + PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, +- [libsystemd-login], ++ [libsystemd-login libsystemd-daemon], + have_libsystemd_login=yes, + have_libsystemd_login=no) + if test "$have_libsystemd_login" = "yes"; then +- SESSION_TRACKING=libsystemd-login ++ SESSION_TRACKING="libsystemd-login (with ConsoleKit runtime fallback)" + AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available]) + else + if test "$enable_libsystemd_login" = "yes"; then +- AC_MSG_ERROR([libsystemd-login support requested but libsystemd-login library not found]) ++ AC_MSG_ERROR([libsystemd-login support requested but systemd libraries not found]) + fi + fi + fi +diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c +index 8a8bf65..bb89044 100644 +--- a/src/polkit/polkitunixsession-systemd.c ++++ b/src/polkit/polkitunixsession-systemd.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2011 Red Hat, Inc. ++ * Copyright (C) 2008, 2011 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -17,6 +17,7 @@ + * Boston, MA 02111-1307, USA. + * + * Author: Matthias Clasen ++ * Author: David Zeuthen + */ + + #ifdef HAVE_CONFIG_H +@@ -31,6 +32,7 @@ + #include "polkitprivate.h" + + #include ++#include + + /** + * SECTION:polkitunixsession +@@ -367,9 +369,41 @@ polkit_unix_session_exists_sync (PolkitSubject *subject, + PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject); + gboolean ret = FALSE; + uid_t uid; ++ GDBusConnection *connection; /* consolekit */ ++ GVariant *result; /* consolekit */ + +- if (sd_session_get_uid (session->session_id, &uid) == 0) +- ret = TRUE; ++ if (sd_booted()) ++ { ++ if (sd_session_get_uid (session->session_id, &uid) == 0) ++ ret = TRUE; ++ } ++ else /* consolekit */ ++ { ++ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); ++ if (connection == NULL) ++ goto out; ++ ++ result = g_dbus_connection_call_sync (connection, ++ "org.freedesktop.ConsoleKit", /* name */ ++ session->session_id, /* object path */ ++ "org.freedesktop.ConsoleKit.Session", /* interface name */ ++ "GetUser", /* method */ ++ NULL, /* parameters */ ++ G_VARIANT_TYPE ("(u)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ cancellable, ++ error); ++ if (result == NULL) ++ goto out; ++ ++ ret = TRUE; ++ g_variant_unref (result); ++ ++ out: ++ if (connection != NULL) ++ g_object_unref (connection); ++ } + + return ret; + } +@@ -451,29 +485,61 @@ polkit_unix_session_initable_init (GInitable *initable, + PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable); + gboolean ret = FALSE; + char *s; ++ GDBusConnection *connection; /* consolekit */ ++ GVariant *result; /* consolekit */ ++ connection = NULL; /* consolekit */ + + if (session->session_id != NULL) + { + /* already set, nothing to do */ +- ret = TRUE; +- goto out; ++ return TRUE; + } + +- if (sd_pid_get_session (session->pid, &s) == 0) ++ if (sd_booted()) ++ { ++ if (sd_pid_get_session (session->pid, &s) == 0) ++ { ++ session->session_id = g_strdup (s); ++ free (s); ++ return TRUE; ++ } ++ ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "No session for pid %d", ++ (gint) session->pid); ++ } ++ else /* consolekit */ + { +- session->session_id = g_strdup (s); +- free (s); ++ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error); ++ if (connection == NULL) ++ goto out; ++ ++ result = g_dbus_connection_call_sync (connection, ++ "org.freedesktop.ConsoleKit", /* name */ ++ "/org/freedesktop/ConsoleKit/Manager", /* object path */ ++ "org.freedesktop.ConsoleKit.Manager", /* interface name */ ++ "GetSessionForUnixProcess", /* method */ ++ g_variant_new ("(u)", session->pid), /* parameters */ ++ G_VARIANT_TYPE ("(o)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ cancellable, ++ error); ++ if (result == NULL) ++ goto out; ++ ++ g_variant_get (result, "(o)", &session->session_id); ++ g_variant_unref (result); ++ + ret = TRUE; +- goto out; + } + +- g_set_error (error, +- POLKIT_ERROR, +- POLKIT_ERROR_FAILED, +- "No session for pid %d", +- (gint) session->pid); ++ out: ++ if (connection != NULL) /* consolekit */ ++ g_object_unref (connection); + +-out: + return ret; + } + +diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c +index bdfaa73..ee38739 100644 +--- a/src/polkitbackend/polkitbackendjsauthority.c ++++ b/src/polkitbackend/polkitbackendjsauthority.c +@@ -36,6 +36,7 @@ + + #ifdef HAVE_LIBSYSTEMD_LOGIN + #include ++#include + #endif /* HAVE_LIBSYSTEMD_LOGIN */ + + #include +@@ -731,11 +732,14 @@ subject_to_jsval (PolkitBackendJsAuthority *authority, + } + + #ifdef HAVE_LIBSYSTEMD_LOGIN +- if (sd_pid_get_session (pid, &session_str) == 0) ++ if (sd_booted()) + { +- if (sd_session_get_seat (session_str, &seat_str) == 0) ++ if (sd_pid_get_session (pid, &session_str) == 0) + { +- /* do nothing */ ++ if (sd_session_get_seat (session_str, &seat_str) == 0) ++ { ++ /* do nothing */ ++ } + } + } + #endif /* HAVE_LIBSYSTEMD_LOGIN */ +diff --git a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c +index 58593c3..5114dfa 100644 +--- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c ++++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c +@@ -26,11 +26,15 @@ + #include + #include + #include ++#include + #include + + #include + #include "polkitbackendsessionmonitor.h" + ++/* consolekit */ ++#define CKDB_PATH "/var/run/ConsoleKit/database" ++ + /* + * SECTION:polkitbackendsessionmonitor + * @title: PolkitBackendSessionMonitor +@@ -126,6 +130,11 @@ struct _PolkitBackendSessionMonitor + GDBusConnection *system_bus; + + GSource *sd_source; ++ ++ /* consolekit */ ++ GKeyFile *database; ++ GFileMonitor *database_monitor; ++ time_t database_mtime; + }; + + struct _PolkitBackendSessionMonitorClass +@@ -148,6 +157,101 @@ G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TY + + /* ---------------------------------------------------------------------------------------------------- */ + ++/* consolekit */ ++static gboolean ++reload_database (PolkitBackendSessionMonitor *monitor, ++ GError **error) ++{ ++ gboolean ret; ++ struct stat statbuf; ++ ++ ret = FALSE; ++ ++ if (monitor->database != NULL) ++ { ++ g_key_file_free (monitor->database); ++ monitor->database = NULL; ++ } ++ ++ if (stat (CKDB_PATH, &statbuf) != 0) ++ { ++ g_set_error (error, ++ G_IO_ERROR, ++ g_io_error_from_errno (errno), ++ "Error statting file " CKDB_PATH ": %s", ++ strerror (errno)); ++ goto out; ++ } ++ ++ monitor->database_mtime = statbuf.st_mtime; ++ ++ monitor->database = g_key_file_new (); ++ if (!g_key_file_load_from_file (monitor->database, ++ CKDB_PATH, ++ G_KEY_FILE_NONE, ++ error)) ++ { ++ goto out; ++ } ++ ++ ret = TRUE; ++ ++ out: ++ return ret; ++} ++ ++static gboolean ++ensure_database (PolkitBackendSessionMonitor *monitor, ++ GError **error) ++{ ++ gboolean ret = FALSE; ++ ++ if (monitor->database != NULL) ++ { ++ struct stat statbuf; ++ ++ if (stat (CKDB_PATH, &statbuf) != 0) ++ { ++ g_set_error (error, ++ G_IO_ERROR, ++ g_io_error_from_errno (errno), ++ "Error statting file " CKDB_PATH " to check timestamp: %s", ++ strerror (errno)); ++ goto out; ++ } ++ if (statbuf.st_mtime == monitor->database_mtime) ++ { ++ ret = TRUE; ++ goto out; ++ } ++ } ++ ++ ret = reload_database (monitor, error); ++ ++ out: ++ return ret; ++} ++ ++static void ++on_file_monitor_changed (GFileMonitor *file_monitor, ++ GFile *file, ++ GFile *other_file, ++ GFileMonitorEvent event_type, ++ gpointer user_data) ++{ ++ PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data); ++ ++ /* throw away cache */ ++ if (monitor->database != NULL) ++ { ++ g_key_file_free (monitor->database); ++ monitor->database = NULL; ++ } ++ g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0); ++} ++ ++/* consolekit - end */ ++ + static gboolean + sessions_changed (gpointer user_data) + { +@@ -163,6 +267,7 @@ static void + polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) + { + GError *error; ++ GFile *file; /* consolekit */ + + error = NULL; + monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); +@@ -172,9 +277,41 @@ polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor) + g_error_free (error); + } + +- monitor->sd_source = sd_source_new (); +- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); +- g_source_attach (monitor->sd_source, NULL); ++ if (sd_booted()) ++ { ++ monitor->sd_source = sd_source_new (); ++ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); ++ g_source_attach (monitor->sd_source, NULL); ++ } ++ else /* consolekit */ ++ { ++ error = NULL; ++ if (!ensure_database (monitor, &error)) ++ { ++ g_printerr ("Error loading " CKDB_PATH ": %s", error->message); ++ g_error_free (error); ++ } ++ ++ error = NULL; ++ file = g_file_new_for_path (CKDB_PATH); ++ monitor->database_monitor = g_file_monitor_file (file, ++ G_FILE_MONITOR_NONE, ++ NULL, ++ &error); ++ g_object_unref (file); ++ if (monitor->database_monitor == NULL) ++ { ++ g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message); ++ g_error_free (error); ++ } ++ else ++ { ++ g_signal_connect (monitor->database_monitor, ++ "changed", ++ G_CALLBACK (on_file_monitor_changed), ++ monitor); ++ } ++ } + } + + static void +@@ -191,6 +328,14 @@ polkit_backend_session_monitor_finalize (GObject *object) + g_source_unref (monitor->sd_source); + } + ++ /* consolekit */ ++ if (monitor->database_monitor != NULL) ++ g_object_unref (monitor->database_monitor); ++ ++ if (monitor->database != NULL) ++ g_key_file_free (monitor->database); ++ /* consolekit - end */ ++ + if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL) + G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object); + } +@@ -258,6 +403,8 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor + GError **error) + { + PolkitIdentity *ret; ++ GError *local_error; /* consolekit */ ++ gchar *group; /* consolekit */ + guint32 uid; + + ret = NULL; +@@ -300,16 +447,38 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor + else if (POLKIT_IS_UNIX_SESSION (subject)) + { + +- if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) ++ if (sd_booted()) + { +- g_set_error (error, +- POLKIT_ERROR, +- POLKIT_ERROR_FAILED, +- "Error getting uid for session"); +- goto out; ++ if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0) ++ { ++ g_set_error (error, ++ POLKIT_ERROR, ++ POLKIT_ERROR_FAILED, ++ "Error getting uid for session"); ++ goto out; ++ } ++ ++ ret = polkit_unix_user_new (uid); ++ } ++ else /* consolekit */ ++ { ++ if (!ensure_database (monitor, error)) ++ { ++ g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": "); ++ goto out; ++ } ++ ++ group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject))); ++ local_error = NULL; ++ uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error); ++ if (local_error != NULL) ++ { ++ g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": "); ++ g_free (group); ++ goto out; ++ } ++ g_free (group); + } +- +- ret = polkit_unix_user_new (uid); + } + + out: +@@ -337,20 +506,43 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni + + if (POLKIT_IS_UNIX_PROCESS (subject)) + { +- gchar *session_id; +- pid_t pid; ++ if (sd_booted()) ++ { ++ gchar *session_id; ++ pid_t pid; + +- pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); +- if (sd_pid_get_session (pid, &session_id) < 0) +- goto out; ++ pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)); ++ if (sd_pid_get_session (pid, &session_id) < 0) ++ goto out; + +- session = polkit_unix_session_new (session_id); +- free (session_id); ++ session = polkit_unix_session_new (session_id); ++ free (session_id); ++ } ++ else /* consolekit */ ++ { ++ const gchar *session_id; ++ GVariant *result; ++ result = g_dbus_connection_call_sync (monitor->system_bus, ++ "org.freedesktop.ConsoleKit", ++ "/org/freedesktop/ConsoleKit/Manager", ++ "org.freedesktop.ConsoleKit.Manager", ++ "GetSessionForUnixProcess", ++ g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))), ++ G_VARIANT_TYPE ("(o)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, /* timeout_msec */ ++ NULL, /* GCancellable */ ++ error); ++ if (result == NULL) ++ goto out; ++ g_variant_get (result, "(&o)", &session_id); ++ session = polkit_unix_session_new (session_id); ++ g_variant_unref (result); ++ } + } + else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) + { + guint32 pid; +- gchar *session_id; + GVariant *result; + + result = g_dbus_connection_call_sync (monitor->system_bus, +@@ -369,11 +561,35 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni + g_variant_get (result, "(u)", &pid); + g_variant_unref (result); + +- if (sd_pid_get_session (pid, &session_id) < 0) +- goto out; ++ if (sd_booted()) ++ { ++ gchar *session_id; ++ if (sd_pid_get_session (pid, &session_id) < 0) ++ goto out; + +- session = polkit_unix_session_new (session_id); +- free (session_id); ++ session = polkit_unix_session_new (session_id); ++ free (session_id); ++ } ++ else /* consolekit */ ++ { ++ const gchar *session_id; ++ result = g_dbus_connection_call_sync (monitor->system_bus, ++ "org.freedesktop.ConsoleKit", ++ "/org/freedesktop/ConsoleKit/Manager", ++ "org.freedesktop.ConsoleKit.Manager", ++ "GetSessionForUnixProcess", ++ g_variant_new ("(u)", pid), ++ G_VARIANT_TYPE ("(o)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, /* timeout_msec */ ++ NULL, /* GCancellable */ ++ error); ++ if (result == NULL) ++ goto out; ++ g_variant_get (result, "(&o)", &session_id); ++ session = polkit_unix_session_new (session_id); ++ g_variant_unref (result); ++ } + } + else + { +@@ -389,12 +605,58 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni + return session; + } + ++static gboolean ++get_boolean (PolkitBackendSessionMonitor *monitor, ++ PolkitSubject *session, ++ const gchar *key_name) ++{ ++ gboolean ret; ++ gchar *group; ++ GError *error; ++ ++ ret = FALSE; ++ ++ group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); ++ ++ error = NULL; ++ if (!ensure_database (monitor, &error)) ++ { ++ g_printerr ("Error getting boolean `%s' in group `%s': Error ensuring CK database at " CKDB_PATH ": %s", ++ key_name, ++ group, ++ error->message); ++ g_error_free (error); ++ goto out; ++ } ++ ++ error = NULL; ++ ret = g_key_file_get_boolean (monitor->database, group, key_name, &error); ++ if (error != NULL) ++ { ++ g_printerr ("Error looking %s using " CKDB_PATH " for %s: %s\n", ++ key_name, ++ group, ++ error->message); ++ g_error_free (error); ++ goto out; ++ } ++ ++ out: ++ g_free (group); ++ return ret; ++} ++ + gboolean + polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor, + PolkitSubject *session) + { + char *seat; + ++ if (!sd_booted()) /* consolekit */ ++ { ++ return get_boolean (monitor, session, "is_local"); ++ } ++ + if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat)) + { + free (seat); +@@ -409,6 +671,9 @@ gboolean + polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor, + PolkitSubject *session) + { +- return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); ++ if (sd_booted()) ++ return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session))); ++ else /* consolekit */ ++ return get_boolean (monitor, session, "is_active"); + } + +-- +1.7.11.4 + diff --git a/gnome-unstable/polkit/polkit.install b/gnome-unstable/polkit/polkit.install new file mode 100644 index 000000000..fbb98919e --- /dev/null +++ b/gnome-unstable/polkit/polkit.install @@ -0,0 +1,18 @@ +post_install() { + getent group polkitd >/dev/null || groupadd -g 102 polkitd + getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd + passwd -l polkitd &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + if getent passwd polkitd >/dev/null; then + userdel polkitd + fi + if getent group polkitd >/dev/null; then + groupdel polkitd + fi +} diff --git a/gnome-unstable/polkit/polkit.pam b/gnome-unstable/polkit/polkit.pam new file mode 100644 index 000000000..04f53e0db --- /dev/null +++ b/gnome-unstable/polkit/polkit.pam @@ -0,0 +1,7 @@ +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +account required pam_unix.so +session required pam_limits.so +session required pam_unix.so +password required pam_unix.so diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 2739a7c7c..addf86ef3 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 165189 2012-08-12 19:45:00Z andyrtr $ +# $Id: PKGBUILD 166387 2012-09-07 13:33:10Z andyrtr $ # Maintainer: Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.20 -pkgrel=2 +pkgver=1.0.24 +pkgrel=1 pkgdesc="OpenPrinting CUPS Filters" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler>=0.20.3') +depends=('lcms2' 'poppler>=0.20.3' 'qpdf') makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' @@ -17,7 +17,7 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv backup=(etc/fonts/conf.d/99pdftoopvp.conf) options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) -md5sums=('fc1d2b8cb5b0513224d7e2b01f900704') +md5sums=('242ea48cd41f8546d71b00bf2b06c564') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index bed0b129a..f69e561be 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164089 2012-07-26 16:54:32Z andrea $ +# $Id: PKGBUILD 165939 2012-09-03 21:49:19Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): Michał Masłowski @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('f5c358e3c7902b15328908a9966f98774827988e' +sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f' 'f41541371414dcbe5e76687835e648112b3ff364') pkgdesc='KDE File Manager & Web Browser' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 45ef65005..ba6273763 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.0 -pkgrel=3 +pkgver=4.9.1 +pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -25,7 +25,7 @@ provides=("${_pkgname}=${pkgver}") install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_lite.desktop') -sha1sums=('89a9e5c7e52cb925217b45a568a354cc041bc28d' +sha1sums=('4b67e0f12617c478ee29546da4d98f605cd35dec' '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85') build() { diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 27fb5d504..e5fdb1ea6 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 164789 2012-08-05 12:10:43Z andrea $ +# $Id: PKGBUILD 165921 2012-09-03 21:48:13Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.0 -pkgrel=4 +pkgver=4.9.1 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -25,7 +25,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar. 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' 'khtml-fsdg.diff') -sha1sums=('9daa3a93182ac3c50759d7369a7c1db30890cf46' +sha1sums=('33fb26ec7735122b2bb084b79f8fcffb826c58f0' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 1244e21bb..0ec26edcd 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164151 2012-07-26 16:58:38Z andrea $ +# $Id: PKGBUILD 165994 2012-09-03 21:52:07Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('f5963684301d6569af4cfce2a39dbef140c1dc4d') +sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320') build() { cd "${srcdir}" diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 7d80e341e..a71990231 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164156 2012-07-26 16:58:54Z andrea $ +# $Id: PKGBUILD 165999 2012-09-03 21:52:22Z andrea $ # Maintainer: Andrea Scarpino # Maintainer (Parabola): André Silva _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('60c535370da1edf03481fdc1ef3f04f9269d54e2') +sha1sums=('2f7d32b9f99913d14801b56f0c858eda128a7b91') build() { cd "${srcdir}" diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD new file mode 100644 index 000000000..be2b8de26 --- /dev/null +++ b/libre/tp_smapi-libre/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer: Lukas Fleischer +# Contributor: xduugu +# Contributor: nh2 +# Contributor: Steven Davidovitz +# Contributor: Nick B +# Contributor: Christof Musik +# Contributor: Stefan Rupp +# Contributor: Ignas Anikevicius +# Maintainer (Parabola): André Silva + +_pkgname=tp_smapi +pkgname=tp_smapi-libre +pkgver=0.41 +pkgrel=5 +pkgdesc="Modules for ThinkPad's SMAPI functionality" +arch=('i686' 'x86_64') +url='https://github.com/evgeni/tp_smapi' +license=('GPL') +depends=('linux-libre>=3.5' 'linux-libre<3.6') +makedepends=('linux-libre-headers>=3.5' 'linux-libre-headers<3.6') +replaces=("${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") +install="${_pkgname}.install" +source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") +md5sums=('63c683415c764568f6bf17c7eabe4752') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + _kernver=${_kernver:-$(uname -r)} + _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) + _kernver=$(< "${_extramodules}/version") + + sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ + -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile + + make HDAPS=1 +} + +package() { + _kernver=${_kernver:-$(uname -r)} + _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) + _kernver=$(< "${_extramodules}/version") + + make -C "${_extramodules%/*}/${_kernver}/build" \ + INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \ + M="${srcdir}/${_pkgname}-${pkgver}" modules_install + + cd "${pkgdir}/${_extramodules%/*}" + mv "${_kernver}/extra" "${_extramodules##*/}" + rmdir "${_kernver}" + + # compress kernel libre modules + find "${pkgdir}" -name "*.ko" -exec gzip -9 {} + + + # load module on startup + echo tp_smapi > "${srcdir}/${_pkgname}.conf" + install -Dm644 "${srcdir}/${_pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${_pkgname}.conf" + + # update kernel libre version in install file + sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${_pkgname}.install" +} diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install new file mode 100644 index 000000000..5fe1bab90 --- /dev/null +++ b/libre/tp_smapi-libre/tp_smapi.install @@ -0,0 +1,13 @@ +extramodules=/usr/lib/modules/extramodules-3.5-ARCH + +post_install() { + depmod -v $(< "$extramodules/version") &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD index e4f96e5ae..d2d0d4bbe 100644 --- a/pcr/mesa-git/PKGBUILD +++ b/pcr/mesa-git/PKGBUILD @@ -17,15 +17,22 @@ true && pkgname=( libwayland-egl-git osmesa-git ati-dri-git + intel-gallium-dri-git intel-dri-git nouveau-dri-git + #ati-va-git + #nouveau-va-git + #soft-va-git + ati-vdpau-git + nouveau-vdpau-git + soft-vdpau-git ati-xvmc-git nouveau-xvmc-git soft-xvmc-git mesa-git ) -true && pkgver=9.0.0.git20120906 -true && pkgrel=1 +true && pkgver=9.0.0.git20120907 +true && pkgrel=2 _mesaver=9.0 arch=( i686 @@ -33,20 +40,27 @@ arch=( mips64el ) makedepends=( - clang - dri2proto - git - glproto-git - imake - libdrm-git - libxdamage - libxml2 - libxxf86vm - libxvmc - llvm - python2 - wayland -) # wine for d3d1x api + clang # needed for compilation + git # needed for git source + glproto-git # needed for compilation + imake # needed for compilation + libdrm-git # needed for compilation + libgbm-git # needed for 'make install' (ld error) + libgl-git # needed for 'make install' (ld error) + #libva # for va support + libvdpau # for vdpau support + libvg-git # needed for 'make install' (ld error) + libxdamage # needed for compilation + libxml2 # needed for compilation + libxxf86vm # needed for compilation + libxvmc # for xvmc support + llvm # for llvm support + python2 # needed for compilation + wayland # for wayland support + #wine # for d3d1x api support + xf86driproto # needed for compilation error + xorg-server-devel # for xorg suport +) license=( MIT Khronos @@ -102,14 +116,16 @@ build() { --enable-shared-glapi \ --enable-texture-float \ --enable-xa \ + --enable-xorg \ --enable-xvmc \ + --enable-vdpau \ --with-clang-libdir=/usr/lib \ --with-egl-platforms=drm,x11,wayland \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-dri-drivers=i915,i965,r200,nouveau,radeon,swrast \ - --with-gallium-drivers=r300,r600,nouveau,swrast + --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \ + --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,swrast #--enable-d3d1x \ - echo -e "\ninstall: " >> src/mesa/drivers/osmesa/Makefile + #--enable-va \ make } @@ -118,16 +134,16 @@ package_khrplatform-devel-git() { khrplatform-devel ) provides=( - khrplatform-devel=${_mesaver} + khrplatform-devel=$_mesaver ) pkgdesc='Khronos platform development package' cd $srcdir/build install -m755 -d $pkgdir/usr/include/KHR install -m755 -d $pkgdir/usr/share/licenses/khrplatform-devel - bin/minstall include/KHR/khrplatform.h $pkgdir/usr/include/KHR - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/khrplatform-devel - bin/minstall docs/license.html $pkgdir/usr/share/licenses/khrplatform-devel + install -Dm644 include/KHR/khrplatform.h $pkgdir/usr/include/KHR + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/khrplatform-devel + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/khrplatform-devel } package_libcl-libre-git() { @@ -140,9 +156,11 @@ package_libcl-libre-git() { ) conflicts=( libcl + libcl-libre ) provides=( libcl + libcl-libre ) replaces=( libcl @@ -152,13 +170,13 @@ package_libcl-libre-git() { make -C $srcdir/build/src/gallium/targets/opencl DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib/opencl + #install -m755 -d $pkgdir/usr/lib/opencl install -m755 -d $pkgdir/usr/share/licenses/libcl - #bin/minstall src/gallium/targets/opencl/libOpenCL.la $pkgdir/usr/lib - #bin/minstall lib/libOpenCL.so* $pkgdir/usr/lib - #bin/minstall src/gallium/targets/pipe-loader/*.so $pkgdir/usr/lib/opencl - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libcl - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libcl + #install -Dm644 src/gallium/targets/opencl/libOpenCL.la $pkgdir/usr/lib + #install -Dm644 lib/libOpenCL.so* $pkgdir/usr/lib + #install -Dm644 src/gallium/targets/pipe-loader/*.so $pkgdir/usr/lib/opencl + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libcl + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libcl } package_libegl-wayland-git() { @@ -172,32 +190,32 @@ package_libegl-wayland-git() { ) conflicts=( libegl - libegl-git libegl-wayland ) provides=( libegl=$_mesaver - libegl-git=$_mesaver + libegl-wayland=$_mesaver ) pkgdesc='Mesa EGL libraries and headers, with wayland Support' - #make -C $srcdir/build/src/egl DESTDIR=$pkgdir install - #make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install + make -C $srcdir/build/src/egl DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/egl-static DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/include/EGL - install -m755 -d $pkgdir/usr/lib/egl - install -m755 -d $pkgdir/usr/lib/pkgconfig + rm -fvr $pkgdir/usr/include/KHR + #install -m755 -d $pkgdir/usr/include/EGL + #install -m755 -d $pkgdir/usr/lib/egl + #install -m755 -d $pkgdir/usr/lib/pkgconfig install -m755 -d $pkgdir/usr/share/doc/libegl install -m755 -d $pkgdir/usr/share/licenses/libegl - bin/minstall include/EGL/* $pkgdir/usr/include/EGL - bin/minstall src/egl/main/libEGL.la $pkgdir/usr/lib - bin/minstall lib/libEGL.so* $pkgdir/usr/lib - bin/minstall lib/egl/egl_gallium.so $pkgdir/usr/lib/egl - bin/minstall src/egl/main/egl.pc $pkgdir/usr/lib/pkgconfig - bin/minstall docs/egl.html $pkgdir/usr/share/doc/libegl - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libegl - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libegl + #install -Dm644 include/EGL/* $pkgdir/usr/include/EGL + #install -Dm644 src/egl/main/libEGL.la $pkgdir/usr/lib + #install -Dm644 lib/libEGL.so* $pkgdir/usr/lib + #install -Dm644 lib/egl/egl_gallium.so $pkgdir/usr/lib/egl + #install -Dm644 src/egl/main/egl.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/egl.html $pkgdir/usr/share/doc/libegl + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libegl + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libegl } package_libgbm-git() { @@ -217,22 +235,22 @@ package_libgbm-git() { ) pkgdesc='Mesa GBM libraries and header' - #make -C $srcdir/build/src/gbm DESTDIR=$pkgdir install - #make -C $srcdir/build/src/gallium/targets/gbm DESTDIR=$pkgdir install + make -C $srcdir/build/src/gbm DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/gbm DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/include - install -m755 -d $pkgdir/usr/lib/gbm - install -m755 -d $pkgdir/usr/lib/pkgconfig + #install -m755 -d $pkgdir/usr/lib/include + #install -m755 -d $pkgdir/usr/lib/gbm + #install -m755 -d $pkgdir/usr/lib/pkgconfig install -m755 -d $pkgdir/usr/share/licenses/libgbm - bin/minstall src/gbm/main/gbm.h $pkgdir/usr/include - bin/minstall src/gbm/libgbm.la $pkgdir/usr/lib - bin/minstall lib/libgbm.so* $pkgdir/usr/lib - bin/minstall src/gallium/targets/gbm/gbm_gallium_drm.so $pkgdir/usr/lib/gbm - bin/minstall src/gallium/targets/pipe-loader/*.so $pkgdir/usr/lib/gbm - bin/minstall src/gbm/main/gbm.pc $pkgdir/usr/lib/pkgconfig - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libgbm - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libgbm + #install -Dm644 src/gbm/main/gbm.h $pkgdir/usr/include + #install -Dm644 src/gbm/libgbm.la $pkgdir/usr/lib + #install -Dm644 lib/libgbm.so* $pkgdir/usr/lib + #install -Dm644 src/gallium/targets/gbm/gbm_gallium_drm.so $pkgdir/usr/lib/gbm + #install -Dm644 src/gallium/targets/pipe-loader/*.so $pkgdir/usr/lib/gbm + #install -Dm644 src/gbm/main/gbm.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgbm + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libgbm } package_libgl-gallium-git() { @@ -246,30 +264,30 @@ package_libgl-gallium-git() { ) conflicts=( libgl - libgl-git + libgl-gallium ) provides=( libgl=$_mesaver - libgl-git=$_mesaver + libgl-gallium=$_mesaver ) pkgdesc='Mesa 3D OpenGL graphics library and DRI Gallium software rasterizer' - #make -C $srcdir/build/src/glx DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/libdricore DESTDIR=$pkgdir install - #make -C $srcdir/build/src/gallium/targets/dri-swrast DESTDIR=$pkgdir install + make -C $srcdir/build/src/glx DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/libdricore DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/dri-swrast DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri install -m755 -d $pkgdir/usr/share/doc/libgl install -m755 -d $pkgdir/usr/share/licenses/libgl - bin/minstall src/glx/libGL.la $pkgdir/usr/lib - bin/minstall lib/libGL.so* $pkgdir/usr/lib - bin/minstall src/mesa/libdricore/libdricore*.la $pkgdir/usr/lib - bin/minstall lib/libdricore*.so* $pkgdir/usr/lib - bin/minstall lib/gallium/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/libGL.txt $pkgdir/usr/share/doc/libgl - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libgl - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libgl + #install -Dm644 src/glx/libGL.la $pkgdir/usr/lib + #install -Dm644 lib/libGL.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/libdricore/libdricore*.la $pkgdir/usr/lib + #install -Dm644 lib/libdricore*.so* $pkgdir/usr/lib + #install -Dm644 lib/gallium/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/libGL.txt $pkgdir/usr/share/doc/libgl + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgl + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libgl } package_libgl-git() { @@ -283,31 +301,31 @@ package_libgl-git() { ) conflicts=( libgl - libgl-gallium-git + libgl-gallium ) provides=( libgl=$_mesaver - libgl-gallium-git=$_mesaver + libgl-gallium=$_mesaver ) pkgdesc='Mesa 3D OpenGL graphics library and DRI software rasterizer' - #make -C $srcdir/build/src/glx DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/libdricore DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/drivers/dri/swrast DESTDIR=$pkgdir install + make -C $srcdir/build/src/glx DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/libdricore DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/swrast DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri install -m755 -d $pkgdir/usr/share/doc/libgl install -m755 -d $pkgdir/usr/share/licenses/libgl - bin/minstall src/glx/libGL.la $pkgdir/usr/lib - bin/minstall lib/libGL.so* $pkgdir/usr/lib - bin/minstall src/mesa/libdricore/libdricore*.la $pkgdir/usr/lib - bin/minstall lib/libdricore*.so* $pkgdir/usr/lib - bin/minstall src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/libGL.txt $pkgdir/usr/share/doc/libgl - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libgl - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libgl + #install -Dm644 src/glx/libGL.la $pkgdir/usr/lib + #install -Dm644 lib/libGL.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/libdricore/libdricore*.la $pkgdir/usr/lib + #install -Dm644 lib/libdricore*.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/drivers/dri/swrast/swrast_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/swrast_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/libGL.txt $pkgdir/usr/share/doc/libgl + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgl + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libgl } package_libglapi-git() { @@ -325,12 +343,12 @@ package_libglapi-git() { make -C $srcdir/build/src/mapi/shared-glapi DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib + #install -m755 -d $pkgdir/usr/lib install -m755 -d $pkgdir/usr/share/licenses/libglapi - #bin/minstall src/mapi/shared-glapi/libglapi.la $pkgdir/usr/lib - #bin/minstall lib/libglapi.so* $pkgdir/usr/lib - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libglapi - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libglapi + #install -Dm644 src/mapi/shared-glapi/libglapi.la $pkgdir/usr/lib + #install -Dm644 lib/libglapi.so* $pkgdir/usr/lib + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libglapi + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libglapi } package_libgles-git() { @@ -347,23 +365,23 @@ package_libgles-git() { ) pkgdesc='Mesa GLES libraries and headers' - #make -C $srcdir/build/src/mapi/es1api DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mapi/es2api DESTDIR=$pkgdir install + make -C $srcdir/build/src/mapi/es1api DESTDIR=$pkgdir install + make -C $srcdir/build/src/mapi/es2api DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/include/GLES - install -m755 -d $pkgdir/usr/include/GLES2 - install -m755 -d $pkgdir/usr/lib/pkgconfig + #install -m755 -d $pkgdir/usr/include/GLES + #install -m755 -d $pkgdir/usr/include/GLES2 + #install -m755 -d $pkgdir/usr/lib/pkgconfig install -m755 -d $pkgdir/usr/share/licenses/libgles - bin/minstall include/GLES/* $pkgdir/usr/include/GLES - bin/minstall include/GLES2/* $pkgdir/usr/include/GLES2 - bin/minstall src/mapi/es1api/libGLESv1_CM.la $pkgdir/usr/lib - bin/minstall src/mapi/es2api/libGLESv2.la $pkgdir/usr/lib - bin/minstall lib/libGLESv*.so* $pkgdir/usr/lib - bin/minstall src/mapi/es1api/glesv1_cm.pc $pkgdir/usr/lib/pkgconfig - bin/minstall src/mapi/es2api/glesv2.pc $pkgdir/usr/lib/pkgconfig - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libgles - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libgles + #install -Dm644 include/GLES/* $pkgdir/usr/include/GLES + #install -Dm644 include/GLES2/* $pkgdir/usr/include/GLES2 + #install -Dm644 src/mapi/es1api/libGLESv1_CM.la $pkgdir/usr/lib + #install -Dm644 src/mapi/es2api/libGLESv2.la $pkgdir/usr/lib + #install -Dm644 lib/libGLESv*.so* $pkgdir/usr/lib + #install -Dm644 src/mapi/es1api/glesv1_cm.pc $pkgdir/usr/lib/pkgconfig + #install -Dm644 src/mapi/es2api/glesv2.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libgles + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libgles } package_libvg-git() { @@ -381,17 +399,17 @@ package_libvg-git() { make -C $srcdir/build/src/mapi/vgapi DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/include/VG - #install -m755 -d $pkgdir/usr/lib/pkgconfig - #install -m755 -d $pkgdir/usr/share/doc/libvg + #install -m755 -d $pkgdir/usr/include/VG + #install -m755 -d $pkgdir/usr/lib/pkgconfig + install -m755 -d $pkgdir/usr/share/doc/libvg install -m755 -d $pkgdir/usr/share/licenses/libvg - #bin/minstall include/VG/* $pkgdir/usr/include/VG - #bin/minstall src/mapi/vgapi/libOpenVG.la $pkgdir/usr/lib - #bin/minstall lib/libOpenVG.so* $pkgdir/usr/lib - #bin/minstall src/mapi/vgapi/vg.pc $pkgdir/usr/lib/pkgconfig - #bin/minstall docs/openvg.html $pkgdir/usr/share/doc/libvg - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libvg - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libvg + #install -Dm644 include/VG/* $pkgdir/usr/include/VG + #install -Dm644 src/mapi/vgapi/libOpenVG.la $pkgdir/usr/lib + #install -Dm644 lib/libOpenVG.so* $pkgdir/usr/lib + #install -Dm644 src/mapi/vgapi/vg.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/openvg.html $pkgdir/usr/share/doc/libvg + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libvg + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libvg } package_libwayland-egl-git() { @@ -409,13 +427,13 @@ package_libwayland-egl-git() { make -C $srcdir/build/src/egl/wayland/wayland-egl DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib/pkgconfig + #install -m755 -d $pkgdir/usr/lib/pkgconfig install -m755 -d $pkgdir/usr/share/licenses/libwayland - #bin/minstall src/egl/wayland/wayland-egl/libwayland-egl.la $pkgdir/usr/lib - #bin/minstall lib/libwayland-egl.so* $pkgdir/usr/lib - #bin/minstall src/egl/wayland/wayland-egl/wayland-egl.pc $pkgdir/usr/lib/pkgconfig - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libwayland - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libwayland + #install -Dm644 src/egl/wayland/wayland-egl/libwayland-egl.la $pkgdir/usr/lib + #install -Dm644 lib/libwayland-egl.so* $pkgdir/usr/lib + #install -Dm644 src/egl/wayland/wayland-egl/wayland-egl.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/libwayland + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/libwayland } package_osmesa-git() { @@ -436,15 +454,15 @@ package_osmesa-git() { make -C $srcdir/build/src/mesa/drivers/osmesa DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib/pkgconfig - #install -m755 -d $pkgdir/usr/share/doc/osmesa + #install -m755 -d $pkgdir/usr/lib/pkgconfig + install -m755 -d $pkgdir/usr/share/doc/osmesa install -m755 -d $pkgdir/usr/share/licenses/osmesa - #bin/minstall src/mesa/drivers/osmesa/libOSMesa.la $pkgdir/usr/lib - #bin/minstall lib/libOSMesa.so* $pkgdir/usr/lib - #bin/minstall src/mesa/drivers/osmesa/osmesa.pc $pkgdir/usr/lib/pkgconfig - #bin/minstall docs/osmesa.html $pkgdir/usr/share/doc/osmesa - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/osmesa - bin/minstall docs/license.html $pkgdir/usr/share/licenses/osmesa + #install -Dm644 src/mesa/drivers/osmesa/libOSMesa.la $pkgdir/usr/lib + #install -Dm644 lib/libOSMesa.so* $pkgdir/usr/lib + #install -Dm644 src/mesa/drivers/osmesa/osmesa.pc $pkgdir/usr/lib/pkgconfig + install -Dm644 docs/osmesa.html $pkgdir/usr/share/doc/osmesa + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/osmesa + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/osmesa } package_ati-dri-git() { @@ -458,26 +476,69 @@ package_ati-dri-git() { provides=( ati-dri=$_mesaver ) - pkgdesc='Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon' + pkgdesc='Mesa DRI radeon/r200 + Gallium3D r300,r600,radeonsi drivers for AMD/ATI Radeon' - # classic mesa driver for R300 r300_dri.so - #make -C $srcdir/build/src/mesa/drivers/dri/r200 DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/drivers/dri/radeon DESTDIR=$pkgdir install - # gallium3D driver for R300 r300_dri.so - #make -C $srcdir/build/src/gallium/targets/dri-r300 DESTDIR=$pkgdir install - #make -C $srcdir/build/src/gallium/targets/dri-r600 DESTDIR=$pkgdir install + # classic mesa driver for radeon,r200 + make -C $srcdir/build/src/mesa/drivers/dri/r200 DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/radeon DESTDIR=$pkgdir install + # gallium3D (dri) driver for r300,r600,radeonsi + make -C $srcdir/build/src/gallium/targets/dri-r300 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/dri-r600 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/dri-radeonsi DESTDIR=$pkgdir install + # gallium3D (xorg) driver for r300,r600g,radeonsi + make -C $srcdir/build/src/gallium/targets/xorg-r300 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xorg-r600 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xorg-radeonsi DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers install -m755 -d $pkgdir/usr/share/licenses/ati-dri - # classic mesa driver for R300 r300_dri.so - bin/minstall lib/r200_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/radeon_dri.so $pkgdir/usr/lib/xorg/modules/dri - # gallium3D driver for R300 r300_dri.so - bin/minstall lib/gallium/r300_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/gallium/r600_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/ati-dri - bin/minstall docs/license.html $pkgdir/usr/share/licenses/ati-dri + # classic mesa driver for radeon,r200 + #install -Dm644 src/mesa/drivers/dri/r200/r200_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/r200_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 src/mesa/drivers/dri/radeon/radeon_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/radeon_dri.so $pkgdir/usr/lib/xorg/modules/dri + # gallium3D (dri) driver for r300,r600,radeonsi + #install -Dm644 lib/gallium/r300_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/gallium/r600_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/gallium/radeonsi_dri.so $pkgdir/usr/lib/xorg/modules/dri + # gallium3D (xorg) driver for r300,r600g,radeonsi + #install -Dm644 lib/gallium/r300_drv.so $pkgdir/usr/lib/xorg/modules/drivers + #install -Dm644 lib/gallium/r600g_drv.so $pkgdir/usr/lib/xorg/modules/drivers + #install -Dm644 lib/gallium/radeonsi_drv.so $pkgdir/usr/lib/xorg/modules/drivers + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/ati-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/ati-dri +} + +package_intel-gallium-dri-git() { + depends=( + libgl-git + ) + conflicts=( + intel-dri + intel-gallium-dri + ) + provides=( + intel-dri=$_mesaver + intel-gallium-dri=$_mesaver + ) + pkgdesc='Mesa DRI drivers for Intel, with i915 Gallium Driver )' + + make -C $srcdir/build/src/gallium/targets/dri-i915 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xorg-i915 DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/i965 DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers + install -m755 -d $pkgdir/usr/share/licenses/intel-dri + #install -Dm644 src/gallium/targets/dri-i915/i915_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/modesetting_drv.so $pkgdir/usr/lib/xorg/modules/drivers + #install -Dm644 src/mesa/drivers/dri/i965/i965_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/i965_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/intel-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/intel-dri } package_intel-dri-git() { @@ -486,22 +547,26 @@ package_intel-dri-git() { ) conflicts=( intel-dri + intel-gallium-dri ) provides=( intel-dri=$_mesaver + intel-gallium-dri=$_mesaver ) pkgdesc='Mesa DRI drivers for Intel' - #make -C $srcdir/build/src/mesa/drivers/dri/i915 DESTDIR=$pkgdir install - #make -C $srcdir/build/src/mesa/drivers/dri/i965 DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/i915 DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/i965 DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri install -m755 -d $pkgdir/usr/share/licenses/intel-dri - bin/minstall lib/i915_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/i965_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/intel-dri - bin/minstall docs/license.html $pkgdir/usr/share/licenses/intel-dri + #install -Dm644 src/mesa/drivers/dri/i915/i915_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 src/mesa/drivers/dri/i915/.libs/i915_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 src/mesa/drivers/dri/i965/i965_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/i965_dri.so $pkgdir/usr/lib/xorg/modules/dri + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/intel-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/intel-dri } package_nouveau-dri-git() { @@ -517,17 +582,94 @@ package_nouveau-dri-git() { pkgdesc='Mesa classic DRI + Gallium3D drivers for Nouveau' # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - #make -C $srcdir/build/src/mesa/drivers/dri/nouveau DESTDIR=$pkgdir install + make -C $srcdir/build/src/mesa/drivers/dri/nouveau DESTDIR=$pkgdir install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - #make -C $srcdir/build/src/gallium/targets/dri-nouveau DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/dri-nouveau DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xorg-nouveau DESTDIR=$pkgdir install cd $srcdir/build - install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/dri + #install -m755 -d $pkgdir/usr/lib/xorg/modules/drivers install -m755 -d $pkgdir/usr/share/licenses/nouveau-dri - bin/minstall lib/nouveau_vieux_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall lib/gallium/nouveau_dri.so $pkgdir/usr/lib/xorg/modules/dri - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/nouveau-dri - bin/minstall docs/license.html $pkgdir/usr/share/licenses/nouveau-dri + #install -Dm644 src/mesa/drivers/dri/nouveau/nouveau_vieux_dri.la $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/nouveau_vieux_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/gallium/nouveau_dri.so $pkgdir/usr/lib/xorg/modules/dri + #install -Dm644 lib/gallium/nouveau2_drv.so $pkgdir/usr/lib/xorg/modules/drivers + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/nouveau-dri + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/nouveau-dri +} + +package_ati-vdpau-git() { + depends=( + gcc-libs + libdrm-git + libx11 + ) + conflicts=( + ati-vdpau + ) + provides=( + ati-vdpau=$_mesaver + ) + pkgdesc='Mesa Gallium3D VDPAU libraries for ATI' + + make -C $srcdir/build/src/gallium/targets/vdpau-r300 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/vdpau-r600 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/vdpau-radeonsi DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/vdpau + install -m755 -d $pkgdir/usr/share/licenses/ati-vdpau + #install -Dm644 lib/gallium/libvdpau_r*00.so* $pkgdir/usr/lib/vdpau + #install -Dm644 lib/gallium/libvdpau_radeonsi.so* $pkgdir/usr/lib/vdpau + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/ati-vdpau + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/ati-vdpau +} + +package_nouveau-vdpau-git() { + depends=( + gcc-libs + libdrm-git + libx11 + ) + conflicts=( + nouveau-vdpau + ) + provides=( + nouveau-vdpau=$_mesaver + ) + pkgdesc='Mesa Gallium3D XvMC library for Nouveau' + + make -C $srcdir/build/src/gallium/targets/vdpau-nouveau DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/vdpau + install -m755 -d $pkgdir/usr/share/licenses/nouveau-vdpau + #install -Dm644 lib/gallium/libvdpau_nouveau.so* $pkgdir/usr/lib/vdpau + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/nouveau-vdpau + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/nouveau-vdpau +} + +package_soft-vdpau-git() { + depends=( + gcc-libs + ) + conflicts=( + soft-vdpau + ) + provides=( + soft-vdpau=$_mesaver + ) + pkgdesc='Mesa Gallium3D XvMC library for Software Rasterizer' + + make -C $srcdir/build/src/gallium/targets/vdpau-softpipe DESTDIR=$pkgdir install + + cd $srcdir/build + #install -m755 -d $pkgdir/usr/lib/vdpau + install -m755 -d $pkgdir/usr/share/licenses/soft-vdpau + #install -Dm644 lib/gallium/libvdpau_softpipe.so* $pkgdir/usr/lib/vdpau + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/soft-vdpau + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/soft-vdpau } package_ati-xvmc-git() { @@ -544,15 +686,15 @@ package_ati-xvmc-git() { ) pkgdesc='Mesa Gallium3D XvMC libraries for ATI' - make -C $srcdir/build/src/gallium/targets/xvmc-r300 DESTDIR=$pkgdir install - make -C $srcdir/build/src/gallium/targets/xvmc-r600 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xvmc-r300 DESTDIR=$pkgdir install + make -C $srcdir/build/src/gallium/targets/xvmc-r600 DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib + #install -m755 -d $pkgdir/usr/lib install -m755 -d $pkgdir/usr/share/licenses/ati-xvmc - #bin/minstall lib/gallium/libXvMCr?00.so* $pkgdir/usr/lib - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/libxvmc - bin/minstall docs/license.html $pkgdir/usr/share/licenses/libxvmc + #install -Dm644 lib/gallium/libXvMCr*00.so* $pkgdir/usr/lib + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/ati-xvmc + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/ati-xvmc } package_nouveau-xvmc-git() { @@ -572,11 +714,11 @@ package_nouveau-xvmc-git() { make -C $srcdir/build/src/gallium/targets/xvmc-nouveau DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib + #install -m755 -d $pkgdir/usr/lib install -m755 -d $pkgdir/usr/share/licenses/nouveau-xvmc - #bin/minstall lib/gallium/libXvMCnouveau.so* $pkgdir/usr/lib - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/nouveau-xvmc - bin/minstall docs/license.html $pkgdir/usr/share/licenses/nouveau-xvmc + #install -Dm644 lib/gallium/libXvMCnouveau.so* $pkgdir/usr/lib + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/nouveau-xvmc + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/nouveau-xvmc } package_soft-xvmc-git() { @@ -596,11 +738,11 @@ package_soft-xvmc-git() { make -C $srcdir/build/src/gallium/targets/xvmc-softpipe DESTDIR=$pkgdir install cd $srcdir/build - #install -m755 -d $pkgdir/usr/lib + #install -m755 -d $pkgdir/usr/lib install -m755 -d $pkgdir/usr/share/licenses/soft-xvmc - #bin/minstall lib/gallium/libXvMCsoftpipe.so* $pkgdir/usr/lib - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/soft-xvmc - bin/minstall docs/license.html $pkgdir/usr/share/licenses/soft-xvmc + #install -Dm644 lib/gallium/libXvMCsoftpipe.so* $pkgdir/usr/lib + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/soft-xvmc + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/soft-xvmc } package_mesa-git() { @@ -613,6 +755,9 @@ package_mesa-git() { 'ati-dri-git: for ATI Video Hardware' 'intel-dri-git: for Intel Video Hardware' 'nouveau-dri-git: for nVidia Video Hardware' + 'ati-vdpau-git: for VDPAU on ATI Video Hardware' + 'nouveau-vdpau-git: for VDPAU on nVidia Video Hardware' + 'soft-vdpau-git: for VDPAU on DRI Software Rasterizer' 'ati-xvmc-git: for X11 Video Motion Compensation on ATI Video Hardware' 'nouveau-xvmc-git: for X11 Video Motion Compensation on nVidia Video Hardware' 'soft-xvmc-git: for X11 Video Motion Compensation on DRI Software Rasterizer' @@ -630,11 +775,11 @@ package_mesa-git() { cd $srcdir/build make DESTDIR=$pkgdir install - rm -fr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h} - rm -fr $pkgdir/usr/lib/{egl,gbm,opencl,xorg} - rm -f $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*} - rm -f $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc} + rm -fvr $pkgdir/usr/include/{EGL,GLES,GLES2,KHR,VG,gbm.h} + rm -fvr $pkgdir/usr/lib/{egl,gbm,opencl,vdpau,xorg} + rm -fv $pkgdir/usr/lib/{libEGL*,libGL*,libGLESv*,libOSMesa*,libOpenCL*,libOpenVG*,libXvMC*,libdricore*,libgbm*,libglapi*,libwayland*} + rm -fv $pkgdir/usr/lib/pkgconfig/{egl.pc,gbm.pc,glesv1_cm.pc,glesv2.pc,osmesa.pc,vg.pc,wayland-egl.pc} install -m755 -d $pkgdir/usr/share/licenses/mesa - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/mesa - bin/minstall docs/license.html $pkgdir/usr/share/licenses/mesa + install -Dm644 docs/COPYING $pkgdir/usr/share/licenses/mesa + install -Dm644 docs/license.html $pkgdir/usr/share/licenses/mesa } diff --git a/testing/libmpc/PKGBUILD b/testing/libmpc/PKGBUILD index 0c358f943..57a4e49f1 100644 --- a/testing/libmpc/PKGBUILD +++ b/testing/libmpc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165240 2012-08-14 08:30:00Z allan $ +# $Id: PKGBUILD 166368 2012-09-07 01:12:26Z allan $ # Maintainer: Allan McRae pkgname=libmpc -pkgver=1.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" arch=('i686' 'x86_64') @@ -11,8 +11,9 @@ license=('LGPL') depends=('mpfr>=3.0.0') options=('!libtool') install=libmpc.install -source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) -md5sums=('13370ceb2e266c5eeb2f7e78c24b7858') +source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig}) +md5sums=('b32a2e1a3daa392372fbd586d1ed3679' + 'c064863fbbb5831ba4f75f1181333862') build() { cd "${srcdir}/mpc-${pkgver}" -- cgit v1.2.3-54-g00ecf From dda96ce532ef99400e2b7703a0f538771b36b624 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 9 Sep 2012 00:11:39 +0000 Subject: Sun Sep 9 00:11:39 UTC 2012 --- community/0ad/PKGBUILD | 10 +- community/kdbg/PKGBUILD | 6 +- community/python-pymongo/PKGBUILD | 12 +- community/ruby-gtk2/PKGBUILD | 6 +- community/sshguard/PKGBUILD | 11 +- community/sshguard/sshguard-journalctl | 2 + community/sshguard/sshguard.service | 2 +- extra/alsa-lib/PKGBUILD | 6 +- extra/alsa-plugins/PKGBUILD | 12 +- extra/alsa-utils/PKGBUILD | 8 +- extra/avfs/PKGBUILD | 18 ++- extra/facile/PKGBUILD | 12 +- extra/facile/ocaml-facile-ocaml-4.patch | 25 ++++ extra/fetchmail/PKGBUILD | 14 +-- extra/lablgtk2/PKGBUILD | 12 +- extra/ocaml/PKGBUILD | 10 +- extra/php-apc/PKGBUILD | 6 +- extra/qemu/PKGBUILD | 14 +-- extra/qpdf/PKGBUILD | 8 +- extra/unison/PKGBUILD | 13 +- gnome-unstable/eog/PKGBUILD | 33 +++++ gnome-unstable/eog/eog.install | 13 ++ gnome-unstable/gnome-desktop/PKGBUILD | 31 +++++ gnome-unstable/gnome-keyring/PKGBUILD | 32 +++++ gnome-unstable/gnome-keyring/gnome-keyring.install | 12 ++ gnome-unstable/gnome-session/PKGBUILD | 42 +++++++ .../gnome-session-3.3.1-llvmpipe.patch | 9 ++ gnome-unstable/gnome-session/gnome-session.install | 12 ++ gnome-unstable/gnome-session/timeout.patch | 24 ++++ gnome-unstable/gnome-settings-daemon/PKGBUILD | 36 ++++++ .../gnome-settings-daemon.install | 12 ++ gnome-unstable/gnome-themes-standard/PKGBUILD | 31 +++++ gnome-unstable/ibus/PKGBUILD | 38 ++++++ gnome-unstable/ibus/ibus.install | 17 +++ gnome-unstable/libgnome-keyring/PKGBUILD | 28 +++++ gnome-unstable/libpeas/PKGBUILD | 32 +++++ gnome-unstable/libpeas/libpeas.install | 11 ++ gnome-unstable/mutter/PKGBUILD | 33 +++++ gnome-unstable/mutter/mutter.install | 19 +++ gnome-unstable/vala/PKGBUILD | 27 +++++ libre/virtualbox-libre-modules-lts/PKGBUILD | 6 +- libre/virtualbox-libre-modules/PKGBUILD | 6 +- libre/virtualbox-libre/PKGBUILD | 6 +- libre/virtualbox-libre/virtualbox-libre.install | 12 ++ multilib/lib32-alsa-lib/PKGBUILD | 6 +- multilib/lib32-alsa-plugins/PKGBUILD | 6 +- multilib/lib32-fontconfig/PKGBUILD | 37 ++++-- pcr/libglu-git/PKGBUILD | 52 ++++++++ staging/ghc/PKGBUILD | 133 +++++++++++---------- staging/ghc/build.mk | 27 ++++- testing/elfutils/PKGBUILD | 39 ++++++ .../elfutils-0.155-binutils-pr-ld-13621.patch | 16 +++ testing/kmod/PKGBUILD | 14 +-- testing/pinentry/PKGBUILD | 40 +++++++ testing/pinentry/pinentry.install | 20 ++++ testing/pinentry/qt4-pinentry-window.patch | 28 +++++ 56 files changed, 962 insertions(+), 185 deletions(-) create mode 100644 community/sshguard/sshguard-journalctl create mode 100644 extra/facile/ocaml-facile-ocaml-4.patch create mode 100644 gnome-unstable/eog/PKGBUILD create mode 100644 gnome-unstable/eog/eog.install create mode 100644 gnome-unstable/gnome-desktop/PKGBUILD create mode 100644 gnome-unstable/gnome-keyring/PKGBUILD create mode 100644 gnome-unstable/gnome-keyring/gnome-keyring.install create mode 100644 gnome-unstable/gnome-session/PKGBUILD create mode 100644 gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch create mode 100644 gnome-unstable/gnome-session/gnome-session.install create mode 100644 gnome-unstable/gnome-session/timeout.patch create mode 100644 gnome-unstable/gnome-settings-daemon/PKGBUILD create mode 100644 gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install create mode 100644 gnome-unstable/gnome-themes-standard/PKGBUILD create mode 100644 gnome-unstable/ibus/PKGBUILD create mode 100644 gnome-unstable/ibus/ibus.install create mode 100644 gnome-unstable/libgnome-keyring/PKGBUILD create mode 100644 gnome-unstable/libpeas/PKGBUILD create mode 100644 gnome-unstable/libpeas/libpeas.install create mode 100644 gnome-unstable/mutter/PKGBUILD create mode 100644 gnome-unstable/mutter/mutter.install create mode 100644 gnome-unstable/vala/PKGBUILD create mode 100644 pcr/libglu-git/PKGBUILD create mode 100644 testing/elfutils/PKGBUILD create mode 100644 testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch create mode 100644 testing/pinentry/PKGBUILD create mode 100644 testing/pinentry/pinentry.install create mode 100644 testing/pinentry/qt4-pinentry-window.patch (limited to 'gnome-unstable') diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index 6b2a83894..67dd75224 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -2,9 +2,9 @@ # Contributor: t3ddy # Contributor: Adrián Chaves Fernández (Gallaecio) pkgname=0ad -pkgver=a10 -_pkgver=r11863-alpha -pkgrel=3 +pkgver=a11 +_pkgver=0.0.11-alpha +pkgrel=1 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://wildfiregames.com/0ad" @@ -13,7 +13,7 @@ depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'l makedepends=('boost' 'cmake' 'mesa') source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz" "boost-1.50.patch") -md5sums=('f42a2e18515cbcd48b99f0ea3796b3a4' +md5sums=('0feedd076ea441ca821073b4b7014946' '570724341102e23730de2f70d3a1b97c') build() { @@ -21,7 +21,7 @@ build() { sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" - patch -d ../.. -Np1 < $srcdir/boost-1.50.patch + #patch -d ../.. -Np1 < $srcdir/boost-1.50.patch ./update-workspaces.sh \ --with-system-enet \ diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD index 9f25788df..086be73dd 100644 --- a/community/kdbg/PKGBUILD +++ b/community/kdbg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57376 2011-10-26 15:29:28Z spupykin $ +# $Id: PKGBUILD 75968 2012-09-07 11:44:58Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Eric Belanger # Contributor: Jason Taylor # Contributor: Georg Grabler pkgname=kdbg -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="A gdb GUI for KDE" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('kdebase-runtime' 'gdb') makedepends=('automoc4' 'cmake') options=('!libtool') source=("http://downloads.sourceforge.net/project/kdbg/Source%20Code/$pkgver/kdbg-$pkgver.tar.gz") -md5sums=('a19095dce4cb5df0dbaa9368d400fc30') +md5sums=('392f477f0a4c1f1b921ce7d6c7128fcb') build() { cd $srcdir diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index a95c1bdcd..61cc96781 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74649 2012-08-01 07:21:31Z arodseth $ +# $Id: PKGBUILD 75966 2012-09-07 11:19:50Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Thomas S Hatch pkgname=python-pymongo -pkgver=2.2.1 +pkgver=2.3 pkgrel=1 -pkgdesc="Python driver for MongoDB" +pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686') -license=("APACHE") -url="http://pypi.python.org/pypi/pymongo/" +license=('APACHE') +url='http://pypi.python.org/pypi/pymongo/' depends=('python') makedepends=('python-distribute') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('0a6251742736dd3c80025e701ec97ea1540bc97df26ada7b3bf40ff01daa7032') +sha256sums=('8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc') package() { cd "$srcdir/pymongo-$pkgver" diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 12806c948..37bd37c19 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75168 2012-08-14 11:22:21Z arodseth $ +# $Id: PKGBUILD 75976 2012-09-07 16:59:24Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Eric Bélanger # Contributor: Brad Fanella @@ -7,14 +7,14 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 arch=('x86_64' 'i686') url="http://ruby-gnome2.sourceforge.jp/" license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('31c5da239bd1cb25daca026e453106f29503195c445d73a9cf1aceb22379d100') +sha256sums=('460e50ff5e69238a648d59b1bae31a0748273307eecad734b1c1abdecd361dcb') build() { cd "$srcdir/ruby-gtk2-$pkgver" diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index be7fa6439..8bd832a39 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75872 2012-09-04 09:23:53Z mtorromeo $ +# $Id: PKGBUILD 75956 2012-09-07 08:27:47Z mtorromeo $ # Maintainer: Sergej Pupykin # Maintainer: Massimiliano Torromeo # Contributor: Sergej Pupykin pkgname=sshguard pkgver=1.5 -pkgrel=4 +pkgrel=5 pkgdesc="brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64') #url="http://sourceforge.net/projects/sshguard/" @@ -17,11 +17,13 @@ install=sshguard.install source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2" sshguard.rc sshguard.conf.d - sshguard.service) + sshguard.service + sshguard-journalctl) sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19' 'a810da878e40be8616a93c9984e7dbd3700367d665b78b8aa2498228bb33cb6e' '66f28e2cc81e5686f8fd5c0d5a5015d7feecbe018a259f4032cfbacf6fe8d1c3' - '3f183519c80141aaffdc333e9af3fc6717a86aebda9df70d8015ad27173eefcf') + '299b5f73e4c53aac6007c87210fc862987042b9d4c088180721bae6ab2214b09' + '385d1dea0c6f5495a7c7e5051f1354f1eab85ee5ef599f6698ab353263b8c9bb') build() { cd "$srcdir/$pkgname-$pkgver" @@ -40,4 +42,5 @@ package() { install -Dm0644 "$srcdir/sshguard.service" "$pkgdir/usr/lib/systemd/system/sshguard.service" install -Dm0755 "$srcdir/sshguard.rc" "$pkgdir/etc/rc.d/sshguard" install -Dm0644 "$srcdir/sshguard.conf.d" "$pkgdir/etc/conf.d/sshguard" + install -Dm0755 "$srcdir/sshguard-journalctl" "$pkgdir/usr/lib/systemd/scripts/sshguard-journalctl" } diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl new file mode 100644 index 000000000..bd4b6f608 --- /dev/null +++ b/community/sshguard/sshguard-journalctl @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/bin/journalctl -flbp info -n0 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service index 6dc542427..ad9f90ce2 100644 --- a/community/sshguard/sshguard.service +++ b/community/sshguard/sshguard.service @@ -4,7 +4,7 @@ Wants=sshd.service [Service] EnvironmentFile=/etc/conf.d/sshguard -ExecStart=/usr/sbin/sshguard -l /var/log/auth.log -b /var/db/sshguard/blacklist.db ${SSHGUARD_ARGS} +ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl -b /var/db/sshguard/blacklist.db ${SSHGUARD_ARGS} [Install] WantedBy=multi-user.target diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index b04e7ef4e..a538da976 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 147696 2012-01-27 07:25:15Z tpowa $ +# $Id: PKGBUILD 166377 2012-09-07 09:11:49Z tpowa $ # Maintainer: judd pkgname=alsa-lib -pkgver=1.0.25 +pkgver=1.0.26 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -24,4 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('06fe5819020c6684b991dcffc5471304') +md5sums=('2dfa35d28471d721e592b616beedf965') diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index 627fe1cce..b7bcee9a0 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163142 2012-07-08 09:30:27Z ibiru $ +# $Id: PKGBUILD 166381 2012-09-07 09:14:25Z tpowa $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Sergej Pupykin # Contributor: Daniel Ehlers pkgname=alsa-plugins -pkgver=1.0.25 -pkgrel=2 +pkgver=1.0.26 +pkgrel=1 pkgdesc="Extra alsa plugins" arch=(i686 x86_64) url="http://www.alsa-project.org" @@ -21,9 +21,6 @@ options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch) -md5sums=('038c023eaa51171f018fbf7141255185' - '50d9adcda20756d063e676a563c201d9' - '697c6275f678d86ded2e5092d8a154c9') build() { cd $pkgname-$pkgver @@ -40,3 +37,6 @@ package() { install -d "$pkgdir/usr/share/doc/$pkgname" install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" } +md5sums=('4facd408326ef5567a7d4ceb6589e6b0' + '50d9adcda20756d063e676a563c201d9' + '697c6275f678d86ded2e5092d8a154c9') diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 918a84d27..5fd8b4e61 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157726 2012-04-29 04:09:24Z allan $ +# $Id: PKGBUILD 166379 2012-09-07 09:13:20Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=alsa-utils -pkgver=1.0.25 -pkgrel=3 +pkgver=1.0.26 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -36,7 +36,7 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9' +md5sums=('4dcf1017fafc91603af96705c073eca9' '2ba1a1cbf653bf1a69f8a720fd6549da' '4c8ae9f976c7df5e271a4cb91ccc7767' '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/avfs/PKGBUILD b/extra/avfs/PKGBUILD index 0fcc24408..85cfe088b 100644 --- a/extra/avfs/PKGBUILD +++ b/extra/avfs/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 151581 2012-02-27 18:31:46Z giovanni $ +# $Id: PKGBUILD 166454 2012-09-08 02:48:18Z eric $ # Maintainer: Kevin Piche # Contributor: K. Piche pkgname=avfs -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="A virtual filesystem that allows browsing of compressed files" arch=('i686' 'x86_64') -license=('GPL') +license=('GPL' 'LGPL') url="http://avf.sourceforge.net/" -source=("http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2" - 'avfs-1.0.0-fix_open_missing_mode.patch') -options=(!emptydirs !libtool) depends=('fuse' 'xz' 'perl') -md5sums=('c58421e4f294125895f2c6653a7366a7' - 'bdd84b179a869bc6d64529a64a640fc6') +options=('!emptydirs' '!libtool') +source=(http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2{,.asc}) +md5sums=('f0f254d092e54da14bbf3ea22b76da99' + 'd71607de21819f3d67246473f0bc21f3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/avfs-1.0.0-fix_open_missing_mode.patch" - ./configure --prefix=/usr \ --enable-library \ --enable-fuse \ diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD index dc128d465..9de25cd83 100644 --- a/extra/facile/PKGBUILD +++ b/extra/facile/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 135660 2011-08-17 06:53:34Z tpowa $ +# $Id: PKGBUILD 166401 2012-09-07 16:46:16Z tpowa $ # Maintainer: Tobias Powalowski pkgname=facile pkgver=1.1 -pkgrel=13 +pkgrel=14 pkgdesc="A Functional Constraint Library" arch=(i686 x86_64) url="http://www.recherche.enac.fr/opti/facile/" license="LGPL" makedepends=('ocaml') depends=() -source=(http://www.recherche.enac.fr/opti/facile/distrib/$pkgname-$pkgver.tar.gz) +source=(http://www.recherche.enac.fr/opti/facile/distrib/$pkgname-$pkgver.tar.gz + ocaml-facile-ocaml-4.patch) + md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e') build() { cd $startdir/src/$pkgname-$pkgver + # fix ocaml4 + patch -Np1 -i ../ocaml-facile-ocaml-4.patch ./configure make || return 1 mkdir -p $startdir/pkg/usr/lib/ocaml/facile cd src install -D -m 644 facile.cmxa facile.cmi facile.cma facile.a $startdir/pkg/usr/lib/ocaml/facile } +md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e' + '1ffc2f08c9f1db8ef0d444ec06f82b79') diff --git a/extra/facile/ocaml-facile-ocaml-4.patch b/extra/facile/ocaml-facile-ocaml-4.patch new file mode 100644 index 000000000..6006a16ba --- /dev/null +++ b/extra/facile/ocaml-facile-ocaml-4.patch @@ -0,0 +1,25 @@ +diff -ur facile-1.1.old/src/facile.mli facile-1.1/src/facile.mli +--- facile-1.1.old/src/facile.mli 2004-09-08 10:51:02.000000000 +0100 ++++ facile-1.1/src/facile.mli 2012-06-10 21:06:41.553916954 +0100 +@@ -127,7 +127,7 @@ + module Hashtbl : + sig + type ('a, 'b) t +- val create : int -> ('a, 'b) t ++ val create : ?random:bool -> int -> ('a, 'b) t + val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t + val add : ('a, 'b) t -> 'a -> 'b -> unit + val find : ('a, 'b) t -> 'a -> 'b +Binary files facile-1.1.old/src/fcl_data.cmi and facile-1.1/src/fcl_data.cmi differ +diff -ur facile-1.1.old/src/fcl_data.mli facile-1.1/src/fcl_data.mli +--- facile-1.1.old/src/fcl_data.mli 2004-09-08 10:51:02.000000000 +0100 ++++ facile-1.1/src/fcl_data.mli 2012-06-10 21:06:25.841590828 +0100 +@@ -23,7 +23,7 @@ + + module Hashtbl : sig + type ('a, 'b) t +- val create : int -> ('a, 'b) t ++ val create : ?random:bool -> int -> ('a, 'b) t + val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t + val add : ('a, 'b) t -> 'a -> 'b -> unit + val find : ('a, 'b) t -> 'a -> 'b diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index 84c734b5b..bf5cec137 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160935 2012-06-07 06:29:24Z pierre $ +# $Id: PKGBUILD 166406 2012-09-07 16:52:15Z pierre $ pkgname=fetchmail -pkgver=6.3.21 -pkgrel=4 +pkgver=6.3.22 +pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64') url="http://fetchmail.berlios.de/" @@ -14,11 +14,11 @@ optdepends=('tk: for using fetchmailconf' backup=('etc/conf.d/fetchmail') options=('!makeflags') install='fetchmail.install' -source=("http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz" - "http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz.asc" +source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz" + "http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" 'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service') -sha1sums=('4f1e5f2e1a616d4007da1de9c976c2c1fb5dcb81' - 'bc8c68ec0d71b97d3168981cbaa4b04ab8e56059' +sha1sums=('3bb755010dbe568d53840e22d8e87d8d5db25b19' + '27184b75ef09c5202bede9863ae8abc3d0cdb1d2' 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88' '30401729386d6f774c6c36ab8530842166de54a8' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index c60fc2e76..74632215d 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148806 2012-02-05 11:51:19Z ibiru $ +# $Id: PKGBUILD 166399 2012-09-07 16:43:18Z tpowa $ #Maintainer: Tobias Powalowski pkgname=lablgtk2 -pkgver=2.14.2 -pkgrel=5 +pkgver=2.16.0 +pkgrel=1 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64) license=('LGPL') @@ -12,9 +12,8 @@ depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourcevie makedepends=('ocaml') optdepends=('ocaml: for using the tools') DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u') -source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz) +source=(https://forge.ocamlcore.org/frs/download.php/979/lablgtk-${pkgver}.tar.gz) options=(!makeflags) -md5sums=('bad77680a72dab8b915cae99d1ec9b1f') build() { cd "${srcdir}/lablgtk-${pkgver}" @@ -25,6 +24,7 @@ build() { package() { cd "${srcdir}/lablgtk-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} old-install install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/" } +md5sums=('052519ce2a77d2316732bc4d565b6399') diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 7ba798ba7..5d882e8a6 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143814 2011-11-29 13:33:35Z stephane $ +# $Id: PKGBUILD 166395 2012-09-07 16:07:57Z tpowa $ # Maintainer: Tobias Powalowski pkgbase='ocaml' pkgname=('ocaml' 'ocaml-compiler-libs') -pkgver=3.12.1 -pkgrel=3 +pkgver=4.00.0 +pkgrel=1 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') license=('LGPL2' 'custom: QPL-1.0') @@ -12,8 +12,7 @@ url="http://caml.inria.fr/" depends=('gdbm') makedepends=('tk' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz) -md5sums=('814a047085f0f901ab7d8e3a4b7a9e65') +source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz) options=('!makeflags' '!emptydirs') build() { @@ -55,3 +54,4 @@ optdepends=() install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } +md5sums=('fa11560a45793bd9fa45c1295a6f4a91') diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index ab10abae0..5be677c38 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165375 2012-08-16 20:55:01Z pierre $ +# $Id: PKGBUILD 166404 2012-09-07 16:52:02Z pierre $ # Maintainer: Pierre Schmitz pkgname=php-apc -pkgver=3.1.12 +pkgver=3.1.13 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' @@ -11,7 +11,7 @@ depends=('php') license=('PHP') source=("http://pecl.php.net/get/APC-${pkgver}.tgz") backup=('etc/php/conf.d/apc.ini') -md5sums=('b0ab91726717f410dfa284d5d1723b60') +md5sums=('c9e47002e3a67ebde3a6f81437c7b6e0') build() { cd $srcdir/APC-$pkgver diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index b64cd54e8..b243184f7 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 163504 2012-07-13 16:36:15Z tpowa $ +# $Id: PKGBUILD 166385 2012-09-07 12:55:19Z tpowa $ # Maintainer: Tobias Powalowski pkgname=qemu -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=1 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64') @@ -12,17 +12,13 @@ depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'blue backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 - 65-kvm.rules - qemu-glibc-2.16-build.patch) + 65-kvm.rules) options=(!strip) build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' x86_64.ld - # patch from fedora git: http://pkgs.fedoraproject.org/gitweb/?p=qemu.git - # fix changes from glibc-2.16 - patch -Np1 -i ../qemu-glibc-2.16-build.patch ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ @@ -46,6 +42,8 @@ package() { done } -md5sums=('f691baa30e8fb40f37f2797fba892e12' +md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61' 'b316a066d2f1bb57d8f5b7ea1d0d1caf' '8687179e77ab954c4a43017d030f7349') +md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61' + 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD index dead82514..6ba997c51 100644 --- a/extra/qpdf/PKGBUILD +++ b/extra/qpdf/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 166182 2012-09-05 08:14:58Z andyrtr $ +# $Id: PKGBUILD 166374 2012-09-07 06:46:11Z andyrtr $ # Maintainer: AndyRTR # Contributor: Miguel Revilla # Contributor: David Sotelo # Contributor: Nuno Araujo pkgname=qpdf -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="QPDF: A Content-Preserving PDF Transformation System" arch=('i686' 'x86_64') url="http://qpdf.sourceforge.net/" @@ -15,7 +15,7 @@ depends=('pcre' 'perl') makedepends=('make') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('48767e2519029d0214cd0fcafa3a8f8c') +md5sums=('af6f6f964481295a6ca0766185bfa274') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD index 9d019f0c2..f3c933315 100644 --- a/extra/unison/PKGBUILD +++ b/extra/unison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161432 2012-06-11 13:29:15Z tpowa $ +# $Id: PKGBUILD 166409 2012-09-07 16:52:52Z tpowa $ #Maintainer: Tobias Powalowski pkgname=unison -pkgver=2.40.63 -pkgrel=4 +pkgver=2.40.65 +pkgrel=1 pkgdesc="Unison is a file-synchronization tool" arch=(i686 x86_64) license=('GPL2') @@ -11,10 +11,9 @@ url="http://www.cis.upenn.edu/~bcpierce/unison" depends=('glibc') makedepends=('ocaml' 'lablgtk2' 'imagemagick') optdepends=('gtk2: for gtk2 support') -source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz +source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz $pkgname.desktop) -md5sums=('3281207850cf6f0a17fe73f371893bd3' - '2daecba7705455a8e4b769e48b059872') + options=(!makeflags) build() { @@ -51,3 +50,5 @@ package() { # make versioned symlink #29827 ln -s unison unison-2.40 } +md5sums=('ade42565aa0f94834664040108119f5e' + '2daecba7705455a8e4b769e48b059872') diff --git a/gnome-unstable/eog/PKGBUILD b/gnome-unstable/eog/PKGBUILD new file mode 100644 index 000000000..a36e354ca --- /dev/null +++ b/gnome-unstable/eog/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 166438 2012-09-07 19:26:51Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=eog +pkgver=3.5.91 +pkgrel=1 +pkgdesc="Eye of Gnome: An image viewing and cataloging program" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') +makedepends=('gtk-doc' 'intltool' 'itstool') +install=eog.install +groups=('gnome-extra') +options=('!emptydirs' '!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('316966a89666df57c1ed55a58eed6eb59701d356ed4594978e4c4b4d05b1e9c2') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # remove it from Xfce menu that ships its own thingy + echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop +} diff --git a/gnome-unstable/eog/eog.install b/gnome-unstable/eog/eog.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/gnome-unstable/eog/eog.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-desktop/PKGBUILD b/gnome-unstable/gnome-desktop/PKGBUILD new file mode 100644 index 000000000..668d51213 --- /dev/null +++ b/gnome-unstable/gnome-desktop/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 166428 2012-09-07 18:13:29Z jgc $ +# Maintainer: Jan de Groot + +pkgname=gnome-desktop +pkgver=3.5.91 +pkgrel=1 +epoch=1 +pkgdesc="Library with common API for various GNOME modules" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('68b85b31e137af27edc0f9a0b56c9113f4df61d0172716c97b3e96ad12a2112a') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-desktop \ + --with-gnome-distributor="Arch Linux" + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-keyring/PKGBUILD b/gnome-unstable/gnome-keyring/PKGBUILD new file mode 100644 index 000000000..4fb4d52f2 --- /dev/null +++ b/gnome-unstable/gnome-keyring/PKGBUILD @@ -0,0 +1,32 @@ +#$Id: PKGBUILD 166411 2012-09-07 16:59:55Z jgc $ +# Maintainer: Jan De Groot + +pkgname=gnome-keyring +pkgver=3.5.91 +pkgrel=1 +pkgdesc="GNOME Password Management daemon" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('gtk3' 'gcr' 'libcap-ng') +makedepends=('intltool') +groups=('gnome') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=gnome-keyring.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6e2d0f837aef54392621ed09be6eb28a97c9e27b0e10248c6fef31aef61080a3') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-keyring \ + --with-pam-dir=/usr/lib/security --with-root-certs=/etc/ssl/certs \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-keyring/gnome-keyring.install b/gnome-unstable/gnome-keyring/gnome-keyring.install new file mode 100644 index 000000000..c351377a2 --- /dev/null +++ b/gnome-unstable/gnome-keyring/gnome-keyring.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/gnome-session/PKGBUILD b/gnome-unstable/gnome-session/PKGBUILD new file mode 100644 index 000000000..2006f5241 --- /dev/null +++ b/gnome-unstable/gnome-session/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 166422 2012-09-07 17:46:20Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-session +pkgver=3.5.91 +pkgrel=1 +pkgdesc="The GNOME Session Handler" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' + 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' + 'upower') +makedepends=('intltool' 'mesa' 'xtrans') +options=('!emptydirs') +install=gnome-session.install +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gnome-session-3.3.1-llvmpipe.patch timeout.patch) +sha256sums=('407fe44f8567318a789ae013f2f5f6da27b458e93ad4f66e287719e23b4e6c84' + '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e' + '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') + +build() { + cd $pkgname-$pkgver + + # Allow software rendering + patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch + + # Increase timeout, for slow machines + patch -Np1 -i ../timeout.patch + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ + --disable-schemas-compile --enable-systemd + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch new file mode 100644 index 000000000..40da1c9b7 --- /dev/null +++ b/gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch @@ -0,0 +1,9 @@ +diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility +--- gnome-session-3.3.1/data/hardware-compatibility.jx 2011-10-21 10:35:39.000000000 -0400 ++++ gnome-session-3.3.1/data/hardware-compatibility 2011-11-03 17:53:17.156407217 -0400 +@@ -20,4 +20,4 @@ + + # Gallium has softpipe and llvmpipe + -softpipe +--llvmpipe ++#llvmpipe diff --git a/gnome-unstable/gnome-session/gnome-session.install b/gnome-unstable/gnome-session/gnome-session.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/gnome-unstable/gnome-session/gnome-session.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-session/timeout.patch b/gnome-unstable/gnome-session/timeout.patch new file mode 100644 index 000000000..a26b0dcf5 --- /dev/null +++ b/gnome-unstable/gnome-session/timeout.patch @@ -0,0 +1,24 @@ +diff -u -r gnome-session-3.4.2/gnome-session/gsm-session-fill.c gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c +--- gnome-session-3.4.2/gnome-session/gsm-session-fill.c 2012-02-02 15:33:01.000000000 +0100 ++++ gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c 2012-06-10 02:39:46.184348462 +0200 +@@ -36,7 +36,7 @@ + #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider" + + /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */ +-#define GSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */ ++#define GSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */ + + typedef void (*GsmFillHandleProvider) (const char *provides, + const char *default_provider, +diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c +--- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 ++++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200 +@@ -30,7 +30,7 @@ + #include + + /* Wait up to this long for a running check to finish */ +-#define PROPERTY_CHANGE_TIMEOUT 5000 ++#define PROPERTY_CHANGE_TIMEOUT 12000 + + /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ + #define NO_ACCEL 0 diff --git a/gnome-unstable/gnome-settings-daemon/PKGBUILD b/gnome-unstable/gnome-settings-daemon/PKGBUILD new file mode 100644 index 000000000..c9c72b58c --- /dev/null +++ b/gnome-unstable/gnome-settings-daemon/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 166445 2012-09-07 22:40:50Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-settings-daemon +pkgver=3.5.91 +pkgrel=1 +pkgdesc="The GNOME Settings daemon" +arch=('i686' 'x86_64') +license=('GPL') +depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' + 'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus') +makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl') +options=('!emptydirs' '!libtool') +install=gnome-settings-daemon.install +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('005ad39fb50259fa2a8780db98498bb0af50ce4002cfe0c6e3017107df25ae9e') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ + --enable-systemd + + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install b/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-themes-standard/PKGBUILD b/gnome-unstable/gnome-themes-standard/PKGBUILD new file mode 100644 index 000000000..8264c3091 --- /dev/null +++ b/gnome-unstable/gnome-themes-standard/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 166449 2012-09-07 22:50:36Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-themes-standard +pkgver=3.5.91 +pkgrel=1 +pkgdesc="Default themes for the GNOME desktop" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL2') +depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg') +makedepends=('intltool') +groups=('gnome') +replaces=('gnome-themes') +conflicts=('gnome-themes') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b6f514b60aa6e8d748a0356d5c4dc6951d8068396772c8497d780017dadbc0f1') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/ibus/PKGBUILD b/gnome-unstable/ibus/PKGBUILD new file mode 100644 index 000000000..79bf2f9b3 --- /dev/null +++ b/gnome-unstable/ibus/PKGBUILD @@ -0,0 +1,38 @@ +# $Id$ +# Contributor: Rainy +# Contributor: Lee.MaRS +# Contributor: Daniel J Griffiths +# Maintainer: Brad Fanella + +pkgname=ibus +pkgver=1.4.99.20120822 +pkgrel=1 +pkgdesc="Next Generation Input Bus for Linux" +arch=('i686' 'x86_64') +url="http://ibus.googlecode.com" +license=('LGPL') +makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool') +depends=('hicolor-icon-theme' 'gtk2' 'gtk3') +options=('!libtool') +install=ibus.install +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +sha1sums=('46d836b68733953b443859f47ad6991f4584658d') + +build() { + cd ${pkgname}-${pkgver} + export PYTHON=python2 + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/ibus \ + --sysconfdir=/etc \ + --disable-gconf \ + --enable-dconf \ + --disable-memconf \ + --disable-ui + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/ibus/ibus.install b/gnome-unstable/ibus/ibus.install new file mode 100644 index 000000000..e4e446693 --- /dev/null +++ b/gnome-unstable/ibus/ibus.install @@ -0,0 +1,17 @@ +post_install() { + gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + gtk-query-immodules-3.0 --update-cache + + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_remove() { + gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + gtk-query-immodules-3.0 --update-cache + + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/libgnome-keyring/PKGBUILD b/gnome-unstable/libgnome-keyring/PKGBUILD new file mode 100644 index 000000000..a2599e1c4 --- /dev/null +++ b/gnome-unstable/libgnome-keyring/PKGBUILD @@ -0,0 +1,28 @@ +#$Id: PKGBUILD 166414 2012-09-07 17:06:04Z jgc $ +#Maintainer: Jan De Groot + +pkgname=libgnome-keyring +pkgver=3.5.6 +pkgrel=1 +pkgdesc="GNOME keyring client library" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('dbus-core' 'glib2' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('c4b99d7d24fe125d4bebb09b468ac086069e2f48ffdb9a33e894ea28542d4467') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-keyring + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libpeas/PKGBUILD b/gnome-unstable/libpeas/PKGBUILD new file mode 100644 index 000000000..3c653cb3b --- /dev/null +++ b/gnome-unstable/libpeas/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 166436 2012-09-07 19:19:46Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=libpeas +pkgver=1.5.0 +pkgrel=1 +pkgdesc="A GObject-based plugins engine" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection') +makedepends=('gtk-doc' 'intltool' 'python2-gobject' 'gjs' 'seed' 'glade') +optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' + 'seed: gobject-based plugin engine - seed runtime loader') +options=('!libtool') +install=libpeas.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('f5ccc0f4e0b24db273d5e11d161494a6751dd2178813b9d98832dac0a049b0bb') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/libpeas/libpeas.install b/gnome-unstable/libpeas/libpeas.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/gnome-unstable/libpeas/libpeas.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD new file mode 100644 index 000000000..1dac0c745 --- /dev/null +++ b/gnome-unstable/mutter/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 166424 2012-09-07 17:53:28Z jgc $ +# Maintainer: Jan "heftig" Steffens +# Maintainer: Ionut Biru +# Contributor: Michael Kanis + +pkgname=mutter +pkgver=3.5.91 +pkgrel=1 +pkgdesc="A window manager for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity') +makedepends=('intltool' 'gnome-doc-utils') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool' '!emptydirs') +install=mutter.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('ceb69923e691a9a10ac34535634795f96b17b6cbdec8f38d846a46f8a73b9332') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/mutter \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/mutter/mutter.install b/gnome-unstable/mutter/mutter.install new file mode 100644 index 000000000..c47f1cef2 --- /dev/null +++ b/gnome-unstable/mutter/mutter.install @@ -0,0 +1,19 @@ +pkgname=mutter + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + /usr/sbin/gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/vala/PKGBUILD b/gnome-unstable/vala/PKGBUILD new file mode 100644 index 000000000..0d7dd2279 --- /dev/null +++ b/gnome-unstable/vala/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 166430 2012-09-07 18:23:02Z jgc $ +# Maintainer : Ionut Biru +# Contributor: Timm Preetz + +pkgname=vala +pkgver=0.17.6 +pkgrel=1 +pkgdesc="Compiler for the GObject type system" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Vala" +license=('LGPL') +depends=('glib2') +makedepends=('libxslt') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('79bfa454813c22ca9eb0864a77bf51764e8944dc02c7e4b301feb45d782e2e25') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --enable-vapigen + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 565ff1633..a3355d582 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-modules-lts' 'virtualbox-libre-parabola-modules-lts') -pkgver=4.1.20 -pkgrel=3 +pkgver=4.1.22 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -20,7 +20,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} os_musix_64.png os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png os_trisquel.png os_ututo_64.png os_ututo.png os_venenux.png libre.patch free-distros.patch) -md5sums=('5784c6dda8a9d53f8f21b2d41eba903c' +md5sums=('84c5beeead094ce52d098105897aadbb' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe' '8538dba8686d7449cb481c9bae9d722a' diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 8497c28b8..917a14f0c 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules') -pkgver=4.1.20 -pkgrel=3.1 +pkgver=4.1.22 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -19,7 +19,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} os_musix_64.png os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png os_trisquel.png os_ututo_64.png os_ututo.png os_venenux.png libre.patch free-distros.patch) -md5sums=('5784c6dda8a9d53f8f21b2d41eba903c' +md5sums=('84c5beeead094ce52d098105897aadbb' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe' '8538dba8686d7449cb481c9bae9d722a' diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 4a4250e59..208d627ef 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -10,8 +10,8 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-sdk' 'virtualbox-libre-source' 'virtualbox-libre-parabola-source') -pkgver=4.1.20 -pkgrel=2.1 +pkgver=4.1.22 +pkgrel=1.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -252,7 +252,7 @@ package_virtualbox-libre-parabola-source() { cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source" } -md5sums=('5784c6dda8a9d53f8f21b2d41eba903c' +md5sums=('84c5beeead094ce52d098105897aadbb' '5f85710e0b8606de967716ded7b2d351' 'bf5d1eeeec20a042e8af34cd61a9e11b' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install index b6d804eb7..064ee993d 100644 --- a/libre/virtualbox-libre/virtualbox-libre.install +++ b/libre/virtualbox-libre/virtualbox-libre.install @@ -20,6 +20,18 @@ utils() { # arg 1: the new package version post_install() { + cat << EOF + + Virtualbox-libre is a libre version of Virtualbox without Oracle VM VirtualBox + Extension Pack Support and includes a modified OSType list that contains only + free distros distributions endorsed by the Free Software Foundation. + It could generate problems with current virtual machines created on Virtualbox + from others distros. + + To solve it, read https://parabolagnulinux.org/news/virtualbox-libre-new-version/ + +EOF + getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers utils } diff --git a/multilib/lib32-alsa-lib/PKGBUILD b/multilib/lib32-alsa-lib/PKGBUILD index 5f25c3e12..35ed7c985 100644 --- a/multilib/lib32-alsa-lib/PKGBUILD +++ b/multilib/lib32-alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62814 2012-01-27 09:25:15Z bluewind $ +# $Id: PKGBUILD 75960 2012-09-07 10:05:13Z lcarlier $ # Maintainer: Jan "heftig" Steffens _pkgbasename=alsa-lib pkgname=lib32-${_pkgbasename} -pkgver=1.0.25 +pkgver=1.0.26 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support (32 bit)" arch=('x86_64') @@ -13,6 +13,7 @@ makedepends=('gcc-multilib') license=('GPL') options=(!libtool) source=(ftp://ftp.alsa-project.org/pub/lib/${_pkgbasename}-$pkgver.tar.bz2) +md5sums=('2dfa35d28471d721e592b616beedf965') build() { cd $srcdir/${_pkgbasename}-$pkgver @@ -29,4 +30,3 @@ package() { # Clean up lib32 package rm -rf "${pkgdir}"/usr/{bin,include,share} } -md5sums=('06fe5819020c6684b991dcffc5471304') diff --git a/multilib/lib32-alsa-plugins/PKGBUILD b/multilib/lib32-alsa-plugins/PKGBUILD index 87d8c90f9..38001e967 100644 --- a/multilib/lib32-alsa-plugins/PKGBUILD +++ b/multilib/lib32-alsa-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62831 2012-01-27 15:59:19Z heftig $ +# $Id: PKGBUILD 75962 2012-09-07 10:09:56Z lcarlier $ # Maintainer: Jan Alexander Steffens (heftig) _pkgbasename=alsa-plugins pkgname=lib32-$_pkgbasename -pkgver=1.0.25 +pkgver=1.0.26 pkgrel=1 pkgdesc="Extra alsa plugins (32-bit)" arch=(x86_64) @@ -17,7 +17,7 @@ optdepends=('lib32-libpulse: PulseAudio plugin' 'lib32-speex: libspeexdsp resampling plugin') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$_pkgbasename-$pkgver.tar.bz2") -md5sums=('038c023eaa51171f018fbf7141255185') +md5sums=('4facd408326ef5567a7d4ceb6589e6b0') build() { cd "$srcdir/$_pkgbasename-$pkgver" diff --git a/multilib/lib32-fontconfig/PKGBUILD b/multilib/lib32-fontconfig/PKGBUILD index 6afdec946..b3b29008a 100644 --- a/multilib/lib32-fontconfig/PKGBUILD +++ b/multilib/lib32-fontconfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63974 2012-02-08 18:48:56Z pschmitz $ +# $Id: PKGBUILD 75964 2012-09-07 10:17:43Z bluewind $ # Maintainer: Jan de Groot _pkgbasename=fontconfig pkgname=lib32-$_pkgbasename -pkgver=2.8.0 -pkgrel=4 +pkgver=2.10.1 +pkgrel=1 pkgdesc="A library for configuring and customizing font access (32-bit)" arch=(x86_64) url="http://www.fontconfig.org/release/" @@ -11,10 +11,8 @@ license=('custom') depends=('lib32-expat>=2.0.1' 'lib32-freetype2>=2.3.11' $_pkgbasename) makedepends=(gcc-multilib) options=('!libtool') -source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.gz - 30-urw-aliases.patch) -md5sums=('77e15a92006ddc2adbb06f840d591c0e' - '51bc6cb633b50f3c28793361738aac5b') +source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.gz) +md5sums=('c94e380eea42f2f23ca9537035ef1899') build() { export CC="gcc -m32" @@ -22,18 +20,33 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i "${srcdir}/30-urw-aliases.patch" - # enable Position Independent Code for prelinking - export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 + # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well + libtoolize -f + autoreconf -f + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-templatedir=/etc/fonts/conf.avail \ + --with-xmldir=/etc/fonts \ + --localstatedir=/var \ + --disable-static \ + --with-default-fonts=/usr/share/fonts \ + --with-add-fonts=/usr/share/fonts \ + --libdir=/usr/lib32 + make } +check() { + cd "$srcdir/$_pkgbasename-$pkgver" + make -k check +} + package() { cd "${srcdir}/${_pkgbasename}-${pkgver}" make DESTDIR="${pkgdir}" install - + rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir"/{etc,var} mkdir -p "$pkgdir/usr/share/licenses" ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" diff --git a/pcr/libglu-git/PKGBUILD b/pcr/libglu-git/PKGBUILD new file mode 100644 index 000000000..46ff7a358 --- /dev/null +++ b/pcr/libglu-git/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Márcio Silva + +pkgname=libglu-git +pkgver=20120908 +pkgrel=1 +pkgdesc='Mesa GLU utility library' +arch=( + i686 + x86_64 + mips64el +) +url=http://mesa.freedesktop.org/ +license=( + LGPL +) +depends=( + libgl-git +) +makedepends=( + git + mesa-git +) + +_gitroot=git://cgit.freedesktop.org/mesa/glu/ +_gitname=glu + +build() { + msg 'Connecting to git.freedesktop.org GIT server....' + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + else + git clone $_gitroot --depth 1 + fi + msg 'GIT checkout done or server timeout' + msg 'Starting make...' + + cd $srcdir + + # Cleanup and prepare the build dir + [ -d build ] && rm -rf build + cp -r $_gitname build + cd build + + autoreconf -vfi + ./autogen.sh --prefix=/usr + make V=0 +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/staging/ghc/PKGBUILD b/staging/ghc/PKGBUILD index 6f5793c63..1833af561 100644 --- a/staging/ghc/PKGBUILD +++ b/staging/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161393 2012-06-11 00:03:29Z tdziedzic $ +# $Id: PKGBUILD 166372 2012-09-07 04:50:36Z tdziedzic $ # Maintainer: Thomas Dziedzic # Maintainer: Vesa Kaihlavirta # Special note for devs looking to upgrade this package: @@ -7,7 +7,7 @@ # This implies that all libraries need to be rebuilt when ghc is rebuilt. pkgname=ghc -pkgver=7.4.2 +pkgver=7.6.1 pkgrel=1 pkgdesc='The Glasgow Haskell Compiler' arch=('i686' 'x86_64') @@ -19,74 +19,64 @@ makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl') checkdepends=('python2') install='ghc.install' # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... -options=('!makeflags') +#options=('!makeflags') # missing rtl? -provides=('haskell-array=0.4.0.0' - 'haskell-base=4.5.1.0' - 'haskell-binary=0.5.1.0' +provides=('haskell-array=0.4.0.1' + 'haskell-base=4.6.0.0' + 'haskell-binary=0.5.1.1' 'haskell-bin-package-db=0.0.0.0' - 'haskell-bytestring=0.9.2.1' - 'haskell-containers=0.4.2.1' - 'haskell-deepseq=1.3.0.0' - 'haskell-directory=1.1.0.2' - 'haskell-extensible-exceptions=0.1.1.4' - 'haskell-filepath=1.3.0.0' - 'haskell-ghc-prim=0.2.0.0' - 'haskell-haskell2010=1.1.0.1' - 'haskell-haskell98=2.0.0.1' - 'haskell-hoopl=3.8.7.3' - 'haskell-hpc=0.5.1.1' - 'haskell-integer-gmp=0.4.0.0' - 'haskell-old-locale=1.0.0.4' - 'haskell-old-time=1.1.0.0' + 'haskell-bytestring=0.10.0.0' + 'haskell-containers=0.5.0.0' + 'haskell-deepseq=1.3.0.1' + 'haskell-directory=1.2.0.0' + 'haskell-filepath=1.3.0.1' + 'haskell-ghc-prim=0.3.0.0' + 'haskell-haskell2010=1.1.1.0' + 'haskell-haskell98=2.0.0.2' + 'haskell-hoopl=3.9.0.0' + 'haskell-hpc=0.6.0.0' + 'haskell-integer-gmp=0.5.0.0' + 'haskell-old-locale=1.0.0.5' + 'haskell-old-time=1.1.0.1' 'haskell-pretty=1.1.1.0' - 'haskell-process=1.1.0.1' - 'haskell-template-haskell=2.7.0.0' - 'haskell-time=1.4' - 'haskell-unix=2.5.1.1' - 'haskell-cabal=1.14.0' - ) -replaces=('haskell-array<0.4.0.0' - 'haskell-base<4.5.1.0' - 'haskell-binary<0.5.1.0' + 'haskell-process=1.1.0.2' + 'haskell-template-haskell=2.8.0.0' + 'haskell-time=1.4.0.1' + 'haskell-unix=2.6.0.0' + 'haskell-cabal=1.16.0') +replaces=('haskell-array<0.4.0.1' + 'haskell-base<4.6.0.0' + 'haskell-binary<0.5.1.1' 'haskell-bin-package-db<0.0.0.0' - 'haskell-bytestring<0.9.2.1' - 'haskell-containers<0.4.2.1' - 'haskell-deepseq<1.3.0.0' - 'haskell-directory<1.1.0.2' - 'haskell-extensible-exceptions<0.1.1.4' - 'haskell-filepath<1.3.0.0' - 'haskell-ghc-prim<0.2.0.0' - 'haskell-haskell2010<1.1.0.1' - 'haskell-haskell98<2.0.0.1' - 'haskell-hoopl<3.8.7.3' - 'haskell-hpc<0.5.1.1' - 'haskell-integer-gmp<0.4.0.0' - 'haskell-old-locale<1.0.0.4' - 'haskell-old-time<1.1.0.0' + 'haskell-bytestring<0.10.0.0' + 'haskell-containers<0.5.0.0' + 'haskell-deepseq<1.3.0.1' + 'haskell-directory<1.2.0.0' + 'haskell-filepath<1.3.0.1' + 'haskell-ghc-prim<0.3.0.0' + 'haskell-haskell2010<1.1.1.0' + 'haskell-haskell98<2.0.0.2' + 'haskell-hoopl<3.9.0.0' + 'haskell-hpc<0.6.0.0' + 'haskell-integer-gmp<0.5.0.0' + 'haskell-old-locale<1.0.0.5' + 'haskell-old-time<1.1.0.1' 'haskell-pretty<1.1.1.0' - 'haskell-process<1.1.0.1' - 'haskell-template-haskell<2.7.0.0' - 'haskell-time<1.4' - 'haskell-unix<2.5.1.1' - 'haskell-cabal<1.14.0' - ) + 'haskell-process<1.1.0.2' + 'haskell-template-haskell<2.8.0.0' + 'haskell-time<1.4.0.1' + 'haskell-unix<2.6.0.0' + 'haskell-cabal<1.16.0') source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2" "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2" - 'build.mk' - 'silence-gen_contents_index.diff') -md5sums=('267462db5c5a7c245fb26361b77007c4' - '528005749c761fe6c12a0079bd84fb90' - '88ad4108c26f56fc38466d82aaf9a295' - '2ac480d025b706fc47acc58c54b246bb') + 'build.mk') +md5sums=('e9d892d2970550ec5e70130b3621f6b6' + '0d93c458e3b445a7e524ef6ae459ce11' + 'c367ef26300648ee9b8aca3dee5c9669') build() { cd ghc-${pkgver} - # Silence gen_contents_index for the common case. - # http://hackage.haskell.org/trac/ghc/ticket/5992 - patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff - cp ${srcdir}/build.mk mk/build.mk ./configure \ @@ -96,16 +86,35 @@ build() { } check() { + # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this... + unset MAKEFLAGS + cd ghc-${pkgver} # python2 rename sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py - # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856 - #make THREADS=9 test + # upstream known failures on both i686 and x86_64: + # ghci.debugger/scripts break011 [bad stderr] (ghci) + # perf/compiler parsing001 [stat not good enough] (normal) + # simplCore/should_compile spec-inline [stderr mismatch] (optasm) + # upstream known failures on i686 only: + # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856 make test - # might be some failures + + # enabling threads to speed up + # causes more failures than make test, need to investigate + # upstream known failures on both i686 and x86_64: + # perf/compiler parsing001 [stat not good enough] (normal) + # simplCore/should_compile spec-inline [stderr mismatch] (optasm) + # upstream known failures on i686 only: + # numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856 + #make THREADS=9 test + + # will most likely cause lots of failures + # enable this when upstream has 0 test failures from a simple 'make test' + # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757 #make fulltest } diff --git a/staging/ghc/build.mk b/staging/ghc/build.mk index 73645a957..bb57594bf 100644 --- a/staging/ghc/build.mk +++ b/staging/ghc/build.mk @@ -10,6 +10,9 @@ # Full build with max optimisation and everything enabled (very slow build) BuildFlavour = perf +# As above but build GHC using the LLVM backend +#BuildFlavour = perf-llvm + # Fast build with optimised libraries, no profiling (RECOMMENDED): #BuildFlavour = quick @@ -51,6 +54,23 @@ endif endif +# ---------------- Perf build using LLVM ------------------------------------- + +ifeq "$(BuildFlavour)" "perf-llvm" + +SRC_HC_OPTS = -O -H64m -fllvm +GhcStage1HcOpts = -O -fllvm +GhcStage2HcOpts = -O2 -fllvm +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 +GhcLibWays += p + +ifeq "$(PlatformSupportsSharedLibs)" "YES" +GhcLibWays += dyn +endif + +endif + # -------- A Fast build ------------------------------------------------------ ifeq "$(BuildFlavour)" "quickest" @@ -151,10 +171,14 @@ endif ifeq "$(BuildFlavour)" "unreg" +# Note that the LLVM backend works in unregisterised mode as well as +# registerised mode. This often makes it a good choice for porting +# GHC. + GhcUnregisterised = YES GhcWithNativeCodeGen = NO -SRC_HC_OPTS = -O -H64m +SRC_HC_OPTS = -O -H64m # -fllvm GhcStage1HcOpts = -O GhcStage2HcOpts = -O2 GhcHcOpts = -Rghc-timing @@ -173,3 +197,4 @@ endif # NoFib settings NoFibWays = STRIP_CMD = : + diff --git a/testing/elfutils/PKGBUILD b/testing/elfutils/PKGBUILD new file mode 100644 index 000000000..d368534a4 --- /dev/null +++ b/testing/elfutils/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 166408 2012-09-07 16:52:26Z stephane $ +# Maintainer: Stéphane Gaudreault +# Contributor: Andrej Gelenberg + +pkgname=elfutils +pkgver=0.155 +pkgrel=1 +pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information" +arch=('i686' 'x86_64') +url="https://fedorahosted.org/elfutils/" +license=('LGPL3' 'GPL' 'GPL3') +depends=('gcc-libs' 'zlib' 'bzip2' 'xz') +provides=('libelf') +replaces=('libelf') +conflicts=('libelf') +options=('!makeflags') +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} + elfutils-0.155-binutils-pr-ld-13621.patch) +sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b' + 'fcd0ebd029b305bf030983daf151a2a1ab5294af' + '8a8be7c0686c6311c1ce969ba10494e704ead48c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + CFLAGS+=" -g" # required for test-suite success + patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch + ./configure --prefix=/usr --program-prefix="eu-" + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch b/testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch new file mode 100644 index 000000000..7f99ac0be --- /dev/null +++ b/testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch @@ -0,0 +1,16 @@ +diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh +index 4b01008..7a5f0c8 100755 +--- a/tests/run-elflint-self.sh ++++ b/tests/run-elflint-self.sh +@@ -18,4 +18,11 @@ + + . $srcdir/test-subr.sh + ++# Makes sure we exit cleanly even when we don't... ++clean_exit() ++{ ++ if test $? != 0; then echo "binutils PR ld/13621 workaround"; exit 0; fi ++} ++trap clean_exit EXIT ++ + testrun_on_self ../src/elflint --quiet --gnu-ld diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD index a510578de..8f8045403 100644 --- a/testing/kmod/PKGBUILD +++ b/testing/kmod/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 162918 2012-07-04 00:18:58Z dreisner $ +# $Id: PKGBUILD 166390 2012-09-07 13:56:39Z dreisner $ # Maintainer: Dave Reisner pkgname=kmod -pkgver=9 -pkgrel=2 +pkgver=10 +pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' license=('GPL2') depends=('glibc' 'zlib') +makedepends=('gtk-doc') options=('!libtool') provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') -install=kmod.install source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" "depmod-search.conf") -md5sums=('c8ae2d2694fbca2b28e238b30543a0cd' +md5sums=('e2a883c4df15a50f78a7a61d5b64089f' 'dd62cbf62bd8f212f51ef8c43bec9a77') build() { @@ -24,8 +24,8 @@ build() { ./configure \ --sysconfdir=/etc \ - --with-zlib \ - --with-rootprefix=/usr + --enable-gtk-doc \ + --with-zlib make } diff --git a/testing/pinentry/PKGBUILD b/testing/pinentry/PKGBUILD new file mode 100644 index 000000000..b1c76c880 --- /dev/null +++ b/testing/pinentry/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 166441 2012-09-07 20:18:41Z tpowa $ +# Maintainer: Tobias Powalowski +pkgname=pinentry +pkgver=0.8.2 +pkgrel=1 +pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnupg.org/aegypten2" +depends=('ncurses' 'libcap>=2.16') +makedepends=('gtk2' 'qt') +optdepends=('gtk2: for gtk2 backend' + 'qt: for qt4 backend') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2 + qt4-pinentry-window.patch) +install=pinentry.install + +build() { + cd $srcdir/$pkgname-$pkgver + #fix: https://bugs.archlinux.org/task/29998 + patch -Np1 -i ../qt4-pinentry-window.patch + for file in qt4/*.moc; do + /usr/bin/moc ${file/.moc/.h} > ${file} + done + ./configure --prefix=/usr \ + --enable-pinentry-curses \ + --disable-pinentry-gtk \ + --disable-pinentry-qt \ + --enable-pinentry-gtk2 \ + --enable-pinentry-qt4 \ + --enable-fallback-curses + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=${pkgdir} install +} +md5sums=('82e6114e5e27a8ab36f314b332a6e024' + '450b8713fe42f1bd93311ef84767c3d8') diff --git a/testing/pinentry/pinentry.install b/testing/pinentry/pinentry.install new file mode 100644 index 000000000..eed2c7124 --- /dev/null +++ b/testing/pinentry/pinentry.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(pinentry.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/pinentry/qt4-pinentry-window.patch b/testing/pinentry/qt4-pinentry-window.patch new file mode 100644 index 000000000..8f9faae11 --- /dev/null +++ b/testing/pinentry/qt4-pinentry-window.patch @@ -0,0 +1,28 @@ +From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Tue, 1 Feb 2011 14:42:27 +0100 +Subject: [PATCH] Fix qt4 pinentry window created in the background + +This is probably just a workaround. Proper fix is being investigated. +See: +https://bugzilla.redhat.com/show_bug.cgi?id=589532 +http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background +--- + qt4/pinentrydialog.cpp | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp +index 541baf4..d634eb6 100644 +--- a/qt4/pinentrydialog.cpp ++++ b/qt4/pinentrydialog.cpp +@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w ) + SetForegroundWindow( w->winId() ); + #endif + w->raise(); +- w->activateWindow(); + } + + QPixmap icon( QStyle::StandardPixmap which ) +-- +1.7.3.5 + -- cgit v1.2.3-54-g00ecf From 2a4c41bf2946fad65b14cf1b4ea284ebce0f11f3 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 10 Sep 2012 00:03:51 +0000 Subject: Mon Sep 10 00:03:51 UTC 2012 --- community-staging/haskell-stm/PKGBUILD | 4 +- community-staging/haskell-syb/PKGBUILD | 6 +- community/gigi/PKGBUILD | 17 ++--- community/mathomatic/PKGBUILD | 11 +-- community/pkgfile/PKGBUILD | 11 +-- community/pkgfile/pkgfile.install | 6 ++ community/sshguard/PKGBUILD | 2 +- community/sshguard/sshguard-journalctl | 2 +- core/ppp/PKGBUILD | 11 +-- core/ppp/ppp.systemd | 9 +++ extra/gegl/PKGBUILD | 10 +-- extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff | 12 ++++ extra/gimp/PKGBUILD | 13 ++-- extra/ktorrent/PKGBUILD | 6 +- extra/libktorrent/PKGBUILD | 18 ++--- extra/maxima/PKGBUILD | 8 +-- extra/stellarium/PKGBUILD | 6 +- extra/swt/PKGBUILD | 23 +++---- extra/swt/build-swt.xml | 2 +- gnome-unstable/gvfs/PKGBUILD | 113 +++++++++++++++++++++++++++++++ gnome-unstable/gvfs/gvfs-module.install | 7 ++ gnome-unstable/gvfs/gvfs-smb.install | 12 ++++ gnome-unstable/gvfs/gvfs.install | 14 ++++ gnome-unstable/libsecret/PKGBUILD | 27 ++++++++ gnome-unstable/libsoup/PKGBUILD | 49 ++++++++++++++ gnome-unstable/nautilus/PKGBUILD | 34 ++++++++++ gnome-unstable/nautilus/nautilus.install | 14 ++++ gnome-unstable/udisks2/PKGBUILD | 31 +++++++++ libre/libdrm-libre/COPYING | 48 +++++++++++++ libre/libdrm-libre/PKGBUILD | 90 ++++++++++++++++++++++++ pcr/libdrm-libre-git/COPYING | 48 +++++++++++++ pcr/libdrm-libre-git/PKGBUILD | 113 +++++++++++++++++++++++++++++++ staging/ghc/PKGBUILD | 2 +- staging/haskell-http/PKGBUILD | 6 +- staging/haskell-mtl/PKGBUILD | 6 +- staging/haskell-network/PKGBUILD | 6 +- staging/haskell-parsec/PKGBUILD | 8 +-- staging/haskell-random/PKGBUILD | 4 +- staging/haskell-text/PKGBUILD | 6 +- staging/haskell-transformers/PKGBUILD | 6 +- staging/haskell-zlib/PKGBUILD | 8 ++- testing/util-linux/PKGBUILD | 8 +-- testing/util-linux/util-linux.install | 9 ++- 43 files changed, 737 insertions(+), 109 deletions(-) create mode 100644 core/ppp/ppp.systemd create mode 100644 extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff create mode 100644 gnome-unstable/gvfs/PKGBUILD create mode 100644 gnome-unstable/gvfs/gvfs-module.install create mode 100644 gnome-unstable/gvfs/gvfs-smb.install create mode 100644 gnome-unstable/gvfs/gvfs.install create mode 100644 gnome-unstable/libsecret/PKGBUILD create mode 100644 gnome-unstable/libsoup/PKGBUILD create mode 100644 gnome-unstable/nautilus/PKGBUILD create mode 100644 gnome-unstable/nautilus/nautilus.install create mode 100644 gnome-unstable/udisks2/PKGBUILD create mode 100644 libre/libdrm-libre/COPYING create mode 100644 libre/libdrm-libre/PKGBUILD create mode 100644 pcr/libdrm-libre-git/COPYING create mode 100644 pcr/libdrm-libre-git/PKGBUILD (limited to 'gnome-unstable') diff --git a/community-staging/haskell-stm/PKGBUILD b/community-staging/haskell-stm/PKGBUILD index 8eba45641..764c8298d 100644 --- a/community-staging/haskell-stm/PKGBUILD +++ b/community-staging/haskell-stm/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=stm pkgname=haskell-stm pkgver=2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A modular composable concurrency abstraction." url="http://hackage.haskell.org/package/stm" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install md5sums=('fcaf091a492974045cc04b231a3b7c9c') diff --git a/community-staging/haskell-syb/PKGBUILD b/community-staging/haskell-syb/PKGBUILD index 301c463b5..a2595bf2c 100644 --- a/community-staging/haskell-syb/PKGBUILD +++ b/community-staging/haskell-syb/PKGBUILD @@ -2,17 +2,17 @@ # Contributor: Arch Haskell Team _hkgname=syb pkgname=haskell-syb -pkgver=0.3.6.1 +pkgver=0.3.7 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh) +depends=('ghc=7.6.1-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('50e0a755fcc735cccd0d77a89714ae38') +md5sums=('fa653976a4ee43918cc7546089f94b60') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD index 63fc4188c..5066202b2 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73991 2012-07-18 01:06:42Z ibiru $ +# $Id: PKGBUILD 76013 2012-09-08 21:44:20Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Sven-Hendrik Haase # Contributor: fana-m @@ -7,9 +7,9 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=11 -_fixedrevision=1074 -pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL" +pkgrel=12 +_fixedrevision=5208 +pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)" url="http://gigi.sourceforge.net/" arch=('x86_64' 'i686') license=('LGPL') @@ -24,7 +24,8 @@ build() { if [ -d gigi/.svn ]; then (cd gigi && svn up -r "$_fixedrevision") else - svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \ + #svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \ + svn co https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/ \ --config-dir ./ -r "$_fixedrevision" gigi fi @@ -32,12 +33,6 @@ build() { svn export gigi gigi-build cd gigi-build - msg2 "Patching..." - sed -i 's/move_backward(/adobe::move_backward(/g' GG/adobe/vector.hpp - sed -i 's/__GNUC_MINOR__ <= 6/__GNUC_MINOR__ <= 999/g' GG/adobe/cmath.hpp - sed -i 's/insert(adobe/this->insert(adobe/g' GG/adobe/closed_hash.hpp - sed -i 's:TIME_UTC:TIME_UTC_:' src/GUI.cpp - msg2 "Configuring..." setconf cmake/GiGiOgre.pc.in prefix /usr setconf cmake/GiGi.pc.in prefix /usr diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index b1e13d338..eb7b68c6d 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74885 2012-08-08 16:34:04Z ttopper $ +# $Id: PKGBUILD 76011 2012-09-08 21:04:59Z ttopper $ # Contributor: G_Syme # Contributor: Stefan Husmann # Maintainer: Thorsten Töpper pkgname=mathomatic -pkgver=16.0.2 +pkgver=16.0.3 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64') @@ -13,11 +13,12 @@ url="http://mathomatic.orgserve.de/math/" depends=('readline') makedepends=('time') optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' - 'bash: for running a test script' - 'm4: for complex operations using the matho script' + 'bash: for running a test script' + 'm4: for complex operations using the matho script' + 'rlwrap: for readline editing' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('17d4034b9f4af59d55095d47e9096c7b') +md5sums=('0bd4b73e364d05b7a5b855f19c91b6bd') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD index 7aff4d66f..b43c3719a 100644 --- a/community/pkgfile/PKGBUILD +++ b/community/pkgfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75830 2012-09-02 00:43:15Z dreisner $ +# $Id: PKGBUILD 76000 2012-09-08 16:02:52Z dreisner $ # Maintainer: Dave Reisner pkgname=pkgfile -pkgver=4 -pkgrel=1 +pkgver=5 +pkgrel=2 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64') url="http://github.com/falconindy/pkgfile" @@ -11,9 +11,10 @@ license=('MIT') depends=('libarchive' 'curl' 'pcre' 'pacman') conflicts=('pkgtools<24-2') makedepends=('perl') -source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz") +source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) install=pkgfile.install -md5sums=('2570c69372645d2463979c7227a0a63d') +md5sums=('87e75949ca4ed9d60cc2dfdca9dd1a04' + '14d174d2fe0b8e0a43392c2b4ec48a7a') build() { cd "$pkgname-$pkgver" diff --git a/community/pkgfile/pkgfile.install b/community/pkgfile/pkgfile.install index 358507c55..5545a3d39 100644 --- a/community/pkgfile/pkgfile.install +++ b/community/pkgfile/pkgfile.install @@ -10,3 +10,9 @@ post_remove() { printf "==> /var/cache/pkgfile has not been removed\n" fi } + +post_upgrade() { + if [ "$(vercmp 5 "$2")" -eq 1 ]; then + printf "==> DB format has changed. Please run pkgfile -uu\n" + fi +} diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index 8bd832a39..7ae15b1b5 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75956 2012-09-07 08:27:47Z mtorromeo $ +# $Id: PKGBUILD 75998 2012-09-08 15:38:53Z ebelanger $ # Maintainer: Sergej Pupykin # Maintainer: Massimiliano Torromeo # Contributor: Sergej Pupykin diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl index bd4b6f608..ffb61b1cc 100644 --- a/community/sshguard/sshguard-journalctl +++ b/community/sshguard/sshguard-journalctl @@ -1,2 +1,2 @@ #!/bin/sh -/usr/bin/journalctl -flbp info -n0 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- +/usr/bin/journalctl -flbp info -n0 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@" diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 33c7eccd1..8c029106a 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142987 2011-11-19 20:10:23Z thomas $ +# $Id: PKGBUILD 166496 2012-09-08 11:35:07Z thomas $ # Maintainer: Thomas Baechler pkgname=ppp pkgver=2.4.5 -pkgrel=3 +pkgrel=4 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64) url="http://www.samba.org/ppp/" @@ -20,7 +20,8 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz ip-up ip-down ip-up.d.dns.sh - ip-down.d.dns.sh) + ip-down.d.dns.sh + ppp.systemd) md5sums=('4621bc56167b6953ec4071043fe0ec57' '7a9259a8f038073eeea7e4552ff1849f' '48c024f73a80c8b69c4def22f86902cc' @@ -31,7 +32,8 @@ md5sums=('4621bc56167b6953ec4071043fe0ec57' 'e4beb16ed600b61336d50b2bd2df7cd5' '2fa0671f40711e69194ccf60979f8b33' '4a074d74c29625b254a1db720cb87b99' - '8d1be5af8e46393ba6eb273377831e38') + '8d1be5af8e46393ba6eb273377831e38' + 'fafead5c9d66d0574e6f0a2e5f4d4631') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -77,4 +79,5 @@ package() { install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" install -d -m755 "${pkgdir}/etc/ppp/peers" chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so + install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service } diff --git a/core/ppp/ppp.systemd b/core/ppp/ppp.systemd new file mode 100644 index 000000000..a5c490a73 --- /dev/null +++ b/core/ppp/ppp.systemd @@ -0,0 +1,9 @@ +[Unit] +Description=PPP link to %I +Before=network.target + +[Service] +ExecStart=/usr/sbin/pppd call %I nodetach + +[Install] +WantedBy=multi-user.target diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 8570481bd..9e8a9b408 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163149 2012-07-08 09:31:09Z ibiru $ +# $Id: PKGBUILD 166461 2012-09-08 07:12:58Z daniel $ # Maintainer: Daniel Isenmann pkgname=gegl pkgver=0.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" @@ -15,11 +15,13 @@ optdepends=('openexr: for using the openexr plugin' \ 'librsvg: for using the svg plugin' \ 'jasper: for using the jasper plugin') options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gegl-0.2.0-ffmpeg-0.11.diff) +sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573' + 'c10fd988c634fcf0948cc91a51d6528f6f1704ba') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make diff --git a/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff new file mode 100644 index 000000000..a33ec6f7f --- /dev/null +++ b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff @@ -0,0 +1,12 @@ +diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c +--- gegl-0.2.0/operations/external/ff-load.c 2012-04-01 13:17:57.000000000 +0200 ++++ gegl-0.2.0-1/operations/external/ff-load.c 2012-07-11 12:42:05.174756560 +0200 +@@ -271,7 +271,7 @@ + gint err; + + ff_cleanup (o); +- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL); ++err = avformat_open_input (&p->ic, o->path, NULL, NULL); + if (err < 0) + { + print_error (o->path, err); diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index 91ee40019..f60ef6263 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 159779 2012-05-26 19:57:17Z daniel $ +# $Id: PKGBUILD 166463 2012-09-08 07:14:12Z daniel $ # Maintainer: Daniel Isenmann pkgname=gimp -pkgver=2.8.0 -pkgrel=2 +pkgver=2.8.2 +pkgrel=1 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64') url="http://www.gimp.org/" license=('GPL' 'LGPL') depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ 'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl') -makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl') +makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript') optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' 'libwebkit: for the help browser' 'poppler-glib: for pdf support' 'alsa-lib: for MIDI event controller module' - 'curl: for URI support') + 'curl: for URI support' + 'ghostscript: for postscript support') options=('!libtool' '!makeflags') conflicts=('gimp-devel') install=gimp.install source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl uri-backend-libcurl.patch) -md5sums=('28997d14055f15db063eb92e1c8a7ebb' +md5sums=('b542138820ca3a41cbd63fc331907955' 'bb27bc214261d36484093e857f015f38' 'e894f4b2ffa92c71448fdd350e9b78c6') diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD index 4098d33b7..731ed23de 100644 --- a/extra/ktorrent/PKGBUILD +++ b/extra/ktorrent/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161994 2012-06-18 07:33:57Z ronald $ +# $Id: PKGBUILD 166483 2012-09-08 08:54:47Z ronald $ # Maintainer: Ronald van Haren # Contributor: Travis Willard # Contributor: Georg Grabler pkgname=ktorrent -pkgver=4.2.1 +pkgver=4.3.0 pkgrel=1 pkgdesc="A powerful BitTorrent client for KDE" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('automoc4' 'cmake' 'boost') source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'httpserver.patch') install=${pkgname}.install -sha1sums=('3f52c4a10011a49d304c08a3bb1290a022e0c53f' +sha1sums=('60400c6286f58934dde7ab471f56188b68d69f7b' 'cef22b24af540e1bfcf13da60e4846ade106c303') build() { diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index 62fe72ae8..5c3a5b63e 100644 --- a/extra/libktorrent/PKGBUILD +++ b/extra/libktorrent/PKGBUILD @@ -1,31 +1,25 @@ -# $Id: PKGBUILD 164220 2012-07-27 18:35:04Z ronald $ +# $Id: PKGBUILD 166475 2012-09-08 08:21:58Z ronald $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino pkgname=libktorrent -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="A BitTorrent protocol implementation" arch=('i686' 'x86_64') url="http://ktorrent.org/" license=('GPL2') depends=('kdelibs') makedepends=('automoc4' 'cmake' 'boost' 'doxygen') -source=("http://ktorrent.org/downloads/4.2.1/${pkgname}-${pkgver}-2.tar.bz2" - "magnet.patch") -sha1sums=('857e4227c4bba685755d66581d881f893f6311ae' - 'f0156489364e5590b0b539cfe2abc929c1922ef8') +source=("http://ktorrent.org/downloads/4.3.0/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('e7e813af36f5854237111fd550f4914b83f17102') build() { cd "${srcdir}" - pushd ${pkgname}-${pkgver}-2 - patch -Np1 -i ${srcdir}/magnet.patch - popd - mkdir build cd build - cmake ../${pkgname}-${pkgver}-2 \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 435f36a96..275f5065d 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165312 2012-08-15 11:35:19Z juergen $ +# $Id: PKGBUILD 166487 2012-09-08 10:00:42Z ronald $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa pkgname=maxima -pkgver=5.27.0 -pkgrel=3 +pkgver=5.28.0 +pkgrel=1 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') @@ -17,7 +17,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('8d8d0b3db27f002986cff5429dea96ada46a0576' +sha1sums=('52d7dad4681711a6ead73b72835b177107363b9c' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index c320ab5fa..8b900c199 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161975 2012-06-17 20:22:44Z ronald $ +# $Id: PKGBUILD 166485 2012-09-08 09:30:15Z ronald $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa pkgname=stellarium -pkgver=0.11.3 +pkgver=0.11.4 pkgrel=1 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64") @@ -14,7 +14,7 @@ makedepends=('cmake' 'boost') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) -sha1sums=('8ee73f5ddde320f5912243b6353b1d92ca52562c' +sha1sums=('5b8bfd71b4c3eabbc1db64b71221eeebe6785dbf' 'c9cc79212542238227b5bd6af99f60fe056f4ab2' 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index 638587d1e..a27856a13 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,36 +1,33 @@ -# $Id: PKGBUILD 166346 2012-09-06 20:23:30Z guillaume $ +# $Id: PKGBUILD 166495 2012-09-08 11:23:32Z guillaume $ # Maintainer: Guillaume ALAUX pkgname=swt -pkgver=3.7.2 -pkgrel=2 -_date=201202080800 +pkgver=4.2 +pkgrel=1 +_date=201206081400 pkgdesc="An open source widget toolkit for Java" arch=('i686' 'x86_64') url="http://www.eclipse.org/swt/" license=('EPL') -depends=('java-runtime>=7' 'gtk2>=2.20.1' 'libxtst') +depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst') optdepends=('libgnomeui' 'mesa' 'libwebkit') makedepends=('java-environment' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') if [ "${CARCH}" = "i686" ]; then _carch=x86 - md5sums=('9a858b11e66de8af41786eaf09fc9ee2' - 'f5e548bc26a0f1f3c18131be76face40') + md5sums=('3efe0404f6129183abae46f7620fe14f' + '2f556ab534fc2488c6e8c0ee6c02825c') fi if [ "${CARCH}" = "x86_64" ]; then _carch=x86_64 - md5sums=('b16ab5c9d274b9488432ebeae6e4af5a' - 'f5e548bc26a0f1f3c18131be76face40') + md5sums=('9e06b576116ff409f395571603582827' + '2f556ab534fc2488c6e8c0ee6c02825c') fi -source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip +source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip build-swt.xml) -noextract=(swt-${pkgver}-gtk-linux-${_carch}.zip) # To test this pkg: # http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse -# http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip build() { cd ${srcdir} - unzip -oq swt-${pkgver}-gtk-linux-${_carch}.zip src.zip unzip -oq src.zip -d src . /etc/profile.d/jdk.sh diff --git a/extra/swt/build-swt.xml b/extra/swt/build-swt.xml index ea775871b..a161204f8 100644 --- a/extra/swt/build-swt.xml +++ b/extra/swt/build-swt.xml @@ -8,7 +8,7 @@ - + diff --git a/gnome-unstable/gvfs/PKGBUILD b/gnome-unstable/gvfs/PKGBUILD new file mode 100644 index 000000000..9bedc8196 --- /dev/null +++ b/gnome-unstable/gvfs/PKGBUILD @@ -0,0 +1,113 @@ +# $Id: PKGBUILD 166502 2012-09-08 12:38:07Z jgc $ +# Maintainer: Jan de Groot + +pkgbase=gvfs +pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') +pkgver=1.13.8 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') +url="http://www.gnome.org" +options=(!libtool) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('7c6113facabba82fea0a012170ac7a3b3a69a2636265ec9d5066a90ab743ee2f') + +build() { + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gvfs \ + --with-bash-completion-dir=/usr/share/bash-completion/completions + make +} + +package_gvfs() { + pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret') + optdepends=('gvfs-afc: AFC (mobile devices) support' + 'gvfs-smb: SMB/CIFS (Windows client) support' + 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' + 'gvfs-obexftp: ObexFTP (bluetooth) support' + 'gvfs-afp: Apple Filing Protocol (AFP) support' + 'gtk3: Recent files support') + install=gvfs.install + + cd "$pkgbase-$pkgver" + sed -e 's/^am__append_4/#am__append_4/' \ + -e 's/^am__append_5/#am__append_5/' \ + -i monitor/Makefile + make DESTDIR="$pkgdir" install + + cd "$pkgdir" + rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} + rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount + rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml + rm usr/share/GConf/gsettings/gvfs-smb.convert +} + +package_gvfs-smb() { + pkgdesc="SMB/CIFS (Windows client) backend for gvfs" + depends=("gvfs=$pkgver" 'smbclient') + install=gvfs-smb.install + + cd "$pkgbase-$pkgver/daemon" + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + + install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" + + install -Dm644 org.gnome.system.smb.gschema.xml \ + "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" + install -Dm644 gvfs-smb.convert \ + "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert" +} + +package_gvfs-afc() { + pkgdesc="AFC (mobile devices) backend for gvfs" + depends=("gvfs=$pkgver" 'libimobiledevice') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc" + install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount" + + cd "$srcdir/$pkgbase-$pkgver/monitor/afc" + make DESTDIR="$pkgdir" install +} + +package_gvfs-gphoto2() { + pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" + depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2" + install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount" + + cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2" + make DESTDIR="$pkgdir" install +} + +package_gvfs-obexftp() { + pkgdesc="ObexFTP (bluetooth) backend for gvfs" + depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp" + install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount" +} + +package_gvfs-afp() { + pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" + depends=("gvfs=$pkgver") + install=gvfs-module.install + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + + cd "$pkgbase-$pkgver/daemon" + install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" +} diff --git a/gnome-unstable/gvfs/gvfs-module.install b/gnome-unstable/gvfs/gvfs-module.install new file mode 100644 index 000000000..09d1f11ec --- /dev/null +++ b/gnome-unstable/gvfs/gvfs-module.install @@ -0,0 +1,7 @@ +post_install() { + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} diff --git a/gnome-unstable/gvfs/gvfs-smb.install b/gnome-unstable/gvfs/gvfs-smb.install new file mode 100644 index 000000000..da6a2ab6d --- /dev/null +++ b/gnome-unstable/gvfs/gvfs-smb.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/gvfs/gvfs.install b/gnome-unstable/gvfs/gvfs.install new file mode 100644 index 000000000..3482d99e3 --- /dev/null +++ b/gnome-unstable/gvfs/gvfs.install @@ -0,0 +1,14 @@ +post_install() { + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/gnome-unstable/libsecret/PKGBUILD b/gnome-unstable/libsecret/PKGBUILD new file mode 100644 index 000000000..1d5060145 --- /dev/null +++ b/gnome-unstable/libsecret/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 166488 2012-09-08 10:31:44Z jgc $ +# Maintainer: Jan de Groot + +pkgname=libsecret +pkgver=0.9 +pkgrel=1 +pkgdesc='library for storing and retrieving passwords and other secrets.' +arch=('i686' 'x86_64') +license=('LGPL') +url="https://live.gnome.org/Libsecret" +depends=('glib2' 'libgcrypt') +makedepends=('intltool' 'docbook-xsl') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) +sha256sums=('8b1abfed2f5c88ff9a1801d5b6643331cc833dfe8d8b1dca982ae23bbd6de535') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libsoup/PKGBUILD b/gnome-unstable/libsoup/PKGBUILD new file mode 100644 index 000000000..df3b2e278 --- /dev/null +++ b/gnome-unstable/libsoup/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 166489 2012-09-08 10:32:07Z jgc $ +# Maintainer: Jan de Groot + +pkgbase=libsoup +pkgname=('libsoup' 'libsoup-gnome') +pkgver=2.39.91 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +options=('!libtool' '!emptydirs') +sha256sums=('bec3aeef96918ea9ed199d2be331f37a8ed819a7c3405bf4c33646cac8dc5ab5') + +build() { + cd "$pkgbase-$pkgver" + sed -i -e 's/env python/python2/' libsoup/tld-parser.py + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package_libsoup() { + pkgdesc="GNOME HTTP Library - base library" + depends=('glib2' 'libxml2' 'glib-networking') + + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + + rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.* + rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" + rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4" + rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" +} + +package_libsoup-gnome() { + pkgdesc="GNOME HTTP Library - GNOME libraries" + depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite') + + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + + rm -f "$pkgdir"/usr/lib/libsoup-2.4.* + rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc" + rm -rf "$pkgdir/usr/include/libsoup-2.4" + rm -rf "$pkgdir/usr/share" + rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib" +} diff --git a/gnome-unstable/nautilus/PKGBUILD b/gnome-unstable/nautilus/PKGBUILD new file mode 100644 index 000000000..8795d9837 --- /dev/null +++ b/gnome-unstable/nautilus/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 166504 2012-09-08 13:07:20Z jgc $ +# Maintainer: Jan de Groot + +pkgname=nautilus +pkgver=3.5.91 +pkgrel=1 +pkgdesc="GNOME file manager" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify') +makedepends=('intltool' 'gobject-introspection') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool' '!emptydirs') +install=nautilus.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0fe4b31a27ee1b172d6c948fedcfc2f8b3dd09da035e317b53c6fa2a96c7abc0') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/nautilus \ + --disable-nst-extension \ + --disable-update-mimedb \ + --disable-packagekit \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/nautilus/nautilus.install b/gnome-unstable/nautilus/nautilus.install new file mode 100644 index 000000000..082126d24 --- /dev/null +++ b/gnome-unstable/nautilus/nautilus.install @@ -0,0 +1,14 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime > /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/udisks2/PKGBUILD b/gnome-unstable/udisks2/PKGBUILD new file mode 100644 index 000000000..04b21537f --- /dev/null +++ b/gnome-unstable/udisks2/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 166493 2012-09-08 11:04:55Z jgc $ +# Maintainer: Ionut Biru + +pkgname=udisks2 +pkgver=1.99.0 +pkgrel=1 +pkgdesc="Disk Management Service, version 2" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/udisks" +license=('GPL2') +depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') +optdepends=('parted: partition management' + 'gptfdisk: GUID partition table support') +options=(!libtool) +source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) +sha256sums=('f06d1947ac3c79f3de85ee17b7046da9d22dd9ab06cc75a985e767161704e176') + +build() { + cd "udisks-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "udisks-$pkgver" + make DESTDIR="$pkgdir" install \ + bash_completiondir=/usr/share/bash-completion/completions +} diff --git a/libre/libdrm-libre/COPYING b/libre/libdrm-libre/COPYING new file mode 100644 index 000000000..6e74c337c --- /dev/null +++ b/libre/libdrm-libre/COPYING @@ -0,0 +1,48 @@ + Copyright 2005 Adam Jackson. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation on the rights to use, copy, modify, merge, + publish, distribute, sub license, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +------------------------------------------------------------------------ + + Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. + All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS + SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/libre/libdrm-libre/PKGBUILD b/libre/libdrm-libre/PKGBUILD new file mode 100644 index 000000000..1746710cb --- /dev/null +++ b/libre/libdrm-libre/PKGBUILD @@ -0,0 +1,90 @@ +# Maintainer: Jan de Groot +# Maintainer (Parabola): Márcio Silva + +pkgname=libdrm-libre +pkgver=2.4.39 +pkgrel=1 +pkgdesc='Userspace interface to kernel DRM services, without VMWare Graphics KMS API (vmwgfx)' +arch=( + i686 + x86_64 + mips64el +:) +license=( + MIT +) +depends=( + libpciaccess + ) +makedepends=( + cairo + valgrind +) +options=( + !libtool +) +url=http://dri.freedesktop.org/ +provides=( + ${pkgname%-libre}=$pkgver + ${pkgname%-libre}-git + $pkgname-git +) +conflicts=( + ${pkgname%-libre} + ${pkgname%-libre}-git + $pkgname-git + ${pkgname%-libre}-new + ${pkgname%-libre}-nouveau + ${pkgname%-libre}-old +) +replaces=( + ${pkgname%-libre} + ${pkgname%-libre}-git + ${pkgname%-libre}-new + ${pkgname%-libre}-nouveau +) + +source=( + http://dri.freedesktop.org/${pkgname%-libre}/${pkgname%-libre}-$pkgver.tar.bz2 + COPYING +) +sha512sums=( + 51b849d501adbf6c9d65847d2e6b41e426137af8cdb1335d19e22939128b7cdae8685c27d750db3aad7b1c43e7bb5a448634491dcd86873ba98293d56320eb1f + b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660 +) + +build() { + cd ${pkgname%-libre}-$pkgver + + sed -i '/PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)/d;/AC_SUBST(PTHREADSTUBS_CFLAGS)/d;/AC_SUBST(PTHREADSTUBS_LIBS)/d' \ + configure.ac + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \ + exynos/Makefile.am + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;/ @PTHREADSTUBS_LIBS@ /d' \ + intel/Makefile.am + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \ + nouveau/Makefile.am + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \ + omap/Makefile.am + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \ + radeon/Makefile.am + + #libtoolize --force + autoreconf --force --install + ./configure --prefix=/usr \ + --disable-vmwgfx-experimental-api \ + --enable-udev + make V=0 +} + +check() { +cd ${pkgname%-libre}-$pkgver + make -k check +} + +package() { +cd ${pkgname%-libre}-$pkgver + make DESTDIR=$pkgdir install + install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre} + install -m644 ../COPYING $pkgdir/usr/share/licenses/${pkgname%-libre} +} diff --git a/pcr/libdrm-libre-git/COPYING b/pcr/libdrm-libre-git/COPYING new file mode 100644 index 000000000..6e74c337c --- /dev/null +++ b/pcr/libdrm-libre-git/COPYING @@ -0,0 +1,48 @@ + Copyright 2005 Adam Jackson. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation on the rights to use, copy, modify, merge, + publish, distribute, sub license, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +------------------------------------------------------------------------ + + Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. + All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice (including the + next paragraph) shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS + SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. diff --git a/pcr/libdrm-libre-git/PKGBUILD b/pcr/libdrm-libre-git/PKGBUILD new file mode 100644 index 000000000..37c7066fc --- /dev/null +++ b/pcr/libdrm-libre-git/PKGBUILD @@ -0,0 +1,113 @@ +# Maintainer: Jan de Groot +# Maintainer (Parabola): Márcio Silva + +pkgname=libdrm-libre-git +pkgver=20120909 +_pkgver=2.4.39 +pkgrel=1 +pkgdesc='Userspace interface to kernel DRM services, without VMWare Graphics KMS API (vmwgfx)' +arch=( + i686 + x86_64 + mips64el +) +license=( + MIT +) +depends=( + libpciaccess + ) +makedepends=( + cairo + git + valgrind +) +options=( + !libtool +) +url=http://dri.freedesktop.org/ +provides=( + ${pkgname%-libre-git}=$_pkgver + ${pkgname%-libre-git}-libre=$_pkgver + ${pkgname%-libre-git}-git + ${pkgname%-libre-git}-nouveau1 +) +conflicts=( + ${pkgname%-libre-git} + ${pkgname%-libre-git}-libre + ${pkgname%-libre-git}-git + ${pkgname%-libre-git}-new + ${pkgname%-libre-git}-nouveau + ${pkgname%-libre-git}-nouveau1 + ${pkgname%-libre-git}-old +) +replaces=( + ${pkgname%-libre-git} + ${pkgname%-libre-git}-git + ${pkgname%-libre-git}-new + ${pkgname%-libre-git}-nouveau +) +source=( + COPYING +) +sha512sums=( + b0ca349b882a4326b19f81f22804fabdb6fb7aef31cdc7b16b0a7ae191bfbb50c7daddb2fc4e6c33f1136af06d060a273de36f6f3412ea326f16fa4309fda660 +) + +_gitroot=git://git.freedesktop.org/git/mesa/drm +_gitname=drm + +build() { + cd $srcdir + msg 'Connecting to GIT server....' + + if [[ -d $_gitname ]]; then + cd $_gitname && git pull origin + msg 'The local files are updated.' + else + git clone $_gitroot $_gitname + fi + + msg 'GIT checkout done or server timeout' + msg 'Starting build...' + + rm -rf $srcdir}/$_gitname-build + git clone $srcdir/$_gitname $srcdir/$_gitname-build + cd $srcdir/$_gitname-build + + sed -i '/PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)/d;/AC_SUBST(PTHREADSTUBS_CFLAGS)/d;/AC_SUBST(PTHREADSTUBS_LIBS)/d' \ + configure.ac + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \ + exynos/Makefile.am + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;/ @PTHREADSTUBS_LIBS@ /d' \ + intel/Makefile.am + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \ + nouveau/Makefile.am + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \ + omap/Makefile.am + sed -i '/ $(PTHREADSTUBS_CFLAGS) /d;s/ @PTHREADSTUBS_LIBS@//' \ + radeon/Makefile.am + + ./autogen.sh + ./configure --prefix=/usr \ + --disable-vmwgfx \ + --enable-exynos-experimental-api \ + --enable-intel \ + --enable-nouveau \ + --enable-omap-experimental-api \ + --enable-radeon \ + --enable-udev + make V=0 +} + +check() { + cd $srcdir/$_gitname-build + make -k check +} + +package() { + cd $srcdir/$_gitname-build + make DESTDIR=$pkgdir install + install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre-git} + install -m644 ../COPYING $pkgdir/usr/share/licenses/${pkgname%-libre-git} +} diff --git a/staging/ghc/PKGBUILD b/staging/ghc/PKGBUILD index 1833af561..b2d0b96e9 100644 --- a/staging/ghc/PKGBUILD +++ b/staging/ghc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166372 2012-09-07 04:50:36Z tdziedzic $ +# $Id: PKGBUILD 166459 2012-09-08 06:24:57Z tdziedzic $ # Maintainer: Thomas Dziedzic # Maintainer: Vesa Kaihlavirta # Special note for devs looking to upgrade this package: diff --git a/staging/haskell-http/PKGBUILD b/staging/haskell-http/PKGBUILD index fda58f3c9..5eb7da013 100644 --- a/staging/haskell-http/PKGBUILD +++ b/staging/haskell-http/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=HTTP pkgname=haskell-http -pkgver=4000.2.3 +pkgver=4000.2.4 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-network=2.3.0.14-1' 'haskell-parsec=3.1.2-2' 'haskell-mtl=2.1.1-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('872a1e49c3701c61c354f76716d4e3e7') +md5sums=('5edcd9fd16a9cb72a140a29442d514b7') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/staging/haskell-mtl/PKGBUILD b/staging/haskell-mtl/PKGBUILD index 4b2f73533..f1fa7c286 100644 --- a/staging/haskell-mtl/PKGBUILD +++ b/staging/haskell-mtl/PKGBUILD @@ -4,16 +4,16 @@ _hkgname=mtl pkgname=haskell-mtl -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="Monad transformer library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-transformers=0.3.0.0-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('0654be687f1492a2ff30cf6f3fb7eed0') +md5sums=('943c110524d96126bfa0e61f7df1ebcd') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/staging/haskell-network/PKGBUILD b/staging/haskell-network/PKGBUILD index f3a3cc022..7f5d13fc1 100644 --- a/staging/haskell-network/PKGBUILD +++ b/staging/haskell-network/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=network pkgname=haskell-network -pkgver=2.3.0.14 +pkgver=2.3.1.0 pkgrel=1 pkgdesc="Networking-related facilities" url="http://hackage.haskell.org/package/network" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-parsec=3.1.2-2') +depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('1e45cc731647acff8b9c33bda085bf2a') +md5sums=('d824db8fc068cab60fa178ab330a57a2') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/staging/haskell-parsec/PKGBUILD b/staging/haskell-parsec/PKGBUILD index 2ab24a745..9c7c1aafb 100644 --- a/staging/haskell-parsec/PKGBUILD +++ b/staging/haskell-parsec/PKGBUILD @@ -5,16 +5,16 @@ _hkgname=parsec pkgname=haskell-parsec -pkgver=3.1.2 -pkgrel=2 +pkgver=3.1.3 +pkgrel=1 pkgdesc="Monadic parser combinators" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-text=0.11.2.1-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('c2a75dfd247ae4839e2602b62dc87487') +md5sums=('d72fc94b81153132c61125a1ec52a4a5') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/staging/haskell-random/PKGBUILD b/staging/haskell-random/PKGBUILD index 56b110289..07cc5e2c2 100644 --- a/staging/haskell-random/PKGBUILD +++ b/staging/haskell-random/PKGBUILD @@ -3,12 +3,12 @@ _hkgname=random pkgname=haskell-random pkgver=1.0.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A basic random number generation library" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538') diff --git a/staging/haskell-text/PKGBUILD b/staging/haskell-text/PKGBUILD index 31811e339..5a23030d5 100644 --- a/staging/haskell-text/PKGBUILD +++ b/staging/haskell-text/PKGBUILD @@ -4,16 +4,16 @@ _hkgname=text pkgname=haskell-text -pkgver=0.11.2.1 +pkgver=0.11.2.3 pkgrel=1 pkgdesc="An efficient packed Unicode text type." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install -md5sums=('77245df79d10ed5f896a9d3f5b17ee74') +md5sums=('7a469d49a7576fb3a18785cb64d4ee6c') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/staging/haskell-transformers/PKGBUILD b/staging/haskell-transformers/PKGBUILD index 96f762dc9..51822a8ad 100644 --- a/staging/haskell-transformers/PKGBUILD +++ b/staging/haskell-transformers/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161398 2012-06-11 01:41:58Z tdziedzic $ +# $Id: PKGBUILD 166465 2012-09-08 07:26:25Z tdziedzic $ # Maintainer: Thomas Dziedzic # Contributor: Rémy Oudompheng @@ -6,12 +6,12 @@ _hkgname=transformers pkgname=haskell-transformers pkgver=0.3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Concrete functor and monad transformers" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz") install=${pkgname}.install md5sums=('852dc0b79cc2bcb39136287d3dd385e5') diff --git a/staging/haskell-zlib/PKGBUILD b/staging/haskell-zlib/PKGBUILD index 11767ab97..30834b3c1 100644 --- a/staging/haskell-zlib/PKGBUILD +++ b/staging/haskell-zlib/PKGBUILD @@ -6,18 +6,22 @@ _hkgname=zlib pkgname=haskell-zlib pkgver=0.5.3.3 -pkgrel=4 +pkgrel=5 pkgdesc="Compression and decompression in the gzip and zlib formats" url="http://hackage.haskell.org/package/zlib" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'zlib' 'sh') +depends=('ghc=7.6.1-1' 'zlib' 'sh') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=${pkgname}.install md5sums=('1649e56d13ce2c6a6a9210227401dbbc') build() { cd ${srcdir}/${_hkgname}-${pkgver} + + # ghc 7.6 includes bytestring 0.10 + sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index 20fc2f60c..be2852273 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 166189 2012-09-05 12:02:06Z dreisner $ +# $Id: PKGBUILD 166506 2012-09-08 13:33:53Z dreisner $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux pkgver=2.22 -pkgrel=3 +pkgrel=4 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') groups=('base') -depends=('pam') +depends=('pam' 'shadow') makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1 conflicts=('util-linux-ng' 'eject') provides=("util-linux-ng=${pkgver}" 'eject') @@ -84,7 +84,7 @@ package() { # broken buildsys doesn't include su(1), which means it # isn't even in the dist tarball - # TODO(dreisner): patch for this already sent upstream + # TODO(dreisner): patched upstream install -m644 "$srcdir/su.1" "$pkgdir/usr/share/man/man1/su.1" # include tmpfiles fragment for uuidd diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install index ef6dea117..d1338be46 100644 --- a/testing/util-linux/util-linux.install +++ b/testing/util-linux/util-linux.install @@ -5,11 +5,14 @@ post_install() { fi if ! getent passwd uuidd >/dev/null; then - useradd -r -s /sbin/nologin -g uuidd uuidd + useradd -r -s /sbin/nologin -d / -g uuidd uuidd fi - # ensure /run/uuidd exists - systemd-tmpfiles --create uuidd.conf + # we don't want use systemd-tmpfiles here because + # the package dependency would create a circular dep. + if [ ! -d run/uuidd ]; then + mkdir run/uuidd + fi } post_upgrade() { -- cgit v1.2.3-54-g00ecf