[X2Go-Commits] [pale-moon] 23/52: debian/rules: select GTK3 if upstream thinks it should be the default.

git-admin at x2go.org git-admin at x2go.org
Fri Sep 21 23:08:33 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pale-moon.

commit 0b4f6411e932d51ba4b48dace45f9e8081f6de60
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Sep 20 22:54:05 2018 +0200

    debian/rules: select GTK3 if upstream thinks it should be the default.
---
 debian/changelog | 1 +
 debian/rules     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 50c8984..bad4be5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Hardcode MOZ_APP_REMOTINGNAME.
     - Replace $(PRODUCT) with hardcoded palemoon string in missed location.
     - Ignore rust stuff, but mention it.
+    - Select GTK3 if upstream thinks it should be the default.
   * debian/mozconfig:
     - Remove autoconf flags that should better be handled by debian/rules.
   * debian/make.mk:
diff --git a/debian/rules b/debian/rules
index 29f9bb6..689a481 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,8 @@ BRANDING ?= $(OFFICIAL_BRANDING)
 
 # Leave rust out, it's unsupported and unimplemented.
 
+GTK3 ?= $(shell grep -q "_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk3" configure.in && echo 1)
+
 BRANDING_CONFIGURE_FLAG = $(if $(filter $(BRANDING),$(OFFICIAL_BRANDING)),--enable-official-branding,--with-branding=$(BRANDING))
 
 MOZ_APP_REMOTINGNAME := Palemoon

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git


More information about the x2go-commits mailing list