From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 7 Jun 2023 04:29:39 +0000 (-0400)
Subject: print: Maintain compatibility
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~171^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=30ff35296039946924c977e5d8dd6f767a53d6fa;p=gtk4.git

print: Maintain compatibility

gtkunixprint.h is a public header, that needs
to keep being installed in the same location.
---

diff --git a/gtk/gtkunixprint.h b/gtk/gtkunixprint.h
new file mode 100644
index 0000000000..79158f1ef3
--- /dev/null
+++ b/gtk/gtkunixprint.h
@@ -0,0 +1,27 @@
+/* GtkUnixPrint
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define __GTK_UNIX_PRINT_H_INSIDE__
+
+#include <gtk/print/gtkpagesetupunixdialog.h>
+#include <gtk/print/gtkprinter.h>
+#include <gtk/print/gtkprintjob.h>
+#include <gtk/print/gtkprintunixdialog.h>
+
+#undef __GTK_UNIX_PRINT_H_INSIDE__
+
diff --git a/gtk/meson.build b/gtk/meson.build
index 7b8926451b..84e8b0ad89 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -675,8 +675,13 @@ if os_unix and tracker3_dep.found()
   gtk_sources += 'gtksearchenginetracker3.c'
 endif
 
+gtk_unix_print_main_header = [
+  'gtkunixprint.h'
+]
+
 if os_unix
-  install_headers(gtk_unix_print_headers, subdir: 'gtk-4.0/unix-print/gtk')
+  install_headers(gtk_unix_print_main_header, subdir: 'gtk-4.0/unix-print/gtk')
+  install_headers(gtk_unix_print_headers, subdir: 'gtk-4.0/unix-print/gtk/print')
   gtk_sources += gtk_unix_print_sources
 endif
 
@@ -1254,7 +1259,7 @@ if build_gir
   ]
 
   if os_unix
-    gtk_introspection_sources += [ gtk_unix_print_headers, gtk_unix_print_sources ]
+    gtk_introspection_sources += [ gtk_unix_print_headers + gtk_unix_print_main_header, gtk_unix_print_sources ]
   endif
 
   if os_win32
diff --git a/gtk/print/gtkunixprint.h b/gtk/print/gtkunixprint.h
deleted file mode 100644
index 79158f1ef3..0000000000
--- a/gtk/print/gtkunixprint.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* GtkUnixPrint
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define __GTK_UNIX_PRINT_H_INSIDE__
-
-#include <gtk/print/gtkpagesetupunixdialog.h>
-#include <gtk/print/gtkprinter.h>
-#include <gtk/print/gtkprintjob.h>
-#include <gtk/print/gtkprintunixdialog.h>
-
-#undef __GTK_UNIX_PRINT_H_INSIDE__
-
diff --git a/gtk/print/meson.build b/gtk/print/meson.build
index 79f4d085de..a5263da99d 100644
--- a/gtk/print/meson.build
+++ b/gtk/print/meson.build
@@ -26,7 +26,6 @@ if os_unix
     'gtkprintunixdialog.h',
     'gtkprinter.h',
     'gtkprintjob.h',
-    'gtkunixprint.h',
   ])
 
   gtk_unix_print_sources += files([
diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c
index aa9b515878..0382c8983d 100644
--- a/modules/printbackends/gtkprintbackendcups.c
+++ b/modules/printbackends/gtkprintbackendcups.c
@@ -45,8 +45,8 @@
 #include <gmodule.h>
 
 #include <gtk/gtk.h>
+#include <gtk/gtkunixprint.h>
 #include <gtk/print/gtkprintbackendprivate.h>
-#include <gtk/print/gtkunixprint.h>
 #include <gtk/print/gtkprinterprivate.h>
 #include <gtk/gtkprivate.h>
 
diff --git a/modules/printbackends/gtkprintercups.h b/modules/printbackends/gtkprintercups.h
index fb67f6ac83..30edcece27 100644
--- a/modules/printbackends/gtkprintercups.h
+++ b/modules/printbackends/gtkprintercups.h
@@ -23,7 +23,7 @@
 #include <cups/ppd.h>
 #include "gtkcupsutils.h"
 
-#include <gtk/print/gtkunixprint.h>
+#include <gtk/gtkunixprint.h>
 #include <gtk/print/gtkprinterprivate.h>
 
 #ifdef HAVE_COLORD