GNOME.org
 

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

commit 134c0a4ca2d73a28f91b4df1cc8b9e6099460141
Author: Alberto Fanjul <albertofanjul gmail com>
Date:   Sun Mar 15 12:36:22 2020 +0100

    Change the ABI from goocanvas-2.0 to goocanvas-3.0.
    
    Use goocanvas-3.0 to continue developing on gtk 3

 .gitignore                                 | 28 ++++++++++++++--------------
 ChangeLog                                  |  4 ++++
 Makefile.am                                |  4 ++--
 configure.ac                               |  6 +++---
 demo/Makefile.am                           |  2 +-
 docs/Makefile.am                           |  4 ++--
 goocanvas-2.0.pc.in => goocanvas-3.0.pc.in |  4 ++--
 src/Makefile.am                            | 28 ++++++++++++++--------------
 8 files changed, 42 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 97dc138..618498f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,7 @@ Makefile.in
 /demo/widgets-demo
 /depcomp
 /goocanvas.pc
-/goocanvas-2.0.pc
+/goocanvas-[23].0.pc
 /gtk-doc.make
 /gtk-doc.m4
 /compile
@@ -56,7 +56,7 @@ Makefile.in
 /po/Rules-quot
 /po/Makefile.in.in
 /po/Makevars.template
-/po/goocanvas2.pot
+/po/goocanvas[23].pot
 /po/stamp-po
 /src/goocanvasenumtypes.c
 /src/goocanvasenumtypes.h
@@ -64,8 +64,8 @@ Makefile.in
 /src/goocanvasmarshal.h
 /src/stamp-goocanvasenumtypes.h
 /src/stamp-goocanvasmarshal.h
-/src/GooCanvas-2.0.gir
-/src/GooCanvas-2.0.typelib
+/src/GooCanvas-[23].0.gir
+/src/GooCanvas-[23].0.typelib
 /stamp-h1
 /test-driver
 /docs/goocanvas-decl-list.txt
@@ -78,16 +78,16 @@ Makefile.in
 /docs/goocanvas.interfaces
 /docs/goocanvas.prerequisites
 /docs/goocanvas.signals
-/docs/goocanvas2-decl-list.txt
-/docs/goocanvas2-decl.txt
-/docs/goocanvas2-undeclared.txt
-/docs/goocanvas2-undocumented.txt
-/docs/goocanvas2-unused.txt
-/docs/goocanvas2.args
-/docs/goocanvas2.hierarchy
-/docs/goocanvas2.interfaces
-/docs/goocanvas2.prerequisites
-/docs/goocanvas2.signals
+/docs/goocanvas[23]-decl-list.txt
+/docs/goocanvas[23]-decl.txt
+/docs/goocanvas[23]-undeclared.txt
+/docs/goocanvas[23]-undocumented.txt
+/docs/goocanvas[23]-unused.txt
+/docs/goocanvas[23].args
+/docs/goocanvas[23].hierarchy
+/docs/goocanvas[23].interfaces
+/docs/goocanvas[23].prerequisites
+/docs/goocanvas[23].signals
 /docs/*.stamp
 /docs/*.bak
 /docs/html
diff --git a/ChangeLog b/ChangeLog
index 28f7c33..0e6dfcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-15  Alberto Fanjul  <albfan gnome org>
+
+       * Change the ABI from goocanvas-2.0 to goocanvas-3.0: Use goocanvas-3.0 to continue developing on gtk 
3
+
 2017-11-23  Damon Chaplin  <damon gnome org>
 
        * src/goocanvasitemmodel.c (goo_canvas_item_model_class_list_child_properties):
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.ac b/configure.ac
index 964c3ee..5333410 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(goocanvas, 2.0.4)
+AC_INIT(goocanvas, 3.00.0)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(src/goocanvas.c)
 AC_CONFIG_HEADERS(config.h)
@@ -39,7 +39,7 @@ AC_SUBST(PACKAGE_LIBS)
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.20])
 
-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 4fd2ea2..453e0bc 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,7 +4,7 @@
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=goocanvas2
+DOC_MODULE=goocanvas3
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 #DOC_MODULE_VERSION=2
@@ -75,7 +75,7 @@ expand_content_files=                         \
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=-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/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 e3339d0..2f7d4f3 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              \
@@ -159,15 +159,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) -I$(top_srcdir)/src
-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) -I$(top_srcdir)/src
+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]