print: Install headers in a subdir

This is a first step towards isolating the printing
code within gtk.

gtk/gtk.h

@@ -200,19 +200,19 @@
 #include <gtk/gtkoverlay.h>
 #include <gtk/gtkoverlaylayout.h>
 #include <gtk/gtkpadcontroller.h>
-#include <gtk/gtkpagesetup.h>
+#include <gtk/print/gtkpagesetup.h>
 #include <gtk/gtkpaned.h>
-#include <gtk/gtkpapersize.h>
+#include <gtk/print/gtkpapersize.h>
 #include <gtk/gtkpasswordentry.h>
 #include <gtk/gtkpasswordentrybuffer.h>
 #include <gtk/gtkpicture.h>
 #include <gtk/gtkpopover.h>
 #include <gtk/gtkpopovermenu.h>
 #include <gtk/gtkpopovermenubar.h>
-#include <gtk/gtkprintcontext.h>
-#include <gtk/gtkprintoperation.h>
-#include <gtk/gtkprintoperationpreview.h>
-#include <gtk/gtkprintsettings.h>
+#include <gtk/print/gtkprintcontext.h>
+#include <gtk/print/gtkprintoperation.h>
+#include <gtk/print/gtkprintoperationpreview.h>
+#include <gtk/print/gtkprintsettings.h>
 #include <gtk/gtkprogressbar.h>
 #include <gtk/gtkrange.h>
 #include <gtk/gtkrecentmanager.h>

gtk/gtkpagesetup.c

@@ -18,9 +18,9 @@
 
 #include "config.h"
 
-#include "gtkpagesetup.h"
+#include "print/gtkpagesetup.h"
 #include "gtkprintutilsprivate.h"
-#include "gtkprintoperation.h" /* for GtkPrintError */
+#include "print/gtkprintoperation.h" /* for GtkPrintError */
 #include <glib/gi18n-lib.h>
 #include "gtktypebuiltins.h"
 

gtk/gtkpagesetupunixdialog.c

@@ -33,7 +33,7 @@
 #include "gtkpagesetupunixdialog.h"
 #include "gtkcustompaperunixdialog.h"
 #include "gtkprintbackendprivate.h"
-#include "gtkpapersize.h"
+#include "print/gtkpapersize.h"
 #include "gtkprintutilsprivate.h"
 #include "deprecated/gtkdialogprivate.h"
 

gtk/gtkpapersize.c

@@ -26,9 +26,9 @@
 #endif
 #include <math.h>
 
-#include "gtkpapersize.h"
+#include "print/gtkpapersize.h"
 #include "gtkprintutilsprivate.h"
-#include "gtkprintoperation.h"  /* for GtkPrintError */
+#include "print/gtkprintoperation.h"  /* for GtkPrintError */
 #include <glib/gi18n-lib.h>
 
 /* _gtk_load_custom_papers() only on Unix so far  */

gtk/gtkprintoperation-portal.c

@@ -31,8 +31,8 @@
 
 #include "gtkprintoperation-private.h"
 #include "gtkprintoperation-portal.h"
-#include "gtkprintsettings.h"
-#include "gtkpagesetup.h"
+#include "print/gtkprintsettings.h"
+#include "print/gtkpagesetup.h"
 #include "gtkprintbackendprivate.h"
 #include "gtkfilelauncher.h"
 #include <glib/gi18n-lib.h>

gtk/gtkprintoperation-portal.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "gtkprintoperation.h"
+#include "print/gtkprintoperation.h"
 
 G_BEGIN_DECLS
 

gtk/gtkprintoperation-private.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "gtkprintoperation.h"
+#include "print/gtkprintoperation.h"
 
 G_BEGIN_DECLS
 

gtk/gtkprintoperationpreview.c

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "gtkprintoperationpreview.h"
+#include "print/gtkprintoperationpreview.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 

gtk/gtkprintsettings.c

@@ -23,7 +23,7 @@
 
 #include <glib/gprintf.h>
 
