From ebce8994fe3cc4ca9fbc96ca837cb4c4e98adcbd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 6 May 2018 11:18:16 +0100 Subject: gentoo resync : 06.05.2018 --- dev-libs/libg15render/Manifest | 5 ++-- .../libg15render-1.2-freetype_pkgconfig.patch | 35 ++++++++++++++++++++++ .../files/libg15render-1.2-pixel-c.patch | 24 ++++++++------- dev-libs/libg15render/libg15render-1.2-r2.ebuild | 30 ++++++++++++------- 4 files changed, 72 insertions(+), 22 deletions(-) create mode 100644 dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch (limited to 'dev-libs/libg15render') diff --git a/dev-libs/libg15render/Manifest b/dev-libs/libg15render/Manifest index c3e66c8c63d8..eb75f4bb028f 100644 --- a/dev-libs/libg15render/Manifest +++ b/dev-libs/libg15render/Manifest @@ -1,5 +1,6 @@ -AUX libg15render-1.2-pixel-c.patch 527 BLAKE2B a345fc90a983de5fb1a728289196114c9085fb5beaf4e3812c2f27dcf836b4900dd6697e7296066ad7a313b127a510acb530e1a2e5135c2871945d45e5e98c2b SHA512 a6f3f2a0a6f5e33f6a201688afffbc7c18d3b591d1abba1e95c425bf53f9d53416c0e24fe2726ff752c3656ba76c3d3326d2d2b7f0549a8ff626798008048b3e +AUX libg15render-1.2-freetype_pkgconfig.patch 1091 BLAKE2B 2913ad950880964b82d2b4dfa59a8351ab37abe65616da8069adebd1315a9ee893566b29af50315111d8bb28705c6e64520fe3404a13ad01b43b297841dfbb25 SHA512 3e5313232eb5fc84e039d8d0ea524d3c6e3d238fea7f29f52754ed1b4bb886ec0b7ada57570018da99ae238bd28c7e1fc36c8f6b88227af2df7991afdabacae5 +AUX libg15render-1.2-pixel-c.patch 686 BLAKE2B a6273daa806090247eab17e2f03f3baa3fbcd7ffe4ee502611a4ecb39134dea809a46d77243c61e949f732b9f7fabd7a7002cc0434dad7e7986da1f25dc2962d SHA512 f1d40893c1f2f17d42c9ca6941d802e0c22a5eb85d9f8167612f7bf21045c096744634ea38928ecfc30c39a6085e6b8652168e711534edf82e3d8f5243c072a4 DIST libg15render-1.2.tar.bz2 246034 BLAKE2B 70c21341949186dc65bec7ef0f695c783928ab024e5bd3f83eedc527a501bee64cf0561f5e642e3e9173f063b6f74ecca458262ee9c40a2a8837f197338bbb31 SHA512 960fd6bc6159b1b12e1de3b0c07e5960d7d5056d4927be8eddf89a911e2c97a8677ef41456aa255399e8a86cd354b848fab28a47005ee2d1b6640e0c886deaac -EBUILD libg15render-1.2-r2.ebuild 817 BLAKE2B 6ed3395c5ad2d297a5e56470619cff1411615111b5203f2f8bfc8e0bf89ba73507dd12d32c662bd7d99d7d3e12dbd73facf1fa0dcfd4b8730d77f19d5c578d4b SHA512 6169182c9c93e4d289bbf69ccc2be59f64bfe07f823b6e2238e470ae22932f7edf2efd0389ad37550edbffa0bb23f8350eedf9322474ede167f91e86ba48d233 +EBUILD libg15render-1.2-r2.ebuild 968 BLAKE2B ce22275e91cf2cc19e5b43d8f040e324dd2b83179919379a49cc7bad0a53c9200c0b07c1b2fc6e17450b76f8d9097b17f64036ed365b5fcfdd92cf82c1564269 SHA512 7c712b31f4de39af50ddd02ec4cf3975016e167053e3df521aabd6c175c1ee67be02d21e3153adc0c4f0162366816e5a86952d61fba4c6c04e8e6972859e3dea EBUILD libg15render-9999.ebuild 1168 BLAKE2B d194698228a89c3e8117cb87da0cdef47a3e68ad0da1a9938b213d06ad24b0845c8b3b6e0f21fe6dccbf3edbf6039c815b1d8f3a145a85498bf0ff354b0ec74d SHA512 bab94ac83adfbd395a9fc5ceadaa3f961377987ca5e2685abf8c2582cc43a63810ac774538ff6e8a4cc221d561bca015a571e0efdde53435f66ded723154a782 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d diff --git a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch new file mode 100644 index 000000000000..83df9fa4f0fa --- /dev/null +++ b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch @@ -0,0 +1,35 @@ +--- libg15render-1.2/configure.in ++++ libg15render-1.2/configure.in +@@ -13,19 +13,20 @@ + AC_PROG_LIBTOOL + + # Checks for --enable args +-AC_MSG_CHECKING(whether to enable FreeType2 support) +-AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support], +- if [[[ "$enableval" = "yes" ]]]; then +- AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]) +- CFLAGS="$CFLAGS `freetype-config --cflags`" +- FTLIB="-lfreetype" +- ttf_support="yes" +- else +- ttf_support="no" +- fi, +- ttf_support="no" ++AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support],,enable_ttf=no) ++AS_IF([test "x$enable_ttf" = "xyes"], [ ++ PKG_PROG_PKG_CONFIG ++ PKG_CHECK_MODULES(FREETYPE, freetype2, ++ [ ++ AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]) ++ CFLAGS="$CFLAGS $FREETYPE_CFLAGS" ++ FTLIB="$FREETYPE_LIBS" ++ ], ++ AC_MSG_ERROR([Cannot find freetype2]) ++ ) ++], ++ AC_MSG_RESULT(No Freetype is being used) + ) +-AC_MSG_RESULT($ttf_support) + + # Checks for libraries. + AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"])) diff --git a/dev-libs/libg15render/files/libg15render-1.2-pixel-c.patch b/dev-libs/libg15render/files/libg15render-1.2-pixel-c.patch index 3f7ecc2ff7b2..9b1ab60860b8 100644 --- a/dev-libs/libg15render/files/libg15render-1.2-pixel-c.patch +++ b/dev-libs/libg15render/files/libg15render-1.2-pixel-c.patch @@ -1,19 +1,23 @@ -dev-libs/libg15render-1.2: - * QA Notice: Package has poor programming practices which may compile * fine but exhibit random runtime failures. * pixel.c:356: warning: incompatible implicit declaration of built-in function 'ceil' - - -Should be fixed by including math.h: - ---- libg15render-1.2_old/pixel.c 2007-03-14 23:37:42.000000000 +0100 -+++ libg15render-1.2/pixel.c 2007-03-14 23:36:29.000000000 +0100 -@@ -17,6 +17,7 @@ + +Should be fixed by including math.h + + * QA Notice: Package triggers severe warnings which indicate that it + * may exhibit random runtime failures. + * pixel.c:504:16: warning: incompatible implicit declaration of built-in function ‘malloc’ + +Should be fixed by including stdlib.h + +--- libg15render-1.2/pixel.c ++++ libg15render-1.2/pixel.c +@@ -17,6 +17,8 @@ */ #include ++#include +#include #include "libg15render.h" - void \ No newline at end of file + void diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild index 61782d60444a..816da20255ea 100644 --- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild +++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 -inherit eutils +inherit autotools DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard" HOMEPAGE="https://sourceforge.net/projects/g15tools/" @@ -19,22 +19,32 @@ RDEPEND=" dev-libs/libg15 truetype? ( media-libs/freetype ) " -DEPEND=${RDEPEND} +DEPEND="${RDEPEND} + truetype? ( virtual/pkgconfig )" + +PATCHES=( + "${FILESDIR}/${P}-pixel-c.patch" + "${FILESDIR}/${P}-freetype_pkgconfig.patch" +) src_prepare() { - epatch "${FILESDIR}/${P}-pixel-c.patch" + default + mv configure.{in,ac} || die + eautoreconf } src_configure() { - econf \ - --disable-static \ + local myeconfargs=( + --disable-static $(use_enable truetype ttf ) + ) + econf "${myeconfargs[@]}" } src_install() { emake DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} install || die "make install failed" - rm "${ED}/usr/share/doc/${PF}/COPYING" + docdir=/usr/share/doc/${PF} install + rm "${ED%/}/usr/share/doc/${PF}/COPYING" - find "${ED}" -name '*.la' -exec rm -f {} + + find "${ED}" -name '*.la' -delete || die } -- cgit v1.2.3