diff options
Diffstat (limited to 'dev-libs/gjs')
| -rw-r--r-- | dev-libs/gjs/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch | 76 | ||||
| -rw-r--r-- | dev-libs/gjs/gjs-1.70.0.ebuild | 4 |
3 files changed, 82 insertions, 1 deletions
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index c8ac355b5594..58c575ec0902 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,3 +1,4 @@ +AUX gjs-1.70.0-meson-0.60.2.patch 4173 BLAKE2B f51a18cbf663d4e4e8b9246e7c8e63cc0633943532636439a407d5e59e0121f9fad099bebfe7d8ee15ea80ff409c024ac1caf7f809af3295a747ef1a40420565 SHA512 fea4c9a7db86f39387c2dd35ce7701a18308b8fc8e3fc5f85e279832331e7a4426bc99ed59cdccdb155dc3fa7ec78b10dd607f183f00356eb6797f4f5e3b93b3 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42 DIST gjs-1.68.1.tar.xz 558920 BLAKE2B f5364fe92ddf4cb1e9b5dac5921fa180ed31bfe54ba8ad737e31c5f8a7f19d7e47bad07d7ca088e6e5962b2782a774b985b607214a7381a8b6c54e799df97235 SHA512 bce2f84e748dd483e0c907e7f7f230257aa4b216b76e89c3457ebba5e9bf601dcb5c771ebe864df22255e221876c6e7ee3097328e6f52ef78360f49708ff457a DIST gjs-1.68.2.tar.xz 559432 BLAKE2B 09146cadcc17f16c36f2a07108b086850d51d95cba21ca95ff0311dd107835b6c5fc9d5d682c9c6713ebd082372f8b46aae31b71f7f5e0e03dcb0d47c5d3c72f SHA512 a42d4ee7be92c869ad9e74c0e02debbe62d13fd0926aa0d903efe802d0f8bc6bc18959d4e161b3960261f9e7b9c0de1d4df5cfcf1eabea29fd75063af8cba154 @@ -9,5 +10,5 @@ EBUILD gjs-1.68.1-r1.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c13 EBUILD gjs-1.68.2.ebuild 1125 BLAKE2B 13fd2a1ec2904660be057b1ef8702b704161dbe23796634bb62fab968d156cdf462603ec02a147f2d9ca0d9724f7769ca502613bcb640c90f0ea829f308dd8ad SHA512 b5be649efc4c5835701675423fea9153439d3f17232c9b16d2220588c7b8bdf2abf03a8c5334c18e7b9941e02b5e4a7ab9c961c563a910d5a41a84198b41be85 EBUILD gjs-1.68.3.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e EBUILD gjs-1.68.4.ebuild 1120 BLAKE2B 19bcb66930e48d86adcc80fb753b5cd97b26c137e0a35ff98ddae38dba162a7dd82522e5f25ea2e4f62ccf46829ad89e654cae583bc0d2628bcebce63426461a SHA512 211799f2a201f419f6122fad8f98bfa3cfc904b566dffb6ab2c1a6195c5651834b0f60738d4f7c654f49782ace3c9f5d6c103153ad523e306fdc07383654e93e -EBUILD gjs-1.70.0.ebuild 1189 BLAKE2B 29ff3e597493e433fd70b443c0e6f12f0667d86a1b6c4dec38ff559a74c17641a6ab4e1a89182e0413146af473ede2bf6e0f6381ea0ce44b5c6f0c7409c10832 SHA512 722f5b3365e37f697dcc8cbaa484067bcd92ad793180089b17c2bdfd306016668dec439fafad2772092aaabb6da78214b19e27325ccfc5cd135c2c4c98804b51 +EBUILD gjs-1.70.0.ebuild 1247 BLAKE2B db67807cb632a0ba71b1c5c070eb6e7d4eab758e33e20d518d13f179ccbe0991b65e2db017bec8bcead03dffc9b6e3f05061ecc545aade2fb8c5076c00f3ace1 SHA512 b3d8d300ebeba5101d3343e1def0e0ec81eedffed01f867ca157e6ce50ccccdebceef7696346cfd78947d9f555c9b79ab2e09964859b2a6e3f6ec763159aa9cc MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb diff --git a/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch b/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch new file mode 100644 index 000000000000..9a051131d98c --- /dev/null +++ b/dev-libs/gjs/files/gjs-1.70.0-meson-0.60.2.patch @@ -0,0 +1,76 @@ +From 59bbb5e4795d2b6e41ce27ae3b18257e75b71a19 Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbeich@FreeBSD.org> +Date: Sat, 27 Nov 2021 22:57:11 +0000 +Subject: [PATCH] build: disable gir install via list to pacify meson >= 0.60.2 + +meson.build:580:0: ERROR: "install_dir" must be specified when installing a target +installed-tests/js/meson.build:73:0: ERROR: "install_dir" must be specified when installing a target +installed-tests/js/meson.build:91:4: ERROR: "install_dir" must be specified when installing a target +installed-tests/js/meson.build:104:0: ERROR: "install_dir" must be specified when installing a target +installed-tests/js/libgjstesttools/meson.build:13:0: ERROR: "install_dir" must be specified when installing a target +--- + installed-tests/js/libgjstesttools/meson.build | 2 +- + installed-tests/js/meson.build | 6 +++--- + meson.build | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/installed-tests/js/libgjstesttools/meson.build b/installed-tests/js/libgjstesttools/meson.build +index 2e57483a..3ca4d7ed 100644 +--- a/installed-tests/js/libgjstesttools/meson.build ++++ b/installed-tests/js/libgjstesttools/meson.build +@@ -14,7 +14,7 @@ gjstest_tools_gir = gnome.generate_gir(libgjstesttools, + includes: ['GObject-2.0', 'Gio-2.0'], sources: gjstest_tools_sources, + namespace: 'GjsTestTools', nsversion: '1.0', + symbol_prefix: 'gjs_test_tools_', extra_args: '--warn-error', +- install: get_option('installed_tests'), install_dir_gir: false, ++ install: get_option('installed_tests'), install_dir_gir: [false], + install_dir_typelib: installed_tests_execdir) + gjstest_tools_typelib = gjstest_tools_gir[1] + libgjstesttools_dep = declare_dependency( +diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build +index 2f007351..16b59660 100644 +--- a/installed-tests/js/meson.build ++++ b/installed-tests/js/meson.build +@@ -74,7 +74,7 @@ regress_gir = gnome.generate_gir(libregress, includes: regress_gir_includes, + sources: regress_sources, namespace: 'Regress', nsversion: '1.0', + identifier_prefix: 'Regress', symbol_prefix: 'regress_', + extra_args: ['--warn-all', '--warn-error'] + regress_gir_c_args, +- install: get_option('installed_tests'), install_dir_gir: false, ++ install: get_option('installed_tests'), install_dir_gir: [false], + install_dir_typelib: installed_tests_execdir) + regress_typelib = regress_gir[1] + +@@ -91,7 +91,7 @@ if not skip_warnlib + warnlib_gir = gnome.generate_gir(libwarnlib, includes: ['Gio-2.0'], + sources: warnlib_sources, namespace: 'WarnLib', nsversion: '1.0', + symbol_prefix: 'warnlib_', header: 'warnlib.h', +- install: get_option('installed_tests'), install_dir_gir: false, ++ install: get_option('installed_tests'), install_dir_gir: [false], + install_dir_typelib: installed_tests_execdir) + warnlib_typelib = warnlib_gir[1] + endif +@@ -105,7 +105,7 @@ gimarshallingtests_gir = gnome.generate_gir(libgimarshallingtests, + includes: ['Gio-2.0'], sources: gimarshallingtests_sources, + namespace: 'GIMarshallingTests', nsversion: '1.0', + symbol_prefix: 'gi_marshalling_tests_', extra_args: '--warn-error', +- install: get_option('installed_tests'), install_dir_gir: false, ++ install: get_option('installed_tests'), install_dir_gir: [false], + install_dir_typelib: installed_tests_execdir) + gimarshallingtests_typelib = gimarshallingtests_gir[1] + +diff --git a/meson.build b/meson.build +index 437b3fd3..73d0eaca 100644 +--- a/meson.build ++++ b/meson.build +@@ -581,7 +581,7 @@ gjs_private_gir = gnome.generate_gir(libgjs, + includes: ['GObject-2.0', 'Gio-2.0'], sources: libgjs_private_sources, + namespace: 'GjsPrivate', nsversion: '1.0', identifier_prefix: 'Gjs', + symbol_prefix: 'gjs_', extra_args: '--warn-error', install: true, +- install_dir_gir: false, install_dir_typelib: pkglibdir / 'girepository-1.0') ++ install_dir_gir: [false], install_dir_typelib: pkglibdir / 'girepository-1.0') + gjs_private_typelib = gjs_private_gir[1] + + ### Build gjs-console interpreter ############################################## +-- +GitLab + diff --git a/dev-libs/gjs/gjs-1.70.0.ebuild b/dev-libs/gjs/gjs-1.70.0.ebuild index ea422c9bfc60..6560dd57d686 100644 --- a/dev-libs/gjs/gjs-1.70.0.ebuild +++ b/dev-libs/gjs/gjs-1.70.0.ebuild @@ -31,6 +31,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/gjs-1.70.0-meson-0.60.2.patch" +) + src_configure() { append-cppflags -DG_DISABLE_CAST_CHECKS |