-#include "gtkprintsettings.h"
+#include "print/gtkprintsettings.h"
 #include "gtkprintutilsprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidget.h"

gtk/meson.build

@@ -545,19 +545,13 @@ gtk_public_headers = files([
   'gtkoverlay.h',
   'gtkoverlaylayout.h',
   'gtkpadcontroller.h',
-  'gtkpagesetup.h',
   'gtkpaned.h',
-  'gtkpapersize.h',
   'gtkpasswordentry.h',
   'gtkpasswordentrybuffer.h',
   'gtkpicture.h',
   'gtkpopover.h',
   'gtkpopovermenu.h',
   'gtkpopovermenubar.h',
-  'gtkprintcontext.h',
-  'gtkprintoperation.h',
-  'gtkprintoperationpreview.h',
-  'gtkprintsettings.h',
   'gtkprogressbar.h',
   'gtkrange.h',
   'gtkrecentmanager.h',
@@ -632,8 +626,11 @@ gtk_public_headers = files([
   'gtk.h',
 ])
 
+subdir('print')
+
 install_headers(gtk_public_headers, subdir: 'gtk-4.0/gtk/')
 install_headers(gtk_deprecated_headers, subdir: 'gtk-4.0/gtk/deprecated')
+install_headers(gtk_print_headers, subdir: 'gtk-4.0/gtk/print')
 
 gtk_sources = gtk_public_sources + gtk_private_sources
 
@@ -958,7 +955,7 @@ gtkmarshalers = gnome.genmarshal('gtkmarshalers',
 gtkmarshal_h = gtkmarshalers[1]
 
 gtktypebuiltins = gnome.mkenums('gtktypebuiltins',
-  sources: gtk_public_headers + gtk_deprecated_headers,
+  sources: gtk_public_headers + gtk_deprecated_headers + gtk_print_headers,
   c_template: 'gtktypebuiltins.c.template',
   h_template: 'gtktypebuiltins.h.template',
   install_dir: gtk_includedir / 'gtk-4.0/gtk',

gtk/print/gtkpagesetup.h

@@ -23,7 +23,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtkpapersize.h>
+#include <gtk/print/gtkpapersize.h>
 
 
 G_BEGIN_DECLS

gtk/print/gtkprintcontext.h

@@ -24,7 +24,7 @@
 #endif
 
 #include <pango/pango.h>
-#include <gtk/gtkpagesetup.h>
+#include <gtk/print/gtkpagesetup.h>
 
 
 G_BEGIN_DECLS

gtk/print/gtkprintoperation.h

@@ -26,10 +26,10 @@
 #include <cairo.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwindow.h>
-#include <gtk/gtkpagesetup.h>
-#include <gtk/gtkprintsettings.h>
-#include <gtk/gtkprintcontext.h>
-#include <gtk/gtkprintoperationpreview.h>
+#include <gtk/print/gtkpagesetup.h>
+#include <gtk/print/gtkprintsettings.h>
+#include <gtk/print/gtkprintcontext.h>
+#include <gtk/print/gtkprintoperationpreview.h>
 
 
 G_BEGIN_DECLS

gtk/print/gtkprintoperationpreview.h

@@ -23,7 +23,7 @@
 #endif
 
 #include <cairo.h>
-#include <gtk/gtkprintcontext.h>
+#include <gtk/print/gtkprintcontext.h>
 
 G_BEGIN_DECLS
 

gtk/print/gtkprintsettings.h

@@ -22,7 +22,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtkpapersize.h>
+#include <gtk/print/gtkpapersize.h>
 
 G_BEGIN_DECLS
 

gtk/print/meson.build

@@ -0,0 +1,8 @@
+gtk_print_headers = files([
+  'gtkpagesetup.h',
+  'gtkpapersize.h',
+  'gtkprintcontext.h',
+  'gtkprintoperation.h',
+  'gtkprintoperationpreview.h',
+  'gtkprintsettings.h',
+])