diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 3a826ef..d5c82cf 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 30 17:37:58 CEST 2010 - wr@rosenauer.org + +- fixed build with latest Gnome + (mozilla-gdk-pixbuf.patch) + ------------------------------------------------------------------- Sat Jul 24 17:22:58 CEST 2010 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 5af556a..4aa718a 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -27,7 +27,7 @@ BuildRequires: nss-shared-helper-devel License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ %define mainversion 3.1.1 Version: %{mainversion} -Release: 1 +Release: 2 %define releasedate 2010071400 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ @@ -49,6 +49,7 @@ Patch4: tb-ssldap.patch Patch5: tb-develdirs.patch Patch8: mozilla-helper-app.patch Patch9: mozilla-shared-nss-db.patch +Patch10: mozilla-gdk-pixbuf.patch Patch11: thunderbird-shared-nss-db.patch Patch13: mozilla-xsmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -133,7 +134,7 @@ symbols meant for upload to Mozilla's crash collector database. %package -n enigmail Version: 1.1.2 -Release: 1 +Release: 2 License: GPLv2+ ; MPLv1.1+ Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients @@ -160,6 +161,7 @@ pushd mozilla %patch1 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch13 -p1 popd # comm-central patches diff --git a/mozilla-gdk-pixbuf.patch b/mozilla-gdk-pixbuf.patch new file mode 100644 index 0000000..df2a1cc --- /dev/null +++ b/mozilla-gdk-pixbuf.patch @@ -0,0 +1,28 @@ +# HG changeset patch +# Parent bad58443f421fd09ef6366d359b8405ed50c3731 +diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in +--- a/toolkit/system/gnome/Makefile.in ++++ b/toolkit/system/gnome/Makefile.in +@@ -77,20 +77,22 @@ endif + EXTRA_DSO_LDOPTS += \ + $(XPCOM_GLUE_LDOPTS) \ + $(XPCOM_FROZEN_LDOPTS) \ + $(NSPR_LIBS) \ + $(MOZ_GCONF_LIBS) \ + $(MOZ_GNOMEVFS_LIBS) \ + $(GLIB_LIBS) \ + $(MOZ_LIBNOTIFY_LIBS) \ ++ $(MOZ_GTK2_LIBS) \ + $(NULL) + + LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ + + include $(topsrcdir)/config/rules.mk + + CXXFLAGS += \ + $(MOZ_GCONF_CFLAGS) \ + $(MOZ_GNOMEVFS_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(MOZ_LIBNOTIFY_CFLAGS) \ ++ $(MOZ_GTK2_CFLAGS) \ + $(NULL)