commit: 479248d6e040cf019d4abe99bc42dcc78f6b43e7 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Thu Nov 28 11:09:41 2024 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Thu Nov 28 11:10:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479248d6
net-print/cnijfilter2: fix gcc-23 issues Closes: https://bugs.gentoo.org/944980 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> net-print/cnijfilter2/cnijfilter2-6.70.ebuild | 5 +++-- net-print/cnijfilter2/files/cnijfilter2-6.70-c23.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/net-print/cnijfilter2/cnijfilter2-6.70.ebuild b/net-print/cnijfilter2/cnijfilter2-6.70.ebuild index b2f835c76756..bee7634c9ecb 100644 --- a/net-print/cnijfilter2/cnijfilter2-6.70.ebuild +++ b/net-print/cnijfilter2/cnijfilter2-6.70.ebuild @@ -11,6 +11,8 @@ DESCRIPTION="IJ Printer Driver" HOMEPAGE="https://www.usa.canon.com/support/p/pixma-g4270#idReference%3Dsoftware-drivers"; SRC_URI="https://gdlp01.c-wss.com/gds/7/0100012137/01/${PN}-source-${PV}-1.tar.gz"; +S="${WORKDIR}"/${MY_P} + LICENSE="Canon-IJ" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -20,13 +22,12 @@ DEPEND="virtual/libusb:1 net-print/cups" RDEPEND="${DEPEND}" -S="${WORKDIR}"/${MY_P} - PATCHES=( "${FILESDIR}"/${PN}-6.50-gentoo.patch "${FILESDIR}"/${PN}-5.80-cflags.patch "${FILESDIR}"/${PN}-5.80-fno-common.patch "${FILESDIR}"/${PN}-6.60-c99.patch + "${FILESDIR}"/${P}-c23.patch ) pkg_setup() { diff --git a/net-print/cnijfilter2/files/cnijfilter2-6.70-c23.patch b/net-print/cnijfilter2/files/cnijfilter2-6.70-c23.patch new file mode 100644 index 000000000000..5604c29a312b --- /dev/null +++ b/net-print/cnijfilter2/files/cnijfilter2-6.70-c23.patch @@ -0,0 +1,13 @@ +--- a/lgmon3/src/common/libcnnet2_type.h 2024-11-28 10:21:02.088649219 +0100 ++++ b/lgmon3/src/common/libcnnet2_type.h 2024-11-28 10:22:01.171874307 +0100 +@@ -48,8 +48,10 @@ + } CNNET2_SETTING_FLAGS; + + #ifndef __cplusplus ++#if (__STD_VERSION__ <= 201710L) + typedef char bool; + #endif ++#endif + + typedef struct { + int nicIndex_;
