From dfeacd927c97b9e47f005efb322ead10ecd3e702 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 25 Sep 2022 13:39:09 +0000 Subject: [PATCH] gtklock: fix and rebuild for glib 2.72 --- ...7d5083b28ae955352710a2daf30d3497d229.patch | 31 +++++++++++++++++++ srcpkgs/gtklock/template | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/gtklock/patches/45877d5083b28ae955352710a2daf30d3497d229.patch diff --git a/srcpkgs/gtklock/patches/45877d5083b28ae955352710a2daf30d3497d229.patch b/srcpkgs/gtklock/patches/45877d5083b28ae955352710a2daf30d3497d229.patch new file mode 100644 index 00000000000..0f117cf02e0 --- /dev/null +++ b/srcpkgs/gtklock/patches/45877d5083b28ae955352710a2daf30d3497d229.patch @@ -0,0 +1,31 @@ +From 45877d5083b28ae955352710a2daf30d3497d229 Mon Sep 17 00:00:00 2001 +From: Jovan Lanik +Date: Thu, 22 Sep 2022 00:33:01 +0200 +Subject: [PATCH] fix old glib2 versions + +--- + src/gtklock.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/gtklock.c b/src/gtklock.c +index cc047ce..2faf66d 100644 +--- a/src/gtklock.c ++++ b/src/gtklock.c +@@ -94,10 +94,16 @@ void gtklock_idle_show(struct GtkLock *gtklock) { + gtklock->idle_hide_source = g_timeout_add_seconds(gtklock->idle_timeout, gtklock_idle_handler, gtklock); + } + ++#if GLIB_CHECK_VERSION(2, 74, 0) ++ #define GTKLOCK_FLAGS G_APPLICATION_DEFAULT_FLAGS ++#else ++ #define GTKLOCK_FLAGS G_APPLICATION_FLAGS_NONE ++#endif ++ + struct GtkLock* create_gtklock(void) { + struct GtkLock *gtklock = g_malloc0(sizeof(struct GtkLock)); + if(!gtklock) report_error_and_exit("Failed allocation"); +- gtklock->app = gtk_application_new(NULL, G_APPLICATION_DEFAULT_FLAGS); ++ gtklock->app = gtk_application_new(NULL, GTKLOCK_FLAGS); + if(gtklock->use_layer_shell) g_application_hold(G_APPLICATION(gtklock->app)); + gtklock->windows = g_array_new(FALSE, TRUE, sizeof(struct Window *)); + gtklock->messages = g_array_new(FALSE, TRUE, sizeof(char *)); diff --git a/srcpkgs/gtklock/template b/srcpkgs/gtklock/template index 48a6f370e48..abb435f3284 100644 --- a/srcpkgs/gtklock/template +++ b/srcpkgs/gtklock/template @@ -1,7 +1,7 @@ # Template file for 'gtklock' pkgname=gtklock version=1.3.7 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=yes hostmakedepends="pkg-config wayland-devel scdoc"