From 21596885601734506529d2e63d84d26d7608c9c4 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 26 Mar 2020 16:08:13 -0700 Subject: Updated to 28.9.0.2 --- PKGBUILD | 44 +++++++++++++++++++++++++++----------------- mozconfig.in | 12 ++++++------ system-libs.patch | 15 +++++---------- 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 3253d11..8d58f99 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,10 @@ # AUR version does not use system libs pkgname=palemoon +_repo=Pale-Moon pkgver=28.9.0.2 +_commit=c40d825675631ee745e11c97b2c03254a39f6b27 +_othercommit=cc9b40cc21caa95cb3c9cdb5a147bbeaf320d06f pkgrel=1 pkgdesc="Open source web browser based on Firefox focusing on efficiency." arch=(x86_64 i686) @@ -17,7 +20,7 @@ license=(MPL GPL LGPL) url="https://www.palemoon.org/" depends=(gtk2 desktop-file-utils libxt startup-notification mime-types dbus-glib libpulse alsa-lib - bzip2 libffi hunspell icu libjpeg-turbo libvpx nspr nss pixman libpng sqlite zlib) + bzip2 libffi hunspell libjpeg-turbo pixman zlib) makedepends=(unzip zip python2 yasm jack autoconf2.13 @@ -28,25 +31,31 @@ optdepends=('ffmpeg: various video and audio support' 'pulseaudio: PulseAudio support' 'palemoon-preferences: Custom vendor.js with security by default' 'palemoon-preferences-basic: Custom vendor.js with less breaking changes') -source=(palemoon-${pkgver}.tar.gz::https://github.com/MoonchildProductions/Pale-Moon/archive/${pkgver}_Release.tar.gz +source=(git+"https://github.com/MoonchildProductions/${_repo}?signed#commit=${_commit}" + git+"https://github.com/MoonchildProductions/UXP?signed#commit=${_othercommit}" mozconfig.in system-libs.patch) -b2sums=('f45e4be889c14ad6c911acf9fd3eb25599a27b125154db72854089b12a134d73ff8aeab249617d8313f61a6882a5cf780698327402d23a8da33d414acf8146ac' - 'e9053dc0efcc2fbc541d340e5054b4c9c6426c46c93e2fb68bc5860adf3785d1c0688ec1da2a7578c13eb59ef741a3d4312f9a1bc2e873f5a1490ed0cf296630' - '3f6c97f4bac9d6908be6844ba12027b98f9a535d16ee881529b3d497eaea0cdf888689ca593bc009bb45885f445652c96ac28b00ca6e1d16fb484aedb103a3cf') -#validpgpkeys=('3059E09144F56804F0FBF4E126B40624BDBFD9F3') +b2sums=('SKIP' + 'SKIP' + '233229764b0c4c1af30e100fa8dddd36f59405064a0c01f54fd1b387af3724b94dd5a78b3fc43be1eacc8b23cabdfd91a9d127360ceecea2bbebf48f42839d7a' + '47cc9da19cb7003ea896e8d1f3f77197548cf917c943ec1bd8526daaf6212d2c2c90bc417df156ee571c9ca052749a6a3a13f8acc150f1983a8bf0f8f1ebe2de') +validpgpkeys=('3059E09144F56804F0FBF4E126B40624BDBFD9F3') prepare() { sed 's#%SRCDIR%#'"${srcdir}"'#g' mozconfig.in > mozconfig - sed -i 's#xlocale#locale#' UXP-PM${pkgver}_Release/intl/icu/source/i18n/digitlst.cpp -} - -build() { - cd UXP-PM${pkgver}_Release + cd ${_repo} + git submodule init + git config submodule.platform.url "${srcdir}/UXP" + git submodule update # I'll use system libs if I darn well choose, thank you very much. patch -Np1 -i ../system-libs.patch - rm build/directive4.py + rm platform/build/directive4.py + +} + +build() { + cd ${_repo} export MOZBUILD_STATE_PATH="${srcdir}/mozbuild" export MOZCONFIG="${srcdir}/mozconfig" @@ -64,15 +73,16 @@ package() { ln -s "/usr/lib/${pkgname}/palemoon" "${pkgdir}/usr/bin/palemoon" # icons - install -Dm644 palemoon/browser/chrome/icons/default/default16.png \ + install -Dm644 ${srcdir}/${_repo}/palemoon/branding/official/default16.png \ "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${pkgname}.png" - install -Dm644 palemoon/browser/chrome/icons/default/default32.png \ + install -Dm644 ${srcdir}/${_repo}/palemoon/branding/official/default32.png \ "${pkgdir}/usr/share/icons/hicolor/32x32/apps/${pkgname}.png" - install -Dm644 palemoon/browser/chrome/icons/default/default48.png \ + install -Dm644 ${srcdir}/${_repo}/palemoon/branding/official/default48.png \ "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png" - install -Dm644 palemoon/browser/icons/mozicon128.png \ + install -Dm644 ${srcdir}/${_repo}/palemoon/branding/official/mozicon128.png \ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${pkgname}.png" # install desktop file - install -Dm644 "${srcdir}/UXP-PM${pkgver}_Release/application/palemoon/branding/official/palemoon.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 "${srcdir}/${_repo}/palemoon/branding/official/palemoon.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" } diff --git a/mozconfig.in b/mozconfig.in index 3884fd7..569f28d 100644 --- a/mozconfig.in +++ b/mozconfig.in @@ -23,16 +23,16 @@ ac_add_options --with-system-bz2 #ac_add_options --enable-system-cairo ac_add_options --with-system-ffi ac_add_options --enable-system-hunspell -ac_add_options --with-system-icu +#ac_add_options --with-system-icu ac_add_options --with-system-jpeg #ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --with-system-nspr -ac_add_options --with-system-nss +#ac_add_options --with-system-libvpx +#ac_add_options --with-system-nspr +#ac_add_options --with-system-nss ac_add_options --enable-system-pixman -ac_add_options --with-system-png +#ac_add_options --with-system-png ac_add_options --with-pthreads -ac_add_options --enable-system-sqlite +#ac_add_options --enable-system-sqlite ac_add_options --with-system-zlib ac_add_options --x-libraries=/usr/lib diff --git a/system-libs.patch b/system-libs.patch index 3d7a462..ccb987b 100644 --- a/system-libs.patch +++ b/system-libs.patch @@ -1,10 +1,6 @@ ---- a/old-configure.in -+++ b/old-configure.in -@@ -2055,3 +2055,0 @@ --if test -n "$_USE_SYSTEM_NSS"; then -- AC_MSG_ERROR([Building with system NSS is currently not supported.]) --fi -@@ -5616,31 +5616,0 @@ +--- a/platform/old-configure.in ++++ b/platform/old-configure.in +@@ -5282,30 +5616,0 @@ -dnl ======================================================== -dnl Directive 4 -dnl ======================================================== @@ -16,9 +12,6 @@ -MC_PALEMOON=$MC_PALEMOON -MOZ_EME=$MOZ_EME -MOZ_WEBRTC=$MOZ_WEBRTC --MOZ_SYSTEM_LIBEVENT=$MOZ_SYSTEM_LIBEVENT --MOZ_SYSTEM_NSS=$MOZ_SYSTEM_NSS --MOZ_SYSTEM_NSPR=$MOZ_SYSTEM_NSPR -MOZ_SYSTEM_JPEG=$MOZ_SYSTEM_JPEG -MOZ_SYSTEM_ZLIB=$MOZ_SYSTEM_ZLIB -MOZ_SYSTEM_BZ2=$MOZ_SYSTEM_BZ2 @@ -36,3 +29,5 @@ - AC_MSG_ERROR([Branding Violation - Please see: http://www.palemoon.org/redist.shtml]) - fi -fi +- +-AC_SUBST(DIRECTIVE4) -- cgit v1.2.1