From d5effc9aadfb9ed5890376ca9497eef52fafcf83 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 14 Sep 2011 23:14:41 +0000 Subject: Wed Sep 14 23:14:41 UTC 2011 --- .../Bug_658631_crash_at_empathy_startup.patch | 41 ++++++++++++++++++++++ gnome-unstable/folks/PKGBUILD | 22 ++++++++---- gnome-unstable/gthumb/PKGBUILD | 35 ++++++++++++++++++ gnome-unstable/gthumb/gthumb.install | 24 +++++++++++++ 4 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch create mode 100644 gnome-unstable/gthumb/PKGBUILD create mode 100644 gnome-unstable/gthumb/gthumb.install (limited to 'gnome-unstable') diff --git a/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch b/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch new file mode 100644 index 000000000..6ba35bc02 --- /dev/null +++ b/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch @@ -0,0 +1,41 @@ +From 1f85f89051e63b05e271b418687c242a83e2f296 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Mon, 12 Sep 2011 22:09:10 +0000 +Subject: Bug 658631 — crash at empathy startup + +In the case that a persona is removed and the individual containing that +persona is replaced by a different non-null individual which doesn't contain +that persona (because it's been removed), we need to set the persona's +individual pointer to null rather than the replacement individual. + +This stops us tripping the assertion in the setter for Persona.individual. + +Closes: bgo#658631 +--- +diff --git a/folks/individual.vala b/folks/individual.vala +index 3b6c12b..59548ee 100644 +--- a/folks/individual.vala ++++ b/folks/individual.vala +@@ -1510,7 +1510,19 @@ public class Folks.Individual : Object, + * aggregator's rewritten, it would be nice to fix this. */ + if (persona.individual == this) + { +- persona.individual = replacement_individual; ++ /* It may be the case that the persona's being removed from the ++ * individual (i.e. the replacement individual is non-null, but ++ * doesn't contain this persona). In this case, we need to set the ++ * persona's individual to null. */ ++ if (replacement_individual != null && ++ persona in replacement_individual.personas) ++ { ++ persona.individual = replacement_individual; ++ } ++ else ++ { ++ persona.individual = null; ++ } + } + } + +-- +cgit v0.9.0.2 diff --git a/gnome-unstable/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD index 13ff2b06c..b4e164e5c 100644 --- a/gnome-unstable/folks/PKGBUILD +++ b/gnome-unstable/folks/PKGBUILD @@ -1,21 +1,31 @@ -# $Id: PKGBUILD 137520 2011-09-08 18:28:46Z ibiru $ +# $Id: PKGBUILD 138001 2011-09-13 21:34:06Z heftig $ # Maintainer: Ionut Biru pkgname=folks pkgver=0.6.2.1 -pkgrel=1 +pkgrel=2 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' 'libsocialweb') -makedepends=('gobject-introspection' 'vala' 'intltool') +makedepends=('gobject-introspection' 'vala' 'intltool' 'libtracker-sparql') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3eda79a71890b51b6f723067b61c32ef25e9041a9e188b483d7f23e3dcd328ee') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz + Bug_658631_crash_at_empathy_startup.patch) +sha256sums=('3eda79a71890b51b6f723067b61c32ef25e9041a9e188b483d7f23e3dcd328ee' + '4ef4caaab73e799fe31e7a93ba1f3f088e99f66600e644828bbcc4fb966c1196') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + + # Fix a crash + patch -Np1 -i "$srcdir/Bug_658631_crash_at_empathy_startup.patch" + find . -name '*.stamp' -delete + + # Change tracker version + grep -lr sparql-0.10 . | xargs sed -i 's/sparql-0.10/sparql-0.12/g' + + ./configure --prefix=/usr --enable-tracker-backend make } diff --git a/gnome-unstable/gthumb/PKGBUILD b/gnome-unstable/gthumb/PKGBUILD new file mode 100644 index 000000000..315dc1fd9 --- /dev/null +++ b/gnome-unstable/gthumb/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 137983 2011-09-13 21:08:13Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Tobias Kieslich + +pkgname=gthumb +pkgver=2.13.90 +pkgrel=1 +pkgdesc="Image browser and viewer for the GNOME Desktop" +arch=(i686 x86_64) +license=('GPL') +url="http://gthumb.sourceforge.net/" +depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2') +makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base') +optdepends=('gstreamer0.10-base: video support') +options=('!libtool' '!emptydirs') +install=gthumb.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('14d4dc212c9f924ff3161733842edccbf6b6ac5d829808ae11f8af29d10ac5de') +sha256sums=('d11f08bc7d513ea8c5340f5b36edd620b53e9ddfc0c8b31fcda284b720145e6a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/gthumb/gthumb.install b/gnome-unstable/gthumb/gthumb.install new file mode 100644 index 000000000..6046ebb6f --- /dev/null +++ b/gnome-unstable/gthumb/gthumb.install @@ -0,0 +1,24 @@ +pkgname=gthumb + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} -- cgit v1.2.3-54-g00ecf