* [gentoo-commits] repo/gentoo:master commit in: app-text/libspectre/, app-text/libspectre/files/
@ 2015-10-23 13:26 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2015-10-23 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 8d34151aea08aa04cca35e1f5da59445af0440d0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 13:25:42 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 13:26:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d34151a
app-text/libspectre: >=app-text/ghostscript-gpl-9.18 compile fix
(bug #563540).
Package-Manager: portage-2.2.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../libspectre/files/libspectre-0.2.7-gs918.patch | 42 ++++++++++++++++++++++
app-text/libspectre/libspectre-0.2.7.ebuild | 2 ++
2 files changed, 44 insertions(+)
diff --git a/app-text/libspectre/files/libspectre-0.2.7-gs918.patch b/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
new file mode 100644
index 0000000..e9a4eda
--- /dev/null
+++ b/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
@@ -0,0 +1,42 @@
+Fixed error namespace for >=ghostscript-gpl-9.18
+
+https://bugs.gentoo.org/563540
+
+--- libspectre-0.2.7/libspectre/spectre-gs.c
++++ libspectre-0.2.7/libspectre/spectre-gs.c
+@@ -43,12 +43,12 @@
+
+ if (code <= -100) {
+ switch (code) {
+- case e_Fatal:
++ case gs_error_Fatal:
+ fprintf (stderr, "fatal internal error %d", code);
+ return TRUE;
+ break;
+
+- case e_ExecStackUnderflow:
++ case gs_error_ExecStackUnderflow:
+ fprintf (stderr, "stack overflow %d", code);
+ return TRUE;
+ break;
+@@ -109,9 +109,9 @@
+ set = _spectre_strdup_printf ("%d %d translate\n", -x, -y);
+ error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set),
+ 0, &exit_code);
+- error = error == e_NeedInput ? 0 : error;
++ error = error == gs_error_NeedInput ? 0 : error;
+ free (set);
+- if (error != e_NeedInput && critic_error_code (error)) {
++ if (error != gs_error_NeedInput && critic_error_code (error)) {
+ fclose (fd);
+ return FALSE;
+ }
+@@ -126,7 +126,7 @@
+ read = fread (buf, sizeof (char), to_read, fd);
+ error = gsapi_run_string_continue (ghostscript_instance,
+ buf, read, 0, &exit_code);
+- error = error == e_NeedInput ? 0 : error;
++ error = error == gs_error_NeedInput ? 0 : error;
+ left -= read;
+ }
+
diff --git a/app-text/libspectre/libspectre-0.2.7.ebuild b/app-text/libspectre/libspectre-0.2.7.ebuild
index 920dab4..68a7ad1 100644
--- a/app-text/libspectre/libspectre-0.2.7.ebuild
+++ b/app-text/libspectre/libspectre-0.2.7.ebuild
@@ -26,6 +26,8 @@ DOCS="NEWS README TODO"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.2.0-interix.patch
+ has_version \>=app-text/ghostscript-gpl-9.18 \
+ && epatch "${FILESDIR}"/${PN}-0.2.7-gs918.patch
eautoreconf # need new libtool for interix
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/libspectre/, app-text/libspectre/files/
@ 2020-05-07 7:54 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-05-07 7:54 UTC (permalink / raw
To: gentoo-commits
commit: a6ffbf1fe25b2102f985ec1b86ad46f89c9a4516
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 6 20:51:24 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 7 07:54:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ffbf1f
app-text/libspectre: 0.2.9 version bump, EAPI-7 bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-text/libspectre/Manifest | 1 +
.../files/libspectre-0.2.0-interix.patch | 6 +--
app-text/libspectre/libspectre-0.2.9.ebuild | 54 ++++++++++++++++++++++
3 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 54fa010bd95..8afc9c293ae 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1 +1,2 @@
DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
+DIST libspectre-0.2.9.tar.gz 433384 BLAKE2B ed75a7013763a86c0f0702e0e47dcfb8401db6c957ed4851ecc85e27db6a49c8d4dae6443b302bcce5b0ae0da18dce3294a010eee5531a253020a650c19388c5 SHA512 7c24b5c83c6d356c89417d09dc76566afbe886ec189fe80d030a239c23ad25b061db071768117fa06805aa3d86f749fb232b7491bd7d467f26a40e348e74d5d2
diff --git a/app-text/libspectre/files/libspectre-0.2.0-interix.patch b/app-text/libspectre/files/libspectre-0.2.0-interix.patch
index 7b607542dfa..8f295633185 100644
--- a/app-text/libspectre/files/libspectre-0.2.0-interix.patch
+++ b/app-text/libspectre/files/libspectre-0.2.0-interix.patch
@@ -1,6 +1,6 @@
-diff -ru libspectre-0.2.0.orig/libspectre/spectre-utils.c libspectre-0.2.0/libspectre/spectre-utils.c
---- libspectre-0.2.0.orig/libspectre/spectre-utils.c 2008-05-06 08:35:07 +0200
-+++ libspectre-0.2.0/libspectre/spectre-utils.c 2008-05-06 08:49:51 +0200
+diff -ru libspectre/spectre-utils.c libspectre/spectre-utils.c
+--- a/libspectre/spectre-utils.c 2008-05-06 08:35:07 +0200
++++ b/libspectre/spectre-utils.c 2008-05-06 08:49:51 +0200
@@ -148,6 +148,17 @@
spectre_strdup_vprintf (const char *format,
va_list args)
diff --git a/app-text/libspectre/libspectre-0.2.9.ebuild b/app-text/libspectre/libspectre-0.2.9.ebuild
new file mode 100644
index 00000000000..0053bce742a
--- /dev/null
+++ b/app-text/libspectre/libspectre-0.2.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library for rendering Postscript documents"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
+SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug doc"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+RDEPEND=">=app-text/ghostscript-gpl-9.24"
+DEPEND="${RDEPEND}"
+
+# does not actually test anything, see bug 362557
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.2.0-interix.patch )
+
+src_prepare() {
+ default
+ eautoreconf # need new libtool for interix
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug asserts)
+ $(use_enable debug checks)
+ --disable-test
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ emake
+ if use doc; then
+ doxygen || die
+ fi
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( doc/html/. )
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/libspectre/, app-text/libspectre/files/
@ 2022-11-06 11:53 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-11-06 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 806cbeab41222287f73a11f29fa7ad899bdcea66
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 11:44:03 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 11:53:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=806cbeab
app-text/libspectre: drop 0.2.9
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-text/libspectre/Manifest | 1 -
.../files/libspectre-0.2.0-interix.patch | 29 ------------
app-text/libspectre/libspectre-0.2.9.ebuild | 55 ----------------------
3 files changed, 85 deletions(-)
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 5a0e02e4ad89..2670091f0b61 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1,2 +1 @@
DIST libspectre-0.2.10.tar.gz 436690 BLAKE2B 8c1d25225a212b7e8d2bab7cffa4298509450cf727e38d0be22d27ed5fb161a0f838967afa3f8aa265c2bd243431bbfb92976cf51ee52ee7d3b0479000215546 SHA512 01738f452f99878beaa528b15d8df463ca22d625306d636e1a6199ade9f068d284f1def3882e954a06e5f066937343f79d0c2197fbb19ab53ef1ab0540c72f2f
-DIST libspectre-0.2.9.tar.gz 433384 BLAKE2B ed75a7013763a86c0f0702e0e47dcfb8401db6c957ed4851ecc85e27db6a49c8d4dae6443b302bcce5b0ae0da18dce3294a010eee5531a253020a650c19388c5 SHA512 7c24b5c83c6d356c89417d09dc76566afbe886ec189fe80d030a239c23ad25b061db071768117fa06805aa3d86f749fb232b7491bd7d467f26a40e348e74d5d2
diff --git a/app-text/libspectre/files/libspectre-0.2.0-interix.patch b/app-text/libspectre/files/libspectre-0.2.0-interix.patch
deleted file mode 100644
index 8f2956331852..000000000000
--- a/app-text/libspectre/files/libspectre-0.2.0-interix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru libspectre/spectre-utils.c libspectre/spectre-utils.c
---- a/libspectre/spectre-utils.c 2008-05-06 08:35:07 +0200
-+++ b/libspectre/spectre-utils.c 2008-05-06 08:49:51 +0200
-@@ -148,6 +148,17 @@
- spectre_strdup_vprintf (const char *format,
- va_list args)
- {
-+#ifdef __INTERIX
-+ /* no [v]asprintf here, so we need to do something else. */
-+ char * string = NULL;
-+ char buf[524288];
-+
-+ if(vsprintf(buf, format, args) < 0)
-+ return NULL;
-+
-+ string = strdup(buf);
-+ return string;
-+#else
- char *string = NULL;
- int len = vasprintf (&string, format, args);
-
-@@ -155,6 +166,7 @@
- string = NULL;
-
- return string;
-+#endif
- }
-
- char *
diff --git a/app-text/libspectre/libspectre-0.2.9.ebuild b/app-text/libspectre/libspectre-0.2.9.ebuild
deleted file mode 100644
index cfb66f66da8c..000000000000
--- a/app-text/libspectre/libspectre-0.2.9.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library for rendering Postscript documents"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
-SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug doc"
-
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-RDEPEND=">=app-text/ghostscript-gpl-9.24:="
-DEPEND="${RDEPEND}"
-
-# does not actually test anything, see bug 362557
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.2.0-interix.patch )
-
-src_prepare() {
- default
- eautoreconf # need new libtool for interix
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug asserts)
- $(use_enable debug checks)
- --disable-static
- --disable-test
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake
- if use doc; then
- doxygen || die
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( doc/html/. )
- default
- find "${D}" -name '*.la' -type f -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-06 11:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-23 13:26 [gentoo-commits] repo/gentoo:master commit in: app-text/libspectre/, app-text/libspectre/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2020-05-07 7:54 Andreas Sturmlechner
2022-11-06 11:53 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox