From 0848e6c6eaeac59a5d743f6445d0919f12f57c61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 16 Dec 2015 00:38:44 +0100 Subject: [PATCH] - up to 43.0 --- iceweasel-packaging.patch | 17 ++++++++++------- iceweasel.spec | 7 +++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch index 23a62cf..db249ed 100644 --- a/iceweasel-packaging.patch +++ b/iceweasel-packaging.patch @@ -106,11 +106,14 @@ diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-rel @RESPATH@/components/gfx.xpt @RESPATH@/components/html5.xpt @RESPATH@/components/htmlparser.xpt -@@ -276,7 +297,9 @@ +@@ -276,10 +297,12 @@ @RESPATH@/components/layout_xul.xpt @RESPATH@/components/locale.xpt @RESPATH@/components/lwbrk.xpt +#endif + #ifdef MOZ_ENABLE_PROFILER_SPS + @RESPATH@/components/memory_profiler.xpt + #endif @RESPATH@/browser/components/migration.xpt +#ifndef LIBXUL_SDK @RESPATH@/components/mimetype.xpt @@ -151,9 +154,9 @@ diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-rel @RESPATH@/browser/components/FeedConverter.js @RESPATH@/browser/components/FeedWriter.js @@ -391,6 +421,7 @@ + @RESPATH@/browser/components/webideComponents.manifest @RESPATH@/browser/components/Experiments.manifest @RESPATH@/browser/components/ExperimentsService.js - @RESPATH@/browser/components/translation.manifest +#ifndef LIBXUL_SDK @RESPATH@/components/Downloads.manifest @RESPATH@/components/DownloadLegacy.js @@ -184,13 +187,13 @@ diff -ruN mozilla-release.orig/browser/installer/package-manifest.in mozilla-rel @RESPATH@/browser/components/ProfileMigrator.js @RESPATH@/browser/components/ChromeProfileMigrator.js @@ -495,6 +531,7 @@ - #ifdef XP_MACOSX - @RESPATH@/browser/components/SafariProfileMigrator.js + #if defined(MOZ_ENABLE_DBUS) || defined(MOZ_ENABLE_GNOME_COMPONENT) + @RESPATH@/components/components.manifest #endif +#ifndef LIBXUL_SDK - #ifdef MOZ_ENABLE_DBUS - @RESPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@ - #endif + @RESPATH@/components/nsINIProcessor.manifest + @RESPATH@/components/nsINIProcessor.js + @RESPATH@/components/nsPrompter.manifest @@ -624,22 +661,27 @@ @RESPATH@/components/TestInterfaceJS.js @RESPATH@/components/TestInterfaceJS.manifest diff --git a/iceweasel.spec b/iceweasel.spec index f164f9f..8ff388b 100644 --- a/iceweasel.spec +++ b/iceweasel.spec @@ -22,12 +22,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: 42.0 -Release: 3 +Version: 43.0 +Release: 1 License: MPL v2.0 Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz -# Source0-md5: d610bf10a75afb4734045e1a43d8eba4 +# Source0-md5: a49c7f286a87112a5da836675200b060 Source1: %{name}-branding.tar.xz # Source1-md5: 8f25cec142ee276cb516940db12076db Source2: %{name}-rm_nonfree.sh @@ -528,7 +528,6 @@ fi # private xulrunner instance %dir %{_libdir}/%{name}/components %{_libdir}/%{name}/components/components.manifest -%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so %attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so %attr(755,root,root) %{_libdir}/%{name}/plugin-container %{_libdir}/%{name}/dictionaries -- 2.44.0