From 3567a49f79d2dbf828b723ab54982fa6c7ea1c80 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 4 Oct 2011 23:14:30 +0000 Subject: Tue Oct 4 23:14:30 UTC 2011 --- extra/abiword/PKGBUILD | 4 +- extra/clutter-gst/PKGBUILD | 6 +- extra/cups-pdf/PKGBUILD | 7 +- extra/digikam/PKGBUILD | 6 +- extra/enchant/PKGBUILD | 8 +- extra/fakechroot/PKGBUILD | 16 +- extra/fcitx/PKGBUILD | 6 +- extra/gdl/PKGBUILD | 6 +- extra/git/PKGBUILD | 16 +- extra/gnome-media/PKGBUILD | 7 +- extra/gnome-settings-daemon/PKGBUILD | 11 +- extra/gnome-settings-daemon/fix_color_crash.patch | 186 +++++++++++++++++++++ extra/gnucash/PKGBUILD | 4 +- extra/gnumeric/PKGBUILD | 10 +- extra/goffice/PKGBUILD | 14 +- extra/goffice/use-apiver-for-dirs.patch | 32 ++++ extra/grilo-plugins/PKGBUILD | 13 +- extra/gssdp/PKGBUILD | 8 +- extra/gtk3/PKGBUILD | 11 +- extra/gupnp-av/PKGBUILD | 8 +- extra/gupnp/PKGBUILD | 10 +- extra/liblrdf/PKGBUILD | 17 +- extra/liblrdf/pkgconfig-raptor.patch | 9 + extra/libmowgli/PKGBUILD | 6 +- extra/mail-notification/PKGBUILD | 14 +- ...il-notification-5.4-evolution-3-0-support.patch | 54 +++++- .../mail-notification-5.4-gtk3-support.patch | 60 +++++-- extra/midori/PKGBUILD | 16 +- extra/midori/webkit_search.diff | 59 +++++++ extra/upower/PKGBUILD | 8 +- 30 files changed, 515 insertions(+), 117 deletions(-) create mode 100644 extra/gnome-settings-daemon/fix_color_crash.patch create mode 100644 extra/goffice/use-apiver-for-dirs.patch create mode 100644 extra/liblrdf/pkgconfig-raptor.patch create mode 100644 extra/midori/webkit_search.diff (limited to 'extra') diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD index 69974e508..2bb71bb52 100644 --- a/extra/abiword/PKGBUILD +++ b/extra/abiword/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135772 2011-08-18 15:03:53Z andyrtr $ +# $Id: PKGBUILD 139550 2011-10-03 12:22:58Z jgc $ # Maintainer: Giovanni Scafora # Contributor: Maël Lavault pkgbase=abiword pkgname=('abiword' 'abiword-plugins') pkgver=2.8.6 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('GPL') url="http://www.abisource.com" diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 7b342e38e..998557870 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 139211 2011-10-01 18:55:32Z ibiru $ +# $Id: PKGBUILD 139555 2011-10-03 12:43:44Z ibiru $ # Maintainer: Jan "heftig" Steffens pkgname=clutter-gst -pkgver=1.4.0 +pkgver=1.4.2 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ depends=('clutter' 'gstreamer0.10-base' 'libxdamage') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d47b771e1453eec4848bac8d58258058a435319d925b22256a28d348bc8d5270') +sha256sums=('48f623a08a6793ab688ef6b899a2d889ef68053718ba44aac7997a1f9f619e7e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/cups-pdf/PKGBUILD b/extra/cups-pdf/PKGBUILD index aef413f1b..c0700820d 100644 --- a/extra/cups-pdf/PKGBUILD +++ b/extra/cups-pdf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121266 2011-04-29 22:22:36Z andyrtr $ +# $Id: PKGBUILD 139594 2011-10-03 14:30:44Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Thomas Baechler pkgname=cups-pdf -pkgver=2.5.1 +pkgver=2.6.0 pkgrel=1 pkgdesc="PDF printer for cups" arch=(i686 x86_64) @@ -13,7 +13,8 @@ url="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf" license=('GPL2') source=(http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/cups-pdf_$pkgver.tar.gz) backup=(etc/cups/cups-pdf.conf) -md5sums=('4b4cf1a249d02a38045db74b5f259aac') +md5sums=('8ee644c77438aac542301352266db181') +sha1sums=('45ecff78f26dab6261bbf66978e708d93385ef31') build() { cd $srcdir/$pkgname-$pkgver/src diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 106f55cec..f88924eea 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138026 2011-09-14 18:37:32Z andrea $ +# $Id: PKGBUILD 139601 2011-10-03 17:47:38Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.1.1 +pkgver=2.2.0 pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8cd3f5f2141bbb54ba2fd80371582c2c') +md5sums=('be6100de4961a8cb99a8d9d1688a0460') build() { cd "${srcdir}" diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD index 2edd15320..a8dc20ddb 100644 --- a/extra/enchant/PKGBUILD +++ b/extra/enchant/PKGBUILD @@ -1,17 +1,15 @@ -# $Id: PKGBUILD 127251 2011-06-11 20:47:42Z andrea $ +# $Id: PKGBUILD 139539 2011-10-03 12:17:06Z jgc $ # Maintainer: Andrea Scarpino # Contributor: dorphell pkgname=enchant pkgver=1.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="A wrapper library for generic spell checking" arch=('i686' 'x86_64') url="http://www.abisource.com/enchant/" license=('LGPL') -depends=('aspell' 'dbus-glib' 'hunspell') -makedepends=('hspell') -optdepends=('hspell: Hebrew dictionary') +depends=('aspell' 'dbus-glib' 'hunspell' 'hspell') options=('!libtool') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('de11011aff801dc61042828041fb59c7') diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD index 4c5a23f7e..750e87407 100644 --- a/extra/fakechroot/PKGBUILD +++ b/extra/fakechroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 109836 2011-02-13 10:43:46Z allan $ +# $Id: PKGBUILD 139553 2011-10-03 12:37:11Z allan $ # Maintainer : Allan McRae # Contributor: Aaron Griffin pkgname=fakechroot -pkgver=2.14 +pkgver=2.15 pkgrel=1 pkgdesc="Gives a fake chroot environment" arch=('i686' 'x86_64') @@ -12,18 +12,20 @@ license=('LGPL') options=('!libtool') install=fakechroot.install source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz) -md5sums=('264c4e3f9a2264ab57e286682f9c4ad2') +md5sums=('ce8bdde1d30274e124e8ecf8f59681ff') -build() -{ +build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make check } -package() -{ +package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index d448e4eb2..fea27eed6 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 137540 2011-09-09 07:00:04Z andrea $ +# $Id: PKGBUILD 139597 2011-10-03 17:18:33Z andrea $ # Maintainer: Andrea Scarpino # Contributor: csslayer pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.1.1 +pkgver=4.1.2 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu') source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('465ede4722d2bb0c7fcf2d1a5206c9ce922902a4') +sha1sums=('d2d4e725b1c2ed60543d466504954b631d5689e3') build() { cd "${srcdir}" diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD index 0c5e2dc3e..fe83158e8 100644 --- a/extra/gdl/PKGBUILD +++ b/extra/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139269 2011-10-01 18:57:05Z ibiru $ +# $Id: PKGBUILD 139625 2011-10-03 20:22:38Z ibiru $ # Maintainer: Jan de Groot pkgname=gdl -pkgver=3.1.5 +pkgver=3.2.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=('b89a30a7df499f3ee74108bb28ac46a962dc5e94c4e50fe34c8f9cf1580db482') +sha256sums=('f4839224b7837efb8fbec8666f8a3bb1ce9ea110f06c57a8b9438faa0abab533') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index d93c3b09e..a1f5cef60 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 138474 2011-09-24 15:33:33Z dan $ +# $Id: PKGBUILD 139595 2011-10-03 14:35:14Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.6.4 -_manver=1.7.6.1 +pkgver=1.7.7 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -24,8 +23,9 @@ replaces=('git-core') provides=('git-core') backup=('etc/conf.d/git-daemon.conf') #source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" +# "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2" source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" - "http://kernel.org/pub/software/scm/git/git-manpages-$_manver.tar.bz2" + "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" git-daemon git-daemon.conf) changelog=ChangeLog @@ -80,11 +80,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('e0b7afcc0e5e43bbb82f85598ae34bd8' - 'cae559424a62507cb2c15252d85a158e' +md5sums=('5d645884e688921e773186783b65ce33' + '2ee47bd79dfd391bc7d1b466539b9734' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6' - 'faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44' +sha256sums=('5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6' + 'dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/gnome-media/PKGBUILD b/extra/gnome-media/PKGBUILD index 8e8d3da64..5697957f8 100644 --- a/extra/gnome-media/PKGBUILD +++ b/extra/gnome-media/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 111636 2011-02-27 21:57:39Z ibiru $ +# $Id: PKGBUILD 139627 2011-10-03 20:26:30Z ibiru $ # Maintainer: Jan de Groot pkgname=gnome-media pkgver=2.91.2 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME Media Tools" arch=('i686' 'x86_64') license=('GPL') depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme') makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') url="http://www.gnome.org" -groups=('gnome') -replaces=('gnome-media-pulse') +groups=('gnome-extra') options=('!libtool' '!emptydirs') install=gnome-media.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index ab9dbadde..0132134cd 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139319 2011-10-01 18:58:22Z ibiru $ +# $Id: PKGBUILD 139631 2011-10-03 21:04:24Z ibiru $ # Maintainer: Jan de Groot pkgname=gnome-settings-daemon pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -15,11 +15,14 @@ url="http://www.gnome.org" groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +fix_color_crash.patch) +sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b' + 'b249d21702d4cf9a3a8dc177ba17c00d33e8e742e548811552d79ddeff1e91e3') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix_color_crash.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \ --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids diff --git a/extra/gnome-settings-daemon/fix_color_crash.patch b/extra/gnome-settings-daemon/fix_color_crash.patch new file mode 100644 index 000000000..24602100f --- /dev/null +++ b/extra/gnome-settings-daemon/fix_color_crash.patch @@ -0,0 +1,186 @@ +From fd4c0057b8e3f72b30acb6f1c82688e29b31c0c0 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 03 Oct 2011 08:52:06 +0000 +Subject: color: Fix a crash if ~/.local is deleted at runtime + +Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660664 +--- +diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c +index d325162..3dde406 100644 +--- a/plugins/color/gcm-profile-store.c ++++ b/plugins/color/gcm-profile-store.c +@@ -254,6 +254,8 @@ gcm_profile_store_process_child (GcmProfileStore *profile_store, + + /* check we're not in a loop */ + helper = gcm_profile_store_find_directory (profile_store, path); ++ if (helper == NULL) ++ goto out; + if (helper->depth > GCM_PROFILE_STORE_MAX_RECURSION_LEVELS) { + g_warning ("recursing more than %i levels deep is insane", + GCM_PROFILE_STORE_MAX_RECURSION_LEVELS); +-- +cgit v0.9.0.2 +From e3313eb16fd2cb25ab3fbc010837b910e525acf6 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 03 Oct 2011 10:02:56 +0000 +Subject: color: Simplify gcm_profile_store_mkdir_with_parents() + +No need to check for the path existing, +g_file_make_directory_with_parents() will do that for us. +--- +(limited to 'plugins/color/gcm-profile-store.c') + +diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c +index 3dde406..d705604 100644 +--- a/plugins/color/gcm-profile-store.c ++++ b/plugins/color/gcm-profile-store.c +@@ -419,19 +419,12 @@ static gboolean + gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error) + { + gboolean ret; +- GFile *file = NULL; + + /* ensure destination exists */ +- ret = g_file_test (filename, G_FILE_TEST_EXISTS); +- if (!ret) { +- file = g_file_new_for_path (filename); +- ret = g_file_make_directory_with_parents (file, NULL, error); +- if (!ret) +- goto out; +- } +-out: +- if (file != NULL) +- g_object_unref (file); ++ file = g_file_new_for_path (filename); ++ ret = g_file_make_directory_with_parents (file, NULL, error); ++ g_object_unref (file); ++ + return ret; + } + +-- +cgit v0.9.0.2 +From a711ba99fd5a9bc7bf79dcdc763deed39440eb86 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 03 Oct 2011 10:38:36 +0000 +Subject: Make commit e3313eb16fd2cb25ab3fbc010837b910e525acf6 actually compile + +--- +(limited to 'plugins/color/gcm-profile-store.c') + +diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c +index d705604..0b3cfa0 100644 +--- a/plugins/color/gcm-profile-store.c ++++ b/plugins/color/gcm-profile-store.c +@@ -419,6 +419,7 @@ static gboolean + gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error) + { + gboolean ret; ++ GFile *file; + + /* ensure destination exists */ + file = g_file_new_for_path (filename); +-- +cgit v0.9.0.2 +From 42fa1af884fda1590bc7af0f78e4fc70d0eb621b Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Mon, 03 Oct 2011 10:34:04 +0000 +Subject: color: Cancel any in-progress directory searching on plugin unload + +--- +diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c +index 0b3cfa0..bcb7adc 100644 +--- a/plugins/color/gcm-profile-store.c ++++ b/plugins/color/gcm-profile-store.c +@@ -34,6 +34,7 @@ struct _GcmProfileStorePrivate + { + GPtrArray *filename_array; + GPtrArray *directory_array; ++ GCancellable *cancellable; + }; + + enum { +@@ -326,7 +327,7 @@ gcm_profile_store_next_files_cb (GObject *source_object, + g_file_enumerator_next_files_async (enumerator, + 5, + G_PRIORITY_LOW, +- NULL, ++ profile_store->priv->cancellable, + gcm_profile_store_next_files_cb, + user_data); + +@@ -343,6 +344,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object, + gchar *path = NULL; + GError *error = NULL; + GFileEnumerator *enumerator; ++ GcmProfileStore *profile_store = GCM_PROFILE_STORE (user_data); + + enumerator = g_file_enumerate_children_finish (G_FILE (source_object), + res, +@@ -360,7 +362,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object, + g_file_enumerator_next_files_async (enumerator, + 5, + G_PRIORITY_LOW, +- NULL, ++ profile_store->priv->cancellable, + gcm_profile_store_next_files_cb, + user_data); + g_object_unref (enumerator); +@@ -407,7 +409,7 @@ gcm_profile_store_search_path (GcmProfileStore *profile_store, const gchar *path + G_FILE_ATTRIBUTE_STANDARD_TYPE, + G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, + G_PRIORITY_LOW, +- NULL, ++ profile_store->priv->cancellable, + gcm_profile_store_enumerate_children_cb, + profile_store); + out: +@@ -416,14 +418,16 @@ out: + } + + static gboolean +-gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error) ++gcm_profile_store_mkdir_with_parents (const gchar *filename, ++ GCancellable *cancellable, ++ GError **error) + { + gboolean ret; + GFile *file; + + /* ensure destination exists */ + file = g_file_new_for_path (filename); +- ret = g_file_make_directory_with_parents (file, NULL, error); ++ ret = g_file_make_directory_with_parents (file, cancellable, error); + g_object_unref (file); + + return ret; +@@ -438,7 +442,9 @@ gcm_profile_store_search (GcmProfileStore *profile_store) + + /* get Linux per-user profiles */ + path = g_build_filename (g_get_user_data_dir (), "icc", NULL); +- ret = gcm_profile_store_mkdir_with_parents (path, &error); ++ ret = gcm_profile_store_mkdir_with_parents (path, ++ profile_store->priv->cancellable, ++ &error); + if (!ret) { + g_warning ("failed to create directory on startup: %s", error->message); + g_error_free (error); +@@ -480,6 +486,7 @@ static void + gcm_profile_store_init (GcmProfileStore *profile_store) + { + profile_store->priv = GCM_PROFILE_STORE_GET_PRIVATE (profile_store); ++ profile_store->priv->cancellable = g_cancellable_new (); + profile_store->priv->filename_array = g_ptr_array_new_with_free_func (g_free); + profile_store->priv->directory_array = g_ptr_array_new_with_free_func ((GDestroyNotify) gcm_profile_store_helper_free); + } +@@ -490,6 +497,8 @@ gcm_profile_store_finalize (GObject *object) + GcmProfileStore *profile_store = GCM_PROFILE_STORE (object); + GcmProfileStorePrivate *priv = profile_store->priv; + ++ g_cancellable_cancel (profile_store->priv->cancellable); ++ g_object_unref (profile_store->priv->cancellable); + g_ptr_array_unref (priv->filename_array); + g_ptr_array_unref (priv->directory_array); + +-- +cgit v0.9.0.2 diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index cd594befa..cca232ee5 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130812 2011-07-08 04:52:51Z eric $ +# $Id: PKGBUILD 139548 2011-10-03 12:22:55Z jgc $ # Maintainer: Aaron Griffin # Contributor: Mark Schneider pkgname=gnucash pkgver=2.4.7 -pkgrel=1 +pkgrel=2 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') url="http://www.gnucash.org" diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 2fd9e4799..51531a917 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125165 2011-05-25 19:05:49Z foutrelis $ +# $Id: PKGBUILD 139544 2011-10-03 12:22:49Z jgc $ # Maintainer: Eric Belanger # Contributor: Kritoke pkgname=gnumeric -pkgver=1.10.15 -pkgrel=2 +pkgver=1.10.17 +pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/gnumeric/" @@ -16,8 +16,8 @@ optdepends=('pygobject: for python plugin support' 'yelp: for viewing the help manual') install=gnumeric.install options=('libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4343a8e72bd19380d83ab5d4937388b2327e0dbb6187296e66dc7ca2d2b9025a') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 0352c9453..a7a8f4fe9 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 124493 2011-05-22 15:24:56Z ibiru $ +# $Id: PKGBUILD 139546 2011-10-03 12:22:52Z jgc $ # Maintainer: Aaron Griffin pkgname=goffice -pkgver=0.8.15 +pkgver=0.8.17 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64') @@ -10,12 +10,16 @@ url="http://www.gnome.org" license=('GPL') options=('!libtool') depends=('gtk2' 'gconf' 'libgsf') -makedepends=('pkgconfig' 'intltool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6a6ddf9821ff1547ef1977c276fa5a7c6842a1b4cb90c923d600283260aecf58') +makedepends=('pkgconfig' 'intltool' 'gtk-doc') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + use-apiver-for-dirs.patch) +sha256sums=('165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15' + '4507a49f6ccb13e55c0b3cc6831b7e0dcec7badb58a3661190e843f8607fa270') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i "${srcdir}/use-apiver-for-dirs.patch" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make diff --git a/extra/goffice/use-apiver-for-dirs.patch b/extra/goffice/use-apiver-for-dirs.patch new file mode 100644 index 000000000..3d0909da3 --- /dev/null +++ b/extra/goffice/use-apiver-for-dirs.patch @@ -0,0 +1,32 @@ +--- configure.in.orig 2011-09-07 08:45:49.687783970 +0000 ++++ configure.in 2011-09-07 09:12:55.709382840 +0000 +@@ -418,7 +418,7 @@ + fi + + dnl ************************************************** +-AC_SUBST(GETTEXT_PACKAGE, goffice-${VERSION}) ++AC_SUBST(GETTEXT_PACKAGE, goffice-${GOFFICE_API_VER}) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The package name, for gettext]) + AM_GLIB_GNU_GETTEXT +@@ -638,9 +638,9 @@ + dnl ****************** + dnl + dnl These are changed in goffice.c for WIN32 packages +-AC_SUBST(goffice_datadir, '${datadir}/goffice/${VERSION}') +-AC_SUBST(goffice_libdir, '${libdir}/goffice/${VERSION}') +-AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${VERSION}') ++AC_SUBST(goffice_datadir, '${datadir}/goffice/${GOFFICE_API_VER}') ++AC_SUBST(goffice_libdir, '${libdir}/goffice/${GOFFICE_API_VER}') ++AC_SUBST(goffice_icondir, '${datadir}/pixmaps/goffice/${GOFFICE_API_VER}') + AC_SUBST(goffice_localedir, '${prefix}/${DATADIRNAME}/locale') + dnl + AC_SUBST(goffice_plugindir, '${goffice_libdir}/plugins') +--- libgoffice.pc.in.orig 2010-02-18 22:49:39.000000000 +0000 ++++ libgoffice.pc.in 2011-09-07 09:18:53.655992532 +0000 +@@ -11,4 +11,4 @@ + Libs.private: @EXTRA_LIBS@ + Cflags: -I${includedir}/libgoffice-@GOFFICE_API_VER@ @EXTRA_INCLUDES@ + +-PluginDir=${libdir}/goffice/@VERSION@/plugins ++PluginDir=${libdir}/goffice/@GOFFICE_API_VER@/plugins diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 0c352df2a..b57eefce4 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 139338 2011-10-01 18:58:50Z ibiru $ +# $Id: PKGBUILD 139613 2011-10-03 19:05:35Z heftig $ # Maintainer: Jan "heftig" Steffens pkgname=grilo-plugins pkgver=0.1.17 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') license=('LGPL') depends=('grilo') -makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest') +makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest' 'libtracker-sparql') optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'quvi: Youtube plugin' @@ -18,13 +18,18 @@ optdepends=('gupnp-av: uPnP plugin' 'sqlite3: Bookmarks plugin' 'sqlite3: Metadata store plugin' 'libgcrypt: Vimeo plugin' - 'rest: Blip.tv plugin') + 'rest: Blip.tv plugin' + 'libtracker-sparql: Tracker plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) sha256sums=('c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # support tracker 0.12, already fixed in git master. + sed -i 's/sparql-0.11/sparql-0.12/g' configure + ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ --enable-shoutcast make diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index e37c1ef09..aa78f6b01 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139341 2011-10-01 18:58:54Z ibiru $ +# $Id: PKGBUILD 139610 2011-10-03 19:05:04Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: György Balló pkgname=gssdp -pkgver=0.10.0 +pkgver=0.12.0 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('libsoup') makedepends=('gobject-introspection' 'gtk2' 'gtk-doc') optdepends=('gtk2: gssdp-device-sniffer') options=('!libtool') -source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) -sha256sums=('94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('7f02903989b4ac7cfb7508898706a5b4a01c9ace2f6345bd96bf8a3faa30ae1a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index a4f822080..0e60a45da 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139345 2011-10-01 18:59:03Z ibiru $ +# $Id: PKGBUILD 139599 2011-10-03 17:26:32Z ibiru $ # Maintainer: Ionut Biru pkgname=gtk3 pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -14,12 +14,15 @@ options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz - settings.ini) + settings.ini + a11y.patch::http://git.gnome.org/browse/gtk+/patch/?id=e248c6812e8e33150d61074471ef0330668aed45) sha256sums=('bce3c1a9be6afd7552c795268656d8fdd09c299765a7faaf5a76498bb82ed44c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + '0ae5f9c3553f9fc6c515343de96046c17544654936b17c09330443ed44778cb2') build() { cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/a11y.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD index a2a49d388..16dcc2de5 100644 --- a/extra/gupnp-av/PKGBUILD +++ b/extra/gupnp-av/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139358 2011-10-01 18:59:22Z ibiru $ +# $Id: PKGBUILD 139612 2011-10-03 19:05:21Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Thijs Vermeir # Contributor: Denis Zawada pkgname=gupnp-av -pkgver=0.8.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('LGPL') depends=('gupnp') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') -source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) -sha256sums=('e6aa032377488cedc4e347519bd30701c583780b7c54f00bab083f2316a93dc9') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('41aeb5d243426b293c315788b41bc79a2be1f466eeff114cf6c89a37140f507e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 9fcb01a55..5c8810754 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139356 2011-10-01 18:59:21Z ibiru $ +# $Id: PKGBUILD 139611 2011-10-03 19:05:21Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: György Balló pkgname=gupnp -pkgver=0.16.1 +pkgver=0.18.0 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('gssdp') makedepends=('gobject-introspection' 'gtk-doc') optdepends=('python2: gupnp-binding-tool') options=('!libtool') -source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz) -sha256sums=('f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('82f4758b26ef0531cf6301f526fe705f06c329eaef403bb30925128fcbb6a71a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,7 +22,7 @@ build() { sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static + --disable-static --with-context-manager=linux make } diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD index 17236fa71..49a0fe584 100644 --- a/extra/liblrdf/PKGBUILD +++ b/extra/liblrdf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130976 2011-07-09 09:47:10Z andyrtr $ +# $Id: PKGBUILD 139617 2011-10-03 19:42:49Z jgc $ # Maintainer: Giovanni Scafora pkgname=liblrdf pkgver=0.4.0 -pkgrel=8 +pkgrel=9 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf" @@ -13,16 +13,19 @@ license=('GPL') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz md5.patch - raptor2.diff) + raptor2.diff + pkgconfig-raptor.patch) groups=('ladspa-plugins') md5sums=('327a5674f671c4b360c6353800226877' - 'a6d231d052dc188cbc4c1039cf3a2003' - '80e938469da06a178e03107ca5b41e55') + 'a6d231d052dc188cbc4c1039cf3a2003' + '80e938469da06a178e03107ca5b41e55' + '982ae1bd4b39c2fb5cba108fbcbfbad1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/md5.patch - patch -Np0 -i ${srcdir}/raptor2.diff + patch -Np1 -i "${srcdir}/md5.patch" + patch -Np0 -i "${srcdir}/raptor2.diff" + patch -Np1 -i "${srcdir}/pkgconfig-raptor.patch" autoreconf -vfi ./configure --prefix=/usr make diff --git a/extra/liblrdf/pkgconfig-raptor.patch b/extra/liblrdf/pkgconfig-raptor.patch new file mode 100644 index 000000000..c68f1f1b5 --- /dev/null +++ b/extra/liblrdf/pkgconfig-raptor.patch @@ -0,0 +1,9 @@ +--- liblrdf-0.4.0/lrdf.pc.in.orig 2011-10-03 19:28:16.702773254 +0000 ++++ liblrdf-0.4.0/lrdf.pc.in 2011-10-03 19:28:43.003017477 +0000 +@@ -7,4 +7,5 @@ + Version: @VERSION@ + Description: liblrdf, a lightweight RDF library with extensions for LADSPA + Libs: -L${libdir} -llrdf +-Cflags: -I${includedir} ++Libs.private: @RAPTOR_LIBS@ ++Cflags: @RAPTOR_CFLAGS@ -I${includedir} diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD index c00b18954..c9b11d1c0 100644 --- a/extra/libmowgli/PKGBUILD +++ b/extra/libmowgli/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119898 2011-04-16 22:56:08Z bisson $ +# $Id: PKGBUILD 139564 2011-10-03 13:29:22Z bisson $ # Contributor: Alexander Fehr # Contributor: Brad Gordon # Maintainer: Gaetan Bisson pkgname=libmowgli -pkgver=0.9.50 +pkgver=0.9.95 pkgrel=1 pkgdesc='Performance and usability-oriented extensions to C' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://www.atheme.org/project/mowgli' license=('custom') depends=('glibc') source=("http://distfiles.atheme.org/libmowgli-${pkgver}.tar.bz2") -sha1sums=('51cac29a5670561e63dd9346820d61e6fd409e88') +sha1sums=('50d32d4d84f2438382c203bd7c85adc976683c25') build() { cd "${srcdir}/libmowgli-${pkgver}" diff --git a/extra/mail-notification/PKGBUILD b/extra/mail-notification/PKGBUILD index b5b1deeff..edb5a8d03 100644 --- a/extra/mail-notification/PKGBUILD +++ b/extra/mail-notification/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 119734 2011-04-14 10:44:43Z jgc $ +# $Id: PKGBUILD 139560 2011-10-03 13:09:05Z jgc $ # Maintainer: Roman Kyrylych pkgname=mail-notification pkgver=5.4 -pkgrel=8 +pkgrel=9 pkgdesc="Tray icon application that informs you if you have new mail" arch=('i686' 'x86_64') url="http://www.nongnu.org/mailnotify/" license=('GPL3' 'FDL') -depends=('cyrus-sasl-plugins' 'gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') -makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils') +depends=('gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') +makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2') options=('!libtool' '!emptydirs') install=mail-notification.install -source=(http://savannah.nongnu.org/download/mailnotify/${pkgname}-${pkgver}.tar.bz2 +source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}.tar.bz2 dont-update-cache.patch remove-ubuntu-special-case.patch mail-notification-5.4-evolution.patch @@ -39,8 +39,8 @@ md5sums=('c8dc33a61251acb5474e56eab6b18f43' '31bde95dfd39449959d8b3316f91429c' 'cdead6a88d1779f69a5f40dc75d5cb84' 'c7991b831834724eddc1c6802c3e06a6' - '49fe910f68393b0f6a1f1bcb7a8bdcd3' - '55ed1aeb56ca053cc1a0a6062761c2b4' + 'b370b1085ebb2814bd5d345a6d2b45ea' + '1ba948759110787dd57097cff157b75a' '09df61b4dc29c676ac81ff9054e840ac') build() { diff --git a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch index 51a0eb519..51938b5fa 100644 --- a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch +++ b/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch @@ -28,6 +28,18 @@ #include #include #include "mn-evolution.h" +@@ -240,7 +241,11 @@ + EMEventTargetFolder *folder) + { + if (evo_server) ++#if EDS_CHECK_VERSION(3,1,0) ++ mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name)); ++#else + mn_evolution_server_folder_changed(evo_server, folder->uri); ++#endif + } + + void @@ -249,10 +250,16 @@ { if (evo_server) @@ -38,7 +50,7 @@ +#else + char *url = mail_tools_folder_to_url(message->folder); +#endif - + - url = mail_tools_folder_to_url(message->folder); mn_evolution_server_message_reading(evo_server, url); + @@ -68,3 +80,43 @@ if (folder) self_cache_folder(uri, folder); else +@@ -677,7 +681,12 @@ + folder = self_lookup_folder(folder_uri, err); + if (folder) + { ++#if EDS_CHECK_VERSION(3,1,0) ++ *ret = g_strdup(camel_folder_get_display_name(folder)); ++#else + *ret = g_strdup(camel_folder_get_name(folder)); ++#endif ++ + #if EDS_CHECK_VERSION(2,31,0) + g_object_unref(folder); + #else +@@ -725,8 +734,12 @@ + shell = e_shell_get_default (); + shell_backend = e_shell_get_backend_by_name (shell, "mail"); + +- browser = e_mail_browser_new (shell_backend); ++ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend)); ++#if EDS_CHECK_VERSION(3,1,0) ++ e_mail_reader_set_folder (E_MAIL_READER (browser), folder); ++#else + e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri); ++#endif + e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); + gtk_widget_show (browser); + #else +--- build/src/mn-evolution-folder-tree-server.c.orig 2011-06-17 22:01:49.226886994 +0200 ++++ build/src/mn-evolution-folder-tree-server.c 2011-06-18 00:34:23.046889847 +0200 +@@ -444,7 +444,9 @@ + { + #line 61 "src/mn-evolution-folder-tree-server.gob" + +-#if EDS_CHECK_VERSION(2,91,0) ++#if EDS_CHECK_VERSION(3,1,0) ++ selfp->tree = em_folder_tree_new(NULL, NULL); ++#elif EDS_CHECK_VERSION(2,91,0) + selfp->session = e_mail_session_new(); + selfp->tree = em_folder_tree_new(selfp->session); + #elif EDS_CHECK_VERSION(2,29,0) diff --git a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch b/extra/mail-notification/mail-notification-5.4-gtk3-support.patch index cd19c2e84..6a29f8622 100644 --- a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch +++ b/extra/mail-notification/mail-notification-5.4-gtk3-support.patch @@ -20,7 +20,7 @@ + jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-3.0 libgnome-2.0 >= 2.14.0 gnome-vfs-2.0 libxml-2.0 libnotify >= 0.4.1"); jb_require_packages("D-Bus", "dbus", "dbus-glib-1"); - jb_check_packages_for_options("GMime", "gmime", "gmime-2.4", + jb_check_packages_for_options("GMime", "gmime", "gmime-2.6", --- build/src/mn-file-chooser-button.c.orig 2011-02-02 23:38:01.503049512 +0100 +++ build/src/mn-file-chooser-button.c 2011-02-02 23:38:16.988222034 +0100 @@ -358,7 +358,7 @@ @@ -545,7 +545,7 @@ + int y; + + gtk_widget_get_allocation(widget, &allocation); -+ y = allocation.y; ++ y = 0; - if (! GTK_WIDGET_DRAWABLE(widget)) + if (! gtk_widget_is_drawable(widget)) @@ -557,7 +557,7 @@ Row *row = g_ptr_array_index(selfp->rows, i); int j; - int x = widget->allocation.x; -+ int x = allocation.x; ++ int x = 0; int column = 0; MN_ARRAY_FOREACH(j, row->cells) @@ -587,6 +587,20 @@ #line 109 "mn-tooltips.c" #line 308 "src/mn-tooltips.gob" static void mn_tooltips_draw_tips (MNTooltips * self); +@@ -422,7 +422,13 @@ + + if (! selfp->window) + { ++ GtkStyleContext *ctx; ++ + selfp->window = gtk_window_new(GTK_WINDOW_POPUP); ++ ++ ctx = gtk_widget_get_style_context(GTK_WIDGET(selfp->window)); ++ gtk_style_context_add_class(ctx, "tooltip"); ++ + self_update_screen(self, TRUE); + gtk_widget_set_app_paintable(selfp->window, TRUE); + gtk_window_set_resizable(GTK_WINDOW(selfp->window), FALSE); @@ -430,7 +430,7 @@ gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width); @@ -614,23 +628,32 @@ { #line 600 "mn-tooltips.c" #define __GOB_FUNCTION__ "MN:Tooltips::paint_window" -@@ -608,13 +608,12 @@ +@@ -608,18 +608,13 @@ GtkRequisition req; - gtk_widget_size_request(selfp->window, &req); - gtk_paint_flat_box(selfp->window->style, - selfp->window->window, -+ gtk_widget_size_request(GTK_WIDGET(selfp), &req); -+ gtk_paint_flat_box(gtk_widget_get_style(GTK_WIDGET(selfp)), -+ cr, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - NULL, +- GTK_STATE_NORMAL, +- GTK_SHADOW_OUT, +- NULL, - selfp->window, - "tooltip", - 0, - 0, +- "tooltip", +- 0, +- 0, +- req.width, +- req.height); ++ gtk_widget_size_request(GTK_WIDGET(selfp->window), &req); ++ gtk_render_background(gtk_widget_get_style_context(GTK_WIDGET(selfp->window)), ++ cr, ++ 0, ++ 0, ++ req.width, ++ req.height); + + return FALSE; + }} @@ -651,10 +650,11 @@ gint monitor_num, px, py; GdkRectangle monitor; @@ -1380,3 +1403,14 @@ #include "mn-util.h" #include "mn-conf.h" #include "mn-shell.h" +--- data/mail-notification.desktop.in.orig 2011-07-08 13:46:52.327548264 +0200 ++++ data/mail-notification.desktop.in 2011-07-08 13:47:00.732704467 +0200 +@@ -5,7 +5,7 @@ + _Comment=Get notified when new mail arrives + Type=Application + Categories=GNOME;GTK;Network;Email; +-Exec=mail-notification --sm-disable ++Exec=mail-notification + Terminal=false + StartupNotify=true + X-GNOME-DocPath=mail-notification/mail-notification.xml diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index bcf5e453d..e517de22b 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134671 2011-08-07 11:28:53Z andyrtr $ +# $Id: PKGBUILD 139590 2011-10-03 14:23:27Z andyrtr $ # Maintainer: Andreas Radke # Contributor: rabyte # Contributor: Johannes Krampf pkgname=midori pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64') url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" @@ -14,11 +14,19 @@ install=midori.install depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') -source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2) -md5sums=('14aa14ccabf3d003903f1584dab15d7a') +source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2 + webkit_search.diff) +md5sums=('14aa14ccabf3d003903f1584dab15d7a' + '293c026e1875145e0df9584e1ff2a70e') +sha1sums=('c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585' + '82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # FS#26207 + patch -Np1 -i ${srcdir}/webkit_search.diff + # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf diff --git a/extra/midori/webkit_search.diff b/extra/midori/webkit_search.diff new file mode 100644 index 000000000..620cdc96f --- /dev/null +++ b/extra/midori/webkit_search.diff @@ -0,0 +1,59 @@ +From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001 +From: Christian Dywan +Date: Wed, 21 Sep 2011 21:50:51 +0000 +Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1 + +Fixes: https://bugs.launchpad.net/midori/+bug/799603 +--- +diff --git a/midori/midori-view.c b/midori/midori-view.c +index 0d7a96e..e426e7f 100644 +--- a/midori/midori-view.c ++++ b/midori/midori-view.c +@@ -39,9 +39,11 @@ + #include + #endif + ++#if !WEBKIT_CHECK_VERSION (1, 5, 1) + /* This is unstable API, so we need to declare it */ + gchar* + webkit_web_view_get_selected_text (WebKitWebView* web_view); ++#endif + + static void + midori_view_construct_web_view (MidoriView* view); +@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view) + gboolean + midori_view_has_selection (MidoriView* view) + { ++#if WEBKIT_CHECK_VERSION (1, 5, 1) ++ WebKitDOMDocument* doc; ++ WebKitDOMDOMWindow* window; ++ WebKitDOMDOMSelection* selection; ++ WebKitDOMRange* range; ++#endif ++ + g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); + ++ ++#if WEBKIT_CHECK_VERSION (1, 5, 1) ++ doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view)); ++ window = webkit_dom_document_get_default_view (doc); ++ selection = webkit_dom_dom_window_get_selection (window); ++ if (selection == NULL) ++ return FALSE; ++ ++ range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL); ++ if (range == NULL) ++ return FALSE; ++ ++ katze_assign (view->selected_text, webkit_dom_range_get_text (range)); ++#else + katze_assign (view->selected_text, webkit_web_view_get_selected_text ( + WEBKIT_WEB_VIEW (view->web_view))); ++#endif ++ + if (view->selected_text && *view->selected_text) + return TRUE; + else +-- +cgit diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index 59de81965..34d7c3c11 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139447 2011-10-01 19:01:50Z ibiru $ +# $Id: PKGBUILD 139536 2011-10-03 11:27:50Z ibiru $ # Maintainer: Jan de Groot pkgname=upower -pkgver=0.9.13 -pkgrel=2 +pkgver=0.9.14 +pkgrel=1 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" @@ -13,7 +13,7 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection') replaces=('devicekit-power') options=('!libtool') source=($url/releases/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2c7dd2c26d11da628d68111d50eed51244a8337c1d0830addecd1372a7d44a22') +sha256sums=('81eb44c0453b264a737d32f763a31d5b1776f050a47d5be85fc5e9caf874a4c5') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v1.2.3-54-g00ecf