[packages/xulrunner/DEVEL] - up to 16.0.1, compile failures

glen glen at pld-linux.org
Fri Oct 19 09:14:52 CEST 2012


commit fccc909d9077dad93192a910fbafd8bf72acf18e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Oct 19 10:14:26 2012 +0300

    - up to 16.0.1, compile failures

 xulrunner-gtkmozembed.patch | 17 ++++++++---------
 xulrunner.spec              | 10 +++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 20729d5..8aa2905 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -23,18 +23,18 @@
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
-Version:	15.0
-Release:	1
+Version:	16.0.1
+Release:	0.1
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
 # Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
 # instead of waiting for mozilla to copy file on ftp.
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	64220887a349515f16e5aa990acb4db3
+# Source0-md5:	78e641c67dc4a40cb3f48fce3e782d41
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-rpath.patch
-Patch4:		%{name}-paths.patch
+#Patch4:		%{name}-paths.patch
 Patch5:		%{name}-pc.patch
 Patch6:		%{name}-prefs.patch
 Patch7:		system-cairo.patch
@@ -187,7 +187,7 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 
 %patch0 -p2
 %patch1 -p1
-%patch4 -p1
+#%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p2
diff --git a/xulrunner-gtkmozembed.patch b/xulrunner-gtkmozembed.patch
index 3747ebb..400739d 100644
--- a/xulrunner-gtkmozembed.patch
+++ b/xulrunner-gtkmozembed.patch
@@ -8761,18 +8761,17 @@ diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSoc
 +    fprintf(stderr, "Can't fork.\n");
 +  }
 +}
-diff -up xulrunner-11.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulrunner-11.0/mozilla-beta/toolkit/library/Makefile.in
---- xulrunner-11.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed	2012-03-09 01:40:05.000000000 +0100
-+++ xulrunner-11.0/mozilla-beta/toolkit/library/Makefile.in	2012-03-09 15:19:22.268678765 +0100
-@@ -73,6 +73,8 @@ CPPSRCS += dlldeps-xul.cpp
- endif
+--- xulrunner-16.0.1/mozilla/toolkit/library/Makefile.in~	2012-10-11 00:43:51.000000000 +0300
++++ xulrunner-16.0.1/mozilla/toolkit/library/Makefile.in	2012-10-19 01:36:08.665153714 +0300
+@@ -177,6 +177,8 @@
  
- ifneq (,$(MOZ_ENABLE_GTK2))
+ ifdef MOZ_XUL
+ ifdef MOZ_ENABLE_GTK2
 +SHARED_LIBRARY_LIBS += \
 +  $(DEPTH)/embedding/browser/gtk/src/$(LIB_PREFIX)gtkembedmoz.$(LIB_SUFFIX)
- DEFINES += -DMOZ_ENABLE_GTK2
- endif
- 
+ COMPONENT_LIBS += \
+   unixproxy \
+   $(NULL)
 diff -up xulrunner-11.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-11.0/mozilla-beta/toolkit/toolkit-makefiles.sh
 --- xulrunner-11.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed	2012-03-09 01:40:06.000000000 +0100
 +++ xulrunner-11.0/mozilla-beta/toolkit/toolkit-makefiles.sh	2012-03-09 15:19:22.268678765 +0100
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/fccc909d9077dad93192a910fbafd8bf72acf18e



More information about the pld-cvs-commit mailing list