/pidgin/main: 81b06ce81755: Remove more GTK+2 compatibility.

Changeset: 81b06ce817552995b7fc65682a147c4cb7db0688
Author:	 Elliott Sales de Andrade <[email protected]>
Date:	 2016-08-20 23:11 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/81b06ce81755

Description:

Remove more GTK+2 compatibility.

We only support GTK+3 now.

diffstat:

 configure.ac               |  9 +--------
 pidgin/Makefile.am         |  2 +-
 pidgin/data/pidgin-3.pc.in |  4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diffs (57 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -582,18 +582,12 @@ running configure.
 	AC_SUBST(GTK_CFLAGS)
 	AC_SUBST(GTK_LIBS)
 
-	GTK_PC_MODULE="gtk+-3.0"
-	GTK_VERSION="3"
-	AC_SUBST(GTK_PC_MODULE)
-	AC_SUBST(GTK_VERSION)
-
 	dnl We only really need Pango >= 1.4 for decent RTL support
 	PKG_CHECK_MODULES(PANGO, [pango >= 1.4.0],
 			AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:)
 
 	WEBKIT_VERSION=1.3.7
-	WEBKIT_PC_MODULE="webkitgtk-3.0"
-	PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [
+	PKG_CHECK_MODULES(WEBKIT, ["webkitgtk-3.0" >= $WEBKIT_VERSION], , [
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR([
 You must have WebKit for GTK+3 $WEBKIT_VERSION or newer development headers
@@ -602,7 +596,6 @@ installed to compile Pidgin.  If you wan
 ])])
 	AC_SUBST(WEBKIT_CFLAGS)
 	AC_SUBST(WEBKIT_LIBS)
-	AC_SUBST(WEBKIT_PC_MODULE)
 
 	dnl #######################################################################
 	dnl # Check if we should compile with enchant support
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -271,7 +271,7 @@ if HAVE_INTROSPECTION
 introspection_sources = $(libpidgininclude_HEADERS)
 
 Pidgin-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir: $(builddir)/libpidgin.la
-Pidgin_3_0_gir_INCLUDES = GObject-2.0 Gtk-$(GTK_VERSION).0 Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION)
+Pidgin_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION)
 Pidgin_3_0_gir_CFLAGS = \
 	$(INCLUDES) \
 	-DDATADIR=\"$(datadir)\" \
diff --git a/pidgin/data/pidgin-3.pc.in b/pidgin/data/pidgin-3.pc.in
--- a/pidgin/data/pidgin-3.pc.in
+++ b/pidgin/data/pidgin-3.pc.in
@@ -9,8 +9,8 @@ sysconfdir=@sysconfdir@
 plugindir=${libdir}/pidgin
 
 Name: Pidgin
-Description: Pidgin is a GTK2-based instant messenger application.
+Description: Pidgin is a GTK3-based instant messenger application.
 Version: @VERSION@
-Requires: @GTK_PC_MODULE@ @WEBKIT_PC_MODULE@ purple-3
+Requires: gtk+-3.0 webkitgtk-3.0 purple-3
 Cflags: -I${includedir}
 Libs: -L${libdir} -lpidgin

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits