Browse Source

libalpm 5.1.0 compat

tags/v6.7.0
Chris Cromer 1 year ago
parent
commit
783baf464b

+ 9
- 9
pamac.avprj View File

@@ -1,7 +1,7 @@
### AutoVala Project ###
autovala_version: 27
autovala_version: 28
project_name: pamac
project_version: 6.6.4
project_version: 6.7.0
vala_version: 0.38

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: 6.6.4
*version: 6.7.0
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: gtk+-3.0
@@ -33,7 +33,7 @@ vala_check_package: json-glib-1.0
*vala_source: pamac_config.vala

vala_binary: src/pamac-install/pamac-install
*version: 6.6.4
*version: 6.7.0
use_gresource: pamac_installer_gresource_xml
vala_local_package: pamacclassic
vala_check_package: gtk+-3.0
@@ -45,7 +45,7 @@ vala_check_package: json-glib-1.0
*vala_source: progress_dialog.vala

vala_binary: src/pamac-manager/pamac-manager
*version: 6.6.4
*version: 6.7.0
alias: pamac-updater
use_gresource: pamac_manager_gresource_xml
vala_local_package: pamacclassic
@@ -59,7 +59,7 @@ vala_check_package: json-glib-1.0
*vala_source: manager_window.vala

vala_binary: src/pamac-system-daemon/pamac-system-daemon
*version: 6.6.4
*version: 6.7.0
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: gtk+-3.0
@@ -77,7 +77,7 @@ vala_check_package: polkit-gobject-1
*vala_source: system_daemon.vala

vala_binary: src/pamac-tray/pamac-tray
*version: 6.6.4
*version: 6.7.0
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: json-glib-1.0
@@ -101,7 +101,7 @@ end
*vala_source: tray.vala

vala_binary: src/pamac-user-daemon/pamac-user-daemon
*version: 6.6.4
*version: 6.7.0
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: gtk+-3.0
@@ -117,7 +117,7 @@ vala_check_package: libsoup-2.4


vala_library: src/pamac-classic
*version: 6.6.4
*version: 6.7.0
namespace: pamacclassic
use_gresource: pamac_transaction_gresource_xml
vala_package: posix

+ 1
- 1
po/pamac.pot View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pamac\n"
"Report-Msgid-Bugs-To: cromer@cromnix.org\n"
"POT-Creation-Date: 2018-02-16 15:41-0300\n"
"POT-Creation-Date: 2018-06-02 14:49-0400\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"

+ 3
- 3
src/CMakeLists.txt View File

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.6.4")
set (VERSION "6.7.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

@@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.pc ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.deps ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps)
set (VERSION "6.6.4")
set (VERSION "6.7.0")
add_definitions (${DEPS_CFLAGS})
link_libraries ( ${DEPS_LIBRARIES} )
link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -101,7 +101,7 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
target_link_libraries( pamacclassic m )
set_target_properties( pamacclassic PROPERTIES
VERSION
6.6.4
6.7.0
SOVERSION
6 )


+ 4
- 3
src/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac_classic.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
cfg_pamac_classic.set('GETTEXT_PACKAGE', 'pamac')
cfg_pamac_classic.set('RELEASE_NAME', 'pamac')
cfg_pamac_classic.set('PREFIX', get_option('prefix'))
cfg_pamac_classic.set('VERSION', '6.6.4')
cfg_pamac_classic.set('VERSION', '6.7.0')
cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())

cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic)
@@ -56,10 +56,11 @@ if DISABLE_AUR
pamac_classic_c_args += ['-DDISABLE_AUR']
endif
pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : false)]
pamac_classic_link_args = ['-rdynamic']
pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir']


pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,version: '6.6.4',soversion: '6',install: true)
pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,link_args: pamac_classic_link_args,version: '6.7.0',soversion: '6',install: true)

pamac_classic_requires = []
pamac_classic_requires += ['gdk-3.0']
@@ -74,7 +75,7 @@ pamac_classic_requires += ['glib-2.0']
pamac_classic_requires += ['gobject-2.0']
pkg_mod = import('pkgconfig')
pkg_mod.generate(libraries : pamacclassic_library,
version : '6.6.4',
version : '6.7.0',
name : 'pamacclassic',
filebase : 'pamacclassic',
description : 'pamacclassic',

+ 2
- 2
src/pamac-clean-cache/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.6.4")
set (VERSION "6.7.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.6.4")
set (VERSION "6.7.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

+ 3
- 2
src/pamac-clean-cache/meson.build View File

@@ -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', '6.6.4')
cfg_pamac_clean_cache.set('VERSION', '6.7.0')
cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())

cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache)
@@ -36,7 +36,8 @@ if DISABLE_AUR
pamac_clean_cache_vala_args += ['-D', 'DISABLE_AUR']
pamac_clean_cache_c_args += ['-DDISABLE_AUR']
endif
pamac_clean_cache_link_args = ['-rdynamic']
pamac_clean_cache_hfolders = ['../../src']

