diff options
| -rw-r--r-- | libre/iceape/PKGBUILD | 21 | ||||
| -rw-r--r-- | libre/iceape/mozconfig | 2 | ||||
| -rw-r--r-- | libre/iceape/no-crmf.patch | 15 |
3 files changed, 29 insertions, 9 deletions
diff --git a/libre/iceape/PKGBUILD b/libre/iceape/PKGBUILD index 3d4e0a464..afc408510 100644 --- a/libre/iceape/PKGBUILD +++ b/libre/iceape/PKGBUILD @@ -1,19 +1,19 @@ -# Maintainer: André Silva <emulatorman@parabola.nu> -# Maintainer: Márcio Silva <coadde@parabola.nu> +# Maintainer: Andreas Grapentin <andreas@grapentin.org> +# Contributor: André Silva <emulatorman@riseup.net> +# Contributor: Márcio Silva <coadde@riseup.net> -# We're getting this from Debian Sid _pkgname=seamonkey pkgname=iceape epoch=1 _brandingver=2.39 _brandingrel=3 pkgver=2.46 -pkgrel=3 +pkgrel=4 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 gtk3 hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification libpulse icu=59.1 gconf) -makedepends=(unzip zip pkg-config python2 librsvg-stable wireless_tools yasm mesa autoconf2.13 quilt imake python3 gst-plugins-base) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gtk3 hunspell libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification libpulse icu=59.1 gconf) +makedepends=(unzip zip pkg-config python2 librsvg 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' 'gst-plugins-good: webm and mp4 demuxing' @@ -31,16 +31,18 @@ source=("https://archive.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/ $pkgname-2.0-lang.patch libre.patch rhbz-966424.patch + no-crmf.patch xulrunner-27.0-build-arm.patch add-bracket-for-sed-4.3-compliance.patch) sha256sums=('39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912' 'ed6f0aab804235a8ea32631b8d8d664329e9507f7aa6fb016c87042bace51a44' 'SKIP' - 'cbc768322c5f3cc9c43594618826349c14d902ba7756d6c16c1d33430d058d3b' + 'f0ce3865e2798a0575a29b49181ce1f058de2af8b7c5bae38670fda3d643d9e1' '46ac418fe26937460a36a593d71c8f5cef1288c9e747cac4ec4ca92db56da45d' 'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e' '8055e44151f007dd176d2bc545aa3ce282e9b1a59b35ca1f9f93d1c3e21689cd' '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a' + 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb' 'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e' '705223f37b0016fe9fcf4e89d7cbed4ae0c192a5e3e1b7055ba0a9577da14077') validpgpkeys=( @@ -64,9 +66,12 @@ prepare() { quilt push -av -# patch -Np1 -i "$srcdir/$pkgname-2.0-lang.patch" patch -Np1 -i "$srcdir/libre.patch" + # work around from FS#54395 + patch -Np1 -d mozilla -i "$srcdir/no-crmf.patch" + sed -i "s/'crmf',//" mozilla/security/manager/ssl/moz.build + # set up a simple non-animated throbber from the icon for throbber_target_gif in suite/themes/{classic,modern}/communicator/brand/throbber{,16}-anim.png; do install -m644 $pkgname/extras/Throbber-small.gif $throbber_target_gif diff --git a/libre/iceape/mozconfig b/libre/iceape/mozconfig index d0e01282c..96fe216ac 100644 --- a/libre/iceape/mozconfig +++ b/libre/iceape/mozconfig @@ -2,6 +2,7 @@ ac_add_options --enable-application=suite ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib +ac_add_options --enable-optimize="-O2" # Iceape ac_add_options --disable-official-branding @@ -14,7 +15,6 @@ ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --with-system-png -ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite diff --git a/libre/iceape/no-crmf.patch b/libre/iceape/no-crmf.patch new file mode 100644 index 000000000..242304eb4 --- /dev/null +++ b/libre/iceape/no-crmf.patch @@ -0,0 +1,15 @@ +diff --git i/old-configure.in w/old-configure.in +index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 +--- i/old-configure.in ++++ w/old-configure.in +@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + +-if test -n "$MOZ_SYSTEM_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" +-else ++if test -z "$MOZ_SYSTEM_NSS"; then + NSS_CFLAGS="-I${DIST}/include/nss" + case "${OS_ARCH}" in + # Only few platforms have been tested with GYP |