From owner-dev-commits-ports-all@freebsd.org Mon Apr 12 19:50:33 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 A38DC5DCA9E; Mon, 12 Apr 2021 19:50:33 +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 4FJzqY3ty9z4qMt; Mon, 12 Apr 2021 19:50:33 +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 7857C1D766; Mon, 12 Apr 2021 19:50:33 +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 13CJoX8p031880; Mon, 12 Apr 2021 19:50:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13CJoX2w031879; Mon, 12 Apr 2021 19:50:33 GMT (envelope-from git) Date: Mon, 12 Apr 2021 19:50:33 GMT Message-Id: <202104121950.13CJoX2w031879@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 66d062d16722 - main - x11-toolkits/gtksourceview4: Fix build failure MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66d062d16722b0263ad170452781eb9b042455ca Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 19:50:33 -0000 The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=66d062d16722b0263ad170452781eb9b042455ca commit 66d062d16722b0263ad170452781eb9b042455ca Author: Neel Chauhan AuthorDate: 2021-04-12 19:50:24 +0000 Commit: Neel Chauhan CommitDate: 2021-04-12 19:50:24 +0000 x11-toolkits/gtksourceview4: Fix build failure PR: 255014 --- .../files/patch-gtksourceview_meson.build | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/x11-toolkits/gtksourceview4/files/patch-gtksourceview_meson.build b/x11-toolkits/gtksourceview4/files/patch-gtksourceview_meson.build new file mode 100644 index 000000000000..f855ebae88d2 --- /dev/null +++ b/x11-toolkits/gtksourceview4/files/patch-gtksourceview_meson.build @@ -0,0 +1,43 @@ +--- gtksourceview/meson.build.orig 2021-04-12 19:46:19 UTC ++++ gtksourceview/meson.build +@@ -172,12 +172,18 @@ gtksourceversion_h = configure_file( + install_dir: join_paths(pkgincludedir, 'gtksourceview'), + ) + ++gtksource_res = gnome.compile_resources( ++ 'gtksourceview-gresources', ++ 'gtksourceview.gresource.xml' ++) ++ + core_sources = [ + core_public_c, + core_private_c, + core_enums, + gtksourceversion_h, + core_marshallers, ++ gtksource_res, + ] + + install_headers( +@@ -216,12 +222,6 @@ extra_public_sources = [] + + subdir('completion-providers') + +-gtksource_res = gnome.compile_resources( +- 'gtksourceview-gresources', +- 'gtksourceview.gresource.xml' +-) +- +- + # We can't use the static libs on Visual Studio builds + # to form our DLL here directly, so we must use + # extract_all_objects() to extract all the core and word +@@ -233,7 +233,7 @@ foreach int_lib : gtksource_libs + gtksource_objs += int_lib.extract_all_objects() + endforeach + +-gtksource_lib = shared_library(package_string, gtksource_res, ++gtksource_lib = shared_library(package_string, + version: lib_version, + darwin_versions: lib_osx_version, + include_directories: gtksourceview_include_dirs,