cromer/pamac-classic
Archived
2
0
Fork 2
Code Issues Pull Requests 1 Releases 13 Wiki Activity

update to work with libalpm 5.2

Browse Source
This commit is contained in:
Chris Cromer
2019-10-23 14:41:05 -03:00
parent e35b4c3ada
commit b6144a7164
13 changed files with 28 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pamac-system-daemon/meson.build
View File

@@ -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.2')
cfg_pamac_system_daemon.set('VERSION', '7.1.0')
cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())
cfgfile_7 = configure_file(

9
src/pamac-system-daemon/system_daemon.vala
View File

@@ -780,7 +780,7 @@ namespace Pamac {
foreach (unowned string name in alpm_config.get_syncfirsts ()) {
pkg = Alpm.find_satisfier (alpm_handle.localdb.pkgcache, name);
if (pkg != null) {
candidate = pkg.sync_newversion (alpm_handle.syncdbs);
candidate = pkg.get_new_version (alpm_handle.syncdbs);
if (candidate != null) {
var infos = initialise_pkg_struct (candidate);
infos.installed_version = pkg.version;
@@ -809,7 +809,7 @@ namespace Pamac {
unowned Alpm.Package installed_pkg = pkgcache.data;
// check if installed_pkg is in IgnorePkg or IgnoreGroup
if (alpm_handle.should_ignore (installed_pkg) == 0) {
candidate = installed_pkg.sync_newversion (alpm_handle.syncdbs);
candidate = installed_pkg.get_new_version (alpm_handle.syncdbs);
if (candidate != null) {
var infos = initialise_pkg_struct (candidate);
infos.installed_version = installed_pkg.version;
@@ -1616,7 +1616,6 @@ namespace Pamac {
case Alpm.Errno.PKG_INVALID:
case Alpm.Errno.PKG_INVALID_CHECKSUM:
case Alpm.Errno.PKG_INVALID_SIG:
case Alpm.Errno.DLT_INVALID:
string[] details = {};
details += Alpm.strerror (errno) + ":";
unowned Alpm.List<string*> list = err_data;
@@ -1776,10 +1775,6 @@ private void cb_event (Alpm.Event.Data data) {
break;
}
break;
case Alpm.Event.Type.DELTA_PATCH_START:
details += data.delta_patch_delta.to;
details += data.delta_patch_delta.delta;
break;
case Alpm.Event.Type.SCRIPTLET_INFO:
details += data.scriptlet_info_line;
break;