gentoo auto-resync : 06:07:2024 - 08:06:15

6 files changed, 164 insertions, 61 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 5fe53d4e250d..805cd4e70992 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-browser-connector/Manifest b/gnome-extra/gnome-browser-connector/Manifest
index 577a1edbd4c9..79323d74008d 100644
--- a/gnome-extra/gnome-browser-connector/Manifest
+++ b/gnome-extra/gnome-browser-connector/Manifest
@@ -1,5 +1,5 @@
-DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
+AUX gnome-browser-connector-42.1-python-path.patch 3173 BLAKE2B 60c2e04aac01347849d719d8f42ee007b0a7d262e910551ca95089b6862527ed461a0ec117d8dba38b71ed1bff99a3d8945f4f191a7bbe6cea31f0a9292f648e SHA512 daa03877eb1e023b829101af2f418704fca641d06e632c866952cf3996d10845c74b398c8db21c68909bbcc6ed110af6663681bd77f22e1118a4a9bdfb43ed1f
 DIST gnome-browser-connector-42.1.tar.xz 26732 BLAKE2B e7236d01f8da7497ef7eecf750009f5c5b68688fcb756133d9a5a4d1e6c98bba4de258f7992c41e9060880b38f6f7f3354580bf8dec7afb33c50060ebb565a2f SHA512 f8f7c0e7f3fb6bd50eddc674c48f521d07aa03b5b36674e8dfcb6b6d8203bbdf4fc4de1f7cbbcc805a3da3cf098a27bda281b7a0ac5b98d7144dffe85698b7d7
-EBUILD gnome-browser-connector-10-r5.ebuild 1479 BLAKE2B f755aa3a8f4367084682b8a521d9d8163b0e7f7e39cc135da8c0075e566de81fe2e7ab794c5b6460b3c7df81074470d17ff28776fc1a700a3f160c2c114002be SHA512 fe68d8a1891e5fe084b255d1c8169b8aa7b1e6a90d81de600243ef1c8d91cdc3a065f77d7ab1a84e75fea33b7a6333fd92f551f5bb7ed9e36bb3e030fbaac160
+EBUILD gnome-browser-connector-42.1-r1.ebuild 1373 BLAKE2B 31a2f844b7df2b4efde3a1be2102172668587acded6caf66437f1eb343843c53e35d02c90f496daaedd485b2bf8cf3c4a1d1e95f4056dce037a04aeb8068f749 SHA512 c921cd1cc3b564049de9e3a6254c89d5ba086e68148f28e3dcc7714134f44c01bc2504c22935e767e2ac636b9cd2ad44c609873895bccd46a3cb3bff0c043fd9
 EBUILD gnome-browser-connector-42.1.ebuild 1319 BLAKE2B a147ad0fe1174f8e7f13061e35e03dc32b0189d1841256cea33bede63fa1b2ae618f62f5e99811c60cb28237d600010235b42550b2e220d020f8c69e35f40f1d SHA512 174849ad5b134086e0d54696b76f74f8860697ab9f20b07e73af39a40e6c8b31522c0a94b75a3aed5a2c492a2bcba3be2a6f63982d40bde471e98ad76d88a4b2
