From 6e24892bfa58bc47e0bc3103c4bc9c90ecf0a513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
Date: Wed, 23 Oct 2024 13:43:19 +0300
Subject: [PATCH 1/2] wncklet: port to libwnck 4

---
 configure.ac                         | 2 +-
 modules/wncklet/showdesktop.c        | 2 +-
 modules/wncklet/window-list.c        | 2 +-
 modules/wncklet/window-menu.c        | 2 +-
 modules/wncklet/wncklet-module.c     | 2 +-
 modules/wncklet/wncklet.c            | 2 +-
 modules/wncklet/wncklet.h            | 2 +-
 modules/wncklet/workspace-switcher.c | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index e6d3e188d..201a85e32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,7 +208,7 @@ PKG_CHECK_MODULES([STATUS_NOTIFIER], [
   gtk+-3.0 >= $GTK_REQUIRED
 ])
 
-PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-4.0 >= $LIBWNCK_REQUIRED)
+PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-gtk3-4.0 >= $LIBWNCK_REQUIRED)
 AC_SUBST(WNCKLET_CFLAGS)
 AC_SUBST(WNCKLET_LIBS)
 
diff --git a/modules/wncklet/showdesktop.c b/modules/wncklet/showdesktop.c
index 9f511b471..ca9f1d2dc 100644
--- a/modules/wncklet/showdesktop.c
+++ b/modules/wncklet/showdesktop.c
@@ -21,7 +21,7 @@
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <string.h>
 
 #include "wncklet.h"
diff --git a/modules/wncklet/window-list.c b/modules/wncklet/window-list.c
index 0ee231fe9..37670f483 100644
--- a/modules/wncklet/window-list.c
+++ b/modules/wncklet/window-list.c
@@ -22,7 +22,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <string.h>
 
 #include "wncklet.h"
diff --git a/modules/wncklet/window-menu.c b/modules/wncklet/window-menu.c
index 74e4d380b..400f43b48 100644
--- a/modules/wncklet/window-menu.c
+++ b/modules/wncklet/window-menu.c
@@ -26,7 +26,7 @@
 
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <string.h>
 
 #include "wncklet.h"
diff --git a/modules/wncklet/wncklet-module.c b/modules/wncklet/wncklet-module.c
index 6ad6c4b6b..2533fbba1 100644
--- a/modules/wncklet/wncklet-module.c
+++ b/modules/wncklet/wncklet-module.c
@@ -19,7 +19,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <libgnome-panel/gp-module.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 
 #include "showdesktop.h"
 #include "window-list.h"
diff --git a/modules/wncklet/wncklet.c b/modules/wncklet/wncklet.c
index 201196dcd..2f457d0bd 100644
--- a/modules/wncklet/wncklet.c
+++ b/modules/wncklet/wncklet.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <string.h>
 
 #include "wncklet.h"
diff --git a/modules/wncklet/wncklet.h b/modules/wncklet/wncklet.h
index 261db8093..5da9b4120 100644
--- a/modules/wncklet/wncklet.h
+++ b/modules/wncklet/wncklet.h
@@ -22,7 +22,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 
 #define WNCKLET_RESOURCE_PATH "/org/gnome/panel/applet/wncklet/"
 
diff --git a/modules/wncklet/workspace-switcher.c b/modules/wncklet/workspace-switcher.c
index e2cb1e6f2..0050e6872 100644
--- a/modules/wncklet/workspace-switcher.c
+++ b/modules/wncklet/workspace-switcher.c
@@ -22,7 +22,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <libwnck/libwnck.h>
+#include <libwnck/libwnck-gtk3.h>
 #include <stdlib.h>
 #include <string.h>
 
-- 
GitLab


From 611a7bea770525208eb9089a51361a19d64c3661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
Date: Wed, 23 Oct 2024 14:13:47 +0300
Subject: [PATCH 2/2] ci: build libwnck 4

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 437d59b8d..30b3aae4d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ variables:
                   yelp-tools
 
 .build-libwnck: &build-libwnck
-  - git clone https://gitlab.gnome.org/GNOME/libwnck.git
+  - git clone https://gitlab.gnome.org/GNOME/libwnck.git -b wip/muktupavels/widgets
   - meson setup libwnck libwnck/build --prefix /usr -Dintrospection=disabled
   - meson install -C libwnck/build
 
-- 
GitLab