diff options
87 files changed, 4944 insertions, 183 deletions
diff --git a/community-staging/awesome/01-fix_glib2_build.patch b/community-staging/awesome/01-fix_glib2_build.patch new file mode 100644 index 000000000..aeab63fbb --- /dev/null +++ b/community-staging/awesome/01-fix_glib2_build.patch @@ -0,0 +1,31 @@ +From d3d8160e273b56d0262d2570cfa6bcb76b9ea771 Mon Sep 17 00:00:00 2001 +From: Thomas Moschny <thomas.moschny@gmx.de> +Date: Wed, 14 Dec 2011 20:00:53 +0100 +Subject: [PATCH] Fix build with glib2 2.31.0 + +Starting with glib2 2.31.0, It is no longer possible to +include individual headers (like "ghash.h") -- you must +#include <glib.h>. + +Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de> +Signed-off-by: Uli Schlachter <psychon@znc.in> +--- + spawn.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/spawn.c b/spawn.c +index 3c8cf07..a6d6c5e 100644 +--- a/spawn.c ++++ b/spawn.c +@@ -24,7 +24,7 @@ + #include <sys/types.h> + #include <sys/wait.h> + +-#include <glib/gspawn.h> ++#include <glib.h> + + #include "spawn.h" + #include "screen.h" +-- +1.7.2.5 + diff --git a/community-staging/awesome/PKGBUILD b/community-staging/awesome/PKGBUILD new file mode 100644 index 000000000..b62dd9a38 --- /dev/null +++ b/community-staging/awesome/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 71670 2012-05-31 20:27:13Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: xduugu +# Contributor: Ronald van Haren <ronald.archlinux.org> +# Contributor: Vesa Kaihlavirta + +pkgname=awesome +pkgver=3.4.11 +pkgrel=5 +pkgdesc='Highly configurable framework window manager' +arch=('i686' 'x86_64') +url='http://awesome.naquadah.org/' +license=('GPL2') +depends=( + 'cairo' + 'dbus' + 'imlib2' + 'libev' + 'libxdg-basedir' + 'lua' + 'pango' + 'startup-notification' + 'xcb-util-image' + 'xcb-util-keysyms' + 'xcb-util-wm' + 'xorg-xmessage' +) +makedepends=( + 'asciidoc' + 'cmake' + 'docbook-xsl' + 'doxygen' + 'gperf' + 'imagemagick' + 'luadoc' + 'xmlto' +) +optdepends=( + 'rlwrap: readline support for awesome-client' + 'feh: image background setter for awsetbg' +) +provides=('notification-daemon') +source=("$url/download/$pkgname-$pkgver.tar.xz" + "$pkgname.desktop" + '01-fix_glib2_build.patch') +md5sums=('d6aa71334b5cd4ef63ce69d6c612ecf2' + '0fdbeec43d211c6750041d7e37611a6a' + 'baa179074c36e26ef156ebb2060bfd5c') + +build() { + cd $pkgname-$pkgver + # to remove in 3.4.12 + patch -N -p1 -i ../01-fix_glib2_build.patch + make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE' +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # install desktop file so you can start awesome from your login manager + install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/awesome/awesome.desktop b/community-staging/awesome/awesome.desktop new file mode 100644 index 000000000..453399c6e --- /dev/null +++ b/community-staging/awesome/awesome.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Awesome +Comment=Highly configurable framework window manager +Type=XSession +Exec=awesome +TryExec=awesome diff --git a/community-staging/enet/PKGBUILD b/community-staging/enet/PKGBUILD new file mode 100644 index 000000000..2434a0f40 --- /dev/null +++ b/community-staging/enet/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 71656 2012-05-31 16:55:51Z ebelanger $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Contributor: Bj?indeijer <bjorn@lindeijer.nl> + +pkgname=enet +pkgver=1.3.4 +pkgrel=1 +pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.' +arch=('i686' 'x86_64') +url='http://enet.bespin.org/' +license=('custom') +depends=('glibc') +options=('!libtool') +source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz") +md5sums=('e5fb0ca3fd3a9fe7eadbcde4d6af1517') + +build() { + cd "${pkgname}-${pkgver}" + CFLAGS+="-fPIC" ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community-staging/python-bsddb/LICENSE b/community-staging/python-bsddb/LICENSE new file mode 100644 index 000000000..7d6035775 --- /dev/null +++ b/community-staging/python-bsddb/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2008-2009 Jesus Cea Avion + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.
\ No newline at end of file diff --git a/community-staging/python-bsddb/PKGBUILD b/community-staging/python-bsddb/PKGBUILD new file mode 100644 index 000000000..6d3f1aad7 --- /dev/null +++ b/community-staging/python-bsddb/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 71672 2012-05-31 23:21:51Z stephane $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgbase=python-bsddb +pkgname=('python2-bsddb' 'python-bsddb') +pkgver=5.3.0 +pkgrel=2 +pkgdesc="Python interface for BerkeleyDB" +license=('MIT') +arch=('i686' 'x86_64') +url="http://www.jcea.es/programacion/pybsddb.htm" +makedepends=('python2-distribute' 'python-distribute') +source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz + LICENSE) +sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915' + 'ef4e4caf618781104dbf5824279ed39d127b4713') + +build () { + cd "${srcdir}" + + cp -r bsddb3-${pkgver}{,-python2} + + # Build python 3 module + cd bsddb3-${pkgver} + python setup.py --berkeley-db=/usr build + + # Build python 2 module + cd ../bsddb3-${pkgver}-python2 + python2 setup.py --berkeley-db=/usr build +} + +package_python2-bsddb() { + depends=('db' 'python2>=2.7') + cd "${srcdir}/bsddb3-${pkgver}-python2" + + python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_python-bsddb() { + depends=('db' 'python>=3.2') + cd "${srcdir}/bsddb3-${pkgver}" + + python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD index 7c3a81189..be7875459 100644 --- a/community/geos/PKGBUILD +++ b/community/geos/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 70399 2012-05-05 14:32:15Z jlichtblau $ +# $Id: PKGBUILD 71674 2012-05-31 23:36:16Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> + pkgname=geos -pkgver=3.3.3 +pkgver=3.3.4 pkgrel=1 pkgdesc="C++ port of the Java Topology Suite" arch=('x86_64' 'i686') @@ -12,20 +13,18 @@ url="http://trac.osgeo.org/geos/" license=('LGPL') depends=('gcc-libs' 'bash') options=('!libtool' '!emptydirs') -source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2") -sha256sums=('dfcf4bd70ab212a5b7bad21d01b84748f101a545092b56dafdc3882ef3bddec9') +source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('cd5400aa5f3fe32246dfed5d238c5017e1808162c865c016480b3e6c07271904') build() { - cd "$srcdir/$pkgname-$pkgver" + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd ${srcdir}/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR=${pkgdir} install } - -# vim:set ts=2 sw=2 et: diff --git a/community/gsasl/PKGBUILD b/community/gsasl/PKGBUILD index d03a75570..26e7a259e 100644 --- a/community/gsasl/PKGBUILD +++ b/community/gsasl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71580 2012-05-30 09:14:40Z spupykin $ +# $Id: PKGBUILD 71612 2012-05-31 08:51:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Orivej Desh <smpuj@bk.ru> # Maintainer: Orivej Desh <smpuj@bk.ru> pkgname=gsasl pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" arch=("i686" "x86_64") url="http://josefsson.org/gsasl/" @@ -16,7 +16,7 @@ md5sums=('982fe54a20016aa46a871c084c990c36') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --with-gssapi-impl=mit make } diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 7a85f0abb..853d1c499 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 70710 2012-05-15 11:27:19Z spupykin $ +# $Id: PKGBUILD 71628 2012-05-31 14:14:16Z 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 +pkgver=0.9.2 pkgrel=1 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' @@ -19,17 +20,14 @@ optdepends=('recordmydesktop' 'xine-ui') install=kdenlive.install options=('docs') -source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.gz - glu.patch) -md5sums=('8ceb59444df9aa950fd6bc7300c4a90d' - 'fd6c5fe46419ee505c562363d41f6e9f') +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 - (cd ../kdenlive-${pkgver} && patch -p1 <$srcdir/glu.patch) cmake ../kdenlive-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community/libnetfilter_queue/PKGBUILD b/community/libnetfilter_queue/PKGBUILD index 6c37f7b9d..e7b74f128 100644 --- a/community/libnetfilter_queue/PKGBUILD +++ b/community/libnetfilter_queue/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66195 2012-02-23 03:06:28Z spupykin $ +# $Id: PKGBUILD 71614 2012-05-31 08:52:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> # Maintainer: Filip Wojciechowski, filip at loka dot pl pkgname=libnetfilter_queue -pkgver=1.0.0 -pkgrel=2 +pkgver=1.0.1 +pkgrel=1 pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter" arch=('i686' 'x86_64') url="http://www.netfilter.org/projects/libnetfilter_queue/index.html" @@ -14,7 +14,7 @@ depends=(libnfnetlink) makedepends=(pkgconfig) options=('!libtool') source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('af6a9ea350f63a13609bc3b47b5c395c') +md5sums=('08b968cb2d36c24deb7f26a69f5d8602') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD index dcf5d2bbf..639eade30 100644 --- a/community/libuser/PKGBUILD +++ b/community/libuser/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 58190 2011-11-08 15:26:34Z spupykin $ +# $Id: PKGBUILD 71616 2012-05-31 09:49:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Dziedzic < gostrc at gmail > pkgname=libuser -pkgver=0.57.1 -pkgrel=2 +pkgver=0.57.6 +pkgrel=1 pkgdesc='A standardized interface for manipulating and administering user and group accounts.' arch=('i686' 'x86_64') license=('LGPL') url='https://fedorahosted.org/libuser/' depends=('python2' 'glib2' 'popt') options=('!libtool') +backup=('etc/libuser.conf') source=("https://fedorahosted.org/releases/l/i/libuser/libuser-${pkgver}.tar.xz") -md5sums=('be82c6941264d0b4bd04f95fb342ec7d') +md5sums=('4a6410e51664570610da1b9a830ac8ec') build() { cd ${pkgname}-${pkgver} diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD index b493ea4c0..1a39cbbdf 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 71667 2012-05-31 18:15:19Z ebelanger $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=onboard @@ -8,7 +9,7 @@ arch=('i686' 'x86_64') url="https://launchpad.net/onboard" license=('GPL') depends=('python2-cairo' 'dbus-python' 'python2-gobject' 'libwnck3' 'python2-virtkey' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('python-distutils-extra') +makedepends=('python2-distutils-extra') optdepends=('at-spi2-atk: auto-show when editing text' 'mousetweaks: hover click with mouse') options=('!emptydirs') diff --git a/community/os-prober/PKGBUILD b/community/os-prober/PKGBUILD index 26e4aaa4b..60969d142 100644 --- a/community/os-prober/PKGBUILD +++ b/community/os-prober/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 63931 2012-02-07 13:00:00Z tredaelli $ +# $Id: PKGBUILD 71622 2012-05-31 12:59:02Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: darkcoder <mario_vazq@hotmail.com> pkgname=os-prober -pkgver=1.49 -pkgrel=3 +pkgver=1.53 +pkgrel=1 pkgdesc="Utility to detect other OSes on a set of drives" url="http://joey.kitenet.net/code/os-prober/" arch=('i686' 'x86_64') license=('GPL3') depends=('sh') source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.gz) -md5sums=('5a981493a7c16174e6454fcf6b39b1b5') -sha512sums=('473f02807bdc971d6abf976f8a708691767ba85d45b54c1c87310c62626959f30e524aca2fb08843dfc859f26bd80cbbba016235137aa87db1c4151f6e893fa4') +md5sums=('1435131b60b078a2a8301df3237a6829') +sha512sums=('4e983d6774cb85df9bec1e8e7ca53d9eec6605bf7308b141d1ee1f118b11534e440a19c0aae17c38f717f433c1ef853ad5879feac1ba4ee10774b3f85bb544ad') build() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" # adjust lib dir to allow detection of 64-bit distros sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro @@ -25,7 +25,7 @@ build() { } package() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/linux-boot-prober install -Dm755 os-prober "$pkgdir"/usr/bin/os-prober diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD index df95826e9..da772e5f4 100644 --- a/community/perl-params-util/PKGBUILD +++ b/community/perl-params-util/PKGBUILD @@ -1,48 +1,43 @@ -# Maintainer: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 57661 2011-11-01 00:18:52Z juster $ +# Maintainer: Justin Davis (juster) <jrcd83@gmail.com> +# $Id: PKGBUILD 71654 2012-05-31 15:48:33Z juster $ pkgname=perl-params-util -pkgver=1.04 +pkgver=1.07 pkgrel=1 -pkgdesc="Simple, compact and correct param-checking functions" +pkgdesc='Simple, compact and correct param-checking functions' arch=(i686 x86_64) license=(PerlArtistic GPL) options=(!emptydirs) -depends=('perl>=5.5.30' 'perl-scalar-list-utils') -makedepends=('perl-extutils-cbuilder>=0.27' 'perl-extutils-makemaker>=6.52' - 'perl-pathtools') -checkdepends=('perl-test-simple') +depends=('perl>=5.5.30') url=https://metacpan.org/release/Params-Util -source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${pkgver}.tar.gz") -md5sums=(84bfb0a16cff67f2077ece0e24408b0f) -sha512sums=(086b6e37ce24a423439e346c4fc7069cbb5bde6af5c259fa765616bf637597105ee379df5edca82fdeb3bb0e44d83c7704ea1fe09170acea389ffb54d77f3d3d) -_distdir="${srcdir}/Params-Util-${pkgver}" +source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-$pkgver.tar.gz") +md5sums=(02db120c0eef87aae1830cc62bdec37b) +sha512sums=(ff471b01b33414fc5e1c68d97c21171a95d3418c33e3c45f9910cc768898690e35051506a83ad9403a200336654c14b8efc9d471c4b3fe3321047a7603d6fd56) +_dir="$srcdir/Params-Util-$pkgver" -build() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ - PERL_AUTOINSTALL=--skipdeps \ - PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ - PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ - MODULEBUILDRC=/dev/null +build() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps + unset PERL5LIB PERL_MM_OPT + /usr/bin/perl Makefile.PL + make +) - cd "$_distdir" - /usr/bin/perl Makefile.PL - make - ) -} +check() +( + cd "$_dir" + export PERL_MM_USE_DEFAULT=1 + unset PERL5LIB + make test +) -check() { - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" - make test - ) -} - -package() { - cd "$_distdir" - make DESTDIR="$pkgdir" install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} +package() +( + cd "$_dir" + make install INSTALLDIRS=vendor DESTDIR="$pkgdir" + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +) # Local Variables: # mode: shell-script diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index 9b6c3efaf..24a9ba7b7 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.6 +_dcpkgver=2.1.7 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.3.0 -pkgrel=7 +pkgver=0.3.1 +pkgrel=1 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" @@ -19,8 +19,8 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig} "dovecot.conf") options=('!libtool') -sha256sums=('2aeee8aa6dc700483b0a5a3d31f535abce71698ed1d467f11e931aeace2b0ada' - '181213cd4af854966ff5bb6b5052b49b0b40c0c21999939b8451658053fa396d' +sha256sums=('e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7' + '9d4699435cb1e82d3ac943c37f2ef909cd80cab707cc8b23be0d087f0e80903f' 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858') build() { @@ -37,4 +37,3 @@ package() { install -m 644 -D "$srcdir/dovecot.conf" "$pkgdir/etc/ld.so.conf.d/dovecot.conf" } - diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index e04bd4d30..39464ea8e 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,29 +1,36 @@ -# $Id: PKGBUILD 57370 2011-10-26 14:27:28Z jlichtblau $ +# $Id: PKGBUILD 71631 2012-05-31 14:23:54Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis -pkgver=1.5.3 +pkgver=2.0.0 pkgrel=2 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64') -url="http://postgis.refractions.net/" +url="http://postgis.org/" license=('GPL') -depends=('postgresql' 'proj' 'geos') +depends=('postgresql' 'gdal' 'json-c') changelog=$pkgname.changelog -source=(http://postgis.refractions.net/download/${pkgname}-${pkgver}.tar.gz) -sha256sums=('a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf') +options=('!libtool') +source=("http://postgis.org/download/${pkgname}-${pkgver}.tar.gz") +sha256sums=('12179e24e348421c60c501590fda25bd349e2f697003958d9493f5c91b280081') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make + + # Build utils (FS#25836) + cd utils + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + cd utils make DESTDIR="${pkgdir}" install } diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 16f9b925d..13d851351 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,10 @@ +2012-05-31 Andrea Scarpino <andrea@archlinux.org> + * Add JSON-C support + * Build utils (FS#25836) + +2012-05-31 Andrea Scarpino <andrea@archlinux.org> + * Update to major release 2.0.0-1 + 2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * FS#26159 fix in postgis-1.5.3-2 diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index de432a83e..0e0790075 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158056 2012-05-02 01:13:00Z allan $ +# $Id: PKGBUILD 160235 2012-05-31 12:26:12Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42.2 -pkgrel=2 +pkgver=1.42.3 +pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'MIT') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('bfba3716b78310cf2a288909f13214a718d91e25' +sha1sums=('0da8c787604876fe23b0f608389c3854ae1a2420' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 6d315225c..26f471584 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142351 2011-11-08 18:37:43Z eric $ +# $Id: PKGBUILD 160239 2012-05-31 14:53:52Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.6 -pkgrel=7 +pkgrel=8 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64') url="http://www.nico.schottelius.org/software/gpm/" @@ -12,12 +12,13 @@ depends=('ncurses' 'bash') backup=('etc/conf.d/gpm') options=('!makeflags') install=gpm.install -source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.bz2 \ - gpm gpm.conf.d gpm.sh) -sha1sums=('f3bb9272878b7934968381c8b25edab359114150' +source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \ + gpm gpm.conf.d gpm.sh gpm.service) +sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c' '19e1feb1493373512a77801699df012d186336ea' '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' - '88fe5ff10916c68a87abc8418a56eb0073f69fa9') + '88fe5ff10916c68a87abc8418a56eb0073f69fa9' + '2db35b5f587b8dd21f9943610e7dd70469f888c7') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -31,6 +32,7 @@ package() { install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh" + install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service" # library fixes cd "${pkgdir}/usr/lib/" diff --git a/core/gpm/gpm.service b/core/gpm/gpm.service new file mode 100644 index 000000000..3e52af729 --- /dev/null +++ b/core/gpm/gpm.service @@ -0,0 +1,6 @@ +[Unit] +Description=GPM daemon + +[Service] +Type=forking +ExecStart=/usr/sbin/gpm diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD index bbc315315..d0dc71c6a 100644 --- a/core/libpipeline/PKGBUILD +++ b/core/libpipeline/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142205 2011-11-06 08:47:46Z andyrtr $ +# $Id: PKGBUILD 160243 2012-05-31 15:59:08Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libpipeline -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" arch=('i686' 'x86_64') url="http://libpipeline.nongnu.org/" @@ -11,7 +11,7 @@ license=('GPL') depends=('glibc') options=('!libtool') source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz) -md5sums=('dd3a987a0d2b594716baee2f73d61ae3') +md5sums=('20896c919eca4acb3d2f13012fb7ba02') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD index 45add6b74..7c4e1c16c 100644 --- a/extra/abook/PKGBUILD +++ b/extra/abook/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149024 2012-02-05 14:23:12Z bisson $ +# $Id: PKGBUILD 160233 2012-05-31 11:55:41Z bisson $ # Contributor: damir <damir@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,17 +6,20 @@ pkgname=abook pkgver=0.6.0pre2 -pkgrel=4 +pkgrel=5 pkgdesc='Text-based addressbook designed for use with Mutt' arch=('i686' 'x86_64') url='http://abook.sourceforge.net/' license=('GPL2') depends=('readline') -source=("http://abook.sourceforge.net/devel/abook-${pkgver}.tar.gz") -sha1sums=('42a939fba43e51aa011fa185113c12ec4bc1e1ec') +source=("http://abook.sourceforge.net/devel/abook-${pkgver}.tar.gz" + 'vcard-compat.patch') +sha1sums=('42a939fba43e51aa011fa185113c12ec4bc1e1ec' + 'feb35deb79116c187953d06e514c7918be5646b6') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../vcard-compat.patch ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/extra/abook/vcard-compat.patch b/extra/abook/vcard-compat.patch new file mode 100644 index 000000000..cc8ea7f3f --- /dev/null +++ b/extra/abook/vcard-compat.patch @@ -0,0 +1,347 @@ +diff -aur old/filter.c new/filter.c +--- old/filter.c 2006-09-06 15:26:10.000000000 +1000 ++++ new/filter.c 2012-05-31 17:48:18.644744197 +1000 +@@ -44,6 +44,7 @@ + static int csv_parse_file(FILE *in); + static int allcsv_parse_file(FILE *in); + static int palmcsv_parse_file(FILE *in); ++static int vcard_parse_file(FILE *in); + + /* + * export filter prototypes +@@ -75,6 +76,7 @@ + { "csv", N_("comma separated values"), csv_parse_file }, + { "allcsv", N_("comma separated values (all fields)"), allcsv_parse_file }, + { "palmcsv", N_("Palm comma separated values"), palmcsv_parse_file }, ++ { "vcard", N_("vCard file"), vcard_parse_file }, + { "\0", NULL, NULL } + }; + +@@ -1331,6 +1333,263 @@ + */ + + /* ++ * vCard import filter ++ */ ++ ++static char *vcard_fields[] = { ++ "FN", /* NAME */ ++ "EMAIL", /* EMAIL */ ++ "ADR", /* ADDRESS */ ++ "ADR", /* ADDRESS2 - not used */ ++ "ADR", /* CITY */ ++ "ADR", /* STATE */ ++ "ADR", /* ZIP */ ++ "ADR", /* COUNTRY */ ++ "TEL", /* PHONE */ ++ "TEL", /* WORKPHONE */ ++ "TEL", /* FAX */ ++ "TEL", /* MOBILEPHONE */ ++ "NICKNAME", /* NICK */ ++ "URL", /* URL */ ++ "NOTE", /* NOTES */ ++ "BDAY", /* ANNIVERSARY */ ++ NULL ++}; ++ ++/* ++ * mappings between vCard ADR field and abook's ADDRESS ++ * see rfc2426 section 3.2.1 ++ */ ++static int vcard_address_fields[] = { ++ -1, /* vCard(post office box) - not used */ ++ -1, /* vCard(the extended address) - not used */ ++ 2, /* vCard(the street address) - ADDRESS */ ++ 4, /* vCard(the locality) - CITY */ ++ 5, /* vCard(the region) - STATE */ ++ 6, /* vCard(the postal code) - ZIP */ ++ 7 /* vCard(the country name) - COUNTRY */ ++}; ++ ++enum { ++ VCARD_KEY = 0, ++ VCARD_KEY_ATTRIBUTE, ++ VCARD_VALUE, ++}; ++ ++static char * ++vcard_get_line_element(char *line, int element) ++{ ++ int i; ++ char *line_copy = 0; ++ char *result = 0; ++ char *key = 0; ++ char *key_attr = 0; ++ char *value = 0; ++ ++ line_copy = xstrdup(line); ++ ++ /* make newline characters if exist end of string */ ++ for(i=0; line_copy[i]; i++) { ++ if(line_copy[i] == '\r' || line_copy[i] == '\n') { ++ line_copy[i] = '\0'; ++ break; ++ } ++ } ++ ++ /* separate key from value */ ++ for(i=0; line_copy[i]; i++) { ++ if(line_copy[i] == ':') { ++ line_copy[i] = '\0'; ++ key = line_copy; ++ value = &line_copy[i+1]; ++ break; ++ } ++ } ++ ++ /* separate key from key attributes */ ++ if (key) { ++ for(i=0; key[i]; i++) { ++ if(key[i] == ';') { ++ key[i] = '\0'; ++ key_attr = &key[i+1]; ++ break; ++ } ++ } ++ } ++ ++ switch(element) { ++ case VCARD_KEY: ++ if(key) ++ result = xstrdup(key); ++ break; ++ case VCARD_KEY_ATTRIBUTE: ++ if(key_attr) ++ result = xstrdup(key_attr); ++ break; ++ case VCARD_VALUE: ++ if(value) ++ result = xstrdup(value); ++ break; ++ } ++ ++ xfree(line_copy); ++ return result; ++} ++ ++static void ++vcard_parse_email(list_item item, char *line) ++{ ++ char *email; ++ ++ email = vcard_get_line_element(line, VCARD_VALUE); ++ ++ if(item[1]) { ++ item[1] = strconcat(item[1], ",", email, 0); ++ xfree(email); ++ } ++ else { ++ item[1] = email; ++ } ++} ++ ++static void ++vcard_parse_address(list_item item, char *line) ++{ ++ int i; ++ int k; ++ char *value; ++ char *address_field; ++ ++ value = vcard_get_line_element(line, VCARD_VALUE); ++ if(!value) ++ return; ++ ++ address_field = value; ++ for(i=k=0; value[i]; i++) { ++ if(value[i] == ';') { ++ value[i] = '\0'; ++ if(vcard_address_fields[k] >= 0) { ++ item[vcard_address_fields[k]] = xstrdup(address_field); ++ } ++ address_field = &value[i+1]; ++ k++; ++ if((k+1)==(sizeof(vcard_address_fields)/sizeof(*vcard_address_fields))) ++ break; ++ } ++ } ++ item[vcard_address_fields[k]] = xstrdup(address_field); ++ xfree(value); ++} ++ ++static void ++vcard_parse_phone(list_item item, char *line) ++{ ++ int index = 8; ++ char *type = vcard_get_line_element(line, VCARD_KEY_ATTRIBUTE); ++ char *value = vcard_get_line_element(line, VCARD_VALUE); ++ ++ /* set the standard number */ ++ if (!type) { ++ item[index] = value; ++ } ++ ++ /* ++ * see rfc2426 section 3.3.1 ++ */ ++ else if (strstr(type, "TYPE=") == type){ ++ if (strcasestr(type, "home")) { ++ item[index] = xstrdup(value); ++ } ++ if (strcasestr(type, "work")) { ++ item[index+1] = xstrdup(value); ++ } ++ if (strcasestr(type, "fax")) { ++ item[index+2] = xstrdup(value); ++ } ++ if (strcasestr(type, "cell")) { ++ item[index+3] = xstrdup(value); ++ } ++ ++ xfree(type); ++ xfree(value); ++ } ++} ++ ++static void ++vcard_parse_line(list_item item, char *line) ++{ ++ int i; ++ char *key; ++ ++ for(i=0; vcard_fields[i]; i++) { ++ key = vcard_fields[i]; ++ ++ if(!strncmp(key, line, strlen(key))) { ++ if(i == 1) { ++ vcard_parse_email(item, line); ++ } ++ else if(i == 2) { ++ vcard_parse_address(item, line); ++ } ++ else if(i == 8) { ++ vcard_parse_phone(item, line); ++ } ++ else { ++ item[i] = vcard_get_line_element(line, VCARD_VALUE); ++ } ++ break; ++ } ++ } ++} ++ ++static void ++vcard_parse_item(FILE *in) ++{ ++ char *line = NULL; ++ list_item item = item_create(); ++ ++ while(!feof(in)) { ++ line = getaline(in); ++ ++ if(line && !strncmp("END:VCARD", line, 9)) { ++ xfree(line); ++ break; ++ } ++ else if(line) { ++ vcard_parse_line(item, line); ++ xfree(line); ++ } ++ } ++ ++ add_item2database(item); ++ item_free(&item); ++} ++ ++static int ++vcard_parse_file(FILE *in) ++{ ++ char *line = NULL; ++ ++ while(!feof(in)) { ++ line = getaline(in); ++ ++ if(line && !strncmp("BEGIN:VCARD", line, 11)) { ++ xfree(line); ++ vcard_parse_item(in); ++ } ++ else if(line) { ++ xfree(line); ++ } ++ } ++ ++ return 0; ++} ++ ++/* ++ * end of vCard import filter ++ */ ++ ++/* + * csv addressbook export filters + */ + +@@ -1547,10 +1806,18 @@ + + free(name); + ++ if(db_fget(e.item, NICK)) ++ fprintf(out, "NICKNAME:%s\r\n", ++ db_fget(e.item, NICK)); ++ ++ if(db_fget(e.item, ANNIVERSARY)) ++ fprintf(out, "BDAY:%s\r\n", ++ db_fget(e.item, ANNIVERSARY)); ++ + if(db_fget(e.item, ADDRESS)) +- fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n", +- safe_str(db_fget(e.item, ADDRESS)), ++ fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n", + safe_str(db_fget(e.item, ADDRESS2)), ++ safe_str(db_fget(e.item, ADDRESS)), + safe_str(db_fget(e.item, CITY)), + safe_str(db_fget(e.item, STATE)), + safe_str(db_fget(e.item, ZIP)), +diff -aur old/misc.c new/misc.c +--- old/misc.c 2006-09-05 05:24:18.000000000 +1000 ++++ new/misc.c 2012-05-31 17:40:46.241284874 +1000 +@@ -77,6 +77,27 @@ + return 1; + } + ++char * ++strcasestr(char *haystack, char *needle) ++{ ++ int i; ++ int k; ++ ++ assert(haystack != NULL); ++ assert(needle != NULL); ++ ++ for(i=0; i<strlen(haystack)-strlen(needle)+1; i++) { ++ for(k=0; k<strlen(needle); k++, i++) { ++ if (tolower(haystack[i]) != tolower(needle[k])) ++ break; ++ else if ((k+1) == strlen(needle)) ++ return &haystack[i]; ++ } ++ } ++ ++ return NULL; ++} ++ + + #ifdef HAVE_CONFIG_H + # include "config.h" +diff -aur old/misc.h new/misc.h +--- old/misc.h 2006-09-05 05:24:18.000000000 +1000 ++++ new/misc.h 2012-05-31 17:40:46.241284874 +1000 +@@ -18,6 +18,8 @@ + + int is_number(char *s); + ++char *strcasestr(char *haystack, char *needle); ++ + char *strdup_printf(const char *format, ... ); + char *strconcat(const char *str, ...); + diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index 98cd43be0..77b8370de 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153560 2012-03-16 02:18:57Z eric $ +# $Id: PKGBUILD 160247 2012-05-31 16:28:09Z eric $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr -pkgver=2.5.0 +pkgver=2.5.1 pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ license=('GPL') depends=('python2') optdepends=('python-paramiko: for sftp support') source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('44eb47b77995098a28f017e2daa606b6' - 'b0d4a26a3dde94f30e142868b896fed5') +md5sums=('ac5079858364a046071000d5cdccb67b' + 'c83dd08dd2c3e27edbab873500d7d6eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,5 +28,6 @@ package() { python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 # bash-completion - install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr" + install -D -m644 contrib/bash/bzr \ + "${pkgdir}/usr/share/bash-completion/completions/bzr" } diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index 83f1867d3..7fa36b87c 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149727 2012-02-09 19:48:22Z andyrtr $ +# $Id: PKGBUILD 160261 2012-05-31 17:12:14Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman -pkgver=0.24.4 +pkgver=0.26.0 pkgrel=1 pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64) @@ -11,11 +11,14 @@ url="http://xorg.freedesktop.org" license=('custom') depends=('glibc') options=('!libtool') -source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('683450f917015366ac7918fc517c76801aeff374') +source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 + test_failures_on_x86-32.diff) +sha1sums=('d772cf794ec5da0966eba3cb360919a0a5e0d23f' + '24a688271d5cf2c4137a147deaa2975122c01aa8') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/test_failures_on_x86-32.diff ./configure --prefix=/usr --disable-static make } diff --git a/extra/pixman/test_failures_on_x86-32.diff b/extra/pixman/test_failures_on_x86-32.diff new file mode 100644 index 000000000..6e333c03a --- /dev/null +++ b/extra/pixman/test_failures_on_x86-32.diff @@ -0,0 +1,46 @@ +From da6193b1fcc1dfab27f4c36917864f2f2c41cf3e Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Sun, 27 May 2012 17:01:57 +0000 +Subject: mmx: add missing _mm_empty calls + +Fixes spurious test failures on x86-32. +--- +diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c +index bb125bf..6e292c6 100644 +--- a/pixman/pixman-mmx.c ++++ b/pixman/pixman-mmx.c +@@ -2232,6 +2232,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp, + w--; + } + } ++ ++ _mm_empty (); + } + + static void +@@ -3542,6 +3544,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask) + w--; + } + ++ _mm_empty (); + return iter->buffer; + } + +@@ -3585,6 +3588,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask) + w--; + } + ++ _mm_empty (); + return iter->buffer; + } + +@@ -3630,6 +3634,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask) + w--; + } + ++ _mm_empty (); + return iter->buffer; + } + +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD index f3f460a6a..6adb11b90 100644 --- a/extra/xfce4-power-manager/PKGBUILD +++ b/extra/xfce4-power-manager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157932 2012-04-30 06:20:21Z foutrelis $ +# $Id: PKGBUILD 160263 2012-05-31 17:40:20Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-power-manager pkgver=1.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Power manager for Xfce desktop" arch=('i686' 'x86_64') url="http://xfce-goodies.berlios.de/" @@ -14,12 +14,19 @@ depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme') makedepends=('pkgconfig' 'intltool') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2) -sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9') +source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2 + xfce4-power-manager-1.2.0-sync-en-gb-translation.patch) +sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9' + 'c8e1dfafd685c2abf1fcc2b3682f5b1eb2e7f1d4fa557f11a7478437eef9a933') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix en_GB translation + # https://bugs.archlinux.org/task/30055 + patch -d po -Np0 -i \ + "$srcdir/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch new file mode 100644 index 000000000..ca7a3dc31 --- /dev/null +++ b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch @@ -0,0 +1,34 @@ +--- en_GB.po.orig 2012-05-31 20:18:09.000000000 +0300 ++++ en_GB.po 2012-05-31 20:25:09.000000000 +0300 +@@ -345,9 +345,8 @@ msgid "" + "An application is currently disabling the automatic sleep. Doing this action " + "now may damage the working state of this application." + msgstr "" +-"An application is currently disabling the automatic sleep, doing this action " +-"now may damage the working state of this application, are you sure you want " +-"to hibernate the system?" ++"An application is currently disabling the automatic sleep. Doing this action " ++"now may damage the working state of this application." + + #: ../src/xfpm-power.c:331 + msgid "Are you sure you want to hibernate the system?" +@@ -548,8 +547,7 @@ msgid "" + "%s (%i%%)\n" + "%s until is fully charged." + msgstr "" +-"%s\n" +-"Your %s is charging (%i%%)\n" ++"%s (%i%%)\n" + "%s until is fully charged." + + #: ../src/xfpm-battery.c:232 ../src/xfpm-battery.c:268 +@@ -568,8 +566,7 @@ msgid "" + "%s (%i%%)\n" + "Estimated time left is %s." + msgstr "" +-"%s\n" +-"Your %s is discharging (%i%%)\n" ++"%s (%i%%)\n" + "Estimated time left is %s." + + #: ../src/xfpm-battery.c:250 ../src/xfpm-battery.c:271 diff --git a/kde-unstable/kactivities/PKGBUILD b/kde-unstable/kactivities/PKGBUILD index 576f83981..899c9ae26 100644 --- a/kde-unstable/kactivities/PKGBUILD +++ b/kde-unstable/kactivities/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160080 2012-05-29 22:12:47Z andrea $ +# $Id: PKGBUILD 160317 2012-05-31 22:19:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc='API for using and interacting with the Activity Manager' url='https://projects.kde.org/projects/kde/kdelibs/kactivities' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('e98929eff9d8c4102bc643cf44a06d28646ff8ce') +sha1sums=('1283527b0432e3e0f554775b077104e696995a3d') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD index a05f08eda..cb664c361 100644 --- a/kde-unstable/kdebase-runtime/PKGBUILD +++ b/kde-unstable/kdebase-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160082 2012-05-29 22:21:05Z andrea $ +# $Id: PKGBUILD 160318 2012-05-31 22:19:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins and applications necessary for the running of KDE applications" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -17,7 +17,7 @@ optdepends=('htdig: to build the search index in khelpcenter' 'gdb: drkonq crash handler') install="${pkgname}.install" source=("http://download.kde.org/unstable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz") -sha1sums=('2ef106862e33a8fc2b936a875ab87e581d25d2ee') +sha1sums=('c191073f5731ea2cb585a4fdfb3318b2a4f55154') build() { cd "${srcdir}" @@ -38,7 +38,4 @@ package() { rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" - - # Fix conflict - rm "${pkgdir}"/usr/lib/libnepomukcommon.so } diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD index fa27f08c5..a419c0465 100644 --- a/kde-unstable/kdebindings-perlqt/PKGBUILD +++ b/kde-unstable/kdebindings-perlqt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160184 2012-05-30 07:32:36Z andrea $ +# $Id: PKGBUILD 160323 2012-05-31 22:23:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD index f1b22222f..2cad5573a 100644 --- a/kde-unstable/kdebindings-python/PKGBUILD +++ b/kde-unstable/kdebindings-python/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 160090 2012-05-29 22:25:25Z andrea $ +# $Id: PKGBUILD 160324 2012-05-31 22:24:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'qscintilla') source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('72bd95baeaf8ab71a66de6da8bba09e978e59bd2') +sha1sums=('bd93872670dc56b0007467a6a9319089e84eb431') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD index 6c47db7fc..9fb9c173d 100644 --- a/kde-unstable/kdebindings-smokegen/PKGBUILD +++ b/kde-unstable/kdebindings-smokegen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160084 2012-05-29 22:22:13Z andrea $ +# $Id: PKGBUILD 160320 2012-05-31 22:21:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('3f98d0a97db5604a924fdf2e654640b0f257486a') +sha1sums=('0ab79864476cfb9888ce55226f539fced5b08ee4') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD index 08600b411..15253da0b 100644 --- a/kde-unstable/kdebindings-smokeqt/PKGBUILD +++ b/kde-unstable/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160085 2012-05-29 22:22:40Z andrea $ +# $Id: PKGBUILD 160321 2012-05-31 22:22:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('8ecb3a8aa49a7095ae4c0b74949ba66cb4d63c2d') +sha1sums=('c24027167d9d05a3feb5ebae8700359d3d92b8de') build() { cd "${srcdir}" diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD index 5734ab542..26ed2dbdd 100644 --- a/kde-unstable/kdepim-runtime/PKGBUILD +++ b/kde-unstable/kdepim-runtime/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 160083 2012-05-29 22:21:42Z andrea $ +# $Id: PKGBUILD 160319 2012-05-31 22:20:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdepim-runtime' license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime' 'libkgoogle') +depends=('kdebase-runtime' 'libkgapi') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1c9b97f2e562edeebda926b16f8b97a257b000d0') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'libkgapi.patch') +sha1sums=('c6c09b9b0e8e9f4e15bb8791ab333b22f949130b' + '84a962fea1bc8ed647fb6640befa1dc5f632092f') build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/libkgapi.patch + cd "${srcdir}" mkdir build cd build diff --git a/kde-unstable/kdepim-runtime/libkgapi.patch b/kde-unstable/kdepim-runtime/libkgapi.patch new file mode 100644 index 000000000..35fc55dff --- /dev/null +++ b/kde-unstable/kdepim-runtime/libkgapi.patch @@ -0,0 +1,1742 @@ +From: Dan Vrátil <dan@progdan.cz> +Date: Thu, 31 May 2012 20:17:18 +0000 +Subject: Adapt Google resources to LibKGoogle/LibKGAPI renaming +X-Git-Url: http://quickgit.kde.org/?p=kdepim-runtime.git&a=commitdiff&h=0f169f44a5c514a7fc297041fa46f7a727ecf71d +--- +Adapt Google resources to LibKGoogle/LibKGAPI renaming + +- use KGAPI namespace +- fix headers location +- require LibKGAPI 0.4.0 + +REVIEW: 105109 +--- + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,11 +93,11 @@ endif(NOT KDEPIM_NO_NEPOMUK) + find_package(Strigi) + macro_log_feature(STRIGI_FOUND "Strigi" "Strigi desktop search engine" "http://strigi.sourceforge.net" FALSE "" "") + +-set(LibKGoogle_MIN_VERSION 0.3.2) +-find_package(LibKGoogle QUIET NO_MODULE) +-macro_log_feature(LibKGoogle_FOUND "LibKGoogle" "A library to access Google services" "http://projects.kde.org/libkgoogle" FALSE "${LibKGoogle_MIN_VERSION}" "LibKGoogle is required to build Akonadi resources to access Google Contacts, Calendars and Tasks" ) ++set(LibKGAPI_MIN_VERSION 0.4.0) ++find_package(LibKGAPI QUIET NO_MODULE) ++macro_log_feature(LibKGAPI_FOUND "LibKGAPI" "A library to access Google services" "http://projects.kde.org/libkgapi" FALSE "${LibKGAPI_MIN_VERSION}" "LibKGAPI is required to build Akonadi resources to access Google Contacts, Calendars and Tasks" ) + +-if(LibKGoogle_FOUND) ++if(LibKGAPI_FOUND) + find_package(QJSON) + macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http://qjson.sourceforge.net/" TRUE) + endif() + +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -54,7 +54,7 @@ macro_optional_add_subdirectory( microbl + macro_optional_add_subdirectory( openxchange ) + add_subdirectory( pop3 ) + +-if( LibKGoogle_FOUND ) ++if( LibKGAPI_FOUND ) + add_subdirectory( google ) + endif() + + +--- a/resources/google/CMakeLists.txt ++++ b/resources/google/CMakeLists.txt +@@ -1,4 +1,4 @@ +-include_directories(${LibKGoogle_INCLUDE_DIR}) ++include_directories(${LibKGAPI_INCLUDE_DIR}) + + macro_optional_add_subdirectory(calendar) + macro_optional_add_subdirectory(contacts) + +--- a/resources/google/calendar/CMakeLists.txt ++++ b/resources/google/calendar/CMakeLists.txt +@@ -43,7 +43,7 @@ target_link_libraries(akonadi_googlecale + ${KDE4_KDECORE_LIBS} + ${KDE4_KDEWEBKIT_LIBS} + ${QJSON_LIBRARIES} +- ${LibKGoogle_LIBRARY} ++ ${LibKGAPI_LIBRARY} + ) + + install(TARGETS akonadi_googlecalendar_resource ${INSTALL_TARGETS_DEFAULT_ARGS}) + +--- a/resources/google/calendar/calendareditor.cpp ++++ b/resources/google/calendar/calendareditor.cpp +@@ -23,8 +23,9 @@ + + #include <QFile> + +-#include <libkgoogle/services/calendar.h> +-using namespace KGoogle::Objects; ++#include <libkgapi/services/calendar.h> ++ ++using namespace KGAPI::Objects; + + CalendarEditor::CalendarEditor( Calendar *calendar ) : + QDialog(), +@@ -56,7 +57,7 @@ CalendarEditor::~CalendarEditor() + void CalendarEditor::accepted() + { + if ( !m_calendar ) { +- m_calendar = new KGoogle::Objects::Calendar(); ++ m_calendar = new KGAPI::Objects::Calendar(); + } + + m_calendar->setTitle( m_ui->nameEdit->text() ); + +--- a/resources/google/calendar/calendareditor.h ++++ b/resources/google/calendar/calendareditor.h +@@ -20,13 +20,13 @@ + + #include <QDialog> + +-#include <libkgoogle/objects/calendar.h> ++#include <libkgapi/objects/calendar.h> + + namespace Ui { + class CalendarEditor; + } + +-using namespace KGoogle::Objects; ++using namespace KGAPI::Objects; + + class CalendarEditor: public QDialog + { +@@ -37,7 +37,7 @@ class CalendarEditor: public QDialog + virtual ~CalendarEditor(); + + Q_SIGNALS: +- void accepted( KGoogle::Objects::Calendar *calendar ); ++ void accepted( KGAPI::Objects::Calendar *calendar ); + + private Q_SLOTS: + void accepted(); + +--- a/resources/google/calendar/calendarresource.cpp ++++ b/resources/google/calendar/calendarresource.cpp +@@ -36,23 +36,23 @@ + #include <QStringList> + #include <QMetaType> + +-#include <libkgoogle/common.h> +-#include <libkgoogle/account.h> +-#include <libkgoogle/accessmanager.h> +-#include <libkgoogle/auth.h> +-#include <libkgoogle/fetchlistjob.h> +-#include <libkgoogle/request.h> +-#include <libkgoogle/reply.h> +-#include <libkgoogle/objects/calendar.h> +-#include <libkgoogle/objects/event.h> +-#include <libkgoogle/objects/task.h> +-#include <libkgoogle/objects/tasklist.h> +-#include <libkgoogle/services/calendar.h> +-#include <libkgoogle/services/tasks.h> ++#include <libkgapi/common.h> ++#include <libkgapi/account.h> ++#include <libkgapi/accessmanager.h> ++#include <libkgapi/auth.h> ++#include <libkgapi/fetchlistjob.h> ++#include <libkgapi/request.h> ++#include <libkgapi/reply.h> ++#include <libkgapi/objects/calendar.h> ++#include <libkgapi/objects/event.h> ++#include <libkgapi/objects/task.h> ++#include <libkgapi/objects/tasklist.h> ++#include <libkgapi/services/calendar.h> ++#include <libkgapi/services/tasks.h> + + using namespace KCalCore; + using namespace Akonadi; +-using namespace KGoogle; ++using namespace KGAPI; + + CalendarResource::CalendarResource( const QString &id ): + ResourceBase( id ), +@@ -60,8 +60,8 @@ CalendarResource::CalendarResource( cons + m_fetchedCalendars( false ), + m_fetchedTaskLists( false ) + { +- qRegisterMetaType< KGoogle::Services::Calendar >( "Calendar" ); +- qRegisterMetaType< KGoogle::Services::Tasks >( "Tasks" ); ++ qRegisterMetaType< KGAPI::Services::Calendar >( "Calendar" ); ++ qRegisterMetaType< KGAPI::Services::Tasks >( "Tasks" ); + AttributeFactory::registerAttribute< DefaultReminderAttribute >(); + + Auth *auth = Auth::instance(); +@@ -71,10 +71,10 @@ CalendarResource::CalendarResource( cons + setOnline( true ); + + m_gam = new AccessManager(); +- connect( m_gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); +- connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(replyReceived(KGoogle::Reply*)) ); ++ connect( m_gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); ++ connect( m_gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(replyReceived(KGAPI::Reply*)) ); + + connect( this, SIGNAL(abortRequested()), + this, SLOT(slotAbortRequested()) ); +@@ -113,7 +113,7 @@ void CalendarResource::slotAbortRequeste + abort(); + } + +-void CalendarResource::error( const KGoogle::Error errCode, const QString &msg ) ++void CalendarResource::error( const KGAPI::Error errCode, const QString &msg ) + { + cancelTask( msg ); + +@@ -160,7 +160,7 @@ Account::Ptr CalendarResource::getAccoun + Auth *auth = Auth::instance(); + try { + m_account = auth->getAccount( Settings::self()->account() ); +- } catch( KGoogle::Exception::BaseException &e ) { ++ } catch( KGAPI::Exception::BaseException &e ) { + Q_EMIT status( Broken, e.what() ); + return Account::Ptr(); + } +@@ -267,7 +267,7 @@ bool CalendarResource::retrieveItem( con + return true; + } + +- Request *request = new Request( url, KGoogle::Request::Fetch, service, account ); ++ Request *request = new Request( url, KGAPI::Request::Fetch, service, account ); + request->setProperty( "Item", QVariant::fromValue( item ) ); + m_gam->sendRequest( request ); + +@@ -340,7 +340,7 @@ void CalendarResource::itemAdded( const + + Services::Calendar service; + kevent.setUid( "" ); +- data = service.objectToJSON( static_cast< KGoogle::Object * >( &kevent ) ); ++ data = service.objectToJSON( static_cast< KGAPI::Object * >( &kevent ) ); + + } else if ( item.mimeType() == Todo::todoMimeType() ) { + +@@ -355,7 +355,7 @@ void CalendarResource::itemAdded( const + } + + Services::Tasks service; +- data = service.objectToJSON( static_cast< KGoogle::Object * >( &ktodo ) ); ++ data = service.objectToJSON( static_cast< KGAPI::Object * >( &ktodo ) ); + + } else { + cancelTask( i18n( "Unknown payload type '%1'", item.mimeType() ) ); +@@ -399,7 +399,7 @@ void CalendarResource::itemChanged( cons + url = Services::Calendar::updateEventUrl( item.parentCollection().remoteId(), item.remoteId() ); + + Services::Calendar service; +- data = service.objectToJSON( static_cast< KGoogle::Object * >( &kevent ) ); ++ data = service.objectToJSON( static_cast< KGAPI::Object * >( &kevent ) ); + + Request *request = new Request( url, Request::Patch, "Calendar", account ); + request->setRequestData( data, "application/json" ); +@@ -498,13 +498,13 @@ void CalendarResource::itemMoved( const + url = Services::Calendar::moveEventUrl( collectionSource.remoteId(), + collectionDestination.remoteId(), + item.remoteId() ); +- Request *request = new Request( url, KGoogle::Request::Move, "Calendar", account ); ++ Request *request = new Request( url, KGAPI::Request::Move, "Calendar", account ); + request->setProperty( "Item", qVariantFromValue( item ) ); + + m_gam->sendRequest( request ); + } + +-void CalendarResource::replyReceived( KGoogle::Reply *reply ) ++void CalendarResource::replyReceived( KGAPI::Reply *reply ) + { + switch ( reply->requestType() ) { + case Request::FetchAll: + +--- a/resources/google/calendar/calendarresource.h ++++ b/resources/google/calendar/calendarresource.h +@@ -23,17 +23,17 @@ + #include <Akonadi/Item> + #include <Akonadi/Collection> + +-#include <libkgoogle/common.h> +-#include <libkgoogle/account.h> ++#include <libkgapi/common.h> ++#include <libkgapi/account.h> + +-namespace KGoogle { ++namespace KGAPI { + class AccessManager; + class Account; + class Reply; + class Request; + } + +-using namespace KGoogle; ++using namespace KGAPI; + + class CalendarResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::ObserverV2 + { +@@ -61,40 +61,40 @@ class CalendarResource : public Akonadi: + void aboutToQuit(); + + private Q_SLOTS: +- void error( const KGoogle::Error, const QString & ); ++ void error( const KGAPI::Error, const QString & ); + void slotAbortRequested(); + + void cachedItemsRetrieved( KJob *job ); +- void replyReceived( KGoogle::Reply *reply ); ++ void replyReceived( KGAPI::Reply *reply ); + + void itemsReceived( KJob *job ); +- void itemReceived( KGoogle::Reply *reply ); +- void itemCreated( KGoogle::Reply *reply ); +- void itemUpdated( KGoogle::Reply *reply ); +- void itemRemoved( KGoogle::Reply *reply ); +- void itemMoved( KGoogle::Reply *reply ); ++ void itemReceived( KGAPI::Reply *reply ); ++ void itemCreated( KGAPI::Reply *reply ); ++ void itemUpdated( KGAPI::Reply *reply ); ++ void itemRemoved( KGAPI::Reply *reply ); ++ void itemMoved( KGAPI::Reply *reply ); + + void taskListReceived( KJob *job ); + void calendarsReceived( KJob *job ); + + /* The actual update of task */ +- void taskDoUpdate( KGoogle::Reply *reply ); ++ void taskDoUpdate( KGAPI::Reply *reply ); + +- void taskReceived( KGoogle::Reply *reply ); ++ void taskReceived( KGAPI::Reply *reply ); + void tasksReceived( KJob *job ); +- void taskCreated( KGoogle::Reply *reply ); +- void taskUpdated( KGoogle::Reply *reply ); +- void taskRemoved( KGoogle::Reply *reply ); ++ void taskCreated( KGAPI::Reply *reply ); ++ void taskUpdated( KGAPI::Reply *reply ); ++ void taskRemoved( KGAPI::Reply *reply ); + + void removeTaskFetchJobFinished( KJob *job ); + void doRemoveTask( KJob *job ); + +- void eventReceived( KGoogle::Reply *reply ); ++ void eventReceived( KGAPI::Reply *reply ); + void eventsReceived( KJob *job ); +- void eventCreated( KGoogle::Reply *reply ); +- void eventUpdated( KGoogle::Reply *reply ); +- void eventRemoved( KGoogle::Reply *reply ); +- void eventMoved( KGoogle::Reply *reply ); ++ void eventCreated( KGAPI::Reply *reply ); ++ void eventUpdated( KGAPI::Reply *reply ); ++ void eventRemoved( KGAPI::Reply *reply ); ++ void eventMoved( KGAPI::Reply *reply ); + + void emitPercent( KJob *job, ulong percent ); + + +--- a/resources/google/calendar/defaultreminderattribute.cpp ++++ b/resources/google/calendar/defaultreminderattribute.cpp +@@ -19,13 +19,13 @@ + + #include <QVariant> + +-#include <libkgoogle/objects/calendar.h> ++#include <libkgapi/objects/calendar.h> + + #include <qjson/parser.h> + #include <qjson/serializer.h> + + using namespace KCalCore; +-using namespace KGoogle::Objects; ++using namespace KGAPI::Objects; + + DefaultReminderAttribute::DefaultReminderAttribute( const Reminder::List &reminders ) + : m_reminders( reminders ) + +--- a/resources/google/calendar/defaultreminderattribute.h ++++ b/resources/google/calendar/defaultreminderattribute.h +@@ -19,14 +19,14 @@ + #ifndef GOOGLE_CALENDAR_DEFAULTREMINDERATTRIBUTE_H + #define GOOGLE_CALENDAR_DEFAULTREMINDERATTRIBUTE_H + +-#include <libkgoogle/objects/calendar.h> ++#include <libkgapi/objects/calendar.h> + + #include <Akonadi/Attribute> + #include <KCalCore/Alarm> + #include <KCalCore/Incidence> + + using namespace KCalCore; +-using namespace KGoogle; ++using namespace KGAPI; + + class DefaultReminderAttribute : public Akonadi::Attribute + { + +--- a/resources/google/calendar/resource_events.cpp ++++ b/resources/google/calendar/resource_events.cpp +@@ -19,12 +19,12 @@ + #include "defaultreminderattribute.h" + #include "settings.h" + +-#include <libkgoogle/fetchlistjob.h> +-#include <libkgoogle/reply.h> +-#include <libkgoogle/request.h> +-#include <libkgoogle/objects/event.h> +-#include <libkgoogle/objects/calendar.h> +-#include <libkgoogle/services/calendar.h> ++#include <libkgapi/fetchlistjob.h> ++#include <libkgapi/reply.h> ++#include <libkgapi/request.h> ++#include <libkgapi/objects/event.h> ++#include <libkgapi/objects/calendar.h> ++#include <libkgapi/services/calendar.h> + + #include <KLocalizedString> + +@@ -37,7 +37,7 @@ + #include <KCalCore/Todo> + + using namespace Akonadi; +-using namespace KGoogle; ++using namespace KGAPI; + + void CalendarResource::calendarsReceived( KJob *job ) + { +@@ -51,8 +51,8 @@ void CalendarResource::calendarsReceived + + QStringList calendars = Settings::self()->calendars(); + +- QList< KGoogle::Object *> allData = fetchJob->items(); +- Q_FOREACH ( KGoogle::Object * replyData, allData ) { ++ QList< KGAPI::Object *> allData = fetchJob->items(); ++ Q_FOREACH ( KGAPI::Object * replyData, allData ) { + + Objects::Calendar *calendar = static_cast< Objects::Calendar * >( replyData ); + +@@ -94,7 +94,7 @@ void CalendarResource::calendarsReceived + } + } + +-void CalendarResource::eventReceived( KGoogle::Reply *reply ) ++void CalendarResource::eventReceived( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask(); +@@ -218,7 +218,7 @@ void CalendarResource::eventsReceived( K + modifyJob->start(); + } + +-void CalendarResource::eventCreated( KGoogle::Reply *reply ) ++void CalendarResource::eventCreated( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to create a new event: %1", reply->errorString() ) ); +@@ -244,7 +244,7 @@ void CalendarResource::eventCreated( KGo + changeCommitted( item ); + } + +-void CalendarResource::eventUpdated( KGoogle::Reply *reply ) ++void CalendarResource::eventUpdated( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to update an event: %1", reply->errorString() ) ); +@@ -266,7 +266,7 @@ void CalendarResource::eventUpdated( KGo + changeCommitted( item ); + } + +-void CalendarResource::eventRemoved( KGoogle::Reply *reply ) ++void CalendarResource::eventRemoved( KGAPI::Reply *reply ) + { + if ( reply->error() != NoContent ) { + cancelTask( i18n( "Failed to delete event: %1", reply->errorString() ) ); +@@ -277,7 +277,7 @@ void CalendarResource::eventRemoved( KGo + changeCommitted( item ); + } + +-void CalendarResource::eventMoved( KGoogle::Reply *reply ) ++void CalendarResource::eventMoved( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to move event: %1", reply->errorString() ) ); + +--- a/resources/google/calendar/resource_tasks.cpp ++++ b/resources/google/calendar/resource_tasks.cpp +@@ -18,13 +18,13 @@ + #include "calendarresource.h" + #include "settings.h" + +-#include <libkgoogle/accessmanager.h> +-#include <libkgoogle/auth.h> +-#include <libkgoogle/fetchlistjob.h> +-#include <libkgoogle/reply.h> +-#include <libkgoogle/objects/task.h> +-#include <libkgoogle/objects/tasklist.h> +-#include <libkgoogle/services/tasks.h> ++#include <libkgapi/accessmanager.h> ++#include <libkgapi/auth.h> ++#include <libkgapi/fetchlistjob.h> ++#include <libkgapi/reply.h> ++#include <libkgapi/objects/task.h> ++#include <libkgapi/objects/tasklist.h> ++#include <libkgapi/services/tasks.h> + + #include <KLocalizedString> + #include <KDebug> +@@ -36,7 +36,7 @@ + #include <Akonadi/ItemFetchScope> + + using namespace Akonadi; +-using namespace KGoogle; ++using namespace KGAPI; + using namespace KCalCore; + + void CalendarResource::taskDoUpdate( Reply *reply ) +@@ -54,7 +54,7 @@ void CalendarResource::taskDoUpdate( Rep + QUrl url = Services::Tasks::updateTaskUrl( item.parentCollection().remoteId(), item.remoteId() ); + + Services::Tasks service; +- QByteArray data = service.objectToJSON( static_cast< KGoogle::Object *>( &ktodo ) ); ++ QByteArray data = service.objectToJSON( static_cast< KGAPI::Object *>( &ktodo ) ); + + Request *request = new Request( url, Request::Update, "Tasks", account ); + request->setRequestData( data, "application/json" ); +@@ -110,7 +110,7 @@ void CalendarResource::taskListReceived( + } + } + +-void CalendarResource::taskReceived( KGoogle::Reply *reply ) ++void CalendarResource::taskReceived( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to fetch task: %1", reply->errorString() ) ); +@@ -180,7 +180,7 @@ void CalendarResource::tasksReceived( KJ + modifyJob->start(); + } + +-void CalendarResource::taskCreated( KGoogle::Reply *reply ) ++void CalendarResource::taskCreated( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to create a task: %1", reply->errorString() ) ); +@@ -205,7 +205,7 @@ void CalendarResource::taskCreated( KGoo + changeCommitted( item ); + } + +-void CalendarResource::taskUpdated( KGoogle::Reply *reply ) ++void CalendarResource::taskUpdated( KGAPI::Reply *reply ) + { + if ( reply->error() != OK ) { + cancelTask( i18n( "Failed to update task: %1", reply->errorString() ) ); +@@ -290,12 +290,12 @@ void CalendarResource::doRemoveTask( KJo + Request *request = + new Request( + Services::Tasks::removeTaskUrl( item.parentCollection().remoteId(), item.remoteId() ), +- KGoogle::Request::Remove, "Tasks", account ); ++ KGAPI::Request::Remove, "Tasks", account ); + request->setProperty( "Item", qVariantFromValue( item ) ); + m_gam->sendRequest( request ); + } + +-void CalendarResource::taskRemoved( KGoogle::Reply *reply ) ++void CalendarResource::taskRemoved( KGAPI::Reply *reply ) + { + if ( reply->error() != NoContent ) { + cancelTask( i18n( "Failed to delete task (5): %1", reply->errorString() ) ); + +--- a/resources/google/calendar/settingsdialog.cpp ++++ b/resources/google/calendar/settingsdialog.cpp +@@ -30,20 +30,20 @@ + #include <QListWidget> + #include <QPointer> + +-#include <libkgoogle/accessmanager.h> +-#include <libkgoogle/request.h> +-#include <libkgoogle/reply.h> +-#include <libkgoogle/auth.h> +-#include <libkgoogle/objects/calendar.h> +-#include <libkgoogle/objects/tasklist.h> +-#include <libkgoogle/services/calendar.h> +-#include <libkgoogle/services/tasks.h> +-#include <libkgoogle/ui/accountscombo.h> ++#include <libkgapi/accessmanager.h> ++#include <libkgapi/request.h> ++#include <libkgapi/reply.h> ++#include <libkgapi/auth.h> ++#include <libkgapi/objects/calendar.h> ++#include <libkgapi/objects/tasklist.h> ++#include <libkgapi/services/calendar.h> ++#include <libkgapi/services/tasks.h> ++#include <libkgapi/ui/accountscombo.h> + +-using namespace KGoogle; ++using namespace KGAPI; + + enum { +- KGoogleObjectRole = Qt::UserRole, ++ KGAPIObjectRole = Qt::UserRole, + ObjectUIDRole = Qt::UserRole + 1 + }; + +@@ -51,8 +51,8 @@ SettingsDialog::SettingsDialog( WId wind + KDialog( parent ), + m_windowId( windowId ) + { +- qRegisterMetaType<KGoogle::Services::Calendar>( "Calendar" ); +- qRegisterMetaType<KGoogle::Services::Tasks>( "Tasks" ); ++ qRegisterMetaType<KGAPI::Services::Calendar>( "Calendar" ); ++ qRegisterMetaType<KGAPI::Services::Tasks>( "Tasks" ); + + KWindowSystem::setMainWindow( this, windowId ); + +@@ -98,14 +98,14 @@ SettingsDialog::SettingsDialog( WId wind + connect( this, SIGNAL(accepted()), + this, SLOT(saveSettings()) ); + +- m_gam = new KGoogle::AccessManager; +- connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) ); +- connect( m_gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ m_gam = new KGAPI::AccessManager; ++ connect( m_gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectsListReceived(KGAPI::Reply*)) ); ++ connect( m_gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- KGoogle::Auth *auth = KGoogle::Auth::instance(); +- connect( auth, SIGNAL(authenticated(KGoogle::Account::Ptr&)), ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); ++ connect( auth, SIGNAL(authenticated(KGAPI::Account::Ptr&)), + this, SLOT(reloadAccounts()) ); + + m_ui->accountsCombo->clear(); +@@ -121,7 +121,7 @@ SettingsDialog::~SettingsDialog() + delete m_ui; + } + +-void SettingsDialog::error( KGoogle::Error code, const QString &msg ) ++void SettingsDialog::error( KGAPI::Error code, const QString &msg ) + { + KMessageBox::sorry( this, msg, i18n( "Error while talking to Google" ) ); + +@@ -183,22 +183,22 @@ void SettingsDialog::reloadAccounts() + + void SettingsDialog::addAccountClicked() + { +- KGoogle::Auth *auth = KGoogle::Auth::instance(); ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); + +- KGoogle::Account::Ptr account( new KGoogle::Account() ); ++ KGAPI::Account::Ptr account( new KGAPI::Account() ); + account->addScope( Services::Calendar::ScopeUrl ); + account->addScope( Services::Tasks::ScopeUrl ); + + try { + auth->authenticate( account, true ); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + KMessageBox::error( this, e.what() ); + } + } + + void SettingsDialog::removeAccountClicked() + { +- KGoogle::Account::Ptr account = m_ui->accountsCombo->currentAccount(); ++ KGAPI::Account::Ptr account = m_ui->accountsCombo->currentAccount(); + if ( account.isNull() ) { + return; + } +@@ -217,10 +217,10 @@ void SettingsDialog::removeAccountClicke + return; + } + +- KGoogle::Auth *auth = KGoogle::Auth::instance(); ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); + try { + auth->revoke( account ); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + KMessageBox::error( this, e.what() ); + } + +@@ -243,15 +243,15 @@ void SettingsDialog::accountChanged() + return; + } + +- KGoogle::Request *request; ++ KGAPI::Request *request; + + m_ui->calendarsList->clear(); +- request = new KGoogle::Request( Services::Calendar::fetchCalendarsUrl(), ++ request = new KGAPI::Request( Services::Calendar::fetchCalendarsUrl(), + Request::FetchAll, "Calendar", account ); + m_gam->queueRequest( request ); + + m_ui->tasksList->clear(); +- request = new KGoogle::Request( Services::Tasks::fetchTaskListsUrl(), ++ request = new KGAPI::Request( Services::Tasks::fetchTaskListsUrl(), + Request::FetchAll, "Tasks", account ); + m_gam->sendRequest( request ); + } +@@ -259,19 +259,19 @@ void SettingsDialog::accountChanged() + void SettingsDialog::addCalendarClicked() + { + QPointer<CalendarEditor> editor = new CalendarEditor; +- connect( editor, SIGNAL(accepted(KGoogle::Objects::Calendar*)), +- this, SLOT(addCalendar(KGoogle::Objects::Calendar*)) ); ++ connect( editor, SIGNAL(accepted(KGAPI::Objects::Calendar*)), ++ this, SLOT(addCalendar(KGAPI::Objects::Calendar*)) ); + + editor->exec(); + + delete editor; + } + +-void SettingsDialog::addCalendar( KGoogle::Objects::Calendar *calendar ) ++void SettingsDialog::addCalendar( KGAPI::Objects::Calendar *calendar ) + { +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + Services::Calendar parser; + QByteArray data; + +@@ -283,17 +283,17 @@ void SettingsDialog::addCalendar( KGoogl + m_ui->accountsBox->setDisabled( true ); + m_ui->calendarsBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectCreated(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectCreated(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Calendar::createCalendarUrl(), ++ request = new KGAPI::Request( Services::Calendar::createCalendarUrl(), + Request::Create, "Calendar", account ); +- data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( calendar ) ); ++ data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( calendar ) ); + request->setRequestData( data, "application/json" ); + gam->sendRequest( request ); + +@@ -316,25 +316,25 @@ void SettingsDialog::editCalendarClicked + return; + } + +- calendar = item->data( KGoogleObjectRole ).value< KGoogle::Objects::Calendar * >(); ++ calendar = item->data( KGAPIObjectRole ).value< KGAPI::Objects::Calendar * >(); + if ( !calendar ) { + return; + } + + QPointer<CalendarEditor> editor = new CalendarEditor( calendar ); +- connect( editor, SIGNAL(accepted(KGoogle::Objects::Calendar*)), +- this, SLOT(editCalendar(KGoogle::Objects::Calendar*)) ); ++ connect( editor, SIGNAL(accepted(KGAPI::Objects::Calendar*)), ++ this, SLOT(editCalendar(KGAPI::Objects::Calendar*)) ); + + editor->exec(); + + delete editor; + } + +-void SettingsDialog::editCalendar( KGoogle::Objects::Calendar *calendar ) ++void SettingsDialog::editCalendar( KGAPI::Objects::Calendar *calendar ) + { +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + Services::Calendar parser; + QByteArray data; + +@@ -346,17 +346,17 @@ void SettingsDialog::editCalendar( KGoog + m_ui->accountsBox->setDisabled( true ); + m_ui->calendarsBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectModified(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectModified(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Calendar::updateCalendarUrl( calendar->uid() ), ++ request = new KGAPI::Request( Services::Calendar::updateCalendarUrl( calendar->uid() ), + Request::Update, "Calendar", account ); +- data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( calendar ) ); ++ data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( calendar ) ); + request->setRequestData( data, "application/json" ); + gam->sendRequest( request ); + +@@ -379,7 +379,7 @@ void SettingsDialog::removeCalendarClick + return; + } + +- calendar = item->data( KGoogleObjectRole ).value< KGoogle::Objects::Calendar * >(); ++ calendar = item->data( KGAPIObjectRole ).value< KGAPI::Objects::Calendar * >(); + if ( !calendar ) { + return; + } +@@ -398,9 +398,9 @@ void SettingsDialog::removeCalendarClick + return; + } + +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + + account = m_ui->accountsCombo->currentAccount(); + if ( account.isNull() ) { +@@ -410,15 +410,15 @@ void SettingsDialog::removeCalendarClick + m_ui->accountsBox->setDisabled( true ); + m_ui->calendarsBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), + this, SLOT(reloadCalendarsClicked()) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Calendar::removeCalendarUrl( calendar->uid() ), ++ request = new KGAPI::Request( Services::Calendar::removeCalendarUrl( calendar->uid() ), + Request::Remove, "Calendar", account ); + gam->sendRequest( request ); + } +@@ -426,8 +426,8 @@ void SettingsDialog::removeCalendarClick + void SettingsDialog::addTaskListClicked() + { + TasklistEditor *editor = new TasklistEditor; +- connect( editor, SIGNAL(accepted(KGoogle::Objects::TaskList*)), +- this, SLOT(addTaskList(KGoogle::Objects::TaskList*)) ); ++ connect( editor, SIGNAL(accepted(KGAPI::Objects::TaskList*)), ++ this, SLOT(addTaskList(KGAPI::Objects::TaskList*)) ); + + editor->exec(); + +@@ -436,9 +436,9 @@ void SettingsDialog::addTaskListClicked( + + void SettingsDialog::reloadCalendarsClicked() + { +- KGoogle::AccessManager *gam; +- KGoogle::Account::Ptr account; +- KGoogle::Request *request; ++ KGAPI::AccessManager *gam; ++ KGAPI::Account::Ptr account; ++ KGAPI::Request *request; + + account = m_ui->accountsCombo->currentAccount(); + if ( account.isNull() ) { +@@ -449,24 +449,24 @@ void SettingsDialog::reloadCalendarsClic + m_ui->calendarsBox->setDisabled( true ); + + m_ui->calendarsList->clear(); +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectsListReceived(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Calendar::fetchCalendarsUrl(), ++ request = new KGAPI::Request( Services::Calendar::fetchCalendarsUrl(), + Request::FetchAll, "Calendar", account ); + gam->sendRequest( request ); + } + + void SettingsDialog::addTaskList( TaskList *taskList ) + { +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + Services::Tasks parser; + QByteArray data; + +@@ -478,17 +478,17 @@ void SettingsDialog::addTaskList( TaskLi + m_ui->accountsBox->setDisabled( true ); + m_ui->tasksBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectCreated(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectCreated(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Tasks::createTaskListUrl(), ++ request = new KGAPI::Request( Services::Tasks::createTaskListUrl(), + Request::Create, "Tasks", account ); +- data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( taskList ) ); ++ data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( taskList ) ); + request->setRequestData( data, "application/json" ); + gam->sendRequest( request ); + +@@ -511,14 +511,14 @@ void SettingsDialog::editTaskListClicked + return; + } + +- taskList = item->data( KGoogleObjectRole ).value< KGoogle::Objects::TaskList * >(); ++ taskList = item->data( KGAPIObjectRole ).value< KGAPI::Objects::TaskList * >(); + if ( !taskList ) { + return; + } + + QPointer<TasklistEditor> editor = new TasklistEditor( taskList ); +- connect( editor, SIGNAL(accepted(KGoogle::Objects::TaskList*)), +- this, SLOT(editTaskList(KGoogle::Objects::TaskList*)) ); ++ connect( editor, SIGNAL(accepted(KGAPI::Objects::TaskList*)), ++ this, SLOT(editTaskList(KGAPI::Objects::TaskList*)) ); + + editor->exec(); + +@@ -527,9 +527,9 @@ void SettingsDialog::editTaskListClicked + + void SettingsDialog::editTaskList( TaskList *taskList ) + { +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + Services::Tasks parser; + QByteArray data; + +@@ -541,17 +541,17 @@ void SettingsDialog::editTaskList( TaskL + m_ui->accountsBox->setDisabled( true ); + m_ui->tasksBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectModified(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectModified(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Tasks::updateTaskListUrl( taskList->uid() ), ++ request = new KGAPI::Request( Services::Tasks::updateTaskListUrl( taskList->uid() ), + Request::Update, "Tasks", account ); +- data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( taskList ) ); ++ data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( taskList ) ); + request->setRequestData( data, "application/json" ); + gam->sendRequest( request ); + +@@ -574,7 +574,7 @@ void SettingsDialog::removeTaskListClick + return; + } + +- taskList = item->data( KGoogleObjectRole ).value< KGoogle::Objects::TaskList * >(); ++ taskList = item->data( KGAPIObjectRole ).value< KGAPI::Objects::TaskList * >(); + if ( !taskList ) { + return; + } +@@ -593,9 +593,9 @@ void SettingsDialog::removeTaskListClick + return; + } + +- KGoogle::Account::Ptr account; +- KGoogle::AccessManager *gam; +- KGoogle::Request *request; ++ KGAPI::Account::Ptr account; ++ KGAPI::AccessManager *gam; ++ KGAPI::Request *request; + + account = m_ui->accountsCombo->currentAccount(); + if ( account.isNull() ) { +@@ -605,24 +605,24 @@ void SettingsDialog::removeTaskListClick + m_ui->accountsBox->setDisabled( true ); + m_ui->tasksBox->setDisabled( true ); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), + this, SLOT(reloadTaskListsClicked()) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect( gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Tasks::removeTaskListUrl( taskList->uid() ), ++ request = new KGAPI::Request( Services::Tasks::removeTaskListUrl( taskList->uid() ), + Request::Remove, "Tasks", account ); + gam->sendRequest( request ); + } + + void SettingsDialog::reloadTaskListsClicked() + { +- KGoogle::AccessManager *gam; +- KGoogle::Account::Ptr account; +- KGoogle::Request *request; ++ KGAPI::AccessManager *gam; ++ KGAPI::Account::Ptr account; ++ KGAPI::Request *request; + + account = m_ui->accountsCombo->currentAccount(); + if ( !account ) { +@@ -634,30 +634,30 @@ void SettingsDialog::reloadTaskListsClic + + m_ui->tasksList->clear(); + +- gam = new KGoogle::AccessManager; +- connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) ); +- connect( gam, SIGNAL(requestFinished(KGoogle::Request*)), ++ gam = new KGAPI::AccessManager; ++ connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(gam_objectsListReceived(KGAPI::Reply*)) ); ++ connect( gam, SIGNAL(requestFinished(KGAPI::Request*)), + gam, SLOT(deleteLater()) ); +- connect (gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect (gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + +- request = new KGoogle::Request( Services::Tasks::fetchTaskListsUrl(), ++ request = new KGAPI::Request( Services::Tasks::fetchTaskListsUrl(), + Request::FetchAll, "Tasks", account ); + gam->sendRequest( request ); + } + + void SettingsDialog::gam_objectCreated( Reply *reply ) + { +- QList< KGoogle::Object * > objects = reply->replyData(); ++ QList< KGAPI::Object * > objects = reply->replyData(); + + if ( reply->serviceName() == "Calendar" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { +- KGoogle::Objects::Calendar *calendar = static_cast< KGoogle::Objects::Calendar * >( object ); ++ Q_FOREACH ( KGAPI::Object * object, objects ) { ++ KGAPI::Objects::Calendar *calendar = static_cast< KGAPI::Objects::Calendar * >( object ); + + QListWidgetItem *item = new QListWidgetItem( calendar->title() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( calendar ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( calendar ) ); + item->setData( ObjectUIDRole, calendar->uid() ); + item->setCheckState( Qt::Unchecked ); + +@@ -669,11 +669,11 @@ void SettingsDialog::gam_objectCreated( + + } else if ( reply->serviceName() == "Tasks" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { +- KGoogle::Objects::TaskList *taskList = static_cast< KGoogle::Objects::TaskList * >( object ); ++ Q_FOREACH ( KGAPI::Object * object, objects ) { ++ KGAPI::Objects::TaskList *taskList = static_cast< KGAPI::Objects::TaskList * >( object ); + + QListWidgetItem *item = new QListWidgetItem( taskList->title() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( taskList ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( taskList ) ); + item->setData( ObjectUIDRole, taskList->uid() ); + item->setCheckState( Qt::Unchecked ); + +@@ -690,18 +690,18 @@ void SettingsDialog::gam_objectCreated( + + void SettingsDialog::gam_objectsListReceived( Reply *reply ) + { +- QList< KGoogle::Object * > objects = reply->replyData(); ++ QList< KGAPI::Object * > objects = reply->replyData(); + + if ( reply->serviceName() == "Calendar" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { ++ Q_FOREACH ( KGAPI::Object * object, objects ) { + Objects::Calendar *calendar; + QListWidgetItem *item; + + calendar = static_cast< Objects::Calendar * >( object ); + item = new QListWidgetItem; + item->setText( calendar->title() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( calendar ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( calendar ) ); + item->setData( ObjectUIDRole, calendar->uid() ); + + if ( Settings::self()->calendars().contains( calendar->uid() ) ) { +@@ -718,14 +718,14 @@ void SettingsDialog::gam_objectsListRece + + } else if ( reply->serviceName() == "Tasks" ) { + +- Q_FOREACH ( KGoogle::Object *object, objects ) { ++ Q_FOREACH ( KGAPI::Object *object, objects ) { + Objects::TaskList *taskList; + QListWidgetItem *item; + + taskList = static_cast< Objects::TaskList * >( object ); + item = new QListWidgetItem; + item->setText( taskList->title() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( taskList ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( taskList ) ); + item->setData( ObjectUIDRole, taskList->uid() ); + + if ( Settings::self()->taskLists().contains( taskList->uid() ) ) { +@@ -749,12 +749,12 @@ void SettingsDialog::gam_objectsListRece + + void SettingsDialog::gam_objectModified( Reply *reply ) + { +- QList< KGoogle::Object * > objects = reply->replyData(); ++ QList< KGAPI::Object * > objects = reply->replyData(); + + if ( reply->serviceName() == "Calendar" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { +- KGoogle::Objects::Calendar *calendar = static_cast< KGoogle::Objects::Calendar * >( object ); ++ Q_FOREACH ( KGAPI::Object * object, objects ) { ++ KGAPI::Objects::Calendar *calendar = static_cast< KGAPI::Objects::Calendar * >( object ); + QListWidgetItem *item = 0; + + for ( int i = 0; i < m_ui->calendarsList->count(); i++ ) { +@@ -773,7 +773,7 @@ void SettingsDialog::gam_objectModified( + + item->setText( calendar->title() ); + item->setData( ObjectUIDRole, calendar->uid() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( calendar ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( calendar ) ); + } + + m_ui->calendarsBox->setEnabled( true ); +@@ -781,8 +781,8 @@ void SettingsDialog::gam_objectModified( + + } else if ( reply->serviceName() == "Tasks" ) { + +- Q_FOREACH ( KGoogle::Object * object, objects ) { +- KGoogle::Objects::TaskList *taskList = static_cast< KGoogle::Objects::TaskList * >( object ); ++ Q_FOREACH ( KGAPI::Object * object, objects ) { ++ KGAPI::Objects::TaskList *taskList = static_cast< KGAPI::Objects::TaskList * >( object ); + QListWidgetItem *item = 0; + + for ( int i = 0; i < m_ui->tasksList->count(); i++ ) { +@@ -801,7 +801,7 @@ void SettingsDialog::gam_objectModified( + + item->setText( taskList->title() ); + item->setData( ObjectUIDRole, taskList->uid() ); +- item->setData( KGoogleObjectRole, qVariantFromValue( taskList ) ); ++ item->setData( KGAPIObjectRole, qVariantFromValue( taskList ) ); + + } + m_ui->tasksBox->setEnabled( true ); + +--- a/resources/google/calendar/settingsdialog.h ++++ b/resources/google/calendar/settingsdialog.h +@@ -22,13 +22,13 @@ + #include <KJob> + #include <Akonadi/ResourceBase> + +-#include <libkgoogle/common.h> ++#include <libkgapi/common.h> + + namespace Ui { + class SettingsDialog; + } + +-namespace KGoogle { ++namespace KGAPI { + class Reply; + class AccessManager; + +@@ -40,7 +40,7 @@ namespace Objects { + + class QListWidgetItem; + +-using namespace KGoogle; ++using namespace KGAPI; + + class SettingsDialog : public KDialog + { +@@ -63,19 +63,19 @@ class SettingsDialog : public KDialog + void removeTaskListClicked(); + void reloadTaskListsClicked(); + +- void gam_objectsListReceived( KGoogle::Reply *reply ); +- void gam_objectCreated( KGoogle::Reply *reply ); +- void gam_objectModified( KGoogle::Reply *reply ); ++ void gam_objectsListReceived( KGAPI::Reply *reply ); ++ void gam_objectCreated( KGAPI::Reply *reply ); ++ void gam_objectModified( KGAPI::Reply *reply ); + +- void addCalendar( KGoogle::Objects::Calendar *calendar ); +- void editCalendar( KGoogle::Objects::Calendar *calendar ); ++ void addCalendar( KGAPI::Objects::Calendar *calendar ); ++ void editCalendar( KGAPI::Objects::Calendar *calendar ); + +- void addTaskList( KGoogle::Objects::TaskList *taskList ); +- void editTaskList( KGoogle::Objects::TaskList *taskList ); ++ void addTaskList( KGAPI::Objects::TaskList *taskList ); ++ void editTaskList( KGAPI::Objects::TaskList *taskList ); + + void saveSettings(); + +- void error( KGoogle::Error code, const QString &msg ); ++ void error( KGAPI::Error code, const QString &msg ); + + private: + Ui::SettingsDialog *m_ui; + +--- a/resources/google/calendar/tasklisteditor.cpp ++++ b/resources/google/calendar/tasklisteditor.cpp +@@ -18,7 +18,7 @@ + #include "tasklisteditor.h" + #include "ui_tasklist_editor.h" + +-using namespace KGoogle::Objects; ++using namespace KGAPI::Objects; + + TasklistEditor::TasklistEditor( TaskList *taskList ): + QDialog(), +@@ -43,7 +43,7 @@ TasklistEditor::~TasklistEditor() + void TasklistEditor::accepted() + { + if ( !m_taskList ) { +- m_taskList = new KGoogle::Objects::TaskList; ++ m_taskList = new KGAPI::Objects::TaskList; + } + + m_taskList->setTitle( m_ui->nameEdit->text() ); + +--- a/resources/google/calendar/tasklisteditor.h ++++ b/resources/google/calendar/tasklisteditor.h +@@ -20,7 +20,7 @@ + + #include <QDialog> + +-#include <libkgoogle/objects/tasklist.h> ++#include <libkgapi/objects/tasklist.h> + + namespace Ui { + class TaskListEditor; +@@ -31,18 +31,18 @@ class TasklistEditor : public QDialog + Q_OBJECT + + public: +- explicit TasklistEditor( KGoogle::Objects::TaskList *taskList = 0 ); ++ explicit TasklistEditor( KGAPI::Objects::TaskList *taskList = 0 ); + + virtual ~TasklistEditor(); + + Q_SIGNALS: +- void accepted( KGoogle::Objects::TaskList *taskList ); ++ void accepted( KGAPI::Objects::TaskList *taskList ); + + private Q_SLOTS: + void accepted(); + + private: +- KGoogle::Objects::TaskList *m_taskList; ++ KGAPI::Objects::TaskList *m_taskList; + Ui::TaskListEditor *m_ui; + }; + + +--- a/resources/google/calendar/ui/settingsdialog.ui ++++ b/resources/google/calendar/ui/settingsdialog.ui +@@ -72,7 +72,7 @@ + </spacer> + </item> + <item row="0" column="0"> +- <widget class="KGoogle::Ui::AccountsCombo" name="accountsCombo"> ++ <widget class="KGAPI::Ui::AccountsCombo" name="accountsCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> +@@ -194,9 +194,9 @@ + </widget> + <customwidgets> + <customwidget> +- <class>KGoogle::Ui::AccountsCombo</class> ++ <class>KGAPI::Ui::AccountsCombo</class> + <extends>QComboBox</extends> +- <header location="global">libkgoogle/ui/accountscombo.h</header> ++ <header location="global">libkgapi/ui/accountscombo.h</header> + </customwidget> + </customwidgets> + <resources/> + +--- a/resources/google/contacts/CMakeLists.txt ++++ b/resources/google/contacts/CMakeLists.txt +@@ -30,7 +30,7 @@ target_link_libraries(akonadi_googlecont + ${QT_QTNETWORK_LIBRARY} + ${KDE4_KDECORE_LIBS} + ${KDE4_KIO_LIBS} +- ${LibKGoogle_LIBRARY} ++ ${LibKGAPI_LIBRARY} + ) + + install(TARGETS akonadi_googlecontacts_resource ${INSTALL_TARGETS_DEFAULT_ARGS}) + +--- a/resources/google/contacts/contactsresource.cpp ++++ b/resources/google/contacts/contactsresource.cpp +@@ -41,16 +41,16 @@ + #include <QNetworkReply> + #include <QNetworkRequest> + +-#include <libkgoogle/accessmanager.h> +-#include <libkgoogle/auth.h> +-#include <libkgoogle/fetchlistjob.h> +-#include <libkgoogle/request.h> +-#include <libkgoogle/reply.h> +-#include <libkgoogle/objects/contact.h> +-#include <libkgoogle/services/contacts.h> ++#include <libkgapi/accessmanager.h> ++#include <libkgapi/auth.h> ++#include <libkgapi/fetchlistjob.h> ++#include <libkgapi/request.h> ++#include <libkgapi/reply.h> ++#include <libkgapi/objects/contact.h> ++#include <libkgapi/services/contacts.h> + + using namespace Akonadi; +-using namespace KGoogle; ++using namespace KGAPI; + + #define RootCollection "root" + #define MyContacts "myContacts" +@@ -69,14 +69,14 @@ ContactsResource::ContactsResource( cons + Auth *auth = Auth::instance(); + auth->init( "Akonadi Google", Settings::self()->clientId(), Settings::self()->clientSecret() ); + +- m_gam = new KGoogle::AccessManager(); ++ m_gam = new KGAPI::AccessManager(); + m_photoNam = new KIO::Integration::AccessManager( this ); + +- connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)), +- this, SLOT(replyReceived(KGoogle::Reply*)) ); ++ connect( m_gam, SIGNAL(replyReceived(KGAPI::Reply*)), ++ this, SLOT(replyReceived(KGAPI::Reply*)) ); + +- connect( m_gam, SIGNAL(error(KGoogle::Error,QString)), +- this, SLOT(error(KGoogle::Error,QString)) ); ++ connect( m_gam, SIGNAL(error(KGAPI::Error,QString)), ++ this, SLOT(error(KGAPI::Error,QString)) ); + connect( this, SIGNAL(abortRequested()), + this, SLOT(slotAbortRequested()) ); + connect( this, SIGNAL(reloadConfiguration()), +@@ -164,7 +164,7 @@ Account::Ptr ContactsResource::getAccoun + Auth *auth = Auth::instance(); + try { + m_account = auth->getAccount( Settings::self()->account() ); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + Q_EMIT status( Broken, e.what() ); + return Account::Ptr(); + } +@@ -205,8 +205,8 @@ bool ContactsResource::retrieveItem( con + + QUrl url( Services::Contacts::fetchContactUrl( account->accountName(), item.remoteId() ) ); + +- KGoogle::Request *request; +- request = new KGoogle::Request( url, KGoogle::Request::Fetch, "Contacts", account ); ++ KGAPI::Request *request; ++ request = new KGAPI::Request( url, KGAPI::Request::Fetch, "Contacts", account ); + request->setProperty( "Item", QVariant::fromValue( item ) ); + + m_gam->sendRequest( request ); +@@ -278,7 +278,7 @@ void ContactsResource::initialItemsFetch + + Collection collection = job->property( "Collection" ).value< Collection >(); + +- QUrl url = KGoogle::Services::Contacts::fetchAllContactsUrl( account->accountName(), true ); ++ QUrl url = KGAPI::Services::Contacts::fetchAllContactsUrl( account->accountName(), true ); + + QString lastSync = collection.remoteRevision(); + if ( !lastSync.isEmpty() ) { +@@ -333,8 +333,8 @@ void ContactsResource::itemAdded( const + "term=\"http://schemas.google.com/contact/2008#contact\"/>" ); + data.append( "</atom:entry>" ); + +- KGoogle::Request *request; +- request = new KGoogle::Request( Services::Contacts::createContactUrl( account->accountName() ), ++ KGAPI::Request *request; ++ request = new KGAPI::Request( Services::Contacts::createContactUrl( account->accountName() ), + Request::Create, "Contacts", account ); + request->setRequestData( data, "application/atom+xml" ); + request->setProperty( "Item", QVariant::fromValue( item ) ); +@@ -375,9 +375,9 @@ void ContactsResource::itemChanged( cons + "term=\"http://schemas.google.com/contact/2008#contact\"/>" ); + data.append( "</atom:entry>" ); + +- KGoogle::Request *request; ++ KGAPI::Request *request; + request = +- new KGoogle::Request( ++ new KGAPI::Request( + Services::Contacts::updateContactUrl( account->accountName(), item.remoteId() ), + Request::Update, "Contacts", account ); + request->setRequestData( data, "application/atom+xml" ); +@@ -430,9 +430,9 @@ void ContactsResource::itemMoved( const + "term=\"http://schemas.google.com/contact/2008#contact\"/>" ); + data.append( "</atom:entry>" ); + +- KGoogle::Request *request; ++ KGAPI::Request *request; + request = +- new KGoogle::Request( ++ new KGAPI::Request( + Services::Contacts::updateContactUrl( account->accountName(), item.remoteId() ), + Request::Update, "Contacts", account ); + request->setRequestData( data, "application/atom+xml" ); +@@ -449,9 +449,9 @@ void ContactsResource::itemRemoved( cons + return; + } + +- KGoogle::Request *request; ++ KGAPI::Request *request; + request = +- new KGoogle::Request( ++ new KGAPI::Request( + Services::Contacts::removeContactUrl( account->accountName(), item.remoteId() ), + Request::Remove, "Contacts", account ); + request->setProperty( "Item", QVariant::fromValue( item ) ); +@@ -459,7 +459,7 @@ void ContactsResource::itemRemoved( cons + m_gam->sendRequest( request ); + } + +-void ContactsResource::replyReceived( KGoogle::Reply *reply ) ++void ContactsResource::replyReceived( KGAPI::Reply *reply ) + { + switch ( reply->requestType() ) { + case Request::Fetch: +@@ -500,9 +500,9 @@ void ContactsResource::contactListReceiv + Item::List changed; + + FetchListJob *fetchJob = dynamic_cast< FetchListJob * >( job ); +- QList< KGoogle::Object * > objects = fetchJob->items(); ++ QList< KGAPI::Object * > objects = fetchJob->items(); + +- Q_FOREACH ( KGoogle::Object * object, objects ) { ++ Q_FOREACH ( KGAPI::Object * object, objects ) { + + Item item; + Objects::Contact *contact = static_cast< Objects::Contact * >( object ); +@@ -543,14 +543,14 @@ void ContactsResource::contactListReceiv + modifyJob->setAutoDelete( true ); + } + +-void ContactsResource::contactReceived( KGoogle::Reply *reply ) ++void ContactsResource::contactReceived( KGAPI::Reply *reply ) + { +- if ( reply->error() != KGoogle::OK ) { ++ if ( reply->error() != KGAPI::OK ) { + cancelTask( i18n( "Failed to fetch contact" ) ); + return; + } + +- QList< KGoogle::Object * > data = reply->replyData(); ++ QList< KGAPI::Object * > data = reply->replyData(); + if ( data.length() != 1 ) { + kWarning() << "Server send " << data.length() << "items, which is not OK"; + cancelTask( i18n( "Failed to create a contact" ) ); +@@ -575,14 +575,14 @@ void ContactsResource::contactReceived( + } + } + +-void ContactsResource::contactCreated( KGoogle::Reply *reply ) ++void ContactsResource::contactCreated( KGAPI::Reply *reply ) + { +- if ( reply->error() != KGoogle::Created ) { ++ if ( reply->error() != KGAPI::Created ) { + cancelTask( i18n( "Failed to create a contact" ) ); + return; + } + +- QList< KGoogle::Object * > data = reply->replyData(); ++ QList< KGAPI::Object * > data = reply->replyData(); + if ( data.length() != 1 ) { + kWarning() << "Server send " << data.length() << "items, which is not OK"; + cancelTask( i18n( "Failed to create a contact" ) ); +@@ -604,14 +604,14 @@ void ContactsResource::contactCreated( K + updatePhoto( item ); + } + +-void ContactsResource::contactUpdated( KGoogle::Reply *reply ) ++void ContactsResource::contactUpdated( KGAPI::Reply *reply ) + { +- if ( reply->error() != KGoogle::OK ) { ++ if ( reply->error() != KGAPI::OK ) { + cancelTask( i18n( "Failed to update contact" ) ); + return; + } + +- QList< KGoogle::Object * > data = reply->replyData(); ++ QList< KGAPI::Object * > data = reply->replyData(); + if ( data.length() != 1 ) { + kWarning() << "Server send " << data.length() << "items, which is not OK"; + cancelTask( i18n( "Failed to update a contact" ) ); +@@ -629,9 +629,9 @@ void ContactsResource::contactUpdated( K + updatePhoto( item ); + } + +-void ContactsResource::contactRemoved( KGoogle::Reply *reply ) ++void ContactsResource::contactRemoved( KGAPI::Reply *reply ) + { +- if ( reply->error() != KGoogle::OK ) { ++ if ( reply->error() != KGAPI::OK ) { + cancelTask( i18n( "Failed to remove contact" ) ); + return; + } + +--- a/resources/google/contacts/contactsresource.h ++++ b/resources/google/contacts/contactsresource.h +@@ -24,10 +24,10 @@ + #include <Akonadi/Item> + #include <KDateTime> + +-#include <libkgoogle/common.h> +-#include <libkgoogle/account.h> ++#include <libkgapi/common.h> ++#include <libkgapi/account.h> + +-namespace KGoogle { ++namespace KGAPI { + class AccessManager; + class Reply; + class Request; +@@ -36,7 +36,7 @@ namespace KGoogle { + class QNetworkAccessManager; + class QNetworkReply; + +-using namespace KGoogle; ++using namespace KGAPI; + + class ContactsResource: public Akonadi::ResourceBase, + public Akonadi::AgentBase::ObserverV2 +@@ -71,7 +71,7 @@ class ContactsResource: public Akonadi:: + void aboutToQuit(); + + private Q_SLOTS: +- void error( KGoogle::Error errCode, const QString &msg ); ++ void error( KGAPI::Error errCode, const QString &msg ); + + void slotAbortRequested(); + +@@ -80,12 +80,12 @@ class ContactsResource: public Akonadi:: + + void photoRequestFinished( QNetworkReply *reply ); + +- void replyReceived( KGoogle::Reply *reply ); ++ void replyReceived( KGAPI::Reply *reply ); + +- void contactReceived( KGoogle::Reply *reply ); +- void contactUpdated( KGoogle::Reply *reply ); +- void contactCreated( KGoogle::Reply *reply ); +- void contactRemoved( KGoogle::Reply *reply ); ++ void contactReceived( KGAPI::Reply *reply ); ++ void contactUpdated( KGAPI::Reply *reply ); ++ void contactCreated( KGAPI::Reply *reply ); ++ void contactRemoved( KGAPI::Reply *reply ); + + void emitPercent( KJob *job, ulong progress ); + +@@ -97,9 +97,9 @@ class ContactsResource: public Akonadi:: + + Account::Ptr getAccount(); + +- KGoogle::Account::Ptr m_account; ++ KGAPI::Account::Ptr m_account; + +- KGoogle::AccessManager *m_gam; ++ KGAPI::AccessManager *m_gam; + QNetworkAccessManager *m_photoNam; + + QMap< QString, Akonadi::Collection > m_collections; + +--- a/resources/google/contacts/settingsdialog.cpp ++++ b/resources/google/contacts/settingsdialog.cpp +@@ -22,13 +22,13 @@ + #include <KMessageBox> + #include <KWindowSystem> + +-#include <libkgoogle/auth.h> +-#include <libkgoogle/services/contacts.h> ++#include <libkgapi/auth.h> ++#include <libkgapi/services/contacts.h> + +-using namespace KGoogle; ++using namespace KGAPI; + + enum { +- KGoogleObjectRole = Qt::UserRole, ++ KGAPIObjectRole = Qt::UserRole, + ObjectUIDRole + }; + +@@ -38,7 +38,7 @@ SettingsDialog::SettingsDialog( WId wind + { + KWindowSystem::setMainWindow( this, windowId ); + +- qRegisterMetaType<KGoogle::Services::Contacts>( "Contacts" ); ++ qRegisterMetaType<KGAPI::Services::Contacts>( "Contacts" ); + + this->setButtons( Ok | Cancel ); + +@@ -58,8 +58,8 @@ SettingsDialog::SettingsDialog( WId wind + connect( m_ui->removeAccountBtn, SIGNAL(clicked(bool)), + this, SLOT(removeAccountClicked()) ); + +- KGoogle::Auth *auth = KGoogle::Auth::instance(); +- connect( auth, SIGNAL(authenticated(KGoogle::Account::Ptr&)), ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); ++ connect( auth, SIGNAL(authenticated(KGAPI::Account::Ptr&)), + this, SLOT(reloadAccounts()) ); + + reloadAccounts(); +@@ -78,9 +78,9 @@ void SettingsDialog::saveSettings() + Settings::self()->writeConfig(); + } + +-void SettingsDialog::error( KGoogle::Error errCode, const QString &msg ) ++void SettingsDialog::error( KGAPI::Error errCode, const QString &msg ) + { +- if ( errCode == KGoogle::OK ) { ++ if ( errCode == KGAPI::OK ) { + return; + } + +@@ -107,22 +107,22 @@ void SettingsDialog::reloadAccounts() + + void SettingsDialog::addAccountClicked() + { +- KGoogle::Auth *auth = KGoogle::Auth::instance(); ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); + +- KGoogle::Account::Ptr account( new KGoogle::Account() ); ++ KGAPI::Account::Ptr account( new KGAPI::Account() ); + account->addScope( Services::Contacts::ScopeUrl ); + + try { + auth->authenticate( account, true ); + updateButtons(); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + KMessageBox::error( this, e.what() ); + } + } + + void SettingsDialog::removeAccountClicked() + { +- KGoogle::Account::Ptr account = m_ui->accountsCombo->currentAccount(); ++ KGAPI::Account::Ptr account = m_ui->accountsCombo->currentAccount(); + + if ( account.isNull() ) { + return; +@@ -142,12 +142,12 @@ void SettingsDialog::removeAccountClicke + return; + } + +- KGoogle::Auth *auth = KGoogle::Auth::instance(); ++ KGAPI::Auth *auth = KGAPI::Auth::instance(); + + try { + auth->revoke( account ); + updateButtons(); +- } catch ( KGoogle::Exception::BaseException &e ) { ++ } catch ( KGAPI::Exception::BaseException &e ) { + KMessageBox::error( this, e.what() ); + } + + +--- a/resources/google/contacts/settingsdialog.h ++++ b/resources/google/contacts/settingsdialog.h +@@ -20,7 +20,7 @@ + + #include <KDialog> + +-#include <libkgoogle/common.h> ++#include <libkgapi/common.h> + + namespace Ui { + class SettingsDialog; +@@ -40,7 +40,7 @@ class SettingsDialog : public KDialog + void removeAccountClicked(); + void reloadAccounts(); + +- void error( KGoogle::Error errCode, const QString &msg ); ++ void error( KGAPI::Error errCode, const QString &msg ); + void saveSettings(); + + private: + +--- a/resources/google/contacts/ui/settingsdialog.ui ++++ b/resources/google/contacts/ui/settingsdialog.ui +@@ -21,7 +21,7 @@ + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> +- <widget class="KGoogle::Ui::AccountsCombo" name="accountsCombo"> ++ <widget class="KGAPI::Ui::AccountsCombo" name="accountsCombo"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> +@@ -51,9 +51,9 @@ + </widget> + <customwidgets> + <customwidget> +- <class>KGoogle::Ui::AccountsCombo</class> ++ <class>KGAPI::Ui::AccountsCombo</class> + <extends>QComboBox</extends> +- <header location="global">libkgoogle/ui/accountscombo.h</header> ++ <header location="global">libkgapi/ui/accountscombo.h</header> + </customwidget> + </customwidgets> + <resources/> + diff --git a/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD index e82ec55d3..68bd3877c 100644 --- a/kde-unstable/kdepimlibs/PKGBUILD +++ b/kde-unstable/kdepimlibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160077 2012-05-29 22:07:02Z andrea $ +# $Id: PKGBUILD 160315 2012-05-31 22:18:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdepimlibs' @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ae808daa00e5d8a5fa3f62777e311391d2412c7c') +sha1sums=('6249c7a8331aaa069e932acdc72a94ac0d75d6db') build() { cd "${srcdir}" diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD index 172a0e987..4a7028891 100644 --- a/kde-unstable/kdesdk-kate/PKGBUILD +++ b/kde-unstable/kdesdk-kate/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160087 2012-05-29 22:23:54Z andrea $ +# $Id: PKGBUILD 160322 2012-05-31 22:22:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate @@ -6,13 +6,13 @@ pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') pkgver=4.8.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('4f757fe5fd2a49a0119b8cafb072d8e742189029' +sha1sums=('b4031257ba5e0873e887343ca3d198e211934502' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { diff --git a/kde-unstable/libkgapi/PKGBUILD b/kde-unstable/libkgapi/PKGBUILD new file mode 100644 index 000000000..67c200fa9 --- /dev/null +++ b/kde-unstable/libkgapi/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 160270 2012-05-31 20:24:46Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkgapi +pkgver=0.4.0 +pkgrel=1 +pkgdesc="A KDE-based library for accessing various Google services via their public API" +url='https://projects.kde.org/projects/kdereview/libkgoogle' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdepimlibs' 'qjson') +makedepends=('cmake' 'automoc4' 'boost') +replaces=('akonadi-google' 'libkgoogle') +conflicts=('akonadi-google' 'libkgoogle') +source=("http://www.progdan.cz/wp-content/uploads/${pkgname}-${pkgver}.tar.bz2") +md5sums=('90c44fd9456a6e34a8375f98250ad7cc') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/nepomuk-core/PKGBUILD b/kde-unstable/nepomuk-core/PKGBUILD index 066760b54..1f9847267 100644 --- a/kde-unstable/nepomuk-core/PKGBUILD +++ b/kde-unstable/nepomuk-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160079 2012-05-29 22:12:19Z andrea $ +# $Id: PKGBUILD 160316 2012-05-31 22:18:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core pkgver=4.8.80 -pkgrel=1 +pkgrel=2 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6d1a84f51018476b2fe05b47c265bd6d182335aa') +sha1sums=('023f241f61d778cee16d29fbc64968a6925e42ee') build() { cd "${srcdir}" @@ -30,7 +30,4 @@ package() { # Fix the python shebang sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen - - # Fix conflict - rm "${pkgdir}"/usr/bin/nepomuk-rcgen } diff --git a/libre-testing/hplip-libre/PKGBUILD b/libre-testing/hplip-libre/PKGBUILD new file mode 100644 index 000000000..02cae8862 --- /dev/null +++ b/libre-testing/hplip-libre/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Maintainer : Rémy Oudompheng <remy@archlinux.org> +# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> +# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy> + +_pkgname=hplip +pkgname=hplip-libre +pkgver=3.12.4 +pkgrel=3 +pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" +arch=('i686' 'x86_64') +url="http://hplipopensource.com" +license=('GPL') +depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' + 'net-snmp>=5.7.1') +makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') +optdepends=('cups: for printing support' + 'dbus-python: for dbus support' + 'sane: for scanner support' + 'python-imaging: for commandline scanning support' + 'python-notify: for Desktop notification support' + 'rpcbind: for network support' + 'python2-pyqt: for running hp-toolbox' + 'python2-gobject2: for running hp-toolbox') +replaces=('hpijs' "${_pkgname}") +conflicts=("${_pkgname}") +provides=("${_pkgname}=${pkgver}") +options=('!libtool') +install=hplip.install +source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('a063f76aa47edab55a3f31ff2558df07' + '2fe18f4091afb3dec200271dc7836128') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + export PYTHON=python2 + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py + sed -i 's|python ./print.py|python2 ./print.py|' scan.py + sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py + sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py + sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py + sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py + + # https://bugs.archlinux.org/task/30085 - hack found in Gentoo + # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip + # The hpcups driver does not use foomatic-rip + local i + for i in ppd/hpijs/*.ppd.gz ; do + rm -f ${i}.temp + gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ + gzip > ${i}.temp || return 1 + mv ${i}.temp ${i} + done + + export AUTOMAKE='automake --foreign' + autoreconf --force --install + + ./configure --prefix=/usr \ + --enable-qt4 \ + --disable-foomatic-rip-hplip-install \ + --enable-foomatic-ppd-install \ + --enable-hpcups-install \ + --enable-new-hpcups \ + --enable-cups-ppd-install \ + --enable-cups-drv-install \ + --enable-hpijs-install \ + --enable-foomatic-drv-install \ + --enable-pp-build \ + --enable-udev-acl-rules + + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install + # remove config provided by sane and autostart of hp-daemon + rm -rf "$pkgdir"/etc/{sane.d,xdg} + # remove HAL .fdi file because HAL is no longer used + rm -rf "$pkgdir"/usr/share/hal + # move to /usr + mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/ + rm "$pkgdir"/lib -r +} diff --git a/libre-testing/hplip-libre/hplip.install b/libre-testing/hplip-libre/hplip.install new file mode 100644 index 000000000..cb0eaf8e8 --- /dev/null +++ b/libre-testing/hplip-libre/hplip.install @@ -0,0 +1,10 @@ +post_install() { + cat << EOF + +NOTE +---- +# If you want to use this driver with sane: +# echo "hpaio" >> /etc/sane.d/dll.conf + +EOF +} diff --git a/libre-testing/systemd/PKGBUILD b/libre-testing/systemd/PKGBUILD index 4bd2e8b14..3d7649c01 100644 --- a/libre-testing/systemd/PKGBUILD +++ b/libre-testing/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd') pkgver=184 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 933527aa9..b031d3c90 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158132 2012-05-03 13:20:07Z andrea $ +# $Id: PKGBUILD 159699 2012-05-26 07:40:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.8.3 -pkgrel=1 +pkgrel=2.1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,7 +14,8 @@ license=('GPL' 'LGPL' 'FDL') depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee' 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' - 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit') + 'docbook-xsl' 'upower' 'udisks' 'libxcursor' 'phonon' 'qtwebkit' + 'media-player-info' 'herqq') makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell') provides=("kdelibs=$pkgver") replaces=('kdelibs-experimental' 'kdelibs') diff --git a/staging/db/PKGBUILD b/staging/db/PKGBUILD new file mode 100644 index 000000000..c0a9f2192 --- /dev/null +++ b/staging/db/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 160310 2012-05-31 21:26:09Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgname=db +pkgver=5.3.21 +pkgrel=1 +pkgdesc="The Berkeley DB embedded database system" +arch=('i686' 'x86_64') +url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +license=('custom') +depends=('gcc-libs' 'sh') +options=('!libtool') +install=db.install +source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) +sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83') + +build() { + cd "${srcdir}"/$pkgname-${pkgver}/build_unix + ../dist/configure --prefix=/usr --enable-compat185 \ + --enable-shared --enable-static --enable-cxx --enable-dbm + make LIBSO_LIBS=-lpthread +} + +package() { + cd "${srcdir}"/$pkgname-${pkgver}/build_unix + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/docs + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/staging/db/db.install b/staging/db/db.install new file mode 100644 index 000000000..03b64042d --- /dev/null +++ b/staging/db/db.install @@ -0,0 +1,5 @@ +post_upgrade() { + if [ "$(vercmp $2 5.1)" -lt 0 ]; then + echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." + fi +} diff --git a/staging/startup-notification/PKGBUILD b/staging/startup-notification/PKGBUILD new file mode 100644 index 000000000..e20271ab6 --- /dev/null +++ b/staging/startup-notification/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 160257 2012-05-31 17:08:21Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=startup-notification +pkgver=0.12 +pkgrel=3 +pkgdesc="Monitor and display application startup" +arch=(i686 x86_64) +license=('LGPL') +depends=('libx11' 'xcb-util>=0.3.9') +options=('!libtool') +url="http://www.freedesktop.org" +source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz) +md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' configure.in + autoreconf --force --install + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/xcb-util-image/LICENSE b/staging/xcb-util-image/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/staging/xcb-util-image/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> + * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> + * Copyright © 2008 Julien Danjou <julien@danjou.info> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard <keithp@keithp.com> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood <iano@quirkster.com> + * Copyright © 2008 Jamey Sharp <jamey@minilop.net> + * Copyright © 2008 Josh Triplett <josh@freedesktop.org> + * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * 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, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/staging/xcb-util-image/PKGBUILD b/staging/xcb-util-image/PKGBUILD new file mode 100644 index 000000000..bab6a6427 --- /dev/null +++ b/staging/xcb-util-image/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 160251 2012-05-31 16:57:38Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=xcb-util-image +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7' 'xcb-util>=0.3.9') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/xcb-util-keysyms/LICENSE b/staging/xcb-util-keysyms/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/staging/xcb-util-keysyms/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> + * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> + * Copyright © 2008 Julien Danjou <julien@danjou.info> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard <keithp@keithp.com> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood <iano@quirkster.com> + * Copyright © 2008 Jamey Sharp <jamey@minilop.net> + * Copyright © 2008 Josh Triplett <josh@freedesktop.org> + * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * 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, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/staging/xcb-util-keysyms/PKGBUILD b/staging/xcb-util-keysyms/PKGBUILD new file mode 100644 index 000000000..09de05c20 --- /dev/null +++ b/staging/xcb-util-keysyms/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 160253 2012-05-31 16:59:59Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=xcb-util-keysyms +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/xcb-util-wm/LICENSE b/staging/xcb-util-wm/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/staging/xcb-util-wm/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> + * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> + * Copyright © 2008 Julien Danjou <julien@danjou.info> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard <keithp@keithp.com> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood <iano@quirkster.com> + * Copyright © 2008 Jamey Sharp <jamey@minilop.net> + * Copyright © 2008 Josh Triplett <josh@freedesktop.org> + * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * 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, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/staging/xcb-util-wm/PKGBUILD b/staging/xcb-util-wm/PKGBUILD new file mode 100644 index 000000000..212613b55 --- /dev/null +++ b/staging/xcb-util-wm/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 160255 2012-05-31 17:02:30Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=xcb-util-wm +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/xcb-util/LICENSE b/staging/xcb-util/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/staging/xcb-util/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou <julien@danjou.info> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine <arnau@debian.org> + * Copyright (C) 2007-2008 Vincent Torri <vtorri@univ-evry.fr> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> + * Copyright © 2008 Julien Danjou <julien@danjou.info> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard <keithp@keithp.com> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey <bart@cs.pdx.edu> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood <iano@quirkster.com> + * Copyright © 2008 Jamey Sharp <jamey@minilop.net> + * Copyright © 2008 Josh Triplett <josh@freedesktop.org> + * Copyright © 2008 Ulrich Eckhardt <doomster@knuut.de> + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * 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, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/staging/xcb-util/PKGBUILD b/staging/xcb-util/PKGBUILD new file mode 100644 index 000000000..373a55b3e --- /dev/null +++ b/staging/xcb-util/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 160249 2012-05-31 16:52:23Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> + +pkgname=xcb-util +pkgver=0.3.9 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('gperf' 'xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4' + 'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/xf86-video-intel/PKGBUILD b/staging/xf86-video-intel/PKGBUILD new file mode 100644 index 000000000..4844cee08 --- /dev/null +++ b/staging/xf86-video-intel/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 160259 2012-05-31 17:10:59Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-intel +pkgver=2.19.0 +pkgrel=3 +pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'udev>=183') +makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') +conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-dri + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD new file mode 100644 index 000000000..ebab05be5 --- /dev/null +++ b/testing/bash/PKGBUILD @@ -0,0 +1,139 @@ +# $Id: PKGBUILD 160232 2012-05-31 11:55:13Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgname=bash +_basever=4.2 +_patchlevel=029 #prepare for some patches +pkgver=$_basever.$_patchlevel +pkgrel=1 +pkgdesc="The GNU Bourne Again shell" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnu.org/software/bash/bash.html" +groups=('base') +backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) +depends=('readline>=6.1' 'glibc') +provides=('sh') +install=bash.install +source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} + dot.bashrc + dot.bash_profile + dot.bash_logout + system.bashrc + system.bash_logout) +if [ $_patchlevel -gt 000 ]; then + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) + done +fi + +build() { + cd ${srcdir}/${pkgname}-$_basever + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" + patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) + done + + _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\' + -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\' + -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' + -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') + export CFLAGS="${CFLAGS} ${_bashconfig[@]}" + + ./configure --prefix=/usr --with-curses --enable-readline \ + --without-bash-malloc --with-installed-readline \ + --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info + make +} + +check() { + cd ${srcdir}/${pkgname}-$_basever + make check +} + +package() { + cd ${srcdir}/${pkgname}-$_basever + make DESTDIR=${pkgdir} install + + # for now, bash is our default /bin/sh + cd ${pkgdir}/bin + ln -s bash sh + + install -dm755 ${pkgdir}/etc/skel/ + + # system-wide configuration files + install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc + install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout + + # user configuration file skeletons + install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc + install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile + install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout +} + +md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' + '8d37a3f97a48c1e56e1a4ded877ed944' + '027d6bd8f5f6a06b75bb7698cb478089' + '2902e0fee7a9168f3a4fd2ccd60ff047' + '42f4400ed2314bd7519c020d0187edc5' + '3546099a1b2f667adc9794f52e78e35b' + '472f536d7c9e8250dc4568ec4cfaf294' + '1100bc1dda2cdc06ac44d7e5d17864a3' + 'a7184b76eb4a079f10174a0a8f574819' + '30e7948079921d3261efcc6a40722135' + 'c4d45307f7e69fe508ce347c4cec1955' + '9ea06decec43a198f3d7cf29acc602f8' + '74bddae6eeb9227a04a467d42597a34d' + 'fb48f6134d7b013135929476aa0c250c' + '3e6a18226b16c773229246abd07a1f5e' + 'e70e45de33426b38153b390be0dbbcd4' + 'e667dc9348ebc3e0e14bfdd87f4b6ff2' + 'ce4e5c484993705b27daa151eca242c2' + '41cbd8e57589bc081a546a014ddb12f8' + '88d1f96db29461767602e2546803bda7' + 'b8b781520f4c7493a2a1ac3010a44a44' + '24c574bf6d6a581e300823d9c1276af6' + '354a0899a7c4b446454c52546562b55b' + '4c5835f2fbab36c4292bb334977e5b6d' + 'ff4547ca7b508d52101729d61f5b77b6' + '0a51602b535ef661ee707be6c8bdb373' + 'cec7c92a4d8052ea4b29216365d16566' + '58deacf3d57cbd75575444ff6a3b0806' + '9ed2a08e549c3c17745f19e8413cfb31' + '72d5059820015231483bb7415d09e9db' + '45b04b41a4230f469d3e47ab9952c2df' + '608336ebe215984ef126e3c29d2d3409' + '623f63025d155a84977b62531e260ee2' + 'ed19da878e3f630834c62b9d9dcc6fce' + 'eef2dd4a0e4505dc8f8e664b40c6cd66' + '2d07daba0b8ca8f876d2aa052ff594b4' + '0cb823a44e6dc1cde7ac97ae5c8163c9' + '53d246537e1fffd1aaa02ba5c056211c' + '60f983a1dded5f0b28040ff4b3f1e9b5' + '304fd129a58fee2d8a34f8b4704db0aa' + '9df4bf4f46aaadc436f430187741f815' + '6921a0b4228fe89b6537a5c29f027c89' + '4ef0e2a2cbfbdd53346f927000b7e112' + '1195d85447f3d048d2c9bcd075fa765c' + 'b0f3a651ce29a1feee687d93177870f1' + 'b09000bba08da6ac753124593850cdf7' + '204bb5054d1f8bafe2b446d4e5d0d99a' + '09d3f96a16b881334cfaee0cf320b47e' + 'aab415350bcc2bb0c29943b413499d96' + '597bf71a2aac6feb510b7505cdd3d4f7' + 'b0db384bdedecafbdd70c8d22c56af5f' + '3fab459b4e09daea529cacad025b13b3' + 'bab99835ad6198cb1109fac89a085262' + '4ad8d11e72afc6090e701073ff034cf4' + '5658ef10c9d0d804126ec1ce700e4e2c' + 'c7d2493e44490f01dd20bdc8feb0a6a7' + 'e4855dbc4b743618b54d408bd5878637' + '9f19c199dd8d1fa9254eebe738759272' + '600c8e90c2fb13cdbc7aa3f18566df03' + 'a6ed82daf034587aee2f2581ba5fe829' + '821620a0389df723644911c56796ca8c' + 'da9265aa2527fd4a7481baa3e0550287' + '0043f8b75f46f43608a67b863e300fe8' + 'ec444d229e8899fbaaf6fc7de2d82ae6' + 'b632fca3a4943825bfaf3bd29df6b27d') diff --git a/testing/bash/bash.install b/testing/bash/bash.install new file mode 100644 index 000000000..bc75e9b6a --- /dev/null +++ b/testing/bash/bash.install @@ -0,0 +1,20 @@ +info_dir=usr/share/info +info_files=(bash.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/testing/bash/dot.bash_logout b/testing/bash/dot.bash_logout new file mode 100644 index 000000000..0e4e4f184 --- /dev/null +++ b/testing/bash/dot.bash_logout @@ -0,0 +1,3 @@ +# +# ~/.bash_logout +# diff --git a/testing/bash/dot.bash_profile b/testing/bash/dot.bash_profile new file mode 100644 index 000000000..5545f007e --- /dev/null +++ b/testing/bash/dot.bash_profile @@ -0,0 +1,5 @@ +# +# ~/.bash_profile +# + +[[ -f ~/.bashrc ]] && . ~/.bashrc diff --git a/testing/bash/dot.bashrc b/testing/bash/dot.bashrc new file mode 100644 index 000000000..a355b0cd3 --- /dev/null +++ b/testing/bash/dot.bashrc @@ -0,0 +1,9 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +alias ls='ls --color=auto' +PS1='[\u@\h \W]\$ ' diff --git a/testing/bash/system.bash_logout b/testing/bash/system.bash_logout new file mode 100644 index 000000000..a76e48e4a --- /dev/null +++ b/testing/bash/system.bash_logout @@ -0,0 +1,3 @@ +# +# /etc/bash.bash_logout +# diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc new file mode 100644 index 000000000..a2231e861 --- /dev/null +++ b/testing/bash/system.bashrc @@ -0,0 +1,23 @@ +# +# /etc/bash.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +PS1='[\u@\h \W]\$ ' +PS2='> ' +PS3='> ' +PS4='+ ' + +case ${TERM} in + xterm*|rxvt*|Eterm|aterm|kterm|gnome*) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + + ;; + screen) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + ;; +esac + +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD new file mode 100644 index 000000000..5a0656731 --- /dev/null +++ b/testing/java7-openjdk/PKGBUILD @@ -0,0 +1,353 @@ +# $Id: PKGBUILD 160312 2012-05-31 21:40:36Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Guillaume ALAUX <guillaume@archlinux.org> + +pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') + # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 +pkgbase=java7-openjdk +_java_ver=7 +_updatever=u4 +_openjdk_build=b21 +_openjdk_date=27_jun_2011 +_icedtea_ver=2.2 +_date=20110922 + +# check "${srcdir}/icedtea7"/Makefile.am +_CORBA_CHANGESET=3231f3e9c517 +_HOTSPOT_CHANGESET=bfe5efd70bce +_JAXP_CHANGESET=0036fe6fe7dc +_JAXWS_CHANGESET=abfb890c262a +_JDK_CHANGESET=839d0155f7cc +_LANGTOOLS_CHANGESET=f855bdb37537 +_OPENJDK_CHANGESET=49a6fc8f712f + +_bootstrap=0 # 0/1 for quick build or full bootstrap + +pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} +pkgrel=1 +arch=('i686' 'x86_64') +url="http://icedtea.classpath.org" +license=('custom') +options=('!emptydirs') +makedepends=('jdk7-openjdk' 'libxp' 'libxslt' + 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2' + 'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`? +[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') + +#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip + +_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2 +source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig} + ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz + ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz + ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz + ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz + ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz + ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz + ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz + fontconfig-paths.diff + fix_corba_cmds_path.diff + openjdk7_fix_jdk_cmds_path.diff + openjdk7_nonreparenting-wm.diff + jdk7-openjdk.profile + jdk7-openjdk.profile.csh + jre7-openjdk.profile + jre7-openjdk.profile.csh) +sha256sums=('98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5' + '9a5e9342111263f76aae4b86ac38e912b60cd81fb49943c3868c8f63e2e21130' + '26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54' + '9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274' + '245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2' + 'e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a' + '19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7' + 'd46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19' + '86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514' + '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' + '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' + 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' + 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' + '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' + '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' + 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' + '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9') + +noextract=("${_OPENJDK_CHANGESET}.tar.gz" + "${_CORBA_CHANGESET}.tar.gz" + "${_JAXP_CHANGESET}.tar.gz" + "${_JAXWS_CHANGESET}.tar.gz" + "${_JDK_CHANGESET}.tar.gz" + "${_LANGTOOLS_CHANGESET}.tar.gz" + "${_HOTSPOT_CHANGESET}.tar.gz") + + _jvmdir=/usr/lib/jvm/java-7-openjdk + + [ "$CARCH" = "x86_64" ] && _JARCH=amd64 + [ "$CARCH" = "i686" ] && _JARCH=i386 + +build() { + cd "${srcdir}/icedtea-${_icedtea_ver}" + + unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS + + # default is to build with first found java-environment found in our repos - is jdk7-openjdk + [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh + + unset MAKEFLAGS # parallel build is currently broken + + export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" + export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" + + . /etc/profile.d/apache-ant.sh + + cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" + + if [ "$_bootstrap" = "1" ]; then + BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" + else + BOOTSTRAPOPT="--disable-bootstrap" + fi + + ./configure \ + $BOOTSTRAPOPT \ + --with-parallel-jobs="${MAKEFLAGS/-j}" \ + --disable-tests \ + --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \ + --with-jdk-home=${JAVA_HOME} \ + --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \ + --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \ + --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \ + --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \ + --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \ + --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ + --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ + --enable-pulse-java \ + --enable-nss \ + --with-rhino \ + --with-abs-install-dir=${_jvmdir} + #--help + #--enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR + + make +} + +check() { + cd "${srcdir}/icedtea-${_icedtea_ver}" + make -k check +} + +package_jre7-openjdk-headless() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs" + depends=('libjpeg-turbo' 'lcms2' 'nss' + 'ca-certificates-java' 'java-rhino') + optdepends=('libcups: needed for Java Mauve support - libmawt.so' + 'fontconfig: needed for Java Mauve support - libmawt.so') + provides=('java-runtime-headless=7') + conflicts=('openjdk6') + # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos + backup=(etc/profile.d/jre.sh + etc/profile.d/jre.csh + etc/java-7-openjdk/calendars.properties + etc/java-7-openjdk/content-types.properties + etc/java-7-openjdk/cursors/cursors.properties + etc/java-7-openjdk/flavormap.properties + etc/java-7-openjdk/fontconfig.bfc + etc/java-7-openjdk/fontconfig.properties + etc/java-7-openjdk/jvm.cfg + etc/java-7-openjdk/logging.properties + etc/java-7-openjdk/management/jmxremote.access + etc/java-7-openjdk/management/jmxremote.password + etc/java-7-openjdk/management/management.properties + etc/java-7-openjdk/management/snmp.acl + etc/java-7-openjdk/net.properties + etc/java-7-openjdk/psfont.properties.ja + etc/java-7-openjdk/psfontj2d.properties + etc/java-7-openjdk/security/java.policy + etc/java-7-openjdk/security/java.security + etc/java-7-openjdk/security/nss.cfg + etc/java-7-openjdk/sound.properties + etc/java-7-openjdk/tz.properties) + install=jre7-openjdk-headless.install + + cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" + + mv lib/fontconfig.Ubuntu.properties.src lib/fontconfig.properties + mv lib/fontconfig.Ubuntu.bfc lib/fontconfig.bfc + rm -f lib/fontconfig.*.bfc + rm -f lib/fontconfig.*.properties.src + rm -f lib/fontconfig.properties.src + + install -d -m755 ${pkgdir}/${_jvmdir}/jre/ + cp -a bin lib ${pkgdir}/${_jvmdir}/jre + + # Install man pages + pushd ../../j2re-image/man + install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/ + install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1 + install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1 + popd + + # more files that belong to the desktop package + mkdir ${srcdir}/tmp-desktop-jre + for file in \ + "/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \ + "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \ + "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \ + "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \ + "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \ + "/usr/share/man/ja/man1/policytool.1" \ + "/usr/share/man/man1/policytool.1"; do + dirname=`dirname $file` + install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true + # mv file from fakeinstall to pkgdir + mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file + done + rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt + + # Link binaries into /usr/bin + pushd ${pkgdir}/${_jvmdir}/jre/bin + install -m755 -d ${pkgdir}/usr/bin/ + for file in *; do + ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin + done + popd + + # Link JKS keystore from ca-certificates-java + rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" + + # Set some variables + install -m755 -d ${pkgdir}/etc/profile.d/ + install -m755 ${srcdir}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh + install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh + + # Install license + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ + install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ + ${pkgdir}/usr/share/licenses/${pkgbase} + + # Put some more files under backup control + install -m755 -d ${pkgdir}/etc/java-7-openjdk/ + install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ + # install dummy links to make them found by JAVA + cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/ + for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do + ln -vsf /etc/java-7-openjdk/`basename $file` . + done + # some more + install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security} + install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/ + pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/ + ln -vsf /etc/java-7-openjdk/cursors/cursors.properties . + popd + mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password + mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl + install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/ + pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management + ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} . + popd + install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/ + pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security + ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} . + popd + install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ + install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ + pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/ + ln -vsf /etc/java-7-openjdk/jvm.cfg . + popd +} + +package_jre7-openjdk() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs" + depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme') + optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' + 'alsa-lib: for basic sound support' + 'giflib: for gif format support' + 'libpulse: for advanced sound support' + 'gtk2: for the Gtk+ look and feel - desktop usage' + 'libxtst: linked in xawt/libmawt.so - desktop usage') + install=jre7-openjdk.install + provides=('java-runtime=7') + conflicts=('openjdk6') + + mv ${srcdir}/tmp-desktop-jre/* ${pkgdir} + # Link binaries into /usr/bin + pushd ${pkgdir}/${_jvmdir}/jre/bin + install -m755 -d ${pkgdir}/usr/bin/ + for file in *; do + ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin + done + popd + + cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" + + # Install icons and menu entries + for s in 16 24 32 48 ; do + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/ + install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ + ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png + done + + # Install desktop files. + install -m755 -d ${pkgdir}/usr/share/applications + install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications +} + +package_jdk7-openjdk() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK" + depends=('jre7-openjdk') + provides=('java-environment=7') + conflicts=('java-environment') + # replaces=('openjdk6') + backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh) + + cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" + + # Main files + install -m755 -d ${pkgdir}/${_jvmdir}/ + + cp -a demo include lib sample ${pkgdir}/${_jvmdir} + + # 'bin' files + pushd bin + install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ + ${pkgdir}/usr/bin/ \ + ${pkgdir}/usr/share/man/{,ja/}man1/ + + # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page + for b in $(ls | grep -v java-rmi.cgi); do + if [ -e ../jre/bin/${b} ]; then + # Provide a link of the jre binary in the jdk/bin/ directory + ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b} + else + # Copy binary to jdk/bin/ + install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} + # Copy man page + install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1 + install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1 + # Link from /bin/ + ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b} + fi + done + popd + + # Install desktop files. + install -m755 -d ${pkgdir}/usr/share/applications + install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications + + # Handling 'java-rmi.cgi' separately + install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi + + # Set some variables + install -m755 -d ${pkgdir}/etc/profile.d/ + install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh + install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh +} + +package_openjdk7-src() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources" + + install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ + ${pkgdir}/${_jvmdir}/src.zip +} diff --git a/testing/java7-openjdk/fix_corba_cmds_path.diff b/testing/java7-openjdk/fix_corba_cmds_path.diff new file mode 100644 index 000000000..7a3db9567 --- /dev/null +++ b/testing/java7-openjdk/fix_corba_cmds_path.diff @@ -0,0 +1,29 @@ +--- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 ++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 +@@ -76,7 +76,7 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio + CUT = $(UTILS_USR_BIN_PATH)cut +@@ -125,7 +125,7 @@ + TAIL = $(UTILS_USR_BIN_PATH)tail + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test +-TOUCH = $(UTILS_COMMAND_PATH)touch ++TOUCH = $(UTILS_USR_BIN_PATH)touch + TR = $(UTILS_USR_BIN_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname +@@ -176,7 +176,7 @@ + # others have it in /usr/bin. + SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ + $(wildcard $(UTILS_USR_BIN_PATH)sort)) +- NAWK = $(USRBIN_PATH)gawk ++ NAWK = $(UTILS_COMMAND_PATH)gawk + # Intrinsic unix command, with backslash-escaped character interpretation + ECHO = /bin/echo -e + # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/testing/java7-openjdk/fontconfig-paths.diff b/testing/java7-openjdk/fontconfig-paths.diff new file mode 100644 index 000000000..fa08db629 --- /dev/null +++ b/testing/java7-openjdk/fontconfig-paths.diff @@ -0,0 +1,134 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000 +@@ -275,73 +275,61 @@ + + # Font File Names + +-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf +-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf +-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf +-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf +- +-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf +-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf +-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf +-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf +- +-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf +-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf +-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf +-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf +- +-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf +- +-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf +-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf +-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf +-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf +-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf +-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf +-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf +-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf +-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf +- +-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf +-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf +-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf +-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf +- +-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf +-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf +-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf +-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf +-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf +-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf +-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf +-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf +-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf +-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf +-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf +-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf +- +-# AWT X11 font paths +-awtfontpath.latin-1=/usr/share/fonts/X11/Type1 +-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic +-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic +-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic +-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic +-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy +-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi +-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami +-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic +-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk +-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts ++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf ++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf ++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf ++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf ++ ++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf ++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf ++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf ++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf ++ ++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf ++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf ++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf ++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf ++ ++filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf ++ ++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf ++filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf ++filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf ++filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf ++filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf ++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf ++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf ++filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf ++filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf ++ ++filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf ++filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf ++#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf ++filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf ++filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf ++filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf ++filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf ++ ++filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf ++filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf ++filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf ++filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf ++filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf ++filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf ++filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf ++filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf ++filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf ++filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf ++filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf ++filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf ++ diff --git a/testing/java7-openjdk/jdk7-openjdk.profile b/testing/java7-openjdk/jdk7-openjdk.profile new file mode 100644 index 000000000..91265cc86 --- /dev/null +++ b/testing/java7-openjdk/jdk7-openjdk.profile @@ -0,0 +1,6 @@ +export J2SDKDIR=/usr/lib/jvm/java-7-openjdk +export J2REDIR=$J2SDKDIR/jre +export JAVA_HOME=/usr/lib/jvm/java-7-openjdk + +# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' +# in /etc/profile.d/jre7.sh diff --git a/testing/java7-openjdk/jdk7-openjdk.profile.csh b/testing/java7-openjdk/jdk7-openjdk.profile.csh new file mode 100644 index 000000000..cc7dc8ab1 --- /dev/null +++ b/testing/java7-openjdk/jdk7-openjdk.profile.csh @@ -0,0 +1 @@ +setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk" diff --git a/testing/java7-openjdk/jre7-openjdk-headless.install b/testing/java7-openjdk/jre7-openjdk-headless.install new file mode 100644 index 000000000..45f52fe32 --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk-headless.install @@ -0,0 +1,15 @@ +post_install() { + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi +} + +post_upgrade() { + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi +} + +#post_remove() { +# +#} diff --git a/testing/java7-openjdk/jre7-openjdk.install b/testing/java7-openjdk/jre7-openjdk.install new file mode 100644 index 000000000..d98e79ec5 --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk.install @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + echo "when you use a non-reparenting window manager" + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" + echo "/etc/profile.d/jre.sh" +# update-desktop-database -q +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +# update-desktop-database -q +} + + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +# update-desktop-database -q +} diff --git a/testing/java7-openjdk/jre7-openjdk.profile b/testing/java7-openjdk/jre7-openjdk.profile new file mode 100644 index 000000000..c86ce857a --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk.profile @@ -0,0 +1,5 @@ +export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre +export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre} + +# enable this for non-reparenting window managers +#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/testing/java7-openjdk/jre7-openjdk.profile.csh b/testing/java7-openjdk/jre7-openjdk.profile.csh new file mode 100644 index 000000000..a9aed27d1 --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk.profile.csh @@ -0,0 +1,5 @@ +setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre" +setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre" + +# enable this for non-reparenting window managers +#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff new file mode 100644 index 000000000..6cac91dd6 --- /dev/null +++ b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff @@ -0,0 +1,36 @@ +--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 +@@ -91,7 +91,7 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio + CUT = $(UTILS_USR_BIN_PATH)cut +@@ -101,13 +101,13 @@ + DIRNAME = $(UTILS_USR_BIN_PATH)dirname + DUMP = $(UTILS_CCS_BIN_PATH)dump + ECHO = $(UTILS_COMMAND_PATH)echo +-EGREP = $(UTILS_COMMAND_PATH)egrep ++EGREP = $(UTILS_USR_BIN_PATH)egrep + EXPR = $(UTILS_USR_BIN_PATH)expr + FILE = $(UTILS_USR_BIN_PATH)file + FIND = $(UTILS_USR_BIN_PATH)find + FMT = $(UTILS_COMMAND_PATH)fmt + GDB = $(UTILS_USR_BIN_PATH)gdb +-GREP = $(UTILS_COMMAND_PATH)grep ++GREP = $(UTILS_USR_BIN_PATH)grep + GUNZIP = $(UTILS_COMMAND_PATH)gunzip + # GZIP is used for solaris. Linux and windows use tar czf + GZIP = $(UTILS_COMMAND_PATH)gzip +@@ -140,7 +140,7 @@ + TAIL = $(UTILS_USR_BIN_PATH)tail + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test +-TOUCH = $(UTILS_COMMAND_PATH)touch ++TOUCH = $(UTILS_USR_BIN_PATH)touch + TR = $(UTILS_USR_BIN_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff new file mode 100644 index 000000000..22d54fc42 --- /dev/null +++ b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff @@ -0,0 +1,58 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 +@@ -103,7 +103,8 @@ + COMPIZ_WM = 12, + LG3D_WM = 13, + CWM_WM = 14, +- MUTTER_WM = 15; ++ MUTTER_WM = 15, ++ OTHER_NONREPARENTING_WM = 16; + public String toString() { + switch (WMID) { + case NO_WM: +@@ -583,7 +584,7 @@ + // TODO: according to wikipedia, compiz is now reparenting. This should + // probably be updated. + static boolean isNonReparentingWM() { +- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM); ++ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); + } + + /* +@@ -771,9 +772,17 @@ + * supports WIN or _NET wm spec. + */ + else if (l_net_protocol.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } else if (win.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } + /* + * Check for legacy WMs. +@@ -784,6 +793,8 @@ + awt_wmgr = XWM.MOTIF_WM; + } else if (isOpenLook()) { + awt_wmgr = XWM.OPENLOOK_WM; ++ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; + } +@@ -1298,6 +1309,7 @@ + res = new Insets(28, 6, 6, 6); + break; + case NO_WM: ++ case OTHER_NONREPARENTING_WM: + case LG3D_WM: + res = zeroInsets; + break; diff --git a/testing/lighttpd/PKGBUILD b/testing/lighttpd/PKGBUILD index 1d0748828..ec4162aa4 100644 --- a/testing/lighttpd/PKGBUILD +++ b/testing/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160045 2012-05-28 14:12:38Z pierre $ +# $Id: PKGBUILD 160272 2012-05-31 20:35:57Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd -pkgver=1.4.30 -pkgrel=6 +pkgver=1.4.31 +pkgrel=1 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -16,15 +16,16 @@ optdepends=('libxml2: mod_webdav' 'sqlite: mod_webdav') backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') options=('!libtool' 'emptydirs') +install='lighttpd.install' source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz" "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') -sha256sums=('c237692366935b19ef8a6a600b2f3c9b259a9c3107271594c081a45902bd9c9b' - '941ab747aeb97ca111fb670d21eefecdf745debc5e139bc5bd6881ee66b2742a' - 'dacfa1d748e5ac38c2d51d8310acad76d85ba5c1fe02a93534cf032400429257' +sha256sums=('8a0a4f1ab782c2a3554e031c7d8ad600aac9b4c0466710a6cc9aab10659fe3f2' + '0ba44866f6ebdf6fefc8efba89240eacff075b5d1b80e0d7a9e0479491ff01a7' + '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17' '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77' 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa' - '758275bd8d17115394caabc46e1bbbad01934b20ea957c7984d0b6ba78c4fd40' + 'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871' '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696') build() { diff --git a/testing/lighttpd/lighttpd.install b/testing/lighttpd/lighttpd.install new file mode 100644 index 000000000..6b471f633 --- /dev/null +++ b/testing/lighttpd/lighttpd.install @@ -0,0 +1,9 @@ +post_install() { + if [[ ! -d run/lighttpd ]]; then + usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/lighttpd.conf + fi +} + +post_upgrade() { + post_install +} diff --git a/testing/lighttpd/lighttpd.rc.d b/testing/lighttpd/lighttpd.rc.d index 7b16cba63..c2c41b818 100644 --- a/testing/lighttpd/lighttpd.rc.d +++ b/testing/lighttpd/lighttpd.rc.d @@ -4,7 +4,7 @@ . /etc/rc.d/functions -pid_file='/var/run/lighttpd/lighttpd-angel.pid' +pid_file='/run/lighttpd/lighttpd-angel.pid' get_pid() { if [ -r "${pid_file}" ]; then diff --git a/testing/lighttpd/lighttpd.tmpfiles b/testing/lighttpd/lighttpd.tmpfiles index eb1a7699e..e39cd425d 100644 --- a/testing/lighttpd/lighttpd.tmpfiles +++ b/testing/lighttpd/lighttpd.tmpfiles @@ -1,2 +1,2 @@ -d /var/run/lighttpd 755 http http - +d /run/lighttpd 755 http http - d /var/cache/lighttpd 755 http http 10d diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD index d5e0a7e03..db0d28e55 100644 --- a/testing/php/PKGBUILD +++ b/testing/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160031 2012-05-28 10:36:59Z pierre $ +# $Id: PKGBUILD 160226 2012-05-31 10:48:16Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.3 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' @@ -36,11 +36,11 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" md5sums=('51f9488bf8682399b802c48656315cac' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - '61837f1e9b50d7fdf4c8d1f81fa153f7' - '59b3a25f9eb3afc02f1adf9ee699808c' - 'a2af49da239122eb45744f4446752050' - '84d0a4caf8d735279cf4500d1772e2a5' - 'e808f39a075dd53cd8da70d984d0e166') + 'aabda9f3f2f8b9d8fdc9558c31c718db' + '825e580dd5708d959b50944afa1b12b6' + 'f56b5bb7e93c802ae8519182fbea3387' + '86c73d481f3099e740e602869bacf637' + 'c60343df74f8e1afb13b084d5c0e47ed') build() { phpconfig="--srcdir=../${pkgbase}-${pkgver} \ @@ -235,6 +235,7 @@ package_php-fpm() { pkgdesc='FastCGI Process Manager for PHP' depends=('php') backup=('etc/php/php-fpm.conf') + install='php-fpm.install' install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm index b4fe083a8..ac2d92a36 100644 --- a/testing/php/logrotate.d.php-fpm +++ b/testing/php/logrotate.d.php-fpm @@ -3,6 +3,6 @@ notifempty delaycompress postrotate - kill -USR1 `cat /var/run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true + kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true endscript } diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch index 4e0f4a888..0b17182fd 100644 --- a/testing/php/php-fpm.conf.in.patch +++ b/testing/php/php-fpm.conf.in.patch @@ -14,7 +14,7 @@ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ ; Default Value: none -;pid = run/php-fpm.pid -+pid = run/php-fpm/php-fpm.pid ++pid = /run/php-fpm/php-fpm.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written @@ -24,7 +24,7 @@ ; Note: This value is mandatory. -listen = 127.0.0.1:9000 +;listen = 127.0.0.1:9000 -+listen = /var/run/php-fpm/php-fpm.sock ++listen = /run/php-fpm/php-fpm.sock ; Set listen(2) backlog. ; Default Value: 128 (-1 on FreeBSD and OpenBSD) diff --git a/testing/php/php-fpm.install b/testing/php/php-fpm.install new file mode 100644 index 000000000..41fc37c22 --- /dev/null +++ b/testing/php/php-fpm.install @@ -0,0 +1,9 @@ +post_install() { + if [[ ! -d run/php-fpm ]]; then + usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf + fi +} + +post_upgrade() { + post_install +} diff --git a/testing/php/php-fpm.service b/testing/php/php-fpm.service index 3ef95a83a..e29f7c236 100644 --- a/testing/php/php-fpm.service +++ b/testing/php/php-fpm.service @@ -4,7 +4,7 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=/var/run/php-fpm/php-fpm.pid +PIDFile=/run/php-fpm/php-fpm.pid PrivateTmp=true ExecStart=/usr/sbin/php-fpm ExecReload=/bin/kill -USR2 $MAINPID diff --git a/testing/php/php-fpm.tmpfiles b/testing/php/php-fpm.tmpfiles index d7ad96545..801e74f1e 100644 --- a/testing/php/php-fpm.tmpfiles +++ b/testing/php/php-fpm.tmpfiles @@ -1 +1 @@ -d /var/run/php-fpm 755 root root +d /run/php-fpm 755 root root diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm index c75d905e5..3b3ec20de 100644 --- a/testing/php/rc.d.php-fpm +++ b/testing/php/rc.d.php-fpm @@ -64,7 +64,7 @@ case "$1" in exit 1 fi - wait_for_pid created /var/run/php-fpm/php-fpm.pid + wait_for_pid created /run/php-fpm/php-fpm.pid if [ -n "$try" ] ; then stat_fail @@ -79,14 +79,14 @@ case "$1" in test_config stat_busy 'Gracefully shutting down php-fpm' - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then stat_fail exit 1 fi - kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + kill -QUIT `cat /run/php-fpm/php-fpm.pid` - wait_for_pid removed /var/run/php-fpm.pid + wait_for_pid removed /run/php-fpm.pid if [ -n "$try" ] ; then stat_fail @@ -100,14 +100,14 @@ case "$1" in force-quit) stat_busy 'Terminating php-fpm' - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then stat_fail exit 1 fi - kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + kill -TERM `cat /run/php-fpm/php-fpm.pid` - wait_for_pid removed /var/run/php-fpm/php-fpm.pid + wait_for_pid removed /run/php-fpm/php-fpm.pid if [ -n "$try" ] ; then stat_fail @@ -127,12 +127,12 @@ case "$1" in test_config stat_busy 'Reload service php-fpm' - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + if [ ! -r /run/php-fpm/php-fpm.pid ] ; then stat_fail exit 1 fi - kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` + kill -USR2 `cat /run/php-fpm/php-fpm.pid` stat_done ;; diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD new file mode 100644 index 000000000..51f04c767 --- /dev/null +++ b/testing/sudo/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 160229 2012-05-31 11:41:21Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=sudo +_ver=1.8.5p2 +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +pkgrel=1 +pkgdesc="Give certain users the ability to run some commands as root" +arch=('i686' 'x86_64') +url="http://www.sudo.ws/sudo/" +license=('custom') +depends=('glibc' 'pam') +backup=('etc/sudoers' 'etc/pam.d/sudo') +options=('!libtool' '!makeflags') +source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} + sudo.pam) +md5sums=('dc42ed9f0946d92273762d0ae7314d59' + '756d80fc1c996d4f5458deec5a69b5c4' + '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') + +build() { + cd "$srcdir/$pkgname-$_ver" + + ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ + --with-env-editor --with-all-insults --with-logfac=auth + make +} + +check() { + cd "$srcdir/$pkgname-$_ver" + make check +} + +package() { + cd "$srcdir/$pkgname-$_ver" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" + + install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" +} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam new file mode 100644 index 000000000..4e586cd22 --- /dev/null +++ b/testing/sudo/sudo.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so |