iceape-1:2.46-1: updating version

6 files changed, 46 insertions, 104 deletions

diff --git a/libre/iceape/PKGBUILD b/libre/iceape/PKGBUILD
index 306e5cc2f..356e6deb0 100644
--- a/libre/iceape/PKGBUILD
+++ b/libre/iceape/PKGBUILD
@@ -7,12 +7,12 @@ pkgname=iceape
 epoch=1
 _brandingver=2.39
 _brandingrel=3
-pkgver=2.40
-pkgrel=5
+pkgver=2.46
+pkgrel=1
 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
 arch=(i686 x86_64 armv7h)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hunspell libevent libnotify libvpx=1.6.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification libpulse icu=58.2 gconf)
+depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gtk3 hunspell libevent libnotify libvpx=1.6.0 libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification libpulse icu=58.2 gconf)
 makedepends=(unzip zip pkg-config python2 librsvg-stable wireless_tools yasm mesa autoconf2.13 quilt imake python3 gst-plugins-base)
 optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing'
             'gst-plugins-bad: aac, vp8 and opus decoding'
@@ -31,23 +31,25 @@ source=("https://archive.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/
         $pkgname-2.0-lang.patch
         libre.patch
         rhbz-966424.patch
-        mozilla-1245076.patch
-        mozilla-1245076-1.patch)
-sha256sums=('7ecccc039d03f38d197b123b59ea42eac4c0c10e4bdec779b3665d79b435fa01'
+        xulrunner-27.0-build-arm.patch)
+sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912'
             'ed6f0aab804235a8ea32631b8d8d664329e9507f7aa6fb016c87042bace51a44'
             'SKIP'
-            'b1e2b82e1c5c9b967b40b651e5fa7f3d79b71081337c5263a9ad454d0abaf056'
+            'cbc768322c5f3cc9c43594618826349c14d902ba7756d6c16c1d33430d058d3b'
             '46ac418fe26937460a36a593d71c8f5cef1288c9e747cac4ec4ca92db56da45d'
             'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e'
-            'bc5150486aea78f58216597257500f14a83a2500eb96f41a2090f13785fb92bb'
+            '8055e44151f007dd176d2bc545aa3ce282e9b1a59b35ca1f9f93d1c3e21689cd'
             '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
-            '05574c7d0f259da161bcd0e2e8bc9a19401e620ff29439da935d349eebb60efa'
-            '6e7cba25c52b246da183b8309e7b56208bd991d1a7adb40063c5702a6f3722ea')
+            'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e')
 validpgpkeys=(
               'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
               '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva
 )
 