-MISC metadata.xml 511 BLAKE2B 6f99ce90fa8a68aa26fa2a99aab993e8e945d719c041a8a58a1176b1ccca1c09a17fecdcd9755c6f9ca09fdcbe9ff1084363b197651e46d674915f54b1976329 SHA512 fd9c5cc8c6d07934f26279f0bc69e5985c841ed681587f7993268d708ce41aa7d0ecfac16373bd6fe6705c4b9e7f4574a3ccb2e974ec5f4d7699994af4f8b50c
+MISC metadata.xml 508 BLAKE2B 4f4df6544a812b6938e8a504494c8f0234817bf4654210c55c372b44a887471840c1050a8b4fa1a16d20ad6eb1f306e864dd3d399cbe27423a20a0c7d0389264 SHA512 a370a9880ac434fccadbba56fd31956d58465f926883e20547ae94960643bdb41bf127dd0a9a8ac684faa27a5975baca76abfc427a1fc942d0090a2cb1b8c415
diff --git a/gnome-extra/gnome-browser-connector/files/gnome-browser-connector-42.1-python-path.patch b/gnome-extra/gnome-browser-connector/files/gnome-browser-connector-42.1-python-path.patch
new file mode 100644
index 000000000000..0234444bfe9f
--- /dev/null
+++ b/gnome-extra/gnome-browser-connector/files/gnome-browser-connector-42.1-python-path.patch
@@ -0,0 +1,109 @@
+From fd738093d293739787ae2fd87c67e634c45c7b7b Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Tue, 28 May 2024 19:01:57 +0400
+Subject: [PATCH] meson: use discovered python interpreter to run build scripts
+
+See-Also: https://gitlab.gnome.org/GNOME/gnome-browser-extension/-/merge_requests/13
+See-Also: https://bugs.gentoo.org/933072
+---
+ contrib/merge_json.py |  2 --
+ meson.build           | 22 +++++++++++++---------
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+ mode change 100755 => 100644 contrib/merge_json.py
+
+diff --git a/contrib/merge_json.py b/contrib/merge_json.py
+old mode 100755
+new mode 100644
+index 8830a2a..41d22e3
+--- a/contrib/merge_json.py
++++ b/contrib/merge_json.py
+@@ -1,5 +1,3 @@
+-#!/usr/bin/python3
+-
+ import argparse
+ import json
+ import os
+diff --git a/meson.build b/meson.build
+index 3a162b5..9903cd6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -8,19 +8,20 @@ project('gnome-browser-connector',
+ )
+ 
+ # Constants
++CONTRIB_PATH = meson.global_source_root() / 'contrib'
+ MANIFEST_FILENAME = 'org.gnome.browser_connector.json'
+ MANIFEST_LEGACY_FILENAME = 'org.gnome.chrome_gnome_shell.json'
+ 
+ # Dependencies
+ python_module = import('python')
+-py = python_module.find_installation('python3', required: true, modules: [
++py_install = python_module.find_installation('python3', required: true, modules: [
+   'gi'
+ ])
+ 
+ # Configuration used in template files
+ config = configuration_data()
+ config.set('bindir', get_option('prefix') / get_option('bindir'))
+-config.set('python_path', py.path())
++config.set('python_path', py_install.path())
+ 
+ # Install scripts
+ foreach script : ['gnome-browser-connector', 'gnome-browser-connector-host']
+@@ -35,23 +36,24 @@ endforeach
+ # Python module
+ install_subdir(
+   'gnome_browser_connector',
+-  install_dir: py.get_install_dir(),
++  install_dir: py_install.get_install_dir(),
+ )
+ 
+ # Chrome/Chromium connector manifests
+ configure_file(
+-  input: 'contrib' / MANIFEST_FILENAME,
++  input: CONTRIB_PATH / MANIFEST_FILENAME,
+   output: MANIFEST_FILENAME,
+   configuration: config,
+ )
+ configure_file(
+   input: [
+     meson.current_build_dir() / MANIFEST_FILENAME,
+-    'contrib' / MANIFEST_LEGACY_FILENAME,
++    CONTRIB_PATH / MANIFEST_LEGACY_FILENAME,
+   ],
+   output: MANIFEST_LEGACY_FILENAME,
+   command: [
+-    'contrib/merge_json.py',
++    py_install.path(),
++    CONTRIB_PATH / 'merge_json.py',
+     '--output', '@OUTPUT@',
+     '@INPUT@'
+   ],
+@@ -70,11 +72,12 @@ endforeach
+ configure_file(
+   input: [
+     meson.current_build_dir() / MANIFEST_FILENAME,
+-    'contrib/org.gnome.browser_connector.firefox.json',
++    CONTRIB_PATH / 'org.gnome.browser_connector.firefox.json',
+   ],
+   output: 'firefox-' + MANIFEST_FILENAME,
+   command: [
+-    'contrib/merge_json.py',
++    py_install.path(),
++    CONTRIB_PATH / 'merge_json.py',
+     '--delete', 'allowed_origins',
+     '--output', '@OUTPUT@',
+     '@INPUT@'
+@@ -87,7 +90,8 @@ configure_file(
+   ],
+   output: 'firefox-' + MANIFEST_LEGACY_FILENAME,
+   command: [
+-    'contrib/merge_json.py',
++    py_install.path(),
++    CONTRIB_PATH / 'merge_json.py',
+     '--output', '@OUTPUT@',
+     '@INPUT@'
+   ],
+-- 
+GitLab
+
diff --git a/gnome-extra/gnome-browser-connector/gnome-browser-connector-10-r5.ebuild b/gnome-extra/gnome-browser-connector/gnome-browser-connector-10-r5.ebuild
deleted file mode 100644
index f65ceb182b47..000000000000
--- a/gnome-extra/gnome-browser-connector/gnome-browser-connector-10-r5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-MY_PN="chrome-gnome-shell"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PV}/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-	gnome-base/gnome-shell
-"
-BDEPEND="
-	app-misc/jq
-	sys-apps/coreutils
-"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
-		# Workaround www-client/firefox-bin manifests location
-		# Bug: https://bugs.gentoo.org/643522
-		insinto /usr/lib/mozilla/native-messaging-hosts
-		doins "${ED}"/usr/$(get_libdir)/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json
-	fi
-}
-
-pkg_postinst() {
-	elog "Please note that this package provides native messaging connector only."
-	elog "You can install browser extension using link provided at"
-	elog "https://extensions.gnome.org website."
-}
diff --git a/gnome-extra/gnome-browser-connector/gnome-browser-connector-42.1-r1.ebuild b/gnome-extra/gnome-browser-connector/gnome-browser-connector-42.1-r1.ebuild
new file mode 100644
index 000000000000..eee9a523e059
--- /dev/null
+++ b/gnome-extra/gnome-browser-connector/gnome-browser-connector-42.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="OS-native connector counterpart for GNOME Shell browser extension"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegration"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+"
+RDEPEND="${DEPEND}
+	gnome-base/gnome-shell
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-python-path.patch"
+)
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}/usr/bin/${PN}"
+	python_fix_shebang "${D}/usr/bin/${PN}-host"
+	python_optimize
+
+	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
+		# Workaround www-client/firefox-bin manifests location
+		# Bug: https://bugs.gentoo.org/643522
+		insinto /usr/lib/mozilla/native-messaging-hosts
+		for id in chrome_gnome_shell browser_connector; do
+			doins "${ED}/usr/$(get_libdir)/mozilla/native-messaging-hosts/org.gnome.${id}.json"
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Please note that this package provides OS-native connector only."
+	elog "You can install browser extension using link provided at"
+	elog "https://extensions.gnome.org website."
+}
diff --git a/gnome-extra/gnome-browser-connector/metadata.xml b/gnome-extra/gnome-browser-connector/metadata.xml
index 69a4f4e1a20c..e4b28fd3d488 100644
--- a/gnome-extra/gnome-browser-connector/metadata.xml
+++ b/gnome-extra/gnome-browser-connector/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://gitlab.gnome.org/nE0sIghT/gnome-browser-connector/-/issues</bugs-to>
+		<bugs-to>https://gitlab.gnome.org/GNOME/gnome-browser-connector/-/issues</bugs-to>
 	</upstream>
 </pkgmetadata>