commit: 41eab49a49ca83d642f6fe4fa3540d048b6efc3b Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Tue Mar 11 19:30:19 2025 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Tue Mar 11 19:32:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41eab49a
net-print/epson-inkjet-printer-escpr: Compilation fixes Fix function arguments, gcc-15 fixes Closes: https://bugs.gentoo.org/944979 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> .../epson-inkjet-printer-escpr-1.2.15-r1.ebuild | 38 ++++++++++++++++++++++ ...pson-inkjet-printer-escpr-1.2-filter-func.patch | 11 +++++++ .../epson-inkjet-printer-escpr-1.2-gcc15.patch | 23 +++++++++++++ 3 files changed, 72 insertions(+) diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15-r1.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15-r1.ebuild new file mode 100644 index 000000000000..24d820039d6a --- /dev/null +++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.2.15-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="${PN}2-${PV}" + +DESCRIPTION="Epson Inkjet Printer Driver 2 (ESC/P-R) for Linux" +HOMEPAGE="https://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"; +SRC_URI="https://download3.ebz.epson.net/dsc/f/03/00/16/06/85/fddc1d5996d0cab4dceea35852a2e430fb124993/${MY_P}-1.tar.gz"; +S="${WORKDIR}/${MY_P}" +LICENSE="EPSON LGPL-2.1+" +SLOT="2" +KEYWORDS="~amd64" + +QA_FLAGS_IGNORED="/usr/lib64/libescpr2.so.1.0.0" + +DEPEND="net-print/cups" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/gcc-no-implicit-function-declaration-$(ver_cut 1-2 ${PV}).patch" + "${FILESDIR}/${PN}-$(ver_cut 1-2 ${PV})-gcc15.patch" + "${FILESDIR}/${PN}-$(ver_cut 1-2 ${PV})-filter-func.patch" +) + +src_configure() { + econf \ + --with-cupsfilterdir="${EPREFIX}/usr/libexec/cups/filter"\ + --with-cupsppddir="${EPREFIX}/usr/share/ppd" +} + +src_install() { + default + + find "${ED}/usr/lib64" -name "*.la" -delete \ + || die "Removal of libtool files (.la) has failed." +} diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.2-filter-func.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.2-filter-func.patch new file mode 100644 index 000000000000..b800f74531c0 --- /dev/null +++ b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.2-filter-func.patch @@ -0,0 +1,11 @@ +--- a/src/filter.c 2025-03-11 13:42:50.136160524 -0400 ++++ b/src/filter.c 2025-03-11 13:43:06.210514768 -0400 +@@ -450,7 +450,7 @@ main (int argc, char *argv[]) + + debug_msg("call SendStartJob function\n"); + +- err = SendStartJob(FALSE); ++ err = SendStartJob(); + + if (err){ + debug_msg("Error occurred in \"SendStartJob\": %d\n", err); diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.2-gcc15.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.2-gcc15.patch new file mode 100644 index 000000000000..076d444234a7 --- /dev/null +++ b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.2-gcc15.patch @@ -0,0 +1,23 @@ +--- a/src/Makefile.in 2025-03-11 13:27:10.299747040 -0400 ++++ b/src/Makefile.in 2025-03-11 13:34:22.746707500 -0400 +@@ -319,7 +319,9 @@ AM_LDFLAGS = -lpthread -lm + cupsfilterdir = $(CUPS_FILTER_DIR) + ESCPR_LIB_DIR = ../escprlib + epson_escpr_wrapper2_CFLAGS = \ +- -Wall\ ++ -Wno-pointer-sign\ ++ -Wno-unused-result\ ++ -Wno-deprecated-declarations\ + -DCUPS_FILTER_NAME=\"epson-escpr2\" \ + -DCUPS_FILTER_PATH=\"$(CUPS_FILTER_DIR)\" \ + -DGCOMSW_PRIVATE +@@ -332,7 +334,8 @@ epson_escpr_wrapper2_SOURCES = \ + epson_escpr2_CFLAGS = \ + -I$(top_srcdir)/escprlib/include \ + -DGCOMSW_PRIVATE \ +- -DEPS_FILTER ++ -DEPS_FILTER\ ++ -Wno-unused-result + + epson_escpr2_SOURCES = \ + filter.c \
