[packages/iceweasel/iceweasel-3.5] up to 3.5.19

glen glen at pld-linux.org
Fri Feb 22 19:04:48 CET 2013 

commit 25481215d6224eedd7560984a83ec5d57e4b4385
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Feb 22 19:58:20 2013 +0200

    up to 3.5.19
    
    3.5 is last version that supports Open JVM Integration (OJI) interface
    (libjavaplugin_oji.so)

 iceweasel-branding.patch | 15 +++++++--------
 iceweasel-gcc44.patch    | 34 ----------------------------------
 iceweasel.spec           | 14 ++++----------
 3 files changed, 11 insertions(+), 52 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 427f4a7..ba55547 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -7,11 +7,7 @@
 %bcond_without	gnomevfs	# disable GNOME comp. (gconf+libgnome+gnomevfs) and gnomevfs ext.
 %bcond_without	gnome		# disable all GNOME components (gnome+gnomeui+gnomevfs)
 %bcond_without	kerberos	# disable krb5 support
-%if "%{pld_release}" == "ti"
 %bcond_with	xulrunner	# build with system xulrunner
-%else
-%bcond_without	xulrunner	# build with system xulrunner
-%endif
 
 %if %{without gnome}
 %undefine	with_gnomeui
@@ -30,12 +26,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:	3.5.7
+Version:	3.5.19
 Release:	1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	82e6f568ddeaae52e85aa089277f5d14
+# Source0-md5:	c1fe589014480419d528766adc460aed
 Source1:	%{name}-branding.tar.bz2
 # Source1-md5:	b49feae9f6434eca8a749776160c15a8
 Source2:	%{name}-rm_nonfree.sh
@@ -50,7 +46,6 @@ Patch5:		%{name}-ti-agent.patch
 Patch6:		%{name}-nss_cflags.patch
 Patch7:		%{name}-prefs.patch
 Patch8:		%{name}-pld-branding.patch
-Patch9:		%{name}-gcc44.patch
 Patch10:	%{name}-no-subshell.patch
 Patch11:	%{name}-ppc.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
@@ -168,7 +163,6 @@ cd mozilla
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch10 -p2
 %patch11 -p1
 
@@ -205,7 +199,7 @@ ac_add_options --enable-crash-on-assert
 ac_add_options --disable-debug
 ac_add_options --disable-debug-modules
 ac_add_options --disable-logging
-ac_add_options --enable-optimize="%{rpmcflags} -Os"
+ac_add_options --enable-optimize="%{rpmcflags} -Os -fpermissive -Wno-error=format-security"
 %endif
 ac_add_options --disable-strip
 ac_add_options --disable-strip-libs
@@ -241,7 +235,7 @@ ac_add_options --enable-xinerama
 ac_add_options --with-distribution-id=org.pld-linux
 ac_add_options --with-branding=iceweasel/branding
 %if %{with xulrunner}
-ac_add_options --with-libxul-sdk=%{_libdir}/xulrunner-sdk
+ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
 %endif
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch
index 682dece..b78c623 100644
--- a/iceweasel-branding.patch
+++ b/iceweasel-branding.patch
@@ -39,9 +39,8 @@ diff -urN mozilla-1.9.1.orig/browser/app/firefox-branding.js mozilla-1.9.1/brows
  
  // Search codes belong only in builds with official branding
  pref("browser.search.param.yahoo-fr", "");
-diff -urN mozilla-1.9.1.orig/browser/app/profile/firefox.js mozilla-1.9.1/browser/app/profile/firefox.js
---- mozilla-1.9.1.orig/browser/app/profile/firefox.js	2009-06-24 10:20:27.000000000 +0200
-+++ mozilla-1.9.1/browser/app/profile/firefox.js	2009-06-28 14:15:29.000000000 +0200
+--- iceweasel-3.5.19/browser/app/profile/firefox.js~	2013-02-22 18:04:45.000000000 +0200
++++ iceweasel-3.5.19/browser/app/profile/firefox.js	2013-02-22 18:05:47.691454691 +0200
 @@ -70,12 +70,12 @@
  
  // Preferences for the Get Add-ons pane
