[gentoo-commits] repo/gentoo:master commit in: net-print/cndrvcups-common-lb/, net-print/cndrvcups-common-lb/files/

[gentoo-commits] repo/gentoo:master commit in: net-print/cndrvcups-common-lb/, net-print/cndrvcups-common-lb/files/

[David Seifert]

commit:     8d23e5dce4da86e96c010ba02e1cdfa5dc5d5974
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 12:42:56 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 12:42:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d23e5dc

net-print/cndrvcups-common-lb: fix build with gcc-10

Closes: https://bugs.gentoo.org/706888
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../cndrvcups-common-lb-3.70.ebuild                | 16 +++--
 .../cndrvcups-common-lb-3.70-fno-common.patch      | 68 ++++++++++++++++++++++
 2 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index 23e5c3724b5..b6566cc425d 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 MY_PV="$(ver_rs 1- '')"
@@ -15,19 +16,18 @@ SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/08/${SOURCES_NAME}-05.tar.gz"
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6:2
 	>=gnome-base/libglade-2.4:2.0
 	>=net-print/cups-1.1.17
-	>=x11-libs/gtk+-2.4:2
-"
+	>=x11-libs/gtk+-2.4:2"
 DEPEND="${DEPEND}"
-BDEPEND=""
 
 S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 pkg_setup() {
 	# Don't raise a fuss over pre-built binaries
 	QA_PREBUILT="
@@ -39,11 +39,9 @@ pkg_setup() {
 		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
 		/usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
 		/usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-		/usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-	"
+		/usr/$(get_libdir)/libcanonc3pl.so.1.0.0"
 	QA_SONAME="
-		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-	"
+		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0"
 }
 
 src_unpack() {

diff --git a/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch b/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch
new file mode 100644
index 00000000000..fd17f6b72b1
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch
@@ -0,0 +1,68 @@
+--- a/cngplp/src/load.c
++++ b/cngplp/src/load.c
+@@ -29,6 +29,17 @@ GModule* g_module = NULL;
+ char pre_lib_name[MAX_PATH];
+ gboolean first_load = TRUE;
+ 
++void (*ShowPDLDialog)(const char* name, int print);
++gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load);
++void (*UpdatePDLData)(int id, const char* value);
++void (*UpdatePDLDataInt)(int id, int value);
++void (*ClosePDLController)();
++void (*SavePDLPrinterData)();
++void (*PrintPDLFile)();
++char* (*GetPDLData)(int id);
++int (*GetPDLDataInt)(int id, int def);
++int (*ExecPDLJobMode)();
++
+ int LoadPDL(GladeXML* main_xml, const char* print_file)
+ {
+ 	GtkWidget* main_dlg = NULL;
+--- a/cngplp/src/load.h
++++ b/cngplp/src/load.h
+@@ -28,15 +28,15 @@
+ 
+ int LoadPDL(GladeXML* main_xml, const char* print_file);
+ void UnLoadPDL();
+-void (*ShowPDLDialog)(const char* name, int print);
+-gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load);
+-void (*UpdatePDLData)(int id, const char* value);
+-void (*UpdatePDLDataInt)(int id, int value);
+-void (*ClosePDLController)();
+-void (*SavePDLPrinterData)();
+-void (*PrintPDLFile)();
+-char* (*GetPDLData)(int id);
+-int (*GetPDLDataInt)(int id, int def);
+-int (*ExecPDLJobMode)();
++extern void (*ShowPDLDialog)(const char* name, int print);
++extern gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load);
++extern void (*UpdatePDLData)(int id, const char* value);
++extern void (*UpdatePDLDataInt)(int id, int value);
++extern void (*ClosePDLController)();
++extern void (*SavePDLPrinterData)();
++extern void (*PrintPDLFile)();
++extern char* (*GetPDLData)(int id);
++extern int (*GetPDLDataInt)(int id, int def);
++extern int (*ExecPDLJobMode)();
+ 
+ #endif
+--- a/cngplp/src/mainwnd.c
++++ b/cngplp/src/mainwnd.c
+@@ -82,6 +82,17 @@ static int g_stdout_fd;
+ static void SaveOptions();
+ static void LoadOptions();
+ 
++extern void (*ShowPDLDialog)(const char* name, int print);
++extern gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load);
++extern void (*UpdatePDLData)(int id, const char* value);
++extern void (*UpdatePDLDataInt)(int id, int value);
++extern void (*ClosePDLController)();
++extern void (*SavePDLPrinterData)();
++extern void (*PrintPDLFile)();
++extern char* (*GetPDLData)(int id);
++extern int (*GetPDLDataInt)(int id, int def);
++extern int (*ExecPDLJobMode)();
++
+ void DisposeMainDlg()
+ {
+ 	int i = 0;