[packages/iceweasel] - updated to 29.0

baggins baggins at pld-linux.org
Fri May 2 19:45:35 CEST 2014


commit cbbb6991851f582a37d29411dcde5c00f17f34a0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri May 2 19:45:26 2014 +0200

    - updated to 29.0

 gyp-slashism.patch        | 57 -----------------------------------------------
 iceweasel-packaging.patch |  5 ++++-
 iceweasel.spec            | 18 ++++++---------
 3 files changed, 11 insertions(+), 69 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index aff9945..50316af 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -9,8 +9,8 @@
 %bcond_with	pgo		# PGO-enabled build (requires working $DISPLAY == :100)
 
 # convert firefox release number to platform version: 15.0.x -> 15.0.x
-%define		xulrunner_main	25.0
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#25.0})
+%define		xulrunner_main	29.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#29.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -24,14 +24,14 @@ Summary:	Iceweasel web browser
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-Version:	28.0
+Version:	29.0
 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:	db06b6da6b826cfc6a49c15bca115a6b
+# Source0-md5:	07c515fc487824f107a947d23f420e9d
 Source1:	%{name}-branding.tar.bz2
-# Source1-md5:	22b0d377cabb6567dd0330f9ab669120
+# Source1-md5:	26e1aa664d0196552792104fa5f8a1e0
 Source2:	%{name}-rm_nonfree.sh
 Source3:	%{name}.desktop
 Source4:	%{name}.sh
@@ -45,7 +45,6 @@ Patch9:		%{name}-no-subshell.patch
 Patch11:	%{name}-middle_click_paste.patch
 Patch12:	%{name}-packaging.patch
 Patch13:	system-virtualenv.patch
-Patch14:	gyp-slashism.patch
 Patch15:	Disable-Firefox-Health-Report.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires:	GConf2-devel >= 1.2.1
@@ -67,6 +66,7 @@ BuildRequires:	libdnet-devel
 BuildRequires:	libevent-devel >= 1.4.7
 # standalone libffi 3.0.9 or gcc's from 4.5(?)+
 BuildRequires:	libffi-devel >= 6:3.0.9
+BuildRequires:	libicu-devel
 BuildRequires:	libiw-devel
 # requires libjpeg-turbo implementing at least libjpeg 6b API
 BuildRequires:	libjpeg-devel >= 6b
@@ -166,13 +166,8 @@ cd mozilla
 %patch11 -p2
 %patch12 -p2
 %patch13 -p2
-%patch14 -p2
 %patch15 -p1
 
-# config/rules.mk is patched by us and js/src/config/rules.mk
-# is supposed to be exact copy
-cp -a config/rules.mk js/src/config/rules.mk
-
 %if %{with pgo}
 sed -i -e 's at __BROWSER_PATH__@"../../dist/bin/iceweasel-bin"@' build/automation.py.in
 %endif
@@ -278,6 +273,7 @@ ac_add_options --with-system-nss
 ac_add_options --with-system-ply
 ac_add_options --with-system-png
 ac_add_options --with-system-zlib
+ac_add_options --with-system-icu
 ac_add_options --with-x
 EOF
 
diff --git a/gyp-slashism.patch b/gyp-slashism.patch
deleted file mode 100644
index 5100011..0000000
--- a/gyp-slashism.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.orig	2013-01-05 00:44:41.000000000 +0100
-+++ xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py	2013-01-13 20:13:40.033894757 +0100
-@@ -114,6 +114,12 @@
-   if dir and not os.path.exists(dir):
-     os.makedirs(dir)
- 
-+def append_relative(base, rel):
-+  if rel == '':
-+    return base
-+  else:
-+    return base + '/' + rel
-+
- def GetFlavor(params):
-   """Returns |params.flavor| if it's set, the system's default flavor else."""
-   flavors = {
-@@ -142,9 +148,9 @@
- 
- def WriteMakefile(filename, data, build_file, depth, topsrcdir, srcdir, relative_path, extra_data=None):
-   if not os.path.isabs(topsrcdir):
--    topsrcdir = depth + "/" + topsrcdir
-+    topsrcdir = append_relative(depth, topsrcdir)
-   if not os.path.isabs(srcdir):
--    srcdir = depth + "/" + srcdir
-+    srcdir = append_relative(depth, srcdir)
-   #TODO: should compare with the existing file and not overwrite it if the
-   # contents are the same!
-   ensure_directory_exists(filename)
-@@ -261,7 +267,7 @@
-       qualified_target)
-     build_file = os.path.abspath(build_file)
-     rel_path, output_file = self.CalculateMakefilePath(build_file, target)
--    subdepth = self.depth + "/" + getdepth(rel_path)
-+    subdepth = append_relative(self.depth, getdepth(rel_path))
-     if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth):
-         # If WriteTargetMakefile returns True, then this is a useful target
-       dirs.append(rel_path)
-@@ -399,7 +405,7 @@
-   # The relative path from objdir to gyp_file_dir
-   srcdir = gyp.common.RelativePath(gyp_file_dir, objdir)
-   # The absolute path to the source dir
--  abs_srcdir = topsrcdir + "/" + relative_srcdir
-+  abs_srcdir = append_relative(topsrcdir, relative_srcdir)
-   # The path to get up to the root of the objdir from the output dir.
-   depth = getdepth(relative_srcdir)
-   # The output directory.
-@@ -408,9 +414,9 @@
-   makefile_path = os.path.join(output_dir, "Makefile")
- 
-   def topsrcdir_path(path):
--    return "$(topsrcdir)/" + swapslashes(gyp.common.RelativePath(path, topsrcdir))
-+    return append_relative("$(topsrcdir)", swapslashes(gyp.common.RelativePath(path, topsrcdir)))
-   def objdir_path(path):
--    return "$(DEPTH)/" + swapslashes(gyp.common.RelativePath(path, objdir))
-+    return append_relative("$(DEPTH)", swapslashes(gyp.common.RelativePath(path, objdir)))
- 
-   # Find the list of targets that derive from the gyp file(s) being built.
-   needed_targets = set()
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index 368fe22..8011c30 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -20,7 +20,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/browser/@PREF_DIR@/firefox-l10n.js
  @BINPATH@/browser/searchplugins/*
  #ifdef XP_WIN32
-@@ -51,17 +55,23 @@
+@@ -51,20 +55,26 @@
  #endif
  
  [xpcom]
@@ -41,6 +41,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/@DLL_PREFIX at mozjs@DLL_SUFFIX@
  #endif
 +#endif
+ #ifdef MOZ_DMD
+ @BINPATH@/@DLL_PREFIX at dmd@DLL_SUFFIX@
+ #endif
  #ifndef MOZ_NATIVE_NSPR
  #ifndef MOZ_FOLD_LIBS
  @BINPATH@/@DLL_PREFIX at nspr4@DLL_SUFFIX@
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list