public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/, gnome-extra/gnome-tweaks/files/
@ 2019-03-06 11:07 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-03-06 11:07 UTC (permalink / raw
  To: gentoo-commits

commit:     724511dcc293e45971b3cadea24836ef0f00b80d
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 11:01:52 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 11:04:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724511dc

gnome-extra/gnome-tweaks: bump to 3.28.1

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-extra/gnome-tweaks/Manifest                  |  1 +
 .../files/3.28.1-gentoo-cursor-themes.patch        | 25 +++++++++++
 .../gnome-tweaks/gnome-tweaks-3.28.1.ebuild        | 49 ++++++++++++++++++++++
 3 files changed, 75 insertions(+)

diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index d02673f40e5..75c405b9672 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-tweak-tool-3.24.1.tar.xz 261872 BLAKE2B ce62ad4357d8f8660bbbdcd81a1190f21cf7a832853aba404bc087b8150bff8f6451902102dfe030a6eec5ce658d31f176e0d32055f25e69203fda65ce092120 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd
 DIST gnome-tweak-tool-3.26.4.tar.xz 253036 BLAKE2B a63d6977e7b4fb9d7e26752a95e123794daa5412ccc2f4ac1572ee1bf06730b29e5a2bd0d547dc3f8bfc1ab2c4a2d9bd72c42f9c0ff10d9bc9a23d377883562d SHA512 42828720213cf366534eabf46fa4c3e4c3f15f2310adad96a5297300c781abe62e3f59ec305e077cdd6bb5538dae3ec3487e5accecd2ce6221c388c28092c2d0
+DIST gnome-tweaks-3.28.1.tar.xz 268476 BLAKE2B e4bcbc218519769ece4ea266f014a59b692c6cdef8f12122a3f1dddf1748e60cbe7fd9b0f7eb32320f111b15c0a2ac09780cac53635f816107b1ca983d8ddd1a SHA512 c3d1f65012b465b428809bcd734df4de37f1530611d1bce6363067683184acfbc736b432b12834882b10aa7d0f03d4242cc51319b6f49de95eea7b7c43db90dc

diff --git a/gnome-extra/gnome-tweaks/files/3.28.1-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweaks/files/3.28.1-gentoo-cursor-themes.patch
new file mode 100644
index 00000000000..7de77aa137a
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/files/3.28.1-gentoo-cursor-themes.patch
@@ -0,0 +1,25 @@
+From a362e7b1b2b6622e913983457a4872950aa8fde7 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 6 Mar 2019 12:57:23 +0200
+Subject: [PATCH] appearance: Look for cursors in Gentoo location too
+
+---
+ gtweak/tweaks/tweak_group_appearance.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
+index ff78735..061925d 100644
+--- a/gtweak/tweaks/tweak_group_appearance.py
++++ b/gtweak/tweaks/tweak_group_appearance.py
+@@ -88,7 +88,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
+             **options)
+ 
+     def _get_valid_cursor_themes(self):
+-        valid = walk_directories(get_resource_dirs("icons"), lambda d:
++        valid = walk_directories([os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11")] + get_resource_dirs("icons"), lambda d:
+                     os.path.isdir(d) and \
+                         os.path.exists(os.path.join(d, "cursors")))
+         return set(valid)
+-- 
+2.17.0
+

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.28.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.28.1.ebuild
new file mode 100644
index 00000000000..9b0e786bdfd
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.28.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+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"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+"
+# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+	>=gnome-base/gnome-settings-daemon-3
+
+	dev-libs/glib:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+	>=gnome-base/gnome-desktop-3.6.0.1:3[introspection]
+	net-libs/libsoup:2.4[introspection]
+	x11-libs/libnotify[introspection]
+
+	>=gnome-base/gsettings-desktop-schemas-3.27.90
+	>=gnome-base/gnome-shell-3.24
+	x11-wm/mutter
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.19.8
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
+)
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/, gnome-extra/gnome-tweaks/files/
@ 2019-03-30 22:50 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-03-30 22:50 UTC (permalink / raw
  To: gentoo-commits

commit:     3c89fd99caa742a2c17a5188e79427dd0fe25f18
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 22:36:39 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 22:36:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c89fd99

gnome-extra/gnome-tweaks: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-extra/gnome-tweaks/Manifest                  |  2 -
 .../files/3.26.4-gentoo-cursor-themes.patch        | 26 ---------
 .../gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild     | 63 ----------------------
 .../gnome-tweaks/gnome-tweaks-3.28.1.ebuild        | 49 -----------------
 4 files changed, 140 deletions(-)

diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index d0d8511b223..335a73cb39b 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,4 +1,2 @@
 DIST gnome-tweak-tool-3.24.1.tar.xz 261872 BLAKE2B ce62ad4357d8f8660bbbdcd81a1190f21cf7a832853aba404bc087b8150bff8f6451902102dfe030a6eec5ce658d31f176e0d32055f25e69203fda65ce092120 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd
-DIST gnome-tweak-tool-3.26.4.tar.xz 253036 BLAKE2B a63d6977e7b4fb9d7e26752a95e123794daa5412ccc2f4ac1572ee1bf06730b29e5a2bd0d547dc3f8bfc1ab2c4a2d9bd72c42f9c0ff10d9bc9a23d377883562d SHA512 42828720213cf366534eabf46fa4c3e4c3f15f2310adad96a5297300c781abe62e3f59ec305e077cdd6bb5538dae3ec3487e5accecd2ce6221c388c28092c2d0
-DIST gnome-tweaks-3.28.1.tar.xz 268476 BLAKE2B e4bcbc218519769ece4ea266f014a59b692c6cdef8f12122a3f1dddf1748e60cbe7fd9b0f7eb32320f111b15c0a2ac09780cac53635f816107b1ca983d8ddd1a SHA512 c3d1f65012b465b428809bcd734df4de37f1530611d1bce6363067683184acfbc736b432b12834882b10aa7d0f03d4242cc51319b6f49de95eea7b7c43db90dc
 DIST gnome-tweaks-3.30.2.tar.xz 281820 BLAKE2B cd980f77a05d74f556fe461f1dc35122efb23ab0885b84ddb71c873dd6cb424d4ae213d393b7555f8baed8eb5fb3df8afa7d9b4cb92d772ba9eed59892871bfe SHA512 183df35e8051aa1fba54ca45aca64d665f28d92c56879ff6fa60adf3809a05676db15d97d7023bf5ffb9bac33df259eb62742bee3cebeb87d8ffa39679b2c078

diff --git a/gnome-extra/gnome-tweaks/files/3.26.4-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweaks/files/3.26.4-gentoo-cursor-themes.patch
deleted file mode 100644
index e7eafc8be8a..00000000000
--- a/gnome-extra/gnome-tweaks/files/3.26.4-gentoo-cursor-themes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 52dc5f832bbb249896f114439d7d1562e26b5e47 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 16 Jan 2019 04:04:16 +0200
-Subject: [PATCH] appearance: Look for cursors in Gentoo location too
-
----
- gtweak/tweaks/tweak_group_appearance.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
-index 1a56287..83159c9 100644
---- a/gtweak/tweaks/tweak_group_appearance.py
-+++ b/gtweak/tweaks/tweak_group_appearance.py
-@@ -87,7 +87,8 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_cursor_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
-+        dirs = ( os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11"),
-+                 os.path.join(gtweak.DATA_DIR, "icons"),
-                  os.path.join(GLib.get_user_data_dir(), "icons"),
-                  os.path.join(os.path.expanduser("~"), ".icons"))
-         valid = walk_directories(dirs, lambda d:
--- 
-2.17.0
-

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild
deleted file mode 100644
index b748b2f7a31..00000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-GNOME_ORG_MODULE="gnome-tweak-tool"
-
-inherit gnome.org meson gnome2-utils python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gnome-settings-daemon-3
-
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	>=gnome-base/gnome-desktop-3.6.0.1:3[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-3.24
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-	>=gnome-base/nautilus-3
-	<gnome-base/nautilus-3.27
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
-)
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.28.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.28.1.ebuild
deleted file mode 100644
index 9b0e786bdfd..00000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.28.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-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"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gnome-settings-daemon-3
-
-	dev-libs/glib:2
-	>=x11-libs/gtk+-3.12:3[introspection]
-	>=gnome-base/gnome-desktop-3.6.0.1:3[introspection]
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-3.27.90
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.8
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gentoo-cursor-themes.patch # Add contents of Gentoo's cursor theme directory to cursor theme list
-)
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/, gnome-extra/gnome-tweaks/files/
@ 2019-05-18 21:24 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-05-18 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     e488762c18ee7cd2f45c78c62ace45608f1231b5
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 21:02:15 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 21:24:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e488762c

gnome-extra/gnome-tweaks: remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-extra/gnome-tweaks/Manifest                  |  1 -
 .../files/3.10.1-gentoo-cursor-themes.patch        | 26 --------
 .../gnome-tweaks/gnome-tweaks-3.24.1.ebuild        | 72 ----------------------
 3 files changed, 99 deletions(-)

diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 335a73cb39b..5ff4a3f6c66 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,2 +1 @@
-DIST gnome-tweak-tool-3.24.1.tar.xz 261872 BLAKE2B ce62ad4357d8f8660bbbdcd81a1190f21cf7a832853aba404bc087b8150bff8f6451902102dfe030a6eec5ce658d31f176e0d32055f25e69203fda65ce092120 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd
 DIST gnome-tweaks-3.30.2.tar.xz 281820 BLAKE2B cd980f77a05d74f556fe461f1dc35122efb23ab0885b84ddb71c873dd6cb424d4ae213d393b7555f8baed8eb5fb3df8afa7d9b4cb92d772ba9eed59892871bfe SHA512 183df35e8051aa1fba54ca45aca64d665f28d92c56879ff6fa60adf3809a05676db15d97d7023bf5ffb9bac33df259eb62742bee3cebeb87d8ffa39679b2c078

diff --git a/gnome-extra/gnome-tweaks/files/3.10.1-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweaks/files/3.10.1-gentoo-cursor-themes.patch
deleted file mode 100644
index b65a713277b..00000000000
--- a/gnome-extra/gnome-tweaks/files/3.10.1-gentoo-cursor-themes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c848d45b0697a6ac3661dbf3fbd356864e8b4e24 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 15 Jan 2013 17:23:12 +0330
-Subject: [PATCH] gentoo-cursor-themes
-
----
- gtweak/tweaks/tweak_interface.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-index b20a41c..2125d59 100644
---- a/gtweak/tweaks/tweak_group_interface.py
-+++ b/gtweak/tweaks/tweak_group_interface.py
-@@ -69,7 +69,8 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_cursor_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
-+        dirs = ( os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11"),
-+                 os.path.join(gtweak.DATA_DIR, "icons"),
-                  os.path.join(GLib.get_user_data_dir(), "icons"),
-                  os.path.join(os.path.expanduser("~"), ".icons"))
-         valid = walk_directories(dirs, lambda d:
--- 
-1.8.1
-

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.24.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.24.1.ebuild
deleted file mode 100644
index feea9ecd2d8..00000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.24.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-GNOME_ORG_MODULE="gnome-tweak-tool"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tweaks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/glib:2[dbus]
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3.23.3
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
-	>=x11-libs/gtk+-3.12:3[introspection]
-
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	>=gnome-base/gnome-shell-3.24
-	>=gnome-base/nautilus-3
-	<gnome-base/nautilus-3.27
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	eapply "${FILESDIR}/3.10.1-gentoo-cursor-themes.patch"
-
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		gnome2_src_install
-		python_doscript gnome-tweak-tool || die
-	}
-	python_foreach_impl run_in_build_dir install_python
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/, gnome-extra/gnome-tweaks/files/
@ 2020-03-29 16:19 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2020-03-29 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     9ce29e6be1338b0ca8edbff7835ff10b5ab01f0c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 13:56:47 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 16:18:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce29e6b

gnome-extra/gnome-tweaks: bump to 3.34.0

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-extra/gnome-tweaks/Manifest                  |  1 +
 .../gnome-tweaks/files/3.34.0-fix-python.patch     | 85 ++++++++++++++++++++++
 .../gnome-tweaks/gnome-tweaks-3.34.0.ebuild        | 51 +++++++++++++
 3 files changed, 137 insertions(+)

diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 883637886a8..9f0b2f95bc7 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1 +1,2 @@
 DIST gnome-tweaks-3.32.0.tar.xz 241492 BLAKE2B f3c0a25b39726600fc5d53d8d3c343dbcde594642a87fc56dd3fff9b88a3498e0f283568a944fc37445c138201db1f280222eb1161f5b8351c566537404cde5e SHA512 8107e9d2b33ac6c46e8d0076b27a1c3a84e1721e49a6b80da28fe854f6f4f6693bc7f7e836c54d39bafec79dcee8a6e2b2962580a77d7d01bfc06c6d11206d8f
+DIST gnome-tweaks-3.34.0.tar.xz 246592 BLAKE2B 8701b03f64bf6b779f6f96de25684602447b4da8f2714cb38f866e5016532aad3283f3dc217b29161534958c03e72aed33c0803e60681a3616818d037c23e5e8 SHA512 1d2b21a31550d4b48afd02a9fcfb9844eacac7aa726ef624abcb40225af31da29b34e9032b3bb2943e5cb5f7553a6f931467d04bfbc2b026732e6bdcb86eb840

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
new file mode 100644
index 00000000000..2501bc7c4d1
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/files/3.34.0-fix-python.patch
@@ -0,0 +1,85 @@
+From 0ec042734f63a3a870920b1e71f07851d335ea45 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
+
+The deprecated meson python3 module tends to end up installing only
+to a python version that meson is installed for too, possibly
+breaking some expectations downstream that want it installed to
+a specific python3 version, that might not match what the build
+machine uses for meson.
+Fix it by using the non-deprecated python module and methods from it.
+
+The python module exists since 0.46, which should be safe to require
+by now. There were meson 0.50 features used already, but unnecessarily,
+as the configure_file install parameter was added then, but all versions
+default to `true` anyhow. However in practice this only emitted a
+warning with newer meson versions and was able to build fine with older
+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(-)
+
+diff --git a/gtweak/meson.build b/gtweak/meson.build
+index 3d9a743..4e558b4 100644
+--- a/gtweak/meson.build
++++ b/gtweak/meson.build
+@@ -11,7 +11,6 @@ configure_file(
+   input: 'defs.py.in',
+   output: 'defs.py',
+   configuration: defs_conf,
+-  install: true,
+   install_dir: gtweakdir
+ )
+ 
+@@ -46,5 +45,5 @@ tweak_sources = [
+   'tweaks/tweak_wacom.py',
+ ]
+ 
+-install_data(shell_sources, install_dir: gtweakdir)
+-install_data(tweak_sources, install_dir: gtweakdir + '/tweaks')
++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
+--- 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'
+ )
+ 
+ gnome = import('gnome')
+ i18n = import('i18n')
+-python3 = import('python3')
++pymod = import('python')
++python3 = pymod.find_installation('python3')
++
++if not python3.found()
++    error('No valid python3 installation found')
++endif
+ 
+ prefix = get_option('prefix')
+ 
+@@ -13,13 +18,12 @@ bindir = join_paths(prefix, get_option('bindir'))
+ datadir = join_paths(prefix, get_option('datadir'))
+ libexecdir = join_paths(prefix, get_option('libexecdir'))
+ localedir = join_paths(prefix, get_option('localedir'))
+-pythondir = join_paths(prefix, python3.sysconfig_path('purelib'))
+ 
+ pkgdatadir = join_paths(datadir, meson.project_name())
+ 
+ appdatadir = join_paths(datadir, 'metainfo')
+ desktopdir = join_paths(datadir, 'applications')
+-gtweakdir = join_paths(pythondir, 'gtweak')
++gtweakdir = python3.get_install_dir(subdir: 'gtweak')
+ icondir = join_paths(datadir, 'icons', 'hicolor')
+ schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
+ 
+-- 
+2.20.1
+

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
new file mode 100644
index 00000000000..7a5ad14a25b
--- /dev/null
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+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"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~ia64 ~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}"/${PV}-fix-python.patch
+)
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/, gnome-extra/gnome-tweaks/files/
@ 2024-03-02 22:33 Mart Raudsepp
  0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2024-03-02 22:33 UTC (permalink / raw
  To: gentoo-commits

commit:     11e3da176e629add7433035d475866c312516aad
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 22:29:16 2024 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 22:32:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e3da17

gnome-extra/gnome-tweaks: drop 40.10-r1, 42_beta

Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-extra/gnome-tweaks/Manifest                  |  2 -
 .../files/3.28.1-gentoo-cursor-themes.patch        | 25 ----------
 .../gnome-tweaks/gnome-tweaks-40.10-r1.ebuild      | 58 ----------------------
 .../gnome-tweaks/gnome-tweaks-42_beta.ebuild       | 54 --------------------
 4 files changed, 139 deletions(-)

diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 479939527189..2b6c8164e7a3 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,3 +1 @@
-DIST gnome-tweaks-40.10.tar.xz 251712 BLAKE2B 7e9e04b86ffcff25cafd2a6dfc0c7be14c8caa4ae003369c34ed2c40c36ce857b05de9994f7c2187cbdd535f464b92f782ec91b835318c2b5d2219ad817fbe56 SHA512 1247933ad2f93bd7817af367d715468591840df4840d45641033ca19ea26c64239828ba3e24fafb8694014a98024b911266c314172ba8e37d6c4165e7e6e8a29
-DIST gnome-tweaks-42.beta.tar.xz 250480 BLAKE2B a9ff92c9927faad54128b969587a3e074bc9bc94a57d454f72807b7cadfa7fe15992c1370c4c9957c0f816aff73c9e432624060d5dacadffa067d6cdce6d0899 SHA512 f641d62891efd8f198f520fd467e6b3c73540e54a506d07a4a4578ae793d273ee76844f5da7581c3562c6cfeb5bcb6e2d86b49db5f7a09d506e6d17fe6b32a14
 DIST gnome-tweaks-45.0.tar.xz 738364 BLAKE2B 0568aa800ab1c981491c6b3a66430e33c720a09a23ab25ce9bf73b2fe761f485a0df585b86541b38f62ee3737c780e8f449f75ac969c5d58e8f2049ffe37720b SHA512 2bc6d64a412c13f84a971d157ce7ebfac31d791af8d4bfc80d7f6b8f88445ecd40dc9d9d12aee0688590ab6d9535add18f244dd9a216e3b59c82e1c88a1c7f86

diff --git a/gnome-extra/gnome-tweaks/files/3.28.1-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweaks/files/3.28.1-gentoo-cursor-themes.patch
deleted file mode 100644
index 7de77aa137a5..000000000000
--- a/gnome-extra/gnome-tweaks/files/3.28.1-gentoo-cursor-themes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a362e7b1b2b6622e913983457a4872950aa8fde7 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 6 Mar 2019 12:57:23 +0200
-Subject: [PATCH] appearance: Look for cursors in Gentoo location too
-
----
- gtweak/tweaks/tweak_group_appearance.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py
-index ff78735..061925d 100644
---- a/gtweak/tweaks/tweak_group_appearance.py
-+++ b/gtweak/tweaks/tweak_group_appearance.py
-@@ -88,7 +88,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_cursor_themes(self):
--        valid = walk_directories(get_resource_dirs("icons"), lambda d:
-+        valid = walk_directories([os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11")] + get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
-                         os.path.exists(os.path.join(d, "cursors")))
-         return set(valid)
--- 
-2.17.0
-

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10-r1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10-r1.ebuild
deleted file mode 100644
index 7234805fcf37..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME 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 ~ppc64 ~riscv 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_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:1[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gsettings-desktop-schemas-40.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
-)
-
-src_install() {
-	meson_src_install
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}

diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-42_beta.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-42_beta.ebuild
deleted file mode 100644
index cca781162472..000000000000
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-42_beta.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Customize advanced GNOME 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 ~loong ~ppc64 ~riscv ~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_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:1[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango[introspection]
-	>=gnome-base/gsettings-desktop-schemas-40.0
-	>=gnome-base/gnome-shell-3.24
-	x11-wm/mutter
-"
-BDEPEND=">=sys-devel/gettext-0.19.8"
-
-src_install() {
-	meson_src_install
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-02 22:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-02 22:33 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/, gnome-extra/gnome-tweaks/files/ Mart Raudsepp
  -- strict thread matches above, loose matches on Subject: below --
2020-03-29 16:19 Mart Raudsepp
2019-05-18 21:24 Mart Raudsepp
2019-03-30 22:50 Mart Raudsepp
2019-03-06 11:07 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox