commit: 5b1fe253c5caa9abe1e3603afcfee4e775339c59 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Wed Jan 1 21:21:06 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Wed Jan 1 21:26:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1fe253
sys-apps/polychromatic: patch to remove calls to which Closes: https://bugs.gentoo.org/947330 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../files/polychromatic-0.9.3-command-v.patch | 101 +++++++++++++++++++++ sys-apps/polychromatic/polychromatic-0.9.3.ebuild | 4 +- 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/sys-apps/polychromatic/files/polychromatic-0.9.3-command-v.patch b/sys-apps/polychromatic/files/polychromatic-0.9.3-command-v.patch new file mode 100644 index 000000000000..4d73e3edae8c --- /dev/null +++ b/sys-apps/polychromatic/files/polychromatic-0.9.3-command-v.patch @@ -0,0 +1,101 @@ +--- a/scripts/build-locales.sh ++++ b/scripts/build-locales.sh +@@ -16,7 +16,7 @@ cd "$(dirname "$0")"/../locale + output_path="$1" + + # Check all the required tools are present +-if [ -z "$(which msgfmt)" ]; then ++if [ -z "$(command -v msgfmt)" ]; then + echo "Command for 'msgfmt' not found. Locales will not be compiled." + echo "Try installing a 'gettext' package for your distribution." + exit 1 +--- a/scripts/build-man-pages.sh ++++ b/scripts/build-man-pages.sh +@@ -5,7 +5,7 @@ + + cd $(dirname "$0")/../man/ + +-which=$(which scdoc) ++which=$(command -v scdoc) + if [ $? != 0 ]; then + echo "Please install 'scdoc', which was not found in your PATH." + exit 1 +--- a/scripts/build-styles.sh ++++ b/scripts/build-styles.sh +@@ -10,8 +10,8 @@ + cd $(dirname "$0")/../sources/qt-theme/ + + # Find an implementation of SASS to use. +-sassc=$(which sassc 2>/dev/null) +-sass=$(which sass 2>/dev/null) ++sassc=$(command -v sassc 2>/dev/null) ++sass=$(command -v sass 2>/dev/null) + + if [ -z "$sass" ] && [ -z "$sassc" ]; then + echo "Please install a package that provides 'sassc' or 'sass' and try again." +--- a/scripts/create-locales.sh ++++ b/scripts/create-locales.sh +@@ -19,7 +19,7 @@ cd "$(dirname "$0")"/../locale + # Check all the required tools are present + missing_tool=false + function check_for_tool() { +- if [ -z "$(which $1)" ]; then ++ if [ -z "$(command -v $1)" ]; then + echo "Command for '$1' not found." + missing_tool=true + fi +--- a/scripts/dev/optimise-svgs.sh ++++ b/scripts/dev/optimise-svgs.sh +@@ -7,7 +7,7 @@ + # as it will likely strip essential data. + # + +-if [ -z "$(which svgcleaner)" ]; then ++if [ -z "$(command -v svgcleaner)" ]; then + echo "'svgcleaner' not installed." + exit 1 + fi +--- a/scripts/validate-metainfo.sh ++++ b/scripts/validate-metainfo.sh +@@ -3,7 +3,7 @@ + # Validate AppStream metainfo + # + +-if [ -z "$(which appstreamcli)" ]; then ++if [ -z "$(command -v appstreamcli)" ]; then + echo "appstreamcli not found. Try installing 'appstream'." + exit 1 + fi +--- a/scripts/validate-scdoc.sh ++++ b/scripts/validate-scdoc.sh +@@ -3,7 +3,7 @@ + # Checks the scdocs can be compiled. + # + +-if [ -z "$(which scdoc)" ]; then ++if [ -z "$(command -v scdoc)" ]; then + echo "'scdoc' not installed." + exit 1 + fi +--- a/scripts/validate-scss.sh ++++ b/scripts/validate-scss.sh +@@ -3,7 +3,7 @@ + # Validates SCSS files can be compiled. Uses 'sassc'. + # + +-if [ -z "$(which sassc)" ]; then ++if [ -z "$(command -v sassc)" ]; then + echo "'sassc' not installed." + exit 1 + fi +--- a/tests/openrazer/run_daemon.sh ++++ b/tests/openrazer/run_daemon.sh +@@ -26,7 +26,7 @@ if [ ! -f "$OPENRAZER_SRC/scripts/create_fake_device.py" ]; then + exit 1 + fi + +-if [ -z "$(which openrazer-daemon)" ]; then ++if [ -z "$(command -v openrazer-daemon)" ]; then + echo "openrazer-daemon is not installed." + exit 1 + fi diff --git a/sys-apps/polychromatic/polychromatic-0.9.3.ebuild b/sys-apps/polychromatic/polychromatic-0.9.3.ebuild index 61ae7be119f4..a3c9f7d14ded 100644 --- a/sys-apps/polychromatic/polychromatic-0.9.3.ebuild +++ b/sys-apps/polychromatic/polychromatic-0.9.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,6 +47,8 @@ BDEPEND=" dev-lang/sassc " +PATCHES=( "${FILESDIR}/polychromatic-0.9.3-command-v.patch" ) + DOC_CONTENTS="To automatically start up Polychromatic on session login copy /usr/share/polychromatic/polychromatic-autostart.desktop file into Your user's ~/.config/autostart/ directory."
