[evince] Bump to new version scheme



commit 4645b3e5aa659a797870166ee3c381a5b86c8044
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Fri Mar 26 00:08:14 2021 -0300

    Bump to new version scheme
    
    Only major and minor version numbers are used from now on.

 help/reference/libdocument/libevdocument-sections.txt |  1 -
 libdocument/ev-version.h.in                           | 14 ++------------
 libdocument/meson.build                               |  1 -
 meson.build                                           |  3 +--
 4 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/help/reference/libdocument/libevdocument-sections.txt 
b/help/reference/libdocument/libevdocument-sections.txt
index 95b0104c..54095eda 100644
--- a/help/reference/libdocument/libevdocument-sections.txt
+++ b/help/reference/libdocument/libevdocument-sections.txt
@@ -842,7 +842,6 @@ EV_TYPE_COMPRESSION_TYPE
 <TITLE>Version checks</TITLE>
 EV_MAJOR_VERSION
 EV_MINOR_VERSION
-EV_MICRO_VERSION
 EV_CHECK_VERSION
 </SECTION>
 
diff --git a/libdocument/ev-version.h.in b/libdocument/ev-version.h.in
index 97cf0a98..a8a3db28 100644
--- a/libdocument/ev-version.h.in
+++ b/libdocument/ev-version.h.in
@@ -43,27 +43,17 @@
  */
 #define EV_MINOR_VERSION (@EV_MINOR_VERSION@)
 
-/**
- * EV_MICRO_VERSION:
- *
- * The micro version number of the EV library
- * (e.g. in version 3.1.4 this is 4).
- */
-#define EV_MICRO_VERSION (@EV_MICRO_VERSION@)
-
 /**
  * EV_CHECK_VERSION:
  * @major: required major version
  * @minor: required minor version
- * @micro: required micro version
  *
  * Macro to check the library version at compile time.
  * It returns <literal>1</literal> if the version of EV is greater or
  * equal to the required one, and <literal>0</literal> otherwise.
  */
-#define EV_CHECK_VERSION(major,minor,micro) \
+#define EV_CHECK_VERSION(major,minor) \
   (EV_MAJOR_VERSION > (major) || \
-   (EV_MAJOR_VERSION == (major) && EV_MINOR_VERSION > (minor)) || \
-   (EV_MAJOR_VERSION == (major) && EV_MINOR_VERSION == (minor) && EV_MICRO_VERSION >= (micro)))
+   (EV_MAJOR_VERSION == (major) && EV_MINOR_VERSION > (minor))
 
 #endif /* #ifndef EV_VERSION_H */
diff --git a/libdocument/meson.build b/libdocument/meson.build
index 6b81c429..74fe2fb1 100644
--- a/libdocument/meson.build
+++ b/libdocument/meson.build
@@ -91,7 +91,6 @@ sources = files(
 version_conf = configuration_data()
 version_conf.set('EV_MAJOR_VERSION', ev_major_version)
 version_conf.set('EV_MINOR_VERSION', ev_minor_version)
-version_conf.set('EV_MICRO_VERSION', ev_micro_version)
 
 version = 'ev-version.h'
 
diff --git a/meson.build b/meson.build
index f9732d46..1ed37e96 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project(
   'evince', ['c', 'cpp'],
-  version: '3.39.2',
+  version: '40.0',
   license: 'GPL2+',
   default_options: 'buildtype=debugoptimized',
   meson_version: '>= 0.50.0',
@@ -12,7 +12,6 @@ ev_version = meson.project_version()
 version_array = ev_version.split('.')
 ev_major_version = version_array[0].to_int()
 ev_minor_version = version_array[1].to_int()
-ev_micro_version = version_array[2].to_int()
 
 ev_prefix = get_option('prefix')
 ev_bindir = join_paths(ev_prefix, get_option('bindir'))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]