Mercurial > pidgin3 / file diff

--- a/meson.build	Tue Sep 24 21:32:21 2024 -0500
+++ b/meson.build	Tue Sep 24 21:33:58 2024 -0500
@@ -21,7 +21,7 @@
 #   For production releases:    ''
 #
 project('pidgin', 'c',
-    version : '3.0.0-devel',
+    version : '2.90.0-devel',
     meson_version : '>=1.0.0',
     default_options : ['c_std=c17', 'warning_level=2'])
 purple_soversion = 0
@@ -38,6 +38,13 @@
 purple_minor_version = parts[1]
 purple_micro_version = parts[2]
 
+# purple_api_major_version should generally match purple_major_version.
+# However, when working towards a new major version, this number should be set
+# to that new major version while the meson project version should be something
+# like 2.90.0. This allows us to get the versioning sane, while changing the
+# major version.
+purple_api_major_version = '3'
+
 GETTEXT_PACKAGE='pidgin3'
 find_program('gettext')
 find_program('xgettext')
@@ -62,6 +69,7 @@
 conf.set_quoted('PURPLE_BUILD_BUILDTYPE', get_option('buildtype'))
 conf.set('PURPLE_DEBUG', get_option('debug'))
 
+version_conf.set('PURPLE_API_MAJOR_VERSION', purple_api_major_version)
 version_conf.set('PURPLE_MAJOR_VERSION', purple_major_version)
 version_conf.set('PURPLE_MINOR_VERSION', purple_minor_version)
 version_conf.set('PURPLE_MICRO_VERSION', purple_micro_version)
@@ -131,9 +139,9 @@
 	endforeach
 
 	conf.set('PURPLE_LIBDIR',
-		 f'wpurple_lib_dir("purple-@purple_major_version@")')
+		 f'wpurple_lib_dir("purple-@purple_api_major_version@")')
 	conf.set('PIDGIN_LIBDIR',
-		 f'wpurple_lib_dir("pidgin-@purple_major_version@")')
+		 f'wpurple_lib_dir("pidgin-@purple_api_major_version@")')
 
 	conf.set('PURPLE_DATADIR', 'wpurple_data_dir()')
 	conf.set('PURPLE_SYSCONFDIR', 'wpurple_sysconf_dir()')
@@ -146,15 +154,15 @@
 
 	common_libdir = get_option('prefix') / get_option('libdir')
 	conf.set_quoted('PURPLE_LIBDIR',
-	                common_libdir / f'purple-@purple_major_version@')
+	                common_libdir / f'purple-@purple_api_major_version@')
 	conf.set_quoted('PIDGIN_LIBDIR',
-	                common_libdir / f'pidgin-@purple_major_version@')
+	                common_libdir / f'pidgin-@purple_api_major_version@')
 endif
 
 abslibdir = get_option('prefix') / get_option('libdir')
-PURPLE_PLUGINDIR = abslibdir / f'purple-@purple_major_version@'
+PURPLE_PLUGINDIR = abslibdir / f'purple-@purple_api_major_version@'
 conf.set_quoted('PURPLE_PLUGINDIR', PURPLE_PLUGINDIR)
-PIDGIN_PLUGINDIR = abslibdir / f'pidgin-@purple_major_version@'
+PIDGIN_PLUGINDIR = abslibdir / f'pidgin-@purple_api_major_version@'
 conf.set_quoted('PIDGIN_PLUGINDIR', PIDGIN_PLUGINDIR)
 
 # Windows and Haiku do not use libm for the math functions, they are part