Fix build with new version of vala

pamac.avprj

@@ -1,7 +1,7 @@
 ### AutoVala Project ###
 autovala_version: 30
 project_name: pamac
-project_version: 7.0.0
+project_version: 7.0.2
 vala_version: 0.44
 
 custom: data/systemd/pamac-system.service /usr/lib/systemd/system
@@ -22,7 +22,7 @@ define: KDE_TRAY
 vapidir: src/vapis
 
 vala_binary: src/pamac-clean-cache/pamac-clean-cache
-*version: 7.0.0
+*version: 7.0.2
 vala_local_package: Pamac
 vala_vapi: ../vapis/libalpm.vapi
 vala_package: posix
@@ -32,7 +32,7 @@ vala_check_package: json-glib-1.0
 *vala_source: clean_cache.vala
 
 vala_binary: src/pamac-install/pamac-install
-*version: 7.0.0
+*version: 7.0.2
 use_gresource: pamac_installer_gresource_xml
 vala_local_package: Pamac
 vala_vapi: ../vapis/libalpm.vapi
@@ -45,7 +45,7 @@ vala_check_package: json-glib-1.0
 *vala_source: progress_dialog.vala
 
 vala_binary: src/pamac-manager/pamac-manager
-*version: 7.0.0
+*version: 7.0.2
 alias: pamac-updater
 use_gresource: pamac_manager_gresource_xml
 vala_local_package: Pamac
@@ -60,7 +60,7 @@ vala_check_package: json-glib-1.0
 *vala_source: manager_window.vala
 
 vala_binary: src/pamac-system-daemon/pamac-system-daemon
-*version: 7.0.0
+*version: 7.0.2
 vala_local_package: Pamac
 vala_package: posix
 vala_check_package: gtk+-3.0
@@ -75,7 +75,7 @@ vala_check_package: polkit-gobject-1
 *vala_source: system_daemon.vala
 
 vala_binary: src/pamac-tray/pamac-tray
-*version: 7.0.0
+*version: 7.0.2
 vala_local_package: Pamac
 vala_package: posix
 vala_check_package: json-glib-1.0
@@ -97,7 +97,7 @@ end
 *vala_source: tray.vala
 
 vala_binary: src/pamac-user-daemon/pamac-user-daemon
-*version: 7.0.0
+*version: 7.0.2
 vala_local_package: Pamac
 vala_package: posix
 vala_check_package: gtk+-3.0
@@ -111,7 +111,7 @@ vala_check_package: libsoup-2.4
 
 
 vala_library: src/pamac
-*version: 7.0.0
+*version: 7.0.2
 *namespace: Pamac
 use_gresource: pamac_transaction_gresource_xml
 *vala_package: posix

po/pamac.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pamac\n"
 "Report-Msgid-Bugs-To: cromer@cromnix.org\n"
-"POT-Creation-Date: 2019-07-06 20:25-0400\n"
+"POT-Creation-Date: 2019-09-17 19:17-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

src/meson.build

@@ -4,7 +4,7 @@ cfg_pamac.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'
 cfg_pamac.set('GETTEXT_PACKAGE', 'pamac')
 cfg_pamac.set('RELEASE_NAME', 'pamac')
 cfg_pamac.set('PREFIX', get_option('prefix'))
-cfg_pamac.set('VERSION', '7.0.0')
+cfg_pamac.set('VERSION', '7.0.2')
 cfg_pamac.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_1 = configure_file(
@@ -64,14 +64,22 @@ pamac_deps += [meson.get_compiler('c').find_library('m', required : false)]
 pamac_link_args = ['-rdynamic']
 
 Pamac_library = shared_library('Pamac', pamac_sources,
+    vala_gir: 'Pamac-1.0.gir',
     dependencies: pamac_deps,
     vala_args: pamac_vala_args,
     c_args: pamac_c_args,
     link_args: pamac_link_args,
-    version: '7.0.0',
+    version: '7.0.2',
     soversion: '7',
     install: true,
-    install_dir: [true, true, true])
+    install_dir: [true, true, true, true])
+
+g_ir_compiler = find_program('g-ir-compiler')
+custom_target('Pamac typelib', command: [g_ir_compiler, '--shared-library=libPamac', '--output', '@OUTPUT@',  join_paths(meson.current_build_dir(), 'Pamac-1.0.gir')],
+    output: 'Pamac-1.0.typelib',
+    depends: Pamac_library,
+    install: true,
+    install_dir: join_paths(get_option('libdir'), 'girepository-1.0'))
 
 pamac_requires = []
 pamac_requires += ['atk']
