GNOME.org
 

[libwnck/wip/muktupavels/gtk4] bump API version to 4

commit a6cb4932db991d85e4533a410f598fcd7f3c9d14
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Nov 13 12:45:34 2016 +0200

    bump API version to 4

 Makefile.am                                        |    4 +-
 configure.ac                                       |   18 +++++++-------
 doc/Makefile.am                                    |    4 +-
 ...nstalled.pc.in => libwnck-4.0-uninstalled.pc.in |    5 +--
 libwnck-3.0.pc.in => libwnck-4.0.pc.in             |    7 ++---
 libwnck/Makefile.am                                |   26 ++++++++++----------
 po/Makevars                                        |    2 +-
 7 files changed, 32 insertions(+), 34 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a7a9031..71db90d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libwnck-3.0.pc
+pkgconfig_DATA = libwnck-4.0.pc
 
 EXTRA_DIST = \
        HACKING         \
@@ -30,7 +30,7 @@ MAINTAINERCLEANFILES = \
        $(srcdir)/po/boldquot.sed \
        $(srcdir)/po/en@boldquot.header \
        $(srcdir)/po/en@quot.header \
-       $(srcdir)/po/libwnck-3.0.pot \
+       $(srcdir)/po/libwnck-4.0.pot \
        $(srcdir)/po/insert-header.sin \
        $(srcdir)/po/quot.sed \
        $(srcdir)/po/remove-potcdate.sin \
diff --git a/configure.ac b/configure.ac
index e9348cc..e8b60fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.62)
 
 m4_define([wnck_major_version], [3])
-m4_define([wnck_minor_version], [20])
-m4_define([wnck_micro_version], [2])
+m4_define([wnck_minor_version], [89])
+m4_define([wnck_micro_version], [0])
 m4_define([wnck_version],
           [wnck_major_version.wnck_minor_version.wnck_micro_version])
 
@@ -23,16 +23,16 @@ AX_CHECK_ENABLE_DEBUG([yes])
 dnl libtool versioning for libwnck
 
 dnl increment if the interface has additions, changes, removals.
-LIBWNCK_CURRENT=2
+LIBWNCK_CURRENT=0
 
 dnl increment any time the source changes; set to
 dnl  0 if you increment CURRENT
-LIBWNCK_REVISION=2
+LIBWNCK_REVISION=0
 
 dnl increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been changed or removed. removal has
 dnl  precedence over adding, so set to 0 if both happened.
-LIBWNCK_AGE=2
+LIBWNCK_AGE=0
 
 AC_SUBST(LIBWNCK_CURRENT)
 AC_SUBST(LIBWNCK_REVISION)
@@ -71,7 +71,7 @@ AM_CONDITIONAL(ENABLE_TOOLS, test "x$enable_tools" != "xno")
 AM_GNU_GETTEXT_VERSION([0.19.4])
 AM_GNU_GETTEXT([external])
 
-GETTEXT_PACKAGE=libwnck-3.0
+GETTEXT_PACKAGE=libwnck-4.0
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Package name])
 
@@ -151,7 +151,7 @@ AC_SUBST(XLIB_CFLAGS)
 AC_SUBST(XLIB_LIBS)
 
 PKG_CHECK_MODULES([LIBWNCK],[
-       gtk+-3.0 >= 3.19.5
+       gtk+-4.0 >= 3.19.5
        glib-2.0 >= 2.32
        gobject-2.0 >= 2.13.0
        $CAIRO_XLIB_XRENDER_PACKAGE
@@ -182,8 +182,8 @@ doc/Makefile
 po/Makefile.in
 libwnck/Makefile
 libwnck/version.h
-libwnck-3.0.pc
-libwnck-3.0-uninstalled.pc
+libwnck-4.0.pc
+libwnck-4.0-uninstalled.pc
 ])
 
 dnl ---------------------------------------------------------------------------
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fd2ba13..0a184bb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,7 @@
 
 # The name of the module.
 DOC_MODULE=libwnck
-DOC_MODULE_VERSION=3.0
+DOC_MODULE_VERSION=4.0
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=libwnck-docs.sgml
@@ -43,7 +43,7 @@ extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(LIBWNCK_CFLAGS) -DWNCK_I_KNOW_THIS_IS_UNSTABLE 
-DWNCK_COMPILATION
-GTKDOC_LIBS = $(top_builddir)/libwnck/libwnck-3.la $(LIBWNCK_LIBS)
+GTKDOC_LIBS = $(top_builddir)/libwnck/libwnck-4.la $(LIBWNCK_LIBS)
 
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/libwnck-3.0-uninstalled.pc.in b/libwnck-4.0-uninstalled.pc.in
similarity index 75%
rename from libwnck-3.0-uninstalled.pc.in
rename to libwnck-4.0-uninstalled.pc.in
index e6782a2..6648829 100644
--- a/libwnck-3.0-uninstalled.pc.in
+++ b/libwnck-4.0-uninstalled.pc.in
@@ -6,8 +6,7 @@ includedir=@includedir@
 Name: libwnck
 Description: Window Navigator Construction Kit library
 Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 gtk+-3.0
