* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/, dev-libs/libg15render/files/
@ 2018-05-04 10:57 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2018-05-04 10:57 UTC (permalink / raw
To: gentoo-commits
commit: d4fe989f5fef08990bb2ae6535b33563597c4f58
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 4 10:54:18 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 4 10:57:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4fe989f
dev-libs/libg15render: Don't use freetype-config
Package-Manager: Portage-2.3.35, Repoman-2.3.9
.../libg15render-1.2-freetype_pkgconfig.patch | 35 ++++++++++++++++++++++
.../files/libg15render-1.2-pixel-c.patch | 24 ++++++++-------
dev-libs/libg15render/libg15render-1.2-r2.ebuild | 30 ++++++++++++-------
3 files changed, 69 insertions(+), 20 deletions(-)
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 00000000000..83df9fa4f0f
--- /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 3f7ecc2ff7b..9b1ab60860b 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 <fcntl.h>
++#include <stdlib.h>
+#include <math.h>
#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 61782d60444..816da20255e 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
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/, dev-libs/libg15render/files/
@ 2020-02-10 0:18 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2020-02-10 0:18 UTC (permalink / raw
To: gentoo-commits
commit: 1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 00:17:58 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 00:17:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1668cfaa
dev-libs/libg15render: Port to EAPI 7
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../libg15render-1.2-freetype_pkgconfig.patch | 22 ++++++++++++++--
dev-libs/libg15render/libg15render-1.2-r2.ebuild | 30 ++++++++++------------
2 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
index 83df9fa4f0f..313d2ef5b6e 100644
--- a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
+++ b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
@@ -1,5 +1,5 @@
---- libg15render-1.2/configure.in
-+++ libg15render-1.2/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -13,19 +13,20 @@
AC_PROG_LIBTOOL
@@ -33,3 +33,21 @@
# Checks for libraries.
AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"]))
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,3 @@
+-LLIBDIR=@LIBDIR@
+-AM_CFLAGS=@CFLAGS@
+ lib_LTLIBRARIES = libg15render.la
+ libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c font_6x4.c font_7x5.c font_8x8.c
+ libg15render_la_LIBADD = @FTLIB@
+@@ -7,8 +5,7 @@
+ include_HEADERS= libg15render.h
+ EXTRA_DIST = debian Doxyfile libg15render.3
+ man3_MANS = $(top_srcdir)/libg15render.3
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+-doc_DATA = AUTHORS ChangeLog COPYING NEWS README
++doc_DATA = AUTHORS ChangeLog NEWS README
+
+ dist-hook:
+ rm -rf `find $(distdir)/debian -name .svn`
diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
index 816da20255e..1082ceb99bf 100644
--- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild
+++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -12,19 +12,18 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
-
IUSE="truetype"
RDEPEND="
dev-libs/libg15
- truetype? ( media-libs/freetype )
-"
-DEPEND="${RDEPEND}
+ truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
truetype? ( virtual/pkgconfig )"
PATCHES=(
- "${FILESDIR}/${P}-pixel-c.patch"
- "${FILESDIR}/${P}-freetype_pkgconfig.patch"
+ "${FILESDIR}"/${P}-pixel-c.patch
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch
)
src_prepare() {
@@ -34,17 +33,14 @@ src_prepare() {
}
src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable truetype ttf )
- )
- econf "${myeconfargs[@]}"
+ econf \
+ --disable-static \
+ $(use_enable truetype ttf)
}
src_install() {
- emake DESTDIR="${D}" \
- docdir=/usr/share/doc/${PF} install
- rm "${ED%/}/usr/share/doc/${PF}/COPYING"
+ default
- find "${ED}" -name '*.la' -delete || die
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/, dev-libs/libg15render/files/
@ 2022-05-14 22:56 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2022-05-14 22:56 UTC (permalink / raw
To: gentoo-commits
commit: 5b6cd28e128a57460f3f4be252dafdfeb7d0df48
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 16:24:46 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat May 14 22:56:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6cd28e
dev-libs/libg15render: Added live ebuild
- new upstream
- Fixed docdir installation
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/libg15render-3.0.4-docdir.patch | 25 +++++++++++
dev-libs/libg15render/libg15render-9999.ebuild | 51 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch b/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch
new file mode 100644
index 000000000000..781c9b6bfcaf
--- /dev/null
+++ b/dev-libs/libg15render/files/libg15render-3.0.4-docdir.patch
@@ -0,0 +1,25 @@
+From 2900f3f8a90915f59a25c8b3fb27912492e7b044 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sat, 14 May 2022 18:20:24 +0200
+Subject: [PATCH] Makefile.am: Make docdir selectable
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2fdacd7..cf00f1c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,7 @@ libg15render_la_LDFLAGS = -version-info 3:0
+ include_HEADERS= libg15render.h
+ EXTRA_DIST = debian libg15render.3
+ man3_MANS = $(top_srcdir)/libg15render.3
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ doc_DATA = AUTHORS ChangeLog COPYING NEWS README
+ ACLOCAL_AMFLAGS = -I m4
+
+--
+2.36.1
+
diff --git a/dev-libs/libg15render/libg15render-9999.ebuild b/dev-libs/libg15render/libg15render-9999.ebuild
new file mode 100644
index 000000000000..35bbac68dd31
--- /dev/null
+++ b/dev-libs/libg15render/libg15render-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
+HOMEPAGE="https://sourceforge.net/projects/g15tools/"
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git"
+else
+ SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="truetype"
+
+RDEPEND="
+ >=dev-libs/libg15-3.0
+ truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ truetype? ( virtual/pkgconfig )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.4-docdir.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ $(use_enable truetype ttf)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # no static archives
+ find "${ED}" -type f -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/, dev-libs/libg15render/files/
@ 2022-05-14 22:56 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2022-05-14 22:56 UTC (permalink / raw
To: gentoo-commits
commit: ebcc30947ab80351efc2cbf66ec8446af405e3fb
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 16:29:49 2022 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat May 14 22:56:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebcc3094
dev-libs/libg15render: Bump to version 3.0.4
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
dev-libs/libg15render/Manifest | 1 +
.../libg15render-3.0.4-freetype_pkgconfig.patch | 59 ++++++++++++++++++++++
dev-libs/libg15render/libg15render-3.0.4.ebuild | 52 +++++++++++++++++++
3 files changed, 112 insertions(+)
diff --git a/dev-libs/libg15render/Manifest b/dev-libs/libg15render/Manifest
index b7b87acab99a..02428fd9f084 100644
--- a/dev-libs/libg15render/Manifest
+++ b/dev-libs/libg15render/Manifest
@@ -1 +1,2 @@
DIST libg15render-1.2.tar.bz2 246034 BLAKE2B 70c21341949186dc65bec7ef0f695c783928ab024e5bd3f83eedc527a501bee64cf0561f5e642e3e9173f063b6f74ecca458262ee9c40a2a8837f197338bbb31 SHA512 960fd6bc6159b1b12e1de3b0c07e5960d7d5056d4927be8eddf89a911e2c97a8677ef41456aa255399e8a86cd354b848fab28a47005ee2d1b6640e0c886deaac
+DIST libg15render-3.0.4.tar.bz2 293668 BLAKE2B 82fece311baf59098d6196b5aa31d6584bf3f610854839e3dcf2318f3e3275ae9394ea2b21576d6e6cc4fffb2440d19b7322704087988de8c47e60d822949758 SHA512 f11470b4c8709b7cab8747d8eca4d55ddf88f6dd0a46f11de78612d6070c8b5ea7188ec1ea0236edbb0e5904e6dffd7c75831d5e00564b3cebf8b9dc58b0100e
diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch
new file mode 100644
index 000000000000..54a8fd4c07d3
--- /dev/null
+++ b/dev-libs/libg15render/files/libg15render-3.0.4-freetype_pkgconfig.patch
@@ -0,0 +1,59 @@
+diff --git a/configure.ac b/configure.ac
+index 97338f3..a64f64c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,19 +13,41 @@ AC_PROG_CC
+ LT_INIT
+
+ # 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_MSG_RESULT($ttf_support)
++AC_ARG_ENABLE(ttf, [ --enable-ttf enable FreeType2 support],,[enable_ttf=no])
++AS_IF([test "x$enable_ttf" != "xno"], [
++ m4_ifdef([PKG_PROG_PKG_CONFIG], [
++ 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"
++ ], [
++ AS_IF([test "x$enable_ttf" = "xyes"], [
++ AC_MSG_ERROR([Cannot find freetype2])
++ ])
++ ])
++ ], [
++ AC_MSG_CHECKING(whether to enable FreeType2 support)
++ AC_PATH_PROG([FTCONFIG], [freetype-config])
++ AS_IF([test -n "$FTCONFIG" ], [
++ CFLAGS="$CFLAGS `$FTCONFIG --cflags`"
++ FTLIB="-lfreetype"
++ AC_DEFINE(TTF_SUPPORT, [1])
++ AC_MSG_RESULT([yes])
++ ], [
++ AS_IF([test "x$enable_ttf" = "xyes"], [
++ AC_MSG_ERROR([Cannot find freetype-config])
++ ], [
++ AC_DEFINE(TTF_SUPPORT, [0])
++ ])
++ ])
++ AC_MSG_RESULT([no])
++ ]
++ )
++], [
++ AC_MSG_RESULT(No Freetype is being used)
++])
+
+ # Checks for libraries.
+ AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"]))
diff --git a/dev-libs/libg15render/libg15render-3.0.4.ebuild b/dev-libs/libg15render/libg15render-3.0.4.ebuild
new file mode 100644
index 000000000000..4fd1e505fdfa
--- /dev/null
+++ b/dev-libs/libg15render/libg15render-3.0.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
+HOMEPAGE="https://sourceforge.net/projects/g15tools/"
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git"
+else
+ SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="truetype"
+
+RDEPEND="
+ >=dev-libs/libg15-3.0
+ truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ truetype? ( virtual/pkgconfig )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-freetype_pkgconfig.patch"
+ "${FILESDIR}/${PN}-3.0.4-docdir.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ $(use_enable truetype ttf)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # no static archives
+ find "${ED}" -type f -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/, dev-libs/libg15render/files/
@ 2024-05-06 6:10 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-05-06 6:10 UTC (permalink / raw
To: gentoo-commits
commit: 689e472bea793c0d9cef4f6c9a3394562a0ef4d7
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Sat Apr 27 07:10:30 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 6 06:08:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689e472b
dev-libs/libg15render: C99: Add missing include
Closes: https://bugs.gentoo.org/870820
Closes: https://bugs.gentoo.org/919188
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/36450
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libg15render-3.0.4-missing-include.patch | 10 ++++
dev-libs/libg15render/libg15render-3.0.4-r1.ebuild | 53 ++++++++++++++++++++++
dev-libs/libg15render/metadata.xml | 1 +
3 files changed, 64 insertions(+)
diff --git a/dev-libs/libg15render/files/libg15render-3.0.4-missing-include.patch b/dev-libs/libg15render/files/libg15render-3.0.4-missing-include.patch
new file mode 100644
index 000000000000..ebe043cfc772
--- /dev/null
+++ b/dev-libs/libg15render/files/libg15render-3.0.4-missing-include.patch
@@ -0,0 +1,10 @@
+--- libg15render-3.0.4.orig/pixel.c 2024-04-27 07:06:42.696360311 +0000
++++ libg15render-3.0.4/pixel.c 2024-04-27 07:07:19.349161271 +0000
+@@ -19,6 +19,7 @@
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <math.h>
++#include <unistd.h>
+ #include "libg15render.h"
+
+ void swap (int *x, int *y){
diff --git a/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild b/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild
new file mode 100644
index 000000000000..bdf4d4d973fc
--- /dev/null
+++ b/dev-libs/libg15render/libg15render-3.0.4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
+HOMEPAGE="https://gitlab.com/menelkir/libg15render"
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git"
+else
+ SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="truetype"
+
+RDEPEND="
+ >=dev-libs/libg15-3.0
+ truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ truetype? ( virtual/pkgconfig )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-freetype_pkgconfig.patch"
+ "${FILESDIR}/${PN}-3.0.4-docdir.patch"
+ "${FILESDIR}/${P}-missing-include.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ $(use_enable truetype ttf)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # no static archives
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libg15render/metadata.xml b/dev-libs/libg15render/metadata.xml
index 947c62c9e342..10e3efad11d7 100644
--- a/dev-libs/libg15render/metadata.xml
+++ b/dev-libs/libg15render/metadata.xml
@@ -6,5 +6,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">g15tools</remote-id>
+ <remote-id type="gitlab">menelkir/libg15render</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/, dev-libs/libg15render/files/
@ 2024-10-07 6:23 Petr Vaněk
0 siblings, 0 replies; 6+ messages in thread
From: Petr Vaněk @ 2024-10-07 6:23 UTC (permalink / raw
To: gentoo-commits
commit: 316da3b374dacc55ae7e72642f2fe250cc45dfd2
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 6 15:07:38 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 06:22:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=316da3b3
dev-libs/libg15render: drop 1.2-r2, 3.0.4
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
dev-libs/libg15render/Manifest | 1 -
.../libg15render-1.2-freetype_pkgconfig.patch | 53 ----------------------
.../files/libg15render-1.2-pixel-c.patch | 23 ----------
dev-libs/libg15render/libg15render-1.2-r2.ebuild | 48 --------------------
dev-libs/libg15render/libg15render-3.0.4.ebuild | 52 ---------------------
5 files changed, 177 deletions(-)
diff --git a/dev-libs/libg15render/Manifest b/dev-libs/libg15render/Manifest
index 02428fd9f084..08d6b06b386c 100644
--- a/dev-libs/libg15render/Manifest
+++ b/dev-libs/libg15render/Manifest
@@ -1,2 +1 @@
-DIST libg15render-1.2.tar.bz2 246034 BLAKE2B 70c21341949186dc65bec7ef0f695c783928ab024e5bd3f83eedc527a501bee64cf0561f5e642e3e9173f063b6f74ecca458262ee9c40a2a8837f197338bbb31 SHA512 960fd6bc6159b1b12e1de3b0c07e5960d7d5056d4927be8eddf89a911e2c97a8677ef41456aa255399e8a86cd354b848fab28a47005ee2d1b6640e0c886deaac
DIST libg15render-3.0.4.tar.bz2 293668 BLAKE2B 82fece311baf59098d6196b5aa31d6584bf3f610854839e3dcf2318f3e3275ae9394ea2b21576d6e6cc4fffb2440d19b7322704087988de8c47e60d822949758 SHA512 f11470b4c8709b7cab8747d8eca4d55ddf88f6dd0a46f11de78612d6070c8b5ea7188ec1ea0236edbb0e5904e6dffd7c75831d5e00564b3cebf8b9dc58b0100e
diff --git a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
deleted file mode 100644
index 313d2ef5b6e2..000000000000
--- a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/configure.in
-+++ b/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"]))
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,3 @@
--LLIBDIR=@LIBDIR@
--AM_CFLAGS=@CFLAGS@
- lib_LTLIBRARIES = libg15render.la
- libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c font_6x4.c font_7x5.c font_8x8.c
- libg15render_la_LIBADD = @FTLIB@
-@@ -7,8 +5,7 @@
- include_HEADERS= libg15render.h
- EXTRA_DIST = debian Doxyfile libg15render.3
- man3_MANS = $(top_srcdir)/libg15render.3
--docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
--doc_DATA = AUTHORS ChangeLog COPYING NEWS README
-+doc_DATA = AUTHORS ChangeLog NEWS README
-
- dist-hook:
- rm -rf `find $(distdir)/debian -name .svn`
diff --git a/dev-libs/libg15render/files/libg15render-1.2-pixel-c.patch b/dev-libs/libg15render/files/libg15render-1.2-pixel-c.patch
deleted file mode 100644
index 9b1ab60860b8..000000000000
--- a/dev-libs/libg15render/files/libg15render-1.2-pixel-c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- * 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
-
- * 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 <fcntl.h>
-+#include <stdlib.h>
-+#include <math.h>
- #include "libg15render.h"
-
- void
diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild
deleted file mode 100644
index 4ee417b73703..000000000000
--- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
-HOMEPAGE="https://sourceforge.net/projects/g15tools/"
-SRC_URI="https://downloads.sourceforge.net/g15tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="truetype"
-
-RDEPEND="
- dev-libs/libg15
- truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- truetype? ( virtual/pkgconfig )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-pixel-c.patch
- "${FILESDIR}"/${P}-freetype_pkgconfig.patch
-)
-
-src_prepare() {
- default
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable truetype ttf)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libg15render/libg15render-3.0.4.ebuild b/dev-libs/libg15render/libg15render-3.0.4.ebuild
deleted file mode 100644
index 5ac51ead28ff..000000000000
--- a/dev-libs/libg15render/libg15render-3.0.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard"
-HOMEPAGE="https://gitlab.com/menelkir/libg15render"
-if [[ ${PV} == *9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/menelkir/libg15render.git"
-else
- SRC_URI="https://gitlab.com/menelkir/${PN}/-/archive/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="truetype"
-
-RDEPEND="
- >=dev-libs/libg15-3.0
- truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- truetype? ( virtual/pkgconfig )"
-
-PATCHES=(
- "${FILESDIR}/${P}-freetype_pkgconfig.patch"
- "${FILESDIR}/${PN}-3.0.4-docdir.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_enable truetype ttf)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -type f -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-10-07 6:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-06 6:10 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/, dev-libs/libg15render/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-10-07 6:23 Petr Vaněk
2022-05-14 22:56 Lars Wendler
2022-05-14 22:56 Lars Wendler
2020-02-10 0:18 David Seifert
2018-05-04 10:57 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox