update to work with newever versions of vala

CMakeLists.txt

@@ -55,9 +55,27 @@ set(MODULES_TO_CHECK ${MODULES_TO_CHECK} gobject-2.0)
 pkg_check_modules(DEPS REQUIRED ${MODULES_TO_CHECK})
 
 
-find_program ( WHERE_GRESOURCE glib-compile-resources )
-if ( NOT WHERE_GRESOURCE )
-	MESSAGE(FATAL_ERROR "Error! GLIB-COMPILE-RESOURCES is not installed.")
+find_program ( WHERE_glib_compile_resources glib-compile-resources )
+if ( NOT WHERE_glib_compile_resources )
+	MESSAGE(FATAL_ERROR "Error! external program 'glib-compile-resources' is not installed.")
+endif()
+
+find_program ( WHERE_gtk_update_icon_cache gtk-update-icon-cache )
+if ( NOT WHERE_gtk_update_icon_cache )
+	find_program ( WHERE_gtk_update_icon_cache gtk-update-icon-cache.3.0 )
+	if ( NOT WHERE_gtk_update_icon_cache )
+		MESSAGE(FATAL_ERROR "Error! none of the external programs 'gtk-update-icon-cache', 'gtk-update-icon-cache.3.0',  are installed.")
+	endif()
+endif()
+
+find_program ( WHERE_glib_compile_schemas glib-compile-schemas )
+if ( NOT WHERE_glib_compile_schemas )
+	MESSAGE(FATAL_ERROR "Error! external program 'glib-compile-schemas' is not installed.")
+endif()
+
+find_program ( WHERE_g_ir_compiler g-ir-compiler )
+if ( NOT WHERE_g_ir_compiler )
+	MESSAGE(FATAL_ERROR "Error! external program 'g-ir-compiler' is not installed.")
 endif()
 
 add_subdirectory(src/vapis)

meson.build

@@ -7,6 +7,10 @@ DISABLE_AUR = (get_option('DISABLE_AUR') != '')
 
 add_global_arguments('-DGETTEXT_PACKAGE="pamac"',language: 'c')
 
+find_program ('glib-compile-resources')
+find_program ('gtk-update-icon-cache', 'gtk-update-icon-cache.3.0')
+find_program ('glib-compile-schemas')
+find_program ('g-ir-compiler')
 gdk_3_0_dep = dependency('gdk-3.0')
 gtk_3_0_dep = dependency('gtk+-3.0')
 json_glib_1_0_dep = dependency('json-glib-1.0')
@@ -26,6 +30,7 @@ gobject_2_0_dep = dependency('gobject-2.0')
 subdir('po')
 cfg_dbus_data = configuration_data()
 cfg_dbus_data.set ('DBUS_PREFIX',get_option('prefix'))
