GNOME.org
 

[gtk+/wip/gtk4: 6/9] Complete the gtk4 conversion

commit ba70527f7a9b9d7ad6ccd2e07127326ef305f432
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Oct 6 15:08:13 2016 -0400

    Complete the gtk4 conversion
    
    This gets to the point of installing.

 demos/gtk-demo/Makefile.am                         |   50 +++++++++---------
 .../data/16x16/gtk3-demo-symbolic.symbolic.png     |  Bin 324 -> 0 bytes
 demos/gtk-demo/data/16x16/gtk3-demo.png            |  Bin 874 -> 0 bytes
 .../data/22x22/gtk3-demo-symbolic.symbolic.png     |  Bin 437 -> 0 bytes
 demos/gtk-demo/data/22x22/gtk3-demo.png            |  Bin 1281 -> 0 bytes
 .../data/24x24/gtk3-demo-symbolic.symbolic.png     |  Bin 465 -> 0 bytes
 demos/gtk-demo/data/24x24/gtk3-demo.png            |  Bin 1374 -> 0 bytes
 .../data/256x256/gtk3-demo-symbolic.symbolic.png   |  Bin 3937 -> 0 bytes
 demos/gtk-demo/data/256x256/gtk3-demo.png          |  Bin 18667 -> 0 bytes
 .../data/32x32/gtk3-demo-symbolic.symbolic.png     |  Bin 581 -> 0 bytes
 demos/gtk-demo/data/32x32/gtk3-demo.png            |  Bin 1748 -> 0 bytes
 .../data/48x48/gtk3-demo-symbolic.symbolic.png     |  Bin 854 -> 0 bytes
 demos/gtk-demo/data/48x48/gtk3-demo.png            |  Bin 2640 -> 0 bytes
 .../data/512x512/gtk3-demo-symbolic.symbolic.png   |  Bin 7594 -> 0 bytes
 demos/gtk-demo/data/512x512/gtk3-demo.png          |  Bin 42374 -> 0 bytes
 demos/gtk-demo/gtk3-demo.desktop                   |   10 ----
 demos/icon-browser/Makefile.am                     |   18 +++---
 demos/icon-browser/gtk3-icon-browser.desktop       |   10 ----
 demos/widget-factory/Makefile.am                   |   30 +++++-----
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 237 -> 0 bytes
 .../data/16x16/gtk3-widget-factory.png             |  Bin 550 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 332 -> 0 bytes
 .../data/22x22/gtk3-widget-factory.png             |  Bin 685 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 336 -> 0 bytes
 .../data/24x24/gtk3-widget-factory.png             |  Bin 750 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 2950 -> 0 bytes
 .../data/256x256/gtk3-widget-factory.png           |  Bin 10864 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 369 -> 0 bytes
 .../data/32x32/gtk3-widget-factory.png             |  Bin 963 -> 0 bytes
 .../gtk3-widget-factory-symbolic.symbolic.png      |  Bin 495 -> 0 bytes
 .../data/48x48/gtk3-widget-factory.png             |  Bin 1260 -> 0 bytes
 .../data/512x512/gtk3-widget-factory.png           |  Bin 24446 -> 0 bytes
 demos/widget-factory/gtk3-widget-factory.desktop   |   10 ----
 gdk/Makefile.am                                    |   56 ++++++++++----------
 gtk/Makefile.am                                    |    2 +-
 libgail-util/Makefile.am                           |   36 ++++++------
 modules/input/Makefile.am                          |   22 ++++----
 modules/printbackends/cloudprint/Makefile.am       |    4 +-
 modules/printbackends/cups/Makefile.am             |    4 +-
 modules/printbackends/file/Makefile.am             |    4 +-
 modules/printbackends/lpr/Makefile.am              |    4 +-
 modules/printbackends/papi/Makefile.am             |    4 +-
 modules/printbackends/test/Makefile.am             |    4 +-
 43 files changed, 119 insertions(+), 149 deletions(-)
