[xulrunner/f14/master] build fix
Martin Stransky
stransky at fedoraproject.org
Mon Aug 9 13:06:53 UTC 2010
commit 2406a7b668f03dab0749d25121d2da3f454c4598
Author: Martin Stransky <stransky at redhat.com>
Date: Mon Aug 9 15:04:17 2010 +0200
build fix
mozilla-gdk-pixbuf.patch | 15 +++++++++++++++
xulrunner.spec | 7 ++++++-
2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/mozilla-gdk-pixbuf.patch b/mozilla-gdk-pixbuf.patch
new file mode 100644
index 0000000..0596b1b
--- /dev/null
+++ b/mozilla-gdk-pixbuf.patch
@@ -0,0 +1,15 @@
+diff -up mozilla-1.9.2/configure.in.gdk-pixbuf mozilla-1.9.2/configure.in
+--- mozilla-1.9.2/configure.in.gdk-pixbuf 2010-07-13 21:10:45.000000000 +0200
++++ mozilla-1.9.2/configure.in 2010-08-03 15:38:43.113733420 +0200
+@@ -5354,7 +5354,10 @@ then
+ then
+ if test "$MOZ_ENABLE_LIBNOTIFY"
+ then
+- PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION)
++ dnl Code which requires gdk-pixbuf is only in
++ dnl toolkit/system/gnome/nsAlertsIconListener.cpp and is compiled
++ dnl only when libnotify is enabled
++ PKG_CHECK_MODULES(MOZ_LIBNOTIFY, libnotify >= $LIBNOTIFY_VERSION gdk-pixbuf-2.0 gtk+-2.0)
+ fi
+ fi
+ fi
diff --git a/xulrunner.spec b/xulrunner.spec
index 8abc8f4..b361a4f 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -23,7 +23,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9.2.7
-Release: 1%{?pretag}%{?dist}
+Release: 2%{?pretag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -44,6 +44,7 @@ Patch7: xulrunner-1.9.2.1-build.patch
Patch8: mozilla-plugin.patch
Patch9: mozilla-build-sbrk.patch
Patch10: mozilla-build-s390.patch
+Patch11: mozilla-gdk-pixbuf.patch
# Fedora specific patches
Patch20: mozilla-192-pkgconfig.patch
@@ -144,6 +145,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
%ifarch s390
%patch10 -p1 -b .s390
%endif
+%patch11 -p1 -b .gdk-pixbuf
%patch20 -p1 -b .pk
%patch21 -p2 -b .jpeg-turbo
@@ -452,6 +454,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Mon Aug 9 2010 Martin Stransky <stransky at redhat.com> 1.9.2.7-2
+- added build-fix by Adam Tkac <atkac at redhat.com>
+
* Tue Jul 20 2010 Jan Horak <jhorak at redhat.com> - 1.9.2.7-1
- Update to 1.9.2.7
More information about the scm-commits
mailing list