diff options
Diffstat (limited to 'extra')
27 files changed, 553 insertions, 215 deletions
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 4eae01e81..67a44192c 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189679 2013-07-04 14:55:32Z tomegun $ +# $Id: PKGBUILD 194461 2013-09-16 16:36:18Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs') -pkgver=5.7 +pkgver=5.8 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -72,4 +72,4 @@ package_bluez-utils() { mv "$srcdir/_utils"/* "$pkgdir" } -md5sums=('eb883ce61753bd3f300a531bcc2af49e') +md5sums=('ed9ebe57d02a243c92af21cc13d3ee69') diff --git a/extra/efivar/PKGBUILD b/extra/efivar/PKGBUILD deleted file mode 100644 index df5cc9ad9..000000000 --- a/extra/efivar/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 193971 2013-09-09 10:46:11Z tpowa $ -# Maintainer : Tobias Powalowski <tpowa@archlinux.org> -# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> - -_gitroot="git://github.com/vathpela/efivar.git" -_gitname="efivar" -_gitbranch="master" - -_pkgname="efivar" -pkgname="${_pkgname}" - -pkgdesc="Library to manipulate EFI variables" -pkgver=0.6 -pkgrel=1 -arch=('x86_64' 'i686') -url="https://github.com/vathpela/efivar" -license=('LGPL2.1') -depends=('popt') -conflicts=('libefivar') -provides=('libefivar') -options=('zipman' 'docs' '!makeflags') - -source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}") -sha1sums=('SKIP') - -pkgver() { - cd "${srcdir}/${_gitname}/" - echo "$(git describe --tags)" | sed 's|-|\.|g' -} - -build() { - - rm -rf "${srcdir}/${_gitname}_build/" || true - cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build" - - cd "${srcdir}/${_gitname}_build/" - - git clean -x -d -f - echo - - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/${_gitname}_build/src/test/Makefile" || true - - make libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" V=1 -j1 - echo - -} - -package() { - - cd "${srcdir}/${_gitname}_build/" - - make -j1 V=1 DESTDIR="${pkgdir}/" libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" install - echo - - install -d "${pkgdir}/usr/bin" - install -D -m0755 "${srcdir}/${_gitname}_build/src/test/tester" "${pkgdir}/usr/bin/efivar-tester" - -} diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 82c6e99e4..0e37fe39b 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186309 2013-05-24 14:23:00Z heftig $ +# $Id: PKGBUILD 194416 2013-09-16 09:02:57Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=(i686 x86_64) @@ -19,7 +19,7 @@ options=('!libtool' '!makeflags') groups=(gnome) install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0') +sha256sums=('cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9') build() { cd $pkgname-$pkgver diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD index 81e27a414..499ce75d9 100644 --- a/extra/freeciv/PKGBUILD +++ b/extra/freeciv/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 178314 2013-02-20 01:15:54Z eric $ +# $Id: PKGBUILD 194398 2013-09-16 01:46:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=freeciv -pkgver=2.3.4 +pkgver=2.4.0 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('i686' 'x86_64') url="http://www.freeciv.org/" license=('GPL') -depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme') -options=('!libtool') +depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme' 'lua51' 'sqlite' 'curl' 'libltdl') +backup=('etc/freeciv/database.lua') +options=('!libtool' '!staticlibs') install=freeciv.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('974bbadf86c697bd2d4de7abf12d992fb50f1724') +sha1sums=('4a3537dc050bd69002794c832b74f5af972da25e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --enable-shared --enable-sys-lua \ + --enable-client=gtk2 --enable-fcdb=sqlite3 --enable-aimodules make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index ee1bd831e..3c144a8c8 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192269 2013-08-09 12:51:47Z heftig $ +# $Id: PKGBUILD 194406 2013-09-16 08:05:52Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.17 +pkgver=2.6.18 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib') makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('22d49e57c404a0a68d1ac3426c8f23a39185a4b2d569de03bece07db03d1202f') +sha256sums=('783fc14190459c568a31c2fd6dba1e8afa0431e2931aa46f652aa486ad881ae6') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 801410a7c..0d29c06de 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185315 2013-05-13 09:38:38Z heftig $ +# $Id: PKGBUILD 194410 2013-09-16 08:14:01Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64) @@ -15,7 +15,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6b9999d8213c8cab7abb7c9b1833d1d599866546180d11603fdee5430f93bae1') +sha256sums=('9125f438321c686c578b37f37a7bfab1ec8dbb519c06031a682b1eb49f474279') build(){ cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 1266a9f5c..8abff2a2c 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 192485 2013-08-12 21:17:35Z heftig $ +# $Id: PKGBUILD 194412 2013-09-16 08:37:42Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.4.1 -pkgrel=2 +pkgver=3.8.5 +pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) arch=(i686 x86_64) @@ -24,7 +24,7 @@ install=gnome-control-center.install options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz no-deprecated-upower.diff) -sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55' +sha256sums=('efb9fb47aaa9a308aed3064efc39356db05d71ddb0374561eeccc57c122212e2' '4182fa082b071c840bc0a6e981dad3c070602cae473229227e81bdaa2b5f8c23') prepare() { @@ -35,8 +35,8 @@ prepare() { build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname --disable-static + CFLAGS="$CFLAGS -Wall" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static --disable-silent-rules #https://bugzilla.gnome.org/show_bug.cgi?id=656229 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 704daff21..89303244b 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188610 2013-06-16 23:56:02Z heftig $ +# $Id: PKGBUILD 194422 2013-09-16 09:53:28Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.8.3 -pkgrel=2 +pkgver=3.8.4 +pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" arch=(i686 x86_64) @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=(gnome) options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2') +sha256sums=('2aa1d4c5b78b018368e1cf9cd3568555dd6b04ad68536b9f338b28ac0f89df9f') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index c2a375b44..1f67adbc1 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192484 2013-08-12 21:17:34Z heftig $ +# $Id: PKGBUILD 194420 2013-09-16 09:19:10Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.8.4 -pkgrel=2 +pkgver=3.8.5 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -16,7 +16,7 @@ url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 0001-power-Use-logind-to-discover-critical-action-availab.patch) -sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc' +sha256sums=('19420c97296802162fd4e0e0a08e797f5038ec8bd98cffe222362e24c7405784' '9825d3486665d87d4fc54355a6d318d68f5d3caeb286bdd659147920a85c56d9') prepare() { diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index 4d2be9843..425edfd92 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191600 2013-07-26 23:41:43Z heftig $ +# $Id: PKGBUILD 194418 2013-09-16 09:09:15Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=(i686 x86_64) @@ -16,7 +16,7 @@ replaces=(gnome-themes) conflicts=(gnome-themes) options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('977eb8ac94bad6e7095c272a583e614fba1c1897410e9f25ae028618d269b1e4') +sha256sums=('1252d719847cab54cc0dc510c3d3698462dcb1b45fabd9643473ac28e5cd7a20') build() { cd $pkgname-$pkgver diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index a28b75be1..bd5110482 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,17 +3,15 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.4 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('jdk7-openjdk' 'zip' '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 - openjdk-hotfix.patch) -sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb' - '1bf96e430d0694c53539e4e7a8c979c65a2ab5274d8ae38067b0fd7dd5bfba03') +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) +sha256sums=('09100207396a09784e04f2ad40d65212930c1d43839e7fa63b9dffaf8567d77b') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -24,7 +22,6 @@ build() { LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz cd "${srcdir}"/icedtea-web* - patch -Np1 < $srcdir/openjdk-hotfix.patch ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ --with-jdk-home=${_jvmdir} \ diff --git a/extra/icedtea-web-java7/openjdk-hotfix.patch b/extra/icedtea-web-java7/openjdk-hotfix.patch deleted file mode 100644 index 29a0a309b..000000000 --- a/extra/icedtea-web-java7/openjdk-hotfix.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java ---- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200 -+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200 -@@ -35,6 +35,8 @@ - import net.sourceforge.jnlp.cache.UpdatePolicy; - import net.sourceforge.jnlp.security.viewer.CertificateViewer; - import net.sourceforge.jnlp.services.ServiceUtil; -+import sun.awt.AppContext; -+import sun.awt.SunToolkit; - - /** - * This is the main entry point for the JNLP client. The main -@@ -113,6 +115,9 @@ - * Launch the JNLP file specified by the command-line arguments. - */ - public static void main(String[] argsIn) { -+ if (AppContext.getAppContext() == null) { -+ SunToolkit.createNewAppContext(); -+ } - args = argsIn; - - if (null != getOption("-viewer")) { -diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java ---- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200 -+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200 -@@ -234,7 +234,7 @@ - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (Exception e) { -- // ignore it -+ e.printStackTrace(); - } - - doMainAppContextHacks(); -diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java ---- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200 -+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200 -@@ -72,6 +72,8 @@ - import java.net.ProxySelector; - import java.util.Enumeration; - import java.util.Properties; -+import sun.awt.AppContext; -+import sun.awt.SunToolkit; - - import net.sourceforge.jnlp.config.DeploymentConfiguration; - import net.sourceforge.jnlp.runtime.JNLPRuntime; -@@ -94,6 +96,9 @@ - */ - public static void main(String args[]) - throws IOException { -+ if (AppContext.getAppContext() == null) { -+ SunToolkit.createNewAppContext(); -+ } - if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { - System.err.println("Invalid pipe names provided. Refusing to proceed."); - System.exit(1); diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD index 950b81527..400dcb52c 100644 --- a/extra/intel-tbb/PKGBUILD +++ b/extra/intel-tbb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188979 2013-06-27 17:08:09Z eric $ +# $Id: PKGBUILD 194497 2013-09-16 20:37:59Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=4.1_20130613 +pkgver=4.2_20130725 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/' license=('GPL') depends=('gcc-libs') source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('b1322bd10c5b05a79f61edb236adc0513b4a1532') +sha1sums=('f354bd9b67295f65c43531b751e34f483ed8a024') build() { cd tbb${pkgver/\./}oss diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 1104d5080..f1668a6da 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190056 2013-07-13 17:35:10Z andyrtr $ +# $Id: PKGBUILD 194427 2013-09-16 10:28:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm @@ -8,7 +8,8 @@ pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) license=('custom') depends=('glibc' 'libpciaccess') -makedepends=('cairo' 'valgrind' 'clang') +makedepends=('valgrind' 'clang') +checkdepends=('cairo') replaces=('libdrm-new' 'libdrm-nouveau') options=('!libtool') url="http://dri.freedesktop.org/" diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index 936a01b78..1c7576b30 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191317 2013-07-23 14:38:48Z foutrelis $ +# $Id: PKGBUILD 194432 2013-09-16 10:42:02Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.6.3 +pkgver=1.6.5 _apngver=1.6.3 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" @@ -16,7 +16,7 @@ depends=('zlib' 'sh') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc} http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz) -md5sums=('9307f8ab04f4be3c1889ffb504f0fe5c' +md5sums=('dec292dd99b094cea03bdd7232f5a80c' 'SKIP' '57007fc121baa2cdc48abcfb26300e78') diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD index 24f5ab35f..3408acb36 100644 --- a/extra/orc/PKGBUILD +++ b/extra/orc/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 182380 2013-04-09 18:42:44Z ioni $ +# $Id: PKGBUILD 194440 2013-09-16 12:20:50Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=orc -pkgver=0.4.17 +pkgver=0.4.18 pkgrel=1 pkgdesc="The Oild Runtime Compiler" arch=('i686' 'x86_64') license=('custom') url="http://code.entropywave.com/projects/orc/" depends=('glibc') +makedepends=('valgrind') options=('!libtool') -source=(http://code.entropywave.com/download/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('af1bf3dab9e69f3c36f389285e2a12a1') +source=(http://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.gz) build () { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static make } +check() { + cd $pkgname-$pkgver + make check +} + package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } +md5sums=('1a2552e8d127526c48d644fe6437b377') diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 86bda04b5..d833e40c8 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180809 2013-03-26 11:49:40Z foutrelis $ +# $Id: PKGBUILD 194462 2013-09-16 16:36:19Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor -pkgver=2.0.9 +pkgver=2.0.10 pkgrel=2 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') @@ -33,4 +33,4 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('4ceb9316488b0ea01acf011023cf7fff') +md5sums=('d9b0314eb835551adb48af037dcfd46e') diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 5c2038dba..592e5f3e2 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 185168 2013-05-11 16:16:33Z tomegun $ +# $Id: PKGBUILD 194424 2013-09-16 10:09:01Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=2.99.1 -pkgrel=2 +pkgver=3.0 +pkgrel=1 pkgdesc="An iTunes-like music playback and management application" arch=(i686 x86_64) license=(GPL) url="http://www.rhythmbox.org" -depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info python2-gobject totem-plparser tdb webkitgtk3) +depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkitgtk3 python-gobject) makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc-utils libgpod libmtp) optdepends=('gst-plugins-ugly: Extra media codecs' 'gst-plugins-bad: Extra media codecs' @@ -24,11 +24,11 @@ optdepends=('gst-plugins-ugly: Extra media codecs' options=('!libtool' '!emptydirs') install=rhythmbox.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz) -sha256sums=('ed30bb534a789e2b50f953e33eee0bb09f389fe813d433a87d504d07be5f7777') +sha256sums=('bf6f35c1a46867d16e45969f97f01630d936bfa92baf940c442f3a19fb6820e4') build() { cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/rhythmbox \ --localstatedir=/var --disable-static \ --enable-daap --enable-python --enable-vala diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD index 3da0815af..235a74225 100644 --- a/extra/swig/PKGBUILD +++ b/extra/swig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188138 2013-06-10 13:01:07Z bpiotrowski $ +# $Id: PKGBUILD 194495 2013-09-16 20:14:45Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=swig -pkgver=2.0.10 +pkgver=2.0.11 pkgrel=1 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64') @@ -11,17 +11,16 @@ url="http://www.swig.org/" license=('custom') depends=('zlib' 'pcre') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('ad6f95ce9b9da4a8f5b80ac1848d26c76f518d84') +sha1sums=('d3bf4e78824dba76bfb3269367f1ae0276b49df9') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE install -D -m644 LICENSE-UNIVERSITIES "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE-UNIVERSITIES diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD index 2558d262c..e28399444 100644 --- a/extra/tali/PKGBUILD +++ b/extra/tali/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tali -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 pkgdesc="Beat the odds in a poker-style dice game" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=tali.install url="https://live.gnome.org/Tali" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('77fa3a3804f51e40629799d441b34e9b01a665097be229bd94adb28d3dbc17d5') +sha256sums=('33a7a67a9ba2034cba916a033ee70285a334438a460fccd24373c7edcfc592c8') build() { cd $pkgname-$pkgver diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 8360e0763..af7b4e93f 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 191767 2013-07-30 10:31:09Z tomegun $ +# $Id: PKGBUILD 194463 2013-09-16 16:36:20Z tomegun $ # Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.81 +pkgver=2.82 pkgrel=1 arch=('i686' 'x86_64') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent') +makedepends=('gtk3' 'intltool' 'curl' 'qt5-base' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz) -md5sums=('db1ad10ecff07150486dab2365ccb3a8') +md5sums=('a5ef870c0410b12d10449c2d36fa4661') build() { cd $pkgbase-$pkgver @@ -19,7 +19,7 @@ build() { ./configure --prefix=/usr make pushd qt - qmake-qt4 qtr.pro + qmake qtr.pro make } package_transmission-cli() { @@ -54,7 +54,7 @@ package_transmission-gtk() { package_transmission-qt() { pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)" - depends=('curl' 'qt4' 'libevent') + depends=('curl' 'qt5-base' 'libevent') optdepends=('transmission-cli: daemon and web support') install=transmission-qt.install diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD index cfed51c91..3877b9210 100644 --- a/extra/xfce4-power-manager/PKGBUILD +++ b/extra/xfce4-power-manager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185209 2013-05-12 07:30:46Z foutrelis $ +# $Id: PKGBUILD 194428 2013-09-16 10:38:02Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-power-manager pkgver=1.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="Power manager for Xfce desktop" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -15,17 +15,27 @@ makedepends=('pkgconfig' 'intltool') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2 + xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch xfce4-power-manager-1.2.0-sync-en-gb-translation.patch) sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9' + '4166f61234abfcd385d43b1e7f7ab5b73711bcb7335ef0f6b217ac799dc9266b' 'c8e1dfafd685c2abf1fcc2b3682f5b1eb2e7f1d4fa557f11a7478437eef9a933') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" + # Use logind interfaces for suspend and hibernate + # https://bugzilla.xfce.org/show_bug.cgi?id=9963 + patch -Np1 -i "$srcdir/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch" + # Fix en_GB translation # https://bugs.archlinux.org/task/30055 patch -d po -Np0 -i \ "$srcdir/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure \ --prefix=/usr \ diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch new file mode 100644 index 000000000..431489588 --- /dev/null +++ b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch @@ -0,0 +1,156 @@ +From 244d0f09561eace29cbef819c2deb55b13701e25 Mon Sep 17 00:00:00 2001 +From: Mikhail Efremov <sem@altlinux.org> +Date: Mon, 8 Apr 2013 21:04:30 +0400 +Subject: [PATCH] Add systemd-logind support for suspend/hibernate. + +--- + configure.ac.in | 20 +++++++++++++++++ + src/xfpm-power-common.h | 8 +++++++ + src/xfpm-power.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 84 insertions(+), 1 deletion(-) + +diff --git a/src/xfpm-power-common.h b/src/xfpm-power-common.h +index 1040aed..11eaedc 100644 +--- a/src/xfpm-power-common.h ++++ b/src/xfpm-power-common.h +@@ -33,9 +33,17 @@ + #define UPOWER_PATH_WAKEUPS "/org/freedesktop/UPower/Wakeups" + #define UPOWER_IFACE_WAKEUPS "org.freedesktop.UPower.Wakeups" + ++#ifdef WITH_SLEEP_MANAGER_UPOWER + #define POLKIT_AUTH_SUSPEND "org.freedesktop.upower.suspend" + #define POLKIT_AUTH_HIBERNATE "org.freedesktop.upower.hibernate" ++#else ++#define LOGIND_NAME "org.freedesktop.login1" ++#define LOGIND_PATH "/org/freedesktop/login1" ++#define LOGIND_IFACE "org.freedesktop.login1.Manager" + ++#define POLKIT_AUTH_SUSPEND "org.freedesktop.login1.suspend" ++#define POLKIT_AUTH_HIBERNATE "org.freedesktop.login1.hibernate" ++#endif + + GPtrArray *xfpm_power_enumerate_devices (DBusGProxy *proxy); + +diff --git a/src/xfpm-power.c b/src/xfpm-power.c +index 796bef8..4a91e33 100644 +--- a/src/xfpm-power.c ++++ b/src/xfpm-power.c +@@ -72,7 +72,10 @@ struct XfpmPowerPrivate + + DBusGProxy *proxy; + DBusGProxy *proxy_prop; +- ++#ifndef WITH_SLEEP_MANAGER_UPOWER ++ DBusGProxy *proxy_logind; ++#endif ++ + GHashTable *hash; + + XfpmConsoleKit *console; +@@ -153,6 +156,7 @@ xfpm_power_check_polkit_auth (XfpmPower *power) + } + #endif + ++#ifdef WITH_SLEEP_MANAGER_UPOWER + static void + xfpm_power_check_pm (XfpmPower *power, GHashTable *props) + { +@@ -186,6 +190,32 @@ xfpm_power_check_pm (XfpmPower *power, GHashTable *props) + power->priv->can_hibernate = ret; + } + } ++#else ++static gboolean ++xfpm_power_can_sleep_method (XfpmPower *power, const char *method) ++{ ++ GError *error = NULL; ++ char *retstr = NULL; ++ gboolean ret = FALSE; ++ ++ if (!dbus_g_proxy_call (power->priv->proxy_logind, method, &error, ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &retstr, ++ G_TYPE_INVALID)) ++ { ++ g_warning ("Unable to check %s method: %s", method, error->message); ++ g_error_free (error); ++ ++ return FALSE; ++ } ++ ++ if (retstr && !strcmp (retstr, "yes")) ++ ret = TRUE; ++ g_free (retstr); ++ ++ return ret; ++} ++#endif + + static void + xfpm_power_check_power (XfpmPower *power, GHashTable *props) +@@ -276,7 +306,12 @@ xfpm_power_get_properties (XfpmPower *power) + + props = xfpm_power_get_interface_properties (power->priv->proxy_prop, UPOWER_IFACE); + ++#ifdef WITH_SLEEP_MANAGER_UPOWER + xfpm_power_check_pm (power, props); ++#else ++ power->priv->can_suspend = xfpm_power_can_sleep_method (power, "CanSuspend"); ++ power->priv->can_hibernate = xfpm_power_can_sleep_method (power, "CanHibernate"); ++#endif + xfpm_power_check_lid (power, props); + xfpm_power_check_power (power, props); + +@@ -347,9 +382,16 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force) + xfpm_lock_screen (); + } + ++#ifdef WITH_SLEEP_MANAGER_UPOWER + dbus_g_proxy_call (power->priv->proxy, sleep_time, &error, + G_TYPE_INVALID, + G_TYPE_INVALID); ++#else ++ dbus_g_proxy_call (power->priv->proxy_logind, sleep_time, &error, ++ G_TYPE_BOOLEAN, TRUE, ++ G_TYPE_INVALID, ++ G_TYPE_INVALID); ++#endif + + if ( error ) + { +@@ -1360,12 +1402,20 @@ xfpm_power_init (XfpmPower *power) + UPOWER_NAME, + UPOWER_PATH, + DBUS_INTERFACE_PROPERTIES); ++ + if (power->priv->proxy_prop == NULL) + { + g_critical ("Unable to create proxy for %s", UPOWER_NAME); + goto out; + } + ++#ifndef WITH_SLEEP_MANAGER_UPOWER ++ power->priv->proxy_logind = dbus_g_proxy_new_for_name (power->priv->bus, ++ LOGIND_NAME, ++ LOGIND_PATH, ++ LOGIND_IFACE); ++#endif ++ + xfpm_power_get_power_devices (power); + xfpm_power_get_properties (power); + #ifdef ENABLE_POLKIT +@@ -1467,6 +1517,11 @@ xfpm_power_finalize (GObject *object) + if ( power->priv->proxy_prop ) + g_object_unref (power->priv->proxy_prop); + ++#ifndef WITH_SLEEP_MANAGER_UPOWER ++ if ( power->priv->proxy_logind ) ++ g_object_unref (power->priv->proxy_logind); ++#endif ++ + g_hash_table_destroy (power->priv->hash); + + #ifdef ENABLE_POLKIT +-- +1.8.1.5 + diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index 2b472ad34..0d967f22a 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189759 2013-07-07 14:26:30Z foutrelis $ +# $Id: PKGBUILD 194429 2013-09-16 10:38:03Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session pkgver=4.10.1 -pkgrel=2 +pkgrel=3 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -20,8 +20,20 @@ optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enab replaces=('xfce-utils') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 + xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch) +sha256sums=('0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83' + '1fc10b6495624ddfb9e18419c835f7b929ad738c602a64ee7aab8327d3aac981') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Use logind interfaces for suspend and hibernate + # https://bugzilla.xfce.org/show_bug.cgi?id=9952 + patch -Np1 -i "$srcdir/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch" + + xdt-autogen +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xfce4-session/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch b/extra/xfce4-session/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch new file mode 100644 index 000000000..43aaeb8d5 --- /dev/null +++ b/extra/xfce4-session/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch @@ -0,0 +1,275 @@ +From b076b5592579b397b7d4888eb8062e646b9a4dec Mon Sep 17 00:00:00 2001 +From: Mikhail Efremov <sem@altlinux.org> +Date: Wed, 10 Apr 2013 17:10:09 +0400 +Subject: [PATCH] Add systemd-logind support for suspend/hibernate. + +--- + xfce4-session/Makefile.am | 8 +++---- + xfce4-session/xfsm-shutdown.c | 42 +++++++++++++++++++++++++++------- + xfce4-session/xfsm-systemd.c | 52 +++++++++++++++++++++++++++++++++++++++++++ + xfce4-session/xfsm-systemd.h | 14 ++++++++++++ + 4 files changed, 104 insertions(+), 12 deletions(-) + +diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am +index 5472b33..5e2973b 100644 +--- a/xfce4-session/Makefile.am ++++ b/xfce4-session/Makefile.am +@@ -59,9 +59,7 @@ xfce4_session_SOURCES = \ + xfsm-splash-screen.c \ + xfsm-splash-screen.h \ + xfsm-startup.c \ +- xfsm-startup.h \ +- xfsm-upower.c \ +- xfsm-upower.h ++ xfsm-startup.h + + if HAVE_SYSTEMD + xfce4_session_SOURCES += \ +@@ -70,7 +68,9 @@ xfce4_session_SOURCES += \ + else + xfce4_session_SOURCES += \ + xfsm-consolekit.c \ +- xfsm-consolekit.h ++ xfsm-consolekit.h \ ++ xfsm-upower.c \ ++ xfsm-upower.h + endif + + xfce4_session_CFLAGS = \ +diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c +index 4c483a7..8a2ba8d 100644 +--- a/xfce4-session/xfsm-shutdown.c ++++ b/xfce4-session/xfsm-shutdown.c +@@ -66,12 +66,12 @@ + #include <xfce4-session/xfsm-fadeout.h> + #include <xfce4-session/xfsm-global.h> + #include <xfce4-session/xfsm-legacy.h> +-#include <xfce4-session/xfsm-upower.h> + + #ifdef HAVE_SYSTEMD + #include <xfce4-session/xfsm-systemd.h> + #else + #include <xfce4-session/xfsm-consolekit.h> ++#include <xfce4-session/xfsm-upower.h> + #endif + + static void xfsm_shutdown_finalize (GObject *object); +@@ -100,8 +100,8 @@ struct _XfsmShutdown + XfsmSystemd *systemd; + #else + XfsmConsolekit *consolekit; +-#endif + XfsmUPower *upower; ++#endif + + /* kiosk settings */ + gboolean kiosk_can_shutdown; +@@ -142,8 +142,8 @@ xfsm_shutdown_init (XfsmShutdown *shutdown) + shutdown->systemd = xfsm_systemd_get (); + #else + shutdown->consolekit = xfsm_consolekit_get (); +-#endif + shutdown->upower = xfsm_upower_get (); ++#endif + shutdown->helper_state = SUDO_NOT_INITIAZED; + shutdown->helper_require_password = FALSE; + +@@ -165,8 +165,8 @@ xfsm_shutdown_finalize (GObject *object) + g_object_unref (G_OBJECT (shutdown->systemd)); + #else + g_object_unref (G_OBJECT (shutdown->consolekit)); +-#endif + g_object_unref (G_OBJECT (shutdown->upower)); ++#endif + + /* close down helper */ + xfsm_shutdown_sudo_free (shutdown); +@@ -692,7 +692,11 @@ xfsm_shutdown_try_suspend (XfsmShutdown *shutdown, + { + g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE); + ++#ifdef HAVE_SYSTEMD ++ return xfsm_systemd_try_suspend (shutdown->systemd, error); ++#else + return xfsm_upower_try_suspend (shutdown->upower, error); ++#endif + } + + +@@ -703,7 +707,11 @@ xfsm_shutdown_try_hibernate (XfsmShutdown *shutdown, + { + g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE); + ++#ifdef HAVE_SYSTEMD ++ return xfsm_systemd_try_hibernate (shutdown->systemd, error); ++#else + return xfsm_upower_try_hibernate (shutdown->upower, error); ++#endif + } + + +@@ -776,6 +784,8 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown, + gboolean *auth_suspend, + GError **error) + { ++ gboolean ret; ++ + g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE); + + if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL)) +@@ -784,8 +794,15 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown, + return TRUE; + } + +- return xfsm_upower_can_suspend (shutdown->upower, can_suspend, +- auth_suspend, error); ++#ifdef HAVE_SYSTEMD ++ ret = xfsm_systemd_can_suspend (shutdown->systemd, can_suspend, error); ++ *auth_suspend = *can_suspend; ++#else ++ ret = xfsm_upower_can_suspend (shutdown->upower, can_suspend, ++ auth_suspend, error); ++#endif ++ ++ return ret; + } + + +@@ -796,6 +813,8 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown, + gboolean *auth_hibernate, + GError **error) + { ++ gboolean ret; ++ + g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE); + + if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL)) +@@ -804,8 +823,15 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown, + return TRUE; + } + +- return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate, +- auth_hibernate, error); ++#ifdef HAVE_SYSTEMD ++ ret = xfsm_systemd_can_hibernate (shutdown->systemd, can_hibernate, error); ++ *auth_hibernate = *can_hibernate; ++#else ++ ret = xfsm_upower_can_hibernate (shutdown->upower, can_hibernate, ++ auth_hibernate, error); ++#endif ++ ++ return ret; + } + + +diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c +index 7bdd39d..cfe7bf4 100644 +--- a/xfce4-session/xfsm-systemd.c ++++ b/xfce4-session/xfsm-systemd.c +@@ -33,8 +33,12 @@ + #define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" + #define SYSTEMD_REBOOT_ACTION "Reboot" + #define SYSTEMD_POWEROFF_ACTION "PowerOff" ++#define SYSTEMD_SUSPEND_ACTION "Suspend" ++#define SYSTEMD_HIBERNATE_ACTION "Hibernate" + #define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot" + #define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off" ++#define SYSTEMD_SUSPEND_TEST "org.freedesktop.login1.suspend" ++#define SYSTEMD_HIBERNATE_TEST "org.freedesktop.login1.hibernate" + + + +@@ -205,6 +209,28 @@ xfsm_systemd_try_shutdown (XfsmSystemd *systemd, + + + gboolean ++xfsm_systemd_try_suspend (XfsmSystemd *systemd, ++ GError **error) ++{ ++ return xfsm_systemd_try_method (systemd, ++ SYSTEMD_SUSPEND_ACTION, ++ error); ++} ++ ++ ++ ++gboolean ++xfsm_systemd_try_hibernate (XfsmSystemd *systemd, ++ GError **error) ++{ ++ return xfsm_systemd_try_method (systemd, ++ SYSTEMD_HIBERNATE_ACTION, ++ error); ++} ++ ++ ++ ++gboolean + xfsm_systemd_can_restart (XfsmSystemd *systemd, + gboolean *can_restart, + GError **error) +@@ -227,3 +253,29 @@ xfsm_systemd_can_shutdown (XfsmSystemd *systemd, + SYSTEMD_POWEROFF_TEST, + error); + } ++ ++ ++ ++gboolean ++xfsm_systemd_can_suspend (XfsmSystemd *systemd, ++ gboolean *can_suspend, ++ GError **error) ++{ ++ return xfsm_systemd_can_method (systemd, ++ can_suspend, ++ SYSTEMD_SUSPEND_TEST, ++ error); ++} ++ ++ ++ ++gboolean ++xfsm_systemd_can_hibernate (XfsmSystemd *systemd, ++ gboolean *can_hibernate, ++ GError **error) ++{ ++ return xfsm_systemd_can_method (systemd, ++ can_hibernate, ++ SYSTEMD_HIBERNATE_TEST, ++ error); ++} +diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h +index 8223622..6cf803f 100644 +--- a/xfce4-session/xfsm-systemd.h ++++ b/xfce4-session/xfsm-systemd.h +@@ -42,6 +42,12 @@ gboolean xfsm_systemd_try_restart (XfsmSystemd *systemd, + gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd, + GError **error); + ++gboolean xfsm_systemd_try_suspend (XfsmSystemd *systemd, ++ GError **error); ++ ++gboolean xfsm_systemd_try_hibernate (XfsmSystemd *systemd, ++ GError **error); ++ + gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd, + gboolean *can_restart, + GError **error); +@@ -50,6 +56,14 @@ gboolean xfsm_systemd_can_shutdown (XfsmSystemd *systemd, + gboolean *can_shutdown, + GError **error); + ++gboolean xfsm_systemd_can_suspend (XfsmSystemd *systemd, ++ gboolean *can_suspend, ++ GError **error); ++ ++gboolean xfsm_systemd_can_hibernate (XfsmSystemd *systemd, ++ gboolean *can_hibernate, ++ GError **error); ++ + G_END_DECLS + + #endif /* __XFSM_SYSTEMD_H__ */ +-- +1.8.1.5 + diff --git a/extra/xorg-xinput/PKGBUILD b/extra/xorg-xinput/PKGBUILD index f1110827f..0f2007c94 100644 --- a/extra/xorg-xinput/PKGBUILD +++ b/extra/xorg-xinput/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 159187 2012-05-17 13:48:28Z andyrtr $ +# $Id: PKGBUILD 194484 2013-09-16 19:13:37Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xinput -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="Small commandline tool to configure devices" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'libxi>=1.5.99.2' 'xorg-xrandr' 'libxinerama') -makedepends=('xorg-util-macros' 'inputproto') +makedepends=('xorg-util-macros' 'inputproto' 'libxfixes') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xinput-${pkgver}.tar.bz2) -sha256sums=('4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e') +sha256sums=('b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f') build() { cd "${srcdir}/xinput-${pkgver}" diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 1553ddcc3..b9ab3f225 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188951 2013-06-27 01:33:26Z foutrelis $ +# $Id: PKGBUILD 194430 2013-09-16 10:39:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=22.0 +pkgver=23.0.1 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/ shared-libs.patch) options=('!emptydirs') replaces=('xulrunner-oss') -sha256sums=('f806adf3f1c5b4c8d26322401ef876c73a549f93911be921044f508d698ac589' +sha256sums=('50d70813cee1c966a6037957206626bb62dc047b011d2e4fab11c559008f9336' '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') |