---
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 8c15e16..a6d4648 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -92,11 +92,11 @@ AM_CPPFLAGS = \
        $(GTK_DEP_CFLAGS)
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.la
+       $(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la         \
-       $(top_builddir)/gdk/libgdk-3.la         \
+       $(top_builddir)/gtk/libgtk-4.la         \
+       $(top_builddir)/gdk/libgdk-4.la         \
        $(GTK_DEP_LIBS)                         \
        $(GDK_DEP_LIBS)                         \
        -lm
@@ -106,10 +106,10 @@ AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
 LDADDS += $(FONTDEMO_LIBS)
 endif
 
-bin_PROGRAMS = gtk3-demo gtk3-demo-application
+bin_PROGRAMS = gtk4-demo gtk4-demo-application
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-demo.desktop
+dist_desktop_DATA = gtk4-demo.desktop
 
 BUILT_SOURCES = demos.h demo_resources.c
 
@@ -132,22 +132,22 @@ demos.h: $(demos) geninclude.pl
 demos.h.win32: $(demos_base) geninclude.pl
         $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
 
-nodist_gtk3_demo_SOURCES = demos.h
+nodist_gtk4_demo_SOURCES = demos.h
 
-gtk3_demo_SOURCES =            \
+gtk4_demo_SOURCES =            \
        $(demos)                \
        demo_resources.c        \
        main.c
 
-gtk3_demo_DEPENDENCIES = $(DEPS)
-gtk3_demo_LDADD = $(LDADDS)
-gtk3_demo_LDFLAGS = -export-dynamic
+gtk4_demo_DEPENDENCIES = $(DEPS)
+gtk4_demo_LDADD = $(LDADDS)
+gtk4_demo_LDFLAGS = -export-dynamic
 
-gtk3_demo_application_SOURCES = \
+gtk4_demo_application_SOURCES = \
        application.c           \
        demo_resources.c
 
-gtk3_demo_application_LDADD = $(LDADDS)
+gtk4_demo_application_LDADD = $(LDADDS)
 
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(builddir)/demo.gresource.xml)
 
@@ -164,12 +164,12 @@ appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
 appsiconscalabledir = $(iconthemedir)/scalable/apps
 
-dist_appsicon16_DATA = data/16x16/gtk3-demo.png data/16x16/gtk3-demo-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-demo.png data/22x22/gtk3-demo-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-demo.png data/24x24/gtk3-demo-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk4-demo.png data/16x16/gtk4-demo-symbolic.symbolic.png
+dist_appsicon22_DATA = data/22x22/gtk4-demo.png data/22x22/gtk4-demo-symbolic.symbolic.png
+dist_appsicon24_DATA = data/24x24/gtk4-demo.png data/24x24/gtk4-demo-symbolic.symbolic.png
+dist_appsicon32_DATA = data/32x32/gtk4-demo.png data/32x32/gtk4-demo-symbolic.symbolic.png
+dist_appsicon48_DATA = data/48x48/gtk4-demo.png data/48x48/gtk4-demo-symbolic.symbolic.png
+dist_appsicon256_DATA = data/256x256/gtk4-demo.png data/256x256/gtk4-demo-symbolic.symbolic.png
 
 update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
 
@@ -185,19 +185,19 @@ uninstall-update-icon-cache:
        test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-demo gtk3-demo-application
+MSVCPROJS = gtk4-demo gtk4-demo-application
 
-gtk3_demo_FILES = $(gtk3_demo_SOURCES)
-gtk3_demo_EXCLUDES = font_features.c|pagesetup.c
+gtk4_demo_FILES = $(gtk4_demo_SOURCES)
+gtk4_demo_EXCLUDES = font_features.c|pagesetup.c
 
-gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES)
-gtk3_demo_application_EXCLUDES = dummy
+gtk4_demo_application_FILES = $(gtk4_demo_application_SOURCES)
+gtk4_demo_application_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-       $(top_builddir)/build/win32/vs9/gtk3-demo.vcproj        \
-       $(top_builddir)/build/win32/vs9/gtk3-demo-application.vcproj
+       $(top_builddir)/build/win32/vs9/gtk4-demo.vcproj        \
+       $(top_builddir)/build/win42/vs9/gtk4-demo-application.vcproj
 
 DISTCLEANFILES = demos.h demos.h.win32
 
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
index 9b13796..111ce35 100644
--- a/demos/icon-browser/Makefile.am
+++ b/demos/icon-browser/Makefile.am
@@ -6,17 +6,17 @@ AM_CPPFLAGS = \
        $(GTK_DEP_CFLAGS)
 
 LDADD = \
