Commit a4db3a4a authored by Chaoting Liu's avatar Chaoting Liu

firefox: update to 66.0.2, remove opensuse patch

- switch to xdg-desktop-portal approach
parent 2aa53b35
pkgname=firefox-kde
pkgver=66.0.1
pkgver=66.0.2
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
arch=('x86_64')
......@@ -13,15 +13,15 @@ makedepends=(unzip zip diffutils python2 yasm mesa imake inetutils xorg-server-x
optdepends=('networkmanager: Location detection via available WiFi networks'
'libnotify: Notification integration'
'upower: Battery API'
'firefox-i18n: for multilanguage support'
'hunspell: for spellchecking support')
'firefox-i18n: For multilanguage support'
'hunspell: For spellchecking support'
'xdg-desktop-portal-kde: For native KDE file dialog support')
screenshot="http://img864.imageshack.us/img864/5116/firefoxm.png"
options=(!emptydirs !makeflags)
provides=("firefox=${pkgver}" "kmozillahelper=5.0.2")
conflicts=('kmozillahelper')
replaces=('kmozillahelper')
#
# For whom want to update this package
# To whom want to update this package
#
# Notes on mercurial release revision
# http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/SOURCE
......@@ -36,27 +36,15 @@ replaces=('kmozillahelper')
_kmozillahelper_commit=2ca28e0 #v5.0.2
_kdepatchrev=eca1c1f2fe50
_kdepatchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_kdepatchrev
_ubuntuver=build3-0ubuntu1
_ubuntuver=build1-0ubuntu1
#_ubuntupatchurl=http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_${pkgver}+${_ubuntuver}.debian.tar.xz # no TLS @2019, really?
#_gentoopatch=https://dev.gentoo.org/~{anarchy,axs,polynomial-c,whissi}/mozilla/patchsets/${PATCH}.tar.xz
source=("https://releases.mozilla.org/pub/firefox/releases/${pkgver}/source/${pkgname%%-kde}-${pkgver}.source.tar.xz"{,.asc}
"git://github.com/openSUSE/kmozillahelper#commit=${_kmozillahelper_commit}"
'firefox.desktop' 'ddg.xml'
'pgo-fix-missing-kdejs.patch'
'0001-bz-1468911.patch'
# Firefox patchset
"$_kdepatchurl/firefox-kde.patch"
"$_kdepatchurl/firefox-branded-icons.patch"
# Gecko/toolkit patchset
"$_kdepatchurl/mozilla-nongnome-proxies.patch"
"$_kdepatchurl/mozilla-kde.patch"
"$_kdepatchurl/mozilla-openaes-decl.patch"
"$_kdepatchurl/mozilla-cubeb-noreturn.patch"
"$_kdepatchurl/mozilla-bmo1463035.patch"
# Gentoo patch
1003_foritify_sources_properly.patch
2000_system_harfbuzz_support.patch
......@@ -78,24 +66,16 @@ source=("https://releases.mozilla.org/pub/firefox/releases/${pkgver}/source/${pk
# mozilla-reduce-files-per-UnifiedBindings.patch
)
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
sha256sums=('5dd072db4e96f8bbedc62cfab0de3c710d95f7c65fc676f90e1e86bc4b46fab2'
sha256sums=('fc37538e5852d4c97778ad7437fb1d37e9218c284ced70935378562e35184b46'
'SKIP'
'SKIP'
'6c2ea431c36afef67710547ae67e81975254309e9e1c82d8312f765caa950fe5'
'297c1a4ddb5448f6821caf0269b163e35a3065c907ce18569316d413b7f66a9c'
'1190f251471305f4c96a313b32aa66ee1549125300d7ce385356f45bd8ebcb3d'
'7c3b3079e587fb5c7fd8725b4677efb270355c03c8d16513bbe619903038381e'
'821f858bac2e13ce02b8c20d5387d4ecc8ab2d0e4ebe0a517cbf935da6aeb31b'
'184b3bc828763929ec13a18ac99cde2ea18cccbcd4483dedf3f50cbc274a1631'
'29acfc63f366510f471e395cc7a3815108072abda5851c48b64fdb894550408c'
'fa3222d3bc8b14b82b58a8ac2b252fdbd41768a5234d334538a1a3c703a3a73d'
'57c771b13bf123d221fb6f3cf917729cb8b9f21411e57505cace648180b27774'
'be7aa94f682dcb0feec3dd7c277d5d19e3c56fe3d4940203c942bbbefad6ed70'
'39acaeb31011777b959ae1a62c919fc67905158aeaca1477cae10b2f6a48ab5f'
'8fd670c7a718f5cbcbaa24fa7c838746db8fb513de06da0d76651988c7c60678'
'e5d8f0410ecd05119119e2d44a88fb5f1eb67a5b1035fd0a66b8cf167fb81c5d'
'21949f918907e16919820784bfb51540714c7bb256e219a3d965387b14b18886'
'8afb2dbc729487aaf6e43e0ce0e86fb51c6f0bd27c3b6580dbb0c431c1cf9aa0'
'f6dacdfb0321d81f8a6f904f3ded7610242cd5c6779aa566eb117ad2a38abb2d')
'ce243540712471cbe1bbc9abee6672720909caee0ed10d9d85e65defa2dd2f2d')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
......@@ -123,12 +103,6 @@ prepare() {
echo -n "$_google_api_key" > google-api-key
echo -n "$_mozilla_api_key" > mozilla-api-key
msg 'Generating kde.js'
cat >kde.js <<END
pref("browser.preferences.instantApply", false);
pref("browser.backspace_action", 0);
END
msg 'Generating mozconfig'
# There multiple default mozconfigs in the soruce tree with references across directories
# $topsrcdir/build/unix/mozconfig.gtk
......@@ -192,16 +166,6 @@ mk_add_options MOZ_MAKE_FLAGS="-j9"
STRIP_FLAGS="--strip-debug"
END
msg "Gecko/toolkit patchset"
for patch in $(ls $srcdir/mozilla-*.patch); do
patch -Np1 -i "$patch"
done
msg "Firefox patchset"
patch -Np1 -i "$srcdir/firefox-kde.patch"
patch -Np1 -i "$srcdir/firefox-branded-icons.patch"
patch -Np0 -i "$srcdir/pgo-fix-missing-kdejs.patch"
msg "Gentoo Patchset"
patch -Np1 -i $srcdir/1003_foritify_sources_properly.patch
patch -Np1 -i $srcdir/2000_system_harfbuzz_support.patch
......@@ -240,7 +204,7 @@ build_firefox() {
ulimit -n 4096
# Do PGO
#xvfb-run -a -n 97 -s "-extension GLX -screen 0 1280x1024x24"
xvfb-run -a -n 97 -s "-extension GLX -screen 0 1280x1024x24"
./mach build
}
......@@ -279,8 +243,6 @@ pref("layers.acceleration.force-enabled", true);
pref("webgl.force-enabled", true);
END
install -Dm644 kde.js "$pkgdir/usr/lib/firefox/browser/defaults/preferences/kde.js"
msg 'Chakra branding'
_distini="$pkgdir/usr/lib/firefox/distribution/distribution.ini"
install -Dm644 /dev/stdin "$_distini" <<END
......
......@@ -108,7 +108,7 @@ Comment[uk]=Перегляд сторінок Інтернету
Comment[vi]=Để duyệt các trang web
Comment[zh_CN]=浏览互联网
Comment[zh_TW]=瀏覽網際網路
Exec=firefox --new-tab %U
Exec=GTK_USE_PORTAL=1 firefox --new-tab %U
Terminal=false
Type=Application
Icon=firefox
......@@ -202,7 +202,7 @@ Name[vi]=Mở thẻ mới
Name[xh]=Vula ithebhu entsha
Name[zh_CN]=打开新标签页
Name[zh_TW]=開啟新分頁
Exec=firefox --new-tab about:newtab
Exec=GTK_USE_PORTAL=1 firefox --new-tab about:newtab
[Desktop Action NewWindow]
Name=Open new window
......@@ -289,7 +289,7 @@ Name[vi]=Mở cửa sổ mới
Name[xh]=Vula iwindow entsha
Name[zh_CN]=打开新窗口
Name[zh_TW]=開啟新視窗
Exec=firefox --new-window
Exec=GTK_USE_PORTAL=1 firefox --new-window
[Desktop Action NewPrivateWindow]
Name=New private window
......@@ -376,4 +376,4 @@ Name[vi]=Cửa sổ riêng tư mới
Name[xh]=Ifestile yangasese entsha
Name[zh_CN]=新建隐私浏览窗口
Name[zh_TW]=新增隱私視窗
Exec=firefox --private-window
Exec=GTK_USE_PORTAL=1 firefox --private-window
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