@@ -90,7 +98,7 @@ pamac_requires += ['vte-2.91']
 pamac_requires += ['x11']
 pkg_mod = import('pkgconfig')
 pkg_mod.generate(libraries : Pamac_library,
-	version : '7.0.0',
+	version : '7.0.2',
 	name : 'Pamac',
 	filebase : 'Pamac',
 	description : 'Pamac',

src/pamac-clean-cache/meson.build

@@ -4,7 +4,7 @@ cfg_pamac_clean_cache.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti
 cfg_pamac_clean_cache.set('GETTEXT_PACKAGE', 'pamac')
 cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac')
 cfg_pamac_clean_cache.set('PREFIX', get_option('prefix'))
-cfg_pamac_clean_cache.set('VERSION', '7.0.0')
+cfg_pamac_clean_cache.set('VERSION', '7.0.2')
 cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_4 = configure_file(

src/pamac-install/meson.build

@@ -4,7 +4,7 @@ cfg_pamac_install.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
 cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac')
 cfg_pamac_install.set('RELEASE_NAME', 'pamac')
 cfg_pamac_install.set('PREFIX', get_option('prefix'))
-cfg_pamac_install.set('VERSION', '7.0.0')
+cfg_pamac_install.set('VERSION', '7.0.2')
 cfg_pamac_install.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_5 = configure_file(

src/pamac-manager/meson.build

@@ -4,7 +4,7 @@ cfg_pamac_manager.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
 cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac')
 cfg_pamac_manager.set('RELEASE_NAME', 'pamac')
 cfg_pamac_manager.set('PREFIX', get_option('prefix'))
-cfg_pamac_manager.set('VERSION', '7.0.0')
+cfg_pamac_manager.set('VERSION', '7.0.2')
 cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_6 = configure_file(

src/pamac-system-daemon/meson.build

@@ -4,7 +4,7 @@ cfg_pamac_system_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_op
 cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac')
 cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac')
 cfg_pamac_system_daemon.set('PREFIX', get_option('prefix'))
-cfg_pamac_system_daemon.set('VERSION', '7.0.0')
+cfg_pamac_system_daemon.set('VERSION', '7.0.2')
 cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_7 = configure_file(

src/pamac-tray/meson.build

@@ -4,7 +4,7 @@ cfg_pamac_tray.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('dat
 cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac')
 cfg_pamac_tray.set('RELEASE_NAME', 'pamac')
 cfg_pamac_tray.set('PREFIX', get_option('prefix'))
-cfg_pamac_tray.set('VERSION', '7.0.0')
+cfg_pamac_tray.set('VERSION', '7.0.2')
 cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_3 = configure_file(

src/pamac-tray/tray.vala

@@ -46,7 +46,7 @@ namespace Pamac {
 		GLib.File lockfile;
 		bool updates_available;
 
-		public TrayIcon () {
+		protected TrayIcon () {
 			application_id = "org.pamac.tray";
 			flags = ApplicationFlags.FLAGS_NONE;
 		}
@@ -303,15 +303,16 @@ namespace Pamac {
 
 			start_daemon ();
 			try {
-				lockfile = GLib.File.new_for_path (daemon.get_lockfile ());
+				string path = daemon.get_lockfile ();
+				if (path != null) {
+					lockfile = GLib.File.new_for_path (path);
+				}
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
-				//try standard lock file
+				try_standard_lock ();
-				lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
 			} catch (DBusError e) {
 				stderr.printf ("DBusError: %s\n", e.message);
-				//try standard lock file
+				try_standard_lock ();
-				lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
 			}
 			Timeout.add (200, check_extern_lock);
 			// wait 30 seconds before check updates
@@ -325,6 +326,10 @@ namespace Pamac {
 			this.hold ();
 		}
 
+		private void try_standard_lock () {
+			lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
+		}
+
 		public override void activate () {
 			// nothing to do
 		}

src/pamac-user-daemon/meson.build

@@ -4,7 +4,7 @@ cfg_pamac_user_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti
 cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac')
 cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac')
 cfg_pamac_user_daemon.set('PREFIX', get_option('prefix'))
-cfg_pamac_user_daemon.set('VERSION', '7.0.0')
+cfg_pamac_user_daemon.set('VERSION', '7.0.2')
 cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_2 = configure_file(