-        $(top_builddir)/gtk/libgtk-3.la \
-        $(top_builddir)/gdk/libgdk-3.la \
+        $(top_builddir)/gtk/libgtk-4.la \
+        $(top_builddir)/gdk/libgdk-4.la \
         $(GTK_DEP_LIBS)
 
 
-bin_PROGRAMS = gtk3-icon-browser
+bin_PROGRAMS = gtk4-icon-browser
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-icon-browser.desktop
+dist_desktop_DATA = gtk4-icon-browser.desktop
 
-gtk3_icon_browser_SOURCES = \
+gtk4_icon_browser_SOURCES = \
        main.c \
        iconbrowserapp.c iconbrowserapp.h \
        iconbrowserwin.c iconbrowserwin.h \
@@ -36,13 +36,13 @@ EXTRA_DIST = \
        window.ui
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-icon-browser
+MSVCPROJS = gtk4-icon-browser
 
-gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES)
-gtk3_icon_browser_EXCLUDES = dummy
+gtk4_icon_browser_FILES = $(gtk4_icon_browser_SOURCES)
+gtk4_icon_browser_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
-dist-hook: $(top_builddir)/build/win32/vs9/gtk3-icon-browser.vcproj
+dist-hook: $(top_builddir)/build/win32/vs9/gtk4-icon-browser.vcproj
 
 -include $(top_srcdir)/git.mk
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
index a6bfbdc..bc94f9b 100644
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -1,29 +1,29 @@
 include $(top_srcdir)/Makefile.decl
 
-bin_PROGRAMS = gtk3-widget-factory
+bin_PROGRAMS = gtk4-widget-factory
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-widget-factory.desktop
+dist_desktop_DATA = gtk4-widget-factory.desktop
 
-gtk3_widget_factory_SOURCES =          \
+gtk4_widget_factory_SOURCES =          \
        widget-factory.c                \
        widget_factory_resources.c
 
 BUILT_SOURCES =                        \
        widget_factory_resources.c
 
-gtk3_widget_factory_DEPENDENCIES =     \
-       $(top_builddir)/gtk/libgtk-3.la
+gtk4_widget_factory_DEPENDENCIES =     \
+       $(top_builddir)/gtk/libgtk-4.la
 
-gtk3_widget_factory_CPPFLAGS =                 \
+gtk4_widget_factory_CPPFLAGS =                 \
        -I$(top_srcdir)                 \
        $(GTK_DEBUG_FLAGS)              \
        $(GTK_DEP_CFLAGS)               \
        $(NULL)
 
-gtk3_widget_factory_LDADD =            \
-       $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/libgtk-3.la \
+gtk4_widget_factory_LDADD =            \
+       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(NULL)
 
@@ -40,12 +40,12 @@ appsicon32dir = $(iconthemedir)/32x32/apps
 appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
 
-dist_appsicon16_DATA = data/16x16/gtk3-widget-factory.png 
data/16x16/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-widget-factory.png 
data/22x22/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-widget-factory.png 
data/24x24/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png 
data/32x32/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png 
data/48x48/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png 
data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk4-widget-factory.png 
data/16x16/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon22_DATA = data/22x22/gtk4-widget-factory.png 
data/22x22/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon24_DATA = data/24x24/gtk4-widget-factory.png 
data/24x24/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon32_DATA = data/32x32/gtk4-widget-factory.png 
data/32x32/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon48_DATA = data/48x48/gtk4-widget-factory.png 
data/48x48/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon256_DATA = data/256x256/gtk4-widget-factory.png 
data/256x256/gtk4-widget-factory-symbolic.symbolic.png
 
 update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
 
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 807a401..e1b6d81 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -206,36 +206,36 @@ common_sources =          \
        gdkresources.h          \
        gdkresources.c
 
-libgdk_3_la_SOURCES = $(common_sources)
-libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
-libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
-libgdk_3_la_LDFLAGS = $(LDADD)
+libgdk_4_la_SOURCES = $(common_sources)
+libgdk_4_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
+libgdk_4_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
+libgdk_4_la_LDFLAGS = $(LDADD)
 
 if USE_X11
-libgdk_3_la_LIBADD += x11/libgdk-x11.la
+libgdk_4_la_LIBADD += x11/libgdk-x11.la
 endif # USE_X11
 
 if USE_QUARTZ