+Requires: glib-2.0 gobject-2.0 gtk+-4.0
 Requires.private: @X11_PACKAGE@ pango cairo @STARTUP_NOTIFICATION_PACKAGE@ @XRES_PACKAGE@
-Libs: ${pc_top_builddir}/${pcfiledir}/libwnck/libwnck-3.la
+Libs: ${pc_top_builddir}/${pcfiledir}/libwnck/libwnck-4.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}
-
diff --git a/libwnck-3.0.pc.in b/libwnck-4.0.pc.in
similarity index 71%
rename from libwnck-3.0.pc.in
rename to libwnck-4.0.pc.in
index f7820e1..96e4532 100644
--- a/libwnck-3.0.pc.in
+++ b/libwnck-4.0.pc.in
@@ -6,8 +6,7 @@ includedir=@includedir@
 Name: libwnck
 Description: Window Navigator Construction Kit library
 Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 gtk+-3.0
+Requires: glib-2.0 gobject-2.0 gtk+-4.0
 Requires.private: @X11_PACKAGE@ pango cairo @STARTUP_NOTIFICATION_PACKAGE@ @XRES_PACKAGE@
-Libs: -L${libdir} -lwnck-3
-Cflags: -I${includedir}/libwnck-3.0
-
+Libs: -L${libdir} -lwnck-4
+Cflags: -I${includedir}/libwnck-4.0
diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
index d293092..cc760cf 100644
--- a/libwnck/Makefile.am
+++ b/libwnck/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-lib_LTLIBRARIES = libwnck-3.la
+lib_LTLIBRARIES = libwnck-4.la
 bin_PROGRAMS =
 noinst_PROGRAMS =              \
        test-pager              \
@@ -43,7 +43,7 @@ wnck_headers =                        \
        window-action-menu.h    \
        workspace.h
 
-libwnckincludedir = $(includedir)/libwnck-3.0/libwnck
+libwnckincludedir = $(includedir)/libwnck-4.0/libwnck
 libwnckinclude_HEADERS =               \
        $(wnck_headers)                 \
        wnck-enum-types.h \
@@ -72,7 +72,7 @@ wnck_accessibility_files =                    \
        workspace-accessible-factory.c          \
        workspace-accessible-factory.h
 
-libwnck_3_la_SOURCES =                 \
+libwnck_4_la_SOURCES =                 \
        $(BUILT_SOURCES) \
        $(wnck_sources)         \
        private.h               \
@@ -82,19 +82,19 @@ libwnck_3_la_SOURCES =              \
        wnck-image-menu-item-private.h \
        $(wnck_accessibility_files)
 
-libwnck_3_la_CPPFLAGS =                        \
+libwnck_4_la_CPPFLAGS =                        \
        $(AM_CPPFLAGS)                  \
        $(XLIB_CFLAGS)                  \
        -DG_LOG_DOMAIN=\"Wnck\"         \
        -DWNCK_COMPILATION              \
        -DSN_API_NOT_YET_FROZEN=1
 
-libwnck_3_la_LIBADD =  \
+libwnck_4_la_LIBADD =  \
        $(LIBWNCK_LIBS) \
        $(XLIB_LIBS)    \
        $(LIBM)
 
-libwnck_3_la_LDFLAGS =                                                         \
+libwnck_4_la_LDFLAGS =                                                         \
        -version-info $(LIBWNCK_CURRENT):$(LIBWNCK_REVISION):$(LIBWNCK_AGE)     \
        -no-undefined                                                           \
        -export-symbols-regex "^[^_].*" \
@@ -179,13 +179,13 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 if HAVE_INTROSPECTION
 introspection_sources = $(wnck_sources) $(libwnckinclude_HEADERS)
 
-Wnck-3.0.gir: libwnck-3.la
-Wnck_3_0_gir_INCLUDES = GObject-2.0 GdkPixbuf-2.0 Gtk-3.0
-Wnck_3_0_gir_CFLAGS = $(libwnck_3_la_CPPFLAGS)
-Wnck_3_0_gir_LIBS = libwnck-3.la
-Wnck_3_0_gir_SCANNERFLAGS = --pkg-export=libwnck-3.0 $(WARN_SCANNERFLAGS)
-Wnck_3_0_gir_FILES = $(introspection_sources)
-INTROSPECTION_GIRS += Wnck-3.0.gir
+Wnck-4.0.gir: libwnck-4.la
+Wnck_4_0_gir_INCLUDES = GObject-2.0 GdkPixbuf-2.0 Gtk-4.0
+Wnck_4_0_gir_CFLAGS = $(libwnck_4_la_CPPFLAGS)
+Wnck_4_0_gir_LIBS = libwnck-4.la
+Wnck_4_0_gir_SCANNERFLAGS = --pkg-export=libwnck-4.0 $(WARN_SCANNERFLAGS)
+Wnck_4_0_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += Wnck-4.0.gir
 
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/po/Makevars b/po/Makevars
index 7b9b017..e551425 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = libwnck-3.0
+DOMAIN = libwnck-4.0
 
 # These two variables depend on the location of this directory.
 subdir = po
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]