From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8240513835C for ; Mon, 28 Dec 2020 12:43:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B65A22BC03B; Mon, 28 Dec 2020 12:43:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 87AAC2BC03A for ; Mon, 28 Dec 2020 12:43:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 556BD3413DC for ; Mon, 28 Dec 2020 12:43:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61F7147F for ; Mon, 28 Dec 2020 12:43:20 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1609159376.8d23e5dce4da86e96c010ba02e1cdfa5dc5d5974.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cndrvcups-common-lb/, net-print/cndrvcups-common-lb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch X-VCS-Directories: net-print/cndrvcups-common-lb/ net-print/cndrvcups-common-lb/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8d23e5dce4da86e96c010ba02e1cdfa5dc5d5974 X-VCS-Branch: master Date: Mon, 28 Dec 2020 12:43:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d00d839-7166-4684-90bd-b4405152a5a4 X-Archives-Hash: e9274f37544de69be2a6b2e6a1e68dd4 commit: 8d23e5dce4da86e96c010ba02e1cdfa5dc5d5974 Author: Jakov Smolic sartura hr> AuthorDate: Mon Dec 28 12:42:56 2020 +0000 Commit: David Seifert gentoo 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 sartura.hr> Signed-off-by: David Seifert 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;