Browse Source

update to work with newever versions of vala

Chris Cromer 2 weeks ago
parent
commit
b2d5118615
Signed by: Chris Cromer <cromer@artixlinux.org> GPG Key ID: 39CC813FF3C8708A

+ 21
- 3
CMakeLists.txt View File

@@ -55,9 +55,27 @@ set(MODULES_TO_CHECK ${MODULES_TO_CHECK} gobject-2.0)
55 55
 pkg_check_modules(DEPS REQUIRED ${MODULES_TO_CHECK})
56 56
 
57 57
 
58
-find_program ( WHERE_GRESOURCE glib-compile-resources )
59
-if ( NOT WHERE_GRESOURCE )
60
-	MESSAGE(FATAL_ERROR "Error! GLIB-COMPILE-RESOURCES is not installed.")
58
+find_program ( WHERE_glib_compile_resources glib-compile-resources )
59
+if ( NOT WHERE_glib_compile_resources )
60
+	MESSAGE(FATAL_ERROR "Error! external program 'glib-compile-resources' is not installed.")
61
+endif()
62
+
63
+find_program ( WHERE_gtk_update_icon_cache gtk-update-icon-cache )
64
+if ( NOT WHERE_gtk_update_icon_cache )
65
+	find_program ( WHERE_gtk_update_icon_cache gtk-update-icon-cache.3.0 )
66
+	if ( NOT WHERE_gtk_update_icon_cache )
67
+		MESSAGE(FATAL_ERROR "Error! none of the external programs 'gtk-update-icon-cache', 'gtk-update-icon-cache.3.0',  are installed.")
68
+	endif()
69
+endif()
70
+
71
+find_program ( WHERE_glib_compile_schemas glib-compile-schemas )
72
+if ( NOT WHERE_glib_compile_schemas )
73
+	MESSAGE(FATAL_ERROR "Error! external program 'glib-compile-schemas' is not installed.")
74
+endif()
75
+
76
+find_program ( WHERE_g_ir_compiler g-ir-compiler )
77
+if ( NOT WHERE_g_ir_compiler )
78
+	MESSAGE(FATAL_ERROR "Error! external program 'g-ir-compiler' is not installed.")
61 79
 endif()
62 80
 
63 81
 add_subdirectory(src/vapis)

+ 7
- 2
meson.build View File

@@ -7,6 +7,10 @@ DISABLE_AUR = (get_option('DISABLE_AUR') != '')
7 7
 
8 8
 add_global_arguments('-DGETTEXT_PACKAGE="pamac"',language: 'c')
9 9
 
10
+find_program ('glib-compile-resources')
11
+find_program ('gtk-update-icon-cache', 'gtk-update-icon-cache.3.0')
12
+find_program ('glib-compile-schemas')
13
+find_program ('g-ir-compiler')
10 14
 gdk_3_0_dep = dependency('gdk-3.0')
11 15
 gtk_3_0_dep = dependency('gtk+-3.0')
12 16
 json_glib_1_0_dep = dependency('json-glib-1.0')
@@ -26,6 +30,7 @@ gobject_2_0_dep = dependency('gobject-2.0')
26 30
 subdir('po')
27 31
 cfg_dbus_data = configuration_data()
28 32
 cfg_dbus_data.set ('DBUS_PREFIX',get_option('prefix'))
33
+meson.add_install_script('meson_scripts/update_icon.sh')
29 34
 meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/lib/systemd/system',join_paths(meson.current_source_dir(),'data/systemd','pamac-system.service'))
30 35
 
31 36
 meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/lib/systemd/system',join_paths(meson.current_source_dir(),'data/systemd','pamac-cleancache.service'))
