Beta

2 files changed, 7 insertions, 218 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 88d9f763aea3..b576e1355bbb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,74 +1,16 @@
 pkgbase = waterfox-alpha-kde
-	pkgdesc = Free, open and private browser with patches for better integration with KDE
-	pkgver = 68.0a2
+	pkgdesc = Transitional package for waterfox-beta-kde
+	pkgver = 68.0a3
 	pkgrel = 0
 	url = https://www.waterfox.net/
 	arch = x86_64
 	license = MPL
-	makedepends = unzip
-	makedepends = zip
-	makedepends = diffutils
-	makedepends = python
-	makedepends = yasm
-	makedepends = mesa
-	makedepends = imake
-	makedepends = gconf
-	makedepends = inetutils
-	makedepends = xorg-server-xvfb
-	makedepends = autoconf2.13
-	makedepends = rust
-	makedepends = clang
-	makedepends = llvm
-	makedepends = libpulse
-	makedepends = alsa-lib
-	makedepends = jack
-	makedepends = cbindgen
-	makedepends = nasm
-	makedepends = python2-setuptools
-	makedepends = nodejs
-	makedepends = python2-psutil
-	makedepends = ccache
-	makedepends = nss
-	makedepends = nspr
-	depends = gtk3
-	depends = gtk2
-	depends = libxt
-	depends = startup-notification
-	depends = mime-types
-	depends = dbus-glib
-	depends = ffmpeg
-	depends = hunspell
-	depends = ttf-font
-	depends = hicolor-icon-theme
-	depends = kwaterfoxhelper
-	optdepends = networkmanager: Location detection via available WiFi networks
-	optdepends = libnotify: Notification integration
-	optdepends = pulseaudio: Audio support
-	optdepends = alsa-lib: Audio support
-	optdepends = speech-dispatcher: Text-to-Speech
-	provides = waterfox-alpha=68.0a2
+	depends = waterfox-beta-kde
+	provides = waterfox-alpha=68.0a3
 	conflicts = waterfox-alpha
 	options = !emptydirs
 	options = !makeflags
 	options = zipman
-	source = git+https://github.com/MrAlex94/Waterfox.git#tag=68.0a2
-	source = waterfox-alpha.desktop
-	source = distribution.ini
-	source = vendor.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha/vendor.js
-	source = waterfox-alpha.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha/waterfox-alpha.1
-	source = syspref.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha/syspref.js
-	source = waterfox-kde-68.0a2.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha-kde/patches/waterfox-kde-68.0a2.patch
-	source = mozilla-nongnome-proxies.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha/patches/mozilla-nongnome-proxies.patch
-	source = kde.js::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/kde.js
-	sha256sums = SKIP
-	sha256sums = 2d9d16132bc30692c9383b0be439a31351f29897808c2cfaf96a252d6acf55d9
-	sha256sums = 3961c09993c442df97832866ddaea5bcc1ade1313beb313b5ceba60166933016
-	sha256sums = 04810534261af6cb7fce4a00ffdd7457be045e480bb95f4dcad4fbfeb202c163
-	sha256sums = 8fe7431aecc9d7f412744608ab8d779231726b6fe33aa46044ee4741053bd67f
-	sha256sums = 1362b56a0b5ddaad0761d8d3a04ea072a591772de8c9f7fd5c0459d2bba2379b
-	sha256sums = 6ce6c1d76b66727b5b1c60eac24074afd0d81f9ec16f8f5e3c52eba1d9fa2352
-	sha256sums = ffa9d71bd6dd60eaaef70ba67444c75b6ce0313a107b5b086fd3d30df865ccbf
-	sha256sums = b900f7f5a8440852a17191a374d5557ece44b98215c3c8960eb864cbc0753fe0
 
 pkgname = waterfox-alpha-kde
 
diff --git a/PKGBUILD b/PKGBUILD
index 5791b5ee4b91..3b289834deab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,166 +1,13 @@
 # Maintainer: hawkeye116477 <hawkeye116477 at gmail dot com>
 
 pkgname=waterfox-alpha-kde
