summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Rasmus Thomsen <cogitri@exherbo.org> 2018-09-16 18:17:25 +0200
committerAvatar Rasmus Thomsen <cogitri@exherbo.org> 2018-09-16 18:17:25 +0200
commitdca07c0cecfdb9375978db0fd8d094c0ecbda5c5 (patch)
treed6d7e373e2a7eade21b8e219f3448d84d71960a8
parent43b84fefd9188f20d14f863705fcb48bf0897f63 (diff)
downloadcogitri-dca07c0cecfdb9375978db0fd8d094c0ecbda5c5.tar.gz
cogitri-dca07c0cecfdb9375978db0fd8d094c0ecbda5c5.tar.xz
bolt: fix build with glib[>=2.58]
-rw-r--r--packages/app-admin/bolt/files/a9fda276415abb4c0ae7031271c2d5703c435086.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/packages/app-admin/bolt/files/a9fda276415abb4c0ae7031271c2d5703c435086.patch b/packages/app-admin/bolt/files/a9fda276415abb4c0ae7031271c2d5703c435086.patch
new file mode 100644
index 0000000..b3ea18b
--- /dev/null
+++ b/packages/app-admin/bolt/files/a9fda276415abb4c0ae7031271c2d5703c435086.patch
@@ -0,0 +1,32 @@
+From a9fda276415abb4c0ae7031271c2d5703c435086 Mon Sep 17 00:00:00 2001
+From: Christian Kellner <christian@kellner.me>
+Date: Fri, 15 Jun 2018 15:43:54 +0200
+Subject: [PATCH] test: common: no enum auto cleanup for glib > 2.57
+
+Newer glib (starting with 2.57) have gained support for autoptr
+cleanup functions for GEnumClass and GFlagsClass, so we don't
+need to define our own ones anymore.
+This change was already done to bolt-enums.c, but also is needed
+for the test.
+---
+ tests/test-common.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-common.c b/tests/test-common.c
+index c44d8ae..eb50a81 100644
+--- a/tests/test-common.c
++++ b/tests/test-common.c
+@@ -43,8 +43,10 @@
+ #include <sys/stat.h>
+ #include <unistd.h> /* unlinkat */
+
++#if !GLIB_CHECK_VERSION (2, 57, 0)
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GEnumClass, g_type_class_unref);
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC (GFlagsClass, g_type_class_unref);
++#endif
+
+ static void
+ cleanup_dir (DIR *d)
+--
+2.18.0
+