summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-08-21 06:39:21 -0400
committerB Stack <bgstack15@gmail.com>2020-08-21 06:39:21 -0400
commit2990bfc8dee999877048d97f0edd9e74d5045763 (patch)
tree5763be4cf19d42aea368f20d1529b02d6ce08abc
parentWIP: add initial de-gtkifying from Gord (diff)
downloadstackrpms-2990bfc8dee999877048d97f0edd9e74d5045763.tar.gz
stackrpms-2990bfc8dee999877048d97f0edd9e74d5045763.tar.bz2
stackrpms-2990bfc8dee999877048d97f0edd9e74d5045763.zip
UXP elim gtk2 attempt 2, and remove u/b/palemoon
-rw-r--r--newmoon/debian/patches/UXP-eliminate-need-for-GTK-2.patch19
-rwxr-xr-xnewmoon/debian/rules2
2 files changed, 20 insertions, 1 deletions
diff --git a/newmoon/debian/patches/UXP-eliminate-need-for-GTK-2.patch b/newmoon/debian/patches/UXP-eliminate-need-for-GTK-2.patch
index 7eaffa9..c266f78 100644
--- a/newmoon/debian/patches/UXP-eliminate-need-for-GTK-2.patch
+++ b/newmoon/debian/patches/UXP-eliminate-need-for-GTK-2.patch
@@ -293,3 +293,22 @@ diff -uprN palemoon-28.12.0-original/platform/widget/moz.build palemoon-28.12.0-
DIRS += ['gtkxtbin']
XPIDL_SOURCES += [
+Date: 2020-08-20
+Message: The following was added in revision 1 of this patch. The location of the UXP
+application's package manifest must be changed before this patch is applied
+to any UXP application other than Pale Moon. However, this patch works
+without modification on Pale Moon.
+diff -uprN palemoon-28.12.0-original/palemoon/installer/package-manifest.in palemoon-28.12.0-patched/palemoon/installer/package-manifest.in
+--- palemoon-28.12.0-original/palemoon/installer/package-manifest.in 2020-07-30 06:09:43.000000000 -0400
++++ palemoon-28.12.0-patched/palemoon/installer/package-manifest.in 2020-08-20 20:57:55.116007204 -0400
+@@ -103,10 +103,6 @@
+ #ifdef MOZ_ICU_DATA_ARCHIVE
+ @RESPATH@/@ICU_DATA_FILE@
+ #endif
+-#ifdef MOZ_GTK3
+-@BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
+-@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
+-#endif
+
+ [browser]
+ ; [Base Browser Files]
diff --git a/newmoon/debian/rules b/newmoon/debian/rules
index 15b65ff..10797b7 100755
--- a/newmoon/debian/rules
+++ b/newmoon/debian/rules
@@ -39,7 +39,7 @@ override_dh_auto_install:
# remove vestigial duplicate file
rm -rf $$(pwd)/debian/newmoon/usr/lib/newmoon/palemoon-bin
mv $$(pwd)/debian/newmoon/usr/lib/newmoon/palemoon $$(pwd)/debian/newmoon/usr/lib/newmoon/newmoon
- rm -rf $$(pwd)/debian/usr/bin/palemoon
+ rm -rf $$(pwd)/debian/newmoon/usr/bin/palemoon
override_dh_shlibdeps:
dh_shlibdeps -l /usr/lib/newmoon
bgstack15