diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig index 4581cd1855f..05965d93c2d 100644 --- a/srcpkgs/firefox/files/mozconfig +++ b/srcpkgs/firefox/files/mozconfig @@ -17,7 +17,6 @@ ac_add_options --with-system-icu # XXX: the system's libpng doesn't have APNG support ac_add_options --without-system-png ac_add_options --enable-system-pixman -ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi diff --git a/srcpkgs/firefox/patches/disable-hunspell_hooks.patch b/srcpkgs/firefox/patches/disable-hunspell_hooks.patch deleted file mode 100644 index a5f7c29f2bd..00000000000 --- a/srcpkgs/firefox/patches/disable-hunspell_hooks.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla-config.h.in 2016-07-06 15:16:06.621880293 +0200 -+++ mozilla-config.h.in 2016-07-06 15:16:42.958428126 +0200 -@@ -54,7 +54,7 @@ - * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in, - * unless --enable-system-hunspell is defined. - */ --#if defined(HUNSPELL_STATIC) -+#if 0 - #include "hunspell_alloc_hooks.h" - #include "hunspell_fopen_hooks.h" - #endif diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index ad705909fc7..359843748d4 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -4,7 +4,7 @@ # pkgname=firefox version=61.0 -revision=1 +revision=2 short_desc="Mozilla Firefox web browser" maintainer="Juan RP " homepage="https://www.mozilla.org/firefox/" @@ -19,7 +19,7 @@ hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo llvm clang" makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx-devel - libXrender-devel hunspell-devel libXcomposite-devel libSM-devel libXt-devel + libXrender-devel libXcomposite-devel libSM-devel libXt-devel libXdamage-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if startup_notification startup-notification-devel) @@ -116,11 +116,6 @@ do_install() { usr/share/icons/hicolor/${i}/apps firefox.png done - # Use system-provided dictionaries - rm -rf ${DESTDIR}/usr/lib/firefox/{dictionaries,hyphenation} - ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/firefox/dictionaries - ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/firefox/hyphenation - # We don't want the development stuff rm -rf ${DESTDIR}/usr/{include,lib/firefox-devel,share/idl}