Merge branch 'pm-experimental' into 'palemoon-bump'

aboutdialog customization

See merge request bgstack15/stackrpms!155

7 files changed, 162 insertions, 29 deletions

diff --git a/palemoon/debian/changelog b/palemoon/debian/changelog
index 8ebc9c3..57de2fb 100644
--- a/palemoon/debian/changelog
+++ b/palemoon/debian/changelog
@@ -1,3 +1,9 @@
+palemoon (28.9.2-2+devuan) obs; urgency=medium
+
+  * testing OBS build optimization and removing animation from about dialog
+
+ -- Ben Stack <bgstack15@gmail.com>  Tue, 06 May 2020 15:08:46 -0400
+
 palemoon (28.9.2-1+devuan) obs; urgency=medium
 
   * This is a minor update for stability and compatibility.
diff --git a/palemoon/debian/mozconfig b/palemoon/debian/mozconfig
index bc45287..6513132 100644
--- a/palemoon/debian/mozconfig
+++ b/palemoon/debian/mozconfig
@@ -1,51 +1,55 @@
 mk_add_options AUTOCLOBBER=1
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/pmbuild
-ac_add_options --enable-application=palemoon
-
-ac_add_options --enable-optimize="-O2"
-
-ac_add_options --enable-official-branding
-ac_add_options --enable-official-vendor
-
-# Safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
-# defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 export MC_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 export MC_PALEMOON=1
 
+#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/pmbuild
+
+ac_add_options --enable-application=palemoon
+ac_add_options --enable-official-branding
+ac_add_options --enable-official-vendor
+
 # Disable add-ons signing
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_SIGNING=
 
+# Standard
+# Enables
+ac_add_options --enable-av1
+ac_add_options --enable-optimize="-O2 -Wl,--no-keep-memory -Wl,--reduce-memory-overhead"
 ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-devtools
 ac_add_options --enable-jemalloc
-ac_add_options --enable-av1
-#ac_add_options --enable-shared-js
-ac_add_options --enable-strip
 ac_add_options --with-pthreads
-
-ac_add_options --disable-tests
+ac_add_options --enable-strip
+# Disables
 ac_add_options --disable-debug
-ac_add_options --disable-crashreporter
 ac_add_options --disable-eme
-ac_add_options --disable-parental-controls
-ac_add_options --disable-accessibility
-ac_add_options --disable-webrtc
 ac_add_options --disable-gamepad
 ac_add_options --disable-necko-wifi
+ac_add_options --disable-tests
 ac_add_options --disable-updater
-# debian-style prefix
+ac_add_options --disable-webrtc
+# Disable temeletry
+export MOZ_TELEMETRY_REPORTING=
+ac_add_options --disable-crashreporter
+ac_add_options --disable-parental-controls
+ac_add_options --disable-accessibility
+
+# Debian style
 ac_add_options --prefix=/usr
-# devuan options
+# Devuan style
 ac_add_options --disable-dbus
 ac_add_options --disable-pulseaudio
 # even though this is redundant
 ac_add_options --enable-alsa
 
-# Disable telemetry reporting
-export MOZ_TELEMETRY_REPORTING=
-
+# primarily for 32-bit but tolerated for 64-bit
 ac_add_options --x-libraries=/usr/lib
+
+# TESTING FOR OBS
+# limit to 4 cpus to limit memory usage (approximately 0.75 GiB RAM/thread)
+mk_add_options MOZ_MAKE_FLAGS="-j4"
diff --git a/palemoon/debian/palemoon_devuan.dsc b/palemoon/debian/palemoon_devuan.dsc
index 8e5f0d8..83380a3 100644
--- a/palemoon/debian/palemoon_devuan.dsc
+++ b/palemoon/debian/palemoon_devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: palemoon
 Binary: palemoon
 Architecture: any
-Version: 28.9.2-1+devuan
+Version: 28.9.2-2+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: http://www.palemoon.org/
 Standards-Version: 4.1.4
diff --git a/palemoon/debian/patches/pm-devuan.patch b/palemoon/debian/patches/pm-devuan.patch
new file mode 100644
index 0000000..4e694a9
--- /dev/null
+++ b/palemoon/debian/patches/pm-devuan.patch
@@ -0,0 +1,59 @@
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul
+--- Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul	2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul	2020-05-05 09:12:48.776096853 -0400
+@@ -39,9 +39,9 @@
+     <vbox id="aboutHeaderBox" />
+     <vbox id="aboutVersionBox" flex="3">
+ #ifdef HAVE_64BIT_BUILD
+-#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (64-bit)</label>
++#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (64-bit) for Devuan</label>
+ #else
+-#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (32-bit)</label>
++#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (32-bit) for Devuan</label>
+ #endif
+         <label id="distribution" class="text-blurb"/>
+         <label id="distributionId" class="text-blurb"/>
+@@ -53,7 +53,7 @@
+ #ifdef MC_PRIVATE_BUILD
+           This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
+ #else
+-          <label class="text-link" href="http://www.palemoon.org">Pale Moon</label> is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
++          This build of palemoon is released by custom.
+         </description>
+         <description class="text-credits text-center">
+           Special thanks to all our supporters and donors for making this browser possible!
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css
+--- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css	2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css	2020-05-05 09:02:38.318463672 -0400
+@@ -21,8 +21,6 @@
+ }
+ 
+ #aboutTextBox {
+-  animation: 3s fadeIn;
+-  animation-fill-mode: forwards;
+   text-shadow: 1px 1px 0px #9ABCD5;
+   color: #101020; 
+ }
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd
+--- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd	2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd	2020-05-05 08:28:53.071897555 -0400
+@@ -1,4 +1,4 @@
+-<!ENTITY  brandShortName        "Pale Moon">
+-<!ENTITY  brandFullName         "Pale Moon">
+-<!ENTITY  vendorShortName       "Moonchild">
++<!ENTITY  brandShortName        "palemoon">
++<!ENTITY  brandFullName         "palemoon">
++<!ENTITY  vendorShortName       "custom">
+ <!ENTITY  trademarkInfo.part1   "The Pale Moon logo and project names are trademarks of Moonchild Productions (M.C. Straver BASc). All rights reserved.">
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties
+--- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties	2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties	2020-05-05 08:28:07.923487413 -0400
+@@ -1,5 +1,5 @@
+-brandShortName=Pale Moon
+-brandFullName=Pale Moon
+-vendorShortName=Moonchild
++brandShortName=palemoon
++brandFullName=palemoon
++vendorShortName=custom
+ 
+ syncBrandShortName=Sync
diff --git a/palemoon/debian/patches/series b/palemoon/debian/patches/series
index 25db835..054d3bf 100644
--- a/palemoon/debian/patches/series
+++ b/palemoon/debian/patches/series
@@ -1,2 +1,3 @@
 small-icons.patch
 bgstack15-palemoon.patch
