CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disabled abrowser kde integration patches not applying correctly

Browse source
This commit is contained in:
Ruben Rodriguez 2017-11-20 21:41:47 -05:00
parent c9c343408c
commit 9f9b47a599
1 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

55
helpers/make-firefox
View file

@ -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