GNOME.org
 

[gtksourceview] Bump gtksourceview version to 3.0

commit 1953708e852535478d154a1b804c2ca32174d153
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Fri Jun 11 16:55:04 2010 +0200

    Bump gtksourceview version to 3.0

 Makefile.am                                        |    2 +-
 README                                             |    4 +-
 configure.ac                                       |   30 ++--------
 data/glade/gtksourceview.xml.in                    |    2 +-
 data/language-specs/Makefile.am                    |    2 +-
 data/styles/Makefile.am                            |    2 +-
 docs/reference/Makefile.am                         |    4 +-
 gtksourceview-2.0.pc.in => gtksourceview-3.0.pc.in |    8 +-
 gtksourceview/Makefile.am                          |   31 +++++-----
 .../completion-providers/words/Makefile.am         |    2 +-
 gtksourceview/gseal-gtk-compat.h                   |   60 --------------------
 gtksourceview/gtksourcecompletion.c                |    1 -
 gtksourceview/gtksourcecompletioninfo.c            |    1 -
 gtksourceview/gtksourcestylescheme.c               |    1 -
 gtksourceview/gtksourceview.c                      |    1 -
 tests/Makefile.am                                  |   10 ++--
 16 files changed, 40 insertions(+), 121 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 270ed4e..bfb28b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS  = -I m4 ${ACLOCAL_FLAGS}
 SUBDIRS = gtksourceview po data docs tests
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gtksourceview-2.0.pc
+pkgconfig_DATA = gtksourceview-3.0.pc
 
 EXTRA_DIST = \
 	intltool-extract.in \
diff --git a/README b/README
index aa9c795..b79783d 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ General Information
 
 This is version 2.11.2 of GtkSourceView.
 
-GtkSourceView is a text widget that extends the standard gtk+ 2.x
+GtkSourceView is a text widget that extends the standard gtk+ 3.x
 text widget GtkTextView.
 
 It improves GtkTextView by implementing syntax highlighting and other
@@ -28,7 +28,7 @@ All future contributions to the project must be LGPL-licensed.
 Installation
 ============
 
-GtkSourceView requires glib-2.14.x, GTK+-2.12.x and libxml2 2.5.x.
+GtkSourceView requires glib-2.14.x, GTK+-3.0.x and libxml2 2.5.x.
 
 Simple install procedure:
 
diff --git a/configure.ac b/configure.ac
index b8e3338..5e021d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,7 @@ LT_INIT([disable-static])
 AC_CHECK_HEADERS([unistd.h])
 
 # Dependencies
-GTK_REQUIRED=
-GTK_REQUIRED_VERSION=
+GTK_REQUIRED_VERSION=2.90.0
 LIBXML_REQUIRED_VERSION=2.5.0
 GLADE_UI_REQUIRED=3.2
 
@@ -63,30 +62,15 @@ if test "$enable_deprecations" = "yes"; then
 -DGDK_DISABLE_DEPRECATED \
 -DGTK_DISABLE_DEPRECATED \
 -DGDK_PIXBUF_DISABLE_DEPRECATED \
--DGNOME_DISABLE_DEPRECATED"
-
-	if $PKG_CONFIG --atleast-version 2.90 $GTK_REQUIRED; then
-		DISABLE_DEPRECATED_CFLAGS="$DISABLE_DEPRECATED_CFLAGS -DGSEAL_ENABLE"
-	fi
+-DGNOME_DISABLE_DEPRECATED \
+-DGSEAL_ENABLE"
 
 	AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 fi
 
-PKG_CHECK_EXISTS([gtk+-3.0 >= 2.90],
-		 [
-		 	GTK_REQUIRED=gtk+-3.0
-		 	GTK_REQUIRED_VERSION=2.90.0
-			GTK_TYPELIB=Gtk-3.0
-		 ],[
-		 	GTK_REQUIRED=gtk+-2.0
-		 	GTK_REQUIRED_VERSION=2.16.0
-			GTK_TYPELIB=Gtk-2.0
-		 ])
-
-AC_SUBST(GTK_TYPELIB)
 PKG_CHECK_MODULES(DEP, [
 	gio-2.0
-	$GTK_REQUIRED >= $GTK_REQUIRED_VERSION
+	gtk+-3.0 >= $GTK_REQUIRED_VERSION
 	libxml-2.0 >= $LIBXML_REQUIRED_VERSION
 ])
 
