From 040b8e1e65cf71b397408b3115aeecb44c71ca09 Mon Sep 17 00:00:00 2001 From: B Stack Date: Fri, 23 Oct 2020 22:45:27 -0400 Subject: nm 28.14.2-2+devuan use gtk2 --- newmoon/debian/changelog | 6 ++++++ newmoon/debian/control | 2 +- newmoon/debian/mozconfig | 4 ++-- newmoon/debian/newmoon+devuan.dsc | 4 ++-- newmoon/debian/patches/series | 4 ++-- newmoon/debian/watch | 1 + 6 files changed, 14 insertions(+), 7 deletions(-) (limited to 'newmoon/debian') diff --git a/newmoon/debian/changelog b/newmoon/debian/changelog index 29bf091..a439024 100644 --- a/newmoon/debian/changelog +++ b/newmoon/debian/changelog @@ -1,3 +1,9 @@ +newmoon (28.14.2-2+devuan) obs; urgency=low + + * revert to gtk2 to see if stability returns + + -- Ben Stack Fri, 23 Oct 2020 22:40:55 -0400 + newmoon (28.14.2-1+devuan) obs; urgency=low * Update version diff --git a/newmoon/debian/control b/newmoon/debian/control index f5f6304..2190e14 100644 --- a/newmoon/debian/control +++ b/newmoon/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 12), libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), - libgtk-3-dev, + libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, diff --git a/newmoon/debian/mozconfig b/newmoon/debian/mozconfig index 097882d..a27b5ab 100644 --- a/newmoon/debian/mozconfig +++ b/newmoon/debian/mozconfig @@ -21,7 +21,7 @@ MOZ_REQUIRE_SIGNING= ac_add_options --enable-av1 ac_add_options --enable-optimize="-O2 -Wl,--no-keep-memory -Wl,--reduce-memory-overhead" # accepts either gtk2 or gtk3 here, but gtk2 is only officially supported option -ac_add_options --enable-default-toolkit=cairo-gtk3 +ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-devtools ac_add_options --disable-jemalloc ac_add_options --with-pthreads @@ -75,4 +75,4 @@ ac_add_options --x-libraries=/usr/lib # Debian Sid/Devuan Ceres is mildly broken as of 2020-07 and will fail to compile on anything higher than -j1 mk_add_options MOZ_MAKE_FLAGS="-j1" -export MOZ_PKG_SPECIAL=gtk3 +export MOZ_PKG_SPECIAL=gtk2 diff --git a/newmoon/debian/newmoon+devuan.dsc b/newmoon/debian/newmoon+devuan.dsc index f382e80..97373e2 100644 --- a/newmoon/debian/newmoon+devuan.dsc +++ b/newmoon/debian/newmoon+devuan.dsc @@ -2,11 +2,11 @@ Format: 3.0 (quilt) Source: newmoon Binary: newmoon Architecture: any -Version: 28.14.2-1+devuan +Version: 28.14.2-2+devuan Maintainer: B Stack Homepage: http://www.palemoon.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk-3-dev, libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip, libffi-dev, libpixman-1-dev | libpixman-dev, libbz2-dev, zlib1g-dev, libjpeg-dev, libnspr-dev | libnspr4-dev, libicu-dev, libhunspell-dev, libsqlite3-dev +Build-Depends: debhelper (>= 12), autoconf2.13, libasound2-dev, libdbus-glib-1-dev (>= 0.60), libgconf2-dev (>= 1.2.1), libgtk2.0-dev (>= 2.14), libssl-dev, libx11-xcb-dev, libxt-dev, mesa-common-dev, pkg-config, python2 (>= 2.7.18-2~) | python (>= 2.7), unzip, yasm (>= 1.1), zip, libffi-dev, libpixman-1-dev | libpixman-dev, libbz2-dev, zlib1g-dev, libjpeg-dev, libnspr-dev | libnspr4-dev, libicu-dev, libhunspell-dev, libsqlite3-dev Package-List: newmoon deb web optional arch=any Files: diff --git a/newmoon/debian/patches/series b/newmoon/debian/patches/series index 660c64a..e310e0c 100644 --- a/newmoon/debian/patches/series +++ b/newmoon/debian/patches/series @@ -1,6 +1,6 @@ small-icons.patch pm-devuan.patch pm-to-nm.patch -UXP-eliminate-need-for-GTK-2.patch -UXP-GTK-3-interface-Ensure-horizontal-scrollbars-are-not-too-tall.patch +#UXP-eliminate-need-for-GTK-2.patch +#UXP-GTK-3-interface-Ensure-horizontal-scrollbars-are-not-too-tall.patch UXP-strip-object-files-before-shared-library-linking.patch diff --git a/newmoon/debian/watch b/newmoon/debian/watch index cc46979..3baddaf 100644 --- a/newmoon/debian/watch +++ b/newmoon/debian/watch @@ -2,6 +2,7 @@ version=4 opts=filenamemangle=s/.+\/v?(\d\S+)_Release\.tar\.gz/palemoon_$1.orig\.tar\.gz/ \ https://github.com/MoonchildProductions/Pale-Moon/tags .*/v?(\d\S+)_Release\.tar\.gz +# Improve: added for 28.14.2-2 need to learn how to use https://repo.palemoon.org/MoonchildProductions/Pale-Moon/releases/tag/28.14.2_Release now that it is gone from github # not working. Uscan does not want to download specific, untagged git commits. #opts="component=platform" \ # https://github.com/MoonchildProductions/UXP/archive/41e5925b4271c598601fdc77238bbf6497576594.tar.gz -- cgit