--- a/MozillaFirefox/MozillaFirefox.changes Fri Jun 19 08:22:26 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes Sun Jun 28 09:17:38 2015 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sat Jun 27 21:19:48 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 38.1.0 (bnc#935979)
+- requires NSS 3.19.2
+
+-------------------------------------------------------------------
Thu Jun 18 10:30:18 UTC 2015 - schwab@suse.de
- mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
--- a/MozillaFirefox/MozillaFirefox.spec Fri Jun 19 08:22:26 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Sun Jun 28 09:17:38 2015 +0200
@@ -19,9 +19,9 @@
# changed with every update
%define major 38
-%define mainver %major.0.6
-%define update_channel release
-%define releasedate 2015060500
+%define mainver %major.1.0
+%define update_channel esr38
+%define releasedate 2015062600
# general build definitions
%if "%{update_channel}" != "aurora"
@@ -77,7 +77,7 @@
BuildRequires: libproxy-devel
BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.10.8
-BuildRequires: mozilla-nss-devel >= 3.18.1
+BuildRequires: mozilla-nss-devel >= 3.19.2
BuildRequires: nss-shared-helper-devel
BuildRequires: python-devel
BuildRequires: startup-notification-devel
--- a/MozillaFirefox/create-tar.sh Fri Jun 19 08:22:26 2015 +0200
+++ b/MozillaFirefox/create-tar.sh Sun Jun 28 09:17:38 2015 +0200
@@ -1,9 +1,9 @@
#!/bin/bash
-CHANNEL="release"
+CHANNEL="esr38"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_38_0_6_RELEASE"
-VERSION="38.0.6"
+RELEASE_TAG="FIREFOX_38_1_0esr_RELEASE"
+VERSION="38.1.0"
# mozilla
if [ -d mozilla ]; then
@@ -47,7 +47,7 @@
;;
*)
echo "fetching $locale ..."
- hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale
+ hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale
[ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG
;;
esac
--- a/MozillaFirefox/firefox-esr.changes Fri Jun 19 08:22:26 2015 +0200
+++ b/MozillaFirefox/firefox-esr.changes Sun Jun 28 09:17:38 2015 +0200
@@ -1,9 +1,15 @@
-------------------------------------------------------------------
-Fri Jun 19 06:21:43 UTC 2015 - wr@rosenauer.org
+Sun Jun 28 07:11:18 UTC 2015 - wr@rosenauer.org
- renamed package to firefox-esr for ESR 38 cycle
-------------------------------------------------------------------
+Sat Jun 27 21:19:48 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 38.1.0 (bnc#935979)
+- requires NSS 3.19.2
+
+-------------------------------------------------------------------
Thu Jun 18 10:30:18 UTC 2015 - schwab@suse.de
- mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
--- a/MozillaFirefox/firefox-esr.spec Fri Jun 19 08:22:26 2015 +0200
+++ b/MozillaFirefox/firefox-esr.spec Sun Jun 28 09:17:38 2015 +0200
@@ -19,9 +19,9 @@
# changed with every update
%define major 38
-%define mainver %major.0.6
-%define update_channel release
-%define releasedate 2015060500
+%define mainver %major.1.0
+%define update_channel esr38
+%define releasedate 2015062600
# general build definitions
%if "%{update_channel}" != "aurora"
@@ -77,7 +77,7 @@
BuildRequires: libproxy-devel
BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.10.8
-BuildRequires: mozilla-nss-devel >= 3.18.1
+BuildRequires: mozilla-nss-devel >= 3.19.2
BuildRequires: nss-shared-helper-devel
BuildRequires: python-devel
BuildRequires: startup-notification-devel
@@ -133,7 +133,6 @@
Source14: create-tar.sh
Source15: firefox-appdata.xml
Source16: MozillaFirefox.changes
-Patch17: mozilla-arm64-libjpeg-turbo.patch
# Gecko/Toolkit
Patch1: toolkit-download-folder.patch
Patch2: mozilla-nongnome-proxies.patch
@@ -150,6 +149,7 @@
Patch14: mozilla-skia-be-le.patch
Patch15: mozilla-bmo1005535.patch
Patch16: mozilla-add-glibcxx_use_cxx11_abi.patch
+Patch17: mozilla-arm64-libjpeg-turbo.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-no-default-ualocale.patch
--- a/firefox-kde.patch Fri Jun 19 08:22:26 2015 +0200
+++ b/firefox-kde.patch Sun Jun 28 09:17:38 2015 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 14be97741eabce611c291418a4c1774cae8b29ff
+# Parent 37dd974224e6c52f4bccc1ea6cef65b0e0add838
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644
@@ -1339,7 +1339,7 @@
<button id="editBookmarkPanelDeleteButton"
class="editBookmarkPanelBottomButton"
label="&editBookmark.cancel.label;"
-@@ -1234,17 +1234,17 @@
+@@ -1228,17 +1228,17 @@
<hbox id="full-screen-warning-container" hidden="true" fadeout="true">
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1372,14 +1372,14 @@
* content/browser/browser.xul (content/browser.xul)
+* content/browser/browser-kde.xul (content/browser-kde.xul)
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
- content/browser/browser-pocket-en-US.properties (content/browser-pocket-en-US.properties)
- content/browser/browser-pocket.dtd (content/browser-pocket.dtd)
- content/browser/browser-pocket-de.properties (content/browser-pocket-de.properties)
- content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties)
- content/browser/browser-pocket-ja.properties (content/browser-pocket-ja.properties)
- content/browser/browser-pocket-ru.properties (content/browser-pocket-ru.properties)
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul)
+ content/browser/content.js (content/content.js)
+ content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg)
+ content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg)
+ content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg)
+ content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg)
+ content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
--- a/xulrunner/mozilla-libproxy-compat.patch Fri Jun 19 08:22:26 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-libproxy-compat.patch
\ No newline at end of file
--- a/xulrunner/mozilla-ppc.patch Fri Jun 19 08:22:26 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-ppc.patch
\ No newline at end of file
--- a/xulrunner/mozilla-sle11.patch Fri Jun 19 08:22:26 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-sle11.patch
\ No newline at end of file