Author: qboosh Date: Tue May 29 19:40:21 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- just define xulrunner_ver, minor magick not suitable for icedove/thunderbird
- updated system-xulrunner patch
---- Files affected:
packages/icedove:
icedove-system-xulrunner.patch (1.2 -> 1.3) , icedove.spec (1.157 -> 1.158)
---- Diffs:
================================================================
Index: packages/icedove/icedove-system-xulrunner.patch
diff -u packages/icedove/icedove-system-xulrunner.patch:1.2
packages/icedove/icedove-system-xulrunner.patch:1.3
--- packages/icedove/icedove-system-xulrunner.patch:1.2 Sun Mar 25 20:49:41 2012
+++ packages/icedove/icedove-system-xulrunner.patch Tue May 29 21:40:15 2012
@@ -1,6 +1,6 @@
---- mozilla/mail/app/Makefile.in.orig 2012-02-16 11:18:22.000000000 +0100
-+++ mozilla/mail/app/Makefile.in 2012-03-22 16:43:33.608721456 +0100
-@@ -44,5 +44,7 @@
+--- mozilla/mail/app/Makefile.in.orig 2012-04-28 21:31:30.000000000 +0200
++++ mozilla/mail/app/Makefile.in 2012-05-29 20:12:43.887999371 +0200
+@@ -44,6 +44,8 @@
AB_CD = $(MOZ_UI_LOCALE)
@@ -8,12 +8,13 @@
+
GRE_MILESTONE = $(shell $(PYTHON)
$(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini
Build Milestone)
GRE_BUILDID = $(shell $(PYTHON)
$(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini
Build BuildID)
+
@@ -79,6 +81,7 @@
$(srcdir)/profile/channel-prefs.js \
$(NULL)
+ifndef LIBXUL_SDK
- ifneq (,$(filter OS2 Darwin WINCE WINNT,$(OS_ARCH)))
+ ifneq (,$(filter OS2 Darwin WINNT,$(OS_ARCH)))
PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
else
@@ -88,8 +91,6 @@
================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.157 packages/icedove/icedove.spec:1.158
--- packages/icedove/icedove.spec:1.157 Tue May 29 19:37:31 2012
+++ packages/icedove/icedove.spec Tue May 29 21:40:15 2012
@@ -24,9 +24,7 @@
%define nspr_ver 4.9
%define nss_ver 3.13.3
-# convert thunderbird release number to platform version: 12.0.x -> 12.0.x
-%define xulrunner_main 12.0
-%define xulrunner_ver %(v=%{version}; echo
%{xulrunner_main}${v#12.0})
+%define xulrunner_ver 12.0
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
@@ -573,6 +571,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.158 2012/05/29 19:40:15 qboosh
+- just define xulrunner_ver, minor magick not suitable for icedove/thunderbird
+- updated system-xulrunner patch
+
Revision 1.157 2012/05/29 17:37:31 qboosh
- fixed xulrunner version
- don't provide libmozalloc.so when building with included xulrunner
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/icedove/icedove-system-xulrunner.patch?r1=1.2&r2=1.3
http://cvs.pld-linux.org/packages/icedove/icedove.spec?r1=1.157&r2=1.158
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
