From owner-svn-ports-head@freebsd.org Sat Aug 29 01:40:30 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8DE193C9BEF; Sat, 29 Aug 2020 01:40:30 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BdfL63FjJz3Vr8; Sat, 29 Aug 2020 01:40:30 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52D081E214; Sat, 29 Aug 2020 01:40:30 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07T1eUk7001305; Sat, 29 Aug 2020 01:40:30 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07T1eTjA001301; Sat, 29 Aug 2020 01:40:29 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202008290140.07T1eTjA001301@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sat, 29 Aug 2020 01:40:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546861 - head/print/gtklp/files X-SVN-Group: ports-head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/print/gtklp/files X-SVN-Commit-Revision: 546861 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Aug 2020 01:40:30 -0000 Author: kevans Date: Sat Aug 29 01:40:29 2020 New Revision: 546861 URL: https://svnweb.freebsd.org/changeset/ports/546861 Log: print/gtklp: fix build with -fno-common Just a couple of duplicate symbols here. PR: 248852 MFH: 2020Q3 (-fno-common build fix) Added: head/print/gtklp/files/ head/print/gtklp/files/patch-gtklp_gtklp.c (contents, props changed) head/print/gtklp/files/patch-gtklp_gtklp__functions.c (contents, props changed) head/print/gtklp/files/patch-gtklpq_gtklpq.c (contents, props changed) head/print/gtklp/files/patch-libgtklp_libgtklp.h (contents, props changed) Added: head/print/gtklp/files/patch-gtklp_gtklp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/gtklp/files/patch-gtklp_gtklp.c Sat Aug 29 01:40:29 2020 (r546861) @@ -0,0 +1,10 @@ +--- gtklp/gtklp.c.orig 2019-11-01 16:27:28 UTC ++++ gtklp/gtklp.c +@@ -119,7 +119,6 @@ ppd_file_t *printerPPD; + int PPDopen; + char *PPDfilename; + int conflict_active; +-int nox; + int num_commandline_opts; + cups_option_t *commandline_opts; + char nupLayout[5]; Added: head/print/gtklp/files/patch-gtklp_gtklp__functions.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/gtklp/files/patch-gtklp_gtklp__functions.c Sat Aug 29 01:40:29 2020 (r546861) @@ -0,0 +1,20 @@ +--- gtklp/gtklp_functions.c.orig 2019-11-01 16:27:28 UTC ++++ gtklp/gtklp_functions.c +@@ -57,17 +57,6 @@ + #include "conflict.xpm" + #include "rarrow.xpm" + +-unsigned topmargin, bottommargin, leftmargin, rightmargin; +-int imageScalingType; +-double imageScalingScalingValue; +-double imageScalingNaturalValue; +-double imageScalingPPIValue; +-int hasAskedPWD; +- +-ppd_file_t *printerPPD; +- +-GtkWidget *mainWindow; +- + #if GTK_MAJOR_VERSION == 1 + GtkWidget *button_inst_save_label; + #else Added: head/print/gtklp/files/patch-gtklpq_gtklpq.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/gtklp/files/patch-gtklpq_gtklpq.c Sat Aug 29 01:40:29 2020 (r546861) @@ -0,0 +1,23 @@ +--- gtklpq/gtklpq.c.orig 2019-11-01 16:27:28 UTC ++++ gtklpq/gtklpq.c +@@ -79,20 +79,7 @@ GtkWidget *dialog; + + int m_id_upd, c_id_upd, m_id_state, c_id_state; + +-char PrinterNames[MAX_PRT][DEF_PRN_LEN + 1]; +-char PrinterInfos[MAX_PRT][MAXLINE + 1]; +-char PrinterLocations[MAX_PRT][MAXLINE + 1]; +-int PrinterNum; +-int PrinterChoice; +-char PrinterBannerStart[MAX_PRT][MAXLINE + 1]; +-char PrinterBannerEnd[MAX_PRT][MAXLINE + 1]; +- + unsigned int selectedJob; +- +-int lastPrinterChoice; +- +-http_t *cupsHttp; +-cups_lang_t *cupsLanguage; + + int main(int argc, char *argv[]) + { Added: head/print/gtklp/files/patch-libgtklp_libgtklp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/gtklp/files/patch-libgtklp_libgtklp.h Sat Aug 29 01:40:29 2020 (r546861) @@ -0,0 +1,11 @@ +--- libgtklp/libgtklp.h.orig 2019-11-01 16:27:28 UTC ++++ libgtklp/libgtklp.h +@@ -80,7 +80,7 @@ void exitOnError(char *gerror1, char *gerror2, int exi + void hello(GtkWidget * widget, gpointer data); + void button_pad(GtkWidget * widget); + #if GTK_MAJOR_VERSION != 1 +-GtkWidget *progressBar; ++extern GtkWidget *progressBar; + void setWindowDefaultIcons(void); + #endif + #endif /* LIBGTKLP_H */