Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-apps/swaybg/
Date: Sat, 25 Jun 2022 19:12:53
Message-Id: 1656184364.1a0cbb9052632e827c64f96752e3e2c0d1d391c7.prometheanfire@gentoo
1 commit: 1a0cbb9052632e827c64f96752e3e2c0d1d391c7
2 Author: Alex Xu (Hello71) <alex_y_xu <AT> yahoo <DOT> ca>
3 AuthorDate: Tue Aug 24 11:49:33 2021 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 25 19:12:44 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0cbb90
7
8 gui-apps/swaybg: upgrade to 1.1.1, various fixes
9
10 - fix cross-compile deps
11 - make gdk-pixbuf optional
12 - add ~riscv to -9999
13
14 Signed-off-by: Alex Xu (Hello71) <alex_y_xu <AT> yahoo.ca>
15 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
16
17 gui-apps/swaybg/Manifest | 1 +
18 gui-apps/swaybg/metadata.xml | 3 +++
19 .../swaybg/{swaybg-9999.ebuild => swaybg-1.1.1.ebuild} | 14 ++++++++------
20 gui-apps/swaybg/swaybg-9999.ebuild | 12 +++++++-----
21 4 files changed, 19 insertions(+), 11 deletions(-)
22
23 diff --git a/gui-apps/swaybg/Manifest b/gui-apps/swaybg/Manifest
24 index 562a59c8a6d5..63a13a1ba054 100644
25 --- a/gui-apps/swaybg/Manifest
26 +++ b/gui-apps/swaybg/Manifest
27 @@ -1 +1,2 @@
28 DIST swaybg-1.0.tar.gz 15851 BLAKE2B 820edbce4161f2d109bc8e842fb2bef101a5793d1da90f4258e5771fe85ab089e184c063a0a7073adbe218c59307946f86bd02c4d62b0585aeb3f9cd5c7963f8 SHA512 67d0e0109b906ece51800729182940374cc59fa07d0866b57cf876d12191fe12e796b84350a849dc85183fa58a3b2d196191e48dcc03dcc3708a980ed4a8cff0
29 +DIST swaybg-1.1.1.tar.gz 16474 BLAKE2B 21e966e28b5228688aa452f6086feea58bcd56d7fccfe53babe086b9e26702429705870b7d5c7e4900db40e281eab6e1f4077c4cc58f0be745e2d5a9a7d7f46f SHA512 e5ac7af1690974206f916e1d99a8dde0e837acbc686e2de2c46d505201f239a059f998adc22192205d1ad75b5905222f16aed243b31920e19c0ff2229b8eda2c
30
31 diff --git a/gui-apps/swaybg/metadata.xml b/gui-apps/swaybg/metadata.xml
32 index c00e68acd181..98797bd88f43 100644
33 --- a/gui-apps/swaybg/metadata.xml
34 +++ b/gui-apps/swaybg/metadata.xml
35 @@ -22,4 +22,7 @@
36 <bugs-to>https://github.com/swaywm/swaybg/issues</bugs-to>
37 <changelog>https://github.com/swaywm/swaybg/releases</changelog>
38 </upstream>
39 + <use>
40 + <flag name="gdk-pixbuf">Support image types other than PNG</flag>
41 + </use>
42 </pkgmetadata>
43
44 diff --git a/gui-apps/swaybg/swaybg-9999.ebuild b/gui-apps/swaybg/swaybg-1.1.1.ebuild
45 similarity index 70%
46 copy from gui-apps/swaybg/swaybg-9999.ebuild
47 copy to gui-apps/swaybg/swaybg-1.1.1.ebuild
48 index dfb9021263d7..ce371ad99d1a 100644
49 --- a/gui-apps/swaybg/swaybg-9999.ebuild
50 +++ b/gui-apps/swaybg/swaybg-1.1.1.ebuild
51 @@ -12,25 +12,26 @@ if [[ ${PV} == 9999 ]]; then
52 inherit git-r3
53 EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
54 else
55 - SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
56 - KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
57 + SRC_URI="https://github.com/swaywm/${PN}/releases/download/v${PV}/${P}.tar.gz"
58 + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
59 fi
60
61 LICENSE="MIT"
62 SLOT="0"
63 -IUSE="+man"
64 +IUSE="gdk-pixbuf +man"
65
66 DEPEND="
67 dev-libs/wayland
68 + >=dev-libs/wayland-protocols-1.14
69 + x11-libs/cairo
70 + gdk-pixbuf? ( x11-libs/gdk-pixbuf )
71 "
72 RDEPEND="
73 ${DEPEND}
74 !<gui-wm/sway-1.1_alpha1
75 "
76 BDEPEND="
77 - >=dev-libs/wayland-protocols-1.14
78 - x11-libs/gdk-pixbuf
79 - x11-libs/cairo
80 + dev-util/wayland-scanner
81 virtual/pkgconfig
82 man? ( app-text/scdoc )
83 "
84 @@ -38,6 +39,7 @@ BDEPEND="
85 src_configure() {
86 local emesonargs=(
87 -Dman-pages=$(usex man enabled disabled)
88 + -Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
89 )
90
91 meson_src_configure
92
93 diff --git a/gui-apps/swaybg/swaybg-9999.ebuild b/gui-apps/swaybg/swaybg-9999.ebuild
94 index dfb9021263d7..a665232edee6 100644
95 --- a/gui-apps/swaybg/swaybg-9999.ebuild
96 +++ b/gui-apps/swaybg/swaybg-9999.ebuild
97 @@ -13,24 +13,25 @@ if [[ ${PV} == 9999 ]]; then
98 EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
99 else
100 SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
101 - KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~x86"
102 + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
103 fi
104
105 LICENSE="MIT"
106 SLOT="0"
107 -IUSE="+man"
108 +IUSE="gdk-pixbuf +man"
109
110 DEPEND="
111 dev-libs/wayland
112 + >=dev-libs/wayland-protocols-1.14
113 + x11-libs/cairo
114 + gdk-pixbuf? ( x11-libs/gdk-pixbuf )
115 "
116 RDEPEND="
117 ${DEPEND}
118 !<gui-wm/sway-1.1_alpha1
119 "
120 BDEPEND="
121 - >=dev-libs/wayland-protocols-1.14
122 - x11-libs/gdk-pixbuf
123 - x11-libs/cairo
124 + dev-util/wayland-scanner
125 virtual/pkgconfig
126 man? ( app-text/scdoc )
127 "
128 @@ -38,6 +39,7 @@ BDEPEND="
129 src_configure() {
130 local emesonargs=(
131 -Dman-pages=$(usex man enabled disabled)
132 + -Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
133 )
134
135 meson_src_configure