db-move libre-testing libre iceweasel

Whatever bugs are still in it aren't worth ICU hell.

1 files changed, 10 insertions, 12 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 12afc0d41..ade199152 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -28,7 +28,7 @@ _pkgname=firefox
 pkgname=iceweasel
 epoch=1
 pkgver=61.0.2
-pkgrel=1
+pkgrel=0.testing1
 _bver=61.0
 _brel=1
 pkgdesc="Libre standalone web browser based on Mozilla Firefox"
@@ -50,15 +50,12 @@ options=(!emptydirs !makeflags !strip)
 replaces=("$_pkgname")
 conflicts=("$_pkgname")
 # https://archive.mozilla.org/pub/firefox/releases/$pkgver/SOURCE
-_commit=239e434d6d2b8e1e2b697c3416d1e96d48fe98e5
-source=(firefox-$pkgver.tar.bz::https://hg.mozilla.org/releases/mozilla-release/archive/$_commit.tar.bz2
-        $pkgname.desktop
-        no-crmf.diff)
+source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
+        $pkgname.desktop)
 source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig}
          libre.patch)
-sha256sums=('5b7382ac0697e2abce5e2873878069a47fff5f3a5eeec4c3a0186598a1592833'
+sha256sums=('0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c'
             'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
-            '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873'
             'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e'
             'SKIP'
             'f2f3484a5339c7208a2a44b63a185ec5a57f837040627d29cc45b4d1d14ef6c2')
@@ -68,7 +65,7 @@ prepare() {
   mkdir path
   ln -s /usr/bin/python2 path/python
 
-  cd mozilla-release-$_commit
+  cd firefox-$pkgver
 
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
   patch -Np1 -i ../no-crmf.diff
@@ -170,16 +167,16 @@ END
 
   # Disable various components at the source level
   sed -i 's|[;]1|;0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup"
-  sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
+  #sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
   sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket"
   sed -i '/activity-stream/d' browser/extensions/moz.build || die "failed to wipe activity-stream"
 }
 
 build() {
-  cd mozilla-release-$_commit
+  cd firefox-$pkgver
 
   # _FORTIFY_SOURCE causes configure failures
-  CPPFLAGS+=" -O2"
+#   CPPFLAGS+=" -O2"
 
   export PATH="$srcdir/path:$PATH"
   export MOZ_SOURCE_REPO="$_repo"
@@ -187,12 +184,13 @@ build() {
   # Do PGO
   #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
   #  MOZ_PGO=1 ./mach build
+
   ./mach build
   ./mach buildsymbols
 }
 
 package() {
-  cd mozilla-release-$_commit
+  cd firefox-$pkgver
   DESTDIR="$pkgdir" ./mach install
   find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +