GNOME.org
 

[evolution-data-server/gtk3-rebased: 1/8] Drop support for gtk+-2.0.

commit 8bcaa2bafbc958e4fea3e4ab511ab026ba66dde9
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Dec 16 13:05:47 2010 -0500

    Drop support for gtk+-2.0.

 configure.ac                                |   48 +++--------------
 docs/reference/libedataserverui/Makefile.am |    7 ---
 libedataserverui/Makefile.am                |   78 ++++++++++-----------------
 libedataserverui/libedataserverui.pc.in     |    4 +-
 4 files changed, 37 insertions(+), 100 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f31ff0d..1f79cb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 dnl Required Package Versions
 m4_define([glib_minimum_version], [2.25.12])
+m4_define([gtk_minimum_version], [2.90.4])
 m4_define([gconf_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([libxml_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.3.0])
@@ -40,37 +41,10 @@ m4_define([libgdata_minimum_version], [0.7.0])
 m4_define([gnome_keyring_minimum_version], [2.20.1])
 m4_define([sqlite_minimum_version], [3.5])
 m4_define([libical_minimum_version], [0.43])
-
-dnl **********************************
-dnl Gtk-3 compatibility
-dnl Use the API version 3.0 while compiling with gtk+-3
-dnl **********************************
-AC_ARG_ENABLE([gtk3],
-	AS_HELP_STRING([--enable-gtk3],
-	[Attempt to use gtk+-3]),
-	[enable_gtk3=$enableval],[enable_gtk3=no])
-
-if test "x${enable_gtk3}" = "xyes"; then
-	LIBEDATASERVERUI_API_VERSION=3.0
-	GTK_PACKAGE="gtk+-3.0"
-	gtk_minimum_version="2.90.4"
-	GWEATHER_PACKAGE="gweather-3.0"
-	gweather_minimum_version="2.90.0"
-else	
-	LIBEDATASERVERUI_API_VERSION=1.2
-	GTK_PACKAGE="gtk+-2.0"
-	gtk_minimum_version="2.22.0"
-	GWEATHER_PACKAGE="gweather"
-	gweather_minimum_version="2.25.4"
-fi
-
-AM_CONDITIONAL([ENABLE_GTK3], [test "$enable_gtk3" = yes])
-GTK_MODULE="$GTK_PACKAGE >= $gtk_minimum_version"
-AC_SUBST(GTK_MODULE)
+m4_define([gweather_minimum_version], [2.90.0])
 
 AC_SUBST([BASE_VERSION],[base_version])
 AC_SUBST([API_VERSION],[api_version])
-AC_SUBST([LIBEDATASERVERUI_API_VERSION])
 AC_DEFINE_UNQUOTED(BASE_VERSION, ["$BASE_VERSION"], [Base version (Major.Minor)])
 AC_DEFINE_UNQUOTED(API_VERSION, ["$API_VERSION"], [API version (Major.Minor)])
 
@@ -104,14 +78,10 @@ LIBEDATASERVER_CURRENT=14
 LIBEDATASERVER_REVISION=0
 LIBEDATASERVER_AGE=0
 
-LIBEDATASERVERUI_CURRENT=11
+LIBEDATASERVERUI_CURRENT=0
 LIBEDATASERVERUI_REVISION=0
 LIBEDATASERVERUI_AGE=0
 
-LIBEDATASERVERUI_GTK3_CURRENT=0
-LIBEDATASERVERUI_GTK3_REVISION=0
-LIBEDATASERVERUI_GTK3_AGE=0
-
 LIBECAL_CURRENT=10
 LIBECAL_REVISION=2
 LIBECAL_AGE=2
@@ -149,9 +119,6 @@ AC_SUBST(LIBEDATASERVER_AGE)
 AC_SUBST(LIBEDATASERVERUI_CURRENT)
 AC_SUBST(LIBEDATASERVERUI_REVISION)
 AC_SUBST(LIBEDATASERVERUI_AGE)
-AC_SUBST(LIBEDATASERVERUI_GTK3_CURRENT)
-AC_SUBST(LIBEDATASERVERUI_GTK3_REVISION)
-AC_SUBST(LIBEDATASERVERUI_GTK3_AGE)
 AC_SUBST(LIBECAL_CURRENT)
 AC_SUBST(LIBECAL_REVISION)
 AC_SUBST(LIBECAL_AGE)
@@ -346,7 +313,7 @@ dnl Check for base dependencies early.
 dnl ***********************************
 PKG_CHECK_MODULES(GNOME_PLATFORM,
 	[gio-2.0 >= glib_minimum_version
-	$GTK_MODULE
+	gtk+-3.0 >= gtk_minimum_version
 	gconf-2.0 >= gconf_minimum_version
 	libxml-2.0 >= libxml_minimum_version
 	libsoup-2.4 >= libsoup_minimum_version
@@ -1034,8 +1001,8 @@ fi
 
 AC_MSG_RESULT([$use_gweather])
 if test "x$use_gweather" = "xyes"; then
-	PKG_CHECK_MODULES([LIBGWEATHER], [$GWEATHER_PACKAGE >= $gweather_minimum_version],[],
-	[AC_MSG_ERROR([The weather calendar backend requires GWeather >= $gweather_minimum_version. Alternatively, you may specify --disable-weather as a configure option to avoid building the backend.])])
+	PKG_CHECK_MODULES([LIBGWEATHER], [gweather-3.0 >= gweather_minimum_version],[],
+	[AC_MSG_ERROR([The weather calendar backend requires GWeather >= gweather_minimum_version. Alternatively, you may specify --disable-weather as a configure option to avoid building the backend.])])
 fi
 AM_CONDITIONAL(ENABLE_WEATHER, [test $use_gweather = yes])
 
@@ -1209,7 +1176,7 @@ AC_SUBST(E_DATA_SERVER_LIBS)
 dnl ******************************
 dnl libedataserverui
 dnl ******************************
-E_DATA_SERVER_UI_DEPS="gio-2.0 $GTK_PACKAGE libxml-2.0 gconf-2.0 gnome-keyring-1"
+E_DATA_SERVER_UI_DEPS="gtk+-3.0 libxml-2.0 gconf-2.0 gnome-keyring-1"
 
 EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, , )
 AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
@@ -1512,7 +1479,6 @@ AC_OUTPUT
 
 echo "
 	evolution-data-server has been configured as follows:
-	GTK+ package:		$GTK_PACKAGE
 	Calendar:		$msg_calendar
 	Weather calendar:	$use_gweather
 	Mail Directory:		$system_mail_dir, $system_mail_perm
diff --git a/docs/reference/libedataserverui/Makefile.am b/docs/reference/libedataserverui/Makefile.am
index 3b00b91..419e830 100644
--- a/docs/reference/libedataserverui/Makefile.am
+++ b/docs/reference/libedataserverui/Makefile.am
@@ -26,17 +26,10 @@ GTKDOC_CFLAGS  =					\
 	-I$(top_builddir)				\
 	$(E_DATA_SERVER_UI_CFLAGS)
 
-if ENABLE_GTK3
 GTKDOC_LIBS = 								\
 	$(top_builddir)/libedataserverui/libedataserverui-3.0.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
 	$(E_DATA_SERVER_UI_LIBS)
-else
-GTKDOC_LIBS = 								\
-	$(top_builddir)/libedataserverui/libedataserverui-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
-	$(E_DATA_SERVER_UI_LIBS)
-endif
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/libedataserverui/Makefile.am b/libedataserverui/Makefile.am
index b14d9b5..3bc959b 100644
--- a/libedataserverui/Makefile.am
+++ b/libedataserverui/Makefile.am
@@ -19,7 +19,27 @@ CPPFLAGS = \
 	$(E_DATA_SERVER_UI_CFLAGS)		\
 	$(CAMEL_CFLAGS)
 
-csources =				\
+lib_LTLIBRARIES = libedataserverui-3.0.la
+
+libedataserveruiinclude_HEADERS =	\
+	e-categories-dialog.h		\
+	e-category-completion.h		\
+	e-destination-store.h		\
+	e-book-auth-util.h		\
+	e-contact-store.h		\
+	e-name-selector.h		\
+	e-name-selector-dialog.h	\
+	e-name-selector-entry.h		\
+	e-name-selector-model.h		\
+	e-name-selector-list.h		\
+	e-passwords.h			\
+	e-source-selector.h		\
+	e-source-selector-dialog.h	\
+	e-source-combo-box.h		\
+	e-tree-model-generator.h	\
+	e-cell-renderer-color.h
+
+libedataserverui_3_0_la_SOURCES =	\
 	$(MARSHAL_GENERATED)		\
 	e-categories-dialog.c		\
 	e-category-completion.c		\
@@ -39,53 +59,20 @@ csources =				\
 	e-cell-renderer-color.c		\
 	gtk-compat.h
 
-
-if ENABLE_GTK3
-lib_LTLIBRARIES = libedataserverui-3.0.la
 libedataserverui_3_0_la_CPPFLAGS = $(CPPFLAGS)
-libedataserverui_3_0_la_SOURCES = $(csources)	
+
 libedataserverui_3_0_la_LIBADD = 				\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(top_builddir)/camel/libcamel-1.2.la			\
 	$(E_DATA_SERVER_UI_LIBS)				\
 	$(CAMEL_LIBS)
-libedataserverui_3_0_la_LDFLAGS = 										\
-	-version-info $(LIBEDATASERVERUI_GTK3_CURRENT):$(LIBEDATASERVERUI_GTK3_REVISION):$(LIBEDATASERVERUI_GTK3_AGE) $(NO_UNDEFINED)
-else
-lib_LTLIBRARIES = libedataserverui-1.2.la
-libedataserverui_1_2_la_CPPFLAGS = $(CPPFLAGS)
-libedataserverui_1_2_la_SOURCES = $(csources)	
-libedataserverui_1_2_la_LIBADD = 				\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(top_builddir)/camel/libcamel-1.2.la			\
-	$(E_DATA_SERVER_UI_LIBS)				\
-	$(CAMEL_LIBS)
-libedataserverui_1_2_la_LDFLAGS = 										\
+
+libedataserverui_3_0_la_LDFLAGS = \
 	-version-info $(LIBEDATASERVERUI_CURRENT):$(LIBEDATASERVERUI_REVISION):$(LIBEDATASERVERUI_AGE) $(NO_UNDEFINED)
-endif
 
 libedataserveruiincludedir = $(privincludedir)/libedataserverui
 
-libedataserveruiinclude_HEADERS =	\
-	e-categories-dialog.h		\
-	e-category-completion.h		\
-	e-destination-store.h		\
-	e-book-auth-util.h		\
-	e-contact-store.h		\
-	e-name-selector.h		\
-	e-name-selector-dialog.h	\
-	e-name-selector-entry.h		\
-	e-name-selector-model.h		\
-	e-name-selector-list.h		\
-	e-passwords.h			\
-	e-source-selector.h		\
-	e-source-selector-dialog.h	\
-	e-source-combo-box.h		\
-	e-tree-model-generator.h	\
-	e-cell-renderer-color.h
-
 TEST_EDATASERVERUI_CPPFLAGS= \
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
@@ -95,21 +82,12 @@ TEST_EDATASERVERUI_CPPFLAGS= \
 	$(CAMEL_CFLAGS)				\
 	$(E_DATA_SERVER_UI_CFLAGS)
 
-if ENABLE_GTK3
 TEST_EDATASERVERUI_LDFLAGS = \
 	libedataserverui-3.0.la 				\
 	$(top_builddir)/camel/libcamel-1.2.la			\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
 	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(E_DATA_SERVER_UI_LIBS)
-else
-TEST_EDATASERVERUI_LDFLAGS = \
-	libedataserverui-1.2.la 				\
-	$(top_builddir)/camel/libcamel-1.2.la			\
-	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
-	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
-	$(E_DATA_SERVER_UI_LIBS)
-endif
 
 # Test programs
 test_category_completion_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
@@ -132,17 +110,17 @@ test_name_selector_CPPFLAGS = $(TEST_EDATASERVERUI_CPPFLAGS)
 test_name_selector_SOURCES = test-name-selector.c
 test_name_selector_LDADD = $(TEST_EDATASERVERUI_LDFLAGS)
 
-%-$(LIBEDATASERVERUI_API_VERSION).pc: %.pc
-	 cp $< $@
+%-3.0.pc: %.pc
+	cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libedataserverui-$(LIBEDATASERVERUI_API_VERSION).pc
+pkgconfig_DATA = libedataserverui-3.0.pc
 
 BUILT_SOURCES = $(MARSHAL_GENERATED)
 
 EXTRA_DIST = 						\
 	e-data-server-ui-marshal.list			\
-	$(pkgconfig_DATA:-$(LIBEDATASERVERUI_API_VERSION).pc=.pc.in)
+	$(pkgconfig_DATA:-3.0.pc=.pc.in)
 
 CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
diff --git a/libedataserverui/libedataserverui.pc.in b/libedataserverui/libedataserverui.pc.in
index df081b0..a1e2fdc 100644
--- a/libedataserverui/libedataserverui.pc.in
+++ b/libedataserverui/libedataserverui.pc.in
@@ -8,6 +8,6 @@ privincludedir= privincludedir@
 Name: libedataserverui
 Description: GUI utility library for Evolution Data Server
 Version: @VERSION@
-Requires: @GTK_MODULE@ libedataserver- API_VERSION@ libebook- API_VERSION@
-Libs: -L${libdir} -ledataserverui- LIBEDATASERVERUI_API_VERSION@
+Requires: gtk+-3.0 libedataserver- API_VERSION@ libebook- API_VERSION@
+Libs: -L${libdir} -ledataserverui-3.0
 Cflags: -I${privincludedir}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]