[xulrunner] update to 6.0 - xulstup patch fix

Martin Stransky stransky at fedoraproject.org
Tue Aug 16 09:32:21 UTC 2011


commit b94c0a62d68d63b6fe16f5334d724ee6ba2c5078
Author: Martin Stransky <stransky at redhat.com>
Date:   Tue Aug 16 11:31:57 2011 +0200

    update to 6.0 - xulstup patch fix

 firefox-6.0-xulstub.patch |   31 -------------------------------
 1 files changed, 0 insertions(+), 31 deletions(-)
---
diff --git a/firefox-6.0-xulstub.patch b/firefox-6.0-xulstub.patch
index 07a731c..de3566a 100644
--- a/firefox-6.0-xulstub.patch
+++ b/firefox-6.0-xulstub.patch
@@ -1642,37 +1642,6 @@ diff -up xulrunner-6.0/mozilla-release/xulrunner/app/nsXULRunnerApp.cpp.xulstub
      if (IsArg(argv[1], "gre-version")) {
        if (argc != 2) {
          Usage(argv[0]);
-diff -up xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in.xulstub xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in
---- xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in.xulstub	2011-08-16 10:24:26.996662200 +0200
-+++ xulrunner-6.0/mozilla-release/xulrunner/installer/Makefile.in	2011-08-16 10:24:27.034657911 +0200
-@@ -70,6 +70,19 @@ INSTALL_SDK = 1
- 
- include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
- 
-+$(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile
-+	printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
-+	  $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
-+
-+ifndef SKIP_GRE_REGISTRATION
-+# to register xulrunner per-user, override this with $HOME/.gre.d
-+regdir = /etc/gre.d
-+
-+install:: $(MOZILLA_VERSION).system.conf
-+	$(NSINSTALL) -D $(DESTDIR)$(regdir)
-+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(regdir)
-+endif
-+
- # Add pkg-config files to the install:: target
- 
- pkg_config_files = \
-@@ -111,6 +124,7 @@ endif
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
 diff -up xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp.xulstub xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp
 --- xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp.xulstub	2011-08-11 23:41:33.000000000 +0200
 +++ xulrunner-6.0/mozilla-release/xulrunner/stub/nsXULStub.cpp	2011-08-16 11:10:02.509742103 +0200


More information about the scm-commits mailing list