executable('pamac-clean-cache',pamac_clean_cache_sources,dependencies: pamac_clean_cache_deps,vala_args: pamac_clean_cache_vala_args,c_args: pamac_clean_cache_c_args,link_with: pamac_clean_cache_dependencies,include_directories: include_directories(pamac_clean_cache_hfolders),install: true)
executable('pamac-clean-cache',pamac_clean_cache_sources,dependencies: pamac_clean_cache_deps,vala_args: pamac_clean_cache_vala_args,c_args: pamac_clean_cache_c_args,link_args: pamac_clean_cache_link_args,link_with: pamac_clean_cache_dependencies,include_directories: include_directories(pamac_clean_cache_hfolders),install: true)


+ 2
- 2
src/pamac-install/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.6.4")
set (VERSION "6.7.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.6.4")
set (VERSION "6.7.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

+ 3
- 2
src/pamac-install/meson.build View File

@@ -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', '6.6.4')
cfg_pamac_install.set('VERSION', '6.7.0')
cfg_pamac_install.set('TESTSRCDIR', meson.source_root())

cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)
@@ -38,7 +38,8 @@ if DISABLE_AUR
pamac_install_vala_args += ['-D', 'DISABLE_AUR']
pamac_install_c_args += ['-DDISABLE_AUR']
endif
pamac_install_link_args = ['-rdynamic']
pamac_install_hfolders = ['../../src']

executable('pamac-install',pamac_install_sources,dependencies: pamac_install_deps,vala_args: pamac_install_vala_args,c_args: pamac_install_c_args,link_with: pamac_install_dependencies,include_directories: include_directories(pamac_install_hfolders),install: true)
executable('pamac-install',pamac_install_sources,dependencies: pamac_install_deps,vala_args: pamac_install_vala_args,c_args: pamac_install_c_args,link_args: pamac_install_link_args,link_with: pamac_install_dependencies,include_directories: include_directories(pamac_install_hfolders),install: true)


+ 2
- 2
src/pamac-manager/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.6.4")
set (VERSION "6.7.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.6.4")
set (VERSION "6.7.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

+ 3
- 2
src/pamac-manager/meson.build View File

@@ -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', '6.6.4')
cfg_pamac_manager.set('VERSION', '6.7.0')
cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())

cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)
@@ -39,8 +39,9 @@ if DISABLE_AUR
pamac_manager_vala_args += ['-D', 'DISABLE_AUR']
pamac_manager_c_args += ['-DDISABLE_AUR']
endif
pamac_manager_link_args = ['-rdynamic']
pamac_manager_hfolders = ['../../src']

executable('pamac-manager',pamac_manager_sources,dependencies: pamac_manager_deps,vala_args: pamac_manager_vala_args,c_args: pamac_manager_c_args,link_with: pamac_manager_dependencies,include_directories: include_directories(pamac_manager_hfolders),install: true)
executable('pamac-manager',pamac_manager_sources,dependencies: pamac_manager_deps,vala_args: pamac_manager_vala_args,c_args: pamac_manager_c_args,link_args: pamac_manager_link_args,link_with: pamac_manager_dependencies,include_directories: include_directories(pamac_manager_hfolders),install: true)

meson.add_install_script('sh', '-c', 'ln -sf pamac-manager ${DESTDIR}/${MESON_INSTALL_PREFIX}/bin/pamac-updater')

+ 2
- 2
src/pamac-system-daemon/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.6.4")
set (VERSION "6.7.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.6.4")
set (VERSION "6.7.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

+ 3
- 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', '6.6.4')
cfg_pamac_system_daemon.set('VERSION', '6.7.0')
cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())

cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon)
@@ -43,7 +43,8 @@ if DISABLE_AUR
pamac_system_daemon_vala_args += ['-D', 'DISABLE_AUR']
pamac_system_daemon_c_args += ['-DDISABLE_AUR']
endif
pamac_system_daemon_link_args = ['-rdynamic']
pamac_system_daemon_hfolders = ['../../src']

