Reverted to 29.4.4, epoch bump

3 files changed, 26 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f121be372704..762ac7789fbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = palemoon
 	pkgdesc = Open source web browser based on Firefox focusing on efficiency.
-	pkgver = 30.0.1
+	pkgver = 29.4.4
 	pkgrel = 1
+	epoch = 1
 	url = https://www.palemoon.org/
 	arch = i686
 	arch = x86_64
@@ -15,7 +16,6 @@ pkgbase = palemoon
 	makedepends = yasm
 	makedepends = gcc10
 	makedepends = libpulse
-	makedepends = git
 	depends = gtk2
 	depends = dbus-glib
 	depends = desktop-file-utils
@@ -25,15 +25,15 @@ pkgbase = palemoon
 	depends = startup-notification
 	optdepends = libpulse: PulseAudio audio driver
 	optdepends = ffmpeg: various video and audio support
-	source = git+https://repo.palemoon.org/MoonchildProductions/Pale-Moon?signed#commit=77e5e00208
-	source = git+https://repo.palemoon.org/MoonchildProductions/GRE
+	source = https://archive.palemoon.org/source/palemoon-29.4.4.source.tar.xz
+	source = https://archive.palemoon.org/source/palemoon-29.4.4.source.tar.xz.sig
 	source = mozconfig.in
 	validpgpkeys = 3DAD8CD107197488D2A2A0BD40481E7B8FCF9CEC
+	sha1sums = ace8fffe7d6851c7c0ec2c2555c0b8c19c7611b9
 	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = 49ded8cea5fffe4c8c8daec2335249988bc9c149
-	sha256sums = SKIP
+	sha1sums = 5fc8e164a8c1731ad2cce6270c9b0e9a5145194c
+	sha256sums = 5d81f24fdc7cdb000d6ed5762459eda842b0b1f43fdad3a4be5e8edd5c8f7079
 	sha256sums = SKIP
-	sha256sums = fe3c49964d7bbebc9fca844e5b4af12c52dac9187b87a98361788cfb6dd65fa7
+	sha256sums = a8ded94beaef0dfa4a5d6b109c1a669967cb7d38d4fe70b3a4d7725ef4b47394
 
 pkgname = palemoon
diff --git a/PKGBUILD b/PKGBUILD
index 7b51bb743f76..91cc9bf72abe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,8 @@
 # Contributor: ilikenwf
 # Contributor: American_Jesus
 pkgname=palemoon
-_repo=Pale-Moon
-pkgver=30.0.1
-# Commit can be found at https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases
-_commit=77e5e00208
+epoch=1
+pkgver=29.4.4
 pkgrel=1
 pkgdesc="Open source web browser based on Firefox focusing on efficiency."
 arch=('i686' 'x86_64')
@@ -15,34 +13,29 @@ license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2' 'dbus-glib' 'desktop-file-utils' 'libxt' 'mime-types' 'alsa-lib'
          'startup-notification')
 makedepends=('python2' 'autoconf2.13' 'unzip' 'zip' 'yasm' 'gcc10'
-             'libpulse' 'git')
+             'libpulse')
 optdepends=('libpulse: PulseAudio audio driver'
             'ffmpeg: various video and audio support')
-source=(git+"https://repo.palemoon.org/MoonchildProductions/${_repo}?signed#commit=${_commit}"
-        git+"https://repo.palemoon.org/MoonchildProductions/GRE"
+# as of 29.4.1, upstream have switched to unsigned source archives instead of git
+source=("https://archive.palemoon.org/source/palemoon-${pkgver}.source.tar.xz"{,.sig}
         mozconfig.in)
 validpgpkeys=('3DAD8CD107197488D2A2A0BD40481E7B8FCF9CEC')
-sha1sums=('SKIP'
+sha1sums=('ace8fffe7d6851c7c0ec2c2555c0b8c19c7611b9'
           'SKIP'
-          '49ded8cea5fffe4c8c8daec2335249988bc9c149')
-sha256sums=('SKIP'
+          '5fc8e164a8c1731ad2cce6270c9b0e9a5145194c')
+sha256sums=('5d81f24fdc7cdb000d6ed5762459eda842b0b1f43fdad3a4be5e8edd5c8f7079'
             'SKIP'
-            'fe3c49964d7bbebc9fca844e5b4af12c52dac9187b87a98361788cfb6dd65fa7')
+            'a8ded94beaef0dfa4a5d6b109c1a669967cb7d38d4fe70b3a4d7725ef4b47394')
 
 prepare() {
   sed 's#%SRCDIR%#'"${srcdir}"'#g' mozconfig.in > mozconfig
-  cd ${_repo}
-  git submodule init
-  git config submodule.platform.url "${srcdir}/GRE"
-  git submodule update
 }
 
 build() {
-  cd ${_repo}
-
   export MOZBUILD_STATE_PATH="${srcdir}/mozbuild"
   export MOZCONFIG="${srcdir}/mozconfig"
   export CPPFLAGS="${CPPFLAGS} -O2 -Wno-format-overflow"
+  cd palemoon-source
   ./mach build
 }
 
@@ -55,15 +48,15 @@ package() {
   ln -s "../lib/${pkgname}/palemoon" "${pkgdir}/usr/bin/palemoon"
 
   # icons
-  install -Dm644 palemoon/chrome/icons/default/default16.png \
+  install -Dm644 palemoon/browser/chrome/icons/default/default16.png \
     "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${pkgname}.png"
-  install -Dm644 palemoon/chrome/icons/default/default32.png \
+  install -Dm644 palemoon/browser/chrome/icons/default/default32.png \
     "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${pkgname}.png"
-  install -Dm644 palemoon/chrome/icons/default/default48.png \
+  install -Dm644 palemoon/browser/chrome/icons/default/default48.png \
     "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png"
-  install -Dm644 palemoon/icons/mozicon128.png \
+  install -Dm644 palemoon/browser/icons/mozicon128.png \
     "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png"
 
   # install desktop file
-  install -Dm644 "${srcdir}/${_repo}/other-licenses/branding/palemoon/official/palemoon.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${srcdir}/palemoon-source/palemoon/branding/official/palemoon.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }
diff --git a/mozconfig.in b/mozconfig.in
index cd34cac95c9f..f99befd140b1 100644
--- a/mozconfig.in
+++ b/mozconfig.in
@@ -6,13 +6,15 @@ export MOZ_PKG_SPECIAL=gtk2
 export CC=/usr/bin/gcc-10
 export CXX=/usr/bin/g++-10
 
-ac_add_options --enable-application=browser
+ac_add_options --enable-application=palemoon
 ac_add_options --enable-optimize="-O2 -w"
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-jemalloc
 ac_add_options --enable-strip
 ac_add_options --enable-devtools
 ac_add_options --enable-av1
+ac_add_options --disable-eme
+ac_add_options --disable-webrtc
 ac_add_options --disable-gamepad
 ac_add_options --disable-tests
 ac_add_options --disable-debug