@@ -101,7 +85,7 @@ AM_CONDITIONAL([ENABLE_PROVIDERS], [ test "$enable_providers" = "yes" ])
 dnl check for native osx
 AC_MSG_CHECKING([for native Mac OS X])
 
-gdk_windowing=`$PKG_CONFIG --variable=target gdk-2.0`
+gdk_windowing=`$PKG_CONFIG --variable=target gdk-3.0`
 
 if test "$gdk_windowing" = "quartz"; then
 	os_osx=yes
@@ -136,7 +120,7 @@ AS_IF([ test "$glade_catalog" = "yes" ],
 # i18N stuff
 IT_PROG_INTLTOOL([0.40])
 
-AC_SUBST([GETTEXT_PACKAGE], [gtksourceview-2.0])
+AC_SUBST([GETTEXT_PACKAGE], [gtksourceview-3.0])
 AM_GNU_GETTEXT_VERSION([0.17])
 AM_GLIB_GNU_GETTEXT
 AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [Define to the gettext package name.])
@@ -152,7 +136,7 @@ AC_SUBST(ABS_TOP_SRCDIR)
 
 # Output files
 AC_CONFIG_FILES([
-gtksourceview-2.0.pc
+gtksourceview-3.0.pc
 gtksourceview-zip
 Makefile
 data/Makefile
diff --git a/data/glade/gtksourceview.xml.in b/data/glade/gtksourceview.xml.in
index 574fc98..5094ff4 100644
--- a/data/glade/gtksourceview.xml.in
+++ b/data/glade/gtksourceview.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glade-catalog version="2.10" supports="gtkbuilder" name="gtksourceview" library="gtksourceview" domain="gtksourceview" depends="gtk+" book="gtksourceview">
+<glade-catalog version="3.0" supports="gtkbuilder" name="gtksourceview" library="gtksourceview" domain="gtksourceview" depends="gtk+" book="gtksourceview">
   <glade-widget-classes>
     <glade-widget-class name="GtkSourceView" _title="GtkSourceView" generic-name="gtksourceview">
       <properties>
diff --git a/data/language-specs/Makefile.am b/data/language-specs/Makefile.am
index 2c0de49..64709a2 100644
--- a/data/language-specs/Makefile.am
+++ b/data/language-specs/Makefile.am
@@ -81,7 +81,7 @@ LANGUAGES =			\
 	xslt.lang		\
 	yacc.lang
 
-languagesdir = $(datadir)/gtksourceview-2.0/language-specs
+languagesdir = $(datadir)/gtksourceview-3.0/language-specs
 languages_DATA = $(LANGUAGES) language.rng language2.rng language.dtd \
 		 check-language.sh convert.py
 
diff --git a/data/styles/Makefile.am b/data/styles/Makefile.am
index 7ad3955..d104102 100644
--- a/data/styles/Makefile.am
+++ b/data/styles/Makefile.am
@@ -7,7 +7,7 @@ STYLES =		\
 	oblivion.xml	\
 	tango.xml
 
-stylesdir = $(datadir)/gtksourceview-2.0/styles
+stylesdir = $(datadir)/gtksourceview-3.0/styles
 styles_DATA = $(STYLES) styles.rng check-style.sh
 
 EXTRA_DIST = $(styles_DATA)
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index ca17ccd..ea08c38 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,11 +1,11 @@
 GTKDOC_CFLAGS = -I$(top_srcdir) $(DEP_CFLAGS)
-GTKDOC_LIBS = $(top_builddir)/gtksourceview/libgtksourceview-2.0.la
+GTKDOC_LIBS = $(top_builddir)/gtksourceview/libgtksourceview-3.0.la
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.7
 
 # The name of the module.
-DOC_MODULE = gtksourceview-2.0
+DOC_MODULE = gtksourceview-3.0
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = gtksourceview-docs.sgml
diff --git a/gtksourceview-2.0.pc.in b/gtksourceview-3.0.pc.in
similarity index 51%
rename from gtksourceview-2.0.pc.in
rename to gtksourceview-3.0.pc.in
index 1f4e73e..7e19a99 100644
--- a/gtksourceview-2.0.pc.in
+++ b/gtksourceview-3.0.pc.in
@@ -4,9 +4,9 @@ libdir= libdir@
 includedir= includedir@
 
 Name: @PACKAGE_NAME@
-Description: GTK+ 2.0 Source Editing Widget
+Description: GTK+ 3.0 Source Editing Widget
 Version: @PACKAGE_VERSION@
-Requires: @GTK_REQUIRED@ >= @GTK_REQUIRED_VERSION@
+Requires: gtk+-3.0 >= @GTK_REQUIRED_VERSION@
 Requires.private: libxml-2.0 >= @LIBXML_REQUIRED_VERSION@
-Libs: -L${libdir} -lgtksourceview-2.0
-Cflags: -I${includedir}/gtksourceview-2.0
+Libs: -L${libdir} -lgtksourceview-3.0
+Cflags: -I${includedir}/gtksourceview-3.0
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index cb59e3d..df143fa 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -18,7 +18,7 @@ BUILT_SOURCES = 			\
 	gtksourceview-typebuiltins.h
 
 # libs
-lib_LTLIBRARIES = libgtksourceview-2.0.la
+lib_LTLIBRARIES = libgtksourceview-3.0.la
 
 libgtksourceview_headers =			\
 	gtksourcebuffer.h			\
@@ -41,7 +41,6 @@ libgtksourceview_headers =			\
 	gtksourceview.h
 
 NOINST_H_FILES = \
-	gseal-gtk-compat.h		\
 	gtksourcecompletionmodel.h	\
 	gtksourcecompletion-private.h	\
 	gtksourcecompletionui.h		\
@@ -86,23 +85,23 @@ libgtksourceview_c_files = \
 	gtksourceview-utils.c 		\
 	gtktextregion.c
 
-libgtksourceview_2_0_la_SOURCES = 	\
+libgtksourceview_3_0_la_SOURCES = 	\
 	$(libgtksourceview_c_files)	\
 	$(libgtksourceview_headers)	\
 	$(NOINST_H_FILES)
 
 # do not distribute generated files
-nodist_libgtksourceview_2_0_la_SOURCES =\
+nodist_libgtksourceview_3_0_la_SOURCES =\
 	$(BUILT_SOURCES)
 
 completion_providers = 							\
 	completion-providers/words/libgtksourcecompletionwords.la
 
-libgtksourceview_2_0_la_LIBADD = $(DEP_LIBS) $(IGE_MAC_LIBS) $(completion_providers)
-libgtksourceview_2_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*"
-libgtksourceview_2_0_includedir = $(includedir)/gtksourceview-2.0/gtksourceview
+libgtksourceview_3_0_la_LIBADD = $(DEP_LIBS) $(IGE_MAC_LIBS) $(completion_providers)
+libgtksourceview_3_0_la_LDFLAGS = -no-undefined -export-symbols-regex "^gtk_source_.*"
+libgtksourceview_3_0_includedir = $(includedir)/gtksourceview-3.0/gtksourceview
 
-libgtksourceview_2_0_include_HEADERS =		\
+libgtksourceview_3_0_include_HEADERS =		\
 	$(libgtksourceview_headers)		\
 	gtksourceview-typebuiltins.h
 
@@ -160,16 +159,16 @@ CLEANFILES = 					\
 
 if HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS = GtkSource-2.0.gir
+INTROSPECTION_GIRS = GtkSource-3.0.gir
 
-GtkSource-2.0.gir: libgtksourceview-2.0.la
+GtkSource-3.0.gir: libgtksourceview-3.0.la
 INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir)
-GtkSource_2_0_gir_NAMESPACE = GtkSource
-GtkSource_2_0_gir_VERSION = 2.0
-GtkSource_2_0_gir_LIBS = libgtksourceview-2.0.la
-GtkSource_2_0_gir_FILES = $(libgtksourceview_headers) $(libgtksourceview_c_files)
-GtkSource_2_0_gir_INCLUDES = $(GTK_TYPELIB)
-GtkSource_2_0_gir_PACKAGES = gtksourceview-2.0
+GtkSource_3_0_gir_NAMESPACE = GtkSource
+GtkSource_3_0_gir_VERSION = 3.0
+GtkSource_3_0_gir_LIBS = libgtksourceview-3.0.la
+GtkSource_3_0_gir_FILES = $(libgtksourceview_headers) $(libgtksourceview_c_files)
+GtkSource_3_0_gir_INCLUDES = Gtk-3.0
+GtkSource_3_0_gir_PACKAGES = gtksourceview-3.0
 
 girdir = $(INTROSPECTION_GIRDIR)
 dist_gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/gtksourceview/completion-providers/words/Makefile.am b/gtksourceview/completion-providers/words/Makefile.am
index 48c8d5d..ac102da 100644
--- a/gtksourceview/completion-providers/words/Makefile.am
+++ b/gtksourceview/completion-providers/words/Makefile.am
@@ -27,7 +27,7 @@ libgtksourcecompletionwords_la_SOURCES =	\
 	$(NOINST_H_FILES)
 
 libgtksourcecompletionwords_includedir = \
-	$(includedir)/gtksourceview-2.0/gtksourceview/completion-providers/words
+	$(includedir)/gtksourceview-3.0/gtksourceview/completion-providers/words
 
 libgtksourcecompletionwords_include_HEADERS =		\
 	$(libgtksourcecompletionwords_headers)
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index 8bfec81..220afeb 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -38,7 +38,6 @@
 #include "gtksourcecompletion-private.h"
 #include "gtksourcecompletioncontext.h"
 #include "gtksourcecompletionui.h"
-#include "gseal-gtk-compat.h"
 #include <stdarg.h>
 
 #define WINDOW_WIDTH 350
diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtksourcecompletioninfo.c
index d10f156..9c2a4b7 100644
--- a/gtksourceview/gtksourcecompletioninfo.c
+++ b/gtksourceview/gtksourcecompletioninfo.c
@@ -32,7 +32,6 @@
 #include <gtksourceview/gtksourcecompletioninfo.h>
 #include "gtksourcecompletionutils.h"
 #include "gtksourceview-i18n.h"
-#include "gseal-gtk-compat.h"
 
 #ifndef MIN
 #define MIN (a, b) ((a) < (b) ? (a) : (b))
diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c
index 256cb7c..9e5e627 100644
--- a/gtksourceview/gtksourcestylescheme.c
+++ b/gtksourceview/gtksourcestylescheme.c
@@ -24,7 +24,6 @@
 #include "gtksourceview.h"
 #include "gtksourcelanguage-private.h"
 #include "gtksourcestyle-private.h"
-#include "gseal-gtk-compat.h"
 #include <libxml/parser.h>
 #include <string.h>
 
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index 70001dc..2de7985 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -41,7 +41,6 @@
 #include "gtksourcecompletion-private.h"
 #include "gtksourcecompletionutils.h"
 #include "gtksourcegutter-private.h"
-#include "gseal-gtk-compat.h"
 
 /**
  * SECTION:view
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0abffd7..23f882c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,14 +14,14 @@ TESTS = $(UNIT_TEST_PROGS)
 TEST_PROGS = test-widget
 test_widget_SOURCES = test-widget.c
 test_widget_LDADD = 			\
-	$(top_builddir)/gtksourceview/libgtksourceview-2.0.la \
+	$(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
 	$(DEP_LIBS)			\
 	$(TESTS_LIBS)
 
 TEST_PROGS += test-completion
 test_completion_SOURCES = test-completion.c
 test_completion_LDADD = 		\
-	$(top_builddir)/gtksourceview/libgtksourceview-2.0.la \
+	$(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
 	$(DEP_LIBS)			\
 	$(TESTS_LIBS)
 
@@ -29,7 +29,7 @@ UNIT_TEST_PROGS = test-languagemanager
 test_languagemanager_SOURCES =		\
 	test-languagemanager.c
 test_languagemanager_LDADD = 		\
-	$(top_builddir)/gtksourceview/libgtksourceview-2.0.la \
+	$(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
 	$(DEP_LIBS)			\
 	$(TESTS_LIBS)
 
@@ -37,7 +37,7 @@ UNIT_TEST_PROGS += test-printcompositor
 test_printcompositor_SOURCES =		\
 	test-printcompositor.c
 test_printcompositor_LDADD = 		\
-	$(top_builddir)/gtksourceview/libgtksourceview-2.0.la \
+	$(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
 	$(DEP_LIBS)			\
 	$(TESTS_LIBS)
 
@@ -46,7 +46,7 @@ test_printcompositor_LDADD = 		\
 # TEST_PROGS += testregion
 #testregion_SOURCES = testregion.c
 #testregion_LDADD = 			\
-#	$(top_builddir)/gtksourceview/libgtksourceview-2.0.la \
+#	$(top_builddir)/gtksourceview/libgtksourceview-3.0.la \
 #	$(DEP_LIBS)
 
 EXTRA_DIST =				\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]