From owner-dev-commits-ports-main@freebsd.org Wed Aug 4 19:53:29 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 250B7654F7C; Wed, 4 Aug 2021 19:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gg2VK0MWYz4rV7; Wed, 4 Aug 2021 19:53:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7A934D58; Wed, 4 Aug 2021 19:53:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 174JrS4Z022739; Wed, 4 Aug 2021 19:53:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 174JrSiK022738; Wed, 4 Aug 2021 19:53:28 GMT (envelope-from git) Date: Wed, 4 Aug 2021 19:53:28 GMT Message-Id: <202108041953.174JrSiK022738@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: fd15b7fad520 - main - devel/glib20: fix patching on powerpc64 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd15b7fad5200a1a01f26d808fa8782541193cdc Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2021 19:53:29 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd15b7fad5200a1a01f26d808fa8782541193cdc commit fd15b7fad5200a1a01f26d808fa8782541193cdc Author: Piotr Kubaj AuthorDate: 2021-08-04 19:53:25 +0000 Commit: Piotr Kubaj 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; - -