Index: branches/2020Q3/print/gtklp/files/patch-gtklp_gtklp.c
===================================================================
--- branches/2020Q3/print/gtklp/files/patch-gtklp_gtklp.c	(nonexistent)
+++ branches/2020Q3/print/gtklp/files/patch-gtklp_gtklp.c	(revision 546862)
@@ -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];

Property changes on: branches/2020Q3/print/gtklp/files/patch-gtklp_gtklp.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3/print/gtklp/files/patch-gtklp_gtklp__functions.c
===================================================================
--- branches/2020Q3/print/gtklp/files/patch-gtklp_gtklp__functions.c	(nonexistent)
+++ branches/2020Q3/print/gtklp/files/patch-gtklp_gtklp__functions.c	(revision 546862)
@@ -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

Property changes on: branches/2020Q3/print/gtklp/files/patch-gtklp_gtklp__functions.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3/print/gtklp/files/patch-gtklpq_gtklpq.c
===================================================================
--- branches/2020Q3/print/gtklp/files/patch-gtklpq_gtklpq.c	(nonexistent)
+++ branches/2020Q3/print/gtklp/files/patch-gtklpq_gtklpq.c	(revision 546862)
@@ -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[])
+ {

Property changes on: branches/2020Q3/print/gtklp/files/patch-gtklpq_gtklpq.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3/print/gtklp/files/patch-libgtklp_libgtklp.h
===================================================================
--- branches/2020Q3/print/gtklp/files/patch-libgtklp_libgtklp.h	(nonexistent)
+++ branches/2020Q3/print/gtklp/files/patch-libgtklp_libgtklp.h	(revision 546862)
@@ -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 */

Property changes on: branches/2020Q3/print/gtklp/files/patch-libgtklp_libgtklp.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 546861)
+++ branches/2020Q3	(revision 546862)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r546861