[epiphany] Bump GTK+ dependency to GTK+ 3.x branch
- From: Xan Lopez <xan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Bump GTK+ dependency to GTK+ 3.x branch
- Date: Mon, 28 Jun 2010 23:48:37 +0000 (UTC)
commit 6f7399f3b787242e3164aaab9d12e5955472f997
Author: Xan Lopez <xan gnome org>
Date: Thu Jun 24 22:37:01 2010 +0200
Bump GTK+ dependency to GTK+ 3.x branch
We require at least 2.90.4 to build, there is no support for the old
2.x versions anymore.
configure.ac | 8 ++++----
src/Makefile.am | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 05816e5..274998d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ if test "$enable_maintainer_mode" = "yes"; then
fi
GLIB_REQUIRED=2.19.7
-GTK_REQUIRED=2.21.2
+GTK_REQUIRED=2.90.4
LIBXML_REQUIRED=2.6.12
LIBXSLT_REQUIRED=1.1.7
LIBSTARTUP_NOTIFICATION_REQUIRED=0.5
@@ -127,8 +127,8 @@ PKG_CHECK_MODULES([DEPENDENCIES], [
gmodule-2.0
gthread-2.0
gio-unix-2.0 >= $GLIB_REQUIRED
- gtk+-2.0 >= $GTK_REQUIRED
- gtk+-unix-print-2.0 >= $GTK_REQUIRED
+ gtk+-3.0 >= $GTK_REQUIRED
+ gtk+-unix-print-3.0 >= $GTK_REQUIRED
ice
x11
sm
@@ -137,7 +137,7 @@ PKG_CHECK_MODULES([DEPENDENCIES], [
gconf-2.0
libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
$LIBNOTIFY_PACKAGE
- webkit-1.0 >= $WEBKIT_GTK_REQUIRED
+ webkit-3.0 >= $WEBKIT_GTK_REQUIRED
libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
])
diff --git a/src/Makefile.am b/src/Makefile.am
index 219b083..9906cff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -341,9 +341,9 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE
--nsversion=$(EPIPHANY_API_VERSION) \
--add-include-path=. \
--add-include-path=$(srcdir) \
- --include=Gtk-2.0 \
+ --include=Gtk-3.0 \
--include=libxml2-2.0 \
- --include=WebKit-1.0 \
+ --include=WebKit-3.0 \
--program=./epiphany \
--output $@ \
--pkg epiphany-$(EPIPHANY_API_VERSION) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]