* [gentoo-commits] repo/gentoo:master commit in: x11-themes/arc-theme/, x11-themes/arc-theme/files/
@ 2016-09-20 19:57 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2016-09-20 19:57 UTC (permalink / raw
To: gentoo-commits
commit: 5274fa3943a272e4ff85c6bcb372ff3746445a48
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 19:52:00 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 19:56:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5274fa39
x11-themes/arc-theme: New package, fixes bug #585566
Package-Manager: portage-2.3.1
x11-themes/arc-theme/Manifest | 1 +
x11-themes/arc-theme/arc-theme-20160605.ebuild | 46 +++++++++++++++++++++++++
x11-themes/arc-theme/files/configure-gtk3.patch | 26 ++++++++++++++
x11-themes/arc-theme/metadata.xml | 19 ++++++++++
4 files changed, 92 insertions(+)
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
new file mode 100644
index 00000000..8b0aa35
--- /dev/null
+++ b/x11-themes/arc-theme/Manifest
@@ -0,0 +1 @@
+DIST arc-theme-20160605.tar.gz 1413807 SHA256 c61fad735e53d46db6416f0e067c3fd0c97330dc4b74a0b9b012a9d6c300026b SHA512 e8905d4c5bf3a2881243db12ce23972180edf95873eb1533cbeb0a582f8f684fdcbaa7df9b314354d0cb83d5e462e45ce07561dfac706b4fceaa5d350b2357e9 WHIRLPOOL d739793a29d725b83a8de169727602ee3bb223b612eaf351966f9060d0128aec58d716e472b2f3a6dc087b390f6f22184cecf46cb5f05cdcbfc3bcfa168720c3
diff --git a/x11-themes/arc-theme/arc-theme-20160605.ebuild b/x11-themes/arc-theme/arc-theme-20160605.ebuild
new file mode 100644
index 00000000..f987c65
--- /dev/null
+++ b/x11-themes/arc-theme/arc-theme-20160605.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell"
+HOMEPAGE="https://github.com/horst3180/arc-theme"
+SRC_URI="https://github.com/horst3180/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate xfce"
+
+# Supports various GTK+3 versions and uses pkg-config to determine which
+# set of files to install. Updates will break it but only this fix will
+# help. https://github.com/horst3180/arc-theme/pull/436
+DEPEND="gtk3? ( >=x11-libs/gtk+-3.14:3
+ virtual/pkgconfig )"
+
+# gnome-themes-standard is only needed by GTK+2 for the Adwaita
+# engine. This engine is built into GTK+3.
+RDEPEND="gtk2? ( x11-themes/gnome-themes-standard
+ x11-themes/gtk-engines-murrine )"
+
+PATCHES=(
+ "${FILESDIR}"/configure-gtk3.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-unity \
+ $(use_enable cinnamon) \
+ $(use_enable gtk2) \
+ $(use_enable gtk3) \
+ $(use_enable gnome-shell) \
+ $(use_enable mate metacity) \
+ $(use_enable xfce xfwm)
+}
diff --git a/x11-themes/arc-theme/files/configure-gtk3.patch b/x11-themes/arc-theme/files/configure-gtk3.patch
new file mode 100644
index 00000000..23e69c7
--- /dev/null
+++ b/x11-themes/arc-theme/files/configure-gtk3.patch
@@ -0,0 +1,26 @@
+From f416c04a979a6616bb5471c5982555bcac5bf346 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Tue, 20 Sep 2016 13:29:44 +0100
+Subject: [PATCH] Don't require GTK+3 at configure time when it's not needed
+
+It's not needed when --disable-gtk3 --disable-gnome-shell is given.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b27f5cd..dc8098b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,7 +24,7 @@ ARC_ENABLE([UNITY], [unity], [Unity], [disable])
+ ARC_ENABLE([XFWM], [xfwm], [XFWM], [disable])
+ ARC_ENABLE([TRANSPARENCY], [transparency], [transparency], [disable])
+
+-ARC_GNOME
++AS_IF([test "x$ENABLE_GNOME_SHELL$ENABLE_GTK3" != xnono], [ARC_GNOME])
+
+ AC_CONFIG_FILES([
+ common/Makefile
+--
+2.10.0
+
diff --git a/x11-themes/arc-theme/metadata.xml b/x11-themes/arc-theme/metadata.xml
new file mode 100644
index 00000000..33dd600
--- /dev/null
+++ b/x11-themes/arc-theme/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chewi@gentoo.org</email>
+ <name>James Le Cuirot</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">horst3180/arc-theme</remote-id>
+ </upstream>
+ <use>
+ <flag name="cinnamon">Install theme for <pkg>gnome-extra/cinnamon</pkg></flag>
+ <flag name="gtk2">Install GTK+2 theme</flag>
+ <flag name="gtk3">Install GTK+3 theme</flag>
+ <flag name="mate">Install Metacity theme for <pkg>mate-base/mate</pkg></flag>
+ <flag name="gnome-shell">Install theme for <pkg>gnome-base/gnome-shell</pkg></flag>
+ <flag name="xfce">Install theme for <pkg>xfce-base/xfwm4</pkg></flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-themes/arc-theme/, x11-themes/arc-theme/files/
@ 2016-10-13 17:25 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2016-10-13 17:25 UTC (permalink / raw
To: gentoo-commits
commit: 83591a474b362c0d55f5560aef1f96a1bdcd0566
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 17:24:53 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 17:24:53 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83591a47
x11-themes/arc-theme: Version bump to 20161005
Package-Manager: portage-2.3.2
x11-themes/arc-theme/Manifest | 2 +-
...e-20160605.ebuild => arc-theme-20161005.ebuild} | 4 ----
x11-themes/arc-theme/files/configure-gtk3.patch | 26 ----------------------
3 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index 8b0aa35..6ee9e18 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1 +1 @@
-DIST arc-theme-20160605.tar.gz 1413807 SHA256 c61fad735e53d46db6416f0e067c3fd0c97330dc4b74a0b9b012a9d6c300026b SHA512 e8905d4c5bf3a2881243db12ce23972180edf95873eb1533cbeb0a582f8f684fdcbaa7df9b314354d0cb83d5e462e45ce07561dfac706b4fceaa5d350b2357e9 WHIRLPOOL d739793a29d725b83a8de169727602ee3bb223b612eaf351966f9060d0128aec58d716e472b2f3a6dc087b390f6f22184cecf46cb5f05cdcbfc3bcfa168720c3
+DIST arc-theme-20161005.tar.gz 1457943 SHA256 09167228e286c3decedd2197ed6915d70d8601e7274f81cd368ac097f6c4f7e4 SHA512 cbdb73424f85532d756f2b7ed781fbc49598be44e01715490c0f95a60d7e1ab1c4f58a02f1a60bc9aec7f9625a9b7190ed680888af9c6fdf8a192b935c2ebe33 WHIRLPOOL a0473437ccf23a3634d9bb4c38a77dffa5c6e3295fe4a49e37a3429925496332a5c7f362e892b5f470d227326fa1c10f47de3034aaa8f0fe95a94d1625b705be
diff --git a/x11-themes/arc-theme/arc-theme-20160605.ebuild b/x11-themes/arc-theme/arc-theme-20161005.ebuild
similarity index 95%
rename from x11-themes/arc-theme/arc-theme-20160605.ebuild
rename to x11-themes/arc-theme/arc-theme-20161005.ebuild
index f987c65..bdf5f23 100644
--- a/x11-themes/arc-theme/arc-theme-20160605.ebuild
+++ b/x11-themes/arc-theme/arc-theme-20161005.ebuild
@@ -25,10 +25,6 @@ DEPEND="gtk3? ( >=x11-libs/gtk+-3.14:3
RDEPEND="gtk2? ( x11-themes/gnome-themes-standard
x11-themes/gtk-engines-murrine )"
-PATCHES=(
- "${FILESDIR}"/configure-gtk3.patch
-)
-
src_prepare() {
default
eautoreconf
diff --git a/x11-themes/arc-theme/files/configure-gtk3.patch b/x11-themes/arc-theme/files/configure-gtk3.patch
deleted file mode 100644
index 23e69c7..00000000
--- a/x11-themes/arc-theme/files/configure-gtk3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f416c04a979a6616bb5471c5982555bcac5bf346 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 20 Sep 2016 13:29:44 +0100
-Subject: [PATCH] Don't require GTK+3 at configure time when it's not needed
-
-It's not needed when --disable-gtk3 --disable-gnome-shell is given.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b27f5cd..dc8098b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,7 +24,7 @@ ARC_ENABLE([UNITY], [unity], [Unity], [disable])
- ARC_ENABLE([XFWM], [xfwm], [XFWM], [disable])
- ARC_ENABLE([TRANSPARENCY], [transparency], [transparency], [disable])
-
--ARC_GNOME
-+AS_IF([test "x$ENABLE_GNOME_SHELL$ENABLE_GTK3" != xnono], [ARC_GNOME])
-
- AC_CONFIG_FILES([
- common/Makefile
---
-2.10.0
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-themes/arc-theme/, x11-themes/arc-theme/files/
@ 2021-07-20 21:12 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2021-07-20 21:12 UTC (permalink / raw
To: gentoo-commits
commit: a8163edec919436c14ae72ade7dcea68a52e2527
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 20 21:11:58 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 21:12:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8163ede
x11-themes/arc-theme: Drop old 20201013 and 20210127
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
x11-themes/arc-theme/Manifest | 4 -
x11-themes/arc-theme/arc-theme-20201013.ebuild | 97 ---------------------
x11-themes/arc-theme/arc-theme-20210127.ebuild | 110 ------------------------
x11-themes/arc-theme/files/meson-inkscape.patch | 91 --------------------
4 files changed, 302 deletions(-)
diff --git a/x11-themes/arc-theme/Manifest b/x11-themes/arc-theme/Manifest
index 30e4e203de9..256eebbbd47 100644
--- a/x11-themes/arc-theme/Manifest
+++ b/x11-themes/arc-theme/Manifest
@@ -1,6 +1,2 @@
-DIST arc-theme-20201013-pngs.tar.xz 85204 BLAKE2B fb1ef7e0d9618238cf6057777d1494d6247b237d060c4c6772aa5a7ce740218f45f0ee6b2328bc486b8b29d2741c4c44dadcb8db5abf4e333ce519c7db961f9c SHA512 d7d28fe99ac7fce7360905eea0ed1a2cac77612dc7dde05240bbb2cf8e7cc0956f63c35426c1dae34d8adb20553758f595e442e955a202e9c73af5b61ca30a86
-DIST arc-theme-20201013.tar.xz 241636 BLAKE2B 6f825b290c0f2cf1e67d72d9dbca0f23c83e7fc2ea89bc7b69013fb38bb7959205caad1b357a5cb1c4196e4b4460f13223515124c2012aa363a17765e89f992d SHA512 c1c70c80935af2b1f3c7c9bf79ee72d5fba907fd03caadecf96d6fd796bf70d325bbb16dbe93f95d9a63eff748c7d90bcb0bf837e446e5c2770cfdccb131f45c
-DIST arc-theme-20210127-pngs.tar.xz 159392 BLAKE2B 2a355e85766f44c21a4a85cacd184cb28ddb4ba19e7dff7cae70114c12422ed5d46a3930d780a6e2dd458684a944f5cbd17a769a0d3e331f94007b9fc9943238 SHA512 b0de3065e81979f2aa6b7f31edc1aad6dd6998776da2a1ba3b1030f6d8c552c9f1702e0bca0585e625e868541b0444b7a0d75631dfbeef517bdb9925e19e6159
-DIST arc-theme-20210127.tar.xz 256364 BLAKE2B 4e85d2ca801977588273715a94b91e199e3f16d304090789748e22b55c1339386a84938da1b1c143004655d8573678a51ff3b27e9ac3a2027de93625b0f39ada SHA512 bb0554c96cf6c3c3891698d973e7d719931fc316ea6cd910f69d21440110690aeef0e734b5f940ad1c81bdff238477b6353de4ae074cd54fbed09c680377d594
DIST arc-theme-20210412-pngs.tar.xz 159340 BLAKE2B 40027335b8b44ae38bfadfa52e08858cf09646ed9c3e2fcddece8959d2f35845c4924002f36cea65cb27ecf61fdb3dffbf0d5c01024c34d16c31e21bf69b5a72 SHA512 85bdcd1fb81a5c33b479123bad178b1833a95ecf09310fa3b754c25f753ec10a7cada14983014b090c4a86d7a8497ac881fee9576737be29f4f772ccb59a8f1e
DIST arc-theme-20210412.tar.xz 257248 BLAKE2B c525c3632670d8aa6b640baa8b3dddca6c5dd5f087734604c68d9140f810fc595f73db06f93b6193ba1c59a8cd85b87f5f6fda9777940adf36f3c436a8426810 SHA512 d3064546301e013a1e5a8db735346d74c73f37cbf808b7afeee6f88c820cea58ba6458fa63e1213377cdd33c8347167242e6f8f1eacf85ce212f3b2508c0bb80
diff --git a/x11-themes/arc-theme/arc-theme-20201013.ebuild b/x11-themes/arc-theme/arc-theme-20201013.ebuild
deleted file mode 100644
index 640c44b0ebe..00000000000
--- a/x11-themes/arc-theme/arc-theme-20201013.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
-# cd ~portage/x11-themes/${P}/work
-# make -j -C */common/gtk-3.0/3.18
-# find */common/{gtk-2.0,gtk-3.0/3.*,xfwm4} -name "*.png" ! -path "*/menubar-toolbar/*" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root
-
-inherit autotools
-
-DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell"
-HOMEPAGE="https://github.com/jnsh/arc-theme"
-SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.tar.xz
- pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
-
-SASSC_DEPEND="
- dev-lang/sassc
-"
-
-SVG_DEPEND="
- !pre-rendered? (
- media-gfx/inkscape
- media-gfx/optipng
- )
-"
-
-# Supports various GTK+3 versions and uses pkg-config to determine which
-# set of files to install. Updates will break it but only this fix will
-# help. See https://github.com/horst3180/arc-theme/pull/436. The same
-# applies to GNOME Shell and Cinnamon but I don't know whether those are
-# fixable.
-BDEPEND="
- cinnamon? (
- ${SASSC_DEPEND}
- gnome-extra/cinnamon
- )
- gnome-shell? (
- ${SASSC_DEPEND}
- >=gnome-base/gnome-shell-3.18
- )
- gtk2? (
- ${SVG_DEPEND}
- )
- gtk3? (
- ${SASSC_DEPEND}
- ${SVG_DEPEND}
- virtual/pkgconfig
- >=x11-libs/gtk+-3.18:3
- )
- xfce? (
- ${SVG_DEPEND}
- )
-"
-
-# gnome-themes-standard is only needed by GTK+2 for the Adwaita
-# engine. This engine is built into GTK+3.
-RDEPEND="
- gtk2? (
- x11-themes/gnome-themes-standard
- x11-themes/gtk-engines-murrine
- )
-"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- use pre-rendered &&
- export INKSCAPE="${BROOT}"/bin/false OPTIPNG="${BROOT}"/bin/false
-
- econf \
- --disable-plank \
- --disable-unity \
- $(use_enable cinnamon) \
- $(use_enable gtk2) \
- $(use_enable gtk3) \
- $(use_enable gnome-shell) \
- $(use_enable mate metacity) \
- $(use_enable xfce xfwm)
-}
-
-src_compile() {
- # fontconfig issue?
- # https://bugs.gentoo.org/666418#c28
- use pre-rendered ||
- addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX
-
- default
-}
diff --git a/x11-themes/arc-theme/arc-theme-20210127.ebuild b/x11-themes/arc-theme/arc-theme-20210127.ebuild
deleted file mode 100644
index e7a1d5c3bff..00000000000
--- a/x11-themes/arc-theme/arc-theme-20210127.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# USE="-* gtk2 gtk3 xfce" ebuild ${P}.ebuild clean compile
-# cd $(portageq envvar PORTAGE_TMPDIR)/portage/x11-themes/${P}/work
-# find ${P}-build/ -name "*.png" | xargs tar Jcvf /usr/portage/distfiles/${P}-pngs.tar.xz --owner=root --group=root
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="A flat theme with transparent elements for GTK+3, GTK+2 and GNOME Shell"
-HOMEPAGE="https://github.com/jnsh/arc-theme"
-SRC_URI="https://github.com/jnsh/${PN}/releases/download/${PV}/arc-theme-${PV}.tar.xz
- pre-rendered? ( https://dev.gentoo.org/~chewi/distfiles/${P}-pngs.tar.xz )"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cinnamon gnome-shell +gtk2 +gtk3 mate +pre-rendered xfce"
-
-SASSC_DEPEND="
- dev-lang/sassc
-"
-
-SVG_DEPEND="
- !pre-rendered? (
- media-gfx/inkscape
- media-gfx/optipng
- )
-"
-
-# Supports various GTK+3, GNOME Shell, and Cinnamon versions and uses
-# pkg-config to determine which set of files to build. Updates will
-# therefore break existing installs but there's no way around this. At
-# least GTK+3 is unlikely to see a release beyond 3.24.
-BDEPEND="
- >=dev-util/meson-0.56.0
- cinnamon? (
- ${SASSC_DEPEND}
- gnome-extra/cinnamon
- )
- gnome-shell? (
- ${SASSC_DEPEND}
- >=gnome-base/gnome-shell-3.18
- )
- gtk2? (
- ${SVG_DEPEND}
- )
- gtk3? (
- ${SASSC_DEPEND}
- ${SVG_DEPEND}
- virtual/pkgconfig
- =x11-libs/gtk+-3.24*:3
- )
- xfce? (
- ${SVG_DEPEND}
- )
-"
-
-# gnome-themes-standard is only needed by GTK+2 for the Adwaita
-# engine. This engine is built into GTK+3.
-RDEPEND="
- gtk2? (
- x11-themes/gnome-themes-standard
- x11-themes/gtk-engines-murrine
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/meson-inkscape.patch
-)
-
-src_configure() {
- local themes=$(
- printf "%s," \
- $(usev cinnamon) \
- $(usev gnome-shell) \
- $(usev gtk2) \
- $(usev gtk3) \
- $(usex mate metacity "") \
- $(usex xfce xfwm "")
- )
-
- local emesonargs=(
- -Dthemes="${themes%,}"
- -Dgtk3_version=3.24
- )
-
- if use pre-rendered; then
- emesonargs+=(
- $(if tc-is-cross-compiler; then
- echo --cross-file
- else
- echo --native-file
- fi)
- "${FILESDIR}"/pre-rendered.ini
- )
- fi
-
- meson_src_configure
-}
-
-src_compile() {
- # fontconfig issue?
- # https://bugs.gentoo.org/666418#c28
- use pre-rendered ||
- addpredict "${BROOT}"/usr/share/inkscape/fonts/.uuid.TMP-XXXXXX
-
- meson_src_compile
-}
diff --git a/x11-themes/arc-theme/files/meson-inkscape.patch b/x11-themes/arc-theme/files/meson-inkscape.patch
deleted file mode 100644
index dfec810aa53..00000000000
--- a/x11-themes/arc-theme/files/meson-inkscape.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 6c2e91fb79177f64eae875e1091d35ad94a74f5a Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Thu, 28 Jan 2021 23:14:22 +0000
-Subject: [PATCH] build: Fix building with Inkscape 1.0
-
-This wasn't matching the >1.0.0 version check.
----
- common/gtk-2.0/dark/meson.build | 2 +-
- common/gtk-2.0/light/meson.build | 2 +-
- common/gtk-3.0/meson.build | 4 ++--
- common/xfwm4/dark/meson.build | 2 +-
- common/xfwm4/light/meson.build | 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/common/gtk-2.0/dark/meson.build b/common/gtk-2.0/dark/meson.build
-index 869beda9..c13608a8 100644
---- a/common/gtk-2.0/dark/meson.build
-+++ b/common/gtk-2.0/dark/meson.build
-@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names
- command : [
- inkscape,
- '--export-id-only',
-- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
- '--export-id=' + asset,
- '--export-dpi=96',
- '@INPUT@'
-diff --git a/common/gtk-2.0/light/meson.build b/common/gtk-2.0/light/meson.build
-index 3df389a0..4dd32c63 100644
---- a/common/gtk-2.0/light/meson.build
-+++ b/common/gtk-2.0/light/meson.build
-@@ -8,7 +8,7 @@ foreach asset : gtk2_asset_names
- command : [
- inkscape,
- '--export-id-only',
-- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
- '--export-id=' + asset,
- '--export-dpi=96',
- '@INPUT@'
-diff --git a/common/gtk-3.0/meson.build b/common/gtk-3.0/meson.build
-index fcb2e074..085bb739 100644
---- a/common/gtk-3.0/meson.build
-+++ b/common/gtk-3.0/meson.build
-@@ -50,7 +50,7 @@ foreach asset : gtk3_asset_names
- command : [
- inkscape,
- '--export-id-only',
-- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
- '--export-id=' + asset,
- '--export-dpi=96',
- '@INPUT@'
-@@ -65,7 +65,7 @@ foreach asset : gtk3_asset_names
- command : [
- inkscape,
- '--export-id-only',
-- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
- '--export-id=' + asset,
- '--export-dpi=192',
- '@INPUT@'
-diff --git a/common/xfwm4/dark/meson.build b/common/xfwm4/dark/meson.build
-index a2820df2..9bb7d46b 100644
---- a/common/xfwm4/dark/meson.build
-+++ b/common/xfwm4/dark/meson.build
-@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names
- command : [
- inkscape,
- '--export-id-only',
-- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
- '--export-id=' + asset,
- '--export-dpi=96',
- '@INPUT@'
-diff --git a/common/xfwm4/light/meson.build b/common/xfwm4/light/meson.build
-index c65b891b..6ee79fc4 100644
---- a/common/xfwm4/light/meson.build
-+++ b/common/xfwm4/light/meson.build
-@@ -8,7 +8,7 @@ foreach asset : xfwm_asset_names
- command : [
- inkscape,
- '--export-id-only',
-- inkscape_ver.version_compare('>1.0.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
-+ inkscape_ver.version_compare('>=1.0') ? '--export-filename=@OUTPUT@' : '--export-png=@OUTPUT@',
- '--export-id=' + asset,
- '--export-dpi=96',
- '@INPUT@'
---
-2.26.2
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-20 21:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-20 21:12 [gentoo-commits] repo/gentoo:master commit in: x11-themes/arc-theme/, x11-themes/arc-theme/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2016-10-13 17:25 James Le Cuirot
2016-09-20 19:57 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox