diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-03-19 11:37:34 +0000 |
| commit | b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch) | |
| tree | 9fd110f9fc996e8a4213eeda994a8c112491b86d /x11-apps/mkfontscale | |
| parent | 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff) | |
gentoo resync : 19.03.2019
Diffstat (limited to 'x11-apps/mkfontscale')
| -rw-r--r-- | x11-apps/mkfontscale/Manifest | 3 | ||||
| -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.0-r1.ebuild (renamed from x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild) | 9 |
3 files changed, 60 insertions, 3 deletions
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest index 45ac133a6700..782f243b9d32 100644 --- a/x11-apps/mkfontscale/Manifest +++ b/x11-apps/mkfontscale/Manifest @@ -1,5 +1,6 @@ +AUX mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch 1396 BLAKE2B d30ad031ae808179fc73b0bceee1d8c227fd8f624a677114621338ca886d5c7c554fe38f82381f3deb650b6d2061d16ca0410a797be32931e6258146e172b868 SHA512 cdf672907371ee7347c61d825270774301857f656cdad682810bada1c6d955b09da383d83a88168c2f9469b010688ad96a75fd76a091f7f92eca0dd6e435b73b DIST mkfontscale-1.1.3.tar.bz2 144386 BLAKE2B 8cf4a61472b9357888ef355e89c3087102c4928884ecc6b5671202ad09284a2dc188b81faba6b1727b1a28ccaa6c3c36649c53659faf7a3fae4a2b32ab5a2420 SHA512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62 DIST mkfontscale-1.2.0.tar.bz2 150646 BLAKE2B 7f4a0b279f0759b2d8faac584603488c9e405b92b43457b301aa6ba252bdef2cbfe65f58a1fb837e61113cfea139b6fcde1084450333864175e2cc4da84b6626 SHA512 3d02db7e031fe6730a07ed481d2a744592a7d542d75fedf55a4f5ad50d03d92e3534b4105af09d0a8f863bdc0321758222baf5b943de77ce4972978d86a5013f EBUILD mkfontscale-1.1.3.ebuild 600 BLAKE2B 1be6ee6b55382ed63fc6464fd83d3a6d90cd39c41952e0a35c2e46f3d88a41e5baed46669260bbd0084073f647ffb66ab18904dad7d1579c4f7afb035b42cb8a SHA512 222722cc686d874d3f457e6a908084fd5dfbeaff3a438f94cfc2f86b2545fec009a559fdfa68fd2ae9a86d80f13e93e980d0194cd858407f3f7ba2d49701cddd -EBUILD mkfontscale-1.2.0.ebuild 636 BLAKE2B 2ae337a35debc23962c0f1e45bdb4b1a3c45cbc45a888a6eada210b265797e8398be9eecd02288b027866771d5598dde9f09caa396083db8ace8d71089caf3c3 SHA512 7d9d8f8ea83e0c3e955bca7af4bf6e8beca982090ec16fa46a5227dc58162ed3a56adabfae97f5349a004530ebb32b1314d471ed5432ba161726ca94f377dfa0 +EBUILD mkfontscale-1.2.0-r1.ebuild 758 BLAKE2B 3da498f61aa28df9e8512c7f1e1045d3416cd1b6247cdbf8b10518dceaa60ac80ed854c93e6c2fb490ff40eaec6351b2bb36254b34dbff9676a210638763bdac SHA512 ef7d582c8e2e6d1d3285009e5c103ed6685eafc63845eda6038557efbdf8469cb2cd98c7d501d321f8c9d53efab1b04c07aed650e5888e3f9595e535d74e263a MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 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 new file mode 100644 index 000000000000..fdeea14e31dc --- /dev/null +++ b/x11-apps/mkfontscale/files/mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch @@ -0,0 +1,51 @@ +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.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.0-r1.ebuild index c0f737d6f423..2a83d1cb6f7e 100644 --- a/x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild +++ b/x11-apps/mkfontscale/mkfontscale-1.2.0-r1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +XORG_EAUTORECONF="yes" inherit xorg-3 DESCRIPTION="create an index of scalable font files for X" @@ -15,11 +16,15 @@ COMMON_DEPEND=" media-libs/freetype:2 sys-libs/zlib app-arch/bzip2" -DEPEND="x11-base/xorg-proto" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto" RDEPEND="${COMMON_DEPEND} - ${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 ) |