| 1 |
commit: d4053942550ffe073b63307a40d78de7d9c36e26 |
| 2 |
Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja> |
| 3 |
AuthorDate: Sat Jun 4 11:27:28 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 4 21:13:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4053942 |
| 7 |
|
| 8 |
x11-wm/fvwm3: Fix breaking builds |
| 9 |
|
| 10 |
- Bug in fvwm3-1.0.4-htmldoc patch |
| 11 |
- Upstream bug with `./configure ... --disable-xft` (truetype USE flag) |
| 12 |
- Upstream bug with `./configure ... --disable-png` (png USE flag) |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/849596 |
| 15 |
Closes: https://bugs.gentoo.org/849668 |
| 16 |
|
| 17 |
Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja> |
| 18 |
Closes: https://github.com/gentoo/gentoo/pull/25748 |
| 19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 20 |
|
| 21 |
x11-wm/fvwm3/Manifest | 2 -- |
| 22 |
x11-wm/fvwm3/files/fvwm3-1.0.4-htmldoc.patch | 29 ++++++++++++++----------- |
| 23 |
x11-wm/fvwm3/fvwm3-1.0.4.ebuild | 32 ++++++---------------------- |
| 24 |
x11-wm/fvwm3/fvwm3-9999.ebuild | 32 ++++++---------------------- |
| 25 |
4 files changed, 30 insertions(+), 65 deletions(-) |
| 26 |
|
| 27 |
diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest |
| 28 |
index 6ba89565ed08..8fbcc853d95b 100644 |
| 29 |
--- a/x11-wm/fvwm3/Manifest |
| 30 |
+++ b/x11-wm/fvwm3/Manifest |
| 31 |
@@ -1,3 +1 @@ |
| 32 |
-DIST fvwm3-1.0.4-deps.tar.xz 2847880 BLAKE2B 245a5fa7846ffd74679ecd280b7f31cdcc58dfb765923750b22905caecdea0a1b2a322eeecc8133996414be37026de9f859222b78d93ed6c974005456ee953d1 SHA512 c93e5d4706a6261d8ebafcb5d2576377d79dfb693cc2b4a7608c3657b1c612b7c17a2554a6cef30c80ed5ffc9d0efd16f9adc33b2a9b906ece812fdf4fa8ab86 |
| 33 |
DIST fvwm3-1.0.4.tar.gz 4691719 BLAKE2B 4ce93b1a2d110b570b5fc8b253f9ff8ea1f44e5470c6e1bc136a53ebe53a23abe3d075bf351fca54ac110ea5731f9b44c59c83186d320e7509bf26e5144436ca SHA512 b72a1ebeba7c55214603fd43ea439f7283b3c79e39d2671a67b9512c67dcea111377eab2131ed0b18a72f6b772b0d048abe08f52565708367465ed9bb14e85f6 |
| 34 |
-DIST fvwm3-9999-deps.tar.xz 3712984 BLAKE2B 389f70dbadbe2fe6accd4793ed71e17cb2ff2f72e318e1744204344902145e5050ace5379f4de89991907199b7b354a9690e6546382d1eedfcdb676b28f1ff13 SHA512 444b1ea17b31d477ae12b4ef84a9f5fb85aae1158aead1bc3a4d8e96a18dde6a13e41e3e3552bd652eb58fe42958ad45791a1d4ef70242e9d6d80060067cef86 |
| 35 |
|
| 36 |
diff --git a/x11-wm/fvwm3/files/fvwm3-1.0.4-htmldoc.patch b/x11-wm/fvwm3/files/fvwm3-1.0.4-htmldoc.patch |
| 37 |
index 67abc9febfa4..ef277e902faa 100644 |
| 38 |
--- a/x11-wm/fvwm3/files/fvwm3-1.0.4-htmldoc.patch |
| 39 |
+++ b/x11-wm/fvwm3/files/fvwm3-1.0.4-htmldoc.patch |
| 40 |
@@ -1,7 +1,7 @@ |
| 41 |
-This patch enables HTML documentation output |
| 42 |
+This patch enables html documentation output for fvwm3 1.0.4 |
| 43 |
--- a/doc/Makefile.am |
| 44 |
+++ b/doc/Makefile.am |
| 45 |
-@@ -1,29 +1,39 @@ |
| 46 |
+@@ -1,40 +1,59 @@ |
| 47 |
docdir = @FVWM_DOCDIR@ |
| 48 |
-MODULE_ADOCS = $(wildcard fvwm3/fvwm3.adoc bin/*.adoc modules/*.adoc) |
| 49 |
+DOC_SRC = $(wildcard fvwm3/fvwm3.adoc bin/*.adoc modules/*.adoc) |
| 50 |
@@ -21,7 +21,7 @@ This patch enables HTML documentation output |
| 51 |
-docs: $(BUILD_MANS) |
| 52 |
+all: man html |
| 53 |
+ |
| 54 |
-+man: $(BUILD_MANS) |
| 55 |
++man: $(BUILD_MANS) |
| 56 |
+ |
| 57 |
+html: $(BUILD_HTML) |
| 58 |
|
| 59 |
@@ -32,7 +32,8 @@ This patch enables HTML documentation output |
| 60 |
distclean-local: clean |
| 61 |
|
| 62 |
if FVWM_BUILD_MANDOC |
| 63 |
- QUIET_ASCIIDOC = @echo ' ' DOC ' ' $@'.1'; |
| 64 |
+-QUIET_ASCIIDOC = @echo ' ' DOC ' ' $@'.1'; |
| 65 |
++QUIET_ASCIIDOC = @echo ' ' DOC ' ' $@; |
| 66 |
|
| 67 |
-%: %.adoc |
| 68 |
+%.1: %.adoc |
| 69 |
@@ -48,23 +49,25 @@ This patch enables HTML documentation output |
| 70 |
|
| 71 |
install-data-local: |
| 72 |
install -d -m 755 $(DESTDIR)$(mandir)/man1/ |
| 73 |
-@@ -31,10 +41,19 @@ install-data-local: |
| 74 |
+ @for i in $(notdir $(BUILD_MANS)); do \ |
| 75 |
NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \ |
| 76 |
- install -m 644 "man1/$$NAME.1" $(DESTDIR)$(mandir)/man1/; \ |
| 77 |
- done |
| 78 |
+- install -m 644 "man1/$$NAME.1" $(DESTDIR)$(mandir)/man1/; \ |
| 79 |
++ install -m 644 "man1/$$NAME" $(DESTDIR)$(mandir)/man1/; \ |
| 80 |
++ done |
| 81 |
+ install -d -m 755 $(DESTDIR)$(mandir)/html/ |
| 82 |
+ @for i in $(notdir $(BUILD_HTML)); do \ |
| 83 |
+ NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \ |
| 84 |
-+ install -m 644 "html/$$NAME.html" $(DESTDIR)$(mandir)/html/; \ |
| 85 |
-+ done |
| 86 |
++ install -m 644 "html/$$NAME" $(DESTDIR)$(mandir)/html/; \ |
| 87 |
+ done |
| 88 |
|
| 89 |
uninstall-local: |
| 90 |
@for i in $(notdir $(BUILD_MANS)); do \ |
| 91 |
NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \ |
| 92 |
- rm -f "$(DESTDIR)$(mandir)/man1/$$NAME.1"; \ |
| 93 |
- done |
| 94 |
+- rm -f "$(DESTDIR)$(mandir)/man1/$$NAME.1"; \ |
| 95 |
++ rm -f "$(DESTDIR)$(mandir)/man1/$$NAME"; \ |
| 96 |
++ done |
| 97 |
+ @for i in $(notdir $(BUILD_HTML)); do \ |
| 98 |
+ NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \ |
| 99 |
-+ rm -f "$(DESTDIR)$(mandir)/html/$$NAME.html"; \ |
| 100 |
-+ done |
| 101 |
++ rm -f "$(DESTDIR)$(mandir)/html/$$NAME"; \ |
| 102 |
+ done |
| 103 |
endif |
| 104 |
|
| 105 |
diff --git a/x11-wm/fvwm3/fvwm3-1.0.4.ebuild b/x11-wm/fvwm3/fvwm3-1.0.4.ebuild |
| 106 |
index cbafa1cafe1d..b8246aa3ce60 100644 |
| 107 |
--- a/x11-wm/fvwm3/fvwm3-1.0.4.ebuild |
| 108 |
+++ b/x11-wm/fvwm3/fvwm3-1.0.4.ebuild |
| 109 |
@@ -19,8 +19,6 @@ else |
| 110 |
KEYWORDS="~amd64" |
| 111 |
fi |
| 112 |
|
| 113 |
-SRC_URI+=" https://gitlab.com/Matt.Jolly/fvwm3-go-deps/-/raw/${PV}/${P}-deps.tar.xz?inline=false -> ${P}-deps.tar.xz" |
| 114 |
- |
| 115 |
LICENSE="GPL-2+ FVWM |
| 116 |
go? ( |
| 117 |
Apache-2.0 |
| 118 |
@@ -30,7 +28,7 @@ LICENSE="GPL-2+ FVWM |
| 119 |
|
| 120 |
SLOT="0" |
| 121 |
|
| 122 |
-IUSE="bidi debug doc go netpbm nls perl png readline rplay stroke svg tk truetype vanilla lock" |
| 123 |
+IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock" |
| 124 |
REQUIRED_USE=" |
| 125 |
${PYTHON_REQUIRED_USE}" |
| 126 |
|
| 127 |
@@ -51,9 +49,11 @@ BDEPEND=" |
| 128 |
RDEPEND="${PYTHON_DEPS} |
| 129 |
${COMMON_DEPEND} |
| 130 |
!x11-wm/fvwm |
| 131 |
+ dev-lang/perl |
| 132 |
dev-libs/glib:2 |
| 133 |
dev-libs/libevent:= |
| 134 |
- dev-lang/perl |
| 135 |
+ media-libs/fontconfig |
| 136 |
+ media-libs/libpng:= |
| 137 |
sys-libs/zlib |
| 138 |
x11-libs/libICE |
| 139 |
x11-libs/libSM |
| 140 |
@@ -64,6 +64,7 @@ RDEPEND="${PYTHON_DEPS} |
| 141 |
x11-libs/libXdmcp |
| 142 |
x11-libs/libXext |
| 143 |
x11-libs/libXfixes |
| 144 |
+ x11-libs/libXft |
| 145 |
x11-libs/libXpm |
| 146 |
x11-libs/libXrandr |
| 147 |
x11-libs/libXrender |
| 148 |
@@ -76,7 +77,6 @@ RDEPEND="${PYTHON_DEPS} |
| 149 |
>=dev-perl/X11-Protocol-0.56 |
| 150 |
) |
| 151 |
) |
| 152 |
- png? ( media-libs/libpng:= ) |
| 153 |
readline? ( |
| 154 |
sys-libs/ncurses:= |
| 155 |
sys-libs/readline:= |
| 156 |
@@ -87,10 +87,6 @@ RDEPEND="${PYTHON_DEPS} |
| 157 |
gnome-base/librsvg:2 |
| 158 |
x11-libs/cairo |
| 159 |
) |
| 160 |
- truetype? ( |
| 161 |
- media-libs/fontconfig |
| 162 |
- x11-libs/libXft |
| 163 |
- ) |
| 164 |
userland_GNU? ( sys-apps/debianutils )" |
| 165 |
|
| 166 |
DEPEND="${COMMON_DEPEND} |
| 167 |
@@ -106,26 +102,12 @@ if [[ ${PV} == 9999 ]]; then |
| 168 |
) |
| 169 |
fi |
| 170 |
|
| 171 |
-src_unpack() { |
| 172 |
- if [[ ${PV} == 9999 ]]; then |
| 173 |
- einfo "The branch ${EGIT_BRANCH} will be installed." |
| 174 |
- git-r3_src_unpack |
| 175 |
- else |
| 176 |
- unpack "${P}".tar.gz |
| 177 |
- fi |
| 178 |
- unpack "${P}"-deps.tar.xz |
| 179 |
- mv go-mod ${P}/bin/FvwmPrompt/ || die |
| 180 |
-} |
| 181 |
- |
| 182 |
src_prepare() { |
| 183 |
default |
| 184 |
if use doc; then |
| 185 |
eapply "${FILESDIR}/${P}-htmldoc.patch" |
| 186 |
fi |
| 187 |
|
| 188 |
- sed -i '/^@FVWM_BUILD_GOLANG_TRUE@GOBUILD = $(GOCMD) build/s/$/ -mod=mod/' \ |
| 189 |
- bin/FvwmPrompt/Makefile.in || die "Updating go build paramaters failed." |
| 190 |
- |
| 191 |
eautoreconf |
| 192 |
} |
| 193 |
|
| 194 |
@@ -151,10 +133,10 @@ src_configure() { |
| 195 |
$(use_enable nls) |
| 196 |
$(use_enable nls iconv) |
| 197 |
$(use_enable perl perllib) |
| 198 |
- $(use_enable png) |
| 199 |
$(use_with readline readline-library) |
| 200 |
$(use_enable svg rsvg) |
| 201 |
- $(use_enable truetype xft) |
| 202 |
+ --enable-png |
| 203 |
+ --enable-xft |
| 204 |
--docdir=/usr/share/doc/${P} |
| 205 |
) |
| 206 |
|
| 207 |
|
| 208 |
diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild |
| 209 |
index cbafa1cafe1d..368e25548404 100644 |
| 210 |
--- a/x11-wm/fvwm3/fvwm3-9999.ebuild |
| 211 |
+++ b/x11-wm/fvwm3/fvwm3-9999.ebuild |
| 212 |
@@ -19,8 +19,6 @@ else |
| 213 |
KEYWORDS="~amd64" |
| 214 |
fi |
| 215 |
|
| 216 |
-SRC_URI+=" https://gitlab.com/Matt.Jolly/fvwm3-go-deps/-/raw/${PV}/${P}-deps.tar.xz?inline=false -> ${P}-deps.tar.xz" |
| 217 |
- |
| 218 |
LICENSE="GPL-2+ FVWM |
| 219 |
go? ( |
| 220 |
Apache-2.0 |
| 221 |
@@ -30,7 +28,7 @@ LICENSE="GPL-2+ FVWM |
| 222 |
|
| 223 |
SLOT="0" |
| 224 |
|
| 225 |
-IUSE="bidi debug doc go netpbm nls perl png readline rplay stroke svg tk truetype vanilla lock" |
| 226 |
+IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock" |
| 227 |
REQUIRED_USE=" |
| 228 |
${PYTHON_REQUIRED_USE}" |
| 229 |
|
| 230 |
@@ -51,9 +49,11 @@ BDEPEND=" |
| 231 |
RDEPEND="${PYTHON_DEPS} |
| 232 |
${COMMON_DEPEND} |
| 233 |
!x11-wm/fvwm |
| 234 |
+ dev-lang/perl |
| 235 |
dev-libs/glib:2 |
| 236 |
dev-libs/libevent:= |
| 237 |
- dev-lang/perl |
| 238 |
+ media-libs/fontconfig |
| 239 |
+ media-libs/libpng:= |
| 240 |
sys-libs/zlib |
| 241 |
x11-libs/libICE |
| 242 |
x11-libs/libSM |
| 243 |
@@ -64,6 +64,7 @@ RDEPEND="${PYTHON_DEPS} |
| 244 |
x11-libs/libXdmcp |
| 245 |
x11-libs/libXext |
| 246 |
x11-libs/libXfixes |
| 247 |
+ x11-libs/libXft |
| 248 |
x11-libs/libXpm |
| 249 |
x11-libs/libXrandr |
| 250 |
x11-libs/libXrender |
| 251 |
@@ -76,7 +77,7 @@ RDEPEND="${PYTHON_DEPS} |
| 252 |
>=dev-perl/X11-Protocol-0.56 |
| 253 |
) |
| 254 |
) |
| 255 |
- png? ( media-libs/libpng:= ) |
| 256 |
+ media-libs/libpng:= |
| 257 |
readline? ( |
| 258 |
sys-libs/ncurses:= |
| 259 |
sys-libs/readline:= |
| 260 |
@@ -87,10 +88,6 @@ RDEPEND="${PYTHON_DEPS} |
| 261 |
gnome-base/librsvg:2 |
| 262 |
x11-libs/cairo |
| 263 |
) |
| 264 |
- truetype? ( |
| 265 |
- media-libs/fontconfig |
| 266 |
- x11-libs/libXft |
| 267 |
- ) |
| 268 |
userland_GNU? ( sys-apps/debianutils )" |
| 269 |
|
| 270 |
DEPEND="${COMMON_DEPEND} |
| 271 |
@@ -106,26 +103,12 @@ if [[ ${PV} == 9999 ]]; then |
| 272 |
) |
| 273 |
fi |
| 274 |
|
| 275 |
-src_unpack() { |
| 276 |
- if [[ ${PV} == 9999 ]]; then |
| 277 |
- einfo "The branch ${EGIT_BRANCH} will be installed." |
| 278 |
- git-r3_src_unpack |
| 279 |
- else |
| 280 |
- unpack "${P}".tar.gz |
| 281 |
- fi |
| 282 |
- unpack "${P}"-deps.tar.xz |
| 283 |
- mv go-mod ${P}/bin/FvwmPrompt/ || die |
| 284 |
-} |
| 285 |
- |
| 286 |
src_prepare() { |
| 287 |
default |
| 288 |
if use doc; then |
| 289 |
eapply "${FILESDIR}/${P}-htmldoc.patch" |
| 290 |
fi |
| 291 |
|
| 292 |
- sed -i '/^@FVWM_BUILD_GOLANG_TRUE@GOBUILD = $(GOCMD) build/s/$/ -mod=mod/' \ |
| 293 |
- bin/FvwmPrompt/Makefile.in || die "Updating go build paramaters failed." |
| 294 |
- |
| 295 |
eautoreconf |
| 296 |
} |
| 297 |
|
| 298 |
@@ -151,10 +134,9 @@ src_configure() { |
| 299 |
$(use_enable nls) |
| 300 |
$(use_enable nls iconv) |
| 301 |
$(use_enable perl perllib) |
| 302 |
- $(use_enable png) |
| 303 |
$(use_with readline readline-library) |
| 304 |
$(use_enable svg rsvg) |
| 305 |
- $(use_enable truetype xft) |
| 306 |
+ --enable-png |
| 307 |
--docdir=/usr/share/doc/${P} |
| 308 |
) |
Archives