[packages/iceweasel] - updated to 20.0.1
baggins
baggins at pld-linux.org
Wed Apr 17 23:05:53 CEST 2013
commit 47c1233f2818766af51d71d43fc299d9817a3544
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Apr 17 23:05:42 2013 +0200
- updated to 20.0.1
iceweasel-install.patch | 37 ++++---------------------------------
iceweasel-packaging.patch | 18 +++++++++++-------
iceweasel.spec | 10 +++++-----
3 files changed, 20 insertions(+), 45 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 74b5b61..71c3098 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -14,8 +14,8 @@
%endif
# convert firefox release number to platform version: 19.0.x -> 19.0.x
-%define xulrunner_main 19.0
-%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#19.0})
+%define xulrunner_main 20.0
+%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#20.0})
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
@@ -29,12 +29,12 @@ Summary: Iceweasel web browser
Summary(hu.UTF-8): Iceweasel web böngésző
Summary(pl.UTF-8): Iceweasel - przeglądarka WWW
Name: iceweasel
-Version: 19.0
+Version: 20.0.1
Release: 1
License: MPL 1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications/Networking
Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 3dc732b6ce177792b43324f4bc7164d8
+# Source0-md5: b822ff4b2348410587dec563235d9320
Source1: %{name}-branding.tar.bz2
# Source1-md5: 816d926bd2c76a5bba5108979ba776ac
Source2: %{name}-rm_nonfree.sh
@@ -93,7 +93,7 @@ BuildRequires: python-modules
BuildRequires: python-virtualenv
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.601
-BuildRequires: sqlite3-devel >= 3.7.14.1
+BuildRequires: sqlite3-devel >= 3.7.15.2
BuildRequires: startup-notification-devel >= 0.8
BuildRequires: xorg-lib-libXScrnSaver-devel
BuildRequires: xorg-lib-libXext-devel
diff --git a/iceweasel-install.patch b/iceweasel-install.patch
index 3265748..a98f739 100644
--- a/iceweasel-install.patch
+++ b/iceweasel-install.patch
@@ -1,32 +1,3 @@
---- mozilla/browser/app/Makefile.in 2008-06-22 22:54:03.000000000 +0200
-+++ mozilla/browser/app/Makefile.in 2008-06-23 10:34:59.000000000 +0200
-@@ -397,7 +397,7 @@
- sed -e "s/%MAC_APP_NAME%/$(MAC_APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(dist_dest)/Contents/Resources/$(AB).lproj/InfoPlist.strings
- rsync -a $(DIST)/bin/ $(dist_dest)/Contents/$(APPFILES)
- ifdef LIBXUL_SDK
-- cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(dist_dest)/Contents/MacOS/firefox
-+ cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(dist_dest)/Contents/MacOS/$(MOZ_APP_NAME)
- else
- rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
- rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
-@@ -359,7 +359,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
-- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
- endif
- endif
-
-@@ -433,7 +433,7 @@
- rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(dist_dest)/Contents/Frameworks
- else
- $(NSINSTALL) -D $(DIST)/bin/xulrunner
-- (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
-+ cp -rfRp $(LIBXUL_SDK)/bin $(DIST)/bin/xulrunner
- endif #} cocoa
- endif #} SKIP_COPY_XULRUNNER
- endif #} LIBXUL_SDK
--- mozilla/toolkit/mozapps/installer/packager.mk.orig 2011-03-19 00:34:12.000000000 +0100
+++ mozilla/toolkit/mozapps/installer/packager.mk 2011-03-22 23:53:43.877485659 +0100
@@ -708,41 +708,41 @@
@@ -87,11 +58,11 @@
@$(NSINSTALL) -D $(DIST)/xpt
@($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/. Continuing...
else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
+- @cd $(DIST)/bin && $(TAR) $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
endif
else
-- @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
+- @cd $(DIST)/bin && $(TAR) $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
+ cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
@echo "Linking XPT files..."
@rm -rf $(DIST)/xpt
@@ -100,8 +71,8 @@
cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
endif
$(NSINSTALL) -D $(DESTDIR)$(installdir)
-- (cd $(DIST)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
-+ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
+- (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
++ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
(cd $(DESTDIR)$(installdir) && tar -xf -)
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index 75caf11..d46f87b 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -135,9 +135,9 @@
@BINPATH@/components/FeedConverter.js
@BINPATH@/components/FeedWriter.js
@@ -340,6 +368,7 @@
- @BINPATH@/components/BrowserPageThumbs.manifest
@BINPATH@/components/nsPrivateBrowsingService.manifest
@BINPATH@/components/nsPrivateBrowsingService.js
+ #endif
+#ifndef LIBXUL_SDK
@BINPATH@/components/SiteSpecificUserAgent.js
@BINPATH@/components/SiteSpecificUserAgent.manifest
@@ -226,9 +226,9 @@
@BINPATH@/components/Weave.js
#endif
+#ifndef LIBXUL_SDK
+ @BINPATH@/components/servicesComponents.manifest
+ @BINPATH@/components/cryptoComponents.manifest
@BINPATH@/components/TelemetryPing.js
- @BINPATH@/components/TelemetryPing.manifest
- @BINPATH@/components/messageWakeupService.js
@@ -488,11 +533,14 @@
@BINPATH@/components/AlarmsManager.manifest
@BINPATH@/components/TCPSocket.js
@@ -271,14 +271,18 @@
#ifdef MOZ_GTK2
@BINPATH@/chrome/icons/default/default16.png
@BINPATH@/chrome/icons/default/default32.png
-@@ -560,10 +610,10 @@
- #ifdef MOZ_SERVICES_SYNC
- @BINPATH@/@PREF_DIR@/services-sync.js
- #endif
+@@ -560,14 +610,14 @@
+
+ ; [Default Preferences]
+ ; All the pref files must be part of base to prevent migration bugs
+#ifndef LIBXUL_SDK
+ @BINPATH@/@PREF_DIR@/firefox.js
+ @BINPATH@/@PREF_DIR@/firefox-branding.js
@BINPATH@/greprefs.js
@BINPATH@/defaults/autoconfig/platform.js
@BINPATH@/defaults/autoconfig/prefcalls.js
+ @BINPATH@/defaults/profile/prefs.js
+
-#ifndef LIBXUL_SDK
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
@BINPATH@/defaults/pref/channel-prefs.js
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/47c1233f2818766af51d71d43fc299d9817a3544
More information about the pld-cvs-commit
mailing list