Browse Source

libalpm 5.1.0 compat

Chris Cromer 6 months ago
parent
commit
783baf464b

+ 9
- 9
pamac.avprj View File

@@ -1,7 +1,7 @@
1 1
 ### AutoVala Project ###
2
-autovala_version: 27
2
+autovala_version: 28
3 3
 project_name: pamac
4
-project_version: 6.6.4
4
+project_version: 6.7.0
5 5
 vala_version: 0.38
6 6
 
7 7
 custom: data/systemd/pamac-system.service /usr/lib/systemd/system
@@ -22,7 +22,7 @@ define: KDE_TRAY
22 22
 vapidir: src/vapis
23 23
 
24 24
 vala_binary: src/pamac-clean-cache/pamac-clean-cache
25
-*version: 6.6.4
25
+*version: 6.7.0
26 26
 vala_local_package: pamacclassic
27 27
 vala_package: posix
28 28
 vala_check_package: gtk+-3.0
@@ -33,7 +33,7 @@ vala_check_package: json-glib-1.0
33 33
 *vala_source: pamac_config.vala
34 34
 
35 35
 vala_binary: src/pamac-install/pamac-install
36
-*version: 6.6.4
36
+*version: 6.7.0
37 37
 use_gresource: pamac_installer_gresource_xml
38 38
 vala_local_package: pamacclassic
39 39
 vala_check_package: gtk+-3.0
@@ -45,7 +45,7 @@ vala_check_package: json-glib-1.0
45 45
 *vala_source: progress_dialog.vala
46 46
 
47 47
 vala_binary: src/pamac-manager/pamac-manager
48
-*version: 6.6.4
48
+*version: 6.7.0
49 49
 alias: pamac-updater
50 50
 use_gresource: pamac_manager_gresource_xml
51 51
 vala_local_package: pamacclassic
@@ -59,7 +59,7 @@ vala_check_package: json-glib-1.0
59 59
 *vala_source: manager_window.vala
60 60
 
61 61
 vala_binary: src/pamac-system-daemon/pamac-system-daemon
62
-*version: 6.6.4
62
+*version: 6.7.0
63 63
 vala_local_package: pamacclassic
64 64
 vala_package: posix
65 65
 vala_check_package: gtk+-3.0
@@ -77,7 +77,7 @@ vala_check_package: polkit-gobject-1
77 77
 *vala_source: system_daemon.vala
78 78
 
79 79
 vala_binary: src/pamac-tray/pamac-tray
80
-*version: 6.6.4
80
+*version: 6.7.0
81 81
 vala_local_package: pamacclassic
82 82
 vala_package: posix
83 83
 vala_check_package: json-glib-1.0
@@ -101,7 +101,7 @@ end
101 101
 *vala_source: tray.vala
102 102
 
103 103
 vala_binary: src/pamac-user-daemon/pamac-user-daemon
104
-*version: 6.6.4
104
+*version: 6.7.0
105 105
 vala_local_package: pamacclassic
106 106
 vala_package: posix
107 107
 vala_check_package: gtk+-3.0
@@ -117,7 +117,7 @@ vala_check_package: libsoup-2.4
117 117
 
118 118
 
119 119
 vala_library: src/pamac-classic
120
-*version: 6.6.4
120
+*version: 6.7.0
121 121
 namespace: pamacclassic
122 122
 use_gresource: pamac_transaction_gresource_xml
123 123
 vala_package: posix

+ 1
- 1
po/pamac.pot View File

@@ -8,7 +8,7 @@ msgid ""
8 8
 msgstr ""
9 9
 "Project-Id-Version: Pamac\n"
10 10
 "Report-Msgid-Bugs-To: cromer@cromnix.org\n"
11
-"POT-Creation-Date: 2018-02-16 15:41-0300\n"
11
+"POT-Creation-Date: 2018-06-02 14:49-0400\n"
12 12
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14
 "Language-Team: LANGUAGE <LL@li.org>\n"

+ 3
- 3
src/CMakeLists.txt View File

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
7 7
 set (RELEASE_NAME "pamac")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.6.4")