+if [[ "$CARCH" == arm* ]]; then
+  highmem=1
+fi
+
 prepare() {
   cd "$_pkgname-$pkgver"
 
@@ -118,7 +120,7 @@ prepare() {
   cp "${srcdir}/mozconfig" .mozconfig
 
   # FS#48404
-  echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig
+  #echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig
 
   # https://bugs.archlinux.org/task/41689
   patch -Np1 -d mozilla -i "$srcdir/rhbz-966424.patch"
@@ -133,17 +135,14 @@ prepare() {
   # 2.26 build fix from wgnie (blfs ch 37)
   sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk
 
-  # GCC 6
-  patch -Np1 -d mozilla -i ../../mozilla-1245076.patch
-  patch -Np1 -d mozilla -i ../../mozilla-1245076-1.patch
-
   # ARM-specific changes
   if [[ "$CARCH" == arm* ]]; then
     cat >> .mozconfig <<- EOF
 	ac_add_options --disable-elf-hack
-	ac_add_options --disable-neon
-	ac_add_options --disable-ion
 	EOF
+
+    LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+    patch -p2 -d mozilla -i "$srcdir/xulrunner-27.0-build-arm.patch"
   fi
 }
 
diff --git a/libre/iceape/libre.patch b/libre/iceape/libre.patch
index 444bd8e6d..bdf54e25f 100644
--- a/libre/iceape/libre.patch
+++ b/libre/iceape/libre.patch
@@ -1,5 +1,5 @@
 diff --git a/editor/ui/locales/en-US/chrome/region/region.properties b/editor/ui/locales/en-US/chrome/region/region.properties
-index fb6fac6..8d2ae68 100644
+index fb6fac676..8d2ae68db 100644
 --- a/editor/ui/locales/en-US/chrome/region/region.properties
 +++ b/editor/ui/locales/en-US/chrome/region/region.properties
 @@ -5,4 +5,4 @@
@@ -9,7 +9,7 @@ index fb6fac6..8d2ae68 100644
 -editor.throbber.url=http://www.seamonkey-project.org/
 +editor.throbber.url=about:
 diff --git a/mozilla/browser/locales/en-US/chrome/browser-region/region.properties b/mozilla/browser/locales/en-US/chrome/browser-region/region.properties
-index e078ed5..ce2c5ed 100644
+index e078ed528..ce2c5ed4d 100644
 --- a/mozilla/browser/locales/en-US/chrome/browser-region/region.properties
 +++ b/mozilla/browser/locales/en-US/chrome/browser-region/region.properties
 @@ -3,17 +3,12 @@
@@ -60,7 +60,7 @@ index e078ed5..ce2c5ed 100644
 +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
 diff --git a/suite/locales/en-US/chrome/browser/region.properties b/suite/locales/en-US/chrome/browser/region.properties
-index 1534dbf..b6377f2 100644
+index 1534dbf3c..b6377f20e 100644
 --- a/suite/locales/en-US/chrome/browser/region.properties
 +++ b/suite/locales/en-US/chrome/browser/region.properties
 @@ -6,24 +6,13 @@
@@ -95,20 +95,20 @@ index 1534dbf..b6377f2 100644
 -browser.contentHandlers.types.3.uri=http://digg.com/reader/search/%s
 +startup.homepage_override_url=about:
 diff --git a/suite/locales/en-US/chrome/common/region.properties b/suite/locales/en-US/chrome/common/region.properties
-index 1766d5d..4e2142e 100644
+index a0331dc52..4e2142ef6 100644
 --- a/suite/locales/en-US/chrome/common/region.properties
 +++ b/suite/locales/en-US/chrome/common/region.properties
 @@ -3,13 +3,13 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  # Default search engine
--browser.search.defaultenginename=Google
+-browser.search.defaultenginename=DuckDuckGo
 +browser.search.defaultenginename=searx
  
  # Search engine order (order displayed in the search bar dropdown)
--browser.search.order.1=Google
--browser.search.order.2=Yahoo
--browser.search.order.3=DuckDuckGo
+-browser.search.order.1=DuckDuckGo
+-browser.search.order.2=Google
+-browser.search.order.3=Yahoo
 +browser.search.order.1=searx
 +browser.search.order.2=DuckDuckGo HTML
 +browser.search.order.3=DuckDuckGo Lite
@@ -118,7 +118,7 @@ index 1766d5d..4e2142e 100644
 -app.update.url.details=http://www.seamonkey-project.org/releases/
 +app.update.url.details=about:
 diff --git a/suite/locales/en-US/chrome/mailnews/region.properties b/suite/locales/en-US/chrome/mailnews/region.properties
-index 588802f..c60ed7b 100644
+index fd56569f1..9b3a8dcc0 100644
 --- a/suite/locales/en-US/chrome/mailnews/region.properties
 +++ b/suite/locales/en-US/chrome/mailnews/region.properties
 @@ -6,9 +6,9 @@
@@ -133,24 +133,27 @@ index 588802f..c60ed7b 100644
 +addressbook.throbber.url=about:
  # To make mapit buttons to disappear in the addressbook, specify empty string.  For example:
  # mail.addr_book.mapit_url.format=
- # The format for "mail.addr_book.mapit_url.format" is:
+ # The mail.addr_book.mapit_url.format should start with the URL of the mapping
 diff --git a/suite/locales/en-US/profile/bookmarks.extra b/suite/locales/en-US/profile/bookmarks.extra
-index 7d73f86..d29297a 100644
+index e7fd304c7..5308ce51f 100644
 --- a/suite/locales/en-US/profile/bookmarks.extra
 +++ b/suite/locales/en-US/profile/bookmarks.extra
-@@ -9,9 +9,7 @@
+@@ -9,10 +9,9 @@
  
      <DT><H3>Search the Web</H3>
      <DL><p>
+-        <DT><A HREF="https://duckduckgo.com/">DuckDuckGo</A>
 -        <DT><A HREF="http://www.google.com/">Google</A>
 -        <DT><A HREF="http://groups.google.com/">Google Groups</A>
 -        <DT><A HREF="http://news.google.com/">Google News</A>
 +        <DT><A HREF="https://searx.laquadrature.net/">searx</A>
++        <DT><A HREF="https://duckduckgo.com/html">DuckDuckGo HTML</A>
++        <DT><A HREF="https://duckduckgo.com/lite">DuckDuckGo Lite</A>
      </DL><p>
  
  #unfilter emptyLines
 diff --git a/suite/locales/generic/profile/bookmarks.html.in b/suite/locales/generic/profile/bookmarks.html.in
-index 62a9327..6726af9 100644
+index 62a9327fc..6726af900 100644
 --- a/suite/locales/generic/profile/bookmarks.html.in
 +++ b/suite/locales/generic/profile/bookmarks.html.in
 @@ -15,37 +15,36 @@ Do Not Edit! -->
diff --git a/libre/iceape/mozconfig b/libre/iceape/mozconfig
index c1d8902a9..d0e01282c 100644
--- a/libre/iceape/mozconfig
+++ b/libre/iceape/mozconfig
@@ -30,11 +30,11 @@ ac_add_options --enable-gio
 ac_add_options --enable-pulseaudio
 
 
-ac_add_options --disable-gnomevfs
+#ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-installer
+#ac_add_options --disable-installer
 
 export MOZILLA_OFFICIAL=1
 
diff --git a/libre/iceape/mozilla-1245076-1.patch b/libre/iceape/mozilla-1245076-1.patch
deleted file mode 100644
index dfc52c2cf..000000000
--- a/libre/iceape/mozilla-1245076-1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h
---- a/config/gcc-stl-wrapper.template.h
-+++ b/config/gcc-stl-wrapper.template.h
-@@ -12,33 +12,39 @@
- // compiling ObjC.
- #if defined(__EXCEPTIONS) && __EXCEPTIONS && !(__OBJC__ && __GNUC__ && XP_IOS)
- #  error "STL code can only be used with -fno-exceptions"
- #endif
- 
- // Silence "warning: #include_next is a GCC extension"
- #pragma GCC system_header
- 
-+#ifndef moz_dont_include_mozalloc_for_cstdlib
-+#  define moz_dont_include_mozalloc_for_cstdlib
-+#endif
-+#ifndef moz_dont_include_mozalloc_for_${HEADER}
- // mozalloc.h wants <new>; break the cycle by always explicitly
- // including <new> here.  NB: this is a tad sneaky.  Sez the gcc docs:
- //
- //    `#include_next' does not distinguish between <file> and "file"
- //    inclusion, nor does it check that the file you specify has the
- //    same name as the current file. It simply looks for the file
- //    named, starting with the directory in the search path after the
- //    one where the current file was found.
--#include_next <new>
-+#  include_next <new>
- 
- // See if we're in code that can use mozalloc.  NB: this duplicates
- // code in nscore.h because nscore.h pulls in prtypes.h, and chromium
- // can't build with that being included before base/basictypes.h.
--#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
--#  include "mozilla/mozalloc.h"
--#else
--#  error "STL code can only be used with infallible ::operator new()"
-+#  if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
-+#    include "mozilla/mozalloc.h"
-+#  else
-+#    error "STL code can only be used with infallible ::operator new()"
-+#  endif
-+
- #endif
- 
- #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)
- // Enable checked iterators and other goodies
- //
- // FIXME/bug 551254: gcc's debug STL implementation requires -frtti.
- // Figure out how to resolve this with -fno-rtti.  Maybe build with
- // -frtti in DEBUG builds?
-
diff --git a/libre/iceape/mozilla-1245076.patch b/libre/iceape/mozilla-1245076.patch
deleted file mode 100644
index c3f06f19a..000000000
--- a/libre/iceape/mozilla-1245076.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/gfx/graphite2/src/Collider.cpp b/gfx/graphite2/src/Collider.cpp
---- a/gfx/graphite2/src/Collider.cpp
-+++ b/gfx/graphite2/src/Collider.cpp
-@@ -21,17 +21,17 @@
- 
- Alternatively, the contents of this file may be used under the terms of the
- Mozilla Public License (http://mozilla.org/MPL) or the GNU General Public
- License, as published by the Free Software Foundation, either version 2
- of the License or (at your option) any later version.
- */
- #include <algorithm>
- #include <limits>
--#include <math.h>
-+#include <cmath>
- #include <string>
- #include <functional>
- #include "inc/Collider.h"
- #include "inc/Segment.h"
- #include "inc/Slot.h"
- #include "inc/GlyphCache.h"
- #include "inc/Sparse.h"
- 
-
diff --git a/libre/iceape/xulrunner-27.0-build-arm.patch b/libre/iceape/xulrunner-27.0-build-arm.patch
new file mode 100644
index 000000000..f82dc4f36
--- /dev/null
+++ b/libre/iceape/xulrunner-27.0-build-arm.patch
@@ -0,0 +1,12 @@
+diff -up xulrunner-27.0/mozilla-release/gfx/ycbcr/moz.build.arm xulrunner-27.0/mozilla-release/gfx/ycbcr/moz.build
+--- firefox-27.0/mozilla-release/gfx/ycbcr/moz.build.arm	2014-01-28 05:03:42.000000000 +0100
++++ firefox-27.0/mozilla-release/gfx/ycbcr/moz.build	2014-02-03 11:14:34.062219509 +0100
+@@ -61,7 +61,7 @@ else:
+         'yuv_row_other.cpp',
+     ]
+ 
+-if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
++if CONFIG['HAVE_ARM_NEON']:
+     SOURCES += [
+         'yuv_row_arm.s',
+     ]