From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Wed, 6 Feb 2019 08:53:17 +0000 (+0100)
Subject: Adjust some more pkg-config references for gtk+ to gtk rename
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~21^2~775
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d2d35e52c3932249703e055049e60cb35e06e5bc;p=gtk4.git

Adjust some more pkg-config references for gtk+ to gtk rename

See https://gitlab.gnome.org/GNOME/gtk/issues/1439
---

diff --git a/gtk/meson.build b/gtk/meson.build
index d81a5ef923..c700b37289 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -995,7 +995,7 @@ if build_gir
                                nsversion: gtk_api_version,
                                identifier_prefix: 'Gdk',
                                symbol_prefix: 'gdk',
-                               export_packages: 'gtk+-4.0',
+                               export_packages: 'gtk4',
                                includes: gdk_gir_inc,
                                header: 'gdk/gdk.h',
                                install: true,
@@ -1012,7 +1012,7 @@ if build_gir
                                      nsversion: gtk_api_version,
                                      identifier_prefix: 'Gdk',
                                      symbol_prefix: 'gdk',
-                                     export_packages: 'gtk+-x11-4.0',
+                                     export_packages: 'gtk4-x11',
                                      includes: [ gdk_gir[0], 'xlib-2.0', ],
                                      install: true,
                                      dependencies: gdk_gir_dep,
@@ -1036,7 +1036,7 @@ if build_gir
                                nsversion: gtk_api_version,
                                identifier_prefix: 'Gsk',
                                symbol_prefix: 'gsk',
-                               export_packages: 'gtk+-4.0',
+                               export_packages: 'gtk4',
                                includes: gsk_gir_inc,
                                header: 'gsk/gsk.h',
                                install: true,
@@ -1071,7 +1071,7 @@ if build_gir
                                nsversion: gtk_api_version,
                                identifier_prefix: 'Gtk',
                                symbol_prefix: 'gtk',
-                               export_packages: 'gtk+-4.0',
+                               export_packages: 'gtk4',
                                includes: [ gdk_gir[0], gsk_gir[0], 'Atk-1.0', ],
                                header: 'gtk/gtk.h',
                                install: true,
diff --git a/gtk4-unix-print.pc.in b/gtk4-unix-print.pc.in
index efcda5689b..a15f064811 100644
--- a/gtk4-unix-print.pc.in
+++ b/gtk4-unix-print.pc.in
@@ -10,5 +10,5 @@ gtk_host=@host@
 Name: GTK
 Description: GTK Unix print support
 Version: @VERSION@
-Requires: gtk+-@GTK_API_VERSION@ @GTK_PACKAGES@
+Requires: gtk4 @GTK_PACKAGES@
 Cflags: -I${includedir}/gtk-@GTK_API_VERSION@/unix-print