* [gentoo-commits] repo/gentoo:master commit in: media-libs/plotutils/files/, media-libs/plotutils/
@ 2017-02-16 0:13 Andreas Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2017-02-16 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 55072a2e6eb94c4300dfb3bc56fb190013b13d8c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 00:12:05 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 00:13:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55072a2e
media-libs/plotutils: Add debian/redhat patch for format-security, bug 556568
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/plotutils-2.6-format-security.patch | 18 ++++++++++++++++++
media-libs/plotutils/plotutils-2.6-r1.ebuild | 3 ++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/media-libs/plotutils/files/plotutils-2.6-format-security.patch b/media-libs/plotutils/files/plotutils-2.6-format-security.patch
new file mode 100644
index 0000000000..c1cbecfc79
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.6-format-security.patch
@@ -0,0 +1,18 @@
+Description: Fix build error with -Werror=format-security.
+Forwarded: https://lists.gnu.org/archive/html/bug-plotutils/2016-01/msg00000.html
+Author: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Origin: http://pkgs.fedoraproject.org/cgit/plotutils.git
+
+diff --git a/pic2plot/gram.yy b/pic2plot/gram.yy
+index d11320b..1bcce46 100644
+--- a/pic2plot/gram.yy
++++ b/pic2plot/gram.yy
+@@ -1833,7 +1833,7 @@ do_sprintf(const char *form, const double *v, int nv)
+ {
+ one_format += *form++;
+ one_format += '\0';
+- sprintf(sprintf_buf, one_format.contents());
++ sprintf(sprintf_buf, "%s", one_format.contents());
+ }
+ else
+ {
diff --git a/media-libs/plotutils/plotutils-2.6-r1.ebuild b/media-libs/plotutils/plotutils-2.6-r1.ebuild
index 13eeaf32b8..3153d134c0 100644
--- a/media-libs/plotutils/plotutils-2.6-r1.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r1.ebuild
@@ -35,7 +35,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-2.5.1-rangecheck.patch \
"${FILESDIR}"/${P}-makefile.patch \
"${FILESDIR}"/${P}-libpng-1.5.patch \
- "${FILESDIR}"/${P}-libxmi.patch
+ "${FILESDIR}"/${P}-libxmi.patch \
+ "${FILESDIR}"/${P}-format-security.patch
eautoreconf
elibtoolize
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/plotutils/files/, media-libs/plotutils/
@ 2020-11-06 2:25 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-11-06 2:25 UTC (permalink / raw
To: gentoo-commits
commit: 68a6ab2ca89ce4a276c70c72856f360e7eb02b17
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 00:52:46 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 6 02:24:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a6ab2c
media-libs/plotutils: EAPI-7 bump, fix pkg_postinst message
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../plotutils/files/plotutils-2.6-libpng-1.5.patch | 4 +-
media-libs/plotutils/plotutils-2.6-r2.ebuild | 65 +++++++++++-----------
2 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch b/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
index b86d9f45742..431c638a553 100644
--- a/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
+++ b/media-libs/plotutils/files/plotutils-2.6-libpng-1.5.patch
@@ -1,7 +1,7 @@
fix building with libpng-1.5
---- libplot/z_write.c
-+++ libplot/z_write.c
+--- a/libplot/z_write.c
++++ b/libplot/z_write.c
@@ -164,7 +164,7 @@
}
diff --git a/media-libs/plotutils/plotutils-2.6-r2.ebuild b/media-libs/plotutils/plotutils-2.6-r2.ebuild
index d3c6f4302a9..3b254ce0cae 100644
--- a/media-libs/plotutils/plotutils-2.6-r2.ebuild
+++ b/media-libs/plotutils/plotutils-2.6-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit libtool eutils autotools
+inherit libtool autotools
DESCRIPTION="Powerful C/C++ function library for exporting 2-D vector graphics"
HOMEPAGE="https://www.gnu.org/software/plotutils/"
@@ -12,47 +12,50 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+png static-libs X"
+IUSE="+png X"
DEPEND="
- !<media-libs/plotutils-${PV}
media-libs/libxmi
png? (
media-libs/libpng:0=
- sys-libs/zlib )
- X? ( x11-libs/libXaw )"
-RDEPEND="${DEPEND}"
+ sys-libs/zlib
+ )
+ X? ( x11-libs/libXaw )
+"
+RDEPEND="${DEPEND}
+ !<media-libs/plotutils-${PV}
+"
-DOCS="AUTHORS COMPAT ChangeLog INSTALL.* KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO"
+DOCS=( AUTHORS COMPAT ChangeLog INSTALL.{fonts,pkg} KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.1-rangecheck.patch
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-libpng-1.5.patch
+ "${FILESDIR}"/${P}-libxmi.patch
+ "${FILESDIR}"/${P}-format-security.patch
+)
src_prepare() {
- rm -rf libxmi/* || die
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
- epatch \
- "${FILESDIR}"/${PN}-2.5.1-rangecheck.patch \
- "${FILESDIR}"/${P}-makefile.patch \
- "${FILESDIR}"/${P}-libpng-1.5.patch \
- "${FILESDIR}"/${P}-libxmi.patch \
- "${FILESDIR}"/${P}-format-security.patch
+ default
+
+ rm -r libxmi/* || die
+ sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
eautoreconf
elibtoolize
}
src_configure() {
- local myconf
- if use X ; then
- myconf="--with-x --enable-libxmi"
- else
- myconf="--without-x"
- fi
-
- econf \
- --enable-shared \
- --enable-libplotter \
- --disable-libxmi \
- $(use_enable static-libs static) \
- $(use_with png libpng) \
- ${myconf}
+ local myeconfargs=(
+ --enable-shared
+ --enable-libplotter
+ --disable-libxmi
+ --disable-static
+ $(use_with png libpng)
+ $(usex X "--with-x --enable-libxmi" "--without-x")
+ )
+ econf "${myeconfargs[@]}"
}
pkg_postinst() {
@@ -60,7 +63,7 @@ pkg_postinst() {
elog "There are extra fonts available in the plotutils package."
elog "The current ebuild does not install them for you since most"
elog "of them can be installed via the media-fonts/urw-fonts"
- elog "package. See /usr/share/doc/${P}/INSTALL.fonts for"
+ elog "package. See /usr/share/doc/${PF}/INSTALL.fonts for"
elog "information on installing the remaining Tektronix fonts."
elog ""
elog "If you manually install the extra fonts and use the"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/plotutils/files/, media-libs/plotutils/
@ 2024-09-09 8:23 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2024-09-09 8:23 UTC (permalink / raw
To: gentoo-commits
commit: 530901e555a778c235f8031a65abb5c4eff9cf05
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 9 08:19:55 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Sep 9 08:22:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530901e5
media-libs/plotutils: Drop .la files, fix impl declarations
Fix implicit declarations in configure files, c++17 compat (also
fixing tests), drop .la files, port to greadme.eclass.
Closes: https://bugs.gentoo.org/899836
Closes: https://bugs.gentoo.org/847508
Closes: https://bugs.gentoo.org/618708
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../files/plotutils-2.6-configure-c99.patch | 54 ++++++++++++++
.../plotutils/files/plotutils-2.6-cxx17-fix.patch | 46 ++++++++++++
media-libs/plotutils/plotutils-2.6-r3.ebuild | 82 ++++++++++++++++++++++
3 files changed, 182 insertions(+)
diff --git a/media-libs/plotutils/files/plotutils-2.6-configure-c99.patch b/media-libs/plotutils/files/plotutils-2.6-configure-c99.patch
new file mode 100644
index 000000000000..282596049953
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.6-configure-c99.patch
@@ -0,0 +1,54 @@
+Do not call the undeclared exit function. This avoids build problems
+with future compilers which do not support implicit function
+declarations.
+
+diff --git a/configure b/configure
+index 229ccd453ae4487f..fdf3785ad4c5175f 100755
+--- a/configure
++++ b/configure
+@@ -19537,9 +19537,9 @@ int main()
+ || fflush ((FILE *)0) < 0
+ || (fpr = fopen ("conftest0", "r")) == (FILE *)0
+ || fread (test_array, 1, 7, fpr) != 7)
+- exit (1);
++ return 1;
+ else
+- exit(0); }
++ return 0; }
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (ac_try="$ac_link"
+@@ -24022,7 +24022,7 @@ int main()
+ int i;
+ for (i=0; i < B; i++)
+ Array[i] = i - 3;
+- exit (Array[1] != -2);
++ return Array[1] != -2;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+diff --git a/configure.ac b/configure.ac
+index 8fb7b640864eb4a8..d1f6d7e08c6946d4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,9 +88,9 @@ int main()
+ || fflush ((FILE *)0) < 0
+ || (fpr = fopen ("conftest0", "r")) == (FILE *)0
+ || fread (test_array, 1, 7, fpr) != 7)
+- exit (1);
++ return 1;
+ else
+- exit(0); }]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NULL_FLUSH)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
++ return 0; }]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NULL_FLUSH)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
+
+ # Checks for header files: ANSI C, POSIX, and nonstandard Unix headers.
+ AC_HEADER_STDC
+@@ -383,7 +383,7 @@ int main()
+ int i;
+ for (i=0; i < B; i++)
+ Array[[i]] = i - 3;
+- exit (Array[[1]] != -2);
++ return Array[[1]] != -2;
+ }]])],
+ [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
+ if test "$ac_cv_c_gcc_strength_bug" = "yes"
diff --git a/media-libs/plotutils/files/plotutils-2.6-cxx17-fix.patch b/media-libs/plotutils/files/plotutils-2.6-cxx17-fix.patch
new file mode 100644
index 000000000000..a14336a580d7
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.6-cxx17-fix.patch
@@ -0,0 +1,46 @@
+https://github.com/NixOS/nixpkgs/commit/92d99c521b2c02fa645b3b993ac4bbaf49e43ddd
+
+diff -ur a/pic2plot/gram.cc b/pic2plot/gram.cc
+--- a/pic2plot/gram.cc 2000-06-28 00:23:21.000000000 -0400
++++ b/pic2plot/gram.cc 2023-09-07 22:59:47.004460065 -0400
+@@ -1229,9 +1229,9 @@
+ char *from;
+ unsigned int count;
+ {
+- register char *f = from;
+- register char *t = to;
+- register int i = count;
++ char *f = from;
++ char *t = to;
++ int i = count;
+
+ while (i-- > 0)
+ *t++ = *f++;
+@@ -1244,9 +1244,9 @@
+ static void
+ __yy_memcpy (char *to, char *from, unsigned int count)
+ {
+- register char *t = to;
+- register char *f = from;
+- register int i = count;
++ char *t = to;
++ char *f = from;
++ int i = count;
+
+ while (i-- > 0)
+ *t++ = *f++;
+@@ -1289,10 +1289,10 @@
+ yyparse(YYPARSE_PARAM_ARG)
+ YYPARSE_PARAM_DECL
+ {
+- register int yystate;
+- register int yyn;
+- register short *yyssp;
+- register YYSTYPE *yyvsp;
++ int yystate;
++ int yyn;
++ short *yyssp;
++ YYSTYPE *yyvsp;
+ int yyerrstatus; /* number of tokens to shift before error messages enabled */
+ int yychar1 = 0; /* lookahead token as an internal (translated) token number */
+
diff --git a/media-libs/plotutils/plotutils-2.6-r3.ebuild b/media-libs/plotutils/plotutils-2.6-r3.ebuild
new file mode 100644
index 000000000000..9b4fdd74264e
--- /dev/null
+++ b/media-libs/plotutils/plotutils-2.6-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool autotools greadme
+
+DESCRIPTION="Powerful C/C++ function library for exporting 2-D vector graphics"
+HOMEPAGE="https://www.gnu.org/software/plotutils/"
+SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+png X"
+
+DEPEND="
+ media-libs/libxmi
+ png? (
+ media-libs/libpng:0=
+ sys-libs/zlib
+ )
+ X? ( x11-libs/libXaw )
+"
+RDEPEND="${DEPEND}
+ !<media-libs/plotutils-${PV}
+"
+
+DOCS=( AUTHORS COMPAT ChangeLog INSTALL.{fonts,pkg} KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.1-rangecheck.patch
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-libpng-1.5.patch
+ "${FILESDIR}"/${P}-libxmi.patch
+ "${FILESDIR}"/${P}-format-security.patch
+ "${FILESDIR}"/${P}-configure-c99.patch
+ "${FILESDIR}"/${P}-cxx17-fix.patch
+)
+
+src_prepare() {
+ default
+
+ rm -r libxmi/* || die
+ sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' -i configure.ac || die
+
+ eautoreconf
+ elibtoolize
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-shared
+ --enable-libplotter
+ --disable-libxmi
+ --disable-static
+ $(use_with png libpng)
+ $(usex X "--with-x --enable-libxmi" "--without-x")
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ if use X ; then
+ greadme_stdin <<-EOF
+ There are extra fonts available in the plotutils package.
+ The current ebuild does not install them for you since most
+ of them can be installed via the media-fonts/urw-fonts
+ package. See /usr/share/doc/${PF}/INSTALL.fonts for
+ information on installing the remaining Tektronix fonts.
+
+ If you manually install the extra fonts and use the
+ program xfig, you might want to recompile to take
+ advantage of the additional ps fonts.
+ Also, it is possible to enable ghostscript and your
+ printer to use the HP fonts.
+ EOF
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-09 8:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-06 2:25 [gentoo-commits] repo/gentoo:master commit in: media-libs/plotutils/files/, media-libs/plotutils/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-09-09 8:23 Pacho Ramos
2017-02-16 0:13 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox