From e673a0434bab2cdf41e8f8c582cebe8751df09de Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 24 Sep 2020 00:57:06 +0000 Subject: Drop glib < 2.60 workaround after r549741 PR: 247278 --- accessibility/feedbackd/Makefile | 1 + accessibility/feedbackd/files/patch-glib-2.56 | 23 ----------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 accessibility/feedbackd/files/patch-glib-2.56 (limited to 'accessibility') diff --git a/accessibility/feedbackd/Makefile b/accessibility/feedbackd/Makefile index 8b6832698028..1e6f7292c9b2 100644 --- a/accessibility/feedbackd/Makefile +++ b/accessibility/feedbackd/Makefile @@ -2,6 +2,7 @@ PORTNAME= feedbackd PORTVERSION= s20200726 +PORTREVISION= 1 CATEGORIES= accessibility MAINTAINER= jbeich@FreeBSD.org diff --git a/accessibility/feedbackd/files/patch-glib-2.56 b/accessibility/feedbackd/files/patch-glib-2.56 deleted file mode 100644 index bbcebb574b20..000000000000 --- a/accessibility/feedbackd/files/patch-glib-2.56 +++ /dev/null @@ -1,23 +0,0 @@ -Drop after devel/glib20 is updated to 2.58 or later. - -../tests/test-lfb-integration.c:26:17: warning: implicit declaration of function 'g_canonicalize_filename' is invalid in C99 [-Wimplicit-function-declaration] - servicesdir = g_canonicalize_filename (relative, NULL); - ^ -ld: error: undefined symbol: g_canonicalize_filename ->>> referenced by test-lfb-integration.c ->>> tests/test-lfb-integration.p/test-lfb-integration.c.o:(fixture_setup) - ---- tests/test-lfb-integration.c.orig 2020-07-26 11:06:35 UTC -+++ tests/test-lfb-integration.c -@@ -23,7 +23,11 @@ fixture_setup (TestFixture *fixture, gconstpointer unu - - fixture->dbus = g_test_dbus_new (G_TEST_DBUS_NONE); - relative = g_test_build_filename (G_TEST_BUILT, "services", NULL); -+#if GLIB_CHECK_VERSION(2, 58, 0) - servicesdir = g_canonicalize_filename (relative, NULL); -+#else -+ servicesdir = realpath (relative, NULL); -+#endif - g_free (relative); - - g_test_dbus_add_service_dir (fixture->dbus, servicesdir); -- cgit v1.2.3