* [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/files/, net-dialup/lrzsz/
@ 2023-03-10 13:55 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-03-10 13:55 UTC (permalink / raw
To: gentoo-commits
commit: d7f6f2d938cc48a64919dce4fa295d4751c71a51
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 13:53:14 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 13:55:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f6f2d9
net-dialup/lrzsz: fix configure w/ clang 16
Closes: https://bugs.gentoo.org/898970
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../lrzsz/files/lrzsz-0.12.20-configure-clang16.patch | 13 +++++++++++++
.../{lrzsz-0.12.20-r4.ebuild => lrzsz-0.12.20-r5.ebuild} | 6 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-configure-clang16.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-configure-clang16.patch
new file mode 100644
index 000000000000..bda489d11dd4
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-configure-clang16.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/898970
+--- a/configure.in
++++ b/configure.in
+@@ -186,7 +186,8 @@ AC_CACHE_VAL(lrzsz_cv_sys_ftime_ok,
+ #include <sys/types.h>
+ #include <sys/timeb.h>
+ #include <stdio.h>
+-main ()
++#include <stdlib.h>
++int main (void)
+ {
+ struct timeb s, slast;
+ int c = 0;
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r5.ebuild
similarity index 92%
rename from net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
rename to net-dialup/lrzsz/lrzsz-0.12.20-r5.ebuild
index 9134cf53053f..ba988723b913 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
+inherit autotools toolchain-funcs
DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
@@ -23,6 +23,7 @@ PATCHES=(
"${FILESDIR}"/${P}-automake-1.13.patch
"${FILESDIR}"/${P}-gettext-0.20.patch
"${FILESDIR}"/${P}-AR.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
)
DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
@@ -43,7 +44,6 @@ src_prepare() {
src_configure() {
tc-export CC
- append-flags -Wstrict-prototypes
econf $(use_enable nls)
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/files/, net-dialup/lrzsz/
@ 2023-07-28 12:06 Viorel Munteanu
0 siblings, 0 replies; 3+ messages in thread
From: Viorel Munteanu @ 2023-07-28 12:06 UTC (permalink / raw
To: gentoo-commits
commit: b647c383f528693999a2774a5d7f7726f57e2605
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 11:58:43 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 12:06:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b647c383
net-dialup/lrzsz: fix gettext 0.22
Fix compilation with gettext 0.22.
Update EAPI 7 -> 8.
Closes: https://bugs.gentoo.org/908861
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../lrzsz/files/lrzsz-0.12.20-gettext-0.22.patch | 48 ++++++++++++++++
net-dialup/lrzsz/lrzsz-0.12.20-r6.ebuild | 67 ++++++++++++++++++++++
2 files changed, 115 insertions(+)
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.22.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.22.patch
new file mode 100644
index 000000000000..016e6dd40262
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.22.patch
@@ -0,0 +1,48 @@
+gettext 0.22 removed BUILD_INCLUDED_LIBINTL and USE_INCLUDED_LIBINTL is 'no'
+
+INSTOBJEXT was deprecated and removed, replace with .mo
+
+Bug: https://bugs.gentoo.org/908861
+
+--- a/intl/Makefile.in
++++ b/intl/Makefile.in
+@@ -81,7 +81,7 @@
+
+ INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
+
+-all: all-@USE_INCLUDED_LIBINTL@
++all: all-no
+
+ all-yes: libintl.$la intlh.inst
+ all-no:
+--- a/configure.in
++++ b/configure.in
+@@ -98,7 +98,7 @@
+ AM_PROG_AR
+ AC_ISC_POSIX
+ AC_USE_SYSTEM_EXTENSIONS
+-AM_GNU_GETTEXT
++AM_GNU_GETTEXT([use-libtool])
+ AC_C_CONST
+ AC_C_INLINE
+
+@@ -264,6 +264,8 @@
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(LIBS)
+
++INTLLIBS="$LIBINTL"
++AC_SUBST(INTLLIBS)
+
+ AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME", [LOCALEDIR])
+ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
+@@ -53,7 +53,7 @@
+
+ CATALOGS = de.gmo
+ CATOBJEXT = @CATOBJEXT@
+-INSTOBJEXT = @INSTOBJEXT@
++INSTOBJEXT = .mo
+
+ .SUFFIXES:
+ .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r6.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r6.ebuild
new file mode 100644
index 000000000000..08671484501a
--- /dev/null
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
+HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
+SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DEPEND="nls? ( virtual/libintl )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-autotools.patch
+ "${FILESDIR}"/${PN}-implicit-decl.patch
+ "${FILESDIR}"/${P}-automake-1.12.patch
+ "${FILESDIR}"/${P}-automake-1.13.patch
+ "${FILESDIR}"/${P}-gettext-0.20.patch
+ "${FILESDIR}"/${P}-AR.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
+ "${FILESDIR}"/${P}-gettext-0.22.patch
+)
+
+DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
+ README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO )
+
+src_prepare() {
+ default
+
+ # automake is unhappy if this is missing
+ >> config.rpath || die
+ # This is too old. Remove it so automake puts in a newer copy.
+ rm missing || die
+ # Autoheader does not like seeing this file.
+ rm acconfig.h || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC
+
+ econf $(use_enable nls)
+}
+
+src_test() {
+ # Don't use check target.
+ # See bug #120748 before changing this function.
+ emake vcheck
+}
+
+src_install() {
+ default
+
+ local x
+ for x in {r,s}{b,x,z} ; do
+ dosym l${x} /usr/bin/${x}
+ dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
+ [ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
+ done
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/files/, net-dialup/lrzsz/
@ 2023-08-20 6:24 Viorel Munteanu
0 siblings, 0 replies; 3+ messages in thread
From: Viorel Munteanu @ 2023-08-20 6:24 UTC (permalink / raw
To: gentoo-commits
commit: b71db11c9c7b4b0d79de03f603f4398f3cf2f3a3
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 16:34:27 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 06:24:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71db11c
net-dialup/lrzsz: fix installation without gettext
If gettext is not installed, eautoreconf breaks the package. Embed
required m4 files to fix this.
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-dialup/lrzsz/Manifest | 1 +
.../lrzsz/files/lrzsz-0.12.20-disable-nls.patch | 25 ++++++++
net-dialup/lrzsz/lrzsz-0.12.20-r7.ebuild | 74 ++++++++++++++++++++++
3 files changed, 100 insertions(+)
diff --git a/net-dialup/lrzsz/Manifest b/net-dialup/lrzsz/Manifest
index 77293a9cd1d0..7e386a9ee3bb 100644
--- a/net-dialup/lrzsz/Manifest
+++ b/net-dialup/lrzsz/Manifest
@@ -1 +1,2 @@
DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
+DIST lrzsz-m4-0.12.20.tar.bz2 23959 BLAKE2B 933e43f80a40478baef77d69f81fcb04947f2d0afb87f777b0c000ea4223408bf3e55d687cf625ab4835fb30e274f7058ff09ee3b51ad90e09723cd3053ee038 SHA512 c8818381f2e5271bc2dd7d469c0a33a6b22d42d3159b41f168223473a8b03322f3ff91a49ce398e3ef5abe7b355d92b83b1429d0c6d450d19985a60e2e1190d4
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-disable-nls.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-disable-nls.patch
new file mode 100644
index 000000000000..b0f290e71564
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-disable-nls.patch
@@ -0,0 +1,25 @@
+This package does not contain the m4 macros from gettext, so if gettext is not
+installed the macros are lost when running eautoreconf.
+
+Embed the required m4 files and add the directory to configure.ac.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -5,6 +5,7 @@
+ noinst_SCRIPTS=systype
+ PR=@PACKAGE@-@VERSION@
+ CLEAN_FILES=fastcheck.done
++AC_CONFIG_MACRO_DIR=-I m4
+
+ dist-hook:
+ mkdir $(distdir)/debian
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,7 @@
+ AC_INIT(src/crctab.c)
+ AM_INIT_AUTOMAKE(lrzsz, 0.12.20)
+ AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_MACRO_DIR([m4])
+
+
+ dnl AC_C_CROSS is in AC_PROG_CC since 2.12
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r7.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r7.ebuild
new file mode 100644
index 000000000000..252debc21c72
--- /dev/null
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
+HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
+SRC_URI="
+ https://www.ohse.de/uwe/releases/${P}.tar.gz
+ https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+DEPEND="nls? ( virtual/libintl )"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-autotools.patch
+ "${FILESDIR}"/${PN}-implicit-decl.patch
+ "${FILESDIR}"/${P}-automake-1.12.patch
+ "${FILESDIR}"/${P}-automake-1.13.patch
+ "${FILESDIR}"/${P}-gettext-0.20.patch
+ "${FILESDIR}"/${P}-AR.patch
+ "${FILESDIR}"/${P}-configure-clang16.patch
+ "${FILESDIR}"/${P}-gettext-0.22.patch
+ "${FILESDIR}"/${P}-disable-nls.patch
+)
+
+DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
+ README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO )
+
+src_prepare() {
+ default
+
+ # automake is unhappy if this is missing
+ >> config.rpath || die
+ # This is too old. Remove it so automake puts in a newer copy.
+ rm missing || die
+ # Autoheader does not like seeing this file.
+ rm acconfig.h || die
+ # embed default m4 files in case gettext is not installed
+ mv "${WORKDIR}"/m4 . || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC
+
+ econf $(use_enable nls)
+}
+
+src_test() {
+ # Don't use check target.
+ # See bug #120748 before changing this function.
+ emake vcheck
+}
+
+src_install() {
+ default
+
+ local x
+ for x in {r,s}{b,x,z} ; do
+ dosym l${x} /usr/bin/${x}
+ dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
+ [ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
+ done
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-20 6:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-10 13:55 [gentoo-commits] repo/gentoo:master commit in: net-dialup/lrzsz/files/, net-dialup/lrzsz/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-07-28 12:06 Viorel Munteanu
2023-08-20 6:24 Viorel Munteanu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox