packages: xulrunner/xulrunner-install.patch, xulrunner/xulrunner-nss_cflags...
arekm
arekm at pld-linux.org
Thu Jan 21 13:50:12 CET 2010
Author: arekm Date: Thu Jan 21 12:50:12 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- initial step to final 3.6
---- Files affected:
packages/xulrunner:
xulrunner-install.patch (1.5 -> 1.6) , xulrunner-nss_cflags.patch (1.2 -> 1.3) , xulrunner-pc.patch (1.10 -> 1.11) , xulrunner.spec (1.127 -> 1.128) , xulrunner-gcc44.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner-install.patch
diff -u packages/xulrunner/xulrunner-install.patch:1.5 packages/xulrunner/xulrunner-install.patch:1.6
--- packages/xulrunner/xulrunner-install.patch:1.5 Tue Jun 30 20:28:24 2009
+++ packages/xulrunner/xulrunner-install.patch Thu Jan 21 13:50:07 2010
@@ -1,23 +1,20 @@
---- mozilla/toolkit/mozapps/installer/packager.mk.orig 2009-06-24 10:22:23.000000000 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk 2009-06-28 18:59:02.000000000 +0200
-@@ -370,13 +370,13 @@
+--- mozilla/toolkit/mozapps/installer/packager.mk.org 2010-01-21 13:25:04.436839154 +0100
++++ mozilla/toolkit/mozapps/installer/packager.mk 2010-01-21 13:32:14.673453287 +0100
+@@ -362,11 +362,11 @@
# NOTE: this must be a tar now that dist links into the tree so that we
# do not strip the binaries actually in the tree.
@echo "Creating package directory..."
- @mkdir $(DIST)/$(MOZ_PKG_DIR)
-+ @mkdir -p $(DESTDIR)$(MOZ_PKG_APPDIR)
++ @mkdir $(DESTDIR)/$(MOZ_PKG_DIR)
ifdef MOZ_PKG_MANIFEST
$(RM) -rf $(DIST)/xpt
- $(call PACKAGER_COPY, "$(DIST)",\
-- "$(DIST)/$(MOZ_PKG_DIR)", \
-+ "$(DESTDIR)/$(MOZ_PKG_APPDIR)", \
+ $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+- "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
++ "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
-- $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/components -v -x "$(XPIDL_LINK)"
-+ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/components -v -x "$(XPIDL_LINK)"
+ $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
else # !MOZ_PKG_MANIFEST
- ifeq ($(MOZ_PKG_FORMAT),DMG)
- # If UNIVERSAL_BINARY, the package will be made from an already-prepared
-@@ -385,11 +385,11 @@
+@@ -377,11 +377,11 @@
ifndef STAGE_SDK
@cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
else
@@ -28,19 +25,10 @@
else
- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif # DMG
- endif # MOZ_PKG_MANIFEST
- ifndef PKG_SKIP_STRIP
-@@ -421,7 +421,7 @@
- endif
- @echo "Removing unpackaged files..."
- ifdef NO_PKG_FILES
-- cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
-+ cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
- endif
- ifdef MOZ_PKG_REMOVALS
- $(SYSINSTALL) $(IFLAGS1) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
-@@ -446,39 +446,47 @@
+ @echo "Linking XPT files..."
+ @rm -rf $(DIST)/xpt
+ @$(NSINSTALL) -D $(DIST)/xpt
+@@ -450,24 +450,33 @@
$(error "make install" is not supported on this platform. Use "make package" instead.)
endif
$(NSINSTALL) -D $(DESTDIR)$(installdir)
@@ -61,46 +49,24 @@
+ $(RM) -f $(DESTDIR)$(bindir)/xpt_link
+ ln -s $(installdir)/xpt_link $(DESTDIR)$(bindir)/xpt_link
ifdef INSTALL_SDK # Here comes the hard part
- # include directory is stable (dist/sdk/include) and unstable (dist/include)
- $(NSINSTALL) -D $(DESTDIR)$(includedir)/stable
-- $(NSINSTALL) -D $(DESTDIR)$(includedir)/unstable
-- (cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
-- (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
-+ cp -rfLp $(DIST)/sdk/include/* $(DESTDIR)$(includedir)/stable
- # The dist/include has module subdirectories that we need to flatten
-- find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
-+# find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
+ $(NSINSTALL) -D $(DESTDIR)$(includedir)
+- (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
+- (cd $(DESTDIR)$(includedir) && tar -xf -)
+ cp -rfLp $(DIST)/include/* $(DESTDIR)$(includedir)
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
-- $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable
-- $(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
-- (cd $(DIST)/sdk/idl && tar $(TAR_CREATE_FLAGS) - .) | \
-- (cd $(DESTDIR)$(idldir)/stable && tar -xf -)
+ $(NSINSTALL) -D $(DESTDIR)$(idldir)
- (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
-- (cd $(DESTDIR)$(idldir)/unstable && tar -xf -)
-+ $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable
-+ $(NSINSTALL) -D $(DESTDIR)$(idldir)
-+ cp -rfLp $(DIST)/sdk/idl/* $(DESTDIR)$(idldir)/stable
+- (cd $(DESTDIR)$(idldir) && tar -xf -)
+ cp -rfLp $(DIST)/idl/* $(DESTDIR)$(idldir)
# SDK directory is the libs + a bunch of symlinks
$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
- if test -f $(DIST)/sdk/include/xpcom-config.h; then \
- $(SYSINSTALL) $(IFLAGS1) $(DIST)/sdk/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
+ if test -f $(DIST)/include/xpcom-config.h; then \
+ $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
fi
- (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
+ cp -rfLp $(DIST)/sdk/lib/*.a $(DESTDIR)$(sdkdir)/sdk/lib
+ ln -s $(installdir)/libmozjs.so $(DESTDIR)$(sdkdir)/sdk/lib/libmozjs.so
+ ln -s $(installdir)/libxpcom.so $(DESTDIR)$(sdkdir)/sdk/lib/libxpcom.so
+ ln -s $(installdir)/libxul.so $(DESTDIR)$(sdkdir)/sdk/lib/libxul.so
- $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/sdk/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
+ $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
- ln -s $(includedir)/stable $(DESTDIR)$(sdkdir)/sdk/include
-- ln -s $(includedir)/unstable $(DESTDIR)$(sdkdir)/include
-+ ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
- ln -s $(idldir)/stable $(DESTDIR)$(sdkdir)/sdk/idl
-- ln -s $(idldir)/unstable $(DESTDIR)$(sdkdir)/idl
-+ ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
- endif # INSTALL_SDK
-
- make-sdk:
================================================================
Index: packages/xulrunner/xulrunner-nss_cflags.patch
diff -u packages/xulrunner/xulrunner-nss_cflags.patch:1.2 packages/xulrunner/xulrunner-nss_cflags.patch:1.3
--- packages/xulrunner/xulrunner-nss_cflags.patch:1.2 Tue Jun 30 20:28:24 2009
+++ packages/xulrunner/xulrunner-nss_cflags.patch Thu Jan 21 13:50:07 2010
@@ -1,14 +1,3 @@
---- mozilla/config/autoconf.mk.in.orig 2008-06-19 17:55:40.000000000 +0200
-+++ mozilla/config/autoconf.mk.in 2008-06-19 18:45:18.000000000 +0200
-@@ -280,7 +280,7 @@
- OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
- OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
-
--OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
-+OS_INCLUDES = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
- OS_LIBS = @LIBS@
- ACDEFINES = @MOZ_DEFINES@
-
--- mozilla/config/rules.mk.orig 2008-06-19 18:45:00.000000000 +0200
+++ mozilla/config/rules.mk 2008-06-19 18:42:40.000000000 +0200
@@ -1365,23 +1365,23 @@
================================================================
Index: packages/xulrunner/xulrunner-pc.patch
diff -u packages/xulrunner/xulrunner-pc.patch:1.10 packages/xulrunner/xulrunner-pc.patch:1.11
--- packages/xulrunner/xulrunner-pc.patch:1.10 Tue Jun 30 20:28:24 2009
+++ packages/xulrunner/xulrunner-pc.patch Thu Jan 21 13:50:07 2010
@@ -9,29 +9,9 @@
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
-diff -urN mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in mozilla.new/xulrunner/installer/libxul-embedding-unstable.pc.in
---- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-01-05 07:50:34.000000000 +0100
-+++ mozilla.new/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-07-07 19:59:29.000000000 +0200
-@@ -7,5 +7,6 @@
- Name: libxul-embedding-unstable
- Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue
--Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
-+Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
diff -urN mozilla/xulrunner/installer/libxul-embedding.pc.in mozilla.new/xulrunner/installer/libxul-embedding.pc.in
--- mozilla/xulrunner/installer/libxul-embedding.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/libxul-embedding.pc.in 2008-07-07 19:59:11.000000000 +0200
-@@ -1,7 +1,7 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
- includedir=%includedir%
--idldir=%idldir%
-+idldir=%idldir%/stable
- includetype=stable
-
- # Note: the default pkg-config cflags will only list include directories
@@ -11,5 +11,6 @@
Name: libxul-embedding
Description: Static library for version-independent embedding of the Mozilla runtime
@@ -39,41 +19,16 @@
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue
Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
-diff -urN mozilla/xulrunner/installer/libxul-unstable.pc.in mozilla.new/xulrunner/installer/libxul-unstable.pc.in
---- mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-01-05 07:50:34.000000000 +0100
-+++ mozilla.new/xulrunner/installer/libxul-unstable.pc.in 2008-07-07 20:00:35.000000000 +0200
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
- includetype=unstable
-@@ -9,4 +10,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
--Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
-+Cflags: -I${includedir} %WCHAR_CFLAGS%
diff -urN mozilla/xulrunner/installer/libxul.pc.in mozilla.new/xulrunner/installer/libxul.pc.in
--- mozilla/xulrunner/installer/libxul.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/libxul.pc.in 2008-07-07 20:00:09.000000000 +0200
-@@ -1,7 +1,8 @@
+@@ -1,5 +1,6 @@
prefix=%prefix%
sdkdir=%sdkdir%
+libdir=%libdir%
includedir=%includedir%
--idldir=%idldir%
-+idldir=%idldir%/stable
- includetype=stable
+ idldir=%idldir%
- # Note: the default pkg-config includes will only list include directories
-@@ -13,4 +14,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
--Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
-+Cflags: -I${includedir} %WCHAR_CFLAGS%
diff -urN mozilla/xulrunner/installer/mozilla-nspr.pc.in mozilla.new/xulrunner/installer/mozilla-nspr.pc.in
--- mozilla/xulrunner/installer/mozilla-nspr.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/mozilla-nspr.pc.in 2008-07-07 19:56:15.000000000 +0200
@@ -86,12 +41,13 @@
diff -urN mozilla/xulrunner/installer/mozilla-plugin.pc.in mozilla.new/xulrunner/installer/mozilla-plugin.pc.in
--- mozilla/xulrunner/installer/mozilla-plugin.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/mozilla-plugin.pc.in 2008-07-07 19:56:15.000000000 +0200
-@@ -6,4 +6,4 @@
+@@ -5,5 +5,5 @@
+ Name: Mozilla Plug-In API
Description: Mozilla Plug-In API
Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
-+Cflags: -I${includedir}/stable -I${includedir}/plugin -DXP_UNIX %ojidef%
++Cflags: -I${includedir} -I${includedir}/plugin -DXP_UNIX %ojidef%
+
diff -urN mozilla/xulrunner/installer/mozilla-js.pc.in mozilla.new/xulrunner/installer/mozilla-js.pc.in
--- mozilla/xulrunner/installer/mozilla-js.pc.in 2007-08-03 16:46:28.000000000 +0200
+++ mozilla.new/xulrunner/installer/mozilla-js.pc.in 2009-02-18 23:15:40.681314523 +0100
@@ -99,5 +55,5 @@
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
Libs: -L${sdkdir}/lib -lmozjs
--Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
+-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.127 packages/xulrunner/xulrunner.spec:1.128
--- packages/xulrunner/xulrunner.spec:1.127 Thu Jan 14 11:48:02 2010
+++ packages/xulrunner/xulrunner.spec Thu Jan 21 13:50:07 2010
@@ -14,9 +14,11 @@
%undefine with_gnomevfs
%endif
-# convert firefox release number to platform version: 3.5.x -> 1.9.1.x
-%define xulrunner_ver %(v=%{firefox_ver}; echo 1.9.1.${v#3.5.})
-%define firefox_ver 3.5.7
+# convert firefox release number to platform version: 3.6.x -> 1.9.2.x
+%define xulrunner_main 1.9.2
+# %%define xulrunner_ver %(v=%{firefox_ver}; echo %{xulrunner_main}.${v#3.6.})
+%define xulrunner_ver %{xulrunner_main}
+%define firefox_ver 3.6
# The actual sqlite version (see RHBZ#480989):
%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
@@ -25,14 +27,14 @@
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
Name: xulrunner
Version: %{xulrunner_ver}
-Release: 2
+Release: 1
Epoch: 1
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/%{firefox_ver}/source/firefox-%{firefox_ver}.source.tar.bz2
-# Source0-md5: 82e6f568ddeaae52e85aa089277f5d14
+# Source0-md5: 458051557ff49e6a352c1d56eee5782a
Patch0: %{name}-install.patch
Patch1: %{name}-rpath.patch
Patch2: %{name}-mozldap.patch
@@ -42,8 +44,7 @@
Patch6: %{name}-pc.patch
Patch7: %{name}-prefs.patch
Patch8: %{name}-ssl_oldapi.patch
-Patch9: %{name}-gcc44.patch
-Patch10: %{name}-ppc.patch
+Patch9: %{name}-ppc.patch
URL: http://developer.mozilla.org/en/docs/XULRunner
%{?with_gnomevfs:BuildRequires: GConf2-devel >= 1.2.1}
BuildRequires: automake
@@ -168,7 +169,7 @@
%prep
%setup -qc
-mv -f mozilla-1.9.1 mozilla
+mv -f mozilla-%{xulrunner_main} mozilla
cd mozilla
rm -r nsprpub
# avoid using included headers (-I. is before HUNSPELL_CFLAGS)
@@ -188,7 +189,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
%build
@@ -538,8 +538,6 @@
%{_libdir}/%{name}-sdk
%{_pkgconfigdir}/libxul.pc
%{_pkgconfigdir}/libxul-embedding.pc
-%{_pkgconfigdir}/libxul-embedding-unstable.pc
-%{_pkgconfigdir}/libxul-unstable.pc
%{_pkgconfigdir}/mozilla-js.pc
%{_pkgconfigdir}/mozilla-plugin.pc
%{_pkgconfigdir}/mozilla-gtkmozembed.pc
@@ -562,6 +560,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.128 2010/01/21 12:50:07 arekm
+- initial step to final 3.6
+
Revision 1.127 2010/01/14 10:48:02 hawk
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-install.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-nss_cflags.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-pc.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.127&r2=1.128&f=u
More information about the pld-cvs-commit
mailing list