10
+set (VERSION "6.7.0")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
@@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16 16
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.pc ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc)
17 17
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.deps ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps)
18
-set (VERSION "6.6.4")
18
+set (VERSION "6.7.0")
19 19
 add_definitions (${DEPS_CFLAGS})
20 20
 link_libraries ( ${DEPS_LIBRARIES} )
21 21
 link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -101,7 +101,7 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
101 101
 target_link_libraries( pamacclassic m )
102 102
 set_target_properties( pamacclassic PROPERTIES
103 103
 VERSION
104
-	6.6.4
104
+	6.7.0
105 105
 SOVERSION
106 106
 	6 )
107 107
 

+ 4
- 3
src/meson.build View File

@@ -4,7 +4,7 @@ cfg_pamac_classic.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
4 4
 cfg_pamac_classic.set('GETTEXT_PACKAGE', 'pamac')
5 5
 cfg_pamac_classic.set('RELEASE_NAME', 'pamac')
6 6
 cfg_pamac_classic.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_classic.set('VERSION', '6.6.4')
7
+cfg_pamac_classic.set('VERSION', '6.7.0')
8 8
 cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic)
@@ -56,10 +56,11 @@ if DISABLE_AUR
56 56
   pamac_classic_c_args += ['-DDISABLE_AUR']
57 57
 endif
58 58
 pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : false)]
59
+pamac_classic_link_args = ['-rdynamic']
59 60
 pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir']
60 61
 
61 62
 
62
-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)
63
+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)
63 64
 
64 65
 pamac_classic_requires = []
65 66
 pamac_classic_requires += ['gdk-3.0']
@@ -74,7 +75,7 @@ pamac_classic_requires += ['glib-2.0']
74 75
 pamac_classic_requires += ['gobject-2.0']
75 76
 pkg_mod = import('pkgconfig')
76 77
 pkg_mod.generate(libraries : pamacclassic_library,
77
-	version : '6.6.4',
78
+	version : '6.7.0',
78 79
 	name : 'pamacclassic',
79 80
 	filebase : 'pamacclassic',
80 81
 	description : 'pamacclassic',

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
7 7
 set (RELEASE_NAME "pamac")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.6.4")
10
+set (VERSION "6.7.0")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.6.4")
16
+set (VERSION "6.7.0")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 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
4 4
 cfg_pamac_clean_cache.set('GETTEXT_PACKAGE', 'pamac')
5 5
 cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac')
6 6
 cfg_pamac_clean_cache.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_clean_cache.set('VERSION', '6.6.4')
7
+cfg_pamac_clean_cache.set('VERSION', '6.7.0')
8 8
 cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache)
@@ -36,7 +36,8 @@ if DISABLE_AUR
36 36
   pamac_clean_cache_vala_args += ['-D', 'DISABLE_AUR']
37 37
   pamac_clean_cache_c_args += ['-DDISABLE_AUR']
38 38
 endif
39
+pamac_clean_cache_link_args = ['-rdynamic']
39 40
 pamac_clean_cache_hfolders = ['../../src']
40 41
 
41
-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)
42
+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)
42 43
 

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
7 7
 set (RELEASE_NAME "pamac")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.6.4")
10
+set (VERSION "6.7.0")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.6.4")
16
+set (VERSION "6.7.0")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 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('
4 4
 cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac')
5 5
 cfg_pamac_install.set('RELEASE_NAME', 'pamac')
6 6
 cfg_pamac_install.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_install.set('VERSION', '6.6.4')
7
+cfg_pamac_install.set('VERSION', '6.7.0')
8 8
 cfg_pamac_install.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)
@@ -38,7 +38,8 @@ if DISABLE_AUR
38 38
   pamac_install_vala_args += ['-D', 'DISABLE_AUR']
39 39
   pamac_install_c_args += ['-DDISABLE_AUR']
40 40
 endif
41
+pamac_install_link_args = ['-rdynamic']
41 42
 pamac_install_hfolders = ['../../src']