+meson.add_install_script('meson_scripts/update_icon.sh')
 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'))
 
 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
 install_data(dbus_cfg_org_pamac_user_service,install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','services'))
 install_data( 'data/dbus/org.pamac.system.conf',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','system.d'))
 install_data('data/org.pamac.main.gschema.xml', install_dir: join_paths(get_option('prefix'),get_option('datadir'), 'glib-2.0', 'schemas'))
-meson.add_install_script('meson_scripts/install_schemas.py')
+meson.add_install_script('meson_scripts/install_schemas.sh')
 if not DISABLE_AUR
 	install_data('data/org.pamac.aur.gschema.xml', install_dir: join_paths(get_option('prefix'),get_option('datadir'), 'glib-2.0', 'schemas'))
-	meson.add_install_script('meson_scripts/install_schemas.py')
+	meson.add_install_script('meson_scripts/install_schemas.sh')
 endif
 install_data('data/icons/16x16/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/16x16/apps'))
 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'))

meson_scripts/install_data.sh

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

meson_scripts/install_library.sh

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

meson_scripts/install_schemas.py

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

meson_scripts/install_schemas.sh

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

meson_scripts/update_icon.sh

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

pamac.avprj

@@ -1,7 +1,7 @@
 ### AutoVala Project ###
-autovala_version: 28
+autovala_version: 30
 project_name: pamac
-project_version: 6.7.0
+project_version: 6.7.1
 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.7.0
+*version: 6.7.1
 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.7.0
+*version: 6.7.1
 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.7.0
+*version: 6.7.1
 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.7.0
+*version: 6.7.1
 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.7.0
+*version: 6.7.1
 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.7.0
+*version: 6.7.1
 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.7.0
+*version: 6.7.1
 namespace: pamacclassic
 use_gresource: pamac_transaction_gresource_xml
 vala_package: posix
@@ -223,6 +223,11 @@ end
 
 *pixmap: data/pixmaps/package-generic.png
 
+*build_external_program: glib-compile-resources
+*build_external_program: gtk-update-icon-cache gtk-update-icon-cache.3.0
+*build_external_program: glib-compile-schemas
+*build_external_program: g-ir-compiler
+
 *polkit: data/polkit/org.pamac.policy
 
 *mimetype: data/mime/x-alpm-package.xml

po/LINGUAS

@@ -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
+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

po/meson.build

@@ -1,2 +1,2 @@
 i18n = import('i18n')
-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'])
+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'])

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

src/CMakeLists.txt

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.7.0")
+set (VERSION "6.7.1")
 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.7.0")
+set (VERSION "6.7.1")
 add_definitions (${DEPS_CFLAGS})
 link_libraries ( ${DEPS_LIBRARIES} )
 link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -78,7 +78,7 @@ if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "Rel
 	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
 endif()
 
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic --gir pamacclassic-6.0.gir )
+set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic --gir pamacclassic-1.0.gir )
 set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction.gresource.xml )
 
 vala_precompile(VALA_C pamacclassic
@@ -101,10 +101,16 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
 target_link_libraries( pamacclassic m )
 set_target_properties( pamacclassic PROPERTIES
 VERSION
-	6.7.0
+	6.7.1
 SOVERSION
 	6 )
 
+add_custom_command (
+	TARGET pamacclassic
+	POST_BUILD
+	COMMAND g-ir-compiler --shared-library=libpamacclassic "${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.gir"  --output="${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.typelib"
+)
+
 
 install(TARGETS
 	pamacclassic
@@ -127,10 +133,15 @@ DESTINATION
 	${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/
 )
 install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-6.0.gir
+	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.gir
 DESTINATION
 	${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/
 )
+install(FILES
+	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.typelib
+DESTINATION
+	lib/girepository-1.0/
+)
 install(FILES
 	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc
 DESTINATION

src/Config.vala.base

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

src/meson.build

@@ -4,10 +4,13 @@ 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.7.0')
+cfg_pamac_classic.set('VERSION', '6.7.1')
 cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())
 
-cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic)
+cfgfile_1 = configure_file(
+	input: 'Config.vala.base',
+	output: 'Config.vala',
+	configuration: cfg_pamac_classic)
 
 pamac_classic_deps = [gdk_3_0_dep]
 pamac_classic_deps += [gtk_3_0_dep]
@@ -57,10 +60,16 @@ if DISABLE_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,link_args: pamac_classic_link_args,version: '6.7.0',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.1',
+    soversion: '6',
+    install: true,
+    install_dir: [true, true, true])
 
 pamac_classic_requires = []
 pamac_classic_requires += ['gdk-3.0']
@@ -75,12 +84,10 @@ pamac_classic_requires += ['glib-2.0']
 pamac_classic_requires += ['gobject-2.0']
 pkg_mod = import('pkgconfig')
 pkg_mod.generate(libraries : pamacclassic_library,
-	version : '6.7.0',
+	version : '6.7.1',
 	name : 'pamacclassic',
 	filebase : 'pamacclassic',
 	description : 'pamacclassic',
 	requires : pamac_classic_requires)
 
 install_data(join_paths(meson.current_source_dir(),'pamacclassic.deps'),install_dir: join_paths(get_option('prefix'),'share','vala','vapi'))
-meson.add_install_script(join_paths(meson.source_root(),'meson_scripts','install_library.sh'),'src','pamacclassic','pamacclassic-6.0.gir')
-

src/pamac-clean-cache/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.7.0")
+set (VERSION "6.7.1")
 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.7.0")
+set (VERSION "6.7.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

src/pamac-clean-cache/meson.build

@@ -4,10 +4,13 @@ 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.7.0')
+cfg_pamac_clean_cache.set('VERSION', '6.7.1')
 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)
+cfgfile_4 = configure_file(
+	input: 'Config.vala.base',
+	output: 'Config.vala',
+	configuration: cfg_pamac_clean_cache)
 
 pamac_clean_cache_deps = [gtk_3_0_dep]
 pamac_clean_cache_deps += [json_glib_1_0_dep]
@@ -39,5 +42,12 @@ 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_args: pamac_clean_cache_link_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)
 

src/pamac-install/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.7.0")
+set (VERSION "6.7.1")
 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.7.0")
+set (VERSION "6.7.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

src/pamac-install/meson.build

@@ -4,10 +4,13 @@ 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.7.0')
+cfg_pamac_install.set('VERSION', '6.7.1')
 cfg_pamac_install.set('TESTSRCDIR', meson.source_root())
 
-cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)
+cfgfile_5 = configure_file(
+	input: 'Config.vala.base',
+	output: 'Config.vala',
+	configuration: cfg_pamac_install)
 
 pamac_install_deps = [gtk_3_0_dep]
 pamac_install_deps += [json_glib_1_0_dep]
@@ -41,5 +44,12 @@ 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_args: pamac_install_link_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)
 

src/pamac-manager/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.7.0")
+set (VERSION "6.7.1")
 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.7.0")
