prepare 7.1.3

README.md

@@ -34,47 +34,6 @@ A graphical package manager for pacman
 - Vala: 0.38
 - AutoVala: 1.2.0 (optional to regenerate CMake and Meson files)
 
-## Using CMake with GNU Make
-
-```
-mkdir build
-cd build
-cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc
-make
-make install
-```
-### Extra build flags
-
-- -DDISABLE_AUR=ON (to disable AUR in Pamac)
-- -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon)
-- -DENABLE_UPDATE_ICON=ON (to install the update desktop entry)
-- -DICON_UPDATE=OFF (to disable updating the icon cache)
-- -DENABLE_HAMBURGER=ON (to build with the classic hamburger menu)
-
-## Using CMake with Ninja
-
-```
-mkdir build
-cd build
-cmake .. \
-    -GNinja
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DCMAKE_INSTALL_SYSCONFDIR=/etc
-ninja
-ninja install
-```
-### Extra build flags
-
-- -DDISABLE_AUR=ON (to disable AUR in Pamac)
-- -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon)
-- -DENABLE_UPDATE_ICON=ON (to install the update desktop entry)
-- -DICON_UPDATE=OFF (to disable updating the icon cache)
-- -DENABLE_HAMBURGER=ON (to build with the classic hamburger menu)
-
 ## Using Meson with Ninja
 
 ```
@@ -92,24 +51,4 @@ ninja install
 - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon)
 - -DENABLE_UPDATE_ICON=ON (to install the update desktop entry)
 - -DICON_UPDATE=OFF (to disable updating the icon cache)
-- -DENABLE_HAMBURGER=ON (to build with the classic hamburger menu)
-
-## Using configure wrapper
-
-The configure script is just a wrapper for CMake, in the background the build process is the same as using CMake with GNU Make.
-
-```
-./configure --prefix=/usr \
-	--libdir=/usr/lib \
-	--sysconfdir=/etc
-make
-make install
-```
-
-### Extra configure options
-
-- --disable-aur (to disable Aur in Pamac)
-- --enable-kde-tray (to build kde tray icon instead of gtk tray icon)
-- --enable-update-desktop (to install the update desktop entry)
-- --disable-icon-update (to disable updating the icon cache)
-- --enable-hamburger (to build with the classic hamburger menu)
+- -DENABLE_HAMBURGER=ON (to build with the classic hamburger menu)

pamac.avprj

@@ -1,8 +1,8 @@
 ### AutoVala Project ###
 autovala_version: 30
 project_name: pamac
-project_version: 7.1.2
-vala_version: 0.44
+project_version: 7.1.3
+vala_version: 0.48
 
 custom: data/systemd/pamac-system.service /usr/lib/systemd/system
 custom: data/systemd/pamac-cleancache.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.1.2
+*version: 7.1.3
 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.1.2
+*version: 7.1.3
 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.1.2
+*version: 7.1.3
 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.1.2
+*version: 7.1.3
 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.1.2
+*version: 7.1.3
 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.1.2
+*version: 7.1.3
 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.1.2
+*version: 7.1.3
 *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: 2020-01-02 12:42-0300\n"
+"POT-Creation-Date: 2020-03-12 21:22-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/common.vala

@@ -51,7 +51,7 @@ namespace Pamac {
 	}
 
 	public struct ErrorInfos {
-		public uint errno;
+		public uint errnos;
 		public string message;
 		public string[] details;
 		public ErrorInfos () {

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.1.2')
+cfg_pamac.set('VERSION', '7.1.3')
 cfg_pamac.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_1 = configure_file(
@@ -69,7 +69,7 @@ Pamac_library = shared_library('Pamac', pamac_sources,
     vala_args: pamac_vala_args,
     c_args: pamac_c_args,
     link_args: pamac_link_args,
-    version: '7.1.2',
+    version: '7.1.3',
     soversion: '7',
     install: true,
     install_dir: [true, true, true, true])
@@ -98,7 +98,7 @@ pamac_requires += ['vte-2.91']
 pamac_requires += ['x11']
 pkg_mod = import('pkgconfig')
 pkg_mod.generate(libraries : Pamac_library,
-	version : '7.1.2',
+	version : '7.1.3',
 	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.1.2')
+cfg_pamac_clean_cache.set('VERSION', '7.1.3')
 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.1.2')
+cfg_pamac_install.set('VERSION', '7.1.3')
 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.1.2')
+cfg_pamac_manager.set('VERSION', '7.1.3')
 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.1.2')
+cfg_pamac_system_daemon.set('VERSION', '7.1.3')
 cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_7 = configure_file(

src/pamac-system-daemon/system_daemon.vala

@@ -485,12 +485,12 @@ namespace Pamac {
 					// fail later with unresolved deps, but that should be rare, and would be expected
 					success = true;
 				} else {
-					Alpm.Errno errno = handle.errno ();
-					current_error.errno = (uint) errno;
-					if (errno != 0) {
+					Alpm.Errno errnos = handle.errno ();
+					current_error.errnos = (uint) errnos;
+					if (errnos != 0) {
 						// download error details are set in cb_fetch
-						if (errno != Alpm.Errno.EXTERNAL_DOWNLOAD) {
-							current_error.details = { Alpm.strerror (errno) };
+						if (errnos != Alpm.Errno.EXTERNAL_DOWNLOAD) {
+							current_error.details = { Alpm.strerror (errnos) };
 						}
 					}
 				}
@@ -915,11 +915,11 @@ namespace Pamac {
 			current_error = ErrorInfos ();
 			cancellable.reset ();
 			if (alpm_handle.trans_init (flags) == -1) {
-				Alpm.Errno errno = alpm_handle.errno ();
-				current_error.errno = (uint) errno;
+				Alpm.Errno errnos = alpm_handle.errno ();
+				current_error.errnos = (uint) errnos;
 				current_error.message = _("Failed to init transaction");
-				if (errno != 0) {
-					current_error.details = { Alpm.strerror (errno) };
+				if (errnos != 0) {
+					current_error.details = { Alpm.strerror (errnos) };
 				}
 				return false;
 			}
@@ -932,11 +932,11 @@ namespace Pamac {
 			if (success) {
 				add_ignorepkgs ();
 				if (alpm_handle.trans_sysupgrade ((enable_downgrade) ? 1 : 0) == -1) {
-					Alpm.Errno errno = alpm_handle.errno ();
-					current_error.errno = (uint) errno;
+					Alpm.Errno errnos = alpm_handle.errno ();
+					current_error.errnos = (uint) errnos;
 					current_error.message = _("Failed to prepare transaction");
-					if (errno != 0) {
-						current_error.details = { Alpm.strerror (errno) };
+					if (errnos != 0) {
+						current_error.details = { Alpm.strerror (errnos) };
 					}
 					try {
 						trans_release (lock_id);
@@ -970,15 +970,15 @@ namespace Pamac {
 		private bool trans_add_pkg_real (Alpm.Package pkg) {
 			current_error = ErrorInfos ();
 			if (alpm_handle.trans_add_pkg (pkg) == -1) {
-				Alpm.Errno errno = alpm_handle.errno ();
-				if (errno == Alpm.Errno.TRANS_DUP_TARGET || errno == Alpm.Errno.PKG_IGNORED) {
+				Alpm.Errno errnos = alpm_handle.errno ();
+				if (errnos == Alpm.Errno.TRANS_DUP_TARGET || errnos == Alpm.Errno.PKG_IGNORED) {
 					// just skip duplicate or ignored targets
 					return true;
 				} else {
-					current_error.errno = (uint) errno;
+					current_error.errnos = (uint) errnos;
 					current_error.message = _("Failed to prepare transaction");
-					if (errno != 0) {
-						current_error.details = { "%s: %s".printf (pkg.name, Alpm.strerror (errno)) };
+					if (errnos != 0) {
+						current_error.details = { "%s: %s".printf (pkg.name, Alpm.strerror (errnos)) };
 					}
 					return false;
 				}
@@ -1050,23 +1050,23 @@ namespace Pamac {
 			current_error = ErrorInfos ();
 			Alpm.Package* pkg;
 			if (alpm_handle.load_tarball (pkgpath, 1, alpm_handle.localfilesiglevel, out pkg) == -1) {
-				Alpm.Errno errno = alpm_handle.errno ();
-				current_error.errno = (uint) errno;
+				Alpm.Errno errnos = alpm_handle.errno ();
+				current_error.errnos = (uint) errnos;
 				current_error.message = _("Failed to prepare transaction");
-				if (errno != 0) {
-					current_error.details = { "%s: %s".printf (pkgpath, Alpm.strerror (errno)) };
+				if (errnos != 0) {
+					current_error.details = { "%s: %s".printf (pkgpath, Alpm.strerror (errnos)) };
 				}
 				return false;
 			} else if (alpm_handle.trans_add_pkg (pkg) == -1) {
-				Alpm.Errno errno = alpm_handle.errno ();
-				if (errno == Alpm.Errno.TRANS_DUP_TARGET || errno == Alpm.Errno.PKG_IGNORED) {
+				Alpm.Errno errnos = alpm_handle.errno ();
+				if (errnos == Alpm.Errno.TRANS_DUP_TARGET || errnos == Alpm.Errno.PKG_IGNORED) {
 					// just skip duplicate or ignored targets
 					return true;
 				} else {
-					current_error.errno = (uint) errno;
+					current_error.errnos = (uint) errnos;
 					current_error.message = _("Failed to prepare transaction");
-					if (errno != 0) {
-						current_error.details = { "%s: %s".printf (pkg->name, Alpm.strerror (errno)) };
+					if (errnos != 0) {
+						current_error.details = { "%s: %s".printf (pkg->name, Alpm.strerror (errnos)) };
 					}
 					// free the package because it will not be used
 					delete pkg;
@@ -1084,15 +1084,15 @@ namespace Pamac {
 				current_error.details = { _("target not found: %s").printf (pkgname) };
 				return false;
 			} else if (alpm_handle.trans_remove_pkg (pkg) == -1) {
-				Alpm.Errno errno = alpm_handle.errno ();
-				if (errno == Alpm.Errno.TRANS_DUP_TARGET) {
+				Alpm.Errno errnos = alpm_handle.errno ();
+				if (errnos == Alpm.Errno.TRANS_DUP_TARGET) {
 					// just skip duplicate targets
 					return true;
 				} else {
-					current_error.errno = (uint) errno;
+					current_error.errnos = (uint) errnos;
 					current_error.message = _("Failed to prepare transaction");
-					if (errno != 0) {
-						current_error.details = { "%s: %s".printf (pkg.name, Alpm.strerror (errno)) };
+					if (errnos != 0) {
+						current_error.details = { "%s: %s".printf (pkg.name, Alpm.strerror (errnos)) };
 					}
 					return false;
 				}
@@ -1106,14 +1106,14 @@ namespace Pamac {
 			string[] details = {};
 			Alpm.List err_data;
 			if (alpm_handle.trans_prepare (out err_data) == -1) {
-				Alpm.Errno errno = alpm_handle.errno ();
-				current_error.errno = (uint) errno;
+				Alpm.Errno errnos = alpm_handle.errno ();
+				current_error.errnos = (uint) errnos;
 				current_error.message = _("Failed to prepare transaction");
-				switch (errno) {
+				switch (errnos) {
 					case 0:
 						break;
 					case Alpm.Errno.PKG_INVALID_ARCH:
-						details += Alpm.strerror (errno) + ":";
+						details += Alpm.strerror (errnos) + ":";
 						unowned Alpm.List<string*> list = err_data;
 						while (list != null) {
 							string* pkgname = list.data;
@@ -1123,7 +1123,7 @@ namespace Pamac {
 						}
 						break;
 					case Alpm.Errno.UNSATISFIED_DEPS:
-						details += Alpm.strerror (errno) + ":";
+						details += Alpm.strerror (errnos) + ":";
 						unowned Alpm.List<Alpm.DepMissing*> list = err_data;
 						while (list != null) {
 							Alpm.DepMissing* miss = list.data;
@@ -1149,7 +1149,7 @@ namespace Pamac {
 						}
 						break;
 					case Alpm.Errno.CONFLICTING_DEPS:
-						details += Alpm.strerror (errno) + ":";
+						details += Alpm.strerror (errnos) + ":";
 						unowned Alpm.List<Alpm.Conflict*> list = err_data;
 						while (list != null) {
 							Alpm.Conflict* conflict = list.data;
@@ -1164,7 +1164,7 @@ namespace Pamac {
 						}
 						break;
 					default:
-						details += Alpm.strerror (errno);
+						details += Alpm.strerror (errnos);
 						break;
 				}
 				current_error.details = (owned) details;
@@ -1320,11 +1320,11 @@ namespace Pamac {
 				current_error = ErrorInfos ();
 				bool success = true;
 				if (alpm_handle.trans_init (flags | Alpm.TransFlag.NOLOCK) == -1) {
-					Alpm.Errno errno = alpm_handle.errno ();
-					current_error.errno = (uint) errno;
+					Alpm.Errno errnos = alpm_handle.errno ();
+					current_error.errnos = (uint) errnos;
 					current_error.message = _("Failed to init transaction");
-					if (errno != 0) {
-						current_error.details = { Alpm.strerror (errno) };
+					if (errnos != 0) {
+						current_error.details = { Alpm.strerror (errnos) };
 					}
 					success = false;
 				}
@@ -1572,10 +1572,10 @@ namespace Pamac {
 			bool success = true;
 			Alpm.List err_data;
 			if (alpm_handle.trans_commit (out err_data) == -1) {
-				Alpm.Errno errno = alpm_handle.errno ();
-				current_error.errno = (uint) errno;
+				Alpm.Errno errnos = alpm_handle.errno ();
+				current_error.errnos = (uint) errnos;
 				// cancel the download return an EXTERNAL_DOWNLOAD error
-				if (errno == Alpm.Errno.EXTERNAL_DOWNLOAD && cancellable.is_cancelled ()) {
+				if (errnos == Alpm.Errno.EXTERNAL_DOWNLOAD && cancellable.is_cancelled ()) {
 					try {
 						trans_release (lock_id);
 					} catch (IOError e) {
@@ -1587,12 +1587,12 @@ namespace Pamac {
 					return;
 				}
 				current_error.message = _("Failed to commit transaction");
-				switch (errno) {
+				switch (errnos) {
 					case 0:
 						break;
 					case Alpm.Errno.FILE_CONFLICTS:
 						string[] details = {};
-						details += Alpm.strerror (errno) + ":";
+						details += Alpm.strerror (errnos) + ":";
 						//TransFlag flags = alpm_handle.trans_get_flags ();
 						//if ((flags & TransFlag.FORCE) != 0) {
 							//details += _("unable to %s directory-file conflicts").printf ("--force");
@@ -1617,7 +1617,7 @@ namespace Pamac {
 					case Alpm.Errno.PKG_INVALID_CHECKSUM:
 					case Alpm.Errno.PKG_INVALID_SIG:
 						string[] details = {};
-						details += Alpm.strerror (errno) + ":";
+						details += Alpm.strerror (errnos) + ":";
 						unowned Alpm.List<string*> list = err_data;
 						while (list != null) {
 							string* filename = list.data;
@@ -1631,7 +1631,7 @@ namespace Pamac {
 						// details are set in cb_fetch
 						break;
 					default:
-						current_error.details = {Alpm.strerror (errno)};
+						current_error.details = {Alpm.strerror (errnos)};
 						break;
 				}
 				success = false;

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.1.2')
+cfg_pamac_tray.set('VERSION', '7.1.3')
 cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_3 = configure_file(

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.1.2')
+cfg_pamac_user_daemon.set('VERSION', '7.1.3')
 cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())
 
 cfgfile_2 = configure_file(

src/transaction.vala

@@ -2037,7 +2037,7 @@ namespace Pamac {
 				// if it is an authentication or a download error, database was not modified
 				var err = get_current_error ();
 				if (err.message == dgettext (null, "Authentication failed")
-					|| err.errno == 54) { //Alpm.Errno.EXTERNAL_DOWNLOAD
+					|| err.errnos == 54) { //Alpm.Errno.EXTERNAL_DOWNLOAD
 					// recover old pkgnames
 					foreach (unowned string name in previous_to_install) {
 						to_install.add (name);