* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pslib/, dev-libs/pslib/files/
@ 2017-12-31 12:44 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-12-31 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 395bfd358c5499dcf401ebaa00f9073d40d49c41
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 12:23:44 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 12:44:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395bfd35
dev-libs/pslib: Port to EAPI 6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../pslib/files/pslib-0.4.5-fix-build-system.patch | 22 ++++++++++++++++++++++
dev-libs/pslib/pslib-0.4.5.ebuild | 22 ++++++++++++----------
2 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch b/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch
new file mode 100644
index 00000000000..242a819d0da
--- /dev/null
+++ b/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch
@@ -0,0 +1,22 @@
+--- a/configure.in
++++ b/configure.in
+@@ -4,7 +4,7 @@
+ AC_CONFIG_SRCDIR(src/pslib.c)
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
+
+ AC_PROG_INTLTOOL
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -36,7 +36,7 @@
+ ps_fontenc.c \
+ ps_strbuf.c
+
+-libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS)
++libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS) -lm
+
+ BUILD_LIBS = -lm
+
diff --git a/dev-libs/pslib/pslib-0.4.5.ebuild b/dev-libs/pslib/pslib-0.4.5.ebuild
index f3a704c4f43..b81fc2baa5c 100644
--- a/dev-libs/pslib/pslib-0.4.5.ebuild
+++ b/dev-libs/pslib/pslib-0.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=6
-inherit eutils autotools
+inherit autotools
DESCRIPTION="pslib is a C-library to create PostScript files on the fly"
HOMEPAGE="http://pslib.sourceforge.net/"
@@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="debug jpeg png static-libs tiff"
RDEPEND="
- png? ( >=media-libs/libpng-1.2.43-r2:0 )
- jpeg? ( virtual/jpeg )
- tiff? ( media-libs/tiff )"
+ png? ( media-libs/libpng:0= )
+ jpeg? ( virtual/jpeg:0 )
+ tiff? ( media-libs/tiff:0= )"
#gif? requires libungif, not in portage
DEPEND="${RDEPEND}
dev-lang/perl
@@ -25,10 +25,11 @@ DEPEND="${RDEPEND}
dev-util/intltool
dev-perl/XML-Parser"
+PATCHES=( "${FILESDIR}"/${PN}-0.4.5-fix-build-system.patch )
+
src_prepare() {
- # hackpatchfix underlinking
- sed -i -e 's/$(TIFF_LIBS)/$(TIFF_LIBS) -lm/' src/Makefile.am || die
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+ default
+ mv configure.{in,ac} || die
eautoreconf
}
@@ -45,5 +46,6 @@ src_configure() {
src_install() {
default
- prune_libtool_files --all
+ # package installs .pc files
+ find "${D}" -name '*.la' -delete || die
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pslib/, dev-libs/pslib/files/
@ 2018-05-26 13:57 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2018-05-26 13:57 UTC (permalink / raw
To: gentoo-commits
commit: ae11dd7e67b2e17b72a6b5fe892c13e3afd835e1
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 01:39:44 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May 26 13:57:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae11dd7e
dev-libs/pslib: drop old EAPI
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8592
dev-libs/pslib/Manifest | 1 -
dev-libs/pslib/files/pslib-getline.patch | 47 -------------------------------
dev-libs/pslib/files/pslib-lm.patch | 11 --------
dev-libs/pslib/pslib-0.4.1-r2.ebuild | 48 --------------------------------
4 files changed, 107 deletions(-)
diff --git a/dev-libs/pslib/Manifest b/dev-libs/pslib/Manifest
index 7cc3ab271f3..979f121724a 100644
--- a/dev-libs/pslib/Manifest
+++ b/dev-libs/pslib/Manifest
@@ -1,2 +1 @@
-DIST pslib-0.4.1.tar.gz 531797 BLAKE2B 28224be5411739d20118e3457050b7fc388ad0c5f1f14403080732588b16b2bfc89bad5ce8383db5d5da85fceca466fe81588550c949d18c5c4965889c26f9bc SHA512 012c0b2de1cb151fc41498ca4e6f62ec15138b35afddd0199c6366b818c7b544877eea9575df0e1aee49a67cd52dcac47eae405854e7390abeb64fda221327cf
DIST pslib-0.4.5.tar.gz 493687 BLAKE2B cca0709bc3fa9f464166b02ca54d85056c510f677b478b4f187fba653b3a17af38c3c7ffbea23113d5ad3a146e881d183f138d836cd5f373a116e836ba8d4974 SHA512 410abfdca6c52f16c07b7d0157930fbb7a996f03bfb84aee2bc951b2d859bc2186d3ba742b724cd957b9b1c48201364fbeb11c15d7f4ead34f78b0d0746abc6f
diff --git a/dev-libs/pslib/files/pslib-getline.patch b/dev-libs/pslib/files/pslib-getline.patch
deleted file mode 100644
index cfe7ce4da73..00000000000
--- a/dev-libs/pslib/files/pslib-getline.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/ps_afm.c 2007-07-11 20:18:00.000000000 +0200
-+++ src/ps_afm.c.fix 2009-07-11 14:51:05.000000000 +0200
-@@ -138,7 +138,7 @@
- return (int)(acc>=0? floor(acc+0.5) : ceil(acc-0.5) ) ;
- }
-
--static int getline(FILE *afmin) {
-+static int pslib_getline(FILE *afmin) {
- char *p ;
- int c ;
-
-@@ -616,7 +616,7 @@
- return(-1);
- }
-
-- while (getline(fp)) {
-+ while (pslib_getline(fp)) {
- switch(interest(paramstring())) {
- case N:
- handleprotusion(psdoc, metrics) ;
-@@ -664,7 +664,7 @@
- /*
- * Read file line by line.
- */
-- while (getline(metric->afmin)) {
-+ while (pslib_getline(metric->afmin)) {
- switch(interest(paramstring())) {
- case FontName:
- metric->fontname = paramnewstring(psdoc) ;
-@@ -1039,7 +1039,7 @@
-
- while (1) {
- while (param == NULL || *param == '\0') {
-- if (getline(metrics->afmin) == 0)
-+ if (pslib_getline(metrics->afmin) == 0)
- ps_error(psdoc, PS_RuntimeError, _("Premature end of encoding file."));
- for (p=buffer; *p != '\0'; p++)
- if (*p == '%') {
-@@ -1160,7 +1160,7 @@
- psdoc->free(psdoc, e);
- return -1;
- }
-- while (getline(metrics->afmin)) {
-+ while (pslib_getline(metrics->afmin)) {
- for (p=buffer; *p != '\0'; p++)
- if (*p == '%') {
- if (ignoreligkern == 0)
diff --git a/dev-libs/pslib/files/pslib-lm.patch b/dev-libs/pslib/files/pslib-lm.patch
deleted file mode 100644
index 46292eee3d4..00000000000
--- a/dev-libs/pslib/files/pslib-lm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in 2007-10-30 02:38:30.000000000 -0500
-+++ b/configure.in 2009-01-21 18:55:37.000000000 -0600
-@@ -92,6 +92,8 @@
- AC_SUBST(LIBHNJ_CFLAGS)
- AC_SUBST(LIBHNJ_LIBS)
-
-+AC_CHECK_LIB([m], [pow])
-+
- PNG_PREFIX=no
- AC_ARG_WITH(png, [ --with-png=DIR Path to png library (/usr)])
- case "${withval}" in
diff --git a/dev-libs/pslib/pslib-0.4.1-r2.ebuild b/dev-libs/pslib/pslib-0.4.1-r2.ebuild
deleted file mode 100644
index e0f19c00b2f..00000000000
--- a/dev-libs/pslib/pslib-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="pslib is a C-library to create PostScript files on the fly"
-HOMEPAGE="http://pslib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pslib/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc ~x86"
-IUSE="debug jpeg png tiff"
-
-RDEPEND="png? ( >=media-libs/libpng-1.2.43-r2:0 )
- jpeg? ( virtual/jpeg )
- tiff? ( media-libs/tiff )"
-#gif? requires libungif, not in portage
-DEPEND="${RDEPEND}
- dev-lang/perl
- >=dev-libs/glib-2
- dev-util/intltool
- dev-perl/XML-Parser"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-lm.patch \
- "${FILESDIR}"/${PN}-getline.patch
-
- sed -i \
- -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
- src/pslib.c || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with png) \
- $(use_with jpeg) \
- $(use_with tiff) \
- $(use_with debug)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS README
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pslib/, dev-libs/pslib/files/
@ 2022-10-04 7:09 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-10-04 7:09 UTC (permalink / raw
To: gentoo-commits
commit: 6791747772fac59091dea9be75074c106c97ebeb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 4 05:38:59 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 4 07:09:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67917477
dev-libs/pslib: add 0.4.6
Closes: https://bugs.gentoo.org/871300
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/pslib/Manifest | 1 +
...-0.4.6-Fix-implicit-function-declarations.patch | 29 ++++++++++++
dev-libs/pslib/pslib-0.4.6.ebuild | 54 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/dev-libs/pslib/Manifest b/dev-libs/pslib/Manifest
index 979f121724a2..b826a83df9ad 100644
--- a/dev-libs/pslib/Manifest
+++ b/dev-libs/pslib/Manifest
@@ -1 +1,2 @@
DIST pslib-0.4.5.tar.gz 493687 BLAKE2B cca0709bc3fa9f464166b02ca54d85056c510f677b478b4f187fba653b3a17af38c3c7ffbea23113d5ad3a146e881d183f138d836cd5f373a116e836ba8d4974 SHA512 410abfdca6c52f16c07b7d0157930fbb7a996f03bfb84aee2bc951b2d859bc2186d3ba742b724cd957b9b1c48201364fbeb11c15d7f4ead34f78b0d0746abc6f
+DIST pslib-0.4.6.tar.gz 543950 BLAKE2B 18f85ce5c2d558b2abe8c3297a65201890813d57d3e14353333c1e1b221ee89e0d2c27e6f247be8c1066c9be1e3cf390205217f2ca2fe76fe76208d4be2e2ac6 SHA512 aa1fb217fa36b33e8e4b1a9cf5057803f9dd2d50c76f8d33c6494939a592fba0bddef53d4e5d2c14769508df6d409b3bd18cd6d716014cd99224be5e1d64282b
diff --git a/dev-libs/pslib/files/pslib-0.4.6-Fix-implicit-function-declarations.patch b/dev-libs/pslib/files/pslib-0.4.6-Fix-implicit-function-declarations.patch
new file mode 100644
index 000000000000..7548ced79b87
--- /dev/null
+++ b/dev-libs/pslib/files/pslib-0.4.6-Fix-implicit-function-declarations.patch
@@ -0,0 +1,29 @@
+From ffd2e04b8e32d916cc513e73e92afa98348d3a73 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 4 Oct 2022 06:37:32 +0100
+Subject: [PATCH] Fix implicit function declarations
+
+Bug: https://bugs.gentoo.org/871300
+--- a/src/bmp.c
++++ b/src/bmp.c
+@@ -34,6 +34,9 @@
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
++
++#include <ps_error.h>
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/src/ps_error.h
++++ b/src/ps_error.h
+@@ -1,5 +1,8 @@
+ #ifndef __PS_ERROR_H__
+ #define __PS_ERROR_H__
++
++#include "ps_intern.h"
++
+ void _ps_errorhandler(PSDoc *p, int error, const char *str, void *data);
+ void ps_error(PSDoc *p, int type, const char *fmt, ...);
+ #endif
diff --git a/dev-libs/pslib/pslib-0.4.6.ebuild b/dev-libs/pslib/pslib-0.4.6.ebuild
new file mode 100644
index 000000000000..4391cb1b9132
--- /dev/null
+++ b/dev-libs/pslib/pslib-0.4.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="pslib is a C-library to create PostScript files on the fly"
+HOMEPAGE="http://pslib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pslib/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug jpeg png tiff"
+
+RDEPEND="
+ png? ( media-libs/libpng:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ tiff? ( media-libs/tiff:= )"
+#gif? requires libungif, not in portage
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-libs/glib:2
+ dev-util/intltool
+ dev-perl/XML-Parser
+ sys-devel/gettext"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.4.5-fix-build-system.patch
+ "${FILESDIR}"/${PN}-0.4.6-Fix-implicit-function-declarations.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-bmp \
+ $(use_with png) \
+ $(use_with jpeg) \
+ $(use_with tiff) \
+ $(use_with debug)
+}
+
+src_install() {
+ default
+
+ # package installs .pc files
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-04 7:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-04 7:09 [gentoo-commits] repo/gentoo:master commit in: dev-libs/pslib/, dev-libs/pslib/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2018-05-26 13:57 Aaron Bauman
2017-12-31 12:44 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox