Date: Wed, 4 Aug 2021 19:53:28 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fd15b7fad520 - main - devel/glib20: fix patching on powerpc64 Message-ID: <202108041953.174JrSiK022738@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd15b7fad5200a1a01f26d808fa8782541193cdc commit fd15b7fad5200a1a01f26d808fa8782541193cdc Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2021-08-04 19:53:25 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2021-08-04 19:53:25 +0000 devel/glib20: fix patching on powerpc64 The patch is not necessary anymore. --- devel/glib20/Makefile | 4 ---- devel/glib20/files/extra-arch-powerpc64 | 23 ----------------------- 2 files changed, 27 deletions(-) diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 7f2b3f17a546..ea534cd9cd74 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -58,10 +58,6 @@ MESON_ARGS+= -Diconv=libc MESON_ARGS+= -Diconv=external .endif -.if ${ARCH} == powerpc64 -EXTRA_PATCHES= ${FILESDIR}/extra-arch-powerpc64 -.endif - pre-configure-FAM_ALTBACKEND-on: @${REINPLACE_CMD} -e 's|kqueue-helper.c|kqueue_fnm.c|g ; \ s|.*kqueue-missing.c.*||g ; \ diff --git a/devel/glib20/files/extra-arch-powerpc64 b/devel/glib20/files/extra-arch-powerpc64 deleted file mode 100644 index d774ebd6b7b1..000000000000 --- a/devel/glib20/files/extra-arch-powerpc64 +++ /dev/null @@ -1,23 +0,0 @@ - ---- gio/glib-compile-schemas.c.orig 2010-11-24 21:32:15.000000000 +0100 -+++ gio/glib-compile-schemas.c 2010-11-24 21:33:42.000000000 +0100 -@@ -1458,7 +1458,7 @@ - } - /* Text {{{2 */ - static void --text (GMarkupParseContext *context, -+XXXtext (GMarkupParseContext *context, - const gchar *text, - gsize text_len, - gpointer user_data, -@@ -1590,7 +1590,7 @@ - parse_gschema_files (gchar **files, - gboolean strict) - { -- GMarkupParser parser = { start_element, end_element, text }; -+ GMarkupParser parser = { start_element, end_element, XXXtext }; - ParseState state = { 0, }; - const gchar *filename; - GError *error = NULL; - -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108041953.174JrSiK022738>