Date: Sat, 29 Aug 2020 01:40:29 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546861 - head/print/gtklp/files Message-ID: <202008290140.07T1eTjA001301@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008290140.07T1eTjA001301>