diff options
Diffstat (limited to 'extra')
549 files changed, 10704 insertions, 4135 deletions
diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD index c9427e7a4..d634cb171 100644 --- a/extra/abook/PKGBUILD +++ b/extra/abook/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191361 2013-07-24 01:43:47Z bisson $ +# $Id: PKGBUILD 195248 2013-09-29 04:45:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=abook -pkgver=0.6.0pre2.20130724 +pkgver=0.6.0pre2.20130928 pkgrel=1 pkgdesc='Text-based addressbook designed for use with Mutt' url='http://abook.sourceforge.net/' @@ -13,8 +13,15 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('git') depends=('readline') -source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68") -sha1sums=('SKIP') +source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68" + 'vcard.patch') +sha1sums=('SKIP' + 'ac71e84812c5d57cb8ddaf5b03b7c25cbdf4c3db') + +prepare() { + cd "${srcdir}/${pkgname}" + patch -p1 -i ../vcard.patch +} build() { cd "${srcdir}/${pkgname}" diff --git a/extra/abook/vcard.patch b/extra/abook/vcard.patch new file mode 100644 index 000000000..55630c1e5 --- /dev/null +++ b/extra/abook/vcard.patch @@ -0,0 +1,26 @@ +diff -Naur old/filter.c new/filter.c +--- old/filter.c 2013-08-22 20:49:06.229337260 -1000 ++++ new/filter.c 2013-08-22 20:49:13.552700987 -1000 +@@ -1673,7 +1673,7 @@ + // vCard(the country name) + item_fput(item, COUNTRY, xstrdup(strsep(&value, ";"))); + +- if(*value) xfree(value); ++ if(value) xfree(value); + } + + static void +@@ -2052,6 +2052,13 @@ + + free(name); + ++ if(db_fget(item, NICK)) ++ fprintf(out, "NICKNAME:%s\r\n", ++ safe_str(db_fget(item, NICK))); ++ if(db_fget(item, ANNIVERSARY)) ++ fprintf(out, "BIRTHDAY:%s\r\n", ++ safe_str(db_fget(item, ANNIVERSARY))); ++ + // see rfc6350 section 6.3.1 + if(db_fget(item, ADDRESS)) { + fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n", diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index 4d28f1031..0e2730543 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188075 2013-06-08 11:18:20Z bpiotrowski $ +# $Id: PKGBUILD 196010 2013-10-07 11:50:21Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="A collection of patience games written in guile scheme" arch=(i686 x86_64 mips64el) @@ -16,8 +16,8 @@ optdepends=('libkdegames: KDE card sets' 'pysolfc-cardsets: PySol card sets') options=('!emptydirs' '!libtool') install=aisleriot.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('14954fe77fa953b20f5385292743857f79efd45e8b75fb06807e7cf17f9db004') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('2b96e73fa2e3c75afc27b2a572c4175943fbaac015824a6f49c41bf479b26e02') build() { cd $pkgname-$pkgver diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 0bd9d6f68..faefac4a3 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191591 2013-07-26 06:33:36Z andrea $ +# $Id: PKGBUILD 196161 2013-10-07 12:32:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi -pkgver=1.10.2 +pkgver=1.10.3 pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano') makedepends=('cmake' 'automoc4' 'boost' 'postgresql') optdepends=('postgresql: PostgreSQL backend') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('35eb8f76588b1d111f75bc46e3ac784b') +source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}-1.tar.bz2") +md5sums=('3929b765baa3dc0d548a26893c64abcf') prepare() { mkdir build diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 57f5dbb06..cc49f7990 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 189860 2013-07-10 07:26:51Z bpiotrowski $ +# $Id: PKGBUILD 193960 2013-09-08 17:48:29Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10803 -pkgrel=3 +pkgver=10808 +pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('febf14f5b1185f25acde64f61b78ed38') +md5sums=('68099241871f4e47eee06bebc7ce20a1') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD index 51dd918a2..b531384f0 100644 --- a/extra/anjuta-extras/PKGBUILD +++ b/extra/anjuta-extras/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 183329 2013-04-21 22:08:26Z heftig $ +# $Id: PKGBUILD 196013 2013-10-07 11:50:25Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=anjuta-extras -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Anjuta Integrated Development Environment extra plugins" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('anjuta') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool' 'itstool') install=anjuta-extras.install url="http://www.anjuta.org/" -source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('115c2f51017aa51edc6bfc7a2d2084e26b29d3df353ed2a92e40f9e3ae28a761') +sha256sums=('92f92e3c530f5649edfe4d8645e8cfd3161383cbc486c636ebb24cf2d2642213') build() { cd $pkgname-$pkgver diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index 85cee7edc..1805f0e19 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 188637 2013-06-17 09:36:56Z jgc $ +# $Id: PKGBUILD 196012 2013-10-07 11:50:24Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.8.4 +pkgver=3.10.0 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') license=(GPL) -makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf +makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs python) url="http://www.anjuta.org/" options=('!libtool' '!emptydirs') source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17') +sha256sums=('72c8569fcd629f3ed1f248cfd452e1f0b473e890421679bd5bb4d6ab2ce3fedb') build() { cd "$pkgbase-$pkgver" @@ -38,7 +38,7 @@ package_libanjuta(){ package_anjuta(){ pkgdesc="GNOME Integrated Development Environment (IDE)" - depends=(libanjuta vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf) + depends=(libanjuta vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf) groups=('gnome-extra') install=anjuta.install diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 66961d92f..fe8fc09b6 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 191251 2013-07-22 09:20:17Z schiv $ +# $Id: PKGBUILD 194389 2013-09-15 12:35:01Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.3 +pkgver=3.4 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64' 'mips64el') url="http://ardour.org/" license=('GPL') -depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' - 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') +depends=('liblrdf' 'liblo' 'libsmf' 'lilv' + 'aubio' 'libgnomecanvasmm' 'suil') makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') optdepends=('xjadeo: video monitoring') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('40edf6ab63488d52abf94a2a48d7ac97' +md5sums=('4c2286d9c5de6846e2abaa2a8fab0349' '316bd21ece5e2208a104fd09cac521af') prepare() { diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD index 720f63d5f..47aa5dc5f 100644 --- a/extra/arj/PKGBUILD +++ b/extra/arj/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 149330 2012-02-06 20:41:57Z stephane $ +# $Id: PKGBUILD 195286 2013-09-29 21:24:32Z eric $ # Maintainer: # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Gergely Tamas <dice@mfa.kfki.hu> pkgname=arj pkgver=3.10.22 -pkgrel=7.1 +pkgrel=8 pkgdesc="Free and portable clone of the ARJ archiver" url="http://arj.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -options=('!makeflags') depends=('glibc') +options=('!makeflags') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 001_arches_align.patch 002_no_remove_static_const.patch @@ -23,7 +23,7 @@ md5sums=('f263bf3cf6d42a8b7e85b4fb514336d3' '56b3cf96ec485b0d824761457417fcc0' '4630a7254dfc6c8d8c7e696aa4a58f4a') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # Add gentoo patches @@ -35,7 +35,13 @@ build() { cd gnu aclocal autoconf - ./configure --prefix=/usr --build=$CHOST --host=$CHOST + rm -f config.{guess,sub} + cp /usr/share/automake-1.14/config.{guess,sub} . +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}/gnu" + ./configure --prefix=/usr cd .. make prepare make diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index b6fe3765c..21f4330c5 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191983 2013-08-03 19:18:46Z remy $ +# $Id: PKGBUILD 195314 2013-09-30 10:28:34Z allan $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Firmicus <francois.archlinux.org> # Contributor: bender02 at gmx dot com pkgname=asymptote pkgver=2.24 -pkgrel=1 +pkgrel=2 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64' 'mips64el') url="http://asymptote.sourceforge.net/" @@ -16,7 +16,7 @@ makedepends=('ghostscript' 'imagemagick' 'texlive-plainextra' # For texinfo ) optdepends=('python2: for the xasy GUI' - 'python-imaging: for the xasy GUI' + 'python2-pillow: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index 39b8b0388..5aa8592fe 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183331 2013-04-21 22:08:29Z heftig $ +# $Id: PKGBUILD 196015 2013-10-07 11:50:27Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.8.1 +pkgver=2.10.0 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('at-spi2-core' 'libx11' 'atk') makedepends=('intltool') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('eb659b94fde6dc0a2f584c9121a5e6d39a4c8aa297d21d8f9032f7a8a775fd06') +sha256sums=('dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94') build() { cd $pkgname-$pkgver diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index 44fb8bc99..a388a9ee9 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183332 2013-04-21 22:08:31Z heftig $ +# $Id: PKGBUILD 196016 2013-10-07 11:50:29Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.8.0 +pkgver=2.10.0 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('dbus' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458') +sha256sums=('964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db') build() { cd $pkgname-$pkgver diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD index a6311a06f..7d1d7851f 100644 --- a/extra/atk/PKGBUILD +++ b/extra/atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183330 2013-04-21 22:08:28Z heftig $ +# $Id: PKGBUILD 196014 2013-10-07 11:50:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=atk -pkgver=2.8.0 +pkgver=2.10.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ makedepends=('gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) url='http://www.gtk.org/' -sha256sums=('b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4') +sha256sums=('636917a5036bc851d8491194645d284798ec118919a828be5e713b6ecc5b50b0') build() { cd "$pkgname-$pkgver" diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD index 1ac22f46f..f326a8530 100644 --- a/extra/audacity/PKGBUILD +++ b/extra/audacity/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176352 2013-01-30 20:25:49Z eric $ +# $Id: PKGBUILD 193962 2013-09-08 19:31:47Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=audacity -pkgver=2.0.3 -pkgrel=2 +pkgver=2.0.4 +pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=('i686' 'x86_64' 'mips64el') url="http://audacity.sourceforge.net/" @@ -14,17 +14,17 @@ makedepends=('cmake') options=('!makeflags') install=audacity.install source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.xz) -sha1sums=('72e634711fb96aac9df445e75e16e12e00c047e6') +sha1sums=('4c1a42137cef598e3d83829ca7c22dba62d215be') build() { - cd "${srcdir}/${pkgname}-src-${pkgver}" + cd ${pkgname}-src-${pkgver} [ "$CARCH" = "mips64el" ] && sse="--disable-sse" PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ - ./configure --prefix=/usr --docdir=/usr/share/doc/audacity $sse + ./configure --prefix=/usr $sse make } package() { - cd "${srcdir}/${pkgname}-src-${pkgver}" + cd ${pkgname}-src-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/audacity/audacity.install b/extra/audacity/audacity.install index 028c9f62a..34ab919aa 100644 --- a/extra/audacity/audacity.install +++ b/extra/audacity/audacity.install @@ -5,9 +5,9 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD index 19ddaa5b7..d683bc937 100644 --- a/extra/baobab/PKGBUILD +++ b/extra/baobab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185372 2013-05-13 18:01:12Z heftig $ +# $Id: PKGBUILD 196017 2013-10-07 11:50:30Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=baobab -pkgver=3.8.2 +pkgver=3.10 pkgrel=1 pkgdesc="A graphical directory tree analyzer" arch=(i686 x86_64 mips64el) @@ -12,8 +12,8 @@ depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'deskto makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection') groups=('gnome') install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('68ce73e34378909a384d17355d2b80c14423dc54ace6a363dc93653cf608614a') +source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz) +sha256sums=('6f4e309073c3834f957b957b03d388fd89900a1622a001d238ad6105c6e303ee') build() { cd "$pkgname-$pkgver" diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD index f2ffc2cd2..14d4171b9 100644 --- a/extra/bijiben/PKGBUILD +++ b/extra/bijiben/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 193200 2013-08-19 01:30:39Z heftig $ +# $Id: PKGBUILD 196018 2013-10-07 11:50:31Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=bijiben -pkgver=3.8.4 +pkgver=3.10.0 pkgrel=1 pkgdesc="Write out notes, every detail matters" arch=(i686 x86_64 mips64el) url="https://live.gnome.org/Bijiben" license=(GPL) -depends=(tracker clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils) +depends=(tracker clutter-gtk zeitgeist webkitgtk hicolor-icon-theme desktop-file-utils gnome-online-accounts) makedepends=(intltool itstool) options=(!emptydirs) install=bijiben.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('5b8f6580fa726139dd707bea8ee581531c21b8470c04723b9b1046033cb999db') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('82817151d7a69190944447bcc7cd12306160c2edce2d0e2ddbfd15ae2d2a6d10') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname + --libexecdir=/usr/lib/$pkgname --disable-update-mimedb make } diff --git a/extra/bijiben/bijiben.install b/extra/bijiben/bijiben.install index 8b17fa3d4..8f9149ffc 100644 --- a/extra/bijiben/bijiben.install +++ b/extra/bijiben/bijiben.install @@ -2,6 +2,7 @@ post_install() { glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime } post_upgrade() { diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index 2fd923666..92633a8d7 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 180985 2013-03-29 12:10:22Z andrea $ +# $Id: PKGBUILD 194547 2013-09-18 11:33:01Z tomegun $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64' 'mips64el') @@ -11,13 +11,13 @@ license=('GPL') depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('d21ad78030ffd892bb2ae5c78aa37919') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('a43e644fe75bd090c47c060dcbdfdb27') build(){ mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${pkgname}-v${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index f1c82b6ca..286957cf6 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 189679 2013-07-04 14:55:32Z tomegun $ +# $Id: PKGBUILD 194652 2013-09-20 13:20:06Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=bluez pkgname=('bluez' 'bluez-utils' 'bluez-libs') -pkgver=5.7 +pkgver=5.9 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -makedepends=('libusb-compat' 'dbus' 'libical' 'systemd') +makedepends=('dbus' 'libical' 'systemd') options=(!libtool) source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2") @@ -65,11 +65,11 @@ package_bluez-libs() { } package_bluez-utils() { pkgdesc="Development and debugging utilities for the bluetooth protocol stack" - depends=('systemd' 'libusb-compat') + depends=('systemd') conflicts=('bluez-hcidump') provides=('bluez-hcidump') replaces=('bluez-hcidump' 'bluez<=4.101') mv "$srcdir/_utils"/* "$pkgdir" } -md5sums=('eb883ce61753bd3f300a531bcc2af49e') +md5sums=('6edaf60d09ee32942a739f80ea847db1') diff --git a/extra/boo/PKGBUILD b/extra/boo/PKGBUILD index 27ae5ff7e..8243ba40e 100644 --- a/extra/boo/PKGBUILD +++ b/extra/boo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149602 2012-02-08 17:29:14Z stephane $ +# $Id: PKGBUILD 195921 2013-10-05 12:22:09Z bpiotrowski $ # Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=boo pkgver=0.9.4.9 -pkgrel=2 +pkgrel=3 pkgdesc="A wrist friendly language for the CLI" arch=('i686' 'x86_64') url="http://boo.codehaus.org/" diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD index 06ac2ba34..bb13ee15b 100644 --- a/extra/brasero/PKGBUILD +++ b/extra/brasero/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183335 2013-04-21 22:08:35Z heftig $ +# $Id: PKGBUILD 196019 2013-10-07 11:50:33Z jgc $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=brasero pkgver=3.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="A disc burning application for Gnome" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/brasero" @@ -20,14 +20,23 @@ optdepends=('libburn: alternative back-end' replaces=('nautilus-cd-burner') install=brasero.install groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + bug655513.patch) +sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4' + '3e774040c570881fe120af7c250a91e8a69331289490c823feed87c4d00f98fb') -build() { +prepare() { cd "$pkgname-$pkgver" # Update tracker dep sed -i '/tracker/s/0\.14/0.16/' configure.ac + + # Fix infinite loop after cancelling the burn image dialog + patch -Np1 -i ../bug655513.patch +} + +build() { + cd "$pkgname-$pkgver" autoreconf -f -v -i ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/extra/brasero/bug655513.patch b/extra/brasero/bug655513.patch new file mode 100644 index 000000000..c5841d3f7 --- /dev/null +++ b/extra/brasero/bug655513.patch @@ -0,0 +1,37 @@ +From f122ee0620380b7c21edce722cfe347f10c8c827 Mon Sep 17 00:00:00 2001 +From: Joshua Lock <joshua.lock@intel.com> +Date: Tue, 03 Sep 2013 10:01:26 +0000 +Subject: brasero-app: don't try and show the main window if it hasn't been created + +It's possible to open brasero without creating the main window, such as +when opening an image file directly triggering the image burning dialogue. +In these cases trying to show the main window when the dialogue is +dismissed is an error, brasero should just exit. + +https://bugzilla.gnome.org/show_bug.cgi?id=655513 +--- +diff --git a/src/brasero-app.c b/src/brasero-app.c +index d345941..8d10781 100644 +--- a/src/brasero-app.c ++++ b/src/brasero-app.c +@@ -2013,6 +2013,9 @@ brasero_app_run_mainwin (BraseroApp *app) + + priv = BRASERO_APP_PRIVATE (app); + ++ if (!priv->mainwin) ++ return FALSE; ++ + if (priv->mainwin_running) + return TRUE; + +@@ -2055,6 +2058,8 @@ brasero_app_init (BraseroApp *object) + + priv = BRASERO_APP_PRIVATE (object); + ++ priv->mainwin = NULL; ++ + /* Load settings */ + priv->setting = brasero_setting_get_default (); + brasero_setting_load (priv->setting); +-- +cgit v0.9.2 diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD index 3d9096993..db49c0848 100644 --- a/extra/cdparanoia/PKGBUILD +++ b/extra/cdparanoia/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 149332 2012-02-06 20:43:48Z stephane $ -# Maintainer: -# Contributor: Alexander Fehr <pizzapunk gmail com> +# $Id: PKGBUILD 195270 2013-09-29 18:03:20Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=cdparanoia pkgver=10.2 -pkgrel=4.2 +pkgrel=5 pkgdesc="Compact Disc Digital Audio extraction tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.xiph.org/paranoia/" license=('GPL') depends=('glibc') -options=('!makeflags') -source=("http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz" - 'gcc.patch') -md5sums=('b304bbe8ab63373924a744eac9ebc652' - '12da14958d2b84c6719fe69890436445') +options=('!makeflags' '!staticlibs') +source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz + gcc.patch) +sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320' + '67faaf0e3eed2e3de6f66d8168604bc6c7295921') -build() { +prepare() { cd "${srcdir}/${pkgname}-III-${pkgver}" patch -p0 -i ${srcdir}/gcc.patch +} + +build() { + cd "${srcdir}/${pkgname}-III-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index 8f384caae..a01fa92da 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191326 2013-07-23 16:47:58Z jgc $ +# $Id: PKGBUILD 196020 2013-10-07 11:50:34Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.8.3 +pkgver=3.10.0 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 'mips64el') @@ -16,7 +16,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=('5f08079b6ccaa6ea8de9163ff0e43554347c12e13f0a60eb6ad06d291c116937') +sha256sums=('eb0d8ba5211a4fe804d540e16a7fb61f16c467e23b106370723c32731b6e620b') build() { cd $pkgname-$pkgver diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index 20f60941d..63e492395 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 191890 2013-08-01 06:53:24Z bpiotrowski $ +# $Id: PKGBUILD 193966 2013-09-09 09:33:12Z bisson $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint -pkgver=0.7 -pkgrel=6 +pkgver=1.0 +pkgrel=1 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('ffmpeg') -makedepends=('cmake' 'git') -source=('git+https://bitbucket.org/acoustid/chromaprint.git#commit=dd51f8e') -sha1sums=('SKIP') +makedepends=('cmake') +source=("https://bitbucket.org/acoustid/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz") +sha1sums=('919e012af588a7e6fea862b29a30e3a5da67526a') build() { - cd "${srcdir}/${pkgname}" - + cd "${srcdir}/${pkgname}-${pkgver}" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ @@ -26,6 +25,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index cb5880f62..496ec0b7d 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 191274 2013-07-23 03:29:14Z bisson $ +# $Id: PKGBUILD 194640 2013-09-20 02:05:29Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav -pkgver=0.97.8 -pkgrel=3 +pkgver=0.98 +pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/logrotate.d/clamav') +backup=('etc/logrotate.d/clamav') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'service' 'service.fresh' 'logrotate' 'tmpfiles.d' 'config.patch') -sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' +sha1sums=('1e6a7284721387646c713a8d32fa8b5a897985db' 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' 'cda9a087e5593992150cb456e34c5f6f589aca82' 'bb488a56b0f6a0760446cde89c1e3321e2717b78' 'a224ea9b4d0f4f196827347d54bed51e11c197ea' - '1c8ef193919b041135115170acd6313f008de808') + '00dfadd93d11186793cb1161745f9dd7370beb99') install=install @@ -49,11 +49,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - # Make sure conf files get installed, because make install - # doesn't do that if clamav is already installed upon building. - install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf - install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf - install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf diff --git a/extra/clamav/config.patch b/extra/clamav/config.patch index 0640df2c3..0b552b3f9 100644 --- a/extra/clamav/config.patch +++ b/extra/clamav/config.patch @@ -1,6 +1,6 @@ -diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf ---- old/etc/clamd.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/clamd.conf 2010-12-02 19:31:45.873357389 +0100 +diff -arU 0 old/etc/clamd.conf.sample new/etc/clamd.conf.sample +--- old/etc/clamd.conf.sample 2010-12-02 19:31:21.773357389 +0100 ++++ new/etc/clamd.conf.sample 2010-12-02 19:31:45.873357389 +0100 @@ -14 +14 @@ -#LogFile /tmp/clamd.log +LogFile /var/log/clamav/clamd.log @@ -19,9 +19,9 @@ diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf @@ -190 +190 @@ -#User clamav +User clamav -diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf ---- old/etc/freshclam.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/freshclam.conf 2010-12-02 19:31:51.190024057 +0100 +diff -arU 0 old/etc/freshclam.conf.sample new/etc/freshclam.conf.sample +--- old/etc/freshclam.conf.sample 2010-12-02 19:31:21.773357389 +0100 ++++ new/etc/freshclam.conf.sample 2010-12-02 19:31:51.190024057 +0100 @@ -17 +17 @@ -#UpdateLogFile /var/log/freshclam.log +UpdateLogFile /var/log/clamav/freshclam.log diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 637d67be0..8c585e8d4 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191304 2013-07-23 13:13:07Z heftig $ +# $Id: PKGBUILD 196022 2013-10-07 11:50:36Z jgc $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=2.0.6 +pkgver=2.0.8 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad) makedepends=(gobject-introspection) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0ecc5630b0578968201802b831a75904a26e6ffe38fb8b60209ef9da51f8b258') +sha256sums=('cee6b0667c74a54fdf43f0ec7c1dc8ff0ffd1c594e0d43529de45048f8080a4d') build() { cd $pkgname-$pkgver diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD index f0c446e13..a8f647fd2 100644 --- a/extra/clutter-gtk/PKGBUILD +++ b/extra/clutter-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189885 2013-07-10 14:58:18Z jgc $ +# $Id: PKGBUILD 196023 2013-10-07 11:50:36Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=clutter-gtk pkgver=1.4.4 -pkgrel=3 +pkgrel=4 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 2b0a30eea..8444153f9 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 190119 2013-07-15 21:53:44Z tomegun $ +# $Id: PKGBUILD 196021 2013-10-07 11:50:34Z jgc $ # 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.14.4 -pkgrel=3 +pkgver=1.16.0 +pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" options=('!libtool') license=('LGPL') -depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon') +depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev') makedepends=('gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c') +sha256sums=('a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --enable-introspection \ - --enable-wayland-backend --enable-egl-backend --enable-evdev-input + --enable-wayland-backend --enable-egl-backend --enable-evdev-input \ + --enable-wayland-compositor # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 573c9b350..86cdbef17 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190118 2013-07-15 21:53:44Z tomegun $ +# $Id: PKGBUILD 196024 2013-10-07 11:50:37Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.14.0 -pkgrel=4 +pkgver=1.16.0 +pkgrel=2 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=(mips64el) url="http://www.clutter-project.org/" @@ -12,12 +12,14 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') options=(!libtool !emptydirs) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8') +sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr \ - --enable-wayland-egl-platform --enable-gles{1,2} + --enable-gles{1,2} \ + --enable-{kms,wayland}-egl-platform \ + --enable-wayland-egl-server # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/extra/cyrus-sasl/CVE-2013-4122.patch b/extra/cyrus-sasl/CVE-2013-4122.patch new file mode 100644 index 000000000..d6b9800e6 --- /dev/null +++ b/extra/cyrus-sasl/CVE-2013-4122.patch @@ -0,0 +1,116 @@ +From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001 +From: mancha <mancha1@hush.com> +Date: Thu, 11 Jul 2013 09:08:07 +0000 +Subject: Handle NULL returns from glibc 2.17+ crypt() + +Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL +(w/ NULL return) if the salt violates specifications. Additionally, +on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords +passed to crypt() fail with EPERM (w/ NULL return). + +When using glibc's crypt(), check return value to avoid a possible +NULL pointer dereference. + +Patch by mancha1@hush.com. +--- +diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c +index 4b34222..400289c 100644 +--- a/pwcheck/pwcheck_getpwnam.c ++++ b/pwcheck/pwcheck_getpwnam.c +@@ -32,6 +32,7 @@ char *userid; + char *password; + { + char* r; ++ char* crpt_passwd; + struct passwd *pwd; + + pwd = getpwnam(userid); +@@ -41,7 +42,7 @@ char *password; + else if (pwd->pw_passwd[0] == '*') { + r = "Account disabled"; + } +- else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) { ++ else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) { + r = "Incorrect password"; + } + else { +diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c +index 2b11286..6d607bb 100644 +--- a/pwcheck/pwcheck_getspnam.c ++++ b/pwcheck/pwcheck_getspnam.c +@@ -32,13 +32,15 @@ char *userid; + char *password; + { + struct spwd *pwd; ++ char *crpt_passwd; + + pwd = getspnam(userid); + if (!pwd) { + return "Userid not found"; + } + +- if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) { ++ crpt_passwd = crypt(password, pwd->sp_pwdp); ++ if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) { + return "Incorrect password"; + } + else { +diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c +index fc8029d..d4ebe54 100644 +--- a/saslauthd/auth_getpwent.c ++++ b/saslauthd/auth_getpwent.c +@@ -77,6 +77,7 @@ auth_getpwent ( + { + /* VARIABLES */ + struct passwd *pw; /* pointer to passwd file entry */ ++ char *crpt_passwd; /* encrypted password */ + int errnum; + /* END VARIABLES */ + +@@ -105,7 +106,8 @@ auth_getpwent ( + } + } + +- if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) { ++ crpt_passwd = crypt(password, pw->pw_passwd); ++ if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) { + if (flags & VERBOSE) { + syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login); + } +diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c +index 677131b..1988afd 100644 +--- a/saslauthd/auth_shadow.c ++++ b/saslauthd/auth_shadow.c +@@ -210,8 +210,8 @@ auth_shadow ( + RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)"); + } + +- cpw = strdup((const char *)crypt(password, sp->sp_pwdp)); +- if (strcmp(sp->sp_pwdp, cpw)) { ++ cpw = crypt(password, sp->sp_pwdp); ++ if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) { + if (flags & VERBOSE) { + /* + * This _should_ reveal the SHADOW_PW_LOCKED prefix to an +@@ -221,10 +221,8 @@ auth_shadow ( + syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'", + sp->sp_pwdp, cpw); + } +- free(cpw); + RETURN("NO Incorrect password"); + } +- free(cpw); + + /* + * The following fields will be set to -1 if: +@@ -286,7 +284,7 @@ auth_shadow ( + RETURN("NO Invalid username"); + } + +- if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) { ++ if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) { + if (flags & VERBOSE) { + syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s", + password, upw->upw_passwd); +-- +cgit v0.9.2 diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 07cf8e0cb..4fdfe49ad 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187053 2013-06-03 11:16:18Z allan $ +# $Id: PKGBUILD 195995 2013-10-07 10:32:45Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.26 -pkgrel=4 +pkgrel=6 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" @@ -25,7 +25,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d - tmpfiles.conf) + tmpfiles.conf + CVE-2013-4122.patch) md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' 'f45aa8c42b32e0569ab3d14a83485b37' @@ -36,21 +37,27 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' - '45bb0192d2f188066240b9a66ee6365f') + '45bb0192d2f188066240b9a66ee6365f' + 'c5f0ec88c584a75c14d7f402eaeed7ef') + +prepare() { + cd cyrus-sasl-$pkgver + patch -Np1 -i ../cyrus-sasl-2.1.22-qa.patch + patch -Np1 -i ../cyrus-sasl-2.1.26-size_t.patch + patch -Np1 -i ../0010_maintainer_mode.patch + patch -Np1 -i ../0011_saslauthd_ac_prog_libtool.patch + patch -Np1 -i ../0025_ld_as_needed.patch + patch -Np1 -i ../0026_drop_krb5support_dependency.patch + patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch + patch -Np1 -i ../CVE-2013-4122.patch + + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in +} build() { export CFLAGS="$CFLAGS -fPIC" + cd cyrus-sasl-$pkgver - cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" - patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" - patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" - patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" - patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" - patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" - - sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in rm -f config/config.guess config/config.sub rm -f config/ltconfig config/ltmain.sh config/libtool.m4 rm -fr autom4te.cache @@ -111,7 +118,7 @@ package_libsasl() { depends=('openssl') conflicts=('cyrus-sasl-plugins') - cd "${srcdir}/cyrus-sasl-${pkgver}" + cd cyrus-sasl-$pkgver for dir in include lib sasldb plugins utils; do pushd ${dir} make DESTDIR="${pkgdir}" install @@ -130,7 +137,7 @@ package_cyrus-sasl() { pkgdesc="Cyrus saslauthd SASL authentication daemon" backup=('etc/conf.d/saslauthd') - cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd" + cd cyrus-sasl-$pkgver/saslauthd make DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service" @@ -145,7 +152,7 @@ package_cyrus-sasl-gssapi() { depends=("libsasl=${pkgver}" 'krb5') replaces=('cyrus-sasl-plugins') - cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + cd cyrus-sasl-$pkgver/plugins install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/" @@ -159,7 +166,7 @@ package_cyrus-sasl-ldap() { depends=("libsasl=${pkgver}" 'libldap') replaces=('cyrus-sasl-plugins') - cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + cd cyrus-sasl-$pkgver/plugins install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/" @@ -172,7 +179,7 @@ package_cyrus-sasl-sql() { depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') replaces=('cyrus-sasl-plugins') - cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" + cd cyrus-sasl-$pkgver/plugins install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/" diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index 4080832c2..0dccaad2b 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190798 2013-07-16 21:17:38Z heftig $ +# $Id: PKGBUILD 196025 2013-10-07 11:50:38Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=dconf -pkgver=0.16.1 +pkgver=0.18.0 pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python' 'python2') optdepends=('gtk3: for dconf-editor') install=dconf.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee') +sha256sums=('109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955') build() { cd "$pkgname-$pkgver" diff --git a/extra/desktop-file-utils/ChangeLog b/extra/desktop-file-utils/ChangeLog deleted file mode 100644 index 8941e4825..000000000 --- a/extra/desktop-file-utils/ChangeLog +++ /dev/null @@ -1,7 +0,0 @@ -2008-07-22 Alexander Fehr <pizzapunk gmail com> - - * desktop-file-utils-0.15-1: - New upstream release. - New maintainer. - Changed url. - Added ChangeLog. diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD index 2493e0774..89c67e814 100644 --- a/extra/desktop-file-utils/PKGBUILD +++ b/extra/desktop-file-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174820 2013-01-07 18:41:05Z andyrtr $ +# $Id: PKGBUILD 196163 2013-10-07 12:38:06Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=desktop-file-utils -pkgver=0.21 +pkgver=0.22 pkgrel=1 pkgdesc="Command line utilities for working with desktop entries" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/desktop-file-utils" license=('GPL') depends=('glib2') source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz) -md5sums=('fda5c312c9fb3b8d818fb54f2c34db82') +sha256sums=('843532672692f98e9b2d6ae6cc8658da562dfde1606c7f33d9d227a344de56c5') build() { cd "${srcdir}/desktop-file-utils-${pkgver}" diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index 2a5913115..a2f70e87c 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 191281 2013-07-23 09:52:37Z jgc $ +# $Id: PKGBUILD 196026 2013-10-07 11:50:39Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=devhelp -pkgver=3.8.2 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64 'mips64el') license=(GPL) url="http://live.gnome.org/devhelp/" -depends=(webkitgtk3 hicolor-icon-theme) +depends=(webkitgtk hicolor-icon-theme) makedepends=(pkgconfig intltool python) options=('!libtool' '!emptydirs') install=devhelp.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7') +sha256sums=('4d28d21a0331c67086607b737147947b288416ab38c8a0b0264f7a63bd4fce9b') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --with-webkit2 + --localstatedir=/var --disable-static make } diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 7443af532..89ea54bca 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 193384 2013-08-19 10:05:42Z andrea $ +# $Id: PKGBUILD 195970 2013-10-06 19:03:45Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=3.3.0 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2' 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('ecf8d9eca918059cdd90ef3538295ee9873fb55f') +sha1sums=('9ed0ef7a7eda8660edf44b1e89354f110e487373') prepare() { mkdir build diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index c9f3fb2d2..a69f783e9 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192152 2013-08-06 14:10:47Z andyrtr $ +# $Id: PKGBUILD 195140 2013-09-25 15:41:44Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.5 +pkgver=2.2.6 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('0096442e2a1739b1b7997a833248a263' +md5sums=('db65988ef2e6889dd8b49c132b21fc8f' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') @@ -32,7 +32,7 @@ build() { cd ${srcdir}/$pkgname-$pkgver # fix build with recent clucene (FC) - sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in +# sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in # fix path in helper script sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh diff --git a/extra/efilinux-efi/PKGBUILD b/extra/efilinux-efi/PKGBUILD deleted file mode 100644 index bd75029c5..000000000 --- a/extra/efilinux-efi/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> - -_gitroot="git://git.kernel.org/pub/scm/boot/efilinux/efilinux.git" -_gitname="efilinux" -_gitbranch="master" - -pkgname="efilinux-efi" -pkgver="1.0" -pkgrel="8" -pkgdesc="Simple UEFI Linux bootloader - Precursor to EFISTUB" -url="https://github.com/mfleming/efilinux" -arch=('x86_64' 'i686') -license=('GPL') -makedepends=('gnu-efi-libs') -depends=('dosfstools' 'efibootmgr') -options=('!strip') -install="${pkgname}.install" - -source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}") -sha1sums=('SKIP') - -[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" -[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32" - -[[ "${CARCH}" == "x86_64" ]] && _EFI_S_ARCH="x64" -[[ "${CARCH}" == "i686" ]] && _EFI_S_ARCH="ia32" - -build() { - - rm -rf "${srcdir}/efilinux-${pkgver}/" || true - cp -r "${srcdir}/${_gitname}" "${srcdir}/efilinux-${pkgver}" - - cd "${srcdir}/efilinux-${pkgver}/" - - ## Add "-fno-strict-aliasing -fno-stack-protector -fno-stack-check -mno-sse -mno-mmx" to CFLAGS - sed 's|-DEFI_FUNCTION_WRAPPER|-fno-strict-aliasing -fno-stack-protector -fno-stack-check -mno-sse -mno-mmx -DEFI_FUNCTION_WRAPPER|g' -i "${srcdir}/efilinux-${pkgver}/Makefile" - - ## Add -DGNU_EFI_USE_MS_ABI to CFLAGS - sed 's|-DEFI_FUNCTION_WRAPPER|-DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI|g' -i "${srcdir}/efilinux-${pkgver}/Makefile" - - ## Add -m64 for x86_64 build - sed 's|CFLAGS += -mno-red-zone|CFLAGS += -m64 -mno-red-zone|g' -i "${srcdir}/efilinux-${pkgver}/Makefile" - - ## Unset all compiler FLAGS - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - make CRT0="/usr/lib/crt0-efi-${_EFI_ARCH}.o" LDSCRIPT="/usr/lib/elf_${_EFI_ARCH}_efi.lds" - -} - -package() { - - cd "${srcdir}/efilinux-${pkgver}/" - - install -d "${pkgdir}/usr/lib/efilinux/" - install -D -m0644 "${srcdir}/efilinux-${pkgver}/efilinux.efi" "${pkgdir}/usr/lib/efilinux/efilinux${_EFI_S_ARCH}.efi" - -} diff --git a/extra/efilinux-efi/efilinux-efi.install b/extra/efilinux-efi/efilinux-efi.install deleted file mode 100644 index 6d6e817c5..000000000 --- a/extra/efilinux-efi/efilinux-efi.install +++ /dev/null @@ -1,23 +0,0 @@ -post_install() { - - cat << EOF - -efilinux has been installed at /usr/lib/efilinux/*.efi - -Copy the efi application for your UEFI ARCH to a sub-directory of -<EFISYS>/EFI/ and add an entry to firmware boot menu using efibootmgr -or mactel-boot (for Macs) - -Usage instructions at http://thread.gmane.org/gmane.linux.kernel/1172645 -and http://article.gmane.org/gmane.linux.kernel/1175060 - -EOF - -} - -post_upgrade() { - - post_install - -} - diff --git a/extra/efivar/PKGBUILD b/extra/efivar/PKGBUILD deleted file mode 100644 index fcbcca915..000000000 --- a/extra/efivar/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 188788 2013-06-20 17:50:47Z tpowa $ -# Maintainer : Tobias Powalowski <tpowa@archlinux.org> -# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> - -_gitroot="git://github.com/vathpela/efivar.git" -_gitname="efivar" -_gitbranch="master" - -_pkgname="efivar" -pkgname="${_pkgname}" - -pkgdesc="Library to manipulate EFI variables - GIT Version" - -pkgver=0.4_18_gb8c524c -pkgrel=1 -arch=('x86_64' 'i686') -url="https://github.com/vathpela/efivar" -license=('LGPL2.1') -depends=('popt') -conflicts=("${_pkgname}" 'libefivar' 'libefivar-git') -provides=("${_pkgname}" 'libefivar' 'libefivar-git') -options=('strip' 'emptydirs' 'zipman' 'libtool' 'docs') - -source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}") -sha1sums=('SKIP') - -pkgver() { - cd "${srcdir}/${_gitname}/" - echo "$(git describe --tags)" | sed 's|-|_|g' -} - -build() { - - rm -rf "${srcdir}/${_gitname}_build/" || true - cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build" - - cd "${srcdir}/${_gitname}_build/" - - git clean -x -d -f - echo - - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/${_gitname}_build/src/test/Makefile" || true - - make libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" V=1 -j1 - echo - -} - -package() { - - cd "${srcdir}/${_gitname}_build/" - - make -j1 V=1 DESTDIR="${pkgdir}/" libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" install - echo - - install -d "${pkgdir}/usr/bin" - install -D -m0755 "${srcdir}/${_gitname}_build/src/test/tester" "${pkgdir}/usr/bin/efivar-tester" - -} diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index a324d9bb3..a2c0f7f81 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190037 2013-07-13 12:40:41Z svenstaro $ +# $Id: PKGBUILD 196027 2013-10-07 11:50:40Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=4.0.1 -pkgrel=5 +pkgrel=6 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index b09cf7948..ef98832e7 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189328 2013-07-03 01:24:05Z eric $ +# $Id: PKGBUILD 194689 2013-09-22 08:17:23Z lcarlier $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=elfutils -pkgver=0.155 +pkgver=0.156 pkgrel=1 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information" arch=('i686' 'x86_64' 'mips64el') @@ -13,23 +13,16 @@ depends=('gcc-libs' 'zlib' 'bzip2' 'xz') provides=('libelf') replaces=('libelf') conflicts=('libelf') -options=('!makeflags') -source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} - elfutils-0.155-binutils-pr-ld-13621.patch) -sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b' - 'fcd0ebd029b305bf030983daf151a2a1ab5294af' - '8a8be7c0686c6311c1ce969ba10494e704ead48c') - -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch - sed -i -e 's:-Werror::g' $(find -name Makefile.in) -} +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}) +sha1sums=('48b30828eb0fb47787e45d80db05c05bbe0eaa76' + 'SKIP') build() { cd ${pkgname}-${pkgver} + CFLAGS+=" -g" # required for test-suite success ./configure --prefix=/usr --program-prefix="eu-" + make } @@ -41,5 +34,6 @@ check() { package() { cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch b/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch deleted file mode 100644 index 7f99ac0be..000000000 --- a/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh -index 4b01008..7a5f0c8 100755 ---- a/tests/run-elflint-self.sh -+++ b/tests/run-elflint-self.sh -@@ -18,4 +18,11 @@ - - . $srcdir/test-subr.sh - -+# Makes sure we exit cleanly even when we don't... -+clean_exit() -+{ -+ if test $? != 0; then echo "binutils PR ld/13621 workaround"; exit 0; fi -+} -+trap clean_exit EXIT -+ - testrun_on_self ../src/elflint --quiet --gnu-ld diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 0ba87960e..40fd956d0 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 186309 2013-05-24 14:23:00Z heftig $ +# $Id: PKGBUILD 196028 2013-10-07 11:50:41Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.8.3 +pkgver=3.10.0 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Empathy" license=(GPL2) -depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control) +depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control geoclue2 geocode-glib cheese libchamplain) makedepends=(intltool itstool docbook-xsl python2) optdepends=('telepathy-gabble: XMPP/Jabber support' 'telepathy-idle: IRC support' @@ -18,8 +18,8 @@ optdepends=('telepathy-gabble: XMPP/Jabber support' options=('!libtool' '!makeflags') groups=(gnome) install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f') build() { cd $pkgname-$pkgver diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index d781aa20f..35a0946c0 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186992 2013-06-02 19:43:30Z heftig $ +# $Id: PKGBUILD 196030 2013-10-07 11:50:43Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.8.1 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/" @@ -13,7 +13,7 @@ makedepends=('intltool') install=eog-plugins.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9') +sha256sums=('0e6699c45181264e87f34a6eb03deeadfd5d73e35995772b7afc803e8218906d') build() { cd $pkgname-$pkgver diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index b60bc2c34..43e05dd2d 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185427 2013-05-14 09:33:41Z heftig $ +# $Id: PKGBUILD 196029 2013-10-07 11:50:42Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=(i686 x86_64 mips64el) @@ -15,7 +15,7 @@ groups=(gnome) options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('689251b6dd18ef191cbfd9431c0324c70707b60edd73d86fc014bd8ae0bd8336') +sha256sums=('d449abfba8ac460b9d9af17778a0f2ffed5c983e74232596b807c3a99f11a1da') build() { cd "$pkgname-$pkgver" diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 6107d244f..230f99612 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189847 2013-07-09 13:12:40Z heftig $ +# $Id: PKGBUILD 196032 2013-10-07 11:50:46Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.8.3 -pkgrel=1 +pkgver=3.10.0 +pkgrel=2 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=(i686 x86_64 mips64el) @@ -11,12 +11,15 @@ license=(GPL) depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre gnome-icon-theme t1lib libsecret desktop-file-utils dconf gsettings-desktop-schemas) makedepends=(itstool libnautilus-extension texlive-bin intltool gobject-introspection docbook-xsl python) optdepends=('texlive-bin: DVI support' - 'gvfs: bookmark support and session saving') + 'gvfs: bookmark support and session saving' + 'p7zip: cbz and cb7 compressed comic books' + 'tar: cbt compressed comic books' + 'unrar: cbr compressed comic books') groups=(gnome) install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1526921201fabe833733e7c2552dfbe62085fd18d325a27c2fffb332e5e418bd') +sha256sums=('495e855af3f071277d79be97a36bf39938d13d09530e80412fed4b7c0b1bdd3e') build() { cd $pkgname-$pkgver diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index e6d5812df..70e175b5d 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,45 +1,27 @@ -# $Id: PKGBUILD 192423 2013-08-11 13:38:21Z heftig $ +# $Id: PKGBUILD 196034 2013-10-07 11:50:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.8.5 +pkgver=3.10.0 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata) -makedepends=(intltool gperf gobject-introspection vala python2 gnome-common) +makedepends=(intltool gperf gobject-introspection vala python2) options=('!libtool') install=$pkgname.install url="http://www.gnome.org" license=(GPL) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz -fix-google-2fa-1.patch -fix-google-2fa-2.patch -fix-google-2fa-3.patch -fix-google-2fa-4.patch) -sha256sums=('73c4ecfed65651cc72966b90081d7b72f9b42573585bc89797efea65ccfdbd2a' - 'c1de9fe146f0512cf6c0219341c8409a9e4d955c3eb6a85f7d07183972b9328e' - '3e1c83dd00f01dfa0f9d67d2327de110b3e232a5f9a882ccce09a02392df7de6' - '9da8cccf504f40b8ee9e068b465cdf0a1a858999dd88d8e8e96f1e4cdffbf1e2' - '27022d00575ba1b9283d9420aa231c2770ff403b0b6c0442b6d679faefdbe00e') - - -prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i ../fix-google-2fa-1.patch - patch -Np1 -i ../fix-google-2fa-2.patch - patch -Np1 -i ../fix-google-2fa-3.patch - patch -Np1 -i ../fix-google-2fa-4.patch -} +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1c47a0e138e9a5ed630d6e3ab30761e74e5f26ed7bbc31debfe76c2bac058b27') build() { cd "$pkgname-$pkgver" - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --with-openldap=yes \ --libexecdir=/usr/lib/evolution-data-server \ --with-krb5=/usr --with-libdb=/usr \ - --enable-vala-bindings --disable-uoa PYTHON=python2 + --enable-vala-bindings --disable-uoa sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool make } diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index 4e0063e36..b34f53475 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 192425 2013-08-11 13:43:43Z heftig $ +# $Id: PKGBUILD 196035 2013-10-07 11:50:49Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.8.5 +pkgver=3.10.0 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'libmspack') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('74a0fdcc698797902ca107f3523e3d3b3e51b8ba01709d308b47ed31e99de877') +sha256sums=('689ad1908d750a6004ee7ce997543a1b5481849aafeb923edebe3f766efa4b46') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index b1976409b..9b4e30122 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192424 2013-08-11 13:43:05Z heftig $ +# $Id: PKGBUILD 196033 2013-10-07 11:50:47Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.8.5 +pkgver=3.10.0 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') @@ -18,8 +18,8 @@ groups=('gnome-extra') options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('26ef047425826a7672f0db7f3d4eef908e68bae47a9e0756883079c445e4326d') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('e64fabc07e1126b80ef8354411d8232aee6e45cfece040a99d494d77df040064') build() { cd $pkgname-$pkgver diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD index ee41dc728..6bfc3812e 100644 --- a/extra/facile/PKGBUILD +++ b/extra/facile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177541 2013-02-07 05:32:46Z eric $ +# $Id: PKGBUILD 195985 2013-10-07 07:06:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=facile pkgver=1.1 -pkgrel=15 +pkgrel=16 pkgdesc="A Functional Constraint Library" arch=(i686 x86_64 'mips64el') url="http://www.recherche.enac.fr/opti/facile/" diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD index bd3595ee2..2867b3946 100644 --- a/extra/five-or-more/PKGBUILD +++ b/extra/five-or-more/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186970 2013-06-01 21:56:36Z heftig $ +# $Id: PKGBUILD 196037 2013-10-07 11:50:51Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=five-or-more -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Remove colored balls from the board by forming lines" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=five-or-more.install url="https://live.gnome.org/Five%20or%20more" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('d63055c296a73762f68d900c753c5ecbec9b20cc1ed4595feb0b7bee9900c311') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('4198d713a2e29e4c1e5493cfb3880acee295d486e2f5b4d3c4780b154cad3a07') build() { cd $pkgname-$pkgver diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD index d1fe8c143..2eb654e93 100644 --- a/extra/fltk/PKGBUILD +++ b/extra/fltk/PKGBUILD @@ -1,17 +1,24 @@ -# $Id: PKGBUILD 184377 2013-05-06 19:37:12Z foutrelis $ +# $Id: PKGBUILD 194347 2013-09-14 08:19:54Z bpiotrowski $ # Maintainer: pkgbase=fltk pkgname=('fltk' 'fltk-docs' 'fltk-games') pkgver=1.3.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('custom:LGPL') url="http://www.fltk.org/" makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \ - 'alsa-lib' 'desktop-file-utils') -source=(http://www.fltk.org/tars/releases/$pkgbase-$pkgver-source.tar.gz) -md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d') + 'alsa-lib' 'desktop-file-utils' 'libxcursor') +source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz + tigervnc.patch) +md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d' + '9efdf03a449d7639b6da493cb0972bba') + +prepare() { + cd "$srcdir/$pkgbase-$pkgver" + patch -Np1 -i ../tigervnc.patch +} build() { cd "$srcdir/$pkgbase-$pkgver" @@ -26,7 +33,7 @@ build() { package_fltk() { pkgdesc="Graphical user interface toolkit for X" depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \ - 'desktop-file-utils' 'xdg-utils') + 'desktop-file-utils' 'xdg-utils' 'libxcursor') options=('!docs') install=fltk.install diff --git a/extra/fltk/tigervnc.patch b/extra/fltk/tigervnc.patch new file mode 100644 index 000000000..92660a013 --- /dev/null +++ b/extra/fltk/tigervnc.patch @@ -0,0 +1,3903 @@ +diff -Nur fltk-1.3.2.orig/CMakeLists.txt fltk-1.3.2/CMakeLists.txt +--- fltk-1.3.2.orig/CMakeLists.txt 2012-09-13 16:19:01.000000000 +0200 ++++ fltk-1.3.2/CMakeLists.txt 2013-07-17 19:37:45.782342898 +0200 +@@ -515,6 +515,34 @@ + endif(OPTION_USE_XINERAMA) + + ####################################################################### ++if(X11_Xfixes_FOUND) ++ option(OPTION_USE_XFIXES "use lib XFIXES" ON) ++endif(X11_Xfixes_FOUND) ++ ++if(OPTION_USE_XFIXES) ++ set(HAVE_XFIXES ${X11_Xfixes_FOUND}) ++ include_directories(${X11_Xfixes_INCLUDE_PATH}) ++ list(APPEND FLTK_LDLIBS -lXfixes) ++ set(FLTK_XFIXES_FOUND TRUE) ++else() ++ set(FLTK_XFIXES_FOUND FALSE) ++endif(OPTION_USE_XFIXES) ++ ++####################################################################### ++if(X11_Xcursor_FOUND) ++ option(OPTION_USE_XCURSOR "use lib XCURSOR" ON) ++endif(X11_Xcursor_FOUND) ++ ++if(OPTION_USE_XCURSOR) ++ set(HAVE_XCURSOR ${X11_Xcursor_FOUND}) ++ include_directories(${X11_Xcursor_INCLUDE_PATH}) ++ list(APPEND FLTK_LDLIBS -lXcursor) ++ set(FLTK_XCURSOR_FOUND TRUE) ++else() ++ set(FLTK_XCURSOR_FOUND FALSE) ++endif(OPTION_USE_XCURSOR) ++ ++####################################################################### + if(X11_Xft_FOUND) + option(OPTION_USE_XFT "use lib Xft" ON) + endif(X11_Xft_FOUND) +diff -Nur fltk-1.3.2.orig/configh.cmake.in fltk-1.3.2/configh.cmake.in +--- fltk-1.3.2.orig/configh.cmake.in 2011-07-19 06:49:30.000000000 +0200 ++++ fltk-1.3.2/configh.cmake.in 2013-07-17 19:37:45.782342898 +0200 +@@ -108,6 +108,22 @@ + #define USE_XDBE HAVE_XDBE + + /* ++ * HAVE_XFIXES: ++ * ++ * Do we have the X fixes extension? ++ */ ++ ++#cmakedefine01 HAVE_XFIXES ++ ++/* ++ * HAVE_XCURSOR: ++ * ++ * Do we have the X cursor library? ++ */ ++ ++#cmakedefine01 HAVE_XCURSOR ++ ++/* + * __APPLE_QUARTZ__: + * + * If __APPLE_QUARTZ__ is defined, FLTK will be +diff -Nur fltk-1.3.2.orig/configh.in fltk-1.3.2/configh.in +--- fltk-1.3.2.orig/configh.in 2011-10-04 11:21:47.000000000 +0200 ++++ fltk-1.3.2/configh.in 2013-07-17 19:37:45.783342892 +0200 +@@ -108,6 +108,22 @@ + #define USE_XDBE HAVE_XDBE + + /* ++ * HAVE_XFIXES: ++ * ++ * Do we have the X fixes extension? ++ */ ++ ++#define HAVE_XFIXES 0 ++ ++/* ++ * HAVE_XCURSOR: ++ * ++ * Do we have the X cursor library? ++ */ ++ ++#define HAVE_XCURSOR 0 ++ ++/* + * __APPLE_QUARTZ__: + * + * All Apple implementations are now based on Quartz and Cocoa, +diff -Nur fltk-1.3.2.orig/configure.in fltk-1.3.2/configure.in +--- fltk-1.3.2.orig/configure.in 2012-11-06 22:13:54.000000000 +0100 ++++ fltk-1.3.2/configure.in 2013-07-17 19:37:45.784342888 +0200 +@@ -997,6 +997,26 @@ + LIBS="-lXext $LIBS") + fi + ++ dnl Check for the Xfixes extension unless disabled... ++ AC_ARG_ENABLE(xfixes, [ --enable-xfixes turn on Xfixes support [default=yes]]) ++ ++ if test x$enable_xfixes != xno; then ++ AC_CHECK_HEADER(X11/extensions/Xfixes.h, AC_DEFINE(HAVE_XFIXES),, ++ [#include <X11/Xlib.h>]) ++ AC_CHECK_LIB(Xfixes, XFixesQueryExtension, ++ LIBS="-lXfixes $LIBS") ++ fi ++ ++ dnl Check for the Xcursor library unless disabled... ++ AC_ARG_ENABLE(xcursor, [ --enable-xcursor turn on Xcursor support [default=yes]]) ++ ++ if test x$enable_xcursor != xno; then ++ AC_CHECK_HEADER(X11/Xcursor/Xcursor.h, AC_DEFINE(HAVE_XCURSOR),, ++ [#include <X11/Xlib.h>]) ++ AC_CHECK_LIB(Xcursor, XcursorImageCreate, ++ LIBS="-lXcursor $LIBS") ++ fi ++ + dnl Check for overlay visuals... + AC_PATH_PROG(XPROP, xprop) + AC_CACHE_CHECK(for X overlay visuals, ac_cv_have_overlay, +diff -Nur fltk-1.3.2.orig/FL/Enumerations.H fltk-1.3.2/FL/Enumerations.H +--- fltk-1.3.2.orig/FL/Enumerations.H 2012-12-09 19:45:57.000000000 +0100 ++++ fltk-1.3.2/FL/Enumerations.H 2013-07-17 19:37:45.785342886 +0200 +@@ -879,35 +879,36 @@ + + /** The following constants define the mouse cursors that are available in FLTK. + +- The double-headed arrows are bitmaps provided by FLTK on X, the others +- are provided by system-defined cursors. ++ Cursors are provided by the system when available, or bitmaps built into ++ FLTK as a fallback. + + \todo enum Fl_Cursor needs maybe an image. + */ + enum Fl_Cursor { + FL_CURSOR_DEFAULT = 0, /**< the default cursor, usually an arrow. */ +- FL_CURSOR_ARROW = 35, /**< an arrow pointer. */ +- FL_CURSOR_CROSS = 66, /**< crosshair. */ +- FL_CURSOR_WAIT = 76, /**< watch or hourglass. */ +- FL_CURSOR_INSERT = 77, /**< I-beam. */ +- FL_CURSOR_HAND = 31, /**< hand (uparrow on MSWindows). */ +- FL_CURSOR_HELP = 47, /**< question mark. */ +- FL_CURSOR_MOVE = 27, /**< 4-pointed arrow. */ +- // fltk provides bitmaps for these: +- FL_CURSOR_NS = 78, /**< up/down arrow. */ +- FL_CURSOR_WE = 79, /**< left/right arrow. */ +- FL_CURSOR_NWSE = 80, /**< diagonal arrow. */ +- FL_CURSOR_NESW = 81, /**< diagonal arrow. */ +- FL_CURSOR_NONE =255, /**< invisible. */ +- // for back compatibility (non MSWindows ones): +- FL_CURSOR_N = 70, /**< for back compatibility. */ +- FL_CURSOR_NE = 69, /**< for back compatibility. */ +- FL_CURSOR_E = 49, /**< for back compatibility. */ +- FL_CURSOR_SE = 8, /**< for back compatibility. */ +- FL_CURSOR_S = 9, /**< for back compatibility. */ +- FL_CURSOR_SW = 7, /**< for back compatibility. */ +- FL_CURSOR_W = 36, /**< for back compatibility. */ +- FL_CURSOR_NW = 68 /**< for back compatibility. */ ++ FL_CURSOR_ARROW = 1, /**< an arrow pointer. */ ++ FL_CURSOR_CROSS = 2, /**< crosshair. */ ++ FL_CURSOR_WAIT = 3, /**< busy indicator (e.g. hourglass). */ ++ FL_CURSOR_INSERT = 4, /**< I-beam. */ ++ FL_CURSOR_HAND = 5, /**< pointing hand. */ ++ FL_CURSOR_HELP = 6, /**< question mark pointer. */ ++ FL_CURSOR_MOVE = 7, /**< 4-pointed arrow or hand. */ ++ ++ /* Resize indicators */ ++ FL_CURSOR_NS = 101, /**< up/down resize. */ ++ FL_CURSOR_WE = 102, /**< left/right resize. */ ++ FL_CURSOR_NWSE = 103, /**< diagonal resize. */ ++ FL_CURSOR_NESW = 104, /**< diagonal resize. */ ++ FL_CURSOR_NE = 110, /**< upwards, right resize. */ ++ FL_CURSOR_N = 111, /**< upwards resize. */ ++ FL_CURSOR_NW = 112, /**< upwards, left resize. */ ++ FL_CURSOR_E = 113, /**< leftwards resize. */ ++ FL_CURSOR_W = 114, /**< rightwards resize. */ ++ FL_CURSOR_SE = 115, /**< downwards, right resize. */ ++ FL_CURSOR_S = 116, /**< downwards resize. */ ++ FL_CURSOR_SW = 117, /**< downwards, left resize. */ ++ ++ FL_CURSOR_NONE = 255, /**< invisible. */ + }; + /*@}*/ // group: Cursors + +diff -Nur fltk-1.3.2.orig/FL/fl_draw.H fltk-1.3.2/FL/fl_draw.H +--- fltk-1.3.2.orig/FL/fl_draw.H 2012-05-08 18:15:34.000000000 +0200 ++++ fltk-1.3.2/FL/fl_draw.H 2013-07-17 19:37:45.785342886 +0200 +@@ -751,7 +751,8 @@ + FL_EXPORT unsigned int fl_old_shortcut(const char* s); + FL_EXPORT void fl_overlay_rect(int x,int y,int w,int h); + FL_EXPORT void fl_overlay_clear(); +-FL_EXPORT void fl_cursor(Fl_Cursor, Fl_Color fg=FL_BLACK, Fl_Color bg=FL_WHITE); ++FL_EXPORT void fl_cursor(Fl_Cursor); ++FL_EXPORT void fl_cursor(Fl_Cursor, Fl_Color fg, Fl_Color bg=FL_WHITE); + FL_EXPORT const char* fl_expand_text(const char* from, char* buf, int maxbuf, + double maxw, int& n, double &width, + int wrap, int draw_symbols = 0); +diff -Nur fltk-1.3.2.orig/FL/Fl.H fltk-1.3.2/FL/Fl.H +--- fltk-1.3.2.orig/FL/Fl.H 2012-10-18 14:56:31.000000000 +0200 ++++ fltk-1.3.2/FL/Fl.H 2013-07-17 19:38:09.574341653 +0200 +@@ -109,6 +109,9 @@ + \see Fl::event_dispatch(Fl_Event_Dispatch) */ + typedef int (*Fl_Event_Dispatch)(int event, Fl_Window *w); + ++/** Signature of add_clipboard_notify functions passed as parameters */ ++typedef void (*Fl_Clipboard_Notify_Handler)(int source, void *data); ++ + /** @} */ /* group callback_functions */ + + +@@ -746,6 +749,19 @@ + */ + static void paste(Fl_Widget &receiver, int source /*=0*/); // platform dependent + /** ++ FLTK will call the registered callback whenever there is a change to the ++ selection buffer or the clipboard. The source argument indicates which ++ of the two has changed. Only changes by other applications are reported. ++ \note Some systems require polling to monitor the clipboard and may ++ therefore have some delay in detecting changes. ++ */ ++ static void add_clipboard_notify(Fl_Clipboard_Notify_Handler h, void *data); ++ /** ++ Stop calling the specified callback when there are changes to the selection ++ buffer or the clipboard. ++ */ ++ static void remove_clipboard_notify(Fl_Clipboard_Notify_Handler h); ++ /** + Initiate a Drag And Drop operation. The selection buffer should be + filled with relevant data before calling this method. FLTK will + then initiate the system wide drag and drop handling. Dropped data +@@ -792,6 +808,8 @@ + static void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my); + static void screen_xywh(int &X, int &Y, int &W, int &H, int n); + static void screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh); ++ static int screen_num(int x, int y); ++ static int screen_num(int x, int y, int w, int h); + static void screen_dpi(float &h, float &v, int n=0); + static void screen_work_area(int &X, int &Y, int &W, int &H, int mx, int my); + static void screen_work_area(int &X, int &Y, int &W, int &H, int n); +diff -Nur fltk-1.3.2.orig/FL/Fl_Image.H fltk-1.3.2/FL/Fl_Image.H +--- fltk-1.3.2.orig/FL/Fl_Image.H 2012-11-09 17:02:08.000000000 +0100 ++++ fltk-1.3.2/FL/Fl_Image.H 2013-07-17 19:37:37.910343301 +0200 +@@ -26,6 +26,7 @@ + #include <stdlib.h> + + class Fl_Widget; ++class Fl_Pixmap; + struct Fl_Menu_Item; + struct Fl_Label; + +@@ -203,6 +204,7 @@ + */ + Fl_RGB_Image(const uchar *bits, int W, int H, int D=3, int LD=0) : + Fl_Image(W,H,D), array(bits), alloc_array(0), id_(0), mask_(0) {data((const char **)&array, 1); ld(LD);} ++ Fl_RGB_Image(const Fl_Pixmap *pxm, Fl_Color bg=FL_GRAY); + virtual ~Fl_RGB_Image(); + virtual Fl_Image *copy(int W, int H); + Fl_Image *copy() { return copy(w(), h()); } +diff -Nur fltk-1.3.2.orig/FL/Fl_Widget.H fltk-1.3.2/FL/Fl_Widget.H +--- fltk-1.3.2.orig/FL/Fl_Widget.H 2012-04-23 22:12:06.000000000 +0200 ++++ fltk-1.3.2/FL/Fl_Widget.H 2013-07-17 19:37:07.411344886 +0200 +@@ -171,6 +171,7 @@ + GROUP_RELATIVE = 1<<16, ///< position this widget relative to the parent group, not to the window + COPIED_TOOLTIP = 1<<17, ///< the widget tooltip is internally copied, its destruction is handled by the widget + FULLSCREEN = 1<<18, ///< a fullscreen window (Fl_Window) ++ SIMPLE_KEYBOARD = 1<<19, ///< the widget wants simple, consistent keypresses and not advanced input (like character composition and CJK input) + // (space for more flags) + USERFLAG3 = 1<<29, ///< reserved for 3rd party extensions + USERFLAG2 = 1<<30, ///< reserved for 3rd party extensions +@@ -776,6 +777,35 @@ + */ + void clear_changed() {flags_ &= ~CHANGED;} + ++ /** ++ Returns if the widget sees a simplified keyboard model or not. ++ ++ Normally widgets get a full-featured keyboard model that is geared ++ towards text input. This includes support for compose sequences and ++ advanced input methods, commonly used for asian writing system. This ++ system however has downsides in that extra graphic can be presented ++ to the user and that a physical key press doesn't correspond directly ++ to a FLTK event. ++ ++ Widgets that need a direct correspondence between actual key events ++ and those seen by the widget can swith to the simplified keyboard ++ model. ++ ++ \retval 0 if the widget uses the normal keyboard model ++ \see set_changed(), clear_changed() ++ */ ++ unsigned int simple_keyboard() const {return flags_&SIMPLE_KEYBOARD;} ++ ++ /** Marks a widget to use the simple keyboard model. ++ \see changed(), clear_changed() ++ */ ++ void set_simple_keyboard() {flags_ |= SIMPLE_KEYBOARD;} ++ ++ /** Marks a widget to use the normal keyboard model. ++ \see changed(), set_changed() ++ */ ++ void set_normal_keyboard() {flags_ &= ~SIMPLE_KEYBOARD;} ++ + /** Gives the widget the keyboard focus. + Tries to make this widget be the Fl::focus() widget, by first sending + it an FL_FOCUS event, and if it returns non-zero, setting +diff -Nur fltk-1.3.2.orig/FL/Fl_Window.H fltk-1.3.2/FL/Fl_Window.H +--- fltk-1.3.2.orig/FL/Fl_Window.H 2012-11-06 21:46:14.000000000 +0100 ++++ fltk-1.3.2/FL/Fl_Window.H 2013-07-17 19:38:17.318341233 +0200 +@@ -22,12 +22,17 @@ + #ifndef Fl_Window_H + #define Fl_Window_H + ++#ifdef WIN32 ++#include <windows.h> ++#endif ++ + #include "Fl_Group.H" + + #define FL_WINDOW 0xF0 ///< window type id all subclasses have type() >= this + #define FL_DOUBLE_WINDOW 0xF1 ///< double window type id + + class Fl_X; ++class Fl_RGB_Image; + + /** + This widget produces an actual window. This can either be a main +@@ -49,7 +54,7 @@ + class FL_EXPORT Fl_Window : public Fl_Group { + + static char *default_xclass_; +- // Note: we must use separate statements for each of the following 4 variables, ++ // Note: we must use separate statements for each of the following 8 variables, + // with the static attribute, otherwise MS VC++ 2008/2010 complains :-( + // AlbrechtS 04/2012 + #if FLTK_ABI_VERSION < 10301 +@@ -68,20 +73,45 @@ + static // when these members are static, ABI compatibility with 1.3.0 is respected + #endif + int no_fullscreen_h; ++#if FLTK_ABI_VERSION < 10302 ++ static // when these members are static, ABI compatibility with 1.3.0 is respected ++#endif ++ int fullscreen_screen_top; ++#if FLTK_ABI_VERSION < 10302 ++ static // when these members are static, ABI compatibility with 1.3.0 is respected ++#endif ++ int fullscreen_screen_bottom; ++#if FLTK_ABI_VERSION < 10302 ++ static // when these members are static, ABI compatibility with 1.3.0 is respected ++#endif ++ int fullscreen_screen_left; ++#if FLTK_ABI_VERSION < 10302 ++ static // when these members are static, ABI compatibility with 1.3.0 is respected ++#endif ++ int fullscreen_screen_right; + + friend class Fl_X; + Fl_X *i; // points at the system-specific stuff + ++ struct icon_data { ++ const void *legacy_icon; ++ Fl_RGB_Image **icons; ++ int count; ++#ifdef WIN32 ++ HICON big_icon; ++ HICON small_icon; ++#endif ++ }; ++ + const char* iconlabel_; + char* xclass_; +- const void* icon_; ++ struct icon_data *icon_; + // size_range stuff: + int minw, minh, maxw, maxh; + int dw, dh, aspect; + uchar size_range_set; + // cursor stuff + Fl_Cursor cursor_default; +- Fl_Color cursor_fg, cursor_bg; + void size_range_(); + void _Fl_Window(); // constructor innards + void fullscreen_x(); // platform-specific part of sending a window to full screen +@@ -121,6 +151,8 @@ + */ + int force_position() const { return ((flags() & FORCE_POSITION)?1:0); } + ++ void free_icons(); ++ + public: + + /** +@@ -350,6 +382,18 @@ + static const char *default_xclass(); + const char* xclass() const; + void xclass(const char* c); ++ ++ static void default_icon(const Fl_RGB_Image*); ++ static void default_icons(const Fl_RGB_Image*[], int); ++ void icon(const Fl_RGB_Image*); ++ void icons(const Fl_RGB_Image*[], int); ++ ++#ifdef WIN32 ++ static void default_icons(HICON big_icon, HICON small_icon); ++ void icons(HICON big_icon, HICON small_icon); ++#endif ++ ++ /* for legacy compatibility */ + const void* icon() const; + void icon(const void * ic); + +@@ -402,13 +446,15 @@ + */ + void show(int argc, char **argv); + /** +- Makes the window completely fill the screen, without any window +- manager border visible. You must use fullscreen_off() to undo +- this. ++ Makes the window completely fill one or more screens, without any ++ window manager border visible. You must use fullscreen_off() to ++ undo this. + + \note On some platforms, this can result in the keyboard being + grabbed. The window may also be recreated, meaning hide() and + show() will be called. ++ ++ \see void Fl_Window::fullscreen_screens() + */ + void fullscreen(); + /** +@@ -425,6 +471,17 @@ + */ + unsigned int fullscreen_active() const { return flags() & FULLSCREEN; } + /** ++ Sets which screens should be used when this window is in fullscreen ++ mode. The window will be resized to the top of the screen with index ++ \p top, the bottom of the screen with index \p bottom, etc. ++ ++ If this method is never called, or if any argument is < 0, then the ++ window will be resized to fill the screen it is currently on. ++ ++ \see void Fl_Window::fullscreen() ++ */ ++ void fullscreen_screens(int top, int bottom, int left, int right); ++ /** + Iconifies the window. If you call this when shown() is false + it will show() it as an icon. If the window is already + iconified this does nothing. +@@ -466,14 +523,17 @@ + is different. + + The type Fl_Cursor is an enumeration defined in <FL/Enumerations.H>. +- (Under X you can get any XC_cursor value by passing +- Fl_Cursor((XC_foo/2)+1)). The colors only work on X, they are +- not implemented on WIN32. + +- For back compatibility only. ++ \see cursor(const Fl_RGB_Image*, int, int), default_cursor() + */ +- void cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); // platform dependent +- void default_cursor(Fl_Cursor, Fl_Color=FL_BLACK, Fl_Color=FL_WHITE); ++ void cursor(Fl_Cursor); ++ void cursor(const Fl_RGB_Image*, int, int); ++ void default_cursor(Fl_Cursor); ++ ++ /* for legacy compatibility */ ++ void cursor(Fl_Cursor c, Fl_Color, Fl_Color=FL_WHITE); ++ void default_cursor(Fl_Cursor c, Fl_Color, Fl_Color=FL_WHITE); ++ + static void default_callback(Fl_Window*, void* v); + + /** Returns the window width including any frame added by the window manager. +diff -Nur fltk-1.3.2.orig/FL/mac.H fltk-1.3.2/FL/mac.H +--- fltk-1.3.2.orig/FL/mac.H 2012-11-13 15:45:42.000000000 +0100 ++++ fltk-1.3.2/FL/mac.H 2013-07-17 19:38:01.694342066 +0200 +@@ -120,7 +120,11 @@ + void collapse(void); + WindowRef window_ref(void); + void set_key_window(void); +- void set_cursor(Fl_Cursor); ++ // OS X doesn't have per window icons ++ static void set_default_icons(const Fl_RGB_Image*[], int) {}; ++ void set_icons() {}; ++ int set_cursor(Fl_Cursor); ++ int set_cursor(const Fl_RGB_Image*, int, int); + static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h); + static unsigned char *bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel); + static Fl_Region intersect_region_and_rect(Fl_Region current, int x,int y,int w, int h); +diff -Nur fltk-1.3.2.orig/FL/win32.H fltk-1.3.2/FL/win32.H +--- fltk-1.3.2.orig/FL/win32.H 2012-03-12 12:55:50.000000000 +0100 ++++ fltk-1.3.2/FL/win32.H 2013-07-17 19:38:17.318341233 +0200 +@@ -73,16 +73,23 @@ + int wait_for_expose; + HDC private_dc; // used for OpenGL + HCURSOR cursor; ++ int custom_cursor; + HDC saved_hdc; // saves the handle of the DC currently loaded + // static variables, static functions and member functions + static Fl_X* first; + static Fl_X* i(const Fl_Window* w) {return w->i;} + static int fake_X_wm(const Fl_Window* w,int &X, int &Y, + int &bt,int &bx,int &by); ++ void make_fullscreen(int X, int Y, int W, int H); + void setwindow(Fl_Window* wi) {w=wi; wi->i=this;} + void flush() {w->flush();} + void set_minmax(LPMINMAXINFO minmax); + void mapraise(); ++ static void set_default_icons(const Fl_RGB_Image*[], int); ++ static void set_default_icons(HICON, HICON); ++ void set_icons(); ++ int set_cursor(Fl_Cursor); ++ int set_cursor(const Fl_RGB_Image*, int, int); + static Fl_X* make(Fl_Window*); + }; + extern FL_EXPORT HCURSOR fl_default_cursor; +diff -Nur fltk-1.3.2.orig/FL/x.H fltk-1.3.2/FL/x.H +--- fltk-1.3.2.orig/FL/x.H 2012-03-23 17:47:53.000000000 +0100 ++++ fltk-1.3.2/FL/x.H 2013-07-17 19:38:01.695342062 +0200 +@@ -154,6 +154,10 @@ + static Fl_X* i(const Fl_Window* wi) {return wi->i;} + void setwindow(Fl_Window* wi) {w=wi; wi->i=this;} + void sendxjunk(); ++ static void set_default_icons(const Fl_RGB_Image*[], int); ++ void set_icons(); ++ int set_cursor(Fl_Cursor); ++ int set_cursor(const Fl_RGB_Image*, int, int); + static void make_xid(Fl_Window*,XVisualInfo* =fl_visual, Colormap=fl_colormap); + static Fl_X* set_xid(Fl_Window*, Window); + // kludges to get around protection: +diff -Nur fltk-1.3.2.orig/src/CMakeLists.txt fltk-1.3.2/src/CMakeLists.txt +--- fltk-1.3.2.orig/src/CMakeLists.txt 2011-01-12 10:24:03.000000000 +0100 ++++ fltk-1.3.2/src/CMakeLists.txt 2013-07-17 19:37:45.788342890 +0200 +@@ -239,6 +239,14 @@ + target_link_libraries(fltk ${X11_Xinerama_LIB}) + endif(HAVE_XINERAMA) + ++if(HAVE_XFIXES) ++ target_link_libraries(fltk ${X11_Xfixes_LIB}) ++endif(HAVE_XFIXES) ++ ++if(HAVE_XCURSOR) ++ target_link_libraries(fltk ${X11_Xcursor_LIB}) ++endif(HAVE_XCURSOR) ++ + if(USE_XFT) + target_link_libraries(fltk ${X11_Xft_LIB}) + endif(USE_XFT) +diff -Nur fltk-1.3.2.orig/src/Fl_cocoa.mm fltk-1.3.2/src/Fl_cocoa.mm +--- fltk-1.3.2.orig/src/Fl_cocoa.mm 2012-11-30 19:20:36.000000000 +0100 ++++ fltk-1.3.2/src/Fl_cocoa.mm 2013-07-17 19:38:17.320341239 +0200 +@@ -97,7 +97,6 @@ + CGContextRef fl_gc = 0; + void *fl_system_menu; // this is really a NSMenu* + Fl_Sys_Menu_Bar *fl_sys_menu_bar = 0; +-void *fl_default_cursor; // this is really a NSCursor* + void *fl_capture = 0; // (NSWindow*) we need this to compensate for a missing(?) mouse capture + bool fl_show_iconic; // true if called from iconize() - shows the next created window in collapsed state + //int fl_disable_transient_for; // secret method of removing TRANSIENT_FOR +@@ -663,12 +662,9 @@ + return NO; // prevent the caption to be redrawn as active on click + // when another modal window is currently the key win + +- return !(w->tooltip_window() || w->menu_window()); ++ return !w->tooltip_window(); + } + +-// TODO see if we really need a canBecomeMainWindow ... +-#if 0 +- + - (BOOL)canBecomeMainWindow + { + if (Fl::modal_ && (Fl::modal_ != w)) +@@ -677,7 +673,6 @@ + + return !(w->tooltip_window() || w->menu_window()); + } +-#endif + + @end + +@@ -1333,8 +1328,6 @@ + dequeue:YES]; + while (ign_event); + +- fl_default_cursor = [NSCursor arrowCursor]; +- + // bring the application into foreground without a 'CARB' resource + Boolean same_psn; + ProcessSerialNumber cur_psn, front_psn; +@@ -1639,6 +1632,7 @@ + - (void)drawRect:(NSRect)rect; + - (BOOL)acceptsFirstResponder; + - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent; ++- (void)resetCursorRects; + - (BOOL)performKeyEquivalent:(NSEvent*)theEvent; + - (void)mouseUp:(NSEvent *)theEvent; + - (void)rightMouseUp:(NSEvent *)theEvent; +@@ -1696,6 +1690,16 @@ + Fl_Window *first = Fl::first_window(); + return (first == w || !first->modal()); + } ++- (void)resetCursorRects { ++ Fl_Window *w = [(FLWindow*)[self window] getFl_Window]; ++ Fl_X *i = Fl_X::i(w); ++ // We have to have at least one cursor rect for invalidateCursorRectsForView ++ // to work, hence the "else" clause. ++ if (i->cursor) ++ [self addCursorRect:[self visibleRect] cursor:(NSCursor*)i->cursor]; ++ else ++ [self addCursorRect:[self visibleRect] cursor:[NSCursor arrowCursor]]; ++} + - (void)mouseUp:(NSEvent *)theEvent { + cocoaMouseHandler(theEvent); + } +@@ -2069,7 +2073,7 @@ + x->other_xid = 0; + x->region = 0; + x->subRegion = 0; +- x->cursor = fl_default_cursor; ++ x->cursor = NULL; + x->gc = 0; // stay 0 for Quickdraw; fill with CGContext for Quartz + Fl_Window *win = w->window(); + Fl_X *xo = Fl_X::i(win); +@@ -2165,16 +2169,39 @@ + x->other_xid = 0; // room for doublebuffering image map. On OS X this is only used by overlay windows + x->region = 0; + x->subRegion = 0; +- x->cursor = fl_default_cursor; ++ x->cursor = NULL; + x->xidChildren = 0; + x->xidNext = 0; + x->gc = 0; + + NSRect crect; + if (w->fullscreen_active()) { +- int sx, sy, sw, sh; +- Fl::screen_xywh(sx, sy, sw, sh, w->x(), w->y(), w->w(), w->h()); +- w->resize(sx, sy, sw, sh); ++ int top, bottom, left, right; ++ int sx, sy, sw, sh, X, Y, W, H; ++ ++ top = w->fullscreen_screen_top; ++ bottom = w->fullscreen_screen_bottom; ++ left = w->fullscreen_screen_left; ++ right = w->fullscreen_screen_right; ++ ++ if ((top < 0) || (bottom < 0) || (left < 0) || (right < 0)) { ++ top = Fl::screen_num(w->x(), w->y(), w->w(), w->h()); ++ bottom = top; ++ left = top; ++ right = top; ++ } ++ ++ Fl::screen_xywh(sx, sy, sw, sh, top); ++ Y = sy; ++ Fl::screen_xywh(sx, sy, sw, sh, bottom); ++ H = sy + sh - Y; ++ Fl::screen_xywh(sx, sy, sw, sh, left); ++ X = sx; ++ Fl::screen_xywh(sx, sy, sw, sh, right); ++ W = sx + sw - X; ++ ++ w->resize(X, Y, W, H); ++ + winstyle = NSBorderlessWindowMask; + winlevel = NSStatusWindowLevel; + } +@@ -2692,6 +2719,10 @@ + Fl_X::relink(w, w->window() ); + w->redraw(); + } ++ if (cursor) { ++ [(NSCursor*)cursor release]; ++ cursor = NULL; ++ } + } + + void Fl_X::unmap() { +@@ -2796,68 +2827,106 @@ + return [image autorelease]; + } + +-static NSCursor *PrepareCursor(NSCursor *cursor, CGContextRef (*f)() ) ++int Fl_X::set_cursor(Fl_Cursor c) + { +- if (cursor == nil) { +- CGContextRef c = f(); +- NSImage *image = CGBitmapContextToNSImage(c); +- fl_delete_offscreen( (Fl_Offscreen)c ); +- NSPoint pt = {[image size].width/2, [image size].height/2}; +- cursor = [[NSCursor alloc] initWithImage:image hotSpot:pt]; ++ if (cursor) { ++ [(NSCursor*)cursor release]; ++ cursor = NULL; + } +- return cursor; +-} + +-void Fl_X::set_cursor(Fl_Cursor c) +-{ +- NSCursor *icrsr; + switch (c) { +- case FL_CURSOR_CROSS: icrsr = [NSCursor crosshairCursor]; break; +- case FL_CURSOR_WAIT: +- static NSCursor *watch = nil; +- watch = PrepareCursor(watch, &Fl_X::watch_cursor_image); +- icrsr = watch; +- break; +- case FL_CURSOR_INSERT: icrsr = [NSCursor IBeamCursor]; break; +- case FL_CURSOR_N: icrsr = [NSCursor resizeUpCursor]; break; +- case FL_CURSOR_S: icrsr = [NSCursor resizeDownCursor]; break; +- case FL_CURSOR_NS: icrsr = [NSCursor resizeUpDownCursor]; break; +- case FL_CURSOR_HELP: +- static NSCursor *help = nil; +- help = PrepareCursor(help, &Fl_X::help_cursor_image); +- icrsr = help; +- break; +- case FL_CURSOR_HAND: icrsr = [NSCursor pointingHandCursor]; break; +- case FL_CURSOR_MOVE: icrsr = [NSCursor openHandCursor]; break; +- case FL_CURSOR_NE: +- case FL_CURSOR_SW: +- case FL_CURSOR_NESW: +- static NSCursor *nesw = nil; +- nesw = PrepareCursor(nesw, &Fl_X::nesw_cursor_image); +- icrsr = nesw; +- break; +- case FL_CURSOR_E: icrsr = [NSCursor resizeRightCursor]; break; +- case FL_CURSOR_W: icrsr = [NSCursor resizeLeftCursor]; break; +- case FL_CURSOR_WE: icrsr = [NSCursor resizeLeftRightCursor]; break; +- case FL_CURSOR_SE: +- case FL_CURSOR_NW: +- case FL_CURSOR_NWSE: +- static NSCursor *nwse = nil; +- nwse = PrepareCursor(nwse, &Fl_X::nwse_cursor_image); +- icrsr = nwse; +- break; +- case FL_CURSOR_NONE: +- static NSCursor *none = nil; +- none = PrepareCursor(none, &Fl_X::none_cursor_image); +- icrsr = none; +- break; +- case FL_CURSOR_ARROW: +- case FL_CURSOR_DEFAULT: +- default: icrsr = [NSCursor arrowCursor]; +- break; ++ case FL_CURSOR_ARROW: cursor = [NSCursor arrowCursor]; break; ++ case FL_CURSOR_CROSS: cursor = [NSCursor crosshairCursor]; break; ++ case FL_CURSOR_INSERT: cursor = [NSCursor IBeamCursor]; break; ++ case FL_CURSOR_HAND: cursor = [NSCursor pointingHandCursor]; break; ++ case FL_CURSOR_MOVE: cursor = [NSCursor openHandCursor]; break; ++ case FL_CURSOR_NS: cursor = [NSCursor resizeUpDownCursor]; break; ++ case FL_CURSOR_WE: cursor = [NSCursor resizeLeftRightCursor]; break; ++ case FL_CURSOR_N: cursor = [NSCursor resizeUpCursor]; break; ++ case FL_CURSOR_E: cursor = [NSCursor resizeRightCursor]; break; ++ case FL_CURSOR_W: cursor = [NSCursor resizeLeftCursor]; break; ++ case FL_CURSOR_S: cursor = [NSCursor resizeDownCursor]; break; ++ default: ++ return 0; ++ } ++ ++ [(NSCursor*)cursor retain]; ++ ++ [(NSWindow*)xid invalidateCursorRectsForView:[(NSWindow*)xid contentView]]; ++ ++ return 1; ++} ++ ++int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) { ++ if (cursor) { ++ [(NSCursor*)cursor release]; ++ cursor = NULL; ++ } ++ ++ if ((hotx < 0) || (hotx >= image->w())) ++ return 0; ++ if ((hoty < 0) || (hoty >= image->h())) ++ return 0; ++ ++ // OS X >= 10.6 can create a NSImage from a CGImage, but we need to ++ // support older versions, hence this pesky handling. ++ ++ NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc] ++ initWithBitmapDataPlanes:NULL ++ pixelsWide:image->w() ++ pixelsHigh:image->h() ++ bitsPerSample:8 ++ samplesPerPixel:image->d() ++ hasAlpha:!(image->d() & 1) ++ isPlanar:NO ++ colorSpaceName:(image->d()<=2) ? NSDeviceWhiteColorSpace : NSDeviceRGBColorSpace ++ bytesPerRow:(image->w() * image->d()) ++ bitsPerPixel:(image->d()*8)]; ++ ++ // Alpha needs to be premultiplied for this format ++ ++ const uchar *i = (const uchar*)*image->data(); ++ unsigned char *o = [bitmap bitmapData]; ++ for (int y = 0;y < image->h();y++) { ++ if (image->d() & 1) { ++ for (int x = 0;x < image->w();x++) { ++ unsigned int alpha; ++ if (image->d() == 4) { ++ alpha = i[3]; ++ *o++ = (unsigned char)((unsigned int)*i++ * alpha / 255); ++ *o++ = (unsigned char)((unsigned int)*i++ * alpha / 255); ++ } ++ ++ alpha = i[1]; ++ *o++ = (unsigned char)((unsigned int)*i++ * alpha / 255); ++ *o++ = alpha; ++ i++; ++ } ++ } else { ++ // No alpha, so we can just copy everything directly. ++ int len = image->w() * image->d(); ++ memcpy(o, i, len); ++ o += len; ++ i += len; ++ } ++ i += image->ld(); + } +- [icrsr set]; +- cursor = icrsr; ++ ++ NSImage *nsimage = [[NSImage alloc] ++ initWithSize:NSMakeSize(image->w(), image->h())]; ++ ++ [nsimage addRepresentation:bitmap]; ++ ++ cursor = [[NSCursor alloc] ++ initWithImage:nsimage ++ hotSpot:NSMakePoint(hotx, hoty)]; ++ ++ [(NSWindow*)xid invalidateCursorRectsForView:[(NSWindow*)xid contentView]]; ++ ++ [bitmap release]; ++ [nsimage release]; ++ ++ return 1; + } + + @interface FLaboutItemTarget : NSObject +diff -Nur fltk-1.3.2.orig/src/fl_cursor.cxx fltk-1.3.2/src/fl_cursor.cxx +--- fltk-1.3.2.orig/src/fl_cursor.cxx 2012-03-12 12:55:50.000000000 +0100 ++++ fltk-1.3.2/src/fl_cursor.cxx 2013-07-17 19:37:45.791342890 +0200 +@@ -24,297 +24,165 @@ + + #include <FL/Fl.H> + #include <FL/Fl_Window.H> ++#include <FL/Fl_Pixmap.H> ++#include <FL/Fl_RGB_Image.H> + #include <FL/x.H> +-#if !defined(WIN32) && !defined(__APPLE__) +-# include <X11/cursorfont.h> +-#endif + #include <FL/fl_draw.H> + ++#include "fl_cursor_wait.xpm" ++#include "fl_cursor_help.xpm" ++#include "fl_cursor_nwse.xpm" ++#include "fl_cursor_nesw.xpm" ++#include "fl_cursor_none.xpm" ++ + /** + Sets the cursor for the current window to the specified shape and colors. + The cursors are defined in the <FL/Enumerations.H> header file. + */ ++void fl_cursor(Fl_Cursor c) { ++ if (Fl::first_window()) Fl::first_window()->cursor(c); ++} ++ ++/* For back compatibility only. */ + void fl_cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) { +- if (Fl::first_window()) Fl::first_window()->cursor(c,fg,bg); ++ fl_cursor(c); + } ++ ++ + /** +- Sets the default window cursor as well as its color. ++ Sets the default window cursor. This is the cursor that will be used ++ after the mouse pointer leaves a widget with a custom cursor set. + +- For back compatibility only. ++ \see cursor(const Fl_RGB_Image*, int, int), default_cursor() + */ +-void Fl_Window::default_cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) { +-// if (c == FL_CURSOR_DEFAULT) c = FL_CURSOR_ARROW; +- ++void Fl_Window::default_cursor(Fl_Cursor c) { + cursor_default = c; +- cursor_fg = fg; +- cursor_bg = bg; ++ cursor(c); ++} ++ ++ ++void fallback_cursor(Fl_Window *w, Fl_Cursor c) { ++ const char **xpm; ++ int hotx, hoty; ++ ++ // The standard arrow is our final fallback, so something is broken ++ // if we get called back here with that as an argument. ++ if (c == FL_CURSOR_ARROW) ++ return; ++ ++ switch (c) { ++ case FL_CURSOR_WAIT: ++ xpm = (const char**)fl_cursor_wait_xpm; ++ hotx = 8; ++ hoty = 15; ++ break; ++ case FL_CURSOR_HELP: ++ xpm = (const char**)fl_cursor_help_xpm; ++ hotx = 1; ++ hoty = 3; ++ break; ++ case FL_CURSOR_NWSE: ++ xpm = (const char**)fl_cursor_nwse_xpm; ++ hotx = 7; ++ hoty = 7; ++ break; ++ case FL_CURSOR_NESW: ++ xpm = (const char**)fl_cursor_nesw_xpm; ++ hotx = 7; ++ hoty = 7; ++ break; ++ case FL_CURSOR_NONE: ++ xpm = (const char**)fl_cursor_none_xpm; ++ hotx = 0; ++ hoty = 0; ++ break; ++ default: ++ w->cursor(FL_CURSOR_ARROW); ++ return; ++ } + +- cursor(c, fg, bg); ++ Fl_Pixmap pxm(xpm); ++ Fl_RGB_Image image(&pxm); ++ ++ w->cursor(&image, hotx, hoty); + } + +-#ifdef WIN32 + +-# ifndef IDC_HAND +-# define IDC_HAND MAKEINTRESOURCE(32649) +-# endif // !IDC_HAND ++void Fl_Window::cursor(Fl_Cursor c) { ++ int ret; + +-void Fl_Window::cursor(Fl_Cursor c, Fl_Color c1, Fl_Color c2) { +- if (!shown()) return; + // the cursor must be set for the top level window, not for subwindows + Fl_Window *w = window(), *toplevel = this; +- while (w) { toplevel = w; w = w->window(); } +- if (toplevel != this) { toplevel->cursor(c, c1, c2); return; } +- // now set the actual cursor +- if (c == FL_CURSOR_DEFAULT) { +- c = cursor_default; +- } +- if (c > FL_CURSOR_NESW) { +- i->cursor = 0; +- } else if (c == FL_CURSOR_DEFAULT) { +- i->cursor = fl_default_cursor; +- } else { +- LPSTR n; +- switch (c) { +- case FL_CURSOR_ARROW: n = IDC_ARROW; break; +- case FL_CURSOR_CROSS: n = IDC_CROSS; break; +- case FL_CURSOR_WAIT: n = IDC_WAIT; break; +- case FL_CURSOR_INSERT: n = IDC_IBEAM; break; +- case FL_CURSOR_HELP: n = IDC_HELP; break; +- case FL_CURSOR_HAND: { +- OSVERSIONINFO osvi; +- +- // Get the OS version: Windows 98 and 2000 have a standard +- // hand cursor. +- memset(&osvi, 0, sizeof(OSVERSIONINFO)); +- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); +- GetVersionEx(&osvi); +- +- if (osvi.dwMajorVersion > 4 || +- (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion > 0 && +- osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)) n = IDC_HAND; +- else n = IDC_UPARROW; +- } break; +- case FL_CURSOR_MOVE: n = IDC_SIZEALL; break; +- case FL_CURSOR_N: +- case FL_CURSOR_S: +- case FL_CURSOR_NS: n = IDC_SIZENS; break; +- case FL_CURSOR_NE: +- case FL_CURSOR_SW: +- case FL_CURSOR_NESW: n = IDC_SIZENESW; break; +- case FL_CURSOR_E: +- case FL_CURSOR_W: +- case FL_CURSOR_WE: n = IDC_SIZEWE; break; +- case FL_CURSOR_SE: +- case FL_CURSOR_NW: +- case FL_CURSOR_NWSE: n = IDC_SIZENWSE; break; +- default: n = IDC_NO; break; +- } +- i->cursor = LoadCursor(NULL, n); ++ ++ while (w) { ++ toplevel = w; ++ w = w->window(); + } +- SetCursor(i->cursor); +-} + +-#elif defined(__APPLE__) ++ if (toplevel != this) { ++ toplevel->cursor(c); ++ return; ++ } + +-#ifdef __BIG_ENDIAN__ +-# define E(x) x +-#elif defined __LITTLE_ENDIAN__ +-// Don't worry. This will be resolved at compile time +-# define E(x) (x>>8)|((x<<8)&0xff00) +-#else +-# error "Either __LITTLE_ENDIAN__ or __BIG_ENDIAN__ must be defined" +-#endif +- +-CGContextRef Fl_X::help_cursor_image(void) +-{ +- int w = 20, h = 20; +- Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h); +- fl_begin_offscreen(off); +- CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0); +- fl_rectf(0,0,w,h); +- fl_color(FL_BLACK); +- fl_font(FL_COURIER_BOLD, 20); +- fl_draw("?", 1, h-1); +- fl_end_offscreen(); +- return (CGContextRef)off; +-} ++ if (c == FL_CURSOR_DEFAULT) ++ c = cursor_default; + +-CGContextRef Fl_X::none_cursor_image(void) +-{ +- int w = 20, h = 20; +- Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h); +- fl_begin_offscreen(off); +- CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0); +- fl_rectf(0,0,w,h); +- fl_end_offscreen(); +- return (CGContextRef)off; +-} ++ if (!i) ++ return; + +-CGContextRef Fl_X::watch_cursor_image(void) +-{ +- int w, h, r = 5; +- w = 2*r+6; +- h = 4*r; +- Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h); +- fl_begin_offscreen(off); +- CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0); +- fl_rectf(0,0,w,h); +- CGContextTranslateCTM( (CGContextRef)off, w/2, h/2); +- fl_color(FL_WHITE); +- fl_circle(0, 0, r+1); +- fl_color(FL_BLACK); +- fl_rectf(int(-r*0.7), int(-r*1.7), int(1.4*r), int(3.4*r)); +- fl_rectf(r-1, -1, 3, 3); +- fl_color(FL_WHITE); +- fl_pie(-r, -r, 2*r, 2*r, 0, 360); +- fl_color(FL_BLACK); +- fl_circle(0,0,r); +- fl_xyline(0, 0, int(-r*.7)); +- fl_xyline(0, 0, 0, int(-r*.7)); +- fl_end_offscreen(); +- return (CGContextRef)off; +-} ++ ret = i->set_cursor(c); ++ if (ret) ++ return; + +-CGContextRef Fl_X::nesw_cursor_image(void) +-{ +- int c = 7, r = 2*c; +- int w = r, h = r; +- Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h); +- fl_begin_offscreen(off); +- CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0); +- fl_rectf(0,0,w,h); +- CGContextTranslateCTM( (CGContextRef)off, 0, h); +- CGContextScaleCTM( (CGContextRef)off, 1, -1); +- fl_color(FL_BLACK); +- fl_polygon(0, 0, c, 0, 0, c); +- fl_polygon(r, r, r, r-c, r-c, r); +- fl_line_style(FL_SOLID, 2, 0); +- fl_line(0,1, r,r+1); +- fl_line_style(FL_SOLID, 0, 0); +- fl_end_offscreen(); +- return (CGContextRef)off; ++ fallback_cursor(this, c); + } + +-CGContextRef Fl_X::nwse_cursor_image(void) +-{ +- int c = 7, r = 2*c; +- int w = r, h = r; +- Fl_Offscreen off = Fl_Quartz_Graphics_Driver::create_offscreen_with_alpha(w, h); +- fl_begin_offscreen(off); +- CGContextSetRGBFillColor( (CGContextRef)off, 0,0,0,0); +- fl_rectf(0,0,w,h); +- CGContextTranslateCTM( (CGContextRef)off, 0, h); +- CGContextScaleCTM( (CGContextRef)off, 1, -1); +- fl_color(FL_BLACK); +- fl_polygon(r-1, 0, r-1, c, r-1-c, 0); +- fl_polygon(-1, r, c-1, r, -1, r-c); +- fl_line_style(FL_SOLID, 2, 0); +- fl_line(r-1,1, -1,r+1); +- fl_line_style(FL_SOLID, 0, 0); +- fl_end_offscreen(); +- return (CGContextRef)off; +-} +- +-void Fl_Window::cursor(Fl_Cursor c, Fl_Color, Fl_Color) { +- if (c == FL_CURSOR_DEFAULT) { +- c = cursor_default; +- } +- if (i) i->set_cursor(c); +-} ++/** ++ Changes the cursor for this window. This always calls the system, if ++ you are changing the cursor a lot you may want to keep track of how ++ you set it in a static variable and call this only if the new cursor ++ is different. + +-#else ++ The default cursor will be used if the provided image cannot be used ++ as a cursor. + +-// I like the MSWindows resize cursors, so I duplicate them here: ++ \see cursor(Fl_Cursor), default_cursor() ++*/ ++void Fl_Window::cursor(const Fl_RGB_Image *image, int hotx, int hoty) { ++ int ret; + +-#define CURSORSIZE 16 +-#define HOTXY 7 +-static struct TableEntry { +- uchar bits[CURSORSIZE*CURSORSIZE/8]; +- uchar mask[CURSORSIZE*CURSORSIZE/8]; +- Cursor cursor; +-} table[] = { +- {{ // FL_CURSOR_NS +- 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0x80, 0x01, 0x80, 0x01, +- 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, +- 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01, 0x00, 0x00}, +- { +- 0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0xc0, 0x03, +- 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, +- 0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01}}, +- {{ // FL_CURSOR_EW +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, +- 0x0c, 0x30, 0xfe, 0x7f, 0xfe, 0x7f, 0x0c, 0x30, 0x08, 0x10, 0x00, 0x00, +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, +- { +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x1c, 0x38, +- 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0x1c, 0x38, 0x18, 0x18, +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, +- {{ // FL_CURSOR_NWSE +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x38, 0x00, 0x78, 0x00, +- 0xe8, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x17, 0x00, 0x1e, 0x00, 0x1c, +- 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, +- { +- 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0x7c, 0x00, 0xfc, 0x00, +- 0xfc, 0x01, 0xec, 0x03, 0xc0, 0x37, 0x80, 0x3f, 0x00, 0x3f, 0x00, 0x3e, +- 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00}}, +- {{ // FL_CURSOR_NESW +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x1c, 0x00, 0x1e, +- 0x00, 0x17, 0x80, 0x03, 0xc0, 0x01, 0xe8, 0x00, 0x78, 0x00, 0x38, 0x00, +- 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, +- { +- 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x3f, 0x00, 0x3e, 0x00, 0x3f, +- 0x80, 0x3f, 0xc0, 0x37, 0xec, 0x03, 0xfc, 0x01, 0xfc, 0x00, 0x7c, 0x00, +- 0xfc, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00}}, +- {{0}, {0}} // FL_CURSOR_NONE & unknown +-}; ++ // the cursor must be set for the top level window, not for subwindows ++ Fl_Window *w = window(), *toplevel = this; + +-void Fl_Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) { +- if (!shown()) return; +- Cursor xc; +- int deleteit = 0; +- if (c == FL_CURSOR_DEFAULT) { +- c = cursor_default; +- fg = cursor_fg; +- bg = cursor_bg; ++ while (w) { ++ toplevel = w; ++ w = w->window(); + } + +- if (!c) { +- xc = None; +- } else { +- if (c >= FL_CURSOR_NS) { +- TableEntry *q = (c > FL_CURSOR_NESW) ? table+4 : table+(c-FL_CURSOR_NS); +- if (!(q->cursor)) { +- XColor dummy = { 0 }; +- Pixmap p = XCreateBitmapFromData(fl_display, +- RootWindow(fl_display, fl_screen), (const char*)(q->bits), +- CURSORSIZE, CURSORSIZE); +- Pixmap m = XCreateBitmapFromData(fl_display, +- RootWindow(fl_display, fl_screen), (const char*)(q->mask), +- CURSORSIZE, CURSORSIZE); +- q->cursor = XCreatePixmapCursor(fl_display, p,m,&dummy, &dummy, +- HOTXY, HOTXY); +- XFreePixmap(fl_display, m); +- XFreePixmap(fl_display, p); +- } +- xc = q->cursor; +- } else { +- xc = XCreateFontCursor(fl_display, (c-1)*2); +- deleteit = 1; +- } +- XColor fgc; +- uchar r,g,b; +- Fl::get_color(fg,r,g,b); +- fgc.red = r<<8; fgc.green = g<<8; fgc.blue = b<<8; +- XColor bgc; +- Fl::get_color(bg,r,g,b); +- bgc.red = r<<8; bgc.green = g<<8; bgc.blue = b<<8; +- XRecolorCursor(fl_display, xc, &fgc, &bgc); ++ if (toplevel != this) { ++ toplevel->cursor(image, hotx, hoty); ++ return; + } +- XDefineCursor(fl_display, fl_xid(this), xc); +- if (deleteit) XFreeCursor(fl_display, xc); ++ ++ if (!i) ++ return; ++ ++ ret = i->set_cursor(image, hotx, hoty); ++ if (ret) ++ return; ++ ++ cursor(FL_CURSOR_DEFAULT); + } + +-#endif ++/* For back compatibility only. */ ++void Fl_Window::cursor(Fl_Cursor c, Fl_Color, Fl_Color) { ++ cursor(c); ++}; ++ ++void Fl_Window::default_cursor(Fl_Cursor c, Fl_Color, Fl_Color) { ++ default_cursor(c); ++}; ++ + + // + // End of "$Id: fl_cursor.cxx 9278 2012-03-12 11:55:50Z manolo $". +diff -Nur fltk-1.3.2.orig/src/fl_cursor_help.xpm fltk-1.3.2/src/fl_cursor_help.xpm +--- fltk-1.3.2.orig/src/fl_cursor_help.xpm 1970-01-01 01:00:00.000000000 +0100 ++++ fltk-1.3.2/src/fl_cursor_help.xpm 2013-07-17 19:37:45.792342890 +0200 +@@ -0,0 +1,95 @@ ++/* XPM */ ++static const char * fl_cursor_help_xpm[] = { ++"16 27 65 1", ++" c None", ++". c #FFFFFF", ++"+ c #E2E2E2", ++"@ c #1C1C1C", ++"# c #E7E7E7", ++"$ c #000000", ++"% c #212121", ++"& c #EAEAEA", ++"* c #262626", ++"= c #EDEDED", ++"- c #2C2C2C", ++"; c #F0F0F0", ++"> c #333333", ++", c #F1F1F1", ++"' c #393939", ++") c #F3F3F3", ++"! c #404040", ++"~ c #484848", ++"{ c #F4F4F4", ++"] c #050505", ++"^ c #202020", ++"/ c #707070", ++"( c #F5F5F5", ++"_ c #040404", ++": c #E1E1E1", ++"< c #EEEEEE", ++"[ c #EFEFEF", ++"} c #FEFEFE", ++"| c #3D3D3D", ++"1 c #7E7E7E", ++"2 c #696969", ++"3 c #414141", ++"4 c #131313", ++"5 c #080808", ++"6 c #454545", ++"7 c #F2F2F2", ++"8 c #878787", ++"9 c #7D7D7D", ++"0 c #101010", ++"a c #111111", ++"b c #FDFDFD", ++"c c #8A8A8A", ++"d c #E6E6E6", ++"e c #7B7B7B", ++"f c #4C4C4C", ++"g c #5C5C5C", ++"h c #9F9F9F", ++"i c #F9F9F9", ++"j c #F7F7F7", ++"k c #B1B1B1", ++"l c #2E2E2E", ++"m c #767676", ++"n c #DCDCDC", ++"o c #DEDEDE", ++"p c #C7C7C7", ++"q c #1B1B1B", ++"r c #6B6B6B", ++"s c #575757", ++"t c #797979", ++"u c #020202", ++"v c #010101", ++"w c #FBFBFB", ++"x c #D7D7D7", ++"y c #D8D8D8", ++"z c #060606", ++" ", ++". ", ++".+ ", ++".@# ", ++".$%& ", ++".$$*= ", ++".$$$-; ", ++".$$$$>, ", ++".$$$$$') ", ++".$$$$$$!) ", ++".$$$$$$$~{ ", ++".$$$$]^^^/( ", ++".$$$$_:(<<[} ", ++".$$|1$2< ", ++".$3,(45[ ", ++".67 78$9, ", ++".7 {0a( .... ", ++"b ,c5[defgh, ", ++" )ijk_la$m.", ++" no.p$q.", ++" .r$s.", ++" .t$-= ", ++" 7uv+ ", ++" wxy. ", ++" :$z. ", ++" :$z. ", ++" .... "}; +diff -Nur fltk-1.3.2.orig/src/fl_cursor_nesw.xpm fltk-1.3.2/src/fl_cursor_nesw.xpm +--- fltk-1.3.2.orig/src/fl_cursor_nesw.xpm 1970-01-01 01:00:00.000000000 +0100 ++++ fltk-1.3.2/src/fl_cursor_nesw.xpm 2013-07-17 19:37:45.792342890 +0200 +@@ -0,0 +1,46 @@ ++/* XPM */ ++static const char * fl_cursor_nesw_xpm[] = { ++"15 15 28 1", ++" c None", ++". c #FFFFFF", ++"+ c #767676", ++"@ c #000000", ++"# c #4E4E4E", ++"$ c #0C0C0C", ++"% c #494949", ++"& c #4D4D4D", ++"* c #1B1B1B", ++"= c #515151", ++"- c #646464", ++"; c #363636", ++"> c #6A6A6A", ++", c #545454", ++"' c #585858", ++") c #242424", ++"! c #797979", ++"~ c #2E2E2E", ++"{ c #444444", ++"] c #3B3B3B", ++"^ c #0A0A0A", ++"/ c #595959", ++"( c #F7F7F7", ++"_ c #080808", ++": c #6B6B6B", ++"< c #FDFDFD", ++"[ c #FCFCFC", ++"} c #FEFEFE", ++" ..........", ++" .+@@@@@@.", ++" .#@@@@@.", ++" .$@@@@.", ++" .%@@@@@.", ++". .&@@@*@@.", ++".. .=@@@-.;@.", ++".>. .,@@@'. .).", ++".@!.'@@@#. ..", ++".@@~@@@{. .", ++".@@@@@]. ", ++".@@@@^. ", ++".@@@@@/( ", ++".______:( ", ++"<[[[[[[[[} "}; +diff -Nur fltk-1.3.2.orig/src/fl_cursor_none.xpm fltk-1.3.2/src/fl_cursor_none.xpm +--- fltk-1.3.2.orig/src/fl_cursor_none.xpm 1970-01-01 01:00:00.000000000 +0100 ++++ fltk-1.3.2/src/fl_cursor_none.xpm 2013-07-17 19:37:45.793342890 +0200 +@@ -0,0 +1,19 @@ ++/* XPM */ ++static const char * fl_cursor_none_xpm[] = { ++"15 15 1 1", ++" c None", ++" ", ++" ", ++" ", ++" ", ++" ", ++" ", ++" ", ++" ", ++" ", ++" ", ++" ", ++" ", ++" ", ++" ", ++" "}; +diff -Nur fltk-1.3.2.orig/src/fl_cursor_nwse.xpm fltk-1.3.2/src/fl_cursor_nwse.xpm +--- fltk-1.3.2.orig/src/fl_cursor_nwse.xpm 1970-01-01 01:00:00.000000000 +0100 ++++ fltk-1.3.2/src/fl_cursor_nwse.xpm 2013-07-17 19:37:45.793342890 +0200 +@@ -0,0 +1,46 @@ ++/* XPM */ ++static const char * fl_cursor_nwse_xpm[] = { ++"15 15 28 1", ++" c None", ++". c #FFFFFF", ++"+ c #000000", ++"@ c #767676", ++"# c #4E4E4E", ++"$ c #0C0C0C", ++"% c #494949", ++"& c #1B1B1B", ++"* c #4D4D4D", ++"= c #363636", ++"- c #646464", ++"; c #515151", ++"> c #242424", ++", c #585858", ++"' c #545454", ++") c #6A6A6A", ++"! c #797979", ++"~ c #444444", ++"{ c #2E2E2E", ++"] c #3B3B3B", ++"^ c #0A0A0A", ++"/ c #F7F7F7", ++"( c #595959", ++"_ c #6B6B6B", ++": c #080808", ++"< c #FEFEFE", ++"[ c #FCFCFC", ++"} c #FDFDFD", ++".......... ", ++".++++++@. ", ++".+++++#. ", ++".++++$. ", ++".+++++%. ", ++".++&+++*. .", ++".+=.-+++;. ..", ++".>. .,+++'. .).", ++".. .#+++,.!+.", ++". .~+++{++.", ++" .]+++++.", ++" .^++++.", ++" /(+++++.", ++" /_::::::.", ++" <[[[[[[[[}"}; +diff -Nur fltk-1.3.2.orig/src/fl_cursor_wait.xpm fltk-1.3.2/src/fl_cursor_wait.xpm +--- fltk-1.3.2.orig/src/fl_cursor_wait.xpm 1970-01-01 01:00:00.000000000 +0100 ++++ fltk-1.3.2/src/fl_cursor_wait.xpm 2013-07-17 19:37:45.793342890 +0200 +@@ -0,0 +1,72 @@ ++/* XPM */ ++static const char * fl_cursor_wait_xpm[] = { ++"17 32 37 1", ++" c None", ++". c #FFFFFF", ++"+ c #2E2E2E", ++"@ c #202020", ++"# c #F1F1F1", ++"$ c #2D2D2D", ++"% c #000000", ++"& c #EDEDED", ++"* c #585858", ++"= c #575757", ++"- c #FBFBFB", ++"; c #848484", ++"> c #B8B8B8", ++", c #E5E5E5", ++"' c #F7F7F7", ++") c #181818", ++"! c #F0F0F0", ++"~ c #616161", ++"{ c #B7B7B7", ++"] c #F5F5F5", ++"^ c #050505", ++"/ c #D4D4D4", ++"( c #EEEEEE", ++"_ c #595959", ++": c #7B7B7B", ++"< c #E9E9E9", ++"[ c #131313", ++"} c #E3E3E3", ++"| c #767676", ++"1 c #505050", ++"2 c #F3F3F3", ++"3 c #2A2A2A", ++"4 c #070707", ++"5 c #343434", ++"6 c #939393", ++"7 c #191919", ++"8 c #6A6A6A", ++".................", ++".+@@@@@@@@@@@@@+.", ++".................", ++" #$%%%%%%%%%%%$# ", ++" &*%%%%%%%%%%%=& ", ++" -;%%%%%%%%%%%;- ", ++" >%%%%%%%%%%%> ", ++" ,%%%%%%%%%%%, ", ++" ')%%%%%%%%%)' ", ++" !~%%%%%%%%%~! ", ++" {%%%%%%%%%{ ", ++" ]^/...../^] ", ++" (_:.....:_( ", ++" <[}...}[< ", ++" !|1...1|! ", ++" 2[3.3[2 ", ++" 2[%.%[2 ", ++" !|%%.%%|! ", ++" <4%%.%%4< ", ++" (_%%%.%%%_( ", ++" ]^%%%.%%%^] ", ++" {%%%%.%%%%{ ", ++" !~%%%%.%%%%~! ", ++" ')%%%%.%%%%)' ", ++" ,%%56{.{65%%, ", ++" >%*.......*%> ", ++" -;7&.......&7;- ", ++" &*8.........8=& ", ++" #$%%%%%%%%%%%$# ", ++".................", ++".+@@@@@@@@@@@@@+.", ++"................."}; +diff -Nur fltk-1.3.2.orig/src/Fl.cxx fltk-1.3.2/src/Fl.cxx +--- fltk-1.3.2.orig/src/Fl.cxx 2012-08-16 22:59:36.000000000 +0200 ++++ fltk-1.3.2/src/Fl.cxx 2013-07-17 19:38:01.696342059 +0200 +@@ -70,6 +70,8 @@ + extern double fl_mac_flush_and_wait(double time_to_wait, char in_idle); + #endif // WIN32 + ++extern void fl_update_focus(void); ++ + // + // Globals... + // +@@ -435,6 +437,69 @@ + #endif + + //////////////////////////////////////////////////////////////// ++// Clipboard notifications ++ ++struct Clipboard_Notify { ++ Fl_Clipboard_Notify_Handler handler; ++ void *data; ++ struct Clipboard_Notify *next; ++}; ++ ++static struct Clipboard_Notify *clip_notify_list = NULL; ++ ++extern void fl_clipboard_notify_change(); // in Fl_<platform>.cxx ++ ++void Fl::add_clipboard_notify(Fl_Clipboard_Notify_Handler h, void *data) { ++ struct Clipboard_Notify *node; ++ ++ remove_clipboard_notify(h); ++ ++ node = new Clipboard_Notify; ++ ++ node->handler = h; ++ node->data = data; ++ node->next = clip_notify_list; ++ ++ clip_notify_list = node; ++ ++ fl_clipboard_notify_change(); ++} ++ ++void Fl::remove_clipboard_notify(Fl_Clipboard_Notify_Handler h) { ++ struct Clipboard_Notify *node, **prev; ++ ++ node = clip_notify_list; ++ prev = &clip_notify_list; ++ while (node != NULL) { ++ if (node->handler == h) { ++ *prev = node->next; ++ delete node; ++ ++ fl_clipboard_notify_change(); ++ ++ return; ++ } ++ ++ prev = &node->next; ++ node = node->next; ++ } ++} ++ ++bool fl_clipboard_notify_empty(void) { ++ return clip_notify_list == NULL; ++} ++ ++void fl_trigger_clipboard_notify(int source) { ++ struct Clipboard_Notify *node; ++ ++ node = clip_notify_list; ++ while (node != NULL) { ++ node->handler(source, node->data); ++ node = node->next; ++ } ++} ++ ++//////////////////////////////////////////////////////////////// + // wait/run/check/ready: + + void (*Fl::idle)(); // see Fl::add_idle.cxx for the add/remove functions +@@ -876,6 +941,8 @@ + fl_oldfocus = p; + } + e_number = old_event; ++ // let the platform code do what it needs ++ fl_update_focus(); + } + } + +@@ -1464,6 +1531,8 @@ + if (xclass_) { + free(xclass_); + } ++ free_icons(); ++ delete icon_; + } + + // FL_SHOW and FL_HIDE are called whenever the visibility of this widget +diff -Nur fltk-1.3.2.orig/src/fl_draw_pixmap.cxx fltk-1.3.2/src/fl_draw_pixmap.cxx +--- fltk-1.3.2.orig/src/fl_draw_pixmap.cxx 2012-04-22 05:09:31.000000000 +0200 ++++ fltk-1.3.2/src/fl_draw_pixmap.cxx 2013-07-17 19:37:37.911343302 +0200 +@@ -58,99 +58,6 @@ + return 1; + } + +-#ifdef U64 +- +-// The callback from fl_draw_image to get a row of data passes this: +-struct pixmap_data { +- int w, h; +- const uchar*const* data; +- union { +- U64 colors[256]; +- U64* byte1[256]; +- }; +-}; +- +-// callback for 1 byte per pixel: +-static void cb1(void*v, int x, int y, int w, uchar* buf) { +- pixmap_data& d = *(pixmap_data*)v; +- const uchar* p = d.data[y]+x; +- U64* q = (U64*)buf; +- for (int X=w; X>0; X-=2, p += 2) { +- if (X>1) { +-# if WORDS_BIGENDIAN +- *q++ = (d.colors[p[0]]<<32) | d.colors[p[1]]; +-# else +- *q++ = (d.colors[p[1]]<<32) | d.colors[p[0]]; +-# endif +- } else { +-# if WORDS_BIGENDIAN +- *q++ = d.colors[p[0]]<<32; +-# else +- *q++ = d.colors[p[0]]; +-# endif +- } +- } +-} +- +-// callback for 2 bytes per pixel: +-static void cb2(void*v, int x, int y, int w, uchar* buf) { +- pixmap_data& d = *(pixmap_data*)v; +- const uchar* p = d.data[y]+2*x; +- U64* q = (U64*)buf; +- for (int X=w; X>0; X-=2) { +- U64* colors = d.byte1[*p++]; +- int index = *p++; +- if (X>1) { +- U64* colors1 = d.byte1[*p++]; +- int index1 = *p++; +-# if WORDS_BIGENDIAN +- *q++ = (colors[index]<<32) | colors1[index1]; +-# else +- *q++ = (colors1[index1]<<32) | colors[index]; +-# endif +- } else { +-# if WORDS_BIGENDIAN +- *q++ = colors[index]<<32; +-# else +- *q++ = colors[index]; +-# endif +- } +- } +-} +- +-#else // U32 +- +-// The callback from fl_draw_image to get a row of data passes this: +-struct pixmap_data { +- int w, h; +- const uchar*const* data; +- union { +- U32 colors[256]; +- U32* byte1[256]; +- }; +-}; +- +-// callback for 1 byte per pixel: +-static void cb1(void*v, int x, int y, int w, uchar* buf) { +- pixmap_data& d = *(pixmap_data*)v; +- const uchar* p = d.data[y]+x; +- U32* q = (U32*)buf; +- for (int X=w; X--;) *q++ = d.colors[*p++]; +-} +- +-// callback for 2 bytes per pixel: +-static void cb2(void*v, int x, int y, int w, uchar* buf) { +- pixmap_data& d = *(pixmap_data*)v; +- const uchar* p = d.data[y]+2*x; +- U32* q = (U32*)buf; +- for (int X=w; X--;) { +- U32* colors = d.byte1[*p++]; +- *q++ = colors[*p++]; +- } +-} +- +-#endif // U64 else U32 +- + uchar **fl_mask_bitmap; // if non-zero, create bitmap and store pointer here + + /** +@@ -200,34 +107,33 @@ + } + #endif + +-/** +- Draw XPM image data, with the top-left corner at the given position. +- \see fl_draw_pixmap(char* const* data, int x, int y, Fl_Color bg) +- */ +-int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { +- pixmap_data d; +- if (!fl_measure_pixmap(cdata, d.w, d.h)) return 0; ++int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg) { ++ int w, h; + const uchar*const* data = (const uchar*const*)(cdata+1); + int transparent_index = -1; ++ ++ if (!fl_measure_pixmap(cdata, w, h)) ++ return 0; ++ ++ if ((chars_per_pixel < 1) || (chars_per_pixel > 2)) ++ return 0; ++ ++ uchar colors[1<<(chars_per_pixel*8)][4]; ++ + #ifdef WIN32 + uchar *transparent_c = (uchar *)0; // such that transparent_c[0,1,2] are the RGB of the transparent color + color_count = 0; + used_colors = (uchar *)malloc(abs(ncolors)*3*sizeof(uchar)); + #endif + +- if (ncolors < 0) { // FLTK (non standard) compressed colormap ++ if (ncolors < 0) { ++ // FLTK (non standard) compressed colormap + ncolors = -ncolors; + const uchar *p = *data++; + // if first color is ' ' it is transparent (put it later to make + // it not be transparent): + if (*p == ' ') { +- uchar* c = (uchar*)&d.colors[(int)' ']; +-#ifdef U64 +- *(U64*)c = 0; +-# if WORDS_BIGENDIAN +- c += 4; +-# endif +-#endif ++ uchar* c = colors[(int)' ']; + transparent_index = ' '; + Fl::get_color(bg, c[0], c[1], c[2]); c[3] = 0; + #ifdef WIN32 +@@ -238,13 +144,7 @@ + } + // read all the rest of the colors: + for (int i=0; i < ncolors; i++) { +- uchar* c = (uchar*)&d.colors[*p++]; +-#ifdef U64 +- *(U64*)c = 0; +-# if WORDS_BIGENDIAN +- c += 4; +-# endif +-#endif ++ uchar* c = colors[*p++]; + #ifdef WIN32 + used_colors[3*color_count] = *p; + used_colors[3*color_count+1] = *(p+1); +@@ -254,69 +154,44 @@ + *c++ = *p++; + *c++ = *p++; + *c++ = *p++; +-#ifdef __APPLE_QUARTZ__ + *c = 255; +-#else +- *c = 0; +-#endif + } +- } else { // normal XPM colormap with names +- if (chars_per_pixel>1) memset(d.byte1, 0, sizeof(d.byte1)); ++ } else { ++ // normal XPM colormap with names + for (int i=0; i<ncolors; i++) { + const uchar *p = *data++; + // the first 1 or 2 characters are the color index: + int ind = *p++; + uchar* c; +- if (chars_per_pixel>1) { +-#ifdef U64 +- U64* colors = d.byte1[ind]; +- if (!colors) colors = d.byte1[ind] = new U64[256]; +-#else +- U32* colors = d.byte1[ind]; +- if (!colors) colors = d.byte1[ind] = new U32[256]; +-#endif +- c = (uchar*)&colors[*p]; +- ind = (ind<<8)|*p++; +- } else { +- c = (uchar *)&d.colors[ind]; +- } ++ if (chars_per_pixel>1) ++ ind = (ind<<8)|*p++; ++ c = colors[ind]; + // look for "c word", or last word if none: + const uchar *previous_word = p; + for (;;) { +- while (*p && isspace(*p)) p++; +- uchar what = *p++; +- while (*p && !isspace(*p)) p++; +- while (*p && isspace(*p)) p++; +- if (!*p) {p = previous_word; break;} +- if (what == 'c') break; +- previous_word = p; +- while (*p && !isspace(*p)) p++; ++ while (*p && isspace(*p)) p++; ++ uchar what = *p++; ++ while (*p && !isspace(*p)) p++; ++ while (*p && isspace(*p)) p++; ++ if (!*p) {p = previous_word; break;} ++ if (what == 'c') break; ++ previous_word = p; ++ while (*p && !isspace(*p)) p++; + } +-#ifdef U64 +- *(U64*)c = 0; +-# if WORDS_BIGENDIAN +- c += 4; +-# endif +-#endif +-#ifdef __APPLE_QUARTZ__ +- c[3] = 255; +-#endif + int parse = fl_parse_color((const char*)p, c[0], c[1], c[2]); ++ c[3] = 255; + if (parse) { + #ifdef WIN32 +- used_colors[3*color_count] = c[0]; +- used_colors[3*color_count+1] = c[1]; +- used_colors[3*color_count+2] = c[2]; +- color_count++; ++ used_colors[3*color_count] = c[0]; ++ used_colors[3*color_count+1] = c[1]; ++ used_colors[3*color_count+2] = c[2]; ++ color_count++; + #endif +- } +- else { ++ } else { + // assume "None" or "#transparent" for any errors +- // "bg" should be transparent... +- Fl::get_color(bg, c[0], c[1], c[2]); +-#ifdef __APPLE_QUARTZ__ ++ // "bg" should be transparent... ++ Fl::get_color(bg, c[0], c[1], c[2]); + c[3] = 0; +-#endif + transparent_index = ind; + #ifdef WIN32 + transparent_c = c; +@@ -324,7 +199,6 @@ + } + } + } +- d.data = data; + #ifdef WIN32 + if (transparent_c) { + make_unused_color(transparent_c[0], transparent_c[1], transparent_c[2]); +@@ -334,77 +208,76 @@ + make_unused_color(r, g, b); + } + #endif ++ ++ U32 *q = (U32*)out; ++ for (int Y = 0; Y < h; Y++) { ++ const uchar* p = data[Y]; ++ if (chars_per_pixel <= 1) { ++ for (int X = 0; X < w; X++) ++ memcpy(q++, colors[*p++], 4); ++ } else { ++ for (int X = 0; X < w; X++) { ++ int ind = (*p++)<<8; ++ ind |= *p++; ++ memcpy(q++, colors[ind], 4); ++ } ++ } ++ } + ++ return 1; ++} ++ ++/** ++ Draw XPM image data, with the top-left corner at the given position. ++ \see fl_draw_pixmap(char* const* data, int x, int y, Fl_Color bg) ++ */ ++int fl_draw_pixmap(const char*const* cdata, int x, int y, Fl_Color bg) { ++ int w, h; ++ ++ if (!fl_measure_pixmap(cdata, w, h)) ++ return 0; ++ ++ uchar buffer[w*h*4]; ++ ++ if (!fl_convert_pixmap(cdata, buffer, bg)) ++ return 0; ++ ++ // FIXME: Hack until fl_draw_image() supports alpha properly + #ifdef __APPLE_QUARTZ__ + if (Fl_Surface_Device::surface() == Fl_Display_Device::display_device()) { +- U32 *array = new U32[d.w * d.h], *q = array; +- for (int Y = 0; Y < d.h; Y++) { +- const uchar* p = data[Y]; +- if (chars_per_pixel <= 1) { +- for (int X = 0; X < d.w; X++) { +- *q++ = d.colors[*p++]; +- } +- } else { +- for (int X = 0; X < d.w; X++) { +- U32* colors = (U32*)d.byte1[*p++]; +- *q++ = colors[*p++]; +- } +- } +- } +- Fl_RGB_Image* rgb = new Fl_RGB_Image((uchar*)array, d.w, d.h, 4); ++ Fl_RGB_Image* rgb = new Fl_RGB_Image(buffer, w, h, 4); + rgb->draw(x, y); + delete rgb; +- delete[] array; +- } +- else { ++ } else { + #endif // __APPLE_QUARTZ__ +- + // build the mask bitmap used by Fl_Pixmap: +- if (fl_mask_bitmap && transparent_index >= 0) { +- int W = (d.w+7)/8; +- uchar* bitmap = new uchar[W * d.h]; ++ if (fl_mask_bitmap) { ++ int W = (w+7)/8; ++ uchar* bitmap = new uchar[W * h]; + *fl_mask_bitmap = bitmap; +- for (int Y = 0; Y < d.h; Y++) { +- const uchar* p = data[Y]; +- if (chars_per_pixel <= 1) { +- int dw = d.w; +- for (int X = 0; X < W; X++) { +- uchar b = (dw-->0 && *p++ != transparent_index); +- if (dw-->0 && *p++ != transparent_index) b |= 2; +- if (dw-->0 && *p++ != transparent_index) b |= 4; +- if (dw-->0 && *p++ != transparent_index) b |= 8; +- if (dw-->0 && *p++ != transparent_index) b |= 16; +- if (dw-->0 && *p++ != transparent_index) b |= 32; +- if (dw-->0 && *p++ != transparent_index) b |= 64; +- if (dw-->0 && *p++ != transparent_index) b |= 128; ++ const uchar *p = &buffer[3]; ++ uchar b = 0; ++ for (int Y = 0; Y < h; Y++) { ++ b = 0; ++ for (int X = 0, bit = 1; X < w; X++, p += 4) { ++ if (*p > 127) b |= bit; ++ bit <<= 1; ++ if (bit > 0x80 || X == w-1) { + *bitmap++ = b; +- } +- } else { +- uchar b = 0, bit = 1; +- for (int X = 0; X < d.w; X++) { +- int ind = *p++; +- ind = (ind<<8) | (*p++); +- if (ind != transparent_index) b |= bit; +- +- if (bit < 128) bit <<= 1; +- else { +- *bitmap++ = b; +- b = 0; +- bit = 1; ++ bit = 1; ++ b = 0; + } + } +- +- if (bit > 1) *bitmap++ = b; + } +- } ++ + } + +- fl_draw_image(chars_per_pixel==1 ? cb1 : cb2, &d, x, y, d.w, d.h, 4); ++ fl_draw_image(buffer, x, y, w, h, 4); ++ + #ifdef __APPLE_QUARTZ__ + } + #endif + +- if (chars_per_pixel > 1) for (int i = 0; i < 256; i++) delete[] d.byte1[i]; + return 1; + } + +diff -Nur fltk-1.3.2.orig/src/Fl_grab.cxx fltk-1.3.2/src/Fl_grab.cxx +--- fltk-1.3.2.orig/src/Fl_grab.cxx 2012-03-23 17:47:53.000000000 +0100 ++++ fltk-1.3.2/src/Fl_grab.cxx 2013-07-17 19:37:07.411344886 +0200 +@@ -29,6 +29,7 @@ + // override_redirect, it does similar things on WIN32. + + extern void fl_fix_focus(); // in Fl.cxx ++void fl_update_focus(void); + + #ifdef WIN32 + // We have to keep track of whether we have captured the mouse, since +@@ -80,6 +81,7 @@ + #endif + } + grab_ = win; ++ fl_update_focus(); + } else { + if (grab_) { + #ifdef WIN32 +@@ -98,6 +100,7 @@ + XFlush(fl_display); + #endif + grab_ = 0; ++ fl_update_focus(); + fl_fix_focus(); + } + } +diff -Nur fltk-1.3.2.orig/src/Fl_Image.cxx fltk-1.3.2/src/Fl_Image.cxx +--- fltk-1.3.2.orig/src/Fl_Image.cxx 2012-11-09 17:02:08.000000000 +0100 ++++ fltk-1.3.2/src/Fl_Image.cxx 2013-07-17 19:37:37.911343302 +0200 +@@ -165,7 +165,22 @@ + // + size_t Fl_RGB_Image::max_size_ = ~((size_t)0); + +-/** The destructor free all memory and server resources that are used by the image. */ ++int fl_convert_pixmap(const char*const* cdata, uchar* out, Fl_Color bg); ++ ++/** The constructor creates a new RGBA image from the specified Fl_Pixmap. ++ ++ The RGBA image is built fully opaque except for the transparent area ++ of the pixmap that is assigned the \par bg color with full transparency */ ++Fl_RGB_Image::Fl_RGB_Image(const Fl_Pixmap *pxm, Fl_Color bg): ++ Fl_Image(pxm->w(), pxm->h(), 4), id_(0), mask_(0) ++{ ++ array = new uchar[w() * h() * d()]; ++ alloc_array = 1; ++ fl_convert_pixmap(pxm->data(), (uchar*)array, bg); ++ data((const char **)&array, 1); ++} ++ ++/** The destructor frees all memory and server resources that are used by the image. */ + Fl_RGB_Image::~Fl_RGB_Image() { + uncache(); + if (alloc_array) delete[] (uchar *)array; +diff -Nur fltk-1.3.2.orig/src/Fl_win32.cxx fltk-1.3.2/src/Fl_win32.cxx +--- fltk-1.3.2.orig/src/Fl_win32.cxx 2012-06-21 10:52:29.000000000 +0200 ++++ fltk-1.3.2/src/Fl_win32.cxx 2013-07-17 19:38:17.322341239 +0200 +@@ -942,6 +942,10 @@ + break; + + case WM_SETFOCUS: ++ if ((Fl::modal_) && (Fl::modal_ != window)) { ++ SetFocus(fl_xid(Fl::modal_)); ++ return 0; ++ } + Fl::handle(FL_FOCUS, window); + break; + +@@ -1333,7 +1337,6 @@ + Y+=yoff; + + if (w->fullscreen_active()) { +- X = Y = 0; + bx = by = bt = 0; + } + +@@ -1387,19 +1390,42 @@ + } + } + +-static void make_fullscreen(Fl_Window *w, Window xid, int X, int Y, int W, int H) { ++void Fl_X::make_fullscreen(int X, int Y, int W, int H) { ++ int top, bottom, left, right; + int sx, sy, sw, sh; +- Fl::screen_xywh(sx, sy, sw, sh, X, Y, W, H); ++ ++ top = w->fullscreen_screen_top; ++ bottom = w->fullscreen_screen_bottom; ++ left = w->fullscreen_screen_left; ++ right = w->fullscreen_screen_right; ++ ++ if ((top < 0) || (bottom < 0) || (left < 0) || (right < 0)) { ++ top = Fl::screen_num(X, Y, W, H); ++ bottom = top; ++ left = top; ++ right = top; ++ } ++ ++ Fl::screen_xywh(sx, sy, sw, sh, top); ++ Y = sy; ++ Fl::screen_xywh(sx, sy, sw, sh, bottom); ++ H = sy + sh - Y; ++ Fl::screen_xywh(sx, sy, sw, sh, left); ++ X = sx; ++ Fl::screen_xywh(sx, sy, sw, sh, right); ++ W = sx + sw - X; ++ + DWORD flags = GetWindowLong(xid, GWL_STYLE); + flags = flags & ~(WS_THICKFRAME|WS_CAPTION); + SetWindowLong(xid, GWL_STYLE, flags); ++ + // SWP_NOSENDCHANGING is so that we can override size limits +- SetWindowPos(xid, HWND_TOP, sx, sy, sw, sh, SWP_NOSENDCHANGING | SWP_FRAMECHANGED); ++ SetWindowPos(xid, HWND_TOP, X, Y, W, H, SWP_NOSENDCHANGING | SWP_FRAMECHANGED); + } + + void Fl_Window::fullscreen_x() { + _set_fullscreen(); +- make_fullscreen(this, fl_xid(this), x(), y(), w(), h()); ++ i->make_fullscreen(x(), y(), w(), h()); + Fl::handle(FL_FULLSCREEN, this); + } + +@@ -1477,7 +1503,6 @@ + + char fl_show_iconic; // hack for Fl_Window::iconic() + // int fl_background_pixel = -1; // color to use for background +-HCURSOR fl_default_cursor; + UINT fl_wake_msg = 0; + int fl_disable_transient_for; // secret method of removing TRANSIENT_FOR + +@@ -1526,7 +1551,7 @@ + if (!w->icon()) + w->icon((void *)LoadIcon(NULL, IDI_APPLICATION)); + wcw.hIcon = wcw.hIconSm = (HICON)w->icon(); +- wcw.hCursor = fl_default_cursor = LoadCursor(NULL, IDC_ARROW); ++ wcw.hCursor = LoadCursor(NULL, IDC_ARROW); + //uchar r,g,b; Fl::get_color(FL_GRAY,r,g,b); + //wc.hbrBackground = (HBRUSH)CreateSolidBrush(RGB(r,g,b)); + wcw.hbrBackground = NULL; +@@ -1618,7 +1643,8 @@ + x->setwindow(w); + x->region = 0; + x->private_dc = 0; +- x->cursor = fl_default_cursor; ++ x->cursor = LoadCursor(NULL, IDC_ARROW); ++ x->custom_cursor = 0; + if (!fl_codepage) fl_get_codepage(); + + WCHAR *lab = NULL; +@@ -1644,6 +1670,8 @@ + ); + if (lab) free(lab); + ++ x->set_icons(); ++ + if (w->fullscreen_active()) { + /* We need to make sure that the fullscreen is created on the + default monitor, ie the desktop where the shortcut is located +@@ -1652,8 +1680,8 @@ + monitor the window was placed on. */ + RECT rect; + GetWindowRect(x->xid, &rect); +- make_fullscreen(w, x->xid, rect.left, rect.top, +- rect.right - rect.left, rect.bottom - rect.top); ++ x->make_fullscreen(rect.left, rect.top, ++ rect.right - rect.left, rect.bottom - rect.top); + } + + x->next = Fl_X::first; +@@ -1668,6 +1696,11 @@ + Fl::e_number = old_event; + w->redraw(); // force draw to happen + } ++ ++ // Needs to be done before ShowWindow() to get the correct behaviour ++ // when we get WM_SETFOCUS. ++ if (w->modal()) {Fl::modal_ = w; fl_fix_focus();} ++ + // If we've captured the mouse, we dont want to activate any + // other windows from the code, or we lose the capture. + ShowWindow(x->xid, !showit ? SW_SHOWMINNOACTIVE : +@@ -1685,7 +1718,6 @@ + } + } + +- if (w->modal()) {Fl::modal_ = w; fl_fix_focus();} + return x; + } + +@@ -1867,6 +1899,285 @@ + } + + //////////////////////////////////////////////////////////////// ++ ++static HICON image_to_icon(const Fl_RGB_Image *image, bool is_icon=true, ++ int hotx = 0, int hoty = 0) { ++ BITMAPV5HEADER bi; ++ HBITMAP bitmap, mask; ++ DWORD *bits; ++ HICON icon; ++ ++ if (!is_icon) { ++ if ((hotx < 0) || (hotx >= image->w())) ++ return NULL; ++ if ((hoty < 0) || (hoty >= image->h())) ++ return NULL; ++ } ++ ++ memset(&bi, 0, sizeof(BITMAPV5HEADER)); ++ ++ bi.bV5Size = sizeof(BITMAPV5HEADER); ++ bi.bV5Width = image->w(); ++ bi.bV5Height = -image->h(); // Negative for top-down ++ bi.bV5Planes = 1; ++ bi.bV5BitCount = 32; ++ bi.bV5Compression = BI_BITFIELDS; ++ bi.bV5RedMask = 0x00FF0000; ++ bi.bV5GreenMask = 0x0000FF00; ++ bi.bV5BlueMask = 0x000000FF; ++ bi.bV5AlphaMask = 0xFF000000; ++ ++ HDC hdc; ++ ++ hdc = GetDC(NULL); ++ bitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ++ ReleaseDC(NULL, hdc); ++ ++ if (bits == NULL) ++ return NULL; ++ ++ const uchar *i = (const uchar*)*image->data(); ++ for (int y = 0;y < image->h();y++) { ++ for (int x = 0;x < image->w();x++) { ++ switch (image->d()) { ++ case 1: ++ *bits = (0xff<<24) | (i[0]<<16) | (i[0]<<8) | i[0]; ++ break; ++ case 2: ++ *bits = (i[1]<<24) | (i[0]<<16) | (i[0]<<8) | i[0]; ++ break; ++ case 3: ++ *bits = (0xff<<24) | (i[0]<<16) | (i[1]<<8) | i[2]; ++ break; ++ case 4: ++ *bits = (i[3]<<24) | (i[0]<<16) | (i[1]<<8) | i[2]; ++ break; ++ } ++ i += image->d(); ++ bits++; ++ } ++ i += image->ld(); ++ } ++ ++ // A mask bitmap is still needed even though it isn't used ++ mask = CreateBitmap(image->w(),image->h(),1,1,NULL); ++ if (mask == NULL) { ++ DeleteObject(bitmap); ++ return NULL; ++ } ++ ++ ICONINFO ii; ++ ++ ii.fIcon = is_icon; ++ ii.xHotspot = hotx; ++ ii.yHotspot = hoty; ++ ii.hbmMask = mask; ++ ii.hbmColor = bitmap; ++ ++ icon = CreateIconIndirect(&ii); ++ ++ DeleteObject(bitmap); ++ DeleteObject(mask); ++ ++ if (icon == NULL) ++ return NULL; ++ ++ return icon; ++} ++ ++//////////////////////////////////////////////////////////////// ++ ++static HICON default_big_icon = NULL; ++static HICON default_small_icon = NULL; ++ ++const Fl_RGB_Image *find_best_icon(int ideal_width, ++ const Fl_RGB_Image *icons[], int count) { ++ const Fl_RGB_Image *best; ++ ++ best = NULL; ++ ++ for (int i = 0;i < count;i++) { ++ if (best == NULL) ++ best = icons[i]; ++ else { ++ if (best->w() < ideal_width) { ++ if (icons[i]->w() > best->w()) ++ best = icons[i]; ++ } else { ++ if ((icons[i]->w() >= ideal_width) && ++ (icons[i]->w() < best->w())) ++ best = icons[i]; ++ } ++ } ++ } ++ ++ return best; ++} ++ ++void Fl_X::set_default_icons(const Fl_RGB_Image *icons[], int count) { ++ const Fl_RGB_Image *best_big, *best_small; ++ ++ if (default_big_icon != NULL) ++ DestroyIcon(default_big_icon); ++ if (default_small_icon != NULL) ++ DestroyIcon(default_small_icon); ++ ++ best_big = find_best_icon(GetSystemMetrics(SM_CXICON), icons, count); ++ best_small = find_best_icon(GetSystemMetrics(SM_CXSMICON), icons, count); ++ ++ if (best_big != NULL) ++ default_big_icon = image_to_icon(best_big); ++ else ++ default_big_icon = NULL; ++ ++ if (best_small != NULL) ++ default_small_icon = image_to_icon(best_small); ++ else ++ default_small_icon = NULL; ++} ++ ++void Fl_X::set_default_icons(HICON big_icon, HICON small_icon) { ++ if (default_big_icon != NULL) ++ DestroyIcon(default_big_icon); ++ if (default_small_icon != NULL) ++ DestroyIcon(default_small_icon); ++ ++ if (big_icon != NULL) ++ default_big_icon = CopyIcon(big_icon); ++ if (small_icon != NULL) ++ default_small_icon = CopyIcon(small_icon); ++} ++ ++void Fl_X::set_icons() { ++ HICON big_icon, small_icon; ++ ++ big_icon = NULL; ++ small_icon = NULL; ++ ++ if (w->icon_->count) { ++ const Fl_RGB_Image *best_big, *best_small; ++ ++ best_big = find_best_icon(GetSystemMetrics(SM_CXICON), ++ (const Fl_RGB_Image **)w->icon_->icons, ++ w->icon_->count); ++ best_small = find_best_icon(GetSystemMetrics(SM_CXSMICON), ++ (const Fl_RGB_Image **)w->icon_->icons, ++ w->icon_->count); ++ ++ if (best_big != NULL) ++ big_icon = image_to_icon(best_big); ++ if (best_small != NULL) ++ small_icon = image_to_icon(best_small); ++ } else { ++ big_icon = default_big_icon; ++ small_icon = default_small_icon; ++ } ++ ++ if (big_icon != NULL) ++ SendMessage(xid, WM_SETICON, ICON_BIG, (LPARAM)big_icon); ++ if (small_icon != NULL) ++ SendMessage(xid, WM_SETICON, ICON_SMALL, (LPARAM)small_icon); ++ ++ if (w->icon_->count) { ++ if (big_icon != NULL) ++ DestroyIcon(big_icon); ++ if (small_icon != NULL) ++ DestroyIcon(small_icon); ++ } ++} ++ ++void Fl_Window::default_icons(HICON big_icon, HICON small_icon) { ++ Fl_X::set_default_icons(big_icon, small_icon); ++} ++ ++void Fl_Window::icons(HICON big_icon, HICON small_icon) { ++ free_icons(); ++ ++ if (big_icon != NULL) ++ icon_->big_icon = CopyIcon(big_icon); ++ if (small_icon != NULL) ++ icon_->small_icon = CopyIcon(small_icon); ++ ++ if (i) ++ i->set_icons(); ++} ++ ++//////////////////////////////////////////////////////////////// ++ ++#ifndef IDC_HAND ++# define IDC_HAND MAKEINTRESOURCE(32649) ++#endif // !IDC_HAND ++ ++int Fl_X::set_cursor(Fl_Cursor c) { ++ LPSTR n; ++ HCURSOR new_cursor; ++ ++ if (c == FL_CURSOR_NONE) ++ new_cursor = NULL; ++ else { ++ switch (c) { ++ case FL_CURSOR_ARROW: n = IDC_ARROW; break; ++ case FL_CURSOR_CROSS: n = IDC_CROSS; break; ++ case FL_CURSOR_WAIT: n = IDC_WAIT; break; ++ case FL_CURSOR_INSERT: n = IDC_IBEAM; break; ++ case FL_CURSOR_HAND: n = IDC_HAND; break; ++ case FL_CURSOR_HELP: n = IDC_HELP; break; ++ case FL_CURSOR_MOVE: n = IDC_SIZEALL; break; ++ case FL_CURSOR_N: ++ case FL_CURSOR_S: ++ // FIXME: Should probably have fallbacks for these instead ++ case FL_CURSOR_NS: n = IDC_SIZENS; break; ++ case FL_CURSOR_NE: ++ case FL_CURSOR_SW: ++ // FIXME: Dito. ++ case FL_CURSOR_NESW: n = IDC_SIZENESW; break; ++ case FL_CURSOR_E: ++ case FL_CURSOR_W: ++ // FIXME: Dito. ++ case FL_CURSOR_WE: n = IDC_SIZEWE; break; ++ case FL_CURSOR_SE: ++ case FL_CURSOR_NW: ++ // FIXME: Dito. ++ case FL_CURSOR_NWSE: n = IDC_SIZENWSE; break; ++ default: ++ return 0; ++ } ++ ++ new_cursor = LoadCursor(NULL, n); ++ if (new_cursor == NULL) ++ return 0; ++ } ++ ++ if ((cursor != NULL) && custom_cursor) ++ DestroyIcon(cursor); ++ ++ cursor = new_cursor; ++ custom_cursor = 0; ++ ++ SetCursor(cursor); ++ ++ return 1; ++} ++ ++int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) { ++ HCURSOR new_cursor; ++ ++ new_cursor = image_to_icon(image, false, hotx, hoty); ++ if (new_cursor == NULL) ++ return 0; ++ ++ if ((cursor != NULL) && custom_cursor) ++ DestroyIcon(cursor); ++ ++ cursor = new_cursor; ++ custom_cursor = 1; ++ ++ SetCursor(cursor); ++ ++ return 1; ++} ++ ++//////////////////////////////////////////////////////////////// + // Implement the virtual functions for the base Fl_Window class: + + // If the box is a filled rectangle, we can make the redisplay *look* +diff -Nur fltk-1.3.2.orig/src/Fl_Window.cxx fltk-1.3.2/src/Fl_Window.cxx +--- fltk-1.3.2.orig/src/Fl_Window.cxx 2012-11-06 21:46:14.000000000 +0100 ++++ fltk-1.3.2/src/Fl_Window.cxx 2013-07-17 19:38:01.699342056 +0200 +@@ -23,6 +23,7 @@ + #include <config.h> + #include <FL/Fl.H> + #include <FL/x.H> ++#include <FL/Fl_RGB_Image.H> + #include <FL/Fl_Window.H> + #include <stdlib.h> + #include "flstring.h" +@@ -45,7 +46,8 @@ + } + i = 0; + xclass_ = 0; +- icon_ = 0; ++ icon_ = new icon_data; ++ memset(icon_, 0, sizeof(*icon_)); + iconlabel_ = 0; + resizable(0); + size_range_set = 0; +@@ -62,8 +64,6 @@ + Fl_Window::Fl_Window(int X,int Y,int W, int H, const char *l) + : Fl_Group(X, Y, W, H, l) { + cursor_default = FL_CURSOR_DEFAULT; +- cursor_fg = FL_BLACK; +- cursor_bg = FL_WHITE; + + _Fl_Window(); + set_flag(FORCE_POSITION); +@@ -73,8 +73,6 @@ + // fix common user error of a missing end() with current(0): + : Fl_Group((Fl_Group::current(0),0), 0, W, H, l) { + cursor_default = FL_CURSOR_DEFAULT; +- cursor_fg = FL_BLACK; +- cursor_bg = FL_WHITE; + + _Fl_Window(); + clear_visible(); +@@ -268,16 +266,68 @@ + } + } + ++void Fl_Window::default_icon(const Fl_RGB_Image *icon) { ++ default_icons(&icon, 1); ++} ++ ++void Fl_Window::default_icons(const Fl_RGB_Image **icons, int count) { ++ Fl_X::set_default_icons(icons, count); ++} ++ ++void Fl_Window::icon(const Fl_RGB_Image *icon) { ++ icons(&icon, 1); ++} ++ ++void Fl_Window::icons(const Fl_RGB_Image **icons, int count) { ++ free_icons(); ++ ++ if (count > 0) { ++ icon_->icons = new Fl_RGB_Image*[count]; ++ icon_->count = count; ++ // FIXME: Fl_RGB_Image lacks const modifiers on methods ++ for (int i = 0;i < count;i++) ++ icon_->icons[i] = (Fl_RGB_Image*)((Fl_RGB_Image*)icons[i])->copy(); ++ } ++ ++ if (i) ++ i->set_icons(); ++} ++ + /** Gets the current icon window target dependent data. */ + const void *Fl_Window::icon() const { +- return icon_; ++ return icon_->legacy_icon; + } + + /** Sets the current icon window target dependent data. */ + void Fl_Window::icon(const void * ic) { +- icon_ = ic; ++ free_icons(); ++ icon_->legacy_icon = ic; + } + ++void Fl_Window::free_icons() { ++ int i; ++ ++ icon_->legacy_icon = 0L; ++ ++ if (icon_->icons) { ++ for (i = 0;i < icon_->count;i++) ++ delete icon_->icons[i]; ++ delete [] icon_->icons; ++ icon_->icons = 0L; ++ } ++ ++ icon_->count = 0; ++ ++#ifdef WIN32 ++ if (icon_->big_icon) ++ DestroyIcon(icon_->big_icon); ++ if (icon_->small_icon) ++ DestroyIcon(icon_->small_icon); ++ ++ icon_->big_icon = NULL; ++ icon_->small_icon = NULL; ++#endif ++} + + // + // End of "$Id: Fl_Window.cxx 9706 2012-11-06 20:46:14Z matt $". +diff -Nur fltk-1.3.2.orig/src/Fl_Window_fullscreen.cxx fltk-1.3.2/src/Fl_Window_fullscreen.cxx +--- fltk-1.3.2.orig/src/Fl_Window_fullscreen.cxx 2012-11-06 21:46:14.000000000 +0100 ++++ fltk-1.3.2/src/Fl_Window_fullscreen.cxx 2013-07-17 19:38:17.323341239 +0200 +@@ -36,6 +36,10 @@ + int Fl_Window::no_fullscreen_y = 0; + int Fl_Window::no_fullscreen_w = 0; + int Fl_Window::no_fullscreen_h = 0; ++int Fl_Window::fullscreen_screen_top = -1; ++int Fl_Window::fullscreen_screen_bottom = -1; ++int Fl_Window::fullscreen_screen_left = -1; ++int Fl_Window::fullscreen_screen_right = -1; + #endif + + void Fl_Window::border(int b) { +@@ -95,6 +99,23 @@ + fullscreen_off(no_fullscreen_x, no_fullscreen_y, no_fullscreen_w, no_fullscreen_h); + } + ++void Fl_Window::fullscreen_screens(int top, int bottom, int left, int right) { ++ if ((top < 0) || (bottom < 0) || (left < 0) || (right < 0)) { ++ fullscreen_screen_top = -1; ++ fullscreen_screen_bottom = -1; ++ fullscreen_screen_left = -1; ++ fullscreen_screen_right = -1; ++ } else { ++ fullscreen_screen_top = top; ++ fullscreen_screen_bottom = bottom; ++ fullscreen_screen_left = left; ++ fullscreen_screen_right = right; ++ } ++ ++ if (shown() && (flags() & Fl_Widget::FULLSCREEN)) ++ fullscreen_x(); ++} ++ + + // + // End of "$Id: Fl_Window_fullscreen.cxx 9706 2012-11-06 20:46:14Z matt $". +diff -Nur fltk-1.3.2.orig/src/Fl_x.cxx fltk-1.3.2/src/Fl_x.cxx +--- fltk-1.3.2.orig/src/Fl_x.cxx 2012-10-16 17:35:34.000000000 +0200 ++++ fltk-1.3.2/src/Fl_x.cxx 2013-07-17 19:38:17.326341239 +0200 +@@ -53,6 +53,17 @@ + static int randrEventBase; // base of RandR-defined events + #endif + ++# if HAVE_XFIXES ++# include <X11/extensions/Xfixes.h> ++static int xfixes_event_base = 0; ++static bool have_xfixes = false; ++# endif ++ ++# include <X11/cursorfont.h> ++ ++# if HAVE_XCURSOR ++# include <X11/Xcursor/Xcursor.h> ++# endif + static Fl_Xlib_Graphics_Driver fl_xlib_driver; + static Fl_Display_Device fl_xlib_display(&fl_xlib_driver); + Fl_Display_Device *Fl_Display_Device::_display = &fl_xlib_display;// the platform display +@@ -298,6 +309,7 @@ + Colormap fl_colormap; + XIM fl_xim_im = 0; + XIC fl_xim_ic = 0; ++Window fl_xim_win = 0; + char fl_is_over_the_spot = 0; + static XRectangle status_area; + +@@ -306,6 +318,9 @@ + static Atom fl_MOTIF_WM_HINTS; + static Atom TARGETS; + static Atom CLIPBOARD; ++static Atom TIMESTAMP; ++static Atom PRIMARY_TIMESTAMP; ++static Atom CLIPBOARD_TIMESTAMP; + Atom fl_XdndAware; + Atom fl_XdndSelection; + Atom fl_XdndEnter; +@@ -329,7 +344,9 @@ + Atom fl_NET_SUPPORTING_WM_CHECK; + Atom fl_NET_WM_STATE; + Atom fl_NET_WM_STATE_FULLSCREEN; ++Atom fl_NET_WM_FULLSCREEN_MONITORS; + Atom fl_NET_WORKAREA; ++Atom fl_NET_WM_ICON; + + /* + X defines 32-bit-entities to have a format value of max. 32, +@@ -583,6 +600,65 @@ + if(xim_styles) XFree(xim_styles); + } + ++void fl_xim_deactivate(void); ++ ++void fl_xim_activate(Window xid) ++{ ++ if (!fl_xim_im) ++ return; ++ ++ // If the focused window has changed, then use the brute force method ++ // of completely recreating the input context. ++ if (fl_xim_win != xid) { ++ fl_xim_deactivate(); ++ ++ fl_new_ic(); ++ fl_xim_win = xid; ++ ++ XSetICValues(fl_xim_ic, ++ XNFocusWindow, fl_xim_win, ++ XNClientWindow, fl_xim_win, ++ NULL); ++ } ++ ++ fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height); ++} ++ ++void fl_xim_deactivate(void) ++{ ++ if (!fl_xim_ic) ++ return; ++ ++ XDestroyIC(fl_xim_ic); ++ fl_xim_ic = NULL; ++ ++ fl_xim_win = 0; ++} ++ ++extern Fl_Window *fl_xfocus; ++ ++void fl_update_focus(void) ++{ ++ Fl_Widget *focus; ++ ++ focus = Fl::grab(); ++ if (!focus) ++ focus = Fl::focus(); ++ if (!focus) ++ return; ++ ++ if (focus->simple_keyboard()) { ++ fl_xim_deactivate(); ++ } else { ++ // fl_xfocus should always be set if something has focus, but let's ++ // play it safe ++ if (!fl_xfocus || !fl_xid(fl_xfocus)) ++ return; ++ ++ fl_xim_activate(fl_xid(fl_xfocus)); ++ } ++} ++ + void fl_open_display() { + if (fl_display) return; + +@@ -607,6 +683,9 @@ + fl_MOTIF_WM_HINTS = XInternAtom(d, "_MOTIF_WM_HINTS", 0); + TARGETS = XInternAtom(d, "TARGETS", 0); + CLIPBOARD = XInternAtom(d, "CLIPBOARD", 0); ++ TIMESTAMP = XInternAtom(d, "TIMESTAMP", 0); ++ PRIMARY_TIMESTAMP = XInternAtom(d, "PRIMARY_TIMESTAMP", 0); ++ CLIPBOARD_TIMESTAMP = XInternAtom(d, "CLIPBOARD_TIMESTAMP", 0); + fl_XdndAware = XInternAtom(d, "XdndAware", 0); + fl_XdndSelection = XInternAtom(d, "XdndSelection", 0); + fl_XdndEnter = XInternAtom(d, "XdndEnter", 0); +@@ -631,7 +710,9 @@ + fl_NET_SUPPORTING_WM_CHECK = XInternAtom(d, "_NET_SUPPORTING_WM_CHECK", 0); + fl_NET_WM_STATE = XInternAtom(d, "_NET_WM_STATE", 0); + fl_NET_WM_STATE_FULLSCREEN = XInternAtom(d, "_NET_WM_STATE_FULLSCREEN", 0); ++ fl_NET_WM_FULLSCREEN_MONITORS = XInternAtom(d, "_NET_WM_FULLSCREEN_MONITORS", 0); + fl_NET_WORKAREA = XInternAtom(d, "_NET_WORKAREA", 0); ++ fl_NET_WM_ICON = XInternAtom(d, "_NET_WM_ICON", 0); + + if (sizeof(Atom) < 4) + atom_bits = sizeof(Atom) * 8; +@@ -653,6 +734,15 @@ + #if !USE_COLORMAP + Fl::visual(FL_RGB); + #endif ++ ++#if HAVE_XFIXES ++ int error_base; ++ if (XFixesQueryExtension(fl_display, &xfixes_event_base, &error_base)) ++ have_xfixes = true; ++ else ++ have_xfixes = false; ++#endif ++ + #if USE_XRANDR + void *libxrandr_addr = dlopen("libXrandr.so.2", RTLD_LAZY); + if (!libxrandr_addr) libxrandr_addr = dlopen("libXrandr.so", RTLD_LAZY); +@@ -841,6 +931,102 @@ + } + + //////////////////////////////////////////////////////////////// ++// Code for tracking clipboard changes: ++ ++static Time primary_timestamp = -1; ++static Time clipboard_timestamp = -1; ++ ++extern bool fl_clipboard_notify_empty(void); ++extern void fl_trigger_clipboard_notify(int source); ++ ++static void poll_clipboard_owner(void) { ++ Window xid; ++ ++#if HAVE_XFIXES ++ // No polling needed with Xfixes ++ if (have_xfixes) ++ return; ++#endif ++ ++ // No one is interested, so no point polling ++ if (fl_clipboard_notify_empty()) ++ return; ++ ++ // We need a window for this to work ++ if (!Fl::first_window()) ++ return; ++ xid = fl_xid(Fl::first_window()); ++ if (!xid) ++ return; ++ ++ // Request an update of the selection time for both the primary and ++ // clipboard selections. Magic continues when we get a SelectionNotify. ++ if (!fl_i_own_selection[0]) ++ XConvertSelection(fl_display, XA_PRIMARY, TIMESTAMP, PRIMARY_TIMESTAMP, ++ xid, fl_event_time); ++ if (!fl_i_own_selection[1]) ++ XConvertSelection(fl_display, CLIPBOARD, TIMESTAMP, CLIPBOARD_TIMESTAMP, ++ xid, fl_event_time); ++} ++ ++static void clipboard_timeout(void *data) ++{ ++ // No one is interested, so stop polling ++ if (fl_clipboard_notify_empty()) ++ return; ++ ++ poll_clipboard_owner(); ++ ++ Fl::repeat_timeout(0.5, clipboard_timeout); ++} ++ ++static void handle_clipboard_timestamp(int clipboard, Time time) ++{ ++ Time *timestamp; ++ ++ timestamp = clipboard ? &clipboard_timestamp : &primary_timestamp; ++ ++#if HAVE_XFIXES ++ if (!have_xfixes) ++#endif ++ { ++ // Initial scan, just store the value ++ if (*timestamp == (Time)-1) { ++ *timestamp = time; ++ return; ++ } ++ } ++ ++ // Same selection ++ if (time == *timestamp) ++ return; ++ ++ *timestamp = time; ++ ++ // Something happened! Let's tell someone! ++ fl_trigger_clipboard_notify(clipboard); ++} ++ ++void fl_clipboard_notify_change() { ++ // Reset the timestamps if we've going idle so that you don't ++ // get a bogus immediate trigger next time they're activated. ++ if (fl_clipboard_notify_empty()) { ++ primary_timestamp = -1; ++ clipboard_timestamp = -1; ++ } else { ++#if HAVE_XFIXES ++ if (!have_xfixes) ++#endif ++ { ++ poll_clipboard_owner(); ++ ++ if (!Fl::has_timeout(clipboard_timeout)) ++ Fl::add_timeout(0.5, clipboard_timeout); ++ } ++ } ++} ++ ++//////////////////////////////////////////////////////////////// + + const XEvent* fl_xevent; // the current x event + ulong fl_event_time; // the last timestamp from an x event +@@ -918,10 +1104,9 @@ + XEvent xevent = thisevent; + fl_xevent = &thisevent; + Window xid = xevent.xany.window; +- static Window xim_win = 0; + + if (fl_xim_ic && xevent.type == DestroyNotify && +- xid != xim_win && !fl_find(xid)) ++ xid != fl_xim_win && !fl_find(xid)) + { + XIM xim_im; + xim_im = XOpenIM(fl_display, NULL, NULL, NULL); +@@ -936,48 +1121,10 @@ + return 0; + } + +- if (fl_xim_ic && (xevent.type == FocusIn)) +- { +-#define POOR_XIM +-#ifdef POOR_XIM +- if (xim_win != xid) +- { +- xim_win = xid; +- XDestroyIC(fl_xim_ic); +- fl_xim_ic = NULL; +- fl_new_ic(); +- XSetICValues(fl_xim_ic, +- XNFocusWindow, xevent.xclient.window, +- XNClientWindow, xid, +- NULL); +- } +- fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height); +-#else +- if (Fl::first_window() && Fl::first_window()->modal()) { +- Window x = fl_xid(Fl::first_window()); +- if (x != xim_win) { +- xim_win = x; +- XSetICValues(fl_xim_ic, +- XNFocusWindow, xim_win, +- XNClientWindow, xim_win, +- NULL); +- fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height); +- } +- } else if (xim_win != xid && xid) { +- xim_win = xid; +- XSetICValues(fl_xim_ic, +- XNFocusWindow, xevent.xclient.window, +- XNClientWindow, xid, +- //XNFocusWindow, xim_win, +- //XNClientWindow, xim_win, +- NULL); +- fl_set_spot(spotf, spots, spot.x, spot.y, spot.width, spot.height); +- } +-#endif ++ if (fl_xim_ic) { ++ if (XFilterEvent((XEvent *)&xevent, 0)) ++ return 1; + } +- +- if ( XFilterEvent((XEvent *)&xevent, 0) ) +- return(1); + + #if USE_XRANDR + if( XRRUpdateConfiguration_f && xevent.type == randrEventBase + RRScreenChangeNotify) { +@@ -1003,7 +1150,6 @@ + return 0; + + case SelectionNotify: { +- if (!fl_selection_requestor) return 0; + static unsigned char* buffer = 0; + if (buffer) {XFree(buffer); buffer = 0;} + long bytesread = 0; +@@ -1019,6 +1165,19 @@ + bytesread/4, 65536, 1, 0, + &actual, &format, &count, &remaining, + &portion)) break; // quit on error ++ ++ if ((fl_xevent->xselection.property == PRIMARY_TIMESTAMP) || ++ (fl_xevent->xselection.property == CLIPBOARD_TIMESTAMP)) { ++ if (portion && format == 32 && count == 1) { ++ Time t = *(unsigned int*)portion; ++ if (fl_xevent->xselection.property == CLIPBOARD_TIMESTAMP) ++ handle_clipboard_timestamp(1, t); ++ else ++ handle_clipboard_timestamp(0, t); ++ } ++ return true; ++ } ++ + if (actual == TARGETS || actual == XA_ATOM) { + Atom type = XA_STRING; + for (unsigned i = 0; i<count; i++) { +@@ -1055,6 +1214,9 @@ + buffer[bytesread] = 0; + convert_crlf(buffer, bytesread); + } ++ ++ if (!fl_selection_requestor) return 0; ++ + Fl::e_text = buffer ? (char*)buffer : (char *)""; + Fl::e_length = bytesread; + int old_event = Fl::e_number; +@@ -1075,6 +1237,7 @@ + case SelectionClear: { + int clipboard = fl_xevent->xselectionclear.selection == CLIPBOARD; + fl_i_own_selection[clipboard] = 0; ++ poll_clipboard_owner(); + return 1;} + + case SelectionRequest: { +@@ -1287,6 +1450,9 @@ + case FocusIn: + if (fl_xim_ic) XSetICFocus(fl_xim_ic); + event = FL_FOCUS; ++ // If the user has toggled from another application to this one, ++ // then it's a good time to check for clipboard changes. ++ poll_clipboard_owner(); + break; + + case FocusOut: +@@ -1327,15 +1493,15 @@ + //static XComposeStatus compose; + len = XLookupString((XKeyEvent*)&(xevent.xkey), + buffer, buffer_len, &keysym, 0/*&compose*/); +- if (keysym && keysym < 0x400) { // a character in latin-1,2,3,4 sets +- // force it to type a character (not sure if this ever is needed): +- // if (!len) {buffer[0] = char(keysym); len = 1;} +- len = fl_utf8encode(XKeysymToUcs(keysym), buffer); +- if (len < 1) len = 1; +- // ignore all effects of shift on the keysyms, which makes it a lot +- // easier to program shortcuts and is Windoze-compatible: +- keysym = XKeycodeToKeysym(fl_display, keycode, 0); +- } ++ // XLookupString() is only defined to return Latin-1 (although it ++ // often gives you more). To be safe, use our own lookups based on ++ // keysym. ++ len = fl_utf8encode(XKeysymToUcs(keysym), buffer); ++ if (len < 1) ++ len = 1; ++ // ignore all effects of shift on the keysyms, which makes it a lot ++ // easier to program shortcuts and is Windoze-compatable: ++ keysym = XKeycodeToKeysym(fl_display, keycode, 0); + } + // MRS: Can't use Fl::event_state(FL_CTRL) since the state is not + // set until set_event_xy() is called later... +@@ -1655,6 +1821,25 @@ + } + } + ++#if HAVE_XFIXES ++ switch (xevent.type - xfixes_event_base) { ++ case XFixesSelectionNotify: { ++ // Someone feeding us bogus events? ++ if (!have_xfixes) ++ return true; ++ ++ XFixesSelectionNotifyEvent *selection_notify = (XFixesSelectionNotifyEvent *)&xevent; ++ ++ if ((selection_notify->selection == XA_PRIMARY) && !fl_i_own_selection[0]) ++ handle_clipboard_timestamp(0, selection_notify->selection_timestamp); ++ else if ((selection_notify->selection == CLIPBOARD) && !fl_i_own_selection[1]) ++ handle_clipboard_timestamp(1, selection_notify->selection_timestamp); ++ ++ return true; ++ } ++ } ++#endif ++ + return Fl::handle(event, window); + } + +@@ -1697,22 +1882,30 @@ + #define _NET_WM_STATE_ADD 1 /* add/set property */ + #define _NET_WM_STATE_TOGGLE 2 /* toggle property */ + +-static void send_wm_state_event(Window wnd, int add, Atom prop) { ++static void send_wm_event(Window wnd, Atom message, ++ unsigned long d0, unsigned long d1=0, ++ unsigned long d2=0, unsigned long d3=0, ++ unsigned long d4=0) { + XEvent e; + e.xany.type = ClientMessage; + e.xany.window = wnd; +- e.xclient.message_type = fl_NET_WM_STATE; ++ e.xclient.message_type = message; + e.xclient.format = 32; +- e.xclient.data.l[0] = add ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; +- e.xclient.data.l[1] = prop; +- e.xclient.data.l[2] = 0; +- e.xclient.data.l[3] = 0; +- e.xclient.data.l[4] = 0; ++ e.xclient.data.l[0] = d0; ++ e.xclient.data.l[1] = d1; ++ e.xclient.data.l[2] = d2; ++ e.xclient.data.l[3] = d3; ++ e.xclient.data.l[4] = d4; + XSendEvent(fl_display, RootWindow(fl_display, fl_screen), + 0, SubstructureNotifyMask | SubstructureRedirectMask, + &e); + } + ++static void send_wm_state_event(Window wnd, int add, Atom prop) { ++ send_wm_event(wnd, fl_NET_WM_STATE, ++ add ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE, prop); ++} ++ + int Fl_X::ewmh_supported() { + static int result = -1; + +@@ -1736,6 +1929,22 @@ + /* Change an existing window to fullscreen */ + void Fl_Window::fullscreen_x() { + if (Fl_X::ewmh_supported()) { ++ int top, bottom, left, right; ++ ++ top = fullscreen_screen_top; ++ bottom = fullscreen_screen_bottom; ++ left = fullscreen_screen_left; ++ right = fullscreen_screen_right; ++ ++ if ((top < 0) || (bottom < 0) || (left < 0) || (right < 0)) { ++ top = Fl::screen_num(x(), y(), w(), h()); ++ bottom = top; ++ left = top; ++ right = top; ++ } ++ ++ send_wm_event(fl_xid(this), fl_NET_WM_FULLSCREEN_MONITORS, ++ top, bottom, left, right); + send_wm_state_event(fl_xid(this), 1, fl_NET_WM_STATE_FULLSCREEN); + } else { + _set_fullscreen(); +@@ -1822,7 +2031,7 @@ + // force the window to be on-screen. Usually the X window manager + // does this, but a few don't, so we do it here for consistency: + int scr_x, scr_y, scr_w, scr_h; +- Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h, X, Y); ++ Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h, X, Y, W, H); + + if (win->border()) { + // ensure border is on screen: +@@ -1851,6 +2060,23 @@ + return; + } + ++ // Compute which screen(s) we should be on if we want to go fullscreen ++ int fullscreen_top, fullscreen_bottom, fullscreen_left, fullscreen_right; ++ ++ fullscreen_top = win->fullscreen_screen_top; ++ fullscreen_bottom = win->fullscreen_screen_bottom; ++ fullscreen_left = win->fullscreen_screen_left; ++ fullscreen_right = win->fullscreen_screen_right; ++ ++ if ((fullscreen_top < 0) || (fullscreen_bottom < 0) || ++ (fullscreen_left < 0) || (fullscreen_right < 0)) { ++ fullscreen_top = Fl::screen_num(X, Y, W, H); ++ fullscreen_bottom = fullscreen_top; ++ fullscreen_left = fullscreen_top; ++ fullscreen_right = fullscreen_top; ++ } ++ ++ + ulong root = win->parent() ? + fl_xid(win->window()) : RootWindow(fl_display, fl_screen); + +@@ -1874,9 +2100,17 @@ + // border, and cannot grab without an existing window. Besides, + // there is no clear_override(). + if (win->flags() & Fl_Widget::FULLSCREEN && !Fl_X::ewmh_supported()) { ++ int sx, sy, sw, sh; + attr.override_redirect = 1; + mask |= CWOverrideRedirect; +- Fl::screen_xywh(X, Y, W, H, X, Y, W, H); ++ Fl::screen_xywh(sx, sy, sw, sh, fullscreen_left); ++ X = sx; ++ Fl::screen_xywh(sx, sy, sw, sh, fullscreen_right); ++ W = sx + sw - X; ++ Fl::screen_xywh(sx, sy, sw, sh, fullscreen_top); ++ Y = sy; ++ Fl::screen_xywh(sx, sy, sw, sh, fullscreen_bottom); ++ H = sy + sh - Y; + } + + if (fl_background_pixel >= 0) { +@@ -1929,6 +2163,12 @@ + while (wp->parent()) wp = wp->window(); + XSetTransientForHint(fl_display, xp->xid, fl_xid(wp)); + if (!wp->visible()) showit = 0; // guess that wm will not show it ++ if (win->modal()) { ++ Atom net_wm_state = XInternAtom (fl_display, "_NET_WM_STATE", 0); ++ Atom net_wm_state_skip_taskbar = XInternAtom (fl_display, "_NET_WM_STATE_MODAL", 0); ++ XChangeProperty (fl_display, xp->xid, net_wm_state, XA_ATOM, 32, ++ PropModeAppend, (unsigned char*) &net_wm_state_skip_taskbar, 1); ++ } + } + + // Make sure that borderless windows do not show in the task bar +@@ -1941,6 +2181,13 @@ + + // If asked for, create fullscreen + if (win->flags() & Fl_Widget::FULLSCREEN && Fl_X::ewmh_supported()) { ++ unsigned long data[4]; ++ data[0] = fullscreen_top; ++ data[1] = fullscreen_bottom; ++ data[2] = fullscreen_left; ++ data[3] = fullscreen_right; ++ XChangeProperty (fl_display, xp->xid, fl_NET_WM_FULLSCREEN_MONITORS, XA_ATOM, 32, ++ PropModeReplace, (unsigned char*) data, 4); + XChangeProperty (fl_display, xp->xid, fl_NET_WM_STATE, XA_ATOM, 32, + PropModeAppend, (unsigned char*) &fl_NET_WM_STATE_FULLSCREEN, 1); + } +@@ -1959,12 +2206,14 @@ + fl_show_iconic = 0; + showit = 0; + } +- if (win->icon()) { +- hints->icon_pixmap = (Pixmap)win->icon(); ++ if (win->icon_->legacy_icon) { ++ hints->icon_pixmap = (Pixmap)win->icon_->legacy_icon; + hints->flags |= IconPixmapHint; + } + XSetWMHints(fl_display, xp->xid, hints); + XFree(hints); ++ ++ xp->set_icons(); + } + + // set the window type for menu and tooltip windows to avoid animations (compiz) +@@ -1974,6 +2223,16 @@ + XChangeProperty(fl_display, xp->xid, net_wm_type, XA_ATOM, 32, PropModeReplace, (unsigned char*)&net_wm_type_kind, 1); + } + ++#if HAVE_XFIXES ++ // register for clipboard change notifications ++ if (have_xfixes && !win->parent()) { ++ XFixesSelectSelectionInput(fl_display, xp->xid, XA_PRIMARY, ++ XFixesSetSelectionOwnerNotifyMask); ++ XFixesSelectSelectionInput(fl_display, xp->xid, CLIPBOARD, ++ XFixesSetSelectionOwnerNotifyMask); ++ } ++#endif ++ + XMapWindow(fl_display, xp->xid); + if (showit) { + win->set_visible(); +@@ -2073,6 +2332,181 @@ + } + + //////////////////////////////////////////////////////////////// ++ ++static unsigned long *default_net_wm_icons = 0L; ++static size_t default_net_wm_icons_size = 0; ++ ++void icons_to_property(const Fl_RGB_Image *icons[], int count, ++ unsigned long **property, size_t *len) { ++ size_t sz; ++ unsigned long *data; ++ ++ sz = 0; ++ for (int i = 0;i < count;i++) ++ sz += 2 + icons[i]->w() * icons[i]->h(); ++ ++ // FIXME: Might want to sort the icons ++ ++ *property = data = new unsigned long[sz]; ++ *len = sz; ++ ++ for (int i = 0;i < count;i++) { ++ const Fl_RGB_Image *image; ++ ++ image = icons[i]; ++ ++ data[0] = image->w(); ++ data[1] = image->h(); ++ data += 2; ++ ++ const uchar *in = (const uchar*)*image->data(); ++ for (int y = 0;y < image->h();y++) { ++ for (int x = 0;x < image->w();x++) { ++ switch (image->d()) { ++ case 1: ++ *data = ( 0xff<<24) | (in[0]<<16) | (in[0]<<8) | in[0]; ++ break; ++ case 2: ++ *data = (in[1]<<24) | (in[0]<<16) | (in[0]<<8) | in[0]; ++ break; ++ case 3: ++ *data = ( 0xff<<24) | (in[0]<<16) | (in[1]<<8) | in[2]; ++ break; ++ case 4: ++ *data = (in[3]<<24) | (in[0]<<16) | (in[1]<<8) | in[2]; ++ break; ++ } ++ in += image->d(); ++ data++; ++ } ++ in += image->ld(); ++ } ++ } ++} ++ ++void Fl_X::set_default_icons(const Fl_RGB_Image *icons[], int count) { ++ if (default_net_wm_icons) { ++ delete [] default_net_wm_icons; ++ default_net_wm_icons = 0L; ++ default_net_wm_icons_size = 0; ++ } ++ ++ if (count > 0) ++ icons_to_property(icons, count, ++ &default_net_wm_icons, &default_net_wm_icons_size); ++} ++ ++void Fl_X::set_icons() { ++ unsigned long *net_wm_icons; ++ size_t net_wm_icons_size; ++ ++ if (w->icon_->count) { ++ icons_to_property((const Fl_RGB_Image **)w->icon_->icons, w->icon_->count, ++ &net_wm_icons, &net_wm_icons_size); ++ } else { ++ net_wm_icons = default_net_wm_icons; ++ net_wm_icons_size = default_net_wm_icons_size; ++ } ++ ++ XChangeProperty (fl_display, xid, fl_NET_WM_ICON, XA_CARDINAL, 32, ++ PropModeReplace, (unsigned char*) net_wm_icons, net_wm_icons_size); ++ ++ if (w->icon_->count) { ++ delete [] net_wm_icons; ++ net_wm_icons = 0L; ++ net_wm_icons_size = 0; ++ } ++} ++ ++//////////////////////////////////////////////////////////////// ++ ++int Fl_X::set_cursor(Fl_Cursor c) { ++ unsigned int shape; ++ Cursor xc; ++ ++ switch (c) { ++ case FL_CURSOR_ARROW: shape = XC_left_ptr; break; ++ case FL_CURSOR_CROSS: shape = XC_tcross; break; ++ case FL_CURSOR_WAIT: shape = XC_watch; break; ++ case FL_CURSOR_INSERT: shape = XC_xterm; break; ++ case FL_CURSOR_HAND: shape = XC_hand2; break; ++ case FL_CURSOR_HELP: shape = XC_question_arrow; break; ++ case FL_CURSOR_MOVE: shape = XC_fleur; break; ++ case FL_CURSOR_NS: shape = XC_sb_v_double_arrow; break; ++ case FL_CURSOR_WE: shape = XC_sb_h_double_arrow; break; ++ case FL_CURSOR_NE: shape = XC_top_right_corner; break; ++ case FL_CURSOR_N: shape = XC_top_side; break; ++ case FL_CURSOR_NW: shape = XC_top_left_corner; break; ++ case FL_CURSOR_E: shape = XC_right_side; break; ++ case FL_CURSOR_W: shape = XC_left_side; break; ++ case FL_CURSOR_SE: shape = XC_bottom_right_corner; break; ++ case FL_CURSOR_S: shape = XC_bottom_side; break; ++ case FL_CURSOR_SW: shape = XC_bottom_left_corner; break; ++ default: ++ return 0; ++ } ++ ++ xc = XCreateFontCursor(fl_display, shape); ++ XDefineCursor(fl_display, xid, xc); ++ XFreeCursor(fl_display, xc); ++ ++ return 1; ++} ++ ++int Fl_X::set_cursor(const Fl_RGB_Image *image, int hotx, int hoty) { ++#if ! HAVE_XCURSOR ++ return 0; ++#else ++ XcursorImage *cursor; ++ Cursor xc; ++ ++ if ((hotx < 0) || (hotx >= image->w())) ++ return 0; ++ if ((hoty < 0) || (hoty >= image->h())) ++ return 0; ++ ++ cursor = XcursorImageCreate(image->w(), image->h()); ++ if (!cursor) ++ return 0; ++ ++ const uchar *i = (const uchar*)*image->data(); ++ XcursorPixel *o = cursor->pixels; ++ for (int y = 0;y < image->h();y++) { ++ for (int x = 0;x < image->w();x++) { ++ switch (image->d()) { ++ case 1: ++ *o = (0xff<<24) | (i[0]<<16) | (i[0]<<8) | i[0]; ++ break; ++ case 2: ++ *o = (i[1]<<24) | (i[0]<<16) | (i[0]<<8) | i[0]; ++ break; ++ case 3: ++ *o = (0xff<<24) | (i[0]<<16) | (i[1]<<8) | i[2]; ++ break; ++ case 4: ++ *o = (i[3]<<24) | (i[0]<<16) | (i[1]<<8) | i[2]; ++ break; ++ } ++ i += image->d(); ++ o++; ++ } ++ i += image->ld(); ++ } ++ ++ cursor->xhot = hotx; ++ cursor->yhot = hoty; ++ ++ xc = XcursorImageLoadCursor(fl_display, cursor); ++ XDefineCursor(fl_display, xid, xc); ++ XFreeCursor(fl_display, xc); ++ ++ XcursorImageDestroy(cursor); ++ ++ return 1; ++#endif ++} ++ ++//////////////////////////////////////////////////////////////// + + // returns pointer to the filename, or null if name ends with '/' + const char *fl_filename_name(const char *name) { +diff -Nur fltk-1.3.2.orig/src/ps_image.cxx fltk-1.3.2/src/ps_image.cxx +--- fltk-1.3.2.orig/src/ps_image.cxx 2011-07-19 06:49:30.000000000 +0200 ++++ fltk-1.3.2/src/ps_image.cxx 2013-07-17 19:37:37.912343302 +0200 +@@ -185,72 +185,38 @@ + + extern uchar **fl_mask_bitmap; + ++struct callback_data { ++ const uchar *data; ++ int D, LD; ++}; + +-void Fl_PostScript_Graphics_Driver::draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) { +- double x = ix, y = iy, w = iw, h = ih; + +- if (D<3){ //mono +- draw_image_mono(data, ix, iy, iw, ih, D, LD); +- return; +- } ++static void draw_image_cb(void *data, int x, int y, int w, uchar *buf) { ++ struct callback_data *cb_data; ++ const uchar *curdata; + ++ cb_data = (struct callback_data*)data; ++ curdata = cb_data->data + x*cb_data->D + y*cb_data->LD; + +- int i,j, k; ++ memcpy(buf, curdata, w*cb_data->D); ++} + +- fprintf(output,"save\n"); + +- const char * interpol; +- if (lang_level_>1){ +- if (interpolate_) +- interpol="true"; +- else +- interpol="false"; +- if (mask && lang_level_>2) +- fprintf(output, "%g %g %g %g %i %i %i %i %s CIM\n", x , y+h , w , -h , iw , ih, mx, my, interpol); +- else +- fprintf(output, "%g %g %g %g %i %i %s CII\n", x , y+h , w , -h , iw , ih, interpol); +- } else +- fprintf(output , "%g %g %g %g %i %i CI", x , y+h , w , -h , iw , ih); ++void Fl_PostScript_Graphics_Driver::draw_image(const uchar *data, int ix, int iy, int iw, int ih, int D, int LD) { ++ if (D<3){ //mono ++ draw_image_mono(data, ix, iy, iw, ih, D, LD); ++ return; ++ } + ++ struct callback_data cb_data; + + if (!LD) LD = iw*D; +- uchar *curmask=mask; +- +- for (j=0; j<ih;j++){ +- if (mask){ +- +- for (k=0;k<my/ih;k++){ +- for (i=0; i<((mx+7)/8);i++){ +- if (!(i%80)) fprintf(output, "\n"); +- fprintf(output, "%.2x",swap_byte(*curmask)); +- curmask++; +- } +- fprintf(output,"\n"); +- } +- } +- const uchar *curdata=data+j*LD; +- for (i=0 ; i<iw ; i++) { +- uchar r = curdata[0]; +- uchar g = curdata[1]; +- uchar b = curdata[2]; +- if (lang_level_<3 && D>3) { //can do mixing using bg_* colors) +- unsigned int a2 = curdata[3]; //must be int +- unsigned int a = 255-a2; +- r = (a2 * r + bg_r * a)/255; +- g = (a2 * g + bg_g * a)/255; +- b = (a2 * b + bg_b * a)/255; +- } +- if (!(i%40)) fprintf(output, "\n"); +- fprintf(output, "%.2x%.2x%.2x", r, g, b); +- curdata +=D; +- } +- fprintf(output,"\n"); +- +- } +- +- fprintf(output," >\nrestore\n" ); + ++ cb_data.data = data; ++ cb_data.D = D; ++ cb_data.LD = LD; + ++ draw_image(draw_image_cb, &cb_data, ix, iy, iw, ih, D); + } + + void Fl_PostScript_Graphics_Driver::draw_image(Fl_Draw_Image_Cb call, void *data, int ix, int iy, int iw, int ih, int D) { +@@ -325,6 +291,14 @@ + uchar g = curdata[1]; + uchar b = curdata[2]; + ++ if (lang_level_<3 && D>3) { //can do mixing using bg_* colors) ++ unsigned int a2 = curdata[3]; //must be int ++ unsigned int a = 255-a2; ++ r = (a2 * r + bg_r * a)/255; ++ g = (a2 * g + bg_g * a)/255; ++ b = (a2 * b + bg_b * a)/255; ++ } ++ + if (!(i%40)) fputs("\n", output); + fprintf(output, "%.2x%.2x%.2x", r, g, b); + +diff -Nur fltk-1.3.2.orig/src/screen_xywh.cxx fltk-1.3.2/src/screen_xywh.cxx +--- fltk-1.3.2.orig/src/screen_xywh.cxx 2012-03-23 17:47:53.000000000 +0100 ++++ fltk-1.3.2/src/screen_xywh.cxx 2013-07-17 19:38:09.575341648 +0200 +@@ -215,21 +215,6 @@ + return num_screens ? num_screens : 1; + } + +-static int find_screen_with_point(int mx, int my) { +- int screen = 0; +- if (num_screens < 0) screen_init(); +- +- for (int i = 0; i < num_screens; i ++) { +- int sx, sy, sw, sh; +- Fl::screen_xywh(sx, sy, sw, sh, i); +- if ((mx >= sx) && (mx < (sx+sw)) && (my >= sy) && (my < (sy+sh))) { +- screen = i; +- break; +- } +- } +- return screen; +-} +- + /** + Gets the bounding box of a screen + that contains the specified screen position \p mx, \p my +@@ -237,7 +222,7 @@ + \param[in] mx, my the absolute screen position + */ + void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my) { +- screen_xywh(X, Y, W, H, find_screen_with_point(mx, my)); ++ screen_xywh(X, Y, W, H, screen_num(mx, my)); + } + + +@@ -248,7 +233,7 @@ + \param[in] mx, my the absolute screen position + */ + void Fl::screen_work_area(int &X, int &Y, int &W, int &H, int mx, int my) { +- screen_work_area(X, Y, W, H, find_screen_with_point(mx, my)); ++ screen_work_area(X, Y, W, H, screen_num(mx, my)); + } + + /** +@@ -321,6 +306,38 @@ + #endif // WIN32 + } + ++/** ++ Gets the screen bounding rect for the screen ++ which intersects the most with the rectangle ++ defined by \p mx, \p my, \p mw, \p mh. ++ \param[out] X,Y,W,H the corresponding screen bounding box ++ \param[in] mx, my, mw, mh the rectangle to search for intersection with ++ \see void screen_xywh(int &X, int &Y, int &W, int &H, int n) ++ */ ++void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh) { ++ screen_xywh(X, Y, W, H, screen_num(mx, my, mw, mh)); ++} ++ ++/** ++ Gets the screen number of a screen ++ that contains the specified screen position \p x, \p y ++ \param[in] x, y the absolute screen position ++*/ ++int Fl::screen_num(int x, int y) { ++ int screen = 0; ++ if (num_screens < 0) screen_init(); ++ ++ for (int i = 0; i < num_screens; i ++) { ++ int sx, sy, sw, sh; ++ Fl::screen_xywh(sx, sy, sw, sh, i); ++ if ((x >= sx) && (x < (sx+sw)) && (y >= sy) && (y < (sy+sh))) { ++ screen = i; ++ break; ++ } ++ } ++ return screen; ++} ++ + static inline float fl_intersection(int x1, int y1, int w1, int h1, + int x2, int y2, int w2, int h2) { + if(x1+w1 < x2 || x2+w2 < x1 || y1+h1 < y2 || y2+h2 < y1) +@@ -333,30 +350,27 @@ + } + + /** +- Gets the screen bounding rect for the screen ++ Gets the screen number for the screen + which intersects the most with the rectangle +- defined by \p mx, \p my, \p mw, \p mh. +- \param[out] X,Y,W,H the corresponding screen bounding box +- \param[in] mx, my, mw, mh the rectangle to search for intersection with +- \see void screen_xywh(int &X, int &Y, int &W, int &H, int n) ++ defined by \p x, \p y, \p w, \p h. ++ \param[in] x, y, w, h the rectangle to search for intersection with + */ +-void Fl::screen_xywh(int &X, int &Y, int &W, int &H, int mx, int my, int mw, int mh) { ++int Fl::screen_num(int x, int y, int w, int h) { + int best_screen = 0; + float best_intersection = 0.; + for(int i = 0; i < Fl::screen_count(); i++) { + int sx, sy, sw, sh; + Fl::screen_xywh(sx, sy, sw, sh, i); +- float sintersection = fl_intersection(mx, my, mw, mh, sx, sy, sw, sh); ++ float sintersection = fl_intersection(x, y, w, h, sx, sy, sw, sh); + if(sintersection > best_intersection) { + best_screen = i; + best_intersection = sintersection; + } + } +- screen_xywh(X, Y, W, H, best_screen); ++ return best_screen; + } + + +- + /** + Gets the screen resolution in dots-per-inch for the given screen. + \param[out] h, v horizontal and vertical resolution +diff -Nur fltk-1.3.2.orig/src/xutf8/imKStoUCS.c fltk-1.3.2/src/xutf8/imKStoUCS.c +--- fltk-1.3.2.orig/src/xutf8/imKStoUCS.c 2009-03-13 23:43:43.000000000 +0100 ++++ fltk-1.3.2/src/xutf8/imKStoUCS.c 2013-07-17 19:37:07.412344891 +0200 +@@ -266,6 +266,12 @@ + 0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac /* 0x20a8-0x20af */ + }; + ++static unsigned short const keysym_to_unicode_fe50_fe60[] = { ++ 0x0300, 0x0301, 0x0302, 0x0303, 0x0304, 0x0306, 0x0307, 0x0308, /* 0xfe50-0xfe57 */ ++ 0x030a, 0x030b, 0x030c, 0x0327, 0x0328, 0x1da5, 0x3099, 0x309a, /* 0xfe58-0xfe5f */ ++ 0x0323 /* 0xfe60-0xfe67 */ ++}; ++ + unsigned int + KeySymToUcs4(KeySym keysym) + { +@@ -315,6 +321,8 @@ + return keysym_to_unicode_1e9f_1eff[keysym - 0x1e9f]; + else if (keysym > 0x209f && keysym < 0x20ad) + return keysym_to_unicode_20a0_20ac[keysym - 0x20a0]; ++ else if (keysym > 0xfe4f && keysym < 0xfe61) ++ return keysym_to_unicode_fe50_fe60[keysym - 0xfe50]; + else + return 0; + } +diff -Nur fltk-1.3.2.orig/test/cursor.cxx fltk-1.3.2/test/cursor.cxx +--- fltk-1.3.2.orig/test/cursor.cxx 2011-07-19 06:49:30.000000000 +0200 ++++ fltk-1.3.2/test/cursor.cxx 2013-07-17 19:37:45.796342890 +0200 +@@ -23,8 +23,6 @@ + #include <FL/fl_draw.H> + #include <FL/Fl_Box.H> + +-Fl_Color fg = FL_BLACK; +-Fl_Color bg = FL_WHITE; + Fl_Cursor cursor = FL_CURSOR_DEFAULT; + + Fl_Hor_Value_Slider *cursor_slider; +@@ -32,7 +30,7 @@ + void choice_cb(Fl_Widget *, void *v) { + cursor = (Fl_Cursor)(fl_intptr_t)v; + cursor_slider->value(cursor); +- fl_cursor(cursor,fg,bg); ++ fl_cursor(cursor); + } + + Fl_Menu_Item choices[] = { +@@ -48,8 +46,6 @@ + {"FL_CURSOR_WE",0,choice_cb,(void*)FL_CURSOR_WE}, + {"FL_CURSOR_NWSE",0,choice_cb,(void*)FL_CURSOR_NWSE}, + {"FL_CURSOR_NESW",0,choice_cb,(void*)FL_CURSOR_NESW}, +- {"FL_CURSOR_NONE",0,choice_cb,(void*)FL_CURSOR_NONE}, +-#if 0 + {"FL_CURSOR_N",0,choice_cb,(void*)FL_CURSOR_N}, + {"FL_CURSOR_NE",0,choice_cb,(void*)FL_CURSOR_NE}, + {"FL_CURSOR_E",0,choice_cb,(void*)FL_CURSOR_E}, +@@ -58,26 +54,14 @@ + {"FL_CURSOR_SW",0,choice_cb,(void*)FL_CURSOR_SW}, + {"FL_CURSOR_W",0,choice_cb,(void*)FL_CURSOR_W}, + {"FL_CURSOR_NW",0,choice_cb,(void*)FL_CURSOR_NW}, +-#endif ++ {"FL_CURSOR_NONE",0,choice_cb,(void*)FL_CURSOR_NONE}, + {0} + }; + + void setcursor(Fl_Widget *o, void *) { + Fl_Hor_Value_Slider *slider = (Fl_Hor_Value_Slider *)o; + cursor = Fl_Cursor((int)slider->value()); +- fl_cursor(cursor,fg,bg); +-} +- +-void setfg(Fl_Widget *o, void *) { +- Fl_Hor_Value_Slider *slider = (Fl_Hor_Value_Slider *)o; +- fg = Fl_Color((int)slider->value()); +- fl_cursor(cursor,fg,bg); +-} +- +-void setbg(Fl_Widget *o, void *) { +- Fl_Hor_Value_Slider *slider = (Fl_Hor_Value_Slider *)o; +- bg = Fl_Color((int)slider->value()); +- fl_cursor(cursor,fg,bg); ++ fl_cursor(cursor); + } + + // draw the label without any ^C or \nnn conversions: +@@ -103,29 +87,11 @@ + slider1.align(FL_ALIGN_LEFT); + slider1.step(1); + slider1.precision(0); +- slider1.bounds(0,100); ++ slider1.bounds(0,255); + slider1.value(0); + slider1.callback(setcursor); + slider1.value(cursor); + +- Fl_Hor_Value_Slider slider2(80,220,310,30,"fgcolor:"); +- slider2.align(FL_ALIGN_LEFT); +- slider2.step(1); +- slider2.precision(0); +- slider2.bounds(0,255); +- slider2.value(0); +- slider2.callback(setfg); +- slider2.value(fg); +- +- Fl_Hor_Value_Slider slider3(80,260,310,30,"bgcolor:"); +- slider3.align(FL_ALIGN_LEFT); +- slider3.step(1); +- slider3.precision(0); +- slider3.bounds(0,255); +- slider3.value(0); +- slider3.callback(setbg); +- slider3.value(bg); +- + #if 0 + // draw the manual's diagram of cursors... + window.size(400,800); +diff -Nur fltk-1.3.2.orig/test/fullscreen.cxx fltk-1.3.2/test/fullscreen.cxx +--- fltk-1.3.2.orig/test/fullscreen.cxx 2012-06-14 17:09:46.000000000 +0200 ++++ fltk-1.3.2/test/fullscreen.cxx 2013-07-17 19:38:17.327341239 +0200 +@@ -127,7 +127,7 @@ + fullscreen_window(int W, int H, const char *t=0); + int handle (int e); + Fl_Toggle_Light_Button *b3; +- ++ Fl_Toggle_Light_Button *b4; + }; + + fullscreen_window::fullscreen_window(int W, int H, const char *t) : Fl_Single_Window(W, H, t) { +@@ -170,23 +170,54 @@ + #endif + } + +-int px,py,pw,ph; + Fl_Button *border_button; + void fullscreen_cb(Fl_Widget *o, void *p) { + Fl_Window *w = (Fl_Window *)p; + int d = ((Fl_Button *)o)->value(); + if (d) { +- px = w->x(); +- py = w->y(); +- pw = w->w(); +- ph = w->h(); ++ if (((fullscreen_window*)w)->b4->value()) { ++ int top, bottom, left, right; ++ int top_y, bottom_y, left_x, right_x; ++ ++ int sx, sy, sw, sh; ++ ++ top = bottom = left = right = 0; ++ ++ Fl::screen_xywh(sx, sy, sw, sh, 0); ++ top_y = sy; ++ bottom_y = sy + sh; ++ left_x = sx; ++ right_x = sx + sw; ++ ++ for (int i = 1;i < Fl::screen_count();i++) { ++ Fl::screen_xywh(sx, sy, sw, sh, i); ++ if (sy < top_y) { ++ top = i; ++ top_y = sy; ++ } ++ if ((sy + sh) > bottom_y) { ++ bottom = i; ++ bottom_y = sy + sh; ++ } ++ if (sx < left_x) { ++ left = i; ++ left_x = sx; ++ } ++ if ((sx + sw) > right_x) { ++ right = i; ++ right_x = sx + sw; ++ } ++ } ++ ++ w->fullscreen_screens(top, bottom, left, right); ++ } else { ++ w->fullscreen_screens(-1, -1, -1, -1); ++ } + w->fullscreen(); +- w->override(); + #ifndef WIN32 // update our border state in case border was turned off + border_button->value(w->border()); + #endif + } else { +- //w->fullscreen_off(px,py,pw,ph); + w->fullscreen_off(); + } + } +@@ -219,7 +250,7 @@ + exit(0); + } + +-#define NUMB 7 ++#define NUMB 8 + + int twowindow = 0; + int initfull = 0; +@@ -284,6 +315,9 @@ + window.b3->callback(fullscreen_cb,w); + y+=30; + ++ window.b4 = new Fl_Toggle_Light_Button(50,y,window.w()-60,30,"All Screens"); ++ y+=30; ++ + Fl_Button eb(50,y,window.w()-60,30,"Exit"); + eb.callback(exit_cb); + y+=30; diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index befd6efeb..3c29f888b 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 188065 2013-06-08 08:06:46Z heftig $ +# $Id: PKGBUILD 196038 2013-10-07 11:50:52Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.9.2 +pkgver=0.9.5 pkgrel=1 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64 'mips64el') url="http://telepathy.freedesktop.org/wiki/Folks" license=(LGPL2.1) -depends=(telepathy-glib libgee libxml2 evolution-data-server libzeitgeist libtracker-sparql) -makedepends=(gobject-introspection intltool) +depends=(telepathy-glib libgee libxml2 evolution-data-server zeitgeist libtracker-sparql) +makedepends=(gobject-introspection intltool vala) install=folks.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4b034ffe83928acd8a7d607edab60f36eb13801a9d3fcc34ccc7c34a16747818') +sha256sums=('924c440f16a8c9b0d0d832588fa77a1553fa2a5d2659c4c7d3178a7ef42222af') build() { cd "$pkgname-$pkgver" + export PKG_CONFIG_PATH="${srcdir}/${pkgname}-${pkgver}/folks" ./configure --prefix=/usr --disable-schemas-compile --enable-tracker-backend \ - --disable-libsocialweb-backend + --disable-libsocialweb-backend --disable-fatal-warnings make } diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD index 39fbaaa54..c5944b6c8 100644 --- a/extra/four-in-a-row/PKGBUILD +++ b/extra/four-in-a-row/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183358 2013-04-21 22:09:11Z heftig $ +# $Id: PKGBUILD 196039 2013-10-07 11:50:54Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=four-in-a-row -pkgver=3.8.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="Make lines of the same color to win" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=four-in-a-row.install url="https://live.gnome.org/Four-in-a-row" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('eb44c8508a7d4281df1e52c75a4dc8b31a0de108b94c0f37c4e8d99ea380019d') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('4759dcc8483c5bbf89de8b10a5379539ec1df6392cf2f7b96e91ec9dd2897001') build() { cd $pkgname-$pkgver diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD index 9db4debcb..ea18bbfa6 100644 --- a/extra/freeciv/PKGBUILD +++ b/extra/freeciv/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 178314 2013-02-20 01:15:54Z eric $ +# $Id: PKGBUILD 194398 2013-09-16 01:46:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=freeciv -pkgver=2.3.4 +pkgver=2.4.0 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeciv.org/" license=('GPL') -depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme') -options=('!libtool') +depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme' 'lua51' 'sqlite' 'curl' 'libltdl') +backup=('etc/freeciv/database.lua') +options=('!libtool' '!staticlibs') install=freeciv.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('974bbadf86c697bd2d4de7abf12d992fb50f1724') +sha1sums=('4a3537dc050bd69002794c832b74f5af972da25e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --enable-shared --enable-sys-lua \ + --enable-client=gtk2 --enable-fcdb=sqlite3 --enable-aimodules make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD index fe3da514a..a40c41f15 100644 --- a/extra/gconf-editor/PKGBUILD +++ b/extra/gconf-editor/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 183359 2013-04-21 22:09:12Z heftig $ +# $Id: PKGBUILD 195993 2013-10-07 08:23:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gconf-editor pkgver=3.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Graphical gconf registry editor" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('gconf' 'hicolor-icon-theme') +depends=('gconf' 'hicolor-icon-theme' 'gtk3') makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils') url="http://www.gnome.org" options=(!emptydirs) diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index 527e3cd30..a6212af02 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 187058 2013-06-03 11:16:33Z allan $ +# $Id: PKGBUILD 195892 2013-10-03 19:08:22Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf pkgver=3.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="A configuration database system" arch=(i686 x86_64 'mips64el') license=('LGPL') -depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3') +depends=('libxml2' 'polkit' 'libldap' 'dbus-glib') makedepends=('intltool' 'gtk-doc' 'gobject-introspection') options=('!libtool') install=gconf.install @@ -40,7 +40,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/GConf \ - --disable-static --enable-defaults-service --with-gtk=3.0 \ + --disable-static --enable-defaults-service \ --disable-orbit make pkglibdir=/usr/lib/GConf diff --git a/extra/gconf/gconf.install b/extra/gconf/gconf.install index f7945d165..a5ea777a5 100644 --- a/extra/gconf/gconf.install +++ b/extra/gconf/gconf.install @@ -9,10 +9,7 @@ post_upgrade() { chmod 755 etc/gconf/gconf.xml.system usr/bin/gio-querymodules usr/lib/gio/modules - PID=`pidof gconfd-2` - if [ ! -z "${PID}" ]; then - kill ${PID} - fi + pkill /usr/lib/GConf/gconfd-2 || return 0 } post_remove() { diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD index da1d98e5c..37826ce6b 100644 --- a/extra/gcr/PKGBUILD +++ b/extra/gcr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184241 2013-05-04 20:06:54Z heftig $ +# $Id: PKGBUILD 196040 2013-10-07 11:50:55Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gcr -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="A library for bits of crypto UI and parsing" arch=(i686 x86_64 mips64el) @@ -12,9 +12,9 @@ depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt') makedepends=('intltool' 'gobject-introspection' 'python') options=(!libtool) install=gcr.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 10-gcr.conf) -sha256sums=('a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1' +sha256sums=('b689c679b244c1f47d773002c33dadc4111cddeb05bc2f3651826893fd43ff1b' '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc') build() { diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index 43651ad2a..921a6a886 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187905 2013-06-07 22:45:04Z heftig $ +# $Id: PKGBUILD 196041 2013-10-07 11:50:57Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.28.2 +pkgver=2.30.0 pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('183113c2eb2232963e88864a6a54fd963dbfeb1a3679fb0d3456f9e0b79e4617') +sha256sums=('4a73600525621283a14436c5f873c1126c4feafcb07d24a746f13215e2caa658') build() { cd gdk-pixbuf-$pkgver diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD index aa0992a8f..b7d18400a 100644 --- a/extra/gdl/PKGBUILD +++ b/extra/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183362 2013-04-21 22:09:18Z heftig $ +# $Id: PKGBUILD 196042 2013-10-07 11:50:58Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdl -pkgver=3.8.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="GNOME Docking Library" arch=(i686 x86_64 mips64el) @@ -12,7 +12,7 @@ depends=('gtk3') makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c9911e9eec5a62497fff7e044ca9eaae47354658238e6b9e9a0a744f05b4ebdb') +sha256sums=('4e0d6f66115ba3b0f3cd2495d8a95c6714d701f89d556bb691bd0c0a62a1c760') build() { cd "$pkgname-$pkgver" diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 0f922cf8e..74e04e1d9 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191808 2013-07-30 23:19:36Z jgc $ +# $Id: PKGBUILD 196043 2013-10-07 11:50:59Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gdm pkgname=(gdm libgdm) -pkgver=3.8.4 +pkgver=3.10.0 pkgrel=1 pkgdesc="Gnome Display Manager" arch=('i686' 'x86_64' 'mips64el') @@ -14,9 +14,9 @@ options=('!libtool') depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost) makedepends=(itstool intltool yelp-tools gobject-introspection) checkdepends=('check') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz fix_external_program_directories.patch arch-pam.patch) -sha256sums=('db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447' +sha256sums=('bb04600298f5be795f0d0bfea40bbd9bf78f95a44c5caeda4d0cc6a05207318c' 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2' 'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003') @@ -47,7 +47,7 @@ build() { sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make + make -j1 } check() { @@ -69,7 +69,7 @@ package_gdm() { make DESTDIR="$pkgdir" install chmod 711 "$pkgdir/var/log/gdm" - rm -r "$pkgdir/var/run" "$pkgdir/var/gdm" + rm -r "$pkgdir/var/run" ### Split libgdm make -C gui/libgdm DESTDIR="$pkgdir" uninstall diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index b8552eba1..9c2795a24 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 188910 2013-06-25 07:42:51Z heftig $ +# $Id: PKGBUILD 196044 2013-10-07 11:51:01Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.8.3 +pkgver=3.10.0 pkgrel=1 pkgdesc="A text editor for GNOME" arch=(i686 x86_64 mips64el) license=(GPL) depends=(gtksourceview3 gsettings-desktop-schemas libpeas enchant iso-codes libsm desktop-file-utils python-gobject dconf) -makedepends=(yelp-tools intltool 'zeitgeist>=0.9.12') +makedepends=(yelp-tools intltool zeitgeist) optdepends=('zeitgeist: Zeitgeist plugin') groups=(gnome-extra) 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=('dfbc2d9cf975b247c6a6b8bd1ae1b72d8e8a1f862f5f3d084a404853092cf9d3') +sha256sums=('4c20049ccee2198468edaf20fba9dbd44e3baf50bd304700b4f24257571cdca5') build() { cd $pkgname-$pkgver diff --git a/extra/geoclue2/PKGBUILD b/extra/geoclue2/PKGBUILD new file mode 100644 index 000000000..70f7bfb9a --- /dev/null +++ b/extra/geoclue2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 196002 2013-10-07 11:46:24Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=geoclue2 +pkgver=1.99.4 +pkgrel=1 +pkgdesc="Modular geoinformation service built on the D-Bus messaging system." +arch=(i686 x86_64) +url="http://geoclue.freedesktop.org/" +license=(LGPL) +depends=(libsoup json-glib) +makedepends=(intltool geoip) +optdepends=('geoip: geoip-lookup server binary') +options=('!libtool') +install=geoclue.install +source=(http://freedesktop.org/software/geoclue/releases/1.99/geoclue-$pkgver.tar.xz) +md5sums=('b991f4a409b492996a38627ee18fa76e') + +build() { + cd geoclue-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static + make +} + +package() { + cd geoclue-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/geoclue2/geoclue.install b/extra/geoclue2/geoclue.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/geoclue2/geoclue.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/geocode-glib/PKGBUILD b/extra/geocode-glib/PKGBUILD new file mode 100644 index 000000000..e3ec1a334 --- /dev/null +++ b/extra/geocode-glib/PKGBUILD @@ -0,0 +1,26 @@ +#Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=geocode-glib +pkgver=3.10.0 +pkgrel=1 +pkgdesc="Geocode Helper library" +arch=(i686 x86_64) +license=('GPL') +url="https://git.gnome.org/browse/geocode-glib/" +depends=('glib2' 'json-glib' 'libsoup') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0aedc198cf8a9b934a290d50aadaf4b48bb13c3b4783618c6753eb466cdaa637') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} + diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD index f1d5e11d2..5857354ba 100644 --- a/extra/geoip/PKGBUILD +++ b/extra/geoip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183169 2013-04-18 10:54:20Z juergen $ +# $Id: PKGBUILD 194736 2013-09-23 12:28:32Z jgc $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Manolis Tzanidakis <manolis@archlinux.org> pkgname=geoip -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="Non-DNS IP-to-country resolver C library & utils" arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,18 @@ license=('GPL') depends=('zlib' 'geoip-database') backup=('etc/geoip/GeoIP.conf') options=('!libtool' '!emptydirs') -source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz) -sha256sums=('d1dbd4f27bcf0e760329f0f9c67a5fc81b4c56efbe0666159934c2bcd38caea2') +source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz + pkgconfig.patch) +sha256sums=('ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731' + '64a6a608beabdc553019237d7da808dc234f760c21040036b2f589eaebba5d10') + +prepare() { + cd GeoIP-$pkgver + patch -Np1 -i ../pkgconfig.patch +} build() { - cd "$srcdir/GeoIP-$pkgver" + cd GeoIP-$pkgver autoreconf -vi ./configure \ @@ -27,12 +34,12 @@ build() { } check() { - cd "$srcdir/GeoIP-$pkgver" + cd GeoIP-$pkgver make check } package() { - cd "$srcdir/GeoIP-$pkgver" + cd GeoIP-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/geoip/pkgconfig.patch b/extra/geoip/pkgconfig.patch new file mode 100644 index 000000000..ed3fee9e7 --- /dev/null +++ b/extra/geoip/pkgconfig.patch @@ -0,0 +1,8 @@ +--- GeoIP-1.5.1/geoip.pc.in.orig 2013-03-23 02:26:09.000000000 +0000 ++++ GeoIP-1.5.1/geoip.pc.in 2013-09-23 12:04:07.441555775 +0000 +@@ -1,4 +1,5 @@ + prefix=@prefix@ ++exec_prefix=${prefix} + libdir=@libdir@ + includedir=@includedir@ + datadir=@datarootdir@ diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD index ee2bd74bc..33ff85744 100644 --- a/extra/ghex/PKGBUILD +++ b/extra/ghex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185359 2013-05-13 17:41:00Z heftig $ +# $Id: PKGBUILD 196153 2013-10-07 12:05:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=ghex -pkgver=3.8.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="A simple binary editor for the Gnome desktop" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('gtk3' 'hicolor-icon-theme') makedepends=('intltool' 'itstool' 'docbook-xsl') options=('!libtool' '!emptydirs') install=ghex.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('84ce220eed0dc9f640a87db68533e65a4dc06a1a6136b244270d8b2a1ae93534') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('9c31383b1d32c8942ca0327c615336f5777309674c4fc090e8cceb1576c63255') build() { cd $pkgname-$pkgver diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD index 8777035fc..db3f85d07 100644 --- a/extra/gjs/PKGBUILD +++ b/extra/gjs/PKGBUILD @@ -1,33 +1,28 @@ -# $Id: PKGBUILD 191784 2013-07-30 19:02:00Z jgc $ +# $Id: PKGBUILD 196045 2013-10-07 11:51:04Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gjs -pkgver=1.36.1 -pkgrel=2 +pkgver=1.38.1 +pkgrel=1 pkgdesc="Javascript Bindings for GNOME" arch=('i686' 'x86_64') url="http://live.gnome.org/Gjs" license=(GPL) depends=(cairo gobject-introspection 'js>=17.0.0') options=('!libtool') -source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2 - gettext-typo.patch) -sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27' - 'c2c3ca377d9d69511d5784599ea33d754aed776d5ceefaf384b8e303b54fd038') +source=(http://ftp.gnome.org/pub/gnome/sources/gjs/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../gettext-typo.patch -} build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --libexecdir=/usr/lib make } check() { cd $pkgname-$pkgver - make check + # Needs a display + make -k check || : } package() { diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index de2fb9eb6..6c1181d90 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183366 2013-04-21 22:09:24Z heftig $ +# $Id: PKGBUILD 196046 2013-10-07 11:51:05Z jgc $ # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=glade -pkgver=3.15.0 +pkgver=3.16.0 pkgrel=1 pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64 mips64el) @@ -15,7 +15,7 @@ options=('!libtool') url="http://glade.gnome.org/" install=glade.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4e64f33d8a5ad614279dc7024ed70fe57805526e82244001a33351b1cf13f95c') +sha256sums=('b80773a294d3af07739d9d53bae12e11cf0bbf420bbc8931cc5e20b2647e3626') build() { cd "$pkgname-$pkgver" diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index cb2cf05c4..1fbe885bc 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185433 2013-05-14 09:44:30Z heftig $ +# $Id: PKGBUILD 196048 2013-10-07 11:51:08Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.36.2 +pkgver=2.38.0 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') @@ -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=('2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9') +sha256sums=('a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d') build() { cd $pkgname-$pkgver diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index dce85cc57..7cb0e8679 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184169 2013-05-03 03:02:45Z heftig $ +# $Id: PKGBUILD 196047 2013-10-07 11:51:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.36.2 +pkgver=2.37.93 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf') +sha256sums=('a01031d7d05ba9df5915fc84867303c93341a8dd13a2aa5af78a71dfb46842f6') build() { cd "$pkgname-$pkgver" diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index a3277a101..08153cdac 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192269 2013-08-09 12:51:47Z heftig $ +# $Id: PKGBUILD 194406 2013-09-16 08:05:52Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.17 +pkgver=2.6.18 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib') [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('22d49e57c404a0a68d1ac3426c8f23a39185a4b2d569de03bece07db03d1202f') +sha256sums=('783fc14190459c568a31c2fd6dba1e8afa0431e2931aa46f652aa486ad881ae6') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 74c73d9ff..321dc1c6e 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 188094 2013-06-09 11:29:56Z heftig $ +# $Id: PKGBUILD 196050 2013-10-07 11:51:10Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.8.1 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeBluetooth" license=(GPL LGPL) -depends=(gtk3 hicolor-icon-theme libnotify bluez4) +depends=(gtk3 hicolor-icon-theme libnotify bluez) makedepends=(intltool gobject-introspection itstool docbook-xsl) 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=('8095fcfa014931773e9d231dff76c6924f43abfbe4c5525cf07fd2d7f8e1f770' +sha256sums=('7ee4ad464abfed59f04d1a471eb25cfb95fc34eeefbe4c47580dbb50df2ab712' '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53') build() { diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD index b785093ac..c9212569b 100644 --- a/extra/gnome-calculator/PKGBUILD +++ b/extra/gnome-calculator/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185451 2013-05-14 10:16:40Z heftig $ +# $Id: PKGBUILD 196051 2013-10-07 11:51:12Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-calculator -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ conflicts=('gcalctool') options=(!emptydirs) url="http://www.gnome.org" install=gnome-calculator.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('13d67b6dfa2501b883add8adf5470c5fea5eb1f1fa87f84e8ceda069418f1e81') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('d76ad21286ea20308bb6302833ce8e5846df7e8ccd2b7ac0a48619f0d6cf2cb1') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index d48773b42..6ccd272a2 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193436 2013-08-20 07:10:18Z jgc $ +# $Id: PKGBUILD 196052 2013-10-07 11:51:13Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.8.4 +pkgver=3.10.0 pkgrel=1 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64' 'mips64el') @@ -17,8 +17,8 @@ options=('!emptydirs' '!libtool') install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('4b7f20d875585e1d36bc0e4dda8c66ccd2e014f8ef829c4a6ec87275c4418d6a') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9bbc0b2819a3f6d9d688ea0089a0d5f826d368100af7a0f3e8361e0d6f9e77ee') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD index d31c53891..ae4eba65a 100644 --- a/extra/gnome-clocks/PKGBUILD +++ b/extra/gnome-clocks/PKGBUILD @@ -1,39 +1,24 @@ -# $Id: PKGBUILD 185477 2013-05-14 11:11:41Z heftig $ +# $Id: PKGBUILD 196053 2013-10-07 11:51:15Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-clocks -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Clocks applications for GNOME" arch=(i686 x86_64 mips64el) url="https://www.gnome.org/" license=(GPL) depends=(gtk3 libcanberra libgweather gnome-desktop libnotify - hicolor-icon-theme gnome-themes-standard) -makedepends=(intltool vala gobject-introspection) + hicolor-icon-theme gnome-themes-standard geoclue2 geocode-glib) +makedepends=(intltool vala gobject-introspection itstool) options=(!libtool) groups=(gnome-extra) install=gnome-clocks.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz - gnome-clocks.css::http://git.gnome.org/browse/gnome-clocks/plain/data/css/gnome-clocks.css?id=${pkgver} - button-border-go.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go.svg?id=${pkgver} - button-border-go-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go-active.svg?id=${pkgver} - button-border-stop.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop.svg?id=${pkgver} - button-border-stop-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop-active.svg?id=${pkgver}) -sha256sums=('afe8405e41d8d2ac570642c2d73a43a2a45f8c6e521640d0a266e0fe0a55410f' - '3ce4afb848ea2a2728c53a9f4bfca5f12d9719e3935d1acd2d90056cb1c464fc' - 'a44df652c8034ccbbc87a62f92ab6efbf6dfabead44e3316b4b9e85d851a6b24' - 'e12ac57acaa43b25a36d9fd9b6dbe906980a5e8429840d98c604bf28515749e0' - 'e71fa928cf5812fb1cc4ea62e55176be14716b670c37c7899368b0f8f020876c' - '34916c190c259788bcb561f0b4cce73b47a39e50326e1a53a2a91c2725e9d8a3') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f6418272e8d3a9ad41fba49712917130b09db925b6caecd78653541aedee3e2d') build() { cd $pkgname-$pkgver - - # Fix files missing from tarball - mkdir data/css - cp ../*.{css,svg} data/css - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index e25240abd..24becb277 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185315 2013-05-13 09:38:38Z heftig $ +# $Id: PKGBUILD 196054 2013-10-07 11:51:16Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6b9999d8213c8cab7abb7c9b1833d1d599866546180d11603fdee5430f93bae1') +sha256sums=('95e27198fb6c7d45918d1a47a440ed5af0c65bbe2ec53fb8898d4c00c7dc8f00') build(){ cd $pkgname-$pkgver diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index bbf6134ed..86453a889 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190124 2013-07-15 23:14:12Z heftig $ +# $Id: PKGBUILD 196056 2013-10-07 11:51:18Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-contacts -pkgver=3.8.3 +pkgver=3.10 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64 mips64el) @@ -12,8 +12,8 @@ groups=(gnome) depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese') makedepends=('intltool' 'vala' 'gobject-introspection') install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('48e179aa40ffdee4218565a22da31d8794fb47f21beda60a2e8b80483a2f80a3') +source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz) +sha256sums=('1cb57d81455ee44e50745452bfefdf74f9ad4e393661199005c665284cda20cf') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 44787ffbb..aadb184d4 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 192485 2013-08-12 21:17:35Z heftig $ +# $Id: PKGBUILD 196057 2013-10-07 11:51:20Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.4.1 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) arch=('i686' 'x86_64' 'mips64el') @@ -22,21 +22,14 @@ groups=(gnome) url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - no-deprecated-upower.diff) -sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55' - '4182fa082b071c840bc0a6e981dad3c070602cae473229227e81bdaa2b5f8c23') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../no-deprecated-upower.diff -} +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('ea74d87e255308f130039a9afab548ae0416e2c96e69adfc7c794d1775f1474f') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname --disable-static + --libexecdir=/usr/lib/$pkgname --disable-static --disable-silent-rules #https://bugzilla.gnome.org/show_bug.cgi?id=656229 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index c8e03a16b..c234c2309 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188610 2013-06-16 23:56:02Z heftig $ +# $Id: PKGBUILD 196058 2013-10-07 11:51:23Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.8.3 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ makedepends=(intltool gobject-introspection itstool) url="http://www.gnome.org" groups=(gnome) options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('3e87352ba30e9965199fb360c852e22ccb7c7e5c02965b6d63fb175f3737b75c') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD index 883e619c6..2f76b3c90 100644 --- a/extra/gnome-dictionary/PKGBUILD +++ b/extra/gnome-dictionary/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 191351 2013-07-23 18:22:13Z jgc $ +# $Id: PKGBUILD 196059 2013-10-07 11:51:24Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> + pkgname=gnome-dictionary -pkgver=3.8.0 +pkgver=3.9.0 pkgrel=1 pkgdesc="Look up words in dictionary sources" arch=(i686 x86_64 mips64el) @@ -13,16 +14,16 @@ install=$pkgname.install options=(!libtool) groups=('gnome') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('faebbca7684aeef5ff4111305bc8e0c1790b0551445df404b68f3d7cf2c50421') +sha256sums=('4881096d5952ca39e19e4ecfb37f16634d5f5c1e41ee1e74fa8550f59f5bd455') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index 17afe93d1..3a63e5f2c 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,30 +1,21 @@ -# $Id: PKGBUILD 186559 2013-05-29 01:23:46Z heftig $ +# $Id: PKGBUILD 196060 2013-10-07 11:51:25Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Silvio Knizek (killermoehre) pkgname=gnome-disk-utility -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Disk Management Utility for GNOME" arch=('i686' 'x86_64' 'mips64el') license=(GPL) url="http://www.gnome.org" groups=(gnome) -depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hicolor-icon-theme desktop-file-utils) +depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify desktop-file-utils gnome-icon-theme-symbolic) makedepends=(intltool docbook-xsl gnome-settings-daemon) options=('!libtool' '!emptydirs') install=gnome-disk-utility.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - typefixes.patch) -sha256sums=('6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3' - '0a1f2f80f1c741119639b3b2b8cf32d6261b126baa85189309d6473e171894d2') - -prepare() { - cd $pkgname-$pkgver - - # Gets rid of warnings and compilation errors on i686 - patch -Np1 -i ../typefixes.patch -} +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('34e23a62e711ec543670550f9312a5ad6610ce807d57345146b6af989788b8aa') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index d9194daa2..91595e4bf 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 193767 2013-08-30 14:34:45Z heftig $ +# $Id: PKGBUILD 196061 2013-10-07 11:51:26Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=3.8.4 -pkgrel=1 +pkgver=3.10.0 +pkgrel=2 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" license=(GPL) groups=(gnome-extra) depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata - tracker libzapojit webkitgtk3) + tracker libzapojit webkitgtk gnome-online-miners) makedepends=(intltool gobject-introspection itstool docbook-xsl) optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('daebb07b2e0767677e5fbdc4f5b5ca6672089565f955e3a42505e3f784e02ed9') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('93365aee61c2777d1fe70fa8f55f6e3ce9e7e130dd2869d74eb85787825be9f6') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD index 167a933e3..ac73bae46 100644 --- a/extra/gnome-font-viewer/PKGBUILD +++ b/extra/gnome-font-viewer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183381 2013-04-21 22:09:54Z heftig $ +# $Id: PKGBUILD 196062 2013-10-07 11:51:28Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-font-viewer -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="GNOME font viewer and thumbnailer" arch=(i686 x86_64 mips64el) @@ -13,8 +13,8 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" groups=('gnome') install=gnome-font-viewer.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d34f17f026b7c41d8de5c255070c79c938ce69030b3429444e7fb8f2275ff819') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 12ec0d911..349f6e48a 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 184243 2013-05-04 20:20:08Z heftig $ +#$Id: PKGBUILD 196066 2013-10-07 11:51:34Z jgc $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64 'mips64el') @@ -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=('f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868') +sha256sums=('1cc87260fa17b8e39071fdae0418cd9ca5f913d50e23d8f456f3e2c6d6d22213') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD index d0619306e..e9ce6d8c5 100644 --- a/extra/gnome-klotski/PKGBUILD +++ b/extra/gnome-klotski/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185360 2013-05-13 17:42:01Z heftig $ +# $Id: PKGBUILD 196067 2013-10-07 11:51:35Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-klotski -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Slide blocks to solve the puzzle" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=gnome-klotski.install url="https://live.gnome.org/Klotski" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('757a531542272b8d2191facb034e5033ba3aa340d5303b8d939f78045d91910c') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('ce29d136bc1c141dc92b0dc67d597f2b0eddefcee7d3de10d54ef80327c6f5d3') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD index c6b6fa33b..e01bc365b 100644 --- a/extra/gnome-mahjongg/PKGBUILD +++ b/extra/gnome-mahjongg/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-mahjongg -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Disassemble a pile of tiles by removing matching pairs" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=gnome-mahjongg.install url="https://live.gnome.org/Mahjongg" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('6995bfae4c145f07764a7825865804232e620bbdf57c0625d0a21d06561ad496') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('bcbb67d0784e3e8c1772d83f559506c40b5ff2d38c8212db004b0d913f04e963') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD index e819f3217..977af2778 100644 --- a/extra/gnome-menus/PKGBUILD +++ b/extra/gnome-menus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183388 2013-04-21 22:10:05Z heftig $ +# $Id: PKGBUILD 196156 2013-10-07 12:17:09Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-menus -pkgver=3.8.0 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64' 'mips64el') depends=('glib2') @@ -11,14 +11,11 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') license=('GPL' 'LGPL') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - calculator.patch) -sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f' - 'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('713a58ff9e3264be70dd233c2935cfce4ee76223c17044ecbf6cb53eba875192') build() { cd "$pkgname-$pkgver" - patch -Np1 -i ../calculator.patch ./configure \ --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static diff --git a/extra/gnome-menus/calculator.patch b/extra/gnome-menus/calculator.patch deleted file mode 100644 index 9ff1ed261..000000000 --- a/extra/gnome-menus/calculator.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001 -From: Kalev Lember <kalevlember@gmail.com> -Date: Thu, 28 Mar 2013 21:54:34 +0000 -Subject: Adapt for gnome-calculator -> gcalctool desktop file rename - -gnome-calculator.desktop was renamed back to gcalctool.desktop, at the -very last minute before the 3.8.0 release. - -https://bugzilla.gnome.org/show_bug.cgi?id=696816 ---- -diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu -index 84d13ed..503f9ca 100644 ---- a/layout/gnome-applications.menu -+++ b/layout/gnome-applications.menu -@@ -38,7 +38,6 @@ - <Not><Filename>file-roller.desktop</Filename></Not> - <Not><Filename>gnome-file-roller.desktop</Filename></Not> - <Not><Filename>deja-dup-preferences.desktop</Filename></Not> -- <Not><Filename>gnome-calculator.desktop</Filename></Not> - <Not><Filename>gcalctool.desktop</Filename></Not> - <Not><Filename>gucharmap.desktop</Filename></Not> - <Not><Filename>gnome-gucharmap.desktop</Filename></Not> -@@ -251,7 +250,7 @@ - <Directory>X-GNOME-Utilities.directory</Directory> - <Include> - <Filename>file-roller.desktop</Filename> -- <Filename>gnome-calculator.desktop</Filename> -+ <Filename>gcalctool.desktop</Filename> - <Filename>gnome-font-viewer.desktop</Filename> - <Filename>gucharmap.desktop</Filename> - <Filename>seahorse.desktop</Filename> -@@ -287,7 +286,6 @@ - <Not><Filename>gnome-eog.desktop</Filename></Not> - <Not><Filename>gnome-file-roller.desktop</Filename></Not> - <Not><Filename>gnome-gucharmap.desktop</Filename></Not> -- <Not><Filename>gcalctool.desktop</Filename></Not> - </And> - </Include> - </Menu> <!-- End Other --> --- -cgit v0.9.1 diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD index 0ed91876b..97e5041df 100644 --- a/extra/gnome-mines/PKGBUILD +++ b/extra/gnome-mines/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193434 2013-08-20 07:06:23Z jgc $ +# $Id: PKGBUILD 196069 2013-10-07 11:51:38Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-mines -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Clear hidden mines from a minefield" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=gnome-mines.install url="https://live.gnome.org/Mines" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('e70f13056183f8d9a8aa3721516545364e10e9fde0a4b703de7cba1fe3af531d') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b0f71a58e864848f5dd1067488b7d1d31b7c8f30d6d9904411b755d29074826c') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-music/PKGBUILD b/extra/gnome-music/PKGBUILD new file mode 100644 index 000000000..409f8ebb0 --- /dev/null +++ b/extra/gnome-music/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-music +pkgver=3.10.0 +pkgrel=2 +pkgdesc="Music player and management application" +arch=(i686 x86_64) +license=('GPL') +url="https://wiki.gnome.org/Apps/Music" +depends=(grilo grilo-plugins tracker python gobject-introspection libdmapsharing python-dbus dbus-glib) +makedepends=(intltool) +options=('!libtool') +groups=('gnome-extra') +install=gnome-music.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('16ecbb93f4e69a7e85b86fc73413744073d69edaa09e71e135afe2c8de5b1d69') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make -j1 DESTDIR="${pkgdir}" install +} diff --git a/extra/gnome-music/gnome-music.install b/extra/gnome-music/gnome-music.install new file mode 100644 index 000000000..2b172e29c --- /dev/null +++ b/extra/gnome-music/gnome-music.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-nibbles/PKGBUILD b/extra/gnome-nibbles/PKGBUILD index 528bbeb45..4a521a010 100644 --- a/extra/gnome-nibbles/PKGBUILD +++ b/extra/gnome-nibbles/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-nibbles -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Guide a worm around a maze" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=gnome-nibbles.install url="https://live.gnome.org/Nibbles" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('bc1e4f687f1e794ef15a4162492154970300ac682378e59f9471327e5fd0d606') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6bf774cbd86e617c49f1740e79d52a7d26bf23656a673db1efb20bcc893e614a') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index 5b9c7e624..a110b1e75 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,37 +1,23 @@ -# $Id: PKGBUILD 193766 2013-08-30 14:31:41Z heftig $ +# $Id: PKGBUILD 196071 2013-10-07 11:51:42Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.8.3 +pkgver=3.10.0 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" license=('GPL') -depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret') +depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret' 'telepathy-glib') makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz - drop-google-password-interface-1.patch - drop-google-password-interface-2.patch - drop-google-password-interface-3.patch) -sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b' - '33435c10aa1ba3fbb6fd633dc098cd1da50629f1d602521ca83be5379f2ebe48' - 'c837f9be4e5e072a06ea44076e6b9a1519c66c95b16d7a55b1dba105fded317f' - '18dfad8ed978af1068fd057bbe323006c349ac4ea77c742aa06f1011dc92326e') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb') -prepare() { - cd $pkgname-$pkgver - # Backport from Ubuntu - patch -Np1 -i ../drop-google-password-interface-1.patch - patch -Np1 -i ../drop-google-password-interface-2.patch - patch -Np1 -i ../drop-google-password-interface-3.patch -} - build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname make } diff --git a/extra/gnome-online-accounts/drop-google-password-interface-1.patch b/extra/gnome-online-accounts/drop-google-password-interface-1.patch deleted file mode 100644 index 1bd5c8c0f..000000000 --- a/extra/gnome-online-accounts/drop-google-password-interface-1.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9182fb378614abb2ff0245fe71a753f22eaaa906 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Tue, 11 Jun 2013 14:58:21 +0000 -Subject: google: Bump credentials generation - -Access to the following were turned on in the Google APIs Console: - - Calendar API - - Google Calendar CalDAV API - - Google Contacts CardDAV API - -Of these, only the last two are new. We were already requesting the -scope for Calendar API, but looks like the APIs Console is the way -to go now. Interestingly the APIs Console does not list all the other -services that we are interested in, or it is does but is not obvious -to me. - -In any case we need access to their new CalDAV API which works with -OAuth2 because that would let us work with 2-factor authenticated -accounts again. - -See: https://bugzilla.gnome.org/show_bug.cgi?id=686804 - https://bugzilla.gnome.org/show_bug.cgi?id=688364 ---- -(limited to 'src/goabackend/goagoogleprovider.c') - -diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c -index 8271711..79f5f73 100644 ---- a/src/goabackend/goagoogleprovider.c -+++ b/src/goabackend/goagoogleprovider.c -@@ -148,7 +148,7 @@ get_scope (GoaOAuth2Provider *provider) - static guint - get_credentials_generation (GoaProvider *provider) - { -- return 3; -+ return 4; - } - - static const gchar * - diff --git a/extra/gnome-online-accounts/drop-google-password-interface-2.patch b/extra/gnome-online-accounts/drop-google-password-interface-2.patch deleted file mode 100644 index 9aa1ce28e..000000000 --- a/extra/gnome-online-accounts/drop-google-password-interface-2.patch +++ /dev/null @@ -1,74 +0,0 @@ -From a0fd4cd595bd0fe6eb4015ea9050170319b16546 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Wed, 19 Jun 2013 15:04:38 +0000 -Subject: google: Export CalDAV and CardDAV endpoints - -According to: -https://developers.google.com/google-apps/calendar/caldav/v2/guide/ -https://developers.google.com/google-apps/carddav/ - -See: https://bugzilla.gnome.org/show_bug.cgi?id=686804 - https://bugzilla.gnome.org/show_bug.cgi?id=688364 ---- -(limited to 'src/goabackend/goagoogleprovider.c') - -diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c -index 79f5f73..740c08e 100644 ---- a/src/goabackend/goagoogleprovider.c -+++ b/src/goabackend/goagoogleprovider.c -@@ -385,6 +385,7 @@ build_object (GoaProvider *provider, - gboolean contacts_enabled; - gboolean chat_enabled; - gboolean documents_enabled; -+ const gchar *email_address; - - account = NULL; - mail = NULL; -@@ -419,6 +420,7 @@ build_object (GoaProvider *provider, - } - - account = goa_object_get_account (GOA_OBJECT (object)); -+ email_address = goa_account_get_identity (account); - - /* Email */ - mail = goa_object_get_mail (GOA_OBJECT (object)); -@@ -427,8 +429,6 @@ build_object (GoaProvider *provider, - { - if (mail == NULL) - { -- const gchar *email_address; -- email_address = goa_account_get_identity (account); - mail = goa_mail_skeleton_new (); - g_object_set (G_OBJECT (mail), - "email-address", email_address, -@@ -457,8 +457,19 @@ build_object (GoaProvider *provider, - { - if (calendar == NULL) - { -+ gchar *uri_caldav; -+ -+ uri_caldav = g_strconcat ("https://apidata.googleusercontent.com/caldav/v2/", -+ email_address, -+ "/user", -+ NULL); -+ - calendar = goa_calendar_skeleton_new (); -+ g_object_set (G_OBJECT (calendar), -+ "uri", uri_caldav, -+ NULL); - goa_object_skeleton_set_calendar (object, calendar); -+ g_free (uri_caldav); - } - } - else -@@ -475,6 +486,9 @@ build_object (GoaProvider *provider, - if (contacts == NULL) - { - contacts = goa_contacts_skeleton_new (); -+ g_object_set (G_OBJECT (contacts), -+ "uri", "https://www.googleapis.com/.well-known/carddav", -+ NULL); - goa_object_skeleton_set_contacts (object, contacts); - } - } - diff --git a/extra/gnome-online-accounts/drop-google-password-interface-3.patch b/extra/gnome-online-accounts/drop-google-password-interface-3.patch deleted file mode 100644 index 487132b32..000000000 --- a/extra/gnome-online-accounts/drop-google-password-interface-3.patch +++ /dev/null @@ -1,296 +0,0 @@ -From 365a5a92909fce8dcdd851b5a2b9caf34e0da926 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@gnome.org> -Date: Fri, 28 Jun 2013 12:22:07 +0000 -Subject: google: Don't offer a PasswordBased interface - -This was a temporary measure back when Google did not support OAuth2 -for CalDAV. Now that they do, we can drop this. - -In any case, the workaround didn't work with accounts using 2-factor -authentication. This will make those people happy. - -This reverts 89c335479c1bb8409af8296c99ffea602a28b71f - -See: https://bugzilla.gnome.org/show_bug.cgi?id=686804 - https://bugzilla.gnome.org/show_bug.cgi?id=688364 ---- -(limited to 'src/goabackend/goagoogleprovider.c') - -Index: gnome-online-accounts-3.8.2/src/goabackend/goagoogleprovider.c -=================================================================== ---- gnome-online-accounts-3.8.2.orig/src/goabackend/goagoogleprovider.c 2013-07-10 13:29:35.381448621 -0400 -+++ gnome-online-accounts-3.8.2/src/goabackend/goagoogleprovider.c 2013-07-10 13:29:35.377448621 -0400 -@@ -32,8 +32,6 @@ - #include "goaprovider-priv.h" - #include "goaoauth2provider.h" - #include "goagoogleprovider.h" --#include "goahttpclient.h" --#include "goautils.h" - - /** - * GoaGoogleProvider: -@@ -71,8 +69,6 @@ - - /* ---------------------------------------------------------------------------------------------------- */ - --static const gchar *CALDAV_ENDPOINT = "https://www.google.com/calendar/dav/%s/events/"; -- - static const gchar * - get_provider_type (GoaProvider *_provider) - { -@@ -310,48 +306,8 @@ - return ret; - } - --static gboolean --is_password_node (GoaOAuth2Provider *provider, WebKitDOMHTMLInputElement *element) --{ -- gboolean ret; -- gchar *element_type; -- gchar *id; -- gchar *name; -- -- element_type = NULL; -- id = NULL; -- name = NULL; -- -- ret = FALSE; -- -- g_object_get (element, "type", &element_type, NULL); -- if (g_strcmp0 (element_type, "password") != 0) -- goto out; -- -- id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (element)); -- if (g_strcmp0 (id, "Passwd") != 0) -- goto out; -- -- name = webkit_dom_html_input_element_get_name (element); -- if (g_strcmp0 (name, "Passwd") != 0) -- goto out; -- -- ret = TRUE; -- -- out: -- g_free (element_type); -- g_free (id); -- g_free (name); -- return ret; --} -- - /* ---------------------------------------------------------------------------------------------------- */ - --static gboolean on_handle_get_password (GoaPasswordBased *interface, -- GDBusMethodInvocation *invocation, -- const gchar *id, -- gpointer user_data); -- - static gboolean - build_object (GoaProvider *provider, - GoaObjectSkeleton *object, -@@ -367,7 +323,6 @@ - GoaContacts *contacts; - GoaChat *chat; - GoaDocuments *documents; -- GoaPasswordBased *password_based; - gboolean ret; - gboolean mail_enabled; - gboolean calendar_enabled; -@@ -394,20 +349,6 @@ - error)) - goto out; - -- password_based = goa_object_get_password_based (GOA_OBJECT (object)); -- if (password_based == NULL) -- { -- password_based = goa_password_based_skeleton_new (); -- /* Ensure D-Bus method invocations run in their own thread */ -- g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (password_based), -- G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD); -- goa_object_skeleton_set_password_based (object, password_based); -- g_signal_connect (password_based, -- "handle-get-password", -- G_CALLBACK (on_handle_get_password), -- NULL); -- } -- - account = goa_object_get_account (GOA_OBJECT (object)); - email_address = goa_account_get_identity (account); - -@@ -567,103 +508,6 @@ - /* ---------------------------------------------------------------------------------------------------- */ - - static gboolean --ensure_credentials_sync (GoaProvider *provider, -- GoaObject *object, -- gint *out_expires_in, -- GCancellable *cancellable, -- GError **error) --{ -- GVariant *credentials; -- GoaAccount *account; -- GoaHttpClient *http_client; -- gboolean ret; -- const gchar *username; -- gchar *password; -- gchar *uri_caldav; -- -- credentials = NULL; -- http_client = NULL; -- password = NULL; -- uri_caldav = NULL; -- -- ret = FALSE; -- -- /* Chain up */ -- if (!GOA_PROVIDER_CLASS (goa_google_provider_parent_class)->ensure_credentials_sync (provider, -- object, -- out_expires_in, -- cancellable, -- error)) -- goto out; -- -- credentials = goa_utils_lookup_credentials_sync (provider, -- object, -- cancellable, -- error); -- if (credentials == NULL) -- { -- if (error != NULL) -- { -- (*error)->domain = GOA_ERROR; -- (*error)->code = GOA_ERROR_NOT_AUTHORIZED; -- } -- goto out; -- } -- -- account = goa_object_peek_account (object); -- username = goa_account_get_presentation_identity (account); -- uri_caldav = g_strdup_printf (CALDAV_ENDPOINT, username); -- -- if (!g_variant_lookup (credentials, "password", "s", &password)) -- { -- if (error != NULL) -- { -- *error = g_error_new (GOA_ERROR, -- GOA_ERROR_NOT_AUTHORIZED, -- _("Did not find password with identity `%s' in credentials"), -- username); -- } -- goto out; -- } -- -- http_client = goa_http_client_new (); -- ret = goa_http_client_check_sync (http_client, -- uri_caldav, -- username, -- password, -- FALSE, -- cancellable, -- error); -- if (!ret) -- { -- if (error != NULL) -- { -- g_prefix_error (error, -- /* Translators: the first %s is the username -- * (eg., debarshi.ray@gmail.com or rishi), and the -- * (%s, %d) is the error domain and code. -- */ -- _("Invalid password with username `%s' (%s, %d): "), -- username, -- g_quark_to_string ((*error)->domain), -- (*error)->code); -- (*error)->domain = GOA_ERROR; -- (*error)->code = GOA_ERROR_NOT_AUTHORIZED; -- } -- goto out; -- } -- -- out: -- g_clear_object (&http_client); -- g_free (password); -- g_free (uri_caldav); -- g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref); -- return ret; --} -- --/* ---------------------------------------------------------------------------------------------------- */ -- --static gboolean - get_use_mobile_browser (GoaOAuth2Provider *provider) - { - return TRUE; -@@ -744,7 +588,6 @@ - provider_class->get_provider_name = get_provider_name; - provider_class->get_provider_group = get_provider_group; - provider_class->build_object = build_object; -- provider_class->ensure_credentials_sync = ensure_credentials_sync; - provider_class->show_account = show_account; - provider_class->get_credentials_generation = get_credentials_generation; - -@@ -758,65 +601,7 @@ - oauth2_class->get_scope = get_scope; - oauth2_class->is_deny_node = is_deny_node; - oauth2_class->is_identity_node = is_identity_node; -- oauth2_class->is_password_node = is_password_node; - oauth2_class->get_token_uri = get_token_uri; - oauth2_class->get_use_mobile_browser = get_use_mobile_browser; - oauth2_class->add_account_key_values = add_account_key_values; - } -- --/* ---------------------------------------------------------------------------------------------------- */ -- --/* runs in a thread dedicated to handling @invocation */ --static gboolean --on_handle_get_password (GoaPasswordBased *interface, -- GDBusMethodInvocation *invocation, -- const gchar *id, /* unused */ -- gpointer user_data) --{ -- GoaObject *object; -- GoaAccount *account; -- GoaProvider *provider; -- GError *error; -- GVariant *credentials; -- const gchar *identity; -- gchar *password; -- -- /* TODO: maybe log what app is requesting access */ -- -- password = NULL; -- credentials = NULL; -- -- object = GOA_OBJECT (g_dbus_interface_get_object (G_DBUS_INTERFACE (interface))); -- account = goa_object_peek_account (object); -- identity = goa_account_get_identity (account); -- provider = goa_provider_get_for_provider_type (goa_account_get_provider_type (account)); -- -- error = NULL; -- credentials = goa_utils_lookup_credentials_sync (provider, -- object, -- NULL, /* GCancellable* */ -- &error); -- if (credentials == NULL) -- { -- g_dbus_method_invocation_take_error (invocation, error); -- goto out; -- } -- -- if (!g_variant_lookup (credentials, "password", "s", &password)) -- { -- g_dbus_method_invocation_return_error (invocation, -- GOA_ERROR, -- GOA_ERROR_FAILED, /* TODO: more specific */ -- _("Did not find password with identity `%s' in credentials"), -- identity); -- goto out; -- } -- -- goa_password_based_complete_get_password (interface, invocation, password); -- -- out: -- g_free (password); -- g_clear_pointer (&credentials, (GDestroyNotify) g_variant_unref); -- g_object_unref (provider); -- return TRUE; /* invocation was handled */ --} diff --git a/extra/gnome-online-miners/PKGBUILD b/extra/gnome-online-miners/PKGBUILD new file mode 100644 index 000000000..9211d6522 --- /dev/null +++ b/extra/gnome-online-miners/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 196006 2013-10-07 11:48:35Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-online-miners +pkgver=3.10.0 +pkgrel=1 +pkgdesc="Tracker miners for online accounts" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=(GPL) +depends=(libgdata gnome-online-accounts grilo libzapojit tracker) +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('a4ca0d78452f8d19ed4eedeb5164b93aead9566cb9e2cf9826d49e3bad02a504') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD index bd7d4686f..84a78e9bd 100644 --- a/extra/gnome-photos/PKGBUILD +++ b/extra/gnome-photos/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 185464 2013-05-14 10:33:14Z heftig $ +# $Id: PKGBUILD 196072 2013-10-07 11:51:43Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-photos -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Access, organize, and share your photos on GNOME" arch=(i686 x86_64 mips64el) url="https://www.gnome.org/" license=(GPL) -depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme) +depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme grilo) makedepends=(intltool) options=(!libtool) groups=(gnome-extra) install=gnome-photos.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c6e777cdc6a4b0ee24b4dbd1b971fe239198926a3057c27c08eeda0a53ba6d58') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('65cb5790ec5a282c8bc8b4902858a0b4b3cec2fe39709a580dc073a23a5fc210') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index 60e423d81..fbe60f96a 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185314 2013-05-13 09:37:19Z heftig $ +# $Id: PKGBUILD 196073 2013-10-07 11:51:45Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="System power information and statistics" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ makedepends=(intltool) options=(!emptydirs) install=gnome-power-manager.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('6f4fee6cce2c0a58ae52a2cae1b8f0acca0a08d8154fe056ca3bfb5e537c5b61') +sha256sums=('e193f7b6c813acab2d57eefec783d267b26d114c2185ffe41334000c65f76841') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD index 939de0ee0..336997ea5 100644 --- a/extra/gnome-python-desktop/PKGBUILD +++ b/extra/gnome-python-desktop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169097 2012-10-17 22:51:16Z allan $ +# $Id: PKGBUILD 196074 2013-10-07 11:51:47Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,7 +6,7 @@ pkgbase=gnome-python-desktop pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck') pkgver=2.32.0 -pkgrel=12 +pkgrel=13 arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') options=('!libtool') diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD index cc7133763..42091c6fd 100644 --- a/extra/gnome-robots/PKGBUILD +++ b/extra/gnome-robots/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183394 2013-04-21 22:10:16Z heftig $ +# $Id: PKGBUILD 196075 2013-10-07 11:51:48Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-robots -pkgver=3.8.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="Avoid the robots and make them crash into each other" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=gnome-robots.install url="https://live.gnome.org/Robots" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('6faeeef5ab9b5002c7ca3cf60ea67e7a66064654ae28c68c233b2ee40459a704') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('600a5b81bf0b47cbe942cd3902a947df2e9e2a2a72f4b2a7248e60b1621b987e') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD index f06a06c73..19f80f98a 100644 --- a/extra/gnome-screenshot/PKGBUILD +++ b/extra/gnome-screenshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 189890 2013-07-10 16:54:26Z heftig $ +# $Id: PKGBUILD 196076 2013-10-07 11:51:50Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-screenshot -pkgver=3.8.3 +pkgver=3.10.0 pkgrel=1 pkgdesc="Take pictures of your screen" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool') groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('05d638d53da334aa8818e83ed3f91a17334c48c707d728426414033607582971') +sha256sums=('709de9b9c66f569f4984152376479ca2c4aa47c9e5aa5e7385e417c9fe3465d9') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 6b165d2b3..3248f0e22 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 191810 2013-07-30 23:24:20Z jgc $ +# $Id: PKGBUILD 196077 2013-10-07 11:51:51Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.8.4 -pkgrel=1 +pkgver=3.10.0 +pkgrel=2 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') license=(GPL LGPL) -depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop +depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop hicolor-icon-theme json-glib libgl libsm libxtst upower) makedepends=(intltool mesa gtk-doc xtrans) options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" groups=(gnome) -source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz timeout.patch) -sha256sums=('e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1' +sha256sums=('38d90c5d5a33ec8a3002f1e77e201c1554eeb8bbba8923d94fab81b3a8e0696e' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') -build() { +prepare() { cd $pkgname-$pkgver # Increase timeout, for slow machines patch -Np1 -i ../timeout.patch - +} +build() { + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ - --disable-schemas-compile --enable-systemd + --disable-schemas-compile --enable-systemd --disable-gconf make } diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 644ef9539..c1ca47019 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,28 +1,21 @@ -# $Id: PKGBUILD 192484 2013-08-12 21:17:34Z heftig $ +# $Id: PKGBUILD 196078 2013-10-07 11:51:53Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.8.4 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' - 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg') + 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2') makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl') options=('!emptydirs' '!libtool') install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - 0001-power-Use-logind-to-discover-critical-action-availab.patch) -sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc' - '9825d3486665d87d4fc54355a6d318d68f5d3caeb286bdd659147920a85c56d9') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../0001-power-Use-logind-to-discover-critical-action-availab.patch -} +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 2653f103e..4bc5142a2 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191829 2013-07-31 09:01:10Z jgc $ +# $Id: PKGBUILD 196079 2013-10-07 11:51:54Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.4 +pkgver=3.10.0.1 pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) @@ -11,16 +11,16 @@ url="http://live.gnome.org/GnomeShell" license=(GPL2) depends=(accountsservice caribou evolution-data-server gcr gjs gnome-bluetooth gnome-menus gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas - libcanberra-pulse libcroco libgdm libsecret mutter network-manager-applet + libcanberra-pulse libcroco libgdm libsecret mutter mutter-wayland network-manager-applet telepathy-logger telepathy-mission-control unzip) makedepends=(intltool gtk-doc gnome-control-center) optdepends=('gnome-control-center: System settings') options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz nm-libexecdir.patch) -sha256sums=('547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47' +sha256sums=('eb98ca6274e82e446834221b2dfd9af0e12e5ebce651319435524fd6cd5f4ec9' 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') prepare() { @@ -28,6 +28,9 @@ prepare() { # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch + + # Build against mutter-wayland 3.9.92 + sed -ri 's/^(MUTTER_MIN_VERSION)=.*/\1=3.9.92/' configure } build() { diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD index 6be59b5f6..ef076f48f 100644 --- a/extra/gnome-system-log/PKGBUILD +++ b/extra/gnome-system-log/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183402 2013-04-21 22:10:29Z heftig $ +# $Id: PKGBUILD 196082 2013-10-07 11:51:58Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-system-log -pkgver=3.8.1 +pkgver=3.9.90 pkgrel=1 pkgdesc="View your system logs" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'docbook-xsl') groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2393d00e059212b5a1135589d11412c0639fe9e60958ccff1bac238139dd4967') +sha256sums=('9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index e8417be42..2e2069b64 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 185539 2013-05-14 20:47:47Z heftig $ +# $Id: PKGBUILD 196083 2013-10-07 11:52:01Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.8.2.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'systemd') +depends=('libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'systemd') makedepends=('itstool' 'docbook-xsl' 'intltool') options=(!emptydirs) url="http://www.gnome.org" groups=('gnome') install=gnome-system-monitor.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('df4d2c4dbb4f3408b621140732efb3e38853658addd6aae73613027856f6bb44') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a6bd4e925b21db08e687f7b71a0363777e1dbdda143142232c1c78ecf14821ac') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index 918b23442..2f2567a30 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 189824 2013-07-08 16:53:47Z heftig $ +# $Id: PKGBUILD 196084 2013-10-07 11:52:02Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.8.4 -pkgrel=1 +pkgver=3.10.0 +pkgrel=2 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') license=(GPL) -depends=(vte3 gsettings-desktop-schemas libsm dconf) -makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils python2 gconf) +depends=(vte3 gsettings-desktop-schemas dconf) +makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils gconf libnautilus-extension) optdepends=('gconf: settings migration when upgrading from older version') options=('!emptydirs' '!libtool') url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('2f7cc56d39e083eee0419c7d7e9ae43e00dca8bc55bdd31271fb193ec7f63796') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/$pkgname --disable-static + --libexecdir=/usr/lib/$pkgname --disable-static --with-nautilus-extension make } diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD index 28ccd7c14..87ee40378 100644 --- a/extra/gnome-tetravex/PKGBUILD +++ b/extra/gnome-tetravex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183405 2013-04-21 22:10:35Z heftig $ +# $Id: PKGBUILD 196085 2013-10-07 11:52:04Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-tetravex -pkgver=3.8.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="Complete the puzzle by matching numbered tiles" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=gnome-tetravex.install url="https://live.gnome.org/Tetravex" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('30491c1e9005d8f17f6f9655c3a9b553bcaa16e353719ce1de60630a71150ea3') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('12ae001325038cdf4bc5bd1bb8efe1807e560c55d63aa9dd21ac997d2f51dadf') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index a6c6bac23..f0def4d2a 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191600 2013-07-26 23:41:43Z heftig $ +# $Id: PKGBUILD 196086 2013-10-07 11:52:07Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.8.3 +pkgver=3.10.0 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ replaces=(gnome-themes) conflicts=(gnome-themes) options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('977eb8ac94bad6e7095c272a583e614fba1c1897410e9f25ae028618d269b1e4') +sha256sums=('812c6cfc534fced921dc327b436e70020d8979529284bb59d72d6f37af1f4b38') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index 756dcd97a..bb4ce9a23 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 190104 2013-07-15 17:59:27Z heftig $ +# $Id: PKGBUILD 196089 2013-10-07 11:52:13Z jgc $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.8.3 +pkgver=3.10.0 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64' 'mips64el') url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" license=('GPL') -depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'dbus-glib') -makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl') +depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') +makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl' 'dbus-glib') options=('!emptydirs' '!libtool') groups=('gnome') install=gnome-user-share.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e6f36eaf66fafad2f6ec959ba2cb143b60ff00eb9a94a65b181411b366f2a26f') +sha256sums=('2dbeacab637eede5429521d7796abe40c3e9d3d842b9e5aa45453c54db08f500') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-user-share \ - --localstatedir=/var + --localstatedir=/var --enable-bluetooth make } diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD index 227ee4050..1ed6c2a93 100644 --- a/extra/gnome-weather/PKGBUILD +++ b/extra/gnome-weather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185432 2013-05-14 09:43:24Z heftig $ +# $Id: PKGBUILD 196090 2013-10-07 11:52:14Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-weather -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Access current weather conditions and forecasts" arch=(i686 x86_64 mips64el) @@ -13,8 +13,8 @@ makedepends=(intltool gobject-introspection) options=(!libtool) groups=(gnome-extra) install=gnome-weather.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('cf61afac1435dbdb87e8d9e4d86bca29cf1ff2c64cefc8db696cd27dad15adf4') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('66d764a19ceebc512711a3b71c849e04021311fa12d617148bbf22c083121b69') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-weather/gnome-weather.install b/extra/gnome-weather/gnome-weather.install index c25dff2d3..f7e8c46ac 100644 --- a/extra/gnome-weather/gnome-weather.install +++ b/extra/gnome-weather/gnome-weather.install @@ -1,11 +1,12 @@ post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD index 65e9d14cc..495f939f7 100644 --- a/extra/gobject-introspection/PKGBUILD +++ b/extra/gobject-introspection/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183411 2013-04-21 22:10:45Z heftig $ +# $Id: PKGBUILD 196091 2013-10-07 11:52:16Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gobject-introspection -pkgver=1.36.0 +pkgver=1.38.0 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://live.gnome.org/GObjectIntrospection" @@ -12,7 +12,7 @@ depends=('glib2' 'python2' 'python2-mako') makedepends=('cairo') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz) -sha256sums=('e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383') +sha256sums=('3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73') build() { cd "$pkgname-$pkgver" diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 6fb18992c..877de6c6d 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186367 2013-05-26 06:28:56Z giovanni $ +# $Id: PKGBUILD 194596 2013-09-19 09:44:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted -pkgver=0.16.1 -pkgrel=5 +pkgver=0.16.2 +pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') url="http://gparted.sourceforge.net" @@ -28,7 +28,7 @@ install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy' 'gparted_polkit') -md5sums=('3f399bff031b5ce14d11a8c346f4b89c' +md5sums=('4e722a48a90c6d65d212711d45c9c0d1' '122ed3120c846376bead22b25f6a3b19' '0b68a4e2bc6bc15440730ebe2d7bf9f6') diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index c70f07471..5125687bf 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193739 2013-08-29 23:46:03Z bisson $ +# $Id: PKGBUILD 194533 2013-09-17 17:04:18Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.32.0 -pkgrel=1 +pkgrel=2 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('CPL') @@ -53,10 +53,7 @@ build() { export PYTHON=python2 export LUA=lua5.1 - # install the graph and cgraph api alongside - sed 's/@WITH_CGRAPH_FALSE@//g' -i lib/graph/Makefile.in - - ./configure --prefix=/usr + ./configure --prefix=/usr --with-cgraph=no make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky make } @@ -64,7 +61,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - # everything has been built against cgraph, but use graph as default api - sed '/#define WITH_CGRAPH 1/d' -i "${pkgdir}"/usr/include/graphviz/types.h } diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 178d3ea4e..dd7e4c5ce 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193611 2013-08-26 07:04:31Z heftig $ +# $Id: PKGBUILD 196093 2013-10-07 11:52:19Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins pkgver=0.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index d63d1bde2..f92e34e65 100644 --- a/extra/grilo/PKGBUILD +++ b/extra/grilo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185628 2013-05-16 14:06:42Z heftig $ +# $Id: PKGBUILD 196092 2013-10-07 11:52:18Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.2.6 +pkgver=0.2.7 pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" @@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala' 'intltool') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('601421279753b26bee0b2b5952689f87f7c7836879f7326151a8f8139fa67036') +sha256sums=('4a854ee6f9a220f05e696813949be94780c12a7fb281253f10a545f30ed596d8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index c9fefb682..0ed3e6019 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191762 2013-07-30 09:58:58Z heftig $ +# $Id: PKGBUILD 194952 2013-09-24 10:27:03Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gssdp -pkgver=0.14.4 +pkgver=0.14.5 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk3 gtk-doc vala) optdepends=('gtk3: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ed93fa1555a7032fa1e2b24eeef17d20a2275ee8b1682f28ac48640d6f2112ac') +sha256sums=('e847940a852c968d18c7ca044783e9b938c84c3b5f53978a29b636bf95c91af1') build() { cd $pkgname-$pkgver diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index 3d87d9da8..5ab50f608 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193754 2013-08-30 08:16:24Z heftig $ +# $Id: PKGBUILD 196095 2013-10-07 11:52:22Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-libav -pkgver=1.0.10 +pkgver=1.2.0 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64' 'mips64el') @@ -13,14 +13,19 @@ makedepends=('yasm') options=(!libtool !emptydirs) provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('b6d059d1a39967ef7e1d345009fe003afe14ab55006d68e895a64f4a36968c5e') +sha256sums=('48721eb318ffffdd134edea754d0b65d76b08c8209a8d2c8a42bca1f799f9099') build() { cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \ - --with-package-name="GStreamer libav Plugin (Archlinux)" \ + --with-package-name="GStreamer libav Plugin (Arch Linux)" \ --with-package-origin="http://www.archlinux.org/" + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD index f7b3dfcb5..f8d375037 100644 --- a/extra/gst-plugins-base/PKGBUILD +++ b/extra/gst-plugins-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193750 2013-08-30 08:12:17Z heftig $ +# $Id: PKGBUILD 196097 2013-10-07 11:52:25Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.10 +pkgver=1.2.0 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,19 +12,21 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('9754e83b2a3ff61266112915bfc84c895c4d145519ad9a3381edceb216bc97e8') +sha256sums=('8656e20bf4b675e5696fb4af193793351926d428ca02826c5667a6384729a45d') build() { cd $pkgbase-$pkgver - sed -i -e '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ - --with-package-name="GStreamer Base Plugins (Archlinux)" \ + --with-package-name="GStreamer Base Plugins (Arch Linux)" \ --with-package-origin="http://www.archlinux.org/" + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make + sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile } diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index 057b077a6..e718e77b8 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,36 +1,38 @@ -# $Id: PKGBUILD 193751 2013-08-30 08:13:17Z heftig $ +# $Id: PKGBUILD 196098 2013-10-07 11:52:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good -pkgver=1.0.10 +pkgver=1.2.0 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo') -makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') +makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('c60342d6080ac6f794c5c2427dfbdee9140a2f67b82e7e945e286a2d416428ae') +sha256sums=('2256a6b2744ea18d8810642cf9061a2f12f4b7eba87d3fbc98004262b4f0fdfa') build() { cd $pkgname-$pkgver - sed -i -e '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ - --with-package-name="GStreamer Good Plugins (Archlinux)" \ + --with-package-name="GStreamer Good Plugins (Arch Linux)" \ --with-package-origin="http://www.archlinux.org/" + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } -check() { - cd $pkgname-$pkgver - make check -} +# Disable for now: fails with soup timeout +#check() { +# cd $pkgname-$pkgver +# make check +#} package() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index f7709298a..30d834adb 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193753 2013-08-30 08:14:48Z heftig $ +# $Id: PKGBUILD 196099 2013-10-07 11:52:28Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.0.10 +pkgver=1.2.0 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -11,18 +11,19 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('bed3510e09f036e7609e8d291535c395d25109b1180324b16859f475eac3a3c0') +sha256sums=('e4760af4b12bf97ba0a8001cfe733d9d52160a0ad81f6c6f0d0d3a9e798626de') build() { cd $pkgname-$pkgver - sed -i '/AC_PATH_XTRA/d' configure.ac - aclocal -I m4 -I common/m4 - autoconf - automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ - --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ + --with-package-name="GStreamer Ugly Plugins (Arch Linux)" \ --with-package-origin="http://www.archlinux.org/" + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index b210533f2..e8da8a074 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193749 2013-08-30 08:11:09Z heftig $ +# $Id: PKGBUILD 196100 2013-10-07 11:52:29Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer -pkgver=1.0.10 +pkgver=1.2.0 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('8e0aa9f41370586171a2616326fbc508bc4b61ffc4d55b2a8c4c3459d0cc1130') +sha256sums=('94af5274299f845adf41cc504e0209b269acab7721293f49850fea27b4099463') build() { cd "${srcdir}/gstreamer-${pkgver}" @@ -21,6 +21,10 @@ build() { --with-package-name="GStreamer (Parabola)" \ --with-package-origin="https://parabolagnulinux.org/" \ --enable-gtk-doc --disable-static + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index c812675b9..57200067e 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 189883 2013-07-10 14:53:39Z heftig $ +# $Id: PKGBUILD 196101 2013-10-07 11:52:31Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb pkgver=3.2.3 -pkgrel=1 +pkgrel=4 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64 mips64el) license=(GPL) url="http://live.gnome.org/gthumb" depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret - libsoup webkitgtk3 json-glib) + libsoup webkitgtk json-glib) makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl) optdepends=('libopenraw: read RAW files' 'exiv2: metadata support' @@ -21,8 +21,15 @@ optdepends=('libopenraw: read RAW files' 'liboauth: web albums') options=('!libtool' '!emptydirs') install=gthumb.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gtk310.patch) +sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a' + 'dcbfad2eb7047c1ea4210dc0af1054dc2ec863331f12fcd59c05021570d38bfe') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../gtk310.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/gthumb/gtk310.patch b/extra/gthumb/gtk310.patch new file mode 100644 index 000000000..86f0e99e8 --- /dev/null +++ b/extra/gthumb/gtk310.patch @@ -0,0 +1,29 @@ +From 36ba0c99c1780ca9f23f220ced70a76b97ce8260 Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega <paobac@src.gnome.org> +Date: Fri, 27 Sep 2013 15:40:33 +0000 +Subject: Fixed broken window layout with gtk+ 3.10 + +[bug #708800] +--- +diff --git a/gthumb/gth-window.c b/gthumb/gth-window.c +index a2960bc..a2cce99 100644 +--- a/gthumb/gth-window.c ++++ b/gthumb/gth-window.c +@@ -324,6 +324,7 @@ gth_window_attach (GthWindow *window, + return; + } + ++ gtk_widget_set_vexpand (child, FALSE); + gtk_grid_attach (GTK_GRID (window->priv->grid), + child, + 0, position, +@@ -362,6 +363,7 @@ gth_window_attach_content (GthWindow *window, + + _gtk_container_remove_children (GTK_CONTAINER (window->priv->contents[page]), NULL, NULL); + gtk_widget_set_hexpand (child, TRUE); ++ gtk_widget_set_vexpand (child, TRUE); + gtk_container_add (GTK_CONTAINER (window->priv->contents[page]), child); + } + +-- +cgit v0.9.2 diff --git a/extra/gtk-sharp-2/PKGBUILD b/extra/gtk-sharp-2/PKGBUILD index 7adbebf17..d1827c87c 100644 --- a/extra/gtk-sharp-2/PKGBUILD +++ b/extra/gtk-sharp-2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142257 2011-11-07 12:49:15Z jgc $ +# $Id: PKGBUILD 196159 2013-10-07 12:30:37Z jgc $ # Maintainer: tobias <tobias@archlinux.org> pkgname=gtk-sharp-2 -pkgver=2.12.11 +pkgver=2.12.22 pkgrel=1 pkgdesc="gtk2 bindings for C#" arch=(i686 x86_64) @@ -12,20 +12,19 @@ depends=('mono' 'libglade' 'gtk2') makedepends=('pkgconfig' 'monodoc') conflicts=('gtk#') options=('!libtool' '!makeflags') -source=(http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${pkgver}.tar.bz2) -md5sums=('c278da6a472c6c13b698af012f543c64') +source=(https://github.com/mono/gtk-sharp/archive/${pkgver}.tar.gz) +md5sums=('0cdaef41857e29c23942a148c83122ac') build() { - # get rid of that .wapi errors; thanks to brice export MONO_SHARED_DIR="${srcdir}/wapi" mkdir -p "${MONO_SHARED_DIR}" - cd "${srcdir}/gtk-sharp-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static + cd gtk-sharp-${pkgver} + ./bootstrap-2.12 --prefix=/usr --sysconfdir=/etc --disable-static make } package() { - cd "${srcdir}/gtk-sharp-${pkgver}" + cd gtk-sharp-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 1be842221..bc6004fc4 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189695 2013-07-04 21:16:18Z heftig $ +# $Id: PKGBUILD 196102 2013-10-07 11:52:32Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.20 -pkgrel=1 +pkgver=2.24.21 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,13 +12,20 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - xid-collision-debug.patch) -sha256sums=('cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + gtkrc xid-collision-debug.patch gtkrc-fix.patch) +sha256sums=('302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3' + 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' + '4038c0f1ef4cc052e469858abe32eaa8afc8d4f540760f18ad132986e396604d') -build() { +prepare() { cd gtk+-$pkgver patch -Np1 -i ../xid-collision-debug.patch + patch -Np1 -i ../gtkrc-fix.patch +} + +build() { + cd gtk+-$pkgver CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -34,23 +41,27 @@ build() { package_gtk2() { 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) + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' + 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + optdepends=('gnome-themes-standard: Default widget theme' + 'gnome-icon-theme: Default icon theme') replaces=('gtk2-docs') cd gtk+-$pkgver - make DESTDIR="$pkgdir" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert - echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc" + + install -Dm644 "$srcdir/gtkrc" "$pkgdir/usr/share/gtk-2.0/gtkrc" + #split this out to use with gtk3 too rm $pkgdir/usr/bin/gtk-update-icon-cache } package_gtk-update-icon-cache() { pkgdesc="The GTK+ update icon cache tool" - depends=('gdk-pixbuf2>=2.24.1-3') + depends=('gdk-pixbuf2>=2.24.1-3' 'hicolor-icon-theme') + install=gtk-update-icon-cache.install cd gtk+-$pkgver/gtk - - install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache + install -D -m755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache" } diff --git a/extra/gtk2/gtk-update-icon-cache.install b/extra/gtk2/gtk-update-icon-cache.install new file mode 100644 index 000000000..1afcc72a7 --- /dev/null +++ b/extra/gtk2/gtk-update-icon-cache.install @@ -0,0 +1,3 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} diff --git a/extra/gtk2/gtkrc b/extra/gtk2/gtkrc new file mode 100644 index 000000000..d2282ac36 --- /dev/null +++ b/extra/gtk2/gtkrc @@ -0,0 +1,3 @@ +gtk-icon-theme-name = "gnome" +gtk-theme-name = "Adwaita" +gtk-font-name = "Cantarell 11" diff --git a/extra/gtk2/gtkrc-fix.patch b/extra/gtk2/gtkrc-fix.patch new file mode 100644 index 000000000..09e350e98 --- /dev/null +++ b/extra/gtk2/gtkrc-fix.patch @@ -0,0 +1,22 @@ +From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Mon, 30 Sep 2013 16:50:34 +0000 +Subject: Actually look in /usr/share/gtk-2.0 for default rc files + +I managed to forget the 'share' component of the path. +--- +diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c +index b1f68e2..50b2563 100644 +--- a/gtk/gtkrc.c ++++ b/gtk/gtkrc.c +@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void) + const gchar * const *config_dirs; + const gchar *config_dir; + +- str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL); ++ str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL); + gtk_rc_add_default_file (str); + g_free (str); + +-- +cgit v0.9.2 diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 202045ba9..bf8444926 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 193768 2013-08-30 14:56:03Z heftig $ +# $Id: PKGBUILD 196103 2013-10-07 11:52:34Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.8.4 -pkgrel=1 +pkgver=3.10.0 +pkgrel=2 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64 mips64el) url="http://www.gtk.org/" install=gtk3.install -depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon) +depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi + libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon) makedepends=(gobject-introspection) +optdepends=('gnome-themes-standard: Default widget theme' + 'gnome-icon-theme: Default icon theme') options=('!libtool') -backup=(etc/gtk-3.0/settings.ini) license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('b08360167702299e91b3435a4ce6bae41dd26d2794e898632f12dd091b0692e2' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') +sha256sums=('6559feb360cd935d341cd7a0b69a72f8f4346ed6ee9b7c4040c02b73b75c53fe' + '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119') build() { cd "gtk+-$pkgver" @@ -39,6 +41,5 @@ build() { package() { cd "gtk+-$pkgver" make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" + install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini" } diff --git a/extra/gtk3/settings.ini b/extra/gtk3/settings.ini index 039000d38..6a0643bfa 100644 --- a/extra/gtk3/settings.ini +++ b/extra/gtk3/settings.ini @@ -1,2 +1,4 @@ [Settings] -gtk-fallback-icon-theme = gnome +gtk-icon-theme-name = gnome +gtk-theme-name = Adwaita +gtk-font-name = Cantarell 11 diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index f48187816..6b7105aa7 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184170 2013-05-03 03:05:29Z heftig $ +# $Id: PKGBUILD 196104 2013-10-07 11:52:35Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.8.1 +pkgver=3.9.16 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b') +sha256sums=('3a07679530c0c58ddaf3b2bdc7859d8f7050a1057ae99e2d3857004e36e7c879') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index 55015e684..30ca82b3e 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189822 2013-07-08 16:51:30Z heftig $ +# $Id: PKGBUILD 196105 2013-10-07 11:52:37Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('1c2a01f1e04e3c8c9f09ff22f34f73f17b0e4e7ff0d83b2996c209bd02a6501b') +sha256sums=('5208afa6edccf4d70a30ed1da399cefcceb8a8b879305d491be4be3e3d6ef776') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 303096b43..167566090 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191287 2013-07-23 10:08:45Z jgc $ +# $Id: PKGBUILD 196106 2013-10-07 11:52:39Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.8.2 -pkgrel=2 +pkgver=3.9.99 +pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,8 +14,8 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl options=('!libtool' '!emptydirs') groups=('gnome') install=gucharmap.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('08272386155bc1a7d6a2d1a0ee8d2e5ea08a9512c40dbd76b3b4c3f105604901') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7a9425f07f8e4053e0382e627d65ca428674f8c63f2c721877ae8c62c25ccb00') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 266815bf9..4820db26a 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193457 2013-08-20 18:30:50Z heftig $ +# $Id: PKGBUILD 194953 2013-09-24 10:27:41Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gupnp -pkgver=0.20.5 +pkgver=0.20.6 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala) optdepends=('python2: gupnp-binding-tool') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('be54bd5f3bfea36d689a5ce70679e51ec3ea3c94677e70ffc7c7ef160bffb260') +sha256sums=('1b4ed7de9fdf2da2a5610a0101271f1661706e6481737d7a2ac0f318b5b2dbaa') build() { cd $pkgname-$pkgver diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 6c06f1cb0..531903e0c 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,24 +1,17 @@ -# $Id: PKGBUILD 189282 2013-07-02 08:23:35Z jgc $ +# $Id: PKGBUILD 196107 2013-10-07 11:52:42Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs -pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp') -pkgver=1.16.3 -pkgrel=2 +pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-goa' 'gvfs-mtp') +pkgver=1.18.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') +makedepends=('avahi' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - imobiledevice-1.1.5.patch) -sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49' - '3faf3027ef40c5cea3f01cb9d37e4cf848ed2ecfe6cde3b7bf86087da4a2d2e1') - -prepare() { - cd $pkgbase-$pkgver - patch -Np1 -i ../imobiledevice-1.1.5.patch -} +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('a24ce342a3369f7ec34f19deadc5da46bf51070d39d8733f0848d9ba4bb55da7') build() { cd "$pkgbase-$pkgver" @@ -26,17 +19,18 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ - --with-bash-completion-dir=/usr/share/bash-completion/completions + --with-bash-completion-dir=/usr/share/bash-completion/completions \ + --disable-obexftp make } package_gvfs() { pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup>=2.24.0' 'udisks2' 'libsecret' 'libbluray') + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup' 'udisks2' 'libsecret' 'libbluray') + replaces=('gvfs-obexftp') optdepends=('gvfs-afc: AFC (mobile devices) support' 'gvfs-smb: SMB/CIFS (Windows client) support' 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' - 'gvfs-obexftp: ObexFTP (bluetooth) support' 'gvfs-afp: Apple Filing Protocol (AFP) support' 'gvfs-mtp: MTP device support' 'gvfs-goa: gnome-online-accounts support' @@ -52,8 +46,8 @@ package_gvfs() { make DESTDIR="$pkgdir" install cd "$pkgdir" - rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp} - rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}.mount + rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,mtp} + rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,mtp}.mount rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml rm usr/share/GConf/gsettings/gvfs-smb.convert } @@ -102,16 +96,6 @@ package_gvfs-gphoto2() { make DESTDIR="$pkgdir" install } -package_gvfs-obexftp() { - pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=$pkgver" 'dbus-glib' 'bluez4' 'obex-data-server') - install=gvfs-module.install - - cd "$pkgbase-$pkgver/daemon" - install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp" - install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount" -} - package_gvfs-afp() { pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" depends=("gvfs=$pkgver") diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD index a75082082..e3a1312c3 100644 --- a/extra/iagno/PKGBUILD +++ b/extra/iagno/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193512 2013-08-21 14:33:53Z jgc $ +# $Id: PKGBUILD 196108 2013-10-07 11:52:44Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=iagno -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Dominate the board in a classic version of Reversi" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=iagno.install url="https://live.gnome.org/Iagno" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('c4687214262c9fd838e40ea27fac8ed7c23db32690ef2d0f569373a8eaeb1de7') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('23a041b54fd4df817c8d507e87d19495ddfc8a23bfe812a3e7d500f32f8a49d0') build() { cd $pkgname-$pkgver diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 7c9eade1d..7e0926f22 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 191614 2013-07-27 18:39:53Z eric $ -# Contributor: Rainy <rainylau(at)gmail(dot)com> -# Contributor: Lee.MaRS <leemars at gmail dot com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 194672 2013-09-21 02:17:57Z eric $ +# Maintainer: pkgname=ibus -pkgver=1.5.3 +pkgver=1.5.4 pkgrel=1 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ibus.googlecode.com" license=('LGPL') depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-gobject' 'libnotify') -makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool') +makedepends=('gobject-introspection' 'vala' 'dconf' 'gconf' 'iso-codes' 'intltool') options=('!libtool') install=ibus.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('51ba186cbf5e1e194ba0cd22b81f00d9d40ec521') +sha1sums=('2ce4b4d728a4685fd77360d0097b0e568f920c7b') build() { cd ${pkgname}-${pkgver} diff --git a/extra/ibus/ibus.install b/extra/ibus/ibus.install index 0b5ce0196..4bc5288cf 100644 --- a/extra/ibus/ibus.install +++ b/extra/ibus/ibus.install @@ -1,17 +1,16 @@ post_install() { - gtk-query-immodules-2.0 --update-cache - gtk-query-immodules-3.0 --update-cache + gtk-query-immodules-2.0 --update-cache + gtk-query-immodules-3.0 --update-cache - gtk-update-icon-cache -fq -t usr/share/icons/hicolor + gtk-update-icon-cache -fq -t /usr/share/icons/hicolor - glib-compile-schemas /usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas } -post_remove() { - gtk-query-immodules-2.0 --update-cache - gtk-query-immodules-3.0 --update-cache - - gtk-update-icon-cache -fq -t usr/share/icons/hicolor +post_upgrade() { + post_install +} - glib-compile-schemas /usr/share/glib-2.0/schemas +post_remove() { + post_install } diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index a28b75be1..bd5110482 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,17 +3,15 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.4 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz - openjdk-hotfix.patch) -sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb' - '1bf96e430d0694c53539e4e7a8c979c65a2ab5274d8ae38067b0fd7dd5bfba03') +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) +sha256sums=('09100207396a09784e04f2ad40d65212930c1d43839e7fa63b9dffaf8567d77b') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -24,7 +22,6 @@ build() { LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz cd "${srcdir}"/icedtea-web* - patch -Np1 < $srcdir/openjdk-hotfix.patch ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ --with-jdk-home=${_jvmdir} \ diff --git a/extra/icedtea-web-java7/openjdk-hotfix.patch b/extra/icedtea-web-java7/openjdk-hotfix.patch deleted file mode 100644 index 29a0a309b..000000000 --- a/extra/icedtea-web-java7/openjdk-hotfix.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java ---- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200 -+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200 -@@ -35,6 +35,8 @@ - import net.sourceforge.jnlp.cache.UpdatePolicy; - import net.sourceforge.jnlp.security.viewer.CertificateViewer; - import net.sourceforge.jnlp.services.ServiceUtil; -+import sun.awt.AppContext; -+import sun.awt.SunToolkit; - - /** - * This is the main entry point for the JNLP client. The main -@@ -113,6 +115,9 @@ - * Launch the JNLP file specified by the command-line arguments. - */ - public static void main(String[] argsIn) { -+ if (AppContext.getAppContext() == null) { -+ SunToolkit.createNewAppContext(); -+ } - args = argsIn; - - if (null != getOption("-viewer")) { -diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java ---- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200 -+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200 -@@ -234,7 +234,7 @@ - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (Exception e) { -- // ignore it -+ e.printStackTrace(); - } - - doMainAppContextHacks(); -diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java ---- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200 -+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200 -@@ -72,6 +72,8 @@ - import java.net.ProxySelector; - import java.util.Enumeration; - import java.util.Properties; -+import sun.awt.AppContext; -+import sun.awt.SunToolkit; - - import net.sourceforge.jnlp.config.DeploymentConfiguration; - import net.sourceforge.jnlp.runtime.JNLPRuntime; -@@ -94,6 +96,9 @@ - */ - public static void main(String args[]) - throws IOException { -+ if (AppContext.getAppContext() == null) { -+ SunToolkit.createNewAppContext(); -+ } - if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { - System.err.println("Invalid pipe names provided. Refusing to proceed."); - System.exit(1); diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 7c0b56469..a1f73f8bb 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193716 2013-08-29 06:22:01Z eric $ +# $Id: PKGBUILD 195181 2013-09-26 23:04:47Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.6.9 +pkgver=6.8.7.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -11,10 +11,11 @@ license=('custom') makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' 'libwebp') [ "$CARCH" != "mips64el" ] && makedepends+=('opencl-headers' 'libcl') -#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ -source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ +#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \ +source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \ perlmagick.rpath.patch) -sha1sums=('c1e8b19f6afc19751c7c777688f0005d36917f9e' +sha1sums=('e7f5bc0cb03a16fb1b7c278c63bf4ac81e1642b2' + 'SKIP' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { @@ -38,7 +39,7 @@ build() { check() { cd ImageMagick-${pkgver%.*}-${pkgver##*.} - # make check +# make check } package_imagemagick() { diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD index 6afb2705c..637dd82ba 100644 --- a/extra/indent/PKGBUILD +++ b/extra/indent/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 152433 2012-03-06 21:03:48Z stephane $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: aurelien <aurelien@archlinux.org> -# Contributor: Herb Rose (hrose56@yahoo.com) +# $Id: PKGBUILD 195284 2013-09-29 20:55:02Z eric $ +# Maintainer: pkgname=indent pkgver=2.2.11 -pkgrel=2.1 +pkgrel=3 pkgdesc="C language source code formatting program" arch=('i686' 'x86_64' 'mips64el') -url="http://indent.isidore-it.eu/beautify.html" +url="https://www.gnu.org/software/indent/" +license=('GPL3') depends=('glibc') makedepends=('texi2html') -license=('GPL3') install=indent.install -source=(http://indent.isidore-it.eu/${pkgname}-${pkgver}.tar.gz +source=(http://ftp.de.debian.org/debian/pool/main/i/indent/${pkgname}_${pkgver}.orig.tar.gz indent-2.2.11-segfault.patch indent-2.2.11-LC_ALL.patch indent-2.2.11-decimal_format.patch) @@ -22,23 +20,26 @@ sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7' '91b210b666de59ca44524288a4c1ebd213570daa' '2b7d5a725fe307ce81565f920a0a66b319b50c91') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i ../indent-2.2.11-segfault.patch +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../indent-2.2.11-segfault.patch - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692 - patch -Np1 -i ../indent-2.2.11-LC_ALL.patch + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692 + patch -Np1 -i ../indent-2.2.11-LC_ALL.patch - # https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html - patch -Np1 -i ../indent-2.2.11-decimal_format.patch + # https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html + patch -Np1 -i ../indent-2.2.11-decimal_format.patch - sed -i 's/-number/-number-sections/' doc/Makefile.in - ./configure --prefix=/usr - make + sed -i 's/-number/-number-sections/' doc/Makefile.in +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install } diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index b15ccc6ee..37428a872 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 192476 2013-08-12 20:25:43Z eric $ +# $Id: PKGBUILD 194677 2013-09-21 18:35:38Z eric $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=10 +pkgrel=11 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD index 985d1b765..eb1b9748f 100644 --- a/extra/intel-tbb/PKGBUILD +++ b/extra/intel-tbb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188979 2013-06-27 17:08:09Z eric $ +# $Id: PKGBUILD 194497 2013-09-16 20:37:59Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=4.1_20130613 +pkgver=4.2_20130725 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/' license=('GPL') depends=('gcc-libs') source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('b1322bd10c5b05a79f61edb236adc0513b4a1532') +sha1sums=('f354bd9b67295f65c43531b751e34f483ed8a024') build() { cd tbb${pkgver/\./}oss diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 1743f2af7..5bd2ea109 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 193198 2013-08-18 17:27:18Z andyrtr $ +# $Id: PKGBUILD 194862 2013-09-23 20:40:54Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> -pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' - 'openjdk7-src' 'openjdk7-doc') +pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 _updatever=u40 -_icedtea_ver=2.4.1 +_icedtea_ver=2.4.2 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am -_CORBA_CHANGESET=23ae4e0e0cce -_JAXP_CHANGESET=5be6b670d08b -_JAXWS_CHANGESET=c0e48fdfb695 -_JDK_CHANGESET=65d95818d79e -_LANGTOOLS_CHANGESET=91c95fd8eea8 -_OPENJDK_CHANGESET=ae86c6974e8e +_CORBA_CHANGESET=5ea58899ae9f +_JAXP_CHANGESET=135f46e0e653 +_JAXWS_CHANGESET=a2ff16e5361f +_JDK_CHANGESET=4bf5ac86e0e4 +_LANGTOOLS_CHANGESET=06ea051f7ffe +_OPENJDK_CHANGESET=6125b83238df -_HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map +_HOTSPOT_CHANGESET=b732355257e3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -48,14 +47,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a' - 'f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a' - '618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395' - 'df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34' - '972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037' - '97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432' - '6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561' - 'f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42' +sha256sums=('3dab1edc5c0391bd67cfac60cbfb5c91aee6ea9726043252d9f216dfafd236b6' + 'bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b' + '41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8' + '3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde' + 'ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda' + '8cc46ef5d73a3a6445b411637fee5cc5f086e400d42b36f1f42eba4caee2a11a' + 'd2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735' + '4a4a04fa2c49d0a688400f6c9f129f47ba5cd931874c33254a047a1f36e6ac36' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' @@ -72,7 +71,7 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz" "${_HOTSPOT_CHANGESET}.tar.gz") _jvmdir=/usr/lib/jvm/java-7-openjdk - + [ "$CARCH" = "x86_64" ] && _JARCH=amd64 [ "$CARCH" = "i686" ] && _JARCH=i386 @@ -159,8 +158,8 @@ package_jre7-openjdk-headless() { rm -f lib/fontconfig.*.properties.src rm -f lib/fontconfig.properties.src - install -d -m755 ${pkgdir}/${_jvmdir}/jre/ - cp -a bin lib ${pkgdir}/${_jvmdir}/jre + install -d -m755 ${pkgdir}${_jvmdir}/jre + cp -a bin lib ${pkgdir}${_jvmdir}/jre # Install man pages pushd ../../j2re-image/man @@ -172,22 +171,22 @@ package_jre7-openjdk-headless() { # more files that belong to the desktop package mkdir ${srcdir}/tmp-desktop-jre for file in \ - "/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \ - "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \ - "/usr/share/man/ja/man1/policytool.1" \ - "/usr/share/man/man1/policytool.1"; do + "${_jvmdir}/jre/bin/policytool" \ + "${_jvmdir}/jre/lib/${_JARCH}/libjsoundalsa.so" \ + "${_jvmdir}/jre/lib/${_JARCH}/libpulse-java.so" \ + "${_jvmdir}/jre/lib/${_JARCH}/libsplashscreen.so" \ + "${_jvmdir}/jre/lib/${_JARCH}/xawt/libmawt.so" \ + "/usr/share/man/ja/man1/policytool.1" \ + "/usr/share/man/man1/policytool.1"; do dirname=`dirname $file` install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true # mv file from fakeinstall to pkgdir mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file done - rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt + rmdir ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/xawt # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/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 @@ -195,8 +194,8 @@ package_jre7-openjdk-headless() { 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" + 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/ @@ -213,31 +212,36 @@ package_jre7-openjdk-headless() { # Put some more files under backup control install -m755 -d ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/ # install dummy links to make them found by JAVA - cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/ + cd ${pkgdir}${_jvmdir}/jre/lib/ for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do ln -vsf /etc/java-7-openjdk/`basename $file` . done # some more install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security} - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/images/cursors/cursors.properties \ + ${pkgdir}/etc/java-7-openjdk/cursors/ + pushd ${pkgdir}${_jvmdir}/jre/lib/images/cursors/ ln -vsf /etc/java-7-openjdk/cursors/cursors.properties . popd - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password - mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management + mv ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password.template \ + ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password + mv ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl.template \ + ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl + install -m644 ${pkgdir}${_jvmdir}/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} \ + ${pkgdir}/etc/java-7-openjdk/management/ + pushd ${pkgdir}${_jvmdir}/jre/lib/management ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} . popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security + install -m644 ${pkgdir}${_jvmdir}/jre/lib/security/{java.policy,java.security,nss.cfg} \ + ${pkgdir}/etc/java-7-openjdk/security/ + pushd ${pkgdir}${_jvmdir}/jre/lib/security ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} . popd - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ - install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ - pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/ + install -m644 ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/ + pushd ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/ ln -vsf /etc/java-7-openjdk/jvm.cfg . popd } @@ -257,7 +261,7 @@ package_jre7-openjdk() { mv ${srcdir}/tmp-desktop-jre/* ${pkgdir} # Link binaries into /usr/bin - pushd ${pkgdir}/${_jvmdir}/jre/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 @@ -293,13 +297,13 @@ package_jdk7-openjdk() { cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image" # Main files - install -m755 -d ${pkgdir}/${_jvmdir}/ + install -m755 -d ${pkgdir}${_jvmdir} - cp -a include lib ${pkgdir}/${_jvmdir} + cp -a include lib ${pkgdir}${_jvmdir} # 'bin' files pushd bin - install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ + install -m755 -d ${pkgdir}${_jvmdir}/bin/ \ ${pkgdir}/usr/bin/ \ ${pkgdir}/usr/share/man/{,ja/}man1/ @@ -307,10 +311,10 @@ package_jdk7-openjdk() { 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} + ln -s ../jre/bin/${b} ${pkgdir}${_jvmdir}/bin/${b} else # Copy binary to jdk/bin/ - install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} + 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 @@ -325,7 +329,7 @@ package_jdk7-openjdk() { install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications # Handling 'java-rmi.cgi' separately - install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi + install -m755 -D bin/java-rmi.cgi ${pkgdir}${_jvmdir}/bin/java-rmi.cgi # Set some variables install -m755 -d ${pkgdir}/etc/profile.d/ @@ -333,7 +337,7 @@ package_jdk7-openjdk() { install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh # Temporarily fixing FS#35141 - chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar + chmod go+r ${pkgdir}${_jvmdir}/lib/sa-jdi.jar # link license install -m755 -d ${pkgdir}/usr/share/licenses @@ -345,7 +349,7 @@ package_openjdk7-src() { replaces=('openjdk6-src') install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ - ${pkgdir}/${_jvmdir}/src.zip + ${pkgdir}${_jvmdir}/src.zip } package_openjdk7-doc() { diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD index accf2d8f1..429061f9e 100644 --- a/extra/json-glib/PKGBUILD +++ b/extra/json-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183001 2013-04-16 19:33:50Z heftig $ +# $Id: PKGBUILD 196109 2013-10-07 11:52:45Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=json-glib -pkgver=0.16.0 +pkgver=0.16.2 pkgrel=1 pkgdesc="JSON library built on GLib" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e4a3fd2f399e4c148aad608e6ed0a94095f2ddde9dd12f5aa2f072ecae5c1d37') +sha256sums=('a95475364ec27ab1d2a69303cf579018558bfb6981e3498b3aaf1e6401f7422c') build(){ cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index 6ff77721b..633e265da 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193221 2013-08-19 09:54:14Z andrea $ +# $Id: PKGBUILD 195502 2013-10-01 15:14:00Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('2f7ff6d98b50396f9afa1ce9cf6958cba2ec4956') +sha1sums=('3e484dd32e55cff7ce15899b8904c70c2f3e7a38') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index 0227adb3c..2c50a2808 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193248 2013-08-19 09:54:41Z andrea $ +# $Id: PKGBUILD 195556 2013-10-01 15:18:04Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('574672ddc034c0efb46b777505ed1ed73728abca') +sha1sums=('67700e70c208ed2d15f7d8581c1f50b5f0f7cb4b') build() { mkdir build diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index b3cac42b7..b1656a885 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193249 2013-08-19 09:54:42Z andrea $ +# $Id: PKGBUILD 195558 2013-10-01 15:18:13Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('efb2d24862fe3fb9dad478d4df09b302545d7644') +sha1sums=('fe602715dc4b241a0be88c5bfb3bc5f7a357c330') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index 21cb42b99..ea60afd23 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193250 2013-08-19 09:54:43Z andrea $ +# $Id: PKGBUILD 195560 2013-10-01 15:18:20Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('2f9db700bf511470afbd831758d1928dbf03b182') +sha1sums=('1fb0fe89e1c973e1db9783232a3b03135a9cac39') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index a9c59981f..126c5a2b4 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193251 2013-08-19 09:54:44Z andrea $ +# $Id: PKGBUILD 195562 2013-10-01 15:18:27Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('d24017e8b966562e4b3d74264496f65e240b7a04') +sha1sums=('c783c8e4eb7c72be344dddddebcde786d715dab9') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index e11a9d2d3..bc95ec15e 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193252 2013-08-19 09:54:45Z andrea $ +# $Id: PKGBUILD 195564 2013-10-01 15:18:34Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('2a40d22cf11ed2a55f7e2576cf526e667296e325') +sha1sums=('2bbc09abf8f76642f65fb6db4aa92c4c897c5176') build() { cd "${srcdir}" diff --git a/extra/kdeadmin-kcron/PKGBUILD b/extra/kdeadmin-kcron/PKGBUILD index 95d0314ee..b5f1ceb38 100644 --- a/extra/kdeadmin-kcron/PKGBUILD +++ b/extra/kdeadmin-kcron/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193253 2013-08-19 09:54:46Z andrea $ +# $Id: PKGBUILD 195566 2013-10-01 15:18:41Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeadmin-kcron -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Configure and schedule tasks' url='http://userbase.kde.org/KCron' @@ -12,7 +12,7 @@ groups=('kde' 'kdeadmin') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kcron-${pkgver}.tar.xz") -sha1sums=('8a837c7c9e2d04df1688a89679c7fcaa621957af') +sha1sums=('6354f77e033f35e2e241522aae81359f162bfe90') build() { mkdir build diff --git a/extra/kdeadmin-ksystemlog/PKGBUILD b/extra/kdeadmin-ksystemlog/PKGBUILD index f9d8a98fa..6b87307ae 100644 --- a/extra/kdeadmin-ksystemlog/PKGBUILD +++ b/extra/kdeadmin-ksystemlog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193254 2013-08-19 09:54:47Z andrea $ +# $Id: PKGBUILD 195568 2013-10-01 15:18:48Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeadmin-ksystemlog -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='System log viewer tool' url='http://kde.org/applications/system/ksystemlog/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ksystemlog-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('351ed0755674ecc37f8517ab6a61e2c6ea967ce5' +sha1sums=('a14a55b46163de74c6c4e6754c9060acc00fc9d3' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') prepare() { diff --git a/extra/kdeadmin-kuser/PKGBUILD b/extra/kdeadmin-kuser/PKGBUILD index 85551f54d..9b2f8f355 100644 --- a/extra/kdeadmin-kuser/PKGBUILD +++ b/extra/kdeadmin-kuser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193255 2013-08-19 09:54:48Z andrea $ +# $Id: PKGBUILD 195570 2013-10-01 15:18:56Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeadmin-kuser -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='User Manager' url='http://kde.org/applications/system/kuser/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kuser-${pkgver}.tar.xz") -sha1sums=('9eda2225632e8707ae6f59ed7fb9d29ef8488df9') +sha1sums=('a4898545884c4414a89541252290b081e610e039') build() { mkdir build diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index f26dd6e45..acd3c37f4 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193256 2013-08-19 09:54:49Z andrea $ +# $Id: PKGBUILD 195572 2013-10-01 15:19:08Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdeartwork-colorschemes' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('e2240e998483cd5f65a1602c8c410bb8453c2b4b') +sha1sums=('4e58014eed76b88955af645507ddecadd4c5a70f') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index d478ff35b..61a3fc714 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193257 2013-08-19 09:54:50Z andrea $ +# $Id: PKGBUILD 195574 2013-10-01 15:19:39Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('6bc97a6364699fba6474cae0fcdcff6d9435cf4b') +sha1sums=('bd4095086e6b9c4a271b0147c4fdf68aa7faba27') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 1c39daf36..d73feb4a3 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193487 2013-08-21 09:33:33Z andrea $ +# $Id: PKGBUILD 195528 2013-10-01 15:15:58Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.11.0 -pkgrel=2 +pkgver=4.11.2 +pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -27,9 +27,8 @@ install="${pkgname}.install" backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' - 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' - 'plasma-desktop-dbus.patch') -sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d' + 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('fa19cf2b56f7cbcc8bb2200dc33a38150379f4ad' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' @@ -37,10 +36,11 @@ sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d' 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514' - '57315ab3adf4d7eed9410c4494f0a63204122763') + 'd509dac592bd8b310df27991b208c95b6d907514') prepare() { + mkdir build + cd ${_pkgname}-${pkgver} # reads the shell scripts in /etc/kde/ @@ -50,12 +50,9 @@ prepare() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch - # KDEBUG#321695 - patch -p1 -i "${srcdir}"/plasma-desktop-dbus.patch } build() { - mkdir build cd build cmake ../${_pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdebase-workspace/kdebug-324574.patch b/extra/kdebase-workspace/kdebug-324574.patch new file mode 100644 index 000000000..053eef57e --- /dev/null +++ b/extra/kdebase-workspace/kdebug-324574.patch @@ -0,0 +1,55 @@ +From: Weng Xuetian <wengxt@gmail.com> +Date: Mon, 09 Sep 2013 15:43:06 +0000 +Subject: Delay KDE class initialization to main loop +X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=2e5a2450762f8dedf9ffd77028ed06b3a39a807d +--- +Delay KDE class initialization to main loop + +Gui platform plugin is loaded during QApplication construction, but it +relies on some KApplication/QApplication data to work correctly. + +This patch delays the initialization to main loop, to ensure +KApplication/QApplication is already constructed. + +BUG: 324574 +FIXED-IN: 4.11.2 +REVIEW: 112602 +--- + + +--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp ++++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp +@@ -28,6 +28,7 @@ + #include <KDE/KFileDialog> + #include <KDE/KColorDialog> + #include <QtCore/QHash> ++#include <QtCore/QTimer> + #include <QtGui/QFileDialog> + #include <QtGui/QColorDialog> + #include <QtGui/QApplication> +@@ -153,9 +154,7 @@ + public: + KQGuiPlatformPlugin() + { +- connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons())); +- connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle())); +- connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle())); ++ QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection); + } + + virtual QStringList keys() const { return QStringList() << QLatin1String("kde"); } +@@ -340,6 +339,13 @@ + } + + private slots: ++ void init() ++ { ++ connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons())); ++ connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle())); ++ connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle())); ++ } ++ + void updateToolbarStyle() + { + //from gtksymbol.cpp + diff --git a/extra/kdebase-workspace/plasma-desktop-dbus.patch b/extra/kdebase-workspace/plasma-desktop-dbus.patch deleted file mode 100644 index 70790dac3..000000000 --- a/extra/kdebase-workspace/plasma-desktop-dbus.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Hrvoje Senjan <hrvoje.senjan@gmail.com> -Date: Tue, 20 Aug 2013 11:35:57 +0000 -Subject: Partially revert commit 83d3018 -X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=bb2bddb083eb293786206ac91ae1feeaf942db32 ---- -Partially revert commit 83d3018 - -Somehow unique made ksplash quit too soon and/or plasma start -too late - -REVIEW: 112073 -BUG: 321695 -FIXED-IN: 4.11.1 ---- - - ---- a/plasma/desktop/shell/data/plasma-desktop.desktop -+++ b/plasma/desktop/shell/data/plasma-desktop.desktop -@@ -1,6 +1,6 @@ - [Desktop Entry] - Exec=plasma-desktop --X-DBUS-StartupType=unique -+X-DBUS-StartupType=multi - Name=Plasma Desktop Workspace - Name[ar]=مساحة عمل بلازما - Name[ast]=Espaciu de trabayu del escritoriu Plasma - diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 52f006a1f..d43dd2d41 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193236 2013-08-19 09:54:31Z andrea $ +# $Id: PKGBUILD 195532 2013-10-01 15:16:19Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konq-plugins' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,11 +19,15 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('2a1e0e902016f0dc6f39cbe4fc776e5f20554088') +sha1sums=('6a988adf54e9f499365dce0ce1691d020411bd0d') + +prepare() { + mkdir build + + cd kde-baseapps-${pkgver} +} build() { - cd ${srcdir} - mkdir build cd build cmake ../kde-baseapps-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdebase/kdebug-324511.patch b/extra/kdebase/kdebug-324511.patch new file mode 100644 index 000000000..cca2a7254 --- /dev/null +++ b/extra/kdebase/kdebug-324511.patch @@ -0,0 +1,25 @@ +commit 43a981481ab9161a83dd200db39c093e2502f68a +Author: Bernd Buschinski <b.buschinski@googlemail.com> +Date: Wed Sep 4 16:23:35 2013 +0200 + + Fix toplevel bookmarks not showing in toolbar + regression from d1963e23 + +diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp +index 2141575..199e15f 100644 +--- a/konqueror/src/konqbookmarkbar.cpp ++++ b/konqueror/src/konqbookmarkbar.cpp +@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent) + + if (!bm.isGroup()) + { +- if ( bm.isSeparator() ) ++ if ( bm.isSeparator() ) ++ { + if (m_toolBar) { + m_toolBar->addSeparator(); + } ++ } + else + { + KAction *action = new KBookmarkAction( bm, m_pOwner, 0 ); diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index dffb9aafe..e12062047 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193258 2013-08-19 09:54:51Z andrea $ +# $Id: PKGBUILD 195576 2013-10-01 15:19:48Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') optdepends=('kdepimlibs: akonadi bindings') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('c79ece1aff5d225dc17c0082e31beda06782a51e') +sha1sums=('629ec8027ee5650234dc19c26488cde0244ca7dd') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 4c8655dcc..6740edb87 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193259 2013-08-19 09:54:52Z andrea $ +# $Id: PKGBUILD 195578 2013-10-01 15:19:56Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -16,7 +16,7 @@ optdepends=('kdegraphics-okular: okular bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz") -sha1sums=('44b74d69d8f1533c965f86ae5cac688de6499e35') +sha1sums=('0ea502fb79d1c5f61b32dd8419880e4f29b229e2') prepare() { mkdir build diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index e6d51a3c6..4b1dee7c8 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193260 2013-08-19 09:54:53Z andrea $ +# $Id: PKGBUILD 195580 2013-10-01 15:20:04Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('647af2a112e571ebdb435e6948268075f97486b0') +sha1sums=('89f232ceaa37d9b289e9a1a997695839071090fb') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index f2f46fce3..46a002942 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193261 2013-08-19 09:54:54Z andrea $ +# $Id: PKGBUILD 195582 2013-10-01 15:20:12Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('18dcfe5623eb599e7cefc259fff3ed4b361bb05d') +sha1sums=('226673575d9daeb7498a2bcd3f9f196a3308d471') build() { mkdir build diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 2ee5d5580..879bbfdc4 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193230 2013-08-19 09:54:24Z andrea $ +# $Id: PKGBUILD 195520 2013-10-01 15:15:20Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('6909be471229916833861fa04f49e63398c29960') +sha1sums=('2a6ddaafdbc0bd62ae7b1982f9bd0efa6908157c') build() { mkdir build diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index bff3284e3..84ab851cf 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193227 2013-08-19 09:54:19Z andrea $ +# $Id: PKGBUILD 195514 2013-10-01 15:14:52Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64' 'mips64el') @@ -13,13 +13,18 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4' 'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') - source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('f7d11a316d7985f510926cadf0bdb0d27d110a8e') +source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") +sha1sums=('5e7c43e224fa1db4ae2bbec1eb040dd2855e8c86') + +prepare() { + mkdir build + + cd pykde4-${pkgver} +} build() { export PYTHONDONTWRITEBYTECODE="TRUE" - mkdir build cd build cmake ../pykde4-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdebindings-python/pykde4.patch b/extra/kdebindings-python/pykde4.patch new file mode 100644 index 000000000..159af304c --- /dev/null +++ b/extra/kdebindings-python/pykde4.patch @@ -0,0 +1,269 @@ +--- pykde4-4.11.1.orig/CMakeLists.txt 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/CMakeLists.txt 2013-09-08 17:29:29.755854280 -0400 +@@ -124,20 +124,20 @@ + if (PYTHON_VERSION_MAJOR GREATER 2) + if(PYQT4_VERSION STRGREATER "040904") + # Disable for newer PyQt +- set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) + else () + set(SIP_EXTRA_OPTIONS -g) + endif() + else (PYTHON_VERSION_MAJOR GREATER 2) + if(PYQT4_VERSION STRGREATER "040904") + # Disable for newer PyQt +- set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) + else () + set(SIP_EXTRA_OPTIONS -g -x Py_v3) + endif() + endif () + +-add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API) ++add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API -DSIP_PROTECTED_IS_PUBLIC -Dprotected=public) + + # Do not use --no-undefined for python modules. + STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") +--- pykde4-4.11.1.orig/sip/akonadi/entitytreemodel.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/akonadi/entitytreemodel.sip 2013-09-08 17:29:29.755854280 -0400 +@@ -122,5 +122,12 @@ + }; + bool includeUnsubscribed () const; + void setIncludeUnsubscribed (bool show); ++//force ++private: ++ virtual bool removeColumns(int, int, const QModelIndex&); ++ virtual bool removeRows(int, int, const QModelIndex&); ++ virtual bool insertColumns(int, int, const QModelIndex&); ++ virtual bool insertRows(int, int, const QModelIndex&); ++//end + }; + }; +--- pykde4-4.11.1.orig/sip/akonadi/favoritecollectionsmodel.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/akonadi/favoritecollectionsmodel.sip 2013-09-08 17:29:29.759854280 -0400 +@@ -42,5 +42,9 @@ + virtual bool dropMimeData (const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent); + virtual QStringList mimeTypes () const; + virtual Qt::ItemFlags flags (const QModelIndex& index) const; ++//force ++private: ++ virtual void setSourceModel(QAbstractItemModel *); ++//end + }; + }; +--- pykde4-4.11.1.orig/sip/kdeui/highlighter.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kdeui/highlighter.sip 2013-09-08 17:29:29.759854280 -0400 +@@ -70,6 +70,11 @@ + public: + ~Highlighter (); + bool checkerEnabledByDefault () const; ++//force ++private: ++ virtual void connectNotify(const char* signal); ++ virtual void disconnectNotify(const char* signal); ++//end + }; + // Highlighter + +--- pykde4-4.11.1.orig/sip/kdeui/kdatetable.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kdeui/kdatetable.sip 2013-09-08 17:29:29.759854280 -0400 +@@ -61,8 +61,10 @@ + + public: + KDateValidator (QWidget* parent /TransferThis/ = 0); +- virtual QValidator::State validate (QString& text, int& e /In/) const; +- virtual void fixup (QString& input) const; ++ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; ++ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; ++ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; ++ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; + QValidator::State date (const QString& text, QDate& date) const; + }; + // KDateValidator +--- pykde4-4.11.1.orig/sip/kdeui/knumvalidator.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kdeui/knumvalidator.sip 2013-09-08 17:29:29.759854280 -0400 +@@ -30,8 +30,10 @@ + public: + explicit KIntValidator (QWidget* parent /TransferThis/, int base = 10); + KIntValidator (int bottom, int top, QWidget* parent /TransferThis/, int base = 10); +- virtual QValidator::State validate (QString&, int& /In/) const; +- virtual void fixup (QString&) const; ++ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; ++ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; ++ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; ++ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; + virtual void setRange (int bottom, int top); + virtual void setBase (int base); + virtual int bottom () const; +@@ -53,8 +55,10 @@ + explicit KFloatValidator (QWidget* parent /TransferThis/); + KFloatValidator (double bottom, double top, QWidget* parent /TransferThis/); + KFloatValidator (double bottom, double top, bool localeAware, QWidget* parent /TransferThis/); +- virtual QValidator::State validate (QString&, int& /In/) const; +- virtual void fixup (QString&) const; ++ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; ++ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; ++ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; ++ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; + virtual void setRange (double bottom, double top); + virtual double bottom () const; + virtual double top () const; +@@ -75,7 +79,8 @@ + public: + explicit KDoubleValidator (QObject* parent /TransferThis/); + KDoubleValidator (double bottom, double top, int decimals, QObject* parent /TransferThis/); +- virtual QValidator::State validate (QString& input, int& pos /In/) const; ++ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; ++ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; + bool acceptLocalizedNumbers () const; + void setAcceptLocalizedNumbers (bool accept); + ~KDoubleValidator (); +--- pykde4-4.11.1.orig/sip/kdeui/kpixmapregionselectorwidget.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kdeui/kpixmapregionselectorwidget.sip 2013-09-08 17:29:29.759854280 -0400 +@@ -57,6 +57,7 @@ + private: + //force + KPixmapRegionSelectorWidget (const KPixmapRegionSelectorWidget&); ++ virtual bool eventFilter(QObject*, QEvent*); + //end + public: + ~KPixmapRegionSelectorWidget (); +--- pykde4-4.11.1.orig/sip/kdeui/kpixmapsequenceoverlaypainter.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kdeui/kpixmapsequenceoverlaypainter.sip 2013-09-08 17:29:29.763854280 -0400 +@@ -39,4 +39,8 @@ + void setOffset (const QPoint& offset); + void start (); + void stop (); ++//force ++private: ++ virtual bool eventFilter(QObject*, QEvent*); ++//end + }; +--- pykde4-4.11.1.orig/sip/kdeui/krecursivefilterproxymodel.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kdeui/krecursivefilterproxymodel.sip 2013-09-08 17:29:29.763854280 -0400 +@@ -31,4 +31,8 @@ + virtual bool acceptRow (int sourceRow, const QModelIndex& sourceParent) const; + public: + virtual QModelIndexList match (const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const; ++//force ++private: ++ virtual bool filterAcceptsRow(int, const QModelIndex&) const; ++//end + }; +--- pykde4-4.11.1.orig/sip/kdeui/kstringvalidator.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kdeui/kstringvalidator.sip 2013-09-08 17:29:29.763854280 -0400 +@@ -35,8 +35,10 @@ + bool isFixupEnabled () const; + void setStringList (const QStringList& list); + QStringList stringList () const; +- virtual QValidator::State validate (QString& input, int& pos /Out/) const; +- virtual void fixup (QString& input) const; ++ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; ++ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; ++ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; ++ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; + ~KStringListValidator (); + }; + // KStringListValidator +@@ -51,8 +53,10 @@ + + public: + explicit KMimeTypeValidator (QObject* parent /TransferThis/ = 0); +- virtual QValidator::State validate (QString& input, int& pos /Out/) const; +- virtual void fixup (QString& input) const; ++ virtual QValidator::State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; ++ virtual QValidator::State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; ++ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; ++ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; + ~KMimeTypeValidator (); + }; + // KMimeTypeValidator +--- pykde4-4.11.1.orig/sip/kdeui/ktogglefullscreenaction.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kdeui/ktogglefullscreenaction.sip 2013-09-08 17:29:29.763854280 -0400 +@@ -37,7 +37,10 @@ + bool eventFilter (QObject* object, QEvent* event); + public: + ~KToggleFullScreenAction (); ++ ++//force ++private: ++ virtual void slotToggled(bool); ++//end + }; + // KToggleFullScreenAction +- +- +--- pykde4-4.11.1.orig/sip/kdeui/ktoggletoolbaraction.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kdeui/ktoggletoolbaraction.sip 2013-09-08 17:29:29.763854280 -0400 +@@ -33,6 +33,10 @@ + KToolBar* toolBar (); + virtual bool eventFilter (QObject* watched, QEvent* event); + ~KToggleToolBarAction (); ++//force ++private: ++ virtual void slotToggled( bool checked ); ++//end + }; + // KToggleToolBarAction + +--- pykde4-4.11.1.orig/sip/kio/kdirmodel.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kio/kdirmodel.sip 2013-09-08 17:29:29.767854280 -0400 +@@ -105,6 +105,13 @@ + ~KDirModel (); + void setJobTransfersVisible (bool value); + bool jobTransfersVisible () const; ++//force ++private: ++ virtual bool removeColumns(int, int, const QModelIndex&); ++ virtual bool removeRows(int, int, const QModelIndex&); ++ virtual bool insertColumns(int, int, const QModelIndex&); ++ virtual bool insertRows(int, int, const QModelIndex&); ++//end + }; + // KDirModel + +--- pykde4-4.11.1.orig/sip/kio/kshellcompletion.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kio/kshellcompletion.sip 2013-09-08 17:29:29.767854280 -0400 +@@ -39,5 +39,3 @@ + ~KShellCompletion (); + }; + // KShellCompletion +- +- +--- pykde4-4.11.1.orig/sip/kio/metainfojob.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/kio/metainfojob.sip 2013-09-08 17:29:29.767854280 -0400 +@@ -51,7 +51,7 @@ + private: + //force + MetaInfoJob (); +- ++ virtual void start(); + //end + public: + ~MetaInfoJob (); +--- pykde4-4.11.1.orig/sip/plasma/applet.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/plasma/applet.sip 2013-09-08 17:29:29.767854280 -0400 +@@ -217,6 +217,10 @@ + void showConfigurationInterface (QWidget* widget); + bool isUserConfiguring () const; + explicit Applet (const KPluginInfo& info, QGraphicsItem* parent = 0, uint appletId = 0); ++//force ++private: ++ virtual void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*); ++//end + }; + // Applet + +--- pykde4-4.11.1.orig/sip/plasma/glapplet.sip 2013-09-08 17:29:29.775854281 -0400 ++++ pykde4-4.11.1/sip/plasma/glapplet.sip 2013-09-08 17:29:29.771854281 -0400 +@@ -52,6 +52,10 @@ + ~GLApplet (); + GLuint bindTexture (const QImage& image, GLenum target = GL_TEXTURE_2D); + void deleteTexture (GLuint texture_id); ++ ++private: ++ virtual void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*); ++ virtual void paintInterface(QPainter*, const QStyleOptionGraphicsItem*, const QRect&); + //end + }; + // GLApplet diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 13345adfc..2a08a37ef 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193232 2013-08-19 09:54:25Z andrea $ +# $Id: PKGBUILD 195524 2013-10-01 15:15:35Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('ff362e4b62192ddf5023d325fac008d6fe59a4fa') +sha1sums=('a75925deb9caaf75dc9f77da861516767d40688a') build() { mkdir build diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 508d2e606..6d54fce7c 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193231 2013-08-19 09:54:25Z andrea $ +# $Id: PKGBUILD 195522 2013-10-01 15:15:27Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('77bcc62cc587aa90e5cc02924f9379c9cf17f97e') +sha1sums=('e10f00c4528e3d31a57935dd54c6276ba631e903') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 586af38b6..a165ba2a8 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193224 2013-08-19 09:54:17Z andrea $ +# $Id: PKGBUILD 195508 2013-10-01 15:14:27Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('c4bb56f45dc135ac92b11c4bcbfcfe4b226565d7') +sha1sums=('4fbb3292391d26b4c68bed44a819f54b05b33bc0') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 9b7fa30fe..a6d6ef08f 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193229 2013-08-19 09:54:23Z andrea $ +# $Id: PKGBUILD 195518 2013-10-01 15:15:12Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('d99082d9f48ff0d6758d26d1e47cb1e44d2a7992') +sha1sums=('09b73d8f13767cd9132387e391ddde09b14ed972') build() { mkdir build diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 377d22138..f3857c279 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193225 2013-08-19 09:54:18Z andrea $ +# $Id: PKGBUILD 195510 2013-10-01 15:14:38Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4' 'mesa') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('7b661f43c17098474d06f27949872fd44d4b2bc4') +sha1sums=('d54d2e3ffae9ab526b9e04d1f03dfb8898a590b5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 6f70822aa..1a41e328a 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193243 2013-08-19 09:54:37Z andrea $ +# $Id: PKGBUILD 195546 2013-10-01 15:17:21Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('2950c6fa66ae6a7beb530a83974a17d08239a9eb') +sha1sums=('f1b63cf72dc4ffa67ed96c1d073dda2dccf58e67') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index ccd67aab6..d4873ab23 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193262 2013-08-19 09:54:55Z andrea $ +# $Id: PKGBUILD 195584 2013-10-01 15:20:20Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('0f6b34ab9074c15b29bdcdf9f6fd153772f66058') +sha1sums=('8517eb54038d0c51bd993dc26456993bb8cf1631') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index d51ce86bd..e2d8c6789 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193263 2013-08-19 09:54:56Z andrea $ +# $Id: PKGBUILD 195586 2013-10-01 15:20:28Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('6126f637367f43b5a84bcc516f2f96ef4b7987ee') +sha1sums=('d24c08721f0182bee317b24eb9afd99dd0790602') prepare() { mkdir build diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index ea36cd939..8a2806879 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193264 2013-08-19 09:54:58Z andrea $ +# $Id: PKGBUILD 195588 2013-10-01 15:20:36Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('bb7c128750eef3e62ac39b245b7e8cfc4493b450') +sha1sums=('29fa67fc0a4925318742c9746b7f9a5aec865563') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 152bcfd33..b2afb2769 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193265 2013-08-19 09:54:59Z andrea $ +# $Id: PKGBUILD 195986 2013-10-07 07:06:21Z tpowa $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.11.0 -pkgrel=1 +pkgver=4.11.2 +pkgrel=2 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('f206cbd593aa1ee1bce0f089099aae198b4fb5f2') +sha1sums=('20789b2f67fc4fe53cd81d58283911bc0a8fa68c') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 170d4ac95..e06789360 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193266 2013-08-19 09:55:00Z andrea $ +# $Id: PKGBUILD 195592 2013-10-01 15:20:52Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('989e9c0b697a24554cde4e6316e63aa5302c3deb') +sha1sums=('57a0acb63161e8d927317068e30fa2701814582e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index efcf9ba9b..28eb48f01 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193267 2013-08-19 09:55:02Z andrea $ +# $Id: PKGBUILD 195594 2013-10-01 15:21:00Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('7010da4294dc50d15be8c5672dcf2032e708fb82') +sha1sums=('d3173e20ae4b95a601eb5cb2abdccad73e43a8a8') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index 21d205180..6d40f4723 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193268 2013-08-19 09:55:03Z andrea $ +# $Id: PKGBUILD 195596 2013-10-01 15:21:08Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('11e8b12645b2a039bbcf46b195e33826e5f79072') +sha1sums=('aaa13ed6f38704bfb5187a1b1ba81e214f576c9f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index b1f9fc734..5faa48e4f 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193269 2013-08-19 09:55:04Z andrea $ +# $Id: PKGBUILD 195598 2013-10-01 15:21:17Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('d9e849fb79468e83ce0033b3264d06f642093406') +sha1sums=('05126aab8d051323c58ef40ee8800f77f841c44c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 449961ac2..325ec5a19 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193270 2013-08-19 09:55:06Z andrea $ +# $Id: PKGBUILD 195600 2013-10-01 15:21:24Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('050abf3c47c1bbd93cf8773674006113ab3e09a7') +sha1sums=('984137eab99bff5829521e395e1b704498fffba6') build() { mkdir build diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index dcc5c7ade..761a937b0 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193271 2013-08-19 09:55:08Z andrea $ +# $Id: PKGBUILD 195602 2013-10-01 15:21:32Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('f7d0792c017704591a5840b615f15cd73fa0999b') +sha1sums=('d8e4638de926e77d0866fac93d35f80234546ca3') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 39aff7919..923bb72cd 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193272 2013-08-19 09:55:09Z andrea $ +# $Id: PKGBUILD 195604 2013-10-01 15:21:54Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('309b1a0eabfc0f60a23c01df784dc92519bc5a4c') +sha1sums=('dcb66130f08ce5ed15ff271f3d119fdbaab53951') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 6601c496a..2d6af89f3 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193273 2013-08-19 09:55:11Z andrea $ +# $Id: PKGBUILD 195606 2013-10-01 15:22:12Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('36821499b2e6835bc863e30405a1e25d9bbac773') +sha1sums=('00dbf0f0df11ab82c65a491834b522865725c20e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index e6b549c14..58513864b 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193274 2013-08-19 09:55:12Z andrea $ +# $Id: PKGBUILD 195608 2013-10-01 15:22:36Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'wcslib' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('955b53ffcde6ef319c3ad3181957396a91887ddc') +sha1sums=('9dc44a2b6a6cda29d3508206b1737f38d5bff54a') build() { mkdir build @@ -29,4 +29,5 @@ build() { package() { cd build make DESTDIR="${pkgdir}" install + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|g' ${pkgdir}/usr/share/apps/kstars/scripts/supernova_updates_parser.py } diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index aad119556..fd904e6e5 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193275 2013-08-19 09:55:14Z andrea $ +# $Id: PKGBUILD 195610 2013-10-01 15:22:56Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('7b847dc9a760e62e00281cca65d0faaacb93427d') +sha1sums=('d8b1c37a0270dbfba63d5dc2e73d7320e58c07e5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index d2aa968d2..1e0d32902 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193276 2013-08-19 09:55:15Z andrea $ +# $Id: PKGBUILD 195612 2013-10-01 15:23:10Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('b2808e56702a9f1d11873d0633d0ed6fbee1ed78') +sha1sums=('1343755dbc7ffbcb0da848fa13804cb86895d568') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index acd5ceb44..696276c71 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193277 2013-08-19 09:55:16Z andrea $ +# $Id: PKGBUILD 195614 2013-10-01 15:23:31Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('5a8cd264eb1650fc7f772ae5fb29cb3789b77ee0') +sha1sums=('d630d944824296459d643a76323cab34126ddf92') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 37c21759b..ece18c857 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193238 2013-08-19 09:54:32Z andrea $ +# $Id: PKGBUILD 195536 2013-10-01 15:16:34Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('a7feb09a825f93c301fdfec5975813f09f14f41b') +sha1sums=('d37528ba9c61f8938569ea6af39d0fd5181f52d4') build() { mkdir build diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index c216aa035..8effe234e 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193278 2013-08-19 09:55:18Z andrea $ +# $Id: PKGBUILD 195616 2013-10-01 15:23:51Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('d1b284e4dc768f07ee4d680af2f184591f0b29e6') +sha1sums=('3c066354585127ad6f9c9e0ed99c8b6f0bd0c3b1') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 701173eaf..09d17201f 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193279 2013-08-19 09:55:19Z andrea $ +# $Id: PKGBUILD 195618 2013-10-01 15:25:01Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebindings-kross-python: scripting support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('04734868e2fc8ffc396e7939f02a7ee403ee0893') +sha1sums=('f98d01d01fde0ec28be842874245af4aa88a95b6') build() { mkdir build diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 7ec8ec8be..a6a6a7d3e 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193280 2013-08-19 09:55:21Z andrea $ +# $Id: PKGBUILD 195620 2013-10-01 15:25:09Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('216bb4655cd9c601e8857d47fbcfdaa50d28e512') +sha1sums=('cede7bdee7f2d64da79b564461ede119108a6a55') build() { cd "${srcdir}" diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index e96e31893..fbedab5c5 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193281 2013-08-19 09:55:23Z andrea $ +# $Id: PKGBUILD 195622 2013-10-01 15:25:16Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('9cf6fcdb469dda029be8d15c057af036729610c2') +sha1sums=('1b6dd907caa47f3867ad03eb7d4e91f3981a2730') build() { cd "${srcdir}" diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD index b8521a1ad..d7360c280 100644 --- a/extra/kdegames-bomber/PKGBUILD +++ b/extra/kdegames-bomber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193282 2013-08-19 09:55:25Z andrea $ +# $Id: PKGBUILD 195624 2013-10-01 15:25:22Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bomber -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A single player arcade game" url="http://kde.org/applications/games/bomber/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz") -sha1sums=('562551627c35b509e6c2a34977dc8c4cc09a4838') +sha1sums=('c6bd8e69cd7e172f63893b7c1c6305006ace79ab') build() { mkdir build diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD index 5a1bcd61c..50a41fa9b 100644 --- a/extra/kdegames-bovo/PKGBUILD +++ b/extra/kdegames-bovo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193283 2013-08-19 09:55:26Z andrea $ +# $Id: PKGBUILD 195626 2013-10-01 15:25:29Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bovo -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A Gomoku like game for two players" url="http://kde.org/applications/games/bovo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz") -sha1sums=('96429d14bf801aa2950c018146da0632facaabe4') +sha1sums=('7e98d4b6e4b7396f3f81a2295f35ddc0bf669ddc') build() { mkdir build diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD index 60099a930..f656d7393 100644 --- a/extra/kdegames-granatier/PKGBUILD +++ b/extra/kdegames-granatier/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193284 2013-08-19 09:55:29Z andrea $ +# $Id: PKGBUILD 195628 2013-10-01 15:25:37Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-granatier -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A clone of the classic Bomberman game" url="http://kde.org/applications/games/granatier/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz") -sha1sums=('37c4453c5c1c1712912383e2be1766be5f5948cd') +sha1sums=('f83a41521c95d3f40963155f9f9760499cdb2429') build() { mkdir build diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD index c06137ad5..69b5f349c 100644 --- a/extra/kdegames-kapman/PKGBUILD +++ b/extra/kdegames-kapman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193286 2013-08-19 09:55:35Z andrea $ +# $Id: PKGBUILD 195632 2013-10-01 15:25:51Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kapman -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A clone of the well known game Pac-Man" url="http://kde.org/applications/games/kapman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz") -sha1sums=('312dd63aa8b3849414cdfe901cff67255ac511e0') +sha1sums=('858147cc497c07fec55b5cfc9ed2abf671e71645') build() { mkdir build diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD index 8fe94504c..dc2833492 100644 --- a/extra/kdegames-katomic/PKGBUILD +++ b/extra/kdegames-katomic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193287 2013-08-19 09:55:36Z andrea $ +# $Id: PKGBUILD 195634 2013-10-01 15:25:59Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-katomic -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A fun and educational game built around molecular geometry" url="http://kde.org/applications/games/katomic/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz") -sha1sums=('2c8050f3069df2ed46322b9aa29ae1ad0868d4f2') +sha1sums=('d640e617e0ee55db1ffceafd14b714df290f185f') build() { mkdir build diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD index 84907d68a..d523f9be9 100644 --- a/extra/kdegames-kblackbox/PKGBUILD +++ b/extra/kdegames-kblackbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193288 2013-08-19 09:55:37Z andrea $ +# $Id: PKGBUILD 195636 2013-10-01 15:26:08Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblackbox -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A game of hide and seek played on a grid of boxes" url="http://kde.org/applications/games/kblackbox/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz") -sha1sums=('d2347c7365d37d7afc7057dbc9cd4f6f5a7b82b4') +sha1sums=('27b8370bca2ece8aef7a0d9604d7dfd80c44b1d2') build() { mkdir build diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD index 1d7d23c7a..d110f9f8a 100644 --- a/extra/kdegames-kblocks/PKGBUILD +++ b/extra/kdegames-kblocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193289 2013-08-19 09:55:39Z andrea $ +# $Id: PKGBUILD 195638 2013-10-01 15:26:16Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblocks -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="The classic falling blocks game" url="http://kde.org/applications/games/kblocks/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz") -sha1sums=('90ebab1d33df63bff608023084b1f83c4e5e5c6e') +sha1sums=('d248a16fd4d430da6138f1b20ca8dcf67893e68c') build() { mkdir build diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD index 660c3d436..126c8b29a 100644 --- a/extra/kdegames-kbounce/PKGBUILD +++ b/extra/kdegames-kbounce/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193290 2013-08-19 09:55:41Z andrea $ +# $Id: PKGBUILD 195640 2013-10-01 15:26:26Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbounce -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A single player arcade game with the elements of puzzle" url="http://kde.org/applications/games/kbounce/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz") -sha1sums=('3eac97000785aa6e7092af1e921bc5ec1c2eff44') +sha1sums=('a1bd2b405c6aae79dac8063d6b461e88ba6ded51') build() { mkdir build diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD index de0a3357d..3c888916b 100644 --- a/extra/kdegames-kbreakout/PKGBUILD +++ b/extra/kdegames-kbreakout/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193291 2013-08-19 09:55:43Z andrea $ +# $Id: PKGBUILD 195642 2013-10-01 15:26:34Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbreakout -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A Breakout-like game" url="http://kde.org/applications/games/kbreakout/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz") -sha1sums=('b8559bba88f9793203d3e7f46b05f81893403453') +sha1sums=('2ae752f463e12b267e84b9847d68993b61becc4a') build() { mkdir build diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD index 5b7fe6b3b..386ecefd8 100644 --- a/extra/kdegames-kdiamond/PKGBUILD +++ b/extra/kdegames-kdiamond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193292 2013-08-19 09:55:44Z andrea $ +# $Id: PKGBUILD 195644 2013-10-01 15:26:42Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kdiamond -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A single player puzzle game" url="http://kde.org/applications/games/kdiamond/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz") -sha1sums=('75a956cb672f32d6a40e10f67253734300fea5c4') +sha1sums=('bf6d4d03ed8dec892785cf898dd954d9f8867268') build() { mkdir build diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD index 3c3289412..bcc92f678 100644 --- a/extra/kdegames-kfourinline/PKGBUILD +++ b/extra/kdegames-kfourinline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193293 2013-08-19 09:55:46Z andrea $ +# $Id: PKGBUILD 195646 2013-10-01 15:26:52Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kfourinline -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A four-in-a-row game" url="http://kde.org/applications/games/kfourinline/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz") -sha1sums=('27f71f82ba4e43efcb50dfffdbbfa14d80a21726') +sha1sums=('c832f1485fad84e0e97c4de71bacc602f5cfe269') build() { mkdir build diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD index b737c551c..5d4bd8b3f 100644 --- a/extra/kdegames-kgoldrunner/PKGBUILD +++ b/extra/kdegames-kgoldrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193294 2013-08-19 09:55:47Z andrea $ +# $Id: PKGBUILD 195648 2013-10-01 15:27:00Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kgoldrunner -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A game of action and puzzle solving" url="http://kde.org/applications/games/kgoldrunner/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz") -sha1sums=('e28245a4c1c8327669a353fa47913bb893498526') +sha1sums=('a6bc9684535df789a1d901bb76b491a6c0cd2152') build() { mkdir build diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD index 51f878dca..ff320d10d 100644 --- a/extra/kdegames-kigo/PKGBUILD +++ b/extra/kdegames-kigo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193295 2013-08-19 09:55:49Z andrea $ +# $Id: PKGBUILD 195650 2013-10-01 15:27:10Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kigo -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="An open-source implementation of the popular Go game" url="http://kde.org/applications/games/kigo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz") -sha1sums=('9753b7cde11acca14d63217e91c2534cc13c35b7') +sha1sums=('7f542952c905a0159baa6bf76859e555ccc734f1') build() { mkdir build diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD index 4af58db5b..3529def51 100644 --- a/extra/kdegames-killbots/PKGBUILD +++ b/extra/kdegames-killbots/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193296 2013-08-19 09:55:51Z andrea $ +# $Id: PKGBUILD 195652 2013-10-01 15:27:20Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-killbots -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A simple game of evading killer robots" url="http://kde.org/applications/games/killbots/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz") -sha1sums=('e7d2dd5f0cd26729dfb1fc57db47b487fe17ee79') +sha1sums=('51fec4b46a44de9412ea30716b9aeabb23ce1b08') build() { mkdir build diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD index 66c0aad98..4d2605b70 100644 --- a/extra/kdegames-kiriki/PKGBUILD +++ b/extra/kdegames-kiriki/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193297 2013-08-19 09:55:53Z andrea $ +# $Id: PKGBUILD 195654 2013-10-01 15:27:31Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kiriki -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="An addictive and fun dice game" url="http://kde.org/applications/games/kiriki/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz") -sha1sums=('10fbe6c2a1162c53c01e9d8d5113b05db3e8a305') +sha1sums=('85ee7a363c2acd357c234750e76735f4a44ecfe5') build() { mkdir build diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD index 8fe63acf1..237ef18ba 100644 --- a/extra/kdegames-kjumpingcube/PKGBUILD +++ b/extra/kdegames-kjumpingcube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193298 2013-08-19 09:55:55Z andrea $ +# $Id: PKGBUILD 195656 2013-10-01 15:27:43Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kjumpingcube -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A simple tactical game" url="http://kde.org/applications/games/kjumpingcube/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz") -sha1sums=('016196c8b05572136b9436427a8a136518a32f07') +sha1sums=('accd0b0113e3d39862a61073bfe43ead4ae66931') build() { mkdir build diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD index 738a2424e..a417b2916 100644 --- a/extra/kdegames-klickety/PKGBUILD +++ b/extra/kdegames-klickety/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193299 2013-08-19 09:55:59Z andrea $ +# $Id: PKGBUILD 195658 2013-10-01 15:27:50Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klickety -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="An adaptation of the Clickomania game" url="http://kde.org/applications/games/klickety/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz") -sha1sums=('ef0d3e62163c1e7fdbabe59f44745f0a2157818d') +sha1sums=('8fbddac4341e15d13f49c32c0944c8039e439e2e') build() { mkdir build diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD index a5ea903e7..e8bbf2535 100644 --- a/extra/kdegames-klines/PKGBUILD +++ b/extra/kdegames-klines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193300 2013-08-19 09:56:00Z andrea $ +# $Id: PKGBUILD 195660 2013-10-01 15:27:58Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klines -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A simple but highly addictive, one player game" url="http://kde.org/applications/games/klines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz") -sha1sums=('4de5385ee60342af078efae25b97fb575cdf61d1') +sha1sums=('52998f7c594c7d6deb6462c04569edfe6fc55526') build() { mkdir build diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD index a4e7daf7f..8e66402c8 100644 --- a/extra/kdegames-kmahjongg/PKGBUILD +++ b/extra/kdegames-kmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193301 2013-08-19 09:56:02Z andrea $ +# $Id: PKGBUILD 195662 2013-10-01 15:28:06Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmahjongg -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A tile matching game for one or two players" url="http://kde.org/applications/games/kmahjongg/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz") -sha1sums=('8db268624dc3ddc29510cb4c8c4994f907141b08') +sha1sums=('af458140e050374226e69a9041d61ea2cfa53a74') build() { mkdir build diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD index b79f94ec3..3d010330f 100644 --- a/extra/kdegames-kmines/PKGBUILD +++ b/extra/kdegames-kmines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193302 2013-08-19 09:56:05Z andrea $ +# $Id: PKGBUILD 195664 2013-10-01 15:28:15Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmines -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="The classic Minesweeper game" url="http://kde.org/applications/games/kmines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz") -sha1sums=('c456bfc098fb4bac38446b1da725855624390238') +sha1sums=('e76b14c64361133dbaab03e72633d344f0e0faff') build() { mkdir build diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD index 344d476a9..09b76ba2e 100644 --- a/extra/kdegames-knavalbattle/PKGBUILD +++ b/extra/kdegames-knavalbattle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193303 2013-08-19 09:56:06Z andrea $ +# $Id: PKGBUILD 195666 2013-10-01 15:28:22Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knavalbattle -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A ship sinking game" url="http://kde.org/applications/games/knavalbattle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz") -sha1sums=('cec8d3a13b916bb2b429819a6ae588fca107d2b8') +sha1sums=('e9de15755f03bbdecb50765134bf4440214d2a93') build() { mkdir build diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD index e7e4b0eb4..5c4b32f32 100644 --- a/extra/kdegames-knetwalk/PKGBUILD +++ b/extra/kdegames-knetwalk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193304 2013-08-19 09:56:08Z andrea $ +# $Id: PKGBUILD 195668 2013-10-01 15:28:29Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knetwalk -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Connect all the terminals to the server, in as few turns as possible" url="http://kde.org/applications/games/knetwalk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz") -sha1sums=('e2c5108b23d2b7f069fa0819122ba96fb823c5d7') +sha1sums=('259a493851f84217d37cd03306618cbebf50baf8') build() { mkdir build diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD index 8447b448c..29aff7c9d 100644 --- a/extra/kdegames-kolf/PKGBUILD +++ b/extra/kdegames-kolf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193305 2013-08-19 09:56:10Z andrea $ +# $Id: PKGBUILD 195670 2013-10-01 15:28:37Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kolf -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A miniature golf game with 2d top-down view" url="http://kde.org/applications/games/kolf/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz") -sha1sums=('b3aeed99ffe55d6ca06e4af8e2a6490a41bdf3a8') +sha1sums=('1b32e7cb03ab7e8653e6f3a54f05f716e0d9ca8f') build() { mkdir build diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD index dbdd6403a..8fc26b584 100644 --- a/extra/kdegames-kollision/PKGBUILD +++ b/extra/kdegames-kollision/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193306 2013-08-19 09:56:11Z andrea $ +# $Id: PKGBUILD 195672 2013-10-01 15:28:45Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kollision -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A simple ball dodging game" url="http://kde.org/applications/games/kollision/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz") -sha1sums=('2bd85e458e3c284dad377246159af7f3f51a9d24') +sha1sums=('0c5be24b8885635de8e0ef94d70c7e5522287d3f') build() { mkdir build diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD index 2b0a2224d..2e8b6da70 100644 --- a/extra/kdegames-konquest/PKGBUILD +++ b/extra/kdegames-konquest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193307 2013-08-19 09:56:13Z andrea $ +# $Id: PKGBUILD 195674 2013-10-01 15:28:53Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-konquest -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="The KDE version of Gnu-Lactic" url="http://kde.org/applications/games/konquest/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz") -sha1sums=('fca9a8b091c62aa0ff59e1910781680de51c7846') +sha1sums=('d8333e0965289b273554d81fa97d8b4b4a3f1456') build() { mkdir build diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD index 9607d0505..8eee9fd6c 100644 --- a/extra/kdegames-kpatience/PKGBUILD +++ b/extra/kdegames-kpatience/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193308 2013-08-19 09:56:15Z andrea $ +# $Id: PKGBUILD 195676 2013-10-01 15:29:02Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kpatience -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Offers a selection of solitaire card games" url="http://kde.org/applications/games/kpat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz") -sha1sums=('2f76f802e9d72c83e5372aa8baa110aa447f5b67') +sha1sums=('34e562ec8c892bbf9775e020e1c9fb5135adf164') build() { mkdir build diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD index ddde37b5a..f6a89633b 100644 --- a/extra/kdegames-kreversi/PKGBUILD +++ b/extra/kdegames-kreversi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193309 2013-08-19 09:56:17Z andrea $ +# $Id: PKGBUILD 195678 2013-10-01 15:29:10Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kreversi -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A simple one player strategy game played against the computer" url="http://kde.org/applications/games/kreversi/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz") -sha1sums=('872a4a7f27c60e0781ec09061299c1f6ff479a5d') +sha1sums=('adc039fd970fadd76e654fcae17b522baf0be716') build() { mkdir build diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD index 3f0875cf6..837089359 100644 --- a/extra/kdegames-kshisen/PKGBUILD +++ b/extra/kdegames-kshisen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193310 2013-08-19 09:56:19Z andrea $ +# $Id: PKGBUILD 195680 2013-10-01 15:29:18Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kshisen -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles" url="http://kde.org/applications/games/kshisen/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz") -sha1sums=('05cbe373149c9b951d396022a58984428fb48919') +sha1sums=('59e6d8e1a76206dbeef8697b919f7890ecca80b3') build() { mkdir build diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD index 657f4cce7..f98487ba5 100644 --- a/extra/kdegames-ksirk/PKGBUILD +++ b/extra/kdegames-ksirk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193311 2013-08-19 09:56:20Z andrea $ +# $Id: PKGBUILD 195682 2013-10-01 15:29:25Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksirk -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A computerized version of a well known strategy game" url="http://kde.org/applications/games/ksirk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz") -sha1sums=('b7191b75ce9e33dfa693b366af388ab6e3547f0d') +sha1sums=('87fcb89e0160b8cc4e5b576f0aac3b5f074fb131') build() { mkdir build diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD index d0b76fc1a..31768db78 100644 --- a/extra/kdegames-ksnakeduel/PKGBUILD +++ b/extra/kdegames-ksnakeduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193312 2013-08-19 09:56:22Z andrea $ +# $Id: PKGBUILD 195684 2013-10-01 15:29:33Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksnakeduel -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A simple snake duel game" url="http://kde.org/applications/games/ksnakeduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz") -sha1sums=('00a781f5cfc39c51642160765417e5acc679f502') +sha1sums=('f05ea9a609b5a16d73c92ec8557a66f9c6f23b17') build() { mkdir build diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD index 7ccdf5b10..bd8d57feb 100644 --- a/extra/kdegames-kspaceduel/PKGBUILD +++ b/extra/kdegames-kspaceduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193313 2013-08-19 09:56:23Z andrea $ +# $Id: PKGBUILD 195686 2013-10-01 15:29:41Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kspaceduel -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun" url="http://kde.org/applications/games/kspaceduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz") -sha1sums=('25cc88607546efb509924a92b4e12707a44da1fe') +sha1sums=('c488e638aea02b67bab6caf4898f7d007b44e089') build() { mkdir build diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD index 94004e30d..0f16d38a9 100644 --- a/extra/kdegames-ksquares/PKGBUILD +++ b/extra/kdegames-ksquares/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193314 2013-08-19 09:56:25Z andrea $ +# $Id: PKGBUILD 195688 2013-10-01 15:29:48Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksquares -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes" url="http://kde.org/applications/games/ksquares/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz") -sha1sums=('3196c54800dd00182087ed8076a17271d4e66bc4') +sha1sums=('f649ac82973623414342f2c1b48486fc9ab94973') build() { mkdir build diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD index 7adf9286e..0de779d86 100644 --- a/extra/kdegames-ksudoku/PKGBUILD +++ b/extra/kdegames-ksudoku/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193315 2013-08-19 09:56:26Z andrea $ +# $Id: PKGBUILD 195690 2013-10-01 15:29:55Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksudoku -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A logic-based symbol placement puzzle" url="http://kde.org/applications/games/ksudoku/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz") -sha1sums=('e875827f5892ac43386baac1448459dd55dbadb3') +sha1sums=('73ac09b5e3f0d0be33aa6830349c9a20b7399d6f') build() { mkdir build diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD index 4ddb1463b..296e4649d 100644 --- a/extra/kdegames-ktuberling/PKGBUILD +++ b/extra/kdegames-ktuberling/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193316 2013-08-19 09:56:28Z andrea $ +# $Id: PKGBUILD 195692 2013-10-01 15:30:05Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ktuberling -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A simple constructor game suitable for children and adults alike" url="http://kde.org/applications/games/ktuberling/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz") -sha1sums=('7528f966835e53ca46e74ae4cf53739ed0d3cc69') +sha1sums=('e7cfb00de7a7142a164052d09ebcf07eb9f1d73a') build() { mkdir build diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD index 02a255984..0dab47f3d 100644 --- a/extra/kdegames-kubrick/PKGBUILD +++ b/extra/kdegames-kubrick/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193317 2013-08-19 09:56:30Z andrea $ +# $Id: PKGBUILD 195694 2013-10-01 15:30:14Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kubrick -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Based on the famous Rubik's Cube" url="http://kde.org/applications/games/kubrick/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz") -sha1sums=('f249947c3640872a2cdb309b63ed682559ababde') +sha1sums=('0f5ef0e814532a1ff37364c43ad05de30d974efa') build() { mkdir build diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD index d6c26d79e..1243768ca 100644 --- a/extra/kdegames-lskat/PKGBUILD +++ b/extra/kdegames-lskat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193318 2013-08-19 09:56:32Z andrea $ +# $Id: PKGBUILD 195696 2013-10-01 15:30:22Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-lskat -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players" url="http://kde.org/applications/games/lskat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz") -sha1sums=('e0e1382b022d04cbd89786232107262112893cf4') +sha1sums=('ad2736dba919a04f147f5854654a46e800830a53') build() { mkdir build diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD index 83b076f4b..e6b9a3352 100644 --- a/extra/kdegames-palapeli/PKGBUILD +++ b/extra/kdegames-palapeli/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193319 2013-08-19 09:56:34Z andrea $ +# $Id: PKGBUILD 195698 2013-10-01 15:30:31Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-palapeli -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A single-player jigsaw puzzle game" url="http://kde.org/applications/games/palapeli/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'qhull') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz") -sha1sums=('c4cc64e2969e815e1f23d8c89f418e498cbe334a') +sha1sums=('162da00abfdd31958935e30cb5622f4fd29ab48e') build() { mkdir build diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD index 0de38efb9..79df436f1 100644 --- a/extra/kdegames-picmi/PKGBUILD +++ b/extra/kdegames-picmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193320 2013-08-19 09:56:39Z andrea $ +# $Id: PKGBUILD 195700 2013-10-01 15:30:39Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-picmi -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A nonogram logic game for KDE" url="http://kde.org/applications/games/picmi/" @@ -15,7 +15,7 @@ replaces=('picmi') conflicts=('picmi') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz") -sha1sums=('80d577618e1b957f6fe57986ef03ab42437d914f') +sha1sums=('2399ba362a6d97d556de2e7e4fce0d21b294fcbf') build() { mkdir build diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index 7986ca53d..4c133c1e6 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193321 2013-08-19 09:56:42Z andrea $ +# $Id: PKGBUILD 195702 2013-10-01 15:30:46Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('3b8b06db3a696e397a28522df605fd91f41a9fef') +sha1sums=('a52c8c0312e5fd90e7a62099bd4a1a70fc5d37c0') build() { mkdir build diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 8557acc33..71f14ad38 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193322 2013-08-19 09:56:43Z andrea $ +# $Id: PKGBUILD 195704 2013-10-01 15:30:54Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libgphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('54ad8e61aca0016d23f996a374fafcf1a838342e') +sha1sums=('23008a038d247f81ad7878257eec329008a65f7e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 2990392f0..0bd1a2fca 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193323 2013-08-19 09:56:44Z andrea $ +# $Id: PKGBUILD 195706 2013-10-01 15:31:02Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('6d41705b23ad12051b6b0347408c3ed2db753386') +sha1sums=('fedbdf1ead8bc1096c5c0da5fd9e857f67798ca5') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 4ac2a7583..8a97a44ea 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193324 2013-08-19 09:56:46Z andrea $ +# $Id: PKGBUILD 195708 2013-10-01 15:31:10Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('14a2f4868664a35ab3685203584fe1673257dba6') +sha1sums=('b65fe9770310f60c2a9f951424100d0a02d13fa5') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index cb406d77f..51c44fe15 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193325 2013-08-19 09:56:47Z andrea $ +# $Id: PKGBUILD 195710 2013-10-01 15:31:18Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('529d62b18f458d0c8d49ccaa16919755e974eb7d') +sha1sums=('bd7cb2c69daa94e19db34ac0eff2c4d494ba1491') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 010f6af99..6ce8e1a80 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193326 2013-08-19 09:56:49Z andrea $ +# $Id: PKGBUILD 195712 2013-10-01 15:31:25Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('fa541ee3daefd5ac8135638ee166bc13bb2d0b29') +sha1sums=('01fa3df0c2a5e55e447ac9e03321f4ac299572e9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index a6d80fcb7..eedbeaa47 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193327 2013-08-19 09:56:51Z andrea $ +# $Id: PKGBUILD 195714 2013-10-01 15:31:33Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('ebea5febb727fd2aa4a9e8cef8c04b53ad7356e5') +sha1sums=('baf3f8d92e683f53f7fce59d7854783223942877') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 39d64d857..5be7b819b 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193328 2013-08-19 09:56:53Z andrea $ +# $Id: PKGBUILD 195716 2013-10-01 15:31:41Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('85c905639a2b57bf096fb28b52ba25edded3d2d3') +sha1sums=('2eaaa87438d3ee2b24fc1af61c1b18c4307f570d') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 1d6feb2b9..91c2311b8 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193329 2013-08-19 09:56:55Z andrea $ +# $Id: PKGBUILD 195718 2013-10-01 15:31:48Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('bbfdb3bc09a307b9277269629c86bb2ebe9656f6') +sha1sums=('d1ab52f21a3908cebe22348e9aee3d649d2f32c5') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index d82c59a75..95f324035 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193226 2013-08-19 09:54:19Z andrea $ +# $Id: PKGBUILD 195512 2013-10-01 15:14:45Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('c163bff59c0f145a88c38d4c3042a6d104793399') +sha1sums=('9910de294467ab7b056983040abcff458ade1792') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index a081602f6..0043653d9 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193330 2013-08-19 09:56:57Z andrea $ +# $Id: PKGBUILD 195720 2013-10-01 15:31:56Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('2f037b6cec2d0d49615c9c4b517e5eca22eb4385') +sha1sums=('df681ed83bdbbcffd66905d56001695c255d1d1d') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index 0747c884f..ee45f0ac0 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193331 2013-08-19 09:56:58Z andrea $ +# $Id: PKGBUILD 195722 2013-10-01 15:32:04Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A KPart for viewing SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('e68c517dff6f5b5771e0b1c75d2a8f0204e5540b') +sha1sums=('28bc50ca0e7f414e38168df9a224c2dd3883ba24') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index c2d687f29..5a0b2dbba 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193332 2013-08-19 09:56:59Z andrea $ +# $Id: PKGBUILD 195724 2013-10-01 15:32:13Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('51cbd5cef7dbe265a9c8f4f09cdb710bb8eb506b') +sha1sums=('7b25127d63f0bf4e8d67af21d4fd9bf636e9b691') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 0e283940e..1aec6c8fc 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193333 2013-08-19 09:57:01Z andrea $ +# $Id: PKGBUILD 195726 2013-10-01 15:32:21Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('dd22eb26047aef9f332af6c60c073685ccbcb9cb') +sha1sums=('56cf44401ce26e6b25ce1dcd6cfa02ac09eed7eb') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 41c1af898..c3c584726 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193334 2013-08-19 09:57:02Z andrea $ +# $Id: PKGBUILD 195728 2013-10-01 15:32:28Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" @@ -14,7 +14,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('9249ffcaf51ddc87df87e347bdc3cb9506e554ea') +sha1sums=('b3c68741c9aff01aee8fb3c5bd3d3d7e14ddd5a7') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 7c71b0020..b434b51de 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193335 2013-08-19 09:57:04Z andrea $ +# $Id: PKGBUILD 195730 2013-10-01 15:32:37Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' @@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('e39a2dbb8da47fb1ec667c266b37f95707bd22cd') +sha1sums=('066f3802c91125b821dde01ae3484fc98ba6cba4') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index d42c94dab..e4382e24e 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193336 2013-08-19 09:57:05Z andrea $ +# $Id: PKGBUILD 195732 2013-10-01 15:32:45Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('13b966c9c9450570feb1c46b3f39bf58f1e149a3') +sha1sums=('7b9b04f3f0957b7b2afa51f55a4c9d4691ba2c2c') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index d70c42a51..e3ad2eeb6 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193337 2013-08-19 09:57:07Z andrea $ +# $Id: PKGBUILD 195734 2013-10-01 15:32:52Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('2a0e9d5c898537343b134b2e62c2de8631081f5c') +sha1sums=('e47a77c19a00e9a68f36158e3c320204ca5c2707') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index e369e8454..e7a1297bd 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193338 2013-08-19 09:57:08Z andrea $ +# $Id: PKGBUILD 195736 2013-10-01 15:32:59Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('b1e6dccfab3c2c4246bcff43880ab8e9938ee915') +sha1sums=('0380536835dfc97121f4de2a68ac574a38148b3f') build() { mkdir build diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index cbc807b86..cc5d3cd6f 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193339 2013-08-19 09:57:10Z andrea $ +# $Id: PKGBUILD 195738 2013-10-01 15:33:07Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('b71789470433ce8c555857301781fc47e5bbc12c') +sha1sums=('ea9b2fbb067894bef2b1e60cb72c1f7bfd0e9151') build() { cd "${srcdir}" diff --git a/extra/kdenetwork-filesharing/PKGBUILD b/extra/kdenetwork-filesharing/PKGBUILD index b5381e338..07fcc6f3c 100644 --- a/extra/kdenetwork-filesharing/PKGBUILD +++ b/extra/kdenetwork-filesharing/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-filesharing -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Properties dialog plugin to share a directory with the local network' url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-filesharing' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'smbclient') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-filesharing-${pkgver}.tar.xz") -sha1sums=('02fb41306fb3bc6b42d3c478665a8df5958d0268') +sha1sums=('14c94385f1476b4debfee4c211080b6087ce6708') build() { mkdir build diff --git a/extra/kdenetwork-kdnssd/PKGBUILD b/extra/kdenetwork-kdnssd/PKGBUILD index 205b435c2..1a34b4624 100644 --- a/extra/kdenetwork-kdnssd/PKGBUILD +++ b/extra/kdenetwork-kdnssd/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-kdnssd -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Monitors the network for DNS-SD services' url='https://projects.kde.org/projects/kde/kdenetwork/kdnssd' @@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kdnssd-${pkgver}.tar.xz") -sha1sums=('d8957dab1a0516474b856bc5d1ef647be8dfb1a2') +sha1sums=('ff10bfe39a968101a582705e0c844dcf545e8cb1') build() { mkdir build diff --git a/extra/kdenetwork-kget/PKGBUILD b/extra/kdenetwork-kget/PKGBUILD index 7f1d1fbba..4678b20e4 100644 --- a/extra/kdenetwork-kget/PKGBUILD +++ b/extra/kdenetwork-kget/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-kget -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Download Manager' url='http://kde.org/applications/internet/kget/' @@ -13,7 +13,7 @@ depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms' 'gpgme' 'nepom makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kget-${pkgver}.tar.xz") -sha1sums=('a31afa2747a50edbd20fe785e75c8746e0684c83') +sha1sums=('ea08c57090046987d0d4d5c8ad991364fccde471') build() { mkdir build diff --git a/extra/kdenetwork-kppp/PKGBUILD b/extra/kdenetwork-kppp/PKGBUILD index 9c1834c6b..e31b67888 100644 --- a/extra/kdenetwork-kppp/PKGBUILD +++ b/extra/kdenetwork-kppp/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-kppp -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Internet Dial-Up Tool' url='http://kde.org/applications/internet/kppp/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'ppp') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kppp-${pkgver}.tar.xz") -sha1sums=('5322ed6fe8122940f618c04dd51c6dbff7b9f437') +sha1sums=('4ae9bea4814db06162e73b3bd496f023d74f488c') build() { mkdir build diff --git a/extra/kdenetwork-krdc/PKGBUILD b/extra/kdenetwork-krdc/PKGBUILD index e9f54c790..27459761b 100644 --- a/extra/kdenetwork-krdc/PKGBUILD +++ b/extra/kdenetwork-krdc/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-krdc -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Remote Desktop Client' url='http://kde.org/applications/internet/krdc/' @@ -15,7 +15,7 @@ optdepends=('libvncserver: VNC support' 'freerdp: RDP support' 'kdebase-keditbookmarks: to edit bookmarks') source=("http://download.kde.org/stable/${pkgver}/src/krdc-${pkgver}.tar.xz") -sha1sums=('4e25aa290996c2c8b75fcfadad2d983fcadde390') +sha1sums=('4df48d142823505770f47a8ac99454e8b2855a74') build() { mkdir build diff --git a/extra/kdenetwork-krfb/PKGBUILD b/extra/kdenetwork-krfb/PKGBUILD index 667598f69..7ba2f81c3 100644 --- a/extra/kdenetwork-krfb/PKGBUILD +++ b/extra/kdenetwork-krfb/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-krfb -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Desktop Sharing' url='http://www.kde.org/applications/system/krfb' @@ -15,7 +15,7 @@ groups=('kde' 'kdenetwork') depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/krfb-${pkgver}.tar.xz") -sha1sums=('06dd1c34622e7bb2748053e262bdb5e087997b1c') +sha1sums=('b5b7b6c229f7c60382aa30dbf7726ad6044a4d6a') build() { mkdir build diff --git a/extra/kdenetwork-strigi-analyzers/PKGBUILD b/extra/kdenetwork-strigi-analyzers/PKGBUILD index 9b5e2f728..a0d929e08 100644 --- a/extra/kdenetwork-strigi-analyzers/PKGBUILD +++ b/extra/kdenetwork-strigi-analyzers/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdenetwork-strigi-analyzers -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Strigi analyzers for various network protocols' url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-strigi-analyzers' @@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-strigi-analyzers-${pkgver}.tar.xz") -sha1sums=('0227e4686eea9b1f228e6bc15dfe8fa9ec270d5b') +sha1sums=('e59c6497f15c60ee703fb3c376da2e8d9a9ec021') build() { mkdir build diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 62873681b..2086e3dff 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193223 2013-08-19 09:54:16Z andrea $ +# $Id: PKGBUILD 195506 2013-10-01 15:14:20Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab' 'libkfbapi') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ec2a45baf0c2c2ccea633b599a453db52b38dc75') +sha1sums=('acc133c3c9d5cff0cdc9901b5ff7bd8b31a15825') prepare() { mkdir build diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD new file mode 100644 index 000000000..c837d5d44 --- /dev/null +++ b/extra/kdepim/PKGBUILD @@ -0,0 +1,264 @@ +# $Id: PKGBUILD 195756 2013-10-01 15:34:28Z svenstaro $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdepim +pkgname=('kdepim-akonadiconsole' + 'kdepim-akregator' + 'kdepim-blogilo' + 'kdepim-console' + 'kdepim-kaddressbook' + 'kdepim-kalarm' + 'kdepim-kjots' + 'kdepim-kleopatra' + 'kdepim-kmail' + 'kdepim-knode' + 'kdepim-knotes' + 'kdepim-kontact' + 'kdepim-korganizer' + 'kdepim-kresources' + 'kdepim-ktimetracker' + 'kdepim-ktnef' + 'kdepim-libkdepim') +pkgver=4.11.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://pim.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdepim') +makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' + 'kde-agent' 'nepomuk-widgets' 'link-grammar') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('027a6560bcd8f55659f642f2041f1265453a02ad') + +build() { + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF + make +} + +package_kdepim-akonadiconsole() { + pkgdesc='Akonadi Management and Debugging Console' + depends=('kdepim-libkdepim' 'nepomuk-widgets') + url='http://pim.kde.org' + install='kdepim.install' + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install +} + +package_kdepim-akregator() { + pkgdesc='A Feed Reader for KDE' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/akregator/" + install='kdepim-akregator.install' + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install +} + +package_kdepim-blogilo() { + pkgdesc='A KDE Blogging Client' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/blogilo/" + replaces=('blogilo') + conflicts=('blogilo') + install='kdepim.install' + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/composereditor-ng + make DESTDIR="${pkgdir}" install +} + +package_kdepim-console() { + pkgdesc='Command line tool for accessing calendar files' + depends=('kdepim-runtime') + url='http://pim.kde.org' + install='kdepim.install' + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kabcclient + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/konsolekalendar + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kaddressbook() { + pkgdesc='Contact Manager' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kaddressbook/" + install='kdepim.install' + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kalarm() { + pkgdesc='Personal Alarm Scheduler' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kalarm/" + install='kdepim.install' + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kjots() { + pkgdesc='Note Taker' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" + install='kdepim.install' + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kleopatra() { + pkgdesc='Certificate Manager and Unified Crypto GUI' + depends=('kdepim-libkdepim') + install=kdepim-kleopatra.install + url="http://kde.org/applications/utilities/kleopatra/" + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kwatchgnupg + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kmail() { + pkgdesc='Mail Client' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/kmail/" + install='kdepim-kmail.install' + conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' + 'kdepim-mimelib' 'kdepim-plugins') + for i in kmail doc/kmail kmailcvt archivemailagent \ + importwizard ksendemail libksieve messagelist mailfilteragent \ + ontologies kontact/plugins/kmail headerthemeeditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-knode() { + pkgdesc='News Reader' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/internet/knode/" + install='kdepim-knode.install' + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kioslave/news + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install +} + +package_kdepim-knotes() { + pkgdesc='Popup Notes' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/knotes/" + install='kdepim.install' + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install +} + +package_kdepim-kontact() { + pkgdesc='Personal Information Manager' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/kontact/" + install='kdepim.install' + conflcits=('kdepim-kontactinterfaces') + replaces=('kdepim-kontactinterfaces') + for i in kontact/src doc/kontact kontact/plugins/summary \ + kontact/plugins/specialdates doc/kontact-admin; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-korganizer() { + pkgdesc='Calendar and Scheduling Program' + depends=('kdepim-libkdepim') + url="http://kde.org/applications/office/korganizer" + install='kdepim-korganizer.install' + for i in korganizer doc/korganizer kontact/plugins/korganizer \ + calendarviews; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} + +package_kdepim-kresources() { + pkgdesc='KDE PIM resources' + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktimetracker() { + pkgdesc='Personal Time Tracker' + depends=('kdepim-kresources') + url="http://kde.org/applications/utilities/ktimetracker/" + install='kdepim.install' + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install +} + +package_kdepim-ktnef() { + pkgdesc='A viewer/extractor for TNEF files' + depends=('kdebase-runtime' 'kdepimlibs') + url="https://projects.kde.org/projects/kde/kdepim/ktnef" + install=kdepim-ktnef.install + cd "${srcdir}"/build/ktnef + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktnef + make DESTDIR="${pkgdir}" install +} + +package_kdepim-libkdepim() { + pkgdesc='Library for KDE PIM' + groups=() + depends=('kde-agent' 'kdepim-runtime' 'link-grammar') + url='http://pim.kde.org' + conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-akonadi') + replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' + 'kdepim-akonadi') + for i in akonadi_next calendarsupport incidenceeditor-ng \ + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + mailcommon mailimporter messagecomposer messagecore messageviewer \ + icons templateparser plugins/messageviewer grammar sendlateragent \ + plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install + done +} diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 31e2f5552..bee074d41 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193219 2013-08-19 09:54:12Z andrea $ +# $Id: PKGBUILD 195498 2013-10-01 15:13:18Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('8fa13be4729184b50edf404cc7de8dbd97c23636') +sha1sums=('8808bee93143b4b0bbcfc8fb670efb9613ddae29') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 27de75444..47e2ba4d5 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193349 2013-08-19 09:57:27Z andrea $ +# $Id: PKGBUILD 195758 2013-10-01 15:34:46Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdeplasma-addons' @@ -86,10 +86,13 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('33272760868e18128a98c5fa7aeecdc973f79a3b') +sha1sums=('2060310ec0dbd2f5b12ac2f783de85689c9df9e8') + +prepare() { + mkdir build +} build() { - mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdeplasma-addons/kdebug-324661.patch b/extra/kdeplasma-addons/kdebug-324661.patch new file mode 100644 index 000000000..92de3fcc9 --- /dev/null +++ b/extra/kdeplasma-addons/kdebug-324661.patch @@ -0,0 +1,76 @@ +commit 7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6 +Author: Eike Hein <hein@kde.org> +Date: Mon Sep 9 23:12:45 2013 +0200 + + Spin the event loop before destroying the menu. + + This allows the menu implementation to complete toggling the + launcher before the instance is destroyed. It's extremely un- + fortunate that the library currently requires this careful + handling; see e944d7ae in kde-workspace for a note on what + needs to be cleaned up there. + + BUG:324661 + +diff --git a/applets/icontasks/windowtaskitem.cpp b/applets/icontasks/windowtaskitem.cpp +index 970c19f..61b39ef 100644 +--- a/applets/icontasks/windowtaskitem.cpp ++++ b/applets/icontasks/windowtaskitem.cpp +@@ -406,17 +406,18 @@ void WindowTaskItem::showContextMenu(const QPoint &pos, bool showAppMenu) + actionList.append(configAction); + } + +- TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>()); +- menu.adjustSize(); ++ TaskManager::BasicMenu * menu = new TaskManager::BasicMenu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>()); ++ menu->adjustSize(); + + if (m_applet->formFactor() != Plasma::Vertical) { +- menu.setMinimumWidth(size().width()); ++ menu->setMinimumWidth(size().width()); + } + + Q_ASSERT(m_applet->containment()); + Q_ASSERT(m_applet->containment()->corona()); + stopWindowHoverEffect(); +- menu.exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu.size()) : pos); ++ menu->exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu->size()) : pos); ++ menu->deleteLater(); + delete a; + } + +commit b56d1552e9a8f8efe8fb8fd641126e78627c61a9 +Author: Eike Hein <hein@kde.org> +Date: Mon Sep 9 23:33:30 2013 +0200 + + Fix it for non-running items too. + + BUG:324661 + +diff --git a/applets/icontasks/applauncheritem.cpp b/applets/icontasks/applauncheritem.cpp +index b5f646c..f721b5a 100644 +--- a/applets/icontasks/applauncheritem.cpp ++++ b/applets/icontasks/applauncheritem.cpp +@@ -100,17 +100,18 @@ void AppLauncherItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e) + actionList.append(configAction); + } + +- TaskManager::BasicMenu menu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu()); +- menu.adjustSize(); ++ TaskManager::BasicMenu *menu = new TaskManager::BasicMenu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu()); ++ menu->adjustSize(); + + if (m_applet->formFactor() != Plasma::Vertical) { +- menu.setMinimumWidth(size().width()); ++ menu->setMinimumWidth(size().width()); + } + + Q_ASSERT(m_applet->containment()); + Q_ASSERT(m_applet->containment()->corona()); + stopWindowHoverEffect(); +- menu.exec(m_applet->containment()->corona()->popupPosition(this, menu.size())); ++ menu->exec(m_applet->containment()->corona()->popupPosition(this, menu->size())); ++ menu->deleteLater(); + } + + diff --git a/extra/kdesdk-cervisia/PKGBUILD b/extra/kdesdk-cervisia/PKGBUILD index 3208582de..569da4072 100644 --- a/extra/kdesdk-cervisia/PKGBUILD +++ b/extra/kdesdk-cervisia/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-cervisia -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='CVS Frontend' url='http://kde.org/applications/development/cervisia/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cervisia-${pkgver}.tar.xz") -sha1sums=('2cb067a3f739225ac5282cf1095eaee644f792b6') +sha1sums=('326bbab5cdb7a26d40a9813d3b6b63008e748b25') build() { mkdir build diff --git a/extra/kdesdk-dev-scripts/PKGBUILD b/extra/kdesdk-dev-scripts/PKGBUILD index 5969d10c5..543a7bde1 100644 --- a/extra/kdesdk-dev-scripts/PKGBUILD +++ b/extra/kdesdk-dev-scripts/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-dev-scripts -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Scripts and setting files useful during development of KDE software' url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts' @@ -12,7 +12,7 @@ groups=('kde' 'kdesdk') depends=('kdebase-runtime' 'python2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-scripts-${pkgver}.tar.xz") -sha1sums=('65af660df5e90f55c45a5ec52f7df8371d0d6e56') +sha1sums=('228df6780ba192d6b345df10aefeb49254f13362') build() { mkdir build diff --git a/extra/kdesdk-dev-utils/PKGBUILD b/extra/kdesdk-dev-utils/PKGBUILD index 9a308e91c..bbace57b0 100644 --- a/extra/kdesdk-dev-utils/PKGBUILD +++ b/extra/kdesdk-dev-utils/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-dev-utils -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks' url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils' @@ -17,7 +17,7 @@ replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod' 'kdesdk-kstartperf' 'kdesdk-kuiviewer') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-utils-${pkgver}.tar.xz") -sha1sums=('5242c8db5176859838438ba0e24e30bd7afc862c') +sha1sums=('156728376241093275639b0ac97736c432ee99ce') build() { mkdir build diff --git a/extra/kdesdk-dolphin-plugins/PKGBUILD b/extra/kdesdk-dolphin-plugins/PKGBUILD index 7eddb21b6..70c8cb4c2 100644 --- a/extra/kdesdk-dolphin-plugins/PKGBUILD +++ b/extra/kdesdk-dolphin-plugins/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-dolphin-plugins -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Extra Dolphin plugins' url='https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins' @@ -17,7 +17,7 @@ optdepends=('bzr: bazaar support' 'subversion: svn support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/dolphin-plugins-${pkgver}.tar.xz") -sha1sums=('e58a4908dfcfcab93dc39dfe465df074153df81d') +sha1sums=('74e493c65046dc7e42dda1309650ca7c4ca9fc85') build() { mkdir build diff --git a/extra/kdesdk-kapptemplate/PKGBUILD b/extra/kdesdk-kapptemplate/PKGBUILD index 058d1a532..d979f81eb 100644 --- a/extra/kdesdk-kapptemplate/PKGBUILD +++ b/extra/kdesdk-kapptemplate/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-kapptemplate -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='KDE Template Generator' url='http://kde.org/applications/development/kapptemplate/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kapptemplate-${pkgver}.tar.xz") -sha1sums=('a0fc6ca7906f8bfb54298f9e63367c269913d5e2') +sha1sums=('083698f4329337ef4e96b54ad30e9e7b9ed2eede') build() { mkdir build diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 194163962..e5be2b6a1 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 193228 2013-08-19 09:54:21Z andrea $ +# $Id: PKGBUILD 195516 2013-10-01 15:15:04Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('0032f388618fa3d035ee206e3014c362d419b965' +sha1sums=('3cb7211d2523b955d640808d45feaa68699f11f7' '80c324c9db81c07a02374e7a092d75e0bdd6b4ea') prepare() { diff --git a/extra/kdesdk-kcachegrind/PKGBUILD b/extra/kdesdk-kcachegrind/PKGBUILD index 6f0f8b58c..b3c029b5a 100644 --- a/extra/kdesdk-kcachegrind/PKGBUILD +++ b/extra/kdesdk-kcachegrind/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-kcachegrind -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Visualization of Performance Profiling Data' url='http://kde.org/applications/development/kcachegrind/' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('php: PHP support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcachegrind-${pkgver}.tar.xz") -sha1sums=('394666271ad4997710e937f0db8f80c80790c8c9') +sha1sums=('e04d45340696709aef2a569d16996ac1f0633820') build() { mkdir build diff --git a/extra/kdesdk-kioslaves/PKGBUILD b/extra/kdesdk-kioslaves/PKGBUILD index cca0cc654..ac846f03c 100644 --- a/extra/kdesdk-kioslaves/PKGBUILD +++ b/extra/kdesdk-kioslaves/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-kioslaves -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='KIO-Slaves' url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'subversion') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-kioslaves-${pkgver}.tar.xz") -sha1sums=('020946f037978a95d3d336a5bb7af33987f94142') +sha1sums=('865bf780ac091884bc486aa3d64c75c0ece183e4') build() { mkdir build diff --git a/extra/kdesdk-kompare/PKGBUILD b/extra/kdesdk-kompare/PKGBUILD index bc3321988..8795b8e04 100644 --- a/extra/kdesdk-kompare/PKGBUILD +++ b/extra/kdesdk-kompare/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-kompare -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Diff/Patch Frontend' url='http://kde.org/applications/development/kompare/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kompare-${pkgver}.tar.xz") -sha1sums=('6a9f483bfbbdf7df1d1178400c67435cfdb103bb') +sha1sums=('fc9e07e3ace90d83a010d8949dcddf6519b0917e') build() { mkdir build diff --git a/extra/kdesdk-lokalize/PKGBUILD b/extra/kdesdk-lokalize/PKGBUILD index b7b4cb431..51b3032fe 100644 --- a/extra/kdesdk-lokalize/PKGBUILD +++ b/extra/kdesdk-lokalize/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-lokalize -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Computer-Aided Translation System' url='http://kde.org/applications/development/lokalize/' @@ -11,20 +11,22 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdesdk') depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzers') makedepends=('cmake' 'automoc4') -optdepends=('translate-toolkit: enable extra python script') +optdepends=('translate-toolkit: enable extra scripts' + 'kdebindings-kross-python: enable python scripts') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/lokalize-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('b0e606806db9188c95e49d139ba58d417232d3a3' +sha1sums=('875429ea7297003843efa357bf1e110eed967075' '07db42bbcae402c292eebf002e549b04162621c5') prepare() { + mkdir build + cd lokalize-${pkgver} patch -p2 -i "${srcdir}"/fix-python2-path.patch } build() { - mkdir build cd build cmake ../lokalize-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdesdk-okteta/PKGBUILD b/extra/kdesdk-okteta/PKGBUILD index 7c1488545..260918745 100644 --- a/extra/kdesdk-okteta/PKGBUILD +++ b/extra/kdesdk-okteta/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-okteta -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Hex Editor' url='http://kde.org/applications/utilities/okteta/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okteta-${pkgver}.tar.xz") -sha1sums=('9861ed34933f032912a69701e819ff6913a8a49c') +sha1sums=('c7616231bf0b3d4273075a05c52c67ae2f80b721') build() { mkdir build diff --git a/extra/kdesdk-poxml/PKGBUILD b/extra/kdesdk-poxml/PKGBUILD index 09372e164..8815145da 100644 --- a/extra/kdesdk-poxml/PKGBUILD +++ b/extra/kdesdk-poxml/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-poxml -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Translates DocBook XML files using gettext po files' url='https://projects.kde.org/projects/kde/kdesdk/poxml' @@ -10,10 +10,10 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdesdk') depends=('kdelibs') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'antlr2') optdepends=('antlr2: required for po2xml and swappo tool') source=("http://download.kde.org/stable/${pkgver}/src/poxml-${pkgver}.tar.xz") -sha1sums=('197ac3dc0a85f69e932a572dae56f4666b46e16d') +sha1sums=('fa435373c74e5260a3ae423c236670f0bac70a33') build() { mkdir build diff --git a/extra/kdesdk-strigi-analyzers/PKGBUILD b/extra/kdesdk-strigi-analyzers/PKGBUILD index 8cf988b41..a6e2e98bb 100644 --- a/extra/kdesdk-strigi-analyzers/PKGBUILD +++ b/extra/kdesdk-strigi-analyzers/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-strigi-analyzers -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Analyzer plugins for strigi' url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers' @@ -12,7 +12,7 @@ groups=('kde' 'kdesdk') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-strigi-analyzers-${pkgver}.tar.xz") -sha1sums=('d6e42e178d7dbf12acd59062bbcccb033b2fa875') +sha1sums=('1635a71fdcd83060a534356b99d3c0a70ca7a6ab') build() { mkdir build diff --git a/extra/kdesdk-thumbnailers/PKGBUILD b/extra/kdesdk-thumbnailers/PKGBUILD index a473cefb1..7fd139d34 100644 --- a/extra/kdesdk-thumbnailers/PKGBUILD +++ b/extra/kdesdk-thumbnailers/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-thumbnailers -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Plugins for the thumbnailing system' url='http://kde.org/applications/development/cervisia/' @@ -12,7 +12,7 @@ groups=('kde' 'kdesdk') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-thumbnailers-${pkgver}.tar.xz") -sha1sums=('80055731dfae18f4150b28367c750e25299fe466') +sha1sums=('b4f2c15838bdb21c807b0317f505ad6209829e5a') build() { mkdir build diff --git a/extra/kdesdk-umbrello/PKGBUILD b/extra/kdesdk-umbrello/PKGBUILD index 2bc2699b9..8b6081cab 100644 --- a/extra/kdesdk-umbrello/PKGBUILD +++ b/extra/kdesdk-umbrello/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdesdk-umbrello -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='UML Modeller' url='http://kde.org/applications/development/umbrello/' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost') optdepends=('ruby') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/umbrello-${pkgver}.tar.xz") -sha1sums=('ec1552e8d854c41ef5febcee581f4cc16b8869e6') +sha1sums=('8a42f8188608610062bebd2243b88b6145a3af0a') build() { mkdir build diff --git a/extra/kdetoys-amor/PKGBUILD b/extra/kdetoys-amor/PKGBUILD index 25a778832..38cc0c33f 100644 --- a/extra/kdetoys-amor/PKGBUILD +++ b/extra/kdetoys-amor/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdetoys-amor -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='On-Screen Creature' url='https://projects.kde.org/projects/kde/kdetoys/amor' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/amor-${pkgver}.tar.xz") -sha1sums=('c596b2f57ef6cf87cddc4587178fa70e27865f47') +sha1sums=('67fe2a99457f6fc7b7dd7b84e4f6690d9134ce45') build() { mkdir build diff --git a/extra/kdetoys-kteatime/PKGBUILD b/extra/kdetoys-kteatime/PKGBUILD index b7757bf78..426f20cf7 100644 --- a/extra/kdetoys-kteatime/PKGBUILD +++ b/extra/kdetoys-kteatime/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdetoys-kteatime -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Tea Cooker' url='http://kde.org/applications/games/kteatime/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kteatime-${pkgver}.tar.xz") -sha1sums=('e3cccbe39e819e309a0ee6ddf5ccb1130aaa06c3') +sha1sums=('253b2a66d9095ce9af969b8cfe5b0f83573e1b5c') build() { mkdir build diff --git a/extra/kdetoys-ktux/PKGBUILD b/extra/kdetoys-ktux/PKGBUILD index 77c72fdae..f044d66f4 100644 --- a/extra/kdetoys-ktux/PKGBUILD +++ b/extra/kdetoys-ktux/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdetoys-ktux -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='A Tux-in-a-spaceship screen saver' url='https://projects.kde.org/projects/kde/kdetoys/ktux' @@ -13,7 +13,7 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktux-${pkgver}.tar.xz") -sha1sums=('4f3671599c2c73808e8a25f0dbc9e221f524d12c') +sha1sums=('6012c3ada2dd4096c435bf45222021c9ec989b2f') build() { mkdir build diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index 5225a5cab..3bbeaf21d 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193368 2013-08-19 09:57:52Z andrea $ +# $Id: PKGBUILD 195796 2013-10-01 15:37:12Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('9766e00c99991bb24cb6663ed2071322b6dfe309') +sha1sums=('58141b28830c223314377e0f71e09fdf0d7a67fc') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index 4e780b2b6..d2410dc5b 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193369 2013-08-19 09:57:53Z andrea $ +# $Id: PKGBUILD 195798 2013-10-01 15:37:21Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('e55d9b73c89343f2c2e87b0a53a948393b732953') +sha1sums=('371aee1cd09cae646cfe2ed98bfca5074af8173c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index 6f5357ee8..1aaf50a5b 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193370 2013-08-19 09:57:55Z andrea $ +# $Id: PKGBUILD 195800 2013-10-01 15:37:29Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('1ed1cb584d1cd51603ca3d51d4c1d7f1632ad0e6') +sha1sums=('cdec14bedb6d436e21611c71c787d5b4ad24a2f6') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index a30aa0183..1f666aecf 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193371 2013-08-19 09:57:56Z andrea $ +# $Id: PKGBUILD 195802 2013-10-01 15:37:37Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('b571b719efdf633b72065cfa1862ad662a7d81bb') +sha1sums=('4bf2e637c31916dc51682cd0174ba7391458e185') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index 2cc867f67..ac76da662 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193372 2013-08-19 09:57:57Z andrea $ +# $Id: PKGBUILD 195804 2013-10-01 15:37:44Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('c3abdbb0adeca3fa6aaac03b99e6eed1e545a8c2') +sha1sums=('6c09ec058822e742b1a34c3d720996c0208f023c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index 916b32af9..e97c30ddd 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193373 2013-08-19 09:57:58Z andrea $ +# $Id: PKGBUILD 195806 2013-10-01 15:37:52Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('46c7148a8db7160f606926f1a62062b7345267cf') +sha1sums=('a48013a5da3499d72e8edce0fd4917b2fd0bb315') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 5a6cc6847..de1ed00e0 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('4586cf32c07022f326b30249b48a8d90f0523e90') +sha1sums=('a129eb1d9c268d77caa713ab0a16e791811606f2') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 3ec4007b2..c5dd4d318 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193375 2013-08-19 09:58:03Z andrea $ +# $Id: PKGBUILD 195810 2013-10-01 15:38:07Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('c43072ad23e231c523fb15d482233daba9fafbc9') +sha1sums=('d05ed7f30847046cd04f0f69848b07223c05e994') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index 430163ae0..5fede273b 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193376 2013-08-19 09:58:07Z andrea $ +# $Id: PKGBUILD 195812 2013-10-01 15:38:15Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('a562056d062b6e91905411416c3dd978b1bf3f35') +sha1sums=('bf72073284d6e12763eb7a02a3f8742839da9cf7') build() { cd "${srcdir}" diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD index 808dfef36..e10750c6c 100644 --- a/extra/kdeutils-print-manager/PKGBUILD +++ b/extra/kdeutils-print-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193377 2013-08-19 09:58:08Z andrea $ +# $Id: PKGBUILD 195814 2013-10-01 15:38:23Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-print-manager -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A tool for managing print jobs and printers" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin conflicts=('print-manager') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz") -sha1sums=('a3c955a5746a0046609790bbd283a0fb06a27933') +sha1sums=('955be477961aed2cbcdb7a69c845fed2e8d0698a') build() { mkdir build diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index 35116f447..5547364ab 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193378 2013-08-19 09:58:09Z andrea $ +# $Id: PKGBUILD 195816 2013-10-01 15:38:31Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('125ab6827e322844b934a9606db6cd469f2136c0') +sha1sums=('2be1b912a0908bc8b43d3a401786ec58d0584f2a') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index 85b6e8f78..44897a8c6 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193379 2013-08-19 09:58:11Z andrea $ +# $Id: PKGBUILD 195818 2013-10-01 15:38:38Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('696994b80cda4cab6fbe28cee80b0d844dd070ed') +sha1sums=('e310f79fa232518b3b413b62162127e37bd1e146') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 1c8e88f40..abe2a28bd 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193380 2013-08-19 09:58:12Z andrea $ +# $Id: PKGBUILD 195820 2013-10-01 15:38:47Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('97aa1ade44ad1ed6e607d786db7db057a4dad8d8') +sha1sums=('331006c8e7b6eea5558f2d3869499484bdce1411') build() { cd $srcdir diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index ab7971c4d..63fc1edac 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170201 2012-11-05 08:17:35Z tpowa $ +# $Id: PKGBUILD 195987 2013-10-07 07:06:22Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lablgtk2 pkgver=2.16.0 -pkgrel=2 +pkgrel=3 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD index 58eb3e723..75683cabc 100644 --- a/extra/lcms/PKGBUILD +++ b/extra/lcms/PKGBUILD @@ -1,18 +1,25 @@ -# $Id: PKGBUILD 148810 2012-02-05 11:51:27Z ibiru $ +# $Id: PKGBUILD 193922 2013-09-06 07:11:54Z bpiotrowski $ # Maintainer: Tobias Kieslich <neri@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=lcms pkgver=1.19 -pkgrel=2.2 +pkgrel=4 pkgdesc="Lightweight color management development library/engine" arch=('i686' 'x86_64' 'mips64el') license=('custom') depends=('libtiff') url="http://www.littlecms.com" options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('8af94611baf20d9646c7c2c285859818') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz + cve-2013-4276.patch) +md5sums=('8af94611baf20d9646c7c2c285859818' + 'fa1db4861cfa05f4c4a2c826e1c35502') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../cve-2013-4276.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/lcms/cve-2013-4276.patch b/extra/lcms/cve-2013-4276.patch new file mode 100644 index 000000000..8f2f32297 --- /dev/null +++ b/extra/lcms/cve-2013-4276.patch @@ -0,0 +1,62 @@ +diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c +--- lcms-1.19.dfsg/samples/icctrans.c 2009-10-30 15:57:45.000000000 +0000 ++++ lcms-1.19.dfsg-patched/samples/icctrans.c 2013-08-06 11:53:14.385266647 +0100 +@@ -86,6 +86,8 @@ + static LPcmsNAMEDCOLORLIST InputColorant = NULL; + static LPcmsNAMEDCOLORLIST OutputColorant = NULL; + ++unsigned int Buffer_size = 4096; ++ + + // isatty replacement + +@@ -500,7 +502,7 @@ + + Prefix[0] = 0; + if (!lTerse) +- sprintf(Prefix, "%s=", C); ++ snprintf(Prefix, 20, "%s=", C); + + if (InHexa) + { +@@ -648,7 +650,9 @@ + static + void GetLine(char* Buffer) + { +- scanf("%s", Buffer); ++ char User_buffer[Buffer_size]; ++ fgets(User_buffer, (Buffer_size - 1), stdin); ++ sscanf(User_buffer,"%s", Buffer); + + if (toupper(Buffer[0]) == 'Q') { // Quit? + +@@ -668,7 +672,7 @@ + static + double GetAnswer(const char* Prompt, double Range) + { +- char Buffer[4096]; ++ char Buffer[Buffer_size]; + double val = 0.0; + + if (Range == 0.0) { // Range 0 means double value +@@ -738,7 +742,7 @@ + static + WORD GetIndex(void) + { +- char Buffer[4096], Name[40], Prefix[40], Suffix[40]; ++ char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40]; + int index, max; + + max = cmsNamedColorCount(hTrans)-1; +diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c +--- lcms-1.19.dfsg/tifficc/tiffdiff.c 2009-10-30 15:57:46.000000000 +0000 ++++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c 2013-08-06 11:49:06.698951157 +0100 +@@ -633,7 +633,7 @@ + cmsIT8SetSheetType(hIT8, "TIFFDIFF"); + + +- sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2); ++ snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2); + + cmsIT8SetComment(hIT8, Buffer); + diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD index 7afd28d0a..ceda6b8a8 100644 --- a/extra/lesstif/PKGBUILD +++ b/extra/lesstif/PKGBUILD @@ -1,15 +1,12 @@ -# $Id: PKGBUILD 143913 2011-11-30 20:33:57Z andrea $ +# $Id: PKGBUILD 195188 2013-09-27 04:29:31Z eric $ # Maintainer: -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=lesstif pkgver=0.95.2 -pkgrel=4.1 +pkgrel=5 pkgdesc="LGPL'd re-implementation of Motif" arch=('i686' 'x86_64' 'mips64el') -url="http://www.lesstif.org/" +url="http://sourceforge.net/projects/lesstif/" license=('LGPL' 'MIT') depends=('freetype2' 'libxt' 'libxp') [ "$CARCH" = "mips64el" ] && options=('!libtool') @@ -21,41 +18,42 @@ md5sums=('754187dbac09fcf5d18296437e72a32f' 'b1f320192a9154f72d83e9d3d5a25a2f' '30e2c0babc84696af089d55cb9cb2908') -build() { - cd "${srcdir}"/${pkgname}-${pkgver} +prepare() { + cd "${srcdir}"/${pkgname}-${pkgver} + + # https://bugs.archlinux.org/task/17712 + patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff +} - # https://bugs.archlinux.org/task/17712 - patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff +build() { + cd "${srcdir}"/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --docdir=/usr/share/doc \ - --enable-production \ - --enable-nonstandard-conversions \ - --enable-editres \ - --with-xdnd \ - --enable-build-21 \ - --disable-debug \ - --enable-static + ./configure --prefix=/usr \ + --enable-production \ + --enable-nonstandard-conversions \ + --enable-editres \ + --with-xdnd \ + --enable-build-21 \ + --disable-debug \ + --enable-static - # fix linkage against already installed version - perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool + # fix linkage against already installed version + perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool - make + make - # fix linkage against already installed version - for f in `find . -name \*.la -type f` ; do - perl -pi -e 's/^(relink_command=.*)/# $1/' $f - done + # fix linkage against already installed version + for f in $(find . -name \*.la -type f) ; do + perl -pi -e 's/^(relink_command=.*)/# $1/' $f + done - make -C lib/Mrm-2.1 + make -C lib/Mrm-2.1 } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} - make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install - make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif \ - DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" appdir=/usr/share/X11/app-defaults rootdir=/usr/share/doc/LessTif install + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD index 40409218e..614aadc62 100644 --- a/extra/leveldb/PKGBUILD +++ b/extra/leveldb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189268 2013-07-02 02:41:15Z dreisner $ +# $Id: PKGBUILD 195162 2013-09-25 22:08:21Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: feydaykyn <feydaykyn@yahoo.fr> pkgname=leveldb -pkgver=1.12.0 +pkgver=1.14.0 pkgrel=1 pkgdesc="A fast and lightweight key/value database library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="https://code.google.com/p/leveldb/" license=('BSD') depends=('gperftools' 'snappy') source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha1sums=('e7b84f239949920bfc2d7d1074ec6a6fa8869e23') +sha1sums=('641d54df4aaf7ee569ae003cfbdb888ebdee0d7f') build() { make -C "$pkgname-$pkgver" diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index a64cadc07..da95a708c 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 187863 2013-06-07 09:24:59Z tomegun $ +# $Id: PKGBUILD 194548 2013-09-18 11:33:02Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil -pkgver=1.9.3 -pkgrel=2 +pkgver=1.9.4 +pkgrel=1 pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/playground/libs/libbluedevil" license=('GPL') depends=('qt4' 'bluez4') makedepends=('cmake') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('fcb1480feba45dcd076b3ee54150bdf5') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('25d114ba52218f4cf44c7b4525399835') build() { mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${pkgname}-v${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index 9c9101c43..a79985526 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186991 2013-06-02 19:42:55Z heftig $ +# $Id: PKGBUILD 196110 2013-10-07 11:52:47Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=libchamplain -pkgver=0.12.4 +pkgver=0.12.5 pkgrel=2 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" @@ -13,7 +13,7 @@ options=('!libtool') depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('631ce8e91b02c596e29778d3f7c1d28013e2e40d080a88f2d9a06f8b79f9e493') +sha256sums=('9c937d3775053a7d6b542aad36b16bbb07e02be3adb683ae57d7dcbe89634236') build() { cd $pkgname-$pkgver diff --git a/extra/libchewing/PKGBUILD b/extra/libchewing/PKGBUILD index 9d850aa60..84f145044 100644 --- a/extra/libchewing/PKGBUILD +++ b/extra/libchewing/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 176851 2013-02-01 14:39:29Z bisson $ -# Contributor: damir <damir@archlinux.org> -# Contributor: whisky <archlinux.cle(at)gmail.com> +# $Id: PKGBUILD 194021 2013-09-10 06:55:01Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: whisky <archlinux.cle(at)gmail.com> +# Contributor: damir <damir@archlinux.org> pkgname=libchewing -pkgver=0.3.4 +pkgver=0.3.5 pkgrel=1 -pkgdesc='Intelligent Zhuyin input method library for traditional Chinese' +pkgdesc='Intelligent Chinese phonetic input method' +url='http://chewing.im/' arch=('i686' 'x86_64' 'mips64el') -url='http://chewing.csie.net/' license=('GPL') options=('!libtool') source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('631a613df00409b51adebb8b2dc33c5e6a006834') +sha1sums=('5ee3941f0f62fa14fbda53e1032970b04a7a88b7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libcryptui/PKGBUILD b/extra/libcryptui/PKGBUILD new file mode 100644 index 000000000..e610adb9d --- /dev/null +++ b/extra/libcryptui/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 196111 2013-10-07 11:52:48Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Balló György <ballogyor+arch at gmail dot com> + +pkgname=libcryptui +pkgver=3.10.0 +pkgrel=1 +pkgdesc="Library for OpenPGP prompts" +arch=('i686' 'x86_64' 'mips64el') +url="http://git.gnome.org/browse/libcryptui/" +license=('GPL') +depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('ceeba7ebdcda768d671e9df9332b18d4f25edd1f4d91e86a241c3c1f3ffc6332') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/extra/libcryptui/libcryptui.install b/extra/libcryptui/libcryptui.install new file mode 100644 index 000000000..7a903e80c --- /dev/null +++ b/extra/libcryptui/libcryptui.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index ba372dd96..096406399 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192092 2013-08-05 19:32:28Z eric $ +# $Id: PKGBUILD 195896 2013-10-03 23:11:52Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Eric Gillingham <sysrq@sysrq.tk> pkgname=libdiscid -pkgver=0.5.2 +pkgver=0.6.1 pkgrel=1 pkgdesc="A Library for creating MusicBrainz DiscIDs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('glibc') options=('!libtool') source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") -md5sums=('ce5141be6082cf2f8a31f624ce8510c9') +md5sums=('98c4b281780707e6b446cc526a825e7a') build() { cd ${pkgname}-${pkgver} diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index fb8249bd4..c9b28d1b9 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190056 2013-07-13 17:35:10Z andyrtr $ +# $Id: PKGBUILD 194427 2013-09-16 10:28:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm @@ -8,7 +8,7 @@ pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') license=('custom') depends=('glibc' 'libpciaccess') -makedepends=('cairo') +checkdepends=('cairo') [ "$CARCH" != "mips64el" ] && makedepends+=('clang' 'valgrind') replaces=('libdrm-new' 'libdrm-nouveau') options=('!libtool') diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD index 4bdad975b..c44f8e725 100644 --- a/extra/libdvbpsi/PKGBUILD +++ b/extra/libdvbpsi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184029 2013-05-01 14:46:54Z foutrelis $ +# $Id: PKGBUILD 195173 2013-09-26 15:48:02Z foutrelis $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=libdvbpsi -pkgver=0.2.2 +pkgver=1.1.0 pkgrel=1 epoch=1 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables" @@ -15,7 +15,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5') conflicts=('libdvbpsi4' 'libdvbpsi5') url="http://developers.videolan.org/libdvbpsi/" source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b387e07ffd844b61c7a050c47307c0f7') +md5sums=('1f84f9d1de08e15f94e6ff9957278064') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD index 41146c232..840851852 100644 --- a/extra/libdvdcss/PKGBUILD +++ b/extra/libdvdcss/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 180007 2013-03-14 11:52:25Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 195484 2013-10-01 06:01:26Z bpiotrowski $ +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdcss pkgver=1.2.13 -pkgrel=1 -pkgdesc="A portable abstraction library for DVD decryption" +pkgrel=2 +pkgdesc="Portable abstraction library for DVD decryption" url="http://www.videolan.org/libdvdcss" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc') options=('!libtool' '!docs' '!emptydirs') -source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +source=(http://download.videolan.org/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD new file mode 100644 index 000000000..fe5d89618 --- /dev/null +++ b/extra/libevdev/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: $ +# Maintainer: Jan de Groot + +pkgname=libevdev +pkgver=0.4 +pkgrel=2 +pkgdesc="Wrapper library for evdev devices" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/libevdev/" +license=(custom:X11) +depends=('glibc') +makedepends=('python') +options=('!libtool') +source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('ba6becd3f41430aa290ddf53694909fb46b9a65d5fe264e5fc2a4f5169484f42') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static --disable-gcov + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD index 8f7db2ec7..d54504e49 100644 --- a/extra/libgee/PKGBUILD +++ b/extra/libgee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193394 2013-08-19 16:07:01Z heftig $ +# $Id: PKGBUILD 196112 2013-10-07 11:52:50Z jgc $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libgee -pkgver=0.10.4 +pkgver=0.12.0 pkgrel=1 pkgdesc="GObject collection library" url="http://live.gnome.org/Libgee" @@ -13,7 +13,7 @@ depends=(glib2) makedepends=(gobject-introspection vala) options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bb18fbdd048a9fb474def98f8b038db62d391b658b6bdebd2504cb638798ef6b') +sha256sums=('d106ed63fe0da5d5ee89aa8197a373cf9a2b96688cc3060144bfc0a022496ea5') build() { cd $pkgname-$pkgver diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index f8f357351..1cb9f768d 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 183431 2013-04-21 22:11:18Z heftig $ +#$Id: PKGBUILD 196113 2013-10-07 11:52:52Z jgc $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ optdepends=('gnome-keyring: key storage service (or use any other service implem options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a8646f2bc62ef903be422946a6356b0718f7a4cbb29b5bdd35a84136f6b82f76') +sha256sums=('3984e99338e6e610af320a637fa84fb9e795226cfd633d7c0db452c5ae43b560') build() { cd "$pkgname-$pkgver" diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 9230c7938..5527147f5 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,40 +1,24 @@ -# $Id: PKGBUILD 185424 2013-05-14 09:29:29Z heftig $ +# $Id: PKGBUILD 196114 2013-10-07 11:52:53Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('libsoup' 'gnome-icon-theme' 'gtk3') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common') +makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool' '!emptydirs') url="http://www.gnome.org/" install=libgweather.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gettext-not-xml.patch - no_external_gettext.patch) -sha256sums=('b053c1328d756a6c653e44464b7a41bec451752fa9686ade32e2e4c6e2a6deb5' - '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533' - 'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('4feab6e5c6eb4df85e7d134982a18a6196e63bc8179cfe5a25fc727482c52996') build() { cd "$pkgname-$pkgver" - - patch -Np1 -i "$srcdir/gettext-not-xml.patch" - patch -Np1 -i "$srcdir/no_external_gettext.patch" - gtkdocize - autoreconf -fi - - cd po - intltool-update --pot - cd ../po-locations - intltool-update --gettext-package libgweather-locations --pot - cd .. ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-locations-compression + --localstatedir=/var --disable-static make } diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD index a6cb39355..358abdbd2 100644 --- a/extra/libidn/PKGBUILD +++ b/extra/libidn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178107 2013-02-16 09:56:28Z ronald $ +# $Id: PKGBUILD 194235 2013-09-11 07:58:33Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jan de Groot <jgc.archlinux.org> # Contributor: Eric Johnson <eric.archlinux.org> pkgname=libidn -pkgver=1.26 +pkgver=1.28 pkgrel=1 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications" url="http://www.gnu.org/software/libidn/" @@ -15,7 +15,7 @@ makedepends=('pkgconfig') options=('!libtool') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) install=libidn.install -sha1sums=('b1cb40646a96dadbfc41d060d23dfb382eec1128') +sha1sums=('725587211b229c156e29fa2ad116b0ef71a7ca17') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index 0ffd7e91b..9886e7ffd 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193244 2013-08-19 09:54:38Z andrea $ +# $Id: PKGBUILD 195548 2013-10-01 15:17:30Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('818157b0a306d82a102ce0e2f85ac0275323dbc5') +sha1sums=('8d2a6774f96ae08666bbfe117c77e63a4e789457') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index c958c454f..53ba20837 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193245 2013-08-19 09:54:39Z andrea $ +# $Id: PKGBUILD 195550 2013-10-01 15:17:40Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('dde519bece17036a507cff2c326e37b9e91b7d1b') +sha1sums=('bca14ffe1defbfd194f9429d051af5cb0545cede') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 809da1d78..20f392fef 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193239 2013-08-19 09:54:33Z andrea $ +# $Id: PKGBUILD 195538 2013-10-01 15:16:44Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('35618bcdf322de457669e117df28b6843ae00853') +sha1sums=('51680e9653bc7e00bb71a3744702c7f52570c672') build() { mkdir build diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 41660e120..f0aaf9993 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193237 2013-08-19 09:54:31Z andrea $ +# $Id: PKGBUILD 195534 2013-10-01 15:16:27Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('231421834163b1628690c75d0680d40b68803d73') +sha1sums=('23daf0f0371b1c7e40a376fba627bc42afeeb5a2') build() { cd "${srcdir}" diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD index 9b57124b2..5ca097c62 100644 --- a/extra/libkdegames/PKGBUILD +++ b/extra/libkdegames/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193246 2013-08-19 09:54:40Z andrea $ +# $Id: PKGBUILD 195552 2013-10-01 15:17:47Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdegames -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Common code and data for many KDE games" url="https://projects.kde.org/projects/kde/kdegames/libkdegames" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkdegames') conflicts=('kdegames-libkdegames') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('89884744f60fdb1858960444d27bc3cbde6afc26') +sha1sums=('f8a9f1ec6f92dd04bcdb7b929cf62b594e7cf641') build() { mkdir build diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index afb2aeb97..fe07d34bc 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193240 2013-08-19 09:54:34Z andrea $ +# $Id: PKGBUILD 195540 2013-10-01 15:16:52Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('9f843c1dfd3b02f52cce743ce7602f035bd35fad') +sha1sums=('51e75f8e6db99a6fd7ca8956a16636c790a9f81c') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 0388ccda7..90d879a95 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('b186a4901f330aa12a20fe0ea708be11934e20c4') +sha1sums=('291dd7ad892b2c0598642b006ad4709d669b7271') build() { cd "${srcdir}" diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD index 8be138dba..9a65a926b 100644 --- a/extra/libkmahjongg/PKGBUILD +++ b/extra/libkmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193247 2013-08-19 09:54:40Z andrea $ +# $Id: PKGBUILD 195554 2013-10-01 15:17:56Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkmahjongg -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles" url="https://projects.kde.org/projects/kde/kdegames/libmahjongg" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkmahjongg') conflicts=('kdegames-libkmahjongg') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ec7b32b5c0f767f06a36202f2276dc0fe08ebd53') +sha1sums=('f2594a7047d228160241d1aa2dd7f307dfb15921') build() { mkdir build diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 5ecfd49ad..ee8e732b4 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193242 2013-08-19 09:54:36Z andrea $ +# $Id: PKGBUILD 195544 2013-10-01 15:17:09Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('21313b183de5e602b8ae6bbf31147ad71d2130e2') +sha1sums=('9f617633c6770f0db426362df78c6dc564601533') build() { cd "${srcdir}" diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD index 6ddab8260..5a374b892 100644 --- a/extra/libkscreen/PKGBUILD +++ b/extra/libkscreen/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 192012 2013-08-04 07:18:21Z lcarlier $ +# $Id: PKGBUILD 194203 2013-09-10 14:07:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=libkscreen pkgver=1.0.1 -pkgrel=1 +pkgrel=3 pkgdesc="KDE's screen management library" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/libkscreen' license=('GPL') depends=('kdelibs' 'qjson') makedepends=('cmake' 'automoc4') -#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('52aeaf2d987bffd05b111e89b445bd00') prepare() { diff --git a/extra/libmodplug/PKGBUILD b/extra/libmodplug/PKGBUILD index fd25e0373..a63647ad9 100644 --- a/extra/libmodplug/PKGBUILD +++ b/extra/libmodplug/PKGBUILD @@ -1,28 +1,35 @@ -# $Id: PKGBUILD 150611 2012-02-18 22:54:35Z pierre $ -# Maintainer: -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> +# $Id: PKGBUILD 193909 2013-09-05 20:04:00Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libmodplug pkgver=0.8.8.4 -pkgrel=1.2 +pkgrel=2 pkgdesc="A MOD playing library" arch=(i686 x86_64 'mips64el') url="http://modplug-xmms.sourceforge.net/" license=('custom') depends=('gcc-libs') options=('!libtool') -source=("http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz") -md5sums=('fddc3c704c5489de2a3cf0fedfec59db') +source=(http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz + libmodplug-CVE-2013-4233-Fix.patch libmodplug-CVE-2013-4234-Fix.patch) +sha1sums=('df4deffe542b501070ccb0aee37d875ebb0c9e22' + 'daee7fba80f633236a3d09ad19225c57013140e9' + '2e870747261a86dce5056cbf077c5914e9e8b287') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p2 -i "${srcdir}/libmodplug-CVE-2013-4233-Fix.patch" + patch -p2 -i "${srcdir}/libmodplug-CVE-2013-4234-Fix.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libmodplug/libmodplug-CVE-2013-4233-Fix.patch b/extra/libmodplug/libmodplug-CVE-2013-4233-Fix.patch new file mode 100644 index 000000000..288b44d13 --- /dev/null +++ b/extra/libmodplug/libmodplug-CVE-2013-4233-Fix.patch @@ -0,0 +1,42 @@ +From c4d4e047862649a75f6dba905c613aff0df81309 Mon Sep 17 00:00:00 2001 +From: Konstanty Bialkowski <konstanty@ieee.org> +Date: Wed, 14 Aug 2013 14:15:27 +1000 +Subject: [PATCH] CVE-2013-4233 Fix + +Integer overflow in j variable + +-- reported by Florian "Agix" Gaultier +--- + libmodplug/src/load_abc.cpp | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/libmodplug/src/load_abc.cpp b/libmodplug/src/load_abc.cpp +index 9f4b328..ecb7b62 100644 +--- a/libmodplug/src/load_abc.cpp ++++ b/libmodplug/src/load_abc.cpp +@@ -1814,7 +1814,7 @@ static int abc_extract_tempo(const char *p, int invoice) + + static void abc_set_parts(char **d, char *p) + { +- int i,j,k,m,n; ++ int i,j,k,m,n,size; + char *q; + #ifdef NEWMIKMOD + static MM_ALLOC *h; +@@ -1852,10 +1852,11 @@ static void abc_set_parts(char **d, char *p) + i += n-1; + } + } +- q = (char *)_mm_calloc(h, j+1, sizeof(char)); // enough storage for the worst case ++ size = (j + 1) > 0 ? j+1 : j; ++ q = (char *)_mm_calloc(h, size, sizeof(char)); // enough storage for the worst case + // now copy bytes from p to *d, taking parens and digits in account + j = 0; +- for( i=0; p[i] && p[i] != '%'; i++ ) { ++ for( i=0; p[i] && p[i] != '%' && j < size; i++ ) { + if( isdigit(p[i]) || isupper(p[i]) || p[i] == '(' || p[i] == ')' ) { + if( p[i] == ')' ) { + for( n=j; n > 0 && q[n-1] != '('; n-- ) ; // find open paren in q +-- +1.8.4 + diff --git a/extra/libmodplug/libmodplug-CVE-2013-4234-Fix.patch b/extra/libmodplug/libmodplug-CVE-2013-4234-Fix.patch new file mode 100644 index 000000000..c4b105d19 --- /dev/null +++ b/extra/libmodplug/libmodplug-CVE-2013-4234-Fix.patch @@ -0,0 +1,95 @@ +From 5de53a46283e7c463115444a9339978011dab961 Mon Sep 17 00:00:00 2001 +From: Konstanty Bialkowski <konstanty@ieee.org> +Date: Wed, 14 Aug 2013 15:15:09 +1000 +Subject: [PATCH] CVE-2013-4234 Fix + +Heap overflow in abc_MIDI_drum + abc_MIDI_gchord + +-- reported by Florian "Agix" Gaultier +--- + libmodplug/src/load_abc.cpp | 34 +++++++++++++++++++++++----------- + 1 file changed, 23 insertions(+), 11 deletions(-) + +diff --git a/libmodplug/src/load_abc.cpp b/libmodplug/src/load_abc.cpp +index ecb7b62..dd9cc6b 100644 +--- a/libmodplug/src/load_abc.cpp ++++ b/libmodplug/src/load_abc.cpp +@@ -3205,27 +3205,33 @@ static void abc_MIDI_chordname(const char *p) + static int abc_MIDI_drum(const char *p, ABCHANDLE *h) + { + char *q; +- int i,n,m; ++ int i, n, m, len; + while( isspace(*p) ) p++; + if( !strncmp(p,"on",2) && (isspace(p[2]) || p[2] == '\0') ) return 2; + if( !strncmp(p,"off",3) && (isspace(p[3]) || p[3] == '\0') ) return 1; +- n = 0; ++ n = 0; len = 0; + for( q = h->drum; *p && !isspace(*p); p++ ) { + if( !strchr("dz0123456789",*p) ) break; +- *q++ = *p; +- if( !isdigit(*p) ) { +- if( !isdigit(p[1]) ) *q++ = '1'; ++ *q++ = *p; len++; ++ if( !isdigit(*p) && len < sizeof(h->drum)-1 ) { ++ if( !isdigit(p[1]) ) { *q++ = '1'; len ++; } + n++; // count the silences too.... + } ++ if (len >= sizeof(h->drum)-1) { ++ // consume the rest of the input ++ // definitely enough "drum last state" stored. ++ while ( *p && !isspace(*p) ) p++; ++ break; ++ } + } + *q = '\0'; + q = h->drumins; + for( i = 0; i<n; i++ ) { + if( h->drum[i*2] == 'd' ) { +- while( isspace(*p) ) p++; ++ while( *p && isspace(*p) ) p++; + if( !isdigit(*p) ) { + m = 0; +- while( !isspace(*p) ) p++; ++ while( *p && !isspace(*p) ) p++; + } + else + p += abc_getnumber(p,&m); +@@ -3236,10 +3242,10 @@ static int abc_MIDI_drum(const char *p, ABCHANDLE *h) + q = h->drumvol; + for( i = 0; i<n; i++ ) { + if( h->drum[i*2] == 'd' ) { +- while( isspace(*p) ) p++; ++ while( *p && isspace(*p) ) p++; + if( !isdigit(*p) ) { + m = 0; +- while( !isspace(*p) ) p++; ++ while( *p && !isspace(*p) ) p++; + } + else + p += abc_getnumber(p,&m); +@@ -3254,13 +3260,19 @@ static int abc_MIDI_drum(const char *p, ABCHANDLE *h) + static int abc_MIDI_gchord(const char *p, ABCHANDLE *h) + { + char *q; ++ int len = 0; + while( isspace(*p) ) p++; + if( !strncmp(p,"on",2) && (isspace(p[2]) || p[2] == '\0') ) return 2; + if( !strncmp(p,"off",3) && (isspace(p[3]) || p[3] == '\0') ) return 1; + for( q = h->gchord; *p && !isspace(*p); p++ ) { + if( !strchr("fbcz0123456789ghijGHIJ",*p) ) break; +- *q++ = *p; +- if( !isdigit(*p) && !isdigit(p[1]) ) *q++ = '1'; ++ *q++ = *p; len++; ++ if( !isdigit(*p) && len < sizeof(h->gchord)-1 && !isdigit(p[1]) ) { *q++ = '1'; len ++; } ++ if (len >= sizeof(h->gchord)-1) { ++ // consume the rest of the input ++ // definitely enough "drum last state" stored. ++ while ( *p && !isspace(*p) ) p++; ++ } + } + *q = '\0'; + return 0; +-- +1.8.4 + diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD index 6f1a5eddd..3ea034dae 100644 --- a/extra/libnotify/PKGBUILD +++ b/extra/libnotify/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154761 2012-03-30 16:37:09Z heftig $ +# $Id: PKGBUILD 196115 2013-10-07 11:52:55Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libnotify -pkgver=0.7.5 -pkgrel=1.1 +pkgver=0.7.6 +pkgrel=1 pkgdesc="Desktop notification library" arch=('i686' 'x86_64' 'mips64el') url="http://library.gnome.org/devel/notification-spec/" @@ -12,7 +12,7 @@ depends=('gdk-pixbuf2') makedepends=('gtk3' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4378cb47874ba4d5f759b7890d8d28d086e81d3f0bd4f6e84e5ab66d82ffb652') +sha256sums=('0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837') build() { cd ${pkgname}-${pkgver} diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD index cb2b98529..bb1e32b4e 100644 --- a/extra/libpeas/PKGBUILD +++ b/extra/libpeas/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188712 2013-06-18 13:46:20Z heftig $ +# $Id: PKGBUILD 196116 2013-10-07 11:52:58Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libpeas -pkgver=1.8.1 +pkgver=1.9.0 pkgrel=1 pkgdesc="A GObject-based plugins engine" arch=('i686' 'x86_64' 'mips64el') @@ -17,15 +17,9 @@ if [ "$CARCH" != "mips64el" ]; then fi options=('!libtool') install=libpeas.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz - js17.patch) -sha256sums=('ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d' - '094f28f911de979167c870b3ed51df09dbe3cacc271b375d891d7601c51ad44f') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../js17.patch -} build() { cd $pkgname-$pkgver diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index 3bc376d33..b5473089a 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191317 2013-07-23 14:38:48Z foutrelis $ +# $Id: PKGBUILD 194432 2013-09-16 10:42:02Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.6.3 +pkgver=1.6.5 _apngver=1.6.3 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" @@ -16,7 +16,7 @@ depends=('zlib' 'sh') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc} http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz) -md5sums=('9307f8ab04f4be3c1889ffb504f0fe5c' +md5sums=('dec292dd99b094cea03bdd7232f5a80c' 'SKIP' '57007fc121baa2cdc48abcfb26300e78') diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD index 44f4e9230..8d78ab2b2 100644 --- a/extra/libquvi/PKGBUILD +++ b/extra/libquvi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 173175 2012-12-12 00:31:54Z eric $ +# $Id: PKGBUILD 196117 2013-10-07 11:52:59Z jgc $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=libquvi -pkgver=0.4.1 -pkgrel=2 +pkgver=0.9.3 +pkgrel=1 pkgdesc='Library for parsing video download links.' arch=('i686' 'x86_64' 'mips64el') url='http://quvi.sourceforge.net/' -license=('LGPL') -depends=('libquvi-scripts' 'curl' 'lua') -conflicts=('quvi<0.4.0') +license=('AGPL3') +depends=('libquvi-scripts' 'curl' 'lua51' 'libproxy' 'libgcrypt' 'glib2') +conflicts=('quvi<0.9.0') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('a5fa8860c23655a529b3166f6e25c83a' - 'cc7f15518f8ab2fc134bc64f0e9d584b') +source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.xz"{,.sig}) +md5sums=('12a62c4fcde9b6109193191b7bd3d685' + 'SKIP') build() { cd "${pkgname}-${pkgver}" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 0aec90273..36ebc53ff 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 193796 2013-09-01 09:04:01Z andyrtr $ +# $Id: PKGBUILD 196169 2013-10-07 14:33:01Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase="libreoffice" pkgname=('libreoffice-common' @@ -18,15 +19,15 @@ pkgname=('libreoffice-common' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.1.1.2 -pkgver=4.1.1 -pkgrel=2 +_LOver=4.1.2.3 +pkgver=4.1.2 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' - 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' + 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez-libs' 'harfbuzz-icu' @@ -78,7 +79,7 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/libcdr-0.0.14.tar.bz2 ${_additional_source_url}/libmspub-0.0.6.tar.bz2 ${_additional_source_url}/libmwaw-0.1.10.tar.bz2 - ${_additional_source_url}/libvisio-0.0.30.tar.bz2 + ${_additional_source_url}/libvisio-0.0.31.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @@ -114,10 +115,10 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 libcdr-0.0.14.tar.bz2 libmspub-0.0.6.tar.bz2 libmwaw-0.1.10.tar.bz2 - libvisio-0.0.30.tar.bz2 ) -md5sums=('4eb8fd2b0d1177d19b2f797faabc4ea2' - 'f6b418a1ed94ef9d5ee30e9f5d7f305a' - 'e8c69bdb55586531cc192904467f5e24' + libvisio-0.0.31.tar.bz2 ) +md5sums=('bb2fe0056ae92e70ee8816a36dd0696c' + '761323fae73ef156f5cf188d8bd983f1' + '54f36cf305ae018ad685c331587d83e3' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -151,7 +152,7 @@ md5sums=('4eb8fd2b0d1177d19b2f797faabc4ea2' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' '2289bb137bbba9b473ce60168895c036' - '9d9eb3ae6bee763c161228b2b12e25f8' + '82628333418f101a20cd21f980cf9f40' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') @@ -450,7 +451,7 @@ package_libreoffice-draw() { package_libreoffice-gnome() { pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3 + depends=('libreoffice-common' 'gconf' 'gtk3') groups=('libreoffice') # create directories from *list.txt file diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 086f4c6e2..14627fe1a 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193630 2013-08-26 12:12:13Z jgc $ +# $Id: PKGBUILD 196119 2013-10-07 11:53:02Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.37.0 -pkgrel=1 +pkgver=2.39.0 +pkgrel=2 epoch=1 pkgdesc="A SVG viewing library" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') url="https://live.gnome.org/LibRsvg" install=librsvg.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('06c57dbcb29369d147b4e6ff4257c42ae5120c504c30fb567a27034ee30fd835') +sha256sums=('aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f') build() { cd $pkgname-$pkgver diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD index 2c6086d5c..4b002f3dd 100644 --- a/extra/libsecret/PKGBUILD +++ b/extra/libsecret/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 166488 2012-09-08 10:31:44Z jgc $ +# $Id: PKGBUILD 196120 2013-10-07 11:53:04Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsecret -pkgver=0.15 -pkgrel=2 +pkgver=0.16 +pkgrel=1 pkgdesc='library for storing and retrieving passwords and other secrets.' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="https://live.gnome.org/Libsecret" depends=('glib2' 'libgcrypt') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala') -optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets') +optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8') +sha256sums=('b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218') build() { cd "$pkgname-$pkgver" diff --git a/extra/libsidplayfp/PKGBUILD b/extra/libsidplayfp/PKGBUILD index d0f6ed36a..257d2643a 100644 --- a/extra/libsidplayfp/PKGBUILD +++ b/extra/libsidplayfp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189835 2013-07-08 22:03:31Z bisson $ +# $Id: PKGBUILD 195480 2013-10-01 01:48:17Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Simon Perry <aur [at] sanxion [dot] net> # Contributor: Jonas Nyrén <jonas.nyren*mindkiller.com> pkgname=libsidplayfp -pkgver=1.0.3 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc='Library to play Commodore 64 music derived from libsidplay2' url='http://sourceforge.net/projects/sidplay-residfp/' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') makedepends=('vice') optdepends=('vice: better SID support') source=("http://downloads.sourceforge.net/project/sidplay-residfp/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('967426a369122b9398c60be0e7d0b78753e23f3e') +sha1sums=('6c3617fcbd94fd364f3305a1c4d88485911110c7') options=('!libtool' '!staticlibs') diff --git a/extra/libsm/PKGBUILD b/extra/libsm/PKGBUILD index 907c56c8a..1a6a1bd94 100644 --- a/extra/libsm/PKGBUILD +++ b/extra/libsm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 151850 2012-03-03 13:43:52Z andyrtr $ +# $Id: PKGBUILD 194298 2013-09-13 07:26:46Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsm -pkgver=1.2.1 -pkgrel=1.1 +pkgver=1.2.2 +pkgrel=1 pkgdesc="X11 Session Management library" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" -depends=('libice' 'util-linux-ng') +depends=('libice' 'util-linux') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2) -sha1sums=('8d354a165e330022ffd3606aba562b8c8154213d') +sha256sums=('0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd') build() { cd "${srcdir}/libSM-${pkgver}" diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 51d518a4b..dff130218 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 183606 2013-04-24 20:33:35Z heftig $ +# $Id: PKGBUILD 196121 2013-10-07 11:53:05Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsoup -pkgver=2.42.2 +pkgver=2.44.0 pkgrel=1 pkgdesc="GNOME HTTP Library" arch=('i686' 'x86_64' 'mips64el') license=(LGPL) url="http://www.gnome.org" depends=(glib2 libxml2 glib-networking sqlite) -makedepends=(intltool gobject-introspection python2) +makedepends=(intltool gobject-introspection python) +checkdepends=(apache php php-apache) provides=("libsoup-gnome=$pkgver-$pkgrel") conflicts=(libsoup-gnome) replaces=(libsoup-gnome) options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1f4f9cc55ba483dc8defea0c3f97cc507dc48384c5529179e29c1e6d05630dbf') +sha256sums=('2ed9b200bda39c686d19eb4a0a5464e9166d09cbb3ced5a689c78214e83b5c27') build() { cd $pkgname-$pkgver - - # Python3 has UnicodeDecodeErrors - sed -i -e '1s/python$/&2/' libsoup/tld-parser.py - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD index b836561e8..b2c484a0c 100644 --- a/extra/libssh/PKGBUILD +++ b/extra/libssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180604 2013-03-24 15:55:47Z tomegun $ +# $Id: PKGBUILD 195938 2013-10-05 20:32:06Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: ice-man <icemanf@gmail.com> # Contributor: sergeantspoon <sergeantspoon@archlinux.us> pkgname=libssh -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="Library for accessing ssh client services through C libraries" url="http://www.libssh.org/" @@ -13,7 +13,7 @@ license=('LGPL') arch=('i686' 'x86_64' 'mips64el') depends=('openssl') makedepends=('cmake' 'doxygen') -source=("https://red.libssh.org/attachments/download/41/${pkgname}-${pkgver}.tar.gz") +source=("https://red.libssh.org/attachments/download/51/${pkgname}-${pkgver}.tar.gz") build() { cd "${srcdir}" @@ -29,4 +29,4 @@ package(){ cd "${srcdir}"/build make DESTDIR="${pkgdir}" install } -md5sums=('b8b4e733c13dfabae33b2688ef82dacc') +md5sums=('bb308196756c7255c0969583d917136b') diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index 1c41314ac..e60397f1c 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191746 2013-07-30 07:19:33Z jgc $ +# $Id: PKGBUILD 194312 2013-09-13 08:00:26Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') options=('!libtool') license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha256sums=('10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892') +sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16') build() { cd "${srcdir}/libX11-${pkgver}" diff --git a/extra/libxaw/PKGBUILD b/extra/libxaw/PKGBUILD index 63ebbb27a..19bf832eb 100644 --- a/extra/libxaw/PKGBUILD +++ b/extra/libxaw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160631 2012-06-02 21:31:52Z andyrtr $ +# $Id: PKGBUILD 194288 2013-09-13 07:15:28Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxaw -pkgver=1.0.11 +pkgver=1.0.12 pkgrel=1 pkgdesc="X11 Athena Widget library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libxmu' 'libxpm') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXaw-${pkgver}.tar.bz2) -sha256sums=('87a874acbb71d1ee59b8047312fc91d89dcb373e2970f121184cdae29a3d9492') +sha256sums=('96fc314874fce9979556321d1d6ee00b5baf32fb333b7278853b4983bc3cdbf6') build() { cd "${srcdir}/libXaw-${pkgver}" diff --git a/extra/libxmu/PKGBUILD b/extra/libxmu/PKGBUILD index b000167bb..00c14986b 100644 --- a/extra/libxmu/PKGBUILD +++ b/extra/libxmu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152301 2012-03-06 15:00:25Z andyrtr $ +# $Id: PKGBUILD 194290 2013-09-13 07:18:50Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxmu -pkgver=1.1.1 -pkgrel=1.2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="X11 miscellaneous micro-utility library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ makedepends=('xorg-util-macros') license=('custom') options=('!libtool') source=("${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2") -sha1sums=('3e280aa927d78c05f94db6c7ae606f7ad132b495') +sha256sums=('756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b') build() { cd "${srcdir}/libXmu-${pkgver}" diff --git a/extra/libxpm/PKGBUILD b/extra/libxpm/PKGBUILD index 838433bdf..78f229bc3 100644 --- a/extra/libxpm/PKGBUILD +++ b/extra/libxpm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152783 2012-03-09 16:22:06Z andyrtr $ +# $Id: PKGBUILD 194292 2013-09-13 07:20:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxpm -pkgver=3.5.10 -pkgrel=1.1 +pkgver=3.5.11 +pkgrel=1 pkgdesc="X11 pixmap library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -12,7 +12,7 @@ depends=('libxt' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2") -sha1sums=('eca9dbfa6253f7d6cc7d593dc83110c6c4876d7c') +sha256sums=('c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c') build() { cd "${srcdir}/libXpm-${pkgver}" diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD index 1dff6ef33..6fba3d84e 100644 --- a/extra/libxrandr/PKGBUILD +++ b/extra/libxrandr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186941 2013-06-01 09:48:56Z andyrtr $ +# $Id: PKGBUILD 194294 2013-09-13 07:22:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxrandr -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('libxext' 'libxrender' 'randrproto>=1.4.0') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -sha256sums=('d914a0490fd0a2ea6c3194505b5b28c56e2a277d8f4648b0275ee0ee370fb905') +sha256sums=('caa7b31ac769be51a532343c65376f1d4df3f307afaed58e34fb5e82e8b825ad') build() { cd "${srcdir}/libXrandr-${pkgver}" diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD index 2a6151bdb..36dd7d536 100644 --- a/extra/libxv/PKGBUILD +++ b/extra/libxv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188854 2013-06-23 08:21:34Z lcarlier $ +# $Id: PKGBUILD 194296 2013-09-13 07:24:42Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxv -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="X11 Video extension library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libxext' 'videoproto') makedepends=('pkgconfig') options=('!libtool') source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2") -sha256sums=('a874dbf864d0271bbe795af67ef5b3f20096c92fc11eacbf0d2af00e32bc5b4b') +sha256sums=('55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525') build() { cd "${srcdir}/libXv-${pkgver}" diff --git a/extra/libzrtpcpp/PKGBUILD b/extra/libzrtpcpp/PKGBUILD index d2050134e..47eebf2d0 100644 --- a/extra/libzrtpcpp/PKGBUILD +++ b/extra/libzrtpcpp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184149 2013-05-02 19:39:50Z eric $ +# $Id: PKGBUILD 194211 2013-09-10 14:40:23Z bpiotrowski $ # Maintainer: # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Michel Brabants <michel.brabants@euphonynet.be> pkgname=libzrtpcpp -pkgver=2.3.2 +pkgver=2.3.4 pkgrel=1 pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=('GPL3') depends=('ccrtp') makedepends=('cmake') source=(http://ftp.gnu.org/gnu/ccrtp/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('b5f0a72252785862133e9cbc9cbbd3f8' +md5sums=('3aac59472c5649736e24de30080e2efd' 'SKIP') prepare() { diff --git a/extra/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD index 8099b7997..f25e72dca 100644 --- a/extra/lightsoff/PKGBUILD +++ b/extra/lightsoff/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=lightsoff -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Turn off all the lights" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=lightsoff.install url="https://live.gnome.org/Lightsoff" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('767f7876c6f360b0e3c18243c7e2201ea0a31523df890853a572d0325d91c24b') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('920a38ebe320d3882c6a98d073388e64ba9c8bea4414c05fc16a81771b0a64a4') build() { cd $pkgname-$pkgver diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index 24ca572a3..1f2b855f8 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185242 2013-05-12 10:58:13Z pierre $ +# $Id: PKGBUILD 195225 2013-09-28 07:19:12Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd -pkgver=1.4.32 -pkgrel=5 +pkgver=1.4.33 +pkgrel=1 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ install='lighttpd.install' source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz" "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc" 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service') -sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1' +sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c' 'SKIP' '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe' 'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa' diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 7f1d2105c..605c0401f 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193833 2013-09-02 17:04:03Z giovanni $ +# $Id: PKGBUILD 194693 2013-09-22 12:59:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.08.31 +pkgver=2013.09.18 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('3321fc303bf02542018e5280efa1206c') +md5sums=('082ebd8f4cab6194db268b77780056d9') build() { cd ${srcdir}/live diff --git a/extra/ltrace/PKGBUILD b/extra/ltrace/PKGBUILD index 524420218..0ca77b8fe 100644 --- a/extra/ltrace/PKGBUILD +++ b/extra/ltrace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173009 2012-12-08 13:59:15Z foutrelis $ +# $Id: PKGBUILD 194589 2013-09-18 22:47:23Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ltrace -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Tracks runtime library calls in dynamically linked programs" arch=('i686' 'x86_64' 'mips64el') @@ -13,22 +13,23 @@ license=('GPL') depends=('elfutils') makedepends=('dejagnu') backup=('etc/ltrace.conf') -source=(https://alioth.debian.org/frs/download.php/3848/$pkgname-$pkgver.tar.bz2) -sha256sums=('bd9e7bd94ba6728fd3ec57f4bcfef8240260bea8f4fcebbc9c454d07ccc11894') +source=(https://alioth.debian.org/frs/download.php/file/3947/$pkgname-$pkgver.tar.bz2) +sha256sums=('0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503') build() { cd "$srcdir/$pkgname-$pkgver" ./configure \ --prefix=/usr \ - --sysconfdir=/etc + --sysconfdir=/etc \ + --disable-werror make } check() { cd "$srcdir/$pkgname-$pkgver" - make -k check + make -k check || true } package(){ diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 394f7d168..61d894d9f 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 193074 2013-08-15 15:18:16Z bpiotrowski $ +# $Id: PKGBUILD 195113 2013-09-25 07:07:22Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb -pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.32 -pkgrel=2 +pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb') +pkgver=5.5.33.a +_pkgver=${pkgver/.a/a} +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://mariadb.org/' makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') -source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz +source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468' +sha256sums=('adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') +prepare() { + cd $pkgbase-$_pkgver + sed -i '63d' storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake +} + build() { - cd $srcdir mkdir build cd build - cmake ../$pkgbase-$pkgver \ + cmake ../$pkgbase-$_pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -53,6 +58,7 @@ build() { -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITH_TOKUDB_STORAGE_ENGINE=1 \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ -DWITHOUT_PBXT_STORAGE_ENGINE=1 \ @@ -71,16 +77,15 @@ package_libmariadbclient() { conflicts=('libmysqlclient') provides=("libmysqlclient=$pkgver") - cd "$srcdir"/build + cd build for dir in include libmysql libmysqld libservices; do make -C $dir DESTDIR="$pkgdir" install done - install -d "$pkgdir"/usr/bin - install -m755 scripts/mysql_config "$pkgdir"/usr/bin/ + install -Dm755 scripts/mysql_config "$pkgdir"/usr/bin/mysql_config install -d "$pkgdir"/usr/share/man/man1 for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 done } @@ -90,17 +95,26 @@ package_mariadb-clients() { conflicts=('mysql-clients') provides=("mysql-clients=$pkgver") - cd "$srcdir"/build + cd build make -C client DESTDIR="$pkgdir" install # install man pages install -d "$pkgdir"/usr/share/man/man1 for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 + install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1 done # provided by mariadb rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} + +} + +package_mytop() { + pkgdesc='Top clone for MariaDB' + depends=('perl-dbd-mysql' 'perl-term-readkey') + + cd build + install -Dm755 scripts/mytop "$pkgdir"/usr/bin/mytop } package_mariadb() { @@ -108,31 +122,33 @@ package_mariadb() { backup=('etc/mysql/my.cnf') install=mariadb.install depends=('mariadb-clients' 'inetutils') - conflicts=('mysql' 'mytop') - provides=("mysql=$pkgver" 'mytop') - optdepends=('perl-dbd-mysql: mytop dependency' - 'perl-term-readkey: mytop dependency') + conflicts=('mysql') + provides=("mysql=$pkgver") options=('emptydirs') - cd "$srcdir"/build + cd build make DESTDIR="$pkgdir" install install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf - install -Dm755 "$srcdir"/mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post - install -Dm644 "$srcdir"/mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service - install -Dm644 "$srcdir"/mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf + install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post + install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service + install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf # provided by libmariadbclient - rm "$pkgdir"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} - rm "$pkgdir"/usr/lib/libmysql* - rm -r "$pkgdir"/usr/include/ - rm "$pkgdir"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 + cd "$pkgdir" + rm usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} + rm usr/lib/libmysql* + rm -r usr/include/ + rm usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 # provided by mariadb-clients - rm "$pkgdir"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm "$pkgdir"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + rm usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} + rm usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 + + # provided by mytop + rm usr/bin/mytop # not needed - rm -r "$pkgdir"/usr/{data,mysql-test,sql-bench} - rm "$pkgdir"/usr/share/man/man1/mysql-test-run.pl.1 + rm -r usr/{data,mysql-test,sql-bench} + rm usr/share/man/man1/mysql-test-run.pl.1 } diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD index 92e2a085e..4059c82a2 100644 --- a/extra/mash/PKGBUILD +++ b/extra/mash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183442 2013-04-21 22:11:40Z heftig $ +# $Id: PKGBUILD 196123 2013-10-07 11:53:08Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=mash pkgver=0.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A small library for using 3D models within a Clutter scene" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index c911dae6d..5d01dd9e4 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191931 2013-08-01 07:14:32Z andrea $ +# $Id: PKGBUILD 194257 2013-09-11 19:36:47Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,12 +6,12 @@ pkgname=mediastreamer pkgver=2.9.0 -pkgrel=3 +pkgrel=4 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/" license=('GPL') -depends=('ortp' 'ffmpeg' 'libxv' 'glew' 'libupnp') +depends=('ortp' 'ffmpeg' 'libxv' 'libupnp') # xxd from Vim is needed to build makedepends=('intltool' 'vim') options=('!libtool') @@ -21,7 +21,8 @@ md5sums=('f2ea0fe731a363749a81b6eaac22a62c' build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --disable-glx --enable-xv make } diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index ef6114012..3186d2cc7 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191974 2013-08-02 17:22:54Z giovanni $ +# $Id: PKGBUILD 193933 2013-09-07 05:53:52Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.7 +pkgver=2.7.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('61093c08ca5d8d1310382d17764f0c43' +md5sums=('3313de3667902ae4dc82f29f5280294d' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index fd09645b6..1951f3148 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 193703 2013-08-28 15:19:08Z andyrtr $ +# $Id: PKGBUILD 196157 2013-10-07 12:17:10Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.2.0 +pkgver=9.2.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' @@ -16,13 +16,13 @@ fi url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') -source=(ftp://ftp.freedesktop.org/pub/mesa/9.2/MesaLib-${pkgver}.tar.bz2 +source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 LICENSE) -md5sums=('4185b6aae890bc62a964f4b24cc1aca8' +md5sums=('dd4c82667d9c19c28a553b12eba3f8a0' '5c65a0fe315dd347e09b1f2826a1df5a') build() { - cd ${srcdir}/?esa-* + cd ${srcdir}/?esa-* if [ "$CARCH" = "mips64el" ]; then extraconf="--with-gallium-drivers=swrast --with-dri-drivers=swrast --disable-gallium-llvm --disable-vdpau" @@ -32,7 +32,7 @@ build() { autoreconf -vfi # our automake is far too new for their build system :) - ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ @@ -56,11 +56,11 @@ build() { $extraconf # --help - make + make - # fake installation - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall install + # fake installation + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall install } package_ati-dri() { @@ -108,6 +108,9 @@ package_nouveau-dri() { install -m755 -d ${pkgdir}/usr/lib/gallium-pipe mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/ + # vdpau drivers are still buggy with nouveau, so remove them (FS#36754) + rm -rf ${pkgdir}/usr/lib/vdpau/ + install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" } diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index ebe172536..bf219caff 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 190046 2013-07-13 12:42:05Z svenstaro $ +# $Id: PKGBUILD 194528 2013-09-17 13:02:47Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=6.3.0 -pkgrel=2 +pkgver=6.4.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz") -md5sums=('3d64652b1aa3ce3faaa468b11dcbd82c') +md5sums=('1e878646b34eb2c32772d05b91f84f4c') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index 1a1200a8e..b22cb8b88 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186332 2013-05-24 20:45:34Z daniel $ +# $Id: PKGBUILD 194705 2013-09-22 21:22:23Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=3.0.7 +pkgver=3.2.3 pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) @@ -14,15 +14,21 @@ makedepends=('pkgconfig') options=('!libtool' '!makeflags') provides=('monodoc') conflicts=('monodoc') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - mono.binfmt.d) -md5sums=('76ebec9c97347aac13d9f28fc58b347d' - 'b9ef8a65fea497acf176cca16c1e2402') +install=mono.install +source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2 + mono.binfmt.d + mono.install + sgen_fix.patch) +md5sums=('a66c6309fad071e21f77f4c6b67a0f10' + 'b9ef8a65fea497acf176cca16c1e2402' + 'ca1108e9638b01c26453ee663592a4e5' + '8a700b94bff7a913f920e95890d2fb4c') build() { cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 < ../sgen_fix.patch # build mono - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin --sbindir=/usr/bin make # build jay diff --git a/extra/mono/mono.install b/extra/mono/mono.install new file mode 100644 index 000000000..6a57c2a70 --- /dev/null +++ b/extra/mono/mono.install @@ -0,0 +1,7 @@ +post_install() { +ln -sf /bin/mono-sgen /bin/mono +} + +post_upgrade() { +post_install +} diff --git a/extra/mono/sgen_fix.patch b/extra/mono/sgen_fix.patch new file mode 100644 index 000000000..40cb9fba7 --- /dev/null +++ b/extra/mono/sgen_fix.patch @@ -0,0 +1,112 @@ +From d2cc22580898df5d4a15e0f99ab513e1570a6082 Mon Sep 17 00:00:00 2001 +From: Zoltan Varga <vargaz@gmail.com> +Date: Fri, 20 Sep 2013 19:06:34 +0200 +Subject: [PATCH] [sgen] Use __builtin_ctzl () in OBJ_BITMAP_FOREACH_PTR () on + 64 bit platforms. Fixes #14834. + +--- + mono/metadata/sgen-descriptor.h | 28 +++++++++++++++++++++++++--- + mono/tests/sgen-descriptors.cs | 15 +++++++++++++-- + 2 files changed, 38 insertions(+), 5 deletions(-) + +diff --git a/mono/metadata/sgen-descriptor.h b/mono/metadata/sgen-descriptor.h +index cd53a86..3a00589 100644 +--- a/mono/metadata/sgen-descriptor.h ++++ b/mono/metadata/sgen-descriptor.h +@@ -170,21 +170,43 @@ enum { + } \ + } while (0) + +-#ifdef __GNUC__ ++#if defined(__GNUC__) && SIZEOF_VOID_P==4 ++#define OBJ_BITMAP_FOREACH_PTR(desc,obj) do { \ ++ /* there are pointers */ \ ++ void **_objptr = (void**)(obj); \ ++ gsize _bmap = (desc) >> 16; \ ++ _objptr += OBJECT_HEADER_WORDS; \ ++ { \ ++ int _index = __builtin_ctz (_bmap); \ ++ _objptr += _index; \ ++ _bmap >>= (_index + 1); \ ++ HANDLE_PTR (_objptr, (obj)); \ ++ _objptr ++; \ ++ } \ ++ while (_bmap) { \ ++ int _index = __builtin_ctz (_bmap); \ ++ _objptr += _index; \ ++ _bmap >>= (_index + 1); \ ++ HANDLE_PTR (_objptr, (obj)); \ ++ _objptr ++; \ ++ } \ ++ } while (0) ++#elif defined(__GNUC__) && SIZEOF_VOID_P==8 ++/* Same as above, but use _builtin_ctzl () */ + #define OBJ_BITMAP_FOREACH_PTR(desc,obj) do { \ + /* there are pointers */ \ + void **_objptr = (void**)(obj); \ + gsize _bmap = (desc) >> 16; \ + _objptr += OBJECT_HEADER_WORDS; \ + { \ +- int _index = __builtin_ctz (_bmap); \ ++ int _index = __builtin_ctzl (_bmap); \ + _objptr += _index; \ + _bmap >>= (_index + 1); \ + HANDLE_PTR (_objptr, (obj)); \ + _objptr ++; \ + } \ + while (_bmap) { \ +- int _index = __builtin_ctz (_bmap); \ ++ int _index = __builtin_ctzl (_bmap); \ + _objptr += _index; \ + _bmap >>= (_index + 1); \ + HANDLE_PTR (_objptr, (obj)); \ +diff --git a/mono/tests/sgen-descriptors.cs b/mono/tests/sgen-descriptors.cs +index ae00084..246e5aa 100644 +--- a/mono/tests/sgen-descriptors.cs ++++ b/mono/tests/sgen-descriptors.cs +@@ -1,4 +1,5 @@ + using System; ++using System.Runtime.InteropServices; + + public struct SmallMixed + { +@@ -47,6 +48,13 @@ public class HugePtrFree { + public LargeStruct2 c; + } + ++[StructLayout (LayoutKind.Sequential)] ++public class Non32bitBitmap { ++ public object o; ++ public long i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15, i16, i17, i18, i19, i20, i21, i22, i23, i24, i25, i26, i27, i28, i29, i30, i31, i32, i33, i34, i35; ++ public object o2; ++} ++ + /* + This is a stress test for descriptors. + */ +@@ -54,10 +62,10 @@ class Driver { + static char[] FOO = new char[] { 'f', 'o', 'b' }; + + static void Fill (int cycles) { +- object[] root = new object [12]; ++ object[] root = new object [13]; + object[] current = root; + for (int i = 0; i < cycles; ++i) { +- current [0] = new object [12]; ++ current [0] = new object [13]; + current [1] = new int [6]; + current [2] = new int [2,3]; + current [3] = new string (FOO); +@@ -72,6 +80,9 @@ class Driver { + current [10] = new HugePtrFree (); + if ((i % 10000) == 0) + current [11] = new LargeStruct2 [1]; ++ ++ /* Test for 64 bit bitmap descriptors (#14834) */ ++ current [12] = new Non32bitBitmap () { o = new object (), i32 = 1, i33 = 1, i34 = 1, i35 = 1, o2 = new object () }; + + current = (object[])current [0]; + } +-- +1.8.4 + diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index 3aa47b9dd..d58895531 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188885 2013-06-23 21:47:27Z daniel $ +# $Id: PKGBUILD 194339 2013-09-13 21:42:34Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=4.0.9 +pkgver=4.0.12 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') # also "any" pkg? url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=4.0.9' 'gdb') +depends=('monodevelop>=4.0.12' 'gdb') makedepends=('mono') options=('!makeflags') -source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('6735424b41449221b0471c5ba6cf307e') +source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver-3.tar.bz2) +md5sums=('b9c9d12cc73352a208bcdb5ad5949418') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" @@ -29,4 +29,3 @@ package() { make DESTDIR="${pkgdir}" install } - diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index c44244a7d..886f09470 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188887 2013-06-23 21:49:24Z daniel $ +# $Id: PKGBUILD 194341 2013-09-13 21:42:47Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=4.0.9 +pkgver=4.0.12 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" @@ -17,9 +17,9 @@ depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' makedepends=('rsync' 'git') options=(!makeflags) install=monodevelop.install -source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}-3.tar.bz2 monodevelop-core-addins.pc.in.patch) -md5sums=('b54461118aab6c8f9d4520d9cbf84d84' +md5sums=('5f9cd24d2791054d88b0dcce1259afdb' '8466d032735130e37d4091a793a7966c') build() { diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD index dbc57f6fe..6ef97c5e2 100644 --- a/extra/most/PKGBUILD +++ b/extra/most/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 176312 2013-01-29 13:46:57Z stephane $ +# $Id: PKGBUILD 195919 2013-10-05 12:05:12Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=most pkgver=5.0.0a -pkgrel=5 +pkgrel=6 pkgdesc="A terminal pager similar to 'more' and 'less'" arch=('i686' 'x86_64' 'mips64el') depends=('slang') diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD index a845608bd..96cee75d8 100644 --- a/extra/mousetweaks/PKGBUILD +++ b/extra/mousetweaks/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=mousetweaks -pkgver=3.8.0 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 pkgdesc="Mouse accessibility enhancements for the GNOME desktop" arch=(i686 x86_64 'mips64el') license=('GPL3' 'FDL') @@ -15,7 +15,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=('daa9b16e98675f414d3dcf63a0222a37d6c3e518718d92155bba8781510f2e4f') +sha256sums=('12fa50eca2e442057a1b816b4aa78d0b8a17f854cf01f4d339d82ff0172b57dd') build() { cd $pkgname-$pkgver diff --git a/extra/mtdev/PKGBUILD b/extra/mtdev/PKGBUILD index 0ade75444..76c71d19a 100644 --- a/extra/mtdev/PKGBUILD +++ b/extra/mtdev/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168434 2012-10-11 16:11:43Z andyrtr $ +# $Id: PKGBUILD 195256 2013-09-29 09:02:35Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=mtdev -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom:MIT') depends=('glibc') options=('!libtool') source=("$url$pkgname-$pkgver.tar.bz2") -md5sums=('8a236569ad3dd79eaeed45f1935359be') +md5sums=('73a915d6075b31db4f08ab8c6d314695') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/mutter-wayland/PKGBUILD b/extra/mutter-wayland/PKGBUILD new file mode 100644 index 000000000..004ece9dd --- /dev/null +++ b/extra/mutter-wayland/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 196008 2013-10-07 11:49:47Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=mutter-wayland +pkgver=3.10.0.1 +pkgrel=2 +pkgdesc="A Wayland compositor for GNOME" +arch=(i686 x86_64) +license=(GPL) +depends=(mutter) +makedepends=(intltool gnome-doc-utils) +url="http://www.gnome.org" +options=('!libtool' '!emptydirs') +install=mutter-wayland.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz + mutter-wayland-3.10.0.1-logfile.patch) +sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560' + 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644') + + +prepare() { + cd "$pkgname-$pkgver" + + # From Fedora: Don't try to redirect the logfile. It won't work. + patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch +} + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/$pkgname \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile --enable-compile-warnings=minimum + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # Already in "mutter" + rm -r "$pkgdir"/usr/share/{man,gtk-doc,GConf,gnome-control-center} + rm "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml" +} diff --git a/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch b/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch new file mode 100644 index 000000000..922e0ae33 --- /dev/null +++ b/extra/mutter-wayland/mutter-wayland-3.10.0.1-logfile.patch @@ -0,0 +1,17 @@ +--- mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c.jx 2013-09-16 16:40:46.000000000 -0400 ++++ mutter-wayland-3.10.0.1/src/wayland/meta-xwayland.c 2013-10-02 13:37:57.027318760 -0400 +@@ -380,11 +380,9 @@ meta_xwayland_start (MetaWaylandComposit + args[3] = "-rootless"; + args[4] = "-retro"; + args[5] = "-noreset"; +- args[6] = "-logfile"; +- args[7] = g_build_filename (g_get_user_cache_dir (), "xwayland.log", NULL); +- args[8] = "-nolisten"; +- args[9] = "all"; +- args[10] = NULL; ++ args[6] = "-nolisten"; ++ args[7] = "all"; ++ args[8] = NULL; + + error = NULL; + if (g_spawn_async (NULL, /* cwd */ diff --git a/extra/mutter-wayland/mutter-wayland.install b/extra/mutter-wayland/mutter-wayland.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/mutter-wayland/mutter-wayland.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 42905532d..00488b85c 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 191806 2013-07-30 22:50:38Z jgc $ +# $Id: PKGBUILD 196125 2013-10-07 11:53:12Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.8.4 +pkgver=3.10.0.1 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 mips64el) license=('GPL') -depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm') +depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm' 'gnome-desktop' 'upower') makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('efe28bb665fd43d97b20c57bb1d1dc0a7e98919b6ad4b770bfd7ec5576e29454') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('2d1288727d60b45c4d902101b805c89fa93f7a6b147bb4a7d3d99f990680b203') build() { cd "$pkgname-$pkgver" diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD index 87ec0b12a..1b514a9aa 100644 --- a/extra/nautilus-sendto/PKGBUILD +++ b/extra/nautilus-sendto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191279 2013-07-23 09:48:38Z jgc $ +# $Id: PKGBUILD 196127 2013-10-07 11:53:15Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-sendto -pkgver=3.8.0 -pkgrel=2 +pkgver=3.8.1 +pkgrel=1 pkgdesc="Nautilus context menu for sending files." arch=('i686' 'x86_64' 'mips64el') url="http://download.gnome.org/sources/nautilus-sendto/" @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=nautilus-sendto.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d99ea11a484bff8894097696a1afc8d7f44de4f064f78deeb6f598cecf0604bb') +sha256sums=('03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index 7cee1de43..3cbd80266 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188611 2013-06-16 23:57:46Z heftig $ +# $Id: PKGBUILD 196126 2013-10-07 11:53:13Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=nautilus pkgname=(nautilus libnautilus-extension) -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="GNOME file manager" arch=(i686 x86_64 mips64el) @@ -13,8 +13,8 @@ depends=(libexif gnome-desktop exempi gvfs desktop-file-utils gnome-icon-theme d makedepends=(intltool gobject-introspection python) url="http://www.gnome.org" options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) -sha256sums=('dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75') +source=(http://download.gnome.org/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('9b15ccf1c9313631c8cf2ed337e697cd2b32630d2ae36072aa389d64af16d88c') build() { cd $pkgbase-$pkgver diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD index c2a1fe5bf..765feccaa 100644 --- a/extra/neon/PKGBUILD +++ b/extra/neon/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 153967 2012-03-21 06:21:04Z pierre $ +# $Id: PKGBUILD 195974 2013-10-06 19:11:39Z eric $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=neon -pkgver=0.29.6 -pkgrel=4 +pkgver=0.30.0 +pkgrel=1 pkgdesc="HTTP and WebDAV client library with a C interface" arch=('i686' 'x86_64' 'mips64el') +url="http://www.webdav.org/neon/" license=('GPL' 'LGPL') depends=('krb5' 'expat' 'ca-certificates') -url="http://www.webdav.org/neon/" -source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('591e0c82e6979e7e615211b386b8f6bc') options=('libtool') # FS#16067 +source=(http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) +sha1sums=('9e6297945226f90d66258b7ee05f757ff5cea10a' + 'SKIP') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -24,9 +25,6 @@ build() { --with-ssl=openssl \ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt make - - # fix invalid .so links in man pages (FS#24902) - sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/* } package() { diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index aec63d01e..709300655 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193218 2013-08-19 09:54:11Z andrea $ +# $Id: PKGBUILD 195496 2013-10-01 15:13:09Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('16b3176b9c615199321c87c383ad27802041d7dd') +sha1sums=('d5a320b39edda61f82ad24da1745238bfcdfe73c') prepare() { mkdir build diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD index fdedbac77..2c11b7aed 100644 --- a/extra/nepomuk-widgets/PKGBUILD +++ b/extra/nepomuk-widgets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193235 2013-08-19 09:54:29Z andrea $ +# $Id: PKGBUILD 195530 2013-10-01 15:16:09Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-widgets -pkgver=4.11.0 +pkgver=4.11.2 pkgrel=1 pkgdesc="The Library containing the Nepomuk Widgets" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('65c62afbfefad3261df5048bcc146feb6a7c8af5') +sha1sums=('d63ef40b9832fc0f18f981163800a9d5ecd5e29e') build() { mkdir build diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index ffd23bb15..c5b86caf1 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187895 2013-06-07 21:36:22Z heftig $ +# $Id: PKGBUILD 196128 2013-10-07 11:53:16Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,20 +6,20 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.8.2 -pkgrel=1 +pkgver=0.9.8.4 +pkgrel=2 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64' 'mips64el') license=(GPL) url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver::5}" libsecret gtk3 libnotify +depends=("networkmanager>=${pkgver%.*}" libsecret gtk3 libnotify gnome-icon-theme mobile-broadband-provider-info iso-codes) makedepends=(intltool gnome-bluetooth gobject-introspection) optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('a540c743971c199a7b8663a8d0a38eb66a4c13a6b5124cd3a7495c75560aadc7') +sha256sums=('f68849291047c94487279aab4a6cb90945ad351df02da621a73b413e6c6c198c') build() { cd ${pkgname}-${pkgver} @@ -30,6 +30,10 @@ build() { --disable-maintainer-mode \ --disable-migration \ --with-modem-manager-1 + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index 55bcf19ff..b2e07ad69 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 187896 2013-06-07 21:36:56Z heftig $ +# $Id: PKGBUILD 194796 2013-09-23 17:23:08Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.8.2 +pkgver=0.9.8.4 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver::5}" 'openconnect' 'gconf' 'libgnome-keyring') +depends=("networkmanager>=${pkgver::5}" 'openconnect' 'libgnome-keyring' 'gtk3') makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('8c3b393d155448d41f5de539d4920f0e5205a087aa5b25ed65601d6a370c44eb') +sha256sums=('99b4dc03da311026eaa4bee2ff3f141270e8ba4bf341762d4eeee7152be387b6') build() { cd NetworkManager-openconnect-${pkgver} diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index 39387b87a..608935066 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187897 2013-06-07 21:37:29Z heftig $ +# $Id: PKGBUILD 194797 2013-09-23 17:23:43Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.8.2 +pkgver=0.9.8.4 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('d1c032f30e3c58d6d6bc371aad6d7e757f748d23a9240c077294492753078359') +sha256sums=('af8c52b6a61af3c178eed1ea8f1d4704bea87331fde43deb3d4aafe1821e6687') build() { cd NetworkManager-openvpn-${pkgver} diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index 80d46e896..286dc88c2 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187898 2013-06-07 21:38:15Z heftig $ +# $Id: PKGBUILD 194798 2013-09-23 17:24:22Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.8.2 +pkgver=0.9.8.4 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz gtk_table_to_gtk_grid.patch) -sha256sums=('7f46ea61376d13d03685eca3f26a26e0022f6e92e6f1fc356034ca9717eb6dac' +sha256sums=('97ba8f6f726056c3b8e0e1c8d2ab3d32791cadd7c3a38e0478fb2bd3ecafdce8' '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215') prepare() { diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index f0c4a178e..740248d8d 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 187899 2013-06-07 21:38:48Z heftig $ +# $Id: PKGBUILD 194799 2013-09-23 17:25:00Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.8.2 +pkgver=0.9.8.6 pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring') +depends=("networkmanager>=${pkgver%.*}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring') makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('adf6f4abd29d3f0384ef55fdfea75e6cd56088a0ecdfed2454305fd9e08318a1') +sha256sums=('40306cd713d4e6e9df6a520d2992664d22173b3327e94df45a6dac23f0a8abd6') build() { cd NetworkManager-vpnc-${pkgver} diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index f8826c1ea..2b7eb91f4 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187894 2013-06-07 21:35:29Z heftig $ +# $Id: PKGBUILD 196155 2013-10-07 12:16:03Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -8,7 +8,7 @@ pkgname=networkmanager _pkgname=NetworkManager -pkgver=0.9.8.2 +pkgver=0.9.8.6 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc git) optdepends=('dhclient: DHCPv6 support' 'dnsmasq: Connection sharing' - 'bluez4: Bluetooth support' + 'bluez: Bluetooth support' 'openresolv: resolvconf support' 'ppp: Dialup connection support') options=('!libtool') @@ -28,7 +28,7 @@ install=networkmanager.install #source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz NetworkManager.conf disable_set_hostname.patch) -sha256sums=('5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead' +sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index f9bf4bae3..42c9641a3 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 191781 2013-07-30 17:31:51Z jgc $ +# $Id: PKGBUILD 196165 2013-10-07 12:54:42Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.10 -pkgrel=2 +pkgver=4.10.1 +pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/nspr/" @@ -13,12 +13,13 @@ depends=('glibc') makedepends=('zip') options=('!emptydirs') source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) -md5sums=('f5466def95726b3c900d8a0227bdd034') +sha1sums=('bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7') +md5sums=('2e354084ca2bc5fbbb820762597f3890') build() { cd $pkgname-$pkgver - if [[ $CARCH = x86_64 ]]; then + if [ "$CARCH" = "x86_64" ]; then _confflags="--enable-64bit" else _confflags="" diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index ebd9bb584..068e90fa8 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191782 2013-07-30 17:31:52Z jgc $ +# $Id: PKGBUILD 196167 2013-10-07 13:20:22Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.15.1 +pkgver=3.15.2 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') @@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s nss-config.in ssl-renegotiate-transitional.patch add_spi+cacert_ca_certs.patch) -sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0' +sha1sums=('2d900c296bf11deabbf833ebd6ecdea549c97a5f' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 2a738484b..e7179ab54 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 175505 2013-01-17 15:01:31Z tpowa $ +# $Id: PKGBUILD 195984 2013-10-07 07:06:19Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' pkgname=('ocaml') # Needs optimized build. [ "$CARCH" = "mips64el" ] || pkgname+=('ocaml-compiler-libs') -pkgver=4.00.1 -pkgrel=3 +pkgver=4.01.0 +pkgrel=1 pkgdesc="A functional language with OO extensions" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL2' 'custom: QPL-1.0') +arch=('i686' 'x86_64') +license=('LGPL2.1' 'custom: QPL-1.0') url="http://caml.inria.fr/" depends=('gdbm') makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz +source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz fix-caml_int64_float_of_bits-n32.patch tk8.6-build.patch) options=('!makeflags' '!emptydirs') @@ -22,7 +22,7 @@ options=('!makeflags' '!emptydirs') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/fix-caml_int64_float_of_bits-n32.patch" - ./configure -prefix /usr + ./configure -prefix /usr -x11include /usr/include if [ "${CARCH}" == "mips64el" ] ; then make world else @@ -32,8 +32,6 @@ build() { package_ocaml() { cd "${srcdir}/${pkgbase}-${pkgver}" - # fix https://bugs.archlinux.org/task/33302 - patch -Np2 -i ../tk8.6-build.patch make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install # Save >10MB with this one, makepkg only strips debug symbols. @@ -65,6 +63,6 @@ optdepends=() install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7' +md5sums=('04dfdd7da189462a4f10ec6530359cef' 'e2c8bc316efe40532c5b9d7f9a1d8d62' '67b0a8a8885fc1221181b171541cb1b0') diff --git a/extra/ocaml/tk8.6-build.patch b/extra/ocaml/tk8.6-build.patch deleted file mode 100644 index 439a930f0..000000000 --- a/extra/ocaml/tk8.6-build.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/ocaml-4.00.1/configure 2012-06-26 08:33:50.000000000 -0700 -+++ p/src/ocaml-4.00.1/configure 2013-01-05 17:06:54.877900143 -0800 -@@ -804,6 +804,9 @@ - echo "ARCMD=ar" >> Makefile - - -+bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT" -+nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT" -+ - # Do #! scripts work? - - if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then -@@ -1450,6 +1453,7 @@ - if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then - echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"." - case $tcl_version in -+ 8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;; - 8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;; - 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;; - 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;; diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index e2f2da0ea..7661155f7 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191906 2013-08-01 06:53:39Z bpiotrowski $ +# $Id: PKGBUILD 194345 2013-09-14 08:18:24Z bpiotrowski $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.10 -pkgrel=2 +pkgrel=3 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64 'mips64el') url="http://www.opalvoip.org" @@ -14,7 +14,7 @@ options=(!makeflags) source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz opal-ffmpeg.patch) sha256sums=('f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864' - '0111eec3f7109a83f8cd4a87744ca050b3ca27482e9d31e3a1d50798f8cd88c1') + '83f60ecf692e004293ce9dbaae7d7eb64d9713d3bfb71a0e7b1a0d1f936794cd') build() { cd "${srcdir}/opal-${pkgver}" diff --git a/extra/opal/opal-ffmpeg.patch b/extra/opal/opal-ffmpeg.patch index e7671ee53..942a5a396 100644 --- a/extra/opal/opal-ffmpeg.patch +++ b/extra/opal/opal-ffmpeg.patch @@ -1,15 +1,39 @@ -diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx ---- opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx 2012-08-23 04:18:42.000000000 +0200 -+++ opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-08-28 19:53:12.080918973 +0200 -@@ -48,6 +48,7 @@ +diff -Naur opal-3.10.10-orig/plugins/video/H.263-1998/Makefile.in opal-3.10.10/plugins/video/H.263-1998/Makefile.in +--- opal-3.10.10-orig/plugins/video/H.263-1998/Makefile.in 2013-02-20 03:18:03.000000000 +0100 ++++ opal-3.10.10/plugins/video/H.263-1998/Makefile.in 2013-09-10 21:43:11.091108557 +0200 +@@ -35,7 +35,7 @@ + $(COMMONDIR)/dyna.cxx + + CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) +-LIBS += @DL_LIBS@ ++LIBS += @DL_LIBS@ @LIBAVUTIL_LIBS@ + + HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@ + ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes) +diff -Naur opal-3.10.10-orig/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx +--- opal-3.10.10-orig/plugins/video/H.263-1998/h263-1998.cxx 2013-02-20 03:18:03.000000000 +0100 ++++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx 2013-09-10 21:43:11.091108557 +0200 +@@ -48,6 +48,10 @@ #endif #include "h263-1998.h" ++extern "C" ++{ +#include <libavutil/opt.h> ++} #include <limits> #include <iomanip> #include <stdio.h> -@@ -317,9 +318,9 @@ +@@ -203,7 +207,7 @@ + PTRACE(4, m_prefix, "Encoder closed"); + } + +-bool H263_Base_EncoderContext::Init(CodecID codecId) ++bool H263_Base_EncoderContext::Init(AVCodecID codecId) + { + PTRACE(5, m_prefix, "Opening encoder"); + +@@ -317,9 +321,9 @@ // Level 2+ // works with eyeBeam, signaled via non-standard "D" if (atoi(value) == 1) @@ -21,7 +45,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/ return; } -@@ -328,9 +329,9 @@ +@@ -328,9 +332,9 @@ // Annex F: Advanced Prediction Mode // does not work with eyeBeam if (atoi(value) == 1) @@ -33,7 +57,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/ return; } #endif -@@ -360,9 +361,9 @@ +@@ -360,9 +364,9 @@ // Annex K: Slice Structure // does not work with eyeBeam if (atoi(value) != 0) @@ -45,7 +69,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/ return; } -@@ -370,9 +371,9 @@ +@@ -370,9 +374,9 @@ // Annex S: Alternative INTER VLC mode // does not work with eyeBeam if (atoi(value) == 1) @@ -57,7 +81,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/ return; } -@@ -450,15 +451,6 @@ +@@ -450,15 +454,6 @@ PTRACE(5, m_prefix, "qmax set to " << m_context->qmax); PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size); @@ -73,7 +97,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/ return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0; } -@@ -521,7 +513,7 @@ +@@ -521,7 +516,7 @@ // Need to copy to local buffer to guarantee 16 byte alignment memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2); @@ -82,7 +106,7 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/ /* m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE; -@@ -603,13 +595,13 @@ +@@ -603,13 +598,13 @@ m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack; m_context->opaque = this; // used to separate out packets from different encode threads @@ -99,10 +123,21 @@ diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/ return true; } -Only in opal-3.10.7.patched/plugins/video/H.263-1998: h263-1998.cxx.orig -diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx ---- opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx 2012-08-23 04:18:41.000000000 +0200 -+++ opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx 2012-08-28 19:53:12.080918973 +0200 +diff -Naur opal-3.10.10-orig/plugins/video/H.263-1998/h263-1998.h opal-3.10.10/plugins/video/H.263-1998/h263-1998.h +--- opal-3.10.10-orig/plugins/video/H.263-1998/h263-1998.h 2013-02-20 03:18:03.000000000 +0100 ++++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.h 2013-09-10 21:43:11.091108557 +0200 +@@ -115,7 +115,7 @@ + virtual ~H263_Base_EncoderContext(); + + virtual bool Init() = 0; +- virtual bool Init(CodecID codecId); ++ virtual bool Init(AVCodecID codecId); + + virtual bool SetOptions(const char * const * options); + virtual void SetOption(const char * option, const char * value); +diff -Naur opal-3.10.10-orig/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx +--- opal-3.10.10-orig/plugins/video/H.264/gpl/h264_helper.cxx 2013-02-20 03:18:02.000000000 +0100 ++++ opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx 2013-09-10 21:43:11.091108557 +0200 @@ -27,6 +27,7 @@ #include <fstream> #include <stdlib.h> @@ -111,11 +146,20 @@ diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched #ifdef HAVE_UNISTD_H #include <unistd.h> -Only in opal-3.10.7.patched/plugins/video/H.264/gpl: h264_helper.cxx.orig -diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx ---- opal-3.10.7/plugins/video/H.264/h264-x264.cxx 2012-08-23 04:18:41.000000000 +0200 -+++ opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx 2012-08-28 19:53:12.080918973 +0200 -@@ -1071,13 +1071,10 @@ +diff -Naur opal-3.10.10-orig/plugins/video/H.264/h264-x264.cxx opal-3.10.10/plugins/video/H.264/h264-x264.cxx +--- opal-3.10.10-orig/plugins/video/H.264/h264-x264.cxx 2013-02-20 03:18:02.000000000 +0100 ++++ opal-3.10.10/plugins/video/H.264/h264-x264.cxx 2013-09-10 21:43:11.091108557 +0200 +@@ -40,6 +40,9 @@ + #include "plugin-config.h" + #endif + ++#define FF_IDCT_H264 11 ++#define CODEC_FLAG2_SKIP_RD 0x00004000 ++ + #include <codec/opalplugin.hpp> + + #include "../common/ffmpeg.h" +@@ -1071,13 +1074,10 @@ return false; m_context->workaround_bugs = FF_BUG_AUTODETECT; @@ -130,10 +174,9 @@ diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugi CODEC_FLAG2_SKIP_RD | CODEC_FLAG2_CHUNKS; -Only in opal-3.10.7.patched/plugins/video/H.264: h264-x264.cxx.orig -diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx ---- opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx 2012-08-23 04:18:41.000000000 +0200 -+++ opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx 2012-08-28 19:53:12.084252306 +0200 +diff -Naur opal-3.10.10-orig/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx +--- opal-3.10.10-orig/plugins/video/H.264/shared/x264wrap.cxx 2013-02-20 03:18:02.000000000 +0100 ++++ opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx 2013-09-10 21:43:11.091108557 +0200 @@ -33,6 +33,7 @@ #include <codec/opalplugin.hpp> @@ -142,10 +185,21 @@ diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched #ifdef HAVE_UNISTD_H #include <unistd.h> -Only in opal-3.10.7.patched/plugins/video/H.264/shared: x264wrap.cxx.orig -diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx ---- opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-08-23 04:18:44.000000000 +0200 -+++ opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-08-28 19:54:35.460923804 +0200 +diff -Naur opal-3.10.10-orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in +--- opal-3.10.10-orig/plugins/video/MPEG4-ffmpeg/Makefile.in 2013-02-20 03:18:07.000000000 +0100 ++++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in 2013-09-10 21:43:49.101654132 +0200 +@@ -31,7 +31,7 @@ + SRCS := mpeg4.cxx $(COMMONDIR)/dyna.cxx + + CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR) +-LIBS += @DL_LIBS@ ++LIBS += @DL_LIBS@ @LIBAVUTIL_LIBS@ + + # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h> + # Also add libavutil, so ffmpeg headers can #include "log.h". +diff -Naur opal-3.10.10-orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx +--- opal-3.10.10-orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2013-02-20 03:18:07.000000000 +0100 ++++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2013-09-10 21:43:11.091108557 +0200 @@ -103,6 +103,7 @@ #else /* LIBAVCODEC_HAVE_SOURCE_DIR */ @@ -193,10 +247,10 @@ diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/pl m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations } -diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx ---- a/plugins/video/common/dyna.cxx 2013-02-20 02:18:05.000000000 +0000 -+++ b/plugins/video/common/dyna.cxx 2013-07-22 16:55:47.307946942 +0000 -@@ -210,7 +210,7 @@ static void logCallbackFFMPEG(void * avc +diff -Naur opal-3.10.10-orig/plugins/video/common/dyna.cxx opal-3.10.10/plugins/video/common/dyna.cxx +--- opal-3.10.10-orig/plugins/video/common/dyna.cxx 2013-02-20 03:18:05.000000000 +0100 ++++ opal-3.10.10/plugins/video/common/dyna.cxx 2013-09-10 21:43:11.091108557 +0200 +@@ -210,7 +210,7 @@ #endif @@ -205,7 +259,7 @@ diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx { m_codec = codec; if (m_codec==CODEC_ID_H264) -@@ -348,12 +348,12 @@ bool FFMPEGLibrary::Load() +@@ -348,12 +348,12 @@ return true; } @@ -220,10 +274,10 @@ diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx { WaitAndSignal m(processLock); -diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h ---- a/plugins/video/common/dyna.h 2013-02-20 02:18:05.000000000 +0000 -+++ b/plugins/video/common/dyna.h 2013-07-22 16:55:47.191281134 +0000 -@@ -88,13 +88,13 @@ class DynaLink +diff -Naur opal-3.10.10-orig/plugins/video/common/dyna.h opal-3.10.10/plugins/video/common/dyna.h +--- opal-3.10.10-orig/plugins/video/common/dyna.h 2013-02-20 03:18:05.000000000 +0100 ++++ opal-3.10.10/plugins/video/common/dyna.h 2013-09-10 21:43:11.091108557 +0200 +@@ -88,13 +88,13 @@ class FFMPEGLibrary { public: @@ -240,7 +294,7 @@ diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h AVCodecContext *AvcodecAllocContext(void); AVFrame *AvcodecAllocFrame(void); int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); -@@ -117,15 +117,15 @@ class FFMPEGLibrary +@@ -117,15 +117,15 @@ DynaLink m_libAvcodec; DynaLink m_libAvutil; @@ -259,9 +313,9 @@ diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h AVCodecContext *(*Favcodec_alloc_context)(void); AVFrame *(*Favcodec_alloc_frame)(void); int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec); -diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/common/ffmpeg/libavcodec/avcodec.h ---- a/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-02-20 02:18:04.000000000 +0000 -+++ b/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-07-22 16:55:47.167947971 +0000 +diff -Naur opal-3.10.10-orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h +--- opal-3.10.10-orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-02-20 03:18:04.000000000 +0100 ++++ opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-09-10 21:43:11.094441937 +0200 @@ -101,7 +101,7 @@ * 1. no value of a existing codec ID changes (that would break ABI), * 2. it is as close as possible to similar codecs. @@ -271,7 +325,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co CODEC_ID_NONE, /* video codecs */ -@@ -1390,7 +1390,7 @@ typedef struct AVCodecContext { +@@ -1390,7 +1390,7 @@ char codec_name[32]; enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ @@ -280,7 +334,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co /** * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). -@@ -2843,7 +2843,7 @@ typedef struct AVCodec { +@@ -2843,7 +2843,7 @@ */ const char *name; enum AVMediaType type; @@ -289,7 +343,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co int priv_data_size; int (*init)(AVCodecContext *); int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data); -@@ -2898,7 +2898,7 @@ typedef struct AVHWAccel { +@@ -2898,7 +2898,7 @@ * * See CODEC_ID_xxx */ @@ -298,7 +352,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co /** * Supported pixel format. -@@ -3402,10 +3402,10 @@ void avcodec_register(AVCodec *codec); +@@ -3402,10 +3402,10 @@ /** * Find a registered encoder with a matching codec ID. * @@ -311,7 +365,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co /** * Find a registered encoder with the specified name. -@@ -3418,10 +3418,10 @@ AVCodec *avcodec_find_encoder_by_name(co +@@ -3418,10 +3418,10 @@ /** * Find a registered decoder with a matching codec ID. * @@ -324,7 +378,7 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co /** * Find a registered decoder with the specified name. -@@ -3822,7 +3822,7 @@ char av_get_pict_type_char(int pict_type +@@ -3822,7 +3822,7 @@ * @param[in] codec_id the codec * @return Number of bits per sample or zero if unknown for the given codec. */ @@ -333,40 +387,3 @@ diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/co #if FF_API_OLD_SAMPLE_FMT /** -diff -rupN a/plugins/video/H.263-1998/h263-1998.cxx b/plugins/video/H.263-1998/h263-1998.cxx ---- a/plugins/video/H.263-1998/h263-1998.cxx 2013-02-20 02:18:03.000000000 +0000 -+++ b/plugins/video/H.263-1998/h263-1998.cxx 2013-07-22 16:55:47.314613571 +0000 -@@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc - PTRACE(4, m_prefix, "Encoder closed"); - } - --bool H263_Base_EncoderContext::Init(CodecID codecId) -+bool H263_Base_EncoderContext::Init(AVCodecID codecId) - { - PTRACE(5, m_prefix, "Opening encoder"); - -diff -rupN a/plugins/video/H.263-1998/h263-1998.h b/plugins/video/H.263-1998/h263-1998.h ---- a/plugins/video/H.263-1998/h263-1998.h 2013-02-20 02:18:03.000000000 +0000 -+++ b/plugins/video/H.263-1998/h263-1998.h 2013-07-22 16:55:47.307946942 +0000 -@@ -115,7 +115,7 @@ class H263_Base_EncoderContext - virtual ~H263_Base_EncoderContext(); - - virtual bool Init() = 0; -- virtual bool Init(CodecID codecId); -+ virtual bool Init(AVCodecID codecId); - - virtual bool SetOptions(const char * const * options); - virtual void SetOption(const char * option, const char * value); -diff -rupN a/plugins/video/H.264/h264-x264.cxx b/plugins/video/H.264/h264-x264.cxx ---- a/plugins/video/H.264/h264-x264.cxx 2013-02-20 02:18:02.000000000 +0000 -+++ b/plugins/video/H.264/h264-x264.cxx 2013-07-22 17:05:35.383661843 +0000 -@@ -40,6 +40,9 @@ - #include "plugin-config.h" - #endif - -+#define FF_IDCT_H264 11 -+#define CODEC_FLAG2_SKIP_RD 0x00004000 -+ - #include <codec/opalplugin.hpp> - - #include "../common/ffmpeg.h" diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD index 6305e6ed3..504150a9b 100644 --- a/extra/orc/PKGBUILD +++ b/extra/orc/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 182380 2013-04-09 18:42:44Z ioni $ +# $Id: PKGBUILD 194440 2013-09-16 12:20:50Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=orc -pkgver=0.4.17 +pkgver=0.4.18 pkgrel=1 pkgdesc="The Oild Runtime Compiler" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://code.entropywave.com/projects/orc/" depends=('glibc') +makedepends=('valgrind') options=('!libtool') -source=(http://code.entropywave.com/download/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('af1bf3dab9e69f3c36f389285e2a12a1') +source=(http://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.gz) build () { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static make } +check() { + cd $pkgname-$pkgver + make check +} + package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } +md5sums=('1a2552e8d127526c48d644fe6437b377') diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index 2ea835aa0..e36731b1a 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 189939 2013-07-11 19:54:40Z ioni $ +# $Id: PKGBUILD 196130 2013-10-07 11:53:19Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=p11-kit -pkgver=0.18.4 +pkgver=0.20.1 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64 mips64el) url="http://p11-glue.freedesktop.org" license=('BSD') -depends=('glibc' 'libtasn1') +depends=('glibc' 'libtasn1' 'libffi') options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('9535c4e5b9c2ef5f5cd0755115ba098b' +md5sums=('88c651137f76a167336639371eafd8cc' 'SKIP') build() { @@ -21,6 +21,11 @@ build() { make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index d2577e193..c4d6cd0f8 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185364 2013-05-13 17:48:00Z heftig $ +# $Id: PKGBUILD 196131 2013-10-07 11:53:20Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.34.1 +pkgver=1.36.0 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool') install=pango.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('1aea30df34a8ae4fcce71afd22aa5b57224b52916d46e3ea81ff9f1eb130e64c') +sha256sums=('bb41d1b26ee7450e5430a7d2765f38c51ebe72db9fce616a9ee52611b55906a0') build() { cd ${pkgname}-${pkgver} diff --git a/extra/pango/pango.install b/extra/pango/pango.install index 73b0f5bf1..4aa7c4d31 100644 --- a/extra/pango/pango.install +++ b/extra/pango/pango.install @@ -1,21 +1,14 @@ -# arg 1: the new package version post_install() { - # we need to ldconfig first, in case xfree86's libs aren't - # in ld.so.cache yet - sbin/ldconfig -r . usr/bin/pango-querymodules >etc/pango/pango.modules } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { if [ -f usr/etc/pango/pango.modules ]; then rm usr/etc/pango/pango.modules fi - post_install $1 + post_install } -# arg 1: the old package version pre_remove() { rm etc/pango/pango.modules } diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD index 8c5389681..b45d4ee66 100644 --- a/extra/phonon-vlc/PKGBUILD +++ b/extra/phonon-vlc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177946 2013-02-12 07:43:37Z andrea $ +# $Id: PKGBUILD 195169 2013-09-26 11:04:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon-vlc pkgver=0.6.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://phonon.kde.org/' pkgdesc="Phonon VLC backend" diff --git a/extra/php-apcu/PKGBUILD b/extra/php-apcu/PKGBUILD index 3edccd175..96e41a005 100644 --- a/extra/php-apcu/PKGBUILD +++ b/extra/php-apcu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193138 2013-08-17 08:22:17Z pierre $ +# $Id: PKGBUILD 194370 2013-09-14 20:47:48Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apcu -pkgver=4.0.1 -pkgrel=5 +pkgver=4.0.2 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A userland caching module for PHP' url='http://pecl.php.net/package/APCu' @@ -14,7 +14,7 @@ provides=("php-apc=${pkgver}") license=('PHP') source=("http://pecl.php.net/get/apcu-$pkgver.tgz") backup=('etc/php/conf.d/apcu.ini') -md5sums=('994de4335eb2967c006aa9ca185876fa') +md5sums=('c8a5c246b787eec81847017823099884') build() { cd $srcdir/apcu-$pkgver diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD index 1b0579dc7..470da9072 100644 --- a/extra/php-xcache/PKGBUILD +++ b/extra/php-xcache/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 193139 2013-08-17 08:22:18Z pierre $ +# $Id: PKGBUILD 195126 2013-09-25 11:18:14Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-xcache pkgver=3.1.0dev -_svnrev=1341 -pkgrel=12 +_svnrev=1394 +pkgrel=14 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A PHP opcode cacher' url='http://xcache.lighttpd.net/' diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index b1f89e3b8..1b1e55ffe 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193545 2013-08-23 06:57:45Z pierre $ +# $Id: PKGBUILD 194666 2013-09-20 19:11:06Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.5.3 +pkgver=5.5.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('437e98144ef014dfab0922a9eed36853' +md5sums=('32c1dc56701d21def91a39a312392b54' 'f9ee638591aaf1526767db7976d95847' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '880afea327bb00c47082d22c507e6bfc' diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 1c1d605cc..5e6c57a3f 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192153 2013-08-06 14:10:47Z andyrtr $ +# $Id: PKGBUILD 195252 2013-09-29 08:56:18Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,12 +7,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.5 +_dcpkgver=2.2.6 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.4.1 -pkgrel=2 +pkgver=0.4.2 +pkgrel=1 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" @@ -22,7 +22,7 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig} "dovecot.conf") options=('!libtool') -sha256sums=('361cf61c1b6c8a42d841d694736dac99c6bb5b5166e050a95c185119399c696e' +sha256sums=('0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13' 'SKIP' 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858') diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD index cc69461ab..b64159482 100644 --- a/extra/pkgfile/PKGBUILD +++ b/extra/pkgfile/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193608 2013-08-25 20:10:57Z dreisner $ +# $Id: PKGBUILD 194358 2013-09-14 14:21:19Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile -pkgver=9 +pkgver=10 pkgrel=1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libarchive' 'curl' 'pcre' 'pacman') conflicts=('pkgtools<24-2') source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) install=pkgfile.install -md5sums=('7e27e9c15da6d59ae04f32d5dc977485' +md5sums=('262d7359423dedbf1f7323cc14d4a1e3' 'SKIP') options=(!strip) diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD index 6bae12fdd..d27c47ff9 100644 --- a/extra/polkit/PKGBUILD +++ b/extra/polkit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188528 2013-06-15 09:16:15Z tomegun $ +# $Id: PKGBUILD 194653 2013-09-20 15:18:42Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit -pkgver=0.111 +pkgver=0.112 pkgver=0.110 # holding version, it now depends on non-portable 'js' pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" @@ -35,5 +35,5 @@ package() { install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1" } -md5sums=('81b116edf986d8e13502929a171f4e0d' +md5sums=('b0f2fa00a55f47c6a5d88e9b73f80127' '6564f95878297b954f0572bc1610dd15') diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index cb8f2e13d..f2968558b 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193705 2013-08-28 15:19:09Z andyrtr $ +# $Id: PKGBUILD 196154 2013-10-07 12:15:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') -pkgver=0.24.1 +pkgver=0.24.2 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('b11cc0408b4ad3809fa455d7b3d5ade9' +md5sums=('ca5c6e35859db5cd578ce4a351dd589d' '9dc64c254a31e570507bdd4ad4ba629a') prepare() { diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 3b75f99e9..fc7f5b92a 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188891 2013-06-23 23:24:25Z bisson $ +# $Id: PKGBUILD 193923 2013-09-06 07:17:49Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix -pkgver=2.10.1 +pkgver=2.10.2 pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' @@ -16,9 +16,9 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' 'service') -sha1sums=('3e236cf95a7439750e92d9ef5cd510c00e603eb2' 'SKIP' +sha1sums=('4721024784d071c3e663d610db17f8bd99821f3d' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' - '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6') + 'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9') provides=('smtp-server' 'smtp-forwarder') conflicts=('smtp-server' 'smtp-forwarder') diff --git a/extra/postfix/service b/extra/postfix/service index e7d4cd20c..a7cdc5379 100644 --- a/extra/postfix/service +++ b/extra/postfix/service @@ -5,9 +5,9 @@ After=network.target [Service] Type=forking PIDFile=/var/spool/postfix/pid/master.pid -ExecStart=/usr/sbin/postfix start -ExecStop=/usr/sbin/postfix stop -ExecReload=/usr/sbin/postfix reload +ExecStart=/usr/bin/postfix start +ExecStop=/usr/bin/postfix stop +ExecReload=/usr/bin/postfix reload Restart=always [Install] diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index 26df56f54..c7b2eec8c 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 192480 2013-08-12 20:25:47Z eric $ +# $Id: PKGBUILD 194678 2013-09-21 18:35:39Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tobias Powalowski <t.powa@gmx.de> pkgname=pstoedit pkgver=3.62 -pkgrel=2 +pkgrel=3 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=("i686" "x86_64" 'mips64el') url="http://www.pstoedit.net/" diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD index e1342e7a3..dc0f58b21 100644 --- a/extra/pycups/PKGBUILD +++ b/extra/pycups/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 164649 2012-08-01 18:38:32Z andrea $ +# $Id: PKGBUILD 195975 2013-10-06 19:13:24Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: nesl247 <nesl247@gmail.com> pkgname=pycups -pkgver=1.9.62 +pkgver=1.9.63 pkgrel=1 pkgdesc="Python CUPS Bindings" -url="http://cyberelk.net/tim/software/pycups/" arch=('i686' 'x86_64' 'mips64el') +url="http://cyberelk.net/tim/software/pycups/" license=('GPL') depends=('libcups' 'python2') -source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('b62fb397c0997dc4adf44487f4bdf5ae' - 'ced304a64389f2a0cf4178acc002562d') +source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc}) +md5sums=('cdee3ef87ac68d435c8ea04384563d15' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index cd51f80a7..08494e3e7 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 189725 2013-07-06 02:03:20Z heftig $ +# $Id: PKGBUILD 196150 2013-10-07 11:53:48Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.8.3 +pkgver=3.10.0 pkgrel=1 arch=(i686 x86_64 mips64el) url="https://live.gnome.org/PyGObject" license=(LGPL) makedepends=(python python2 python-cairo python2-cairo gobject-introspection) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('384b3e1b8d1e7c8796d7eb955380d62946dd0ed9c54ecf0817af2d6b254e082c') +sha256sums=('8aaa1f83fdb2e30bae77405a63a8be600b311a04a4cdc952b2ab62ee81aad077') prepare() { mkdir build-py2 build-py3 devel diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD new file mode 100644 index 000000000..fc6840cac --- /dev/null +++ b/extra/pyqt5/PKGBUILD @@ -0,0 +1,105 @@ +# $Id: PKGBUILD 195876 2013-10-03 10:38:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Yichao Yu <yyc1992@gmail.com> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> + +pkgbase=pyqt5 +pkgname=pyqt5 +pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5') +pkgver=5.1 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://riverbankcomputing.co.uk/software/pyqt/intro" +license=('GPL') +makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl' + 'python2-dbus' 'python-dbus' 'qt5-multimedia' 'qt5-tools' + 'qt5-svg') +source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz") +md5sums=('056f6232bf9ea92baf86e812fd1669f8') + +build() { + cp -r PyQt-gpl-${pkgver} Py2Qt-gpl-${pkgver} + + cd PyQt-gpl-${pkgver} + python3 configure.py \ + --confirm-license \ + -v /usr/share/sip/PyQt5 \ + --qsci-api \ + -q /usr/bin/qmake-qt5 + + # Thanks Gerardo for the rpath fix + find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + + make + + ### Python2 version ### + cd ../Py2Qt-gpl-${pkgver} + python2 configure.py \ + --confirm-license \ + -v /usr/share/sip/Py2-PyQt5 \ + --qsci-api \ + -q /usr/bin/qmake-qt5 + + # Thanks Gerardo for the rpath fix + find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + + make +} + +package_pyqt5-common(){ + pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5" + depends=('qt5-base') + + cd PyQt-gpl-${pkgver} + make -C pyrcc DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + make -C pylupdate DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api +} + +package_python-pyqt5(){ + pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit" + depends=('python-sip' 'pyqt5-common' 'python' 'python') + optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications' + 'python-dbus: for python-dbus mainloop support' + 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets' + 'qt5-tools: QtHelp, QtDesigner' + 'qt5-svg: QtSvg' + 'qt5-webkit: QtWebKit, QtWebKitWidgets' + 'qt5-xmlpatterns: QtXmlPatterns' + 'qt5-declarative: QtQml, qmlplugin') + + cd PyQt-gpl-${pkgver} + # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by pyqt-common + rm "${pkgdir}"/usr/bin/{pylupdate5,pyrcc5} + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api +} + +package_python2-pyqt5(){ + pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit" + depends=('python2-sip' 'pyqt5-common' 'python2') + optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications' + 'python-dbus: for python-dbus mainloop support' + 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets' + 'qt5-tools: QtHelp, QtDesigner' + 'qt5-svg: QtSvg' + 'qt5-webkit: QtWebKit, QtWebKitWidgets' + 'qt5-xmlpatterns: QtXmlPatterns' + 'qt5-declarative: QtQml, qmlplugin') + + cd Py2Qt-gpl-${pkgver} + # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Fix conflicts with python-pyqt5 + mv "${pkgdir}"/usr/bin/{,python2-}pyuic5 + + rm "${pkgdir}"/usr/bin/{pylupdate5,pyrcc5} + rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so + rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so + rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api +} diff --git a/extra/python-cairo/PKGBUILD b/extra/python-cairo/PKGBUILD index 8034ee1b0..24f6a0fea 100644 --- a/extra/python-cairo/PKGBUILD +++ b/extra/python-cairo/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 169010 2012-10-17 10:20:01Z allan $ +# $Id: PKGBUILD 195288 2013-09-29 21:45:06Z eric $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=python-cairo pkgver=1.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for the cairo graphics library" arch=('i686' 'x86_64' 'mips64el') +url="http://www.cairographics.org/pycairo" license=('LGPL3') depends=('python' 'cairo') -makedepends=('pkg-config') options=('!libtool') source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2) -url="http://www.cairographics.org/pycairo" md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5') build() { diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index e03fa8012..7643e2d15 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186477 2013-05-27 11:23:42Z foutrelis $ +# $Id: PKGBUILD 195467 2013-09-30 13:27:17Z jgc $ # Maintainer: # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -6,7 +6,7 @@ pkgname=('python2-geoip') pkgbase=python-geoip pkgver=1.2.8 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" arch=('i686' 'x86_64' 'mips64el') url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10" @@ -16,12 +16,12 @@ source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.ta sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73') build() { - cd "$srcdir/GeoIP-Python-$pkgver" + cd "GeoIP-Python-$pkgver" python2 setup.py build } package_python2-geoip() { - cd "$srcdir/GeoIP-Python-$pkgver" + cd "GeoIP-Python-$pkgver" python2 setup.py install --root="$pkgdir" -O1 } diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index d991489df..8733625fe 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 186286 2013-05-23 20:40:14Z stephane $ +# $Id: PKGBUILD 193927 2013-09-06 07:53:42Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python pkgver=3.3.2 -pkgrel=1 +pkgrel=2 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.python.org/" depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk>=8.6.0' 'sqlite' 'bluez') +makedepends=('tk>=8.6.0' 'sqlite' 'bluez-libs') [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind') optdepends=('tk: for tkinter' 'sqlite') provides=('python3') replaces=('python3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz - python-3.3.2-CVE-2013-2099.patch) + python-3.3.2-CVE-2013-2099.patch + python-3.3.2-CVE-2013-4238.patch) sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad' - 'b7a386b2e2f0811b344898500860ec31ba81ed4d') + 'bfe07759daacd4ffa0e682e65f0c9fb84f715c73' + 'c30297201ef5cd803b685085ca6defb7ca66d2cd') -build() { +prepare() { cd "${srcdir}/Python-${pkgver}" # FS#23997 @@ -42,6 +44,11 @@ build() { fi patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch + patch -Np1 -i ../python-3.3.2-CVE-2013-4238.patch +} + +build() { + cd "${srcdir}/Python-${pkgver}" ./configure --prefix=/usr \ --enable-shared \ @@ -67,11 +74,12 @@ package() { make DESTDIR="${pkgdir}" install maninstall # Why are these not done by default... - ln -sf python3 "${pkgdir}/usr/bin/python" - ln -sf python3-config "${pkgdir}/usr/bin/python-config" - ln -sf idle3 "${pkgdir}/usr/bin/idle" - ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc" - ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" + ln -sf python3 "${pkgdir}"/usr/bin/python + ln -sf python3-config "${pkgdir}"/usr/bin/python-config + ln -sf idle3 "${pkgdir}"/usr/bin/idle + ln -sf pydoc3 "${pkgdir}"/usr/bin/pydoc + ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python3.1 + ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1 # Fix FS#22552 ln -sf ../../libpython${_pybasever}m.so \ diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch index 8162d8e54..888b43b00 100644 --- a/extra/python/python-3.3.2-CVE-2013-2099.patch +++ b/extra/python/python-3.3.2-CVE-2013-2099.patch @@ -1,4 +1,3 @@ - # HG changeset patch # User Antoine Pitrou <solipsis@pitrou.net> # Date 1368892602 -7200 diff --git a/extra/python/python-3.3.2-CVE-2013-4238.patch b/extra/python/python-3.3.2-CVE-2013-4238.patch new file mode 100644 index 000000000..2de2ed47f --- /dev/null +++ b/extra/python/python-3.3.2-CVE-2013-4238.patch @@ -0,0 +1,255 @@ + +# HG changeset patch +# User Christian Heimes <christian@cheimes.de> +# Date 1376693687 -7200 +# Node ID c9f073e593b037e8a29e386326859537691bcf62 +# Parent 3105b78d34346ea36c52a3b7e635954f4b444120 +Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes +inside subjectAltName correctly. Formerly the module has used OpenSSL's +GENERAL_NAME_print() function to get the string represention of ASN.1 +strings for rfc822Name (email), dNSName (DNS) and +uniformResourceIdentifier (URI). + +diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem +new file mode 100644 +--- /dev/null ++++ b/Lib/test/nullbytecert.pem +@@ -0,0 +1,90 @@ ++Certificate: ++ Data: ++ Version: 3 (0x2) ++ Serial Number: 0 (0x0) ++ Signature Algorithm: sha1WithRSAEncryption ++ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Validity ++ Not Before: Aug 7 13:11:52 2013 GMT ++ Not After : Aug 7 13:12:52 2013 GMT ++ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Subject Public Key Info: ++ Public Key Algorithm: rsaEncryption ++ Public-Key: (2048 bit) ++ Modulus: ++ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: ++ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: ++ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: ++ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: ++ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: ++ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: ++ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: ++ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: ++ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: ++ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: ++ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: ++ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: ++ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: ++ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: ++ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: ++ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: ++ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: ++ 2f:85 ++ Exponent: 65537 (0x10001) ++ X509v3 extensions: ++ X509v3 Basic Constraints: critical ++ CA:FALSE ++ X509v3 Subject Key Identifier: ++ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C ++ X509v3 Key Usage: ++ Digital Signature, Non Repudiation, Key Encipherment ++ X509v3 Subject Alternative Name: ++ ************************************************************* ++ WARNING: The values for DNS, email and URI are WRONG. OpenSSL ++ doesn't print the text after a NULL byte. ++ ************************************************************* ++ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 ++ Signature Algorithm: sha1WithRSAEncryption ++ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: ++ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: ++ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: ++ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: ++ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: ++ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: ++ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: ++ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: ++ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: ++ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: ++ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: ++ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: ++ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: ++ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: ++ c1:ca:a9:94 ++-----BEGIN CERTIFICATE----- ++MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx ++DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ ++eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg ++RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y ++ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw ++NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI ++DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv ++ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt ++ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq ++hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB ++BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j ++pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P ++vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv ++KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA ++oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL ++08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV ++HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E ++BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu ++Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 ++bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA ++AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 ++i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j ++HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk ++kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx ++VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW ++RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= ++-----END CERTIFICATE----- +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -55,6 +55,7 @@ BADCERT = data_file("badcert.pem") + WRONGCERT = data_file("XXXnonexisting.pem") + BADKEY = data_file("badkey.pem") + NOKIACERT = data_file("nokia.pem") ++NULLBYTECERT = data_file("nullbytecert.pem") + + DHFILE = data_file("dh512.pem") + BYTES_DHFILE = os.fsencode(DHFILE) +@@ -162,6 +163,27 @@ class BasicSocketTests(unittest.TestCase + ('DNS', 'projects.forum.nokia.com')) + ) + ++ def test_parse_cert_CVE_2013_4238(self): ++ p = ssl._ssl._test_decode_cert(NULLBYTECERT) ++ if support.verbose: ++ sys.stdout.write("\n" + pprint.pformat(p) + "\n") ++ subject = ((('countryName', 'US'),), ++ (('stateOrProvinceName', 'Oregon'),), ++ (('localityName', 'Beaverton'),), ++ (('organizationName', 'Python Software Foundation'),), ++ (('organizationalUnitName', 'Python Core Development'),), ++ (('commonName', 'null.python.org\x00example.org'),), ++ (('emailAddress', 'python-dev@python.org'),)) ++ self.assertEqual(p['subject'], subject) ++ self.assertEqual(p['issuer'], subject) ++ self.assertEqual(p['subjectAltName'], ++ (('DNS', 'altnull.python.org\x00example.com'), ++ ('email', 'null@python.org\x00user@example.org'), ++ ('URI', 'http://null.python.org\x00http://example.org'), ++ ('IP Address', '192.0.2.1'), ++ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) ++ ) ++ + def test_DER_to_PEM(self): + with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: + pem = f.read() +@@ -294,6 +316,13 @@ class BasicSocketTests(unittest.TestCase + fail(cert, 'foo.a.com') + fail(cert, 'bar.foo.com') + ++ # NULL bytes are bad, CVE-2013-4073 ++ cert = {'subject': ((('commonName', ++ 'null.python.org\x00example.org'),),)} ++ ok(cert, 'null.python.org\x00example.org') # or raise an error? ++ fail(cert, 'example.org') ++ fail(cert, 'null.python.org') ++ + # Slightly fake real-world example + cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT', + 'subject': ((('commonName', 'linuxfrz.org'),),), +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -771,12 +771,14 @@ static PyObject * + ext->value->length)); + + for(j = 0; j < sk_GENERAL_NAME_num(names); j++) { +- + /* get a rendering of each name in the set of names */ ++ int gntype; ++ ASN1_STRING *as = NULL; + + name = sk_GENERAL_NAME_value(names, j); +- if (name->type == GEN_DIRNAME) { +- ++ gntype = name-> type; ++ switch (gntype) { ++ case GEN_DIRNAME: + /* we special-case DirName as a tuple of + tuples of attributes */ + +@@ -798,11 +800,62 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + +- } else { ++ case GEN_EMAIL: ++ case GEN_DNS: ++ case GEN_URI: ++ /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string ++ correctly, CVE-2013-4238 */ ++ t = PyTuple_New(2); ++ if (t == NULL) ++ goto fail; ++ switch (gntype) { ++ case GEN_EMAIL: ++ v = PyUnicode_FromString("email"); ++ as = name->d.rfc822Name; ++ break; ++ case GEN_DNS: ++ v = PyUnicode_FromString("DNS"); ++ as = name->d.dNSName; ++ break; ++ case GEN_URI: ++ v = PyUnicode_FromString("URI"); ++ as = name->d.uniformResourceIdentifier; ++ break; ++ } ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 0, v); ++ v = PyUnicode_FromStringAndSize((char *)ASN1_STRING_data(as), ++ ASN1_STRING_length(as)); ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 1, v); ++ break; + ++ default: + /* for everything else, we use the OpenSSL print form */ +- ++ switch (gntype) { ++ /* check for new general name type */ ++ case GEN_OTHERNAME: ++ case GEN_X400: ++ case GEN_EDIPARTY: ++ case GEN_IPADD: ++ case GEN_RID: ++ break; ++ default: ++ if (PyErr_WarnFormat(PyExc_RuntimeWarning, 1, ++ "Unknown general name type %d", ++ gntype) == -1) { ++ goto fail; ++ } ++ break; ++ } + (void) BIO_reset(biobuf); + GENERAL_NAME_print(biobuf, name); + len = BIO_gets(biobuf, buf, sizeof(buf)-1); +@@ -829,6 +882,7 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + } + + /* and add that rendering to the list */ + diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 440e51d2f..15770f376 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 185697 2013-05-17 11:13:51Z stephane $ +# $Id: PKGBUILD 193929 2013-09-06 08:06:17Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 pkgver=2.7.5 -pkgrel=1 +pkgrel=2 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64' 'mips64el') license=('PSF') url="http://www.python.org/" depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi') -makedepends=('tk>=8.6.0' 'bluez') +makedepends=('tk>=8.6.0' 'bluez-libs') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf') +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz + python-2.7.5-CVE-2013-4238.patch) +sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf' + 'fb1f95ca21d9c00eaaea5a58236d1d97300482d7') -build() { +prepare() { cd "${srcdir}/Python-${pkgver}" + # http://bugs.python.org/issue18709 + patch -Np1 -i ../python-2.7.5-CVE-2013-4238.patch + # Temporary workaround for FS#22322 # See http://bugs.python.org/issue10835 for upstream report sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c @@ -40,6 +45,10 @@ build() { rm -r Modules/expat rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* +} + +build() { + cd "${srcdir}/Python-${pkgver}" export OPT="${CFLAGS}" ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ diff --git a/extra/python2/python-2.7.5-CVE-2013-4238.patch b/extra/python2/python-2.7.5-CVE-2013-4238.patch new file mode 100644 index 000000000..c37190182 --- /dev/null +++ b/extra/python2/python-2.7.5-CVE-2013-4238.patch @@ -0,0 +1,267 @@ + +# HG changeset patch +# User Christian Heimes <christian@cheimes.de> +# Date 1376693687 -7200 +# Node ID bd2360476bdbb1477b81b0e18b8d86b3452ba77b +# Parent 87fcc13ade91874971ad577efaa2254c744a2b07 +Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes +inside subjectAltName correctly. Formerly the module has used OpenSSL's +GENERAL_NAME_print() function to get the string represention of ASN.1 +strings for rfc822Name (email), dNSName (DNS) and +uniformResourceIdentifier (URI). + +diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem +new file mode 100644 +--- /dev/null ++++ b/Lib/test/nullbytecert.pem +@@ -0,0 +1,90 @@ ++Certificate: ++ Data: ++ Version: 3 (0x2) ++ Serial Number: 0 (0x0) ++ Signature Algorithm: sha1WithRSAEncryption ++ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Validity ++ Not Before: Aug 7 13:11:52 2013 GMT ++ Not After : Aug 7 13:12:52 2013 GMT ++ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org ++ Subject Public Key Info: ++ Public Key Algorithm: rsaEncryption ++ Public-Key: (2048 bit) ++ Modulus: ++ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3: ++ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97: ++ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2: ++ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1: ++ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4: ++ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8: ++ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02: ++ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75: ++ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91: ++ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d: ++ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30: ++ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7: ++ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12: ++ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5: ++ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb: ++ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f: ++ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da: ++ 2f:85 ++ Exponent: 65537 (0x10001) ++ X509v3 extensions: ++ X509v3 Basic Constraints: critical ++ CA:FALSE ++ X509v3 Subject Key Identifier: ++ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C ++ X509v3 Key Usage: ++ Digital Signature, Non Repudiation, Key Encipherment ++ X509v3 Subject Alternative Name: ++ ************************************************************* ++ WARNING: The values for DNS, email and URI are WRONG. OpenSSL ++ doesn't print the text after a NULL byte. ++ ************************************************************* ++ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1 ++ Signature Algorithm: sha1WithRSAEncryption ++ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5: ++ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44: ++ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37: ++ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3: ++ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86: ++ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac: ++ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4: ++ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60: ++ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5: ++ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60: ++ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6: ++ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d: ++ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e: ++ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6: ++ c1:ca:a9:94 ++-----BEGIN CERTIFICATE----- ++MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx ++DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ ++eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg ++RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y ++ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw ++NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI ++DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv ++ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt ++ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq ++hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB ++BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j ++pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P ++vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv ++KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA ++oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL ++08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV ++HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E ++BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu ++Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251 ++bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA ++AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9 ++i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j ++HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk ++kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx ++VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW ++RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ= ++-----END CERTIFICATE----- +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -25,6 +25,7 @@ ssl = test_support.import_module("ssl") + HOST = test_support.HOST + CERTFILE = None + SVN_PYTHON_ORG_ROOT_CERT = None ++NULLBYTECERT = None + + def handle_error(prefix): + exc_format = ' '.join(traceback.format_exception(*sys.exc_info())) +@@ -123,6 +124,27 @@ class BasicSocketTests(unittest.TestCase + ('DNS', 'projects.forum.nokia.com')) + ) + ++ def test_parse_cert_CVE_2013_4238(self): ++ p = ssl._ssl._test_decode_cert(NULLBYTECERT) ++ if test_support.verbose: ++ sys.stdout.write("\n" + pprint.pformat(p) + "\n") ++ subject = ((('countryName', 'US'),), ++ (('stateOrProvinceName', 'Oregon'),), ++ (('localityName', 'Beaverton'),), ++ (('organizationName', 'Python Software Foundation'),), ++ (('organizationalUnitName', 'Python Core Development'),), ++ (('commonName', 'null.python.org\x00example.org'),), ++ (('emailAddress', 'python-dev@python.org'),)) ++ self.assertEqual(p['subject'], subject) ++ self.assertEqual(p['issuer'], subject) ++ self.assertEqual(p['subjectAltName'], ++ (('DNS', 'altnull.python.org\x00example.com'), ++ ('email', 'null@python.org\x00user@example.org'), ++ ('URI', 'http://null.python.org\x00http://example.org'), ++ ('IP Address', '192.0.2.1'), ++ ('IP Address', '2001:DB8:0:0:0:0:0:1\n')) ++ ) ++ + def test_DER_to_PEM(self): + with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f: + pem = f.read() +@@ -1360,7 +1382,7 @@ else: + + + def test_main(verbose=False): +- global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT ++ global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT + CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, + "keycert.pem") + SVN_PYTHON_ORG_ROOT_CERT = os.path.join( +@@ -1368,10 +1390,13 @@ def test_main(verbose=False): + "https_svn_python_org_root.pem") + NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir, + "nokia.pem") ++ NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir, ++ "nullbytecert.pem") + + if (not os.path.exists(CERTFILE) or + not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or +- not os.path.exists(NOKIACERT)): ++ not os.path.exists(NOKIACERT) or ++ not os.path.exists(NULLBYTECERT)): + raise test_support.TestFailed("Can't read certificate files!") + + tests = [BasicTests, BasicSocketTests] +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -738,13 +738,16 @@ static PyObject * + ext->value->length)); + + for(j = 0; j < sk_GENERAL_NAME_num(names); j++) { +- + /* get a rendering of each name in the set of names */ ++ int gntype; ++ ASN1_STRING *as = NULL; + + name = sk_GENERAL_NAME_value(names, j); +- if (name->type == GEN_DIRNAME) { +- +- /* we special-case DirName as a tuple of tuples of attributes */ ++ gntype = name-> type; ++ switch (gntype) { ++ case GEN_DIRNAME: ++ /* we special-case DirName as a tuple of ++ tuples of attributes */ + + t = PyTuple_New(2); + if (t == NULL) { +@@ -764,11 +767,61 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + +- } else { ++ case GEN_EMAIL: ++ case GEN_DNS: ++ case GEN_URI: ++ /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string ++ correctly, CVE-2013-4238 */ ++ t = PyTuple_New(2); ++ if (t == NULL) ++ goto fail; ++ switch (gntype) { ++ case GEN_EMAIL: ++ v = PyString_FromString("email"); ++ as = name->d.rfc822Name; ++ break; ++ case GEN_DNS: ++ v = PyString_FromString("DNS"); ++ as = name->d.dNSName; ++ break; ++ case GEN_URI: ++ v = PyString_FromString("URI"); ++ as = name->d.uniformResourceIdentifier; ++ break; ++ } ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 0, v); ++ v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as), ++ ASN1_STRING_length(as)); ++ if (v == NULL) { ++ Py_DECREF(t); ++ goto fail; ++ } ++ PyTuple_SET_ITEM(t, 1, v); ++ break; + ++ default: + /* for everything else, we use the OpenSSL print form */ +- ++ switch (gntype) { ++ /* check for new general name type */ ++ case GEN_OTHERNAME: ++ case GEN_X400: ++ case GEN_EDIPARTY: ++ case GEN_IPADD: ++ case GEN_RID: ++ break; ++ default: ++ if (PyErr_Warn(PyExc_RuntimeWarning, ++ "Unknown general name type") == -1) { ++ goto fail; ++ } ++ break; ++ } + (void) BIO_reset(biobuf); + GENERAL_NAME_print(biobuf, name); + len = BIO_gets(biobuf, buf, sizeof(buf)-1); +@@ -794,6 +847,7 @@ static PyObject * + goto fail; + } + PyTuple_SET_ITEM(t, 1, v); ++ break; + } + + /* and add that rendering to the list */ + diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index e6ff9a5f2..b97721f09 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191616 2013-07-27 20:19:26Z tpowa $ +# $Id: PKGBUILD 195926 2013-10-05 14:25:32Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=('qemu' 'libcacard') -pkgver=1.5.2 -pkgrel=1 +pkgver=1.6.0 +pkgrel=4 arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" @@ -20,7 +20,7 @@ build () ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \ - --disable-gtk --enable-linux-aio --enable-seccomp + --disable-gtk --enable-linux-aio --enable-seccomp --localstatedir=/var make } @@ -33,8 +33,12 @@ package_qemu() { backup=('etc/qemu/target-x86_64.conf') cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install + # provided by seabios package rm "${pkgdir}/usr/share/qemu/bios.bin" - + rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml" + rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml" + # remove conflicting /var/run directory + rm -r "${pkgdir}/var" install -D -m644 "${srcdir}/65-kvm.rules" \ "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" # bridge_helper needs suid @@ -65,6 +69,5 @@ package_libcacard() { cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } - -md5sums=('04b94189ba587b3280713ded3b7f959a' +md5sums=('f3f39308472d629aca57a255a0c91ba9' '9d6de26867a05c306157e3d3c612b28a') diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD index 777734f48..4b1f65e86 100644 --- a/extra/quadrapassel/PKGBUILD +++ b/extra/quadrapassel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191635 2013-07-28 18:12:42Z heftig $ +# $Id: PKGBUILD 196132 2013-10-07 11:53:21Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=quadrapassel -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=quadrapassel.install url="https://live.gnome.org/Quadrapassel" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('a2e861f65560345f697665434698e86a3df874ba2721ba1674dce26dcb0a6229') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('02e035d5486f023b2fee410dc909034163fd61369ee77cdfb0f07ac3069c46fa') build() { cd $pkgname-$pkgver diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index b88c703ae..36d55febc 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180809 2013-03-26 11:49:40Z foutrelis $ +# $Id: PKGBUILD 194462 2013-09-16 16:36:19Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor -pkgver=2.0.9 +pkgver=2.0.10 pkgrel=2 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64' 'mips64el') @@ -33,4 +33,4 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('4ceb9316488b0ea01acf011023cf7fff') +md5sums=('d9b0314eb835551adb48af037dcfd46e') diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 1b919070b..aef4fa34c 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 193534 2013-08-22 15:56:50Z tpowa $ +# $Id: PKGBUILD 194269 2013-09-12 15:17:40Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> ####### _TIANOCORE_SVN_URL="https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1" # BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg _TIANO_DIR_="tianocore-udk-svn" +_TIANO_SVN_REV_="14641" ####### ####### _TIANOCORE_PKG="Mde" _TIANOCORE_TARGET="RELEASE" _UDK_TARGET="${_TIANOCORE_PKG}Pkg/${_TIANOCORE_PKG}Pkg.dsc" -_COMPILER="GCC46" +_COMPILER="GCC47" ####### pkgname="refind-efi" -pkgver="0.7.3" -pkgrel="2" +pkgver="0.7.4" +pkgrel="1" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') @@ -36,10 +37,10 @@ source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip" 'refind_linux.conf') for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do - source+=("${_TIANO_DIR_}/${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}") + source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}#revision=${_TIANO_SVN_REV_}") done -sha1sums=('5e4b15202efc658e58e68e64af8a1b2c84aab175' +sha1sums=('410d2694c5005a5312d48414df8acf8291da42a9' '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' 'SKIP' 'SKIP' @@ -70,7 +71,7 @@ _prepare_tianocore_sources() { mkdir -p "${_UDK_DIR}/" for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do - mv "${srcdir}/${_DIR_}" "${_UDK_DIR}/${_DIR_}" + mv "${srcdir}/${_TIANO_DIR_}_${_DIR_}" "${_UDK_DIR}/${_DIR_}" done cd "${_UDK_DIR}/" @@ -98,6 +99,10 @@ _prepare_tianocore_sources() { sed 's|DEFINE GCC_ALL_CC_FLAGS = -g |DEFINE GCC_ALL_CC_FLAGS = -Os -mabi=ms |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true sed 's|DEFINE GCC44_ALL_CC_FLAGS = -g |DEFINE GCC44_ALL_CC_FLAGS = -Os -mabi=ms |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true + msg "Fix GenFw: ERROR 3000: Invalid, refind_x64.dll bad symbol definition" + ## http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg03625.html + sed -e 's|_OBJCOPY_FLAGS =|_OBJCOPY_FLAGS = -R .eh_frame|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true + msg "Fix UDK Target Platform" sed "s|ACTIVE_PLATFORM = Nt32Pkg/Nt32Pkg.dsc|ACTIVE_PLATFORM = ${_UDK_TARGET}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true sed "s|TARGET = DEBUG|TARGET = ${_TIANOCORE_TARGET}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true @@ -120,6 +125,11 @@ _prepare_refind_sources() { sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true + msg "Fix GenFw: ERROR 3000: Invalid, refind_x64.dll bad symbol definition" + sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/refind/Make.tiano" || true + sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" + sed -e 's|--strip-unneeded|--strip-unneeded -R .eh_frame|g' -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true + } prepare() { @@ -242,10 +252,3 @@ package() { sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install" } -sha1sums=('baac40c10b26b337c85248aa8e2b61ab4f06f73d' - '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 13a5ea30a..5e7d8526a 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 185168 2013-05-11 16:16:33Z tomegun $ +# $Id: PKGBUILD 196133 2013-10-07 11:53:23Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=2.99.1 +pkgver=3.0 pkgrel=2 pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64' 'mips64el') license=(GPL) url="http://www.rhythmbox.org" -depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info python2-gobject totem-plparser tdb webkitgtk3) +depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkitgtk3 python-gobject) makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc-utils libgpod libmtp) optdepends=('gst-plugins-ugly: Extra media codecs' 'gst-plugins-bad: Extra media codecs' @@ -24,11 +24,11 @@ optdepends=('gst-plugins-ugly: Extra media codecs' options=('!libtool' '!emptydirs') install=rhythmbox.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz) -sha256sums=('ed30bb534a789e2b50f953e33eee0bb09f389fe813d433a87d504d07be5f7777') +sha256sums=('bf6f35c1a46867d16e45969f97f01630d936bfa92baf940c442f3a19fb6820e4') build() { cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/rhythmbox \ --localstatedir=/var --disable-static \ --enable-daap --enable-python --enable-vala diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD index 5cc11d096..1543daf7a 100644 --- a/extra/rsync/PKGBUILD +++ b/extra/rsync/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 185234 2013-05-12 10:36:09Z pierre $ +# $Id: PKGBUILD 195476 2013-09-30 19:07:27Z pierre $ pkgname=rsync -pkgver=3.0.9 -pkgrel=6 +pkgver=3.1.0 +pkgrel=1 pkgdesc="A file transfer program to keep remote files in sync" arch=('i686' 'x86_64' 'mips64el') url="http://samba.anu.edu.au/rsync/" license=('GPL3') -depends=('perl') +depends=('perl' 'popt') backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync') source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz" + "http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz.asc" 'rsyncd.conf' 'rsync.xinetd' 'rsyncd.service' 'rsyncd.socket' 'rsyncd@.service') -md5sums=('5ee72266fe2c1822333c407e1761b92b' +md5sums=('3be148772a33224771a8d4d2a028b132' + 'SKIP' 'bce64d122a8e0f86872a4a21a03bc7f3' 'ea3e9277dc908bc51f9eddc0f6b935c1' '084140868d38cf3e937a2db716d47c0f' @@ -21,7 +23,10 @@ md5sums=('5ee72266fe2c1822333c407e1761b92b' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-included-popt + ./configure --prefix=/usr \ + --with-included-popt=no \ + --with-included-zlib=no \ + --disable-debug make } diff --git a/extra/rtkit/0001-SECURITY-Pass-uid-of-caller-to-polkit.patch b/extra/rtkit/0001-SECURITY-Pass-uid-of-caller-to-polkit.patch new file mode 100644 index 000000000..92e54b950 --- /dev/null +++ b/extra/rtkit/0001-SECURITY-Pass-uid-of-caller-to-polkit.patch @@ -0,0 +1,48 @@ +From f44c5776b25ca2abd7569fb8532c6aede9b0c6b0 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Thu, 22 Aug 2013 16:05:22 -0400 +Subject: [PATCH] [SECURITY] Pass uid of caller to polkit + +Otherwise, we force polkit to look up the uid itself in /proc, which +is racy if they execve() a setuid binary. +--- + rtkit-daemon.c | 11 ++++++++++- + 1 files changed, 10 insertions(+), 1 deletions(-) + +diff --git a/rtkit-daemon.c b/rtkit-daemon.c +index 2ebe673..3ecc1f7 100644 +--- a/rtkit-daemon.c ++++ b/rtkit-daemon.c +@@ -1170,12 +1170,14 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process + DBusMessage *m = NULL, *r = NULL; + const char *unix_process = "unix-process"; + const char *pid = "pid"; ++ const char *uid = "uid"; + const char *start_time = "start-time"; + const char *cancel_id = ""; + uint32_t flags = 0; + uint32_t pid_u32 = p->pid; +- uint64_t start_time_u64 = p->starttime; ++ uint32_t uid_u32 = (uint32_t)u->uid; + DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant; ++ uint64_t start_time_u64 = p->starttime; + int ret; + dbus_bool_t authorized = FALSE; + +@@ -1206,6 +1208,13 @@ static int verify_polkit(DBusConnection *c, struct rtkit_user *u, struct process + assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant)); + assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict)); + ++ assert_se(dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict)); ++ assert_se(dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &uid)); ++ assert_se(dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant)); ++ assert_se(dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &uid_u32)); ++ assert_se(dbus_message_iter_close_container(&iter_dict, &iter_variant)); ++ assert_se(dbus_message_iter_close_container(&iter_array, &iter_dict)); ++ + assert_se(dbus_message_iter_close_container(&iter_struct, &iter_array)); + assert_se(dbus_message_iter_close_container(&iter_msg, &iter_struct)); + +-- +1.7.1 + diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD index b0aeb467b..d81cbd75b 100644 --- a/extra/rtkit/PKGBUILD +++ b/extra/rtkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185307 2013-05-13 06:17:53Z heftig $ +# $Id: PKGBUILD 195870 2013-10-02 22:42:11Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=rtkit pkgver=0.11 -pkgrel=2 +pkgrel=4 pkgdesc="Realtime Policy and Watchdog Daemon" arch=('i686' 'x86_64' 'mips64el') url="http://git.0pointer.de/?p=rtkit.git" @@ -12,13 +12,18 @@ license=(GPL 'custom:BSD') depends=(dbus polkit systemd) install=rtkit.install source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz - libsystemd.patch) + libsystemd.patch systemd205.patch + 0001-SECURITY-Pass-uid-of-caller-to-polkit.patch) md5sums=('a96c33b9827de66033d2311f82d79a5d' - '35089c0a284005f4abcf45168415857e') + '35089c0a284005f4abcf45168415857e' + '95195a70551057aca833da6bdbf2e35b' + '70df212cba2a6366ff960b60d55858d3') prepare() { cd $pkgname-$pkgver patch -Np1 -i ../libsystemd.patch + patch -Np1 -i ../systemd205.patch + patch -Np1 -i ../0001-SECURITY-Pass-uid-of-caller-to-polkit.patch autoreconf -fi } diff --git a/extra/rtkit/systemd205.patch b/extra/rtkit/systemd205.patch new file mode 100644 index 000000000..3f17b2ddb --- /dev/null +++ b/extra/rtkit/systemd205.patch @@ -0,0 +1,16 @@ +diff -u -r rtkit-0.11/rtkit-daemon.service.in rtkit-0.11-sd205/rtkit-daemon.service.in +--- rtkit-0.11/rtkit-daemon.service.in 2012-05-15 15:25:40.000000000 +0200 ++++ rtkit-0.11-sd205/rtkit-daemon.service.in 2013-07-25 10:27:37.790884664 +0200 +@@ -24,12 +24,7 @@ + BusName=org.freedesktop.RealtimeKit1 + NotifyAccess=main + CapabilityBoundingSet=CAP_SYS_NICE CAP_DAC_READ_SEARCH CAP_SYS_PTRACE CAP_SYS_CHROOT CAP_SETGID CAP_SETUID +-PrivateTmp=yes + PrivateNetwork=yes + +-# Work around the fact that the Linux currently doesn't assign any RT +-# budget to CPU control groups that have none configured explicitly +-ControlGroup=cpu:/ +- + [Install] + WantedBy=graphical.target diff --git a/extra/ruby/0001-remove-db-support.patch b/extra/ruby/0001-remove-db-support.patch new file mode 100644 index 000000000..bdd7e5871 --- /dev/null +++ b/extra/ruby/0001-remove-db-support.patch @@ -0,0 +1,35 @@ +From b653d6ffe9ec25c203fc0cbbbdd72e9b42546283 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Sat, 10 Aug 2013 10:50:16 -0700 +Subject: [PATCH] remove db support + +--- + ext/dbm/extconf.rb | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb +index 32a9446..2412404 100644 +--- a/ext/dbm/extconf.rb ++++ b/ext/dbm/extconf.rb +@@ -5,17 +5,11 @@ dir_config("dbm") + if dblib = with_config("dbm-type", nil) + dblib = dblib.split(/[ ,]+/) + else +- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm) ++ dblib = %w(libc gdbm_compat gdbm qdbm) + end + + headers = { + "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc. +- "db" => ["db.h"], +- "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"], +- "db2" => ["db2/db.h", "db2.h", "db.h"], +- "db3" => ["db3/db.h", "db3.h", "db.h"], +- "db4" => ["db4/db.h", "db4.h", "db.h"], +- "db5" => ["db5/db.h", "db5.h", "db.h"], + "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1 + "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0 + "qdbm" => ["qdbm/relic.h", "relic.h"], +-- +1.8.3.4 + diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index e28535354..2fbb4b46b 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -5,20 +5,25 @@ pkgname=('ruby' 'ruby-docs') pkgver=2.0.0_p247 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://www.ruby-lang.org/en/' license=('BSD' 'custom') -makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') +makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" - 'gemrc') + 'gemrc' + '0001-remove-db-support.patch') md5sums=('60913f3eec0c4071f44df42600be2604' - '6fb8e7a09955e0f64be3158fb4a27e7a') + '6fb8e7a09955e0f64be3158fb4a27e7a' + 'b93ff50214a3da26525244cf37b71a8f') build() { cd ruby-${pkgver//_/-} + # use gdbm because db v6 changed the license to AGPL + patch -Np1 -i ${srcdir}/0001-remove-db-support.patch + PKG_CONFIG=/usr/bin/pkg-config ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -37,7 +42,7 @@ check() { package_ruby() { pkgdesc='An object-oriented language for quick and easy programming' - depends=('openssl' 'libffi' 'libyaml') + depends=('gdbm' 'openssl' 'libffi' 'libyaml') optdepends=('tk: for Ruby/TK' 'ruby-docs: Ruby documentation') provides=('rubygems' 'rake') diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index 244d9dca6..1f544ce8b 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192270 2013-08-09 12:52:33Z heftig $ +# $Id: PKGBUILD 196134 2013-10-07 11:53:25Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.18.4 +pkgver=0.20.0 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ options=('!libtool') install=rygel.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f63f3f1cd1456b7e3b9232ec81ad481d220530a734ed8a09eb046d30c34d3ebe') +sha256sums=('f695bae2c20b911393f7abf265c18f3c5a5c42fe4223fc9150ab9007558363fe') build() { cd $pkgname-$pkgver diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch deleted file mode 100644 index 8bfd29b66..000000000 --- a/extra/sane/1.0.23-hp2400c.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr> -Date: Mon, 3 Jun 2013 06:33:08 +0200 -Subject: [PATCH] bug 314293 fix - -- don't use non-existent end of records ---- - ChangeLog | 3 +++ - backend/genesys_gl646.c | 14 +++++++------- - 2 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c -index c6a5af5..2d5cddc 100644 ---- a/backend/genesys_gl646.c -+++ b/backend/genesys_gl646.c -@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color) - i = 0; - dpi = 9600; - nb = sizeof (sensor_master) / sizeof (Sensor_Master); -- while (sensor_master[i].sensor != -1 && i < nb) -+ while (i < nb) - { - /* computes distance and keep mode if it is closer than previous */ - if (sensor == sensor_master[i].sensor -@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color) - dpi = 0; - dist = 9600; - nb = sizeof (sensor_master) / sizeof (Sensor_Master); -- while (sensor_master[i].sensor != -1 && i < nb) -+ while (i < nb) - { - /* exit on perfect match */ - if (sensor == sensor_master[i].sensor -@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color) - - i = 0; - nb = sizeof (sensor_master) / sizeof (Sensor_Master); -- while (sensor_master[i].sensor != -1 && i < nb) -+ while (i < nb) - { - /* exit on perfect match */ - if (sensor == sensor_master[i].sensor -@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color) - - i = 0; - nb = sizeof (sensor_master) / sizeof (Sensor_Master); -- while (sensor_master[i].sensor != -1 && i < nb) -+ while (i < nb) - { - /* exit on perfect match */ - if (sensor == sensor_master[i].sensor -@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev, - * sensor mode setting */ - i = 0; - nb = sizeof (sensor_master) / sizeof (Sensor_Master); -- while (sensor_master[i].sensor != -1 && i < nb) -+ while (i < nb) - { - if (dev->model->ccd_type == sensor_master[i].sensor - && sensor_master[i].dpi == xresolution -@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev, - * motor mode setting */ - i = 0; - nb = sizeof (motor_master) / sizeof (Motor_Master); -- while (motor_master[i].motor != -1 && i < nb) -+ while (i < nb) - { - if (dev->model->motor_type == motor_master[i].motor - && motor_master[i].dpi == resolution -@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev, - /* now we can search for the specific sensor settings */ - i = 0; - nb = sizeof (sensor_settings) / sizeof (Sensor_Settings); -- while (sensor_settings[i].sensor != -1 && i < nb) -+ while (i < nb) - { - if (sensor->sensor == sensor_settings[i].sensor - && sensor->cksel == sensor_settings[i].cksel) --- -1.7.2.5 - diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 82f211b7b..571a56270 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $ +# $Id: PKGBUILD 195946 2013-10-06 06:58:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> # Contributor: eric <eric@archlinux.org> pkgname=sane -pkgver=1.0.23 -pkgrel=7 +pkgver=1.0.24 +pkgrel=2 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') @@ -18,17 +18,11 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' 'saned.socket' 'saned.service' - 'kodakaio.c.patch' - 'network.patch' - '1.0.23-hp2400c.patch') + 'network.patch') options=(!libtool) prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - # fix FS#35549 - patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch - # fix FS#33657 - patch -Np0 -i ${srcdir}/kodakaio.c.patch # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 patch -Np1 -i ${srcdir}/network.patch } @@ -55,9 +49,9 @@ package () { echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf" # install udev files install -D -m0644 tools/udev/libsane.rules \ - "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules" + "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules" # fix udev rules - sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules" + sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules" # install xinetd file install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane" @@ -71,10 +65,8 @@ package () { install -D -m644 ${srcdir}/saned.service \ "${pkgdir}/usr/lib/systemd/system/saned@.service" } -md5sums=('e226a89c54173efea80e91e9a5eb6573' +md5sums=('1ca68e536cd7c1852322822f5f6ac3a4' 'bc2c8b4f7b3012c8936c7da21f60e2ac' 'e57e9e15528f47f5f1b3f1411135ed5d' '3f9fe36b0c4ff0b01b53b1cffa5d9700' - 'e65dbefb7c3d69955fb6eb3ace14aa12' - '44e77692c52db15b0f530a1d9a8e1296' - '0c8bfabcaa499c4a2583aa2fe53d1686') + '44e77692c52db15b0f530a1d9a8e1296') diff --git a/extra/sane/kodakaio.c.patch b/extra/sane/kodakaio.c.patch deleted file mode 100644 index 95cb1ee9a..000000000 --- a/extra/sane/kodakaio.c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- backend/kodakaio.c.bad 2013-01-31 20:42:10.627296894 +0100 -+++ backend/kodakaio.c 2013-01-31 20:42:46.040397213 +0100 -@@ -2197,7 +2197,7 @@ - - reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT, - "dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy); -- if(reply != IPP_OK) printf("Failed cupsGetDevices\n"); -+ if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n"); - - return 0; - } diff --git a/extra/seahorse-nautilus/PKGBUILD b/extra/seahorse-nautilus/PKGBUILD new file mode 100644 index 000000000..c5cf70f1a --- /dev/null +++ b/extra/seahorse-nautilus/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 196136 2013-10-07 11:53:28Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Balló György <ballogyor+arch at gmail dot com> + +pkgname=seahorse-nautilus +pkgver=3.10.0 +pkgrel=1 +pkgdesc="PGP encryption and signing for nautilus" +arch=('i686' 'x86_64' 'mips64el') +url="http://git.gnome.org/browse/seahorse-nautilus/" +license=('GPL') +depends=('libcryptui' 'gcr' 'nautilus') +makedepends=('intltool') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d54c5fbc2bade03296d39999f8412708cfa87e82bda3c5af8e0b8ad86b2fadf3') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/extra/seahorse-nautilus/seahorse-nautilus.install b/extra/seahorse-nautilus/seahorse-nautilus.install new file mode 100644 index 000000000..21f12fbda --- /dev/null +++ b/extra/seahorse-nautilus/seahorse-nautilus.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index bcc7c7431..4380a4549 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185473 2013-05-14 11:01:28Z heftig $ +# $Id: PKGBUILD 196135 2013-10-07 11:53:27Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') @@ -17,9 +17,9 @@ provides=(x11-ssh-askpass) options=('!libtool' '!emptydirs') groups=(gnome-extra) install=seahorse.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('b3837d088b7e3f7ebc41cb3f11c5c85e2df7e06bdc538a3e85bb1a13c34c9a12' +sha256sums=('98023cb8805cf778163833ddba783ba1505c0595683e1ac92109d27e8556fbde' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD index 763e6c608..58c0c98b2 100644 --- a/extra/serf/PKGBUILD +++ b/extra/serf/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 193131 2013-08-17 07:19:26Z angvp $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# $Id: PKGBUILD 194737 2013-09-23 12:42:49Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=serf -pkgver=1.3.0 -pkgrel=1 +pkgver=1.3.1 +pkgrel=2 pkgdesc="High-performance asynchronous HTTP client library" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/serf/" @@ -11,8 +12,15 @@ license=('Apache') depends=('apr-util') makedepends=('scons') options=('!libtool' '!staticlibs') -source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('14ed3e1dc195016a548499b3831f3df6b2501d27') +source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 'serf-ssl-allocator-v2.patch') +md5sums=('da5aca0cad19fd9c19129c3f8f7393dd' + 'a0ff486ee26f86cb2825decfd1dc8355') + +prepare() { + mv serf-ssl-allocator-v2.patch ${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} + patch -Np0 -i serf-ssl-allocator-v2.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 541758fe9..27b0344b4 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 193580 2013-08-24 12:37:03Z andrea $ +# $Id: PKGBUILD 194372 2013-09-15 07:17:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.15.1 +pkgver=4.15.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.riverbankcomputing.com/software/sip/intro' license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('ec1ce361ac3618fe05359ec6f5368463') +md5sums=('52abe824ca7f530a5643abfa3ee715d7') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} @@ -20,7 +20,7 @@ build() { cd ${pkgbase}-${pkgver} python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" make - + ### Python2 version ### cd ../python2-${pkgbase}-${pkgver} python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" @@ -43,10 +43,10 @@ package_python-sip() { cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install -C siplib - + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py - + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } @@ -56,9 +56,9 @@ package_python2-sip() { cd python2-${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install -C siplib - + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py - + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 3303def70..8fcf5c524 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184434 2013-05-06 19:39:43Z foutrelis $ +# $Id: PKGBUILD 195944 2013-10-06 06:46:09Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -6,27 +6,38 @@ # Contributor: Hugo Ideler <hugoideler@dse.nl> pkgname=slim -pkgver=1.3.5 -pkgrel=3 +pkgver=1.3.6 +pkgrel=2 pkgdesc="Desktop-independent graphical login manager for X11" arch=('i686' 'x86_64' 'mips64el') url="http://slim.berlios.de/" license=('GPL2') -depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'xorg-xauth') +depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth') makedepends=('cmake' 'freeglut') backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim') source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz + slim-1.3.6-fix-libslim-libraries.patch + slim-1.3.6-add-sessiondir.patch slim.pam slim.logrotate) -sha256sums=('818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629' +sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df' + '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0' + '0dffd53a69eb9033a67fad964df6fc150ee7a483e29d8eb8b559010fbd14e5fd' 'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4' '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # Fix installation path of slim.service - sed -i 's|usr/lib/systemd/system|/&|' CMakeLists.txt + sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt + + patch -Np1 -i "$srcdir/slim-1.3.6-fix-libslim-libraries.patch" + patch -Np1 -i "$srcdir/slim-1.3.6-add-sessiondir.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/slim/slim-1.3.6-add-sessiondir.patch b/extra/slim/slim-1.3.6-add-sessiondir.patch new file mode 100644 index 000000000..f6abf0bc7 --- /dev/null +++ b/extra/slim/slim-1.3.6-add-sessiondir.patch @@ -0,0 +1,28 @@ +From 741e43960a4ea3a8bc230b1f599311d800c2cc83 Mon Sep 17 00:00:00 2001 +From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> +Date: Wed, 02 Oct 2013 23:23:24 +0000 +Subject: Update slim.conf. Add sessiondir. + +Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> +--- +diff --git a/slim.conf b/slim.conf +index a8e2e1c..c5f1d38 100644 +--- a/slim.conf ++++ b/slim.conf +@@ -47,11 +47,9 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session + # options "-d" and "-nodaemon" + # daemon yes + +-# Available sessions (first one is the default). +-# The current chosen session name is replaced in the login_cmd +-# above, so your login command can handle different sessions. +-# see the xinitrc.sample file shipped with slim sources +-sessions xfce4,icewm-session,wmaker,blackbox ++# Set directory that contains the xsessions. ++# slim reads xsesion from this directory, and be able to select. ++sessiondir /usr/share/xsessions/ + + # Executed when pressing F11 (requires imagemagick) + screenshot_cmd import -window root /slim.png +-- +cgit v0.9.2 diff --git a/extra/slim/slim-1.3.6-fix-libslim-libraries.patch b/extra/slim/slim-1.3.6-fix-libslim-libraries.patch new file mode 100644 index 000000000..b6c90f9f4 --- /dev/null +++ b/extra/slim/slim-1.3.6-fix-libslim-libraries.patch @@ -0,0 +1,20 @@ +diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt +--- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 ++++ slim-1.3.6/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 +@@ -119,6 +119,7 @@ if(USE_PAM) + if(PAM_FOUND) + message("\tPAM Found") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") ++ target_link_libraries(libslim ${PAM_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) + target_link_libraries(slimlock ${PAM_LIBRARY}) + include_directories(${PAM_INCLUDE_DIR}) +@@ -178,6 +179,8 @@ include_directories( + ) + + target_link_libraries(libslim ++ ${X11_Xft_LIB} ++ ${X11_Xrandr_LIB} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ) diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index 938c5d56f..cf89fbe27 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 193758 2013-08-30 08:53:28Z andyrtr $ +# $Id: PKGBUILD 194286 2013-09-13 07:06:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3080001 +_amalgamationver=3080002 _docver=${_amalgamationver} #_docver=3080001 -pkgver=3.8.0.1 +pkgver=3.8.0.2 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') @@ -18,8 +18,8 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -sha1sums=('d2fd623a7537e0fad5a2f33169dd9d6def268583' - '89005a0fdd60accd037845895c9b21221d9fc30d' +sha1sums=('294c30e882a0d45877bce09afe72d08ccfc6b650' + '43e314880cee7c97c240131625f6442c2ca7b109' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD index b821e2889..ac9cbcf75 100644 --- a/extra/ssmtp/PKGBUILD +++ b/extra/ssmtp/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 187071 2013-06-03 11:16:54Z allan $ +# $Id: PKGBUILD 194362 2013-09-14 19:32:55Z pierre $ # Maintainer: pkgname=ssmtp pkgver=2.64 -pkgrel=4 +pkgrel=5 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://packages.debian.org/stable/mail/ssmtp" depends=('openssl' 'inetutils') -conflicts=('exim') +conflicts=('exim' 'smtp-forwarder') provides=('smtp-forwarder') backup=('etc/ssmtp/ssmtp.conf' 'etc/ssmtp/revaliases') options=('!makeflags' '!emptydirs') diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 8f515f231..f788f2d4a 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 193132 2013-08-17 07:19:28Z angvp $ +# $Id: PKGBUILD 194714 2013-09-23 03:35:04Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.3 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') url="http://subversion.apache.org/" @@ -25,13 +25,13 @@ provides=('svn') backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc} +source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9' +md5sums=('7d7bd97347a4491e1ffb529563ce2e9e' 'SKIP' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' @@ -64,11 +64,11 @@ build() { [ "$CARCH" = "mips64el" ] || make javahl } -check() { - cd ${pkgname}-${pkgver} - export LANG=C LC_ALL=C - make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl -} +#check() { +# cd ${pkgname}-${pkgver} +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl +#} package() { cd ${pkgname}-${pkgver} diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD index 1d9a0f205..1f59a11c6 100644 --- a/extra/sushi/PKGBUILD +++ b/extra/sushi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183459 2013-04-21 22:12:10Z heftig $ +# $Id: PKGBUILD 196137 2013-10-07 11:53:29Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=sushi -pkgver=3.8.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="A quick previewer for Nautilus" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ install=sushi.install makedepends=('intltool' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c4f24d0961ce8fc5ef3a4fe9af178e368c7117459df2c0be12c8f953646c82dd') +sha256sums=('cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8') build() { cd "$pkgname-$pkgver" diff --git a/extra/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD index ccd122837..dccd864ce 100644 --- a/extra/swell-foop/PKGBUILD +++ b/extra/swell-foop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193432 2013-08-20 07:00:28Z jgc $ +# $Id: PKGBUILD 196138 2013-10-07 11:53:31Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=swell-foop -pkgver=3.8.2 +pkgver=3.10.0 pkgrel=1 pkgdesc="Clear the screen by removing groups of colored and shaped tiles" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=swell-foop.install url="https://live.gnome.org/Swell%20Foop" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('33b72da1f5378801ae41cb13f3bc35ce44368c104327f68dd51f45653ca62cb9') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('d96c5cbd071a97038cc281d6a85902721ab5fc50d27981dc2c37b003126a43a6') build() { cd $pkgname-$pkgver diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD index be0e5829f..f145fb1e6 100644 --- a/extra/swig/PKGBUILD +++ b/extra/swig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188138 2013-06-10 13:01:07Z bpiotrowski $ +# $Id: PKGBUILD 194495 2013-09-16 20:14:45Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=swig -pkgver=2.0.10 +pkgver=2.0.11 pkgrel=1 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64' 'mips64el') @@ -11,17 +11,16 @@ url="http://www.swig.org/" license=('custom') depends=('zlib' 'pcre') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('ad6f95ce9b9da4a8f5b80ac1848d26c76f518d84') +sha1sums=('d3bf4e78824dba76bfb3269367f1ae0276b49df9') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE install -D -m644 LICENSE-UNIVERSITIES "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE-UNIVERSITIES diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 8cfeadcbc..a798f6ed6 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186929 2013-06-01 08:46:45Z andrea $ +# $Id: PKGBUILD 195976 2013-10-06 19:13:25Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=system-config-printer -pkgver=1.4.1 -pkgrel=3 +pkgver=1.4.2 +pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ optdepends=('gnome-keyring: password management') replaces=('system-config-printer-common' 'system-config-printer-gnome') conflicts=('system-config-printer-common' 'system-config-printer-gnome') source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('3d794eb88c5813c3024b181677a602dd' +md5sums=('7f6462d84056be13aadeb6e3030aad5e' 'SKIP') prepare() { diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD index c33e2cb6c..8f24ac5be 100644 --- a/extra/tali/PKGBUILD +++ b/extra/tali/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tali -pkgver=3.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Beat the odds in a poker-style dice game" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!emptydirs' '!libtool') install=tali.install url="https://live.gnome.org/Tali" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('77fa3a3804f51e40629799d441b34e9b01a665097be229bd94adb28d3dbc17d5') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('2e276e6965057fe3136fe831809b2cedab3e8f59346b0fbe37f3f383a25c68c6') build() { cd $pkgname-$pkgver diff --git a/extra/talloc/PKGBUILD b/extra/talloc/PKGBUILD index ca53743ba..fff399c50 100644 --- a/extra/talloc/PKGBUILD +++ b/extra/talloc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172901 2012-12-06 14:08:40Z stephane $ +# $Id: PKGBUILD 195486 2013-10-01 06:06:00Z bpiotrowski $ # Maintainer: # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=talloc pkgver=2.0.8 -pkgrel=1 -pkgdesc="A hierarchical pool based memory allocator with destructors" +pkgrel=2 +pkgdesc="Hierarchical pool based memory allocator with destructors" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://talloc.samba.org/" @@ -15,9 +15,13 @@ optdepends=('python2: for python bindings') source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('7857200b58a8617ca18fe2c91296cd93') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's#python#python2#g' buildtools/bin/waf +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc/samba \ --localstatedir=/var \ diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index e5eaa0140..22d4c871f 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 192225 2013-08-08 07:36:39Z eric $ +# $Id: PKGBUILD 194660 2013-09-20 16:55:21Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=tcl -pkgver=8.6.0 -pkgrel=5 +pkgver=8.6.1 +pkgrel=1 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64' 'mips64el') url="http://tcl.sourceforge.net/" license=('custom') depends=('zlib') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -sha1sums=('fc57fc08ab113740a702bb67d4f350f8ec85ef58') +sha1sums=('5c83d44152cc0496cc0847a2495f659502a30e40') prepare() { cd tcl${pkgver} # we build the tcl sqlite interface in sqlite-tcl package rm -rf pkgs/sqlite3* - - sed -i 's/#define DUPTRAVERSE_MAX_DEPTH 500/#define DUPTRAVERSE_MAX_DEPTH 5000/' \ - generic/regc_nfa.c } build() { @@ -36,10 +33,23 @@ check() { package() { cd tcl${pkgver}/unix make INSTALL_ROOT="${pkgdir}" install install-private-headers - ln -sf tclsh8.6 "${pkgdir}/usr/bin/tclsh" + ln -sf tclsh${pkgver%.*} "${pkgdir}/usr/bin/tclsh" ln -sf libtcl${pkgver%.*}.so "${pkgdir}/usr/lib/libtcl.so" install -Dm644 ../license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # remove buildroot traces - sed -i "s#${srcdir}#/usr/src#" "${pkgdir}"/usr/lib/{tcl,tdbc1.0.0/tdbc,itcl4.0.0/itcl}Config.sh + sed -e "s#${srcdir}/tcl${pkgver}/unix#/usr/lib#" \ + -e "s#${srcdir}/tcl${pkgver}#/usr/include#" \ + -i "${pkgdir}/usr/lib/tclConfig.sh" + + sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/tdbc1.0.0#/usr/lib/tdbc1.0.0#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.0/generic#/usr/include#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.0/library#/usr/lib/tcl${pkgver%.*}#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.0.0#/usr/include#" \ + -i "${pkgdir}/usr/lib/tdbc1.0.0/tdbcConfig.sh" + + sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/itcl4.0.0#/usr/lib/itcl4.0.0#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.0.0/generic#/usr/include#" \ + -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.0.0#/usr/include#" \ + -i "${pkgdir}/usr/lib/itcl4.0.0/itclConfig.sh" } diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index 4ef6d9a1a..b770ba6d9 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191842 2013-07-31 09:40:22Z ioni $ +# $Id: PKGBUILD 194217 2013-09-10 16:04:59Z andrea $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.17.5 +pkgver=0.18.1 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2') options=('!libtool' '!emptydirs') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('57d7778e58f82a43dba1311cece0d4e3') +md5sums=('a5384758df829b80d47fbc8a672609ad') build() { cd $pkgname-$pkgver diff --git a/extra/thin-provisioning-tools/PKGBUILD b/extra/thin-provisioning-tools/PKGBUILD new file mode 100644 index 000000000..a57b84756 --- /dev/null +++ b/extra/thin-provisioning-tools/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 195238 2013-09-28 21:28:47Z thomas $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: Jason Hall <cakersq@gmail.com> + +pkgname=thin-provisioning-tools +pkgver=0.2.7 +pkgrel=1 +pkgdesc="A suite of tools for manipulating the metadata of the dm-thin device-mapper target" +arch=('i686' 'x86_64') +url="https://github.com/jthornber/thin-provisioning-tools" +license=('GPL3') +depends=('expat' 'gcc-libs') +makedepends=('boost') +source=(https://github.com/jthornber/${pkgname}/archive/v${pkgver}.tar.gz) +sha1sums=('23ce1110899adce9406aa614a4ee19950e00ee7a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + autoconf + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" BINDIR="${pkgdir}"/usr/bin MANDIR=/usr/share/man install +} + diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD index 140fb9772..a882d8ec4 100644 --- a/extra/thunar-archive-plugin/PKGBUILD +++ b/extra/thunar-archive-plugin/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 185137 2013-05-11 13:25:59Z foutrelis $ +# $Id: PKGBUILD 195948 2013-10-06 07:06:40Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=thunar-archive-plugin pkgver=0.3.1 -pkgrel=1 -pkgdesc="Create and deflate archives in thunar" +pkgrel=2 +pkgdesc="Create and extract archives in Thunar" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" license=('GPL2') groups=('xfce4-goodies') depends=('thunar' 'hicolor-icon-theme') makedepends=('intltool') +optdepends=('file-roller' + 'kdeutils-ark') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2) @@ -20,7 +22,8 @@ sha256sums=('9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ --localstatedir=/var \ diff --git a/extra/thunar-archive-plugin/thunar-archive-plugin.install b/extra/thunar-archive-plugin/thunar-archive-plugin.install index bf6c3fe76..e4f8fd06c 100644 --- a/extra/thunar-archive-plugin/thunar-archive-plugin.install +++ b/extra/thunar-archive-plugin/thunar-archive-plugin.install @@ -1,19 +1,13 @@ post_install() { - cat << EOF - -NOTE for thunar-archive-plugin: ----- - ==> please install xarchiver, squeeze, file-roller or ark to use the plugin -EOF gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } post_remove() { - post_upgrade + post_install } # vim:set ts=2 sw=2 et: diff --git a/extra/time/PKGBUILD b/extra/time/PKGBUILD index 82706136f..09d9d15c2 100644 --- a/extra/time/PKGBUILD +++ b/extra/time/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 147242 2012-01-25 01:42:55Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.us> +# $Id: PKGBUILD 195266 2013-09-29 16:39:25Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Stéphane Gaudreault <stephane@archlinux.us> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: damir <damir@archlinux.org> pkgname=time pkgver=1.7 -pkgrel=6 +pkgrel=7 pkgdesc="Utility for monitoring a program's use of system resources" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/directory/time.html" @@ -19,22 +20,29 @@ sha1sums=('dde0c28c7426960736933f3e763320680356cc6a' 'fff80e05dd41f0a59bb1f49d1c6e581d5e8e92e5' 'b2a909e1d92f7af1bc99a4524ad84d467ed79a06') +prepare() { + cd "$pkgname-$pkgver" -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276 - patch -Np1 -i ../time-1.7-Recompute-CPU-usage-at-microsecond-level.patch + # cf https://bugzilla.redhat.com/show_bug.cgi?id=527276 + patch -Np1 < "$srcdir"/time-1.7-Recompute-CPU-usage-at-microsecond-level.patch + + # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826 + patch -Np1 < "$srcdir"/time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch - # cf https://bugzilla.redhat.com/show_bug.cgi?id=702826 - patch -Np1 -i ../time-1.7-ru_maxrss-is-in-kilobytes-on-Linux.patch + # rebuild the ancient autoconf setup to fix a variety of build issues + # surrounding missing/incorrect includes. + autoreconf -fisv +} + +build() { + cd "$pkgname-$pkgver" - ./configure --prefix=/usr --infodir=/usr/share/info - make + ./configure --prefix=/usr --infodir=/usr/share/info + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" - make exec_prefix="${pkgdir}/usr" infodir="${pkgdir}/usr/share/info" install + make exec_prefix="$pkgdir/usr" infodir="$pkgdir/usr/share/info" install } diff --git a/extra/time/time.install b/extra/time/time.install index 011597c00..ceaf8e6fb 100644 --- a/extra/time/time.install +++ b/extra/time/time.install @@ -1,20 +1,22 @@ +#!/bin/bash + infodir=/usr/share/info filelist=(time.info.gz) post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info "$infodir/$file" "$infodir/dir" 2>/dev/null done } post_upgrade() { - post_install $1 + post_install "$1" } pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info --delete "$infodir/$file" "$infodir/dir" 2>/dev/null done } diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index cf3fd5faf..1d2ceed17 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 192227 2013-08-08 07:38:43Z eric $ +# $Id: PKGBUILD 194661 2013-09-20 16:55:22Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=tk -pkgver=8.6.0 -pkgrel=2 +pkgver=8.6.1 +pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64' 'mips64el') url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -sha1sums=('c42e160285e2d26eae8c2a1e6c6f86db4fa7663b') +sha1sums=('ecfcc20833c04d6890b14a7920a04d16f2123a51') build() { cd tk${pkgver}/unix @@ -19,19 +19,20 @@ build() { make } -#check() { -# cd tk${pkgver}/unix +check() { + cd tk${pkgver}/unix # make test -#} +} package() { cd tk${pkgver}/unix make INSTALL_ROOT="${pkgdir}" install install-private-headers - ln -sf wish8.6 "${pkgdir}/usr/bin/wish" + ln -sf wish${pkgver%.*} "${pkgdir}/usr/bin/wish" ln -sf libtk${pkgver%.*}.so "${pkgdir}/usr/lib/libtk.so" install -Dm644 license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # remove buildroot traces - sed -i "s#${srcdir}#/usr/src#" "${pkgdir}/usr/lib/tkConfig.sh" - + sed -e "s#${srcdir}/tk${pkgver}/unix#/usr/lib#" \ + -e "s#${srcdir}/tk${pkgver}#/usr/include#" \ + -i "${pkgdir}/usr/lib/tkConfig.sh" } diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 8fdb6f0a2..b44bc6bf2 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 185506 2013-05-14 12:10:02Z heftig $ +# $Id: PKGBUILD 196141 2013-10-07 11:53:36Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=totem-plparser -pkgver=3.4.5 -pkgrel=1 +pkgver=3.10.0 +pkgrel=2 url="http://www.gnome.org" pkgdesc="Totem playlist parser library" license=('LGPL') arch=(i686 x86_64 'mips64el') -depends=('gmime' 'libsoup' 'libarchive' 'libquvi') -makedepends=('intltool' 'gobject-introspection') +depends=('gmime' 'libsoup' 'libarchive') +makedepends=('intltool' 'gobject-introspection' 'libquvi') +optdepends=('libquvi: video site handling (Youtube etc.)') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz) -sha256sums=('a573e078692b48895cb5b041385b2760d63e2ee496c8d499eccfa942e7c79f89') +sha256sums=('87eac3fdf2b632dfac0edda07906a3e84f1ce4442b8127394414020dafe41aa9') build() { cd totem-pl-parser-$pkgver - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static make } diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 29125de86..5b63d4ad2 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186680 2013-05-30 12:54:23Z heftig $ +# $Id: PKGBUILD 196140 2013-10-07 11:53:34Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.8.2 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="GNOME3 movie player based on GStreamer" url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') @@ -13,13 +13,13 @@ license=(GPL2 custom) depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst clutter-gtk python-gobject python-xdg gst-plugins-bad) -makedepends=(intltool libnautilus-extension vala grilo dbus-glib libzeitgeist +makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist itstool docbook-xsl python-pylint) [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz browser-plugins.ini bugreport.patch) -sha256sums=('eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba6558f65c64514e5d2583e01' +sha256sums=('b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2' 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e' '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167') @@ -54,7 +54,7 @@ package_totem() { 'gst-libav: Extra media codecs' 'lirc-utils: Infrared Remote Control plugin' 'grilo-plugins: Browse sidebar (remote media)' - 'libzeitgeist: Zeitgeist plugin') + 'zeitgeist: Zeitgeist plugin') cd "$pkgbase-$pkgver" make DESTDIR="${pkgdir}" install @@ -66,6 +66,7 @@ package_totem() { } package_totem-plugin() { + groups=(gnome) pkgdesc="Totem plugin for web browsers" depends=("totem=$pkgver" dbus-glib) backup=(etc/totem/browser-plugins.ini) diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 17779678b..02ed8e51b 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191946 2013-08-01 16:10:52Z heftig $ +# $Id: PKGBUILD 196142 2013-10-07 11:53:37Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -7,7 +7,7 @@ pkgbase=tracker pkgname=(tracker libtracker-sparql) pkgver=0.16.2 _tver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="All-in-one indexer, search tool and metadata database" arch=(i686 x86_64 mips64el) license=(GPL) diff --git a/extra/transcode/04_ffmpeg_options.patch b/extra/transcode/04_ffmpeg_options.patch deleted file mode 100644 index d0429b1d9..000000000 --- a/extra/transcode/04_ffmpeg_options.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Remove "-vpre medium" from ffmpeg's command-line arguments list. -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436 -From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436#25 ---- - export/ffmpeg_cfg.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- transcode.orig/export/ffmpeg_cfg.c -+++ transcode/export/ffmpeg_cfg.c -@@ -126,7 +126,7 @@ int lavc_param_gmc = 0; - //int lavc_param_atag = 0; - //int lavc_param_abitrate = 224; - --char *lavc_param_video_preset = "medium"; -+char *lavc_param_video_preset = NULL; - char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; - - TCConfigEntry lavcopts_conf[]={ -@@ -237,7 +237,6 @@ TCConfigEntry lavcopts_conf[]={ - {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, - {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, - {"fps_code", &lavc_param_fps_code, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9}, -- {"vpre", &lavc_param_video_preset, TCCONF_TYPE_STRING, 0, 0, 0}, - {"ffmpeg_datadir", &lavc_param_ffmpeg_datadir, TCCONF_TYPE_STRING, 0, 0, 0}, - {NULL, NULL, 0, 0, 0, 0} - }; diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 5029e2ceb..63f3122f6 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192481 2013-08-12 20:25:48Z eric $ +# $Id: PKGBUILD 194278 2013-09-12 20:45:23Z eric $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=11 +pkgrel=12 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" @@ -17,23 +17,36 @@ makedepends=('nasm') options=('!libtool') source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch - ffmpeg-0.11.patch transcode-1.1.7-libav-9.patch 04_ffmpeg_options.patch transcode-ffmpeg.patch) + subtitleripper-0.3.4-linkingorder.patch + subtitleripper-0.3.4-respect-ldflags.patch + transcode-1.1.7-ffmpeg.patch + transcode-1.1.7-ffmpeg-0.10.patch + transcode-1.1.7-ffmpeg-0.11.patch + transcode-1.1.7-preset-free.patch + transcode-1.1.7-libav-9.patch + transcode-1.1.7-preset-force.patch + transcode-1.1.7-ffmpeg2.patch) sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' '591943a33235342a66c3df0625a164a1479c09ae' - '3d2dcdc23f14938e87d14cfc03000bb3b649b85e' + 'cc81c190db51d8a64623e2eea3b327ec7eb7ec57' + '3b1590f30f8f32350444f668584ec31be6e8e614' + '3f7b0257f023df6ea249111d247a852c46261c2f' + '54b1bab48a0b3bc0e8464c4deb4de31bf1060a1c' 'ef1cccd35317d3a28443b654da49de731cdf1766' - '00938db9aebde719799c11116ed9fe85a9cc4bdd' - '6d1774e202cca689c4e417def982452990b8e7e4') + '034853427bc784a80b333d2e2f4bab44f0b86ce0' + '764de67996e2c4947346c7a91586cc4ca826a8e2') prepare() { cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/ffmpeg-0.11.patch" + patch -p0 -i "${srcdir}/transcode-1.1.7-ffmpeg.patch" + patch -p0 -i "${srcdir}/transcode-1.1.7-ffmpeg-0.10.patch" + patch -p1 -i "${srcdir}/transcode-1.1.7-ffmpeg-0.11.patch" + patch -p1 -i "${srcdir}/transcode-1.1.7-preset-free.patch" patch -p0 -i "${srcdir}/transcode-1.1.7-libav-9.patch" - patch -p1 -i "${srcdir}/04_ffmpeg_options.patch" - patch -p1 -i "${srcdir}/transcode-ffmpeg.patch" + patch -p1 -i "${srcdir}/transcode-1.1.7-preset-force.patch" + patch -p1 -i "${srcdir}/transcode-1.1.7-ffmpeg2.patch" cd ../subtitleripper patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" diff --git a/extra/transcode/ffmpeg-0.11.patch b/extra/transcode/ffmpeg-0.11.patch deleted file mode 100644 index b5601fe2f..000000000 --- a/extra/transcode/ffmpeg-0.11.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c ---- transcode-1.1.7/export/export_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/export/export_ffmpeg.c 2012-07-05 16:22:41.095346080 -0400 -@@ -180,7 +180,7 @@ - - - /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ --#include <libavcodec/opt.h> -+#include <libavutil/opt.h> - #include <libavutil/avstring.h> - #include <libswscale/swscale.h> - -@@ -470,7 +470,6 @@ - } - - TC_LOCK_LIBAVCODEC; -- avcodec_init(); - avcodec_register_all(); - TC_UNLOCK_LIBAVCODEC; - -@@ -634,7 +633,6 @@ - lavc_param_rc_max_rate = 2516; - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; - - break; - -@@ -674,7 +673,6 @@ - - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; - - break; - -diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c ---- transcode-1.1.7/export/ffmpeg_cfg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/export/ffmpeg_cfg.c 2012-07-05 15:26:29.112103273 -0400 -@@ -160,9 +160,7 @@ - {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, -- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -211,7 +211,6 @@ - #else - {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, - #endif -- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -223,9 +223,6 @@ - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, -- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, -- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, -- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, - {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, -diff -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c ---- transcode-1.1.7/filter/filter_pp.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/filter/filter_pp.c 2012-07-05 15:26:28.945436613 -0400 -@@ -38,8 +38,8 @@ - - /* FIXME: these use the filter ID as an index--the ID can grow - * arbitrarily large, so this needs to be fixed */ --static pp_mode_t *mode[100]; --static pp_context_t *context[100]; -+static pp_mode *mode[100]; -+static pp_context *context[100]; - static int width[100], height[100]; - static int pre[100]; - -diff -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c ---- transcode-1.1.7/import/decode_lavc.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/decode_lavc.c 2012-07-05 15:26:28.842103278 -0400 -@@ -181,7 +181,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c ---- transcode-1.1.7/import/import_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/import_ffmpeg.c 2012-07-05 15:26:28.848769946 -0400 -@@ -314,7 +314,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c ---- transcode-1.1.7/import/probe_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/probe_ffmpeg.c 2012-07-05 15:26:28.838769947 -0400 -@@ -99,8 +99,8 @@ - - TC_INIT_LIBAVCODEC; - -- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, -- NULL, 0, NULL); -+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, -+ NULL, NULL); - if (ret != 0) { - tc_log_error(__FILE__, "unable to open '%s'" - " (libavformat failure)", -diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h ---- transcode-1.1.7/libtc/tcavcodec.h 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/libtc/tcavcodec.h 2012-07-05 15:26:28.828769951 -0400 -@@ -53,7 +53,6 @@ - - #define TC_INIT_LIBAVCODEC do { \ - TC_LOCK_LIBAVCODEC; \ -- avcodec_init(); \ - avcodec_register_all(); \ - TC_UNLOCK_LIBAVCODEC; \ - } while (0) ---- transcode-1.1.7/export/export_ffmpeg.c.orig 2012-10-19 23:25:16.442303175 -0400 -+++ transcode-1.1.7/export/export_ffmpeg.c 2012-10-19 23:26:23.904268733 -0400 -@@ -1249,7 +1249,7 @@ - return TC_EXPORT_ERROR; - } - -- if (lavc_venc_context->codec->encode == NULL) { -+ if (lavc_venc_context->codec->encode2 == NULL) { - tc_log_warn(MOD_NAME, "could not open FFMPEG codec " - "(lavc_venc_context->codec->encode == NULL)"); - return TC_EXPORT_ERROR; diff --git a/extra/transcode/transcode-1.1.7-ffmpeg-0.10.patch b/extra/transcode/transcode-1.1.7-ffmpeg-0.10.patch new file mode 100644 index 000000000..ea737c8b0 --- /dev/null +++ b/extra/transcode/transcode-1.1.7-ffmpeg-0.10.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/401287 + +--- filter/filter_pp.c ++++ filter/filter_pp.c +@@ -38,8 +38,8 @@ + + /* FIXME: these use the filter ID as an index--the ID can grow + * arbitrarily large, so this needs to be fixed */ +-static pp_mode_t *mode[100]; +-static pp_context_t *context[100]; ++static pp_mode *mode[100]; ++static pp_context *context[100]; + static int width[100], height[100]; + static int pre[100]; + diff --git a/extra/transcode/transcode-1.1.7-ffmpeg-0.11.patch b/extra/transcode/transcode-1.1.7-ffmpeg-0.11.patch new file mode 100644 index 000000000..871d073fe --- /dev/null +++ b/extra/transcode/transcode-1.1.7-ffmpeg-0.11.patch @@ -0,0 +1,303 @@ +Fix build with ffmpeg 0.11. +https://bugs.gentoo.org/show_bug.cgi?id=419551 +Author: Brennan Shacklett + +diff -urN transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c +--- transcode-1.1.7-orig/encode/encode_lavc.c 2011-11-19 08:50:27.000000000 -0800 ++++ transcode-1.1.7/encode/encode_lavc.c 2012-07-03 10:47:03.528009149 -0700 +@@ -114,6 +114,7 @@ + + AVFrame ff_venc_frame; + AVCodecContext ff_vcontext; ++ AVDictionary ** ff_opts; + + AVCodec *ff_vcodec; + +@@ -1036,14 +1037,10 @@ + SET_FLAG(pd, mv0); + SET_FLAG(pd, cbp); + SET_FLAG(pd, qpel); +- SET_FLAG(pd, alt); +- SET_FLAG(pd, vdpart); + SET_FLAG(pd, naq); + SET_FLAG(pd, ilme); + SET_FLAG(pd, ildct); + SET_FLAG(pd, aic); +- SET_FLAG(pd, aiv); +- SET_FLAG(pd, umv); + SET_FLAG(pd, psnr); + SET_FLAG(pd, trell); + SET_FLAG(pd, gray); +@@ -1064,6 +1061,18 @@ + pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_DCT; + pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; + } ++ if (pd->confdata.flags.alt) { ++ av_dict_set(pd->ff_opts, "alternate_scan", "1", 0); ++ } ++ if (pd->confdata.flags.vdpart) { ++ av_dict_set(pd->ff_opts, "data_partitioning", "1", 0); ++ } ++ if (pd->confdata.flags.umv) { ++ av_dict_set(pd->ff_opts, "umv", "1", 0); ++ } ++ if (pd->confdata.flags.aiv) { ++ av_dict_set(pd->ff_opts, "aiv", "1", 0); ++ } + } + + #undef SET_FLAG +@@ -1184,18 +1193,18 @@ + { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, + { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, +- { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, ++ { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, + { "ildct", PAUX(flags.ildct), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_DCT }, + { "naq", PAUX(flags.naq), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_NORMALIZE_AQP }, +- { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART }, ++ { "vdpart", PAUX(flags.vdpart), TCCONF_TYPE_FLAG, 0, 0, 1 }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIC }, + #else + { "aic", PAUX(flags.aic), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED }, + #endif +- { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_AIV }, +- { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV }, ++ { "aiv", PAUX(flags.aiv), TCCONF_TYPE_FLAG, 0, 0, 1 }, ++ { "umv", PAUX(flags.umv), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "psnr", PAUX(flags.psnr), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PSNR }, + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + { "trell", PAUX(flags.trell), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRELLIS_QUANT }, +@@ -1387,7 +1396,7 @@ + pd->confdata.thread_count, + (pd->confdata.thread_count > 1) ?"s" :""); + } +- avcodec_thread_init(&pd->ff_vcontext, pd->confdata.thread_count); ++ pd->ff_vcontext.thread_count = pd->confdata.thread_count; + + pd->ff_vcodec = avcodec_find_encoder(FF_VCODEC_ID(pd)); + if (pd->ff_vcodec == NULL) { +@@ -1397,11 +1406,11 @@ + } + + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(&pd->ff_vcontext, pd->ff_vcodec); ++ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts); + TC_UNLOCK_LIBAVCODEC; + + if (ret < 0) { +- tc_log_error(MOD_NAME, "avcodec_open() failed"); ++ tc_log_error(MOD_NAME, "avcodec_open2() failed"); + goto failed; + } + /* finally, pass up the extradata, if any */ +diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c +--- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 ++++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 13:15:23.918019415 -0700 +@@ -122,6 +122,7 @@ + static AVFrame *lavc_convert_frame = NULL; + + static AVCodec *lavc_venc_codec = NULL; ++static AVDictionary **lavc_venc_opts = NULL; + static AVFrame *lavc_venc_frame = NULL; + static AVCodecContext *lavc_venc_context; + static avi_t *avifile = NULL; +@@ -180,7 +181,7 @@ + + + /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ +-#include <libavcodec/opt.h> ++#include <libavutil/opt.h> + #include <libavutil/avstring.h> + #include <libswscale/swscale.h> + +@@ -470,7 +471,6 @@ + } + + TC_LOCK_LIBAVCODEC; +- avcodec_init(); + avcodec_register_all(); + TC_UNLOCK_LIBAVCODEC; + +@@ -634,7 +634,7 @@ + lavc_param_rc_max_rate = 2516; + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; ++ lavc_param_scan_offset = 1; + + break; + +@@ -674,7 +674,7 @@ + + lavc_param_rc_buffer_size = 224 * 8; + lavc_param_rc_buffer_aggressivity = 99; +- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; ++ lavc_param_scan_offset = 1; + + break; + +@@ -887,7 +887,7 @@ + lavc_venc_context->thread_count); + } + +- avcodec_thread_init(lavc_venc_context, lavc_param_threads); ++ lavc_venc_context->thread_count = lavc_param_threads; + + if (lavc_param_intra_matrix) { + char *tmp; +@@ -1065,15 +1065,10 @@ + lavc_venc_context->flags |= lavc_param_closedgop; + lavc_venc_context->flags |= lavc_param_trunc; + lavc_venc_context->flags |= lavc_param_aic; +- lavc_venc_context->flags |= lavc_param_umv; + lavc_venc_context->flags |= lavc_param_v4mv; +- lavc_venc_context->flags |= lavc_param_data_partitioning; + lavc_venc_context->flags |= lavc_param_cbp; + lavc_venc_context->flags |= lavc_param_mv0; + lavc_venc_context->flags |= lavc_param_qp_rd; +- lavc_venc_context->flags |= lavc_param_scan_offset; +- lavc_venc_context->flags |= lavc_param_ss; +- lavc_venc_context->flags |= lavc_param_alt; + lavc_venc_context->flags |= lavc_param_ilme; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_venc_context->flags |= lavc_param_trell; +@@ -1203,7 +1198,6 @@ + + lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; + +- + /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ + if (lavc_param_video_preset) { + avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; +@@ -1241,20 +1235,39 @@ + } + } + ++ if (lavc_param_scan_offset) { ++ av_dict_set(lavc_venc_opts, "scan_offset", "1", 0); ++ } ++ ++ if (lavc_param_ss) { ++ av_dict_set(lavc_venc_opts, "structured_slices", "1", 0); ++ } ++ ++ if (lavc_param_alt) { ++ av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0); ++ } ++ ++ if (lavc_param_umv) { ++ av_dict_set(lavc_venc_opts, "umv", "1", 0); ++ } ++ ++ if (lavc_param_data_partitioning) { ++ av_dict_set(lavc_venc_opts, "vdpart", "1", 0); ++ } + + //-- open codec -- + //---------------- + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(lavc_venc_context, lavc_venc_codec); ++ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); + return TC_EXPORT_ERROR; + } + +- if (lavc_venc_context->codec->encode == NULL) { ++ if (av_codec_is_encoder(lavc_venc_context->codec) == 0) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec " +- "(lavc_venc_context->codec->encode == NULL)"); ++ "(av_codec_is_encoder(lavc_venc_context->codec) == 0)"); + return TC_EXPORT_ERROR; + } + +diff -urN transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c +--- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2011-11-19 08:50:27.000000000 -0800 ++++ transcode-1.1.7/export/ffmpeg_cfg.c 2012-07-03 10:09:25.011003254 -0700 +@@ -160,9 +160,9 @@ + {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, + {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, +- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, ++ {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, 1}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, ++ {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GRAY}, + {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, + {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +@@ -211,7 +211,7 @@ + #else + {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, + #endif +- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, ++ {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, + {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, +@@ -223,9 +223,9 @@ + {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, + {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, +- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, +- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, +- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, ++ {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, ++ {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, + {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, +diff -urN transcode-1.1.7-orig/import/decode_lavc.c transcode-1.1.7/import/decode_lavc.c +--- transcode-1.1.7-orig/import/decode_lavc.c 2011-11-19 08:50:27.000000000 -0800 ++++ transcode-1.1.7/import/decode_lavc.c 2012-07-03 10:21:46.085005182 -0700 +@@ -181,7 +181,7 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +diff -urN transcode-1.1.7-orig/import/import_ffmpeg.c transcode-1.1.7/import/import_ffmpeg.c +--- transcode-1.1.7-orig/import/import_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 ++++ transcode-1.1.7/import/import_ffmpeg.c 2012-07-03 10:19:36.936004841 -0700 +@@ -314,7 +314,7 @@ + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_dec_context->error_resilience = 2; + #else +- lavc_dec_context->error_recognition = 2; ++ lavc_dec_context->err_recognition = 2; + #endif + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; +diff -urN transcode-1.1.7-orig/import/probe_ffmpeg.c transcode-1.1.7/import/probe_ffmpeg.c +--- transcode-1.1.7-orig/import/probe_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 ++++ transcode-1.1.7/import/probe_ffmpeg.c 2012-07-03 10:41:42.782008306 -0700 +@@ -99,8 +99,8 @@ + + TC_INIT_LIBAVCODEC; + +- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, +- NULL, 0, NULL); ++ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, ++ NULL, NULL); + if (ret != 0) { + tc_log_error(__FILE__, "unable to open '%s'" + " (libavformat failure)", +diff -urN transcode-1.1.7-orig/libtc/tcavcodec.h transcode-1.1.7/libtc/tcavcodec.h +--- transcode-1.1.7-orig/libtc/tcavcodec.h 2011-11-19 08:50:27.000000000 -0800 ++++ transcode-1.1.7/libtc/tcavcodec.h 2012-07-03 10:34:43.648007213 -0700 +@@ -53,7 +53,6 @@ + + #define TC_INIT_LIBAVCODEC do { \ + TC_LOCK_LIBAVCODEC; \ +- avcodec_init(); \ + avcodec_register_all(); \ + TC_UNLOCK_LIBAVCODEC; \ + } while (0) diff --git a/extra/transcode/transcode-1.1.7-ffmpeg.patch b/extra/transcode/transcode-1.1.7-ffmpeg.patch new file mode 100644 index 000000000..be7a6cbae --- /dev/null +++ b/extra/transcode/transcode-1.1.7-ffmpeg.patch @@ -0,0 +1,51 @@ +--- encode/encode_lavc.c ++++ encode/encode_lavc.c +@@ -955,8 +955,6 @@ + /* + * context *transcode* (not libavcodec) defaults + */ +- pd->ff_vcontext.mb_qmin = 2; +- pd->ff_vcontext.mb_qmax = 31; + pd->ff_vcontext.max_qdiff = 3; + pd->ff_vcontext.max_b_frames = 0; + pd->ff_vcontext.me_range = 0; +@@ -1116,8 +1114,6 @@ + // handled by transcode core + // { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + // handled by transcode core +- { "mbqmin", PCTX(mb_qmin), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, +- { "mbqmax", PCTX(mb_qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 }, + { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 }, + { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 }, +--- export/ffmpeg_cfg.c ++++ export/ffmpeg_cfg.c +@@ -34,8 +34,6 @@ + //int lavc_param_vqscale = 0; + //int lavc_param_vqmin = 2; + //int lavc_param_vqmax = 31; +-int lavc_param_mb_qmin = 2; +-int lavc_param_mb_qmax = 31; + int lavc_param_lmin = 2; + int lavc_param_lmax = 31; + int lavc_param_vqdiff = 3; +@@ -143,8 +141,6 @@ + // {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + // {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmin", &lavc_param_mb_qmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +- {"mbqmax", &lavc_param_mb_qmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, + {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0}, + {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31}, +--- export/ffmpeg_cfg.h ++++ export/ffmpeg_cfg.h +@@ -13,8 +13,6 @@ + //extern int lavc_param_vqscale; + //extern int lavc_param_vqmin; + //extern int lavc_param_vqmax; +-extern int lavc_param_mb_qmin; +-extern int lavc_param_mb_qmax; + extern int lavc_param_lmin; + extern int lavc_param_lmax; + extern int lavc_param_vqdiff; diff --git a/extra/transcode/transcode-1.1.7-ffmpeg2.patch b/extra/transcode/transcode-1.1.7-ffmpeg2.patch new file mode 100644 index 000000000..26d743140 --- /dev/null +++ b/extra/transcode/transcode-1.1.7-ffmpeg2.patch @@ -0,0 +1,332 @@ +Fix build with ffmpeg-2.0. +Fix segfaults introduced by wrong usage of the av_dict API. +Fix forgotten parts in the libav9 patch. + +Index: transcode-1.1.7/encode/encode_lavc.c +=================================================================== +--- transcode-1.1.7.orig/encode/encode_lavc.c ++++ transcode-1.1.7/encode/encode_lavc.c +@@ -74,6 +74,9 @@ struct tclavcconfigdata_ { + int lmin; + int lmax; + int me_method; ++ int luma_elim_threshold; ++ int chroma_elim_threshold; ++ int quantizer_noise_shaping; + + /* same as above for flags */ + struct { +@@ -114,7 +117,7 @@ struct tclavcprivatedata_ { + + AVFrame ff_venc_frame; + AVCodecContext ff_vcontext; +- AVDictionary ** ff_opts; ++ AVDictionary * ff_opts; + + AVCodec *ff_vcodec; + +@@ -165,6 +168,7 @@ static const TCCodecID tc_lavc_codecs_ou + TC_CODEC_ERROR + }; + ++#if LIBAVCODEC_VERSION_MAJOR < 55 + static const enum CodecID tc_lavc_internal_codecs[] = { + CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, CODEC_ID_MPEG4, + CODEC_ID_H263I, CODEC_ID_H263P, +@@ -177,6 +181,20 @@ static const enum CodecID tc_lavc_intern + CODEC_ID_MSMPEG4V2, CODEC_ID_MSMPEG4V3, + CODEC_ID_NONE + }; ++#else ++static const enum AVCodecID tc_lavc_internal_codecs[] = { ++ AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, AV_CODEC_ID_MPEG4, ++ AV_CODEC_ID_H263I, AV_CODEC_ID_H263P, ++ AV_CODEC_ID_H264, ++ AV_CODEC_ID_WMV1, AV_CODEC_ID_WMV2, ++ AV_CODEC_ID_RV10, ++ AV_CODEC_ID_HUFFYUV, AV_CODEC_ID_FFV1, ++ AV_CODEC_ID_DVVIDEO, ++ AV_CODEC_ID_MJPEG, AV_CODEC_ID_LJPEG, ++ AV_CODEC_ID_MSMPEG4V2, AV_CODEC_ID_MSMPEG4V3, ++ AV_CODEC_ID_NONE ++}; ++#endif + + static const TCFormatID tc_lavc_formats[] = { TC_FORMAT_ERROR }; + +@@ -938,7 +956,11 @@ static int tc_lavc_settings_from_vob(TCL + static void tc_lavc_config_defaults(TCLavcPrivateData *pd) + { + /* first of all reinitialize lavc data */ ++#if LIBAVCODEC_VERSION_MAJOR < 55 + avcodec_get_context_defaults(&pd->ff_vcontext); ++#else ++ avcodec_get_context_defaults3(&pd->ff_vcontext, NULL); ++#endif + + pd->confdata.thread_count = 1; + +@@ -976,8 +998,8 @@ static void tc_lavc_config_defaults(TCLa + pd->ff_vcontext.mpeg_quant = 0; + pd->ff_vcontext.rc_initial_cplx = 0.0; + pd->ff_vcontext.rc_qsquish = 1.0; +- pd->ff_vcontext.luma_elim_threshold = 0; +- pd->ff_vcontext.chroma_elim_threshold = 0; ++ pd->confdata.luma_elim_threshold = 0; ++ pd->confdata.chroma_elim_threshold = 0; + pd->ff_vcontext.strict_std_compliance = 0; + pd->ff_vcontext.dct_algo = FF_DCT_AUTO; + pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; +@@ -1001,7 +1023,7 @@ static void tc_lavc_config_defaults(TCLa + pd->ff_vcontext.intra_quant_bias = FF_DEFAULT_QUANT_BIAS; + pd->ff_vcontext.inter_quant_bias = FF_DEFAULT_QUANT_BIAS; + pd->ff_vcontext.noise_reduction = 0; +- pd->ff_vcontext.quantizer_noise_shaping = 0; ++ pd->confdata.quantizer_noise_shaping = 0; + pd->ff_vcontext.flags = 0; + } + +@@ -1033,7 +1055,6 @@ static void tc_lavc_dispatch_settings(TC + + pd->ff_vcontext.flags = 0; + SET_FLAG(pd, mv0); +- SET_FLAG(pd, cbp); + SET_FLAG(pd, qpel); + SET_FLAG(pd, naq); + SET_FLAG(pd, ilme); +@@ -1060,17 +1081,29 @@ static void tc_lavc_dispatch_settings(TC + pd->ff_vcontext.flags |= CODEC_FLAG_INTERLACED_ME; + } + if (pd->confdata.flags.alt) { +- av_dict_set(pd->ff_opts, "alternate_scan", "1", 0); ++ av_dict_set(&(pd->ff_opts), "alternate_scan", "1", 0); + } + if (pd->confdata.flags.vdpart) { +- av_dict_set(pd->ff_opts, "data_partitioning", "1", 0); ++ av_dict_set(&(pd->ff_opts), "data_partitioning", "1", 0); + } + if (pd->confdata.flags.umv) { +- av_dict_set(pd->ff_opts, "umv", "1", 0); ++ av_dict_set(&(pd->ff_opts), "umv", "1", 0); + } + if (pd->confdata.flags.aiv) { +- av_dict_set(pd->ff_opts, "aiv", "1", 0); ++ av_dict_set(&(pd->ff_opts), "aiv", "1", 0); + } ++ if (pd->confdata.flags.cbp) { ++ av_dict_set(&(pd->ff_opts), "mpv_flags", "+cbp_rd", 0); ++ } ++ ++ char buf[1024]; ++#define set_dict_opt(val, opt) \ ++ snprintf(buf, sizeof(buf), "%i", pd->confdata.val);\ ++ av_dict_set(&(pd->ff_opts), opt, buf, 0) ++ ++ set_dict_opt(luma_elim_threshold, "luma_elim_threshold"); ++ set_dict_opt(chroma_elim_threshold, "chroma_elim_threshold"); ++ set_dict_opt(quantizer_noise_shaping, "quantizer_noise_shaping"); + } + + #undef SET_FLAG +@@ -1155,8 +1188,8 @@ static int tc_lavc_read_config(TCLavcPri + { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, + // { "vrc_init_occupancy", }, // not yet supported + { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, +- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, +- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, ++ { "vlelim", PAUX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, ++ { "vcelim", PAUX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, + { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, +@@ -1182,12 +1215,12 @@ static int tc_lavc_read_config(TCLavcPri + { "ibias", PCTX(intra_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, + { "pbias", PCTX(inter_quant_bias), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512 }, + { "nr", PCTX(noise_reduction), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, +- { "qns", PCTX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, ++ { "qns", PAUX(quantizer_noise_shaping), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 3 }, + { "inter_matrix_file", inter_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + + { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, +- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, ++ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, + { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, 1 }, + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, +@@ -1350,6 +1383,8 @@ static int tc_lavc_configure(TCModuleIns + + pd = self->userdata; + ++ pd->ff_opts = NULL; ++ + pd->flush_flag = vob->encoder_flush; + + /* FIXME: move into core? */ +@@ -1402,7 +1437,7 @@ static int tc_lavc_configure(TCModuleIns + } + + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, pd->ff_opts); ++ ret = avcodec_open2(&pd->ff_vcontext, pd->ff_vcodec, &(pd->ff_opts)); + TC_UNLOCK_LIBAVCODEC; + + if (ret < 0) { +Index: transcode-1.1.7/export/export_ffmpeg.c +=================================================================== +--- transcode-1.1.7.orig/export/export_ffmpeg.c ++++ transcode-1.1.7/export/export_ffmpeg.c +@@ -122,7 +122,7 @@ static uint8_t *img_buffer = + static AVFrame *lavc_convert_frame = NULL; + + static AVCodec *lavc_venc_codec = NULL; +-static AVDictionary **lavc_venc_opts = NULL; ++static AVDictionary *lavc_venc_opts = NULL; + static AVFrame *lavc_venc_frame = NULL; + static AVCodecContext *lavc_venc_context; + static avi_t *avifile = NULL; +@@ -486,7 +486,7 @@ MOD_init + codec->name, codec->fourCC, codec->comments); + } + +- lavc_venc_context = avcodec_alloc_context(); ++ lavc_venc_context = avcodec_alloc_context3(lavc_venc_codec); + lavc_venc_frame = avcodec_alloc_frame(); + + lavc_convert_frame= avcodec_alloc_frame(); +@@ -838,8 +838,13 @@ MOD_init + lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; + lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; + lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; +- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; +- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; ++ ++ char buf[1024]; ++#define set_dict_opt(val, opt) \ ++ snprintf(buf, sizeof(buf), "%i", val); \ ++ av_dict_set(&lavc_venc_opts, opt, buf, 0) ++ set_dict_opt(lavc_param_luma_elim_threshold, "luma_elim_threshold"); ++ set_dict_opt(lavc_param_chroma_elim_threshold, "chroma_elim_threshold"); + lavc_venc_context->rtp_payload_size = lavc_param_packet_size; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + if (lavc_param_packet_size) +@@ -870,7 +875,7 @@ MOD_init + lavc_venc_context->context_model = lavc_param_context; + lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; + lavc_venc_context->noise_reduction = lavc_param_noise_reduction; +- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; ++ set_dict_opt(lavc_param_inter_threshold, "inter_threshold"); + lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; + lavc_venc_context->skip_top = lavc_param_skip_top; + lavc_venc_context->skip_bottom = lavc_param_skip_bottom; +@@ -1066,9 +1071,11 @@ MOD_init + lavc_venc_context->flags |= lavc_param_trunc; + lavc_venc_context->flags |= lavc_param_aic; + lavc_venc_context->flags |= lavc_param_v4mv; +- lavc_venc_context->flags |= lavc_param_cbp; ++ if(lavc_param_cbp) ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+cbp_rd", 0); + lavc_venc_context->flags |= lavc_param_mv0; +- lavc_venc_context->flags |= lavc_param_qp_rd; ++ if(lavc_param_qp_rd) ++ av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0); + lavc_venc_context->flags |= lavc_param_ilme; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + lavc_venc_context->flags |= lavc_param_trell; +@@ -1238,29 +1245,29 @@ MOD_init + } + + if (lavc_param_scan_offset) { +- av_dict_set(lavc_venc_opts, "scan_offset", "1", 0); ++ av_dict_set(&lavc_venc_opts, "scan_offset", "1", 0); + } + + if (lavc_param_ss) { +- av_dict_set(lavc_venc_opts, "structured_slices", "1", 0); ++ av_dict_set(&lavc_venc_opts, "structured_slices", "1", 0); + } + + if (lavc_param_alt) { +- av_dict_set(lavc_venc_opts, "alternate_scan", "1", 0); ++ av_dict_set(&lavc_venc_opts, "alternate_scan", "1", 0); + } + + if (lavc_param_umv) { +- av_dict_set(lavc_venc_opts, "umv", "1", 0); ++ av_dict_set(&lavc_venc_opts, "umv", "1", 0); + } + + if (lavc_param_data_partitioning) { +- av_dict_set(lavc_venc_opts, "vdpart", "1", 0); ++ av_dict_set(&lavc_venc_opts, "vdpart", "1", 0); + } + + //-- open codec -- + //---------------- + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, lavc_venc_opts); ++ ret = avcodec_open2(lavc_venc_context, lavc_venc_codec, &lavc_venc_opts); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_log_warn(MOD_NAME, "could not open FFMPEG codec"); +Index: transcode-1.1.7/export/ffmpeg_cfg.c +=================================================================== +--- transcode-1.1.7.orig/export/ffmpeg_cfg.c ++++ transcode-1.1.7/export/ffmpeg_cfg.c +@@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={ + {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, + {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, +- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, ++ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, + {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, +- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, ++ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, + {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1}, + {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1}, +Index: transcode-1.1.7/export/aud_aux.c +=================================================================== +--- transcode-1.1.7.orig/export/aud_aux.c ++++ transcode-1.1.7/export/aud_aux.c +@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v + + //-- set parameters (bitrate, channels and sample-rate) -- + //-------------------------------------------------------- +- avcodec_get_context_defaults(&mpa_ctx); ++ avcodec_get_context_defaults3(&mpa_ctx, mpa_codec); + #if LIBAVCODEC_VERSION_MAJOR < 53 + mpa_ctx.codec_type = CODEC_TYPE_AUDIO; + #else +@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v + //-- open codec -- + //---------------- + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(&mpa_ctx, mpa_codec); ++ ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", +Index: transcode-1.1.7/import/import_ffmpeg.c +=================================================================== +--- transcode-1.1.7.orig/import/import_ffmpeg.c ++++ transcode-1.1.7/import/import_ffmpeg.c +@@ -302,7 +302,7 @@ do_avi: + + // Set these to the expected values so that ffmpeg's decoder can + // properly detect interlaced input. +- lavc_dec_context = avcodec_alloc_context(); ++ lavc_dec_context = avcodec_alloc_context3(lavc_dec_codec); + if (lavc_dec_context == NULL) { + tc_log_error(MOD_NAME, "Could not allocate enough memory."); + return TC_IMPORT_ERROR; +@@ -344,7 +344,7 @@ do_avi: + } + + TC_LOCK_LIBAVCODEC; +- ret = avcodec_open(lavc_dec_context, lavc_dec_codec); ++ ret = avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL); + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_log_warn(MOD_NAME, "Could not initialize the '%s' codec.", diff --git a/extra/transcode/transcode-1.1.7-preset-force.patch b/extra/transcode/transcode-1.1.7-preset-force.patch new file mode 100644 index 000000000..0d1da8b4f --- /dev/null +++ b/extra/transcode/transcode-1.1.7-preset-force.patch @@ -0,0 +1,28 @@ +Do not force using a preset. Do not try to open non-existant preset by default. + +Index: transcode-1.1.7/export/export_ffmpeg.c +=================================================================== +--- transcode-1.1.7.orig/export/export_ffmpeg.c ++++ transcode-1.1.7/export/export_ffmpeg.c +@@ -1206,7 +1206,7 @@ MOD_init + lavc_venc_context->me_method = ME_ZERO + lavc_param_vme; + + /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ +- if (lavc_param_video_preset) { ++ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { + avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; + video_codec_name = av_strdup(ffmpeg_codec_name(codec->name)); + +Index: transcode-1.1.7/export/ffmpeg_cfg.c +=================================================================== +--- transcode-1.1.7.orig/export/ffmpeg_cfg.c ++++ transcode-1.1.7/export/ffmpeg_cfg.c +@@ -124,7 +124,7 @@ int lavc_param_gmc = 0; + //int lavc_param_atag = 0; + //int lavc_param_abitrate = 224; + +-char *lavc_param_video_preset = "medium"; ++char *lavc_param_video_preset = "none"; + char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; + + TCConfigEntry lavcopts_conf[]={ diff --git a/extra/transcode/transcode-1.1.7-preset-free.patch b/extra/transcode/transcode-1.1.7-preset-free.patch new file mode 100644 index 000000000..00494b94b --- /dev/null +++ b/extra/transcode/transcode-1.1.7-preset-free.patch @@ -0,0 +1,34 @@ +Fix invalid free when preset file not found +https://bugs.gentoo.org/show_bug.cgi?id=322945 +Author: Brennan Shacklett + +diff -urN transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c +--- transcode-1.1.7-orig/export/export_ffmpeg.c 2011-11-19 08:50:27.000000000 -0800 ++++ transcode-1.1.7/export/export_ffmpeg.c 2012-07-03 20:07:05.669083945 -0700 +@@ -321,7 +321,7 @@ + } + + if(!f){ +- fprintf(stderr, "File for preset '%s' not found\n", arg); ++ tc_log_error(MOD_NAME, "File for preset '%s' not found", arg); + av_exit(1); + } + +@@ -1207,7 +1207,7 @@ + /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ + if (lavc_param_video_preset) { + avcodec_opts[AVMEDIA_TYPE_VIDEO] = lavc_venc_context; +- video_codec_name = ffmpeg_codec_name(codec->name); ++ video_codec_name = av_strdup(ffmpeg_codec_name(codec->name)); + + const char *preset_start = lavc_param_video_preset; + while (preset_start) { +@@ -1225,6 +1225,8 @@ + if (opt_preset("vpre", preset_name) != 0) { + tc_log_warn(MOD_NAME, "Parsing ffmpeg preset '%s' failed", preset_name); + } ++ av_free(video_codec_name); ++ video_codec_name = NULL; + if (verbose) { + int i; + tc_log_info(MOD_NAME, "After parsing preset '%s', %i options are overridden:", preset_name, opt_name_count); diff --git a/extra/transcode/transcode-ffmpeg.patch b/extra/transcode/transcode-ffmpeg.patch deleted file mode 100644 index 0021d07d5..000000000 --- a/extra/transcode/transcode-ffmpeg.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -Naur transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c ---- transcode-1.1.7-orig/encode/encode_lavc.c 2013-07-13 18:41:25.441796991 -0400 -+++ transcode-1.1.7/encode/encode_lavc.c 2013-07-13 18:45:21.042465999 -0400 -@@ -977,8 +977,6 @@ - pd->ff_vcontext.mpeg_quant = 0; - pd->ff_vcontext.rc_initial_cplx = 0.0; - pd->ff_vcontext.rc_qsquish = 1.0; -- pd->ff_vcontext.luma_elim_threshold = 0; -- pd->ff_vcontext.chroma_elim_threshold = 0; - pd->ff_vcontext.strict_std_compliance = 0; - pd->ff_vcontext.dct_algo = FF_DCT_AUTO; - pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; -@@ -1150,8 +1148,6 @@ - { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, - // { "vrc_init_occupancy", }, // not yet supported - { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, -- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, -- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, - { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, - { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, -@@ -1182,7 +1178,7 @@ - { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, - - { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, -- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, -+ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 0x04000000 }, - { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, - { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, - { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, -diff -Naur transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c ---- transcode-1.1.7-orig/export/export_ffmpeg.c 2013-07-13 18:41:25.438463695 -0400 -+++ transcode-1.1.7/export/export_ffmpeg.c 2013-07-13 18:48:46.263478358 -0400 -@@ -835,8 +835,6 @@ - lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; - lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; - lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; -- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; -- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; - lavc_venc_context->rtp_payload_size = lavc_param_packet_size; - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - if (lavc_param_packet_size) -@@ -867,7 +865,6 @@ - lavc_venc_context->context_model = lavc_param_context; - lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; - lavc_venc_context->noise_reduction = lavc_param_noise_reduction; -- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; - lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; - lavc_venc_context->skip_top = lavc_param_skip_top; - lavc_venc_context->skip_bottom = lavc_param_skip_bottom; -diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c ---- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2013-07-13 18:41:25.438463695 -0400 -+++ transcode-1.1.7/export/ffmpeg_cfg.c 2013-07-13 18:48:34.633609112 -0400 -@@ -50,8 +50,6 @@ - //int lavc_param_vpass = 0; - int lavc_param_vrc_strategy = 2; - int lavc_param_vb_strategy = 0; --int lavc_param_luma_elim_threshold = 0; --int lavc_param_chroma_elim_threshold = 0; - int lavc_param_packet_size= 0; - int lavc_param_strict= 0; - int lavc_param_data_partitioning= 0; -@@ -105,7 +103,6 @@ - int lavc_param_mv0= 0; - int lavc_param_noise_reduction= 0; - int lavc_param_qp_rd= 0; --int lavc_param_inter_threshold= 0; - int lavc_param_sc_threshold= 0; - int lavc_param_ss= 0; - int lavc_param_top= -1; -@@ -156,8 +153,6 @@ - {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, - {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, - {"vb_qoffset", &lavc_param_vb_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -- {"vlelim", &lavc_param_luma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, -- {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -@@ -215,13 +210,12 @@ - {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, - {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, - {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, -- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, -+ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 0x04000000}, - {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, -- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, -+ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 0x08000000}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, - {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, -- {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, - {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, -diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.h transcode-1.1.7/export/ffmpeg_cfg.h ---- transcode-1.1.7-orig/export/ffmpeg_cfg.h 2013-07-13 18:41:25.438463695 -0400 -+++ transcode-1.1.7/export/ffmpeg_cfg.h 2013-07-13 18:49:04.169944470 -0400 -@@ -29,8 +29,6 @@ - //extern int lavc_param_vpass; - extern int lavc_param_vrc_strategy; - extern int lavc_param_vb_strategy; --extern int lavc_param_luma_elim_threshold; --extern int lavc_param_chroma_elim_threshold; - extern int lavc_param_packet_size; - extern int lavc_param_strict; - extern int lavc_param_data_partitioning; -@@ -84,7 +82,6 @@ - extern int lavc_param_mv0; - extern int lavc_param_noise_reduction; - extern int lavc_param_qp_rd; --extern int lavc_param_inter_threshold; - extern int lavc_param_sc_threshold; - extern int lavc_param_ss; - extern int lavc_param_top; diff --git a/extra/transfig/PKGBUILD b/extra/transfig/PKGBUILD index 5aec31a4a..fb25f29d8 100644 --- a/extra/transfig/PKGBUILD +++ b/extra/transfig/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 184440 2013-05-06 19:39:57Z foutrelis $ +# $Id: PKGBUILD 194011 2013-09-09 18:48:23Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=transfig -pkgver=3.2.5d -pkgrel=2 +pkgver=3.2.5e +pkgrel=1 pkgdesc="Format conversion utility that can be used with xfig" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfig.org" license=('custom') -depends=('libpng' 'libxpm') +depends=('libpng' 'libxpm' 'bc') makedepends=('imake') -source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE \ - transfig-3.2.5d-libpng-1.5.patch) -sha1sums=('90ff277cc9b3fa0d0313052fcf5e3ffad8652abc' - 'b8b712871615308b8b6add92f86d218437d652f2' - '9f9f332b0b31e58e59542bc1568df9617b71710a') +source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.tar.gz LICENSE) +sha1sums=('27aa9691bf84f8775db9be39c453a8132148bad1' + 'b8b712871615308b8b6add92f86d218437d652f2') prepare() { cd ${pkgname}.${pkgver} - sed -i 's/XCOMM USELATEX2E = -DLATEX2E/USELATEX2E = -DLATEX2E/' transfig/Imakefile - sed -i 's/XCOMM USEINLINE = -DUSE_INLINE/USEINLINE = -DUSE_INLINE/' fig2dev/Imakefile - patch -p1 -i ../transfig-3.2.5d-libpng-1.5.patch + sed -i 's/XCOMM USELATEX2E/USELATEX2E/' transfig/Imakefile + sed -i 's/XCOMM USEINLINE/USEINLINE/' fig2dev/Imakefile } build() { @@ -35,5 +32,6 @@ package() { make DESTDIR="${pkgdir}" XFIGLIBDIR=/usr/share/xfig \ FIG2DEV_LIBDIR=/usr/share/fig2dev MANPATH=/usr/share/man \ install install.man + mv "${pkgdir}/usr/bin/fig2ps2tex.sh" "${pkgdir}/usr/bin/fig2ps2tex" install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/transfig/transfig-3.2.5d-libpng-1.5.patch b/extra/transfig/transfig-3.2.5d-libpng-1.5.patch deleted file mode 100644 index e6f15e43e..000000000 --- a/extra/transfig/transfig-3.2.5d-libpng-1.5.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=356751 - -Index: transfig.3.2.5d/fig2dev/dev/readpng.c -=================================================================== ---- transfig.3.2.5d.orig/fig2dev/dev/readpng.c -+++ transfig.3.2.5d/fig2dev/dev/readpng.c -@@ -62,7 +62,7 @@ read_png(file,filetype,pic,llx,lly) - } - - /* set long jump here */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* if we get here there was a problem reading the file */ - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return 0; -@@ -78,15 +78,17 @@ read_png(file,filetype,pic,llx,lly) - png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, - &interlace_type, &compression_type, &filter_type); - -- if (info_ptr->valid & PNG_INFO_gAMA) -- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); -- else -- png_set_gamma(png_ptr, 2.2, 0.45); -+ png_fixed_point gamma = 0.45; -+ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); -+ png_set_gamma(png_ptr, 2.2, gamma); - -- if (info_ptr->valid & PNG_INFO_bKGD) -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { - /* set the background to the one supplied */ -- png_set_background(png_ptr, &info_ptr->background, -+ png_color_16p background; -+ png_get_bKGD(png_ptr,info_ptr,&background); -+ png_set_background(png_ptr, background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); -+ } - else { - /* blend the canvas background using the alpha channel */ - if (bgspec) { diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index bb7dcab64..836b49468 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 191767 2013-07-30 10:31:09Z tomegun $ +# $Id: PKGBUILD 194463 2013-09-16 16:36:20Z tomegun $ # Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.81 +pkgver=2.82 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent') +makedepends=('gtk3' 'intltool' 'curl' 'qt5-base' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz) -md5sums=('db1ad10ecff07150486dab2365ccb3a8') +md5sums=('a5ef870c0410b12d10449c2d36fa4661') build() { cd $pkgbase-$pkgver @@ -19,7 +19,7 @@ build() { ./configure --prefix=/usr make pushd qt - qmake-qt4 qtr.pro + qmake qtr.pro make } package_transmission-cli() { @@ -54,7 +54,7 @@ package_transmission-gtk() { package_transmission-qt() { pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)" - depends=('curl' 'qt4' 'libevent') + depends=('curl' 'qt5-base' 'libevent') optdepends=('transmission-cli: daemon and web support') install=transmission-qt.install diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index f8c5ecf60..bd938c094 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186289 2013-05-23 22:11:35Z eric $ +# $Id: PKGBUILD 194209 2013-09-10 14:36:48Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ucommon -pkgver=6.0.5 +pkgver=6.0.7 pkgrel=1 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL3' 'LGPL3') depends=('openssl') options=('!libtool') source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('afbcf89264e9c96dccf4104bab52a9c0' +md5sums=('0774a0315beac7b26ec75d44d925f208' 'SKIP') build() { diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index 8b589160f..e16ad7efb 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 187072 2013-06-03 11:16:56Z allan $ +# $Id: PKGBUILD 195132 2013-09-25 13:30:53Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2 -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=3 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" license=('GPL2') -depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject') +depends=('glib2' 'systemd' 'polkit' 'libatasmart' 'util-linux') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python') optdepends=('parted: partition management' - 'gptfdisk: GUID partition table support') + 'gptfdisk: GUID partition table support' + 'ntfs-3g: NTFS filesystem management support' + 'dosfstools: VFAT filesystem management support') options=(!libtool) source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) -sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8') +sha256sums=('013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb') build() { cd "udisks-$pkgver" @@ -23,9 +25,6 @@ build() { --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make - # fix mdadm location - sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ - "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules } package() { diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD index 5335e1902..7860d9d6b 100644 --- a/extra/vala/PKGBUILD +++ b/extra/vala/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183465 2013-04-21 22:12:18Z heftig $ +# $Id: PKGBUILD 196143 2013-10-07 11:53:39Z jgc $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=vala -pkgver=0.20.1 +pkgver=0.22.0 pkgrel=1 pkgdesc="Compiler for the GObject type system" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glib2') makedepends=('libxslt') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481') +sha256sums=('2f60a7ff887fcb16ed70fa84bb5872c2c54099a0732ce3f9e2c56e51a9208037') build() { cd $pkgname-$pkgver diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD index 44b5394c8..a27f7cabb 100644 --- a/extra/valgrind/PKGBUILD +++ b/extra/valgrind/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 193067 2013-08-15 12:08:37Z allan $ +# $Id: PKGBUILD 194381 2013-09-15 10:04:52Z allan $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> pkgname=valgrind pkgver=3.8.1 -pkgrel=3 +pkgrel=4 pkgdesc="A tool to help find memory-management problems in programs" arch=('i686' 'x86_64') license=('GPL') @@ -14,10 +14,12 @@ makedepends=('gdb') options=('!emptydirs') source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 valgrind-3.8.1-glibc-2.18.patch - valgrind-3.8.1-ptrace-build-fix.patch) + valgrind-3.8.1-ptrace-build-fix.patch + valgrind-3.8.1-xaddb.patch) md5sums=('288758010b271119a0ffc0183f1d6e38' 'f3f911e6f5b0ab9d176d40b47d6cae24' - '9d429e62255621a0c190a8180d8ab1a4') + '9d429e62255621a0c190a8180d8ab1a4' + 'aad7751a3e4ee899093dcfa9f70a449b') prepare() { cd ${srcdir}/${pkgname}-${pkgver} @@ -27,6 +29,9 @@ prepare() { # based on svn commits 13471 & 13482 patch -p0 -i $srcdir/valgrind-3.8.1-ptrace-build-fix.patch + # https://bugs.kde.org/show_bug.cgi?id=307106 + patch -p0 -i $srcdir/valgrind-3.8.1-xaddb.patch + ./autogen.sh } diff --git a/extra/valgrind/valgrind-3.8.1-xaddb.patch b/extra/valgrind/valgrind-3.8.1-xaddb.patch new file mode 100644 index 000000000..ca5a59700 --- /dev/null +++ b/extra/valgrind/valgrind-3.8.1-xaddb.patch @@ -0,0 +1,34 @@ +Index: priv/guest_amd64_toIR.c +=================================================================== +--- VEX/priv/guest_amd64_toIR.c (revision 2580) ++++ VEX/priv/guest_amd64_toIR.c (revision 2581) +@@ -20268,6 +20268,14 @@ + delta = dis_movx_E_G ( vbi, pfx, delta, 2, sz, True ); + return delta; + ++ case 0xC0: { /* XADD Gb,Eb */ ++ Bool decode_OK = False; ++ delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta ); ++ if (!decode_OK) ++ goto decode_failure; ++ return delta; ++ } ++ + case 0xC1: { /* XADD Gv,Ev */ + Bool decode_OK = False; + delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, sz, delta ); +@@ -27143,14 +27151,6 @@ + + /* =-=-=-=-=-=-=-=-=- XADD -=-=-=-=-=-=-=-=-=-= */ + +- case 0xC0: { /* XADD Gb,Eb */ +- Bool decode_OK = False; +- delta = dis_xadd_G_E ( &decode_OK, vbi, pfx, 1, delta ); +- if (!decode_OK) +- goto decode_failure; +- break; +- } +- + /* =-=-=-=-=-=-=-=-=- SGDT and SIDT =-=-=-=-=-=-=-=-=-=-= */ + + /* =-=-=-=-=-=-=-=-=- unimp2 =-=-=-=-=-=-=-=-=-=-= */ diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 4b30165c2..a2fba37ca 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.4 -_patchlevel=0 -__hgrev=a643d80b6507 +_patchlevel=16 +__hgrev=d17ef148ada4 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=2 @@ -20,7 +20,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('1dfdea2e3fbf778647286d7e23ef9f54' +md5sums=('733cce44a08ea953ad0e1f9d574670e0' 'SKIP' 'b9d4dcb9d3ee2e151dc4be1e94934f6a' '10353a61aadc3f276692d0e17db1478e' diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index d8ce95730..4b2923ce1 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 191757 2013-07-30 09:24:26Z heftig $ +# $Id: PKGBUILD 196144 2013-10-07 11:53:40Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.8.3 -pkgrel=1 +pkgver=3.10.0 +pkgrel=2 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') -license=('GPL') +license=(GPL) url="http://www.gnome.org/projects/vinagre/" install=vinagre.install -depends=('libsecret' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') +depends=(libsecret gtk-vnc vte3 telepathy-glib avahi desktop-file-utils dconf shared-mime-info + gnome-icon-theme spice-gtk3) optdepends=('openssh: SSH plugin' - 'rdesktop: RDP plugin') -makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool') -groups=('gnome-extra') + 'freerdp: RDP plugin') +makedepends=(docbook-xsl intltool freerdp openssh itstool) +groups=(gnome-extra) options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0d862429307d28333f17afa40cf81f6006903e1aa134a8bc430079a9db40b1c6') +sha256sums=('d90ca19d1075149d044a58274016bb3976b2201774ae079d661fd7c3859a1900') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice + --libexecdir=/usr/lib/$pkgname --enable-rdp make } diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index 604f7c10a..a2564736f 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 183467 2013-04-21 22:12:21Z heftig $ +# $Id: PKGBUILD 196145 2013-10-07 11:53:41Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.8.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils') -makedepends=('intltool' 'networkmanager' 'gnome-common') -groups=('gnome') +license=(GPL) +depends=(libnotify libxtst libsm telepathy-glib gtk3 libsecret avahi desktop-file-utils) +makedepends=(intltool networkmanager gnome-common) +groups=(gnome) 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=('3a82392aa479d5a4be38020ac64b3c4f0227917af6175938919dbe741995929c') +sha256sums=('927b71eaafc5ac4c6e098fb9ff0164899eae3ca599a32f5d18897a02b4be1fdd') build() { cd $pkgname-$pkgver - sed -i -e '/AC_PATH_XTRA/d' configure.ac - autoreconf --force + ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vino \ --localstatedir=/var \ --disable-http-server --with-secret + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 278ac45c2..7785c44ea 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193903 2013-09-04 19:31:12Z andrea $ +# $Id: PKGBUILD 194330 2013-09-13 15:52:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgbase=virtuoso pkgname=('virtuoso' 'virtuoso-base') epoch=1 -pkgver=6.1.6 +pkgver=6.1.7 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://virtuoso.openlinksw.com/wiki/main/Main/' @@ -13,7 +13,7 @@ license=('GPL') makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") -md5sums=('3991149c570f3738c3e819ce603e487f') +md5sums=('88885e84e8f7b61e59516f696b1d3be5') prepare() { cd ${pkgbase}-opensource-${pkgver} diff --git a/extra/visualvm/PKGBUILD b/extra/visualvm/PKGBUILD new file mode 100644 index 000000000..b75f938f5 --- /dev/null +++ b/extra/visualvm/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> +# Contributor: Kristof JOZSA <kristof.jozsa@gmail.com> +pkgname=visualvm +pkgver=1.3.6 +_shortver=${pkgver//\./} +pkgrel=3 +pkgdesc='Visual tool integrating several commandline JDK tools and lightweight profiling capabilities' +arch=('i686' 'x86_64') +url='http://visualvm.java.net/' +license=('custom:GPL') +depends=('java-environment') +source=("https://java.net/projects/${pkgname}/downloads/download/release${_shortver}/${pkgname}_${_shortver}.zip" + 'visualvm.desktop' + 'icon.png') +sha256sums=('317f65b3fed7ea25638b6d35c6f95642b5662453b7841a9d32aac3cf3ff59616' + 'e820807e8d78446cf156a3947d97856e24865bb0d8c957e9ce2fed309c737441' + '452fbd85c968ec7176c5894bc4106b7e25310314d44278d807510675b6a5c864') + +package() { + cd ${srcdir}/${pkgname}_${_shortver} + + mkdir -p ${pkgdir}/usr/share/${pkgname} + cp -R bin platform profiler visualvm ${pkgdir}/usr/share/${pkgname} + + install -d ${pkgdir}/etc/${pkgname} + cp -R etc/* ${pkgdir}/etc/${pkgname} + ln -s /etc/${pkgname} ${pkgdir}/usr/share/${pkgname}/etc + + rm -rf ${pkgdir}/usr/share/${pkgname}/profiler/lib/deployed/jdk*/{hpux*,mac,solaris*,windows*,linux-arm*} + if [ ${CARCH} == 'i686' ]; then + rm -rf ${pkgdir}/usr/share/${pkgname}/profiler/lib/deployed/jdk*/linux-amd64 \ + ${pkgdir}/usr/share/${pkgname}/platform/modules/lib/{x86,amd64} + else + rm -rf ${pkgdir}/usr/share/${pkgname}/profiler/lib/deployed/jdk*/linux \ + ${pkgdir}/usr/share/${pkgname}/platform/modules/lib/{x86,i386} + fi + + find ${pkgdir}/usr/share/${pkgname} \( -name "*.exe" -o -name "*.dll" \) -delete + + install -d ${pkgdir}/usr/bin + ln -s /usr/share/${pkgname}/bin/visualvm ${pkgdir}/usr/bin/${pkgname} + + install -Dm644 ${srcdir}/icon.png ${pkgdir}/usr/share/${pkgname}/icon.png + install -Dm644 ${srcdir}/visualvm.desktop ${pkgdir}/usr/share/applications/visualvm.desktop + + install -D LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt +} diff --git a/extra/visualvm/icon.png b/extra/visualvm/icon.png Binary files differnew file mode 100644 index 000000000..fe235b524 --- /dev/null +++ b/extra/visualvm/icon.png diff --git a/extra/visualvm/visualvm.desktop b/extra/visualvm/visualvm.desktop new file mode 100644 index 000000000..9ff50b1c7 --- /dev/null +++ b/extra/visualvm/visualvm.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=VisualVM +GenericName=Java VM monitoring and troubleshooting tool +Icon=/usr/share/visualvm/icon.png +Exec=/usr/bin/visualvm +Categories=Development; + diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index b876df205..4b52b0d8c 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $ +# $Id: PKGBUILD 195902 2013-10-04 17:29:00Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.8.a -pkgrel=1 +pkgver=2.1.0 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' + 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'libdc1394' 'libavc1394' - 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' - 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' - 'mesa') -[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss' 'projectm') + 'libdc1394' 'libavc1394' 'libcaca' + 'librsvg' 'portaudio' 'libgme' 'xosd' + 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' + 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' 'mesa') +[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'projectm') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' 'ncurses: for ncurses interface support' @@ -59,17 +58,14 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz" - vlc-2.0.7-vaapi-compat.patch - vlc-2.0.8-Fix-live555-breakage-in-last-update.patch) -md5sums=('e5000677181406d026ffe448633d1ca0' - '6df10774bb7acf20e09d6139e5c7839e' - 'e592efe7bb65291a84f99cfaa3a9f8a2') +vlc-2.0.7-vaapi-compat.patch) +md5sums=('8c77bda671821f5b9ede96b6816e2ade' + '6df10774bb7acf20e09d6139e5c7839e') prepare() { cd "${srcdir}/${pkgname}-${pkgver/.a}" patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch - patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp @@ -84,7 +80,6 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-rpath \ - --enable-oss \ --enable-faad \ --enable-nls \ --enable-lirc \ diff --git a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch deleted file mode 100644 index 3006cbc8d..000000000 --- a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Kempf <jb@videolan.org> -Date: Thu, 25 Jul 2013 01:14:32 +0200 -Subject: [PATCH] Fix live555 breakage in last update - ---- - modules/demux/live555.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp -index 9e02630..7a1ab16 100644 ---- a/modules/demux/live555.cpp -+++ b/modules/demux/live555.cpp -@@ -243,7 +243,11 @@ public: - char const* applicationName, portNumBits tunnelOverHTTPPortNum, - demux_sys_t *p_sys) : - RTSPClient( env, rtspURL, verbosityLevel, applicationName, -- tunnelOverHTTPPortNum ) -+ tunnelOverHTTPPortNum -+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800 -+ , -1 -+#endif -+ ) - { - this->p_sys = p_sys; - } --- -1.8.3.4 - diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index dc7797ce1..efc91321d 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189823 2013-07-08 16:52:35Z heftig $ +# $Id: PKGBUILD 194827 2013-09-23 18:45:48Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.7 +pkgver=0.34.8 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz) -sha256sums=('187e49cca574f548d04ceea701e95a1531ff9dd9cd1953ce6455824720dab932') +sha256sums=('126ffb7d5a5da35639df003c84ff11ccc92f3fc8b1556d3e8b0f7314c8d909d0') build() { cd "vte-$pkgver" diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 3d0632eda..cf2265f70 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191357 2013-07-23 21:01:37Z jgc $ +# $Id: PKGBUILD 196146 2013-10-07 11:53:43Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk -pkgver=2.0.4 +pkgver=2.2.0 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://webkitgtk.org/" @@ -16,7 +16,7 @@ conflicts=(webkitgtk3 libwebkit3) replaces=(webkitgtk3 libwebkit3) options=(!libtool !emptydirs) source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz) -sha256sums=('bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f') +sha256sums=('84902e3255dcc6efa1298c8a1f2d2a49674126dcacea383f309aeed9e734d538') prepare() { cd $pkgbase-$pkgver diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index cc5c661b3..e61c92471 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186429 2013-05-26 09:26:13Z bluewind $ +# $Id: PKGBUILD 193946 2013-09-07 16:40:23Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat pkgver=0.4.1 -pkgrel=2 +pkgrel=4 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" @@ -16,18 +16,19 @@ options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") md5sums=('071d6f1cd21c892cae126af21095c43f') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - +prepare() { mkdir build +} + +build() { cd build - cmake .. -DPREFIX=/usr \ + cmake ../${pkgname}-${pkgver} -DPREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so } package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" + cd build make DESTDIR="${pkgdir}/" install } diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD index e0134a52d..a4518a5fe 100644 --- a/extra/wget/PKGBUILD +++ b/extra/wget/PKGBUILD @@ -1,36 +1,46 @@ -# $Id: PKGBUILD 169712 2012-10-27 01:52:51Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 195268 2013-09-29 17:27:18Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wget pkgver=1.14 -pkgrel=2.1 +pkgrel=3 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/wget/wget.html" license=('GPL3') -depends=('openssl' 'libidn' 'pcre' 'util-linux') +depends=('openssl' 'libidn' 'util-linux') +checkdepends=('perl-http-daemon' 'perl-io-socket-ssl') optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('316f6f59292c9098ad81fd54f658c579' - '3e121933d69f32fa58776bff76bcebd0') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} + wget-pod-fixes.patch) +sha1sums=('cfa0906e6f72c1c902c29b52d140c22ecdcd617e' + 'SKIP' + 'aae4be72657c7a8e9dbedb7109cd2d8562a325d2') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/wget-pod-fixes.patch" + cat >> doc/sample.wgetrc <<EOF + +# default root certs location +ca_certificate=/etc/ssl/certs/ca-certificates.crt +EOF +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc --enable-nls make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - cat >> "$pkgdir/etc/wgetrc" <<EOF - -# default root certs location -ca_certificate=/etc/ssl/certs/ca-certificates.crt -EOF } diff --git a/extra/wget/wget-pod-fixes.patch b/extra/wget/wget-pod-fixes.patch new file mode 100644 index 000000000..54e985624 --- /dev/null +++ b/extra/wget/wget-pod-fixes.patch @@ -0,0 +1,81 @@ +diff -Naur wget-1.14.orig/doc/wget.texi wget-1.14.new/doc/wget.texi +--- wget-1.14.orig/doc/wget.texi 2012-08-04 02:41:52.000000000 -0600 ++++ wget-1.14.new/doc/wget.texi 2013-05-26 11:18:52.986107183 -0600 +@@ -876,7 +876,7 @@ + actions of one. + + @cindex proxy +-@itemx --no-proxy ++@item --no-proxy + Don't use proxies, even if the appropriate @code{*_proxy} environment + variable is defined. + +@@ -977,7 +977,7 @@ + whose encoding does not match the one used locally. + + @cindex IPv6 +-@itemx -4 ++@item -4 + @itemx --inet4-only + @itemx -6 + @itemx --inet6-only +@@ -2106,32 +2106,32 @@ + + + @table @asis +-@item 0 ++@item C<0> + No problems occurred. + +-@item 1 ++@item C<1> + Generic error code. + +-@item 2 ++@item C<2> + Parse error---for instance, when parsing command-line options, the + @samp{.wgetrc} or @samp{.netrc}... + +-@item 3 ++@item C<3> + File I/O error. + +-@item 4 ++@item C<4> + Network failure. + +-@item 5 ++@item C<5> + SSL verification failure. + +-@item 6 ++@item C<6> + Username/password authentication failure. + +-@item 7 ++@item C<7> + Protocol errors. + +-@item 8 ++@item C<8> + Server issued an error response. + @end table + +@@ -3094,7 +3094,7 @@ + Change setting of passive @sc{ftp}, equivalent to the + @samp{--passive-ftp} option. + +-@itemx password = @var{string} ++@item password = @var{string} + Specify password @var{string} for both @sc{ftp} and @sc{http} file retrieval. + This command can be overridden using the @samp{ftp_password} and + @samp{http_password} command for @sc{ftp} and @sc{http} respectively. +@@ -3605,7 +3605,7 @@ + may be specified from within Wget itself. + + @table @samp +-@itemx --no-proxy ++@item --no-proxy + @itemx proxy = on/off + This option and the corresponding command may be used to suppress the + use of proxy, even if the appropriate environment variables are set. diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index 401e7f352..fba240c38 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191928 2013-08-01 07:00:01Z bpiotrowski $ +# $Id: PKGBUILD 194337 2013-09-13 20:35:50Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker -pkgver=0.95.4 -pkgrel=3 +pkgver=0.95.5 +pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64 'mips64el') url="http://www.windowmaker.org/" @@ -13,7 +13,7 @@ options=('!libtool') source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop wm-giflib.patch) -md5sums=('640b8ea5b1a875440aa48eaab09c5f00' +md5sums=('19e9cc256ccb7075ff82f4b809df3a0a' '2fba97bebfd691836b92b8f0db79ff13' '05d8e98fb579f2fa5a097b629374e6b8') diff --git a/extra/wireshark/01_fix_pod_file.patch b/extra/wireshark/01_fix_pod_file.patch deleted file mode 100644 index f75f4c0bf..000000000 --- a/extra/wireshark/01_fix_pod_file.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/doc/reordercap.pod 2013/05/20 05:45:32 49435 -+++ trunk/doc/reordercap.pod 2013/05/20 14:56:18 49436 -@@ -40,6 +40,8 @@ - When the B<-n> option is used, B<reordercap> will not write out the output - file if it finds that the input file is already in order. - -+=back -+ - =head1 SEE ALSO - - pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1), diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 7492f64d4..552c2d015 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,25 +1,21 @@ -# $Id: PKGBUILD 191608 2013-07-27 17:57:23Z guillaume $ +# $Id: PKGBUILD 194226 2013-09-11 02:06:50Z eric $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.10.1 +pkgver=1.10.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' - 'libgcrypt' 'lua51' 'python') +makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' + 'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme') url='http://www.wireshark.org/' options=(!libtool) -source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_fix_pod_file.patch) -sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc' - '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41') +source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) +sha256sums=('b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -p1 <${srcdir}/01_fix_pod_file.patch + cd ${pkgbase}-${pkgver} ./autogen.sh ./configure \ @@ -33,11 +29,11 @@ build() { package_wireshark-cli() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version' - depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua51') + depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua') install=wireshark.install conflicts=(wireshark) - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install @@ -47,11 +43,11 @@ package_wireshark-cli() { rm "${pkgdir}/usr/bin/wireshark" # Headers - install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} + install -dm755 "${pkgdir}"/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}" for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do - install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} + install -m644 ${d}/*.h "${pkgdir}"/usr/include/${pkgbase}/${d} done } @@ -62,7 +58,7 @@ package_wireshark-gtk() { replaces=(wireshark) conflicts=(wireshark) - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark" for d in 16 32 48; do diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install index 001bd0c58..719171d9e 100644 --- a/extra/wireshark/wireshark.install +++ b/extra/wireshark/wireshark.install @@ -1,18 +1,18 @@ post_install() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null - /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" } post_upgrade() { - /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + getent group wireshark >/dev/null 2>&1 || groupadd -g 150 wireshark &>/dev/null - /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap } post_remove() { - if /usr/bin/getent group wireshark >/dev/null 2>&1; then - /usr/sbin/groupdel wireshark + if getent group wireshark >/dev/null 2>&1; then + groupdel wireshark fi } diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD index 7da864f8c..5ac5eb002 100644 --- a/extra/x2goclient/PKGBUILD +++ b/extra/x2goclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180595 2013-03-24 09:37:30Z andyrtr $ +# $Id: PKGBUILD 194273 2013-09-12 19:24:14Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> # Contributor: Richard Murri <admin@richardmurri.com> pkgname=x2goclient -pkgver=4.0.1.0 +pkgver=4.0.1.1 pkgrel=1 pkgdesc="x2go qt4 client" arch=('i686' 'x86_64' 'mips64el') @@ -14,15 +14,16 @@ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-the makedepends=('man2html') install=x2goclient.install source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('ff223344915b9def9e9e5a01ae919532') +md5sums=('13b6729acfd5c6a00441430ef6ab69d6') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} sed -i "s:-o root -g root ::" Makefile + sed -i "s:lrelease:lrelease-qt4:g" Makefile make PREFIX=/usr } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make PREFIX=/usr DESTDIR="$pkgdir" install } diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD index b80589700..e42083917 100644 --- a/extra/xf86-input-evdev/PKGBUILD +++ b/extra/xf86-input-evdev/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189922 2013-07-11 14:37:25Z andyrtr $ +# $Id: PKGBUILD 195989 2013-10-07 07:38:43Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <Alexander@archlinux.org pkgname=xf86-input-evdev -pkgver=2.8.1 +pkgver=2.8.2 pkgrel=1 pkgdesc="X.org evdev input driver" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION> options=('!libtool' '!makeflags') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('09f887e1ce6cdb92154035db9044e0795a5c80f1ffb9efc599aed9a9dc1ff539') +sha256sums=('750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index b333857db..dcd177f12 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 192066 2013-08-05 14:20:19Z andyrtr $ +# $Id: PKGBUILD 195224 2013-09-28 05:24:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.22.1 +pkgver=0.23.0 pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('inputattach: support for serial tablets') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2 70-wacom.rules) -md5sums=('dba80caac08145a907fc7f7796f3aea7' +md5sums=('353642b8a3f2dde089e913be32955aae' 'cc46dcb399d5ee62c9feb610c60d1270') build() { diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD index 02547ed73..d9c0c3344 100644 --- a/extra/xf86-video-dummy/PKGBUILD +++ b/extra/xf86-video-dummy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180196 2013-03-18 16:09:04Z andyrtr $ +# $Id: PKGBUILD 194314 2013-09-13 08:12:58Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-dummy -pkgver=0.3.6 -pkgrel=3 +pkgver=0.3.7 +pkgrel=1 pkgdesc="X.org dummy video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,13 +13,11 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'res conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff) -sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798' - '06fe79ba658712a1abb0612a049c1061618d30e72d4939fc59c8c905d9d4d5bb') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('56f84fcbc515685529ad8e10bca1072731d9c096b97c5d35ddc95cd589b98680') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git-fix.diff ./configure --prefix=/usr make } diff --git a/extra/xf86-video-dummy/git-fix.diff b/extra/xf86-video-dummy/git-fix.diff deleted file mode 100644 index 4b0b46ef3..000000000 --- a/extra/xf86-video-dummy/git-fix.diff +++ /dev/null @@ -1,31 +0,0 @@ -From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 25 Sep 2012 12:54:36 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/dummy_driver.c b/src/dummy_driver.c -index 62066d6..6062c39 100644 ---- a/src/dummy_driver.c -+++ b/src/dummy_driver.c -@@ -14,9 +14,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" -- - /* All drivers using the mi colormap manipulation need this */ - #include "micmap.h" - -@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL) - , lines - pScrn->virtualY); - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD index 03748cbfd..66af2ff48 100644 --- a/extra/xf86-video-fbdev/PKGBUILD +++ b/extra/xf86-video-fbdev/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180197 2013-03-18 16:09:06Z andyrtr $ +# $Id: PKGBUILD 195144 2013-09-25 17:08:11Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-fbdev -pkgver=0.4.3 -pkgrel=3 +pkgver=0.4.4 +pkgrel=1 pkgdesc="X.org framebuffer video driver" arch=(i686 x86_64 'mips64el') license=('custom') @@ -13,19 +13,17 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff) -sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831' - '4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git-fix.diff + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xf86-video-fbdev/git-fix.diff b/extra/xf86-video-fbdev/git-fix.diff deleted file mode 100644 index 138d5bc2a..000000000 --- a/extra/xf86-video-fbdev/git-fix.diff +++ /dev/null @@ -1,29 +0,0 @@ -From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 25 Sep 2012 12:54:37 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/fbdev.c b/src/fbdev.c -index cd7ebc5..f5a7378 100644 ---- a/src/fbdev.c -+++ b/src/fbdev.c -@@ -14,7 +14,6 @@ - #include "xf86_OSproc.h" - - #include "mipointer.h" --#include "mibstore.h" - #include "micmap.h" - #include "colormapst.h" - #include "xf86cmap.h" -@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL) - } - - xf86SetBlackWhitePixels(pScreen); -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* software cursor */ --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index 882e858d0..5e1198c8c 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191734 2013-07-29 19:57:36Z jgc $ +# $Id: PKGBUILD 195864 2013-10-02 19:32:45Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-r128 -pkgver=6.9.1 -pkgrel=4 +pkgver=6.9.2 +pkgrel=1 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,15 +14,9 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS optdepends=('r128-dri: DRI1 support from community repo') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - no-mibstore.patch) -sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c' - '6e4cbce4de6ff569f6d30a99f699ca44d4cb28e530e593f61578b4f97c1de13e') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('8b2d295f1842d07304a75da1cfb9bf139b320a6539970eaf8d5ecc010cd36ee0') -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i ../no-mibstore.patch -} build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr diff --git a/extra/xf86-video-r128/no-mibstore.patch b/extra/xf86-video-r128/no-mibstore.patch deleted file mode 100644 index b6f18031e..000000000 --- a/extra/xf86-video-r128/no-mibstore.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 24f28a78fdcd056357f137650ca7f0f01c257d97 Mon Sep 17 00:00:00 2001 -From: Connor Behan <connor.behan@gmail.com> -Date: Wed, 19 Dec 2012 18:41:14 +0000 -Subject: Remove call to obsolete miInitializeBackingStore() - -Definition was deleted from Xorg during 1.14 merge window, but has been -a no-op since 1.10 merge window. - -Signed-off-by: Connor Behan <connor.behan@gmail.com> ---- -diff --git a/src/r128_driver.c b/src/r128_driver.c -index a062a60..f47c7e3 100644 ---- a/src/r128_driver.c -+++ b/src/r128_driver.c -@@ -2701,7 +2701,6 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL) - R128DGAInit(pScreen); - - /* Backing store setup */ -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* Set Silken Mouse */ --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD index d5f9a2eea..08158f8fc 100644 --- a/extra/xf86-video-savage/PKGBUILD +++ b/extra/xf86-video-savage/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181070 2013-03-31 08:09:15Z andyrtr $ +# $Id: PKGBUILD 195146 2013-09-25 17:11:53Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-savage -pkgver=2.3.6 -pkgrel=4 +pkgver=2.3.7 +pkgrel=1 pkgdesc="X.org savage video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,21 +14,17 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS optdepends=('savage-dri: DRI1 support from community repo') options=(!libtool) groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git_fixes.diff) -sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6' - 'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git_fixes.diff + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/xf86-video-savage/git_fixes.diff b/extra/xf86-video-savage/git_fixes.diff deleted file mode 100644 index 8d5ef49b0..000000000 --- a/extra/xf86-video-savage/git_fixes.diff +++ /dev/null @@ -1,64 +0,0 @@ -From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@gmail.com> -Date: Wed, 18 Jul 2012 08:52:38 +0000 -Subject: savage: move compat-api.h down to proper place. - -This screws up when DRI isn't enabled. - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/savage_driver.h b/src/savage_driver.h -index b604292..ec4b1ea 100644 ---- a/src/savage_driver.h -+++ b/src/savage_driver.h -@@ -85,8 +85,6 @@ - #include "GL/glxint.h" - #include "xf86drm.h" - --#include "compat-api.h" -- - /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up - * to 32 clients. */ - #define SAVAGE_NUM_BUFFERS 32 -@@ -153,6 +151,8 @@ typedef struct _server{ - - #endif - -+#include "compat-api.h" -+ - typedef enum { - MT_NONE, - MT_CRT, --- -cgit v0.9.0.2-2-gbebe -From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@gmail.com> -Date: Sat, 22 Dec 2012 10:00:00 +0000 -Subject: savage: fix default accel arch when built with no XAA - -Signed-off-by: Dave Airlie <airlied@redhat.com> ---- -diff --git a/src/savage_driver.c b/src/savage_driver.c -index 026bf5c..5b49e60 100644 ---- a/src/savage_driver.c -+++ b/src/savage_driver.c -@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) - from = X_DEFAULT; - char *strptr; - if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) { -+#ifdef HAVE_XAA_H - if(!xf86NameCmp(strptr,"XAA")) { - from = X_CONFIG; - psav->useEXA = FALSE; -@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags) - from = X_CONFIG; - psav->useEXA = TRUE; - } -+#else -+ psav->useEXA = TRUE; -+#endif - } - xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n", - psav->useEXA ? "EXA" : "XAA"); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD index 5427203e4..e57801bbe 100644 --- a/extra/xfce4-power-manager/PKGBUILD +++ b/extra/xfce4-power-manager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185209 2013-05-12 07:30:46Z foutrelis $ +# $Id: PKGBUILD 195950 2013-10-06 07:26:31Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-power-manager pkgver=1.2.0 -pkgrel=4 +pkgrel=6 pkgdesc="Power manager for Xfce desktop" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -15,17 +15,33 @@ makedepends=('pkgconfig' 'intltool') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2 + xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch + xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch xfce4-power-manager-1.2.0-sync-en-gb-translation.patch) sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9' + '4166f61234abfcd385d43b1e7f7ab5b73711bcb7335ef0f6b217ac799dc9266b' + '689751b6369fd8ade6337713283f5ef3dd40715bbbe69e4a8723c9cbe56e7465' 'c8e1dfafd685c2abf1fcc2b3682f5b1eb2e7f1d4fa557f11a7478437eef9a933') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" + # Use logind interfaces for suspend and hibernate + # https://bugzilla.xfce.org/show_bug.cgi?id=9963 + patch -Np1 -i "$srcdir/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch" + + # Fix brightness level handling + # https://bugzilla.xfce.org/show_bug.cgi?id=8840 + patch -Np1 -i "$srcdir/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch" + # Fix en_GB translation # https://bugs.archlinux.org/task/30055 patch -d po -Np0 -i \ "$srcdir/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure \ --prefix=/usr \ diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch new file mode 100644 index 000000000..5cb4fdb0b --- /dev/null +++ b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-change-brightness-level-from-glong-to-gint32.patch @@ -0,0 +1,306 @@ +From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001 +From: Martin Matuska <martin@matuska.org> +Date: Tue, 23 Jul 2013 09:27:41 +0000 +Subject: Change brightness level from glong to gint32 + +The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue. +--- +diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c +index aa1ef33..f1524cb 100644 +--- a/common/xfpm-brightness.c ++++ b/common/xfpm-brightness.c +@@ -92,11 +92,11 @@ out: + } + + static gboolean +-xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current) ++xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current) + { + unsigned long nitems; + unsigned long bytes_after; +- long *prop; ++ gint32 *prop; + Atom actual_type; + int actual_format; + gboolean ret = FALSE; +@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l + } + + static gboolean +-xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level) ++xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level) + { + gboolean ret = TRUE; + +@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l + + if ( gdk_error_trap_pop () ) + { +- g_warning ("failed to XRRChangeOutputProperty for brightness %li", level); ++ g_warning ("failed to XRRChangeOutputProperty for brightness %d", level); + ret = FALSE; + } + +@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness) + } + + static gboolean +-xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) ++xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level) + { +- long hw_level; ++ gint32 hw_level; + gboolean ret = FALSE; +- long set_level; ++ gint32 set_level; + + ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); + +@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) + + if ( !ret ) + { +- g_warning ("xfpm_brightness_xrand_up failed for %li", set_level); ++ g_warning ("xfpm_brightness_xrand_up failed for %d", set_level); + return FALSE; + } + + /* Nothing changed in the hardware*/ + if ( *new_level == hw_level ) + { +- g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level); ++ g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level); + return FALSE; + } + +@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level) + } + + static gboolean +-xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level) ++xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level) + { +- long hw_level; ++ gint32 hw_level; + gboolean ret; +- long set_level; ++ gint32 set_level; + + ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level); + +@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level) + + if ( !ret ) + { +- g_warning ("xfpm_brightness_xrand_down failed for %li", set_level); ++ g_warning ("xfpm_brightness_xrand_down failed for %d", set_level); + return FALSE; + } + + /* Nothing changed in the hardware*/ + if ( *new_level == hw_level ) + { +- g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level); ++ g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level); + return FALSE; + } + +@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness) + } + + static gboolean +-xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level) ++xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level) + { + int ret; + +@@ -406,11 +406,11 @@ out: + } + + static gboolean +-xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level) ++xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level) + { +- glong hw_level; ++ gint32 hw_level; + gboolean ret = FALSE; +- gint set_level; ++ gint32 set_level; + + ret = xfpm_brightness_helper_get_level (brightness, &hw_level); + +@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level) + } + + static gboolean +-xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level) ++xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level) + { +- glong hw_level; ++ gint32 hw_level; + gboolean ret; +- gint set_level; ++ gint32 set_level; + + ret = xfpm_brightness_helper_get_level (brightness, &hw_level); + +@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness) + return FALSE; + } + +-gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level) ++gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level) + { + gboolean ret = FALSE; + +@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level) + return ret; + } + +-gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level) ++gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level) + { + gboolean ret = FALSE; + +@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness) + return brightness->priv->max_level; + } + +-gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level) ++gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, gint32 *level) + { + gboolean ret = FALSE; + +@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, glong *level) + return ret; + } + +-gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level) ++gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level) + { + gboolean ret = FALSE; + +diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h +index 0c4e3ed..26b3dbe 100644 +--- a/common/xfpm-brightness.h ++++ b/common/xfpm-brightness.h +@@ -51,20 +51,20 @@ XfpmBrightness *xfpm_brightness_new (void); + gboolean xfpm_brightness_setup (XfpmBrightness *brightness); + + gboolean xfpm_brightness_up (XfpmBrightness *brightness, +- glong *new_level); ++ gint32 *new_level); + + gboolean xfpm_brightness_down (XfpmBrightness *brightness, +- glong *new_level); ++ gint32 *new_level); + + gboolean xfpm_brightness_has_hw (XfpmBrightness *brightness); + + gint xfpm_brightness_get_max_level (XfpmBrightness *brightness); + + gboolean xfpm_brightness_get_level (XfpmBrightness *brightness, +- glong *level); ++ gint32 *level); + + gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, +- glong level); ++ gint32 level); + + gboolean xfpm_brightness_dim_down (XfpmBrightness *brightness); + +diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c +index 6e60c29..bd466c9 100644 +--- a/panel-plugins/brightness/brightness-button.c ++++ b/panel-plugins/brightness/brightness-button.c +@@ -186,7 +186,7 @@ static gboolean + brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time) + { + gint x, y; +- glong current_level = 0; ++ gint32 current_level = 0; + GdkDisplay *display; + GdkScreen *screen; + BrightnessButton *button; +@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button) + static void + range_value_changed (GtkWidget *widget, BrightnessButton *button) + { +- glong range_level, hw_level; ++ gint32 range_level, hw_level; + + range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range)); + +@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button) + static void + brightness_button_up (BrightnessButton *button) + { +- glong level; +- glong max_level; ++ gint32 level; ++ gint32 max_level; + + xfpm_brightness_get_level (button->priv->brightness, &level); + max_level = xfpm_brightness_get_max_level (button->priv->brightness); +@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button) + static void + brightness_button_down (BrightnessButton *button) + { +- glong level; ++ gint32 level; + xfpm_brightness_get_level (button->priv->brightness, &level); + + if ( level != 0 ) +diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c +index baeeb43..45c990f 100644 +--- a/src/xfpm-backlight.c ++++ b/src/xfpm-backlight.c +@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate + gboolean has_hw; + gboolean on_battery; + +- glong last_level; +- glong max_level; ++ gint32 last_level; ++ gint32 max_level; + + gboolean dimmed; + gboolean block; +@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight) + + if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL ) + { +- glong dim_level; ++ gint32 dim_level; + + g_object_get (G_OBJECT (backlight->priv->conf), + backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level, +@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight) + **/ + if (backlight->priv->last_level > dim_level) + { +- XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level); ++ XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level); + backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level); + } + } +@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight) + { + if ( !backlight->priv->block) + { +- XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level); ++ XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level); + xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level); + } + backlight->priv->dimmed = FALSE; +@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight) + static void + xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight) + { +- glong level; ++ gint32 level; + gboolean ret = TRUE; + + gboolean enable_brightness, show_popup; +-- +cgit v0.9.2 diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch new file mode 100644 index 000000000..431489588 --- /dev/null +++ b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch @@ -0,0 +1,156 @@ +From 244d0f09561eace29cbef819c2deb55b13701e25 Mon Sep 17 00:00:00 2001 +From: Mikhail Efremov <sem@altlinux.org> +Date: Mon, 8 Apr 2013 21:04:30 +0400 +Subject: [PATCH] Add systemd-logind support for suspend/hibernate. + +--- + configure.ac.in | 20 +++++++++++++++++ + src/xfpm-power-common.h | 8 +++++++ + src/xfpm-power.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 84 insertions(+), 1 deletion(-) + +diff --git a/src/xfpm-power-common.h b/src/xfpm-power-common.h +index 1040aed..11eaedc 100644 +--- a/src/xfpm-power-common.h ++++ b/src/xfpm-power-common.h +@@ -33,9 +33,17 @@ + #define UPOWER_PATH_WAKEUPS "/org/freedesktop/UPower/Wakeups" + #define UPOWER_IFACE_WAKEUPS "org.freedesktop.UPower.Wakeups" + ++#ifdef WITH_SLEEP_MANAGER_UPOWER + #define POLKIT_AUTH_SUSPEND "org.freedesktop.upower.suspend" + #define POLKIT_AUTH_HIBERNATE "org.freedesktop.upower.hibernate" ++#else ++#define LOGIND_NAME "org.freedesktop.login1" ++#define LOGIND_PATH "/org/freedesktop/login1" ++#define LOGIND_IFACE "org.freedesktop.login1.Manager" + ++#define POLKIT_AUTH_SUSPEND "org.freedesktop.login1.suspend" ++#define POLKIT_AUTH_HIBERNATE "org.freedesktop.login1.hibernate" ++#endif + + GPtrArray *xfpm_power_enumerate_devices (DBusGProxy *proxy); + +diff --git a/src/xfpm-power.c b/src/xfpm-power.c +index 796bef8..4a91e33 100644 +--- a/src/xfpm-power.c ++++ b/src/xfpm-power.c +@@ -72,7 +72,10 @@ struct XfpmPowerPrivate + + DBusGProxy *proxy; + DBusGProxy *proxy_prop; +- ++#ifndef WITH_SLEEP_MANAGER_UPOWER ++ DBusGProxy *proxy_logind; ++#endif ++ + GHashTable *hash; + + XfpmConsoleKit *console; +@@ -153,6 +156,7 @@ xfpm_power_check_polkit_auth (XfpmPower *power) + } + #endif + ++#ifdef WITH_SLEEP_MANAGER_UPOWER + static void + xfpm_power_check_pm (XfpmPower *power, GHashTable *props) + { +@@ -186,6 +190,32 @@ xfpm_power_check_pm (XfpmPower *power, GHashTable *props) + power->priv->can_hibernate = ret; + } + } ++#else ++static gboolean ++xfpm_power_can_sleep_method (XfpmPower *power, const char *method) ++{ ++ GError *error = NULL; ++ char *retstr = NULL; ++ gboolean ret = FALSE; ++ ++ if (!dbus_g_proxy_call (power->priv->proxy_logind, method, &error, ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &retstr, ++ G_TYPE_INVALID)) ++ { ++ g_warning ("Unable to check %s method: %s", method, error->message); ++ g_error_free (error); ++ ++ return FALSE; ++ } ++ ++ if (retstr && !strcmp (retstr, "yes")) ++ ret = TRUE; ++ g_free (retstr); ++ ++ return ret; ++} ++#endif + + static void + xfpm_power_check_power (XfpmPower *power, GHashTable *props) +@@ -276,7 +306,12 @@ xfpm_power_get_properties (XfpmPower *power) + + props = xfpm_power_get_interface_properties (power->priv->proxy_prop, UPOWER_IFACE); + ++#ifdef WITH_SLEEP_MANAGER_UPOWER + xfpm_power_check_pm (power, props); ++#else ++ power->priv->can_suspend = xfpm_power_can_sleep_method (power, "CanSuspend"); ++ power->priv->can_hibernate = xfpm_power_can_sleep_method (power, "CanHibernate"); ++#endif + xfpm_power_check_lid (power, props); + xfpm_power_check_power (power, props); + +@@ -347,9 +382,16 @@ xfpm_power_sleep (XfpmPower *power, const gchar *sleep_time, gboolean force) + xfpm_lock_screen (); + } + ++#ifdef WITH_SLEEP_MANAGER_UPOWER + dbus_g_proxy_call (power->priv->proxy, sleep_time, &error, + G_TYPE_INVALID, + G_TYPE_INVALID); ++#else ++ dbus_g_proxy_call (power->priv->proxy_logind, sleep_time, &error, ++ G_TYPE_BOOLEAN, TRUE, ++ G_TYPE_INVALID, ++ G_TYPE_INVALID); ++#endif + + if ( error ) + { +@@ -1360,12 +1402,20 @@ xfpm_power_init (XfpmPower *power) + UPOWER_NAME, + UPOWER_PATH, + DBUS_INTERFACE_PROPERTIES); ++ + if (power->priv->proxy_prop == NULL) + { + g_critical ("Unable to create proxy for %s", UPOWER_NAME); + goto out; + } + ++#ifndef WITH_SLEEP_MANAGER_UPOWER ++ power->priv->proxy_logind = dbus_g_proxy_new_for_name (power->priv->bus, ++ LOGIND_NAME, ++ LOGIND_PATH, ++ LOGIND_IFACE); ++#endif ++ + xfpm_power_get_power_devices (power); + xfpm_power_get_properties (power); + #ifdef ENABLE_POLKIT +@@ -1467,6 +1517,11 @@ xfpm_power_finalize (GObject *object) + if ( power->priv->proxy_prop ) + g_object_unref (power->priv->proxy_prop); + ++#ifndef WITH_SLEEP_MANAGER_UPOWER ++ if ( power->priv->proxy_logind ) ++ g_object_unref (power->priv->proxy_logind); ++#endif ++ + g_hash_table_destroy (power->priv->hash); + + #ifdef ENABLE_POLKIT +-- +1.8.1.5 + diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index bf4c67f28..5297fc185 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189759 2013-07-07 14:26:30Z foutrelis $ +# $Id: PKGBUILD 194429 2013-09-16 10:38:03Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session pkgver=4.10.1 -pkgrel=2 +pkgrel=3 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -20,8 +20,20 @@ optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enab replaces=('xfce-utils') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 + xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch) +sha256sums=('0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83' + '1fc10b6495624ddfb9e18419c835f7b929ad738c602a64ee7aab8327d3aac981') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Use logind interfaces for suspend and hibernate + # https://bugzilla.xfce.org/show_bug.cgi?id=9952 + patch -Np1 -i "$srcdir/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch" + + xdt-autogen +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xfce4-session/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch b/extra/xfce4-session/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch new file mode 100644 index 000000000..43aaeb8d5 --- /dev/null +++ b/extra/xfce4-session/xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch @@ -0,0 +1,275 @@ +From b076b5592579b397b7d4888eb8062e646b9a4dec Mon Sep 17 00:00:00 2001 +From: Mikhail Efremov <sem@altlinux.org> +Date: Wed, 10 Apr 2013 17:10:09 +0400 +Subject: [PATCH] Add systemd-logind support for suspend/hibernate. + +--- + xfce4-session/Makefile.am | 8 +++---- + xfce4-session/xfsm-shutdown.c | 42 +++++++++++++++++++++++++++------- + xfce4-session/xfsm-systemd.c | 52 +++++++++++++++++++++++++++++++++++++++++++ + xfce4-session/xfsm-systemd.h | 14 ++++++++++++ + 4 files changed, 104 insertions(+), 12 deletions(-) + +diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am +index 5472b33..5e2973b 100644 +--- a/xfce4-session/Makefile.am ++++ b/xfce4-session/Makefile.am +@@ -59,9 +59,7 @@ xfce4_session_SOURCES = \ + xfsm-splash-screen.c \ + xfsm-splash-screen.h \ + xfsm-startup.c \ +- xfsm-startup.h \ +- xfsm-upower.c \ +- xfsm-upower.h ++ xfsm-startup.h + + if HAVE_SYSTEMD + xfce4_session_SOURCES += \ +@@ -70,7 +68,9 @@ xfce4_session_SOURCES += \ + else + xfce4_session_SOURCES += \ + xfsm-consolekit.c \ +- xfsm-consolekit.h ++ xfsm-consolekit.h \ ++ xfsm-upower.c \ ++ xfsm-upower.h + endif + + xfce4_session_CFLAGS = \ +diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c +index 4c483a7..8a2ba8d 100644 +--- a/xfce4-session/xfsm-shutdown.c ++++ b/xfce4-session/xfsm-shutdown.c +@@ -66,12 +66,12 @@ + #include <xfce4-session/xfsm-fadeout.h> + #include <xfce4-session/xfsm-global.h> + #include <xfce4-session/xfsm-legacy.h> +-#include <xfce4-session/xfsm-upower.h> + + #ifdef HAVE_SYSTEMD + #include <xfce4-session/xfsm-systemd.h> + #else + #include <xfce4-session/xfsm-consolekit.h> ++#include <xfce4-session/xfsm-upower.h> + #endif + + static void xfsm_shutdown_finalize (GObject *object); +@@ -100,8 +100,8 @@ struct _XfsmShutdown + XfsmSystemd *systemd; + #else + XfsmConsolekit *consolekit; +-#endif + XfsmUPower *upower; ++#endif + + /* kiosk settings */ + gboolean kiosk_can_shutdown; +@@ -142,8 +142,8 @@ xfsm_shutdown_init (XfsmShutdown *shutdown) + shutdown->systemd = xfsm_systemd_get (); + #else + shutdown->consolekit = xfsm_consolekit_get (); +-#endif + shutdown->upower = xfsm_upower_get (); ++#endif + shutdown->helper_state = SUDO_NOT_INITIAZED; + shutdown->helper_require_password = FALSE; + +@@ -165,8 +165,8 @@ xfsm_shutdown_finalize (GObject *object) + g_object_unref (G_OBJECT (shutdown->systemd)); + #else + g_object_unref (G_OBJECT (shutdown->consolekit)); +-#endif + g_object_unref (G_OBJECT (shutdown->upower)); ++#endif + + /* close down helper */ + xfsm_shutdown_sudo_free (shutdown); +@@ -692,7 +692,11 @@ xfsm_shutdown_try_suspend (XfsmShutdown *shutdown, + { + g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE); + ++#ifdef HAVE_SYSTEMD ++ return xfsm_systemd_try_suspend (shutdown->systemd, error); ++#else + return xfsm_upower_try_suspend (shutdown->upower, error); ++#endif + } + + +@@ -703,7 +707,11 @@ xfsm_shutdown_try_hibernate (XfsmShutdown *shutdown, + { + g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE); + ++#ifdef HAVE_SYSTEMD ++ return xfsm_systemd_try_hibernate (shutdown->systemd, error); ++#else + return xfsm_upower_try_hibernate (shutdown->upower, error); ++#endif + } + + +@@ -776,6 +784,8 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown, + gboolean *auth_suspend, + GError **error) + { ++ gboolean ret; ++ + g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE); + + if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL)) +@@ -784,8 +794,15 @@ xfsm_shutdown_can_suspend (XfsmShutdown *shutdown, + return TRUE; + } + +- return xfsm_upower_can_suspend (shutdown->upower, can_suspend, +- auth_suspend, error); ++#ifdef HAVE_SYSTEMD ++ ret = xfsm_systemd_can_suspend (shutdown->systemd, can_suspend, error); ++ *auth_suspend = *can_suspend; ++#else ++ ret = xfsm_upower_can_suspend (shutdown->upower, can_suspend, ++ auth_suspend, error); ++#endif ++ ++ return ret; + } + + +@@ -796,6 +813,8 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown, + gboolean *auth_hibernate, + GError **error) + { ++ gboolean ret; ++ + g_return_val_if_fail (XFSM_IS_SHUTDOWN (shutdown), FALSE); + + if (!xfsm_shutdown_kiosk_can_shutdown (shutdown, NULL)) +@@ -804,8 +823,15 @@ xfsm_shutdown_can_hibernate (XfsmShutdown *shutdown, + return TRUE; + } + +- return xfsm_upower_can_hibernate (shutdown->upower, can_hibernate, +- auth_hibernate, error); ++#ifdef HAVE_SYSTEMD ++ ret = xfsm_systemd_can_hibernate (shutdown->systemd, can_hibernate, error); ++ *auth_hibernate = *can_hibernate; ++#else ++ ret = xfsm_upower_can_hibernate (shutdown->upower, can_hibernate, ++ auth_hibernate, error); ++#endif ++ ++ return ret; + } + + +diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c +index 7bdd39d..cfe7bf4 100644 +--- a/xfce4-session/xfsm-systemd.c ++++ b/xfce4-session/xfsm-systemd.c +@@ -33,8 +33,12 @@ + #define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" + #define SYSTEMD_REBOOT_ACTION "Reboot" + #define SYSTEMD_POWEROFF_ACTION "PowerOff" ++#define SYSTEMD_SUSPEND_ACTION "Suspend" ++#define SYSTEMD_HIBERNATE_ACTION "Hibernate" + #define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot" + #define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off" ++#define SYSTEMD_SUSPEND_TEST "org.freedesktop.login1.suspend" ++#define SYSTEMD_HIBERNATE_TEST "org.freedesktop.login1.hibernate" + + + +@@ -205,6 +209,28 @@ xfsm_systemd_try_shutdown (XfsmSystemd *systemd, + + + gboolean ++xfsm_systemd_try_suspend (XfsmSystemd *systemd, ++ GError **error) ++{ ++ return xfsm_systemd_try_method (systemd, ++ SYSTEMD_SUSPEND_ACTION, ++ error); ++} ++ ++ ++ ++gboolean ++xfsm_systemd_try_hibernate (XfsmSystemd *systemd, ++ GError **error) ++{ ++ return xfsm_systemd_try_method (systemd, ++ SYSTEMD_HIBERNATE_ACTION, ++ error); ++} ++ ++ ++ ++gboolean + xfsm_systemd_can_restart (XfsmSystemd *systemd, + gboolean *can_restart, + GError **error) +@@ -227,3 +253,29 @@ xfsm_systemd_can_shutdown (XfsmSystemd *systemd, + SYSTEMD_POWEROFF_TEST, + error); + } ++ ++ ++ ++gboolean ++xfsm_systemd_can_suspend (XfsmSystemd *systemd, ++ gboolean *can_suspend, ++ GError **error) ++{ ++ return xfsm_systemd_can_method (systemd, ++ can_suspend, ++ SYSTEMD_SUSPEND_TEST, ++ error); ++} ++ ++ ++ ++gboolean ++xfsm_systemd_can_hibernate (XfsmSystemd *systemd, ++ gboolean *can_hibernate, ++ GError **error) ++{ ++ return xfsm_systemd_can_method (systemd, ++ can_hibernate, ++ SYSTEMD_HIBERNATE_TEST, ++ error); ++} +diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h +index 8223622..6cf803f 100644 +--- a/xfce4-session/xfsm-systemd.h ++++ b/xfce4-session/xfsm-systemd.h +@@ -42,6 +42,12 @@ gboolean xfsm_systemd_try_restart (XfsmSystemd *systemd, + gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd, + GError **error); + ++gboolean xfsm_systemd_try_suspend (XfsmSystemd *systemd, ++ GError **error); ++ ++gboolean xfsm_systemd_try_hibernate (XfsmSystemd *systemd, ++ GError **error); ++ + gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd, + gboolean *can_restart, + GError **error); +@@ -50,6 +56,14 @@ gboolean xfsm_systemd_can_shutdown (XfsmSystemd *systemd, + gboolean *can_shutdown, + GError **error); + ++gboolean xfsm_systemd_can_suspend (XfsmSystemd *systemd, ++ gboolean *can_suspend, ++ GError **error); ++ ++gboolean xfsm_systemd_can_hibernate (XfsmSystemd *systemd, ++ gboolean *can_hibernate, ++ GError **error); ++ + G_END_DECLS + + #endif /* __XFSM_SYSTEMD_H__ */ +-- +1.8.1.5 + diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD index cf25f6713..548e94fab 100644 --- a/extra/xfig/PKGBUILD +++ b/extra/xfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184453 2013-05-06 19:40:21Z foutrelis $ +# $Id: PKGBUILD 194017 2013-09-10 00:31:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xfig -pkgver=3.2.5b -pkgrel=9 +pkgver=3.2.5c +pkgrel=1 pkgdesc="An interactive drawing tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfig.org/userman/" @@ -16,52 +16,48 @@ install=xfig.install source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \ xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \ xfig-3.2.5-urwfonts.patch \ - xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \ - xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \ - xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop) -sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' + LICENSE) +sha1sums=('47d31dd9ad46819732ab74db340e11489db2c646' '926ad99c7221baa4aa9e9737722958860b2700fc' - 'b7c03fb70066ff476a4039a8c0f8930c15edef68' + '45e7fb80193825b088d798089aeade2e1729c9ac' 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' - '39bec6bac9746b643b05fd1286826113ede07ff6' - 'bd76cd50be6a5789cfd6f182309cfd7056be04f3' - 'a1285f4e61ad2eec040460ab03e8022098e7f78e' - '12a64ddaf65a73e23ef74f31483515a0e262768c' - '83032eb61c8dc96d5fc509a1ce632528457d4598' - '31edf4cfab708820ea3f114d095dfef5aa88e5aa' - '9011b8fa6143e37525b28cc9800a3bf2d6b008d2') + '31edf4cfab708820ea3f114d095dfef5aa88e5aa') prepare() { cd ${pkgname}.${pkgver} patch -p1 < ../xfig-3.2.4-redhat.patch - patch -p1 < ../xfig-3.2.5-fhs.patch - patch -p1 < ../xfig.3.2.5-modularX.patch patch -p1 < ../xfig-3.2.5-color-resources.patch patch -p1 < ../xfig-3.2.5-urwfonts.patch - patch -p1 < ../xfig-3.2.5-missing-protos.patch - patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch - patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch + sed -i -e 's|X11R6/||' -e 's|image/x-xfig|image/fig;image/x-xfig|' xfig.desktop + echo -e "Categories=Application;Graphics;\nIcon=xfig" >> xfig.desktop sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile + sed -i 's/XCOMM USEINLINE/USEINLINE/' Imakefile + sed -i -e 's/XCOMM #define I18N/#define I18N/' \ + -e 's/XCOMM XAW_INTERN/XAW_INTERN/' Imakefile chmod 755 Libraries + groff -mandoc -Thtml Doc/xfig.man > Doc/xfig_man.html } build() { cd ${pkgname}.${pkgver} xmkmf - make DOCDIR=/usr/share/doc + make XFIGDOCDIR=/usr/share/doc/xfig LIBDIR=/usr/share \ + XAPPLOADDIR=/usr/share/X11/app-defaults } package() { cd ${pkgname}.${pkgver} - make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all - rm "${pkgdir}/usr/lib/X11/app-defaults" + + make DESTDIR="${pkgdir}" XFIGDOCDIR=/usr/share/doc/xfig LIBDIR=/usr/share \ + MANDIR=/usr/share/man/man1 XAPPLOADDIR=/usr/share/X11/app-defaults install.all + rm "${pkgdir}/usr/share/app-defaults" find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \; find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \; find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \; find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \; - install -D -m644 ../xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop" + install -D -m644 xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop" install -D -m644 xfig.png "${pkgdir}/usr/share/pixmaps/xfig.png" install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/xfig/xfig-3.2.5-color-resources.patch b/extra/xfig/xfig-3.2.5-color-resources.patch index 6cf1af906..4a716b541 100644 --- a/extra/xfig/xfig-3.2.5-color-resources.patch +++ b/extra/xfig/xfig-3.2.5-color-resources.patch @@ -1,39 +1,39 @@ diff -up xfig.3.2.5/Fig-color.bisque.ad~ xfig.3.2.5/Fig-color.bisque.ad --- xfig.3.2.5/Fig-color.bisque.ad~ 2007-11-16 13:47:45.000000000 +0100 +++ xfig.3.2.5/Fig-color.bisque.ad 2007-11-16 13:47:52.000000000 +0100 -@@ -93,7 +93,7 @@ Fig*sideruler.background: gray95 - Fig*topruler.background: gray95 - Fig*sideruler.background: gray95 - Fig*List*background: gray95 --Fig*Scrollbar.background: gray95 -+! Fig*Scrollbar.background: gray95 - - Fig*cancel.background: navajowhite1 - Fig*dismiss.background: navajowhite1 +@@ -72,7 +72,7 @@ + Fig*topruler.background: gray95
+ Fig*sideruler.background: gray95
+ Fig*List*background: gray95
+-Fig*Scrollbar.background: gray95
++! Fig*Scrollbar.background: gray95
+
+ Fig*cancel.background: navajowhite1
+ Fig*dismiss.background: navajowhite1
@@ -104,8 +104,8 @@ Fig*menu_divider.foreground: red - Fig*menu_divider.foreground: red - - !##### Shadows --Fig*shadowWidth: 2 --Fig*Label.shadowWidth: 1 -+! Fig*shadowWidth: 2 -+! Fig*Label.shadowWidth: 1 - Fig*horizontal.shadowWidth: 2 - Fig*Scrollbar.shadowWidth: 2 - ! no shadows for update indicators + Fig*menu_divider.foreground: red
+
+ !##### Shadows
+-Fig*shadowWidth: 2
+-Fig*Label.shadowWidth: 1
++! Fig*shadowWidth: 2
++! Fig*Label.shadowWidth: 1
+ Fig*horizontal.shadowWidth: 2
+ Fig*Scrollbar.shadowWidth: 2
+ ! no shadows for update indicators
@@ -136,3 +136,15 @@ Fig*color_box*topShadowPixel: gray80 - - Fig*toggle*bottomShadowPixel: gray80 - Fig*toggle*topShadowPixel: gray50 -+ -+! repare damage done to scrollbar shadows non color resources file -+ -+Fig*horizontal.topShadowPixel: gray95 -+Fig*horizontal.bottomShadowPixel: gray50 -+Fig*horizontal.topShadow: gray95 -+Fig*horizontal.bottomShadow: gray50 -+ -+Fig*Scrollbar.topShadow: gray95 -+Fig*Scrollbar.bottomShadow: gray50 -+Fig*Scrollbar.topShadowPixel: gray95 -+Fig*Scrollbar.bottomShadowPixel: gray50 +
+ Fig*toggle*bottomShadowPixel: gray80
+ Fig*toggle*topShadowPixel: gray50
++
++! repare damage done to scrollbar shadows non color resources file
++
++Fig*horizontal.topShadowPixel: gray95
++Fig*horizontal.bottomShadowPixel: gray50
++Fig*horizontal.topShadow: gray95
++Fig*horizontal.bottomShadow: gray50
++
++Fig*Scrollbar.topShadow: gray95
++Fig*Scrollbar.bottomShadow: gray50
++Fig*Scrollbar.topShadowPixel: gray95
++Fig*Scrollbar.bottomShadowPixel: gray50
diff --git a/extra/xfig/xfig-3.2.5-fhs.patch b/extra/xfig/xfig-3.2.5-fhs.patch deleted file mode 100644 index a17d908a7..000000000 --- a/extra/xfig/xfig-3.2.5-fhs.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xfig.3.2.5/Imakefile.fhs 2006-10-11 01:19:22.000000000 +0200 -+++ xfig.3.2.5/Imakefile 2007-04-16 14:04:45.000000000 +0200 -@@ -169,8 +169,7 @@ - XFIGLIBDIR = $(LIBDIR)/xfig - - XCOMM XFIGDOCDIR tells where the html and pdf documentation should go --XCOMM XFIGDOCDIR = $(DOCDIR)/xfig --XFIGDOCDIR = /usr/local/xfig/doc -+XFIGDOCDIR = $(DOCDIR)/xfig - - XCOMM MANDIR tells where the standard man pages should go (no need to change it - XCOMM if you want the man pages installed in the standard place on your system diff --git a/extra/xfig/xfig-3.2.5-missing-protos.patch b/extra/xfig/xfig-3.2.5-missing-protos.patch deleted file mode 100644 index 181c52a69..000000000 --- a/extra/xfig/xfig-3.2.5-missing-protos.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up xfig.3.2.5/u_draw.c~ xfig.3.2.5/u_draw.c ---- xfig.3.2.5/u_draw.c~ 2008-04-03 15:58:23.000000000 +0200 -+++ xfig.3.2.5/u_draw.c 2008-04-03 15:58:23.000000000 +0200 -@@ -43,6 +43,7 @@ - #include "w_zoom.h" - #include "u_redraw.h" - #include "w_cursor.h" -+#include <X11/ImUtil.h> - - static Boolean add_point(int x, int y); - static void init_point_array(void); diff --git a/extra/xfig/xfig-3.2.5b-fix-eps-reading.patch b/extra/xfig/xfig-3.2.5b-fix-eps-reading.patch deleted file mode 100644 index 7601d20ea..000000000 --- a/extra/xfig/xfig-3.2.5b-fix-eps-reading.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c ---- xfig.3.2.5b/f_readeps.c 2009-03-30 17:52:18.000000000 +0200 -+++ xfig.3.2.5b.new/f_readeps.c 2010-11-25 16:53:54.328247928 +0100 -@@ -252,12 +252,13 @@ - { - char buf[300]; - FILE *tmpfp, *pixfile, *gsfile; -- char *psnam, *driver; -+ char *driver; - int status, wid, ht, nbitmap, fd; - char tmpfile[PATH_MAX], - pixnam[PATH_MAX], - errnam[PATH_MAX], -- gscom[2 * PATH_MAX]; -+ gscom[2 * PATH_MAX], -+ psnam[PATH_MAX]; - - wid = urx - llx; - ht = ury - lly; -@@ -307,19 +308,14 @@ - /* for color, use pcx */ - driver = "pcx256"; - } -- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */ -- if (tmpfile[0] == '/') { -- psnam = strrchr(tmpfile, '/'); -- *psnam = 0; -- sprintf(gscom, "cd \"%s/\";", tmpfile); -- *psnam++ = '/'; /* Restore name for unlink() below */ -- } else { -- psnam = tmpfile; -- gscom[0] = '\0'; -+ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */ -+ if (!realpath(tmpfile, psnam)) { -+ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno)); -+ return False; - } -- sprintf(&gscom[strlen(gscom)], -- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1", -- appres.ghostscript, driver, wid, ht, pixnam, errnam); -+ sprintf(gscom, -+ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1", -+ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam); - if (appres.DEBUG) - fprintf(stderr,"calling: %s\n",gscom); - if ((gsfile = popen(gscom, "w")) == 0) { diff --git a/extra/xfig/xfig-3.2.5b-libpng-1.5.patch b/extra/xfig/xfig-3.2.5b-libpng-1.5.patch deleted file mode 100644 index 7d9c3f15e..000000000 --- a/extra/xfig/xfig-3.2.5b-libpng-1.5.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: xfig.3.2.5b/f_readpng.c -=================================================================== ---- xfig.3.2.5b.orig/f_readpng.c -+++ xfig.3.2.5b/f_readpng.c -@@ -73,7 +73,7 @@ read_png(FILE *file, int filetype, F_pic - } - - /* set long jump recovery here */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* if we get here there was a problem reading the file */ - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - close_picfile(file,filetype); -@@ -90,15 +90,17 @@ read_png(FILE *file, int filetype, F_pic - png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, - &interlace_type, &compression_type, &filter_type); - -- if (info_ptr->valid & PNG_INFO_gAMA) -- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); -- else -- png_set_gamma(png_ptr, 2.2, 0.45); -+ png_fixed_point gamma = 0.45; -+ png_get_gAMA_fixed(png_ptr,info_ptr,&gamma); -+ png_set_gamma(png_ptr, 2.2, gamma); - -- if (info_ptr->valid & PNG_INFO_bKGD) -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { - /* set the background to the one supplied */ -- png_set_background(png_ptr, &info_ptr->background, -+ png_color_16p background; -+ png_get_bKGD(png_ptr,info_ptr,&background); -+ png_set_background(png_ptr, background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); -+ } - else { - /* blend the canvas background using the alpha channel */ - background.red = x_bg_color.red >> 8; -@@ -136,7 +138,11 @@ read_png(FILE *file, int filetype, F_pic - - if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { - png_get_hIST(png_ptr, info_ptr, &histogram); -+#if PNG_LIBPNG_VER_MAJOR <= 1 && PNG_LIBPNG_VER_MINOR < 5 - png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0); -+#else -+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0); -+#endif - } - } - if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { -Index: xfig.3.2.5b/f_wrpng.c -=================================================================== ---- xfig.3.2.5b.orig/f_wrpng.c -+++ xfig.3.2.5b/f_wrpng.c -@@ -20,6 +20,7 @@ - #include "w_msgpanel.h" - #include "w_setup.h" - #include <png.h> -+#include <zlib.h> - - /* - * Write PNG file from rgb data -@@ -59,7 +60,7 @@ write_png(FILE *file, unsigned char *dat - } - - /* set long jump recovery here */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* if we get here there was a problem reading the file */ - png_destroy_write_struct(&png_ptr, &info_ptr); - return False; diff --git a/extra/xfig/xfig.3.2.5-modularX.patch b/extra/xfig/xfig.3.2.5-modularX.patch deleted file mode 100644 index 3b5ac5937..000000000 --- a/extra/xfig/xfig.3.2.5-modularX.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- xfig.3.2.5/Imakefile.modularX 2007-04-16 14:27:49.000000000 +0200 -+++ xfig.3.2.5/Imakefile 2007-04-16 14:29:18.000000000 +0200 -@@ -45,7 +45,7 @@ - XCOMM different tree than the "correct" tree that your X system expects. The usual - XCOMM purpose of DESTDIR is to test an install process by installing in a benign area. - --XCOMM XAPPLOADDIR = /home/user/xfig -+XAPPLOADDIR = /usr/share/X11/app-defaults - - XCOMM Uncomment the following definition for XAW3D if you want to use - XCOMM the 3d Athena Widget Set (highly recommended!) -@@ -166,12 +166,12 @@ - XCOMM XFIGLIBDIR = $(LIBDIR) - - XCOMM use this if you want the multi-key data base file in the standard X11 tree --XFIGLIBDIR = $(LIBDIR)/xfig -+XFIGLIBDIR = /usr/share/xfig - - XCOMM XFIGDOCDIR tells where the html and pdf documentation should go - XFIGDOCDIR = $(DOCDIR)/xfig - - XCOMM MANDIR tells where the standard man pages should go (no need to change it - XCOMM if you want the man pages installed in the standard place on your system --MANDIR = $(MANSOURCEPATH)$(MANSUFFIX) -+MANDIR = /usr/share/man/man1 - XCOMM MANDIR = /usr/local/xfig/man - - XCOMM If your system doesn't have strstr undefine the following definition diff --git a/extra/xfig/xfig.desktop b/extra/xfig/xfig.desktop deleted file mode 100644 index c634a28e9..000000000 --- a/extra/xfig/xfig.desktop +++ /dev/null @@ -1,47 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Categories=Application;Graphics; -MimeType=image/fig;image/x-xfig; -Exec=xfig -Icon=xfig -Type=Application -Name=Xfig -Name[eo]=XDesegno -Name[et]=Ffig -Name[ja]=xfig -Name[no]=X-figur -Comment=Xfig drawing application -Comment[bg]=Xfig ïðîãðàìà çà ðèñóâàíå -Comment[ca]=Aplicació de dibuix Xfig -Comment[cs]=Aplikace pro kreslení vektorových obrázků -Comment[da]=Xfig tegneprogram -Comment[de]=Xfig-Zeichenprogramm -Comment[el]=Xfig -Comment[eo]=Desegnilo "Xfig" -Comment[es]=Aplicación de diseño vectorial (objetos) -Comment[et]=XFig joonistusprogramm -Comment[fi]=Xfig vektoripiirto-ohjelma -Comment[fr]=Programme de dessin objet Xfig -Comment[gl]=Aplicación de debuxo (obxectos) -Comment[he]=Xfig רויצה םושיי -Comment[hr]=Program za crtanje -Comment[hu]=Rajzolóprogram -Comment[is]=Hlutbundið teikniforrit -Comment[it]=Applicazione di disegno Xfig -Comment[lt]=Xfig braižymo programa -Comment[mk]=Едноставна апликација за векторско цртање -Comment[nl]=Xfig-tekenprogramma -Comment[no]=Xfig-tegneprogram -Comment[no_NY]=Teikneprogrammet Xfig -Comment[pl]=Aplikacja do kreślenia -Comment[pt]=Aplicação de desenho -Comment[ro]=Program de desenare vectorială -Comment[ru]=Приложения для рисования векторной графики -Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov -Comment[sl]=Program za risanje Xfig -Comment[sr]=Xfig prgram za vektorsko crtanje -Comment[sv]=Xfig ritprogram -Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î -Comment[tr]=Xfig çizim uygulaması -Comment[uk]=Xfig -Comment[zh_CN.GB2312]=Xfig 绘图应用程序 diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 0113942b9..06d6f5e50 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193690 2013-08-28 00:06:11Z eric $ +# $Id: PKGBUILD 195056 2013-09-24 20:09:11Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib -pkgver=1.2.3 -pkgrel=4 +pkgver=1.2.4 +pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" @@ -28,16 +28,12 @@ optdepends+=('wavpack: for using the wavpack plugin' \ 'libmpcdec: for using the musepack plugin' \ 'libcaca: for using the caca plugin' \ 'libbluray: for using the bluray plugin' \ - 'gnome-vfs: for using the gnome-vfs plugin') + 'gnome-vfs: for using the gnome-vfs plugin' + 'smbclient: for using the samba plugin') [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h) -sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57' - '08ed9947ef919c71c87151baa8fc0ce7d8f72050') - -prepare() { - cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/ -} +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) +sha1sums=('32267c5fcaa1439a5fbf7606d27dc4fafba9e504') build() { cd ${pkgname}-${pkgver} diff --git a/extra/xine-lib/accel_vaapi.h b/extra/xine-lib/accel_vaapi.h deleted file mode 100644 index 666b23fd6..000000000 --- a/extra/xine-lib/accel_vaapi.h +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright (C) 2008 the xine project - * - * This file is part of xine, a free video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - * Common acceleration definitions for vdpau - * - * - */ - -#ifndef HAVE_XINE_ACCEL_VAAPI_H -#define HAVE_XINE_ACCEL_VAAPI_H - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <va/va_x11.h> -#include <pthread.h> -#ifdef HAVE_FFMPEG_AVUTIL_H -# include <avcodec.h> -#else -# include <libavcodec/avcodec.h> -#endif - -#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -# define AVVIDEO 2 -#else -# define AVVIDEO 1 -# define pp_context pp_context_t -# define pp_mode pp_mode_t -#endif - -#define NUM_OUTPUT_SURFACES 22 - -#define SURFACE_FREE 0 -#define SURFACE_ALOC 1 -#define SURFACE_RELEASE 2 -#define SURFACE_RENDER 3 -#define SURFACE_RENDER_RELEASE 5 - -struct vaapi_equalizer { - VADisplayAttribute brightness; - VADisplayAttribute contrast; - VADisplayAttribute hue; - VADisplayAttribute saturation; -}; - -typedef struct ff_vaapi_context_s ff_vaapi_context_t; - -struct ff_vaapi_context_s { - VADisplay va_display; - VAContextID va_context_id; - VAConfigID va_config_id; - int width; - int height; - int sw_width; - int sw_height; - int va_profile; - unsigned int va_colorspace; - VAImage va_subpic_image; - VASubpictureID va_subpic_id; - int va_subpic_width; - int va_subpic_height; - int is_bound; - void *gl_surface; - unsigned int soft_head; - unsigned int valid_context; - unsigned int va_head; - unsigned int va_soft_head; - vo_driver_t *driver; - unsigned int last_sub_image_fmt; - VASurfaceID last_sub_surface_id; - struct vaapi_equalizer va_equalizer; - VAImageFormat *va_image_formats; - int va_num_image_formats; - VAImageFormat *va_subpic_formats; - int va_num_subpic_formats; -}; - -typedef struct ff_vaapi_surface_s ff_vaapi_surface_t; -typedef struct vaapi_accel_s vaapi_accel_t; - -struct ff_vaapi_surface_s { - unsigned int index; - vaapi_accel_t *accel; - VASurfaceID va_surface_id; - unsigned int status; -}; - -struct vaapi_accel_s { - unsigned int index; - vo_frame_t *vo_frame; - -#if AVVIDEO > 1 - int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, - int *got_picture_ptr, AVPacket *avpkt); -#else - int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, - int *got_picture_ptr, uint8_t *buf, int buf_size); -#endif - VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender); - int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec); - ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen); - int (*guarded_render)(vo_frame_t *frame_gen); - ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen); - void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); - void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); -}; - -#ifdef __cplusplus -} -#endif - -#endif - diff --git a/extra/xorg-luit/PKGBUILD b/extra/xorg-luit/PKGBUILD index 747a4630f..a60f4dc4c 100644 --- a/extra/xorg-luit/PKGBUILD +++ b/extra/xorg-luit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154146 2012-03-23 17:27:51Z andyrtr $ +# $Id: PKGBUILD 194394 2013-09-15 18:16:48Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-luit pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Filter that can be run between an arbitrary application and a UTF-8 terminal emulator" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,11 +11,15 @@ license=('custom') depends=('libfontenc') groups=('xorg' 'xorg-apps') makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2) -sha1sums=('3130c14d7267cecce0ba2280643844b48cca49b0') +source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2 + git_fixes.diff) +sha256sums=('30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636' + 'aa5d83b8cc772e135e57ae0f0d2b7662b51981f4a120a136a7b201c254b23327') build() { - cd "${srcdir}/luit-${pkgver}" + cd luit-${pkgver} + patch -Np1 -i $srcdir/git_fixes.diff + autoreconf -vfi ./configure --prefix=/usr make } diff --git a/extra/xorg-luit/git_fixes.diff b/extra/xorg-luit/git_fixes.diff new file mode 100644 index 000000000..928caca0f --- /dev/null +++ b/extra/xorg-luit/git_fixes.diff @@ -0,0 +1,254 @@ +From 473959141641b6779e6ff3c3c5b6ef326073bcd4 Mon Sep 17 00:00:00 2001 +From: Mike FABIAN <mfabian@redhat.com> +Date: Tue, 07 Jun 2011 11:42:00 +0000 +Subject: Set up terminal before fork. + +After the fork it is undefined wether parent or child runs +first. So there can be a race: if the child runs before the +terminal of the parent is set up correctly luit may hang. +This patch sets up the terminal before forking and undoes +the settings in the child. + +Signed-off-by: Mike FABIAN <mfabian@redhat.com> +Signed-off-by: Egbert Eich <eich@freedesktop.org> +--- +diff --git a/luit.c b/luit.c +index 0ece7b6..5cb3b8f 100644 +--- a/luit.c ++++ b/luit.c +@@ -577,6 +577,8 @@ condom(int argc, char **argv) + IGNORE_RC(pipe(c2p_waitpipe)); + } + ++ setup_io(pty); ++ + pid = fork(); + if (pid < 0) { + perror("Couldn't fork"); +@@ -584,6 +586,10 @@ condom(int argc, char **argv) + } + + if (pid == 0) { ++#ifdef SIGWINCH ++ installHandler(SIGWINCH, SIG_DFL); ++#endif ++ installHandler(SIGCHLD, SIG_DFL); + close(pty); + if (pipe_option) { + close_waitpipe(1); +@@ -661,7 +667,6 @@ parent(int pid GCC_UNUSED, int pty) + if (verbose) { + reportIso2022(outputState); + } +- setup_io(pty); + + if (pipe_option) { + write_waitpipe(p2c_waitpipe); +-- +cgit v0.9.0.2-2-gbebe + +From 09f4907e4ab4ba3654de829bf3ac2a4a02bb9ef4 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat, 22 Jun 2013 04:11:43 +0000 +Subject: Fix GCC_UNUSED definition to actually work with -Wunused-parameter + +Silences warnings of: +charset.c: In function ‘IdentityRecode’: +charset.c:42:51: warning: unused parameter ‘self’ [-Wunused-parameter] +charset.c: In function ‘NullReverse’: +charset.c:84:26: warning: unused parameter ‘n’ [-Wunused-parameter] +charset.c:84:59: warning: unused parameter ‘self’ [-Wunused-parameter] +other.c: In function ‘mapping_utf8’: +other.c:108:44: warning: unused parameter ‘s’ [-Wunused-parameter] +other.c: In function ‘reverse_utf8’: +other.c:114:44: warning: unused parameter ‘s’ [-Wunused-parameter] +luit.c: In function ‘sigwinchHandler’: +luit.c:463:21: warning: unused parameter ‘sig’ [-Wunused-parameter] +luit.c: In function ‘sigchldHandler’: +luit.c:470:20: warning: unused parameter ‘sig’ [-Wunused-parameter] +luit.c: In function ‘parent’: +luit.c:657:12: warning: unused parameter ‘pid’ [-Wunused-parameter] + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +--- +diff --git a/other.h b/other.h +index 9d814a3..d18b586 100644 +--- a/other.h ++++ b/other.h +@@ -26,7 +26,11 @@ THE SOFTWARE. + #include "config.h" /* include this, for self-contained headers */ + + #ifndef GCC_UNUSED +-#define GCC_UNUSED /* ARGSUSED */ ++# if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205) ++# define GCC_UNUSED __attribute__((__unused__)) ++# else ++# define GCC_UNUSED /* ARGSUSED */ ++# endif + #endif + + #include <X11/fonts/fontenc.h> +-- +cgit v0.9.0.2-2-gbebe + +From 445863f8b5059692ac7a4df785af6920849faa82 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat, 13 Jul 2013 16:08:34 +0000 +Subject: config: Add missing AC_CONFIG_SRCDIR + +Regroup AC statements under the Autoconf initialization section. +Regroup AM statements under the Automake initialization section. + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Julien Cristau <jcristau@debian.org> +Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> +--- +diff --git a/configure.ac b/configure.ac +index c214d85..946db23 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,9 +20,14 @@ dnl PERFORMANCE OF THIS SOFTWARE. + dnl + dnl Process this file with autoconf to create configure. + ++# Initialize Autoconf + AC_PREREQ([2.60]) + AC_INIT([luit], [1.1.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [luit]) ++AC_CONFIG_SRCDIR([Makefile.am]) ++AC_CONFIG_HEADERS([config.h]) ++ ++# Initialize Automake + AM_INIT_AUTOMAKE([foreign dist-bzip2]) + AM_MAINTAINER_MODE + +@@ -32,8 +37,6 @@ m4_ifndef([XORG_MACROS_VERSION], + XORG_MACROS_VERSION(1.8) + XORG_DEFAULT_OPTIONS + +-AC_CONFIG_HEADERS([config.h]) +- + AC_CANONICAL_HOST + + +-- +cgit v0.9.0.2-2-gbebe + +From 800f55f8dcd195dd0cdfc1c4d7487d00bb7745f4 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat, 13 Jul 2013 16:11:20 +0000 +Subject: Replace hardcoded _XOPEN_SOURCE=500 with AC_USE_SYSTEM_EXTENSIONS + +-D_XOPEN_SOURCE was originally added for Linux in commit e751086392e837 +and then updated to -D_XOPEN_SOURCE=500 in commit e1a002217cabdb to +expose strdup() in glibc headers. + +As noted in bug 47792 though, the posix_openpt() function is not +visible unless that's raised to 600. + +Instead of continually chasing the standards ourselves, switch to letting +autoconf handle that for us. + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Julien Cristau <jcristau@debian.org> +Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> +--- +diff --git a/Makefile.am b/Makefile.am +index 8069670..ef042e3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -25,7 +25,6 @@ bin_PROGRAMS = luit + AM_CFLAGS = \ + $(CWARNFLAGS) \ + $(LUIT_CFLAGS) \ +- $(OS_CFLAGS) \ + -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\" + + luit_LDADD = $(LUIT_LIBS) +diff --git a/configure.ac b/configure.ac +index 946db23..0ec4664 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -26,6 +26,7 @@ AC_INIT([luit], [1.1.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [luit]) + AC_CONFIG_SRCDIR([Makefile.am]) + AC_CONFIG_HEADERS([config.h]) ++AC_USE_SYSTEM_EXTENSIONS + + # Initialize Automake + AM_INIT_AUTOMAKE([foreign dist-bzip2]) +@@ -37,9 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION], + XORG_MACROS_VERSION(1.8) + XORG_DEFAULT_OPTIONS + +-AC_CANONICAL_HOST +- +- + AC_CHECK_HEADERS([pty.h stropts.h sys/param.h sys/select.h]) + AC_CHECK_FUNCS([select grantpt posix_openpt]) + +@@ -57,23 +55,16 @@ PKG_CHECK_MODULES(LUIT, fontenc) + PKG_CHECK_EXISTS(x11, [], + [AC_MSG_WARN([libX11 not found. luit may not be able to find locale aliases without it.])]) + ++AC_CANONICAL_HOST + case $host_os in + # darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard) + darwin*) +- OS_CFLAGS= +- ;; +- linux*) +- AC_CHECK_HEADERS([poll.h]) +- AC_CHECK_FUNCS([poll]) +- OS_CFLAGS="-D_XOPEN_SOURCE=500" + ;; + *) + AC_CHECK_HEADERS([poll.h]) + AC_CHECK_FUNCS([poll]) +- OS_CFLAGS= + ;; + esac +-AC_SUBST(OS_CFLAGS) + + AC_CHECK_HEADERS([pty.h stropts.h sys/ioctl.h sys/param.h sys/poll.h sys/select.h sys/time.h termios.h]) + AC_CHECK_FUNCS([grantpt putenv select strdup]) +-- +cgit v0.9.0.2-2-gbebe + +From e1f495359a74342352c4d6641c0002c7c79327ba Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sat, 13 Jul 2013 16:15:16 +0000 +Subject: Merge overlapping AC_CHECK_HEADERS & AC_CHECK_FUNCS calls into one set + +Duplication introduced when merging in changes in commit fddfe30c3ff91c + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Julien Cristau <jcristau@debian.org> +Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> +--- +diff --git a/configure.ac b/configure.ac +index 0ec4664..1c6f2c9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,9 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION], + XORG_MACROS_VERSION(1.8) + XORG_DEFAULT_OPTIONS + +-AC_CHECK_HEADERS([pty.h stropts.h sys/param.h sys/select.h]) +-AC_CHECK_FUNCS([select grantpt posix_openpt]) +- + AC_ARG_WITH(localealiasfile, + AS_HELP_STRING([--with-localealiasfile=<path>], + [The locale alias file (default: ${datadir}/X11/locale/locale.alias)]), +@@ -67,7 +64,7 @@ case $host_os in + esac + + AC_CHECK_HEADERS([pty.h stropts.h sys/ioctl.h sys/param.h sys/poll.h sys/select.h sys/time.h termios.h]) +-AC_CHECK_FUNCS([grantpt putenv select strdup]) ++AC_CHECK_FUNCS([grantpt posix_openpt putenv select strdup]) + + if test "x$ac_cv_func_grantpt" != "xyes" ; then + AC_CHECK_LIB(util, openpty, [cf_have_openpty=yes],[cf_have_openpty=no]) +-- +cgit v0.9.0.2-2-gbebe + diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 3a5d78c56..8063d37e2 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189247 2013-07-01 10:57:37Z jgc $ +# $Id: PKGBUILD 194374 2013-09-15 07:40:13Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.14.2 -pkgrel=2 +pkgver=1.14.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -25,7 +25,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 10-quirks.conf loongson.patch fb-rename-wfbDestroyGlyphCache.patch) -sha256sums=('f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b' +sha256sums=('02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' @@ -49,7 +49,7 @@ prepare() { patch -Np1 -i "${srcdir}/loongson.patch" # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo - patch -Np1 -i ../bug59825.patch +# patch -Np1 -i ../bug59825.patch # From Fedora. Do not build acpid code, it is buggy and we do not need it patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch diff --git a/extra/xorg-twm/PKGBUILD b/extra/xorg-twm/PKGBUILD index a89787cf8..210a1ee7e 100644 --- a/extra/xorg-twm/PKGBUILD +++ b/extra/xorg-twm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134274 2011-08-02 18:36:40Z jgc $ +# $Id: PKGBUILD 193939 2013-09-07 07:11:31Z lcarlier $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xorg-twm -pkgver=1.0.7 -pkgrel=1.2 +pkgver=1.0.8 +pkgrel=1 pkgdesc="Tab Window Manager for the X Window System" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,7 +13,7 @@ license=('custom') depends=('libxmu') makedepends=('xorg-util-macros') source=(${url}/releases/individual/app/twm-${pkgver}.tar.bz2) -sha256sums=('0f5d53dec62540fa97c96b4e983695cc32114836d256b64885253ab58b5bcd44') +sha256sums=('7660352353d632127ff50390991706aa660b28a4ada816c2582ac02720722e44') build() { cd "${srcdir}/twm-${pkgver}" diff --git a/extra/xorg-xclipboard/PKGBUILD b/extra/xorg-xclipboard/PKGBUILD index 093273851..1cfa339ed 100644 --- a/extra/xorg-xclipboard/PKGBUILD +++ b/extra/xorg-xclipboard/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149838 2012-02-11 10:11:10Z andyrtr $ +# $Id: PKGBUILD 193937 2013-09-07 07:08:34Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xclipboard -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X clipboard manager" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xclipboard-${pkgver}.tar.bz2) -sha1sums=('8dc77e1234c1c2853805124536676a4d5f7c7a3b') +sha256sums=('9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5') build() { cd "${srcdir}/xclipboard-${pkgver}" diff --git a/extra/xorg-xclock/PKGBUILD b/extra/xorg-xclock/PKGBUILD index 282ea3614..1b9eda13b 100644 --- a/extra/xorg-xclock/PKGBUILD +++ b/extra/xorg-xclock/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149840 2012-02-11 10:13:13Z andyrtr $ +# $Id: PKGBUILD 194300 2013-09-13 07:29:54Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xclock -pkgver=1.0.6 -pkgrel=1.2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="X clock" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libx11' 'libxmu' 'libxaw' 'libxrender' 'libxft' 'libxkbfile') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xclock-${pkgver}.tar.bz2) -sha1sums=('993817c9e3cc2baaaebe52b29fa2ad26e58b124d') +sha256sums=('23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0') build() { cd "${srcdir}/xclock-${pkgver}" diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD index 725a605ff..d3874cfe0 100644 --- a/extra/xorg-xinit/PKGBUILD +++ b/extra/xorg-xinit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170012 2012-10-31 00:12:04Z thomas $ +# $Id: PKGBUILD 194377 2013-09-15 08:07:59Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xorg-xinit -pkgver=1.3.2 -pkgrel=3 +pkgver=1.3.3 +pkgrel=1 pkgdesc="X.Org initialisation program " arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -23,15 +23,15 @@ source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 xsession xserverrc) options=(!emptydirs) -md5sums=('9c0943cbd83e489ad1b05221b97efd44' - 'abd072ec435ce084cf4e89c58f83d45c' - '73a597d3fb7f5b9487318ac8cfd4bedf' - 'c7b406c3c5c1e8011b3ac7d6b29c1a2c' - '7873d97db30d6c279ed37e3559e7c59d' - '4deba1b7f2cc7f93b304b956023e65d6') +sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af' + 'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb' + '431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b' + '38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc' + '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898' + '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f') build() { - cd "${srcdir}/xinit-${pkgver}" + cd xinit-${pkgver} patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff" patch -Np1 -i "${srcdir}/fs25361.patch" sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp @@ -40,7 +40,7 @@ build() { } package() { - cd "${srcdir}/xinit-${pkgver}" + cd xinit-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/skel" diff --git a/extra/xorg-xinput/PKGBUILD b/extra/xorg-xinput/PKGBUILD index 73f274258..fc8e6d320 100644 --- a/extra/xorg-xinput/PKGBUILD +++ b/extra/xorg-xinput/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 159187 2012-05-17 13:48:28Z andyrtr $ +# $Id: PKGBUILD 194484 2013-09-16 19:13:37Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xinput -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="Small commandline tool to configure devices" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'libxi>=1.5.99.2' 'xorg-xrandr' 'libxinerama') -makedepends=('xorg-util-macros' 'inputproto') +makedepends=('xorg-util-macros' 'inputproto' 'libxfixes') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xinput-${pkgver}.tar.bz2) -sha256sums=('4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e') +sha256sums=('b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f') build() { cd "${srcdir}/xinput-${pkgver}" diff --git a/extra/xorg-xkill/PKGBUILD b/extra/xorg-xkill/PKGBUILD index eb9bb6dd3..3b5541f10 100644 --- a/extra/xorg-xkill/PKGBUILD +++ b/extra/xorg-xkill/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151025 2012-02-24 13:37:13Z allan $ +# $Id: PKGBUILD 194304 2013-09-13 07:50:17Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xkill -pkgver=1.0.3 -pkgrel=3.1 +pkgver=1.0.4 +pkgrel=1 pkgdesc="Kill a client by its X resource" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11' 'libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xkill-${pkgver}.tar.bz2) -sha1sums=('bab7b9c7f3bc053d743eb339cf5fa496bace57e5') +sha256sums=('88ef2a304f32f24b255e879f03c1dcd3a2be3e71d5562205414f267d919f812e') build() { cd "${srcdir}/xkill-${pkgver}" diff --git a/extra/xorg-xlsclients/PKGBUILD b/extra/xorg-xlsclients/PKGBUILD index fb1aa27fa..5701a8336 100644 --- a/extra/xorg-xlsclients/PKGBUILD +++ b/extra/xorg-xlsclients/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151015 2012-02-24 13:22:35Z allan $ +# $Id: PKGBUILD 194306 2013-09-13 07:52:28Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xlsclients -pkgver=1.1.2 -pkgrel=2.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="List client applications running on a display" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxcb') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xlsclients-${pkgver}.tar.bz2) -sha1sums=('c4051429c190444ae9ba327f0ad776a74eb7b27b') +sha256sums=('5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d') build() { cd "${srcdir}/xlsclients-${pkgver}" diff --git a/extra/xorg-xman/PKGBUILD b/extra/xorg-xman/PKGBUILD index 954df4957..6eef4f51c 100644 --- a/extra/xorg-xman/PKGBUILD +++ b/extra/xorg-xman/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xman -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="Unix manual page viewer" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'libxt') makedepends=('xorg-util-macros' 'xproto' 'libxmu') source=(http://xorg.freedesktop.org/archive/individual/app/xman-${pkgver}.tar.bz2) -sha1sums=('ba10cf0b2d0c2b40ded93e892c69e7bd4586ad1e') +sha256sums=('405211b606a7fa420029897f099dc107791bb4c29bc88481c6efac9c4590bb1a') build() { cd "${srcdir}/xman-${pkgver}" diff --git a/extra/xorg-xmodmap/PKGBUILD b/extra/xorg-xmodmap/PKGBUILD index ac04185ec..85a3f3aef 100644 --- a/extra/xorg-xmodmap/PKGBUILD +++ b/extra/xorg-xmodmap/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156637 2012-04-21 23:46:44Z andyrtr $ +# $Id: PKGBUILD 194308 2013-09-13 07:54:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xmodmap -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="Utility for modifying keymaps and button mappings" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xmodmap-${pkgver}.tar.bz2) -sha1sums=('9f9c6b7bd058c09a8e15b1c4f4eccb972e51ffef') +sha256sums=('efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3') build() { cd "${srcdir}/xmodmap-${pkgver}" diff --git a/extra/xorg-xrdb/PKGBUILD b/extra/xorg-xrdb/PKGBUILD index 51561293c..d3f422b92 100644 --- a/extra/xorg-xrdb/PKGBUILD +++ b/extra/xorg-xrdb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151003 2012-02-24 13:05:19Z allan $ +# $Id: PKGBUILD 194310 2013-09-13 07:56:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xrdb -pkgver=1.0.9 -pkgrel=2.1 +pkgver=1.1.0 +pkgrel=1 pkgdesc="X server resource database utility" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11' 'libxmu' 'mcpp') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xrdb-${pkgver}.tar.bz2) -sha1sums=('efa5f2420411988d6a6e142934393fd272507857') +sha256sums=('73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b') build() { cd "${srcdir}/xrdb-${pkgver}" diff --git a/extra/xpdf/PKGBUILD b/extra/xpdf/PKGBUILD deleted file mode 100644 index efd7710a0..000000000 --- a/extra/xpdf/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 177029 2013-02-04 13:10:00Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=xpdf -#pkgver=3.03_pl1 -pkgver=3.03 -pkgrel=3 -pkgdesc='Viewer for Portable Document Format (PDF) files' -url='http://www.foolabs.com/xpdf/' -license=('GPL2') -arch=('i686' 'x86_64' 'mips64el') -depends=('lesstif' 'gsfonts' 'libxt') -optdepends=('poppler: tools that used to be included in xpdf' - 'desktop-file-utils: for desktop environments') -# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch" -source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz" - 'char.patch' - 'desktop') -sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248' - '5c471944685a6b24a2b0c0e000562d1a3263aeeb' - '17ebbfe457cb92e97b12b7362e8ce961526012d9') - -install=install -backup=('etc/xpdfrc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" - -# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch" - patch -p1 -i ../char.patch - - sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc - sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217 - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-multithreaded \ - --enable-wordlist \ - --with-freetype2-library=/usr/lib \ - --with-freetype2-includes=/usr/include/freetype2 \ - --x-includes=/usr/include \ - --with-Xm-library=/usr/lib \ - --with-Xm-includes=/usr/include \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" - - make DESTDIR="${pkgdir}" install - - install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop" - install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm" - - # stuff provided by poppler - for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do - rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1" - done -} diff --git a/extra/xpdf/char.patch b/extra/xpdf/char.patch deleted file mode 100644 index 8e49393a6..000000000 --- a/extra/xpdf/char.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc ---- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700 -+++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700 -@@ -1803,7 +1803,7 @@ - menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n); - for (i = 0; i < nZoomMenuItems; ++i) { - n = 0; -- s = XmStringCreateLocalized(zoomMenuInfo[i].label); -+ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label); - XtSetArg(args[n], XmNlabelString, s); ++n; - XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n; - sprintf(buf, "zoom%d", i); diff --git a/extra/xpdf/desktop b/extra/xpdf/desktop deleted file mode 100644 index 956323427..000000000 --- a/extra/xpdf/desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Xpdf -Comment=Views Adobe PDF (acrobat) files -Exec=xpdf %f -Terminal=false -Type=Application -Icon=xpdf -Categories=Office; -MimeType=application/pdf; diff --git a/extra/xpdf/install b/extra/xpdf/install deleted file mode 100644 index c6cf149dd..000000000 --- a/extra/xpdf/install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index e110427a5..048e57d2b 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189924 2013-07-11 14:40:14Z andyrtr $ +# $Id: PKGBUILD 194316 2013-09-13 08:17:42Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=296 +pkgver=297 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('63d498b14a9d45ae79d3fd3124c72a17' +md5sums=('45610ae6fe90cf086fcd75b9cb97bbaf' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 1553ddcc3..b9ab3f225 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188951 2013-06-27 01:33:26Z foutrelis $ +# $Id: PKGBUILD 194430 2013-09-16 10:39:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=22.0 +pkgver=23.0.1 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/ shared-libs.patch) options=('!emptydirs') replaces=('xulrunner-oss') -sha256sums=('f806adf3f1c5b4c8d26322401ef876c73a549f93911be921044f508d698ac589' +sha256sums=('50d70813cee1c966a6037957206626bb62dc047b011d2e4fab11c559008f9336' '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD index 5805c61df..94144ae37 100644 --- a/extra/xvidcore/PKGBUILD +++ b/extra/xvidcore/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126345 2011-06-04 23:54:53Z eric $ +# $Id: PKGBUILD 194593 2013-09-19 00:27:32Z dan $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=xvidcore pkgver=1.3.2 -pkgrel=1.2 +pkgrel=2 pkgdesc="XviD is an open source MPEG-4 video codec" arch=('i686' 'x86_64' 'mips64el') url="http://www.xvid.org/" diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index 7900d1dd2..35d79a715 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 185459 2013-05-14 10:26:22Z heftig $ +# $Id: PKGBUILD 196147 2013-10-07 11:53:44Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.8.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64' 'mips64el') -depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2' +depends=('webkitgtk' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'gtk-doc' 'itstool') groups=('gnome') @@ -16,7 +16,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=('73b3941316194dea8ea7d1d2b1f6612424c5d80ee1871ef627455893ad15606e') +sha256sums=('146f64a9b69409bedc5a0af9376ff2a38e5a4adcfa93c52c95d4ea4dc868cbd2') build() { cd $pkgname-$pkgver diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index bd94f4965..b989acd8c 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192725 2013-08-14 17:32:47Z pierre $ +# $Id: PKGBUILD 194594 2013-09-19 04:27:04Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh pkgver=5.0.2 -pkgrel=3 +pkgrel=4 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64' 'mips64el') url='http://www.zsh.org/' @@ -16,16 +16,23 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz md5sums=('b8f2ad691acf58b3252225746480dcad' '24a9335edf77252a7b5f52e079f7aef7') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" # Set correct keymap path sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys # Remove unneeded and conflicting completion scripts - rm -rf Completion/{AIX,BSD,Cygwin,Darwin,Debian,Mandriva,openSUSE,Redhat,Solaris} + for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat Solaris; do + rm -rf Completion/$_fpath + sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd + done rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast} - rm -f Completion/Unix/Command/_osc + rm -f Completion/Unix/Command/_{osc,systemd} +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --enable-etcdir=/etc/zsh \ |
