diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/iceape/PKGBUILD | 166 | ||||
| -rw-r--r-- | libre/iceape/iceape.install | 12 | ||||
| -rw-r--r-- | libre/iceape/mozbug1323209.patch | 35 | ||||
| -rw-r--r-- | libre/iceape/mozbug1329272.patch | 31 | ||||
| -rw-r--r-- | libre/iceape/mozconfig | 9 | ||||
| -rw-r--r-- | libre/iceape/no-crmf.diff (renamed from libre/iceape/no-crmf.patch) | 0 | ||||
| -rw-r--r-- | libre/iceape/xulrunner-27.0-build-arm.patch | 12 |
7 files changed, 147 insertions, 118 deletions
diff --git a/libre/iceape/PKGBUILD b/libre/iceape/PKGBUILD index b648e27ec..58aebff79 100644 --- a/libre/iceape/PKGBUILD +++ b/libre/iceape/PKGBUILD @@ -1,63 +1,60 @@ +# $Id$ +# Maintainer (Arch): Kyle Keen <keenerd@gmail.com> # Maintainer: Andreas Grapentin <andreas@grapentin.org> # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Márcio Silva <coadde@hyperbola.info> +_pkgname=seamonkey pkgname=iceape -_oldname=seamonkey - epoch=1 -pkgver=2.49.1 -pkgrel=3 -_brandingver=2.48 -_brandingrel=1 - -arch=(i686 x86_64 armv7h) -license=(MPL GPL LGPL) - -url="https://wiki.parabola.nu/$pkgname" +pkgver=2.49.2 +pkgrel=1 +_bver=2.48 +_brel=1 pkgdesc="Iceape, the libre internet suite based on SeaMonkey." - -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 gconf) -makedepends=(unzip zip pkg-config python2 librsvg wireless_tools yasm mesa autoconf2.13 quilt imake python3 gst-plugins-base) +arch=('x86_64') +arch+=('i686' 'armv7h') +license=('MPL') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification' 'libpulse' 'icu' 'gconf') +makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake' 'python3' 'gst-plugins-base') +makedepends+=('mozilla-searchplugins' 'quilt') optdepends=('gst-plugins-base: vorbis decoding, ogg demuxing' 'gst-plugins-bad: aac, vp8 and opus decoding' 'gst-plugins-good: webm and mp4 demuxing' 'gst-plugins-ugly: h.264 decoding') -replaces=("$_oldname") -conflicts=("$_oldname") -install=$pkgname.install - -source=("https://archive.mozilla.org/pub/mozilla.org/$_oldname/releases/$pkgver/source/$_oldname-$pkgver.source.tar.xz" - "https://repo.parabola.nu/other/$pkgname/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz" - "https://repo.parabola.nu/other/$pkgname/${pkgname}_$_brandingver-$_brandingrel.branding.tar.xz.sig" +url="https://wiki.parabola.nu/$pkgname" +replaces=("$_pkgname") +conflicts=("$_pkgname") +source=(https://archive.mozilla.org/pub/mozilla.org/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz mozconfig - $pkgname.desktop $pkgname-2.0-lang.patch - libre.patch rhbz-966424.patch - no-crmf.patch - xulrunner-27.0-build-arm.patch) -sha256sums=('ad2b31d105308b29cd768cd8e239cd5c0242cc7f5ad3003b19587e3f2900c202' - '2fd3568b07e4dddb0f81201c273c7a5ebb2ba837f49f71683b98f374d03134b4' - 'SKIP' - 'f0ce3865e2798a0575a29b49181ce1f058de2af8b7c5bae38670fda3d643d9e1' - '46ac418fe26937460a36a593d71c8f5cef1288c9e747cac4ec4ca92db56da45d' + mozbug1323209.patch + mozbug1329272.patch + no-crmf.diff) +source+=(https://repo.parabola.nu/other/$pkgname/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig} + libre.patch $pkgname.desktop) +sha256sums=('09fc9f8b1817a901b4e0d7635701ab50236885821d73694ac21615c8d911b575' + '1e88c4f6a1bd8170a714087325c3ba0b88c0b4352c4cd4db58317a3a0d2271c4' 'ab19d10fbd6258aec37ab5e5efb12429814b2c24a1193284a48dd654311b4e2e' - '8055e44151f007dd176d2bc545aa3ce282e9b1a59b35ca1f9f93d1c3e21689cd' '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a' + '87fb92e45f161d47b9e3ca31bcce60555bc33d633116dab4baa3bfba6ad965c4' + '33c7031781357faf5fba7140d7723bf301c1569068922477742ac958ee82e62b' 'fb85a538044c15471c12cf561d6aa74570f8de7b054a7063ef88ee1bdfc1ccbb' - 'bc83b8a51c81a401da2fbe1f7cd0843248c32607d3a51119585df074d797922e') + '2fd3568b07e4dddb0f81201c273c7a5ebb2ba837f49f71683b98f374d03134b4' + 'SKIP' + '8055e44151f007dd176d2bc545aa3ce282e9b1a59b35ca1f9f93d1c3e21689cd' + '46ac418fe26937460a36a593d71c8f5cef1288c9e747cac4ec4ca92db56da45d') validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin -if [[ "$CARCH" == arm* ]]; then - highmem=1 -fi - prepare() { - cd "$_oldname-$pkgver" + cd "$_pkgname-$pkgver" + cp ../mozconfig .mozconfig + #patch -Np1 -i ../$pkgname-2.0-lang.patch + # perform branding install -m755 -d $pkgname - mv -v "$srcdir"/$pkgname-$_brandingver/{branding,extras,patches} $pkgname + mv -v "$srcdir"/$pkgname-$_bver/{branding,extras,patches} $pkgname export QUILT_PATCHES=$pkgname/patches export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' @@ -65,12 +62,6 @@ prepare() { quilt push -av - 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 @@ -82,54 +73,55 @@ prepare() { install -m644 $pkgname/extras/preview.png suite/themes/classic # Convert svg file to png and replace seamonkey to iceape icons - _brandingdir=$pkgname/branding + _bdir=$pkgname/branding brandingdir=suite/branding/nightly for i in 16 48; do - rsvg-convert -w $i -h $i $_brandingdir/${pkgname}_icon_plain.svg \ + rsvg-convert -w $i -h $i $_bdir/${pkgname}_icon_plain.svg \ -o $brandingdir/icons/gtk/default$i.png - rsvg-convert -w $i -h $i $_brandingdir/${pkgname}_icon_plain.svg \ + rsvg-convert -w $i -h $i $_bdir/${pkgname}_icon_plain.svg \ -o $brandingdir/icons/gtk/main-window$i.png done for i in 32 48 64; do - rsvg-convert -w $i -h $i $_brandingdir/${pkgname}_icon_plain.svg \ + rsvg-convert -w $i -h $i $_bdir/${pkgname}_icon_plain.svg \ -o $brandingdir/content/icon$i.png done - rsvg-convert -w 32 -h 32 $_brandingdir/${pkgname}_icon_plain.svg \ + rsvg-convert -w 32 -h 32 $_bdir/${pkgname}_icon_plain.svg \ -o $brandingdir/icons/gtk/default.png - - rsvg-convert -w 32 -h 32 $_brandingdir/${pkgname}_icon_plain.svg \ + rsvg-convert -w 32 -h 32 $_bdir/${pkgname}_icon_plain.svg \ -o $brandingdir/icons/gtk/main-window.png - - rsvg-convert -w 128 -h 128 $_brandingdir/${pkgname}_icon_plain.svg \ + rsvg-convert -w 128 -h 128 $_bdir/${pkgname}_icon_plain.svg \ -o $brandingdir/icons/gtk/${pkgname}.png - - rsvg-convert -w 200 -h 200 $_brandingdir/${pkgname}_icon_plain.svg \ + rsvg-convert -w 200 -h 200 $_bdir/${pkgname}_icon_plain.svg \ -o $brandingdir/content/logo.gif - - rsvg-convert -w 300 -h 280 $_brandingdir/${pkgname}_logo_plain.svg \ + rsvg-convert -w 300 -h 280 $_bdir/${pkgname}_logo_plain.svg \ -o $brandingdir/content/about.png - - rsvg-convert -w 1138 -h 1152 $_brandingdir/${pkgname}_background_plain.svg \ + rsvg-convert -w 1138 -h 1152 $_bdir/${pkgname}_background_plain.svg \ -o $brandingdir/content/messenger-start-bg.png # Create app-icons folder for iceape*.png icons - install -m755 -d $_brandingdir/app-icons + install -m755 -d $_bdir/app-icons # Icons for /usr/share/icons/hicolor for i in 16 32 48 64 128; do - rsvg-convert -w $i -h $i $_brandingdir/${pkgname}_icon_plain.svg \ - -o $_brandingdir/app-icons/$pkgname${i}.png + rsvg-convert -w $i -h $i $_bdir/${pkgname}_icon_plain.svg \ + -o $_bdir/app-icons/$pkgname${i}.png done - cp "${srcdir}/mozconfig" .mozconfig + patch -Np1 -i "$srcdir/libre.patch" # FS#48404 #echo "ac_add_options --enable-gstreamer=1.0" >> .mozconfig # https://bugs.archlinux.org/task/41689 - patch -Np1 -d mozilla -i "$srcdir/rhbz-966424.patch" + #patch -Np1 -d mozilla -i ../../rhbz-966424.patch + + # Support NSS 3.28 + #patch -Np1 -d mozilla -i ../../mozbug1323209.patch + + # Bugfix for icu detection + #patch -Np1 -d mozilla -i ../../mozbug1329272.patch # Don't exit with error when some libs are missing which we have in # system. @@ -141,19 +133,13 @@ prepare() { # 2.26 build fix from wgnie (blfs ch 37) sed -i 's/$(MOZ_ZLIB_CFLAGS)/& $(MOZ_PIXMAN_CFLAGS)/' config/config.mk - # ARM-specific changes - if [[ "$CARCH" == arm* ]]; then - cat >> .mozconfig <<- EOF - ac_add_options --disable-elf-hack - EOF - - LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" - patch -p2 -d mozilla -i "$srcdir/xulrunner-27.0-build-arm.patch" - fi + # work around from FS#54395 + patch -Np1 -d mozilla -i ../../no-crmf.diff + sed -i "s/'crmf',//" mozilla/security/manager/ssl/moz.build } build() { - cd "$_oldname-$pkgver" + cd "$_pkgname-$pkgver" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname-$pkgver" export MOZ_MAKE_FLAGS="$MAKEFLAGS" @@ -168,29 +154,29 @@ build() { } package() { - cd "$_oldname-$pkgver" + cd "$_pkgname-$pkgver" - make -j1 -f client.mk DESTDIR="$pkgdir" install + make -j1 -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install rm -rf "$pkgdir"/usr/lib/$pkgname-$pkgver/{dictionaries,hyphenation,searchplugins} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$pkgname-$pkgver/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$pkgname-$pkgver/hyphenation" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname-$pkgver/searchplugins" + ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgname-$pkgver/dictionaries" + ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgname-$pkgver/hyphenation" + ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname-$pkgver/searchplugins" - install -m755 -d "$pkgdir/usr/share/applications" - install -m755 -d "$pkgdir/usr/share/pixmaps" + install -Dm644 suite/branding/nightly/icons/gtk/iceape.png \ + "$pkgdir/usr/share/pixmaps/seamonkey.png" - _brandingdir=$pkgname/branding - brandingdir=suite/branding/nightly - install -m644 $brandingdir/icons/gtk/iceape.png \ - "$pkgdir/usr/share/pixmaps/" + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" for i in 16 32 48 64 128; do - install -Dm644 $_brandingdir/app-icons/$pkgname$i.png "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" + install -Dm644 $pkgname/branding/app-icons/$pkgname$i.png \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" done - install -Dm644 $_brandingdir/${pkgname}_icon_plain.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg" + install -Dm644 $pkgname/branding/${pkgname}_icon_plain.svg \ + "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg" - install -m644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/" - - rm -r "$pkgdir"/usr/{include,lib/$pkgname-devel-$pkgver,share/idl} + rm -f "$pkgdir/usr/lib/pkgconfig/"$pkgname-ns{s,pr}.pc + #rm -r "$pkgdir"/usr/{include,lib/$pkgname-devel-$pkgver,share/idl} } + diff --git a/libre/iceape/iceape.install b/libre/iceape/iceape.install deleted file mode 100644 index 709ad81f2..000000000 --- a/libre/iceape/iceape.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/libre/iceape/mozbug1323209.patch b/libre/iceape/mozbug1323209.patch new file mode 100644 index 000000000..92c1376ae --- /dev/null +++ b/libre/iceape/mozbug1323209.patch @@ -0,0 +1,35 @@ + +# HG changeset patch +# User Franziskus Kiefer <franziskuskiefer@gmail.com> +# Date 1469717280 -7200 +# Node ID 361ac226da2a83516db8d4e4c5b41a69b3ba754f +# Parent 5d5d3ef04f3f77bb95616f56c129256a89f57831 +Bug 1290037 - Update keybits in H2, r=mt + +MozReview-Commit-ID: 35oWoDMqe1Y + +diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp +--- a/netwerk/protocol/http/Http2Session.cpp ++++ b/netwerk/protocol/http/Http2Session.cpp +@@ -3544,18 +3544,18 @@ Http2Session::ConfirmTLSProfile() + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } + + uint32_t keybits = ssl->GetKEAKeyBits(); + if (kea == ssl_kea_dh && keybits < 2048) { + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); +- } else if (kea == ssl_kea_ecdh && keybits < 256) { // 256 bits is "security level" of 128 +- LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 256\n", ++ } else if (kea == ssl_kea_ecdh && keybits < 224) { // see rfc7540 9.2.1. ++ LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to ECDH %d < 224\n", + this, keybits)); + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY); + } + + int16_t macAlgorithm = ssl->GetMACAlgorithmUsed(); + LOG3(("Http2Session::ConfirmTLSProfile %p MAC Algortihm (aead==6) %d\n", + this, macAlgorithm)); + if (macAlgorithm != nsISSLSocketControl::SSL_MAC_AEAD) { + diff --git a/libre/iceape/mozbug1329272.patch b/libre/iceape/mozbug1329272.patch new file mode 100644 index 000000000..81a4ebb78 --- /dev/null +++ b/libre/iceape/mozbug1329272.patch @@ -0,0 +1,31 @@ + +# HG changeset patch +# User Daniel Stenberg <daniel@haxx.se> +# Date 1484000700 -3600 +# Node ID ebcbf47a83e7d3b89460cf1c991b6be5a79a967b +# Parent 0759511f24e1b8d42acf5e9612f3ab91715842c2 +Bug 1329272 - add bracket for sed 4.3 compliance, r=glandium + +diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 +--- a/build/autoconf/icu.m4 ++++ b/build/autoconf/icu.m4 +@@ -64,17 +64,17 @@ if test -n "$USE_ICU"; then + icudir="$_topsrcdir/intl/icu/source" + if test ! -d "$icudir"; then + icudir="$_topsrcdir/../../intl/icu/source" + if test ! -d "$icudir"; then + AC_MSG_ERROR([Cannot find the ICU directory]) + fi + fi + +- version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` ++ version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"` + if test x"$version" = x; then + AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno]) + fi + MOZ_ICU_VERSION="$version" + + # TODO: the l is actually endian-dependent + # We could make this set as 'l' or 'b' for little or big, respectively, + # but we'd need to check in a big-endian version of the file. + diff --git a/libre/iceape/mozconfig b/libre/iceape/mozconfig index 96fe216ac..69fd3a09a 100644 --- a/libre/iceape/mozconfig +++ b/libre/iceape/mozconfig @@ -2,7 +2,6 @@ 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 @@ -15,6 +14,7 @@ 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 @@ -25,10 +25,14 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification +ac_add_options --disable-safe-browsing ac_add_options --enable-gio #ac_add_options --disable-gstreamer ac_add_options --enable-pulseaudio +ac_add_options --enable-optimize="-O2" +ac_add_options --enable-strip +ac_add_options --enable-install-strip #ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter @@ -37,6 +41,3 @@ ac_add_options --disable-tests #ac_add_options --disable-installer export MOZILLA_OFFICIAL=1 - -# Parabola features -ac_add_options --disable-safe-browsing diff --git a/libre/iceape/no-crmf.patch b/libre/iceape/no-crmf.diff index 242304eb4..242304eb4 100644 --- a/libre/iceape/no-crmf.patch +++ b/libre/iceape/no-crmf.diff diff --git a/libre/iceape/xulrunner-27.0-build-arm.patch b/libre/iceape/xulrunner-27.0-build-arm.patch deleted file mode 100644 index f82dc4f36..000000000 --- a/libre/iceape/xulrunner-27.0-build-arm.patch +++ /dev/null @@ -1,12 +0,0 @@ -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', - ] |