1 |
commit: 8d23e5dce4da86e96c010ba02e1cdfa5dc5d5974 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 12:42:56 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 12:42:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d23e5dc |
7 |
|
8 |
net-print/cndrvcups-common-lb: fix build with gcc-10 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706888 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
.../cndrvcups-common-lb-3.70.ebuild | 16 +++-- |
16 |
.../cndrvcups-common-lb-3.70-fno-common.patch | 68 ++++++++++++++++++++++ |
17 |
2 files changed, 75 insertions(+), 9 deletions(-) |
18 |
|
19 |
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 |
20 |
index 23e5c3724b5..b6566cc425d 100644 |
21 |
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild |
22 |
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild |
23 |
@@ -1,7 +1,8 @@ |
24 |
-# Copyright 1999-2019 Gentoo Authors |
25 |
+# Copyright 1999-2020 Gentoo Authors |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=7 |
29 |
+ |
30 |
inherit autotools |
31 |
|
32 |
MY_PV="$(ver_rs 1- '')" |
33 |
@@ -15,19 +16,18 @@ SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/08/${SOURCES_NAME}-05.tar.gz" |
34 |
LICENSE="Canon-UFR-II GPL-2 MIT" |
35 |
SLOT="0" |
36 |
KEYWORDS="-* ~amd64 ~x86" |
37 |
-IUSE="" |
38 |
|
39 |
RDEPEND=" |
40 |
>=dev-libs/libxml2-2.6:2 |
41 |
>=gnome-base/libglade-2.4:2.0 |
42 |
>=net-print/cups-1.1.17 |
43 |
- >=x11-libs/gtk+-2.4:2 |
44 |
-" |
45 |
+ >=x11-libs/gtk+-2.4:2" |
46 |
DEPEND="${DEPEND}" |
47 |
-BDEPEND="" |
48 |
|
49 |
S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}" |
50 |
|
51 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
52 |
+ |
53 |
pkg_setup() { |
54 |
# Don't raise a fuss over pre-built binaries |
55 |
QA_PREBUILT=" |
56 |
@@ -39,11 +39,9 @@ pkg_setup() { |
57 |
/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0 |
58 |
/usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0 |
59 |
/usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0 |
60 |
- /usr/$(get_libdir)/libcanonc3pl.so.1.0.0 |
61 |
- " |
62 |
+ /usr/$(get_libdir)/libcanonc3pl.so.1.0.0" |
63 |
QA_SONAME=" |
64 |
- /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0 |
65 |
- " |
66 |
+ /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0" |
67 |
} |
68 |
|
69 |
src_unpack() { |
70 |
|
71 |
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 |
72 |
new file mode 100644 |
73 |
index 00000000000..fd17f6b72b1 |
74 |
--- /dev/null |
75 |
+++ b/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch |
76 |
@@ -0,0 +1,68 @@ |
77 |
+--- a/cngplp/src/load.c |
78 |
++++ b/cngplp/src/load.c |
79 |
+@@ -29,6 +29,17 @@ GModule* g_module = NULL; |
80 |
+ char pre_lib_name[MAX_PATH]; |
81 |
+ gboolean first_load = TRUE; |
82 |
+ |
83 |
++void (*ShowPDLDialog)(const char* name, int print); |
84 |
++gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load); |
85 |
++void (*UpdatePDLData)(int id, const char* value); |
86 |
++void (*UpdatePDLDataInt)(int id, int value); |
87 |
++void (*ClosePDLController)(); |
88 |
++void (*SavePDLPrinterData)(); |
89 |
++void (*PrintPDLFile)(); |
90 |
++char* (*GetPDLData)(int id); |
91 |
++int (*GetPDLDataInt)(int id, int def); |
92 |
++int (*ExecPDLJobMode)(); |
93 |
++ |
94 |
+ int LoadPDL(GladeXML* main_xml, const char* print_file) |
95 |
+ { |
96 |
+ GtkWidget* main_dlg = NULL; |
97 |
+--- a/cngplp/src/load.h |
98 |
++++ b/cngplp/src/load.h |
99 |
+@@ -28,15 +28,15 @@ |
100 |
+ |
101 |
+ int LoadPDL(GladeXML* main_xml, const char* print_file); |
102 |
+ void UnLoadPDL(); |
103 |
+-void (*ShowPDLDialog)(const char* name, int print); |
104 |
+-gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load); |
105 |
+-void (*UpdatePDLData)(int id, const char* value); |
106 |
+-void (*UpdatePDLDataInt)(int id, int value); |
107 |
+-void (*ClosePDLController)(); |
108 |
+-void (*SavePDLPrinterData)(); |
109 |
+-void (*PrintPDLFile)(); |
110 |
+-char* (*GetPDLData)(int id); |
111 |
+-int (*GetPDLDataInt)(int id, int def); |
112 |
+-int (*ExecPDLJobMode)(); |
113 |
++extern void (*ShowPDLDialog)(const char* name, int print); |
114 |
++extern gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load); |
115 |
++extern void (*UpdatePDLData)(int id, const char* value); |
116 |
++extern void (*UpdatePDLDataInt)(int id, int value); |
117 |
++extern void (*ClosePDLController)(); |
118 |
++extern void (*SavePDLPrinterData)(); |
119 |
++extern void (*PrintPDLFile)(); |
120 |
++extern char* (*GetPDLData)(int id); |
121 |
++extern int (*GetPDLDataInt)(int id, int def); |
122 |
++extern int (*ExecPDLJobMode)(); |
123 |
+ |
124 |
+ #endif |
125 |
+--- a/cngplp/src/mainwnd.c |
126 |
++++ b/cngplp/src/mainwnd.c |
127 |
+@@ -82,6 +82,17 @@ static int g_stdout_fd; |
128 |
+ static void SaveOptions(); |
129 |
+ static void LoadOptions(); |
130 |
+ |
131 |
++extern void (*ShowPDLDialog)(const char* name, int print); |
132 |
++extern gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const char* print_file, gboolean first_load); |
133 |
++extern void (*UpdatePDLData)(int id, const char* value); |
134 |
++extern void (*UpdatePDLDataInt)(int id, int value); |
135 |
++extern void (*ClosePDLController)(); |
136 |
++extern void (*SavePDLPrinterData)(); |
137 |
++extern void (*PrintPDLFile)(); |
138 |
++extern char* (*GetPDLData)(int id); |
139 |
++extern int (*GetPDLDataInt)(int id, int def); |
140 |
++extern int (*ExecPDLJobMode)(); |
141 |
++ |
142 |
+ void DisposeMainDlg() |
143 |
+ { |
144 |
+ int i = 0; |