GNOME.org
 

[goocanvas] Change the ABI from goocanvas-2.0 to goocanvas-3.0.

commit c5744e5f799a98a84397140927ed96ce33e40976
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Dec 16 10:09:20 2016 +0100

    Change the ABI from goocanvas-2.0 to goocanvas-3.0.
    
    This installs in parallel with goocanvas-2.0, which uses GTK+ 3.0.
    goocanvas-3.0 uses GTK+ 4.0.

 Makefile.am                                        |    4 +-
 configure.in                                       |    6 ++--
 demo/Makefile.am                                   |    2 +-
 docs/Makefile.am                                   |    4 +-
 .../{goocanvas2-docs.sgml => goocanvas3-docs.sgml} |    0
 ...vas2-overrides.txt => goocanvas3-overrides.txt} |    0
 ...anvas2-sections.txt => goocanvas3-sections.txt} |    0
 docs/{goocanvas2.types => goocanvas3.types}        |    0
 goocanvas-2.0.pc.in => goocanvas-3.0.pc.in         |    4 +-
 src/Makefile.am                                    |   28 ++++++++++----------
 10 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 273e4d3..218d3c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,6 @@ AUTOMAKE_OPTIONS = 1.7
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = goocanvas-2.0.pc
+pkgconfig_DATA = goocanvas-3.0.pc
 
-EXTRA_DIST = goocanvas-2.0.pc.in autogen.sh
+EXTRA_DIST = goocanvas-3.0.pc.in autogen.sh
diff --git a/configure.in b/configure.in
index 686b706..e1ca35a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(goocanvas, 2.0.2)
+AC_INIT(goocanvas, 2.99.1)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(src/goocanvas.c)
 AC_CONFIG_HEADERS(config.h)
@@ -35,7 +35,7 @@ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
-GETTEXT_PACKAGE=goocanvas2
+GETTEXT_PACKAGE=goocanvas3
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
 
@@ -117,6 +117,6 @@ docs/Makefile
 bindings/Makefile
 bindings/python/Makefile
 po/Makefile.in
-goocanvas-2.0.pc
+goocanvas-3.0.pc
 ])
 
diff --git a/demo/Makefile.am b/demo/Makefile.am
index f1009f5..5a2466c 100644
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
        -I$(top_builddir)/src \
        @PACKAGE_CFLAGS@
 
-DEMO_LIBS = $(top_builddir)/src/libgoocanvas-2.0.la @PACKAGE_LIBS@ $(INTLLIBS) -lm
+DEMO_LIBS = $(top_builddir)/src/libgoocanvas-3.0.la @PACKAGE_LIBS@ $(INTLLIBS) -lm
 
 #      -DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
 #      -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
diff --git a/docs/Makefile.am b/docs/Makefile.am
index ae66d7e..c634e74 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=goocanvas2
+DOC_MODULE=goocanvas3
 
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -75,7 +75,7 @@ content_files= $(expand_content_files)
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/src @PACKAGE_CFLAGS@
-GTKDOC_LIBS=@PACKAGE_LIBS@ $(top_builddir)/src/libgoocanvas-2.0.la
+GTKDOC_LIBS=@PACKAGE_LIBS@ $(top_builddir)/src/libgoocanvas-3.0.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/goocanvas2-docs.sgml b/docs/goocanvas3-docs.sgml
similarity index 100%
rename from docs/goocanvas2-docs.sgml
rename to docs/goocanvas3-docs.sgml
diff --git a/docs/goocanvas2-overrides.txt b/docs/goocanvas3-overrides.txt
similarity index 100%
rename from docs/goocanvas2-overrides.txt
rename to docs/goocanvas3-overrides.txt
diff --git a/docs/goocanvas2-sections.txt b/docs/goocanvas3-sections.txt
similarity index 100%
rename from docs/goocanvas2-sections.txt
rename to docs/goocanvas3-sections.txt
diff --git a/docs/goocanvas2.types b/docs/goocanvas3.types
similarity index 100%
rename from docs/goocanvas2.types
rename to docs/goocanvas3.types
diff --git a/goocanvas-2.0.pc.in b/goocanvas-3.0.pc.in
similarity index 72%
rename from goocanvas-2.0.pc.in
rename to goocanvas-3.0.pc.in
index 6dcaeff..526d766 100644
--- a/goocanvas-2.0.pc.in
+++ b/goocanvas-3.0.pc.in
@@ -8,6 +8,6 @@ Name: GooCanvas
 Description: A GTK+ canvas widget using cairo
 Version: @VERSION@
 Requires: gtk+-3.0 cairo
-Libs: -L${libdir} -lgoocanvas-2.0
-Cflags: -I${includedir}/goocanvas-2.0
+Libs: -L${libdir} -lgoocanvas-3.0
+Cflags: -I${includedir}/goocanvas-3.0
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e23079e..370fec2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,9 +10,9 @@ INCLUDES = \
 #      -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
 #      -DGTK_DISABLE_DEPRECATED
 
-lib_LTLIBRARIES = libgoocanvas-2.0.la
+lib_LTLIBRARIES = libgoocanvas-3.0.la
 
-libgoocanvas_2_0_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
+libgoocanvas_3_0_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
@@ -23,9 +23,9 @@ libtool_opts =                                \
   -export-dynamic $(no_undefined)      \
   -rpath $(libdir)
 
-libgoocanvas_2_0_la_LDFLAGS = $(libtool_opts) 
+libgoocanvas_3_0_la_LDFLAGS = $(libtool_opts) 
 
-libgoocanvasincludedir = $(includedir)/goocanvas-2.0
+libgoocanvasincludedir = $(includedir)/goocanvas-3.0
 
 libgoocanvas_public_headers =          \
        goocanvasellipse.h              \
@@ -45,7 +45,7 @@ libgoocanvas_public_headers =         \
        goocanvaswidget.h               \
        goocanvas.h
 
-libgoocanvas_2_0_la_SOURCES =          \
+libgoocanvas_3_0_la_SOURCES =          \
        goocanvasatk.h                  \
        goocanvasatk.c                  \
        goocanvasellipse.c              \
@@ -152,15 +152,15 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
-introspection_sources = $(libgoocanvas_2_0_la_SOURCES) $(libgoocanvasinclude_HEADERS)
-
-GooCanvas-2.0.gir: libgoocanvas-2.0.la
-GooCanvas_2_0_gir_SCANNERFLAGS = --identifier-prefix=Goo --symbol-prefix=goo --warn-all
-GooCanvas_2_0_gir_INCLUDES = Gtk-3.0
-GooCanvas_2_0_gir_CFLAGS = $(INCLUDES)
-GooCanvas_2_0_gir_LIBS = goocanvas-2.0
-GooCanvas_2_0_gir_FILES = $(introspection_sources)
-INTROSPECTION_GIRS += GooCanvas-2.0.gir
+introspection_sources = $(libgoocanvas_3_0_la_SOURCES) $(libgoocanvasinclude_HEADERS)
+
+GooCanvas-3.0.gir: libgoocanvas-3.0.la
+GooCanvas_3_0_gir_SCANNERFLAGS = --identifier-prefix=Goo --symbol-prefix=goo --warn-all
+GooCanvas_3_0_gir_INCLUDES = Gtk-3.0
+GooCanvas_3_0_gir_CFLAGS = $(INCLUDES)
+GooCanvas_3_0_gir_LIBS = goocanvas-3.0
+GooCanvas_3_0_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += GooCanvas-3.0.gir
 
 girdir = @INTROSPECTION_GIRDIR@
 gir_DATA = $(INTROSPECTION_GIRS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]