-pkgver=68.0a2
+pkgver=68.0a3
 pkgrel=0
-pkgdesc="Free, open and private browser with patches for better integration with KDE"
+pkgdesc="Transitional package for waterfox-beta-kde"
 arch=('x86_64')
 license=('MPL')
 url="https://www.waterfox.net/"
-depends=('gtk3' 'gtk2' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'ffmpeg'
-         'hunspell' 'ttf-font' 'hicolor-icon-theme' 'kwaterfoxhelper')
-makedepends=('unzip' 'zip' 'diffutils' 'python' 'yasm' 'mesa' 'imake' 'gconf' 'inetutils' 'xorg-server-xvfb'
-             'autoconf2.13' 'rust' 'clang' 'llvm' 'libpulse' 'alsa-lib' 'jack' 'cbindgen' 'nasm' 'python2-setuptools'
-             'nodejs' 'python2-psutil' 'ccache' 'nss' 'nspr')
-optdepends=('networkmanager: Location detection via available WiFi networks'
-             'libnotify: Notification integration'
-             'pulseaudio: Audio support'
-             'alsa-lib: Audio support'
-             'speech-dispatcher: Text-to-Speech')
+depends=('waterfox-beta-kde')
 provides=("waterfox-alpha=${pkgver}")
 conflicts=('waterfox-alpha')
 options=('!emptydirs' '!makeflags' 'zipman')
