fix

2 files changed, 86 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37e24bd576ae..1bce0874881a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = basilisk
-	pkgdesc = Standalone web browser from mozilla.org, Extended Support Release
-	pkgver = 2018.04.01
-	pkgrel = 1
-	url = https://www.mozilla.org/en-US/firefox/organizations/
+	pkgdesc = Standalone web browser forked from mozilla.org, UXP version
+	pkgver = 2018.04.13
+	pkgrel = 2
+	url = https://github.com/MoonchildProductions/UXP
 	arch = x86_64
 	license = MPL
 	license = GPL
@@ -20,7 +20,6 @@ pkgbase = basilisk
 	makedepends = xorg-server-xvfb
 	makedepends = autoconf2.13
 	makedepends = rust
-	depends = gtk3
 	depends = gtk2
 	depends = mozilla-common
 	depends = libxt
@@ -41,26 +40,24 @@ pkgbase = basilisk
 	optdepends = speech-dispatcher: Text-to-Speech
 	options = !emptydirs
 	options = !makeflags
-	source = basil1::git+https://github.com/MoonchildProductions/moebius.git#commit=6d511e28616b5bcb2277c3a2e3dcbc994d84c963
+	source = basil2::git+https://github.com/MoonchildProductions/UXP.git#commit=8a95c03dcd2a7f2c6d64b6ee917f6cb363e9ca60
 	source = https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/basilisk.desktop
 	source = https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/basilisk-symbolic.svg
 	source = https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch
 	source = https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/fix-wifi-scanner.diff
 	source = https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/glibc-2.26-fix.diff
-	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-data-sharing-infobar.patch
 	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-location.services.mozilla.com.patch
-	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-telemetry.patch
-	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-install-dir.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/modified-install-dir.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/nss_mozbuild.patch
 	sha256sums = SKIP
 	sha256sums = 1fdc855349da4e3728b202f411ad1d1c3fdc01e616161603175ab1573df1e6a9
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
 	sha256sums = ebaa84b1e108390cd1042cce7eaad6a7c0053c7b2b4d0b961d4a98732b3c93ac
 	sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8
 	sha256sums = cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8
-	sha256sums = d2f63212766c764eec358c317db1e740c226abef57ef2b557dcf08c2588074a3
 	sha256sums = a7d4a4c240772d27c35aa27d711c0eec909700073c8b9488707f60d6e4b81a5e
-	sha256sums = 3868723b1afc75c109426bf54a86e97a3022ac9ce0650d620842c6ff8333b1cc
-	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
+	sha256sums = fe918de6def5136482e177209a52e6d1e596b36c0f24285cbcd97dbe848f14dd
+	sha256sums = 5f0252c51ecb806bbfb857f25a25df58a786b60c190e12bd00d68dca538f72da
 
 pkgname = basilisk
 
diff --git a/PKGBUILD b/PKGBUILD
index a791d13e381e..7b5ff426e978 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,11 @@
-# $Id$
-# Maintainer : Figue <ffigue@gmail.com>
-# Contributor : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Jakub Schmidtke <sjakub@gmail.com>
-
 pkgname=basilisk
-pkgver=2018.04.01
-ve=55.0.0
-pkgrel=1
-pkgdesc="Standalone web browser from mozilla.org, Extended Support Release"
+pkgver=2018.04.13
+pkgrel=2
+pkgdesc="Standalone web browser forked from mozilla.org, UXP version"
 arch=(x86_64)
 license=(MPL GPL LGPL)
-url="https://www.mozilla.org/en-US/firefox/organizations/"
-depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg
+url="https://github.com/MoonchildProductions/UXP"
+depends=(gtk2 mozilla-common libxt startup-notification mime-types dbus-glib alsa-lib ffmpeg
          libvpx libevent nss hunspell sqlite ttf-font icu)
 makedepends=(unzip zip diffutils python2 yasm mesa imake gconf libpulse inetutils xorg-server-xvfb
              autoconf2.13 rust)
@@ -19,16 +13,16 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'speech-dispatcher: Text-to-Speech')
 options=(!emptydirs !makeflags)
