diff options
Diffstat (limited to 'extra')
169 files changed, 1196 insertions, 3246 deletions
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index b46d66e79..c2de2098b 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) @@ -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 08e717bd1..211dc2487 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') @@ -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/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD index ebcdc4acd..aceedb6a6 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') 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 b5d0d6622..b1b552b57 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) 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/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index 520ac9876..c912b011a 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') @@ -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 dbbdd3d22..2274f74c5 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') @@ -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 969a1cfb1..a7187ebf7 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) @@ -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/baobab/PKGBUILD b/extra/baobab/PKGBUILD index 6079616fd..c6faa8e06 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) @@ -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 2c889b6bb..1d4e62015 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) 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/brasero/PKGBUILD b/extra/brasero/PKGBUILD index b96d207bc..9401392ed 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') 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/cheese/PKGBUILD b/extra/cheese/PKGBUILD index e3508954b..53f1590ab 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) @@ -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/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 60cec1307..87a82c42e 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) @@ -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 07eab4588..247301f28 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') url="http://clutter-project.org/" diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 3f7ddbd14..b01a25c32 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') 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 72aa066c1..26fa8133b 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194508 2013-09-17 02:50:40Z heftig $ +# $Id: PKGBUILD 196024 2013-10-07 11:50:37Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.14.0 -pkgrel=5 +pkgver=1.16.0 +pkgrel=2 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') url="http://www.clutter-project.org/" @@ -11,23 +11,15 @@ license=('GPL2') 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 - git-fixes.patch) -sha256sums=('276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8' - '5f9279122cabf5cce23c1e19cedd9e67231f63a4d35329924b256fc1adc1aab2') - -prepare() { - cd "$pkgname-$pkgver" - # Update to ba5e5410babf705f53b591579c104181dd752bec - # Removed version parts from configure.ac and .gitignore parts, removed conflicting it.po and eu.po commits - patch -Np1 -i ../git-fixes.patch -} +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094') build() { cd "$pkgname-$pkgver" - autoreconf -fi ./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/cogl/git-fixes.patch b/extra/cogl/git-fixes.patch deleted file mode 100644 index 2d16a1262..000000000 --- a/extra/cogl/git-fixes.patch +++ /dev/null @@ -1,1948 +0,0 @@ -diff --git a/cogl/Makefile.am b/cogl/Makefile.am -index 33214ab..80d3b09 100644 ---- a/cogl/Makefile.am -+++ b/cogl/Makefile.am -@@ -349,6 +349,8 @@ cogl_sources_c = \ - $(srcdir)/cogl-pipeline-snippet.c \ - $(srcdir)/cogl-pipeline-cache.h \ - $(srcdir)/cogl-pipeline-cache.c \ -+ $(srcdir)/cogl-pipeline-hash-table.h \ -+ $(srcdir)/cogl-pipeline-hash-table.c \ - $(srcdir)/cogl-material-compat.c \ - $(srcdir)/cogl-program.c \ - $(srcdir)/cogl-program-private.h \ -@@ -552,7 +554,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.enums - - lib_LTLIBRARIES += libcogl.la - --libcogl_la_LIBADD = -lm $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) -+libcogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) - if !USE_GLIB - libcogl_la_LIBADD += $(top_builddir)/deps/glib/libglib.la - libcogl_la_LIBADD += $(top_builddir)/deps/gmodule/libgmodule.la -diff --git a/cogl/cogl-atlas-texture.c b/cogl/cogl-atlas-texture.c -index 7f62efc..30dd319 100644 ---- a/cogl/cogl-atlas-texture.c -+++ b/cogl/cogl-atlas-texture.c -@@ -276,7 +276,8 @@ _cogl_atlas_texture_free (CoglAtlasTexture *atlas_tex) - { - _cogl_atlas_texture_remove_from_atlas (atlas_tex); - -- cogl_object_unref (atlas_tex->sub_texture); -+ if (atlas_tex->sub_texture) -+ cogl_object_unref (atlas_tex->sub_texture); - - /* Chain up */ - _cogl_texture_free (COGL_TEXTURE (atlas_tex)); -diff --git a/cogl/cogl-auto-texture.c b/cogl/cogl-auto-texture.c -index 6de2e32..9a5819d 100644 ---- a/cogl/cogl-auto-texture.c -+++ b/cogl/cogl-auto-texture.c -@@ -179,14 +179,6 @@ _cogl_texture_new_from_bitmap (CoglBitmap *bitmap, - &internal_error))) - return COGL_TEXTURE (atlas_tex); - -- if (cogl_error_matches (internal_error, -- COGL_SYSTEM_ERROR, -- COGL_SYSTEM_ERROR_NO_MEMORY)) -- { -- _cogl_propagate_error (error, internal_error); -- return NULL; -- } -- - cogl_error_free (internal_error); - internal_error = NULL; - -@@ -200,14 +192,6 @@ _cogl_texture_new_from_bitmap (CoglBitmap *bitmap, - internal_format, - &internal_error)); - -- if (cogl_error_matches (internal_error, -- COGL_SYSTEM_ERROR, -- COGL_SYSTEM_ERROR_NO_MEMORY)) -- { -- _cogl_propagate_error (error, internal_error); -- return NULL; -- } -- - if (!tex) - { - cogl_error_free (internal_error); -diff --git a/cogl/cogl-bitmap-pixbuf.c b/cogl/cogl-bitmap-pixbuf.c -index a02b253..ad34234 100644 ---- a/cogl/cogl-bitmap-pixbuf.c -+++ b/cogl/cogl-bitmap-pixbuf.c -@@ -125,11 +125,24 @@ _cogl_bitmap_from_file (CoglContext *ctx, - /* allocate buffer big enough to hold pixel data */ - bmp = _cogl_bitmap_new_with_malloc_buffer (ctx, - width, height, -- COGL_PIXEL_FORMAT_ARGB_8888); -+ COGL_PIXEL_FORMAT_ARGB_8888, -+ error); -+ if (bmp == NULL) -+ { -+ CFRelease (image); -+ return NULL; -+ } - rowstride = cogl_bitmap_get_rowstride (bmp); - out_data = _cogl_bitmap_map (bmp, - COGL_BUFFER_ACCESS_WRITE, -- COGL_BUFFER_MAP_HINT_DISCARD); -+ COGL_BUFFER_MAP_HINT_DISCARD, -+ error); -+ if (out_data == NULL) -+ { -+ cogl_object_unref (bmp); -+ CFRelease (image); -+ return NULL; -+ } - - /* render to buffer */ - color_space = CGColorSpaceCreateWithName (kCGColorSpaceGenericRGB); -diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c -index 175e69d..359e112 100644 ---- a/cogl/cogl-context.c -+++ b/cogl/cogl-context.c -@@ -133,7 +133,7 @@ cogl_context_new (CoglDisplay *display, - CoglError **error) - { - CoglContext *context; -- GLubyte default_texture_data[] = { 0xff, 0xff, 0xff, 0x0 }; -+ uint8_t default_texture_data[] = { 0xff, 0xff, 0xff, 0xff }; - CoglBitmap *default_texture_bitmap; - const CoglWinsysVtable *winsys; - int i; -diff --git a/cogl/cogl-error.c b/cogl/cogl-error.c -index 753e4c8..f72415b 100644 ---- a/cogl/cogl-error.c -+++ b/cogl/cogl-error.c -@@ -105,7 +105,10 @@ _cogl_propagate_error (CoglError **dest, - _COGL_RETURN_IF_FAIL (src != NULL); - - if (dest == NULL) -- cogl_error_free (src); -+ { -+ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, "%s", src->message); -+ cogl_error_free (src); -+ } - else if (*dest) - g_warning (ERROR_OVERWRITTEN_WARNING, src->message); - else -diff --git a/cogl/cogl-error.h b/cogl/cogl-error.h -index 1b6a951..ef6ee7e 100644 ---- a/cogl/cogl-error.h -+++ b/cogl/cogl-error.h -@@ -30,6 +30,8 @@ - - #include "cogl-types.h" - -+COGL_BEGIN_DECLS -+ - /** - * SECTION:cogl-error - * @short_description: A way for Cogl to throw exceptions -@@ -173,4 +175,6 @@ cogl_error_matches (CoglError *error, - #define COGL_GLIB_ERROR(COGL_ERROR) ((CoglError *)COGL_ERROR) - #endif - -+COGL_END_DECLS -+ - #endif /* __COGL_ERROR_H__ */ -diff --git a/cogl/cogl-fixed.c b/cogl/cogl-fixed.c -index e347605..4d92155 100644 ---- a/cogl/cogl-fixed.c -+++ b/cogl/cogl-fixed.c -@@ -30,6 +30,10 @@ - #include <glib-object.h> - #include <gobject/gvaluecollector.h> - -+#ifdef HAVE_FLOAT_WORD_ORDER -+#include <endian.h> -+#endif -+ - #include "cogl-fixed.h" - - /* pre-computed sin table for 1st quadrant -@@ -306,6 +310,7 @@ static const double _magic = 68719476736.0 * 1.5; - * - * FIXME - this should go inside the configure.ac - */ -+#ifdef HAVE_FLOAT_WORD_ORDER - #if (__FLOAT_WORD_ORDER == 1234) - #define _COGL_MAN 0 - #elif (__FLOAT_WORD_ORDER == 4321) -@@ -313,6 +318,9 @@ static const double _magic = 68719476736.0 * 1.5; - #else - #define COGL_NO_FAST_CONVERSIONS - #endif -+#else /* HAVE_FLOAT_WORD_ORDER */ -+#define COGL_NO_FAST_CONVERSIONS -+#endif /* HAVE_FLOAT_WORD_ORDER */ - - /* - * cogl_double_to_fixed : -@@ -629,7 +637,7 @@ cogl_fixed_sqrt (CoglFixed x) - /* - * Find the highest bit set - */ --#if defined (__arm__) && !defined(__ARM_ARCH_4T__) -+#if defined (__arm__) && !defined(__ARM_ARCH_4T__) && !defined(__thumb__) - /* This actually requires at least arm v5, but gcc does not seem - * to set the architecture defines correctly, and it is I think - * very unlikely that anyone will want to use clutter on anything -@@ -807,7 +815,7 @@ CoglFixed - cogl_fixed_mul (CoglFixed a, - CoglFixed b) - { --#ifdef __arm__ -+#if defined(__arm__) && !defined(__thumb__) - /* This provides about 12% speedeup on the gcc -O2 optimised - * C version - * -@@ -819,7 +827,7 @@ cogl_fixed_mul (CoglFixed a, - __asm__ ("smull %0, %1, %2, %3 \n" - "mov %0, %0, lsr %4 \n" - "add %1, %0, %1, lsl %5 \n" -- : "=r"(res_hi), "=r"(res_low) \ -+ : "=&r"(res_hi), "=&r"(res_low) \ - : "r"(a), "r"(b), "i"(COGL_FIXED_Q), "i"(32 - COGL_FIXED_Q)); - - return (CoglFixed) res_low; -diff --git a/cogl/cogl-matrix.h b/cogl/cogl-matrix.h -index 90f3ea9..a136ea0 100644 ---- a/cogl/cogl-matrix.h -+++ b/cogl/cogl-matrix.h -@@ -27,6 +27,8 @@ - #ifndef __COGL_MATRIX_H - #define __COGL_MATRIX_H - -+#include <cogl/cogl-defines.h> -+ - #ifdef COGL_HAS_GTYPE_SUPPORT - #include <glib-object.h> - #endif /* COGL_HAS_GTYPE_SUPPORT */ -diff --git a/cogl/cogl-pipeline-cache.c b/cogl/cogl-pipeline-cache.c -index fab3614..df4c433 100644 ---- a/cogl/cogl-pipeline-cache.c -+++ b/cogl/cogl-pipeline-cache.c -@@ -3,7 +3,7 @@ - * - * An object oriented GL/GLES Abstraction/Utility Layer - * -- * Copyright (C) 2011 Intel Corporation. -+ * Copyright (C) 2011, 2013 Intel Corporation. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -32,133 +32,47 @@ - #include "cogl-context-private.h" - #include "cogl-pipeline-private.h" - #include "cogl-pipeline-cache.h" -+#include "cogl-pipeline-hash-table.h" - - struct _CoglPipelineCache - { -- GHashTable *fragment_hash; -- GHashTable *vertex_hash; -- GHashTable *combined_hash; -+ CoglPipelineHashTable fragment_hash; -+ CoglPipelineHashTable vertex_hash; -+ CoglPipelineHashTable combined_hash; - }; - --static unsigned int --pipeline_fragment_hash (const void *data) --{ -- unsigned int fragment_state; -- unsigned int layer_fragment_state; -- -- _COGL_GET_CONTEXT (ctx, 0); -- -- fragment_state = -- _cogl_pipeline_get_state_for_fragment_codegen (ctx); -- layer_fragment_state = -- _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx); -- -- return _cogl_pipeline_hash ((CoglPipeline *)data, -- fragment_state, layer_fragment_state, -- 0); --} -- --static CoglBool --pipeline_fragment_equal (const void *a, const void *b) -+CoglPipelineCache * -+_cogl_pipeline_cache_new (void) - { -+ CoglPipelineCache *cache = g_new (CoglPipelineCache, 1); -+ unsigned long vertex_state; -+ unsigned long layer_vertex_state; - unsigned int fragment_state; - unsigned int layer_fragment_state; - - _COGL_GET_CONTEXT (ctx, 0); - -+ vertex_state = -+ COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -+ layer_vertex_state = -+ COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; - fragment_state = - _cogl_pipeline_get_state_for_fragment_codegen (ctx); - layer_fragment_state = - _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx); - -- return _cogl_pipeline_equal ((CoglPipeline *)a, (CoglPipeline *)b, -- fragment_state, layer_fragment_state, -- 0); --} -- --static unsigned int --pipeline_vertex_hash (const void *data) --{ -- unsigned long vertex_state = -- COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -- unsigned long layer_vertex_state = -- COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; -- -- return _cogl_pipeline_hash ((CoglPipeline *)data, -- vertex_state, layer_vertex_state, -- 0); --} -- --static CoglBool --pipeline_vertex_equal (const void *a, const void *b) --{ -- unsigned long vertex_state = -- COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -- unsigned long layer_vertex_state = -- COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; -- -- return _cogl_pipeline_equal ((CoglPipeline *)a, (CoglPipeline *)b, -- vertex_state, layer_vertex_state, -- 0); --} -- --static unsigned int --pipeline_combined_hash (const void *data) --{ -- unsigned int combined_state; -- unsigned int layer_combined_state; -- -- _COGL_GET_CONTEXT (ctx, 0); -- -- combined_state = -- _cogl_pipeline_get_state_for_fragment_codegen (ctx) | -- COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -- layer_combined_state = -- _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx) | -- COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; -- -- return _cogl_pipeline_hash ((CoglPipeline *)data, -- combined_state, layer_combined_state, -- 0); --} -- --static CoglBool --pipeline_combined_equal (const void *a, const void *b) --{ -- unsigned int combined_state; -- unsigned int layer_combined_state; -- -- _COGL_GET_CONTEXT (ctx, 0); -- -- combined_state = -- _cogl_pipeline_get_state_for_fragment_codegen (ctx) | -- COGL_PIPELINE_STATE_AFFECTS_VERTEX_CODEGEN; -- layer_combined_state = -- _cogl_pipeline_get_layer_state_for_fragment_codegen (ctx) | -- COGL_PIPELINE_LAYER_STATE_AFFECTS_VERTEX_CODEGEN; -- -- return _cogl_pipeline_equal ((CoglPipeline *)a, (CoglPipeline *)b, -- combined_state, layer_combined_state, -- 0); --} -- --CoglPipelineCache * --_cogl_pipeline_cache_new (void) --{ -- CoglPipelineCache *cache = g_new (CoglPipelineCache, 1); -- -- cache->fragment_hash = g_hash_table_new_full (pipeline_fragment_hash, -- pipeline_fragment_equal, -- cogl_object_unref, -- cogl_object_unref); -- cache->vertex_hash = g_hash_table_new_full (pipeline_vertex_hash, -- pipeline_vertex_equal, -- cogl_object_unref, -- cogl_object_unref); -- cache->combined_hash = g_hash_table_new_full (pipeline_combined_hash, -- pipeline_combined_equal, -- cogl_object_unref, -- cogl_object_unref); -+ _cogl_pipeline_hash_table_init (&cache->vertex_hash, -+ vertex_state, -+ layer_vertex_state, -+ "vertex shaders"); -+ _cogl_pipeline_hash_table_init (&cache->fragment_hash, -+ fragment_state, -+ layer_fragment_state, -+ "fragment shaders"); -+ _cogl_pipeline_hash_table_init (&cache->combined_hash, -+ vertex_state | fragment_state, -+ layer_vertex_state | layer_fragment_state, -+ "programs"); - - return cache; - } -@@ -166,9 +80,9 @@ _cogl_pipeline_cache_new (void) - void - _cogl_pipeline_cache_free (CoglPipelineCache *cache) - { -- g_hash_table_destroy (cache->fragment_hash); -- g_hash_table_destroy (cache->vertex_hash); -- g_hash_table_destroy (cache->combined_hash); -+ _cogl_pipeline_hash_table_destroy (&cache->fragment_hash); -+ _cogl_pipeline_hash_table_destroy (&cache->vertex_hash); -+ _cogl_pipeline_hash_table_destroy (&cache->combined_hash); - g_free (cache); - } - -@@ -176,107 +90,22 @@ CoglPipeline * - _cogl_pipeline_cache_get_fragment_template (CoglPipelineCache *cache, - CoglPipeline *key_pipeline) - { -- CoglPipeline *template = -- g_hash_table_lookup (cache->fragment_hash, key_pipeline); -- -- if (template == NULL) -- { -- /* XXX: I wish there was a way to insert into a GHashTable with -- * a pre-calculated hash value since there is a cost to -- * calculating the hash of a CoglPipeline and in this case we -- * know we have already called _cogl_pipeline_hash during the -- * lookup so we could pass the value through to here to avoid -- * hashing it again. -- */ -- -- /* XXX: Any keys referenced by the hash table need to remain -- * valid all the while that there are corresponding values, -- * so for now we simply make a copy of the current authority -- * pipeline. -- * -- * FIXME: A problem with this is that our key into the cache may -- * hold references to some arbitrary user textures which will -- * now be kept alive indefinitly which is a shame. A better -- * solution will be to derive a special "key pipeline" from the -- * authority which derives from the base Cogl pipeline (to avoid -- * affecting the lifetime of any other pipelines) and only takes -- * a copy of the state that relates to the fragment shader and -- * references small dummy textures instead of potentially large -- * user textures. */ -- template = cogl_pipeline_copy (key_pipeline); -- -- g_hash_table_insert (cache->fragment_hash, -- template, -- cogl_object_ref (template)); -- -- if (G_UNLIKELY (g_hash_table_size (cache->fragment_hash) > 50)) -- { -- static CoglBool seen = FALSE; -- if (!seen) -- g_warning ("Over 50 separate fragment shaders have been " -- "generated which is very unusual, so something " -- "is probably wrong!\n"); -- seen = TRUE; -- } -- } -- -- return template; -+ return _cogl_pipeline_hash_table_get (&cache->fragment_hash, -+ key_pipeline); - } - - CoglPipeline * - _cogl_pipeline_cache_get_vertex_template (CoglPipelineCache *cache, - CoglPipeline *key_pipeline) - { -- CoglPipeline *template = -- g_hash_table_lookup (cache->vertex_hash, key_pipeline); -- -- if (template == NULL) -- { -- template = cogl_pipeline_copy (key_pipeline); -- -- g_hash_table_insert (cache->vertex_hash, -- template, -- cogl_object_ref (template)); -- -- if (G_UNLIKELY (g_hash_table_size (cache->vertex_hash) > 50)) -- { -- static CoglBool seen = FALSE; -- if (!seen) -- g_warning ("Over 50 separate vertex shaders have been " -- "generated which is very unusual, so something " -- "is probably wrong!\n"); -- seen = TRUE; -- } -- } -- -- return template; -+ return _cogl_pipeline_hash_table_get (&cache->vertex_hash, -+ key_pipeline); - } - - CoglPipeline * - _cogl_pipeline_cache_get_combined_template (CoglPipelineCache *cache, - CoglPipeline *key_pipeline) - { -- CoglPipeline *template = -- g_hash_table_lookup (cache->combined_hash, key_pipeline); -- -- if (template == NULL) -- { -- template = cogl_pipeline_copy (key_pipeline); -- -- g_hash_table_insert (cache->combined_hash, -- template, -- cogl_object_ref (template)); -- -- if (G_UNLIKELY (g_hash_table_size (cache->combined_hash) > 50)) -- { -- static CoglBool seen = FALSE; -- if (!seen) -- g_warning ("Over 50 separate programs have been " -- "generated which is very unusual, so something " -- "is probably wrong!\n"); -- seen = TRUE; -- } -- } -- -- return template; -+ return _cogl_pipeline_hash_table_get (&cache->combined_hash, -+ key_pipeline); - } -diff --git a/cogl/cogl-pipeline-hash-table.c b/cogl/cogl-pipeline-hash-table.c -new file mode 100644 -index 0000000..8921efc ---- /dev/null -+++ b/cogl/cogl-pipeline-hash-table.c -@@ -0,0 +1,153 @@ -+/* -+ * Cogl -+ * -+ * An object oriented GL/GLES Abstraction/Utility Layer -+ * -+ * Copyright (C) 2013 Intel Corporation. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library 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 -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see -+ * <http://www.gnu.org/licenses/>. -+ * -+ * -+ * Authors: -+ * Neil Roberts <neil@linux.intel.com> -+ * Robert Bragg <robert@linux.intel.com> -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "cogl-context-private.h" -+#include "cogl-pipeline-private.h" -+#include "cogl-pipeline-hash-table.h" -+ -+typedef struct -+{ -+ /* The template pipeline */ -+ CoglPipeline *pipeline; -+ -+ /* Calculating the hash is a little bit expensive for pipelines so -+ * we don't want to do it repeatedly for entries that are already in -+ * the hash table. Instead we cache the value here and calculate it -+ * outside of the GHashTable. */ -+ unsigned int hash_value; -+ -+ /* GHashTable annoyingly doesn't let us pass a user data pointer to -+ * the hash and equal functions so to work around it we have to -+ * store the pointer in every hash table entry. We will use this -+ * entry as both the key and the value */ -+ CoglPipelineHashTable *hash; -+} CoglPipelineHashTableEntry; -+ -+static void -+value_destroy_cb (void *value) -+{ -+ CoglPipelineHashTableEntry *entry = value; -+ -+ cogl_object_unref (entry->pipeline); -+ -+ g_slice_free (CoglPipelineHashTableEntry, entry); -+} -+ -+static unsigned int -+entry_hash (const void *data) -+{ -+ const CoglPipelineHashTableEntry *entry = data; -+ -+ return entry->hash_value; -+} -+ -+static CoglBool -+entry_equal (const void *a, -+ const void *b) -+{ -+ const CoglPipelineHashTableEntry *entry_a = a; -+ const CoglPipelineHashTableEntry *entry_b = b; -+ const CoglPipelineHashTable *hash = entry_a->hash; -+ -+ return _cogl_pipeline_equal (entry_a->pipeline, -+ entry_b->pipeline, -+ hash->main_state, -+ hash->layer_state, -+ 0); -+} -+ -+void -+_cogl_pipeline_hash_table_init (CoglPipelineHashTable *hash, -+ unsigned int main_state, -+ unsigned int layer_state, -+ const char *debug_string) -+{ -+ hash->n_unique_pipelines = 0; -+ hash->debug_string = debug_string; -+ hash->main_state = main_state; -+ hash->layer_state = layer_state; -+ hash->table = g_hash_table_new_full (entry_hash, -+ entry_equal, -+ NULL, /* key destroy */ -+ value_destroy_cb); -+} -+ -+void -+_cogl_pipeline_hash_table_destroy (CoglPipelineHashTable *hash) -+{ -+ g_hash_table_destroy (hash->table); -+} -+ -+CoglPipeline * -+_cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash, -+ CoglPipeline *key_pipeline) -+{ -+ CoglPipelineHashTableEntry dummy_entry; -+ CoglPipelineHashTableEntry *entry; -+ unsigned int copy_state; -+ -+ dummy_entry.pipeline = key_pipeline; -+ dummy_entry.hash = hash; -+ dummy_entry.hash_value = _cogl_pipeline_hash (key_pipeline, -+ hash->main_state, -+ hash->layer_state, -+ 0); -+ entry = g_hash_table_lookup (hash->table, &dummy_entry); -+ -+ if (entry) -+ return entry->pipeline; -+ -+ if (hash->n_unique_pipelines == 50) -+ g_warning ("Over 50 separate %s have been generated which is very " -+ "unusual, so something is probably wrong!\n", -+ hash->debug_string); -+ -+ entry = g_slice_new (CoglPipelineHashTableEntry); -+ entry->hash = hash; -+ entry->hash_value = dummy_entry.hash_value; -+ -+ copy_state = hash->main_state; -+ if (hash->layer_state) -+ copy_state |= COGL_PIPELINE_STATE_LAYERS; -+ -+ /* Create a new pipeline that is a child of the root pipeline -+ * instead of a normal copy so that the template pipeline won't hold -+ * a reference to the original pipeline */ -+ entry->pipeline = _cogl_pipeline_deep_copy (key_pipeline, -+ copy_state, -+ hash->layer_state); -+ -+ g_hash_table_insert (hash->table, entry, entry); -+ -+ hash->n_unique_pipelines++; -+ -+ return entry->pipeline; -+} -diff --git a/cogl/cogl-pipeline-hash-table.h b/cogl/cogl-pipeline-hash-table.h -new file mode 100644 -index 0000000..1b0a0d9 ---- /dev/null -+++ b/cogl/cogl-pipeline-hash-table.h -@@ -0,0 +1,69 @@ -+/* -+ * Cogl -+ * -+ * An object oriented GL/GLES Abstraction/Utility Layer -+ * -+ * Copyright (C) 2013 Intel Corporation. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library 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 -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library. If not, see <http://www.gnu.org/licenses/>. -+ * -+ * -+ */ -+ -+#ifndef __COGL_PIPELINE_HASH_H__ -+#define __COGL_PIPELINE_HASH_H__ -+ -+#include "cogl-pipeline.h" -+ -+typedef struct -+{ -+ /* Total number of pipelines that were ever added to the hash. This -+ * is not decremented when a pipeline is removed. It is only used to -+ * generate a warning if an unusually high number of pipelines are -+ * generated */ -+ int n_unique_pipelines; -+ -+ /* String that will be used to describe the usage of this hash table -+ * in the debug warning when too many pipelines are generated. This -+ * must be a static string because it won't be copied or freed */ -+ const char *debug_string; -+ -+ unsigned int main_state; -+ unsigned int layer_state; -+ -+ GHashTable *table; -+} CoglPipelineHashTable; -+ -+void -+_cogl_pipeline_hash_table_init (CoglPipelineHashTable *hash, -+ unsigned int main_state, -+ unsigned int layer_state, -+ const char *debug_string); -+ -+void -+_cogl_pipeline_hash_table_destroy (CoglPipelineHashTable *hash); -+ -+/* -+ * Gets a pipeline from the hash that has the same state as -+ * @key_pipeline according to the limited state bits passed to -+ * _cogl_pipeline_hash_table_init(). If there is no matching pipelines -+ * already then a copy of key_pipeline is stored in the hash so that -+ * it will be used next time the function is called with a similar -+ * pipeline. In that case the copy itself will be returned -+ */ -+CoglPipeline * -+_cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash, -+ CoglPipeline *key_pipeline); -+ -+#endif /* __COGL_PIPELINE_HASH_H__ */ -diff --git a/cogl/cogl-pipeline-layer-private.h b/cogl/cogl-pipeline-layer-private.h -index 125b967..7577559 100644 ---- a/cogl/cogl-pipeline-layer-private.h -+++ b/cogl/cogl-pipeline-layer-private.h -@@ -358,6 +358,11 @@ _cogl_pipeline_layer_get_wrap_mode_t (CoglPipelineLayer *layer); - CoglPipelineWrapMode - _cogl_pipeline_layer_get_wrap_mode_p (CoglPipelineLayer *layer); - -+void -+_cogl_pipeline_layer_copy_differences (CoglPipelineLayer *dest, -+ CoglPipelineLayer *src, -+ unsigned long differences); -+ - unsigned long - _cogl_pipeline_layer_compare_differences (CoglPipelineLayer *layer0, - CoglPipelineLayer *layer1); -diff --git a/cogl/cogl-pipeline-layer.c b/cogl/cogl-pipeline-layer.c -index d9590c8..9bc26ef 100644 ---- a/cogl/cogl-pipeline-layer.c -+++ b/cogl/cogl-pipeline-layer.c -@@ -42,6 +42,8 @@ - #include "cogl-context-private.h" - #include "cogl-texture-private.h" - -+#include <string.h> -+ - static void - _cogl_pipeline_layer_free (CoglPipelineLayer *layer); - -@@ -146,6 +148,107 @@ _cogl_get_n_args_for_combine_func (CoglPipelineCombineFunc func) - return 0; - } - -+void -+_cogl_pipeline_layer_copy_differences (CoglPipelineLayer *dest, -+ CoglPipelineLayer *src, -+ unsigned long differences) -+{ -+ CoglPipelineLayerBigState *big_dest, *big_src; -+ -+ if ((differences & COGL_PIPELINE_LAYER_STATE_NEEDS_BIG_STATE) && -+ !dest->has_big_state) -+ { -+ dest->big_state = g_slice_new (CoglPipelineLayerBigState); -+ dest->has_big_state = TRUE; -+ } -+ -+ big_dest = dest->big_state; -+ big_src = src->big_state; -+ -+ dest->differences |= differences; -+ -+ while (differences) -+ { -+ int index = _cogl_util_ffs (differences) - 1; -+ -+ differences &= ~(1 << index); -+ -+ /* This convoluted switch statement is just here so that we'll -+ * get a warning if a new state is added without handling it -+ * here */ -+ switch (index) -+ { -+ case COGL_PIPELINE_LAYER_STATE_COUNT: -+ case COGL_PIPELINE_LAYER_STATE_UNIT_INDEX: -+ g_warn_if_reached (); -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_TEXTURE_TYPE_INDEX: -+ dest->texture_type = src->texture_type; -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_TEXTURE_DATA_INDEX: -+ dest->texture = src->texture; -+ if (dest->texture) -+ cogl_object_ref (dest->texture); -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_SAMPLER_INDEX: -+ dest->sampler_cache_entry = src->sampler_cache_entry; -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_COMBINE_INDEX: -+ { -+ CoglPipelineCombineFunc func; -+ int n_args, i; -+ -+ func = big_src->texture_combine_rgb_func; -+ big_dest->texture_combine_rgb_func = func; -+ n_args = _cogl_get_n_args_for_combine_func (func); -+ for (i = 0; i < n_args; i++) -+ { -+ big_dest->texture_combine_rgb_src[i] = -+ big_src->texture_combine_rgb_src[i]; -+ big_dest->texture_combine_rgb_op[i] = -+ big_src->texture_combine_rgb_op[i]; -+ } -+ -+ func = big_src->texture_combine_alpha_func; -+ big_dest->texture_combine_alpha_func = func; -+ n_args = _cogl_get_n_args_for_combine_func (func); -+ for (i = 0; i < n_args; i++) -+ { -+ big_dest->texture_combine_alpha_src[i] = -+ big_src->texture_combine_alpha_src[i]; -+ big_dest->texture_combine_alpha_op[i] = -+ big_src->texture_combine_alpha_op[i]; -+ } -+ } -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_COMBINE_CONSTANT_INDEX: -+ memcpy (big_dest->texture_combine_constant, -+ big_src->texture_combine_constant, -+ sizeof (big_dest->texture_combine_constant)); -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_POINT_SPRITE_COORDS_INDEX: -+ big_dest->point_sprite_coords = big_src->point_sprite_coords; -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_VERTEX_SNIPPETS_INDEX: -+ _cogl_pipeline_snippet_list_copy (&big_dest->vertex_snippets, -+ &big_src->vertex_snippets); -+ break; -+ -+ case COGL_PIPELINE_LAYER_STATE_FRAGMENT_SNIPPETS_INDEX: -+ _cogl_pipeline_snippet_list_copy (&big_dest->fragment_snippets, -+ &big_src->fragment_snippets); -+ break; -+ } -+ } -+} -+ - static void - _cogl_pipeline_layer_init_multi_property_sparse_state ( - CoglPipelineLayer *layer, -diff --git a/cogl/cogl-pipeline-private.h b/cogl/cogl-pipeline-private.h -index 56700b5..acb5653 100644 ---- a/cogl/cogl-pipeline-private.h -+++ b/cogl/cogl-pipeline-private.h -@@ -845,6 +845,17 @@ _cogl_pipeline_hash (CoglPipeline *pipeline, - unsigned long layer_differences, - CoglPipelineEvalFlags flags); - -+/* Makes a copy of the given pipeline that is a child of the root -+ * pipeline rather than a child of the source pipeline. That way the -+ * new pipeline won't hold a reference to the source pipeline. The -+ * differences specified in @differences and @layer_differences are -+ * copied across and all other state is left with the default -+ * values. */ -+CoglPipeline * -+_cogl_pipeline_deep_copy (CoglPipeline *pipeline, -+ unsigned long differences, -+ unsigned long layer_differences); -+ - CoglPipeline * - _cogl_pipeline_journal_ref (CoglPipeline *pipeline); - -diff --git a/cogl/cogl-pipeline.c b/cogl/cogl-pipeline.c -index c029f45..a91ad25 100644 ---- a/cogl/cogl-pipeline.c -+++ b/cogl/cogl-pipeline.c -@@ -2771,6 +2771,97 @@ _cogl_pipeline_hash (CoglPipeline *pipeline, - - typedef struct - { -+ CoglContext *context; -+ CoglPipeline *src_pipeline; -+ CoglPipeline *dst_pipeline; -+ unsigned int layer_differences; -+} DeepCopyData; -+ -+static CoglBool -+deep_copy_layer_cb (CoglPipelineLayer *src_layer, -+ void *user_data) -+{ -+ DeepCopyData *data = user_data; -+ CoglPipelineLayer *dst_layer; -+ unsigned int differences = data->layer_differences; -+ -+ dst_layer = _cogl_pipeline_get_layer (data->dst_pipeline, src_layer->index); -+ -+ while (src_layer != data->context->default_layer_n && -+ src_layer != data->context->default_layer_0 && -+ differences) -+ { -+ unsigned long to_copy = differences & src_layer->differences; -+ -+ if (to_copy) -+ { -+ _cogl_pipeline_layer_copy_differences (dst_layer, src_layer, to_copy); -+ differences ^= to_copy; -+ } -+ -+ src_layer = COGL_PIPELINE_LAYER (COGL_NODE (src_layer)->parent); -+ } -+ -+ return TRUE; -+} -+ -+CoglPipeline * -+_cogl_pipeline_deep_copy (CoglPipeline *pipeline, -+ unsigned long differences, -+ unsigned long layer_differences) -+{ -+ CoglPipeline *new, *authority; -+ CoglBool copy_layer_state; -+ -+ _COGL_GET_CONTEXT (ctx, NULL); -+ -+ if ((differences & COGL_PIPELINE_STATE_LAYERS)) -+ { -+ copy_layer_state = TRUE; -+ differences &= ~COGL_PIPELINE_STATE_LAYERS; -+ } -+ else -+ copy_layer_state = FALSE; -+ -+ new = cogl_pipeline_new (ctx); -+ -+ for (authority = pipeline; -+ authority != ctx->default_pipeline && differences; -+ authority = COGL_PIPELINE (COGL_NODE (authority)->parent)) -+ { -+ unsigned long to_copy = differences & authority->differences; -+ -+ if (to_copy) -+ { -+ _cogl_pipeline_copy_differences (new, authority, to_copy); -+ differences ^= to_copy; -+ } -+ } -+ -+ if (copy_layer_state) -+ { -+ DeepCopyData data; -+ -+ /* The unit index doesn't need to be copied because it should -+ * end up with the same values anyway because the new pipeline -+ * will have the same indices as the source pipeline */ -+ layer_differences &= ~COGL_PIPELINE_LAYER_STATE_UNIT; -+ -+ data.context = ctx; -+ data.src_pipeline = pipeline; -+ data.dst_pipeline = new; -+ data.layer_differences = layer_differences; -+ -+ _cogl_pipeline_foreach_layer_internal (pipeline, -+ deep_copy_layer_cb, -+ &data); -+ } -+ -+ return new; -+} -+ -+typedef struct -+{ - int i; - CoglPipelineLayer **layers; - } AddLayersToArrayState; -diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl-xlib-renderer.c -index 18c0fe6..eb1f51a 100644 ---- a/cogl/cogl-xlib-renderer.c -+++ b/cogl/cogl-xlib-renderer.c -@@ -238,7 +238,7 @@ update_outputs (CoglRenderer *renderer, - - _cogl_xlib_renderer_trap_errors (renderer, &state); - -- for (i = 0; i < resources->ncrtc && !error; i++) -+ for (i = 0; resources && i < resources->ncrtc && !error; i++) - { - XRRCrtcInfo *crtc_info = NULL; - XRROutputInfo *output_info = NULL; -diff --git a/cogl/cogl-xlib.h b/cogl/cogl-xlib.h -index 7a6bc7e..5dab8ae 100644 ---- a/cogl/cogl-xlib.h -+++ b/cogl/cogl-xlib.h -@@ -79,6 +79,8 @@ cogl_xlib_set_display (Display *display); - CoglFilterReturn - cogl_xlib_handle_event (XEvent *xevent); - -+COGL_END_DECLS -+ - #undef __COGL_XLIB_H_INSIDE__ - - #endif /* __COGL_XLIB_H__ */ -diff --git a/cogl/driver/gl/cogl-attribute-gl.c b/cogl/driver/gl/cogl-attribute-gl.c -index ba7e627..bd9c351 100644 ---- a/cogl/driver/gl/cogl-attribute-gl.c -+++ b/cogl/driver/gl/cogl-attribute-gl.c -@@ -251,17 +251,25 @@ setup_legacy_buffered_attribute (CoglContext *ctx, - case COGL_ATTRIBUTE_NAME_ID_TEXTURE_COORD_ARRAY: - { - int layer_number = attribute->name_state->layer_number; -+ const CoglPipelineGetLayerFlags flags = -+ COGL_PIPELINE_GET_LAYER_NO_CREATE; - CoglPipelineLayer *layer = -- _cogl_pipeline_get_layer (pipeline, layer_number); -- int unit = _cogl_pipeline_layer_get_unit_index (layer); -+ _cogl_pipeline_get_layer_with_flags (pipeline, layer_number, flags); - -- _cogl_bitmask_set (&ctx->enable_texcoord_attributes_tmp, unit, TRUE); -+ if (layer) -+ { -+ int unit = _cogl_pipeline_layer_get_unit_index (layer); - -- GE (ctx, glClientActiveTexture (GL_TEXTURE0 + unit)); -- GE (ctx, glTexCoordPointer (attribute->d.buffered.n_components, -- attribute->d.buffered.type, -- attribute->d.buffered.stride, -- base + attribute->d.buffered.offset)); -+ _cogl_bitmask_set (&ctx->enable_texcoord_attributes_tmp, -+ unit, -+ TRUE); -+ -+ GE (ctx, glClientActiveTexture (GL_TEXTURE0 + unit)); -+ GE (ctx, glTexCoordPointer (attribute->d.buffered.n_components, -+ attribute->d.buffered.type, -+ attribute->d.buffered.stride, -+ base + attribute->d.buffered.offset)); -+ } - break; - } - case COGL_ATTRIBUTE_NAME_ID_POSITION_ARRAY: -@@ -316,13 +324,24 @@ setup_legacy_const_attribute (CoglContext *ctx, - case COGL_ATTRIBUTE_NAME_ID_TEXTURE_COORD_ARRAY: - { - int layer_number = attribute->name_state->layer_number; -+ const CoglPipelineGetLayerFlags flags = -+ COGL_PIPELINE_GET_LAYER_NO_CREATE; - CoglPipelineLayer *layer = -- _cogl_pipeline_get_layer (pipeline, layer_number); -- int unit = _cogl_pipeline_layer_get_unit_index (layer); -+ _cogl_pipeline_get_layer_with_flags (pipeline, -+ layer_number, -+ flags); - -- GE (ctx, glClientActiveTexture (GL_TEXTURE0 + unit)); -+ if (layer) -+ { -+ int unit = _cogl_pipeline_layer_get_unit_index (layer); -+ -+ GE (ctx, glClientActiveTexture (GL_TEXTURE0 + unit)); - -- GE (ctx, glMultiTexCoord4f (vector[0], vector[1], vector[2], vector[3])); -+ GE (ctx, glMultiTexCoord4f (vector[0], -+ vector[1], -+ vector[2], -+ vector[3])); -+ } - break; - } - case COGL_ATTRIBUTE_NAME_ID_POSITION_ARRAY: -diff --git a/cogl/winsys/cogl-winsys-egl-wayland.c b/cogl/winsys/cogl-winsys-egl-wayland.c -index feeb529..156ecb9 100644 ---- a/cogl/winsys/cogl-winsys-egl-wayland.c -+++ b/cogl/winsys/cogl-winsys-egl-wayland.c -@@ -370,12 +370,22 @@ _cogl_winsys_egl_onscreen_deinit (CoglOnscreen *onscreen) - wayland_onscreen->wayland_egl_native_window = NULL; - } - -+ /* NB: The wayland protocol docs explicitly state that -+ * "wl_shell_surface_destroy() must be called before destroying the -+ * wl_surface object." ... */ -+ if (wayland_onscreen->wayland_shell_surface) -+ { -+ wl_shell_surface_destroy (wayland_onscreen->wayland_shell_surface); -+ wayland_onscreen->wayland_shell_surface = NULL; -+ } -+ - if (wayland_onscreen->wayland_surface) - { - wl_surface_destroy (wayland_onscreen->wayland_surface); - wayland_onscreen->wayland_surface = NULL; - } - -+ - g_slice_free (CoglOnscreenWayland, wayland_onscreen); - } - -diff --git a/configure.ac b/configure.ac -index 43bf407..3d57980 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -178,6 +178,12 @@ dnl internal glib configure (as-glibconfig.m4) - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - - dnl ================================================================ -+dnl Find an appropriate libm, for sin() etc. -+dnl ================================================================ -+LT_LIB_M -+AC_SUBST(LIBM) -+ -+dnl ================================================================ - dnl See what platform we are building for - dnl ================================================================ - AC_CANONICAL_HOST -@@ -474,6 +480,7 @@ AS_IF( - EXPERIMENTAL_OPTIONS="$EXPERIMENTAL_OPTIONS Quartz Core Graphics," - AC_DEFINE([USE_QUARTZ], 1, - [Use Core Graphics (Quartz) for loading image data]) -+ COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -framework ApplicationServices" - COGL_IMAGE_BACKEND="quartz" - ], - [ -@@ -950,7 +957,7 @@ AS_IF([test "x$enable_kms_egl_platform" = "xyes"], - GBM_VERSION=`$PKG_CONFIG --modversion gbm` - GBM_MAJOR=`echo $GBM_VERSION | cut -d'.' -f1` - GBM_MINOR=`echo $GBM_VERSION | cut -d'.' -f2` -- GBM_MICRO=`echo $GBM_VERSION | cut -d'.' -f3` -+ GBM_MICRO=`echo $GBM_VERSION | cut -d'.' -f3 | sed 's/-.*//'` - - AC_DEFINE_UNQUOTED([COGL_GBM_MAJOR], [$GBM_MAJOR], [The major version for libgbm]) - AC_DEFINE_UNQUOTED([COGL_GBM_MINOR], [$GBM_MINOR], [The minor version for libgbm]) -@@ -1160,7 +1167,10 @@ dnl ================================================================ - AC_PATH_X - AC_HEADER_STDC - AC_CHECK_HEADERS(fcntl.h limits.h unistd.h) -- -+AC_CHECK_HEADER([endian.h], -+ [AC_CHECK_DECL([__FLOAT_WORD_ORDER], -+ AC_DEFINE([HAVE_FLOAT_WORD_ORDER], [1], -+ [Has the __FLOAT_WORD_ORDER macro]))]) - - dnl ================================================================ - dnl Checks for library functions. -@@ -1173,6 +1183,12 @@ AC_CHECK_FUNCS([ffs]) - dnl 'memmem' is a GNU extension but we have a simple fallback - AC_CHECK_FUNCS([memmem]) - -+dnl This is used in the cogl-gles2-gears example but it is a GNU extension -+save_libs="$LIBS" -+LIBS="$LIBS $LIBM" -+AC_CHECK_FUNCS([sincos]) -+LIBS="$save_libs" -+ - dnl ================================================================ - dnl Platform values - dnl ================================================================ -diff --git a/examples/Makefile.am b/examples/Makefile.am -index 86801c6..ae3e5f7 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -20,7 +20,8 @@ endif - - common_ldadd = \ - $(COGL_DEP_LIBS) \ -- $(top_builddir)/cogl/libcogl.la -+ $(top_builddir)/cogl/libcogl.la \ -+ $(LIBM) - - if !USE_GLIB - common_ldadd += $(top_builddir)/deps/glib/libglib.la -diff --git a/examples/android/hello/jni/main.c b/examples/android/hello/jni/main.c -index 2c5bd9b..c9a8401 100644 ---- a/examples/android/hello/jni/main.c -+++ b/examples/android/hello/jni/main.c -@@ -42,7 +42,7 @@ static int test_init (TestData* data) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-gles2-context.c b/examples/cogl-gles2-context.c -index 1cf375f..de66c21 100644 ---- a/examples/cogl-gles2-context.c -+++ b/examples/cogl-gles2-context.c -@@ -70,7 +70,7 @@ main (int argc, char **argv) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-gles2-gears.c b/examples/cogl-gles2-gears.c -index d7dd271..c7185b6 100644 ---- a/examples/cogl-gles2-gears.c -+++ b/examples/cogl-gles2-gears.c -@@ -35,6 +35,10 @@ - * Jul 13, 2010 - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #define GL_GLEXT_PROTOTYPES - - #include <math.h> -@@ -110,6 +114,15 @@ static GLfloat ProjectionMatrix[16]; - /** The direction of the directional light for the scene */ - static const GLfloat LightSourcePosition[4] = { 5.0, 5.0, 10.0, 1.0}; - -+#ifndef HAVE_SINCOS -+static void -+sincos (double x, double *sinx, double *cosx) -+{ -+ *sinx = sin (x); -+ *cosx = cos (x); -+} -+#endif /* HAVE_SINCOS */ -+ - /** - * Fills a gear vertex. - * -diff --git a/examples/cogl-hello.c b/examples/cogl-hello.c -index 5bda9bf..3ba1e31 100644 ---- a/examples/cogl-hello.c -+++ b/examples/cogl-hello.c -@@ -39,7 +39,7 @@ main (int argc, char **argv) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-msaa.c b/examples/cogl-msaa.c -index 73f9c4e..4a388bc 100644 ---- a/examples/cogl-msaa.c -+++ b/examples/cogl-msaa.c -@@ -12,7 +12,7 @@ main (int argc, char **argv) - CoglFramebuffer *fb; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-sdl-hello.c b/examples/cogl-sdl-hello.c -index 961137a..acb9125 100644 ---- a/examples/cogl-sdl-hello.c -+++ b/examples/cogl-sdl-hello.c -@@ -80,7 +80,7 @@ main (int argc, char **argv) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-sdl2-hello.c b/examples/cogl-sdl2-hello.c -index 405cb92..12e6ced 100644 ---- a/examples/cogl-sdl2-hello.c -+++ b/examples/cogl-sdl2-hello.c -@@ -89,7 +89,7 @@ main (int argc, char **argv) - CoglOnscreen *onscreen; - CoglError *error = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogl-x11-foreign.c b/examples/cogl-x11-foreign.c -index ca9e3ed..a60397c 100644 ---- a/examples/cogl-x11-foreign.c -+++ b/examples/cogl-x11-foreign.c -@@ -61,7 +61,7 @@ main (int argc, char **argv) - unsigned long mask; - Window xwin; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -diff --git a/examples/cogland.c b/examples/cogland.c -index c18850a..238f34c 100644 ---- a/examples/cogland.c -+++ b/examples/cogland.c -@@ -8,6 +8,10 @@ - - #include <wayland-server.h> - -+#ifdef COGL_HAS_XLIB_SUPPORT -+#include <cogl/cogl-xlib.h> -+#endif -+ - typedef struct _CoglandCompositor CoglandCompositor; - - typedef struct -@@ -25,7 +29,7 @@ typedef struct - { - CoglandCompositor *compositor; - -- struct wl_surface wayland_surface; -+ struct wl_resource resource; - int x; - int y; - struct wl_buffer *buffer; -@@ -38,6 +42,7 @@ typedef struct - struct - { - /* wl_surface.attach */ -+ CoglBool newly_attached; - struct wl_buffer *buffer; - struct wl_listener buffer_destroy_listener; - int32_t sx; -@@ -93,7 +98,6 @@ struct _CoglandCompositor - struct wl_display *wayland_display; - struct wl_event_loop *wayland_loop; - -- CoglDisplay *cogl_display; - CoglContext *cogl_context; - - int virtual_width; -@@ -336,15 +340,16 @@ cogland_queue_redraw (CoglandCompositor *compositor) - } - - static void --shm_buffer_damaged (CoglandSurface *surface, -- int32_t x, -- int32_t y, -- int32_t width, -- int32_t height) -+surface_damaged (CoglandSurface *surface, -+ int32_t x, -+ int32_t y, -+ int32_t width, -+ int32_t height) - { - struct wl_buffer *wayland_buffer = surface->buffer; - -- if (surface->texture) -+ if (surface->texture && -+ wl_buffer_is_shm (surface->buffer)) - { - CoglPixelFormat format; - int stride = wl_shm_buffer_get_stride (wayland_buffer); -@@ -381,6 +386,8 @@ shm_buffer_damaged (CoglandSurface *surface, - stride, - data); - } -+ -+ cogland_queue_redraw (surface->compositor); - } - - static void -@@ -453,6 +460,7 @@ cogland_surface_attach (struct wl_client *wayland_client, - surface->pending.sx = sx; - surface->pending.sy = sy; - surface->pending.buffer = buffer; -+ surface->pending.newly_attached = TRUE; - - if (buffer) - wl_signal_add (&buffer->resource.destroy_signal, -@@ -522,7 +530,8 @@ cogland_surface_commit (struct wl_client *client, - CoglandCompositor *compositor = surface->compositor; - - /* wl_surface.attach */ -- if (surface->buffer != surface->pending.buffer) -+ if (surface->pending.newly_attached && -+ surface->buffer != surface->pending.buffer) - { - CoglError *error = NULL; - -@@ -546,16 +555,19 @@ cogland_surface_commit (struct wl_client *client, - - wl_signal_add (&surface->buffer->resource.destroy_signal, - &surface->buffer_destroy_listener); -- wl_list_remove (&surface->pending.buffer_destroy_listener.link); - } - } -- surface->pending.buffer = NULL; -+ if (surface->pending.buffer) -+ { -+ wl_list_remove (&surface->pending.buffer_destroy_listener.link); -+ surface->pending.buffer = NULL; -+ } - surface->pending.sx = 0; - surface->pending.sy = 0; -+ surface->pending.newly_attached = FALSE; - - /* wl_surface.damage */ - if (surface->buffer && -- wl_buffer_is_shm (surface->buffer) && - surface->texture && - !region_is_empty (&surface->pending.damage)) - { -@@ -571,11 +583,11 @@ cogland_surface_commit (struct wl_client *client, - if (region->y1 < 0) - region->y1 = 0; - -- shm_buffer_damaged (surface, -- region->x1, -- region->y1, -- region->x2 - region->x1, -- region->y2 - region->y1); -+ surface_damaged (surface, -+ region->x1, -+ region->y1, -+ region->x2 - region->x1, -+ region->y2 - region->y1); - } - region_init (&surface->pending.damage); - -@@ -583,8 +595,6 @@ cogland_surface_commit (struct wl_client *client, - wl_list_insert_list (&compositor->frame_callbacks, - &surface->pending.frame_callback_list); - wl_list_init (&surface->pending.frame_callback_list); -- -- cogland_queue_redraw (compositor); - } - - static void -@@ -614,6 +624,9 @@ cogland_surface_free (CoglandSurface *surface) - compositor->surfaces = g_list_remove (compositor->surfaces, surface); - cogland_surface_detach_buffer_and_notify (surface); - -+ if (surface->pending.buffer) -+ wl_list_remove (&surface->pending.buffer_destroy_listener.link); -+ - wl_list_for_each_safe (cb, next, - &surface->pending.frame_callback_list, link) - wl_resource_destroy (&cb->resource); -@@ -647,13 +660,13 @@ cogland_compositor_create_surface (struct wl_client *wayland_client, - - surface->compositor = compositor; - -- surface->wayland_surface.resource.destroy = -+ surface->resource.destroy = - cogland_surface_resource_destroy_cb; -- surface->wayland_surface.resource.object.id = id; -- surface->wayland_surface.resource.object.interface = &wl_surface_interface; -- surface->wayland_surface.resource.object.implementation = -+ surface->resource.object.id = id; -+ surface->resource.object.interface = &wl_surface_interface; -+ surface->resource.object.implementation = - (void (**)(void)) &cogland_surface_interface; -- surface->wayland_surface.resource.data = surface; -+ surface->resource.data = surface; - - surface->buffer_destroy_listener.notify = - surface_handle_buffer_destroy; -@@ -663,7 +676,7 @@ cogland_compositor_create_surface (struct wl_client *wayland_client, - wl_list_init (&surface->pending.frame_callback_list); - region_init (&surface->pending.damage); - -- wl_client_add_resource (wayland_client, &surface->wayland_surface.resource); -+ wl_client_add_resource (wayland_client, &surface->resource); - - compositor->surfaces = g_list_prepend (compositor->surfaces, - surface); -@@ -970,7 +983,7 @@ get_shell_surface (struct wl_client *client, - struct wl_resource *surface_resource) - { - CoglandSurface *surface = surface_resource->data; -- CoglandShellSurface *shell_surface = g_new0 (CoglandShellSurface, 1); -+ CoglandShellSurface *shell_surface; - - if (surface->has_shell_surface) - { -@@ -980,6 +993,7 @@ get_shell_surface (struct wl_client *client, - return; - } - -+ shell_surface = g_new0 (CoglandShellSurface, 1); - shell_surface->resource.destroy = destroy_shell_surface; - shell_surface->resource.object.id = id; - shell_surface->resource.object.interface = &wl_shell_surface_interface; -@@ -989,7 +1003,7 @@ get_shell_surface (struct wl_client *client, - - shell_surface->surface = surface; - shell_surface->surface_destroy_listener.notify = shell_handle_surface_destroy; -- wl_signal_add (&surface->wayland_surface.resource.destroy_signal, -+ wl_signal_add (&surface->resource.destroy_signal, - &shell_surface->surface_destroy_listener); - - surface->has_shell_surface = TRUE; -@@ -1012,6 +1026,109 @@ bind_shell (struct wl_client *client, - &cogland_shell_interface, id, data); - } - -+static CoglContext * -+create_cogl_context (CoglandCompositor *compositor, -+ CoglBool use_egl_constraint, -+ CoglError **error) -+{ -+ CoglRenderer *renderer = renderer = cogl_renderer_new (); -+ CoglDisplay *display; -+ CoglContext *context; -+ -+ if (use_egl_constraint) -+ cogl_renderer_add_constraint (renderer, COGL_RENDERER_CONSTRAINT_USES_EGL); -+ -+ if (!cogl_renderer_connect (renderer, error)) -+ { -+ cogl_object_unref (renderer); -+ return NULL; -+ } -+ -+ display = cogl_display_new (renderer, NULL); -+ cogl_wayland_display_set_compositor_display (display, -+ compositor->wayland_display); -+ -+ context = cogl_context_new (display, error); -+ -+ cogl_object_unref (renderer); -+ cogl_object_unref (display); -+ -+ return context; -+} -+ -+#ifdef COGL_HAS_XLIB_SUPPORT -+ -+static CoglFilterReturn -+x_event_cb (XEvent *event, -+ void *data) -+{ -+ CoglandCompositor *compositor = data; -+ -+ if (event->type == Expose) -+ cogland_queue_redraw (compositor); -+ -+ return COGL_FILTER_CONTINUE; -+} -+ -+#endif /* COGL_HAS_XLIB_SUPPORT */ -+ -+static gboolean -+timeout_cb (void *data) -+{ -+ cogland_queue_redraw (data); -+ -+ return TRUE; -+} -+ -+static void -+init_redraws (CoglandCompositor *compositor) -+{ -+#ifdef COGL_HAS_XLIB_SUPPORT -+ CoglDisplay *display = cogl_context_get_display (compositor->cogl_context); -+ CoglRenderer *renderer = cogl_display_get_renderer (display); -+ CoglWinsysID winsys = cogl_renderer_get_winsys_id (renderer); -+ -+ /* If Cogl is using X then we can listen for Expose events to know -+ * when to repaint the window. Otherwise we don't have any code to -+ * know when the contents of the window is dirty so we'll just -+ * redraw constantly */ -+ switch (winsys) -+ { -+ case COGL_WINSYS_ID_GLX: -+ case COGL_WINSYS_ID_EGL_XLIB: -+ { -+ Display *display = cogl_xlib_renderer_get_display (renderer); -+ GList *l; -+ -+ for (l = compositor->outputs; l; l = l->next) -+ { -+ CoglandOutput *output = l->data; -+ XWindowAttributes win_attribs; -+ Window win; -+ -+ win = cogl_x11_onscreen_get_window_xid (output->onscreen); -+ if (XGetWindowAttributes (display, win, &win_attribs)) -+ { -+ XSelectInput (display, -+ win, -+ win_attribs.your_event_mask | ExposureMask); -+ cogl_xlib_renderer_add_filter (renderer, -+ x_event_cb, -+ compositor); -+ -+ } -+ } -+ } -+ return; -+ -+ default: -+ break; -+ } -+#endif /* COGL_HAS_XLIB_SUPPORT */ -+ -+ g_timeout_add (16, timeout_cb, compositor); -+} -+ - int - main (int argc, char **argv) - { -@@ -1020,7 +1137,7 @@ main (int argc, char **argv) - CoglError *error = NULL; - GError *gerror = NULL; - CoglVertexP2C4 triangle_vertices[] = { -- {0, 0.7, 0xff, 0x00, 0x00, 0x80}, -+ {0, 0.7, 0xff, 0x00, 0x00, 0xff}, - {-0.7, -0.7, 0x00, 0xff, 0x00, 0xff}, - {0.7, -0.7, 0x00, 0x00, 0xff, 0xff} - }; -@@ -1055,13 +1172,30 @@ main (int argc, char **argv) - wayland_event_source_new (compositor.wayland_display); - g_source_attach (compositor.wayland_event_source, NULL); - -- compositor.cogl_display = cogl_display_new (NULL, NULL); -- cogl_wayland_display_set_compositor_display (compositor.cogl_display, -- compositor.wayland_display); -- -- compositor.cogl_context = cogl_context_new (compositor.cogl_display, &error); -- if (!compositor.cogl_context) -- g_error ("Failed to create a Cogl context: %s\n", error->message); -+ /* We want Cogl to use an EGL renderer because otherwise it won't -+ * set up the wl_drm object and only SHM buffers will work. */ -+ compositor.cogl_context = -+ create_cogl_context (&compositor, -+ TRUE /* use EGL constraint */, -+ &error); -+ if (compositor.cogl_context == NULL) -+ { -+ /* If we couldn't get an EGL context then try any type of -+ * context */ -+ cogl_error_free (error); -+ error = NULL; -+ -+ compositor.cogl_context = -+ create_cogl_context (&compositor, -+ FALSE, /* don't set EGL constraint */ -+ &error); -+ -+ if (compositor.cogl_context) -+ g_warning ("Failed to create context with EGL constraint, " -+ "falling back"); -+ else -+ g_error ("Failed to create a Cogl context: %s\n", error->message); -+ } - - compositor.virtual_width = 800; - compositor.virtual_height = 600; -@@ -1101,7 +1235,7 @@ main (int argc, char **argv) - - g_source_attach (cogl_source, NULL); - -- cogland_queue_redraw (&compositor); -+ init_redraws (&compositor); - - g_main_loop_run (loop); - -diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am -index 69a460d..d4062f2 100644 ---- a/tests/conform/Makefile.am -+++ b/tests/conform/Makefile.am -@@ -65,6 +65,8 @@ test_sources = \ - test-framebuffer-get-bits.c \ - test-primitive-and-journal.c \ - test-copy-replace-texture.c \ -+ test-pipeline-cache-unrefs-texture.c \ -+ test-texture-no-allocate.c \ - $(NULL) - - test_conformance_SOURCES = $(common_sources) $(test_sources) -@@ -131,7 +133,10 @@ AM_CPPFLAGS += \ - -DCOGL_COMPILATION - - test_conformance_CFLAGS = -g3 -O0 $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) --test_conformance_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la -+test_conformance_LDADD = \ -+ $(COGL_DEP_LIBS) \ -+ $(top_builddir)/cogl/libcogl.la \ -+ $(LIBM) - if !USE_GLIB - test_conformance_LDADD += $(top_builddir)/deps/glib/libglib.la - endif -diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c -index 0b55db6..c5a5d4c 100644 ---- a/tests/conform/test-conform-main.c -+++ b/tests/conform/test-conform-main.c -@@ -120,6 +120,8 @@ main (int argc, char **argv) - - ADD_TEST (test_copy_replace_texture, 0, 0); - -+ ADD_TEST (test_pipeline_cache_unrefs_texture, 0, 0); -+ - UNPORTED_TEST (test_viewport); - - ADD_TEST (test_gles2_context, TEST_REQUIREMENT_GLES2_CONTEXT, 0); -@@ -130,6 +132,8 @@ main (int argc, char **argv) - - ADD_TEST (test_euler_quaternion, 0, 0); - -+ ADD_TEST (test_texture_no_allocate, 0, 0); -+ - g_printerr ("Unknown test name \"%s\"\n", argv[1]); - - return 1; -diff --git a/tests/conform/test-pipeline-cache-unrefs-texture.c b/tests/conform/test-pipeline-cache-unrefs-texture.c -new file mode 100644 -index 0000000..ccd02e7 ---- /dev/null -+++ b/tests/conform/test-pipeline-cache-unrefs-texture.c -@@ -0,0 +1,92 @@ -+#include <cogl/cogl.h> -+ -+#include "test-utils.h" -+ -+/* Keep track of the number of textures that we've created and are -+ * still alive */ -+static int destroyed_texture_count = 0; -+ -+#define N_TEXTURES 3 -+ -+static void -+free_texture_cb (void *user_data) -+{ -+ destroyed_texture_count++; -+} -+ -+static CoglTexture * -+create_texture (void) -+{ -+ static const guint8 data[] = -+ { 0xff, 0xff, 0xff, 0xff }; -+ static CoglUserDataKey texture_data_key; -+ CoglTexture2D *tex_2d; -+ -+ tex_2d = cogl_texture_2d_new_from_data (test_ctx, -+ 1, 1, /* width / height */ -+ COGL_PIXEL_FORMAT_RGBA_8888_PRE, -+ COGL_PIXEL_FORMAT_ANY, -+ 4, /* rowstride */ -+ data, -+ NULL); -+ -+ /* Set some user data on the texture so we can track when it has -+ * been destroyed */ -+ cogl_object_set_user_data (COGL_OBJECT (tex_2d), -+ &texture_data_key, -+ GINT_TO_POINTER (1), -+ free_texture_cb); -+ -+ return COGL_TEXTURE (tex_2d); -+} -+ -+void -+test_pipeline_cache_unrefs_texture (void) -+{ -+ CoglPipeline *pipeline = cogl_pipeline_new (test_ctx); -+ CoglPipeline *simple_pipeline; -+ int i; -+ -+ /* Create a pipeline with three texture layers. That way we can be -+ * pretty sure the pipeline will cause a unique shader to be -+ * generated in the cache */ -+ for (i = 0; i < N_TEXTURES; i++) -+ { -+ CoglTexture *tex = create_texture (); -+ cogl_pipeline_set_layer_texture (pipeline, i, tex); -+ cogl_object_unref (tex); -+ } -+ -+ /* Draw something with the pipeline to ensure it gets into the -+ * pipeline cache */ -+ cogl_framebuffer_draw_rectangle (test_fb, -+ pipeline, -+ 0, 0, 10, 10); -+ cogl_framebuffer_finish (test_fb); -+ -+ /* Draw something else so that it is no longer the current flushed -+ * pipeline, and the units have a different texture bound */ -+ simple_pipeline = cogl_pipeline_new (test_ctx); -+ for (i = 0; i < N_TEXTURES; i++) -+ { -+ CoglColor combine_constant; -+ cogl_color_init_from_4ub (&combine_constant, i, 0, 0, 255); -+ cogl_pipeline_set_layer_combine_constant (simple_pipeline, -+ i, -+ &combine_constant); -+ } -+ cogl_framebuffer_draw_rectangle (test_fb, simple_pipeline, 0, 0, 10, 10); -+ cogl_framebuffer_finish (test_fb); -+ cogl_object_unref (simple_pipeline); -+ -+ g_assert_cmpint (destroyed_texture_count, ==, 0); -+ -+ /* Destroy the pipeline. This should immediately cause the textures -+ * to be freed */ -+ cogl_object_unref (pipeline); -+ -+ g_assert_cmpint (destroyed_texture_count, ==, N_TEXTURES); -+ -+ if (cogl_test_verbose ()) -+ g_print ("OK\n"); -+} -diff --git a/tests/conform/test-texture-no-allocate.c b/tests/conform/test-texture-no-allocate.c -new file mode 100644 -index 0000000..fccb742 ---- /dev/null -+++ b/tests/conform/test-texture-no-allocate.c -@@ -0,0 +1,80 @@ -+#include <cogl/cogl.h> -+ -+#include "test-utils.h" -+ -+/* Tests that the various texture types can be freed without being -+ * allocated */ -+ -+/* Texture size that is probably to big to fit within the texture -+ * limits */ -+#define BIG_TEX_WIDTH 16384 -+#define BIG_TEX_HEIGHT 128 -+ -+void -+test_texture_no_allocate (void) -+{ -+ uint8_t *tex_data; -+ CoglTexture *texture; -+ CoglTexture2D *texture_2d; -+ -+ tex_data = g_malloc (BIG_TEX_WIDTH * BIG_TEX_HEIGHT * 4); -+ -+ /* NB: if we make the atlas and sliced texture APIs public then this -+ * could changed to explicitly use that instead of the magic texture -+ * API */ -+ -+ /* Try to create an atlas texture that is too big so it will -+ * internally be freed without allocating */ -+ texture = cogl_texture_new_from_data (BIG_TEX_WIDTH, -+ BIG_TEX_HEIGHT, -+ COGL_TEXTURE_NONE, /* flags */ -+ /* format */ -+ COGL_PIXEL_FORMAT_RGBA_8888_PRE, -+ /* internal format */ -+ COGL_PIXEL_FORMAT_ANY, -+ /* rowstride */ -+ BIG_TEX_WIDTH * 4, -+ tex_data); -+ -+ g_free (tex_data); -+ -+ /* It's ok if this causes an error, we just don't want it to -+ * crash */ -+ -+ if (texture) -+ cogl_object_unref (texture); -+ -+ /* Try to create a sliced texture without allocating it */ -+ texture = cogl_texture_new_with_size (BIG_TEX_WIDTH, -+ BIG_TEX_HEIGHT, -+ COGL_TEXTURE_NO_ATLAS, -+ COGL_PIXEL_FORMAT_RGBA_8888_PRE); -+ cogl_object_unref (texture); -+ -+ /* 2D texture */ -+ texture_2d = cogl_texture_2d_new_with_size (test_ctx, -+ 64, 64, -+ COGL_PIXEL_FORMAT_RGBA_8888_PRE); -+ cogl_object_unref (texture_2d); -+ -+ /* 3D texture */ -+ if (cogl_has_feature (test_ctx, COGL_FEATURE_ID_TEXTURE_3D)) -+ { -+ CoglTexture3D *texture_3d = -+ cogl_texture_3d_new_with_size (test_ctx, -+ 64, 64, 64, -+ COGL_PIXEL_FORMAT_RGBA_8888_PRE); -+ cogl_object_unref (texture_3d); -+ } -+ -+ /* Rectangle texture */ -+ if (cogl_has_feature (test_ctx, COGL_FEATURE_ID_TEXTURE_RECTANGLE)) -+ { -+ CoglTextureRectangle *texture_rect = -+ cogl_texture_rectangle_new_with_size (test_ctx, -+ 64, 64, -+ COGL_PIXEL_FORMAT_RGBA_8888_PRE, -+ NULL /* error */); -+ cogl_object_unref (texture_rect); -+ } -+} -diff --git a/tests/micro-perf/Makefile.am b/tests/micro-perf/Makefile.am -index c221dd6..5c5f69d 100644 ---- a/tests/micro-perf/Makefile.am -+++ b/tests/micro-perf/Makefile.am -@@ -19,5 +19,10 @@ endif - - AM_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) - -+common_ldadd = \ -+ $(COGL_DEP_LIBS) \ -+ $(top_builddir)/cogl/libcogl.la \ -+ $(LIBM) -+ - test_journal_SOURCES = test-journal.c --test_journal_LDADD = $(COGL_DEP_LIBS) $(top_builddir)/cogl/libcogl.la -+test_journal_LDADD = $(common_ldadd) 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 49976813d..c00711749 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') 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 @@ -109,7 +116,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 @@ -128,7 +135,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" @@ -143,7 +150,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/" @@ -157,7 +164,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/" @@ -170,7 +177,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 bf4e5a2e9..639671156 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) @@ -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 748557122..84d05594d 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') @@ -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 36b38a371..81c4056c0 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) 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/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 7a06c1c55..1f145e72b 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/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 0e37fe39b..5c268a4b6 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 194416 2013-09-16 09:02:57Z jgc $ +# $Id: PKGBUILD 196028 2013-10-07 11:50:41Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.8.4 +pkgver=3.10.0 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=(i686 x86_64) url="http://live.gnome.org/Empathy" license=(GPL2) -depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 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=('cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9') +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 2b974e18f..0d6c8f1f4 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') 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 eae0b6d88..d90093655 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) @@ -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 c3323c732..e6e4667c1 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) @@ -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 fd9407377..0a07a2a2e 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) 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 f5dd3ea4a..0ffa9360f 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') @@ -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 a84a929ff..26d266514 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) @@ -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 af1da96fe..c5164c562 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) url="http://www.recherche.enac.fr/opti/facile/" diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD index 2f1fed450..72dfd1fba 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') @@ -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/folks/PKGBUILD b/extra/folks/PKGBUILD index 2c01d9111..81c0009ba 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) 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 5300d1e79..26001a554 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') @@ -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/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD index aad63a6e5..69a925079 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) 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/gcr/PKGBUILD b/extra/gcr/PKGBUILD index fc1107a6b..3f91432c1 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) @@ -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 8dc915fcd..397f5ce9a 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') @@ -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 7c843b23c..67ffae29d 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) @@ -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 aae217eaa..fa26b1d30 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) @@ -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 4540abee8..a43d476b6 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) 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/ghex/PKGBUILD b/extra/ghex/PKGBUILD index bc25641c5..002957172 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') @@ -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 c35d5566e..9d2375f31 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 e8a69f53d..306824f5c 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) @@ -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 f6e4857f6..d95cd3dd8 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) @@ -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 cf87cfd3e..6b10de42d 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') 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/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index d21ac7547..bc1340279 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) 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 cdec3899c..a7b0d1b87 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') @@ -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 92b7d016e..0e61269fa 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') @@ -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 1e0a538fa..bea06b214 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) 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 0d29c06de..7ba591dad 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 194410 2013-09-16 08:14:01Z jgc $ +# $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.3 +pkgver=3.10.0 pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64) @@ -15,7 +15,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9125f438321c686c578b37f37a7bfab1ec8dbb519c06031a682b1eb49f474279') +sha256sums=('95e27198fb6c7d45918d1a47a440ed5af0c65bbe2ec53fb8898d4c00c7dc8f00') build(){ cd $pkgname-$pkgver diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index 4a3938f3c..d6e4b58d6 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) @@ -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 8abff2a2c..55f3a110a 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194412 2013-09-16 08:37:42Z jgc $ +# $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.5 +pkgver=3.10.0 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -22,20 +22,13 @@ 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=('efb9fb47aaa9a308aed3064efc39356db05d71ddb0374561eeccc57c122212e2' - '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 - CFLAGS="$CFLAGS -Wall" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/$pkgname --disable-static --disable-silent-rules #https://bugzilla.gnome.org/show_bug.cgi?id=656229 diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 89303244b..411340229 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 194422 2013-09-16 09:53:28Z jgc $ +# $Id: PKGBUILD 196058 2013-10-07 11:51:23Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.8.4 +pkgver=3.10.0 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" @@ -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=('2aa1d4c5b78b018368e1cf9cd3568555dd6b04ad68536b9f338b28ac0f89df9f') +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 06234012a..dba419724 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) @@ -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 76b52c8a7..66386b972 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) 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 0ff324441..76cc7709f 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) 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 82392d280..0d5097e42 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) @@ -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 a63dfba2c..f99ba4ce9 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) @@ -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 59da7d96c..01a0ba4e3 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') @@ -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 c3d79b652..21fc000b4 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') @@ -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 482a14cce..81497af6f 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') 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 1931c5630..be69d86fd 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') @@ -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 d10cfdc7c..4ef8cfb89 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') @@ -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 29e966f2f..06c9e5c77 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) 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 486d49d3e..a2a51b53b 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) 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 1ed4787d4..b24a9c7ee 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) @@ -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 569da8596..ab07d1d88 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) license=('GPL' 'LGPL') options=('!libtool') diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD index 8f4c471d2..1fcbc05d0 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') @@ -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 47f20a5bf..811927a6a 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) @@ -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 e88d3369f..2478e24a6 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) 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 1f67adbc1..ab2fb0e77 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,28 +1,21 @@ -# $Id: PKGBUILD 194420 2013-09-16 09:19:10Z jgc $ +# $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.5 +pkgver=3.10.0 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') 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=('19420c97296802162fd4e0e0a08e797f5038ec8bd98cffe222362e24c7405784' - '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 bddb6c987..794d342dc 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) @@ -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 8b4c28ac9..4ee48eff7 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) @@ -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 1bea034eb..140b18c2d 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) 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 ac374672a..00cb6b89e 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) 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 b07cb7346..96d6a0090 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') @@ -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 425edfd92..bbcc70c27 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 194418 2013-09-16 09:09:15Z jgc $ +# $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.4 +pkgver=3.10.0 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=(i686 x86_64) @@ -16,7 +16,7 @@ replaces=(gnome-themes) conflicts=(gnome-themes) options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1252d719847cab54cc0dc510c3d3698462dcb1b45fabd9643473ac28e5cd7a20') +sha256sums=('812c6cfc534fced921dc327b436e70020d8979529284bb59d72d6f37af1f4b38') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index 8b003c0b6..f48c48adb 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') 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 472df3ad0..3774bc35c 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) @@ -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 124f50f3a..ba26ea09e 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/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 559b9f8ce..fefb54ea1 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) diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index d6a43768d..9c8bacbbb 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/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index 03566c715..e73514cce 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') @@ -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 fd0a1d79b..37440ac6f 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') @@ -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 56721eef1..a31604df8 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') 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 d91f98840..b846a62e7 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') @@ -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 6f11d2eb2..6bf196e57 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') @@ -13,14 +13,18 @@ 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}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ - --with-package-name="GStreamer (Archlinux)" \ + --with-package-name="GStreamer (Arch Linux)" \ --with-package-origin="http://www.archlinux.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 5f9b9ded9..49267ecbf 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) 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 61084467a..e35ebeaf5 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') 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 dd021fd13..e18b144ef 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) 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 10880858a..679789bef 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') 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 4e4f8aeb7..2c90fad85 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') @@ -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 f4cfa88b7..05fdac4a4 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') 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/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 3cfaf9caf..b192db6c0 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') 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 45abfd146..e20bf0288 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') @@ -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/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD index 974018af5..c7409b8cd 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') @@ -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/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 8ce4cdb5c..50c31ca38 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 195590 2013-10-01 15:20:43Z svenstaro $ +# $Id: PKGBUILD 195986 2013-10-07 07:06:21Z tpowa $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium pkgver=4.11.2 -pkgrel=1 +pkgrel=2 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" arch=('i686' 'x86_64') diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index ace0b2486..38f0a2dc6 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) license=('LGPL') diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index dc4925c11..25191a25a 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/libcryptui/PKGBUILD b/extra/libcryptui/PKGBUILD index f4d753985..b62c83322 100644 --- a/extra/libcryptui/PKGBUILD +++ b/extra/libcryptui/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 194933 2013-09-24 09:51:27Z heftig $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# $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.8.0 +pkgver=3.10.0 pkgrel=1 pkgdesc="Library for OpenPGP prompts" arch=('i686' 'x86_64') @@ -13,7 +14,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('10eed96e33b6d7286795a7c678a5655a86ae099fb98d1f7211aa28aa636c0837') +sha256sums=('ceeba7ebdcda768d671e9df9332b18d4f25edd1f4d91e86a241c3c1f3ffc6332') build() { cd "$srcdir/$pkgname-$pkgver" 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 4e9c0569b..bd2fb352d 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 abf4e6902..b00db9b2e 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) @@ -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 218663ea4..078d75902 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') 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/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD index b0af725ec..cf3049697 100644 --- a/extra/libnotify/PKGBUILD +++ b/extra/libnotify/PKGBUILD @@ -1,8 +1,8 @@ -# $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 +pkgver=0.7.6 pkgrel=1 pkgdesc="Desktop notification library" arch=('i686' 'x86_64') @@ -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 6b2f5c07b..a097a1885 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) @@ -14,15 +14,9 @@ optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' 'seed: gobject-based plugin engine - seed runtime loader') 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/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD index b50034812..228cc1514 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') 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 60e1c547e..200df7513 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) @@ -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 1e1a449e0..8e0aca8ee 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') 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/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index b20d6635e..606854716 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) 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/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD index 3e8780c64..114ddfc89 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') @@ -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/mash/PKGBUILD b/extra/mash/PKGBUILD index 4b1dbce38..6cb77da6f 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') url="http://clutter-project.org/" diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 1507ce9c4..9dab6f140 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 194265 2013-09-12 09:44:15Z lcarlier $ +# $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=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=9.2.0 -pkgrel=2 +pkgver=9.2.1 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') 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() { diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD index c1f24c59a..a75241392 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) 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/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 d80581bac..57c710ec5 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) 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 17806e5f0..6a9745c6e 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) 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 c7932fe24..ee92f77a6 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) @@ -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/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 614bd4014..02ffccb14 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194795 2013-09-23 17:22:29Z 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> @@ -7,12 +7,12 @@ pkgname=network-manager-applet pkgver=0.9.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME frontends to NetWorkmanager" arch=(i686 x86_64) 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') @@ -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/PKGBUILD b/extra/networkmanager/PKGBUILD index b93a02674..fd11b12ec 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194794 2013-09-23 17:21:36Z 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.4 +pkgver=0.9.8.6 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') @@ -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=('4c9ff0aaf52bee8df9a73290ec2b3f4441ff504420d0b0dfd729b00a92d80d99' +sha256sums=('2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index b12c6868a..e7dc2ef53 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) 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 17b28978e..3fc05134c 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) @@ -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 71c124d1e..49f852159 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,31 +1,28 @@ -# $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' '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') -license=('LGPL2' 'custom: QPL-1.0') +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 - tk8.6-build.patch) +source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz) options=('!makeflags' '!emptydirs') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure -prefix /usr + ./configure -prefix /usr -x11include /usr/include make world.opt } 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. @@ -57,6 +54,4 @@ optdepends=() install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7') -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7' - '67b0a8a8885fc1221181b171541cb1b0') +md5sums=('04dfdd7da189462a4f10ec6530359cef') 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/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index 2480f6010..0d72a6dc8 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) 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 d152bdae9..88f25bc4d 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') @@ -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/poppler/PKGBUILD b/extra/poppler/PKGBUILD index f5997ff4c..03e32ca1a 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) 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/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 14a48e8cb..2ef3a22e8 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) 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/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD index c7b95fbdd..734e2d5b7 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') @@ -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/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 592e5f3e2..2da968474 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 194424 2013-09-16 10:09:01Z jgc $ +# $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=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="An iTunes-like music playback and management application" arch=(i686 x86_64) license=(GPL) diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index 9ca1803ff..435b40215 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) @@ -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/seahorse-nautilus/PKGBUILD b/extra/seahorse-nautilus/PKGBUILD index 8b3765ac9..c296729ca 100644 --- a/extra/seahorse-nautilus/PKGBUILD +++ b/extra/seahorse-nautilus/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 194930 2013-09-24 09:45:38Z heftig $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# $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.8.0 -pkgrel=2 +pkgver=3.10.0 +pkgrel=1 pkgdesc="PGP encryption and signing for nautilus" arch=('i686' 'x86_64') url="http://git.gnome.org/browse/seahorse-nautilus/" @@ -12,17 +13,12 @@ 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 - glib236.patch) -sha256sums=('8173ef08a700ff254fb5637a7f2138ba7625b19ed2102a82fd69f1ecb8072863' - '0cefa14a45784c82871815e9bdcebbb96dea50a8e43316475e6a36d5dc47ade5') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d54c5fbc2bade03296d39999f8412708cfa87e82bda3c5af8e0b8ad86b2fadf3') build() { cd "$srcdir/$pkgname-$pkgver" - # Fix compatibility with glib 2.36 - patch -Np1 -i "$srcdir/glib236.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile make diff --git a/extra/seahorse-nautilus/glib236.patch b/extra/seahorse-nautilus/glib236.patch deleted file mode 100644 index d0ab03046..000000000 --- a/extra/seahorse-nautilus/glib236.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c ---- seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c 2011-10-24 09:25:37.000000000 +0200 -+++ seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c 2013-04-28 22:26:54.483276592 +0200 -@@ -226,8 +226,6 @@ - progress_fd = -1; - return; - } -- -- g_child_watch_add (progress_pid, progress_cancel, NULL); - } - - void diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index cdb00dd9f..63d3c045f 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) @@ -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/sushi/PKGBUILD b/extra/sushi/PKGBUILD index e3da50207..f27cd2d0c 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) @@ -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 69a01e38a..aceaf8261 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') @@ -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/tali/PKGBUILD b/extra/tali/PKGBUILD index e28399444..c4c3fed10 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.1 +pkgver=3.10.0 pkgrel=1 pkgdesc="Beat the odds in a poker-style dice game" arch=('i686' 'x86_64') @@ -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=('33a7a67a9ba2034cba916a033ee70285a334438a460fccd24373c7edcfc592c8') +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/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 541676a3e..400895cab 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) -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 a06bb53b7..9fe893a2f 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) @@ -13,12 +13,12 @@ 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 lirc-utils vala grilo dbus-glib libzeitgeist +makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist itstool docbook-xsl python-pylint) 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') @@ -53,7 +53,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 @@ -65,6 +65,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 d1a998390..50bb03962 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) license=(GPL) diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD index 7cc608b87..2218fb9bf 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') @@ -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/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 11eaafa62..f3f45fbc9 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') -license=('GPL') +arch=(i686 x86_64) +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 40c35c45b..f88ebec9c 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') -license=('GPL') -depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils') -makedepends=('intltool' 'networkmanager' 'gnome-common') -groups=('gnome') +arch=(i686 x86_64) +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/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index ab0e1e16e..fc48f7867 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 pkgdesc="GTK+ Web content engine library" arch=(i686 x86_64) @@ -17,7 +17,7 @@ conflicts=(webkitgtk3 libwebkit3) replaces=(webkitgtk3 libwebkit3) options=(!libtool !emptydirs) source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz) -sha256sums=('bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f') +sha256sums=('84902e3255dcc6efa1298c8a1f2d2a49674126dcacea383f309aeed9e734d538') build() { cd $pkgname-$pkgver diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD index 3ef0ae144..0807391ea 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) @@ -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/yelp/PKGBUILD b/extra/yelp/PKGBUILD index 80d7640c3..c03aed726 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') -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 |