diff options
Diffstat (limited to 'x11-apps/mkfontscale')
| -rw-r--r-- | x11-apps/mkfontscale/Manifest | 2 | ||||
| -rw-r--r-- | x11-apps/mkfontscale/files/mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch | 51 | ||||
| -rw-r--r-- | x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild (renamed from x11-apps/mkfontscale/mkfontscale-1.2.0-r1.ebuild) | 5 |
3 files changed, 1 insertions, 57 deletions
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest index 0709e5eac890..233f43d62578 100644 --- a/x11-apps/mkfontscale/Manifest +++ b/x11-apps/mkfontscale/Manifest @@ -1,2 +1,2 @@ DIST mkfontscale-1.1.3.tar.bz2 144386 BLAKE2B 8cf4a61472b9357888ef355e89c3087102c4928884ecc6b5671202ad09284a2dc188b81faba6b1727b1a28ccaa6c3c36649c53659faf7a3fae4a2b32ab5a2420 SHA512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62 -DIST mkfontscale-1.2.0.tar.bz2 150646 BLAKE2B 7f4a0b279f0759b2d8faac584603488c9e405b92b43457b301aa6ba252bdef2cbfe65f58a1fb837e61113cfea139b6fcde1084450333864175e2cc4da84b6626 SHA512 3d02db7e031fe6730a07ed481d2a744592a7d542d75fedf55a4f5ad50d03d92e3534b4105af09d0a8f863bdc0321758222baf5b943de77ce4972978d86a5013f +DIST mkfontscale-1.2.1.tar.bz2 150808 BLAKE2B 0c2cce3a5b400f8c757a9e1f7a0c8ea85f41c7d229cc1197c68340ec9f2b0b36872a914bf04dabb584727405092b4bf9abbc465190ac1b91419d9ecb3d359b83 SHA512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c diff --git a/x11-apps/mkfontscale/files/mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch b/x11-apps/mkfontscale/files/mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch deleted file mode 100644 index fdeea14e31dc..000000000000 --- a/x11-apps/mkfontscale/files/mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 29cab25240cf30f546671f265167a2eeadfd4c75 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Thu, 7 Mar 2019 13:23:00 -0800 -Subject: [PATCH app/mkfontscale] Revert "Use autoconf instead of sed to - substitute @bindir@ in mkfontdir.in" - -This reverts commit 1f9d14bec07092d62da29a5a233cefbf84d47289. -It caused https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues/5 ---- - Makefile.am | 9 ++++++++- - configure.ac | 1 - - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 7bb11ea..c36d171 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -23,6 +23,13 @@ SUBDIRS = man - bin_PROGRAMS = mkfontscale - bin_SCRIPTS = mkfontdir - -+CLEANFILES = $(bin_SCRIPTS) -+EXTRA_DIST = $(bin_SCRIPTS:=.in) -+DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g' -+ -+mkfontdir: mkfontdir.in -+ $(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@ -+ - AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE - AM_CFLAGS = $(CWARNFLAGS) - mkfontscale_LDADD = @MKFONTSCALE_LIBS@ -@@ -59,4 +66,4 @@ lint: - $(LINT) $(ALL_LINT_FLAGS) $(mkfontscale_SOURCES) - endif LINT - --EXTRA_DIST = README.md -+EXTRA_DIST += README.md -diff --git a/configure.ac b/configure.ac -index 5f5e463..7363bba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,6 +63,5 @@ XORG_WITH_LINT - - AC_CONFIG_FILES([ - Makefile -- mkfontdir - man/Makefile]) - AC_OUTPUT --- -2.19.2 - diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.0-r1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild index 2a83d1cb6f7e..60b075e59724 100644 --- a/x11-apps/mkfontscale/mkfontscale-1.2.0-r1.ebuild +++ b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild @@ -3,7 +3,6 @@ EAPI=7 -XORG_EAUTORECONF="yes" inherit xorg-3 DESCRIPTION="create an index of scalable font files for X" @@ -21,10 +20,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !<x11-apps/mkfontdir-1.2.0" -PATCHES=( - "${FILESDIR}"/${P}-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch -) - XORG_CONFIGURE_OPTIONS=( --with-bzip2 ) |