-libgdk_3_la_CFLAGS += -xobjective-c
-libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
+libgdk_4_la_CFLAGS += -xobjective-c
+libgdk_4_la_LIBADD += quartz/libgdk-quartz.la
 endif # USE_QUARTZ
 
 if USE_WIN32
-libgdk_3_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
-libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
+libgdk_4_la_LIBADD += win32/libgdk-win32.la
+libgdk_4_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
+libgdk_4_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
 endif # USE_WIN32
 
 if USE_BROADWAY
-libgdk_3_la_LIBADD += broadway/libgdk-broadway.la
+libgdk_4_la_LIBADD += broadway/libgdk-broadway.la
 endif # USE_BROADWAY
 
 if USE_WAYLAND
-libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
+libgdk_4_la_LIBADD += wayland/libgdk-wayland.la
 endif
 
 if USE_MIR
-libgdk_3_la_LIBADD += mir/libgdk-mir.la
+libgdk_4_la_LIBADD += mir/libgdk-mir.la
 endif
 
 if HAVE_INTROSPECTION
@@ -246,11 +246,11 @@ introspection_files =             \
         gdkenumtypes.c         \
         gdkenumtypes.h
 
-Gdk-4.0.gir: libgdk-3.la Makefile
+Gdk-4.0.gir: libgdk-4.la Makefile
 Gdk_4_0_gir_SCANNERFLAGS =     \
        --c-include="gdk/gdk.h"
 Gdk_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
-Gdk_4_0_gir_LIBS = libgdk-3.la
+Gdk_4_0_gir_LIBS = libgdk-4.la
 Gdk_4_0_gir_FILES = $(introspection_files)
 Gdk_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Gdk_4_0_gir_EXPORT_PACKAGES = gdk-4.0
@@ -306,13 +306,13 @@ x11_introspection_files =                 \
        x11/gdkx11visual.h              \
        x11/gdkx11window.h
 
-GdkX11-4.0.gir: libgdk-3.la Gdk-4.0.gir Makefile
+GdkX11-4.0.gir: libgdk-4.la Gdk-4.0.gir Makefile
 GdkX11_4_0_gir_SCANNERFLAGS =          \
        --identifier-prefix=Gdk         \
        --c-include="gdk/gdkx.h"        \
        --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
 GdkX11_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
-GdkX11_4_0_gir_LIBS = libgdk-3.la
+GdkX11_4_0_gir_LIBS = libgdk-4.la
 GdkX11_4_0_gir_FILES = $(x11_introspection_files)
 GdkX11_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
 GdkX11_4_0_gir_EXPORT_PACKAGES = gdk-x11-4.0
@@ -357,7 +357,7 @@ GdkWin32_4_0_gir_SCANNERFLAGS = \
        --c-include="gdk/gdkwin32.h"    \
        --include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
 GdkWin32_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
-GdkWin32_4_0_gir_LIBS = libgdk-3.la
+GdkWin32_4_0_gir_LIBS = libgdk-4.la
 GdkWin32_4_0_gir_FILES = $(w32_introspection_files)
 GdkWin32_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
 INTROSPECTION_GIRS += GdkWin32-4.0.gir
@@ -375,7 +375,7 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
 
 if OS_WIN32
-gdk.def: libgdk-3.la
+gdk.def: libgdk-4.la
        echo "LIBRARY libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
        echo "EXPORTS" >>$@
        objdump -p .libs/libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 
's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
@@ -392,7 +392,7 @@ endif
 if MS_LIB_AVAILABLE
 noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
 
-gdk-win32-$(GTK_API_VERSION).lib: libgdk-3.la gdk.def
+gdk-win32-$(GTK_API_VERSION).lib: libgdk-4.la gdk.def
        lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll 
-def:gdk.def -out:$@
 
 install-ms-lib:
@@ -406,7 +406,7 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
-lib_LTLIBRARIES = libgdk-3.la
+lib_LTLIBRARIES = libgdk-4.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 EXTRA_DIST += \
@@ -415,7 +415,7 @@ EXTRA_DIST += \
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la
+       $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-4.la
 endif
 
 BUILT_SOURCES = \
@@ -495,18 +495,18 @@ gdkresources.c: gdk.gresource.xml $(resource_files)
                --sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk-3
+MSVCPROJS = gdk-4
 