@@ -72,10 +77,10 @@ dbus_cfg_org_pamac_user_service = configure_file(input: 'data/dbus/org.pamac.use
72 77
 install_data(dbus_cfg_org_pamac_user_service,install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','services'))
73 78
 install_data( 'data/dbus/org.pamac.system.conf',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','system.d'))
74 79
 install_data('data/org.pamac.main.gschema.xml', install_dir: join_paths(get_option('prefix'),get_option('datadir'), 'glib-2.0', 'schemas'))
75
-meson.add_install_script('meson_scripts/install_schemas.py')
80
+meson.add_install_script('meson_scripts/install_schemas.sh')
76 81
 if not DISABLE_AUR
77 82
 	install_data('data/org.pamac.aur.gschema.xml', install_dir: join_paths(get_option('prefix'),get_option('datadir'), 'glib-2.0', 'schemas'))
78
-	meson.add_install_script('meson_scripts/install_schemas.py')
83
+	meson.add_install_script('meson_scripts/install_schemas.sh')
79 84
 endif
80 85
 install_data('data/icons/16x16/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/16x16/apps'))
81 86
 install_data('data/icons/24x24/status/pamac-tray-no-update.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/24x24/apps'))

+ 4
- 2
meson_scripts/install_data.sh View File

@@ -1,7 +1,9 @@
1
-#!/bin/sh
1
+#!/bin/bash
2
+
3
+shopt -s extglob
2 4
 mkdir -p $DESTDIR/$1
3 5
 if [ -d "$2" ]; then
4
-	cp -a $2/* $DESTDIR/$1
6
+	cp -a $2/!(CMakeLists.txt) $DESTDIR/$1
5 7
 else
6 8
 	cp -a $2 $DESTDIR/$1
7 9
 fi

+ 0
- 9
meson_scripts/install_library.sh View File

@@ -1,9 +0,0 @@
1
-#!/bin/sh
2
-
3
-mkdir -p "${DESTDIR}${MESON_INSTALL_PREFIX}/share/vala/vapi"
4
-mkdir -p "${DESTDIR}${MESON_INSTALL_PREFIX}/share/gir-1.0"
5
-mkdir -p "${DESTDIR}${MESON_INSTALL_PREFIX}/include"
6
-
7
-install -m 644 "${MESON_BUILD_ROOT}/$1/$2.vapi" "${DESTDIR}${MESON_INSTALL_PREFIX}/share/vala/vapi"
8
-install -m 644 "${MESON_BUILD_ROOT}/$1/$2.h" "${DESTDIR}${MESON_INSTALL_PREFIX}/include"
9
-install -m 644 "${MESON_BUILD_ROOT}/$1/$2@sha/$3" "${DESTDIR}${MESON_INSTALL_PREFIX}/share/gir-1.0"

+ 0
- 10
meson_scripts/install_schemas.py View File

@@ -1,10 +0,0 @@
1
-#!/usr/bin/env python3
2
-
3
-import os
4
-import subprocess
5
-
6
-schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
7
-
8
-if not os.environ.get('DESTDIR'):
9
-    print('Compiling gsettings schemas...')
10
-    subprocess.call(['glib-compile-schemas', schemadir])

+ 6
- 0
meson_scripts/install_schemas.sh View File

@@ -0,0 +1,6 @@
1
+#!/bin/bash
2
+
3
+if [[ -z "${DESTDIR}" ]]; then
4
+    echo Compiling gsettings schemas...
5
+	glib-compile-schemas ${MESON_INSTALL_PREFIX}/share/glib-2.0/schemas
6
+fi

+ 12
- 0
meson_scripts/update_icon.sh View File

@@ -0,0 +1,12 @@
1
+#!/bin/bash
2
+
3
+if [[ -z "${DESTDIR}" ]]; then
4
+	if [[ -z "${MESON_INSTALL_PREFIX}" ]]; then
5
+		prefix=/usr/local
6
+	else
7
+		prefix="${MESON_INSTALL_PREFIX}"
8
+	fi
9
+    datadir="${prefix}/share"
10
+	echo Updating icon cache at ${datadir}/icons/hicolor...
11
+	gtk-update-icon-cache -qtf "${datadir}/icons/hicolor"
12
+fi

+ 14
- 9
pamac.avprj View File

@@ -1,7 +1,7 @@
1 1
 ### AutoVala Project ###
2
-autovala_version: 28
2
+autovala_version: 30
3 3
 project_name: pamac
4
-project_version: 6.7.0
4
+project_version: 6.7.1
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.7.0
25
+*version: 6.7.1
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.7.0
36
+*version: 6.7.1
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.7.0
48
+*version: 6.7.1
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.7.0
62
+*version: 6.7.1
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.7.0
80
+*version: 6.7.1
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.7.0
104
+*version: 6.7.1
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.7.0
120
+*version: 6.7.1
121 121
 namespace: pamacclassic
122 122
 use_gresource: pamac_transaction_gresource_xml
123 123
 vala_package: posix
@@ -223,6 +223,11 @@ end
223 223
 
224 224
 *pixmap: data/pixmaps/package-generic.png
225 225
 
226
+*build_external_program: glib-compile-resources
227
+*build_external_program: gtk-update-icon-cache gtk-update-icon-cache.3.0
228
+*build_external_program: glib-compile-schemas
229
+*build_external_program: g-ir-compiler
230
+
226 231
 *polkit: data/polkit/org.pamac.policy
227 232
 
228 233
 *mimetype: data/mime/x-alpm-package.xml

+ 1
- 1
po/LINGUAS View File

@@ -1 +1 @@
1
-af ar es_ES nn sl_SI cs_CZ is gl be sr_RS zh_TW pl_PL uz fi is_IS sr_RS@latin sl sr@latin fr ro sr el eu ml ur_PK ko el_GR de_DE cs bs si zh da ca_ES sv it_IT vi eo es_AR zh_CN pl hi pt en_GB es_419 es_MX fa nl hu bn hr_HR nb ja pt_BR pt_PT nl_BE ca tr he hi_IN et lt fo it fa_IR de_CH de ka bs_BA ru ms sk bg ast uk hr es_SV nl_NL cy id az_AZ es
1
+af ar ast az_AZ be bg bn bs bs_BA ca ca_ES cs cs_CZ cy da de de_CH de_DE el el_GR en_GB eo es es_419 es_AR es_ES es_MX es_SV et eu fa fa_IR fi fo fr gl he hi hi_IN hr hr_HR hu id is is_IS it it_IT ja ka ko lt ml ms nb nl nl_BE nl_NL nn pl pl_PL pt pt_BR pt_PT ro ru si sk sl sl_SI sr sr@latin sr_RS sr_RS@latin sv tr uk ur_PK uz vi zh zh_CN zh_TW

+ 1
- 1
po/meson.build View File

@@ -1,2 +1,2 @@
1 1
 i18n = import('i18n')
2
-i18n.gettext('pamac', languages: ['af', 'ar', 'es_ES', 'nn', 'sl_SI', 'cs_CZ', 'is', 'gl', 'be', 'sr_RS', 'zh_TW', 'pl_PL', 'uz', 'fi', 'is_IS', 'sr_RS@latin', 'sl', 'sr@latin', 'fr', 'ro', 'sr', 'el', 'eu', 'ml', 'ur_PK', 'ko', 'el_GR', 'de_DE', 'cs', 'bs', 'si', 'zh', 'da', 'ca_ES', 'sv', 'it_IT', 'vi', 'eo', 'es_AR', 'zh_CN', 'pl', 'hi', 'pt', 'en_GB', 'es_419', 'es_MX', 'fa', 'nl', 'hu', 'bn', 'hr_HR', 'nb', 'ja', 'pt_BR', 'pt_PT', 'nl_BE', 'ca', 'tr', 'he', 'hi_IN', 'et', 'lt', 'fo', 'it', 'fa_IR', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ', 'es'])
2
+i18n.gettext('pamac', languages: ['af', 'ar', 'ast', 'az_AZ', 'be', 'bg', 'bn', 'bs', 'bs_BA', 'ca', 'ca_ES', 'cs', 'cs_CZ', 'cy', 'da', 'de', 'de_CH', 'de_DE', 'el', 'el_GR', 'en_GB', 'eo', 'es', 'es_419', 'es_AR', 'es_ES', 'es_MX', 'es_SV', 'et', 'eu', 'fa', 'fa_IR', 'fi', 'fo', 'fr', 'gl', 'he', 'hi', 'hi_IN', 'hr', 'hr_HR', 'hu', 'id', 'is', 'is_IS', 'it', 'it_IT', 'ja', 'ka', 'ko', 'lt', 'ml', 'ms', 'nb', 'nl', 'nl_BE', 'nl_NL', 'nn', 'pl', 'pl_PL', 'pt', 'pt_BR', 'pt_PT', 'ro', 'ru', 'si', 'sk', 'sl', 'sl_SI', 'sr', 'sr@latin', 'sr_RS', 'sr_RS@latin', 'sv', 'tr', 'uk', 'ur_PK', 'uz', 'vi', 'zh', 'zh_CN', 'zh_TW'])

+ 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-06-02 14:49-0400\n"
11
+"POT-Creation-Date: 2019-06-29 12:05-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"

+ 16
- 5
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.7.0")
10
+set (VERSION "6.7.1")
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.7.0")
18
+set (VERSION "6.7.1")
19 19
 add_definitions (${DEPS_CFLAGS})
20 20
 link_libraries ( ${DEPS_LIBRARIES} )
21 21
 link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -78,7 +78,7 @@ if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "Rel
78 78
 	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
79 79
 endif()
80 80
 
81
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic --gir pamacclassic-6.0.gir )
81
+set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic --gir pamacclassic-1.0.gir )
82 82
 set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction.gresource.xml )
83 83
 
84 84
 vala_precompile(VALA_C pamacclassic
@@ -101,10 +101,16 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
101 101
 target_link_libraries( pamacclassic m )
102 102
 set_target_properties( pamacclassic PROPERTIES
103 103
 VERSION
104
-	6.7.0
104
+	6.7.1
105 105
 SOVERSION
106 106
 	6 )
107 107
 
108
+add_custom_command (
109
+	TARGET pamacclassic
110
+	POST_BUILD
111
+	COMMAND g-ir-compiler --shared-library=libpamacclassic "${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.gir"  --output="${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.typelib"
112
+)
113
+
108 114
 
109 115
 install(TARGETS
110 116
 	pamacclassic
@@ -127,10 +133,15 @@ DESTINATION
127 133
 	${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/
128 134
 )
129 135
 install(FILES
130
-	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-6.0.gir
136
+	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.gir
131 137
 DESTINATION
132 138
 	${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/
133 139
 )
140
+install(FILES
141
+	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.typelib
142
+DESTINATION
143
+	lib/girepository-1.0/
144
+)
134 145
 install(FILES
135 146
 	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc
136 147
 DESTINATION

+ 1
- 1
src/Config.vala.base View File

@@ -1,4 +1,4 @@
1
-namespace pamacclassicConstants {
1
+namespace pamacclassic {
2 2
 	public const string DATADIR = "@DATADIR@";
3 3
 	public const string PKGDATADIR = "@PKGDATADIR@";
4 4
 	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";

+ 15
- 8
src/meson.build View File

@@ -4,10 +4,13 @@ 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.7.0')
7
+cfg_pamac_classic.set('VERSION', '6.7.1')
8 8
 cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())
9 9
 
10
-cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic)
10
+cfgfile_1 = configure_file(
11
+	input: 'Config.vala.base',
12
+	output: 'Config.vala',
13
+	configuration: cfg_pamac_classic)
11 14
 
12 15
 pamac_classic_deps = [gdk_3_0_dep]
13 16
 pamac_classic_deps += [gtk_3_0_dep]
@@ -57,10 +60,16 @@ if DISABLE_AUR
57 60
 endif
58 61
 pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : false)]
59 62
 pamac_classic_link_args = ['-rdynamic']
60
-pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir']
61 63
 
62
-
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)
64
+pamacclassic_library = shared_library('pamacclassic', pamac_classic_sources,
65
+    dependencies: pamac_classic_deps,
66
+    vala_args: pamac_classic_vala_args,
67
+    c_args: pamac_classic_c_args,
68
+    link_args: pamac_classic_link_args,
69
+    version: '6.7.1',
70
+    soversion: '6',
71
+    install: true,
72
+    install_dir: [true, true, true])
64 73
 
65 74
 pamac_classic_requires = []
66 75
 pamac_classic_requires += ['gdk-3.0']
@@ -75,12 +84,10 @@ pamac_classic_requires += ['glib-2.0']
75 84
 pamac_classic_requires += ['gobject-2.0']
76 85
 pkg_mod = import('pkgconfig')
77 86
 pkg_mod.generate(libraries : pamacclassic_library,
78
-	version : '6.7.0',
87
+	version : '6.7.1',
79 88
 	name : 'pamacclassic',
80 89
 	filebase : 'pamacclassic',
81 90
 	description : 'pamacclassic',
82 91
 	requires : pamac_classic_requires)
83 92
 
84 93
 install_data(join_paths(meson.current_source_dir(),'pamacclassic.deps'),install_dir: join_paths(get_option('prefix'),'share','vala','vapi'))
85
-meson.add_install_script(join_paths(meson.source_root(),'meson_scripts','install_library.sh'),'src','pamacclassic','pamacclassic-6.0.gir')
86
-

+ 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.7.0")
10
+set (VERSION "6.7.1")
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.7.0")
16
+set (VERSION "6.7.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,10 +4,13 @@ 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.7.0')
7
+cfg_pamac_clean_cache.set('VERSION', '6.7.1')
8 8
 cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())
9 9
 
10
-cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache)
10
+cfgfile_4 = configure_file(
11
+	input: 'Config.vala.base',
12
+	output: 'Config.vala',
13
+	configuration: cfg_pamac_clean_cache)
11 14
 
12 15
 pamac_clean_cache_deps = [gtk_3_0_dep]
13 16
 pamac_clean_cache_deps += [json_glib_1_0_dep]
@@ -39,5 +42,12 @@ endif
39 42
 pamac_clean_cache_link_args = ['-rdynamic']
40 43
 pamac_clean_cache_hfolders = ['../../src']
41 44
 
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)
45
+executable('pamac-clean-cache',pamac_clean_cache_sources,
46
+    dependencies: pamac_clean_cache_deps,
47
+    vala_args: pamac_clean_cache_vala_args,
48
+    c_args: pamac_clean_cache_c_args,
49
+    link_args: pamac_clean_cache_link_args,
50
+    link_with: pamac_clean_cache_dependencies,
51
+    include_directories: include_directories(pamac_clean_cache_hfolders),
52
+    install: true)
43 53
 

+ 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.7.0")
10
+set (VERSION "6.7.1")
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.7.0")
16
+set (VERSION "6.7.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,10 +4,13 @@ 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.7.0')
7
+cfg_pamac_install.set('VERSION', '6.7.1')
8 8
 cfg_pamac_install.set('TESTSRCDIR', meson.source_root())
9 9
 
10
-cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)
10
+cfgfile_5 = configure_file(
11
+	input: 'Config.vala.base',
12
+	output: 'Config.vala',
13
+	configuration: cfg_pamac_install)
11 14
 
12 15
 pamac_install_deps = [gtk_3_0_dep]
13 16
 pamac_install_deps += [json_glib_1_0_dep]
@@ -41,5 +44,12 @@ endif
41 44
 pamac_install_link_args = ['-rdynamic']
42 45
 pamac_install_hfolders = ['../../src']
43 46
 
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)
47
+executable('pamac-install',pamac_install_sources,
48
+    dependencies: pamac_install_deps,
49
+    vala_args: pamac_install_vala_args,
50
+    c_args: pamac_install_c_args,
51
+    link_args: pamac_install_link_args,
52
+    link_with: pamac_install_dependencies,
53
+    include_directories: include_directories(pamac_install_hfolders),
54
+    install: true)
45 55
 

+ 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.7.0")
10
+set (VERSION "6.7.1")
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.7.0")
16
+set (VERSION "6.7.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,10 +4,13 @@ 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.7.0')
7
+cfg_pamac_manager.set('VERSION', '6.7.1')
8 8
 cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())
9 9
 
10
-cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)
10
+cfgfile_6 = configure_file(
11
+	input: 'Config.vala.base',
12
+	output: 'Config.vala',
13
+	configuration: cfg_pamac_manager)
11 14
 
12 15
 pamac_manager_deps = [gtk_3_0_dep]
13 16
 pamac_manager_deps += [json_glib_1_0_dep]
@@ -42,6 +45,13 @@ endif
42 45
 pamac_manager_link_args = ['-rdynamic']
43 46
 pamac_manager_hfolders = ['../../src']
44 47
 
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)
48
+executable('pamac-manager',pamac_manager_sources,
49
+    dependencies: pamac_manager_deps,
50
+    vala_args: pamac_manager_vala_args,
51
+    c_args: pamac_manager_c_args,
52
+    link_args: pamac_manager_link_args,
53
+    link_with: pamac_manager_dependencies,
54
+    include_directories: include_directories(pamac_manager_hfolders),
55
+    install: true)
46 56
 
47 57
 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.7.0")
10
+set (VERSION "6.7.1")
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.7.0")
16
+set (VERSION "6.7.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

+ 13
- 3
src/pamac-system-daemon/meson.build View File

@@ -4,10 +4,13 @@ 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.7.0')
7
+cfg_pamac_system_daemon.set('VERSION', '6.7.1')
8 8
 cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())
9 9
 
10
-cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon)
10
+cfgfile_7 = configure_file(
11
+	input: 'Config.vala.base',
12
+	output: 'Config.vala',
13
+	configuration: cfg_pamac_system_daemon)
11 14
 
12 15
 pamac_system_daemon_deps = [gtk_3_0_dep]
13 16
 pamac_system_daemon_deps += [json_glib_1_0_dep]
@@ -46,5 +49,12 @@ endif
46 49
 pamac_system_daemon_link_args = ['-rdynamic']
47 50
 pamac_system_daemon_hfolders = ['../../src']
48 51
 
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)
52
+executable('pamac-system-daemon',pamac_system_daemon_sources,
53
+    dependencies: pamac_system_daemon_deps,
54
+    vala_args: pamac_system_daemon_vala_args,
55
+    c_args: pamac_system_daemon_c_args,
56
+    link_args: pamac_system_daemon_link_args,
57
+    link_with: pamac_system_daemon_dependencies,
58
+    include_directories: include_directories(pamac_system_daemon_hfolders),
59
+    install: true)
50 60
 

+ 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.7.0")
10
+set (VERSION "6.7.1")
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.7.0")
16
+set (VERSION "6.7.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,10 +4,13 @@ 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.7.0')
7
+cfg_pamac_tray.set('VERSION', '6.7.1')
8 8
 cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
9 9
 
10
-cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)
10
+cfgfile_3 = configure_file(
11
+	input: 'Config.vala.base',
12
+	output: 'Config.vala',
13
+	configuration: cfg_pamac_tray)
11 14
 
12 15
 pamac_tray_deps = [json_glib_1_0_dep]
13 16
 pamac_tray_deps += [libalpm_dep]
@@ -52,5 +55,12 @@ endif
52 55
 pamac_tray_link_args = ['-rdynamic']
53 56
 pamac_tray_hfolders = ['../../src']
54 57
 
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)
58
+executable('pamac-tray',pamac_tray_sources,
59
+    dependencies: pamac_tray_deps,
60
+    vala_args: pamac_tray_vala_args,
61
+    c_args: pamac_tray_c_args,
62
+    link_args: pamac_tray_link_args,
63
+    link_with: pamac_tray_dependencies,
64
+    include_directories: include_directories(pamac_tray_hfolders),
65
+    install: true)
56 66
 

+ 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.7.0")
10
+set (VERSION "6.7.1")
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.7.0")
16
+set (VERSION "6.7.1")
17 17
 add_definitions (${DEPS_CFLAGS})
18 18
 include_directories ( ${CMAKE_BINARY_DIR}/src )
19 19
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

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

@@ -4,10 +4,13 @@ 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.7.0')
7
+cfg_pamac_user_daemon.set('VERSION', '6.7.1')
8 8
 cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())
9 9
 
10
-cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon)
10
+cfgfile_2 = configure_file(
11
+	input: 'Config.vala.base',
12
+	output: 'Config.vala',
13
+	configuration: cfg_pamac_user_daemon)
11 14
 
12 15
 pamac_user_daemon_deps = [gtk_3_0_dep]
13 16
 pamac_user_daemon_deps += [json_glib_1_0_dep]
@@ -43,5 +46,12 @@ endif
43 46
 pamac_user_daemon_link_args = ['-rdynamic']
44 47
 pamac_user_daemon_hfolders = ['../../src']
45 48
 
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)
49
+executable('pamac-user-daemon',pamac_user_daemon_sources,
50
+    dependencies: pamac_user_daemon_deps,
51
+    vala_args: pamac_user_daemon_vala_args,
52
+    c_args: pamac_user_daemon_c_args,
53
+    link_args: pamac_user_daemon_link_args,
54
+    link_with: pamac_user_daemon_dependencies,
55
+    include_directories: include_directories(pamac_user_daemon_hfolders),
56
+    install: true)
47 57
 

+ 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.7.0
7
+Version: 6.7.1
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

+ 5
- 5
src/vapis/libalpm.vapi View File

@@ -38,9 +38,9 @@ namespace Alpm {
38 38
 	}
39 39
 	public int capabilities();
40 40
 
41
-	public unowned Package? find_satisfier(Alpm.List<Package> pkgs, string depstring);
41
+	public unowned Package? find_satisfier(Alpm.List<weak Package> pkgs, string depstring);
42 42
 
43
-	public unowned Package? pkg_find(Alpm.List<Package> haystack, string needle);
43
+	public unowned Package? pkg_find(Alpm.List<weak Package> haystack, string needle);
44 44
 
45 45
 	public int pkg_vercmp(string a, string b);
46 46
 
@@ -193,7 +193,7 @@ namespace Alpm {
193 193
 		public unowned DB localdb {
194 194
 				[CCode (cname = "alpm_get_localdb")] get;
195 195
 		}
196
-		public unowned Alpm.List<unowned DB> syncdbs {
196
+		public unowned Alpm.List<weak DB> syncdbs {
197 197
 				[CCode (cname = "alpm_get_syncdbs")] get;
198 198
 		}
199 199
 
@@ -380,7 +380,7 @@ namespace Alpm {
380 380
 
381 381
 		public unowned Package? get_pkg(string name);
382 382
 		public unowned Group? get_group(string name);
383
-		public Alpm.List<unowned Package> search(Alpm.List<string> needles);
383
+		public Alpm.List<weak Package> search(Alpm.List<weak string> needles);
384 384
 
385 385
 		public int check_pgp_signature(out SigList siglist);
386 386
 	}
@@ -550,7 +550,7 @@ namespace Alpm {
550 550
 		public Alpm.List<string> compute_optionalfor();
551 551
 
552 552
 		[CCode (cname = "alpm_sync_newversion")]
553
-		public unowned Package? sync_newversion(Alpm.List<DB> dbs);
553
+		public unowned Package? sync_newversion(Alpm.List<weak DB> dbs);
554 554
 
555 555
 		public int check_pgp_signature(out SigList siglist);
556 556
 	}

Loading…
Cancel
Save