executable('pamac-system-daemon',pamac_system_daemon_sources,dependencies: pamac_system_daemon_deps,vala_args: pamac_system_daemon_vala_args,c_args: pamac_system_daemon_c_args,link_with: pamac_system_daemon_dependencies,include_directories: include_directories(pamac_system_daemon_hfolders),install: true)
executable('pamac-system-daemon',pamac_system_daemon_sources,dependencies: pamac_system_daemon_deps,vala_args: pamac_system_daemon_vala_args,c_args: pamac_system_daemon_c_args,link_args: pamac_system_daemon_link_args,link_with: pamac_system_daemon_dependencies,include_directories: include_directories(pamac_system_daemon_hfolders),install: true)


+ 2
- 2
src/pamac-tray/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.6.4")
set (VERSION "6.7.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.6.4")
set (VERSION "6.7.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

+ 3
- 2
src/pamac-tray/meson.build View File

@@ -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', '6.6.4')
cfg_pamac_tray.set('VERSION', '6.7.0')
cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())

cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)
@@ -49,7 +49,8 @@ if DISABLE_AUR
pamac_tray_vala_args += ['-D', 'DISABLE_AUR']
pamac_tray_c_args += ['-DDISABLE_AUR']
endif
pamac_tray_link_args = ['-rdynamic']
pamac_tray_hfolders = ['../../src']

executable('pamac-tray',pamac_tray_sources,dependencies: pamac_tray_deps,vala_args: pamac_tray_vala_args,c_args: pamac_tray_c_args,link_with: pamac_tray_dependencies,include_directories: include_directories(pamac_tray_hfolders),install: true)
executable('pamac-tray',pamac_tray_sources,dependencies: pamac_tray_deps,vala_args: pamac_tray_vala_args,c_args: pamac_tray_c_args,link_args: pamac_tray_link_args,link_with: pamac_tray_dependencies,include_directories: include_directories(pamac_tray_hfolders),install: true)


+ 2
- 2
src/pamac-user-daemon/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.6.4")
set (VERSION "6.7.0")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.6.4")
set (VERSION "6.7.0")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

+ 3
- 2
src/pamac-user-daemon/meson.build View File

@@ -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', '6.6.4')
cfg_pamac_user_daemon.set('VERSION', '6.7.0')
cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())

cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon)
@@ -40,7 +40,8 @@ if DISABLE_AUR
pamac_user_daemon_vala_args += ['-D', 'DISABLE_AUR']
pamac_user_daemon_c_args += ['-DDISABLE_AUR']
endif
pamac_user_daemon_link_args = ['-rdynamic']
pamac_user_daemon_hfolders = ['../../src']

executable('pamac-user-daemon',pamac_user_daemon_sources,dependencies: pamac_user_daemon_deps,vala_args: pamac_user_daemon_vala_args,c_args: pamac_user_daemon_c_args,link_with: pamac_user_daemon_dependencies,include_directories: include_directories(pamac_user_daemon_hfolders),install: true)
executable('pamac-user-daemon',pamac_user_daemon_sources,dependencies: pamac_user_daemon_deps,vala_args: pamac_user_daemon_vala_args,c_args: pamac_user_daemon_c_args,link_args: pamac_user_daemon_link_args,link_with: pamac_user_daemon_dependencies,include_directories: include_directories(pamac_user_daemon_hfolders),install: true)


+ 1
- 1
src/pamacclassic.pc View File

@@ -4,7 +4,7 @@ includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}

Name: pamacclassic
Description: pamacclassic
Version: 6.6.4
Version: 6.7.0
Libs: -L@DOLLAR@{libdir} -lpamacclassic
Cflags: -I@DOLLAR@{includedir}
Requires: gdk-3.0 gtk+-3.0 json-glib-1.0 libalpm libnotify libsoup-2.4 vte-2.91 gio-2.0 glib-2.0 gobject-2.0

+ 30
- 14
src/vapis/libalpm.vapi View File

@@ -36,7 +36,7 @@ namespace Alpm {
DOWNLOADER = (1 << 1),
SIGNATURES = (1 << 2)
}
public Capabilities capabilities();
public int capabilities();

public unowned Package? find_satisfier(Alpm.List<Package> pkgs, string depstring);