@@ -50,9 +49,9 @@ diff -urN mozilla-1.9.1.orig/browser/app/profile/firefox.js mozilla-1.9.1/browse
 +pref("extensions.getAddons.browseAddons", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox");
  pref("extensions.getAddons.maxResults", 5);
 -pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/recommended");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%?src=firefox");
 -pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%?src=firefox");
 +pref("extensions.getAddons.recommended.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/recommended");
 +pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
 +pref("extensions.getAddons.search.browseURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/firefox/search?q=%TERMS%");
@@ -121,7 +120,6 @@ diff -urN mozilla-1.9.1.orig/browser/base/content/baseMenuOverlay.xul mozilla-1.
          <menuitem id="checkForUpdates"
 diff -urN mozilla-1.9.1.orig/browser/base/content/credits.xhtml mozilla-1.9.1/browser/base/content/credits.xhtml
 --- mozilla-1.9.1.orig/browser/base/content/credits.xhtml	2009-06-24 10:20:27.000000000 +0200
-+++ mozilla-1.9.1/browser/base/content/credits.xhtml	2009-06-28 14:18:00.000000000 +0200
 @@ -209,7 +209,7 @@
      </div>
  
@@ -135,8 +133,8 @@ diff -urN mozilla-1.9.1.orig/browser/base/content/credits.xhtml mozilla-1.9.1/br
          <p id="gecko" class="center" dir="&locale.dir;">&credit.poweredByGeckoReg;</p>
  
          <p class="footnote" dir="&locale.dir;">
--          &brandFullName;™ &license.part0; ©1998-2009 &license.part1;
-+          &brandFullName; &license.part0; ©1998-2009 &license.part1;
+-          &brandFullName;™ &license.part0; ©1998-2011 &license.part1;
++          &brandFullName; &license.part0; ©1998-2011 &license.part1;
            <a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
            &license.part2;
            <a href="" link="about:license" onclick="visitLink(event);">about:license</a>
@@ -322,3 +320,4 @@ diff -urN mozilla-1.9.1.orig/toolkit/xre/nsAppRunner.cpp mozilla-1.9.1/toolkit/x
    if (gAppData->copyright)
        printf(", %s", gAppData->copyright);
    printf("\n");
+   printf("\n");
diff --git a/iceweasel-gcc44.patch b/iceweasel-gcc44.patch
deleted file mode 100644
index 2a62485..0000000
--- a/iceweasel-gcc44.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -burNp mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc mozilla-dud/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
---- mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2008-02-25 19:18:09.000000000 +0100
-+++ mozilla-dud/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2009-04-29 14:30:50.481579531 +0200
-@@ -30,6 +30,7 @@
- #include <a.out.h>
- #include <cstdarg>
- #include <cstdlib>
-+#include <cstdio>
- #include <cxxabi.h>
- #include <elf.h>
- #include <errno.h>
- 
-diff -burNp mozilla.orig/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc mozilla.dud/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
---- mozilla.orig/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc	2008-02-25 19:18:08.000000000 +0100
-+++ mozilla.dud/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc	2009-04-29 14:55:22.044889645 +0200
-@@ -36,6 +36,7 @@
- 
- #include <cassert>
- #include <cstdlib>
-+#include <cstdio>
- #include <ctime>
- #include <linux/limits.h>
- 
-diff -burNp mozilla.orig/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc mozilla.dud/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
---- mozilla.orig/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc	2008-02-25 19:18:08.000000000 +0100
-+++ mozilla.dud/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc	2009-04-29 15:00:56.958685026 +0200
-@@ -39,6 +39,7 @@
- #include <sys/wait.h>
- 
- #include <cstdlib>
-+#include <cstdio>
- #include <ctime>
- #include <string.h>
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/25481215d6224eedd7560984a83ec5d57e4b4385

More information about the pld-cvs-commit mailing list