-source=("git+https://github.com/MrAlex94/Waterfox.git#tag=$pkgver"
-        waterfox-alpha.desktop
-        distribution.ini
-        "vendor.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha/vendor.js"
-        "waterfox-alpha.1::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha/waterfox-alpha.1"
-        "syspref.js::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha/syspref.js"
-        "waterfox-kde-68.0a2.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha-kde/patches/waterfox-kde-68.0a2.patch"
-        "mozilla-nongnome-proxies.patch::https://raw.githubusercontent.com/hawkeye116477/waterfox-deb/master/waterfox-alpha/patches/mozilla-nongnome-proxies.patch"
-        "kde.js::https://raw.githubusercontent.com/hawkeye116477/Waterfox/plasma/_Plasma_Build/kde.js")
-sha256sums=('SKIP'
-            '2d9d16132bc30692c9383b0be439a31351f29897808c2cfaf96a252d6acf55d9'
-            '3961c09993c442df97832866ddaea5bcc1ade1313beb313b5ceba60166933016'
-            '04810534261af6cb7fce4a00ffdd7457be045e480bb95f4dcad4fbfeb202c163'
-            '8fe7431aecc9d7f412744608ab8d779231726b6fe33aa46044ee4741053bd67f'
-            '1362b56a0b5ddaad0761d8d3a04ea072a591772de8c9f7fd5c0459d2bba2379b'
-            '6ce6c1d76b66727b5b1c60eac24074afd0d81f9ec16f8f5e3c52eba1d9fa2352'
-            'ffa9d71bd6dd60eaaef70ba67444c75b6ce0313a107b5b086fd3d30df865ccbf'
-            'b900f7f5a8440852a17191a374d5557ece44b98215c3c8960eb864cbc0753fe0')
-
-prepare() {
-
-  cd Waterfox
-
-  patch -Np1 -i ../waterfox-kde-68.0a2.patch
-  patch -Np1 -i ../mozilla-nongnome-proxies.patch
-
-  cat >.mozconfig <<END
-export CC=clang
-export CXX=clang++
-export AR=llvm-ar
-export NM=llvm-nm
-export RANLIB=llvm-ranlib
-
-ac_add_options --enable-optimize="-O2 -msse3 -march=x86-64 -mtune=generic -w"
-ac_add_options --target=x86_64-pc-linux-gnu
-
-ac_add_options --enable-alsa
-ac_add_options --enable-pulseaudio
-ac_add_options --enable-jack
-
-#X=$(($(getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN)*3/2))
-
-#mk_add_options AUTOCLOBBER=1
-#mk_add_options MOZ_MAKE_FLAGS=-j6
-
-ac_add_options --prefix=/usr
-
-ac_add_options --with-app-name=waterfox-alpha
-ac_add_options --with-app-basename=Waterfox
-ac_add_options --with-branding=browser/branding/alpha
-
-# Libraries
-ac_add_options --x-libraries=/usr/lib
-
-# Disable unwanted features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-debug
-ac_add_options --disable-updater
-ac_add_options --disable-verify-mar
-ac_add_options --disable-profiling
-ac_add_options --disable-signmar
-ac_add_options --disable-gconf
-ac_add_options --disable-dmd
-
-# Enable wanted features
-ac_add_options --enable-rust-simd
-ac_add_options --enable-application=browser
-ac_add_options --enable-startup-notification
-ac_add_options --enable-hardening
-ac_add_options --enable-lto
-ac_add_options --enable-ccache=ccache
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-
-export MOZ_PGO=1
-END
-}
-
-build() {
-  cd Waterfox
-
-  export MOZ_NOSPAM=1
-  export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
-
-  # LTO needs more open files
-  ulimit -n 4096
-
-  xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
-}
-
-package() {
-  cd Waterfox
-  mkdir -p "$pkgdir"
-  DESTDIR="$pkgdir" ./mach install
-
-  _spellcheck_js="$pkgdir/usr/lib/waterfox-alpha/browser/defaults/preferences/spellcheck.js"
-  install -Dm644 /dev/stdin "$_spellcheck_js" <<END
-pref("spellchecker.dictionary_path", "/usr/share/hunspell");
-END
-
-install -Dm644 "$srcdir/kde.js" "$pkgdir/usr/lib/waterfox-alpha/browser/defaults/preferences/kde.js"
-
-  for i in 16 32 48 64 128; do
-    install -Dm644 browser/branding/alpha/default$i.png \
-      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/waterfox-alpha.png"
-  done
-  install -Dm644 browser/branding/alpha/content/about-logo.png \
-    "$pkgdir/usr/share/icons/hicolor/192x192/apps/waterfox-alpha.png"
-  install -Dm644 browser/branding/alpha/content/about-logo@2x.png \
-    "$pkgdir/usr/share/icons/hicolor/384x384/apps/waterfox-alpha.png"
-
-  install -Dm644 $srcdir/waterfox-alpha.desktop \
-    "$pkgdir/usr/share/applications/waterfox-alpha.desktop"
-
-  install -Dm644 $srcdir/waterfox-alpha.1 \
-    "$pkgdir/usr/share/man/man1/waterfox-alpha.1"
-
-  install -Dm644 $srcdir/distribution.ini \
-    "$pkgdir/usr/lib/waterfox-alpha/distribution/distribution.ini"
-
-  # Use system-provided dictionaries
-  if [ -d $pkgdir/usr/lib/waterfox-alpha/dictionaries ]; then
-    rm -r "$pkgdir"/usr/lib/waterfox-alpha/dictionaries
-  fi
-
-  # Install a wrapper to avoid confusion about binary path
-  install -Dm755 /dev/stdin "$pkgdir/usr/bin/waterfox-alpha" <<END
-#!/bin/sh
-exec /usr/lib/waterfox-alpha/waterfox-alpha "\$@"
-END
-
-  # Replace duplicate binary with wrapper
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -srf "$pkgdir/usr/bin/waterfox-alpha" \
-    "$pkgdir/usr/lib/waterfox-alpha/waterfox-alpha-bin"
-
-  # Add syspref.js for setting preferences for all users
-  mkdir -p "$pkgdir/etc/waterfox"
-  cp "$srcdir/syspref.js" "$pkgdir/etc/waterfox/"
-  ln -Tsf /etc/waterfox/syspref.js "$pkgdir/usr/lib/waterfox-alpha/browser/defaults/preferences/syspref.js"
-
-}