diff options
84 files changed, 3303 insertions, 156 deletions
diff --git a/community-staging/ktoblzcheck/PKGBUILD b/community-staging/ktoblzcheck/PKGBUILD new file mode 100644 index 000000000..0b7caeec1 --- /dev/null +++ b/community-staging/ktoblzcheck/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 77312 2012-10-08 16:11:32Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> + +pkgname=ktoblzcheck +pkgver=1.39 +pkgrel=3 +pkgdesc="A library to check account numbers and bank codes of German banks" +arch=(i686 x86_64) +url="http://ktoblzcheck.sourceforge.net" +options=('!libtool') +license=("LGPL") +depends=('gcc-libs' 'python') +optdepends=('perl') +source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz + ktoblzcheck-python3.patch) +md5sums=('ef5efd6e2c31aaf6405060ec477c200c' + 'a81a697bb3aaeffb7fac0ad7d9166e3f') + +build() { + cd "$srcdir/ktoblzcheck-$pkgver" + ./configure --prefix=/usr + patch -p1 <$srcdir/ktoblzcheck-python3.patch + make +} + +package() { + cd "$srcdir/ktoblzcheck-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/ktoblzcheck/ktoblzcheck-python3.patch b/community-staging/ktoblzcheck/ktoblzcheck-python3.patch new file mode 100644 index 000000000..5bfc53275 --- /dev/null +++ b/community-staging/ktoblzcheck/ktoblzcheck-python3.patch @@ -0,0 +1,57 @@ +diff -ur ktoblzcheck-1.28/src/python/ktoblzcheck.py ktoblzcheck-1.28.my/src/python/ktoblzcheck.py +--- ktoblzcheck-1.28/src/python/ktoblzcheck.py 2008-08-12 16:48:54.000000000 +0000 ++++ ktoblzcheck-1.28.my/src/python/ktoblzcheck.py 2010-09-20 09:08:36.000000000 +0000 +@@ -197,35 +197,35 @@ + + def test(): + a = AccountNumberCheck() +- print 'Number of Banks:', a.bankCount +- print 'find 20010020:', a.findBank('20010020') +- print 'find 20010033:', a.findBank('20010033') +- print 'check 20070024/9291394:', a.check('20070024','9291394') +- print 'check 20070024/9291394:', a.check('20070024','9291394023') +- print ++ print('Number of Banks:', a.bankCount) ++ print('find 20010020:', a.findBank('20010020')) ++ print('find 20010033:', a.findBank('20010033')) ++ print('check 20070024/9291394:', a.check('20070024','9291394')) ++ print('check 20070024/9291394:', a.check('20070024','9291394023')) ++ print() + ck = IbanCheck() + if not kto.IbanCheck_selftest(ck): # not publicly defined +- print "Self-Test failed!" ++ print("Self-Test failed!") + raise SystemExit + s = " iban fr14 2004 1010 0505 0001 3m02 606" +- print "test for iban :", s ++ print("test for iban :", s) + iban = Iban(s) +- print "transmission form:", iban.transmissionForm() ++ print("transmission form:", iban.transmissionForm()) + res = ck.check(iban) +- print "check result :", res, "("+IbanCheck.resultText(res)+")" +- print "printable form :", iban.printableForm() +- print +- print "expect bad checksum:" ++ print("check result :", res, "("+IbanCheck.resultText(res)+")") ++ print("printable form :", iban.printableForm()) ++ print() ++ print("expect bad checksum:") + s = "FR1420041010050500013X02606" + res = ck.check(s) +- print s + ":", res, "("+IbanCheck.resultText(res)+")" +- print ++ print(s + ":", res, "("+IbanCheck.resultText(res)+")") ++ print() + s = "IBAN DE66 2007 0024 0929 1394 00" +- print s ++ print(s) + s = Iban(s).transmissionForm() + start, end = ck.bic_position(s) +- print "prefix, checksum, BIC, account:" +- print ', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0'))) ++ print("prefix, checksum, BIC, account:") ++ print(', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0')))) + + + if __name__ == '__main__': diff --git a/community-staging/python-psycopg2/ChangeLog b/community-staging/python-psycopg2/ChangeLog new file mode 100644 index 000000000..f31be0aaa --- /dev/null +++ b/community-staging/python-psycopg2/ChangeLog @@ -0,0 +1,25 @@ + +2009-08-05 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated to: 2.0.11 + +2009-03-24 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 2.0.9 + +2009-01-11 Douglas Soares de Andrade <douglas@archlinux.org> + + * Rebuilt for python 2.6 + +2008-04-25 Mateusz Herych <heniekk@gmail.com> + + * Built for x86_64 - 2.0.7 + +2008-04-23 Douglas Soares de Andrade <dsa@aur.archlinux.org> + + * Built for i686 - 2.0.7 + +2007-06-27 tardo <tardo@nagi-fanboi.net> + + * Built for x86_64 + diff --git a/community-staging/python-psycopg2/PKGBUILD b/community-staging/python-psycopg2/PKGBUILD new file mode 100644 index 000000000..88b74f129 --- /dev/null +++ b/community-staging/python-psycopg2/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 77314 2012-10-08 16:12:05Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> + +pkgbase=python-psycopg2 +pkgname=('python-psycopg2' 'python2-psycopg2') +pkgver=2.4.5 +pkgrel=2 +pkgdesc="A PostgreSQL database adapter for the Python programming language." +arch=('i686' 'x86_64') +url="http://initd.org/psycopg/" +license=('LGPL3') +makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') +source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz) +md5sums=('075e4df465e9a863f288d5bdf6e6887e') + +build() { + cd "$srcdir/psycopg2-$pkgver" + sed -i 's/,PSYCOPG_DEBUG$//' setup.cfg +} + +package_python-psycopg2() { + depends=('python' 'postgresql-libs>=8.4.1') + + cd "$srcdir/psycopg2-$pkgver" + python setup.py install --root="$pkgdir" +} + +package_python2-psycopg2() { + depends=('python2' 'postgresql-libs>=8.4.1') + + cd "$srcdir/psycopg2-$pkgver" + python2 setup.py install --root="$pkgdir" +} diff --git a/community-staging/python-yaml/PKGBUILD b/community-staging/python-yaml/PKGBUILD new file mode 100644 index 000000000..c9457fde7 --- /dev/null +++ b/community-staging/python-yaml/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 77316 2012-10-08 16:12:37Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Michal Bozon <michal.bozon__at__gmail.com> + +pkgbase=python-yaml +pkgname=(python2-yaml python-yaml) +pkgver=3.10 +pkgrel=3 +pkgdesc="Python bindings for YAML, using fast libYAML library" +arch=('i686' 'x86_64') +url="http://pyyaml.org" +license=('MIT') +makedepends=('python' 'python2' 'libyaml') +install='python-yaml.install' +source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz) +md5sums=('74c94a383886519e9e7b3dd1ee540247') + +build() { + true +} + +package_python2-yaml() { + depends=('python2' 'libyaml') + + cd $srcdir/PyYAML-$pkgver + python2 setup.py install --prefix=/usr --root=$pkgdir + install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +package_python-yaml() { + depends=('python' 'libyaml') + + cd $srcdir/PyYAML-$pkgver + python setup.py install --prefix=/usr --root=$pkgdir + install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community-staging/python-yaml/python-yaml.install b/community-staging/python-yaml/python-yaml.install new file mode 100644 index 000000000..e2ae0674b --- /dev/null +++ b/community-staging/python-yaml/python-yaml.install @@ -0,0 +1,7 @@ +post_install() { + cat << EOT +==> Note that even though this package uses libyaml library, +==> slower pure python implementation is used by default. +==> See http://pyyaml.org/wiki/PyYAMLDocumentation +EOT +} diff --git a/community-staging/sdcc/PKGBUILD b/community-staging/sdcc/PKGBUILD new file mode 100644 index 000000000..fd9c0b002 --- /dev/null +++ b/community-staging/sdcc/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 77318 2012-10-08 16:13:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jose Negron <josenj.arch@mailnull.net> + +pkgname=sdcc +pkgver=3.2.0 +pkgrel=2 +pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" +arch=('i686' 'x86_64') +license=('GPL') +depends=('bash' 'gcc-libs' 'boost-libs') +makedepends=('gputils' 'flex' 'bison' 'patch' 'boost') +optdepends=('python') +url="http://sdcc.sourceforge.net/" +options=(!strip) +source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2) +md5sums=('0808a9b4109d2ba6046ddd7b679a0012') + +build() { + cd $srcdir/$pkgname + ./configure \ + --prefix=/usr \ + --includedir=/usr/include/sdcc \ + --libdir=/usr/lib/sdcc + make + make install DESTDIR=$pkgdir + + if [ -d $pkgdir/usr/lib/lib ]; then + mv $pkgdir/usr/lib/lib/* $pkgdir/usr/lib/sdcc/ + rm -rf $pkgdir/usr/lib/lib + fi + + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' $pkgdir/usr/bin/as2gbmap +} diff --git a/community-staging/tix/PKGBUILD b/community-staging/tix/PKGBUILD new file mode 100644 index 000000000..8aa00c521 --- /dev/null +++ b/community-staging/tix/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 77320 2012-10-08 16:13:53Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Brice Méalier <mealier_brice@yahoo.fr> + +pkgname=tix +pkgver=8.4.3 +pkgrel=4 +pkgdesc="Tk Interface eXtension, a powerful set of user interface components" +arch=(i686 'x86_64') +url="http://tix.sourceforge.net/" +license=("BSD") +depends=('tk' 'libx11') +source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz + tcl-tk-path.patch) +md5sums=('2b8bf4b10a852264678182652f477e59' + 'd4df48da39dd51872d58706a51bab505') + +build() { + cd $srcdir/Tix$pkgver + + patch -p1 <$srcdir/tcl-tk-path.patch + + export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2" + + ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install + # move things around + + install -m755 tools/tixindex $pkgdir/usr/bin/tixindex + rm -rf $pkgdir/usr/lib/Tix8.4/html + rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms} + ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so + + mkdir -p $pkgdir/usr/share/man/man1 + mkdir -p $pkgdir/usr/share/man/man3 + cp -p man/tixwish.1 $pkgdir/usr/share/man/man1 + cd $srcdir/Tix$pkgver/man + for i in *.n; do + cp -p $i $pkgdir/usr/share/man/man3/${i%n}3 + done + + mkdir -p $pkgdir/usr/share/licenses/tix + cp $srcdir/Tix$pkgver/license.terms $pkgdir/usr/share/licenses/tix/ +} + diff --git a/community-staging/tix/tcl-tk-path.patch b/community-staging/tix/tcl-tk-path.patch new file mode 100644 index 000000000..2fc12671e --- /dev/null +++ b/community-staging/tix/tcl-tk-path.patch @@ -0,0 +1,22 @@ +diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure +--- Tix8.4.3/configure 2008-02-28 04:35:01.000000000 +0000 ++++ Tix8.4.3.my/configure 2009-12-28 10:57:33.000000000 +0000 +@@ -6645,7 +6645,7 @@ + ;; + esac + else +- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then ++ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then + { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5 + echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;} + { (exit 1); exit 1; }; } +@@ -6700,7 +6700,7 @@ + ;; + esac + else +- if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then ++ if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then + { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5 + echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;} + { (exit 1); exit 1; }; } + diff --git a/community-testing/assimp/PKGBUILD b/community-testing/assimp/PKGBUILD new file mode 100644 index 000000000..6a5087a83 --- /dev/null +++ b/community-testing/assimp/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: jepaan <jepaan at hotmail dot com> + +pkgname=assimp +pkgver=3.0.1270 +pkgrel=1 +pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner" +arch=('i686' 'x86_64') +license=('BSD') +depends=('libxmu' 'zlib' 'freeglut') +makedepends=('cmake' 'boost') +url=('http://assimp.sourceforge.net/index.html') +source=("http://downloads.sourceforge.net/assimp/assimp--$pkgver-source-only.zip") +md5sums=('52aa4cf4e34e6b2a9c5f6c0b3c319af1') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}--${pkgver}-source-only \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/build + + make DESTDIR=$pkgdir install + install -Dm644 ${srcdir}/${pkgname}--${pkgver}-source-only/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community-testing/astromenace/PKGBUILD b/community-testing/astromenace/PKGBUILD new file mode 100644 index 000000000..a4f3d8663 --- /dev/null +++ b/community-testing/astromenace/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 77264 2012-10-08 13:00:46Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Ivan Bobrov <ibobrik at gmail dot com> +# Contributor: Black_Mage <vleon1 at gmail dot com> + +pkgname=astromenace +pkgver=1.2.0 +pkgrel=6 +pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities. English version" +arch=('i686' 'x86_64') +url="http://www.viewizard.com/astromenace/index_linux.php" +license=('GPL3') +depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu') +makedepends=('cmake' 'mesa') +source=(http://downloads.sourceforge.net/openastromenace/openamenace-src-$pkgver.tar.bz2 + http://downloads.sourceforge.net/openastromenace/oamenace-data-$pkgver.tar.bz2 + http://downloads.sourceforge.net/openastromenace/oamenace-lang-en-$pkgver.tar.bz2 + astromenace.desktop + astromenace.png + astromenace.patch + astromenace.sh) +md5sums=('3c8e7013aa64fcde7ba8a7750df51ab8' + 'a8ad3495f8eac419ebcf93473008484d' + 'f137da529da1345a0243f22fb8bf4913' + '1edc9367564a6c639a2b8199adf26a08' + '1643d876d4e21cc0c6ceddc8e7c8ceed' + '8d23310a2bb9c96dd150d30ab39799a1' + '2d4504929a620709cd058657bba335b3') + +build() { + cd $srcdir/OpenAstroMenaceSVN + + # Patch build and install the engine + patch -Np1 -i $srcdir/$pkgname.patch + cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr + sed -i 's/`sdl-config --libs`/-lSDL -lpthread/' CMakeFiles/AstroMenace.dir/link.txt + make +} + +package() { + cd $srcdir/OpenAstroMenaceSVN + + # Manually install the engine and data + install -Dm 755 AstroMenace $pkgdir/usr/bin/astromenace_bin + install -Dm 644 $srcdir/gamedata.vfs $pkgdir/usr/share/astromenace/gamedata.vfs + install -Dm 644 $srcdir/gamelang_en.vfs $pkgdir/usr/share/astromenace/gamelang_en.vfs + install -d $pkgdir/usr/share/astromenace/DATA/SCRIPT + install -m 644 $srcdir/DATA/SCRIPT/* $pkgdir/usr/share/astromenace/DATA/SCRIPT + + # Install .desktop, icon and bin + install -Dm 644 $srcdir/astromenace.desktop $pkgdir/usr/share/applications/astromenace.desktop + install -Dm 644 $srcdir/astromenace.png $pkgdir/usr/share/pixmaps/astromenace.png + install -Dm 755 $srcdir/astromenace.sh $pkgdir/usr/bin/astromenace +} diff --git a/community-testing/astromenace/astromenace.desktop b/community-testing/astromenace/astromenace.desktop new file mode 100644 index 000000000..2b8d57293 --- /dev/null +++ b/community-testing/astromenace/astromenace.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Astromenace +Comment=Space shooter +Exec=astromenace +Icon=/usr/share/pixmaps/astromenace.png +StartupNotify=true +Terminal=false +Type=Application +Categories=Application;Game;ArcadeGame; diff --git a/community-testing/astromenace/astromenace.patch b/community-testing/astromenace/astromenace.patch new file mode 100644 index 000000000..b69efd9a4 --- /dev/null +++ b/community-testing/astromenace/astromenace.patch @@ -0,0 +1,12 @@ +diff -aur OpenAstroMenaceSVN.pristine/AstroMenaceSource/Core/RendererInterface/RendererInterface.h OpenAstroMenaceSVN.new/AstroMenaceSource/Core/RendererInterface/RendererInterface.h +--- OpenAstroMenaceSVN.pristine/AstroMenaceSource/Core/RendererInterface/RendererInterface.h 2010-02-14 11:39:06.721353373 +0100 ++++ OpenAstroMenaceSVN.new/AstroMenaceSource/Core/RendererInterface/RendererInterface.h 2010-02-14 11:46:47.171304764 +0100 +@@ -37,6 +37,8 @@ + #include "../Base.h" + #include "../Math/Math.h" + #include "../Texture/Texture.h" ++#define PFNGLCLIENTACTIVETEXTUREPROC PFNGLACTIVETEXTUREPROC ++ + + + diff --git a/community-testing/astromenace/astromenace.png b/community-testing/astromenace/astromenace.png Binary files differnew file mode 100644 index 000000000..6093e9272 --- /dev/null +++ b/community-testing/astromenace/astromenace.png diff --git a/community-testing/astromenace/astromenace.sh b/community-testing/astromenace/astromenace.sh new file mode 100644 index 000000000..02e8594df --- /dev/null +++ b/community-testing/astromenace/astromenace.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +astromenace_bin --dir=/usr/share/astromenace "$@" diff --git a/community-testing/catalyst-dkms/PKGBUILD b/community-testing/catalyst-dkms/PKGBUILD index b238862f8..7b455b1cc 100644 --- a/community-testing/catalyst-dkms/PKGBUILD +++ b/community-testing/catalyst-dkms/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 76898 2012-10-01 22:40:39Z lcarlier $ +# $Id: PKGBUILD 77331 2012-10-08 22:59:34Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert pkgname=catalyst-dkms -pkgver=12.8 +pkgver=12.9 pkgrel=0.1 pkgdesc="AMD proprietary gpu kernel driver" arch=('i686' 'x86_64') url="http://www.amd.com" license=('custom') -depends=('linux>=3.5' 'linux-headers>=3.5' 'dkms') -source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip - dkms.conf - 3.5-do_mmap.patch) -md5sums=('41c5478322b13be6909eeb46412a3aa0' - '972049dc247a74a7162f2227078abcb0' - 'a450e2e3db61994b09e9d99d95bee837') +depends=('dkms') +optdepends=('linux-headers: build the module against Arch kernel' + 'linux-lts-headers: build the module against LTS Arch kernel') +replaces=('catalyst-lts-dkms') # useless +source=(#http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip + https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz + dkms.conf) +md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b' + '972049dc247a74a7162f2227078abcb0') install=catalyst.install package() { @@ -30,14 +32,14 @@ package() { _archdir=x86 fi - sh ./amd-driver-installer*.run --extract fglrx-install + #sh ./amd-driver-installer*.run --extract fglrx-install - cd fglrx-install - patch -Np1 -i ../3.5-do_mmap.patch + #cd fglrx-install + #patch -Np1 -i ../3.5-do_mmap.patch install -dm755 "${pkgdir}/usr/lib/modprobe.d" install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}" - cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" + cp -r lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf" @@ -45,5 +47,5 @@ package() { echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" # license - install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" + install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" } diff --git a/community-testing/catalyst-dkms/catalyst.install b/community-testing/catalyst-dkms/catalyst.install index f32e7ae7a..3adb1410d 100644 --- a/community-testing/catalyst-dkms/catalyst.install +++ b/community-testing/catalyst-dkms/catalyst.install @@ -5,13 +5,11 @@ post_install() dkms install -m fglrx -v $1 } -pre_upgrade() -{ - dkms remove -m fglrx -v $1 --all -} - post_upgrade() { + # removing old version + dkms remove -m fglrx -v $2 --all + # then installing the new one dkms add -m fglrx -v $1 dkms build -m fglrx -v $1 dkms install -m fglrx -v $1 diff --git a/community-testing/desmume/PKGBUILD b/community-testing/desmume/PKGBUILD new file mode 100644 index 000000000..784e157d7 --- /dev/null +++ b/community-testing/desmume/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 77328 2012-10-08 21:48:37Z schuay $ +# Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> +# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Nathan Jones <nathanj@insightbb.com> +# Contributor: Javier "Phrodo_00" Aravena <phrodo.00 at gmail dot com> +# Contributor: angvp <angvp at archlinux dot us> +# Contributor: Allan <mcrae_allan at hotmail dot com> +# Contributor: w0rm <w0rmtux at gmail dot com> +# Contributor: vEX <vex at niechift dot com> +# Contributor: Asher256 <achrafcherti at gmail dot com> + +pkgname=desmume +pkgver=0.9.8 +pkgrel=2 +pkgdesc="Nintendo DS emulator" +arch=('i686' 'x86_64') +url="http://desmume.org/" +license=('GPL') +depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' + 'soundtouch' 'alsa-lib' 'zziplib' 'glu') +makedepends=('intltool') +install=desmume.install +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --enable-wifi + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} + +sha256sums=('f405b44e2d7ab3578d6be91a6546bbaa0afc60b2a8d193e4415fea5c5332d585') diff --git a/community-testing/desmume/desmume.install b/community-testing/desmume/desmume.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/community-testing/desmume/desmume.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/flightgear/PKGBUILD b/community-testing/flightgear/PKGBUILD new file mode 100644 index 000000000..3f075f553 --- /dev/null +++ b/community-testing/flightgear/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 77277 2012-10-08 14:22:31Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: William Rea <sillywilly@gmail.com> +# Contributor: Hans Janssen <hans@janserv.xs4all.nl> + +pkgname=flightgear +pkgver=2.8.0 +pkgrel=2 +pkgdesc="An open-source, multi-platform flight simulator" +arch=(i686 x86_64) +depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') +makedepends=('boost' 'cmake') +license=("GPL") +url="http://www.flightgear.org" +options=('!makeflags') +#source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") +#source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") +source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") +md5sums=('9499194146f414323efef8cb3451b750') + +build() { + cd $srcdir/flightgear-$pkgver + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" . + make + sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/flightgear.desktop +} + +package() { + depends=(${depends[@]} 'flightgear-data') + + cd $srcdir/flightgear-$pkgver + make DESTDIR=$pkgdir install + + install -Dm0644 package/flightgear.desktop $pkgdir/usr/share/applications/flightgear.desktop + install -Dm0644 package/flightgear.ico $pkgdir/usr/share/icons/flightgear.ico + ln -sf flightgear $pkgdir/usr/share/FlightGear +} diff --git a/community-testing/fox/PKGBUILD b/community-testing/fox/PKGBUILD new file mode 100644 index 000000000..efce724b7 --- /dev/null +++ b/community-testing/fox/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 77273 2012-10-08 13:51:06Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Ben <ben@benmazer.net> + +pkgname=fox +pkgver=1.6.46 +pkgrel=2 +pkgdesc="Free Objects for X: GUI Toolkit for C++" +arch=('i686' 'x86_64') +url="http://www.fox-toolkit.org/" +license=('LGPL' 'custom') +depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff' 'glu') +optdepends=('perl') +options=('!libtool') +source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) +md5sums=('da2c5cf36eff32a0c49cfcd9494fe6b7') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" + ./configure --prefix=/usr \ + --enable-release \ + --with-xft=yes \ + --with-opengl=yes \ + --with-xim \ + --with-xshm \ + --with-shape \ + --with-xcursor \ + --with-xrender \ + --with-xrandr \ + --with-xfixes \ + --with-xinput + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + cd ${srcdir}/${pkgname}-${pkgver}/tests + make ControlPanel + install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/ + install -Dm644 ../LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community-testing/freewrl/PKGBUILD b/community-testing/freewrl/PKGBUILD index 4fcbe0b25..a3c68dbe4 100644 --- a/community-testing/freewrl/PKGBUILD +++ b/community-testing/freewrl/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 74511 2012-07-29 21:15:25Z ebelanger $ +# $Id: PKGBUILD 77283 2012-10-08 14:36:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl -pkgver=1.22.13 +pkgver=1.22.13.1 +_pkgver=1.22.13 pkgrel=2 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" license=('GPL') depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' - 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js') -makedepends=('java-environment' 'xulrunner') + 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js' 'glu') +makedepends=('java-environment' 'xulrunner' 'wget') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('7e432c7a9eb5d00497d34d93e2b4d420') +md5sums=('27f4bf163011d8ac2088a535cb58a13d') build() { . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${_pkgver} export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185" ./configure \ @@ -31,6 +32,6 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${_pkgver} make DESTDIR=$pkgdir install } diff --git a/community-testing/fxdesktop/PKGBUILD b/community-testing/fxdesktop/PKGBUILD new file mode 100644 index 000000000..f03c3025a --- /dev/null +++ b/community-testing/fxdesktop/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 77285 2012-10-08 14:36:38Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sander Jansen <sander@knology.net> + +pkgname=fxdesktop +pkgver=0.1.12 +pkgrel=6 +pkgdesc="Lightweight Desktop Environment" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fxdesktop/" +license=('GPL') +depends=('fox>=1.6.0') +makedepends=('glu') +source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +md5sums=('9489e7369b5e052e0b6836a3b0670832') + +build() { + cd $srcdir/$pkgname-$pkgver + # Override default flags + export CFLAGS="-Wall -O2 -pipe" + export CXXFLAGS="-Wall -O2 -pipe" + [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64) + # Compile + ./gb --prefix=/usr + ./gb --package-root=$pkgdir/usr install +} diff --git a/community-testing/fxprocessview/PKGBUILD b/community-testing/fxprocessview/PKGBUILD new file mode 100644 index 000000000..0b0bba20a --- /dev/null +++ b/community-testing/fxprocessview/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 77289 2012-10-08 15:03:29Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sander Jansen <sander@knology.net> + +pkgname=fxprocessview +pkgver=0.5.0 +pkgrel=5 +pkgdesc="Process Viewer" +arch=('i686' 'x86_64') +license=('GPL') +depends=('fox>=1.4.0') +makedepends=('glu') +url="http://code.google.com/p/fxdesktop/" +source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.gz \ + build-fix.patch) +md5sums=('5d3cc8d7aec770997c281a743ddfda5a' + '2d2c3d54dcd2404149955f12cccb21a5') + +build() { + cd $srcdir/$pkgname-$pkgver + # Override default flags + export CFLAGS="-Wall -O2 -pipe" + export CXXFLAGS="-Wall -O2 -pipe" + # Compile + patch -Np1 <../build-fix.patch + ./gb + # gb does not return valid error code + [ -f src/fxprocessview ] + # make sure destination exists + mkdir -p $pkgdir/usr/bin + # Install + ./gb install --package-root=$pkgdir/usr +} diff --git a/community-testing/fxprocessview/build-fix.patch b/community-testing/fxprocessview/build-fix.patch new file mode 100644 index 000000000..7c883454c --- /dev/null +++ b/community-testing/fxprocessview/build-fix.patch @@ -0,0 +1,41 @@ +diff -wbBur fxprocessview-0.5.0/src/processlist.cpp fxprocessview-0.5.0.my/src/processlist.cpp +--- fxprocessview-0.5.0/src/processlist.cpp 2005-07-15 06:39:17.000000000 +0400 ++++ fxprocessview-0.5.0.my/src/processlist.cpp 2007-03-07 19:21:34.000000000 +0300 +@@ -696,7 +696,7 @@ + + long FXProcessList::onCmdUserMode(FXObject* sender,FXSelector,void* ){ + if (userfilter.empty()){ +- userfilter=FXFile::getCurrentUserName(); ++ userfilter=FXSystem::currentUserName(); + } + else { + userfilter=""; +@@ -942,12 +942,17 @@ + + + +- FXint num_processes = FXFile::listFiles(dirlist,"/proc","[0123456789]*",LIST_MATCH_ALL|LIST_NO_FILES|LIST_NO_PARENT); ++ FXint num_processes = FXDir::listFiles(dirlist,"/proc","[0123456789]*",FXDir::MatchAll | FXDir::NoFiles | FXDir::NoParent); + task_total=num_processes; + for (FXint i=0;i<num_processes;i++){ + + /// Check the Owner +- owner = FXFile::owner("/proc/" + dirlist[i]); ++ FXStat stat; ++ FXStat::statFile("/proc/" + dirlist[i], stat); ++ owner = FXSystem::userName(stat.user()); ++ ++// owner = FXSystem::userName(FXStat::user("/proc/" + dirlist[i])); ++ + if (!userfilter.empty() && (owner!=userfilter)) continue; + + /// Read in Process Stat +@@ -1027,7 +1032,7 @@ + } + + filename = "/proc/" + dirlist[i] + "/cmdline"; +- if (FXFile::exists(filename)) { ++ if (FXStat::exists(filename)) { + fp = fopen(filename.text(),"r"); + if (fp) { + if (fgets(buffer,80,fp)!=NULL){ diff --git a/community-testing/gambas2/PKGBUILD b/community-testing/gambas2/PKGBUILD index 0c75e0d4d..ea0642eb5 100644 --- a/community-testing/gambas2/PKGBUILD +++ b/community-testing/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75178 2012-08-14 20:07:53Z dreisner $ +# $Id: PKGBUILD 77261 2012-10-08 12:51:43Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,11 +20,11 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=6 +pkgrel=7 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" -makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils' +makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'glu' 'gtk2' 'librsvg' 'xdg-utils' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' 'libxcursor' 'libsm' 'intltool' 'mysql' 'postgresql') @@ -390,7 +390,7 @@ package_gambas2-gb-db-postgresql() { } package_gambas2-gb-db-sqlite2() { - depends=('gambas2-gb-db' 'sqlite2') + depends=('gambas2-gb-db' 'sqlite2' 'gcc-libs') pkgdesc="Gambas2 Sqlite2 database access component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 @@ -398,7 +398,7 @@ package_gambas2-gb-db-sqlite2() { } package_gambas2-gb-db-sqlite3() { - depends=('gambas2-gb-db' 'sqlite') + depends=('gambas2-gb-db' 'sqlite' 'gcc-libs') pkgdesc="Gambas2 Sqlite3 database access component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 @@ -580,7 +580,7 @@ package_gambas2-gb-gtk-svg() { } package_gambas2-gb-image() { - depends=('gambas2-runtime') + depends=('gambas2-runtime' 'gcc-libs') pkgdesc="Gambas2 image processing component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.image @@ -632,7 +632,7 @@ package_gambas2-gb-net-smtp() { } package_gambas2-gb-opengl() { - depends=('gambas2-runtime' 'libgl' 'mesa') + depends=('gambas2-runtime' 'glu') pkgdesc="Gambas2 OpenGL component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl @@ -778,7 +778,7 @@ package_gambas2-gb-report() { } package_gambas2-gb-sdl() { - depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl') + depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'glu') pkgdesc="Gambas2 SDL component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD index 96dbccce8..920256d85 100644 --- a/community-testing/gambas3/PKGBUILD +++ b/community-testing/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77244 2012-10-07 20:04:02Z lcarlier $ +# $Id: PKGBUILD 77275 2012-10-08 14:02:58Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.3.2 -pkgrel=3 +pkgrel=3.1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -909,7 +909,7 @@ package_gambas3-gb-net-smtp() { } package_gambas3-gb-opengl() { - depends=('gambas3-runtime' 'libgl' 'glew') + depends=('gambas3-runtime' 'glew') pkgdesc="OpenGL component" ## workaround for splitting @@ -931,7 +931,7 @@ package_gambas3-gb-opengl() { } package_gambas3-gb-opengl-glu() { - depends=('gambas3-gb-opengl' 'glu') + depends=('gambas3-gb-opengl') pkgdesc="GL Utility component" ## workaround for splitting @@ -1122,7 +1122,7 @@ package_gambas3-gb-report() { } package_gambas3-gb-sdl() { - depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') + depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew') pkgdesc="SDL component" ## workaround for splitting diff --git a/community-testing/gl-117/PKGBUILD b/community-testing/gl-117/PKGBUILD new file mode 100644 index 000000000..99d6e8a9c --- /dev/null +++ b/community-testing/gl-117/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 77291 2012-10-08 15:04:07Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: andrewski + +pkgname=gl-117 +pkgver=1.3.2 +pkgrel=6 +pkgdesc="An action flight simulator" +arch=('i686' 'x86_64') +url="http://www.heptargon.de/gl-117/gl-117.html" +license=("GPL") +depends=('freeglut' 'sdl_mixer' 'libxmu' 'libxi' 'glu') +source=(http://downloads.sourceforge.net/project/gl-117/gl-117/GL-117%20Source/gl-117-$pkgver-src.tar.bz2 + gl-117.desktop + gl-117.png) +md5sums=('aad53c5531943529fd769fae4efeae02' + 'db985c5188f1706677b12dc80b797779' + '6975de5572084b78d3ec1a748de85164') + +build() { + cd $srcdir/gl-117-$pkgver-src + # This will link everything to these three libraries, + # but it wouldn't work otherwise. The devs have been contacted. + LDFLAGS="-lX11 -lXi -lXmu" ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install + install -D -m0644 $srcdir/gl-117.desktop $pkgdir/usr/share/applications/gl-117.desktop + install -D -m0644 $srcdir/gl-117.png $pkgdir/usr/share/pixmaps/gl-117.png +} diff --git a/community-testing/gl-117/gl-117.desktop b/community-testing/gl-117/gl-117.desktop new file mode 100644 index 000000000..59748fb86 --- /dev/null +++ b/community-testing/gl-117/gl-117.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Type=Application +Name=GL-117 +Exec=gl-117 +Icon=gl-117 diff --git a/community-testing/gl-117/gl-117.png b/community-testing/gl-117/gl-117.png Binary files differnew file mode 100644 index 000000000..8bbdba58b --- /dev/null +++ b/community-testing/gl-117/gl-117.png diff --git a/community-testing/gogglesmm/PKGBUILD b/community-testing/gogglesmm/PKGBUILD new file mode 100644 index 000000000..6a70860cf --- /dev/null +++ b/community-testing/gogglesmm/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 77293 2012-10-08 15:04:42Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sander Jansen <sander@knology.net> + +pkgname=gogglesmm +pkgver=0.12.6 +pkgrel=2 +pkgdesc="Music Manager and Player" +arch=('i686' 'x86_64') +url="http://code.google.com/p/gogglesmm/" +license=('GPL3') +install=gogglesmm.install +depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt') +makedepends=('pkgconfig' 'glproto' 'dri2proto' 'glu') +replaces=('musicmanager') +conflicts=('musicmanager') +source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) +md5sums=('19505ee514690fe3372621685666db4c') + +build() { + cd $srcdir/gogglesmm-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/gogglesmm-$pkgver + mkdir -p $pkgdir/usr/bin + make DESTDIR=$pkgdir install +} diff --git a/community-testing/gogglesmm/gogglesmm.install b/community-testing/gogglesmm/gogglesmm.install new file mode 100644 index 000000000..04c026840 --- /dev/null +++ b/community-testing/gogglesmm/gogglesmm.install @@ -0,0 +1,11 @@ +post_install() { + which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/gource/PKGBUILD b/community-testing/gource/PKGBUILD index 46bfbd63b..e3886bcba 100644 --- a/community-testing/gource/PKGBUILD +++ b/community-testing/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74514 2012-07-29 21:15:44Z ebelanger $ +# $Id: PKGBUILD 77282 2012-10-08 14:35:47Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.38 -pkgrel=3 +pkgrel=4 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) diff --git a/community-testing/kdenlive/PKGBUILD b/community-testing/kdenlive/PKGBUILD new file mode 100644 index 000000000..4e2c23a93 --- /dev/null +++ b/community-testing/kdenlive/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 77295 2012-10-08 15:05:15Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Zuf <kontakt.zuf@gmail.com> +# Contributor: Darwin Bautista <djclue917@gmail.com> + +pkgname=kdenlive +pkgver=0.9.2 +pkgrel=4 +pkgdesc="A non-linear video editor for Linux" +arch=('i686' 'x86_64') +# http://download.kde.org/stable/kdenlive/ +url="http://www.kdenlive.org/" +license=('GPL') +depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' + 'libqzeitgeist') +makedepends=('automoc4' 'cmake' 'gettext' 'mesa' 'glu') +optdepends=('recordmydesktop' + 'dvdauthor' + 'mkisolinux' + 'xine-ui') +install=kdenlive.install +options=('docs') +source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2) +md5sums=('40f108f26e2c2e08807a1c183d8764ec') + +build() { + export LDFLAGS="$LDFLAGS -lX11" + cd "${srcdir}" + mkdir -p build + cd build + cmake ../kdenlive-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib \ + -DLINK_LIBRARIES=-lX11 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/kdenlive/kdenlive.install b/community-testing/kdenlive/kdenlive.install new file mode 100644 index 000000000..a3489ee9d --- /dev/null +++ b/community-testing/kdenlive/kdenlive.install @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/nestopia/ChangeLog b/community-testing/nestopia/ChangeLog new file mode 100644 index 000000000..5077d00b2 --- /dev/null +++ b/community-testing/nestopia/ChangeLog @@ -0,0 +1,12 @@ +2008-12-16 Tiago Pierezan Camargo <tcamargo@gmail.com> + + * PKGBUILD: Minor corrections. + +2008-12-04 Tiago Pierezan Camargo <tcamargo@gmail.com> + + * PKGBUILD (source): Package adopted. + Variable/version cleanup. + Patch to remove bogus error messages on program exit. + New dependency: mesa. + Renamed executable to nestopia. + diff --git a/community-testing/nestopia/PKGBUILD b/community-testing/nestopia/PKGBUILD new file mode 100644 index 000000000..7ef2d4b96 --- /dev/null +++ b/community-testing/nestopia/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 77297 2012-10-08 15:06:02Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> +# Contributor: robb_force <robb_force@holybuffalo.net> + +pkgname=nestopia +pkgver=1.42 +pkgrel=3 +pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' +url='http://0ldsk00l.ca/nestopia.html' +license=('GPL') +arch=('i686' 'x86_64') +depends=('sdl' 'alsa-lib' 'gtk3' 'mesa' 'glu') +makedepends=('unzip') +source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver" + "build-fix.patch") +md5sums=('ce7ffba59f19c764f08546e015777172' + '49dc5a51243a023b47f25ff3d6aabd89') + +build() { + cd ${srcdir}/rdanbrook-nestopia-* + patch -p1 <$srcdir/build-fix.patch + make PREFIX=/usr -j1 +} + +package() { + cd ${srcdir}/rdanbrook-nestopia-* + mkdir -p $pkgdir/usr/{bin,share/nestopia} + make install PREFIX=$pkgdir/usr +} diff --git a/community-testing/nestopia/build-fix.patch b/community-testing/nestopia/build-fix.patch new file mode 100644 index 000000000..7b8609f8d --- /dev/null +++ b/community-testing/nestopia/build-fix.patch @@ -0,0 +1,19 @@ +diff -wbBur rdanbrook-nestopia-53aa38a/Makefile rdanbrook-nestopia-53aa38a.my/Makefile +--- rdanbrook-nestopia-53aa38a/Makefile 2012-09-26 04:21:32.000000000 +0400 ++++ rdanbrook-nestopia-53aa38a.my/Makefile 2012-10-01 21:12:08.000000000 +0400 +@@ -186,12 +186,12 @@ + install -m 0644 NstDatabase.xml $(DATADIR) + install -m 0644 source/linux/icons/*.png $(DATADIR)/icons + install -m 0644 source/linux/icons/*.svg $(DATADIR)/icons +- install -m 0644 source/linux/icons/nestopia.svg /usr/share/pixmaps +- xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop ++ install -Dm0644 source/linux/icons/nestopia.svg $(PREFIX)/share/pixmaps/nestopia.svg ++ install -Dm0644 $(DATADIR)/nestopia.desktop $(PREFIX)/share/applications/nestopia.desktop + + uninstall: + xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop +- rm /usr/share/pixmaps/nestopia.svg ++ rm $(PREFIX)/share/pixmaps/nestopia.svg + rm $(BINDIR)/$(EXE) + rm -rf $(DATADIR) + diff --git a/community-testing/pyqt3/PKGBUILD b/community-testing/pyqt3/PKGBUILD new file mode 100644 index 000000000..19e46af0b --- /dev/null +++ b/community-testing/pyqt3/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 77299 2012-10-08 15:06:38Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> + +pkgname=pyqt3 +pkgver=3.18.1 +pkgrel=11 +pkgdesc="A set of Python bindings for the Qt3 toolkit" +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.com/software/pyqt/intro" +depends=('python2-sip' 'qscintilla-qt3') +makedepends=('glu') +license=('GPL') +source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('f1d120495d1aaf393819e988c0a7bb7e') + +build() { + cd ${srcdir}/PyQt-x11-gpl-${pkgver} + . /etc/profile.d/qt3.sh + echo yes | python2 configure.py -b /usr/bin \ + -d /usr/lib/python2.7/site-packages \ + -v /usr/share/sip + make +} + +package() { + cd ${srcdir}/PyQt-x11-gpl-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/rss-glx/PKGBUILD b/community-testing/rss-glx/PKGBUILD index 1d106b1ff..e2ef22fed 100644 --- a/community-testing/rss-glx/PKGBUILD +++ b/community-testing/rss-glx/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 74520 2012-07-29 21:16:20Z ebelanger $ +# $Id: PKGBUILD 77302 2012-10-08 15:09:01Z spupykin $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=9 +pkgrel=10 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64') url="http://rss-glx.sourceforge.net/" license=('GPL') -depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick') +depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu' 'mesa') optdepends=('xscreensaver: xscreensaver integration') install=rss-glx.install options=('!libtool') diff --git a/community-testing/smc/PKGBUILD b/community-testing/smc/PKGBUILD index a64c77edf..c16b4ef68 100644 --- a/community-testing/smc/PKGBUILD +++ b/community-testing/smc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73774 2012-07-15 13:20:45Z ibiru $ +# $Id: PKGBUILD 77259 2012-10-08 12:29:17Z lcarlier $ # Maintainer: # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=smc pkgver=1.9 -pkgrel=16 +pkgrel=17.1 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64') url="http://www.secretmaryo.org/" diff --git a/community-testing/stone-soup/PKGBUILD b/community-testing/stone-soup/PKGBUILD new file mode 100644 index 000000000..17177714b --- /dev/null +++ b/community-testing/stone-soup/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer: Jakob Gruber <jakob.gruber@gmail.com> + +pkgname=stone-soup +pkgver=0.11.0 +pkgrel=2 +pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' +arch=('i686' 'x86_64') +url='http://crawl.develz.org/' +depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'glu' 'freetype2' 'ttf-dejavu') +makedepends=('bison' 'flex' 'gendesk') +conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') +license=('custom') +install=stone-soup.install +source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.xz") + +# used by gendesk to create .desktop file +_exec=('crawl-tiles') +_name=('Dungeon Crawl Stone Soup') + +build() { + cd "$srcdir" + gendesk -n + + cd "stone_soup-${pkgver}/source" + + # adjust makefile to use /usr/bin, owner root:root, + # disable setgid on executable + + sed -i 's|bin_prefix := bin|bin_prefix := usr/bin|' Makefile + sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' Makefile + sed -i 's|MCHMOD := 2755|MCHMOD := 755|' Makefile + + # first build and install tiles version + + make DESTDIR="${pkgdir}" \ + SAVEDIR="~/.crawl/" \ + DATADIR="/usr/share/${pkgname}/data" \ + USE_UNICODE=y \ + TILES=y \ + install + + # rename tiles executable to avoid clashing with console crawl + + mv "${pkgdir}/usr/bin/crawl" "${pkgdir}/usr/bin/crawl-tiles" + + # then build and install console version + + make DESTDIR="${pkgdir}" \ + SAVEDIR="~/.crawl/" \ + DATADIR="/usr/share/${pkgname}/data" \ + USE_UNICODE=y \ + install + + # install crawl license + + install -D -m644 ../licence.txt \ + "${pkgdir}/usr/share/licenses/${pkgname}/license.txt" + + # install icon and .desktop file + + install -D -m644 dat/tiles/stone_soup_icon-32x32.png \ + "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -D -m644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + +} + +md5sums=('715d800410a7251499bf8efcc8675ca6') diff --git a/community-testing/stone-soup/stone-soup.install b/community-testing/stone-soup/stone-soup.install new file mode 100644 index 000000000..2320123e2 --- /dev/null +++ b/community-testing/stone-soup/stone-soup.install @@ -0,0 +1,11 @@ +post_upgrade() { + + # return if old pkgver >= 0.9.0-2 + [[ $(vercmp $2 0.9.0-2) -ge 0 ]] && return + + echo "--------------------------------------------------------------------- + stone-soup saves have moved to ~/.crawl. + If you want to keep your old saves, move ~/.stone-soup to + ~/.crawl. +---------------------------------------------------------------------" +} diff --git a/community-testing/teeworlds/PKGBUILD b/community-testing/teeworlds/PKGBUILD new file mode 100644 index 000000000..51ee46ff9 --- /dev/null +++ b/community-testing/teeworlds/PKGBUILD @@ -0,0 +1,51 @@ +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Armin 'IsSuE' Praher [issue.at.gmx.dot.at] +# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=teeworlds +pkgver=0.6.1 +pkgrel=3 +pkgdesc="A multiplayer 2D shooter" +arch=('i686' 'x86_64') +url="http://teeworlds.com" +license=('custom') +depends=('alsa-lib' 'glu' 'sdl' 'freetype2') +makedepends=('python2' 'bam' 'mesa') +replaces=('teewars') +source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz + teeworlds.desktop + teeworlds.png) +md5sums=('00de7195ecd1f23596dc3237341af512' + '3944aaf7a8c19a83510b2b39c4cddf5f' + '44f39e398409232a0e0a431ed46d8cc8') + +build() { + # Build teeworlds + cd ${srcdir}/${pkgname}-*-source + + # Use Python 2 + sed -i 's/python /python2 /' bam.lua + + bam server_release client_release +} + +package() { + cd ${srcdir}/${pkgname}-*-source + + # Install data files + mkdir -p ${pkgdir}/usr/share/${pkgname}/data + cp -r data/* ${pkgdir}/usr/share/${pkgname}/data + + install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname} + install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv + + install -Dm644 ${srcdir}/${pkgname}.desktop \ + ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -Dm644 ${srcdir}/${pkgname}.png \ + ${pkgdir}/usr/share/pixmaps/${pkgname}.png + + install -Dm644 license.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} diff --git a/community-testing/teeworlds/teeworlds.desktop b/community-testing/teeworlds/teeworlds.desktop new file mode 100644 index 000000000..ddfb8994d --- /dev/null +++ b/community-testing/teeworlds/teeworlds.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Icon=teeworlds +Exec=teeworlds +Terminal=false +StartupNotify=false + +Name=TeeWorlds +GenericName=Arcade Game +Comment=is a multiplayer 2D FPS shooter +Comment[pl_PL]=wieloosobowa strzelanka FTP w 2D + +Categories=Game;ArcadeGame; diff --git a/community-testing/teeworlds/teeworlds.png b/community-testing/teeworlds/teeworlds.png Binary files differnew file mode 100644 index 000000000..890baaff3 --- /dev/null +++ b/community-testing/teeworlds/teeworlds.png diff --git a/community-testing/torcs/PKGBUILD b/community-testing/torcs/PKGBUILD new file mode 100644 index 000000000..e81cc5d25 --- /dev/null +++ b/community-testing/torcs/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 77306 2012-10-08 15:41:06Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Shahar Weiss <sweiss4@gmx.net> + +pkgname=torcs +pkgver=1.3.3 +pkgrel=2 +pkgdesc="A 3D racing cars simulator using OpenGL" +url="http://torcs.sourceforge.net" +license=("GPL") +arch=('i686' 'x86_64') +depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis' 'glu') +makedepends=('plib') +options=('!makeflags') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 + torcs.desktop + torcs-gcc.patch) +md5sums=('0319c996dac4480f1182c03d2331b14a' + '328e419e9f985c3e7b69924fe299330d' + '5ae7e903df37300d3b8744328c756bff') + +build() { + cd $srcdir/$pkgname-${pkgver/_/-} + unset LDFLAGS + ./configure --prefix=/usr --x-includes=/usr/include --x-libraries=/usr/lib + make +} + +package() { + depends=(${depends[@]} "torcs-data=$pkgver") + cd $srcdir/$pkgname-${pkgver/_/-} + make DESTDIR=${pkgdir} install + install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png + install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop + find ${pkgdir} -type d -exec chmod 755 {} \; +} diff --git a/community-testing/torcs/torcs-gcc.patch b/community-testing/torcs/torcs-gcc.patch new file mode 100644 index 000000000..fcc5604e7 --- /dev/null +++ b/community-testing/torcs/torcs-gcc.patch @@ -0,0 +1,74 @@ +diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp +--- src.old/drivers/olethros/Trajectory.cpp 2008-04-06 22:21:31.000000000 +0200 ++++ src/drivers/olethros/Trajectory.cpp 2008-04-06 22:28:52.000000000 +0200 +@@ -10,8 +10,10 @@ + ***************************************************************************/ + #include <cstdio> + #include <cstdlib> ++#include <cstring> + #include <cmath> + #include <cassert> ++#include <ctime> + #include <list> + #include <vector> + #include "Trajectory.h" +diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp +--- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp 2008-04-06 22:21:31.000000000 +0200 ++++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp 2008-04-06 22:22:57.000000000 +0200 +@@ -32,7 +32,7 @@ + #include "Transform.h" + + #include <algorithm> +-#include <new.h> ++#include <new> + + class BBoxCompAxis { + public: +diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp +--- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp 2008-04-06 22:21:31.000000000 +0200 ++++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp 2008-04-06 22:23:11.000000000 +0200 +@@ -32,7 +32,7 @@ + #include "Transform.h" + #include "BBoxTree.h" + +-#include <new.h> ++#include <new> + + BBoxInternal *free_node; + +diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp +--- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp 2008-04-06 22:21:31.000000000 +0200 ++++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp 2008-04-06 22:22:29.000000000 +0200 +@@ -32,7 +32,7 @@ + #include "Object.h" + #include "Encounter.h" + +-#include <new.h> ++#include <new> + + void addPair(ObjectPtr object1, ObjectPtr object2); + void removePair(ObjectPtr object1, ObjectPtr object2); +diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp +--- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp 2008-04-06 22:21:31.000000000 +0200 ++++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp 2008-04-06 22:22:40.000000000 +0200 +@@ -33,7 +33,7 @@ + #include "Convex.h" + #include "Complex.h" + +-#include <new.h> ++#include <new> + + Object::Object(DtObjectRef obj, ShapePtr shape) : + ref(obj), +diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp +--- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp 2008-04-06 22:21:31.000000000 +0200 ++++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp 2008-04-06 22:22:12.000000000 +0200 +@@ -37,7 +37,7 @@ + } + + #include <vector> +-#include <new.h> ++#include <new> + + typedef vector<unsigned int> IndexBuf; + diff --git a/community-testing/torcs/torcs.desktop b/community-testing/torcs/torcs.desktop new file mode 100644 index 000000000..03d1ba010 --- /dev/null +++ b/community-testing/torcs/torcs.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=TORCS +Comment=The Open Racing Car Simulator +Exec=torcs +Icon=torcs.png +Terminal=false +Type=Application +Encoding=UTF-8 +Categories=Application;Game; diff --git a/community-testing/torcs/torcs.sh b/community-testing/torcs/torcs.sh new file mode 100644 index 000000000..0f1b4fe8d --- /dev/null +++ b/community-testing/torcs/torcs.sh @@ -0,0 +1,2 @@ +#!/bin/bash +export PATH=$PATH:/opt/torcs/bin diff --git a/community-testing/xbmc/ChangeLog b/community-testing/xbmc/ChangeLog new file mode 100644 index 000000000..66ae97e3b --- /dev/null +++ b/community-testing/xbmc/ChangeLog @@ -0,0 +1,69 @@ +2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com> + * 9.11-15 : + Made it back compliant with FHS ( thx pierre for pointing that out ) + namcap checked and modified to fit its needs as far as it was possible + +2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-10 : + Try and fix some autoconf issues (thanks Gentoo ebuild). + +2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-9 : + Replace some libtool 'ltmain.sh' scripts with the one from libtool + installed with Arch. + Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault + on systems using the nvidia driver. + +2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-8 : + Fix some include's so that gcc 4.3.x is happy, shouldn't complain about + undefined '::realloc' anymore. + Remove Mac OS X specific files. + +2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-7 : + Moved libcdio, pmount, smbclient and unrar to optdepends. + Removed unneeded dependency on sdl_gfx. + Removed dependency on libpng as sdl_image depends on it. + +2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-6 : + Added libpng to dependency list. + Added gawk to dependency list. + Removed '--disable-mms' and '--enable-halmount' configure flags as they + are not mentioned as supported in the configure script. + +2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-5 : + Added libmad to the dependency list. + Streamripper 1.64.0+ does not include tre anymore, removed streamripper + and added tre instead. + Removed subversion from makedepends. + +2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-4 : + Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not + fail any longer. + +2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-3 : + Added lirc to the optdepends array. + +2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-2 : + Added install file which informs users that a display depth of at + least 24-bit is required. + +2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-1 : + Initial package, based on previous work by Zeqadious. diff --git a/community-testing/xbmc/PKGBUILD b/community-testing/xbmc/PKGBUILD new file mode 100644 index 000000000..1cefe9cee --- /dev/null +++ b/community-testing/xbmc/PKGBUILD @@ -0,0 +1,107 @@ +# $Id: PKGBUILD 77308 2012-10-08 15:42:04Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> +# Contributor: Zeqadious <zeqadious.at.gmail.dot.com> +# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > + +_prefix=/usr + +pkgname=xbmc +pkgver=11.0 +pkgrel=8 +pkgdesc="A software media player and entertainment hub for digital media" +arch=('i686' 'x86_64') +url="http://xbmc.org" +license=('GPL' 'custom') +depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' + 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' + 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' + 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu') +makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec' + 'udisks' 'upower' 'bluez') +optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' + 'vdpau-video: accelerated video playback for nvidia cards' + 'xvba-video: accelerated video playback for amd cards' + 'pulseaudio: pulseaudio support' + 'lirc: remote controller support' + 'udisks: automount external drives' + 'upower: used to trigger suspend functionality' + 'unrar: access compressed files without unpacking them') +install="${pkgname}.install" +source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') + +build() { + cd "${srcdir}/xbmc-$pkgver" + + # fix lsb_release dependency + sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp + + # Bootstrapping XBMC + ./bootstrap + + # Configuring XBMC + export PYTHON_VERSION=2 # external python v2 + ./configure --prefix=$_prefix --exec-prefix=$_prefix \ + --disable-debug \ + --enable-optimizations \ + --enable-gl \ + --enable-sdl \ + --enable-vaapi \ + --enable-vdpau \ + --enable-xvba \ + --enable-joystick \ + --enable-xrandr \ + --enable-rsxs \ + --enable-projectm \ + --enable-x11 \ + --enable-pulse \ + --enable-rtmp \ + --enable-samba \ + --enable-nfs \ + --enable-afpclient \ + --enable-airplay \ + --enable-airtunes \ + --enable-ffmpeg-libvorbis \ + --enable-dvdcss \ + --disable-hal \ + --enable-avahi \ + --enable-webserver \ + --enable-optical-drive \ + --enable-libbluray \ + --enable-texturepacker \ + --enable-udev \ + --enable-libusb \ + --enable-libcec \ + --enable-external-libraries \ + --disable-external-ffmpeg + # Now (finally) build + make +} + +package() { + cd "${srcdir}/xbmc-$pkgver" + # Running make install + make DESTDIR="${pkgdir}" install + + # run feh with python2 + sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc + + # lsb_release fix + sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc" + sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc" + + # Tools + install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" + install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" + + # Licenses + install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}" + for licensef in LICENSE.GPL copying.txt; do + mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}" + done +} +# vim:set ts=2 sw=2 et: diff --git a/community-testing/xbmc/xbmc.install b/community-testing/xbmc/xbmc.install new file mode 100644 index 000000000..862508e73 --- /dev/null +++ b/community-testing/xbmc/xbmc.install @@ -0,0 +1,15 @@ +post_install() { + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + true +} + +post_upgrade() { + post_install $1 + true +} + +post_remove() { + post_install $1 + true +} diff --git a/community-testing/xlockmore/LICENSE b/community-testing/xlockmore/LICENSE new file mode 100644 index 000000000..f0b9aa9c6 --- /dev/null +++ b/community-testing/xlockmore/LICENSE @@ -0,0 +1,18 @@ +/*- + * xscreensaver compatibility layer for xlockmore modules. + * xscreensaver, Copyright (c) 1997, 1998 Jamie Zawinski <jwz@jwz.org> + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation. No representations are made about the suitability of this + * software for any purpose. It is provided "as is" without express or + * implied warranty. + * + * This file, along with xlockmore.h, make it possible to compile an xlockmore + * module into a standalone program, and thus use it with xscreensaver. + * By Jamie Zawinski <jwz@jwz.org> on 10-May-97; based on the ideas + * in the older xlock.h by Charles Hannum <mycroft@ai.mit.edu>. (I had + * to redo it, since xlockmore has diverged so far from xlock...) + */ diff --git a/community-testing/xlockmore/PKGBUILD b/community-testing/xlockmore/PKGBUILD new file mode 100644 index 000000000..fc3d8b336 --- /dev/null +++ b/community-testing/xlockmore/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 77304 2012-10-08 15:13:08Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: dorphell <dorphell@archlinux.org> + +pkgname=xlockmore +pkgver=5.40 +pkgrel=2 +pkgdesc="screen saver / locker for the X Window System" +arch=(i686 x86_64) +license=('BSD') +depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu glu) +url="http://www.tux.org/~bagleyd/xlockmore.html" +options=('!makeflags') +source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 + LICENSE) +md5sums=('47a8e16c485da7b0ebfa3f3e43300189' + 'a64afab4283f53972a6702c2e59850d7') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --disable-setuid \ + --enable-appdefaultdir=/usr/share/X11/app-defaults \ + --enable-pam --with-gtk2 --without-esound --without-ftgl + make + make xapploaddir=$pkgdir/usr/share/X11/app-defaults \ + mandir=$pkgdir/usr/man/man1 \ + prefix=$pkgdir/usr install + install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + mv $pkgdir/usr/man $pkgdir/usr/share/ +} diff --git a/community/blobby2/PKGBUILD b/community/blobby2/PKGBUILD index ee2c8bf48..7cdc5186e 100644 --- a/community/blobby2/PKGBUILD +++ b/community/blobby2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64502 2012-02-15 09:59:03Z svenstaro $ +# $Id: PKGBUILD 77257 2012-10-08 12:01:38Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=blobby2 -pkgver=1.0rc1 +pkgver=1.0rc2 arch=('x86_64' 'i686') pkgrel=1 pkgdesc="A beach ball game with blobs of goo" @@ -12,8 +12,9 @@ license=('GPL') depends=('sdl' 'physfs' 'libgl') makedepends=('cmake' 'boost' 'mesa' 'zip') source=(http://downloads.sourceforge.net/blobby/$pkgname-linux-$pkgver.tar.gz - $pkgname.desktop $pkgname.png) -md5sums=('f56472cee041ef3d3c7def604e71b248' + $pkgname.desktop + $pkgname.png) +md5sums=('6a508bb292e8eebe41653da173a37a02' 'ab05bed794ee78db693fd3036393275a' 'c1bc427b41a0a3facd771ac83c7fb412') diff --git a/community/partimage/PKGBUILD b/community/partimage/PKGBUILD index a8c3178b5..2fe4fa830 100644 --- a/community/partimage/PKGBUILD +++ b/community/partimage/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66450 2012-02-25 01:26:42Z lfleischer $ +# $Id: PKGBUILD 77310 2012-10-08 15:54:38Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Sven Kauber <celeon@gmail.com> @@ -7,7 +7,7 @@ pkgname=partimage pkgver=0.6.9 -pkgrel=2 +pkgrel=3 pkgdesc='Partition Image saves partitions in many formats to an image file.' arch=('i686' 'x86_64') url='http://www.partimage.org/' @@ -18,11 +18,13 @@ install='partimage.install' source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'partimage-0.6.9-zlib-1.2.6.patch' 'partimaged' - 'partimaged-gencrt') + 'partimaged-gencrt' + 'partimaged.service') md5sums=('1bc046fd915c5debbafc85729464e513' '202c4334766041d98c5f67c9d62c3063' 'f3b517a62de5540f3b1a8b7edf65b7ec' - '2316b116227b07efb48266e660ca1ba1') + '2316b116227b07efb48266e660ca1ba1' + '4102983fdf6e7af7cac73fdf9d37a6f6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -43,4 +45,6 @@ package() { install -Dm0755 "${srcdir}/partimaged" "${pkgdir}/etc/rc.d/partimaged" install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt" chmod 644 "${pkgdir}/etc/partimaged/partimagedusers" + + install -Dm0755 ../partimaged.service "${pkgdir}/usr/lib/systemd/system/partimaged.service" } diff --git a/community/partimage/partimaged.service b/community/partimage/partimaged.service new file mode 100644 index 000000000..34eb87fd7 --- /dev/null +++ b/community/partimage/partimaged.service @@ -0,0 +1,10 @@ +[Unit] +Description=A partition imaging daemon +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/partimaged --daemon + +[Install] +WantedBy=multi-user.target diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index cad1ef5db..d5674d865 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 165339 2012-08-16 01:57:21Z allan $ +# $Id: PKGBUILD 168332 2012-10-08 22:50:16Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.7.1 -pkgrel=6 -_snapshot=4.7-20120721 -_libstdcppmanver=20120725 # Note: check source directory name when updating this +pkgver=4.7.2 +pkgrel=1 +#_snapshot=4.7-20120721 +_libstdcppmanver=20120924 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -16,14 +16,14 @@ url="http://gcc.gnu.org" makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-4.7.1-libada-pic.patch gcc-4.7.1-libgo-write.patch) -md5sums=('a1a53fda426bc6809cede8e85bbaf2a3' - '79c4381f983b71868c02da3379e1e8a2' +md5sums=('cc308a0891e778cfda7a151ab8a6e762' + '7f3d52515daafffb57c287f427381106' 'ced48436c1b3c981d721a829f1094de1' '2acbc9d35cc9d72329dc71d6b1f162ef' 'df82dd175ac566c8a6d46b11ac21f14c') diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index 96b3479f6..ce5c2727f 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162070 2012-06-19 12:28:01Z allan $ +# $Id: PKGBUILD 168333 2012-10-08 22:50:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -pkgrel=6 +pkgrel=7 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" @@ -28,7 +28,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.1') + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.2') groups=('base-devel') install=libtool.install diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD index 0f6736512..19267a906 100644 --- a/extra/at/PKGBUILD +++ b/extra/at/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138170 2011-09-18 03:48:48Z eric $ +# $Id: PKGBUILD 168299 2012-10-08 05:32:58Z eric $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Todd Musall <tmusall@comcast.net> pkgname=at pkgver=3.1.13 -pkgrel=1 +pkgrel=2 pkgdesc="AT and batch delayed command scheduling utility and daemon" arch=('i686' 'x86_64') url="http://packages.qa.debian.org/a/at.html" @@ -12,10 +12,12 @@ license=('GPL') depends=('pam') makedepends=('ssmtp') backup=('etc/at.deny') +options=('!makeflags') source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz - atd) + atd atd.service) md5sums=('1da61af6c29e323abaaf13ee1a8dad79' - '35574e34829e7df07a3269d4ab646a29') + '35574e34829e7df07a3269d4ab646a29' + '33976a813f4fe7f5659354601044c6f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,4 +32,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make IROOT="${pkgdir}" docdir=/usr/share/doc install install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd" + install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service" } diff --git a/extra/at/atd.service b/extra/at/atd.service new file mode 100644 index 000000000..ba359878c --- /dev/null +++ b/extra/at/atd.service @@ -0,0 +1,9 @@ +[Unit] +Description=ATD daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/atd + +[Install] +WantedBy=multi-user.target diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD index abe2a3adf..8f6f601c0 100644 --- a/extra/kdiff3/PKGBUILD +++ b/extra/kdiff3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166597 2012-09-12 20:12:20Z eric $ +# $Id: PKGBUILD 168298 2012-10-08 05:04:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=kdiff3 pkgver=0.9.97 -pkgrel=1 +pkgrel=2 pkgdesc="A KDE file comparator/merge tool" arch=('i686' 'x86_64') url="http://kdiff3.sourceforge.net/" @@ -12,11 +12,14 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml') optdepends=('kdebase-lib: for the plugin') install=kdiff3.install -source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz) -sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547') +source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz + kdiff3-relative-path.patch) +sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547' + 'b5359dcec2ebb8221a232ecc2ea9982b290172e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p2 -i "${srcdir}/kdiff3-relative-path.patch" mkdir release cd release cmake .. -DCMAKE_INSTALL_PREFIX=/usr diff --git a/extra/kdiff3/kdiff3-relative-path.patch b/extra/kdiff3/kdiff3-relative-path.patch new file mode 100644 index 000000000..7cfccd6f5 --- /dev/null +++ b/extra/kdiff3/kdiff3-relative-path.patch @@ -0,0 +1,59 @@ +--- a/kdiff3/src-QT4/fileaccess.cpp ++++ b/kdiff3/src-QT4/fileaccess.cpp +@@ -183,7 +183,8 @@ + + void FileAccess::setFile( const QFileInfo& fi, FileAccess* pParent ) + { +- m_filePath = nicePath( fi.filePath() ); // remove "./" at start ++ m_filePath = pParent == 0 ? fi.absoluteFilePath() : ++ nicePath( fi.filePath() ); // remove "./" at start + + m_bSymLink = fi.isSymLink(); + if ( m_bSymLink || (!m_bExists && m_filePath.contains("@@") ) ) +@@ -566,7 +567,16 @@ + if ( parent() != 0 ) + return parent()->absoluteFilePath() + "/" + m_filePath; + else +- return m_filePath; ++ { ++ if ( m_filePath.isEmpty() ) ++ return QString(); ++ ++ QFileInfo fi( m_filePath ); ++ if ( fi.isAbsolute() ) ++ return m_filePath; ++ else ++ return fi.absoluteFilePath(); // Probably never reached ++ } + } // Full abs path + + // Just the name-part of the path, without parent directories +@@ -1184,7 +1194,7 @@ + m_bSuccess = false; + KIO::FileCopyJob* pJob = KIO::file_move( m_pFileAccess->url(), kurl, permissions, KIO::HideProgressInfo ); + connect( pJob, SIGNAL(result(KJob*)), this, SLOT(slotSimpleJobResult(KJob*))); +- connect( pJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); ++ connect( pJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); + + ProgressProxy::enterEventLoop( pJob, + i18n("Renaming file: %1 -> %2",m_pFileAccess->prettyAbsPath(),dest) ); +@@ -1673,7 +1683,7 @@ + &pp, SLOT( slotListDirInfoMessage(KJob*, const QString&) )); + + // This line makes the transfer via fish unreliable.:-( +- //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), this, SLOT(slotPercent(KJob*, unsigned long))); ++ //connect( pListJob, SIGNAL(percent(KJob*,unsigned long)), &pp, SLOT(slotPercent(KJob*, unsigned long))); + + ProgressProxy::enterEventLoop( pListJob, + i18n("Listing directory: %1",m_pFileAccess->prettyAbsPath()) ); +--- a/kdiff3/src-QT4/kdiff3.cpp ++++ b/kdiff3/src-QT4/kdiff3.cpp +@@ -211,6 +211,8 @@ + m_outputFilename = args->getOption("output"); + if ( m_outputFilename.isEmpty() ) + m_outputFilename = args->getOption("out"); ++ if ( ! m_outputFilename.isEmpty() ) ++ m_outputFilename = FileAccess( m_outputFilename, true ).absoluteFilePath(); + } + + m_bAutoFlag = args!=0 && args->isSet("auto"); diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 275f5065d..6d0327ed1 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 166487 2012-09-08 10:00:42Z ronald $ +# $Id: PKGBUILD 168309 2012-10-08 09:18:38Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.28.0 -pkgrel=1 +pkgrel=2 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.0.58' 'texinfo' 'sh') +depends=('sbcl=1.1.0' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index d70068fd4..325c61b06 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160499 2012-06-02 10:26:47Z bluewind $ +# $Id: PKGBUILD 168300 2012-10-08 05:33:09Z eric $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64') url="http://www.net-snmp.org/" @@ -18,11 +18,12 @@ provides=('ucd-snmp') backup=('etc/conf.d/snmpd') options=('!libtool' '!makeflags' '!emptydirs') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.confd snmpd.rc libnl32.patch) + snmpd.confd snmpd.rc snmpd.service libnl32.patch) sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' '2bdc2839ce09d7daa608cd54687fa8beb47ed907' 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' + 'f59ddc049c1c689f04e68c3c7cd8b8e301df3158' '74a9848b95f63378eb1753fc309d2b74de5afb0f') build() { @@ -54,5 +55,6 @@ package() { make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" + install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/net-snmp/snmpd.service b/extra/net-snmp/snmpd.service new file mode 100644 index 000000000..111a8d6a9 --- /dev/null +++ b/extra/net-snmp/snmpd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Simple Network Management Protocol (SNMP) Daemon +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/snmpd +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/nicotine/PKGBUILD b/extra/nicotine/PKGBUILD index c37ea7190..08610c142 100644 --- a/extra/nicotine/PKGBUILD +++ b/extra/nicotine/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 144457 2011-12-06 06:35:08Z angvp $ +# $Id: PKGBUILD 168342 2012-10-09 00:13:39Z eric $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Andrew Wright <andreww@photism.org> pkgname=nicotine pkgver=1.2.16 -pkgrel=3 +pkgrel=4 pkgdesc="Soulseek music-sharing client, written in python" -license=('GPL') arch=('i686' 'x86_64') -depends=('pygtk>=2.14.1' 'mutagen') -conflicts=(nicotine-plus) -replaces=(nicotine-plus) url="http://sourceforge.net/projects/nicotine-plus/" +license=('GPL') +depends=('pygtk' 'mutagen') +optdepends=('python2-geoip: to enable Geographical blocker') source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2) -optdepends=('python-sexy: To enable spell checking' - 'python-geoip: to enable Geographical blocker') md5sums=('ac7433c21ef619a37e079a7ae68da94a') - - - build() { - cd ${srcdir}/${pkgname}+-${pkgver} + cd "${srcdir}/${pkgname}+-${pkgver}" sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476 - python2 setup.py install --root=${pkgdir} + sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \ + -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py + + python2 setup.py install --root="${pkgdir}" cd trayicon python2 autogen.py make } package() { - cd ${srcdir}/${pkgname}+-${pkgver}/trayicon - make DESTDIR=${pkgdir} install - ln -s nicotine.py ${pkgdir}/usr/bin/nicotine + cd "${srcdir}/${pkgname}+-${pkgver}/trayicon" + make DESTDIR="${pkgdir}" install + ln -s nicotine.py "${pkgdir}/usr/bin/nicotine" } diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD new file mode 100644 index 000000000..c250b548d --- /dev/null +++ b/extra/opus/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com> +# Contributor: pumbur + +pkgname=opus +pkgver=1.0.1 +pkgrel=2 +pkgdesc="codec designed for interactive speech and audio transmission over the Internet" +arch=('i686' 'x86_64') +url="http://www.opus-codec.org/" +license=('custom') +depends=('glibc') +source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") +options=('!libtool') +md5sums=('bbac19996957b404a1139816e2f357f5') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -m755 -d "${pkgdir}/usr/share/licenses/opus" + install -m644 COPYING "${pkgdir}/usr/share/licenses/opus/" +} diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index 2a5fe156e..f9a76dbbb 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 140200 2011-10-09 08:54:48Z angvp $ +# $Id: PKGBUILD 168340 2012-10-08 23:42:19Z eric $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=python-geoip +pkgbase=python-geoip +pkgname=('python2-geoip') pkgver=1.2.7 -pkgrel=1 -pkgdesc="Python bindings for the GeoIP IP-to-country resolver library." -arch=(i686 x86_64) +pkgrel=2 +pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" +arch=('i686' 'x86_64') url="http://www.maxmind.com/app/python" license=('LGPL') depends=('python2' 'geoip') source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz) -replaces=('geoip-python') -provides=('geoip-python') md5sums=('df71f5ae7a5c77bbdf726d512b7d67cf') -build() { - cd ${startdir}/src/GeoIP-Python-${pkgver} - python2 setup.py build install --root=${startdir}/pkg +package_python2-geoip() { + cd "${srcdir}/GeoIP-Python-${pkgver}" + python2 setup.py build install --root="${pkgdir}" } diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 1894bfaa3..8e8f4cd47 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165308 2012-08-15 11:11:17Z juergen $ +# $Id: PKGBUILD 168308 2012-10-08 09:08:03Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.0.58 +pkgver=1.1.0 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -17,7 +17,7 @@ makedepends=('sbcl' 'texinfo') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp") -md5sums=('341952949dc90af6f83a89f685da5dde' +md5sums=('7390495ce158eac45002c028ed8c149b' '7ac0c1936547f4278198b8bf7725204d') build() { diff --git a/gnome-unstable/empathy/PKGBUILD b/gnome-unstable/empathy/PKGBUILD index 5f0197bcb..f193fd00c 100644 --- a/gnome-unstable/empathy/PKGBUILD +++ b/gnome-unstable/empathy/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 167722 2012-10-03 11:30:17Z jgc $ +# $Id: PKGBUILD 168311 2012-10-08 12:42:52Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.6.0.1 +pkgver=3.6.0.2 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64') url="http://live.gnome.org/Empathy" license=('GPL2') -depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'networkmanager' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control') -makedepends=('intltool' 'itstool' 'docbook-xsl') +depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control') +makedepends=('intltool' 'itstool' 'docbook-xsl' 'nautilus-sendto') optdepends=('telepathy-gabble: XMPP/Jabber support' 'telepathy-idle: IRC support' 'telepathy-salut: Link-local XMPP support' 'telepathy-rakia: SIP support' - 'telepathy-haze: libpurple support') + 'telepathy-haze: libpurple support' + 'nautilus-sendto: Send files from nautilus') options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('317933dca14ed3e402410cd2a4f0cba4d9a80fe43f3d4de110b6342fc43db315') +sha256sums=('3c27db67236249e60ee0439d6a1098729939731ce597b724a058c8ce2eb659f9') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD index b7792151a..64b2f93cf 100644 --- a/gnome-unstable/gnome-control-center/PKGBUILD +++ b/gnome-unstable/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167087 2012-09-25 10:41:31Z jgc $ +# $Id: PKGBUILD 168329 2012-10-08 22:05:31Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7d58d0ccc3defe622f66f4ce8e1229e443f4f57c58f85eecde12b642b8a8e893') +sha256sums=('b6e9530deac15408fee43c9c7a21200456bebf947e677856cd7345a79e2923d5') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/gnome-unstable/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch new file mode 100644 index 000000000..d744eff56 --- /dev/null +++ b/gnome-unstable/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch @@ -0,0 +1,1472 @@ +From a26f7c5190ebc82f9f17e0446159311377b20d3f Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Fri, 21 Sep 2012 11:56:53 +0100 +Subject: [PATCH] power and media-keys: Use logind for suspending and + rebooting the system + +Use the new logind features to suspend and resume but making sure we opt out +of logind handling the sleep and power keys, and also inhibiting for lid close +auto-suspend if there is an external monitor connected. + +Also use a delay inihibit for logind so that we can do actions on suspend like +blanking the screen using the screensaver and also poking the screensaver on +resume. + +https://bugzilla.gnome.org/show_bug.cgi?id=680689 +--- + plugins/common/Makefile.am | 4 +- + plugins/common/gsd-power-helper.c | 203 -------- + plugins/common/gsd-power-helper.h | 35 -- + plugins/media-keys/gsd-media-keys-manager.c | 156 +++++-- + plugins/power/gsd-power-manager.c | 699 +++++++++++++++++++--------- + 5 files changed, 595 insertions(+), 502 deletions(-) + delete mode 100644 plugins/common/gsd-power-helper.c + delete mode 100644 plugins/common/gsd-power-helper.h + +diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am +index 7e50db4..b0e907c 100644 +--- a/plugins/common/Makefile.am ++++ b/plugins/common/Makefile.am +@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \ + gsd-keygrab.c \ + gsd-keygrab.h \ + gsd-input-helper.c \ +- gsd-input-helper.h \ +- gsd-power-helper.c \ +- gsd-power-helper.h ++ gsd-input-helper.h + + libcommon_la_CPPFLAGS = \ + $(AM_CPPFLAGS) +diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c +deleted file mode 100644 +index 27d0eda..0000000 +--- a/plugins/common/gsd-power-helper.c ++++ /dev/null +@@ -1,203 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- * +- */ +- +-#include "config.h" +- +-#include "gsd-power-helper.h" +- +-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" +- +-#define CONSOLEKIT_DBUS_NAME "org.freedesktop.ConsoleKit" +-#define CONSOLEKIT_DBUS_PATH_MANAGER "/org/freedesktop/ConsoleKit/Manager" +-#define CONSOLEKIT_DBUS_INTERFACE_MANAGER "org.freedesktop.ConsoleKit.Manager" +- +-#ifdef HAVE_SYSTEMD +-static void +-systemd_stop (void) +-{ +- GDBusConnection *bus; +- +- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); +- g_dbus_connection_call (bus, +- SYSTEMD_DBUS_NAME, +- SYSTEMD_DBUS_PATH, +- SYSTEMD_DBUS_INTERFACE, +- "PowerOff", +- g_variant_new ("(b)", FALSE), +- NULL, 0, G_MAXINT, NULL, NULL, NULL); +- g_object_unref (bus); +-} +- +-static void +-systemd_suspend (void) +-{ +- GDBusConnection *bus; +- +- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); +- g_dbus_connection_call (bus, +- SYSTEMD_DBUS_NAME, +- SYSTEMD_DBUS_PATH, +- SYSTEMD_DBUS_INTERFACE, +- "Suspend", +- g_variant_new ("(b)", TRUE), +- NULL, 0, G_MAXINT, NULL, NULL, NULL); +- g_object_unref (bus); +-} +- +-static void +-systemd_hibernate (void) +-{ +- GDBusConnection *bus; +- +- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); +- g_dbus_connection_call (bus, +- SYSTEMD_DBUS_NAME, +- SYSTEMD_DBUS_PATH, +- SYSTEMD_DBUS_INTERFACE, +- "Hibernate", +- g_variant_new ("(b)", TRUE), +- NULL, 0, G_MAXINT, NULL, NULL, NULL); +- g_object_unref (bus); +-} +- +-#else /* HAVE_SYSTEMD */ +- +-static void +-consolekit_stop_cb (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- GVariant *result; +- GError *error = NULL; +- +- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), +- res, +- &error); +- if (result == NULL) { +- g_warning ("couldn't stop using ConsoleKit: %s", +- error->message); +- g_error_free (error); +- } else { +- g_variant_unref (result); +- } +-} +- +-static void +-consolekit_stop (void) +-{ +- GError *error = NULL; +- GDBusProxy *proxy; +- +- /* power down the machine in a safe way */ +- proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, +- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, +- NULL, +- CONSOLEKIT_DBUS_NAME, +- CONSOLEKIT_DBUS_PATH_MANAGER, +- CONSOLEKIT_DBUS_INTERFACE_MANAGER, +- NULL, &error); +- if (proxy == NULL) { +- g_warning ("cannot connect to ConsoleKit: %s", +- error->message); +- g_error_free (error); +- return; +- } +- g_dbus_proxy_call (proxy, +- "Stop", +- NULL, +- G_DBUS_CALL_FLAGS_NONE, +- -1, NULL, +- consolekit_stop_cb, NULL); +- g_object_unref (proxy); +-} +-static void +-upower_sleep_cb (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- GVariant *result; +- GError *error = NULL; +- +- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), +- res, +- &error); +- if (result == NULL) { +- g_warning ("couldn't sleep using UPower: %s", +- error->message); +- g_error_free (error); +- } else { +- g_variant_unref (result); +- } +-} +- +-static void +-upower_suspend (GDBusProxy *upower_proxy) +-{ +- g_dbus_proxy_call (upower_proxy, +- "Suspend", +- NULL, +- G_DBUS_CALL_FLAGS_NONE, +- -1, NULL, +- upower_sleep_cb, NULL); +-} +- +-static void +-upower_hibernate (GDBusProxy *upower_proxy) +-{ +- g_dbus_proxy_call (upower_proxy, +- "Hibernate", +- NULL, +- G_DBUS_CALL_FLAGS_NONE, +- -1, NULL, +- upower_sleep_cb, NULL); +-} +-#endif /* HAVE_SYSTEMD */ +- +-void +-gsd_power_suspend (GDBusProxy *upower_proxy) +-{ +-#ifdef HAVE_SYSTEMD +- systemd_suspend (); +-#else +- upower_suspend (upower_proxy); +-#endif +-} +- +-void +-gsd_power_poweroff (void) +-{ +-#ifdef HAVE_SYSTEMD +- systemd_stop (); +-#else +- consolekit_stop (); +-#endif +-} +- +-void +-gsd_power_hibernate (GDBusProxy *upower_proxy) +-{ +-#ifdef HAVE_SYSTEMD +- systemd_hibernate (); +-#else +- upower_hibernate (upower_proxy); +-#endif +-} +diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h +deleted file mode 100644 +index e3be14f..0000000 +--- a/plugins/common/gsd-power-helper.h ++++ /dev/null +@@ -1,35 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- */ +- +-#ifndef __GSD_POWER_HELPER_H +-#define __GSD_POWER_HELPER_H +- +-#include <glib.h> +- +-G_BEGIN_DECLS +- +-#include <gio/gio.h> +- +-void gsd_power_suspend (GDBusProxy *upower_proxy); +-void gsd_power_hibernate (GDBusProxy *upower_proxy); +-void gsd_power_poweroff (void); +- +-G_END_DECLS +- +-#endif /* __GSD_POWER_HELPER_H */ +diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c +index 9c84d7f..a2f277e 100644 +--- a/plugins/media-keys/gsd-media-keys-manager.c ++++ b/plugins/media-keys/gsd-media-keys-manager.c +@@ -39,6 +39,7 @@ + #include <gdk/gdkx.h> + #include <gtk/gtk.h> + #include <gio/gdesktopappinfo.h> ++#include <gio/gunixfdlist.h> + + #ifdef HAVE_GUDEV + #include <gudev/gudev.h> +@@ -51,7 +52,6 @@ + #include "shortcuts-list.h" + #include "gsd-osd-window.h" + #include "gsd-input-helper.h" +-#include "gsd-power-helper.h" + #include "gsd-enums.h" + + #include <canberra.h> +@@ -105,6 +105,10 @@ static const gchar introspection_xml[] = + #define KEY_CURRENT_INPUT_SOURCE "current" + #define KEY_INPUT_SOURCES "sources" + ++#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" ++#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" ++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" ++ + #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) + + typedef struct { +@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate + + /* Power stuff */ + GSettings *power_settings; +- GDBusProxy *upower_proxy; + GDBusProxy *power_screen_proxy; + GDBusProxy *power_keyboard_proxy; + ++ /* systemd stuff */ ++ GDBusProxy *logind_proxy; ++ gint inhibit_keys_fd; ++ + /* Multihead stuff */ + GdkScreen *current_screen; + GSList *screens; +@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager) + } + + static void ++power_action_suspend (GsdMediaKeysManager *manager) ++{ ++#ifndef HAVE_SYSTEMD ++ g_warning ("no systemd support"); ++ return; ++#endif ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "Suspend", ++ g_variant_new ("(b)", TRUE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ manager->priv->bus_cancellable, ++ NULL, NULL); ++} ++ ++static void ++power_action_hibernate (GsdMediaKeysManager *manager) ++{ ++#ifndef HAVE_SYSTEMD ++ g_warning ("no systemd support"); ++ return; ++#endif ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "Hibernate", ++ g_variant_new ("(b)", TRUE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ manager->priv->bus_cancellable, ++ NULL, NULL); ++} ++ ++static void + do_config_power_action (GsdMediaKeysManager *manager, + const gchar *config_key) + { +@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager, + config_key); + switch (action_type) { + case GSD_POWER_ACTION_SUSPEND: +- gsd_power_suspend (manager->priv->upower_proxy); ++ power_action_suspend (manager); + break; + case GSD_POWER_ACTION_INTERACTIVE: + case GSD_POWER_ACTION_SHUTDOWN: + gnome_session_shutdown (manager); + break; + case GSD_POWER_ACTION_HIBERNATE: +- gsd_power_hibernate (manager->priv->upower_proxy); ++ power_action_hibernate (manager); + break; + case GSD_POWER_ACTION_BLANK: + case GSD_POWER_ACTION_NOTHING: +@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) + } + #endif /* HAVE_GUDEV */ + ++ g_clear_object (&priv->logind_proxy); + if (priv->settings) { + g_object_unref (priv->settings); + priv->settings = NULL; +@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) + priv->power_keyboard_proxy = NULL; + } + +- if (priv->upower_proxy) { +- g_object_unref (priv->upower_proxy); +- priv->upower_proxy = NULL; +- } +- + if (priv->cancellable != NULL) { + g_cancellable_cancel (priv->cancellable); + g_object_unref (priv->cancellable); +@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass) + } + + static void ++inhibit_done (GObject *source, ++ GAsyncResult *result, ++ gpointer user_data) ++{ ++ GDBusProxy *proxy = G_DBUS_PROXY (source); ++ GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data); ++ GError *error = NULL; ++ GVariant *res; ++ GUnixFDList *fd_list = NULL; ++ gint idx; ++ ++ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); ++ if (res == NULL) { ++ g_warning ("Unable to inhibit keypresses: %s", error->message); ++ g_error_free (error); ++ } else { ++ g_variant_get (res, "(h)", &idx); ++ manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error); ++ if (manager->priv->inhibit_keys_fd == -1) { ++ g_warning ("Failed to receive system inhibitor fd: %s", error->message); ++ g_error_free (error); ++ } ++ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd); ++ g_object_unref (fd_list); ++ g_variant_unref (res); ++ } ++} ++ ++static void + gsd_media_keys_manager_init (GsdMediaKeysManager *manager) + { ++ GError *error; ++ GDBusConnection *bus; ++ ++ error = NULL; + manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager); ++ ++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); ++ if (bus == NULL) { ++ g_warning ("Failed to connect to system bus: %s", ++ error->message); ++ g_error_free (error); ++ return; ++ } ++ ++ manager->priv->logind_proxy = ++ g_dbus_proxy_new_sync (bus, ++ 0, ++ NULL, ++ SYSTEMD_DBUS_NAME, ++ SYSTEMD_DBUS_PATH, ++ SYSTEMD_DBUS_INTERFACE, ++ NULL, ++ &error); ++ ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("Failed to connect to systemd: %s", ++ error->message); ++ g_error_free (error); ++ } ++ ++ g_object_unref (bus); ++ ++ g_debug ("Adding system inhibitors for power keys"); ++ manager->priv->inhibit_keys_fd = -1; ++ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, ++ "Inhibit", ++ g_variant_new ("(ssss)", ++ "handle-power-key:handle-suspend-key:handle-hibernate-key", ++ g_get_user_name (), ++ "GNOME handling keypresses", ++ "block"), ++ 0, ++ G_MAXINT, ++ NULL, ++ NULL, ++ inhibit_done, ++ manager); ++ + } + + static void +@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object) + + if (media_keys_manager->priv->start_idle_id != 0) + g_source_remove (media_keys_manager->priv->start_idle_id); ++ if (media_keys_manager->priv->inhibit_keys_fd != -1) ++ close (media_keys_manager->priv->inhibit_keys_fd); + + G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object); + } +@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject *source_object, + } + + static void +-upower_ready_cb (GObject *source_object, +- GAsyncResult *res, +- GsdMediaKeysManager *manager) +-{ +- GError *error = NULL; +- +- manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error); +- if (manager->priv->upower_proxy == NULL) { +- g_warning ("Failed to get proxy for upower: %s", +- error->message); +- g_error_free (error); +- } +-} +- +-static void + power_screen_ready_cb (GObject *source_object, + GAsyncResult *res, + GsdMediaKeysManager *manager) +@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager) + manager->priv->bus_cancellable, + (GAsyncReadyCallback) on_bus_gotten, + manager); +- +- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, +- G_DBUS_PROXY_FLAGS_NONE, +- NULL, +- "org.freedesktop.UPower", +- "/org/freedesktop/UPower", +- "org.freedesktop.UPower", +- NULL, +- (GAsyncReadyCallback) upower_ready_cb, +- manager); + } + + GsdMediaKeysManager * +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index 0e06495..7c120c4 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -1,7 +1,7 @@ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> +- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com> ++ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com> + * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com> + * + * This program is free software; you can redistribute it and/or modify +@@ -31,6 +31,7 @@ + #include <libupower-glib/upower.h> + #include <libnotify/notify.h> + #include <canberra-gtk.h> ++#include <gio/gunixfdlist.h> + + #define GNOME_DESKTOP_USE_UNSTABLE_API + #include <libgnome-desktop/gnome-rr.h> +@@ -42,7 +43,6 @@ + #include "gnome-settings-session.h" + #include "gsd-enums.h" + #include "gsd-power-manager.h" +-#include "gsd-power-helper.h" + + #define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" + #define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager" +@@ -77,6 +77,10 @@ + #define GSD_POWER_MANAGER_RECALL_DELAY 30 /* seconds */ + #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */ + ++#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" ++#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" ++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" ++ + /* Keep this in sync with gnome-shell */ + #define SCREENSAVER_FADE_TIME 10 /* seconds */ + +@@ -190,13 +194,19 @@ struct GsdPowerManagerPrivate + ca_context *canberra_context; + ca_proplist *critical_alert_loop_props; + guint32 critical_alert_timeout_id; +- GDBusProxy *screensaver_proxy; + GDBusProxy *session_proxy; + GDBusProxy *session_presence_proxy; + GpmIdletime *idletime; + GsdPowerIdleMode current_idle_mode; +- guint lid_close_safety_timer_id; + GtkStatusIcon *status_icon; ++ ++ /* systemd stuff */ ++ GDBusProxy *logind_proxy; ++ gint inhibit_lid_switch_fd; ++ gboolean inhibit_lid_switch_taken; ++ gint inhibit_suspend_fd; ++ gboolean inhibit_suspend_taken; ++ guint inhibit_lid_switch_timer_id; + }; + + enum { +@@ -213,8 +223,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); + static gchar *engine_get_summary (GsdPowerManager *manager); + static void do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type); + static void do_lid_closed_action (GsdPowerManager *manager); +-static void lock_screensaver (GsdPowerManager *manager); +-static void kill_lid_close_safety_timer (GsdPowerManager *manager); ++static void uninhibit_lid_switch (GsdPowerManager *manager); ++static gboolean external_monitor_is_connected (GnomeRRScreen *screen); + + G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT) + +@@ -2044,6 +2054,57 @@ gnome_session_shutdown (void) + } + + static void ++action_poweroff (GsdPowerManager *manager) ++{ ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("no systemd support"); ++ return; ++ } ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "PowerOff", ++ g_variant_new ("(b)", FALSE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ NULL, ++ NULL, ++ NULL); ++} ++ ++static void ++action_suspend (GsdPowerManager *manager) ++{ ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("no systemd support"); ++ return; ++ } ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "Suspend", ++ g_variant_new ("(b)", FALSE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ NULL, ++ NULL, ++ NULL); ++} ++ ++static void ++action_hibernate (GsdPowerManager *manager) ++{ ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("no systemd support"); ++ return; ++ } ++ g_dbus_proxy_call (manager->priv->logind_proxy, ++ "Hibernate", ++ g_variant_new ("(b)", FALSE), ++ G_DBUS_CALL_FLAGS_NONE, ++ G_MAXINT, ++ NULL, ++ NULL, ++ NULL); ++} ++ ++static void + do_power_action_type (GsdPowerManager *manager, + GsdPowerActionType action_type) + { +@@ -2052,19 +2113,19 @@ do_power_action_type (GsdPowerManager *manager, + + switch (action_type) { + case GSD_POWER_ACTION_SUSPEND: +- gsd_power_suspend (manager->priv->upower_proxy); ++ action_suspend (manager); + break; + case GSD_POWER_ACTION_INTERACTIVE: + gnome_session_shutdown (); + break; + case GSD_POWER_ACTION_HIBERNATE: +- gsd_power_hibernate (manager->priv->upower_proxy); ++ action_hibernate (manager); + break; + case GSD_POWER_ACTION_SHUTDOWN: + /* this is only used on critically low battery where + * hibernate is not available and is marginally better + * than just powering down the computer mid-write */ +- gsd_power_poweroff (); ++ action_poweroff (manager); + break; + case GSD_POWER_ACTION_BLANK: + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +@@ -2136,85 +2197,20 @@ upower_kbd_toggle (GsdPowerManager *manager, + return ret; + } + +-static void +-do_lid_open_action (GsdPowerManager *manager) +-{ +- gboolean ret; +- GError *error = NULL; +- +- /* play a sound, using sounds from the naming spec */ +- ca_context_play (manager->priv->canberra_context, 0, +- CA_PROP_EVENT_ID, "lid-open", +- /* TRANSLATORS: this is the sound description */ +- CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), +- NULL); +- +- /* ensure we turn the panel back on after lid open */ +- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +- GNOME_RR_DPMS_ON, +- &error); +- if (!ret) { +- g_warning ("failed to turn the panel on after lid open: %s", +- error->message); +- g_clear_error (&error); +- } +- +- /* only toggle keyboard if present and already toggled off */ +- if (manager->priv->upower_kdb_proxy != NULL && +- manager->priv->kbd_brightness_old != -1) { +- ret = upower_kbd_toggle (manager, &error); +- if (!ret) { +- g_warning ("failed to turn the kbd backlight on: %s", +- error->message); +- g_error_free (error); +- } +- } +- +- kill_lid_close_safety_timer (manager); +-} +- + static gboolean +-is_on (GnomeRROutput *output) ++inhibit_lid_switch_timer_cb (GsdPowerManager *manager) + { +- GnomeRRCrtc *crtc; +- +- crtc = gnome_rr_output_get_crtc (output); +- if (!crtc) +- return FALSE; +- return gnome_rr_crtc_get_current_mode (crtc) != NULL; +-} +- +-static gboolean +-non_laptop_outputs_are_all_off (GnomeRRScreen *screen) +-{ +- GnomeRROutput **outputs; +- int i; +- +- outputs = gnome_rr_screen_list_outputs (screen); +- for (i = 0; outputs[i] != NULL; i++) { +- if (gnome_rr_output_is_laptop (outputs[i])) +- continue; +- +- if (is_on (outputs[i])) +- return FALSE; ++ if (!external_monitor_is_connected (manager->priv->x11_screen) || ++ g_settings_get_boolean (manager->priv->settings, ++ "lid-close-suspend-with-external-monitor")) { ++ g_debug ("no external monitors for a while; uninhibiting lid close"); ++ uninhibit_lid_switch (manager); ++ manager->priv->inhibit_lid_switch_timer_id = 0; ++ return G_SOURCE_REMOVE; + } + +- return TRUE; +-} +- +-/* Timeout callback used to check conditions when the laptop's lid is closed but +- * the machine is not suspended yet. We try to suspend again, so that the laptop +- * won't overheat if placed in a backpack. +- */ +-static gboolean +-lid_close_safety_timer_cb (GsdPowerManager *manager) +-{ +- manager->priv->lid_close_safety_timer_id = 0; +- +- g_debug ("lid has been closed for a while; trying to suspend again"); +- do_lid_closed_action (manager); +- +- return FALSE; ++ g_debug ("external monitor still there; trying again later"); ++ return G_SOURCE_CONTINUE; + } + + /* Sets up a timer to be triggered some seconds after closing the laptop lid +@@ -2222,82 +2218,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) + * again in the timeout handler to see if we can suspend then. + */ + static void +-setup_lid_close_safety_timer (GsdPowerManager *manager) ++setup_inhibit_lid_switch_timer (GsdPowerManager *manager) + { +- if (manager->priv->lid_close_safety_timer_id != 0) ++ if (manager->priv->inhibit_lid_switch_timer_id != 0) { ++ g_debug ("lid close safety timer already set up"); + return; ++ } ++ ++ g_debug ("setting up lid close safety timer"); + +- manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, +- (GSourceFunc) lid_close_safety_timer_cb, ++ manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, ++ (GSourceFunc) inhibit_lid_switch_timer_cb, + manager); +- g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer"); ++ g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer"); + } + + static void +-kill_lid_close_safety_timer (GsdPowerManager *manager) ++restart_inhibit_lid_switch_timer (GsdPowerManager *manager) + { +- if (manager->priv->lid_close_safety_timer_id != 0) { +- g_source_remove (manager->priv->lid_close_safety_timer_id); +- manager->priv->lid_close_safety_timer_id = 0; ++ if (manager->priv->inhibit_lid_switch_timer_id != 0) { ++ g_debug ("restarting lid close safety timer"); ++ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); ++ manager->priv->inhibit_lid_switch_timer_id = 0; ++ setup_inhibit_lid_switch_timer (manager); + } + } + + static void +-suspend_with_lid_closed (GsdPowerManager *manager) ++do_lid_open_action (GsdPowerManager *manager) + { + gboolean ret; + GError *error = NULL; +- GsdPowerActionType action_type; + +- /* maybe lock the screen if the lid is closed */ +- lock_screensaver (manager); +- +- /* we have different settings depending on AC state */ +- if (up_client_get_on_battery (manager->priv->up_client)) { +- action_type = g_settings_get_enum (manager->priv->settings, +- "lid-close-battery-action"); +- } else { +- action_type = g_settings_get_enum (manager->priv->settings, +- "lid-close-ac-action"); +- } +- +- /* check we won't melt when the lid is closed */ +- if (action_type != GSD_POWER_ACTION_SUSPEND && +- action_type != GSD_POWER_ACTION_HIBERNATE) { +- if (up_client_get_lid_force_sleep (manager->priv->up_client)) { +- g_warning ("to prevent damage, now forcing suspend"); +- do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND); +- return; +- } +- } ++ /* play a sound, using sounds from the naming spec */ ++ ca_context_play (manager->priv->canberra_context, 0, ++ CA_PROP_EVENT_ID, "lid-open", ++ /* TRANSLATORS: this is the sound description */ ++ CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), ++ NULL); + +- /* ensure we turn the panel back on after resume */ ++ /* ensure we turn the panel back on after lid open */ + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +- GNOME_RR_DPMS_OFF, ++ GNOME_RR_DPMS_ON, + &error); + if (!ret) { +- g_warning ("failed to turn the panel off after lid close: %s", ++ g_warning ("failed to turn the panel on after lid open: %s", + error->message); +- g_error_free (error); ++ g_clear_error (&error); + } + +- /* only toggle keyboard if present and not already toggled */ +- if (manager->priv->upower_kdb_proxy && +- manager->priv->kbd_brightness_old == -1) { ++ /* only toggle keyboard if present and already toggled off */ ++ if (manager->priv->upower_kdb_proxy != NULL && ++ manager->priv->kbd_brightness_old != -1) { + ret = upower_kbd_toggle (manager, &error); + if (!ret) { +- g_warning ("failed to turn the kbd backlight off: %s", ++ g_warning ("failed to turn the kbd backlight on: %s", + error->message); + g_error_free (error); + } + } +- +- do_power_action_type (manager, action_type); + } + + static void + do_lid_closed_action (GsdPowerManager *manager) + { ++ gboolean ret; ++ GError *error = NULL; ++ + /* play a sound, using sounds from the naming spec */ + ca_context_play (manager->priv->canberra_context, 0, + CA_PROP_EVENT_ID, "lid-close", +@@ -2305,21 +2292,22 @@ do_lid_closed_action (GsdPowerManager *manager) + CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"), + NULL); + ++ /* turn the panel off if the lid is closed (mainly for Dells...) */ ++ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, ++ GNOME_RR_DPMS_OFF, ++ &error); ++ if (!ret) { ++ g_warning ("failed to turn the panel off after lid close: %s", ++ error->message); ++ g_error_free (error); ++ } ++ + /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */ + gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */ + +- /* perform policy action */ +- if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor") +- || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) { +- g_debug ("lid is closed; suspending or hibernating"); +- suspend_with_lid_closed (manager); +- } else { +- g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active"); +- setup_lid_close_safety_timer (manager); +- } ++ restart_inhibit_lid_switch_timer (manager); + } + +- + static void + up_client_changed_cb (UpClient *client, GsdPowerManager *manager) + { +@@ -2339,6 +2327,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) + if (manager->priv->lid_is_closed == tmp) + return; + manager->priv->lid_is_closed = tmp; ++ g_debug ("up changed: lid is now %s", tmp ? "closed" : "open"); + + /* fake a keypress */ + if (tmp) +@@ -3290,30 +3279,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) + } + + static void +-sleep_cb_screensaver_proxy_ready_cb (GObject *source_object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- GError *error = NULL; +- GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); +- +- manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); +- if (manager->priv->screensaver_proxy == NULL) { +- g_warning ("Could not connect to gnome-screensaver: %s", +- error->message); +- g_error_free (error); +- return; +- } +- +- /* Finish the upower_notify_sleep_cb() call by locking the screen */ +- g_debug ("gnome-screensaver activated, doing gnome-screensaver lock"); +- g_dbus_proxy_call (manager->priv->screensaver_proxy, +- "Lock", +- NULL, G_DBUS_CALL_FLAGS_NONE, -1, +- NULL, NULL, NULL); +-} +- +-static void + idle_dbus_signal_cb (GDBusProxy *proxy, + const gchar *sender_name, + const gchar *signal_name, +@@ -3465,75 +3430,38 @@ out: + } + + static void +-lock_screensaver (GsdPowerManager *manager) ++lock_screensaver (GsdPowerManager *manager, ++ GSourceFunc done_cb) + { + gboolean do_lock; + + do_lock = g_settings_get_boolean (manager->priv->settings_screensaver, + "lock-enabled"); +- if (!do_lock) ++ if (!do_lock && done_cb) { ++ done_cb (manager); + return; +- +- if (manager->priv->screensaver_proxy != NULL) { +- g_debug ("doing gnome-screensaver lock"); +- g_dbus_proxy_call (manager->priv->screensaver_proxy, +- "Lock", +- NULL, G_DBUS_CALL_FLAGS_NONE, -1, +- NULL, NULL, NULL); +- } else { +- /* connect to the screensaver first */ +- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, +- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, +- NULL, +- GS_DBUS_NAME, +- GS_DBUS_PATH, +- GS_DBUS_INTERFACE, +- NULL, +- sleep_cb_screensaver_proxy_ready_cb, +- manager); + } +-} +- +-static void +-upower_notify_sleep_cb (UpClient *client, +- UpSleepKind sleep_kind, +- GsdPowerManager *manager) +-{ +- lock_screensaver (manager); +-} +- +-static void +-upower_notify_resume_cb (UpClient *client, +- UpSleepKind sleep_kind, +- GsdPowerManager *manager) +-{ +- gboolean ret; +- GError *error = NULL; +- +- /* this displays the unlock dialogue so the user doesn't have +- * to move the mouse or press any key before the window comes up */ +- if (manager->priv->screensaver_proxy != NULL) { +- g_dbus_proxy_call (manager->priv->screensaver_proxy, +- "SimulateUserActivity", +- NULL, +- G_DBUS_CALL_FLAGS_NONE, +- -1, NULL, NULL, NULL); +- } +- +- /* close existing notifications on resume, the system power +- * state is probably different now */ +- notify_close_if_showing (manager->priv->notification_low); +- notify_close_if_showing (manager->priv->notification_discharging); + +- /* ensure we turn the panel back on after resume */ +- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +- GNOME_RR_DPMS_ON, +- &error); +- if (!ret) { +- g_warning ("failed to turn the panel on after resume: %s", +- error->message); +- g_error_free (error); +- } ++ g_dbus_connection_call (manager->priv->connection, ++ GS_DBUS_NAME, ++ GS_DBUS_PATH, ++ GS_DBUS_INTERFACE, ++ "Lock", ++ NULL, NULL, ++ G_DBUS_CALL_FLAGS_NONE, -1, ++ NULL, NULL, NULL); ++ ++ /* Wait until gnome-shell shield animation is done ++ * ++ * FIXME: the shell should mark the lock as active ++ * when the shield is down, then we could wait for ++ * that. This would also fix the problem that we wait ++ * needlessly when the shell has already locked the ++ * screen because it is initiating the suspend. ++ * ++ * https://bugzilla.gnome.org/show_bug.cgi?id=685053 ++ */ ++ g_timeout_add (500, done_cb, manager); + } + + static void +@@ -3621,6 +3549,287 @@ engine_session_active_changed_cb (GnomeSettingsSession *session, + idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL); + } + ++static void ++inhibit_lid_switch_done (GObject *source, ++ GAsyncResult *result, ++ gpointer user_data) ++{ ++ GDBusProxy *proxy = G_DBUS_PROXY (source); ++ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); ++ GError *error = NULL; ++ GVariant *res; ++ GUnixFDList *fd_list = NULL; ++ gint idx; ++ ++ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); ++ if (res == NULL) { ++ g_warning ("Unable to inhibit lid switch: %s", error->message); ++ g_error_free (error); ++ } else { ++ g_variant_get (res, "(h)", &idx); ++ manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error); ++ if (manager->priv->inhibit_lid_switch_fd == -1) { ++ g_warning ("Failed to receive system inhibitor fd: %s", error->message); ++ g_error_free (error); ++ } ++ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd); ++ g_object_unref (fd_list); ++ g_variant_unref (res); ++ } ++} ++ ++static void ++inhibit_lid_switch (GsdPowerManager *manager) ++{ ++ GVariant *params; ++ ++ if (manager->priv->inhibit_lid_switch_taken) { ++ g_debug ("already inhibited lid-switch"); ++ return; ++ } ++ g_debug ("Adding lid switch system inhibitor"); ++ manager->priv->inhibit_lid_switch_taken = TRUE; ++ ++ params = g_variant_new ("(ssss)", ++ "handle-lid-switch", ++ g_get_user_name (), ++ "Multiple displays attached", ++ "block"); ++ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, ++ "Inhibit", ++ params, ++ 0, ++ G_MAXINT, ++ NULL, ++ NULL, ++ inhibit_lid_switch_done, ++ manager); ++} ++ ++static void ++uninhibit_lid_switch (GsdPowerManager *manager) ++{ ++ if (manager->priv->inhibit_lid_switch_fd == -1) { ++ g_debug ("no lid-switch inhibitor"); ++ return; ++ } ++ g_debug ("Removing lid switch system inhibitor"); ++ close (manager->priv->inhibit_lid_switch_fd); ++ manager->priv->inhibit_lid_switch_fd = -1; ++ manager->priv->inhibit_lid_switch_taken = FALSE; ++} ++ ++static void ++inhibit_suspend_done (GObject *source, ++ GAsyncResult *result, ++ gpointer user_data) ++{ ++ GDBusProxy *proxy = G_DBUS_PROXY (source); ++ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); ++ GError *error = NULL; ++ GVariant *res; ++ GUnixFDList *fd_list = NULL; ++ gint idx; ++ ++ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); ++ if (res == NULL) { ++ g_warning ("Unable to inhibit suspend: %s", error->message); ++ g_error_free (error); ++ } else { ++ g_variant_get (res, "(h)", &idx); ++ manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error); ++ if (manager->priv->inhibit_suspend_fd == -1) { ++ g_warning ("Failed to receive system inhibitor fd: %s", error->message); ++ g_error_free (error); ++ } ++ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd); ++ g_object_unref (fd_list); ++ g_variant_unref (res); ++ } ++} ++ ++/* We take a delay inhibitor here, which causes logind to send a ++ * PrepareToSleep signal, which gives us a chance to lock the screen ++ * and do some other preparations. ++ */ ++static void ++inhibit_suspend (GsdPowerManager *manager) ++{ ++ if (manager->priv->inhibit_suspend_taken) { ++ g_debug ("already inhibited lid-switch"); ++ return; ++ } ++ g_debug ("Adding suspend delay inhibitor"); ++ manager->priv->inhibit_suspend_taken = TRUE; ++ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, ++ "Inhibit", ++ g_variant_new ("(ssss)", ++ "sleep", ++ g_get_user_name (), ++ "GNOME needs to lock the screen", ++ "delay"), ++ 0, ++ G_MAXINT, ++ NULL, ++ NULL, ++ inhibit_suspend_done, ++ manager); ++} ++ ++static void ++uninhibit_suspend (GsdPowerManager *manager) ++{ ++ if (manager->priv->inhibit_suspend_fd == -1) { ++ g_debug ("no suspend delay inhibitor"); ++ return; ++ } ++ g_debug ("Removing suspend delay inhibitor"); ++ close (manager->priv->inhibit_suspend_fd); ++ manager->priv->inhibit_suspend_fd = -1; ++ manager->priv->inhibit_suspend_taken = TRUE; ++} ++ ++static gboolean ++randr_output_is_on (GnomeRROutput *output) ++{ ++ GnomeRRCrtc *crtc; ++ ++ crtc = gnome_rr_output_get_crtc (output); ++ if (!crtc) ++ return FALSE; ++ return gnome_rr_crtc_get_current_mode (crtc) != NULL; ++} ++ ++static gboolean ++external_monitor_is_connected (GnomeRRScreen *screen) ++{ ++ GnomeRROutput **outputs; ++ guint i; ++ ++ if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS)) ++ return TRUE; ++ ++ /* see if we have more than one screen plugged in */ ++ outputs = gnome_rr_screen_list_outputs (screen); ++ for (i = 0; outputs[i] != NULL; i++) { ++ if (randr_output_is_on (outputs[i]) && ++ !gnome_rr_output_is_laptop (outputs[i])) ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static void ++on_randr_event (GnomeRRScreen *screen, gpointer user_data) ++{ ++ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); ++ ++ /* when a second monitor is plugged in, we take the ++ * handle-lid-switch inhibitor lock of logind to prevent ++ * it from suspending. ++ * ++ * Uninhibiting is done in the inhibit_lid_switch_timer, ++ * since we want to give users a few seconds when unplugging ++ * and replugging an external monitor, not suspend right away. ++ */ ++ if (external_monitor_is_connected (screen) && ++ !g_settings_get_boolean (manager->priv->settings, ++ "lid-close-suspend-with-external-monitor")) { ++ inhibit_lid_switch (manager); ++ setup_inhibit_lid_switch_timer (manager); ++ } ++ else { ++ restart_inhibit_lid_switch_timer (manager); ++ } ++} ++ ++static gboolean ++screen_lock_done_cb (gpointer data) ++{ ++ GsdPowerManager *manager = data; ++ ++ /* lift the delay inhibit, so logind can proceed */ ++ uninhibit_suspend (manager); ++ ++ return FALSE; ++} ++ ++static void ++handle_suspend_actions (GsdPowerManager *manager) ++{ ++ gboolean ret; ++ GError *error = NULL; ++ ++ /* ensure we turn the panel back on after resume */ ++ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, ++ GNOME_RR_DPMS_ON, ++ &error); ++ if (!ret) { ++ g_warning ("failed to turn the panel on after resume: %s", ++ error->message); ++ g_error_free (error); ++ } ++ ++ lock_screensaver (manager, screen_lock_done_cb); ++} ++ ++static void ++handle_resume_actions (GsdPowerManager *manager) ++{ ++ gboolean ret; ++ GError *error = NULL; ++ ++ /* this displays the unlock dialogue so the user doesn't have ++ * to move the mouse or press any key before the window comes up */ ++ g_dbus_connection_call (manager->priv->connection, ++ GS_DBUS_NAME, ++ GS_DBUS_PATH, ++ GS_DBUS_INTERFACE, ++ "SimulateUserActivity", ++ NULL, NULL, ++ G_DBUS_CALL_FLAGS_NONE, -1, ++ NULL, NULL, NULL); ++ ++ /* close existing notifications on resume, the system power ++ * state is probably different now */ ++ notify_close_if_showing (manager->priv->notification_low); ++ notify_close_if_showing (manager->priv->notification_discharging); ++ ++ /* ensure we turn the panel back on after resume */ ++ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, ++ GNOME_RR_DPMS_ON, ++ &error); ++ if (!ret) { ++ g_warning ("failed to turn the panel on after resume: %s", ++ error->message); ++ g_error_free (error); ++ } ++ ++ /* set up the delay again */ ++ inhibit_suspend (manager); ++} ++ ++static void ++logind_proxy_signal_cb (GDBusProxy *proxy, ++ const gchar *sender_name, ++ const gchar *signal_name, ++ GVariant *parameters, ++ gpointer user_data) ++{ ++ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); ++ gboolean is_about_to_suspend; ++ ++ if (g_strcmp0 (signal_name, "PrepareForSleep") != 0) ++ return; ++ g_variant_get (parameters, "(b)", &is_about_to_suspend); ++ if (is_about_to_suspend) { ++ handle_suspend_actions (manager); ++ } else { ++ handle_resume_actions (manager); ++ } ++} ++ + gboolean + gsd_power_manager_start (GsdPowerManager *manager, + GError **error) +@@ -3630,6 +3839,25 @@ gsd_power_manager_start (GsdPowerManager *manager, + g_debug ("Starting power manager"); + gnome_settings_profile_start (NULL); + ++ manager->priv->logind_proxy = ++ g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, ++ 0, ++ NULL, ++ SYSTEMD_DBUS_NAME, ++ SYSTEMD_DBUS_PATH, ++ SYSTEMD_DBUS_INTERFACE, ++ NULL, ++ error); ++ if (manager->priv->logind_proxy == NULL) { ++ g_warning ("no systemd support"); ++ return FALSE; ++ } ++ g_signal_connect (manager->priv->logind_proxy, "g-signal", ++ G_CALLBACK (logind_proxy_signal_cb), ++ manager); ++ /* Set up a delay inhibitor to be informed about suspend attempts */ ++ inhibit_suspend (manager); ++ + /* track the active session */ + manager->priv->session = gnome_settings_session_new (); + g_signal_connect (manager->priv->session, "notify::state", +@@ -3644,10 +3872,6 @@ gsd_power_manager_start (GsdPowerManager *manager, + G_CALLBACK (engine_settings_key_changed_cb), manager); + manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver"); + manager->priv->up_client = up_client_new (); +- g_signal_connect (manager->priv->up_client, "notify-sleep", +- G_CALLBACK (upower_notify_sleep_cb), manager); +- g_signal_connect (manager->priv->up_client, "notify-resume", +- G_CALLBACK (upower_notify_resume_cb), manager); + manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client); + g_signal_connect (manager->priv->up_client, "device-added", + G_CALLBACK (engine_device_added_cb), manager); +@@ -3761,6 +3985,9 @@ gsd_power_manager_start (GsdPowerManager *manager, + manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); + if (manager->priv->x11_screen == NULL) + return FALSE; ++ g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); ++ /* set up initial state */ ++ on_randr_event (manager->priv->x11_screen, manager); + + /* ensure the default dpms timeouts are cleared */ + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, +@@ -3787,6 +4014,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) + { + g_debug ("Stopping power manager"); + ++ if (manager->priv->inhibit_lid_switch_timer_id != 0) { ++ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); ++ manager->priv->inhibit_lid_switch_timer_id = 0; ++ } ++ + if (manager->priv->bus_cancellable != NULL) { + g_cancellable_cancel (manager->priv->bus_cancellable); + g_object_unref (manager->priv->bus_cancellable); +@@ -3798,8 +4030,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) + manager->priv->introspection_data = NULL; + } + +- kill_lid_close_safety_timer (manager); +- + g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager); + + g_clear_object (&manager->priv->connection); +@@ -3807,6 +4037,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) + g_clear_object (&manager->priv->settings); + g_clear_object (&manager->priv->settings_screensaver); + g_clear_object (&manager->priv->up_client); ++ ++ if (manager->priv->inhibit_lid_switch_fd != -1) { ++ close (manager->priv->inhibit_lid_switch_fd); ++ manager->priv->inhibit_lid_switch_fd = -1; ++ manager->priv->inhibit_lid_switch_taken = FALSE; ++ } ++ if (manager->priv->inhibit_suspend_fd != -1) { ++ close (manager->priv->inhibit_suspend_fd); ++ manager->priv->inhibit_suspend_fd = -1; ++ manager->priv->inhibit_suspend_taken = FALSE; ++ } ++ ++ g_clear_object (&manager->priv->logind_proxy); + g_clear_object (&manager->priv->x11_screen); + + g_ptr_array_unref (manager->priv->devices_array); +@@ -3835,6 +4078,8 @@ static void + gsd_power_manager_init (GsdPowerManager *manager) + { + manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager); ++ manager->priv->inhibit_lid_switch_fd = -1; ++ manager->priv->inhibit_suspend_fd = -1; + } + + static void +-- +1.7.12.1 + diff --git a/gnome-unstable/gnome-settings-daemon/PKGBUILD b/gnome-unstable/gnome-settings-daemon/PKGBUILD index c90a2e254..ead00043f 100644 --- a/gnome-unstable/gnome-settings-daemon/PKGBUILD +++ b/gnome-unstable/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167077 2012-09-25 09:29:44Z jgc $ +# $Id: PKGBUILD 168324 2012-10-08 19:48:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') @@ -14,12 +14,19 @@ 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=('6d516a6b9779545568b480b36d69a965c20f3b7b53edbd306527f6bc2a6478f3') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch) +sha256sums=('1fe96e0709d7c618d90cc1bfcddc46eede3c2cdb305f5e7f4cb388d43dd5526a' + '3b72ba86321446e92a6fe32167ebd5edbdd66ab1f7d1eda8a7a3edf5c6d5e1eb') build() { cd $pkgname-$pkgver + # logind key handling FS#31801, patches from Fedora + patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch + aclocal + automake + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ --enable-systemd @@ -33,4 +40,9 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + + # Plugins that aren't installed still have schema references + # and cause gsettings errors - remove the references we're not using + sed -i '/org\.gnome\.settings-daemon\.plugins\.updates/d' \ + "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml" } diff --git a/gnome-unstable/gst-plugins-base/PKGBUILD b/gnome-unstable/gst-plugins-base/PKGBUILD index 03ef9d0f9..27c9ccd41 100644 --- a/gnome-unstable/gst-plugins-base/PKGBUILD +++ b/gnome-unstable/gst-plugins-base/PKGBUILD @@ -3,48 +3,47 @@ pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('4b98a74712e31d5426dd1cf2de883b6af59fd37997b0ffaed53914eb6df45053') +sha256sums=('75466452e4267fff86e322bc52ed0c962c6c3785f802230fe898cb09984b8de0') build() { - cd "${srcdir}/$pkgbase-${pkgver}" + cd $pkgbase-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac autoreconf ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Base Plugins (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" - make sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile } check() { - cd "${srcdir}/gst-plugins-base-${pkgver}" + cd $pkgbase-$pkgver # Testsuite fails on one test. Some refcount leak #make check } package_gst-plugins-base-libs() { - pkgdesc="GStreamer Multimedia Framework Base plugin libraries" + pkgdesc="GStreamer Multimedia Framework Base Plugin libraries" depends=('gstreamer' 'orc' 'libxv') - cd "${srcdir}/$pkgbase-${pkgver}" + cd $pkgbase-$pkgver make DESTDIR="${pkgdir}" install } package_gst-plugins-base() { - pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)" depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') - cd "${srcdir}/$pkgbase-${pkgver}" + cd $pkgbase-$pkgver make -C gst-libs DESTDIR="${pkgdir}" install make -C ext DESTDIR="${pkgdir}" install make -C gst-libs DESTDIR="${pkgdir}" uninstall diff --git a/gnome-unstable/gst-plugins-good/PKGBUILD b/gnome-unstable/gst-plugins-good/PKGBUILD index 442165579..159322646 100644 --- a/gnome-unstable/gst-plugins-good/PKGBUILD +++ b/gnome-unstable/gst-plugins-good/PKGBUILD @@ -2,18 +2,20 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883') makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz) +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('30bc72d77d274289844e2138ca79c840') build() { - cd "${srcdir}/gst-plugins-good-${pkgver}" + cd $pkgname-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac autoreconf ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ @@ -24,12 +26,11 @@ build() { } check() { - cd "${srcdir}/gst-plugins-good-${pkgver}" + cd $pkgname-$pkgver make check } package() { - cd "${srcdir}/gst-plugins-good-${pkgver}" + cd $pkgname-$pkgver make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install } -md5sums=('f711832cd8a9b033eb424fabe89ca9d1') diff --git a/gnome-unstable/gstreamer/PKGBUILD b/gnome-unstable/gstreamer/PKGBUILD index bfd5c74a4..474424f8a 100644 --- a/gnome-unstable/gstreamer/PKGBUILD +++ b/gnome-unstable/gstreamer/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('d0f9887ff1c81a33220add2e6d3eb84d869c485c83523a8da0ce1f0cb2463f58') +sha256sums=('e0e5478bc81caa7e208b0863419bb98b2fbef281a7c806bea61bd70db8c9d3dc') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD index 9c6ae58d6..bcfb1f9cb 100644 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ b/multilib-testing/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75115 2012-08-14 08:29:30Z allan $ +# $Id: PKGBUILD 77268 2012-10-08 13:37:04Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -7,10 +7,10 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -pkgver=4.7.1 -pkgrel=6 -_snapshot=4.7-20120721 -_libstdcppmanver=20120725 # Note: check source directory name when updating this +pkgver=4.7.2 +pkgrel=1 +#_snapshot=4.7-20120721 +_libstdcppmanver=20120924 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,14 +19,14 @@ makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'lib32-glibc>=2.16') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64-multilib.patch gcc-4.7.1-libada-pic.patch gcc-4.7.1-libgo-write.patch) -md5sums=('a1a53fda426bc6809cede8e85bbaf2a3' - '79c4381f983b71868c02da3379e1e8a2' +md5sums=('cc308a0891e778cfda7a151ab8a6e762' + '7f3d52515daafffb57c287f427381106' 'ec24c32d3d1030c2bc8cb2ad2d1dc629' '2acbc9d35cc9d72329dc71d6b1f162ef' 'df82dd175ac566c8a6d46b11ac21f14c') diff --git a/multilib-testing/lib32-catalyst-utils/PKGBUILD b/multilib-testing/lib32-catalyst-utils/PKGBUILD new file mode 100644 index 000000000..753e5e26c --- /dev/null +++ b/multilib-testing/lib32-catalyst-utils/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 77335 2012-10-08 23:34:54Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero +# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert + +pkgname=lib32-catalyst-utils +pkgver=12.9 +pkgrel=0.1 +pkgdesc="AMD Catalyst drivers libraries (32 bits)" +arch=('x86_64') +url="http://www.amd.com" +license=('custom') +source=(#"http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip" + https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz) +md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b') +provides=('lib32-libgl') +conflicts=('lib32-libgl' 'lib32-nvidia-utils') + +#build() { +# cd ${srcdir} +# +# sh ./amd-driver-installer*.run --extract fglrx-install +#} + +package() { + depends=("catalyst-utils=${pkgver}") + + install -dm755 "${pkgdir}"/usr/bin + install -dm755 "${pkgdir}"/usr/lib32/{dri,xorg/modules/{dri,extensions/fglrx}} + + # binaries + cd ${srcdir} + install -m755 arch/x86/usr/X11R6/bin/fgl_glxgears "${pkgdir}/usr/bin/fgl_glxgears32" + install -m755 arch/x86/usr/X11R6/bin/fglrxinfo "${pkgdir}/usr/bin/fglrxinfo32" + + # dri/gl/... drivers + cd ${srcdir}/xpic/usr/X11R6/lib/modules + install -m755 *.so "${pkgdir}/usr/lib32/xorg/modules/" + cd ${srcdir}/arch/x86/usr/X11R6/lib + install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/" + ln -s /usr/lib32/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/dri/" + install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/" + install -m755 *.so* "${pkgdir}/usr/lib32/" + install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib32/" + cd ${srcdir}/arch/x86/usr/lib + install -m755 *.so* "${pkgdir}/usr/lib32/" + # needed symlinks + ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib32/libatiuki.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so" + ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib32/libAMDXvBA.so.1" + ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib32/libAMDXvBA.so" + ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib32/libfglrx_dm.so.1" + + # useful for 32 bits ? + rm "${pkgdir}"/usr/lib32/lib{amdocl*,OpenCL}.so* + + # licenses + install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/multilib-testing/lib32-glew/PKGBUILD b/multilib-testing/lib32-glew/PKGBUILD new file mode 100644 index 000000000..b5302e8ef --- /dev/null +++ b/multilib-testing/lib32-glew/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 77251 2012-10-08 08:13:50Z bluewind $ +# Maintainer: Florian Pritz <flo@xinu.at> + +_pkgbasename=glew +pkgname=lib32-$_pkgbasename +pkgver=1.8.0 +pkgrel=2 +pkgdesc="A cross-platform C/C++ extension loading library (32 bit)" +arch=('x86_64') +url="http://glew.sourceforge.net" +license=('BSD' 'MIT' 'GPL') +depends=('lib32-libxmu' 'lib32-libxi' 'lib32-glu' "$_pkgbasename>=$pkgver") +makedepends=('gcc-multilib') +source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz) +sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + sed -i 's|CC = cc|CC = gcc -m32|' config/Makefile.linux + sed -i 's|LD = cc|LD = gcc -m32|' config/Makefile.linux + sed -i 's|lib64|lib32|' config/Makefile.linux + make +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make GLEW_DEST="${pkgdir}/usr" install + chmod 0755 "${pkgdir}/usr/lib32/libGLEW.so.${pkgver}" + + rm -rf "${pkgdir}"/usr/{include,bin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD index 152e29f53..020346e32 100644 --- a/multilib-testing/libtool-multilib/PKGBUILD +++ b/multilib-testing/libtool-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72542 2012-06-16 14:54:48Z heftig $ +# $Id: PKGBUILD 77269 2012-10-08 13:37:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -8,12 +8,12 @@ pkgbase=libtool-multilib pkgname=(libtool-multilib lib32-libltdl) pkgver=2.4.2 -pkgrel=6 +pkgrel=7 pkgdesc="A generic library support script for multilib" arch=('x86_64') url="http://www.gnu.org/software/libtool" license=('GPL') -_gccver=4.7.1 +_gccver=4.7.2 makedepends=("gcc-multilib=$_gccver") options=('!libtool') source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig}) diff --git a/testing/nx/PKGBUILD b/testing/nx/PKGBUILD index 3b609776d..bc2247597 100644 --- a/testing/nx/PKGBUILD +++ b/testing/nx/PKGBUILD @@ -1,24 +1,53 @@ -# $Id: PKGBUILD 166910 2012-09-21 17:33:30Z andyrtr $ +# $Id: PKGBUILD 168322 2012-10-08 18:52:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers') pkgver=3.5.0.15 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://wiki.x2go.org/" license=('GPL') -options=('!makeflags') +options=('!makeflags') # '!strip') makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends ) source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz - nx-x11.ld.so.conf.d) + nx-x11.ld.so.conf.d + nx-cflags.patch) md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0' - 'f2ec60c7e2d81bef2f7292d2b33681a6') + 'f2ec60c7e2d81bef2f7292d2b33681a6' + 'd0c5b88aac0473e19699cf62d84b9d5f') build() { cd "${srcdir}/nx-libs-$pkgver" + + # debug flags +# export CFLAGS="-march=x86-64 -O1 -g -pipe" +# export CXXFLAGS="-march=x86-64 -O1 -g -pipe" + + + # Gentoo hacks to honor cflags + patch -Np0 -i ${srcdir}/nx-cflags.patch + + # Run autoreconf in all neeed folders + for i in nxcomp nxcompext nxcompshad nxproxy; do + cd ${i} + autoreconf -vfi #${i} + cd .. + done + + # From xorg-x11-6.9.0-r3.ebuild + pushd "${srcdir}/nx-libs-$pkgver/nx-X11" + + HOSTCONF="config/cf/host.def" + echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF} + echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF} + # Respect LDFLAGS + echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF} + echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF} + popd + make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" # fake install mkdir $srcdir/fakeinstall diff --git a/testing/nx/nx-cflags.patch b/testing/nx/nx-cflags.patch new file mode 100644 index 000000000..35562939c --- /dev/null +++ b/testing/nx/nx-cflags.patch @@ -0,0 +1,54 @@ +--- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100 ++++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100 +@@ -7,8 +7,7 @@ + + dnl Set our default compilation flags. + +-CXXFLAGS="-O3 -fno-rtti -fno-exceptions" +-CFLAGS="-O3" ++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + dnl Reset default linking directives. + +--- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100 ++++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(NXlib.h) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="-O3" +-CFLAGS="-O3" +- + dnl Reset default linking directives. + + LIBSTATIC="" +--- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100 ++++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(Shadow.h) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" +- + dnl Reset default linking directives. + + LIBSTATIC="" +--- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100 ++++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100 +@@ -5,11 +5,6 @@ + AC_INIT(Main.c) + AC_PREREQ(2.13) + +-dnl Reset default compilation flags. +- +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" +- + dnl Prefer headers and libraries from nx-X11 if present. + + if test -d "../nx-X11/exports/include" ; then |