+set (VERSION "6.7.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

src/pamac-manager/meson.build

@@ -4,10 +4,13 @@ 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.7.0')
+cfg_pamac_manager.set('VERSION', '6.7.1')
 cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())
 
-cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)
+cfgfile_6 = configure_file(
+	input: 'Config.vala.base',
+	output: 'Config.vala',
+	configuration: cfg_pamac_manager)
 
 pamac_manager_deps = [gtk_3_0_dep]
 pamac_manager_deps += [json_glib_1_0_dep]
@@ -42,6 +45,13 @@ 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_args: pamac_manager_link_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')

src/pamac-system-daemon/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.7.0")
+set (VERSION "6.7.1")
 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.7.0")
+set (VERSION "6.7.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

src/pamac-system-daemon/meson.build

@@ -4,10 +4,13 @@ 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.7.0')
+cfg_pamac_system_daemon.set('VERSION', '6.7.1')
 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)
+cfgfile_7 = configure_file(
+	input: 'Config.vala.base',
+	output: 'Config.vala',
+	configuration: cfg_pamac_system_daemon)
 
 pamac_system_daemon_deps = [gtk_3_0_dep]
 pamac_system_daemon_deps += [json_glib_1_0_dep]
@@ -46,5 +49,12 @@ 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_args: pamac_system_daemon_link_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)
 

src/pamac-tray/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.7.0")
+set (VERSION "6.7.1")
 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.7.0")
+set (VERSION "6.7.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

src/pamac-tray/meson.build

@@ -4,10 +4,13 @@ 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.7.0')
+cfg_pamac_tray.set('VERSION', '6.7.1')
 cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
 
-cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)
+cfgfile_3 = configure_file(
+	input: 'Config.vala.base',
+	output: 'Config.vala',
+	configuration: cfg_pamac_tray)
 
 pamac_tray_deps = [json_glib_1_0_dep]
 pamac_tray_deps += [libalpm_dep]
@@ -52,5 +55,12 @@ 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_args: pamac_tray_link_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)
 

src/pamac-user-daemon/CMakeLists.txt

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
 set (RELEASE_NAME "pamac")
 set (CMAKE_C_FLAGS "")
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.7.0")
+set (VERSION "6.7.1")
 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.7.0")
+set (VERSION "6.7.1")
 add_definitions (${DEPS_CFLAGS})
 include_directories ( ${CMAKE_BINARY_DIR}/src )
 link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )

src/pamac-user-daemon/meson.build

@@ -4,10 +4,13 @@ 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.7.0')
+cfg_pamac_user_daemon.set('VERSION', '6.7.1')
 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)
+cfgfile_2 = configure_file(
+	input: 'Config.vala.base',
+	output: 'Config.vala',
+	configuration: cfg_pamac_user_daemon)
 
 pamac_user_daemon_deps = [gtk_3_0_dep]
 pamac_user_daemon_deps += [json_glib_1_0_dep]
@@ -43,5 +46,12 @@ 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_args: pamac_user_daemon_link_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)
 

src/pamacclassic.pc

@@ -4,7 +4,7 @@ includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}
 
 Name: pamacclassic
 Description: pamacclassic
-Version: 6.7.0
+Version: 6.7.1
 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

src/vapis/libalpm.vapi

@@ -38,9 +38,9 @@ namespace Alpm {
 	}
 	public int capabilities();
 
-	public unowned Package? find_satisfier(Alpm.List<Package> pkgs, string depstring);
+	public unowned Package? find_satisfier(Alpm.List<weak Package> pkgs, string depstring);
 
-	public unowned Package? pkg_find(Alpm.List<Package> haystack, string needle);
+	public unowned Package? pkg_find(Alpm.List<weak Package> haystack, string needle);
 
 	public int pkg_vercmp(string a, string b);
 
@@ -193,7 +193,7 @@ namespace Alpm {
 		public unowned DB localdb {
 				[CCode (cname = "alpm_get_localdb")] get;
 		}
-		public unowned Alpm.List<unowned DB> syncdbs {
+		public unowned Alpm.List<weak DB> syncdbs {
 				[CCode (cname = "alpm_get_syncdbs")] get;
 		}
 
@@ -380,7 +380,7 @@ namespace Alpm {
 
 		public unowned Package? get_pkg(string name);
 		public unowned Group? get_group(string name);
-		public Alpm.List<unowned Package> search(Alpm.List<string> needles);
+		public Alpm.List<weak Package> search(Alpm.List<weak string> needles);
 
 		public int check_pgp_signature(out SigList siglist);
 	}
@@ -550,7 +550,7 @@ namespace Alpm {
 		public Alpm.List<string> compute_optionalfor();
 
 		[CCode (cname = "alpm_sync_newversion")]
-		public unowned Package? sync_newversion(Alpm.List<DB> dbs);
+		public unowned Package? sync_newversion(Alpm.List<weak DB> dbs);
 
 		public int check_pgp_signature(out SigList siglist);
 	}