From bde82da22bd3d0d53c1596a6933706a9a56b4947 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 22 Oct 2021 09:56:27 +0200
Subject: CMakeLists.txt: Don't build GTK2 flavour against GTK3.

---
 CMakeLists.txt | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b92a3c..cfd3bfc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,10 +40,21 @@ endif()
 
 set(DEPS
     glib-2.0>=2.37
-    gtk+-3.0>=3.24
     gmodule-2.0
     gio-unix-2.0
 )
+if (FLAVOUR_GTK3)
+    set(DEPS
+	${DEPS}
+	gtk+-3.0>=3.24
+    )
+endif()
+if (FLAVOUR_GTK2)
+    set(DEPS
+	${DEPS}
+	gtk+-2.0>=2.18
+    )
+endif()
 
 if (FLAVOUR_GTK3 AND ENABLE_IDO)
     set(DEPS
-- 
cgit v1.2.3


From c15189facd577c1fd3d3bf22b30bffe313b3078c Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 22 Oct 2021 09:57:50 +0200
Subject: debian/rules: Use one spelling for 'flavour'.

---
 debian/rules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index fd5a956..2fce74b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-FLAVORS = gtk2 gtk3
+FLAVOURS = gtk2 gtk3
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
@@ -19,12 +19,12 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 %:
 	dh $@
 
-override_dh_auto_configure: $(FLAVORS:%=doconfigure-%)
+override_dh_auto_configure: $(FLAVOURS:%=doconfigure-%)
 
 doconfigure-%:
 	DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/$* -- $(COMMON_CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_$*)
 
-override_dh_auto_build: $(FLAVORS:%=dobuild-%)
+override_dh_auto_build: $(FLAVOURS:%=dobuild-%)
 
 dobuild-%:
 	dh_auto_build --builddirectory=builddir/$*
@@ -33,7 +33,7 @@ override_dh_auto_test:
 	xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk2
 	xvfb-run -a dh_auto_test --no-parallel --builddirectory=builddir/gtk3
 
-override_dh_auto_install: $(FLAVORS:%=doinstall-%)
+override_dh_auto_install: $(FLAVOURS:%=doinstall-%)
 
 doinstall-%:
 	dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$*
-- 
cgit v1.2.3