From 9f9b47a599a6825a61117da044e2292d6f3e5488 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Mon, 20 Nov 2017 21:41:47 -0500
Subject: [PATCH] Disabled abrowser kde integration patches not applying
correctly
---
helpers/make-firefox | 55 ++++++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/helpers/make-firefox b/helpers/make-firefox
index b1da9b52..60f1d909 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -18,38 +18,39 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=50
+VERSION=51
. ./config
rm debian/control
-# KDE integration patches from https://www.rosenauer.org/hg/mozilla
-# Use firefox$MAJORVERSION branch if available, otherwise use default
-MAJORVERSION=$(echo `pkgversion` | /bin/sed 's/\([0-9]\+\).*/\1/')
-BRANCH=firefox$MAJORVERSION
-if ! wget --spider https://rosenauer.org/hg/mozilla/log/$BRANCH; then
- BRANCH=default
-fi
-wget https://rosenauer.org/hg/mozilla/raw-file/$BRANCH/mozilla-kde.patch -O debian/patches/mozilla-kde.patch
-wget https://rosenauer.org/hg/mozilla/raw-file/$BRANCH/firefox-kde.patch -O debian/patches/abrowser-kde.patch
-
-# Add to series
-cat << EOF >> debian/patches/series
-mozilla-kde.patch
-abrowser-kde.patch
-EOF
-
-# Add kde.js file
-echo 'pref("browser.preferences.instantApply", false);' > debian/kde.js
-sed -i '/pre-build/r /dev/stdin' debian/rules << 'EOF'
- mkdir -p $(MOZ_DISTDIR)/bin/defaults/pref
- cp $(CURDIR)/debian/kde.js $(MOZ_DISTDIR)/bin/defaults/pref/kde.js
-EOF
-
-# A line is added to widget/gtk/moz.build by unity-menubar.patch, so we have to fix mozilla-kde.patch
-sed -i "/widget\/gtk\/moz\.build/,/widget\/gtk\/nsFilePicker\.cpp/{ /chromium/d; /generic/a\ \ \ \ \ '/layout/style',
-; }" debian/patches/mozilla-kde.patch
+# Disabled until the patches work on v57 with moz1382323.patch
+## KDE integration patches from https://www.rosenauer.org/hg/mozilla
+## Use firefox$MAJORVERSION branch if available, otherwise use default
+#MAJORVERSION=$(echo `pkgversion` | /bin/sed 's/\([0-9]\+\).*/\1/')
+#BRANCH=firefox$MAJORVERSION
+#if ! wget --spider https://rosenauer.org/hg/mozilla/log/$BRANCH; then
+# BRANCH=default
+#fi
+#wget https://rosenauer.org/hg/mozilla/raw-file/$BRANCH/mozilla-kde.patch -O debian/patches/mozilla-kde.patch
+#wget https://rosenauer.org/hg/mozilla/raw-file/$BRANCH/firefox-kde.patch -O debian/patches/abrowser-kde.patch
+#
+## Add to series
+#cat << EOF >> debian/patches/series
+#mozilla-kde.patch
+#abrowser-kde.patch
+#EOF
+#
+## Add kde.js file
+#echo 'pref("browser.preferences.instantApply", false);' > debian/kde.js
+#sed -i '/pre-build/r /dev/stdin' debian/rules << 'EOF'
+# mkdir -p $(MOZ_DISTDIR)/bin/defaults/pref
+# cp $(CURDIR)/debian/kde.js $(MOZ_DISTDIR)/bin/defaults/pref/kde.js
+#EOF
+#
+## A line is added to widget/gtk/moz.build by unity-menubar.patch, so we have to fix mozilla-kde.patch
+#sed -i "/widget\/gtk\/moz\.build/,/widget\/gtk\/nsFilePicker\.cpp/{ /chromium/d; /generic/a\ \ \ \ \ '/layout/style',
+#; }" debian/patches/mozilla-kde.patch
# js settings
cat $DATA/settings.js >> debian/vendor-firefox.js
--
GitLab