diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-11-14 22:32:16 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2019-01-13 18:55:26 -0500 |
commit | 30e7f6c205c87344ed12840e9d00d346e123a381 (patch) | |
tree | 302d97add4b52f17f8ff8a531918bdac7e86e3a1 | |
parent | f728b4a05500686700a4d9618b0ccc233dde2a3a (diff) |
libre/iceweasel: Update 61.0.2 → 63.0.1
-rw-r--r-- | libre/iceweasel/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch | 35 | ||||
-rw-r--r-- | libre/iceweasel/0001-branding-Fix-for-v60-v61.patch | 72 | ||||
-rw-r--r-- | libre/iceweasel/0002-Fix-triplet-two-parts.patch | 20 | ||||
-rw-r--r-- | libre/iceweasel/PKGBUILD | 65 |
4 files changed, 67 insertions, 125 deletions
diff --git a/libre/iceweasel/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch b/libre/iceweasel/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch new file mode 100644 index 000000000..6fd00ca1c --- /dev/null +++ b/libre/iceweasel/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch @@ -0,0 +1,35 @@ +From e2d8a02d878aa27687f907b64fd41344ad1b2468 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io> +Date: Tue, 30 Oct 2018 22:21:52 +0100 +Subject: [PATCH] Keep mozilla-release building with newer cbindgen versions. + +--- + servo/components/style/cbindgen.toml | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/servo/components/style/cbindgen.toml b/servo/components/style/cbindgen.toml +index 46162e43db5e..1df99ffc5160 100644 +--- a/servo/components/style/cbindgen.toml ++++ b/servo/components/style/cbindgen.toml +@@ -23,11 +23,17 @@ derive_helper_methods = true + + [export] + prefix = "Style" + include = [ + "StyleAppearance", + "StyleDisplay", + "StyleDisplayMode", + "StyleFillRule", +- "StylePathCommand" ++ "StylePathCommand", ++ ++ "Appearance", ++ "Display", ++ "DisplayMode", ++ "FillRule", ++ "PathCommand" + ] + item_types = ["enums", "structs", "typedefs"] +-- +2.17.2 + diff --git a/libre/iceweasel/0001-branding-Fix-for-v60-v61.patch b/libre/iceweasel/0001-branding-Fix-for-v60-v61.patch deleted file mode 100644 index 2651473ad..000000000 --- a/libre/iceweasel/0001-branding-Fix-for-v60-v61.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 1e6b9c496d27014f988d83f6b20625a9eb4c624a Mon Sep 17 00:00:00 2001 -From: Luke Shumaker <lukeshu@parabola.nu> -Date: Sat, 25 Aug 2018 17:29:32 -0400 -Subject: [PATCH] branding: Fix for v60/v61 - - - Makefile.in doesn't respect VPATH - - firefox-branding.js uses lockPref(), which no longer exists - - brand.dtd sets trademarkInfo.part2, which no longer exists - - brand.properties doesn't set syncBrandShortName - - brand.ftl doesn't exist, but it needs to - ---- - branding/Makefile.in | 2 +- - branding/firefox-branding.js | 1 - - branding/locales/en-US/brand.dtd | 1 - - branding/locales/en-US/brand.ftl | 2 ++ - branding/locales/en-US/brand.properties | 2 ++ - 5 files changed, 5 insertions(+), 3 deletions(-) - create mode 100644 branding/locales/en-US/brand.ftl - -diff --git a/branding/Makefile.in b/branding/Makefile.in -index b395c62..deed5a6 100644 ---- a/branding/Makefile.in -+++ b/branding/Makefile.in -@@ -20,7 +20,7 @@ GARBAGE += $(BROWSER_APP_FILES) - - export:: $(BROWSER_APP_FILES) - $(NSINSTALL) -D $(DIST)/branding -- cp $(BROWSER_APP_FILES) $(DIST)/branding/ -+ cp $^ $(DIST)/branding/ - - GARBAGE += iceweasel.png - -diff --git a/branding/firefox-branding.js b/branding/firefox-branding.js -index 17cf43e..e92356e 100644 ---- a/branding/firefox-branding.js -+++ b/branding/firefox-branding.js -@@ -1,4 +1,3 @@ --lockPref("browser.startup.homepage_override.mstone", "ignore"); - pref("browser.aboutHomeSnippets.updateUrl", "data:text/html,"); - pref("startup.homepage_override_url",""); - pref("startup.homepage_welcome_url",""); -diff --git a/branding/locales/en-US/brand.dtd b/branding/locales/en-US/brand.dtd -index 50c20d6..c83e6d0 100644 ---- a/branding/locales/en-US/brand.dtd -+++ b/branding/locales/en-US/brand.dtd -@@ -3,4 +3,3 @@ - <!ENTITY brandFullName "Iceweasel"> - <!ENTITY vendorShortName "Mozilla"> - <!ENTITY trademarkInfo.part1 " "> --<!ENTITY trademarkInfo.part2 " "> -diff --git a/branding/locales/en-US/brand.ftl b/branding/locales/en-US/brand.ftl -new file mode 100644 -index 0000000..ca180e0 ---- /dev/null -+++ b/branding/locales/en-US/brand.ftl -@@ -0,0 +1,2 @@ -+-brand-short-name = Iceweasel -+-vendor-short-name = Mozilla -diff --git a/branding/locales/en-US/brand.properties b/branding/locales/en-US/brand.properties -index b69ae8d..ea073d6 100644 ---- a/branding/locales/en-US/brand.properties -+++ b/branding/locales/en-US/brand.properties -@@ -2,3 +2,5 @@ brandShorterName=Iceweasel - brandShortName=Iceweasel - brandFullName=Iceweasel - vendorShortName=Mozilla -+ -+syncBrandShortName=Sync --- -2.18.0 - diff --git a/libre/iceweasel/0002-Fix-triplet-two-parts.patch b/libre/iceweasel/0002-Fix-triplet-two-parts.patch deleted file mode 100644 index 0c0f0c0ec..000000000 --- a/libre/iceweasel/0002-Fix-triplet-two-parts.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- iceweasel-61.0.2.orig/build/moz.configure/init.configure 2018-11-02 13:44:54.417972000 -0500 -+++ iceweasel-61.0.2/build/moz.configure/init.configure 2018-11-02 13:47:03.932066745 -0500 -@@ -591,7 +591,16 @@ - # There is also a quartet form: - # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM - # But we can consider the "KERNEL-OPERATING_SYSTEM" as one. -- cpu, manufacturer, os = triplet.split('-', 2) -+ # Additionally, some may omit "unknown" when the manufacturer -+ # is not specified and emit -+ # CPU_TYPE-OPERATING_SYSTEM -+ parts = triplet.split('-', 2) -+ if len(parts) == 3: -+ cpu, _, os = parts -+ elif len(parts) == 2: -+ cpu, os = parts -+ else: -+ die("Unexpected triplet string: %s" % triplet) - - # Autoconf uses config.sub to validate and canonicalize those triplets, - # but the granularity of its results has never been satisfying to our diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 635568990..46ebac8ec 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -19,7 +19,7 @@ # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> -# Rational for inclusion in [libre]: +# Rationale for inclusion in [libre]: # - Modify the addons pages to use GNU IceCat plugins sources, rather # than addons.mozilla.org, which hosts non-free addons. # - Disable EME, which is implemented via the non-free libWideVine @@ -29,29 +29,30 @@ # policy[1], so making those changes also requires us to: # - Rebrand to Iceweasel # -# While we're at it, while not strictly nescessary for FSDG +# While we're at it, while not strictly necessary for FSDG # compliance: # - Remove Google API keys and usage # - Disable Mozilla telemetry and crash reporting (good manners -# because of all of the other patching we're doing +# because of all of the other patching we're doing) # # [1]: https://www.mozilla.org/en-US/foundation/trademarks/policy/ pkgname=iceweasel replaces=('firefox') epoch=1 -pkgver=61.0.2 +pkgver=63.0.1 pkgrel=1 -pkgrel+=.parabola4 +pkgrel+=.par1 pkgdesc="Libre standalone web browser based on Mozilla Firefox" arch=(x86_64) arch+=(i686 armv7h) license=(MPL GPL LGPL) url="https://wiki.parabola.nu/$pkgname" -depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg - nss hunspell-en_US sqlite ttf-font libpulse libvpx icu) -makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb - autoconf2.13 rust mercurial clang llvm jack gtk2 python) +depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib + ffmpeg nss hunspell-en_US sqlite ttf-font libpulse libvpx icu) +makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils + xorg-server-xvfb autoconf2.13 rust mercurial clang llvm jack gtk2 + python nodejs python2-psutil cbindgen) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -59,34 +60,33 @@ optdepends=('networkmanager: Location detection via available WiFi networks' options=(!emptydirs !makeflags !strip) _repo=https://hg.mozilla.org/mozilla-unified source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" + 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch $pkgname.desktop) + +# Branding +_brandingver='50e76939d930a072f76eea8d522422c29e49a251' +makedepends+=(git mozilla-searchplugins quilt libxslt imagemagick) +source+=("git://git.parabola.nu/packages/iceweasel.git#commit=${_brandingver}" + libre.patch) + sha256sums=('SKIP' + 'a1e523f830f28217e050991062358c91be254e21732a6391449a8c0e3e0de77f' 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' - 'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e' 'SKIP' - 'f2ebd5054b81a0f0f642b523a545145bdd5939e70b79c8129415cd1646cc6d74' - '070f9e1a8513ab66903f2f19d6fa9d13c9a2d975921a21821a6e76cd8fec53c6' 'b695926b8a1f9560f0e11e0bad2ef42df6152d4f16f95af1027bc12c487c1ede') -# Branding -_brandingver=$(cut -d. -f1,2<<<"$pkgver") -_brandingrel=1 -makedepends+=(mozilla-searchplugins quilt libxslt imagemagick) -source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig} - 0001-branding-Fix-for-v60-v61.patch - 0002-Fix-triplet-two-parts.patch - libre.patch) -validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin - prepare() { + mkdir mozbuild cd mozilla-unified + # https://bugzilla.mozilla.org/show_bug.cgi?id=1503401 + patch -Np1 -i ../0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch + cat >.mozconfig <<END ac_add_options --enable-application=browser ac_add_options --prefix=/usr ac_add_options --enable-release -ac_add_options --enable-linker=gold ac_add_options --enable-hardening ac_add_options --enable-optimize ac_add_options --enable-rust-simd @@ -98,39 +98,34 @@ ac_add_options --enable-update-channel=release ac_add_options --with-distribution-id=nu.parabola # System libraries -ac_add_options --with-system-zlib +ac_add_options --enable-system-ffi +ac_add_options --enable-system-sqlite ac_add_options --with-system-bz2 ac_add_options --with-system-icu ac_add_options --with-system-jpeg ac_add_options --with-system-libvpx ac_add_options --with-system-nspr ac_add_options --with-system-nss -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi +ac_add_options --with-system-zlib # Features ac_add_options --enable-alsa ac_add_options --enable-jack ac_add_options --enable-startup-notification ac_add_options --disable-crashreporter +ac_add_options --disable-gconf ac_add_options --disable-updater ac_add_options --disable-eme END if [[ $CARCH = arm* ]]; then - sed -i '/--enable-linker=gold/d' .mozconfig cat >> .mozconfig <<- END ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns" END fi # end [[ $CARCH = arm* ]] - patch -Np1 -i "$srcdir/0002-Fix-triplet-two-parts.patch" - ## Rebranding - local brandingdir="$srcdir/$pkgname-$_brandingver" - pushd "$brandingdir" - patch -Np1 -i "$srcdir/0001-branding-Fix-for-v60-v61.patch" - popd + local brandingdir="$srcdir/$pkgname/src" # file dump rm -rf -- browser/branding/$pkgname cp -aT -- $brandingdir/branding browser/branding/$pkgname @@ -178,6 +173,8 @@ build() { cd mozilla-unified export MOZ_SOURCE_REPO="$_repo" + export MOZ_NOSPAM=1 + export MOZBUILD_STATE_PATH="$srcdir/mozbuild" ./mach build ./mach buildsymbols @@ -551,3 +548,5 @@ END ln -srf "$pkgdir/usr/bin/$pkgname" \ "$pkgdir/usr/lib/$pkgname/$pkgname-bin" } + +# vim:set sw=2 et: |