-com=6d511e28616b5bcb2277c3a2e3dcbc994d84c963
-source=("basil1::git+https://github.com/MoonchildProductions/moebius.git#commit=$com"
+com=8a95c03dcd2a7f2c6d64b6ee917f6cb363e9ca60
+# there is nothing magic about that commit, it's just the most recent
+source=("basil2::git+https://github.com/MoonchildProductions/UXP.git#commit=$com"
         https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/basilisk.desktop https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/basilisk-symbolic.svg
         https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch
         https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/fix-wifi-scanner.diff
         https://raw.githubusercontent.com/bn0785ac/basilisk-arch/master/glibc-2.26-fix.diff
-https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-data-sharing-infobar.patch
-https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-location.services.mozilla.com.patch
-https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-telemetry.patch
-https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-install-dir.patch)
+        https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-location.services.mozilla.com.patch
+        https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/modified-install-dir.patch
+        https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/nss_mozbuild.patch)
 
 sha256sums=('SKIP'
             '1fdc855349da4e3728b202f411ad1d1c3fdc01e616161603175ab1573df1e6a9'
@@ -36,41 +30,42 @@ sha256sums=('SKIP'
             'ebaa84b1e108390cd1042cce7eaad6a7c0053c7b2b4d0b961d4a98732b3c93ac'
             '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
             'cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8'
-            'd2f63212766c764eec358c317db1e740c226abef57ef2b557dcf08c2588074a3'
             'a7d4a4c240772d27c35aa27d711c0eec909700073c8b9488707f60d6e4b81a5e'
-            '3868723b1afc75c109426bf54a86e97a3022ac9ce0650d620842c6ff8333b1cc'
-            'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd')
-
+            'fe918de6def5136482e177209a52e6d1e596b36c0f24285cbcd97dbe848f14dd'
+            '5f0252c51ecb806bbfb857f25a25df58a786b60c190e12bd00d68dca538f72da')
 
 
 
 prepare() {
-  mkdir path
-  ln -s /usr/bin/python2 path/python
-
-  cd basil1
-
-msg2 'Edgy patches'
-
-#patch -Np1 -i ../firefox-52-disable-data-sharing-infobar.patch
-patch -Np1 -i ../firefox-52-disable-location.services.mozilla.com.patch
-patch -Np1 -i ../firefox-52-disable-telemetry.patch
-
-msg2 'Workin'
-
+  mkdir "$srcdir/path"
+  ln -s /usr/bin/python2 "$srcdir/path/python"
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
-  patch -Np1 -i ../fix-wifi-scanner.diff
+  cd basil2
 
-  # https://bugs.archlinux.org/task/54395 // https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
-  patch -Np1 -i ../0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch
+msg2 'firefox-52-disable-location.services.mozilla.com.patch'
+patch -Np1 -i ../firefox-52-disable-location.services.mozilla.com.patch || return 1
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1385667
-  # Build with the rust targets we actually ship
+msg2 'fix-wifi-scanner.diff'
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
+patch -Np1 -i ../fix-wifi-scanner.diff || return 1
 
+msg2 '0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch'
+# https://bugs.archlinux.org/task/54395 // https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
+patch -Np1 -i ../0001-Bug-54395-remove-hardcoded-flag-lcrmf.patch || return 1
+# note, sed -i 's/\ \-lcrmf//g' old-configure.in would do the same
+# but the patch was here anyway so we may as well use it
 
+msg2 'also remove -lcrmf reference from nss build, rather crudely'
+patch -Np1 -i ../nss_mozbuild.patch || return 1
+# I'd have used sed here, but either it barfs on escaping single quotes for no adequately explained reason that some dolt probably regards as a feature, or I'm just too stupid to get it to work and the dolt is me
 
+msg2 'modified-install-dir.patch'
+patch -Np1 -i ../modified-install-dir.patch || return 1
+# this was in other Firefox installations, and it's still needed
 
+# note that I've enabled some optimizations your CPU might not like
+# also, we will not be drinking the GTK3 koolaid at this time
+# also also, enabling branding/distribution failed for some reason
   cat >.mozconfig <<END
 ac_add_options --enable-application=browser
 
@@ -78,15 +73,17 @@ ac_add_options --prefix=/usr
 ac_add_options --enable-release
 ac_add_options --enable-gold
 ac_add_options --enable-pie
-ac_add_options --enable-optimize="-O2"
+ac_add_options --enable-optimize="-O2 -msse -msse2 -msse3 -mmmx -mfpmath=sse"
+ac_add_options --enable-default-toolkit=cairo-gtk2
 
 export MOZ_TELEMETRY_REPORTING=0
 
-ac_add_options --enable-official-branding
-ac_add_options --enable-update-channel=release
-ac_add_options --with-distribution-id=org.archlinux
-export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
+#ac_add_options --enable-official-branding
+#ac_add_options --enable-update-channel=release
+#ac_add_options --with-distribution-id=org.archlinux
+export MOZ_DATA_REPORTING=0
+export MOZILLA_OFFICIAL=0
+export MOZ_TELEMETRY_REPORTING=0
 export MOZ_ADDON_SIGNING=1
 export MOZ_REQUIRE_SIGNING=0
 
@@ -145,12 +142,17 @@ END
 }
 
 build() {
-  cd basil1
+  cd basil2
 
   # _FORTIFY_SOURCE causes configure failures
-  CPPFLAGS+=" -O2"
-
-#  # Hardening
+  # again note that these are my own optimizations, ymmv
+  # and don't trust it blindly because I might be stupid
+  CPPFLAGS+=" -O2 -msse -msse2 -msse3 -mmmx -mfpmath=sse"
+  CFLAGS+=" -msse -msse2 -msse3 -mmmx -mfpmath=sse"
+  CXXFLAGS+=" -msse -msse2 -msse3 -mmmx -mfpmath=sse"
+
+  # Hardening
+  # this is already in my makepkg.conf anyway so I'm leaving it out
 #  LDFLAGS+=" -Wl,-z,now"
 
   export PATH="$srcdir/path:$PATH"
@@ -158,21 +160,29 @@ build() {
   # Do PGO
   #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
   #  MOZ_PGO=1 ./mach build
-  ./mach build
   #  ./mach buildsymbols
+  # I have no idea what this is but I'm afraid of purging it
+
+  # Ordinarily, one would use "mach build" but this is a suggested workaround for an Assertion Error, see https://github.com/MoonchildProductions/UXP/issues/110
+msg2 'All right, attempting to build now'
+  DESTDIR="$pkgdir" make -f client.mk build
+  # ./mach build
 }
 
 package() {
-  cd basil1
+  cd basil2
 
 msg2 'Fixing  bugs as always lol'
-mkdir browser
-mkdir browser/branding
-cp -r application/basilisk/branding/official/ browser/branding/official
+# you and me both, mate
+mkdir -p browser/branding
+cp -r application/palemoon/branding/unofficial/ browser/branding/official
 
+msg2 'Going to try running make install now'
+# this "mach" business may just be b0rked, trying analogous workaround
+  DESTDIR="$pkgdir" make -f client.mk install
+#  DESTDIR="$pkgdir" ./mach install
 
-  DESTDIR="$pkgdir" ./mach install
-
+msg2 'Now installing a bunch of icons'
   for i in 16 22 24 32 48 256; do
     install -Dm644 browser/branding/official/default$i.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/basilisk.png"
@@ -187,13 +197,20 @@ cp -r application/basilisk/branding/official/ browser/branding/official
     "$pkgdir/usr/share/icons/hicolor/384x384/apps/basilisk.png"
   install -Dm644 ../basilisk-symbolic.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/basilisk-symbolic.svg"
-
   install -Dm644 ../basilisk.desktop \
     "$pkgdir/usr/share/applications/basilisk.desktop"
 
   # Use system-provided dictionaries
-
+  # took this from an old Firefox PKGBUILD, not sure if it will work
+msg2 'using system-provided dictionaries'
+  rm -rf "$pkgdir"/usr/lib/basilisk/{dictionaries,hyphenation}
+  ln -s /usr/share/hunspell "$pkgdir/usr/lib/basilisk/dictionaries"
+  ln -s /usr/share/hyphen "$pkgdir/usr/lib/basilisk/hyphenation"
+
+  # Replace duplicate binary with symlink
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+msg2 'all the weird stuff about duplicates needs to be corrected'
   ln -srf "$pkgdir/usr/bin/basilisk" \
-    "$pkgdir/usr/lib/basilisk-$ve/basilisk-bin"
+    "$pkgdir/usr/lib/basilisk/basilisk-bin"
 
 }