diff options
107 files changed, 1503 insertions, 398 deletions
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index 7fd861848..101f4950e 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 55940 2011-09-26 09:58:23Z lfleischer $ +# $Id: PKGBUILD 57078 2011-10-20 17:07:27Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.7.6 +pkgver=0.7.7 pkgrel=1 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64') url='http://cclive.sourceforge.net/' license=('GPL3') -depends=('boost-libs' 'quvi') +depends=('boost-libs' 'pcre' 'curl' 'libquvi') makedepends=('boost') source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") -md5sums=('714ecd9952f79ac9d2c954e5e84fb843') +md5sums=('8265be865a22fb477bcc050f0dc310dc') build() { cd "$pkgname-$pkgver" diff --git a/community/clamz/PKGBUILD b/community/clamz/PKGBUILD index 3b784be5d..d08c07921 100644 --- a/community/clamz/PKGBUILD +++ b/community/clamz/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 53892 2011-08-09 12:18:03Z lfleischer $ +# $Id: PKGBUILD 57080 2011-10-20 17:17:06Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=clamz pkgver=0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Command-line program to download MP3 files from Amazon.com's music store." arch=('i686' 'x86_64') url='http://code.google.com/p/clamz/' license=('GPL3') depends=('libgcrypt' 'curl' 'expat' 'shared-mime-info' 'desktop-file-utils') install='clamz.install' -source=("http://clamz.googlecode.com/files/clamz-${pkgver}.tar.gz") -md5sums=('ab7661340ee27d206f36064cfbd5bfa4') +source=("http://clamz.googlecode.com/files/clamz-${pkgver}.tar.gz" + 'unencrypted-amz.patch') +md5sums=('ab7661340ee27d206f36064cfbd5bfa4' + '603ef334d297614edabbd1bf5bfe585d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/clamz/unencrypted-amz.patch b/community/clamz/unencrypted-amz.patch new file mode 100644 index 000000000..49b03ba8a --- /dev/null +++ b/community/clamz/unencrypted-amz.patch @@ -0,0 +1,27 @@ +--- playlist.c 2010-04-19 16:01:59.000000000 -0700 ++++ clamz-0.4/playlist.c 2011-10-18 20:35:39.850146353 -0700 +@@ -499,12 +499,21 @@ + { + struct parseinfo pi; + unsigned char *decrypted, *xml; +- unsigned long decrypted_len; ++ unsigned long decrypted_len, i; + int xerr; + + decrypted = decrypt_amz_file(b64data, b64len, fname); +- if (!decrypted) +- return 1; ++ if (!decrypted){ ++ // XXX Perhaps the code file is unencrypted already. ++ decrypted = malloc((b64len + 1) * sizeof(char)); ++ if (!decrypted) { ++ print_error("Out of memory"); ++ return 1; ++ } ++ for (i = 0; i < b64len; i++) { ++ decrypted[i] = b64data[i]; ++ } ++ } + decrypted_len = strlen((char*) decrypted); + + pi.parser = XML_ParserCreate(NULL); diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index a4dbf7ccb..967663b78 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56108 2011-10-01 18:56:09Z ibiru $ +# $Id: PKGBUILD 57063 2011-10-20 05:50:26Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Contributor: Hugo Doria <hugo@archlinux.org> #Contributor: Sergej Chodarev <sergejx@centrum.sk> #Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Set of plugins for gedit" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gedit-plugins.install source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('c8d617a107478dba6ef0ab16e87707c5526e97eefab24a65891dbf9aa32e7839') +sha256sums=('45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index 10d1a3ac6..0c116b3cd 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 55999 2011-09-28 14:40:31Z mherych $ +# $Id: PKGBUILD 57067 2011-10-20 15:00:52Z bpiotrowski $ # Maintainer: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" arch=('i686' 'x86_64') url="http://www.kadu.net/" license=('GPL') -depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('6d3e9889f53cf10c2cd9499aabbff67a') +md5sums=('6211a9a9e02d645268cbf055892601a0') build() { cd $srcdir/kadu-$pkgver diff --git a/community/libquvi/PKGBUILD b/community/libquvi/PKGBUILD new file mode 100644 index 000000000..1f0d35065 --- /dev/null +++ b/community/libquvi/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 57076 2011-10-20 17:03:18Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> + +pkgname=libquvi +pkgver=0.4.0 +pkgrel=2 +pkgdesc='Library for parsing video download links.' +arch=('i686' 'x86_64') +url='http://quvi.sourceforge.net/' +license=('LGPL') +depends=('libquvi-scripts' 'curl' 'lua') +conflicts=('quvi<0.4.0') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz") +md5sums=('85c47035105b6b523a28793d4f6da9f1') + +build() { + cd "${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD index e6ca08f12..45614fd8c 100644 --- a/community/mxml/PKGBUILD +++ b/community/mxml/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 4277 2009-10-19 20:28:23Z giovanni $ +# $Id: PKGBUILD 57065 2011-10-20 07:22:50Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=mxml pkgver=2.6 -pkgrel=1 -pkgdesc="A small XML parsing library " +pkgrel=2 +pkgdesc="A small XML parsing library" arch=('i686' 'x86_64') url="http://www.minixml.org/" license=('LGPL') -depends=('glibc') -source=(http://ftp.easysw.com/pub/mxml/$pkgver/$pkgname-$pkgver.tar.gz) +source=("http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") md5sums=('68977789ae64985dddbd1a1a1652642e') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make DSTROOT=$pkgdir install - chmod -x $pkgdir/usr/lib/libmxml.a + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DSTROOT="$pkgdir" install + chmod -x "$pkgdir/usr/lib/libmxml.a" } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index b10a7dde9..234666119 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9179 +pkgver=9306 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('MIT') makedepends=('pkgconfig') depends=('gtk2') source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz") -md5sums=('f724413049ff2a3cc00799793190b1d0') +md5sums=('30eac18bcfe1e202003709a8281a81bc') build() { cd ${srcdir}/${pkgname}-r${pkgver} diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD index 4194f970b..d90b7e798 100644 --- a/community/quvi/PKGBUILD +++ b/community/quvi/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 53820 2011-08-08 14:10:47Z lfleischer $ +# $Id: PKGBUILD 57074 2011-10-20 16:44:35Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us pkgname=quvi -pkgver=0.2.19 +pkgver=0.4.0 pkgrel=1 pkgdesc='Command-line tool for parsing video download links.' arch=('i686' 'x86_64') url='http://quvi.sourceforge.net/' license=('LGPL') -depends=('curl' 'pcre' 'lua') +depends=('libquvi') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('c96627374377b049ac60e7642eb7f838') +md5sums=('302652f7e3d97051d7250e3a7bc04250') build() { cd "${pkgname}-${pkgver}" diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 08160bda1..d45cbd58d 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.30.02 +pkgver=5.30.03 pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'rootd' 'root.desktop' 'root.xml') -md5sums=('8a5a5451ddaae276abc9d2e263b29b88' +md5sums=('d2c39bf7640bdd26d4645c52c504cc24' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index 5904f5ef7..4e2739fb2 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 53809 2011-08-08 10:37:58Z jelle $ +# $Id: PKGBUILD 57058 2011-10-20 04:40:39Z bpiotrowski $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=vhba-module -pkgver=20110416 +pkgver=20110915 _kernver='3.0-ARCH' -pkgrel=2 +pkgrel=1 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" @@ -14,7 +14,7 @@ depends=('linux>=3.0' 'linux<3.1') makedepends=('linux-headers>=3.0') install=vhba-module.install source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz) -md5sums=('2f91dd4ee8648da92d625221d4275b60') +md5sums=('fb90cd8fc4cd74d08c92e8235f99f1f4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index edb9e8d2b..75669d1a5 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -1,7 +1,7 @@ post_install() { echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." echo ">> This module needs to be recompiled for every kernel version upgrade." - KERNEL_VERSION='2.6.39-ARCH' + KERNEL_VERSION='3.0-ARCH' depmod $KERNEL_VERSION > /dev/null 2>&1 } @@ -10,7 +10,7 @@ post_upgrade() { } post_remove() { - KERNEL_VERSION='2.6.39-ARCH' + KERNEL_VERSION='3.0-ARCH' depmod $KERNEL_VERSION > /dev/null 2>&1 } diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 662893003..6c37dd14b 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140113 2011-10-07 08:18:56Z ibiru $ +# $Id: PKGBUILD 140832 2011-10-20 05:41:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -15,7 +15,7 @@ options=('!libtool' '!docs' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz glib2.sh glib2.csh) -sha256sums=('d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1' +sha256sums=('82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index b86c0a91c..38cf23966 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139635 2011-10-03 23:42:42Z stephane $ +# $Id: PKGBUILD 141000 2011-10-21 02:57:57Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.9.1 -pkgrel=4 +pkgrel=5 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -18,12 +18,14 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-sig krb5-kadmind krb5-kdc krb5-1.9.1-config-script.patch - krb5-1.9.1-canonicalize-fallback.patch) + krb5-1.9.1-canonicalize-fallback.patch + krb5-1.9.1-2011-006.patch) sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' '7342410760cf44bfa01bb99bb4c49e12496cb46f' - '238c268fa6cb42fc7324ab54db9abda5cd77f833') + '238c268fa6cb42fc7324ab54db9abda5cd77f833' + '0b0016b0e341dcf720f67925b0d451b328e02583') options=('!emptydirs') build() { @@ -47,6 +49,10 @@ build() { # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + # KDC denial of service vulnerabilities + # http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-006.txt + patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-006.patch + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ diff --git a/core/krb5/krb5-1.9.1-2011-006.patch b/core/krb5/krb5-1.9.1-2011-006.patch new file mode 100644 index 000000000..05a22caf5 --- /dev/null +++ b/core/krb5/krb5-1.9.1-2011-006.patch @@ -0,0 +1,75 @@ +diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c +index b473611..50c60b7 100644 +--- a/src/plugins/kdb/db2/lockout.c ++++ b/src/plugins/kdb/db2/lockout.c +@@ -169,6 +169,9 @@ krb5_db2_lockout_audit(krb5_context context, + return 0; + } + ++ if (entry == NULL) ++ return 0; ++ + if (!db_ctx->disable_lockout) { + code = lookup_lockout_policy(context, entry, &max_fail, + &failcnt_interval, &lockout_duration); +@@ -176,6 +179,15 @@ krb5_db2_lockout_audit(krb5_context context, + return code; + } + ++ /* ++ * Don't continue to modify the DB for an already locked account. ++ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and ++ * this check is unneeded, but in rare cases, we can fail with an ++ * integrity error or preauth failure before a policy check.) ++ */ ++ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry)) ++ return 0; ++ + /* Only mark the authentication as successful if the entry + * required preauthentication, otherwise we have no idea. */ + if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) { +diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c +index 552e39a..c2f44ab 100644 +--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c ++++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c +@@ -105,6 +105,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor, + CHECK_LDAP_HANDLE(ldap_context); + + if (is_principal_in_realm(ldap_context, searchfor) != 0) { ++ st = KRB5_KDB_NOENTRY; + krb5_set_error_message (context, st, "Principal does not belong to realm"); + goto cleanup; + } +diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c +index a218dc7..fd164dd 100644 +--- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c ++++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c +@@ -165,6 +165,9 @@ krb5_ldap_lockout_audit(krb5_context context, + return 0; + } + ++ if (entry == NULL) ++ return 0; ++ + if (!ldap_context->disable_lockout) { + code = lookup_lockout_policy(context, entry, &max_fail, + &failcnt_interval, +@@ -173,9 +176,16 @@ krb5_ldap_lockout_audit(krb5_context context, + return code; + } + +- entry->mask = 0; ++ /* ++ * Don't continue to modify the DB for an already locked account. ++ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and ++ * this check is unneeded, but in rare cases, we can fail with an ++ * integrity error or preauth failure before a policy check.) ++ */ ++ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry)) ++ return 0; + +- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry)); ++ entry->mask = 0; + + /* Only mark the authentication as successful if the entry + * required preauthentication, otherwise we have no idea. */ diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 218d6f3e1..a64e19690 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,30 +1,38 @@ -# $Id: PKGBUILD 137228 2011-09-06 21:10:41Z dan $ +# $Id: PKGBUILD 140981 2011-10-20 13:56:51Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=libarchive pkgver=2.8.5 -pkgrel=1 +pkgrel=2 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.googlecode.com/" license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz") -md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90') -sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d') +source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" + release-2.8-fixes.patch) +md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90' + '14dbbf2d31d68d8eedb93ec5531f3b0c') +sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d' + 'fcadc5ac3020a9fab5922d343baca28f067cc051e9b6f59e480349ba5b0a5060') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + patch -Np0 < ../release-2.8-fixes.patch ./configure --prefix=/usr --without-xml2 make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - install -D -m644 COPYING $pkgdir/usr/share/licenses/libarchive/COPYING + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING } diff --git a/core/libarchive/release-2.8-fixes.patch b/core/libarchive/release-2.8-fixes.patch new file mode 100644 index 000000000..c21eeaa7b --- /dev/null +++ b/core/libarchive/release-2.8-fixes.patch @@ -0,0 +1,234 @@ +Index: build/cmake/config.h.in +=================================================================== +--- build/cmake/config.h.in (revision 3670) ++++ build/cmake/config.h.in (revision 3737) +@@ -1,5 +1,8 @@ + /* config.h. Generated from config.h.cmake by cmake configure */ + ++/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */ ++#cmakedefine ZLIB_WINAPI 1 ++ + /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */ + #cmakedefine ARCHIVE_HASH_MD5_LIBC + +Index: libarchive/archive_read_support_format_all.c +=================================================================== +--- libarchive/archive_read_support_format_all.c (revision 3670) ++++ libarchive/archive_read_support_format_all.c (revision 3737) +@@ -1,5 +1,5 @@ + /*- +- * Copyright (c) 2003-2007 Tim Kientzle ++ * Copyright (c) 2003-2011 Tim Kientzle + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -39,5 +39,13 @@ + archive_read_support_format_tar(a); + archive_read_support_format_xar(a); + archive_read_support_format_zip(a); ++ ++ /* Note: We always return ARCHIVE_OK here, even if some of the ++ * above return ARCHIVE_WARN. The intent here is to enable ++ * "as much as possible." Clients who need specific ++ * compression should enable those individually so they can ++ * verify the level of support. */ ++ /* Clear any warning messages set by the above functions. */ ++ archive_clear_error(a); + return (ARCHIVE_OK); + } +Index: libarchive/archive_write_disk.c +=================================================================== +--- libarchive/archive_write_disk.c (revision 3670) ++++ libarchive/archive_write_disk.c (revision 3737) +@@ -1513,6 +1513,22 @@ + } + + #if defined(_WIN32) || defined(__CYGWIN__) ++static int ++guidword(const char *p, int n) ++{ ++ int i; ++ ++ for (i = 0; i < n; i++) { ++ if ((*p >= '0' && *p <= '9') || ++ (*p >= 'a' && *p <= 'f') || ++ (*p >= 'A' && *p <= 'F')) ++ p++; ++ else ++ return (-1); ++ } ++ return (0); ++} ++ + /* + * 1. Convert a path separator from '\' to '/' . + * We shouldn't check multi-byte character directly because some +@@ -1521,26 +1537,92 @@ + * 2. Replace unusable characters in Windows with underscore('_'). + * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx + */ +-static void ++static int + cleanup_pathname_win(struct archive_write_disk *a) + { + wchar_t wc; + char *p; + size_t alen, l; + +- alen = 0; +- l = 0; +- for (p = a->name; *p != '\0'; p++) { +- ++alen; +- if (*p == '\\') +- l = 1; ++ p = a->name; ++ /* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or ++ * "\\?\Volume{GUID}\" ++ * (absolute path prefixes used by Windows API) */ ++ if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) && ++ (p[2] == '.' || p[2] == '?') && (p[3] == '\\' || p[3] == '/')) ++ { ++ /* A path begin with "\\?\UNC\" */ ++ if (p[2] == '?' && ++ (p[4] == 'U' || p[4] == 'u') && ++ (p[5] == 'N' || p[5] == 'n') && ++ (p[6] == 'C' || p[6] == 'c') && ++ (p[7] == '\\' || p[7] == '/')) ++ p += 8; ++ /* A path begin with "\\?\Volume{GUID}\" */ ++ else if (p[2] == '?' && ++ (p[4] == 'V' || p[4] == 'v') && ++ (p[5] == 'O' || p[5] == 'o') && ++ (p[6] == 'L' || p[6] == 'l') && ++ (p[7] == 'U' || p[7] == 'u') && ++ (p[8] == 'M' || p[8] == 'm') && ++ (p[9] == 'E' || p[9] == 'e') && ++ p[10] == '{') { ++ if (guidword(p+11, 8) == 0 && p[19] == '-' && ++ guidword(p+20, 4) == 0 && p[24] == '-' && ++ guidword(p+25, 4) == 0 && p[29] == '-' && ++ guidword(p+30, 4) == 0 && p[34] == '-' && ++ guidword(p+35, 12) == 0 && p[47] == '}' && ++ (p[48] == '\\' || p[48] == '/')) ++ p += 49; ++ else ++ p += 4; ++ /* A path begin with "\\.\PhysicalDriveX" */ ++ } else if (p[2] == '.' && ++ (p[4] == 'P' || p[4] == 'p') && ++ (p[5] == 'H' || p[5] == 'h') && ++ (p[6] == 'Y' || p[6] == 'y') && ++ (p[7] == 'S' || p[7] == 's') && ++ (p[8] == 'I' || p[8] == 'i') && ++ (p[9] == 'C' || p[9] == 'c') && ++ (p[9] == 'A' || p[9] == 'a') && ++ (p[9] == 'L' || p[9] == 'l') && ++ (p[9] == 'D' || p[9] == 'd') && ++ (p[9] == 'R' || p[9] == 'r') && ++ (p[9] == 'I' || p[9] == 'i') && ++ (p[9] == 'V' || p[9] == 'v') && ++ (p[9] == 'E' || p[9] == 'e') && ++ (p[10] >= '0' && p[10] <= '9') && ++ p[11] == '\0') { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, ++ "Path is a physical drive name"); ++ return (ARCHIVE_FAILED); ++ } else ++ p += 4; ++ } ++ ++ /* Skip leading drive letter from archives created ++ * on Windows. */ ++ if (((p[0] >= 'a' && p[0] <= 'z') || ++ (p[0] >= 'A' && p[0] <= 'Z')) && ++ p[1] == ':') { ++ if (p[2] == '\0') { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, ++ "Path is a drive name"); ++ return (ARCHIVE_FAILED); ++ } ++ if (p[2] == '\\' || p[2] == '/') ++ p += 3; ++ } ++ ++ for (; *p != '\0'; p++) { + /* Rewrite the path name if its character is a unusable. */ + if (*p == ':' || *p == '*' || *p == '?' || *p == '"' || + *p == '<' || *p == '>' || *p == '|') + *p = '_'; + } +- if (alen == 0 || l == 0) +- return; ++ alen = p - a->name; ++ if (alen == 0 || strchr(a->name, '\\') == NULL) ++ return (ARCHIVE_OK); + /* + * Convert path separator. + */ +@@ -1560,6 +1642,7 @@ + p += l; + alen -= l; + } ++ return (ARCHIVE_OK); + } + #endif + +@@ -1583,7 +1666,8 @@ + } + + #if defined(_WIN32) || defined(__CYGWIN__) +- cleanup_pathname_win(a); ++ if (cleanup_pathname_win(a) != ARCHIVE_OK) ++ return (ARCHIVE_FAILED); + #endif + /* Skip leading '/'. */ + if (*src == '/') +Index: libarchive/archive_util.c +=================================================================== +--- libarchive/archive_util.c (revision 3670) ++++ libarchive/archive_util.c (revision 3737) +@@ -155,6 +155,7 @@ + { + archive_string_empty(&a->error_string); + a->error = NULL; ++ a->archive_error_number = 0; + } + + void +Index: libarchive/archive_read_extract.c +=================================================================== +--- libarchive/archive_read_extract.c (revision 3670) ++++ libarchive/archive_read_extract.c (revision 3737) +@@ -108,7 +108,7 @@ + if (r != ARCHIVE_OK) + /* If _write_header failed, copy the error. */ + archive_copy_error(&a->archive, ad); +- else if (archive_entry_size(entry) > 0) ++ else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0) + /* Otherwise, pour data into the entry. */ + r = copy_data(_a, ad); + r2 = archive_write_finish_entry(ad); +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 3670) ++++ CMakeLists.txt (revision 3737) +@@ -154,6 +154,13 @@ + SET(HAVE_ZLIB_H 1) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES}) ++ IF(WIN32 AND NOT CYGWIN) ++ SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR}) ++ SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES}) ++ CHECK_C_SOURCE_Runs( ++ "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }" ++ ZLIB_WINAPI) ++ ENDIF(WIN32 AND NOT CYGWIN) + ENDIF(ZLIB_FOUND) + MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY) + +Property changes on: . +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /trunk:r1989,3247,3722 + diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index 790e1a8d2..ade20128a 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139215 2011-10-01 18:55:37Z ibiru $ +# $Id: PKGBUILD 140834 2011-10-20 05:41:34Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME Solitaire card games" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=(gnome-doc-utils intltool itstool) options=('!emptydirs' '!libtool') install=aisleriot.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('dba561dc35641cb393626151cf048f407c47960c7a254f378b986ab95d899d85') +sha256sums=('86bbc131daf97d14f1587216d3e4c73db35126dddf393bfef4f7a67822f96529') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index c1fde7179..2ef6f8f57 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139217 2011-10-01 18:55:41Z ibiru $ +# $Id: PKGBUILD 140836 2011-10-20 05:41:37Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url="http://anjuta.sourceforge.net/" install=anjuta.install source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('2ff968af17e9202fcdb12c47aadaa9d3cb4b98d78c22db8a0cedcb4bf0a81fb8') +sha256sums=('1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613') build() { cd "${srcdir}/anjuta-${pkgver}" diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index e4a208b06..c78c48373 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139223 2011-10-01 18:55:48Z ibiru $ +# $Id: PKGBUILD 140838 2011-10-20 05:41:39Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,9 +12,8 @@ depends=('at-spi2-core' 'libx11' 'atk' 'dconf') makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') -groups=('gnome') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7fd0e043d2a32f06cab1ca116f36114d9b0c482ca421e26b1d565687db171150') +sha256sums=('6677def34b16c9a28d6ad96473ea56a3c0e13aa968e584df004cd44c8691ea1a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index 15fc29035..73c41fd57 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139225 2011-10-01 18:55:51Z ibiru $ +# $Id: PKGBUILD 140840 2011-10-20 05:41:41Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9b3f645560749067ea250c26b281248e3eb912316323a02d358fc2be5dea3848') +sha256sums=('2a4129420decca3657e163a4dbb1a3cb28acafe32ea1292417fdd81084d48fac') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD index 912dbfb46..62edcf962 100644 --- a/extra/bigloo/PKGBUILD +++ b/extra/bigloo/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 138164 2011-09-17 22:07:10Z andrea $ +# $Id: PKGBUILD 140975 2011-10-20 08:57:44Z eric $ # Maintainer: Jürgen Hötzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=bigloo -_pkgver=3.6a +_pkgver=3.7a-2 pkgver=${_pkgver/-/_} -pkgrel=3 +pkgrel=1 pkgdesc="Fast scheme compiler" arch=('i686' 'x86_64') url="http://www-sop.inria.fr/mimosa/fp/Bigloo/" license=('GPL' 'LGPL') -depends=('openssl' 'sqlite3') +depends=('openssl' 'sqlite3' 'alsa-lib') makedepends=('java-environment' 'emacs' 'zip') optdepends=('emacs') options=('!makeflags') install=bigloo.install source=(ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${pkgname}${_pkgver}.tar.gz) -md5sums=('484c09cd0e0f84c96999d889de35cd1e') +md5sums=('1a692b950843e36910e13e0e91f90534') build() { cd "${srcdir}/${pkgname}${_pkgver}" @@ -33,6 +33,11 @@ build() { make build compile-bee } +check() { + cd "${srcdir}/${pkgname}${_pkgver}" + make test +} + package() { cd "${srcdir}/${pkgname}${_pkgver}" make DESTDIR="${pkgdir}" install install-bee diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 4ce3613d6..a6efe8dba 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138476 2011-09-24 16:46:30Z stephane $ +# $Id: PKGBUILD 140830 2011-10-20 05:01:46Z eric $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> @@ -12,8 +12,8 @@ _svn=false pkgname=blender -pkgver=2.59 -pkgrel=3 +pkgver=2.60 +pkgrel=1 epoch=2 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') @@ -21,12 +21,12 @@ license=('GPL') url="http://www.blender.org" depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ - 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') -makedepends=('cmake') # 'subversion' + 'freetype2' 'openal' 'libsndfile' 'ffmpeg') +makedepends=('cmake') install=blender.install if [ $_svn = false ]; then source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe') + md5sums=('2951df9d5f004c5e0375b53969205a38') else source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) md5sums=('7579d1139d0d6025df8afcfca64a65c4') @@ -34,6 +34,7 @@ fi # source PKGBUILD && mksource mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) _svnver=38016 _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" _svnmod="$pkgname-$pkgver" diff --git a/extra/blender/blender.install b/extra/blender/blender.install index f4d7cc443..724bfce00 100644 --- a/extra/blender/blender.install +++ b/extra/blender/blender.install @@ -5,13 +5,9 @@ post_install() { } post_upgrade() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + post_install } post_remove() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + post_install } diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index ea9b5a6cc..0feb4c2bc 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 139466 2011-10-01 23:23:01Z ibiru $ +# $Id: PKGBUILD 140843 2011-10-20 05:41:46Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou -pkgver=0.4.0 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64') url="http://live.gnome.org/Caribou" license=('LGPL') depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('gnome-doc-utils' 'intltool') install=caribou.install options=(!libtool !emptydirs) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('9d9aeab26956371e9a8e807e2554be5ca08e32f6a27632598065cf2e85e66d16') +sha256sums=('d4d2328e0eadbf037f7e0ec146e835097fe56cb2b940985655e649c5556e4ed1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index fbfa26db2..f2061e399 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139231 2011-10-01 18:56:02Z ibiru $ +# $Id: PKGBUILD 140845 2011-10-20 05:41:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64) @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('04e32ea45cf7a441dccf72ab08a765b268371878728336b762fb625dd02ad32b') +sha256sums=('0abc54aeaf1cec931b8a6e148f40341be4b2bc0e9a1164eba4fef7989499059c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 5cc980b5a..66ff38ae1 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139233 2011-10-01 18:56:07Z ibiru $ +# $Id: PKGBUILD 140847 2011-10-20 05:41:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.8.0 +pkgver=1.8.2 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('LGPL') depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi') makedepends=('gobject-introspection' 'mesa') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c8bd379154d40400b19932934dfa05e8a02057bbff2455f09afda7aa6c4b5ef8') +sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 5dea3bc70..16321ce85 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139237 2011-10-01 18:56:15Z ibiru $ +# $Id: PKGBUILD 140849 2011-10-20 05:41:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.8.0 +pkgver=1.8.2 pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) -sha256sums=('b1551c129d5570b63e7130971622fc2ab8d4ecbf0dc1773df1c54fa9c1cb0a2c') +sha256sums=('ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 66e51cd45..a81bb963b 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 140214 2011-10-09 19:40:31Z ibiru $ +# $Id: PKGBUILD 140851 2011-10-20 05:41:55Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.2.0.1 +pkgver=3.2.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64') url="http://live.gnome.org/Empathy" license=('GPL2') -depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' 'libcanberra' 'iso-codes' 'networkmanager') +depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' +'libcanberra' 'iso-codes' 'networkmanager') makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto') optdepends=('telepathy-gabble: XMPP/Jabber support' 'telepathy-butterfly: MSN support' @@ -20,7 +21,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b11f6f980ce7ae75ddcdbe14bded86c0cc5970181e2257026610a025b75f5512') +sha256sums=('d50e9b0e31df0e8d137c120c61c5aeaaad06fb24bb208d105b186a01b3f1de0a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 4971ee39c..60914c319 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139249 2011-10-01 18:56:37Z ibiru $ +# $Id: PKGBUILD 140977 2011-10-20 11:11:57Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ install=eog-plugins.install options=('!libtool') groups=(gnome-extra) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('49a78e862a1967733b439ca4a4cde42084e8d4b1947c4a5ddb1b3581bec64dc0') +sha256sums=('f78ac3e72a6f04d9fa4b1a9f973967ae9530b3265abd4b78180730d23c295d9c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index 83426c5e5..1b307cf58 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139247 2011-10-01 18:56:34Z ibiru $ +# $Id: PKGBUILD 140853 2011-10-20 05:41:57Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('79184d0cf420d4b8c1d1de92c30f1d95afc7cd686876e07b20cb82a2ec20d8e3') +sha256sums=('ae20715790796061e51132804f5925c5a61a1e615527c7c746cd8b76a8f97c89') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index 2a4a11394..21aa3faac 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139251 2011-10-01 18:56:40Z ibiru $ +# $Id: PKGBUILD 140855 2011-10-20 05:41:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -14,14 +14,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - fix_crash::http://git.gnome.org/browse/epiphany/patch/?id=1cb7fb1109aecedd224d03fda202165adf3423a7) -sha256sums=('e5402cb8b52d3de5c09feb01bbf28a1bd3c20f260a2e0956c9d132f41040e5d2' - 'ef1423bfaea72c44bd1bc1cc49d06e98dab89235fab2ad5dcd89d87b4d62cb4f') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_crash" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --disable-scrollkeeper \ diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD index e3863df21..57f84c43e 100644 --- a/extra/erlang/PKGBUILD +++ b/extra/erlang/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 110837 2011-02-22 18:42:08Z vesa $ -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# $Id: PKGBUILD 140857 2011-10-20 05:42:01Z ibiru $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> pkgname=erlang -pkgver=R14B -pkgrel=2 +pkgver=R14B04 +pkgrel=1 pkgdesc="A small concurrent functional programming language developed by Ericsson." arch=(i686 x86_64) url="http://www.erlang.org/index.html" license=('custom') depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa') optdepends=('wxgtk: for wx support' 'unixodbc: database') options=('!makeflags') @@ -22,14 +23,11 @@ build() { ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk) - # fix for #17001 - sed -i 's|WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`|WX_LIBS="`$WX_CONFIG_WITH_ARGS --libs` -lGLU"|' lib/wx/configure || return 1 - - sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure || return 1 + sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure - CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --enable-ethread-pre-pentium4-compatibility enable_ethread_pre_pentium4_compatibilit=yes --prefix=/usr --enable-smp-support --enable-threads || return 1 - make || return 1 - make INSTALL_PREFIX="$pkgdir" install || return 1 + CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs + make + make INSTALL_PREFIX="$pkgdir" install # fix prefix cd "$pkgdir" @@ -37,22 +35,22 @@ build() { usr/lib/erlang/bin/start \ usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \ usr/lib/erlang/erts-${ERTSVERSION}/bin/start \ - usr/lib/erlang/releases/RELEASES ;do - sed -i "s#$pkgdir##" $i || return 1 + usr/lib/erlang/releases/RELEASES ;do + sed -i "s#$pkgdir##" $i done # fix symlinks cd "$pkgdir/usr/lib/erlang/bin" - ln -sf ../erts-${ERTSVERSION}/bin/epmd + ln -sf ../erts-${ERTSVERSION}/bin/epmd cd "$pkgdir/usr/bin" for file in *; do - ln -sfv ../lib/erlang/bin/$file || return 1 + ln -sfv ../lib/erlang/bin/$file done - ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" || return 1 + ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" -# install documentation +# install documentation install -d "$pkgdir/usr/share/doc/erlang" install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" @@ -60,5 +58,5 @@ build() { install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" } -md5sums=('5292a04556d17ad528d570e02357dfbb' - '011530a24fbcc194be9bd01f779325a2') +md5sums=('4b469729f103f52702bfb1fb24529dc0' + 'f31e72518daae4007f595c0b224dd59f') diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 77fa0bb66..b7d0edb29 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 140567 2011-10-17 08:14:39Z jgc $ +# $Id: PKGBUILD 140859 2011-10-20 05:42:04Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64') license=('GPL') -depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' - 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') optdepends=('texlive-bin: DVI support') groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a9bc17e7f99489354cc66ffede68466ea0a9c52664b18198291c3a40d0150235') +sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 7cf7ac35d..7df8de5c0 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139257 2011-10-01 18:56:49Z ibiru $ +# $Id: PKGBUILD 140863 2011-10-20 05:42:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64') depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') @@ -12,7 +12,7 @@ options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('de2a75e5256143ed7eb273a78a45ff2ba8af81c894dbf17c5dade5be349fc427') +sha256sums=('0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index 58650ea0b..77ed686dd 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139259 2011-10-01 18:56:51Z ibiru $ +# $Id: PKGBUILD 140865 2011-10-20 05:42:10Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f61a5e5e5a51a6bc45c0df20d7a99a8c5361fac07eb9eadc15dd5329af1f1f29') +sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD index 5a79f4628..786ecc16a 100644 --- a/extra/evolution-groupwise/PKGBUILD +++ b/extra/evolution-groupwise/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140166 2011-10-08 08:16:17Z ibiru $ +# $Id: PKGBUILD 140867 2011-10-20 05:42:12Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: György Balló <ballogy@freestart.hu> pkgname=evolution-groupwise -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GroupWise connector for evolution" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=(intltool evolution) optdepends=('evolution: evolution plugin') options=(!libtool) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=(7c3dec3c4561931dfbc9313949dee68c4f935583fae8323ab4ca87b23b5aabb3) +sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,6 +27,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 9c281538e..6c4e9598e 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139255 2011-10-01 18:56:46Z ibiru $ +# $Id: PKGBUILD 140861 2011-10-20 05:42:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('538883531aa64bec1b43c73db9cf1b59573d10adc4d8dca6401e4bffa90f246d') +sha256sums=('244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index 415b9edad..772eaf8e6 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139263 2011-10-01 18:56:56Z ibiru $ +# $Id: PKGBUILD 140871 2011-10-20 05:42:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.6.3.2 +pkgver=0.6.4.1 pkgrel=1 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialw makedepends=('gobject-introspection' 'vala' 'intltool') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e04d80e4bab12d85a254a22a6b5b8fab88d14d1c2f7b732e40299960c7c32414') +sha256sums=('b6cd5e982f4496cbe6370ca31cc85dcdeb6efccc95c1d940e654f8226cd95578') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index ec6fcff81..038f85375 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139472 2011-10-02 01:28:00Z ibiru $ +# $Id: PKGBUILD 140873 2011-10-20 05:42:19Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1.1 +pkgrel=1 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64') license=('GPL') @@ -16,27 +16,24 @@ depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'me makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') optdepends=('gnome-shell: new login interface') install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz fix_external_program_directories.patch gdm-vt-allocation-hack.patch gdm - gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam - check-for-shell.patch::http://git.gnome.org/browse/gdm/patch/?id=64e6b10f98fe7226a2f41807268dae3afa80236d) -sha256sums=('f827f5500827acef94ad2d60f02ec489bc35cb6392d8f4a60ec814599c2991b7' + gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) +sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd' '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363' '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' - '0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4' + '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c' 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd' - '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834' - 'ae54f11e593e97e031d2dd7b33ce9899038356cef87b354f3c4c596a3153155d') + '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/check-for-shell.patch" patch -Np1 -i "${srcdir}/fix_external_program_directories.patch" patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" diff --git a/extra/gdm/gdm-password.pam b/extra/gdm/gdm-password.pam index 7beda835a..aa4d4dd47 100644 --- a/extra/gdm/gdm-password.pam +++ b/extra/gdm/gdm-password.pam @@ -14,7 +14,7 @@ password required pam_unix.so session required pam_loginuid.so -session optional pam_systemd.so -session optional pam_keyinit.so revoke +session optional pam_keyinit.so force revoke session required pam_limits.so session required pam_unix.so session optional pam_gnome_keyring.so auto_start diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index b9732be50..fda42d319 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -9,6 +9,7 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor gconfpkg --install ${pkgname} glib-compile-schemas usr/share/glib-2.0/schemas + dconf update } pre_remove() { @@ -23,6 +24,7 @@ post_upgrade() { post_remove() { glib-compile-schemas usr/share/glib-2.0/schemas + dconf update gtk-update-icon-cache -q -t -f usr/share/icons/hicolor getent passwd gdm >/dev/null 2>&1 && userdel gdm getent group gdm >/dev/null 2>&1 && groupdel gdm diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 57de97e03..a9457ff7d 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139273 2011-10-01 18:57:12Z ibiru $ +# $Id: PKGBUILD 140875 2011-10-20 05:42:21Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a3f62b20816a3f902bb811cc14ae01111e27ce266e49d39f5854fd45b2895348') +sha256sums=('bdde2dae05bf08e67088c441eac3456d6861b5076d5f00d4c381291ef4c85651') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index b4eee0b40..ad979c58c 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139279 2011-10-01 18:57:20Z ibiru $ +# $Id: PKGBUILD 140877 2011-10-20 05:42:23Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool') options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('e28ca1e354d6519efb5c9c01c1f10e8a1a196710dfbcc5ea8f8aade3244e108c') +sha256sums=('5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD index 2021fcca0..bb3ad8083 100644 --- a/extra/gnome-applets/PKGBUILD +++ b/extra/gnome-applets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139281 2011-10-01 18:57:22Z ibiru $ +# $Id: PKGBUILD 140879 2011-10-20 05:42:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-applets -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME Applets" arch=(i686 x86_64) @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=(gnome) install=gnome-applets.install source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('18e41753d98644689126c3f237f4bf2e1b973cac15544166cef299ba6faa95ef') +sha256sums=('cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 467c4e39b..514f4088c 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139284 2011-10-01 18:57:27Z ibiru $ +# $Id: PKGBUILD 140881 2011-10-20 05:42:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('7f8f35baf4a785a4d966257c31ce6ee8eb4fe21bc83b26cadc55c244f583bbca' +sha256sums=('f67abc26e2a8003b5e3b58e1541ed3955e0ea05a08bfaa8d5dc4b2133d948df0' 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') build() { diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 50b342724..77be710c3 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139883 2011-10-05 19:06:43Z andrea $ +# $Id: PKGBUILD 140883 2011-10-20 05:42:30Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64) url="http://projects.gnome.org/gnome-color-manager/" @@ -14,7 +14,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2d03a7c1f308ab6e2ad89acc39f1f8a67fd0ff1cf3435f5f2269f7a422209273') +sha256sums=('bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436') build(){ cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index c9bcbfa68..5a0fee8ec 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139288 2011-10-01 18:57:32Z ibiru $ +# $Id: PKGBUILD 140885 2011-10-20 05:42:32Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-contacts -pkgver=3.2.0.1 +pkgver=3.2.1 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop') makedepends=('intltool' 'vala') install= source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('2d8e2a325ecc661805f6e7c6339b3876e766c1e227ff084dc02a7535e5983641') +sha256sums=('31c277a3db145c2353fffe33e613fb634e76fa5caf382e8f307a05e74a6a6eb9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 11f2b732f..659bc103c 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 139290 2011-10-01 18:57:35Z ibiru $ +# $Id: PKGBUILD 140887 2011-10-20 05:42:34Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet') optdepends=('mesa-demos: provides glxinfo for graphics information' - 'apg: adds password generation for user accounts') + 'apg: adds password generation for user accounts' + 'gnome-color-manager: for color management tasks') makedepends=('gnome-doc-utils' 'intltool') url="http://www.gnome.org" groups=('gnome') @@ -16,7 +17,7 @@ install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('06c927dcbee2bf63e4960441ccb9bea55d12aa83078e5d71e9832d52fd1966aa') +sha256sums=('bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index a68c80fdf..b9e302837 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139292 2011-10-01 18:57:38Z ibiru $ +# $Id: PKGBUILD 140889 2011-10-20 05:42:36Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c5e8ba08f3c7ba12b5f4062c9b5bcef58383d1e3ec26161eb8bcf49dfea62ff5') +sha256sums=('4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index 1837e56bc..94d5475bc 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139294 2011-10-01 18:57:41Z ibiru $ +# $Id: PKGBUILD 140891 2011-10-20 05:42:38Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64) url="http://www.gnome.org" @@ -15,7 +15,7 @@ optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('51c171a6b8a36ebe0b251d0b4d0acb360b5d7738fe8106006ea5504c03ad4932') +sha256sums=('f04356d6620a3fa47cfdb4b72c80ac3748ca229fe24b57ccf229536afa934f52') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index bbd86c5e8..ddaf0d307 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139296 2011-10-01 18:57:45Z ibiru $ +# $Id: PKGBUILD 140893 2011-10-20 05:42:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d8595b09ecbb3c94cd4a655f5fb56cd585fd9441038ad334cba29b92d592279d') +sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index a30a955a6..18e3d714e 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 139301 2011-10-01 18:57:53Z ibiru $ +#$Id: PKGBUILD 140897 2011-10-20 05:42:44Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('5bd7dbe18f983aae237517d1eb4b070295c7b848d16c2a9d0a8a6046ea0801bc') +sha256sums=('49872dad0c22e495f65be226d6effa053605df9cdc7cb06781aa37d3ff36b8a9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index c89add260..7edd769fe 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139305 2011-10-01 18:58:00Z ibiru $ +# $Id: PKGBUILD 140899 2011-10-20 05:42:46Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.2.0.1 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('b53e1429930294872b64987bf18e8f2cf07adaac5b1a8c9c15d2fb95ea1e8b2b') +sha256sums=('549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD index 306d48b45..61e38e405 100644 --- a/extra/gnome-panel/PKGBUILD +++ b/extra/gnome-panel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139307 2011-10-01 18:58:03Z ibiru $ +# $Id: PKGBUILD 140901 2011-10-20 05:42:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -16,7 +16,7 @@ replaces=('gnome-panel-bonobo') provides=("gnome-panel-bonobo=${pkgver}") options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('83daffb85db57609330da488c5344e3121ed74cd809701a11109ecd7c97bde0f') +sha256sums=('ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index 5f52250c2..e69a65c27 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139313 2011-10-01 18:58:13Z ibiru $ +# $Id: PKGBUILD 140903 2011-10-20 05:42:55Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Power management tools." arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=(!emptydirs) install=gnome-power-manager.install groups=(gnome-extra) source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d66f97f6cff716dd3c612f1a17b0e2b5dfb138deb92ea3d0a782a0144a7eab95') +sha256sums=('11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 29dbe7fcd..671597662 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139317 2011-10-01 18:58:19Z ibiru $ +# $Id: PKGBUILD 140905 2011-10-20 05:42:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-session -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) @@ -14,7 +14,7 @@ install=gnome-session.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4b23d95b1ee622c7d1d600d3a88c8ded787d9a49567b0235208d2e600f131e3e') +sha256sums=('a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 0132134cd..c64de8104 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139631 2011-10-03 21:04:24Z ibiru $ +# $Id: PKGBUILD 140969 2011-10-20 06:58:10Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') @@ -16,13 +16,16 @@ groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz -fix_color_crash.patch) -sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b' - 'b249d21702d4cf9a3a8dc177ba17c00d33e8e742e548811552d79ddeff1e91e3') + upower.patch) +sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d' + 'f7a66e9ff7f415be34873fd6d03843a20732158bd65b382b114d100aaddeb223') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix_color_crash.patch" + + # Fix suspend via key + patch -Np1 -i "$srcdir/upower.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \ --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids diff --git a/extra/gnome-settings-daemon/upower.patch b/extra/gnome-settings-daemon/upower.patch new file mode 100644 index 000000000..36dad59e3 --- /dev/null +++ b/extra/gnome-settings-daemon/upower.patch @@ -0,0 +1,28 @@ +diff -u -r gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c +--- gnome-settings-daemon-3.2.1-orig/plugins/media-keys/gsd-media-keys-manager.c 2011-10-20 08:19:31.818642262 +0200 ++++ gnome-settings-daemon-3.2.1/plugins/media-keys/gsd-media-keys-manager.c 2011-10-20 08:23:55.127492221 +0200 +@@ -2066,15 +2066,15 @@ + (GAsyncReadyCallback) power_keyboard_ready_cb, + manager); + +- g_dbus_proxy_new (manager->priv->connection, +- G_DBUS_PROXY_FLAGS_NONE, +- NULL, +- "org.freedesktop.UPower", +- "/org/freedesktop/UPower", +- "org.freedesktop.UPower", +- NULL, +- (GAsyncReadyCallback) upower_ready_cb, +- manager); ++ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, ++ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, ++ NULL, ++ "org.freedesktop.UPower", ++ "/org/freedesktop/UPower", ++ "org.freedesktop.UPower", ++ NULL, ++ (GAsyncReadyCallback) upower_ready_cb, ++ manager); + } + + static void diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index af6a1e844..11873ea92 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139662 2011-10-04 16:16:39Z ibiru $ +# $Id: PKGBUILD 140909 2011-10-20 05:43:08Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('55f8237f4ca517bcfa02bbf88fbcb9afcdc9b252fb9612b84a65409a1f144324') +sha256sums=('ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index 99b0fa939..5ebfe3b3c 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139324 2011-10-01 18:58:30Z ibiru $ +# $Id: PKGBUILD 140912 2011-10-20 05:43:17Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64) @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('169c82bd1744adba1a4e3f384c06d9ff48aefac5d0f56e8ac4ad48b6f7f5810c') +sha256sums=('f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index f514e5470..484db511a 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139326 2011-10-01 18:58:34Z ibiru $ +# $Id: PKGBUILD 140914 2011-10-20 05:43:22Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('42ca48cff087de770d4783b19653794e82285334144b30557948f852521299b1') +sha256sums=('c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index 7b18bb7c1..1a34c44db 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139328 2011-10-01 18:58:37Z ibiru $ +# $Id: PKGBUILD 140916 2011-10-20 05:43:25Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.2.0.2 +pkgver=3.2.1 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-${pkgver}.tar.xz) -sha256sums=('49b8177fcc6693690eceef207f78173f0ca34bdef873a6c1fed90bef28791bc1') +sha256sums=('ab9e7f6001f4f18420df6a66407ace4340ee815b31e571bc55de7983370e26f3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index e9c45f0d5..92baa37ad 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 117703 2011-04-04 16:40:52Z ibiru $ +# $Id: PKGBUILD 140919 2011-10-20 05:43:32Z ibiru $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64') url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" license=('GPL') -depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') +depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3') makedepends=('intltool' 'gnome-doc-utils' 'nautilus') options=('!emptydirs' '!libtool') install=gnome-user-share.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1987d08ebb88bd3fecd7c76d2d9549dba2c7132a7c2b3cfe68fdc2a24260fafe') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-utils/PKGBUILD b/extra/gnome-utils/PKGBUILD index 51a517224..5017a7712 100644 --- a/extra/gnome-utils/PKGBUILD +++ b/extra/gnome-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139332 2011-10-01 18:58:41Z ibiru $ +# $Id: PKGBUILD 140921 2011-10-20 05:43:36Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-utils -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files" arch=(i686 x86_64) @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-utils.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('532e071ad772afa9bcd116144bc6b644c8af3daf2eb3f76f6fa306aced1ef5f8') +sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 7449d6d04..676a570c2 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136812 2011-09-01 19:14:23Z ibiru $ +# $Id: PKGBUILD 140923 2011-10-20 05:43:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.6 -pkgrel=2 +pkgver=2.24.7 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,17 +12,13 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool' '!docs') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz - xid-collision-debug.patch - gtk2-dont-ellipsize-filters.diff) -sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8') + xid-collision-debug.patch) +sha256sums=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { cd "${srcdir}/gtk+-${pkgver}" patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - #https://bugzilla.gnome.org/show_bug.cgi?id=657949 - patch -Np1 -i "${srcdir}/gtk2-dont-ellipsize-filters.diff" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -36,7 +32,7 @@ build() { } package_gtk2() { - pkgdesc="The GTK+ Toolkit (v2)" + pkgdesc="GTK+ is a multi-platform toolkit (v2)" install=gtk2.install depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') backup=(etc/gtk-2.0/gtkrc) diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 0e60a45da..a2f2c6e70 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139599 2011-10-03 17:26:32Z ibiru $ +# $Id: PKGBUILD 140925 2011-10-20 05:43:41Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.2.0 -pkgrel=2 -pkgdesc="The GTK+ Toolkit (v3)" +pkgver=3.2.1 +pkgrel=1 +pkgdesc="GTK+ is a multi-platform toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" install=gtk3.install @@ -14,15 +14,12 @@ options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz - settings.ini - a11y.patch::http://git.gnome.org/browse/gtk+/patch/?id=e248c6812e8e33150d61074471ef0330668aed45) -sha256sums=('bce3c1a9be6afd7552c795268656d8fdd09c299765a7faaf5a76498bb82ed44c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - '0ae5f9c3553f9fc6c515343de96046c17544654936b17c09330443ed44778cb2') + settings.ini) +sha256sums=('f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/a11y.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 0d375a605..79f407a09 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139348 2011-10-01 18:59:07Z ibiru $ +# $Id: PKGBUILD 140927 2011-10-20 05:43:44Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.2.0 +pkgver=4.2.1 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('a4e50ac159fe49ddac07a3d0fba386ac90b404afce770a89e6077580578c38af') +sha256sums=('e72fb264bae45f2a340818c645248c29eaa2acf3d2bb3c2316ae296a0d438558') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index eb13f87ee..3b5a132c8 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140208 2011-10-09 15:35:36Z ibiru $ +# $Id: PKGBUILD 140929 2011-10-20 05:43:47Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz) -sha256sums=('979e967a3e8d64512db5f7466ce71431e0fa8a77958275369fd9061e068585a4') +sha256sums=('52447d85b57b1413e699a4a27a8c4ba7df737347e9f5b4c5406e6393ca02982c') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 5604fe042..5e993e3a3 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139354 2011-10-01 18:59:17Z ibiru $ +# $Id: PKGBUILD 140931 2011-10-20 05:43:50Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=gucharmap.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('42aacc32beeb0ebb24db519aaceeb184e4212fdd7732bd7b0f6a15f00afc9501') +sha256sums=('b06f376e5baaa41f0236d659bd6d03e3b38759198257a60affb6ddb2e111beff') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 73b85a191..dd451a176 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 139360 2011-10-01 18:59:26Z ibiru $ +# $Id: PKGBUILD 140933 2011-10-20 05:43:53Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.10.0 -pkgrel=2 +pkgver=1.10.1 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' - 'libarchive' 'libgdu' 'pkgconfig' 'intltool' - 'libimobiledevice' 'avahi' 'dconf') +makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf') url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('50970f9f9052ecb6ab83860b366c718994bf618695010c11e1391ca886f71db8') +sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD index 742d76978..52815df01 100644 --- a/extra/hplip/PKGBUILD +++ b/extra/hplip/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 139476 2011-10-02 02:49:32Z eric $ +# $Id: PKGBUILD 140998 2011-10-21 02:57:10Z eric $ # Maintainer : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> pkgname=hplip -pkgver=3.11.7 -pkgrel=2 +pkgver=3.11.10 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') -makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 'cups') depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'libcups>=1.3.10-3' 'net-snmp>=5.7.1' 'libusb-compat') + 'net-snmp>=5.7.1') +makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') optdepends=('cups: for printing support' 'dbus-python: for dbus support' 'sane: for scanner support' @@ -19,22 +19,25 @@ optdepends=('cups: for printing support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-qt: for running hp-toolbox' - 'pygobject: for running hp-toolbox' + 'python2-gobject2: for running hp-toolbox' 'hplip-plugin: binary blobs for specific devices') replaces=('hpijs') options=('!libtool') install=hplip.install -source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} - hplip-cups-1.5.0-compatibility.patch) -md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1' - 'f4422ee0dc842e1a53b75c24f468d65c' - 'a767000ce920e9f7f6a5b0a8e4392ef9') +source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('6143f30f3b6905ef22105176a3b80db0' + '396bbd8c5cc92aa8295e5bcb508692f3') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/hplip-cups-1.5.0-compatibility.patch" 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 + # fix sysfs rules + sed -i -e "s|SYSFS|ATTR|g" \ + -e "s|sysfs|attr|g" \ + data/rules/56-hpmud_support.rules + ./configure --prefix=/usr \ --enable-qt4 \ --enable-foomatic-rip-hplip-install \ @@ -51,21 +54,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - - rm -rf "$pkgdir/etc/sane.d" - # remove autostart of hp-daemon - rm -r "$pkgdir/etc/xdg" - # move udev rules to /lib/udev/rules.d - mkdir -p "$pkgdir/lib/udev/rules.d" - mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/" - rm -r "$pkgdir/etc/udev" - # remove lp user, it's not used on archlinux - sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules" - # fix sysfs rules - sed -i -e "s|SYSFS|ATTR|g" \ - -e "s|sysfs|attr|g" \ - -e 's|"bin/sh|"/bin/sh|g' \ - "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules" + 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} } - diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD new file mode 100644 index 000000000..84488e042 --- /dev/null +++ b/extra/java7-openjdk/PKGBUILD @@ -0,0 +1,263 @@ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Guillaume ALAUX <guillaume@archlinux.org> + +pkgname=('jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') +pkgbase=java7-openjdk +_java_ver=7 +_openjdk_build=b147 +_openjdk_date=27_jun_2011 +_icedtea_ver=2.0 +_date=20110922 + +# check "${srcdir}/icedtea7"/Makefile.am +_CORBA_CHANGESET=4d9e4fb8af09 +_HOTSPOT_CHANGESET=b28ae681bae0 +_JAXP_CHANGESET=948e734135ea +_JAXWS_CHANGESET=a2ebfdc9db7e +_JDK_CHANGESET=2054526dd141 +_LANGTOOLS_CHANGESET=9b85f1265346 +_OPENJDK_CHANGESET=0a76e5390e68 + +pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} +pkgrel=2 +arch=('i686' 'x86_64') +url="http://icedtea.classpath.org" +license=('custom') +makedepends=('libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2' #'eclipse-ecj' only for bootstrapping + 'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib' + 'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2') +source=( #ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz + http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/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 + jconsole.desktop + policytool.desktop) + +#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip + +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") +md5sums=('752721a037a625001fad7a5fc2013f60' + 'ffb12013564794e9abbffbbbd0c58502' + '8f8d222d0a6d363d06b40576da5f1ea2' + '4abf34372e34cccd74ad337e487ed790' + 'f2f40590a83889b8aa1d4631b705092d' + 'd3beed0118bbd93d4651af762eb748c7' + 'c8617700b4bd6cd5de1257bc36509bed' + 'f10b711b0c784df8707808d9d0f52abd' + 'ee1afda124d5927345014ab382ef581e' + 'f7e7a212e50abb56a6ef1a2b1bd27405' + 'c195c4865b84d9e2e0fd71ac6d88eadb' + '203640d6e79e41b0065e016818c17ccd' + 'b7b8996448c7b4fa7dd2d744488ed3bd' + 'cdabafad0ec413d9a983888bf445a443' + '612b0fec7e0943c37a6de77c43622007' + '62443459da0cb28181feb260dc0e5ce7' + '8e346f19a69b11b8dc4fcd8ea9d9d8f1' + 'b6357228d29836504a90abe006d86e56') + +# source PKGBUILD && mksource +#makedepends+=('mercurial') +mksource() { + mkdir /tmp/icedtea7-${_date} + pushd /tmp/icedtea7-${_date} + hg -v clone http://icedtea.classpath.org/hg/icedtea7 + rm -rf icedtea7/.hg* + tar -cvJf /tmp/icedtea7-${_date}/icedtea7-${_date}-hg.tar.xz * + popd +} + +build() { + cd "${srcdir}/icedtea-${_icedtea_ver}" + + unset JAVA_HOME + unset CLASSPATH + # default is to build with first found java-environment found in our repos - is jdk7-openjdk + [ -f /etc/profile.d/jdk7.sh ] && . /etc/profile.d/jdk7.sh + + unset MAKEFLAGS + 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" + + # Bootstrap IcedTea with ecj and a GNU Classpath-based JDK: +# autoreconf --force --install + + ./configure \ + --disable-bootstrap \ + --with-parallel-jobs="${MAKEFLAGS/-j}" \ + --disable-tests \ + --with-pkgversion=ArchLinux-${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 \ +# --with-rhino #--help + + #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \ + #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \ + #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \ + +# --enable-systemtap Enable inclusion of SystemTap trace support +# --enable-nss Enable inclusion of NSS security provider +# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed + + make +} + +check() { + cd "${srcdir}/icedtea-${_icedtea_ver}" + make -k check +} + +package_jre7-openjdk() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment" + depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' + 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'gsettings-desktop-schemas') + optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' + 'alsa-lib: for sound' + 'giflib: for gif format support') + provides=('java-runtime=7') + conflicts=('java-runtime') +# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos + backup=(etc/profile.d/jre7.sh) + install=jre7-openjdk.install + + _jvmdir=/usr/lib/jvm/java-7-openjdk + + cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre" + + install -d -m755 ${pkgdir}/${_jvmdir}/jre/ + cp -a bin lib ${pkgdir}/${_jvmdir}/jre + + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc + rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc + rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src + + # 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 + + # 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 + + # 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}/${pkgname}.profile ${pkgdir}/etc/profile.d/jre.sh + install -m755 ${srcdir}/${pkgname}.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} +} + +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/jdk7.sh) + + _jvmdir=/usr/lib/jvm/java-7-openjdk + + 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 + + # Handling 'java-rmi.cgi' separately + install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi + + # Desktop files + install -m755 -d ${pkgdir}/usr/share/applications/ + install -m644 ${srcdir}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications/ + + # 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/extra/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/fix_corba_cmds_path.diff new file mode 100644 index 000000000..842657880 --- /dev/null +++ b/extra/java7-openjdk/fix_corba_cmds_path.diff @@ -0,0 +1,33 @@ +--- 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 +@@ -86,10 +86,10 @@ + 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 ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -136,7 +136,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq +@@ -186,7 +186,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/extra/java7-openjdk/fontconfig-paths.diff b/extra/java7-openjdk/fontconfig-paths.diff new file mode 100644 index 000000000..fa08db629 --- /dev/null +++ b/extra/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/extra/java7-openjdk/jconsole.desktop b/extra/java7-openjdk/jconsole.desktop new file mode 100644 index 000000000..ffbdd42ad --- /dev/null +++ b/extra/java7-openjdk/jconsole.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Monitoring & Management Console +Comment=Monitor and manage OpenJDK applications +Exec=/usr/bin/jconsole +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-tools-jconsole-JConsole +Categories=Development;Monitor;Java; +Version=1.0 diff --git a/extra/java7-openjdk/jdk7-openjdk.profile b/extra/java7-openjdk/jdk7-openjdk.profile new file mode 100644 index 000000000..91265cc86 --- /dev/null +++ b/extra/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/extra/java7-openjdk/jdk7-openjdk.profile.csh b/extra/java7-openjdk/jdk7-openjdk.profile.csh new file mode 100644 index 000000000..cc7dc8ab1 --- /dev/null +++ b/extra/java7-openjdk/jdk7-openjdk.profile.csh @@ -0,0 +1 @@ +setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk" diff --git a/extra/java7-openjdk/jre7-openjdk.install b/extra/java7-openjdk/jre7-openjdk.install new file mode 100644 index 000000000..d311e6e44 --- /dev/null +++ b/extra/java7-openjdk/jre7-openjdk.install @@ -0,0 +1,24 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi + echo "when you use a non-reparenting window manager" + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" + echo "/etc/profile.d/jre7.sh" +# update-desktop-database -q +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi +# update-desktop-database -q +} + + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +# update-desktop-database -q +} diff --git a/extra/java7-openjdk/jre7-openjdk.profile b/extra/java7-openjdk/jre7-openjdk.profile new file mode 100644 index 000000000..c86ce857a --- /dev/null +++ b/extra/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/extra/java7-openjdk/jre7-openjdk.profile.csh b/extra/java7-openjdk/jre7-openjdk.profile.csh new file mode 100644 index 000000000..a9aed27d1 --- /dev/null +++ b/extra/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/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff new file mode 100644 index 000000000..c68bd4441 --- /dev/null +++ b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff @@ -0,0 +1,24 @@ +--- 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,10 +91,10 @@ + 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 ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -141,7 +141,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq diff --git a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff new file mode 100644 index 000000000..ba1a588e1 --- /dev/null +++ b/extra/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 +@@ -102,7 +102,8 @@ + METACITY_WM = 11, + COMPIZ_WM = 12, + LG3D_WM = 13, +- MUTTER_WM = 14; ++ MUTTER_WM = 14, ++ OTHER_NONREPARENTING_WM = 15; + public String toString() { + switch (WMID) { + case NO_WM: +@@ -576,7 +577,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); ++ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); + } + + /* +@@ -762,9 +763,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. +@@ -775,6 +784,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; + } +@@ -1289,6 +1300,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/extra/java7-openjdk/policytool.desktop b/extra/java7-openjdk/policytool.desktop new file mode 100644 index 000000000..702b44a6f --- /dev/null +++ b/extra/java7-openjdk/policytool.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Policy Tool +Comment=Manage OpenJDK policy files +Exec=/usr/bin/policytool +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-security-tools-PolicyTool +Categories=Development;Java; +Version=1.0 diff --git a/extra/kdeutils/CVE-2011-2725.patch b/extra/kdeutils/CVE-2011-2725.patch new file mode 100644 index 000000000..986bebc90 --- /dev/null +++ b/extra/kdeutils/CVE-2011-2725.patch @@ -0,0 +1,20 @@ +--- a/part/part.cpp ++++ b/part/part.cpp +@@ -558,8 +558,15 @@ void Part::slotPreviewExtracted(KJob *jo + if (!job->error()) { + const ArchiveEntry& entry = + m_model->entryForIndex(m_view->selectionModel()->currentIndex()); +- const QString fullName = +- m_previewDir->name() + QLatin1Char( '/' ) + entry[ FileName ].toString(); ++ ++ QString fullName = ++ m_previewDir->name() + QLatin1Char('/') + entry[FileName].toString(); ++ ++ // Make sure a maliciously crafted archive with parent folders named ".." do ++ // not cause the previewed file path to be located outside the temporary ++ // directory, resulting in a directory traversal issue. ++ fullName.remove(QLatin1String("../")); ++ + ArkViewer::view(fullName, widget()); + } else { + KMessageBox::error(widget(), job->errorString()); diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD index fe47af50e..66fde812f 100644 --- a/extra/kdeutils/PKGBUILD +++ b/extra/kdeutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140028 2011-10-05 19:12:50Z andrea $ +# $Id: PKGBUILD 140971 2011-10-20 07:26:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -17,7 +17,7 @@ pkgname=('kdeutils-ark' 'kdeutils-superkaramba' 'kdeutils-sweeper') pkgver=4.7.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -25,17 +25,31 @@ groups=('kde' 'kdeutils') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' 'qjson') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'CVE-2011-2725.patch') +sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4' + 'bc7428edb6851b4f3dc772bc88ace576379e93f2') build() { - cd ${srcdir} + cd "${srcdir}"/${pkgbase}-${pkgver}/ark + patch -p1 -i "${srcdir}"/CVE-2011-2725.patch + + # Use Python2 + cd "${srcdir}"/${pkgbase}-${pkgver} + sed -i 's|/usr/bin/python|/usr/bin/python2|' \ + kcharselect/kcharselect-generate-datafile.py \ + superkaramba/examples/richtext/rtext.py + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py + + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 make } @@ -159,9 +173,6 @@ package_kdeutils-printer-applet() { make DESTDIR=$pkgdir install cd $srcdir/build/printer-applet/doc make DESTDIR=$pkgdir install - - # Use the python2 executable - find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' } package_kdeutils-superkaramba() { diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 4ce6610c9..745f90c09 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139387 2011-10-01 19:00:12Z ibiru $ +# $Id: PKGBUILD 140935 2011-10-20 05:43:56Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.36.0 +pkgver=2.36.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject- url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('db06af0f8c887abde427e5418e0e74bd39837a0f48a4161ff29607dfcd6b36ca') +sha256sums=('73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index 97c27d97c..ff006192b 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139391 2011-10-01 19:00:17Z ibiru $ +# $Id: PKGBUILD 140937 2011-10-20 05:43:59Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('7cb92e6dbe8f20f4dba327fa078fb3caa35c0ae89445bbbdf1e7a17e5116f542') +sha256sums=('eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD index c88446181..707fb70fa 100644 --- a/extra/mousetweaks/PKGBUILD +++ b/extra/mousetweaks/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=mousetweaks -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Mouse accessibility enhancements for the GNOME desktop" arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=mousetweaks.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('65aeb0fb2c2eb5f0b06ec3aa8de5b3e2ccab02edd3a4a30adb7ef224baa74649') +sha256sums=('6c1ec6780c8dcaa1e3a6a462f7870c4c91574067a4936727a40b011d46d47734') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index bb8edf02f..8a1abf566 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139397 2011-10-01 19:00:26Z ibiru $ +# $Id: PKGBUILD 140941 2011-10-20 05:44:03Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('225edd0dd1cdcc44e3220075728a07de7bafb8aa7e798583aa7602dcd45237c3') +sha256sums=('d6135d5e6c0852f7dc996798e9455fc2e9cbe6d2672f3750fc9b8d27ab141294') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index e9ab6d7c1..d8a2f7351 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 139401 2011-10-01 19:00:31Z ibiru $ +# $Id: PKGBUILD 140943 2011-10-20 05:44:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME file manager" arch=('i686' 'x86_64') license=('GPL') -depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql') +depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify') makedepends=('intltool' 'gobject-introspection') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0eefea717d0b8fa360a50c493875cd146de05cc61b67b426d770ab5ba57541cd') +sha256sums=('c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD index b0a49ee11..71f5bfab8 100644 --- a/extra/notification-daemon/PKGBUILD +++ b/extra/notification-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137530 2011-09-08 19:55:05Z ibiru $ +# $Id: PKGBUILD 140945 2011-10-20 05:44:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=notification-daemon -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Notification daemon for the desktop notifications framework" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ groups=('gnome') makedepends=('pkgconfig' 'intltool') options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) -sha256sums=('74ccbedfe25c9559278ba35ef716125ada9ba0074fe7321a2271abfed5990661') +sha256sums=('c40931557c42cd12fdb04ab531fd7d5c5766641e76babdbff6079a6d88342704') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD index dab326378..52fb398c3 100644 --- a/extra/polkit-gnome/PKGBUILD +++ b/extra/polkit-gnome/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139416 2011-10-01 19:00:54Z ibiru $ +# $Id: PKGBUILD 140948 2011-10-20 05:44:11Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: onestep_ua <onestep@ukr.net> pkgname=polkit-gnome -pkgver=0.103 +pkgver=0.104 pkgrel=1 pkgdesc="PolicyKit integration for the GNOME desktop" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('intltool' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz polkit-gnome-authentication-agent-1.desktop) -sha256sums=('e12712010c76dd7031f83d932253c53940821f5e47303b02fd70d66062ce396b' +sha256sums=('5a59d47cbc87e3e5ac24e5e28b4fa9fc07d6d0096e53fa53d8e6b3fd06854d94' 'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de') build() { diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 2e0f4a603..6384fb1fd 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140517 2011-10-16 08:44:24Z heftig $ +# $Id: PKGBUILD 140984 2011-10-20 15:35:19Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,8 +7,8 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=1.0 -pkgrel=4 +pkgver=1.1 +pkgrel=1 arch=(i686 x86_64) url="http://pulseaudio.org/" license=(GPL LGPL) @@ -17,18 +17,13 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit lirc-utils openssl fftw orc json-c) options=(!emptydirs !libtool !makeflags) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - $pkgbase.xinit version-number.patch dont-require-dbus.patch) -sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' - '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530' - '68c8ddf7ddb4035405ec61e7aa72e88f1430a30f75a36f31761fbfffa8f7dad4') + $pkgbase.xinit) +sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee' + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { cd "$srcdir/$pkgbase-$pkgver" - patch -Np1 -i "$srcdir/version-number.patch" - patch -Np1 -i "$srcdir/dont-require-dbus.patch" - ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -43,7 +38,8 @@ build() { } package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc) + depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc + libsamplerate) optdepends=('avahi: zeroconf support' 'bluez: bluetooth support' 'gconf: configuration through gconf (paprefs)' @@ -96,7 +92,7 @@ package_pulseaudio() { package_libpulse() { pkgdesc="$pkgdesc (client library)" - depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsamplerate json-c) + depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile json-c) optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD index c230b9370..769dbc020 100644 --- a/extra/quodlibet/PKGBUILD +++ b/extra/quodlibet/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 134307 2011-08-02 21:13:14Z eric $ +# $Id: PKGBUILD 140990 2011-10-20 22:44:26Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=quodlibet -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="An audio player written in pygtk" arch=('i686' 'x86_64') @@ -21,8 +21,7 @@ optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support ' 'media-player-info: for media devices support') options=('!makeflags') source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('354b411bd68b3ae4a687c35f6666265b') -sha1sums=('2521011633d0195084e5937eeeb01c0efefa69b1') +sha1sums=('21bc5fb988ca6c09959fc7212c05272a126a5be5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 7c87faf38..f45ffbd5c 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140590 2011-10-17 08:52:42Z heftig $ +# $Id: PKGBUILD 140951 2011-10-20 05:44:14Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) license=('GPL') @@ -18,7 +18,7 @@ groups=('gnome-extra') install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7' +sha256sums=('84f1df80055ca66179a023130e179de44053e7df91c1f6c7fd536563fac832b2' '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') build() { diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD index e4aafe2e3..721620a38 100644 --- a/extra/sushi/PKGBUILD +++ b/extra/sushi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139431 2011-10-01 19:01:21Z ibiru $ +# $Id: PKGBUILD 140953 2011-10-20 05:44:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=sushi -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="A quick previewer for Nautilus" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtkso makedepends=('intltool' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('cdefa909afe31403c118f5c4f356dcb4787161f5a4f4ee92054f84b4c13eb59b') +sha256sums=('b18d166a52738bceeca178318212ef4bd6a5562122f105df40bcd436621cbdb1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 7b6565330..2ab70e259 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139443 2011-10-01 19:01:43Z ibiru $ +# $Id: PKGBUILD 140955 2011-10-20 05:44:18Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="A GNOME3 integrated movie player based on Gstreamer." url="http://www.gnome.org" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulru 'libepc' 'bluez' 'vala' 'grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('97277b6746bdbfa7de185fa20602bfb5c72b77169f346311001d4013a93f9139') +sha256sums=('e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -41,7 +41,8 @@ package_totem() { 'libepc: Publish Playlist plugin' 'libgdata: YouTube Browser plugin' 'bluez: Bemused plugin' - 'grilo-plugins: Browse sidebar (remote media)') + 'grilo-plugins: Browse sidebar (remote media)' + 'pyxdg: opensubtitles plugin') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install @@ -56,7 +57,7 @@ package_totem() { } package_totem-plugin() { - pkgdesc="Totem mozilla/firefox plugin" + pkgdesc="Totem plugin for web browsers" depends=("totem=${pkgver}") cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 63b3e77eb..7d5ca7bcf 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139451 2011-10-01 19:01:59Z ibiru $ +# $Id: PKGBUILD 140957 2011-10-20 05:44:20Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64') license=('GPL') @@ -18,7 +18,7 @@ makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9ba0d13000d81d0e47f456b138f52ef2cb7a603c71381993952acc87c25e2e61') +sha256sums=('077dc011d048e9ed7a683ed74dc027c5c7e47d0b95b99acb493bf99fff22369c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index e199ddd7f..c13a160a5 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139453 2011-10-01 19:02:04Z ibiru $ +# $Id: PKGBUILD 140959 2011-10-20 05:44:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url="http://www.gnome.org" options=(!emptydirs) install=vino.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2b22737aa84c15b07815d47392f9a6ef4cf6f9410cf7024bbae538496e2eda37') +sha256sums=('b8c5a59914886b8676fb512da380114adb896264c46a36d3f123cf459ba799df') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 610261ccd..87ae483fc 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139455 2011-10-01 19:02:07Z ibiru $ +# $Id: PKGBUILD 140961 2011-10-20 05:44:24Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.30.0 +pkgver=0.30.1 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz) -sha256sums=('4b4e13b46e026f1ba088a5bdf9786a339fedb88438f0e094bc7afe5e376be410') +sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64') build() { cd "${srcdir}/vte-${pkgver}" diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index bab95cbdc..2d6ecc158 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 139457 2011-10-01 19:02:12Z ibiru $ +# $Id: PKGBUILD 140963 2011-10-20 05:44:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64') -depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' - 'xz' 'bzip2' 'desktop-file-utils' 'dconf') +depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'gtk-doc') groups=('gnome') license=('GPL') @@ -15,7 +14,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6c33bb608614cc81b1c6d9009621a0618beb39e75bf14da0f091871edcd03172') +sha256sums=('f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/multilib/lib32-libpulse/PKGBUILD b/multilib/lib32-libpulse/PKGBUILD index f28519744..ccf45e707 100644 --- a/multilib/lib32-libpulse/PKGBUILD +++ b/multilib/lib32-libpulse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56113 2011-10-01 19:03:08Z ibiru $ +# $Id: PKGBUILD 57069 2011-10-20 15:38:49Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,13 +7,13 @@ _pkgbasename=libpulse pkgname=lib32-$_pkgbasename pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)" -pkgver=1.0 -pkgrel=2 +pkgver=1.1 +pkgrel=1 arch=(x86_64) url="http://pulseaudio.org/" license=(GPL LGPL) depends=(lib32-dbus-core lib32-xcb-util lib32-json-c - lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsamplerate + lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsndfile $_pkgbasename) makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex) optdepends=('lib32-alsa-plugins: ALSA support') @@ -21,19 +21,16 @@ provides=("lib32-pulseaudio=$pkgver") conflicts=(lib32-pulseaudio) replaces=(lib32-pulseaudio) options=(!emptydirs !libtool !makeflags) -source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz" - version-number.patch) -sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be' - '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530') +source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz") +sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee') _libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la" build() { cd "$srcdir/pulseaudio-$pkgver" - patch -Np1 -i "$srcdir/version-number.patch" - export CC="gcc -m32" + export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" ./configure --prefix=/usr \ diff --git a/testing/truecrypt/PKGBUILD b/testing/truecrypt/PKGBUILD new file mode 100644 index 000000000..9cdc1bc33 --- /dev/null +++ b/testing/truecrypt/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 140995 2011-10-21 02:53:15Z eric $ +# Maintainer: Paul Mattal <paul.archlinux.org> + +pkgname=truecrypt +pkgver=7.1 +pkgrel=1 +pkgdesc="Free open-source cross-platform disk encryption software" +url="http://www.truecrypt.org/" +arch=('i686' 'x86_64') +license=('custom') # TrueCrypt License v2.6 +depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper') +makedepends=('nasm') +optdepends=('sudo: mounting encrypted volumes as nonroot users') +conflicts=('truecrypt-utils') +replaces=('truecrypt-utils') +# N.B. Truecrypt's web-based source download is incompatible with +# makepkg. Source has been placed on ftp.archlinux.org instead +source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \ + 'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \ + "${pkgname}.desktop" \ + "${pkgname}-arch-detection.patch") +md5sums=('a8268630a870faff07af940f63fb29eb' + 'ddee7c4b2419ecb44b02c8294a08fbed' + 'ce6a707b79411e82e8e558aa03e764b0' + '183b9bf04a943454d4e216130bcbac01' + '00ea70fa8437de877b31b027ac2b4060') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-source" + + # Work around buggy CPU type detection + patch -Np1 -i ../${pkgname}-arch-detection.patch + + # Build + make PKCS11_INC="${srcdir}/pkcs-2.20" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-source" + + # Install Binary + install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}" + + # Install Desktop file and Icon + install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm" + + # Install License + install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt" +} diff --git a/testing/truecrypt/truecrypt-arch-detection.patch b/testing/truecrypt/truecrypt-arch-detection.patch new file mode 100644 index 000000000..bc16a2a36 --- /dev/null +++ b/testing/truecrypt/truecrypt-arch-detection.patch @@ -0,0 +1,15 @@ +diff -urN truecrypt-7.0a-source/Makefile truecrypt-7.0a-source.fixed/Makefile +--- truecrypt-7.0a-source/Makefile 2010-09-05 10:32:10.000000000 -0400 ++++ truecrypt-7.0a-source.fixed/Makefile 2011-07-05 21:41:50.296437879 -0400 +@@ -120,10 +120,7 @@ + + export CPU_ARCH ?= unknown + +-ARCH = $(shell uname -p) +-ifeq "$(ARCH)" "unknown" +- ARCH = $(shell uname -m) +-endif ++ARCH = $(shell uname -m) + + ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH))) + CPU_ARCH = x86 diff --git a/testing/truecrypt/truecrypt.desktop b/testing/truecrypt/truecrypt.desktop new file mode 100644 index 000000000..53626f29f --- /dev/null +++ b/testing/truecrypt/truecrypt.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Exec=truecrypt +Icon=truecrypt +Comment=On-the-fly encryption +Terminal=false +Name=TrueCrypt +StartupNotify=true +Categories=System; diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD new file mode 100644 index 000000000..534a3d336 --- /dev/null +++ b/testing/util-linux/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 140979 2011-10-20 11:26:22Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=util-linux +pkgver=2.20.1 +pkgrel=1 +pkgdesc="Miscellaneous system utilities for Linux" +url="http://userweb.kernel.org/~kzak/util-linux-ng/" +arch=('i686' 'x86_64') +groups=('base') +depends=('filesystem') +replaces=('linux32' 'util-linux-ng') +conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') +provides=('linux32' "util-linux-ng=${pkgver}") +license=('GPL2') +options=('!libtool') +#source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2) +optdepends=('perl: for chkdupexe support') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # hardware clock + sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h + + ./configure --enable-arch\ + --enable-write\ + --enable-raw\ + --disable-wall\ + --enable-partx\ + --enable-libmount-mount + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -dm755 "${pkgdir}/var/lib/hwclock" + + make DESTDIR="${pkgdir}" install +} +md5sums=('079b37517fd4e002a2e6e992e8b4e361') |