-gdk_3_FILES = $(libgdk_3_la_SOURCES)
-gdk_3_EXCLUDES = dummy
-gdk_3_HEADERS_DIR = $(gdkincludedir)
+gdk_4_FILES = $(libgdk_4_la_SOURCES)
+gdk_4_EXCLUDES = dummy
+gdk_4_HEADERS_DIR = $(gdkincludedir)
 
-gdk_3_HEADERS_INST = \
+gdk_4_HEADERS_INST = \
        $(gdkinclude_HEADERS)           \
        $(deprecatedinclude_HEADERS)    \
        $(nodist_gdkinclude_HEADERS)
 
-gdk_3_HEADERS_EXCLUDES = dummy
+gdk_4_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f70a26a..a0775c1 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1455,7 +1455,7 @@ include $(top_srcdir)/build/Makefile.msvcproj
 
 if HAVE_INTROSPECTION
 # Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gtk-3.0.gir
+MSVC_INTROSPECT_GIRS = Gtk-4.0.gir
 
 GTK_MSVC_GIR_CFLAGS =                                          \
        $(GTK_BASE_CFLAGS_DEFINES)                              \
diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am
index 048fe33..c471e7a 100644
--- a/libgail-util/Makefile.am
+++ b/libgail-util/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 EXTRA_DIST += gailutil.def
 if OS_WIN32
 export_symbols = -export-symbols $(srcdir)/gailutil.def
-gailutil.def: libgailutil-3.la
+gailutil.def: libgailutil-4.la
        echo "LIBRARY libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE)" >$@
        echo "EXPORTS" >>$@
        objdump -p .libs/libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE).dll | sed -n -e 
's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
@@ -30,26 +30,26 @@ uninstall-ms-lib:
 endif
 
 
-lib_LTLIBRARIES = libgailutil-3.la
+lib_LTLIBRARIES = libgailutil-4.la
 
 util_c_sources =               \
        gailmisc.c              \
        gailtextutil.c
 
-libgailutilincludedir=$(includedir)/gail-3.0/libgail-util
+libgailutilincludedir=$(includedir)/gail-4.0/libgail-util
 
 util_public_h_sources =                \
        gailmisc.h              \
        gailtextutil.h          \
        gail-util.h
 
-libgailutil_3_la_SOURCES =     \
+libgailutil_4_la_SOURCES =     \
        $(util_c_sources)
 
 libgailutilinclude_HEADERS =   \
        $(util_public_h_sources)
 
-libgailutil_3_la_CPPFLAGS = \
+libgailutil_4_la_CPPFLAGS = \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
@@ -59,39 +59,39 @@ libgailutil_3_la_CPPFLAGS = \
        -DGDK_DISABLE_DEPRECATED\
        -DGTK_DISABLE_DEPRECATED
 
-libgailutil_3_la_CFLAGS = \
+libgailutil_4_la_CFLAGS = \
        $(GTK_DEP_CFLAGS)       \
        $(GTK_DEBUG_FLAGS)      \
        $(AM_CFLAGS)
 
-libgailutil_3_la_LIBADD = \
-       $(top_builddir)/gtk/libgtk-3.la \
-       $(top_builddir)/gdk/libgdk-3.la \
+libgailutil_4_la_LIBADD = \
+       $(top_builddir)/gtk/libgtk-4.la \
+       $(top_builddir)/gdk/libgdk-4.la \
        $(GTK_DEP_LIBS)
 
-libgailutil_3_la_LDFLAGS = \
+libgailutil_4_la_LDFLAGS = \
        -version-info $(GAIL_LT_VERSION_INFO)   \
        $(no_undefined)                         \
         $(LDFLAGS)
 
-gailutil.lib: libgailutil-3.la gailutil.def
-       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-3.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll 
-def:gailutil.def -out:$@
+gailutil.lib: libgailutil-4.la gailutil.def
+       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-4.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll 
-def:gailutil.def -out:$@
 
 install-data-local: install-ms-lib install-def-file
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gailutil-3
+MSVCPROJS = gailutil-4
 
-gailutil_3_FILES = $(libgailutil_3_la_SOURCES)
+gailutil_4_FILES = $(libgailutil_4_la_SOURCES)
 
-gailutil_3_EXCLUDES = dummy
-gailutil_3_HEADERS_DIR = $(libgailutilincludedir)
+gailutil_4_EXCLUDES = dummy
+gailutil_4_HEADERS_DIR = $(libgailutilincludedir)
 
-gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS)
+gailutil_4_HEADERS_INST = $(libgailutilinclude_HEADERS)
 
-gailutil_3_HEADERS_EXCLUDES = dummy
+gailutil_4_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index c20b5bb..eb73699 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -13,13 +13,13 @@ AM_CPPFLAGS = \
        $(INCLUDED_IMMODULE_DEFINE)
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.la
+       $(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
-moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
+moduledir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/immodules
 
 im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_xim_la_SOURCES =            \
@@ -190,7 +190,7 @@ else
 MULTIPRESS_MODULE = im-multipress.la
 endif
 
-imconffiledir = $(sysconfdir)/gtk-3.0
+imconffiledir = $(sysconfdir)/gtk-4.0
 dist_imconffile_DATA = im-multipress.conf
 
 if CROSS_COMPILING
@@ -207,21 +207,21 @@ endif
 # after the libraries are installed in their final locations.
 install-data-hook:
        $(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \
-         echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
-         $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
-         echo "$(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) > 
$(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache" ; \
-         $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) > 
$(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache ; \
+         echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
+         $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
+         echo "$(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > 
$(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache" ; \
+         $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > 
$(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache ; \
        else \
          echo "***" ; \
          echo "*** Warning: immodules.cache not built" ; \
          echo "***" ; \
          echo "*** Generate this file manually on host" ; \
-         echo "*** system using gtk-query-immodules-3.0" ; \
+         echo "*** system using gtk-query-immodules-4.0" ; \
          echo "***" ; \
         fi
 
 uninstall-local:
-       rm -f $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache
+       rm -f $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache
 
 if BUILD_DYNAMIC_MODULES
 
@@ -262,7 +262,7 @@ noinst_LTLIBRARIES =                                \
 included-modules: $(noinst_LTLIBRARIES)
 
 immodules.cache: Makefile.am $(module_LTLIBRARIES)
-       $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) $(module_LTLIBRARIES) > 
immodules.cache
+       $(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) $(module_LTLIBRARIES) > 
immodules.cache
 
 EXTRA_DIST += README.multipress
 
diff --git a/modules/printbackends/cloudprint/Makefile.am b/modules/printbackends/cloudprint/Makefile.am
index d2d434f..2a1811f 100644
--- a/modules/printbackends/cloudprint/Makefile.am
+++ b/modules/printbackends/cloudprint/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-cloudprint.la
 
@@ -32,7 +32,7 @@ libprintbackend_cloudprint_la_LDFLAGS =  \
        -avoid-version -module $(no_undefined)
 
 libprintbackend_cloudprint_la_LIBADD =                 \
-       $(top_builddir)/gtk/libgtk-3.la                 \
+       $(top_builddir)/gtk/libgtk-4.la                 \
        $(REST_LIBS)                                    \
        $(JSON_GLIB_LIBS)                               \
        $(GTK_DEP_LIBS)
diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 09a9f89..8f36a87 100644
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -14,11 +14,11 @@ AM_CPPFLAGS = \
        $(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(COLORD_LIBS)                  \
        $(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-cups.la
 
diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
index 9b51bf4..ffdd816 100644
--- a/modules/printbackends/file/Makefile.am
+++ b/modules/printbackends/file/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-file.la
 
@@ -25,7 +25,7 @@ libprintbackend_file_la_LDFLAGS =  \
        -avoid-version -module $(no_undefined)
 
 libprintbackend_file_la_LIBADD = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
 noinst_HEADERS =                       \
diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index 5a75170..79345ed 100644
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
        $(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-lpr.la
 
diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am
index 7176eba..48ae2ca 100644
--- a/modules/printbackends/papi/Makefile.am
+++ b/modules/printbackends/papi/Makefile.am
@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
        $(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-papi.la
 
diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
index bff5e93..876ef0f 100644
--- a/modules/printbackends/test/Makefile.am
+++ b/modules/printbackends/test/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-test.la
 
@@ -24,7 +24,7 @@ libprintbackend_test_la_LDFLAGS =  \
        -avoid-version -module $(no_undefined)
 
 libprintbackend_test_la_LIBADD = \
-       $(top_builddir)/gtk/libgtk-3.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)
 
 noinst_HEADERS =                       \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]