@@ -90,6 +90,15 @@ namespace Alpm {
[CCode (cname = "alpm_option_remove_hookdir")]
public int remove_hookdir(string hookdir);

public unowned Alpm.List<unowned string> overwrite_files {
[CCode (cname = "alpm_option_get_overwrite_files")] get;
[CCode (cname = "alpm_option_set_overwrite_files")] set;
}
[CCode (cname = "alpm_option_add_overwrite_file")]
public int add_overwrite_file(string overwrite_file);
[CCode (cname = "alpm_option_remove_overwrite_file")]
public int remove_overwrite_file(string overwrite_file);

public unowned string logfile {
[CCode (cname = "alpm_option_get_logfile")] get;
[CCode (cname = "alpm_option_set_logfile")] set;
@@ -168,15 +177,15 @@ namespace Alpm {
[CCode (cname = "alpm_option_set_dbext")] set;
}

public Signature.Level defaultsiglevel {
public int defaultsiglevel {
[CCode (cname = "alpm_option_get_default_siglevel")] get;
[CCode (cname = "alpm_option_set_default_siglevel")] set;
}
public Signature.Level localfilesiglevel {
public int localfilesiglevel {
[CCode (cname = "alpm_option_get_local_file_siglevel")] get;
[CCode (cname = "alpm_option_set_local_file_siglevel")] set;
}
public Signature.Level remotefilesiglevel {
public int remotefilesiglevel {
[CCode (cname = "alpm_option_get_remote_file_siglevel")] get;
[CCode (cname = "alpm_option_set_remote_file_siglevel")] set;
}
@@ -221,14 +230,14 @@ namespace Alpm {
public int unlock();

[CCode (cname = "alpm_register_syncdb")]
public unowned DB register_syncdb(string treename, Signature.Level level);
public unowned DB register_syncdb(string treename, int siglevel);
[CCode (cname = "alpm_unregister_all_syncdbs")]
public int unregister_all_syncdbs();

// the return package can be freed except if it is added to a transaction,
// it will be freed upon Handle.trans_release() invocation.
[CCode (cname = "alpm_pkg_load")]
public int load_tarball(string filename, int full, Signature.Level level, out Package pkg);
public int load_tarball(string filename, int full, int siglevel, out Package pkg);

/** Test if a package should be ignored.
* Checks if the package is ignored via IgnorePkg, or if the package is
@@ -251,7 +260,7 @@ namespace Alpm {

/** Returns the bitfield of flags for the current transaction.*/
[CCode (cname = "alpm_trans_get_flags")]
public TransFlag trans_get_flags();
public int trans_get_flags();

/** Returns a list of packages added by the transaction.*/
[CCode (cname = "alpm_trans_get_add")]
@@ -266,7 +275,7 @@ namespace Alpm {
* @return 0 on success, -1 on error (Errno is set accordingly)
*/
[CCode (cname = "alpm_trans_init")]
public int trans_init(TransFlag transflags);
public int trans_init(int transflags);

/** Prepare a transaction.
* @param an alpm_list where detailed description of an error
@@ -332,7 +341,7 @@ namespace Alpm {
[CCode (cname = "alpm_db_get_name")] get;
}

public Signature.Level siglevel {
public int siglevel {
[CCode (cname = "alpm_db_get_siglevel")] get;
}

@@ -349,7 +358,7 @@ namespace Alpm {
[CCode (cname = "alpm_db_get_groupcache")] get;
}

public Usage usage {
public int usage {
[CCode (cname = "alpm_db_get_usage")] get;
[CCode (cname = "alpm_db_set_usage")] set;
}
@@ -455,6 +464,12 @@ namespace Alpm {
public unowned Alpm.List<unowned Depend> optdepends {
[CCode (cname = "alpm_pkg_get_optdepends")] get;
}
public unowned Alpm.List<unowned Depend> checkdepends {
[CCode (cname = "alpm_pkg_get_depends")] get;
}
public unowned Alpm.List<unowned Depend> makedepends {
[CCode (cname = "alpm_pkg_get_optdepends")] get;
}
public unowned Alpm.List<unowned Depend> conflicts {
[CCode (cname = "alpm_pkg_get_conflicts")] get;
}
@@ -482,7 +497,7 @@ namespace Alpm {
public unowned string base64_sig {
[CCode (cname = "alpm_pkg_get_base64_sig")] get;
}
public Validation validation {
public int validation {
[CCode (cname = "alpm_pkg_get_validation")] get;
}
// TODO: changelog functions
@@ -721,7 +736,7 @@ namespace Alpm {
DATABASE_MARGINAL_OK = (1 << 12),
DATABASE_UNKNOWN_OK = (1 << 13),

USE_DEFAULT = (1 << 31)
USE_DEFAULT = (1 << 30)
}

/** PGP signature verification status return codes */
@@ -875,7 +890,7 @@ namespace Alpm {
HOOK_DONE,
/** A hook is starting */
HOOK_RUN_START,
/** A hook has finnished runnning */
/** A hook has finished running */
HOOK_RUN_DONE
}

@@ -1317,7 +1332,8 @@ namespace Alpm {
*/
[CCode (cname = "alpm_errno_t", cprefix = "ALPM_ERR_")]
public enum Errno {
MEMORY = 1,
OK = 0,
MEMORY,
SYSTEM,
BADPERMS,
NOT_A_FILE,

Loading…
Cancel
Save