Hello community, here is the log from the commit of package gwibber for openSUSE:Factory checked in at 2013-05-28 07:38:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwibber (Old) and /work/SRC/openSUSE:Factory/.gwibber.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gwibber" Changes: -------- --- /work/SRC/openSUSE:Factory/gwibber/gwibber.changes 2012-09-23 21:04:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gwibber.new/gwibber.changes 2013-05-28 07:38:10.000000000 +0200 @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Thu May 16 15:23:27 CEST 2013 - [email protected] + +- Add gwibber-3.4.2-spell-disable.patch: Allow to correctly disable + gtkspell support. +- Change the pkgconfig(gtkspell-3.0) BuildRequires to be only + conditionally applicable, on openSUSE < 13.1, where it still + existed. +- On openSUSE > 12.3, pass --disable-spell to configure: openSUSE + 13.1 ships gtkspell3 with the new API, which is not supported by + Gwibber. + New: ---- gwibber-3.4.2-spell-disable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwibber.spec ++++++ --- /var/tmp/diff_new_pack.iCYhLI/_old 2013-05-28 07:38:11.000000000 +0200 +++ /var/tmp/diff_new_pack.iCYhLI/_new 2013-05-28 07:38:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gwibber # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 Andrew Wafaa # # All modifications and additions to the file contributed by third parties @@ -32,6 +32,8 @@ Patch0: gwibber-stnx.diff # PATCH-FIX-OPENSUSE gwibber-sqlite-migrate-opensuse.diff [email protected] -- Fix migration from 11.3's gwibber Patch3: gwibber-sqlite-migrate-opensuse.diff +# PATCH-FIX-UPSTREAM gwibber-3.4.2-spell-disable.patch lp#1180797 [email protected] -- If spell is disabled, really disable it +Patch4: gwibber-3.4.2-spell-disable.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: intltool @@ -45,7 +47,9 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) +%if 0%?suse_version < 1310 BuildRequires: pkgconfig(gtkspell-3.0) +%endif BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libsoup-2.4) @@ -84,10 +88,17 @@ %setup -q %patch0 -p1 %patch3 -p1 +%patch4 +%if 0%?suse_version > 1230 +sed -i 's|gtkspell-3.0|gtkspell3-3.0|g' configure +%endif %build %configure \ --disable-static \ +%if 0%?suse_version > 1230 + --disable-spell \ +%endif --disable-unity make %{?_smp_mflags} ++++++ gwibber-3.4.2-spell-disable.patch ++++++ Index: libgwibber-gtk/entry.c =================================================================== --- libgwibber-gtk/entry.c.orig +++ libgwibber-gtk/entry.c @@ -30,7 +30,9 @@ #include <stdlib.h> #include <string.h> #include <gdk/gdk.h> +#if HAVE_GTKSPELL #include <gtkspell/gtkspell.h> +#endif #include <cairo.h> #include <float.h> #include <math.h> @@ -879,6 +881,7 @@ static GObject * gwibber_gtk_input_text_ _tmp19_ = self->conn_service; g_signal_connect_object (_tmp19_, "connection-changed", (GCallback) __gwibber_gtk_input_text_view___lambda9__gwibber_connection_connection_changed, self, 0); { +#if HAVE_GTKSPELL GtkSpell* _tmp20_; GtkSpell* spell; _tmp20_ = gtkspell_new_attach ((GtkTextView*) self, NULL, &_inner_error_); @@ -887,6 +890,7 @@ static GObject * gwibber_gtk_input_text_ goto __catch8_g_error; } _0 (spell); +#endif } goto __finally8; __catch8_g_error: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
