commit 740e5f43c60756ca64b2de65ed2e218b24f751b7
Author: Jakub Bogusz <[email protected]>
Date: Sun Feb 24 15:30:55 2013 +0100
- added system-xulrunner patch to fix makefile issue; only xulrunner 18.x
is supported though
iceape-system-xulrunner.patch | 11 +++++++++++
iceape.spec | 5 ++++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/iceape.spec b/iceape.spec
index 0ee3ae4..ace2ef1 100644
--- a/iceape.spec
+++ b/iceape.spec
@@ -16,7 +16,7 @@
%define enigmail_ver 1.5.1
%define nspr_ver 4.9.3
%define nss_ver 3.14.1
-%define xulrunner_ver 18.0
+%define xulrunner_ver 18.0.2
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
@@ -55,6 +55,7 @@ Patch6: system-cairo.patch
# Edit patch below and restore --system-site-packages when system virtualenv
gets 1.7 upgrade
Patch7: system-virtualenv.patch
Patch8: gyp-slashism.patch
+Patch9: %{name}-system-xulrunner.patch
URL: http://www.pld-linux.org/Packages/Iceape
BuildRequires: GConf2-devel >= 1.2.1
BuildRequires: OpenGL-devel
@@ -107,6 +108,7 @@ BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXt-devel
%if %{with xulrunner}
BuildRequires: xulrunner-devel >= 2:%{xulrunner_ver}
+BuildRequires: xulrunner-devel < 2:19
%endif
BuildRequires: yasm
BuildRequires: zip
@@ -275,6 +277,7 @@ tar -jxf %{SOURCE2}
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p2
%build
cd comm-release
diff --git a/iceape-system-xulrunner.patch b/iceape-system-xulrunner.patch
new file mode 100644
index 0000000..353c6df
--- /dev/null
+++ b/iceape-system-xulrunner.patch
@@ -0,0 +1,11 @@
+--- iceape-2.15.2/comm-release/suite/browser/Makefile.in.orig 2013-02-03
09:04:13.000000000 +0100
++++ iceape-2.15.2/comm-release/suite/browser/Makefile.in 2013-02-24
15:15:09.573091923 +0100
+@@ -26,7 +26,7 @@
+
+ ifdef LIBXUL_SDK
+ PREF_JS_EXPORTS += \
+- $(srcdir)/channel-prefs.js
++ $(srcdir)/channel-prefs.js \
+ $(NULL)
+ endif
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/740e5f43c60756ca64b2de65ed2e218b24f751b7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
