* [gentoo-commits] repo/gentoo:master commit in: net-print/npadmin/files/, net-print/npadmin/
@ 2017-02-17 21:23 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2017-02-17 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 72379d29338dac85c22f62577170a6061172a78f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 17 21:23:19 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 21:23:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72379d29
net-print/npadmin: EAPI bump; fix build with gcc-6, bug 594414
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-print/npadmin/files/npadmin-0.8.7-gcc6.patch | 138 +++++++++++++++++++++++
net-print/npadmin/npadmin-0.8.7-r1.ebuild | 30 +++++
2 files changed, 168 insertions(+)
diff --git a/net-print/npadmin/files/npadmin-0.8.7-gcc6.patch b/net-print/npadmin/files/npadmin-0.8.7-gcc6.patch
new file mode 100644
index 0000000000..7523bb23e3
--- /dev/null
+++ b/net-print/npadmin/files/npadmin-0.8.7-gcc6.patch
@@ -0,0 +1,138 @@
+--- npadmin-0.8.7/npadmin.C.old 2016-09-19 20:08:16.932034393 -0400
++++ npadmin-0.8.7/npadmin.C 2016-09-19 20:10:41.742717941 -0400
+@@ -72,74 +72,74 @@
+
+ // don't change the order of these without changing the order in npaconsts.h
+ static const struct option options[]= {
+- {"version", no_argument,&retval,VERSION_FLAG},
+- {"all", no_argument,&retval,ALL_FLAG},
+- {"debugsnmp", no_argument,&retval,DEBUGSNMP_FLAG},
+- {"name", no_argument,&retval,NAME_FLAG},
+-
+- {"vendor", no_argument,&retval,VENDOR_FLAG},
+- {"model", no_argument,&retval,MODEL_FLAG},
+- {"contact", no_argument,&retval,CONTACT_FLAG},
+- {"netconfig", no_argument,&retval,NETCONFIG_FLAG},
+- {"printmib", no_argument,&retval,PRINTMIB_FLAG},
+- {"hostmib", no_argument,&retval,HOSTMIB_FLAG},
+-
+- {"memory", no_argument,&retval,MEMORY_FLAG},
+- {"storage", no_argument,&retval,STORAGE_FLAG},
+- {"status", no_argument,&retval,STATUS_FLAG},
+-
+- {"mediapath", no_argument,&retval,MEDIAPATH_FLAG},
+- {"maxpapersize",no_argument,&retval,MAXPAPERSIZE_FLAG},
+- {"enginespeed", no_argument,&retval,ENGINESPEED_FLAG},
+- {"duplex", no_argument,&retval,DUPLEX_FLAG},
+- {"minpapersize",no_argument,&retval,MINPAPERSIZE_FLAG},
+-
+- {"inputtray", no_argument,&retval,INPUTTRAY_FLAG},
+- {"tabloid", no_argument,&retval,TABLOID_FLAG},
+- {"a4", no_argument,&retval,A4_FLAG},
+- {"b4", no_argument,&retval,B4_FLAG},
+- {"executive", no_argument,&retval,EXECUTIVE_FLAG},
+- {"a3", no_argument,&retval,A3_FLAG},
+- {"b5", no_argument,&retval,B5_FLAG},
+- {"letter", no_argument,&retval,LETTER_FLAG},
+- {"legal", no_argument,&retval,LEGAL_FLAG},
++ {"version", no_argument,&retval,(int)VERSION_FLAG},
++ {"all", no_argument,&retval,(int)ALL_FLAG},
++ {"debugsnmp", no_argument,&retval,(int)DEBUGSNMP_FLAG},
++ {"name", no_argument,&retval,(int)NAME_FLAG},
++
++ {"vendor", no_argument,&retval,(int)VENDOR_FLAG},
++ {"model", no_argument,&retval,(int)MODEL_FLAG},
++ {"contact", no_argument,&retval,(int)CONTACT_FLAG},
++ {"netconfig", no_argument,&retval,(int)NETCONFIG_FLAG},
++ {"printmib", no_argument,&retval,(int)PRINTMIB_FLAG},
++ {"hostmib", no_argument,&retval,(int)HOSTMIB_FLAG},
++
++ {"memory", no_argument,&retval,(int)MEMORY_FLAG},
++ {"storage", no_argument,&retval,(int)STORAGE_FLAG},
++ {"status", no_argument,&retval,(int)STATUS_FLAG},
++
++ {"mediapath", no_argument,&retval,(int)MEDIAPATH_FLAG},
++ {"maxpapersize",no_argument,&retval,(int)MAXPAPERSIZE_FLAG},
++ {"enginespeed", no_argument,&retval,(int)ENGINESPEED_FLAG},
++ {"duplex", no_argument,&retval,(int)DUPLEX_FLAG},
++ {"minpapersize",no_argument,&retval,(int)MINPAPERSIZE_FLAG},
++
++ {"inputtray", no_argument,&retval,(int)INPUTTRAY_FLAG},
++ {"tabloid", no_argument,&retval,(int)TABLOID_FLAG},
++ {"a4", no_argument,&retval,(int)A4_FLAG},
++ {"b4", no_argument,&retval,(int)B4_FLAG},
++ {"executive", no_argument,&retval,(int)EXECUTIVE_FLAG},
++ {"a3", no_argument,&retval,(int)A3_FLAG},
++ {"b5", no_argument,&retval,(int)B5_FLAG},
++ {"letter", no_argument,&retval,(int)LETTER_FLAG},
++ {"legal", no_argument,&retval,(int)LEGAL_FLAG},
+
+- {"display", no_argument,&retval,DISPLAY_FLAG},
+- {"covers", no_argument,&retval,COVER_FLAG},
++ {"display", no_argument,&retval,(int)DISPLAY_FLAG},
++ {"covers", no_argument,&retval,(int)COVER_FLAG},
+
+ // From here down These all get an extra bit to indicate that they belong
+ // to argval[1] rather than argval[0]
+- {"languages", no_argument,&retval,LANGUAGES_FLAG+1},
+- {"pjl", no_argument,&retval,PJL_FLAG+1},
+- {"hpgl", no_argument,&retval,HPGL_FLAG+1},
+- {"psprinter", no_argument,&retval,PSPRINTER_FLAG+1},
+- {"autolang", no_argument,&retval,AUTOLANG_FLAG+1},
+- {"pcl", no_argument,&retval,PCL_FLAG+1},
+- {"postscript", no_argument,&retval,POSTSCRIPT_FLAG+1},
+-
+- {"marker", no_argument,&retval,MARKER_FLAG+1},
+- {"pagecount", no_argument,&retval,PAGECOUNT_FLAG+1},
+- {"colors", no_argument,&retval,COLORS_FLAG+1},
+- {"resolution", no_argument,&retval,RESOLUTION_FLAG+1},
+- {"minmargin", no_argument,&retval,MINMARGIN_FLAG+1},
+-
+- {"protocol", no_argument,&retval,PROTOCOL_FLAG+1},
+- {"appletalk", no_argument,&retval,APPLETALK_FLAG+1},
+- {"lpd", no_argument,&retval,LPD_FLAG+1},
+- {"netware", no_argument,&retval,NETWARE_FLAG+1},
+- {"port9100", no_argument,&retval,PORT9100_FLAG+1},
+-
+- {"supplies", no_argument,&retval,SUPPLIES_FLAG+1},
+- {"cfgsrc", no_argument,&retval,CFGSRC_FLAG+1},
+- {"alerts", no_argument,&retval,ALERTS_FLAG+1},
+- {"reboot", no_argument,&retval,REBOOT_FLAG+1},
++ {"languages", no_argument,&retval,(int)LANGUAGES_FLAG+1},
++ {"pjl", no_argument,&retval,(int)PJL_FLAG+1},
++ {"hpgl", no_argument,&retval,(int)HPGL_FLAG+1},
++ {"psprinter", no_argument,&retval,(int)PSPRINTER_FLAG+1},
++ {"autolang", no_argument,&retval,(int)AUTOLANG_FLAG+1},
++ {"pcl", no_argument,&retval,(int)PCL_FLAG+1},
++ {"postscript", no_argument,&retval,(int)POSTSCRIPT_FLAG+1},
++
++ {"marker", no_argument,&retval,(int)MARKER_FLAG+1},
++ {"pagecount", no_argument,&retval,(int)PAGECOUNT_FLAG+1},
++ {"colors", no_argument,&retval,(int)COLORS_FLAG+1},
++ {"resolution", no_argument,&retval,(int)RESOLUTION_FLAG+1},
++ {"minmargin", no_argument,&retval,(int)MINMARGIN_FLAG+1},
++
++ {"protocol", no_argument,&retval,(int)PROTOCOL_FLAG+1},
++ {"appletalk", no_argument,&retval,(int)APPLETALK_FLAG+1},
++ {"lpd", no_argument,&retval,(int)LPD_FLAG+1},
++ {"netware", no_argument,&retval,(int)NETWARE_FLAG+1},
++ {"port9100", no_argument,&retval,(int)PORT9100_FLAG+1},
++
++ {"supplies", no_argument,&retval,(int)SUPPLIES_FLAG+1},
++ {"cfgsrc", no_argument,&retval,(int)CFGSRC_FLAG+1},
++ {"alerts", no_argument,&retval,(int)ALERTS_FLAG+1},
++ {"reboot", no_argument,&retval,(int)REBOOT_FLAG+1},
+
+ // From here down These all get an extra bit 2 to indicate that they belong
+ // to argval[2] rather than argval[0] or argval[1]
+- {"maxproc",required_argument,&retval,MAXPROC_FLAG+2},
+- {"setcontact",required_argument,&retval,SETCONTACT_FLAG+2},
+- {"setlocation",required_argument,&retval,SETLOCATION_FLAG+2},
+- {"updatefirmware",required_argument,&retval,UPDATEFIRM_FLAG+2},
++ {"maxproc",required_argument,&retval,(int)MAXPROC_FLAG+2},
++ {"setcontact",required_argument,&retval,(int)SETCONTACT_FLAG+2},
++ {"setlocation",required_argument,&retval,(int)SETLOCATION_FLAG+2},
++ {"updatefirmware",required_argument,&retval,(int)UPDATEFIRM_FLAG+2},
+
+ {"community",required_argument,NULL, 'c'},
+ {"timeout",required_argument,NULL, 't'},
diff --git a/net-print/npadmin/npadmin-0.8.7-r1.ebuild b/net-print/npadmin/npadmin-0.8.7-r1.ebuild
new file mode 100644
index 0000000000..97a32f6df8
--- /dev/null
+++ b/net-print/npadmin/npadmin-0.8.7-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Network printer command-line adminstration tool"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://npadmin.sourceforge.net/"
+
+# this does NOT link against SNMP
+DEPEND=""
+
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+LICENSE="GPL-2"
+SLOT="0"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-stdlib.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_install() {
+ dobin npadmin
+ doman npadmin.1
+ dodoc README AUTHORS ChangeLog INSTALL NEWS README TODO
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/npadmin/files/, net-print/npadmin/
@ 2024-04-26 19:13 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2024-04-26 19:13 UTC (permalink / raw
To: gentoo-commits
commit: 5a62c61bc94f482d303b5c7e5fa3cd27cc09d6bb
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Sun Mar 31 19:42:04 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 19:08:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a62c61b
net-print/npadmin: fix configure error on Clang/GCC-14
Bundled configure used bad compiler check script. Running autoreconf
fixed that problem.
Makefile.in contained old name of configure.in, fixed that in patch
EAPI bump and revbump included as now npadmin may pull new compile
flags
Closes: https://bugs.gentoo.org/875749
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/35964
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.../npadmin/files/npadmin-0.8.7-makefile.patch | 43 ++++++++++++++++++++++
net-print/npadmin/npadmin-0.8.7-r2.ebuild | 34 +++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/net-print/npadmin/files/npadmin-0.8.7-makefile.patch b/net-print/npadmin/files/npadmin-0.8.7-makefile.patch
new file mode 100644
index 000000000000..140750a0b0b8
--- /dev/null
+++ b/net-print/npadmin/files/npadmin-0.8.7-makefile.patch
@@ -0,0 +1,43 @@
+--- a/Makefile.in 2024-03-28 13:35:04.247099098 +0000
++++ b/Makefile.in 2024-03-28 13:33:44.610623716 +0000
+@@ -104,7 +104,7 @@
+ NROFF = nroff
+ DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
+ Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.h.in \
+-configure configure.in install-sh memcmp.c missing mkinstalldirs \
++configure configure.ac install-sh memcmp.c missing mkinstalldirs \
+ npadmin.spec.in snprintf.c
+
+
+@@ -118,19 +118,19 @@
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .C .S .c .o .s
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+-$(ACLOCAL_M4): configure.in
++$(ACLOCAL_M4): configure.ac
+ cd $(srcdir) && $(ACLOCAL)
+
+ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
++$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ cd $(srcdir) && $(AUTOCONF)
+
+ config.h: stamp-h
+@@ -148,7 +148,7 @@
+ rm -f $(srcdir)/stamp-h.in; \
+ $(MAKE) $(srcdir)/stamp-h.in; \
+ else :; fi
+-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
++$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) acconfig.h
+ cd $(top_srcdir) && $(AUTOHEADER)
+ @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+
diff --git a/net-print/npadmin/npadmin-0.8.7-r2.ebuild b/net-print/npadmin/npadmin-0.8.7-r2.ebuild
new file mode 100644
index 000000000000..fa6d1bf147cd
--- /dev/null
+++ b/net-print/npadmin/npadmin-0.8.7-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Network printer command-line administration tool"
+HOMEPAGE="https://npadmin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# this does NOT link against SNMP
+# DEPEND=""
+
+PATCHES=(
+ "${FILESDIR}"/${P}-stdlib.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+ "${FILESDIR}"/${P}-makefile.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ dobin npadmin
+ doman npadmin.1
+ dodoc README AUTHORS ChangeLog INSTALL NEWS README TODO
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-26 19:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-17 21:23 [gentoo-commits] repo/gentoo:master commit in: net-print/npadmin/files/, net-print/npadmin/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2024-04-26 19:13 Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox