Commit 0a0dfc27 by Santiago Rodriguez

Merge branch 'abrowser-kde-patches' into 'belenos'

Abrowser KDE Integration

These are the KDE integration patches for Abrowser. With every new release, the patches in the DATA directory should be updated from https://www.rosenauer.org/hg/mozilla.

I will make another merge request for the mozilla-kde-support (or kmozillahelper) package that goes along with the patches. Note that these patches have no effect on non-KDE systems.

See merge request !144
parents 3af3ec8c 9ff42db9
......@@ -22,7 +22,6 @@ set -e
export LANG=C LC_TIME=C
PACKAGE=$(echo $0 |/bin/sed s/make-//g)
export DATE=$(date +'%a, %d %b %Y %T %z')
export DATA=$PWD/DATA/$PACKAGE
......@@ -48,12 +47,15 @@ DEVELMIRROR=http://devel.trisquel.info/trisquel/$CODENAME
LOCALMIRROR=http://archive.trisquel.info/trisquel
LOCAL_APT=`mktemp -d`
pkgversion(){
dpkg-parsechangelog --show-field Version
}
replace(){
find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir /bin/sed --follow-symlinks -i s^"$1"^"$2"^g {} \;
}
changelog(){
head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME
echo | dch -D $REPO -v $(/bin/sed -n '1s/^.*(\(.*\)).*/\1'+${REVISION}trisquel${VERSION}'/p' debian/changelog) "$1"
echo | dch -D $REPO -v `pkgversion`+${REVISION}trisquel${VERSION} "$1"
# Make sure the changelog file is identical between archs
/bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info> $DATE/" -i debian/changelog
......
......@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=44
VERSION=45
. ./config
......@@ -28,6 +28,33 @@ rm debian/control
patch -p1 < $DATA/enable-js-options.patch
cp ./browser/components/preferences/advanced-scripts.xul ./browser/components/preferences/in-content/
# 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment