xulrunner locale build fixes (incomplete) esr24
authorWolfgang Rosenauer <wr@rosenauer.org>
Thu, 30 Jan 2014 22:17:50 +0100
branchesr24
changeset 701 ab93666f5ff7
parent 698 8066b2bdabfb
child 702 5561a483919b
xulrunner locale build fixes (incomplete)
series
xulrunner-langpack-build.patch
xulrunner/xulrunner-langpack-build.patch
xulrunner/xulrunner.spec
--- a/series	Tue Jan 14 13:40:19 2014 +0100
+++ b/series	Thu Jan 30 22:17:50 2014 +0100
@@ -18,6 +18,7 @@
 mozilla-idldir.patch
 mozilla-libproxy-compat.patch
 libffi-ppc64le.patch
+xulrunner-langpack-build.patch
 #xpcom-ppc64le.patch
 #ppc64le-support.patch
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner-langpack-build.patch	Thu Jan 30 22:17:50 2014 +0100
@@ -0,0 +1,24 @@
+# HG changeset patch
+# Parent 982d6080b8827036145bc86d46a7075c3feaef2f
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in
+--- a/toolkit/locales/Makefile.in
++++ b/toolkit/locales/Makefile.in
+@@ -10,16 +10,17 @@ relativesrcdir = @relativesrcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+ DEFINES += -DAB_CD=$(AB_CD)
+ 
+ XULPPFLAGS += -I$(LOCALE_SRCDIR)/defines.inc
+ 
+ include $(topsrcdir)/config/rules.mk
++include $(topsrcdir)/toolkit/locales/l10n.mk
+ 
+ ifdef LOCALE_MERGEDIR
+ vpath crashreporter.% $(LOCALE_MERGEDIR)/toolkit/crashreporter
+ endif
+ vpath crashreporter.% $(LOCALE_SRCDIR)/crashreporter
+ ifdef LOCALE_MERGEDIR
+ vpath crashreporter.% @srcdir@/en-US/crashreporter
+ endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xulrunner/xulrunner-langpack-build.patch	Thu Jan 30 22:17:50 2014 +0100
@@ -0,0 +1,1 @@
+../xulrunner-langpack-build.patch
\ No newline at end of file
--- a/xulrunner/xulrunner.spec	Tue Jan 14 13:40:19 2014 +0100
+++ b/xulrunner/xulrunner.spec	Thu Jan 30 22:17:50 2014 +0100
@@ -91,6 +91,7 @@
 Patch12:        libffi-ppc64le.patch
 Patch13:        xpcom-ppc64le.patch
 Patch14:        ppc64le-support.patch
+Patch15:        xulrunner-langpack-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js = %{version}
 Requires(post):  update-alternatives coreutils
@@ -101,7 +102,7 @@
 %define has_system_nspr  1
 %define has_system_nss   1
 %define has_system_cairo 0
-%define localize 0
+%define localize 1
 %ifarch ppc ppc64 ppc64le s390 s390x ia64 %arm aarch64
 %define crashreporter    0
 %else
@@ -211,6 +212,7 @@
 #%patch12 -p1
 #%patch13 -p1
 #%patch14 -p1
+%patch15 -p1
 
 %build
 # no need to add build time to binaries