42 43
 
43
-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)
44
+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)
44 45
 

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
7 7
 set (RELEASE_NAME "pamac")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.6.4")
10
+set (VERSION "6.7.0")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.6.4")
16
+set (VERSION "6.7.0")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 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('
4 4
 cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac')
5 5
 cfg_pamac_manager.set('RELEASE_NAME', 'pamac')
6 6
 cfg_pamac_manager.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_manager.set('VERSION', '6.6.4')
7
+cfg_pamac_manager.set('VERSION', '6.7.0')
8 8
 cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)
@@ -39,8 +39,9 @@ if DISABLE_AUR
39 39
   pamac_manager_vala_args += ['-D', 'DISABLE_AUR']
40 40
   pamac_manager_c_args += ['-DDISABLE_AUR']
41 41
 endif
42
+pamac_manager_link_args = ['-rdynamic']
42 43
 pamac_manager_hfolders = ['../../src']
43 44
 
44
-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)
45
+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)
45 46
 
46 47
 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")
7 7
 set (RELEASE_NAME "pamac")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.6.4")
10
+set (VERSION "6.7.0")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.6.4")
16
+set (VERSION "6.7.0")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 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
4 4
 cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac')
5 5
 cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac')
6 6
 cfg_pamac_system_daemon.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_system_daemon.set('VERSION', '6.6.4')
7
+cfg_pamac_system_daemon.set('VERSION', '6.7.0')
8 8
 cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon)
@@ -43,7 +43,8 @@ if DISABLE_AUR
43 43
   pamac_system_daemon_vala_args += ['-D', 'DISABLE_AUR']
44 44
   pamac_system_daemon_c_args += ['-DDISABLE_AUR']
45 45
 endif
46
+pamac_system_daemon_link_args = ['-rdynamic']
46 47
 pamac_system_daemon_hfolders = ['../../src']
47 48
 
48
-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)
49
+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)
49 50
 

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
7 7
 set (RELEASE_NAME "pamac")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.6.4")
10
+set (VERSION "6.7.0")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.6.4")
16
+set (VERSION "6.7.0")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 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
4 4
 cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac')
5 5
 cfg_pamac_tray.set('RELEASE_NAME', 'pamac')
6 6
 cfg_pamac_tray.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_tray.set('VERSION', '6.6.4')
7
+cfg_pamac_tray.set('VERSION', '6.7.0')
8 8
 cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)
@@ -49,7 +49,8 @@ if DISABLE_AUR
49 49
   pamac_tray_vala_args += ['-D', 'DISABLE_AUR']
50 50
   pamac_tray_c_args += ['-DDISABLE_AUR']
51 51
 endif
52
+pamac_tray_link_args = ['-rdynamic']
52 53
 pamac_tray_hfolders = ['../../src']
53 54
 
54
-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)
55
+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)
55 56
 

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

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
7 7
 set (RELEASE_NAME "pamac")
8 8
 set (CMAKE_C_FLAGS "")
9 9
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
10
-set (VERSION "6.6.4")
10
+set (VERSION "6.7.0")
11 11
 set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
12 12
 set (DOLLAR "$")
13 13
 
14 14
 configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala)
15 15
 add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
16
-set (VERSION "6.6.4")
16
+set (VERSION "6.7.0")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 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
4 4
 cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac')
5 5
 cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac')
6 6
 cfg_pamac_user_daemon.set('PREFIX', get_option('prefix'))
7
-cfg_pamac_user_daemon.set('VERSION', '6.6.4')
7
+cfg_pamac_user_daemon.set('VERSION', '6.7.0')
8 8
 cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())
9 9
 
10 10
 cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon)
@@ -40,7 +40,8 @@ if DISABLE_AUR
40 40
   pamac_user_daemon_vala_args += ['-D', 'DISABLE_AUR']
41 41
   pamac_user_daemon_c_args += ['-DDISABLE_AUR']
42 42
 endif
43
+pamac_user_daemon_link_args = ['-rdynamic']
43 44
 pamac_user_daemon_hfolders = ['../../src']
