[pitivi] about: Fix spaghetti shown instead of version number



commit 1dc1b1e37ab302eac7e4ce824f9a6143ab3f326c
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Fri Oct 2 01:48:09 2020 +0200

    about: Fix spaghetti shown instead of version number

 meson.build             | 11 ++---------
 pitivi/dialogs/about.py | 14 ++++----------
 2 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/meson.build b/meson.build
index 0e151eee0..512a99f53 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('pitivi', 'c', version : '2020.09', meson_version : '>= 0.46.0')
+project('pitivi', 'c', version : '2020.09.1', meson_version : '>= 0.46.0')
 host_system = host_machine.system()
 
 pymod = import('python')
@@ -33,13 +33,6 @@ podir = join_paths(meson.current_source_dir(), 'po')
 itsdir = join_paths(meson.current_source_dir(), 'gettext')
 pkgdatadir = join_paths(get_option('datadir'), meson.project_name())
 
-git = find_program('git', required : false)
-if git.found()
-    GITVERSION = run_command(git, 'describe', '--always').stdout().strip()
-else
-    GITVERSION = ''
-endif
-
 
 geteenvvar = find_program('getenvvar.py')
 cdata = configuration_data()
@@ -57,7 +50,7 @@ cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
 cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
 cdata.set('PACKAGE_NAME', 'Pitivi')
 cdata.set('PACKAGE', 'pitivi')
-cdata.set('GITVERSION', GITVERSION)
+cdata.set('GITVERSION', '')
 cdata.set('VERSION', meson.project_version())
 cdata.set('BUILDDIR', meson.current_build_dir())
 
diff --git a/pitivi/dialogs/about.py b/pitivi/dialogs/about.py
index 8f3b5faaa..1d8de7930 100644
--- a/pitivi/dialogs/about.py
+++ b/pitivi/dialogs/about.py
@@ -23,8 +23,6 @@ from gi.repository import Gtk
 
 from pitivi.configure import APPNAME
 from pitivi.configure import APPURL
-from pitivi.configure import GITVERSION
-from pitivi.configure import in_devel
 from pitivi.configure import VERSION
 
 
@@ -43,16 +41,12 @@ class AboutDialog(Gtk.AboutDialog):
         self.set_program_name(APPNAME)
         self.set_website(APPURL)
 
-        if in_devel():
-            version_str = _("Development version: %s") % GITVERSION
-        elif not app.is_latest():
+        if app.is_latest():
+            version_str = _("Version %s") % VERSION
+        else:
             version_str = _("Version %(cur_ver)s — %(new_ver)s is available") % \
-                {"cur_ver": GITVERSION,
+                {"cur_ver": VERSION,
                  "new_ver": app.get_latest()}
-        elif GITVERSION:
-            version_str = _("Version %s") % GITVERSION
-        else:
-            version_str = _("Version %s") % VERSION
         self.set_version(version_str)
 
         comments = ["",


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