From 9ecac417e466a00be34f34fb2099254026d59a7f Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 29 Sep 2021 08:26:56 +0200
Subject: [PATCH] Really default to Gtk+ 4

---
 data/gtk4/libDesktop.pc.in |  2 +-
 data/project.conf          |  2 +-
 src/project.conf           | 20 +++++++++++---------
 tests/project.conf         |  2 +-
 tools/project.conf         | 18 +++++++++---------
 5 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/data/gtk4/libDesktop.pc.in b/data/gtk4/libDesktop.pc.in
index 5db9978..3fb5e1e 100644
--- a/data/gtk4/libDesktop.pc.in
+++ b/data/gtk4/libDesktop.pc.in
@@ -6,6 +6,6 @@ libdir=${exec_prefix}/lib
 Name: @PACKAGE@
 Description: DeforaOS Desktop helper library
 Version: @VERSION@
-Requires: libSystem gtk4
+Requires: libSystem gtk4-x11
 Cflags: -I${includedir}
 Libs: @RPATH@ -L${libdir} -lDesktop
diff --git a/data/project.conf b/data/project.conf
index 710f06c..fdabe32 100644
--- a/data/project.conf
+++ b/data/project.conf
@@ -1,6 +1,6 @@
 subdirs=gtk3
 dist=Makefile,pkgconfig.sh
-mode=gtk3-debug
+mode=gtk4-debug
 
 #modes
 [mode::gtk2-debug]
diff --git a/src/project.conf b/src/project.conf
index b0e5411..50d895b 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,11 +1,11 @@
 targets=libDesktop
 cppflags_force=-I ../include
-cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11` -fPIC
+cflags_force=`pkg-config --cflags libSystem gtk4-x11` -fPIC
 cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
-ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11`
+ldflags_force=`pkg-config --libs libSystem gtk4-x11`
 ldflags=-Wl,-z,relro -Wl,-z,now
 dist=Makefile,mimehandler.h
-mode=gtk3-debug
+mode=gtk4-debug
 
 #modes
 [mode::gtk2-debug]
@@ -18,19 +18,21 @@ cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC
 cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs libSystem gtk+-2.0`
 
+[mode::gtk3-debug]
+cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11` -fPIC
+ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11`
+
 [mode::gtk3-release]
 cppflags_force=-I ../include -DNDEBUG
+cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11` -fPIC
 cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
-
-[mode::gtk4-debug]
-cflags_force=`pkg-config --cflags libSystem gtk4` -fPIC
-ldflags_force=`pkg-config --libs libSystem gtk4`
+ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11`
 
 [mode::gtk4-release]
 cppflags_force=-I ../include -DNDEBUG
-cflags_force=`pkg-config --cflags libSystem gtk4` -fPIC
+cflags_force=`pkg-config --cflags libSystem gtk4-x11` -fPIC
 cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
-ldflags_force=`pkg-config --libs libSystem gtk4`
+ldflags_force=`pkg-config --libs libSystem gtk4-x11`
 
 #targets
 [libDesktop]
diff --git a/tests/project.conf b/tests/project.conf
index 2b4f283..00a75a9 100644
--- a/tests/project.conf
+++ b/tests/project.conf
@@ -5,7 +5,7 @@ ldflags=-pie -Wl,-z,relro -Wl,-z,now
 cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11`
 ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` $(OBJDIR)../src/libDesktop.a
 dist=Makefile,applications/Root.desktop,applications/Widget.desktop,clint.sh,fixme.sh,htmllint.sh,pkgconfig.sh,tests.sh,xmllint.sh
-mode=gtk3-debug
+mode=gtk4-debug
 
 #modes
 [mode::gtk2-debug]
diff --git a/tools/project.conf b/tools/project.conf
index 954fed3..22463e3 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,11 +1,11 @@
 targets=widget
 cppflags_force=-I ../include
-cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11`
+cflags_force=`pkg-config --cflags libSystem gtk4-x11`
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
-ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` -L $(OBJDIR)../src -lDesktop
+ldflags_force=`pkg-config --libs libSystem gtk4-x11` -L $(OBJDIR)../src -lDesktop
 ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,subst.sh
-mode=gtk3-debug
+mode=gtk4-debug
 
 #modes
 [mode::gtk2-debug]
@@ -18,19 +18,19 @@ cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
 cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -L $(OBJDIR)../src -lDesktop
 
+[mode::gtk3-debug]
+cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11`
+ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` -L $(OBJDIR)../src -lDesktop
+
 [mode::gtk3-release]
 cppflags_force=-I ../include -DNDEBUG
+cflags_force=`pkg-config --cflags libSystem gtk+-3.0 x11`
 cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
-
-[mode::gtk4-debug]
-cflags_force=`pkg-config --cflags libSystem gtk4`
-ldflags_force=`pkg-config --libs libSystem gtk4` -L $(OBJDIR)../src -lDesktop
+ldflags_force=`pkg-config --libs libSystem gtk+-3.0 x11` -L $(OBJDIR)../src -lDesktop
 
 [mode::gtk4-release]
 cppflags_force=-I ../include -DNDEBUG
-cflags_force=`pkg-config --cflags libSystem gtk4`
 cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
-ldflags_force=`pkg-config --libs libSystem gtk4` -L $(OBJDIR)../src -lDesktop
 
 #targets
 [widget]