44 45
 
45
-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)
46
+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)
46 47
 

+ 1
- 1
src/pamacclassic.pc View File

@@ -4,7 +4,7 @@ includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}
4 4
 
5 5
 Name: pamacclassic
6 6
 Description: pamacclassic
7
-Version: 6.6.4
7
+Version: 6.7.0
8 8
 Libs: -L@DOLLAR@{libdir} -lpamacclassic
9 9
 Cflags: -I@DOLLAR@{includedir}
10 10
 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 {
36 36
 		DOWNLOADER = (1 << 1),
37 37
 		SIGNATURES = (1 << 2)
38 38
 	}
39
-	public Capabilities capabilities();
39
+	public int capabilities();
40 40
 
41 41
 	public unowned Package? find_satisfier(Alpm.List<Package> pkgs, string depstring);
42 42
 
@@ -90,6 +90,15 @@ namespace Alpm {
90 90
 		[CCode (cname = "alpm_option_remove_hookdir")]
91 91
 		public int remove_hookdir(string hookdir);
92 92
 
93
+		public unowned Alpm.List<unowned string> overwrite_files {
94
+			[CCode (cname = "alpm_option_get_overwrite_files")] get;
95
+			[CCode (cname = "alpm_option_set_overwrite_files")] set;
96
+		}
97
+		[CCode (cname = "alpm_option_add_overwrite_file")]
98
+		public int add_overwrite_file(string overwrite_file);
99
+		[CCode (cname = "alpm_option_remove_overwrite_file")]
100
+		public int remove_overwrite_file(string overwrite_file);
101
+
93 102
 		public unowned string logfile {
94 103
 			[CCode (cname = "alpm_option_get_logfile")] get;
95 104
 			[CCode (cname = "alpm_option_set_logfile")] set;
@@ -168,15 +177,15 @@ namespace Alpm {
168 177
 			[CCode (cname = "alpm_option_set_dbext")] set;
169 178
 		}
170 179
 
171
-		public Signature.Level defaultsiglevel {
180
+		public int defaultsiglevel {
172 181
 			[CCode (cname = "alpm_option_get_default_siglevel")] get;
173 182
 			[CCode (cname = "alpm_option_set_default_siglevel")] set;
174 183
 		}
175
-		public Signature.Level localfilesiglevel {
184
+		public int localfilesiglevel {
176 185
 			[CCode (cname = "alpm_option_get_local_file_siglevel")] get;
177 186
 			[CCode (cname = "alpm_option_set_local_file_siglevel")] set;
178 187
 		}
179
-		public Signature.Level remotefilesiglevel {
188
+		public int remotefilesiglevel {
180 189
 			[CCode (cname = "alpm_option_get_remote_file_siglevel")] get;
181 190
 			[CCode (cname = "alpm_option_set_remote_file_siglevel")] set;
182 191
 		}
@@ -221,14 +230,14 @@ namespace Alpm {
221 230
 		public int unlock();
222 231
 
223 232
 		[CCode (cname = "alpm_register_syncdb")]
224
-		public unowned DB register_syncdb(string treename, Signature.Level level);
233
+		public unowned DB register_syncdb(string treename, int siglevel);
225 234
 		[CCode (cname = "alpm_unregister_all_syncdbs")]
226 235
 		public int unregister_all_syncdbs();
227 236
 
228 237
 		// the return package can be freed except if it is added to a transaction,
229 238
 		// it will be freed upon Handle.trans_release() invocation.
230 239
 		[CCode (cname = "alpm_pkg_load")]
231
-		public int load_tarball(string filename, int full, Signature.Level level, out Package pkg);
240
+		public int load_tarball(string filename, int full, int siglevel, out Package pkg);
232 241
 
233 242
 		/** Test if a package should be ignored.
234 243
 		 * Checks if the package is ignored via IgnorePkg, or if the package is
@@ -251,7 +260,7 @@ namespace Alpm {
251 260
 
252 261
 		/** Returns the bitfield of flags for the current transaction.*/
253 262
 		[CCode (cname = "alpm_trans_get_flags")]
254
-		public TransFlag trans_get_flags();
263
+		public int trans_get_flags();
255 264
 
256 265
 		/** Returns a list of packages added by the transaction.*/
257 266
 		[CCode (cname = "alpm_trans_get_add")]
@@ -266,7 +275,7 @@ namespace Alpm {
266 275
 		* @return 0 on success, -1 on error (Errno is set accordingly)
267 276
 		*/
268 277
 		[CCode (cname = "alpm_trans_init")]
269
-		public int trans_init(TransFlag transflags);
278
+		public int trans_init(int transflags);
270 279
 
271 280
 		/** Prepare a transaction.
272 281
 		* @param an alpm_list where detailed description of an error
@@ -332,7 +341,7 @@ namespace Alpm {
332 341
 			[CCode (cname = "alpm_db_get_name")] get;
333 342
 		}
334 343
 
335
-		public Signature.Level siglevel {
344
+		public int siglevel {
336 345
 			[CCode (cname = "alpm_db_get_siglevel")] get;
337 346
 		}
338 347
 
@@ -349,7 +358,7 @@ namespace Alpm {
349 358
 			[CCode (cname = "alpm_db_get_groupcache")] get;
350 359
 		}
351 360
 
352
-		public Usage usage {
361
+		public int usage {
353 362
 			[CCode (cname = "alpm_db_get_usage")] get;
354 363
 			[CCode (cname = "alpm_db_set_usage")] set;
355 364
 		}
@@ -455,6 +464,12 @@ namespace Alpm {
455 464
 		public unowned Alpm.List<unowned Depend> optdepends {
456 465
 			[CCode (cname = "alpm_pkg_get_optdepends")] get;
457 466
 		}
467
+		public unowned Alpm.List<unowned Depend> checkdepends {
468
+			[CCode (cname = "alpm_pkg_get_depends")] get;
469
+		}
470
+		public unowned Alpm.List<unowned Depend> makedepends {
471
+			[CCode (cname = "alpm_pkg_get_optdepends")] get;
472
+		}
458 473
 		public unowned Alpm.List<unowned Depend> conflicts {
459 474
 			[CCode (cname = "alpm_pkg_get_conflicts")] get;
460 475
 		}
@@ -482,7 +497,7 @@ namespace Alpm {
482 497
 		public unowned string base64_sig {
483 498
 			[CCode (cname = "alpm_pkg_get_base64_sig")] get;
484 499
 		}
485
-		public Validation validation {
500
+		public int validation {
486 501
 			[CCode (cname = "alpm_pkg_get_validation")] get;
487 502
 		}
488 503
 		// TODO: changelog functions
@@ -721,7 +736,7 @@ namespace Alpm {
721 736
 			DATABASE_MARGINAL_OK = (1 << 12),
722 737
 			DATABASE_UNKNOWN_OK = (1 << 13),
723 738
 
724
-			USE_DEFAULT = (1 << 31)
739
+			USE_DEFAULT = (1 << 30)
725 740
 		}
726 741
 
727 742
 		/** PGP signature verification status return codes */
@@ -875,7 +890,7 @@ namespace Alpm {
875 890
 			HOOK_DONE,
876 891
 			/** A hook is starting */
877 892
 			HOOK_RUN_START,
878
-			/** A hook has finnished runnning */
893
+			/** A hook has finished running */
879 894
 			HOOK_RUN_DONE
880 895
 		}
881 896
 
@@ -1317,7 +1332,8 @@ namespace Alpm {
1317 1332
 	 */
1318 1333
 	[CCode (cname = "alpm_errno_t", cprefix = "ALPM_ERR_")]
1319 1334
 	public enum Errno {
1320
-		MEMORY = 1,
1335
+		OK = 0,
1336
+		MEMORY,
1321 1337
 		SYSTEM,
1322 1338
 		BADPERMS,
1323 1339
 		NOT_A_FILE,

Loading…
Cancel
Save