+pm-devuan.patch
diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec
index c65a3bc..afaa594 100644
--- a/palemoon/palemoon.spec
+++ b/palemoon/palemoon.spec
@@ -37,14 +37,14 @@
 
 %if 0%{stackrpms_custom}
 Name:		palemoon-stackrpms
-Summary:	Pale Moon web browser with stackrpms prefs
-%global prettyname Pale Moon with stackrpms prefs
+Summary:	Pale Moon web browser
+%global prettyname Pale Moon
 %else
 Name:    palemoon
 Summary:	Pale Moon web browser
 %endif
-Version:	28.9.1
-Release:	1
+Version:	28.9.2
+Release:	2
 
 Group:	Networking/Web
 License:	MPLv2.0
@@ -58,6 +58,7 @@ Source4: palemoon-mimeinfo.xml
 Source5: bgstack15-palemoon-prefs.js
 Patch0: small-icons.patch
 Patch1: bgstack15-palemoon.patch
+Patch2: pm-fedora.patch
 %endif
 Packager:	Bgstack15 <bgstack15@gmail.com>
 
@@ -284,6 +285,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & :
 %doc AUTHORS LICENSE
 
 %changelog
+* Tue May 05 2020 B Stack <bgstack15@gmail.com> - 28.9.2-2
+- Add customization to about dialog
+
 * Thu Apr 30 2020 B Stack <bgstack15@gmail.com> - 28.9.2-1
 - update version
 
diff --git a/palemoon/pm-fedora.patch b/palemoon/pm-fedora.patch
new file mode 100644
index 0000000..2abeb5b
--- /dev/null
+++ b/palemoon/pm-fedora.patch
@@ -0,0 +1,59 @@
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul
+--- Pale-Moon-28.9.0.2_Release/palemoon/base/content/aboutDialog.xul	2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/base/content/aboutDialog.xul	2020-05-05 09:12:48.776096853 -0400
+@@ -39,9 +39,9 @@
+     <vbox id="aboutHeaderBox" />
+     <vbox id="aboutVersionBox" flex="3">
+ #ifdef HAVE_64BIT_BUILD
+-#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (64-bit)</label>
++#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (64-bit) for Fedora/CentOS</label>
+ #else
+-#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (32-bit)</label>
++#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (32-bit) for Fedora/CentOS</label>
+ #endif
+         <label id="distribution" class="text-blurb"/>
+         <label id="distributionId" class="text-blurb"/>
+@@ -53,7 +53,7 @@
+ #ifdef MC_PRIVATE_BUILD
+           This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
+ #else
+-          <label class="text-link" href="http://www.palemoon.org">Pale Moon</label> is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
++          This build of palemoon is released by custom.
+         </description>
+         <description class="text-credits text-center">
+           Special thanks to all our supporters and donors for making this browser possible!
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css
+--- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/content/aboutDialog.css	2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/content/aboutDialog.css	2020-05-05 09:02:38.318463672 -0400
+@@ -21,8 +21,6 @@
+ }
+ 
+ #aboutTextBox {
+-  animation: 3s fadeIn;
+-  animation-fill-mode: forwards;
+   text-shadow: 1px 1px 0px #9ABCD5;
+   color: #101020; 
+ }
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd
+--- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.dtd	2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.dtd	2020-05-05 08:28:53.071897555 -0400
+@@ -1,4 +1,4 @@
+-<!ENTITY  brandShortName        "Pale Moon">
+-<!ENTITY  brandFullName         "Pale Moon">
+-<!ENTITY  vendorShortName       "Moonchild">
++<!ENTITY  brandShortName        "palemoon">
++<!ENTITY  brandFullName         "palemoon">
++<!ENTITY  vendorShortName       "custom">
+ <!ENTITY  trademarkInfo.part1   "The Pale Moon logo and project names are trademarks of Moonchild Productions (M.C. Straver BASc). All rights reserved.">
+diff -Naur Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties
+--- Pale-Moon-28.9.0.2_Release/palemoon/branding/official/locales/en-US/brand.properties	2020-03-25 09:49:13.000000000 -0400
++++ Pale-Moon-28.9.0.2_Release-new/palemoon/branding/official/locales/en-US/brand.properties	2020-05-05 08:28:07.923487413 -0400
+@@ -1,5 +1,5 @@
+-brandShortName=Pale Moon
+-brandFullName=Pale Moon
+-vendorShortName=Moonchild
++brandShortName=palemoon
++brandFullName=palemoon
++vendorShortName=custom
+ 
+ syncBrandShortName=Sync