From 276eb145ce96d5f75f8d3901daf6310f60ddbb81 Mon Sep 17 00:00:00 2001
From: lukefromdc <lukefromdc@hushmail.com>
Date: Tue, 22 Nov 2016 15:02:51 -0500
Subject: move to GTK+3 (>= 3.14), drop libunique,  GTK+2 code, and --with-gtk
 build option

*Remove GTK_VERSION_CHECK (3, 0, 0) and libunique selectors
*Remove GTK2 and libunique specific code.
*Leaves selector for specific GTK3 versions.
*Remove #DEFINES for vbox/hbox previously required for GTK2 compatability
*Keep vbox in caja-spatial-window.c, it is necessary for the desktop to work
*spatial-window vbox issue at https://github.com/mate-desktop/caja/issues/591
---
 libcaja-extension/Makefile.am                         | 3 +--
 libcaja-extension/libcaja-extension-uninstalled.pc.in | 2 +-
 libcaja-extension/libcaja-extension.pc.in             | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'libcaja-extension')

diff --git a/libcaja-extension/Makefile.am b/libcaja-extension/Makefile.am
index 452528ff..03b24d82 100644
--- a/libcaja-extension/Makefile.am
+++ b/libcaja-extension/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
 	$(WARNING_CFLAGS) \
 	$(DISABLE_DEPRECATED_CFLAGS) \
 	-DDATADIR=\""$(datadir)"\" \
-	$(UNIQUE_CFLAGS) \
 	$(NULL)
 
 libcaja_extension_la_LDFLAGS=\
@@ -70,7 +69,7 @@ introspection_files = \
 	$(libcaja_extension_include_HEADERS) \
 	$(libcaja_extension_la_SOURCES)
 Caja-2.0.gir: libcaja-extension.la Makefile
-Caja_2_0_gir_INCLUDES = Gtk-${GTK_API_VERSION} Gio-2.0 GLib-2.0
+Caja_2_0_gir_INCLUDES = Gtk-3.0 Gio-2.0 GLib-2.0
 Caja_2_0_gir_CFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
diff --git a/libcaja-extension/libcaja-extension-uninstalled.pc.in b/libcaja-extension/libcaja-extension-uninstalled.pc.in
index 1b156530..9a4b6695 100644
--- a/libcaja-extension/libcaja-extension-uninstalled.pc.in
+++ b/libcaja-extension/libcaja-extension-uninstalled.pc.in
@@ -7,6 +7,6 @@ extensiondir=@libdir@/caja/extensions-2.0
 Name: libcaja-extension
 Description: A library to create Caja view extensions
 Version: @VERSION@
-Requires: glib-2.0 gtk+-@GTK_API_VERSION@
+Requires: glib-2.0 gtk+-3.0
 Libs: ${pc_top_builddir}/${pcfiledir}/libcaja-extension.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}/..
diff --git a/libcaja-extension/libcaja-extension.pc.in b/libcaja-extension/libcaja-extension.pc.in
index a5ccae7e..de36e0a8 100644
--- a/libcaja-extension/libcaja-extension.pc.in
+++ b/libcaja-extension/libcaja-extension.pc.in
@@ -7,6 +7,6 @@ extensiondir=@libdir@/caja/extensions-2.0
 Name: libcaja-extension
 Description: A library to create Caja view extensions
 Version: @VERSION@
-Requires: glib-2.0 gio-2.0 gtk+-@GTK_API_VERSION@ 
+Requires: glib-2.0 gio-2.0 gtk+-3.0
 Libs: -L${libdir} -lcaja-extension
 Cflags: -I${includedir}/caja
-- 
cgit v1.2.1