diff options
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 18 | ||||
| -rw-r--r-- | libre/iceweasel/no-libnotify.patch | 51 |
2 files changed, 63 insertions, 6 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 1dcb2c95b..3fb92e3d4 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -18,7 +18,7 @@ _pgo=true _debname=firefox _brandingver=45.0 _brandingrel=2 -_debver=45.0 +_debver=45.0.1 _debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ _parabolarepo=https://repo.parabola.nu/other/iceweasel @@ -28,7 +28,7 @@ _pkgname=firefox pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64) @@ -57,9 +57,10 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz" $pkgname.desktop $pkgname-install-dir.patch vendor.js - $pkgname-fixed-loading-icon.png) -sha256sums=('96f8b5ccae9864d7a4eece3735378a148481090f76ebfe6524dc433cec229351' - '9a698bbeec395352932bf0f07bdb959d87eaa8b99e9e43fcff2fd97e1c2028c5' + $pkgname-fixed-loading-icon.png + no-libnotify.patch) +sha256sums=('d0ea759658de4480d2e4ae00909f4b6f89dd55caf5bf7e9c96568a22a69afe14' + '928d9cb3a5f330fd13c4ae16cae8b844fb4730d64368ecd0ddd1cdb304836367' '69736106a9c96fdbca2fb82bd8fbceddf2ab87940ff42bc92cfaed716363310e' 'SKIP' 'abc617c170b0c4d549d1995d018285e16e9a30adf5e9c116d8b4d0070758070f' @@ -69,7 +70,8 @@ sha256sums=('96f8b5ccae9864d7a4eece3735378a148481090f76ebfe6524dc433cec229351' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' 'e6e43c6b481891e33dbb95849865410a2a9e77165f7de2c2057d3a8bab990aec' - '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') + '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' + 'e4ebdd14096d177d264a7993dbd5df46463605ff45f783732c26d30b9caa53a7') validpgpkeys=( 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva @@ -95,6 +97,10 @@ prepare() { # Install to /usr/lib/$pkgname patch -Np1 -i "$srcdir/$pkgname-install-dir.patch" + # Notifications with libnotify are broken + # https://bugzilla.mozilla.org/show_bug.cgi?id=1236150 + patch -Np1 -i "$srcdir/no-libnotify.patch" + # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" sed -i 's|Adobe Flash|SWF Player|g; diff --git a/libre/iceweasel/no-libnotify.patch b/libre/iceweasel/no-libnotify.patch new file mode 100644 index 000000000..8d5845743 --- /dev/null +++ b/libre/iceweasel/no-libnotify.patch @@ -0,0 +1,51 @@ +diff --git i/toolkit/system/gnome/moz.build w/toolkit/system/gnome/moz.build +index 0ecde07..206d6eb 100644 +--- i/toolkit/system/gnome/moz.build ++++ w/toolkit/system/gnome/moz.build +@@ -5,9 +5,7 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + SOURCES += [ +- 'nsAlertsIconListener.cpp', + 'nsGnomeModule.cpp', +- 'nsSystemAlertsService.cpp', + ] + + if CONFIG['MOZ_ENABLE_GCONF']: +diff --git i/toolkit/system/gnome/nsGnomeModule.cpp w/toolkit/system/gnome/nsGnomeModule.cpp +index 6ecebcc..2f193a3 100644 +--- i/toolkit/system/gnome/nsGnomeModule.cpp ++++ w/toolkit/system/gnome/nsGnomeModule.cpp +@@ -20,8 +20,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) + NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPackageKitService, Init) + #endif +-#include "nsSystemAlertsService.h" +-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSystemAlertsService, Init) + + #ifdef MOZ_ENABLE_GCONF + NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); +@@ -31,7 +29,6 @@ NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); + NS_DEFINE_NAMED_CID(NS_PACKAGEKITSERVICE_CID); + #endif +-NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); + + static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + #ifdef MOZ_ENABLE_GCONF +@@ -42,7 +39,6 @@ static const mozilla::Module::CIDEntry kGnomeCIDs[] = { + { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, + { &kNS_PACKAGEKITSERVICE_CID, false, nullptr, nsPackageKitServiceConstructor }, + #endif +- { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsSystemAlertsServiceConstructor }, + { nullptr } + }; + +@@ -55,7 +51,6 @@ static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { + { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, + { NS_PACKAGEKITSERVICE_CONTRACTID, &kNS_PACKAGEKITSERVICE_CID }, + #endif +- { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, + { nullptr } + }; + |