[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/files/, gnome-extra/gnome-tweaks/

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/files/, gnome-extra/gnome-tweaks/

[Matt Turner]

commit:     2b91bd421f60b814fd712a8c03bd6e29f6012833
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 13 23:53:58 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 00:06:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b91bd42

gnome-extra/gnome-tweaks: Version bump to 3.34.1

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-extra/gnome-tweaks/Manifest                  |  1 +
 .../gnome-tweaks/files/3.34.0-fix-python.patch     | 17 +++-----
 .../gnome-tweaks/gnome-tweaks-3.34.1.ebuild        | 50 ++++++++++++++++++++++
 3 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 3fb7e7f2d14..9c34453157a 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1 +1,2 @@
 DIST gnome-tweaks-3.34.0.tar.xz 246592 BLAKE2B 8701b03f64bf6b779f6f96de25684602447b4da8f2714cb38f866e5016532aad3283f3dc217b29161534958c03e72aed33c0803e60681a3616818d037c23e5e8 SHA512 1d2b21a31550d4b48afd02a9fcfb9844eacac7aa726ef624abcb40225af31da29b34e9032b3bb2943e5cb5f7553a6f931467d04bfbc2b026732e6bdcb86eb840
+DIST gnome-tweaks-3.34.1.tar.xz 247980 BLAKE2B 55fbb16bcdb1a9ea4b5ca84df802266e07347377eab3712284973146fcc0797af59df5985725b1a95a1fba0d26b580a1c9862675978876de5eeb0de9c0060be3 SHA512 c922bf696b9ff48c8c39fd4ae06f4b72ea7b18645ad41552b0367859066d7601bc59521643335931e1cce799344a1c1ac9a7c28408de4c19bfa4127594a2ec7d

diff --git a/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch b/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
index 2501bc7c4d1..8845a0d26ca 100644
--- a/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
+++ b/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
@@ -1,4 +1,4 @@
-From 0ec042734f63a3a870920b1e71f07851d335ea45 Mon Sep 17 00:00:00 2001
+From 024bf6cbccc4ceb9c1e8243f43df225f5dff9098 Mon Sep 17 00:00:00 2001
 From: Mart Raudsepp <leio@gentoo.org>
 Date: Sun, 29 Mar 2020 16:05:36 +0300
 Subject: [PATCH] build: Fix python files installation handling
@@ -19,8 +19,8 @@ versions too. However fix it too, so that we are now warning-free for
 meson features after raising of the meson version dep.
 ---
  gtweak/meson.build |  5 ++---
- meson.build        | 12 ++++++++----
- 2 files changed, 10 insertions(+), 7 deletions(-)
+ meson.build        | 10 +++++++---
+ 2 files changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/gtweak/meson.build b/gtweak/meson.build
 index 3d9a743..4e558b4 100644
@@ -43,15 +43,10 @@ index 3d9a743..4e558b4 100644
 +python3.install_sources(shell_sources, subdir: 'gtweak')
 +python3.install_sources(tweak_sources, subdir: join_paths('gtweak', 'tweaks'))
 diff --git a/meson.build b/meson.build
-index b7da518..df49ae3 100644
+index cffa8af..60141c5 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1,11 +1,16 @@
- project('gnome-tweaks',
-   version: '3.34.0',
--  meson_version: '>= 0.40.0'
-+  meson_version: '>= 0.46.0'
- )
+@@ -5,7 +5,12 @@ project('gnome-tweaks',
  
  gnome = import('gnome')
  i18n = import('i18n')
@@ -81,5 +76,5 @@ index b7da518..df49ae3 100644
  schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
  
 -- 
-2.20.1
+2.26.2
 

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
new file mode 100644
index 00000000000..c71dcb2c2a9
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="Customize advanced GNOME 3 options"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
+
+LICENSE="GPL-3+ CC0-1.0"
+SLOT="0"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="${PYTHON_DEPS}"
+# See README.md for list of deps
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.10.2:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=gnome-base/gnome-settings-daemon-3
+	x11-themes/sound-theme-freedesktop
+
+	>=dev-libs/glib-2.58:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+	>=gnome-base/gnome-desktop-3.30:3[introspection]
+	gui-libs/libhandy:0.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	>=gnome-base/gnome-shell-3.24
+	x11-wm/mutter
+"
+BDEPEND=">=sys-devel/gettext-0.19.8"
+
+PATCHES=(
+	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+	"${FILESDIR}"/3.34.0-fix-python.patch
+)
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/files/, gnome-extra/gnome-tweaks/

[Sam James]

commit:     b7a3043f861a5656eeeda12898a109786e0a410e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 02:01:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 02:01:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a3043f

gnome-extra/gnome-tweaks: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831937
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/gnome-tweaks-40.0-meson-0.61.patch       | 31 ++++++++++++++++++++++
 gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild  |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch b/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
new file mode 100644
index 000000000000..9ef4db33ecb5
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/files/gnome-tweaks-40.0-meson-0.61.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/gnome-tweaks/-/merge_requests/86.patch
+https://bugs.gentoo.org/831937
+
+From 56f39dc7d04a1be91de1149683874f9c83b794fb Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <mae@meanderingmind.me>
+Date: Sat, 22 Jan 2022 18:09:21 +0100
+Subject: [PATCH] meson: fix invalid positional argument
+
+This was deprecated in meson 0.60 and removed in 0.61. See
+https://github.com/mesonbuild/meson/pull/9445 for details.
+
+Signed-off-by: Mae Dartmann <mae@meanderingmind.me>
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+ 
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: desktop_file + '.in',
+   output: desktop_file,
+   po_dir: '../po',
+GitLab

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
index c5732da246a7..68e456f9a872 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,8 @@ BDEPEND=">=sys-devel/gettext-0.19.8"
 
 PATCHES=(
 	"${FILESDIR}"/3.28.1-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+
+	"${FILESDIR}"/${PN}-40.0-meson-0.61.patch
 )
 
 src_install() {