Fix build with new version of vala

new version
fix tray
2019-09-17 19:18:57 -03:00 · 2019-07-19 08:44:16 -04:00 · 2019-07-19 08:42:19 -04:00 · 2019-07-19 08:32:30 -04:00 · 2019-07-06 20:28:51 -04:00 · 2019-07-06 15:27:51 -04:00
84 changed files with 799 additions and 3051 deletions
--- a/.configure-custom.sh
+++ b/.configure-custom.sh
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-ENABLE_VARS="kde-tray|ON|KDE_TRAY update-desktop|ON|ENABLE_UPDATE_ICON hamburger|ON|ENABLE_HAMBURGER"
-ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray"
-ENABLE_ENABLE_UPDATE_ICON_DOC="install the update desktop entry"
-ENABLE_ENABLE_HAMBURGER_DOC="build with the classic hamburger menu"
-DISABLE_VARS="aur|ON|DISABLE_AUR icon-update|OFF|ICON_UPDATE"
-DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac"
-DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing"
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+build
 po/*.mo
 po/*~
 po/locale
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,82 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-project (pamac)
-cmake_minimum_required (VERSION 2.6)
-cmake_policy (VERSION 2.8)
-list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-enable_testing ()
-option(ICON_UPDATE "Update the icon cache after installing" ON)
-option(BUILD_VALADOC "Build API documentation if Valadoc is available" OFF)
-option(ENABLE_UPDATE_ICON "ENABLE_UPDATE_ICON" OFF)
-option(ENABLE_HAMBURGER "ENABLE_HAMBURGER" OFF)
-option(KDE_TRAY "KDE_TRAY" OFF)
-option(DISABLE_AUR "DISABLE_AUR" OFF)
-
-if( NOT CMAKE_BUILD_TYPE )
-	set(CMAKE_BUILD_TYPE Release)
-endif()
-
-include(GNUInstallDirs)
-if( ( ${CMAKE_INSTALL_PREFIX} MATCHES "^/usr/local" ) )
-	# A workaround to ensure that works 'out of the box' in Debian-based systems
-	set(CMAKE_INSTALL_LIBDIR lib)
-endif()
-
-set(HAVE_VALADOC OFF)
-if(BUILD_VALADOC)
-	find_package(Valadoc)
-	if(VALADOC_FOUND)
-		set(HAVE_VALADOC ON)
-		include(Valadoc)
-	else()
-		message("Valadoc not found, will not build documentation")
-	endif()
-endif()
-
-find_package(PkgConfig)
-
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} gdk-3.0)
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} gtk+-3.0)
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} json-glib-1.0)
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} libalpm)
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} libcurl)
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} libnotify)
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} libsoup-2.4)
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} polkit-gobject-1)
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} vte-2.91)
-if (KDE_TRAY)
-	set(MODULES_TO_CHECK ${MODULES_TO_CHECK} appindicator3-0.1)
-endif ()
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} gio-2.0)
-set(MODULES_TO_CHECK ${MODULES_TO_CHECK} glib-2.0)
-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.")
-endif()
-
-add_subdirectory(src/vapis)
-add_subdirectory(po)
-add_subdirectory(data/pixmaps)
-add_subdirectory(data/mime)
-add_subdirectory(data/polkit)
-add_subdirectory(data/systemd)
-add_subdirectory(data)
-add_subdirectory(data/dbus)
-add_subdirectory(data/icons/24x24/status)
-add_subdirectory(data/icons/16x16/apps)
-add_subdirectory(data/icons/32x32/apps)
-add_subdirectory(data/interface)
-add_subdirectory(src)
-add_subdirectory(src/pamac-user-daemon)
-add_subdirectory(src/pamac-tray)
-add_subdirectory(src/pamac-clean-cache)
-add_subdirectory(src/pamac-install)
-add_subdirectory(src/pamac-manager)
-add_subdirectory(src/pamac-system-daemon)
-
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,6 +12,5 @@ popd
 autovala refresh
 # Remove unused folders and files made by autovala
 rm -rf ./{install,packages,doc} ./data/{local,bash_completion} ./.hgignore ./.bzrignore
-# Generate the cmake and meson build files
-autovala cmake
+# Generate the meson build files
 autovala meson
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -1,17 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/)
-	install(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/
-	DESTINATION
-		share/autovala/cmake
-	)
-ELSE()
-	install(FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/
-	DESTINATION
-		share/autovala/cmake
-	)
-ENDIF()
-
--- a/cmake/FindVala.cmake
+++ b/cmake/FindVala.cmake
@@ -1,80 +0,0 @@
-##
-# Copyright 2009-2010 Jakob Westhoff, 2014 Raster Software Vigo
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#    1. Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-# 
-#    2. Redistributions in binary form must reproduce the above copyright notice,
-#       this list of conditions and the following disclaimer in the documentation
-#       and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies,
-# either expressed or implied, of Jakob Westhoff
-##
-
-##
-# Find module for the Vala compiler (valac)
-#
-# This module determines wheter a Vala compiler is installed on the current
-# system and where its executable is.
-#
-# Call the module using "find_package(Vala) from within your CMakeLists.txt.
-#
-# The following variables will be set after an invocation:
-#
-#  VALA_FOUND       Whether the vala compiler has been found or not
-#  VALA_EXECUTABLE  Full path to the valac executable if it has been found
-#  VALA_VERSION     Version number of the available valac
-##
-
-
-# Search for the valac executable in the usual system paths.
-find_program(VALA_EXECUTABLE NAMES valac)
-
-if (VALA_EXECUTABLE STREQUAL "VALA_EXECUTABLE-NOTFOUND")
-
-# if valac executable is not found, it can be that valac is not installed, or
-# that the OS is source-based (like gentoo), and doesn't do a link from
-# valac-X.YY to valac. In that case, search for the specific valac binary after
-
-	if (NOT VALA_DEFERRING_COMPILER_SEARCH)
-		message (STATUS "VALAC not found. Deferring compiler search")
-	endif(NOT VALA_DEFERRING_COMPILER_SEARCH)
-	set(VALA_DEFERRING_COMPILER_SEARCH TRUE)
-	unset(VALA_EXECUTABLE)
-	unset(VALA_VERSION)
-
-else(VALA_EXECUTABLE STREQUAL "VALA_EXECUTABLE-NOTFOUND")
-
-# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
-# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
-# VALA_EXECUTABLE is set)
-
-	include(FindPackageHandleStandardArgs)
-	find_package_handle_standard_args(Vala DEFAULT_MSG VALA_EXECUTABLE)
-
-	mark_as_advanced(VALA_EXECUTABLE)
-
-# Determine the valac version
-	if(VALA_FOUND)
-	    execute_process(COMMAND ${VALA_EXECUTABLE} "--version" OUTPUT_VARIABLE "VALA_VERSION")
-	    string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
-	    string(STRIP ${VALA_VERSION} "VALA_VERSION")
-	endif(VALA_FOUND)
-endif(VALA_EXECUTABLE STREQUAL "VALA_EXECUTABLE-NOTFOUND")
--- a/cmake/FindValadoc.cmake
+++ b/cmake/FindValadoc.cmake
@@ -1,20 +0,0 @@
-
-# Search for the valadocc executable in the usual system paths.
-find_program(VALADOC_EXECUTABLE NAMES valadoc)
-
-# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
-# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
-# VALA_EXECUTABLE is set)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Valadoc DEFAULT_MSG VALADOC_EXECUTABLE)
-
-mark_as_advanced(VALADOC_EXECUTABLE)
-
-# Determine the valac version
-if(VALA_FOUND)
-    execute_process(COMMAND ${VALA_EXECUTABLE} "--version" 
-                    OUTPUT_VARIABLE "VALA_VERSION")
-    string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
-    string(STRIP ${VALA_VERSION} "VALA_VERSION")
-endif(VALA_FOUND)
--- a/cmake/GObjectIntrospectionMacros.cmake
+++ b/cmake/GObjectIntrospectionMacros.cmake
@@ -1,34 +0,0 @@
-macro(add_target_gir TARGET_NAME GIR_NAME HEADER CFLAGS GRANITE_VERSION)
-    set(PACKAGES "")
-    foreach(PKG ${ARGN})
-        set(PACKAGES ${PACKAGES} --include=${PKG})
-    endforeach()
-    install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\")
-    execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME}
-            --quiet
-            --library ${TARGET_NAME} ${PACKAGES}
-            -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir
-            -L${CMAKE_CURRENT_BINARY_DIR}
-            --nsversion=${GRANITE_VERSION} ${HEADER})")
-    install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)")
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/)
-endmacro()
-
-macro(add_target_gir_with_executable TARGET_NAME EXE_NAME GIR_NAME HEADER EXE_HEADER CFLAGS GRANITE_VERSION)
-    set(PACKAGES "")
-    foreach(PKG ${ARGN})
-        set(PACKAGES ${PACKAGES} --include=${PKG})
-    endforeach()
-    install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\")
-    execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME}
-            --quiet
-            --library ${TARGET_NAME} --program ${EXE_NAME} ${PACKAGES}
-            -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir
-            -L${CMAKE_CURRENT_BINARY_DIR}
-            -I${CMAKE_CURRENT_BINARY_DIR}
-            --nsversion=${GRANITE_VERSION} ${HEADER} ${EXE_HEADER})")
-    install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)")
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/)
-endmacro()
--- a/cmake/GSettings.cmake
+++ b/cmake/GSettings.cmake
@@ -1,42 +0,0 @@
-# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
-
-option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ON)
-
-option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
-
-if(GSETTINGS_LOCALINSTALL)
-    message(STATUS "GSettings schemas will be installed locally.")
-endif()
-
-if(GSETTINGS_COMPILE)
-    message(STATUS "GSettings shemas will be compiled.")
-endif()
-
-macro(add_schema SCHEMA_NAME)
-
-    set(PKG_CONFIG_EXECUTABLE pkg-config)
-    # Have an option to not install the schema into where GLib is
-    if (GSETTINGS_LOCALINSTALL)
-        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
-    else (GSETTINGS_LOCALINSTALL)
-        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
-        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
-    endif (GSETTINGS_LOCALINSTALL)
-
-    # Run the validator and error if it fails
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if (_schemas_invalid)
-      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
-    endif (_schemas_invalid)
-
-    # Actually install and recomple schemas
-    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
-
-    if (GSETTINGS_COMPILE)
-        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
-    endif ()
-endmacro()
--- a/cmake/Makefile
+++ b/cmake/Makefile
@@ -1,286 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-# Remove some rules from gmake that .SUFFIXES does not remove.
-SUFFIXES =
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/mefrio/Scrivania/cmake
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/mefrio/Scrivania/cmake/cmake
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
-	/usr/bin/cmake -i .
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
-# Special rule for the target install
-install: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/bin/cmake -P cmake_install.cmake
-.PHONY : install
-
-# Special rule for the target install
-install/fast: preinstall/fast
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/bin/cmake -P cmake_install.cmake
-.PHONY : install/fast
-
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
-
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
-
-# Special rule for the target install/strip
-install/strip: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
-	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
-.PHONY : install/strip
-
-# Special rule for the target install/strip
-install/strip/fast: install/strip
-.PHONY : install/strip/fast
-
-# Special rule for the target list_install_components
-list_install_components:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
-.PHONY : list_install_components
-
-# Special rule for the target list_install_components
-list_install_components/fast: list_install_components
-.PHONY : list_install_components/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# The main all target
-all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/mefrio/Scrivania/cmake/cmake/CMakeFiles /home/mefrio/Scrivania/cmake/cmake/CMakeFiles/progress.marks
-	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/mefrio/Scrivania/cmake/cmake/CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
-	$(MAKE) -f CMakeFiles/Makefile2 clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-.PHONY : depend
-
-#=============================================================================
-# Target rules for targets named scratch
-
-# Build rule for target.
-scratch: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 scratch
-.PHONY : scratch
-
-# fast build rule for target.
-scratch/fast:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/build
-.PHONY : scratch/fast
-
-src/entry.o: src/entry.c.o
-.PHONY : src/entry.o
-
-# target to build an object file
-src/entry.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.o
-.PHONY : src/entry.c.o
-
-src/entry.i: src/entry.c.i
-.PHONY : src/entry.i
-
-# target to preprocess a source file
-src/entry.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.i
-.PHONY : src/entry.c.i
-
-src/entry.s: src/entry.c.s
-.PHONY : src/entry.s
-
-# target to generate assembly for a file
-src/entry.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.s
-.PHONY : src/entry.c.s
-
-src/main_window.o: src/main_window.c.o
-.PHONY : src/main_window.o
-
-# target to build an object file
-src/main_window.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.o
-.PHONY : src/main_window.c.o
-
-src/main_window.i: src/main_window.c.i
-.PHONY : src/main_window.i
-
-# target to preprocess a source file
-src/main_window.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.i
-.PHONY : src/main_window.c.i
-
-src/main_window.s: src/main_window.c.s
-.PHONY : src/main_window.s
-
-# target to generate assembly for a file
-src/main_window.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.s
-.PHONY : src/main_window.c.s
-
-src/menu.o: src/menu.c.o
-.PHONY : src/menu.o
-
-# target to build an object file
-src/menu.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.o
-.PHONY : src/menu.c.o
-
-src/menu.i: src/menu.c.i
-.PHONY : src/menu.i
-
-# target to preprocess a source file
-src/menu.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.i
-.PHONY : src/menu.c.i
-
-src/menu.s: src/menu.c.s
-.PHONY : src/menu.s
-
-# target to generate assembly for a file
-src/menu.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.s
-.PHONY : src/menu.c.s
-
-src/notebook.o: src/notebook.c.o
-.PHONY : src/notebook.o
-
-# target to build an object file
-src/notebook.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.o
-.PHONY : src/notebook.c.o
-
-src/notebook.i: src/notebook.c.i
-.PHONY : src/notebook.i
-
-# target to preprocess a source file
-src/notebook.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.i
-.PHONY : src/notebook.c.i
-
-src/notebook.s: src/notebook.c.s
-.PHONY : src/notebook.s
-
-# target to generate assembly for a file
-src/notebook.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.s
-.PHONY : src/notebook.c.s
-
-# Help Target
-help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... edit_cache"
-	@echo "... install"
-	@echo "... install/local"
-	@echo "... install/strip"
-	@echo "... list_install_components"
-	@echo "... rebuild_cache"
-	@echo "... scratch"
-	@echo "... src/entry.o"
-	@echo "... src/entry.i"
-	@echo "... src/entry.s"
-	@echo "... src/main_window.o"
-	@echo "... src/main_window.i"
-	@echo "... src/main_window.s"
-	@echo "... src/menu.o"
-	@echo "... src/menu.i"
-	@echo "... src/menu.s"
-	@echo "... src/notebook.o"
-	@echo "... src/notebook.i"
-	@echo "... src/notebook.s"
-.PHONY : help
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-
--- a/cmake/ParseArguments.cmake
+++ b/cmake/ParseArguments.cmake
@@ -1,36 +0,0 @@
-##
-# This is a helper Macro to parse optional arguments in Macros/Functions
-# It has been taken from the public CMake wiki.  
-# See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and
-# licensing.
-##
-macro(parse_arguments prefix arg_names option_names)
-  set(DEFAULT_ARGS)
-  foreach(arg_name ${arg_names})
-    set(${prefix}_${arg_name})
-  endforeach(arg_name)
-  foreach(option ${option_names})
-    set(${prefix}_${option} FALSE)
-  endforeach(option)
-
-  set(current_arg_name DEFAULT_ARGS)
-  set(current_arg_list)
-  foreach(arg ${ARGN})
-    set(larg_names ${arg_names})
-    list(FIND larg_names "${arg}" is_arg_name)
-    if(is_arg_name GREATER -1)
-      set(${prefix}_${current_arg_name} ${current_arg_list})
-      set(current_arg_name ${arg})
-      set(current_arg_list)
-    else(is_arg_name GREATER -1)
-      set(loption_names ${option_names})
-      list(FIND loption_names "${arg}" is_option)
-      if(is_option GREATER -1)
-	    set(${prefix}_${arg} TRUE)
-      else(is_option GREATER -1)
-	    set(current_arg_list ${current_arg_list} ${arg})
-      endif(is_option GREATER -1)
-    endif(is_arg_name GREATER -1)
-  endforeach(arg)
-  set(${prefix}_${current_arg_name} ${current_arg_list})
-endmacro(parse_arguments)
--- a/cmake/README
+++ b/cmake/README
@@ -1,10 +0,0 @@
-        Elementary CMake modules
-
-This is a set of CMake modules: Translations, GSettings, and Vala modules.
-
-For all the Vala related modules see README.Vala.rst: 
-    - ParseArguments.cmake
-    - ValaPrecompile.cmake
-    - ValaVersion.cmake
-    - FindVala.cmake
-
--- a/cmake/README.Vala.rst
+++ b/cmake/README.Vala.rst
@@ -1,173 +0,0 @@
-==========
-Vala CMake
-==========
-:Author: 
-    Jakob Westhoff
-:Version:
-    Draft
-
-
-Overview
-========
-
-Vala CMake is a collection of macros for the CMake_ build system to allow the
-creation and management of projects developed using the Vala_ programming
-language or its "Genie" flavor (less tested).
-
-
-Installation
-============
-
-To use the Vala macros in your own project you need to copy the macro files to
-an arbitrary folder in your projects directory and reference them in your
-``CMakeLists.txt`` file.
-
-Assuming the macros are stored under ``cmake/vala`` in your projects folder you
-need to add the following information to your base ``CMakeLists.txt``::
-
-    list(APPEND CMAKE_MODULE_PATH 
-        ${CMAKE_SOURCE_DIR}/cmake/vala
-    )
-
-After the new module path as been added you can simply include the provided
-modules or use the provided find routines.
-
-
-Finding Vala
-============
-
-The find module for vala works like any other Find module in CMake.
-You can use it by simply calling the usual ``find_package`` function. Default
-parameters like ``REQUIRED`` and ``QUIETLY`` are supported.
-
-::
-
-    find_package(Vala REQUIRED)
-
-After a successful call to the find_package function the following variables 
-will be set:
-
-VALA_FOUND
-    Whether the vala compiler has been found or not
-
-VALA_EXECUTABLE
-    Full path to the valac executable if it has been found
-
-VALA_VERSION
-    Version number of the available valac
-
-
-Precompiling Vala sources
-=========================
-
-CMake is mainly supposed to handle c or c++ based projects. Luckily every vala
-program is translated into plain c code using the vala compiler, followed by
-normal compilation of the generated c program using gcc.
-
-The macro ``vala_precompile`` uses that fact to create c files from your .vala
-sources for further CMake processing. 
-
-The first parameter provided is a variable, which will be filled with a list of
-c files outputted by the vala compiler. This list can than be used in
-conjunction with functions like ``add_executable`` or others to create the
-necessary compile rules with CMake.
-
-The initial variable is followed by a list of .vala files to be compiled.
-Please take care to add every vala file belonging to the currently compiled
-project or library as Vala will otherwise not be able to resolve all
-dependencies.
-
-The following sections may be specified afterwards to provide certain options
-to the vala compiler:
-
-PACKAGES  
-    A list of vala packages/libraries to be used during the compile cycle. The
-    package names are exactly the same, as they would be passed to the valac
-    "--pkg=" option.
-
-OPTIONS
-    A list of optional options to be passed to the valac executable. This can be
-    used to pass "--thread" for example to enable multi-threading support.
-
-DIRECTORY
-    Specify the directory where the output source files will be stored. If 
-    ommitted, the source files will be stored in CMAKE_CURRENT_BINARY_DIR.
-
-CUSTOM_VAPIS
-    A list of custom vapi files to be included for compilation. This can be
-    useful to include freshly created vala libraries without having to install
-    them in the system.
-
-GENERATE_VAPI
-    Pass all the needed flags to the compiler to create an internal vapi for
-    the compiled library. The provided name will be used for this and a
-    <provided_name>.vapi file will be created.
-
-GENERATE_HEADER
-    Let the compiler generate a header file for the compiled code. There will
-    be a header file as well as an internal header file being generated called
-    <provided_name>.h and <provided_name>_internal.h
-
-The following call is a simple example to the vala_precompile macro showing an
-example to every of the optional sections::
-
-    vala_precompile(VALA_C
-        source1.vala
-        source2.vala
-        source3.vala
-    PACKAGES
-        gtk+-2.0
-        gio-1.0
-        posix
-    OPTIONS
-        --thread
-    CUSTOM_VAPIS
-        some_vapi.vapi
-    GENERATE_VAPI
-        myvapi
-    GENERATE_HEADER
-        myheader
-    )
-
-Most important is the variable VALA_C which will contain all the generated c
-file names after the call. The easiest way to use this information is to tell
-CMake to create an executable out of it.
-
-::
-
-    add_executable(myexecutable ${VALA_C})
-
-
-Further reading
-===============
-
-The `Pdf Presenter Console`__ , which is a vala based project of mine, makes
-heavy usage of the here described macros.  To look at a real world example of
-these macros the mentioned project is the right place to take a look. The svn
-trunk of it can be found at::
-
-	svn://pureenergy.cc/pdf_presenter_console/trunk
-
-
-__ http://westhoffswelt.de/projects/pdf_presenter_console.html
-
-
-Acknowledgments
-===============
-
-Thanks go out to Florian Sowade, a fellow local PHP-Usergroupie, who helped me
-a lot with the initial version of this macros and always answered my mostly
-dumb CMake questions.
-
-.. _CMake: http://cmake.org
-.. _Vala: http://live.gnome.org/Vala
-.. _Genie: http://live.gnome.org/Genie
-
-
-
-..
-   Local Variables:
-   mode: rst
-   fill-column: 79
-   End: 
-   vim: et syn=rst tw=79
--- a/cmake/Tests.cmake
+++ b/cmake/Tests.cmake
@@ -1,5 +0,0 @@
-# Test macros for Marlin, feel free to re-use them.
-
-macro(add_test_executable EXE_NAME)
-    add_test(${EXE_NAME} gtester ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME})
-endmacro()
--- a/cmake/Translations.cmake
+++ b/cmake/Translations.cmake
@@ -1,66 +0,0 @@
-# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
-
-macro(add_translations_directory NLS_PACKAGE)
-    add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
-    find_program (MSGFMT_EXECUTABLE msgfmt)
-    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
-    foreach (PO_INPUT ${PO_FILES})
-        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
-        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
-        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
-
-        install (FILES ${MO_OUTPUT} DESTINATION
-            share/locale/${PO_INPUT_BASE}/LC_MESSAGES
-            RENAME ${NLS_PACKAGE}.mo)
-    endforeach (PO_INPUT ${PO_FILES})
-endmacro(add_translations_directory)
-
-
-macro(add_translations_catalog NLS_PACKAGE)
-    add_custom_target (pot COMMENT “Building translation catalog.”)
-    find_program (XGETTEXT_EXECUTABLE xgettext)
-
-    set(C_SOURCE "")
-    set(VALA_SOURCE "")
-    set(GLADE_SOURCE "")
-
-    foreach(FILES_INPUT ${ARGN})
-        set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
-
-        file (GLOB_RECURSE SOURCE_FILES ${BASE_DIRECTORY}/*.c)
-        foreach(C_FILE ${SOURCE_FILES})
-            set(C_SOURCE ${C_SOURCE} ${C_FILE})
-        endforeach()
-
-        file (GLOB_RECURSE SOURCE_FILES ${BASE_DIRECTORY}/*.vala)
-        foreach(VALA_C_FILE ${SOURCE_FILES})
-            set(VALA_SOURCE ${VALA_SOURCE} ${VALA_C_FILE})
-        endforeach()
-
-        file (GLOB_RECURSE SOURCE_FILES ${BASE_DIRECTORY}/*.ui)
-        foreach(GLADE_C_FILE ${SOURCE_FILES})
-            set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_C_FILE})
-        endforeach()
-    endforeach()
-
-    set(BASE_XGETTEXT_COMMAND
-        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE}
-        -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        --keyword="_" --keyword="N_" --from-code=UTF-8)
-
-   set(CONTINUE_FLAG "")
-
-    IF(NOT "${C_SOURCE}" STREQUAL "")
-        add_custom_command(TARGET pot COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE})
-        set(CONTINUE_FLAG "-j")
-    ENDIF()
-
-    IF(NOT "${VALA_SOURCE}" STREQUAL "")
-        add_custom_command(TARGET pot COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LC\# ${VALA_SOURCE})
-        set(CONTINUE_FLAG "-j")
-    ENDIF()
-
-    IF(NOT "${GLADE_SOURCE}" STREQUAL "")
-        add_custom_command (TARGET pot COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE})
-    ENDIF()  
-endmacro()
--- a/cmake/ValaPrecompile.cmake
+++ b/cmake/ValaPrecompile.cmake
@@ -1,243 +0,0 @@
-##
-# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
-# Copyright 2012 elementary.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#    1. Redistributions of source code must retain the above copyright notice,
-#       this list of conditions and the following disclaimer.
-#
-#    2. Redistributions in binary form must reproduce the above copyright notice,
-#       this list of conditions and the following disclaimer in the documentation
-#       and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies,
-# either expressed or implied, of Jakob Westhoff
-##
-
-include(ParseArguments)
-find_package(Vala REQUIRED)
-
-##
-# Compile vala files to their c equivalents for further processing.
-#
-# The "vala_precompile" macro takes care of calling the valac executable on the
-# given source to produce c files which can then be processed further using
-# default cmake functions.
-#
-# The first parameter provided is a variable, which will be filled with a list
-# of c files outputted by the vala compiler. This list can than be used in
-# conjuction with functions like "add_executable" or others to create the
-# neccessary compile rules with CMake.
-#
-# The initial variable is followed by a list of .vala files to be compiled.
-# Please take care to add every vala file belonging to the currently compiled
-# project or library as Vala will otherwise not be able to resolve all
-# dependencies.
-#
-# The following sections may be specified afterwards to provide certain options
-# to the vala compiler:
-#
-# PACKAGES
-#   A list of vala packages/libraries to be used during the compile cycle. The
-#   package names are exactly the same, as they would be passed to the valac
-#   "--pkg=" option.
-#
-# OPTIONS
-#   A list of optional options to be passed to the valac executable. This can be
-#   used to pass "--thread" for example to enable multi-threading support.
-#
-# CUSTOM_VAPIS
-#   A list of custom vapi files to be included for compilation. This can be
-#   useful to include freshly created vala libraries without having to install
-#   them in the system.
-#
-# GENERATE_VAPI
-#   Pass all the needed flags to the compiler to create an internal vapi for
-#   the compiled library. The provided name will be used for this and a
-#   <provided_name>.vapi file will be created.
-#
-# GENERATE_HEADER
-#   Let the compiler generate a header file for the compiled code. There will
-#   be a header file as well as an internal header file being generated called
-#   <provided_name>.h and <provided_name>_internal.h
-#
-# GENERATE_GIR
-#   Have the compiler generate a GObject-Introspection repository file with
-#   name: <provided_name>.gir. This can be later used to create a binary typelib
-#   using the GI compiler.
-#
-# GENERATE_SYMBOLS
-#   Output a <provided_name>.symbols file containing all the exported symbols.
-#
-# The following call is a simple example to the vala_precompile macro showing
-# an example to every of the optional sections:
-#
-#   vala_precompile(VALA_C mytargetname
-#       source1.vala
-#       source2.vala
-#       source3.vala
-#   PACKAGES
-#       gtk+-2.0
-#       gio-1.0
-#       posix
-#   DIRECTORY
-#       gen
-#   OPTIONS
-#       --thread
-#   CUSTOM_VAPIS
-#       some_vapi.vapi
-#   GENERATE_VAPI
-#       myvapi
-#   GENERATE_HEADER
-#       myheader
-#   GENERATE_GIR
-#       mygir
-#   GENERATE_SYMBOLS
-#       mysymbols
-#   )
-#
-# Most important is the variable VALA_C which will contain all the generated c
-# file names after the call.
-##
-
-macro(vala_precompile output target_name)
-    parse_arguments(ARGS "TARGET;PACKAGES;OPTIONS;DIRECTORY;GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
-
-    if(ARGS_DIRECTORY)
-        set(DIRECTORY ${ARGS_DIRECTORY})
-    else(ARGS_DIRECTORY)
-        set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-    endif(ARGS_DIRECTORY)
-    include_directories(${DIRECTORY})
-    set(vala_pkg_opts "")
-    foreach(pkg ${ARGS_PACKAGES})
-        list(APPEND vala_pkg_opts "--pkg=${pkg}")
-    endforeach(pkg ${ARGS_PACKAGES})
-    set(in_files "")
-    set(out_files "")
-    set(out_files_display "")
-    set(${output} "")
-
-    foreach(src ${ARGS_DEFAULT_ARGS})
-        string(REGEX MATCH "^([a-zA-Z]:)?/" IS_MATCHED ${src})
-        if(${IS_MATCHED} MATCHES "/")
-            set(src_file_path ${src})
-        else()
-            set(src_file_path ${CMAKE_CURRENT_SOURCE_DIR}/${src})
-        endif()
-        list(APPEND in_files ${src_file_path})
-        string(REPLACE ".vala" ".c" src ${src})
-        string(REPLACE ".gs" ".c" src ${src})
-        if(${IS_MATCHED} MATCHES "/")
-            get_filename_component(VALA_FILE_NAME ${src} NAME)
-            set(out_file "${DIRECTORY}/${VALA_FILE_NAME}")
-            list(APPEND out_files "${DIRECTORY}/${VALA_FILE_NAME}")
-        else()
-            set(out_file "${DIRECTORY}/${src}")
-            list(APPEND out_files "${DIRECTORY}/${src}")
-        endif()
-        list(APPEND ${output} ${out_file})
-        list(APPEND out_files_display "${src}")
-    endforeach(src ${ARGS_DEFAULT_ARGS})
-
-    set(custom_vapi_arguments "")
-    if(ARGS_CUSTOM_VAPIS)
-        foreach(vapi ${ARGS_CUSTOM_VAPIS})
-            if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
-                list(APPEND custom_vapi_arguments ${vapi})
-            else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
-                list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
-            endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
-        endforeach(vapi ${ARGS_CUSTOM_VAPIS})
-    endif(ARGS_CUSTOM_VAPIS)
-
-    set(vapi_arguments "")
-    if(ARGS_GENERATE_VAPI)
-        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi")
-        list(APPEND out_files_display "${ARGS_GENERATE_VAPI}.vapi")
-        set(vapi_arguments "--library=${ARGS_GENERATE_VAPI}" "--vapi=${ARGS_GENERATE_VAPI}.vapi")
-
-        # Header and internal header is needed to generate internal vapi
-        if (NOT ARGS_GENERATE_HEADER)
-            set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
-        endif(NOT ARGS_GENERATE_HEADER)
-    endif(ARGS_GENERATE_VAPI)
-
-    set(header_arguments "")
-    if(ARGS_GENERATE_HEADER)
-        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
-        list(APPEND out_files_display "${ARGS_GENERATE_HEADER}.h")
-        list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h")
-    endif(ARGS_GENERATE_HEADER)
-
-    set(gir_arguments "")
-    if(ARGS_GENERATE_GIR)
-        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir")
-        list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir")
-        set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir")
-    endif(ARGS_GENERATE_GIR)
-
-    set(symbols_arguments "")
-    if(ARGS_GENERATE_SYMBOLS)
-        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_SYMBOLS}.symbols")
-        list(APPEND out_files_display "${ARGS_GENERATE_SYMBOLS}.symbols")
-        set(symbols_arguments "--symbols=${ARGS_GENERATE_SYMBOLS}.symbols")
-    endif(ARGS_GENERATE_SYMBOLS)
-
-    set(os_defines "")
-    if(WIN32)
-        list(APPEND os_defines "-D" "\"G_OS_WIN32\"")
-    endif(WIN32)
-
-    # Workaround for a bug that would make valac run twice. This file is written
-    # after the vala compiler generates C source code.
-    set (extra_name ${extra_name}_ )
-    set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}${extra_name}valac.stamp)
-
-    add_custom_command(
-    OUTPUT
-        ${OUTPUT_STAMP}
-    COMMAND
-        ${VALA_EXECUTABLE}
-    ARGS
-        "-C"
-        ${header_arguments}
-        ${vapi_arguments}
-        ${gir_arguments}
-        ${symbols_arguments}
-        "-b" ${CMAKE_CURRENT_SOURCE_DIR}
-        "-d" ${DIRECTORY}
-        ${os_defines}
-        ${vala_pkg_opts}
-        ${ARGS_OPTIONS}
-        ${in_files}
-        ${custom_vapi_arguments}
-    COMMAND
-        touch
-    ARGS
-        ${OUTPUT_STAMP}
-    DEPENDS
-        ${in_files}
-        ${ARGS_CUSTOM_VAPIS}
-    COMMENT
-        "Generating ${out_files_display}"
-    )
-
-    # This command will be run twice for some reason (pass a non-empty string to COMMENT
-    # in order to see it). Since valac is not executed from here, this won't be a problem.
-    add_custom_command(OUTPUT ${out_files} DEPENDS ${OUTPUT_STAMP} COMMENT "")
-endmacro(vala_precompile)
--- a/cmake/ValaVersion.cmake
+++ b/cmake/ValaVersion.cmake
@@ -1,153 +0,0 @@
-##
-# Copyright (C) 2014 Raster Software Vigo
-# Autovala is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Autovala is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Copyright (C) 2013, Valama development team
-#
-# Copyright 2009-2010 Jakob Westhoff All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 
-#	1. Redistributions of source code must retain the above copyright notice,
-#	   this list of conditions and the following disclaimer.
-# 
-#	2. Redistributions in binary form must reproduce the above copyright notice,
-#	   this list of conditions and the following disclaimer in the documentation
-#	   and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies,
-# either expressed or implied, of Jakob Westhoff
-##
-
-include(ParseArguments)
-find_package(Vala REQUIRED)
-
-##
-# Ensure a certain valac version is available
-#
-# The initial argument is the version to check for
-# 
-# It may be followed by a optional parameter to specifiy a version range. The
-# following options are valid:
-# 
-# EXACT
-#   Vala needs to be available in the exact version given
-# 
-# MINIMUM
-#   The provided version is the minimum version. Therefore Vala needs to be
-#   available in the given version or any higher version
-#
-# MAXIMUM
-#   The provided version is the maximum. Therefore Vala needs to be available
-#   in the given version or any version older than this
-#
-# If no option is specified the version will be treated as a minimal version.
-##
-macro(ensure_vala_version ensure_version)
-
-	if (USE_VALA_BINARY)
-		message(STATUS "Forced use of vala binary ${USE_VALA_BINARY}")
-		set(VALA_EXECUTABLE ${USE_VALA_BINARY})
-	else (USE_VALA_BINARY)
-
-		message(STATUS "checking for Vala version of valac-${ensure_version}")
-	
-		unset(version_accepted)
-		execute_process(COMMAND "valac-${ensure_version}" "--version"
-			OUTPUT_VARIABLE "VALA_VERSION" OUTPUT_STRIP_TRAILING_WHITESPACE)
-		if (NOT VALA_VERSION)
-	
-			find_program(VALA_EXECUTABLE "valac")
-	
-			# If the specific version asked for this project is not found,
-			# try to use the one pointed by the valac link
-	
-			parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN})
-			set(compare_message "")
-			set(error_message "")
-			if(ARGS_MINIMUM)
-				set(compare_message "a minimum ")
-				set(error_message "or greater ")
-			elseif(ARGS_MAXIMUM)
-				set(compare_message "a maximum ")
-				set(error_message "or less ")
-			endif(ARGS_MINIMUM)
-	
-			message(STATUS "checking for ${compare_message}Vala version of ${ensure_version}" )
-	
-			execute_process(COMMAND ${VALA_EXECUTABLE} "--version"
-				OUTPUT_VARIABLE "VALA_VERSION" OUTPUT_STRIP_TRAILING_WHITESPACE)
-		else(NOT VALA_VERSION)
-			set(VALA_EXECUTABLE "valac-${ensure_version}")
-		endif(NOT VALA_VERSION)
-
-		# this code allows to identify development versions as the right version
-		# e.g. 0.19.1 -> 0.20 ; 0.20.1 -> 0.20 ;
-		# But this code seems to not be fine 0.24.0.2-2235 -> 0.26
-		# Thanks to Yannick Inizan
-		string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
-		string(STRIP ${VALA_VERSION} "VALA_VERSION")
-		string(REPLACE "." ";" VALA_LIST "${VALA_VERSION}")
-		list(GET VALA_LIST 0 maj_ver)
-		list(GET VALA_LIST 1 min_ver)
-		list(GET VALA_LIST 2 rev_ver)
-		math(EXPR is_odd "${min_ver} % 2")
-		list(LENGTH VALA_LIST len)
-		#if((${is_odd} EQUAL 1))
-		#	math(EXPR min_ver "${min_ver} + 1")
-		#elseif(len GREATER 3)
-		#	math(EXPR min_ver "${min_ver} + 2")
-		#endif()
-
-		set(VALA_SVERSION "${maj_ver}.${min_ver}" CACHE INTERNAL "")
-
-		# MINIMUM is the default if no option is specified
-		if(ARGS_EXACT)
-			if(${VALA_SVERSION} VERSION_EQUAL ${ensure_version} )
-				set(version_accepted TRUE)
-			endif(${VALA_SVERSION} VERSION_EQUAL ${ensure_version})
-		elseif(ARGS_MAXIMUM)
-			if(${VALA_SVERSION} VERSION_LESS ${ensure_version} OR ${VALA_SVERSION} VERSION_EQUAL ${ensure_version})
-				set(version_accepted TRUE)
-			endif(${VALA_SVERSION} VERSION_LESS ${ensure_version} OR ${VALA_SVERSION} VERSION_EQUAL ${ensure_version})
-		else(ARGS_MAXIMUM)
-			if(${VALA_SVERSION} VERSION_GREATER ${ensure_version} OR ${VALA_SVERSION} VERSION_EQUAL ${ensure_version})
-				set(version_accepted TRUE)
-			endif(${VALA_SVERSION} VERSION_GREATER ${ensure_version} OR ${VALA_SVERSION} VERSION_EQUAL ${ensure_version})
-		endif(ARGS_EXACT)
-	
-		if (NOT version_accepted)
-			message(FATAL_ERROR 
-				"Vala version ${ensure_version} ${error_message}is required."
-			)
-		endif(NOT version_accepted)
-	
-		message(STATUS
-			"  found Vala, version ${VALA_SVERSION}"
-		)
-	endif(USE_VALA_BINARY)
-endmacro(ensure_vala_version)
--- a/cmake/Valadoc.cmake
+++ b/cmake/Valadoc.cmake
@@ -1,38 +0,0 @@
-include(ParseArguments)
-find_package(Valadoc REQUIRED)
-
-macro(valadoc target outdir)
-	parse_arguments(ARGS "PACKAGES;OPTIONS;CUSTOM_VAPIS" "" ${ARGN})
-	set(vala_pkg_opts "")
-	foreach(pkg ${ARGS_PACKAGES})
-		list(APPEND vala_pkg_opts "--pkg=${pkg}")
-	endforeach(pkg ${ARGS_PACKAGES})
-
-	set(vapi_dir_opts "")
-	foreach(src ${ARGS_CUSTOM_VAPIS})
-		get_filename_component(pkg ${src} NAME_WE)
-		list(APPEND vala_pkg_opts "--pkg=${pkg}")
-		
-		get_filename_component(path ${src} PATH)
-		list(APPEND vapi_dir_opts "--vapidir=${path}")
-	endforeach(src ${ARGS_DEFAULT_ARGS})
-	list(REMOVE_DUPLICATES vapi_dir_opts)
-
-	add_custom_command(TARGET ${target}
-	COMMAND
-		${VALADOC_EXECUTABLE}
-	ARGS
-		"--force"
-		"-b" ${CMAKE_CURRENT_SOURCE_DIR}
-		"-o" ${outdir}
-		"--package-name=${CMAKE_PROJECT_NAME}"
-		"--package-version=${PROJECT_VERSION}"
-		${vala_pkg_opts}
-		${vapi_dir_opts}
-		${ARGS_OPTIONS}
-		${in_files} 
-	DEPENDS
-		${in_files}
-		${ARGS_CUSTOM_VAPIS}
-	)
-endmacro(valadoc)
--- a/314
+++ b/314
@@ -1,314 +0,0 @@
-#!/bin/sh
-
-# Autotools-style (./configure) wrapper for CMake
-# <https://github.com/nemequ/configure-cmake>
-#
-#   *** IMPORTANT ***
-#
-#   You must include the GNUInstallDirs module (which comes with
-#   CMake) in your project.  Just put "include (GNUInstallDirs)" in
-#   you CMakeLists.txt and you should be good.
-#
-# This script was originally written for Squash
-# <https://quixdb.github.io/squash/> by Evan Nemerson
-# <evan@nemerson.com>, but has been spun off into a separate
-# repository.  Please feel free to copy it into your own repository,
-# though I would appreciate it if you would post improvements, bugs,
-# feature requests, etc. to the issue tracker at
-# <https://github.com/nemequ/configure-cmake/issues>.
-#
-# To the extent possible under law, the author(s) hereby waive all
-# copyright and related or neighboring rights to this work.  For
-# details, see <https://creativecommons.org/publicdomain/zero/1.0/>
-
-TOP_SRCDIR="$(dirname $0)"
-CMAKE_CMD="cmake ${TOP_SRCDIR}"
-
-BUILD_TYPE="Debug"
-PREFIX=/usr/local
-LIBDIR=
-CMAKE_ARGS=
-
-if [ -e "${TOP_SRCDIR}/.configure-custom.sh" ]; then
-    . "${TOP_SRCDIR}/.configure-custom.sh"
-fi
-
-quote() {
-    echo "$1" | sed -e "s|'|'\\\\''|g; 1s/^/'/; \$s/\$/'/"
-}
-
-extract_var_string() {
-    VAR_NAME=$1
-    VAR_NAME=$(echo $1 | sed -e 's/[ \t]*$//')
-    if [ "x$2" != "x" ]; then
-        VAR_VALUE=$2
-    else
-        VAR_VALUE=yes
-    fi
-
-    if [ "x$3" != "x" ]; then
-        VAR_UC_NAME=$3
-    else
-        VAR_UC_NAME=$(echo "$1" | tr '[:lower:]' '[:upper:]' | tr -c '[:alnum:]' '_' | sed 's/_$//g')
-    fi
-}
-
-set_config_var() {
-    is_with=n
-    case "$1" in
-        "--enable-"*)
-            name="${1#--enable-}"
-            cfg="${ENABLE_VARS}"
-            ;;
-        "--disable-"*)
-            name="${1#--disable-}";
-            cfg="${DISABLE_VARS}";
-            ;;
-        "--with-"*)
-            # IFS="=" read -ra WITHARGS <<< "${1}"
-            name="${1#--with-}"
-            cfg="${WITH_VARS}"
-            is_with=y
-            ;;
-    esac
-
-    found=n
-    for varstring in $cfg; do
-        extract_var_string $(echo "${varstring}" | tr '|' ' ')
-        if [ "x$VAR_NAME" = "x$name" ]; then
-            found=y
-            break;
-        fi
-    done
-
-    if [ "$found" = "y" ]; then
-        if [ "x$is_with" = "xy" ]; then
-            CMAKE_ARGS="$CMAKE_ARGS -D${VAR_UC_NAME}=$(quote "$2")"
-        else
-            CMAKE_ARGS="$CMAKE_ARGS -D${VAR_UC_NAME}=$(quote "${VAR_VALUE}")"
-        fi
-    else
-        echo "Unknown parameter: ${1}"
-        exit 1
-    fi
-}
-
-prefix_to_offset() {
-    expr $(echo "${1}" | awk '{ print length }') + 1
-}
-
-print_help() {
-    cat <<EOF >&2
-  -h, --help              display this help and exit
-  --disable-debug         disable debugging mode
-  --pass-thru             pass remaining arguments through to CMake
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$PREFIX]
-  --bindir=DIR            user executables [PREFIX/bin]
-  --sbindir=DIR           system admin executables [PREFIX/sbin]
-  --libexecdir=DIR        program executables [PREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [PREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PROJECT_NAME]
-EOF
-
-    first=y
-    for varstring in ${ENABLE_VARS}; do
-        if [ $first = 'y' ]; then
-            echo ""
-            first=n
-        fi
-        extract_var_string $(echo "${varstring}" | tr '|' ' ')
-        var_doc_name="ENABLE_${VAR_UC_NAME}_DOC"
-        eval "docstring=\$$var_doc_name"
-        if [ "x${docstring}" = "x" ]; then
-            printf "  --enable-%-14s enable %s support\n" "${VAR_NAME}" "$(echo -n "${VAR_NAME}" | tr '-' ' ')"
-        else
-            printf "  --enable-%-14s %s\n" "${VAR_NAME}" "$docstring"
-        fi
-    done
-
-    first=y
-    for varstring in ${DISABLE_VARS}; do
-        if [ $first = 'y' ]; then
-            echo ""
-            first=n
-        fi
-        extract_var_string $(echo "${varstring}" | tr '|' ' ')
-        var_doc_name="DISABLE_${VAR_UC_NAME}_DOC"
-        eval "docstring=\$$var_doc_name"
-        if [ "x${docstring}" = "x" ]; then
-            printf "  --disable-%-13s disable %s support\n" "${VAR_NAME}" "$(echo -n "${VAR_NAME}" | tr '-' ' ')"
-        else
-            printf "  --disable-%-13s %s\n" "${VAR_NAME}" "$docstring"
-        fi
-    done
-
-    first=y
-    for varstring in ${WITH_VARS}; do
-        if [ $first = 'y' ]; then
-            echo ""
-            first=n
-        fi
-        extract_var_string $(echo "${varstring}" | tr '|' ' ')
-        var_doc_name="WITH_${VAR_UC_NAME}_DOC"
-        eval "docstring=\$$var_doc_name"
-        paraminfo="${VAR_NAME}=${VAR_VALUE}"
-        if [ "x${docstring}" = "x" ]; then
-            printf "  --with-%-16s enable %s support\n" "$paraminfo" "$(echo -n "${VAR_NAME}" | tr '-' ' ')"
-        else
-            printf "  --with-%-16s %s\n" "$paraminfo" "$docstring"
-        fi
-    done
-
-    exit 0
-}
-
-while [ $# != 0 ]; do
-    case "$1" in
-        "--prefix="*)
-            PREFIX="${1#*=}";;
-        "--prefix")
-            PREFIX="${2}"; shift;;
-        "--bindir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_BINDIR=$(quote "${1#*=}")";;
-        "--bindir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_BINDIR=$(quote "$2")"; shift;;
-        "--sbindir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SBINDIR=$(quote "${1#*=}")";;
-        "--sbindir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SBINDIR=$(quote "$2")"; shift;;
-        "--libexecdir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LIBEXECDIR=$(quote "${1#*=}")";;
-        "--libexecdir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LIBEXECDIR=$(quote "$2")"; shift;;
-        "--sysconfdir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SYSCONFDIR=$(quote "${1#*=}")";;
-        "--sysconfdir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SYSCONFDIR=$(quote "$2")"; shift;;
-        "--sharedstatedir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SHAREDSTATEDIR=$(quote "${1#*=}")";;
-        "--sharedstatedir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_SHAREDSTATEDIR=$(quote "$2")"; shift;;
-        "--localstatedir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALSTATEDIR=$(quote "${1#*=}")";;
-        "--localstatedir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALSTATEDIR=$(quote "$2")"; shift;;
-        "--libdir="*)
-            LIBDIR="${1#*=}";;
-        "--libdir")
-            LIBDIR="${2}"; shift;;
-        "--includedir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INCLUDEDIR=$(quote "${1#*=}")";;
-        "--includedir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INCLUDEDIR=$(quote "$2")"; shift;;
-        "--oldincludedir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_OLDINCLUDEDIR=$(quote "${1#*=}")";;
-        "--oldincludedir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_OLDINCLUDEDIR=$(quote "$2")"; shift;;
-        "--datarootdir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATAROOTDIR=$(quote "${1#*=}")";;
-        "--datarootdir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATAROOTDIR=$(quote "$2")"; shift;;
-        "--datadir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATADIR=$(quote "${1#*=}")";;
-        "--datadir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DATADIR=$(quote "$2")"; shift;;
-        "--infodir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INFODIR=$(quote "${1#*=}")";;
-        "--infodir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_INFODIR=$(quote "$2")"; shift;;
-        "--localedir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALEDIR=$(quote "${1#*=}")";;
-        "--localedir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_LOCALEDIR=$(quote "$2")"; shift;;
-        "--mandir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_MANDIR=$(quote "${1#*=}")";;
-        "--mandir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_MANDIR=$(quote "$2")"; shift;;
-        "--docdir="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DOCDIR=$(quote "${1#*=}")";;
-        "--docdir")
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_INSTALL_DOCDIR=$(quote "$2")"; shift;;
-
-        "CC="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_C_COMPILER=$(quote "${1#*=}")";;
-        "CXX="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_COMPILER=$(quote "${1#*=}")";;
-        "CFLAGS="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_C_FLAGS=$(quote "${1#*=}")";;
-        "CXXFLAGS="*)
-            CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CXX_FLAGS=$(quote "${1#*=}")";;
-        "LDFLAGS="*)
-            LDFLAGS="$LDFLAGS ${1#*=}";;
-
-        "--help")
-            print_help;;
-        "-h")
-            print_help;;
-
-        # This flag is the only one which may be a bit surprising to
-        # people.  Autotools always builds with debugging symbols enabled
-        # (AFAIK), but for cmake you have to do -DCMAKE_BUILD_TYPE=Debug.
-        # Unfortunately this can change other things as well, so although
-        # I realize there is no --disable-debug flag I thought it would be
-        # prudent to support one here.
-        "--disable-debug")
-            BUILD_TYPE="Release";;
-
-        "--pass-thru")
-            shift;
-            while [ $# != 0 ]; do
-                CMAKE_ARGS="$CMAKE_ARGS $(quote "${1}")";
-                shift;
-            done;;
-
-        "--enable-"*)
-            set_config_var "$1"
-            ;;
-
-        "--disable-"*)
-            set_config_var "$1"
-            ;;
-
-        "--with-"*)
-            name=$(echo "${1#--with-}" | awk '{split($1,v,"="); print v[1]}')
-            case "${1}" in
-                "--with-${name}="*)
-                    set_config_var "--with-${name}" "${1#--with-${name}=}";;
-                "--with-${name}")
-                    set_config_var "$1" "$2";
-                    shift;;
-            esac
-            ;;
-
-        *)
-            echo "$0: error: unrecognized option: \`$1'" >&2
-            echo "Try \`$0 --help' for more information" >&2
-            exit -1
-    esac;
-    shift
-done
-
-if [ "x${LIBDIR}" = "x" ]; then
-    LIBDIR="${PREFIX}/lib"
-fi
-
-# Unlike CFLAGS/CXXFLAGS/CC/CXX, LDFLAGS isn't handled by CMake, so we
-# need to parse it here.
-if [ "x${LDFLAGS}" != "x" ]; then
-    for varname in EXE MODULE SHARED STATIC; do
-        CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_${varname}_LINKER_FLAGS=$(quote "$LDFLAGS")"
-    done
-fi
-
-eval "cmake ${TOP_SRCDIR} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_INSTALL_LIBDIR=${LIBDIR} ${CMAKE_ARGS}"
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,66 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.installer.gresource.xml)
-EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.installer.gresource.xml)
-ADD_CUSTOM_COMMAND (
-	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.c
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pamac.installer.gresource.xml ${CMAKE_CURRENT_SOURCE_DIR}/interface/progress_dialog.ui
-	COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.installer.gresource.xml
-
-	COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.installer.gresource.xml
-)
-
-add_custom_target(pamac_installer_gresource_xml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.c)
-SET (pamac_installer_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.c PARENT_SCOPE)
-SET (pamac_installer_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.h PARENT_SCOPE)
-EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager.gresource.xml)
-EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager.gresource.xml)
-ADD_CUSTOM_COMMAND (
-	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.c
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager.gresource.xml ${CMAKE_CURRENT_SOURCE_DIR}/interface/manager_window.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/history_dialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-available.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-available-locked.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-install.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-installed-locked.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-installed-updated.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-reinstall.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-remove.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-upgrade.png
-	COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager.gresource.xml
-
-	COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager.gresource.xml
-)
-
-add_custom_target(pamac_manager_gresource_xml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.c)
-SET (pamac_manager_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.c PARENT_SCOPE)
-SET (pamac_manager_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.h PARENT_SCOPE)
-EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction.gresource.xml)
-EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction.gresource.xml)
-ADD_CUSTOM_COMMAND (
-	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.c
-	DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction.gresource.xml ${CMAKE_CURRENT_SOURCE_DIR}/interface/progress_dialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/progress_box.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/choose_provider_dialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/transaction_sum_dialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/preferences_dialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/choose_ignorepkgs_dialog.ui
-	COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction.gresource.xml
-
-	COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction.gresource.xml
-)
-
-add_custom_target(pamac_transaction_gresource_xml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.c)
-SET (pamac_transaction_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.c PARENT_SCOPE)
-SET (pamac_transaction_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.h PARENT_SCOPE)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-install.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ )
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-manager.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ )
-if (ENABLE_UPDATE_ICON)
-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-updater.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ )
-endif ()
-if (KDE_TRAY)
-	if( NOT ( ${CMAKE_INSTALL_PREFIX} MATCHES "^/home/" ) )
-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-tray-appindicator.desktop DESTINATION /etc/xdg/autostart/ )
-else()
-	MESSAGE(STATUS "[33mAutostart file data/pamac-tray-appindicator.desktop will not be installed. You must create your own .desktop file and put it at ~/.config/autostart[39m")
-endif()
-else ()
-if( NOT ( ${CMAKE_INSTALL_PREFIX} MATCHES "^/home/" ) )
-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-tray.desktop DESTINATION /etc/xdg/autostart/ )
-else()
-	MESSAGE(STATUS "[33mAutostart file data/pamac-tray.desktop will not be installed. You must create your own .desktop file and put it at ~/.config/autostart[39m")
-endif()
-endif ()
-include(GSettings)
-add_schema(org.pamac.main.gschema.xml)
-if (NOT DISABLE_AUR)
-	include(GSettings)
-add_schema(org.pamac.aur.gschema.xml)
-endif ()
--- a/data/dbus/CMakeLists.txt
+++ b/data/dbus/CMakeLists.txt
@@ -1,9 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-SET(DBUS_PREFIX ${CMAKE_INSTALL_PREFIX})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.system.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.system.service DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system-services/)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.user.service)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pamac.user.service DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system.d/)
--- a/data/icons/16x16/apps/CMakeLists.txt
+++ b/data/icons/16x16/apps/CMakeLists.txt
@@ -1,8 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/system-software-install.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps/)
-if( NOT (${ICON_UPDATE} STREQUAL "OFF" ))
-	find_program ( GTK_UPDATE_ICON_CACHE NAMES gtk-update-icon-cache.3.0 gtk-update-icon-cache )
-	install (CODE "execute_process ( COMMAND ${GTK_UPDATE_ICON_CACHE} -f -t ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor )" )
-ENDIF()
--- a/data/icons/24x24/status/CMakeLists.txt
+++ b/data/icons/24x24/status/CMakeLists.txt
@@ -1,9 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-tray-no-update.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/24x24/apps/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-tray-update.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/24x24/apps/)
-if( NOT (${ICON_UPDATE} STREQUAL "OFF" ))
-	find_program ( GTK_UPDATE_ICON_CACHE NAMES gtk-update-icon-cache.3.0 gtk-update-icon-cache )
-	install (CODE "execute_process ( COMMAND ${GTK_UPDATE_ICON_CACHE} -f -t ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor )" )
-ENDIF()
--- a/data/icons/32x32/apps/CMakeLists.txt
+++ b/data/icons/32x32/apps/CMakeLists.txt
@@ -1,8 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/system-software-install.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps/)
-if( NOT (${ICON_UPDATE} STREQUAL "OFF" ))
-	find_program ( GTK_UPDATE_ICON_CACHE NAMES gtk-update-icon-cache.3.0 gtk-update-icon-cache )
-	install (CODE "execute_process ( COMMAND ${GTK_UPDATE_ICON_CACHE} -f -t ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor )" )
-ENDIF()
--- a/data/interface/CMakeLists.txt
+++ b/data/interface/CMakeLists.txt
@@ -1,3 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
--- a/data/mime/CMakeLists.txt
+++ b/data/mime/CMakeLists.txt
@@ -1,4 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/)
--- a/data/pixmaps/CMakeLists.txt
+++ b/data/pixmaps/CMakeLists.txt
@@ -1,4 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-generic.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ )
--- a/data/polkit/CMakeLists.txt
+++ b/data/polkit/CMakeLists.txt
@@ -1,4 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)
--- a/data/polkit/org.pamac.policy
+++ b/data/polkit/org.pamac.policy
@@ -6,49 +6,49 @@
  <icon_name>package-x-generic</icon_name>
  <action id="org.pamac.commit">
    <message>Authentication is required</message>
-    <message xml:lang="es">Se necesita autenticación</message>
-    <message xml:lang="az_AZ">Kimlik tələb olunur</message>
-    <message xml:lang="id">Membutuhkan Otentifikasi</message>
-    <message xml:lang="nl_NL">Authenticatie vereist</message>
-    <message xml:lang="hr">Potrebna je autorizacija</message>
-    <message xml:lang="uk">Потрібна авторизація</message>
-    <message xml:lang="ast">Ríquese l'autenticación</message>
-    <message xml:lang="bg">Изисква се идентификация</message>
-    <message xml:lang="sk">Vyžaduje sa overenie totožnosti</message>
-    <message xml:lang="ru">Запрошена авторизация</message>
-    <message xml:lang="de">Authentifizierung erforderlich</message>
-    <message xml:lang="fa_IR">تائید هویت شکست خورد</message>
-    <message xml:lang="it">Autenticazione richiesta</message>
-    <message xml:lang="lt">Reikalingas tapatybės nustatymas</message>
-    <message xml:lang="he">נדרש אישור</message>
-    <message xml:lang="tr">Kimlik doğrulaması gerekli</message>
-    <message xml:lang="ca">Cal autenticació</message>
-    <message xml:lang="pt_PT">Autenticação necessária</message>
-    <message xml:lang="pt_BR">Autenticação necessária</message>
-    <message xml:lang="ja">認証が必要です</message>
-    <message xml:lang="nb">Autentisering kreves</message>
-    <message xml:lang="hu">Hitelesítés szükséges</message>
-    <message xml:lang="nl">Verificatie vereist</message>
-    <message xml:lang="es_MX">Se requiere autenticación</message>
-    <message xml:lang="es_419">Se requiere autenticación</message>
-    <message xml:lang="pt">Autenticação necessária</message>
-    <message xml:lang="hi">प्रमाणीकरण की आवश्यकता है</message>
-    <message xml:lang="pl">Wymagane jest uwierzytelnienie</message>
+    <message xml:lang="zh_TW">需要授權</message>
    <message xml:lang="zh_CN">需要验证</message>
+    <message xml:lang="uk">Потрібна авторизація</message>
+    <message xml:lang="tr">Kimlik doğrulaması gerekli</message>
    <message xml:lang="sv">Autentisering krävs</message>
-    <message xml:lang="ca_ES">Cal autenticació</message>
-    <message xml:lang="da">Godkendelse er påkrævet</message>
-    <message xml:lang="cs">Je vyžadováno ověření</message>
-    <message xml:lang="el_GR">Απαιτείται πιστοποίηση</message>
-    <message xml:lang="ko">인증이 필요합니다</message>
-    <message xml:lang="eu">Autentifikazioa behar da</message>
-    <message xml:lang="el">Απαιτείται πιστοποίηση</message>
-    <message xml:lang="fr">Authentification nécessaire</message>
    <message xml:lang="sr@latin">Autentifikacija je neophodna</message>
    <message xml:lang="sl">Zahtevana je overitev</message>
-    <message xml:lang="zh_TW">需要授權</message>
-    <message xml:lang="gl">A autenticación é necesaria</message>
+    <message xml:lang="sk">Vyžaduje sa overenie totožnosti</message>
+    <message xml:lang="ru">Запрошена авторизация</message>
+    <message xml:lang="pt_PT">Autenticação necessária</message>
+    <message xml:lang="pt_BR">Autenticação necessária</message>
+    <message xml:lang="pt">Autenticação necessária</message>
+    <message xml:lang="pl">Wymagane jest uwierzytelnienie</message>
+    <message xml:lang="nl_NL">Authenticatie vereist</message>
+    <message xml:lang="nl">Verificatie vereist</message>
+    <message xml:lang="nb">Autentisering kreves</message>
+    <message xml:lang="lt">Reikalingas tapatybės nustatymas</message>
+    <message xml:lang="ko">인증이 필요합니다</message>
+    <message xml:lang="ja">認証が必要です</message>
+    <message xml:lang="it">Autenticazione richiesta</message>
    <message xml:lang="is">Auðkenningar er krafist</message>
+    <message xml:lang="id">Membutuhkan Otentifikasi</message>
+    <message xml:lang="hu">Hitelesítés szükséges</message>
+    <message xml:lang="hr">Potrebna je autorizacija</message>
+    <message xml:lang="hi">प्रमाणीकरण की आवश्यकता है</message>
+    <message xml:lang="he">נדרש אישור</message>
+    <message xml:lang="gl">A autenticación é necesaria</message>
+    <message xml:lang="fr">Authentification nécessaire</message>
+    <message xml:lang="fa_IR">تائید هویت شکست خورد</message>
+    <message xml:lang="eu">Autentifikazioa behar da</message>
+    <message xml:lang="es_MX">Se requiere autenticación</message>
+    <message xml:lang="es_419">Se requiere autenticación</message>
+    <message xml:lang="es">Se necesita autenticación</message>
+    <message xml:lang="el_GR">Απαιτείται πιστοποίηση</message>
+    <message xml:lang="el">Απαιτείται πιστοποίηση</message>
+    <message xml:lang="de">Authentifizierung erforderlich</message>
+    <message xml:lang="da">Godkendelse er påkrævet</message>
+    <message xml:lang="cs">Je vyžadováno ověření</message>
+    <message xml:lang="ca_ES">Cal autenticació</message>
+    <message xml:lang="ca">Cal autenticació</message>
+    <message xml:lang="bg">Изисква се идентификация</message>
+    <message xml:lang="az_AZ">Kimlik tələb olunur</message>
+    <message xml:lang="ast">Ríquese l'autenticación</message>
    <message xml:lang="ar">صلاحيات مطلوبة</message>
    <defaults>
      <allow_any>no</allow_any>
--- a/data/systemd/CMakeLists.txt
+++ b/data/systemd/CMakeLists.txt
@@ -1,73 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-system.service)
-	install(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-system.service
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ELSE()
-	install(FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-system.service
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ENDIF()
-
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.service)
-	install(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.service
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ELSE()
-	install(FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.service
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ENDIF()
-
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.timer)
-	install(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.timer
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ELSE()
-	install(FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.timer
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ENDIF()
-
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.service)
-	install(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.service
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ELSE()
-	install(FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.service
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ENDIF()
-
-IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.timer)
-	install(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.timer
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ELSE()
-	install(FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.timer
-	DESTINATION
-		/usr/lib/systemd/system
-	)
-ENDIF()
-
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,10 @@ DISABLE_AUR = (get_option('DISABLE_AUR') != '')

 add_global_arguments('-DGETTEXT_PACKAGE="pamac"',language: 'c')

-gdk_3_0_dep = dependency('gdk-3.0')
+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')
 gtk_3_0_dep = dependency('gtk+-3.0')
 json_glib_1_0_dep = dependency('json-glib-1.0')
 libalpm_dep = dependency('libalpm')
@@ -15,17 +18,24 @@ libcurl_dep = dependency('libcurl')
 libnotify_dep = dependency('libnotify')
 libsoup_2_4_dep = dependency('libsoup-2.4')
 polkit_gobject_1_dep = dependency('polkit-gobject-1')
-vte_2_91_dep = dependency('vte-2.91')
 if KDE_TRAY
 appindicator3_0_1_dep = dependency('appindicator3-0.1')
 endif
+atk_dep = dependency('atk')
+cairo_dep = dependency('cairo')
+gdk_3_0_dep = dependency('gdk-3.0')
+gdk_pixbuf_2_0_dep = dependency('gdk-pixbuf-2.0')
 gio_2_0_dep = dependency('gio-2.0')
 glib_2_0_dep = dependency('glib-2.0')
 gobject_2_0_dep = dependency('gobject-2.0')
+pango_dep = dependency('pango')
+vte_2_91_dep = dependency('vte-2.91')
+x11_dep = dependency('x11')

 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 +82,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'))
--- a/meson_scripts/install_data.sh
+++ b/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
--- a/meson_scripts/install_library.sh
+++ b/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"
--- a/meson_scripts/install_schemas.py
+++ b/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])
--- a/meson_scripts/install_schemas.sh
+++ b/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
--- a/meson_scripts/update_icon.sh
+++ b/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
--- a/pamac.avprj
+++ b/pamac.avprj
@@ -1,8 +1,8 @@
 ### AutoVala Project ###
-autovala_version: 27
+autovala_version: 30
 project_name: pamac
-project_version: 6.6.4
-vala_version: 0.38
+project_version: 7.0.2
+vala_version: 0.44

 custom: data/systemd/pamac-system.service /usr/lib/systemd/system
 custom: data/systemd/pamac-cleancache.service /usr/lib/systemd/system
@@ -22,20 +22,20 @@ define: KDE_TRAY
 vapidir: src/vapis

 vala_binary: src/pamac-clean-cache/pamac-clean-cache
-*version: 6.6.4
-vala_local_package: pamacclassic
+*version: 7.0.2
+vala_local_package: Pamac
+vala_vapi: ../vapis/libalpm.vapi
 vala_package: posix
 vala_check_package: gtk+-3.0
 vala_check_package: json-glib-1.0
 *vala_check_package: glib-2.0
-*vala_check_package: gobject-2.0
 *vala_source: clean_cache.vala
-*vala_source: pamac_config.vala

 vala_binary: src/pamac-install/pamac-install
-*version: 6.6.4
+*version: 7.0.2
 use_gresource: pamac_installer_gresource_xml
-vala_local_package: pamacclassic
+vala_local_package: Pamac
+vala_vapi: ../vapis/libalpm.vapi
 vala_check_package: gtk+-3.0
 vala_check_package: json-glib-1.0
 *vala_check_package: gio-2.0
@@ -45,10 +45,11 @@ vala_check_package: json-glib-1.0
 *vala_source: progress_dialog.vala

 vala_binary: src/pamac-manager/pamac-manager
-*version: 6.6.4
+*version: 7.0.2
 alias: pamac-updater
 use_gresource: pamac_manager_gresource_xml
-vala_local_package: pamacclassic
+vala_local_package: Pamac
+vala_vapi: ../vapis/libalpm.vapi
 vala_check_package: gtk+-3.0
 vala_check_package: json-glib-1.0
 *vala_check_package: gio-2.0
@@ -59,8 +60,8 @@ 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
-vala_local_package: pamacclassic
+*version: 7.0.2
+vala_local_package: Pamac
 vala_package: posix
 vala_check_package: gtk+-3.0
 vala_check_package: json-glib-1.0
@@ -71,14 +72,11 @@ vala_check_package: polkit-gobject-1
 *vala_check_package: gio-2.0
 *vala_check_package: glib-2.0
 *vala_check_package: gobject-2.0
-*vala_source: alpm_config.vala
-*vala_source: mirrors_config.vala
-*vala_source: pamac_config.vala
 *vala_source: system_daemon.vala

 vala_binary: src/pamac-tray/pamac-tray
-*version: 6.6.4
-vala_local_package: pamacclassic
+*version: 7.0.2
+vala_local_package: Pamac
 vala_package: posix
 vala_check_package: json-glib-1.0
 vala_check_package: libalpm
@@ -96,13 +94,11 @@ vala_source: tray-appindicator.vala
 else
 vala_source: tray-gtk.vala
 end
-*vala_source: alpm_config.vala
-*vala_source: pamac_config.vala
 *vala_source: tray.vala

 vala_binary: src/pamac-user-daemon/pamac-user-daemon
-*version: 6.6.4
-vala_local_package: pamacclassic
+*version: 7.0.2
+vala_local_package: Pamac
 vala_package: posix
 vala_check_package: gtk+-3.0
 vala_check_package: json-glib-1.0
@@ -111,31 +107,31 @@ vala_check_package: libsoup-2.4
 *vala_check_package: gio-2.0
 *vala_check_package: glib-2.0
 *vala_check_package: gobject-2.0
-*vala_source: alpm_config.vala
-*vala_source: pamac_config.vala
 *vala_source: user_daemon.vala


-vala_library: src/pamac-classic
-*version: 6.6.4
-namespace: pamacclassic
+vala_library: src/pamac
+*version: 7.0.2
+*namespace: Pamac
 use_gresource: pamac_transaction_gresource_xml
-vala_package: posix
-vala_check_package: gdk-3.0
-vala_check_package: gtk+-3.0
-vala_check_package: json-glib-1.0
-vala_check_package: libalpm
-vala_check_package: libnotify
-vala_check_package: libsoup-2.4
-vala_check_package: vte-2.91
+*vala_package: posix
+*vala_check_package: atk
+*vala_check_package: cairo
+*vala_check_package: gdk-3.0
+*vala_check_package: gdk-pixbuf-2.0
 *vala_check_package: gio-2.0
 *vala_check_package: glib-2.0
 *vala_check_package: gobject-2.0
+*vala_check_package: gtk+-3.0
+*vala_check_package: json-glib-1.0
+*vala_check_package: libalpm
+*vala_check_package: libsoup-2.4
+*vala_check_package: pango
+*vala_check_package: vte-2.91
+*vala_check_package: x11
 *c_library: m
-if NOT DISABLE_AUR
-vala_source: aur.vala
-end
 *vala_source: alpm_config.vala
+*vala_source: aur.vala
 *vala_source: choose_ignorepkgs_dialog.vala
 *vala_source: choose_provider_dialog.vala
 *vala_source: common.vala
@@ -166,23 +162,15 @@ end
 *translate: vala src/mirrors_config.vala
 *translate: vala src/package.vala
 *translate: vala src/pamac-clean-cache/clean_cache.vala
-*translate: vala src/pamac-clean-cache/pamac_config.vala
 *translate: vala src/pamac-install/installer.vala
 *translate: vala src/pamac-install/progress_dialog.vala
 *translate: vala src/pamac-manager/history_dialog.vala
 *translate: vala src/pamac-manager/manager.vala
 *translate: vala src/pamac-manager/manager_window.vala
-*translate: vala src/pamac-system-daemon/alpm_config.vala
-*translate: vala src/pamac-system-daemon/mirrors_config.vala
-*translate: vala src/pamac-system-daemon/pamac_config.vala
 *translate: vala src/pamac-system-daemon/system_daemon.vala
-*translate: vala src/pamac-tray/alpm_config.vala
-*translate: vala src/pamac-tray/pamac_config.vala
 *translate: vala src/pamac-tray/tray-appindicator.vala
 *translate: vala src/pamac-tray/tray-gtk.vala
 *translate: vala src/pamac-tray/tray.vala
-*translate: vala src/pamac-user-daemon/alpm_config.vala
-*translate: vala src/pamac-user-daemon/pamac_config.vala
 *translate: vala src/pamac-user-daemon/user_daemon.vala
 *translate: vala src/pamac_config.vala
 *translate: vala src/preferences_dialog.vala
@@ -223,6 +211,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
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,6 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-include (Translations)
-add_translations_directory("pamac")
-add_translations_catalog("pamac" ../src/pamac-clean-cache ../src/pamac-install ../src/pamac-manager ../src/pamac-system-daemon ../src/pamac-tray ../src/pamac-user-daemon ../src ../data/interface )
--- a/po/LINGUAS
+++ b/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
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,24 +1,16 @@
 src/pamac-clean-cache/clean_cache.vala
-src/pamac-clean-cache/pamac_config.vala
 src/pamac-install/installer.vala
 src/pamac-install/progress_dialog.vala
 src/pamac-manager/history_dialog.vala
 src/pamac-manager/manager.vala
 src/pamac-manager/manager_window.vala
-src/pamac-system-daemon/alpm_config.vala
-src/pamac-system-daemon/mirrors_config.vala
-src/pamac-system-daemon/pamac_config.vala
 src/pamac-system-daemon/system_daemon.vala
 src/pamac-tray/tray-appindicator.vala
 src/pamac-tray/tray-gtk.vala
-src/pamac-tray/alpm_config.vala
-src/pamac-tray/pamac_config.vala
 src/pamac-tray/tray.vala
-src/pamac-user-daemon/alpm_config.vala
-src/pamac-user-daemon/pamac_config.vala
 src/pamac-user-daemon/user_daemon.vala
-src/aur.vala
 src/alpm_config.vala
+src/aur.vala
 src/choose_ignorepkgs_dialog.vala
 src/choose_provider_dialog.vala
 src/common.vala
--- a/po/meson.build
+++ b/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'])
--- a/po/pamac.pot
+++ b/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-02-16 15:41-0300\n"
+"POT-Creation-Date: 2019-09-17 19:17-0300\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"
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,161 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
-set (CMAKE_C_FLAGS "")
-set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.6.4")
-set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
-set (DOLLAR "$")
-
-configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src/Config.vala)
-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")
-add_definitions (${DEPS_CFLAGS})
-link_libraries ( ${DEPS_LIBRARIES} )
-link_directories ( ${DEPS_LIBRARY_DIRS} )
-find_package (Vala REQUIRED)
-include (ValaVersion)
-ensure_vala_version ("0.38" MINIMUM)
-include (ValaPrecompile)
-
-set (VALA_PACKAGES ${VALA_PACKAGES} posix)
-set (VALA_PACKAGES ${VALA_PACKAGES} gdk-3.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} libalpm)
-set (VALA_PACKAGES ${VALA_PACKAGES} libnotify)
-set (VALA_PACKAGES ${VALA_PACKAGES} libsoup-2.4)
-set (VALA_PACKAGES ${VALA_PACKAGES} vte-2.91)
-set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
-
-set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
-if (NOT DISABLE_AUR)
-	set (APP_SOURCES ${APP_SOURCES} aur.vala)
-endif ()
-set (APP_SOURCES ${APP_SOURCES} alpm_config.vala)
-set (APP_SOURCES ${APP_SOURCES} choose_ignorepkgs_dialog.vala)
-set (APP_SOURCES ${APP_SOURCES} choose_provider_dialog.vala)
-set (APP_SOURCES ${APP_SOURCES} common.vala)
-set (APP_SOURCES ${APP_SOURCES} mirrors_config.vala)
-set (APP_SOURCES ${APP_SOURCES} package.vala)
-set (APP_SOURCES ${APP_SOURCES} pamac_config.vala)
-set (APP_SOURCES ${APP_SOURCES} preferences_dialog.vala)
-set (APP_SOURCES ${APP_SOURCES} progress_box.vala)
-set (APP_SOURCES ${APP_SOURCES} transaction.vala)
-set (APP_SOURCES ${APP_SOURCES} transaction_sum_dialog.vala)
-
-if (ENABLE_UPDATE_ICON)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
-endif ()
-if (ENABLE_HAMBURGER)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
-endif ()
-if (KDE_TRAY)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " )
-endif ()
-if (DISABLE_AUR)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
-endif ()
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis )
-
-if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
-endif()
-
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic --gir pamacclassic-6.0.gir )
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction.gresource.xml )
-
-vala_precompile(VALA_C pamacclassic
-	${APP_SOURCES}
-PACKAGES
-	${VALA_PACKAGES}
-OPTIONS
-	${COMPILE_OPTIONS}
-GENERATE_VAPI
-	pamacclassic
-GENERATE_HEADER
-	pamacclassic
-)
-
-SET (VALA_C ${VALA_C} ${pamac_transaction_gresource_xml_C_FILE})
-add_library(pamacclassic SHARED ${VALA_C})
-
-set ( pamacclassic_DEPENDENCIES ${pamacclassic_DEPENDENCIES} pamac_transaction_gresource_xml )
-add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
-target_link_libraries( pamacclassic m )
-set_target_properties( pamacclassic PROPERTIES
-VERSION
-	6.6.4
-SOVERSION
-	6 )
-
-
-install(TARGETS
-	pamacclassic
-LIBRARY DESTINATION
-	${CMAKE_INSTALL_LIBDIR}/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.h
-DESTINATION
-	${CMAKE_INSTALL_INCLUDEDIR}/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.vapi
-DESTINATION
-	${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps
-DESTINATION
-	${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-6.0.gir
-DESTINATION
-	${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/
-)
-install(FILES
-	${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc
-DESTINATION
-	${CMAKE_INSTALL_LIBDIR}/pkgconfig/
-)
-if(HAVE_VALADOC)
-	valadoc(pamacclassic
-		${CMAKE_BINARY_DIR}/valadoc/pamacclassic
-		${APP_SOURCES}
-	PACKAGES
-		${VALA_PACKAGES}
-	CUSTOM_VAPIS
-		${CUSTOM_VAPIS_LIST}
-	)
-	install(DIRECTORY
-		${CMAKE_BINARY_DIR}/valadoc
-	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
-	)
-endif()
-
-install(CODE "MESSAGE (\"
-************************************************
-* Run 'sudo ldconfig' to complete installation *
-************************************************
-
-\") " )
-
--- a/src/Config.vala.base
+++ b/src/Config.vala.base
@@ -1,4 +1,4 @@
-namespace pamacclassicConstants {
+namespace Pamac {
 	public const string DATADIR = "@DATADIR@";
 	public const string PKGDATADIR = "@PKGDATADIR@";
 	public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
--- a/src/pamacclassic.deps
+++ b/src/pamacclassic.deps
@@ -1,11 +1,15 @@
 posix
+atk
+cairo
 gdk-3.0
-gtk+-3.0
-json-glib-1.0
-libalpm
-libnotify
-libsoup-2.4
-vte-2.91
+gdk-pixbuf-2.0
 gio-2.0
 glib-2.0
 gobject-2.0
+gtk+-3.0
+json-glib-1.0
+libalpm
+libsoup-2.4
+pango
+vte-2.91
+x11
--- a/src/Pamac.pc
+++ b/src/Pamac.pc
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@DOLLAR@{prefix}/${CMAKE_INSTALL_LIBDIR}
+includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}
+
+Name: Pamac
+Description: Pamac
+Version: 7.0.0
+Libs: -L@DOLLAR@{libdir} -lPamac
+Cflags: -I@DOLLAR@{includedir}
+Requires: atk cairo gdk-3.0 gdk-pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk+-3.0 json-glib-1.0 libalpm libsoup-2.4 pango vte-2.91 x11
--- a/src/alpm_config.vala
+++ b/src/alpm_config.vala
@@ -1,7 +1,7 @@
 /*
 *  alpm_config
 *
- *  Copyright (C) 2017 Chris Cromer <cromer@cromnix.org>
+ *  Copyright (C) 2017-2019 Chris Cromer <cromer@cromnix.org>
 *  Copyright (C) 2014-2017 Guillaume Benoit <guillaume@manjaro.org>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -18,6 +18,8 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+//using Alpm
+
 [Compact]
 class AlpmRepo {
 	public string name;
@@ -43,7 +45,7 @@ class AlpmRepo {

 }

-class AlpmConfig {
+public class AlpmConfig {
 	string conf_path;
 	string? rootdir;
 	string? dbpath;
@@ -330,10 +332,10 @@ class AlpmConfig {
 					}
 				}
 			} catch (GLib.Error e) {
-				GLib.stderr.printf("%s\n", e.message);
+				stderr.printf("%s\n", e.message);
 			}
 		} else {
-			GLib.stderr.printf ("File '%s' doesn't exist.\n", path);
+			stderr.printf ("File '%s' doesn't exist.\n", path);
 		}
 	}

@@ -390,10 +392,10 @@ class AlpmConfig {
 				}
 				reload ();
 			} catch (GLib.Error e) {
-				GLib.stderr.printf("%s\n", e.message);
+				stderr.printf("%s\n", e.message);
 			}
 		} else {
-			GLib.stderr.printf ("File '%s' doesn't exist.\n", conf_path);
+			stderr.printf ("File '%s' doesn't exist.\n", conf_path);
 		}
 	}

@@ -477,7 +479,7 @@ class AlpmConfig {
 					siglevel_mask |= (Alpm.Signature.Level.DATABASE_MARGINAL_OK | Alpm.Signature.Level.DATABASE_UNKNOWN_OK);
 				}
 			} else {
-				GLib.stderr.printf("unrecognized siglevel: %s\n", conf_string);
+				stderr.printf("unrecognized siglevel: %s\n", conf_string);
 			}
 		}
 		siglevel &= ~Alpm.Signature.Level.USE_DEFAULT;
--- a/src/aur.vala
+++ b/src/aur.vala
@@ -18,7 +18,11 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-namespace AUR {
+//using Json
+//using Soup
+//using Alpm
+
+namespace Pamac {
 	// AUR urls
 	const string aur_url = "http://aur.archlinux.org";
 	const string rpc_url = aur_url + "/rpc/?v=5";
--- a/src/choose_ignorepkgs_dialog.vala
+++ b/src/choose_ignorepkgs_dialog.vala
@@ -19,6 +19,7 @@
 */

 //using GIO
+//using Gtk

 namespace Pamac {

--- a/src/meson.build
+++ b/src/meson.build
@@ -1,85 +1,107 @@
-cfg_pamac_classic = configuration_data()
-cfg_pamac_classic.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
-cfg_pamac_classic.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
-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('TESTSRCDIR', meson.source_root())
+cfg_pamac = configuration_data()
+cfg_pamac.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
+cfg_pamac.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'pamac'))
+cfg_pamac.set('GETTEXT_PACKAGE', 'pamac')
+cfg_pamac.set('RELEASE_NAME', 'pamac')
+cfg_pamac.set('PREFIX', get_option('prefix'))
+cfg_pamac.set('VERSION', '7.0.2')
+cfg_pamac.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)

-pamac_classic_deps = [gdk_3_0_dep]
-pamac_classic_deps += [gtk_3_0_dep]
-pamac_classic_deps += [json_glib_1_0_dep]
-pamac_classic_deps += [libalpm_dep]
-pamac_classic_deps += [libnotify_dep]
-pamac_classic_deps += [libsoup_2_4_dep]
-pamac_classic_deps += [vte_2_91_dep]
-pamac_classic_deps += [gio_2_0_dep]
-pamac_classic_deps += [glib_2_0_dep]
-pamac_classic_deps += [gobject_2_0_dep]
-pamac_classic_sources = [cfgfile_1]
-if not DISABLE_AUR
-pamac_classic_sources += ['aur.vala']
-endif
-pamac_classic_sources += ['alpm_config.vala']
-pamac_classic_sources += ['choose_ignorepkgs_dialog.vala']
-pamac_classic_sources += ['choose_provider_dialog.vala']
-pamac_classic_sources += ['common.vala']
-pamac_classic_sources += ['mirrors_config.vala']
-pamac_classic_sources += ['package.vala']
-pamac_classic_sources += ['pamac_config.vala']
-pamac_classic_sources += ['preferences_dialog.vala']
-pamac_classic_sources += ['progress_box.vala']
-pamac_classic_sources += ['transaction.vala']
-pamac_classic_sources += ['transaction_sum_dialog.vala']
-pamac_classic_sources += [pamac_transaction_gresource_xml_file_c]
-pamac_classic_vala_args = ['--pkg','posix']
-pamac_classic_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_classic_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction.gresource.xml')]
-pamac_classic_c_args = []
+pamac_deps = [atk_dep]
+pamac_deps += [cairo_dep]
+pamac_deps += [gdk_3_0_dep]
+pamac_deps += [gdk_pixbuf_2_0_dep]
+pamac_deps += [gio_2_0_dep]
+pamac_deps += [glib_2_0_dep]
+pamac_deps += [gobject_2_0_dep]
+pamac_deps += [gtk_3_0_dep]
+pamac_deps += [json_glib_1_0_dep]
+pamac_deps += [libalpm_dep]
+pamac_deps += [libsoup_2_4_dep]
+pamac_deps += [pango_dep]
+pamac_deps += [vte_2_91_dep]
+pamac_deps += [x11_dep]
+pamac_sources = [cfgfile_1]
+pamac_sources += ['alpm_config.vala']
+pamac_sources += ['aur.vala']
+pamac_sources += ['choose_ignorepkgs_dialog.vala']
+pamac_sources += ['choose_provider_dialog.vala']
+pamac_sources += ['common.vala']
+pamac_sources += ['mirrors_config.vala']
+pamac_sources += ['package.vala']
+pamac_sources += ['pamac_config.vala']
+pamac_sources += ['preferences_dialog.vala']
+pamac_sources += ['progress_box.vala']
+pamac_sources += ['transaction.vala']
+pamac_sources += ['transaction_sum_dialog.vala']
+pamac_sources += [pamac_transaction_gresource_xml_file_c]
+pamac_vala_args = ['--pkg','posix']
+pamac_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
+pamac_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction.gresource.xml')]
+pamac_c_args = []
 if ENABLE_UPDATE_ICON
-  pamac_classic_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
-  pamac_classic_c_args += ['-DENABLE_UPDATE_ICON']
+  pamac_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
+  pamac_c_args += ['-DENABLE_UPDATE_ICON']
 endif
 if ENABLE_HAMBURGER
-  pamac_classic_vala_args += ['-D', 'ENABLE_HAMBURGER']
-  pamac_classic_c_args += ['-DENABLE_HAMBURGER']
+  pamac_vala_args += ['-D', 'ENABLE_HAMBURGER']
+  pamac_c_args += ['-DENABLE_HAMBURGER']
 endif
 if KDE_TRAY
-  pamac_classic_vala_args += ['-D', 'KDE_TRAY']
-  pamac_classic_c_args += ['-DKDE_TRAY']
+  pamac_vala_args += ['-D', 'KDE_TRAY']
+  pamac_c_args += ['-DKDE_TRAY']
 endif
 if DISABLE_AUR
-  pamac_classic_vala_args += ['-D', 'DISABLE_AUR']
-  pamac_classic_c_args += ['-DDISABLE_AUR']
+  pamac_vala_args += ['-D', 'DISABLE_AUR']
+  pamac_c_args += ['-DDISABLE_AUR']
 endif
-pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : false)]
-pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir']
+pamac_deps += [meson.get_compiler('c').find_library('m', required : false)]
+pamac_link_args = ['-rdynamic']

+Pamac_library = shared_library('Pamac', pamac_sources,
+    vala_gir: 'Pamac-1.0.gir',
+    dependencies: pamac_deps,
+    vala_args: pamac_vala_args,
+    c_args: pamac_c_args,
+    link_args: pamac_link_args,
+    version: '7.0.2',
+    soversion: '7',
+    install: true,
+    install_dir: [true, true, true, 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,version: '6.6.4',soversion: '6',install: true)
+g_ir_compiler = find_program('g-ir-compiler')
+custom_target('Pamac typelib', command: [g_ir_compiler, '--shared-library=libPamac', '--output', '@OUTPUT@',  join_paths(meson.current_build_dir(), 'Pamac-1.0.gir')],
+    output: 'Pamac-1.0.typelib',
+    depends: Pamac_library,
+    install: true,
+    install_dir: join_paths(get_option('libdir'), 'girepository-1.0'))

-pamac_classic_requires = []
-pamac_classic_requires += ['gdk-3.0']
-pamac_classic_requires += ['gtk+-3.0']
-pamac_classic_requires += ['json-glib-1.0']
-pamac_classic_requires += ['libalpm']
-pamac_classic_requires += ['libnotify']
-pamac_classic_requires += ['libsoup-2.4']
-pamac_classic_requires += ['vte-2.91']
-pamac_classic_requires += ['gio-2.0']
-pamac_classic_requires += ['glib-2.0']
-pamac_classic_requires += ['gobject-2.0']
+pamac_requires = []
+pamac_requires += ['atk']
+pamac_requires += ['cairo']
+pamac_requires += ['gdk-3.0']
+pamac_requires += ['gdk-pixbuf-2.0']
+pamac_requires += ['gio-2.0']
+pamac_requires += ['glib-2.0']
+pamac_requires += ['gobject-2.0']
+pamac_requires += ['gtk+-3.0']
+pamac_requires += ['json-glib-1.0']
+pamac_requires += ['libalpm']
+pamac_requires += ['libsoup-2.4']
+pamac_requires += ['pango']
+pamac_requires += ['vte-2.91']
+pamac_requires += ['x11']
 pkg_mod = import('pkgconfig')
-pkg_mod.generate(libraries : pamacclassic_library,
-	version : '6.6.4',
-	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')
+pkg_mod.generate(libraries : Pamac_library,
+	version : '7.0.2',
+	name : 'Pamac',
+	filebase : 'Pamac',
+	description : 'Pamac',
+	requires : pamac_requires)

+install_data(join_paths(meson.current_source_dir(),'Pamac.deps'),install_dir: join_paths(get_option('prefix'),'share','vala','vapi'))
--- a/src/mirrors_config.vala
+++ b/src/mirrors_config.vala
@@ -19,7 +19,7 @@
 */

 namespace Pamac {
-	class MirrorsConfig {
+	public class MirrorsConfig {
 		string conf_path;

 		public string choosen_generation_method { get; private set; }
@@ -69,10 +69,10 @@ namespace Pamac {
 						}
 					}
 				} catch (Error e) {
-					GLib.stderr.printf("%s\n", e.message);
+					stderr.printf("%s\n", e.message);
 				}
 			} else {
-				GLib.stderr.printf ("File '%s' doesn't exist.\n", path);
+				stderr.printf ("File '%s' doesn't exist.\n", path);
 			}
 		}

@@ -121,10 +121,10 @@ namespace Pamac {
 						dos.put_string (new_line);
 					}
 				} catch (GLib.Error e) {
-					GLib.stderr.printf("%s\n", e.message);
+					stderr.printf("%s\n", e.message);
 				}
 			} else {
-				GLib.stderr.printf ("File '%s' doesn't exist.\n", file.get_path ());
+				stderr.printf ("File '%s' doesn't exist.\n", file.get_path ());
 			}
 		}
 	}
--- a/src/pamac-clean-cache/CMakeLists.txt
+++ b/src/pamac-clean-cache/CMakeLists.txt
@@ -1,99 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
-set (CMAKE_C_FLAGS "")
-set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.6.4")
-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")
-add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
-find_package (Vala REQUIRED)
-include (ValaVersion)
-ensure_vala_version ("0.38" MINIMUM)
-include (ValaPrecompile)
-
-set (VALA_PACKAGES ${VALA_PACKAGES} posix)
-set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
-
-set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
-set (APP_SOURCES ${APP_SOURCES} clean_cache.vala)
-set (APP_SOURCES ${APP_SOURCES} pamac_config.vala)
-
-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)
-
-if (ENABLE_UPDATE_ICON)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
-endif ()
-if (ENABLE_HAMBURGER)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
-endif ()
-if (KDE_TRAY)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " )
-endif ()
-if (DISABLE_AUR)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
-endif ()
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis )
-
-if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
-endif()
-
-
-vala_precompile(VALA_C pamac-clean-cache
-	${APP_SOURCES}
-PACKAGES
-	${VALA_PACKAGES}
-CUSTOM_VAPIS
-	${CUSTOM_VAPIS_LIST}
-OPTIONS
-	${COMPILE_OPTIONS}
-)
-
-add_executable(pamac-clean-cache ${VALA_C})
-set ( pamac-clean-cache_DEPENDENCIES ${pamac-clean-cache_DEPENDENCIES} pamacclassic )
-add_dependencies( pamac-clean-cache ${pamac-clean-cache_DEPENDENCIES} )
-
-
-install(TARGETS
-	pamac-clean-cache
-RUNTIME DESTINATION
-	${CMAKE_INSTALL_BINDIR}
-)
-if(HAVE_VALADOC)
-	valadoc(pamac-clean-cache
-		${CMAKE_BINARY_DIR}/valadoc/pamac-clean-cache
-		${APP_SOURCES}
-	PACKAGES
-		${VALA_PACKAGES}
-	CUSTOM_VAPIS
-		${CUSTOM_VAPIS_LIST}
-	)
-	install(DIRECTORY
-		${CMAKE_BINARY_DIR}/valadoc
-	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
-	)
-endif()
--- a/src/pamac-clean-cache/meson.build
+++ b/src/pamac-clean-cache/meson.build
@@ -4,21 +4,23 @@ 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', '7.0.2')
 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]
 pamac_clean_cache_deps += [glib_2_0_dep]
-pamac_clean_cache_deps += [gobject_2_0_dep]
 pamac_clean_cache_sources = [cfgfile_4]
 pamac_clean_cache_sources += ['clean_cache.vala']
-pamac_clean_cache_sources += ['pamac_config.vala']
+pamac_clean_cache_sources += [join_paths(meson.current_source_dir(),'../vapis/libalpm.vapi')]
 pamac_clean_cache_vala_args = ['--pkg','posix']
 pamac_clean_cache_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_clean_cache_dependencies = [pamacclassic_library]
+pamac_clean_cache_dependencies = [Pamac_library]
 pamac_clean_cache_c_args = []
 if ENABLE_UPDATE_ICON
  pamac_clean_cache_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
@@ -36,7 +38,15 @@ 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)

--- a/src/pamac-clean-cache/pamac_config.vala
+++ b/src/pamac-clean-cache/pamac_config.vala
@@ -1 +0,0 @@
-../pamac_config.vala
--- a/src/pamac-install/CMakeLists.txt
+++ b/src/pamac-install/CMakeLists.txt
@@ -1,102 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
-set (CMAKE_C_FLAGS "")
-set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.6.4")
-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")
-add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
-find_package (Vala REQUIRED)
-include (ValaVersion)
-ensure_vala_version ("0.38" MINIMUM)
-include (ValaPrecompile)
-
-set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
-
-set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
-set (APP_SOURCES ${APP_SOURCES} installer.vala)
-set (APP_SOURCES ${APP_SOURCES} progress_dialog.vala)
-
-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)
-
-if (ENABLE_UPDATE_ICON)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
-endif ()
-if (ENABLE_HAMBURGER)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
-endif ()
-if (KDE_TRAY)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " )
-endif ()
-if (DISABLE_AUR)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
-endif ()
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis )
-
-if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
-endif()
-
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.installer.gresource.xml )
-
-vala_precompile(VALA_C pamac-install
-	${APP_SOURCES}
-PACKAGES
-	${VALA_PACKAGES}
-CUSTOM_VAPIS
-	${CUSTOM_VAPIS_LIST}
-OPTIONS
-	${COMPILE_OPTIONS}
-)
-
-SET (VALA_C ${VALA_C} ${pamac_installer_gresource_xml_C_FILE})
-add_executable(pamac-install ${VALA_C})
-set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} pamac_installer_gresource_xml )
-set ( pamac-install_DEPENDENCIES ${pamac-install_DEPENDENCIES} pamacclassic )
-add_dependencies( pamac-install ${pamac-install_DEPENDENCIES} )
-
-
-install(TARGETS
-	pamac-install
-RUNTIME DESTINATION
-	${CMAKE_INSTALL_BINDIR}
-)
-if(HAVE_VALADOC)
-	valadoc(pamac-install
-		${CMAKE_BINARY_DIR}/valadoc/pamac-install
-		${APP_SOURCES}
-	PACKAGES
-		${VALA_PACKAGES}
-	CUSTOM_VAPIS
-		${CUSTOM_VAPIS_LIST}
-	)
-	install(DIRECTORY
-		${CMAKE_BINARY_DIR}/valadoc
-	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
-	)
-endif()
--- a/src/pamac-install/installer.vala
+++ b/src/pamac-install/installer.vala
@@ -32,8 +32,10 @@ namespace Pamac {

 		public override void startup () {
 			// i18n
-			Intl.textdomain ("pamac");
+			Intl.bindtextdomain(Constants.GETTEXT_PACKAGE, Path.build_filename(Constants.DATADIR,"locale"));
 			Intl.setlocale (LocaleCategory.ALL, "");
+			Intl.textdomain(Constants.GETTEXT_PACKAGE);
+			Intl.bind_textdomain_codeset(Constants.GETTEXT_PACKAGE, "utf-8" );

 			base.startup ();

--- a/src/pamac-install/meson.build
+++ b/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.6.4')
+cfg_pamac_install.set('VERSION', '7.0.2')
 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]
@@ -18,9 +21,10 @@ pamac_install_sources = [cfgfile_5]
 pamac_install_sources += ['installer.vala']
 pamac_install_sources += ['progress_dialog.vala']
 pamac_install_sources += [pamac_installer_gresource_xml_file_c]
+pamac_install_sources += [join_paths(meson.current_source_dir(),'../vapis/libalpm.vapi')]
 pamac_install_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
 pamac_install_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.installer.gresource.xml')]
-pamac_install_dependencies = [pamacclassic_library]
+pamac_install_dependencies = [Pamac_library]
 pamac_install_c_args = []
 if ENABLE_UPDATE_ICON
  pamac_install_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
@@ -38,7 +42,15 @@ 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)

--- a/src/pamac-manager/CMakeLists.txt
+++ b/src/pamac-manager/CMakeLists.txt
@@ -1,109 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
-set (CMAKE_C_FLAGS "")
-set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.6.4")
-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")
-add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
-find_package (Vala REQUIRED)
-include (ValaVersion)
-ensure_vala_version ("0.38" MINIMUM)
-include (ValaPrecompile)
-
-set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
-
-set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
-set (APP_SOURCES ${APP_SOURCES} history_dialog.vala)
-set (APP_SOURCES ${APP_SOURCES} manager.vala)
-set (APP_SOURCES ${APP_SOURCES} manager_window.vala)
-
-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)
-
-if (ENABLE_UPDATE_ICON)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
-endif ()
-if (ENABLE_HAMBURGER)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
-endif ()
-if (KDE_TRAY)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " )
-endif ()
-if (DISABLE_AUR)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
-endif ()
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis )
-
-if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
-endif()
-
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.manager.gresource.xml )
-
-vala_precompile(VALA_C pamac-manager
-	${APP_SOURCES}
-PACKAGES
-	${VALA_PACKAGES}
-CUSTOM_VAPIS
-	${CUSTOM_VAPIS_LIST}
-OPTIONS
-	${COMPILE_OPTIONS}
-)
-
-SET (VALA_C ${VALA_C} ${pamac_manager_gresource_xml_C_FILE})
-add_executable(pamac-manager ${VALA_C})
-set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} pamac_manager_gresource_xml )
-set ( pamac-manager_DEPENDENCIES ${pamac-manager_DEPENDENCIES} pamacclassic )
-add_dependencies( pamac-manager ${pamac-manager_DEPENDENCIES} )
-
-
-install(TARGETS
-	pamac-manager
-RUNTIME DESTINATION
-	${CMAKE_INSTALL_BINDIR}
-)
-if (INSTALL_BINARYPATH_pamac-manager)
-	set(ALIAS_DESTINATION_PATH ${INSTALL_BINARYPATH_pamac-manager})
-else()
-	set(ALIAS_DESTINATION_PATH ${CMAKE_INSTALL_BINDIR})
-endif()
-install(CODE "execute_process(COMMAND ln -sf pamac-manager \$ENV{DESTDIR}/${PREFIX}/${ALIAS_DESTINATION_PATH}/pamac-updater )")
-if(HAVE_VALADOC)
-	valadoc(pamac-manager
-		${CMAKE_BINARY_DIR}/valadoc/pamac-manager
-		${APP_SOURCES}
-	PACKAGES
-		${VALA_PACKAGES}
-	CUSTOM_VAPIS
-		${CUSTOM_VAPIS_LIST}
-	)
-	install(DIRECTORY
-		${CMAKE_BINARY_DIR}/valadoc
-	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
-	)
-endif()
--- a/src/pamac-manager/manager.vala
+++ b/src/pamac-manager/manager.vala
@@ -31,8 +31,10 @@ namespace Pamac {

 		public override void startup () {
 			// i18n
-			Intl.textdomain ("pamac");
+			Intl.bindtextdomain(Constants.GETTEXT_PACKAGE, Path.build_filename(Constants.DATADIR,"locale"));
 			Intl.setlocale (LocaleCategory.ALL, "");
+			Intl.textdomain(Constants.GETTEXT_PACKAGE);
+			Intl.bind_textdomain_codeset(Constants.GETTEXT_PACKAGE, "utf-8" );

 			base.startup ();

--- a/src/pamac-manager/manager_window.vala
+++ b/src/pamac-manager/manager_window.vala
@@ -100,8 +100,11 @@ namespace Pamac {
 		Gtk.Label updated_label;
 		[GtkChild]
 		Gtk.Stack properties_stack;
+#if DISABLE_AUR
+#else
 		[GtkChild]
 		Gtk.StackSwitcher properties_stackswitcher;
+#endif
 		[GtkChild]
 		Gtk.Grid deps_grid;
 		[GtkChild]
@@ -1525,7 +1528,7 @@ namespace Pamac {
 							}
 						}
 					}
-					right_click_menu.popup (null, null, null, event.button, event.time);
+					right_click_menu.popup_at_pointer (event);
 					return true;
 				}
 			}
@@ -1606,7 +1609,7 @@ namespace Pamac {
 							upgrade_item.sensitive = true;
 						}
 					}
-					right_click_menu.popup (null, null, null, event.button, event.time);
+					right_click_menu.popup_at_pointer (event);
 					return true;
 				}
 			}
@@ -1887,12 +1890,11 @@ namespace Pamac {
 			refresh_packages_list ();
 		}

-
-		void on_menu_button_toggled () {
 #if ENABLE_HAMBURGER
+		void on_menu_button_toggled () {
 			preferences_button.sensitive = !(transaction_running || sysupgrade_running);
-#endif
 		}
+#endif

 		[GtkCallback]
 		void on_history_button_clicked () {
@@ -1902,7 +1904,7 @@ namespace Pamac {
 			}
 			var file = GLib.File.new_for_path ("/var/log/pacman.log");
 			if (!file.query_exists ()) {
-				GLib.stderr.printf ("File '%s' doesn't exist.\n", file.get_path ());
+				stderr.printf ("File '%s' doesn't exist.\n", file.get_path ());
 			} else {
 				StringBuilder text = new StringBuilder ();
 				try {
@@ -1916,7 +1918,7 @@ namespace Pamac {
 						text.prepend (line + "\n");
 					}
 				} catch (GLib.Error e) {
-					GLib.stderr.printf ("%s\n", e.message);
+					stderr.printf ("%s\n", e.message);
 				}
 				var history_dialog = new HistoryDialog (this);
 				history_dialog.textview.buffer.set_text (text.str, (int) text.len);
@@ -1990,10 +1992,10 @@ namespace Pamac {
 				"icon_name", "system-software-install",
 				"logo_icon_name", "system-software-install",
 				"comments", dgettext (null, "A Gtk3 frontend for libalpm"),
-				"copyright", "Copyright © 2017 Chris Cromer\nCopyright © 2017 Guillaume Benoit",
+				"copyright", "Copyright © 2017-2019 Chris Cromer\nCopyright © 2017 Guillaume Benoit",
 				"version", VERSION,
 				"license_type", Gtk.License.GPL_3_0,
-				"website", "http://github.com/cromnix/pamac-classic");
+				"website", "https://git.cromer.cl/cromer/pamac-classic");
 		}

 		[GtkCallback]
--- a/src/pamac-manager/meson.build
+++ b/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.6.4')
+cfg_pamac_manager.set('VERSION', '7.0.2')
 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]
@@ -19,9 +22,10 @@ pamac_manager_sources += ['history_dialog.vala']
 pamac_manager_sources += ['manager.vala']
 pamac_manager_sources += ['manager_window.vala']
 pamac_manager_sources += [pamac_manager_gresource_xml_file_c]
+pamac_manager_sources += [join_paths(meson.current_source_dir(),'../vapis/libalpm.vapi')]
 pamac_manager_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
 pamac_manager_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.manager.gresource.xml')]
-pamac_manager_dependencies = [pamacclassic_library]
+pamac_manager_dependencies = [Pamac_library]
 pamac_manager_c_args = []
 if ENABLE_UPDATE_ICON
  pamac_manager_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
@@ -39,8 +43,16 @@ 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')
--- a/src/pamac-system-daemon/CMakeLists.txt
+++ b/src/pamac-system-daemon/CMakeLists.txt
@@ -1,106 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
-set (CMAKE_C_FLAGS "")
-set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.6.4")
-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")
-add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
-find_package (Vala REQUIRED)
-include (ValaVersion)
-ensure_vala_version ("0.38" MINIMUM)
-include (ValaPrecompile)
-
-set (VALA_PACKAGES ${VALA_PACKAGES} posix)
-set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} libalpm)
-set (VALA_PACKAGES ${VALA_PACKAGES} libcurl)
-set (VALA_PACKAGES ${VALA_PACKAGES} libsoup-2.4)
-set (VALA_PACKAGES ${VALA_PACKAGES} polkit-gobject-1)
-set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
-
-set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
-set (APP_SOURCES ${APP_SOURCES} alpm_config.vala)
-set (APP_SOURCES ${APP_SOURCES} mirrors_config.vala)
-set (APP_SOURCES ${APP_SOURCES} pamac_config.vala)
-set (APP_SOURCES ${APP_SOURCES} system_daemon.vala)
-
-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)
-
-if (ENABLE_UPDATE_ICON)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
-endif ()
-if (ENABLE_HAMBURGER)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
-endif ()
-if (KDE_TRAY)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " )
-endif ()
-if (DISABLE_AUR)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
-endif ()
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis )
-
-if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
-endif()
-
-
-vala_precompile(VALA_C pamac-system-daemon
-	${APP_SOURCES}
-PACKAGES
-	${VALA_PACKAGES}
-CUSTOM_VAPIS
-	${CUSTOM_VAPIS_LIST}
-OPTIONS
-	${COMPILE_OPTIONS}
-)
-
-add_executable(pamac-system-daemon ${VALA_C})
-set ( pamac-system-daemon_DEPENDENCIES ${pamac-system-daemon_DEPENDENCIES} pamacclassic )
-add_dependencies( pamac-system-daemon ${pamac-system-daemon_DEPENDENCIES} )
-
-
-install(TARGETS
-	pamac-system-daemon
-RUNTIME DESTINATION
-	${CMAKE_INSTALL_BINDIR}
-)
-if(HAVE_VALADOC)
-	valadoc(pamac-system-daemon
-		${CMAKE_BINARY_DIR}/valadoc/pamac-system-daemon
-		${APP_SOURCES}
-	PACKAGES
-		${VALA_PACKAGES}
-	CUSTOM_VAPIS
-		${CUSTOM_VAPIS_LIST}
-	)
-	install(DIRECTORY
-		${CMAKE_BINARY_DIR}/valadoc
-	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
-	)
-endif()
--- a/src/pamac-system-daemon/alpm_config.vala
+++ b/src/pamac-system-daemon/alpm_config.vala
@@ -1 +0,0 @@
-../alpm_config.vala
--- a/src/pamac-system-daemon/meson.build
+++ b/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.6.4')
+cfg_pamac_system_daemon.set('VERSION', '7.0.2')
 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]
@@ -19,13 +22,10 @@ pamac_system_daemon_deps += [gio_2_0_dep]
 pamac_system_daemon_deps += [glib_2_0_dep]
 pamac_system_daemon_deps += [gobject_2_0_dep]
 pamac_system_daemon_sources = [cfgfile_7]
-pamac_system_daemon_sources += ['alpm_config.vala']
-pamac_system_daemon_sources += ['mirrors_config.vala']
-pamac_system_daemon_sources += ['pamac_config.vala']
 pamac_system_daemon_sources += ['system_daemon.vala']
 pamac_system_daemon_vala_args = ['--pkg','posix']
 pamac_system_daemon_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_system_daemon_dependencies = [pamacclassic_library]
+pamac_system_daemon_dependencies = [Pamac_library]
 pamac_system_daemon_c_args = []
 if ENABLE_UPDATE_ICON
  pamac_system_daemon_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
@@ -43,7 +43,15 @@ 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)

--- a/src/pamac-system-daemon/mirrors_config.vala
+++ b/src/pamac-system-daemon/mirrors_config.vala
@@ -1 +0,0 @@
-../mirrors_config.vala
--- a/src/pamac-system-daemon/pamac_config.vala
+++ b/src/pamac-system-daemon/pamac_config.vala
@@ -1 +0,0 @@
-../pamac_config.vala
--- a/src/pamac-system-daemon/system_daemon.vala
+++ b/src/pamac-system-daemon/system_daemon.vala
@@ -1,7 +1,7 @@
 /*
 *  pamac-vala
 *
- *  Copyright (C) 2017 Chris Cromer <cromer@cromnix.org>
+ *  Copyright (C) 2017-2019 Chris Cromer <cromer@cromnix.org>
 *  Copyright (C) 2014-2017 Guillaume Benoit <guillaume@manjaro.org>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,6 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-// i18n
-const string GETTEXT_PACKAGE = "pamac";
-
 Pamac.SystemDaemon system_daemon;
 MainLoop loop;

@@ -140,7 +137,7 @@ namespace Pamac {
 			refreshed = false;
 		}

-		public void set_environment_variables (HashTable<string,string> variables) {
+		public void set_environment_variables (HashTable<string,string> variables) throws DBusError, IOError {
 			string[] keys = { "HTTP_USER_AGENT",
 							"http_proxy",
 							"https_proxy",
@@ -155,7 +152,7 @@ namespace Pamac {
 			}
 		}

-		public ErrorInfos get_current_error () {
+		public ErrorInfos get_current_error () throws DBusError, IOError {
 			return current_error;
 		}

@@ -277,7 +274,7 @@ namespace Pamac {
 			return true;
 		}

-		public string[] get_mirrors_countries () {
+		public string[] get_mirrors_countries () throws DBusError, IOError {
 			string[] countries = {};
 			try {
 				string countries_str;
@@ -297,7 +294,7 @@ namespace Pamac {
 			return countries;
 		}

-		public bool get_lock (GLib.BusName sender) {
+		public bool get_lock (GLib.BusName sender) throws DBusError, IOError {
 			if (lock_id == sender) {
 				return true;
 			} else if (lock_id == "") {
@@ -307,7 +304,7 @@ namespace Pamac {
 			return false;
 		}

-		public bool unlock (GLib.BusName sender) {
+		public bool unlock (GLib.BusName sender) throws DBusError, IOError {
 			if (lock_id == sender) {
 				lock_id = new BusName ("");
 				return true;
@@ -354,14 +351,14 @@ namespace Pamac {
 			return authorized;
 		}

-		public void start_get_authorization (GLib.BusName sender) {
+		public void start_get_authorization (GLib.BusName sender) throws DBusError, IOError {
 			check_authorization.begin (sender, (obj, res) => {
 				bool authorized = check_authorization.end (res);
 				get_authorization_finished (authorized);
 			});
 		}

-		public void start_save_pamac_config () {
+		public void start_save_pamac_config () throws DBusError, IOError {
 				var pamac_config = new Pamac.Config ();
 				pamac_config.reload ();
 #if DISABLE_AUR
@@ -379,7 +376,7 @@ namespace Pamac {
 			write_alpm_config_finished ((alpm_handle.checkspace == 1));
 		}

-		public void start_write_alpm_config (HashTable<string,Variant> new_alpm_conf_, GLib.BusName sender) {
+		public void start_write_alpm_config (HashTable<string,Variant> new_alpm_conf_, GLib.BusName sender) throws DBusError, IOError {
 			check_authorization.begin (sender, (obj, res) => {
 				bool authorized = check_authorization.end (res);
 				if (authorized ) {
@@ -413,7 +410,7 @@ namespace Pamac {
 			generate_mirrors_list_finished ();
 		}

-		public void start_generate_mirrors_list (GLib.BusName sender) {
+		public void start_generate_mirrors_list (GLib.BusName sender) throws DBusError, IOError {
 			check_authorization.begin (sender, (obj, res) => {
 				bool authorized = check_authorization.end (res);
 				if (authorized) {
@@ -426,7 +423,7 @@ namespace Pamac {
 			});
 		}

-		public void clean_cache (uint64 keep_nb, bool only_uninstalled, GLib.BusName sender) {
+		public void clean_cache (uint64 keep_nb, bool only_uninstalled, GLib.BusName sender) throws DBusError, IOError {
 			check_authorization.begin (sender, (obj, res) => {
 				bool authorized = check_authorization.end (res);
 				if (authorized) {
@@ -446,7 +443,7 @@ namespace Pamac {
 			});
 		}

-		public void start_write_mirrors_config (HashTable<string,Variant> new_mirrors_conf, GLib.BusName sender) {
+		public void start_write_mirrors_config (HashTable<string,Variant> new_mirrors_conf, GLib.BusName sender) throws DBusError, IOError {
 			check_authorization.begin (sender, (obj, res) => {
 				var mirrors_config = new MirrorsConfig ("/etc/pacman-mirrors.conf");
 				bool authorized = check_authorization.end (res);
@@ -458,7 +455,7 @@ namespace Pamac {
 			});
 		}

-		public void start_set_pkgreason (string pkgname, uint reason, GLib.BusName sender) {
+		public void start_set_pkgreason (string pkgname, uint reason, GLib.BusName sender) throws DBusError, IOError {
 			check_authorization.begin (sender, (obj, res) => {
 				bool authorized = check_authorization.end (res);
 				if (authorized) {
@@ -535,7 +532,7 @@ namespace Pamac {
 			}
 		}

-		public void start_refresh (bool force, GLib.BusName sender) {
+		public void start_refresh (bool force, GLib.BusName sender) throws DBusError, IOError {
 			if (lock_id != sender) {
 				refresh_finished (false);
 				return;
@@ -644,7 +641,7 @@ namespace Pamac {
 		private async void check_aur_dep_list (string[] pkgnames) {
 			string[] dep_types = {"Depends", "MakeDepends", "CheckDepends"};
 			string[] dep_to_check = {};
-			Json.Array results = yield AUR.multiinfo (pkgnames);
+			Json.Array results = yield multiinfo (pkgnames);
 			results.foreach_element ((array, index, node) => {
 				unowned Json.Object? pkg_info = node.get_object ();
 				// create fake db desc file
@@ -722,12 +719,12 @@ namespace Pamac {
 										try {
 											dos.put_string ("%s\n".printf (_node.get_string ()));
 										} catch (GLib.Error e) {
-											GLib.stderr.printf("%s\n", e.message);
+											stderr.printf("%s\n", e.message);
 										}
 									});
 									dos.put_string ("\n");
 								} catch (GLib.Error e) {
-									GLib.stderr.printf("%s\n", e.message);
+									stderr.printf("%s\n", e.message);
 								}
 							}
 							// provides
@@ -739,12 +736,12 @@ namespace Pamac {
 										try {
 											dos.put_string ("%s\n".printf (_node.get_string ()));
 										} catch (GLib.Error e) {
-											GLib.stderr.printf("%s\n", e.message);
+											stderr.printf("%s\n", e.message);
 										}
 									});
 									dos.put_string ("\n");
 								} catch (GLib.Error e) {
-									GLib.stderr.printf("%s\n", e.message);
+									stderr.printf("%s\n", e.message);
 								}
 							}
 							// replaces
@@ -756,17 +753,17 @@ namespace Pamac {
 										try {
 											dos.put_string ("%s\n".printf (_node.get_string ()));
 										} catch (GLib.Error e) {
-											GLib.stderr.printf("%s\n", e.message);
+											stderr.printf("%s\n", e.message);
 										}
 									});
 									dos.put_string ("\n");
 								} catch (GLib.Error e) {
-									GLib.stderr.printf("%s\n", e.message);
+									stderr.printf("%s\n", e.message);
 								}
 							}
 						}
 					} catch (GLib.Error e) {
-						GLib.stderr.printf("%s\n", e.message);
+						stderr.printf("%s\n", e.message);
 					}
 				}
 			});
@@ -803,7 +800,10 @@ namespace Pamac {
 				};
 				get_updates_finished (updates);
 			} else {
+#if DISABLE_AUR
+#else
 				string[] local_pkgs = {};
+#endif
 				unowned Alpm.List<unowned Alpm.Package> pkgcache = alpm_handle.localdb.pkgcache;
 				while (pkgcache != null) {
 					unowned Alpm.Package installed_pkg = pkgcache.data;
@@ -842,8 +842,8 @@ namespace Pamac {
 				if (check_aur_updates) {
 					// get aur updates
 					if (!aur_updates_checked) {
-						AUR.multiinfo.begin (local_pkgs, (obj, res) => {
-							aur_updates_results = AUR.multiinfo.end (res);
+						multiinfo.begin (local_pkgs, (obj, res) => {
+							aur_updates_results = multiinfo.end (res);
 							aur_updates_checked = true;
 							var updates = Updates () {
 								is_syncfirst = false,
@@ -899,9 +899,9 @@ namespace Pamac {
 #endif

 #if DISABLE_AUR
-		public void start_get_updates () {
+		public void start_get_updates () throws DBusError, IOError {
 #else
-		public void start_get_updates (bool check_aur_updates_) {
+		public void start_get_updates (bool check_aur_updates_) throws DBusError, IOError {
 			check_aur_updates = check_aur_updates_;
 #endif
 			try {
@@ -938,7 +938,13 @@ namespace Pamac {
 					if (errno != 0) {
 						current_error.details = { Alpm.strerror (errno) };
 					}
-					trans_release (lock_id);
+					try {
+						trans_release (lock_id);
+					} catch (IOError e) {
+						stderr.printf ("IOError: %s\n", e.message);
+					} catch (DBusError e) {
+						stderr.printf ("DBusError: %s\n", e.message);
+					}
 					success = false;
 				} else {
 					success = trans_prepare_real ();
@@ -947,7 +953,7 @@ namespace Pamac {
 			trans_prepare_finished (success);
 		}

-		public void start_sysupgrade_prepare (bool enable_downgrade_, string[] temporary_ignorepkgs_, GLib.BusName sender) {
+		public void start_sysupgrade_prepare (bool enable_downgrade_, string[] temporary_ignorepkgs_, GLib.BusName sender) throws DBusError, IOError {
 			if (lock_id != sender) {
 				trans_prepare_finished (false);
 				return;
@@ -1162,7 +1168,13 @@ namespace Pamac {
 						break;
 				}
 				current_error.details = (owned) details;
-				trans_release (lock_id);
+				try {
+					trans_release (lock_id);
+				} catch (IOError e) {
+					stderr.printf ("IOError: %s\n", e.message);
+				} catch (DBusError e) {
+					stderr.printf ("DBusError: %s\n", e.message);
+				}
 				success = false;
 			} else {
 				// Search for holdpkg in target list
@@ -1180,7 +1192,13 @@ namespace Pamac {
 				if (found_locked_pkg) {
 					current_error.message = _("Failed to prepare transaction");
 					current_error.details = (owned) details;
-					trans_release (lock_id);
+					try {
+						trans_release (lock_id);
+					} catch (IOError e) {
+						stderr.printf ("IOError: %s\n", e.message);
+					} catch (DBusError e) {
+						stderr.printf ("DBusError: %s\n", e.message);
+					}
 					success = false;
 				}
 			}
@@ -1215,7 +1233,13 @@ namespace Pamac {
 				if (success) {
 					success = trans_prepare_real ();
 				} else {
-					trans_release (lock_id);
+					try {
+						trans_release (lock_id);
+					} catch (IOError e) {
+						stderr.printf ("IOError: %s\n", e.message);
+					} catch (DBusError e) {
+						stderr.printf ("DBusError: %s\n", e.message);
+					}
 				}
 			}
 			trans_prepare_finished (success);
@@ -1378,7 +1402,13 @@ namespace Pamac {
 								}
 								pkgs_to_remove.next ();
 							}
-							trans_release (lock_id);
+							try {
+								trans_release (lock_id);
+							} catch (IOError e) {
+								stderr.printf ("IOError: %s\n", e.message);
+							} catch (DBusError e) {
+								stderr.printf ("DBusError: %s\n", e.message);
+							}
 							try {
 								Process.spawn_command_line_sync ("rm -f %ssync/aur.db".printf (alpm_handle.dbpath));
 							} catch (SpawnError e) {
@@ -1391,7 +1421,13 @@ namespace Pamac {
 							trans_prepare ();
 						}
 					} else {
-						trans_release (lock_id);
+						try {
+							trans_release (lock_id);
+						} catch (IOError e) {
+							stderr.printf ("IOError: %s\n", e.message);
+						} catch (DBusError e) {
+							stderr.printf ("DBusError: %s\n", e.message);
+						}
 					}
 				}
 				if (!success) {
@@ -1408,14 +1444,14 @@ namespace Pamac {
 										string[] to_install_,
 										string[] to_remove_,
 										string[] to_load_,
-										GLib.BusName sender) {
+										GLib.BusName sender) throws DBusError, IOError {
 #else
 		public void start_trans_prepare (Alpm.TransFlag flags_,
 										string[] to_install_,
 										string[] to_remove_,
 										string[] to_load_,
 										string[] to_build_,
-										GLib.BusName sender) {
+										GLib.BusName sender) throws DBusError, IOError {
 #endif
 			if (lock_id != sender) {
 				trans_prepare_finished (false);
@@ -1451,14 +1487,14 @@ namespace Pamac {
 #endif
 		}

-		public void choose_provider (int provider) {
+		public void choose_provider (int provider) throws DBusError, IOError {
 			provider_mutex.lock ();
 			choosen_provider = provider;
 			provider_cond.signal ();
 			provider_mutex.unlock ();
 		}

-		public TransactionSummary get_transaction_summary () {
+		public TransactionSummary get_transaction_summary () throws DBusError, IOError {
 			UpdateInfos[] to_install = {};
 			UpdateInfos[] to_upgrade = {};
 			UpdateInfos[] to_downgrade = {};
@@ -1502,9 +1538,9 @@ namespace Pamac {
 				to_remove += (owned) infos;
 				pkgs_to_remove.next ();
 			}
-			UpdateInfos[] conflicts_to_remove = {};
 #if DISABLE_AUR
 #else
+			UpdateInfos[] conflicts_to_remove = {};
 			foreach (unowned UpdateInfos infos in aur_conflicts_to_remove){
 				conflicts_to_remove += infos;
 			}
@@ -1540,7 +1576,13 @@ namespace Pamac {
 				current_error.errno = (uint) errno;
 				// cancel the download return an EXTERNAL_DOWNLOAD error
 				if (errno == Alpm.Errno.EXTERNAL_DOWNLOAD && cancellable.is_cancelled ()) {
-					trans_release (lock_id);
+					try {
+						trans_release (lock_id);
+					} catch (IOError e) {
+						stderr.printf ("IOError: %s\n", e.message);
+					} catch (DBusError e) {
+						stderr.printf ("DBusError: %s\n", e.message);
+					}
 					trans_commit_finished (false);
 					return;
 				}
@@ -1595,7 +1637,13 @@ namespace Pamac {
 				}
 				success = false;
 			}
-			trans_release (lock_id);
+			try {
+				trans_release (lock_id);
+			} catch (IOError e) {
+				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+			}
 			to_install_as_dep.foreach_remove ((pkgname, val) => {
 				unowned Alpm.Package? pkg = alpm_handle.localdb.get_pkg (pkgname);
 				if (pkg != null) {
@@ -1607,7 +1655,7 @@ namespace Pamac {
 			trans_commit_finished (success);
 		}

-		public void start_trans_commit (GLib.BusName sender) {
+		public void start_trans_commit (GLib.BusName sender) throws DBusError, IOError {
 			check_authorization.begin (sender, (obj, res) => {
 				bool authorized = check_authorization.end (res);
 				if (authorized) {
@@ -1617,13 +1665,19 @@ namespace Pamac {
 						stderr.printf ("Thread Error %s\n", e.message);
 					}
 				} else {
-					trans_release (lock_id);
+					try {
+						trans_release (lock_id);
+					} catch (IOError e) {
+						stderr.printf ("IOError: %s\n", e.message);
+					} catch (DBusError e) {
+						stderr.printf ("DBusError: %s\n", e.message);
+					}
 					trans_commit_finished (false);
 				}
 			});
 		}

-		public void trans_release (GLib.BusName sender) {
+		public void trans_release (GLib.BusName sender) throws DBusError, IOError {
 			if (lock_id != sender) {
 				return;
 			}
@@ -1631,7 +1685,7 @@ namespace Pamac {
 			remove_ignorepkgs ();
 		}

-		public void trans_cancel (GLib.BusName sender) {
+		public void trans_cancel (GLib.BusName sender) throws DBusError, IOError {
 			if (lock_id != sender) {
 				return;
 			}
@@ -1644,7 +1698,7 @@ namespace Pamac {
 		}

 		[DBus (no_reply = true)]
-		public void quit () {
+		public void quit () throws DBusError, IOError {
 			// wait for all tasks to be processed
 			ThreadPool.free ((owned) thread_pool, false, true);
 			loop.quit ();
@@ -2066,8 +2120,10 @@ void on_bus_acquired (DBusConnection conn) {

 void main () {
 	// i18n
+	Intl.bindtextdomain(Constants.GETTEXT_PACKAGE, Path.build_filename(Constants.DATADIR,"locale"));
 	Intl.setlocale (LocaleCategory.ALL, "");
-	Intl.textdomain (GETTEXT_PACKAGE);
+	Intl.textdomain(Constants.GETTEXT_PACKAGE);
+	Intl.bind_textdomain_codeset(Constants.GETTEXT_PACKAGE, "utf-8" );

 	Bus.own_name (BusType.SYSTEM,
 				"org.pamac.system",
--- a/src/pamac-tray/CMakeLists.txt
+++ b/src/pamac-tray/CMakeLists.txt
@@ -1,112 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
-set (CMAKE_C_FLAGS "")
-set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.6.4")
-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")
-add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
-find_package (Vala REQUIRED)
-include (ValaVersion)
-ensure_vala_version ("0.38" MINIMUM)
-include (ValaPrecompile)
-
-set (VALA_PACKAGES ${VALA_PACKAGES} posix)
-set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} libalpm)
-set (VALA_PACKAGES ${VALA_PACKAGES} libnotify)
-if (KDE_TRAY)
-	set (VALA_PACKAGES ${VALA_PACKAGES} appindicator3-0.1)
-else ()
-set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
-endif ()
-set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
-
-set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
-if (KDE_TRAY)
-	set (APP_SOURCES ${APP_SOURCES} tray-appindicator.vala)
-else ()
-set (APP_SOURCES ${APP_SOURCES} tray-gtk.vala)
-endif ()
-set (APP_SOURCES ${APP_SOURCES} alpm_config.vala)
-set (APP_SOURCES ${APP_SOURCES} pamac_config.vala)
-set (APP_SOURCES ${APP_SOURCES} tray.vala)
-
-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)
-
-if (ENABLE_UPDATE_ICON)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
-endif ()
-if (ENABLE_HAMBURGER)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
-endif ()
-if (KDE_TRAY)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " )
-endif ()
-if (DISABLE_AUR)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
-endif ()
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis )
-
-if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
-endif()
-
-
-vala_precompile(VALA_C pamac-tray
-	${APP_SOURCES}
-PACKAGES
-	${VALA_PACKAGES}
-CUSTOM_VAPIS
-	${CUSTOM_VAPIS_LIST}
-OPTIONS
-	${COMPILE_OPTIONS}
-)
-
-add_executable(pamac-tray ${VALA_C})
-set ( pamac-tray_DEPENDENCIES ${pamac-tray_DEPENDENCIES} pamacclassic )
-add_dependencies( pamac-tray ${pamac-tray_DEPENDENCIES} )
-
-
-install(TARGETS
-	pamac-tray
-RUNTIME DESTINATION
-	${CMAKE_INSTALL_BINDIR}
-)
-if(HAVE_VALADOC)
-	valadoc(pamac-tray
-		${CMAKE_BINARY_DIR}/valadoc/pamac-tray
-		${APP_SOURCES}
-	PACKAGES
-		${VALA_PACKAGES}
-	CUSTOM_VAPIS
-		${CUSTOM_VAPIS_LIST}
-	)
-	install(DIRECTORY
-		${CMAKE_BINARY_DIR}/valadoc
-	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
-	)
-endif()
--- a/src/pamac-tray/alpm_config.vala
+++ b/src/pamac-tray/alpm_config.vala
@@ -1 +0,0 @@
-../alpm_config.vala
--- a/src/pamac-tray/meson.build
+++ b/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.6.4')
+cfg_pamac_tray.set('VERSION', '7.0.2')
 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]
@@ -26,12 +29,10 @@ pamac_tray_sources += ['tray-appindicator.vala']
 else
 pamac_tray_sources += ['tray-gtk.vala']
 endif
-pamac_tray_sources += ['alpm_config.vala']
-pamac_tray_sources += ['pamac_config.vala']
 pamac_tray_sources += ['tray.vala']
 pamac_tray_vala_args = ['--pkg','posix']
 pamac_tray_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_tray_dependencies = [pamacclassic_library]
+pamac_tray_dependencies = [Pamac_library]
 pamac_tray_c_args = []
 if ENABLE_UPDATE_ICON
  pamac_tray_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
@@ -49,7 +50,15 @@ 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)

--- a/src/pamac-tray/pamac_config.vala
+++ b/src/pamac-tray/pamac_config.vala
@@ -1 +0,0 @@
-../pamac_config.vala
--- a/src/pamac-tray/tray-gtk.vala
+++ b/src/pamac-tray/tray-gtk.vala
@@ -32,7 +32,7 @@ namespace Pamac {

 		// Show popup menu on right button
 		void menu_popup (uint button, uint time) {
-			menu.popup (null, null, null, button, time);
+			menu.popup_at_pointer (null);
 		}

 		public override void set_tooltip (string info) {
--- a/src/pamac-tray/tray.vala
+++ b/src/pamac-tray/tray.vala
@@ -18,9 +18,6 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-// i18n
-const string GETTEXT_PACKAGE = "pamac";
-
 const string update_icon_name = "pamac-tray-update";
 const string noupdate_icon_name = "pamac-tray-no-update";
 const string noupdate_info = _("Your system is up-to-date");
@@ -28,15 +25,15 @@ const string noupdate_info = _("Your system is up-to-date");
 namespace Pamac {
 	[DBus (name = "org.pamac.user")]
 	interface UserDaemon : Object {
-		public abstract void refresh_handle () throws IOError;
-		public abstract string get_lockfile () throws IOError;
+		public abstract void refresh_handle () throws DBusError, IOError;
+		public abstract string get_lockfile () throws DBusError, IOError;
 #if DISABLE_AUR
-		public abstract void start_get_updates () throws IOError;
+		public abstract void start_get_updates () throws DBusError, IOError;
 #else
-		public abstract void start_get_updates (bool check_aur_updates) throws IOError;
+		public abstract void start_get_updates (bool check_aur_updates) throws DBusError, IOError;
 #endif
 		[DBus (no_reply = true)]
-		public abstract void quit () throws IOError;
+		public abstract void quit () throws DBusError, IOError;
 		public signal void get_updates_finished (Updates updates);
 	}

@@ -49,7 +46,7 @@ namespace Pamac {
 		GLib.File lockfile;
 		bool updates_available;

-		public TrayIcon () {
+		protected TrayIcon () {
 			application_id = "org.pamac.tray";
 			flags = ApplicationFlags.FLAGS_NONE;
 		}
@@ -71,6 +68,8 @@ namespace Pamac {
 					daemon.quit ();
 				} catch (IOError e) {
 					stderr.printf ("IOError: %s\n", e.message);
+				} catch (DBusError e) {
+					stderr.printf ("DBusError: %s\n", e.message);
 				}
 			}
 		}
@@ -132,6 +131,8 @@ namespace Pamac {
 #endif
 				} catch (IOError e) {
 					stderr.printf ("IOError: %s\n", e.message);
+				} catch (DBusError e) {
+					stderr.printf ("DBusError: %s\n", e.message);
 				}
 			}
 			return true;
@@ -233,6 +234,8 @@ namespace Pamac {
 						daemon.refresh_handle ();
 					} catch (IOError e) {
 						stderr.printf ("IOError: %s\n", e.message);
+					} catch (DBusError e) {
+						stderr.printf ("DBusError: %s\n", e.message);
 					}
 					check_updates ();
 				}
@@ -274,8 +277,10 @@ namespace Pamac {

 		public override void startup () {
 			// i18n
-			Intl.textdomain ("pamac");
+			Intl.bindtextdomain(Constants.GETTEXT_PACKAGE, Path.build_filename(Constants.DATADIR,"locale"));
 			Intl.setlocale (LocaleCategory.ALL, "");
+			Intl.textdomain(Constants.GETTEXT_PACKAGE);
+			Intl.bind_textdomain_codeset(Constants.GETTEXT_PACKAGE, "utf-8" );

 			var pamac_config = new Pamac.Config ();
 			// if refresh period is 0, just return so tray will exit
@@ -298,11 +303,16 @@ namespace Pamac {

 			start_daemon ();
 			try {
-				lockfile = GLib.File.new_for_path (daemon.get_lockfile ());
+				string path = daemon.get_lockfile ();
+				if (path != null) {
+					lockfile = GLib.File.new_for_path (path);
+				}
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
-				//try standard lock file
-				lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
+				try_standard_lock ();
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				try_standard_lock ();
 			}
 			Timeout.add (200, check_extern_lock);
 			// wait 30 seconds before check updates
@@ -316,6 +326,10 @@ namespace Pamac {
 			this.hold ();
 		}

+		private void try_standard_lock () {
+			lockfile = GLib.File.new_for_path ("var/lib/pacman/db.lck");
+		}
+
 		public override void activate () {
 			// nothing to do
 		}
--- a/src/pamac-user-daemon/CMakeLists.txt
+++ b/src/pamac-user-daemon/CMakeLists.txt
@@ -1,103 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}")
-set (PKGDATADIR "${DATADIR}/pamac")
-set (GETTEXT_PACKAGE "pamac")
-set (RELEASE_NAME "pamac")
-set (CMAKE_C_FLAGS "")
-set (PREFIX ${CMAKE_INSTALL_PREFIX})
-set (VERSION "6.6.4")
-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")
-add_definitions (${DEPS_CFLAGS})
-include_directories ( ${CMAKE_BINARY_DIR}/src )
-link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
-link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src )
-find_package (Vala REQUIRED)
-include (ValaVersion)
-ensure_vala_version ("0.38" MINIMUM)
-include (ValaPrecompile)
-
-set (VALA_PACKAGES ${VALA_PACKAGES} posix)
-set (VALA_PACKAGES ${VALA_PACKAGES} gtk+-3.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} json-glib-1.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} libalpm)
-set (VALA_PACKAGES ${VALA_PACKAGES} libsoup-2.4)
-set (VALA_PACKAGES ${VALA_PACKAGES} gio-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0)
-set (VALA_PACKAGES ${VALA_PACKAGES} gobject-2.0)
-
-set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala)
-set (APP_SOURCES ${APP_SOURCES} alpm_config.vala)
-set (APP_SOURCES ${APP_SOURCES} pamac_config.vala)
-set (APP_SOURCES ${APP_SOURCES} user_daemon.vala)
-
-set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/pamacclassic.vapi)
-
-if (ENABLE_UPDATE_ICON)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_UPDATE_ICON)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_UPDATE_ICON " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_UPDATE_ICON " )
-endif ()
-if (ENABLE_HAMBURGER)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D ENABLE_HAMBURGER)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HAMBURGER " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_HAMBURGER " )
-endif ()
-if (KDE_TRAY)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D KDE_TRAY)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DKDE_TRAY " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DKDE_TRAY " )
-endif ()
-if (DISABLE_AUR)
-	set (COMPILE_OPTIONS ${COMPILE_OPTIONS} -D DISABLE_AUR)
-	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_AUR " )
-	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_AUR " )
-endif ()
-set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --vapidir=${CMAKE_SOURCE_DIR}/src/vapis )
-
-if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo"))
-	set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
-endif()
-
-
-vala_precompile(VALA_C pamac-user-daemon
-	${APP_SOURCES}
-PACKAGES
-	${VALA_PACKAGES}
-CUSTOM_VAPIS
-	${CUSTOM_VAPIS_LIST}
-OPTIONS
-	${COMPILE_OPTIONS}
-)
-
-add_executable(pamac-user-daemon ${VALA_C})
-set ( pamac-user-daemon_DEPENDENCIES ${pamac-user-daemon_DEPENDENCIES} pamacclassic )
-add_dependencies( pamac-user-daemon ${pamac-user-daemon_DEPENDENCIES} )
-
-
-install(TARGETS
-	pamac-user-daemon
-RUNTIME DESTINATION
-	${CMAKE_INSTALL_BINDIR}
-)
-if(HAVE_VALADOC)
-	valadoc(pamac-user-daemon
-		${CMAKE_BINARY_DIR}/valadoc/pamac-user-daemon
-		${APP_SOURCES}
-	PACKAGES
-		${VALA_PACKAGES}
-	CUSTOM_VAPIS
-		${CUSTOM_VAPIS_LIST}
-	)
-	install(DIRECTORY
-		${CMAKE_BINARY_DIR}/valadoc
-	DESTINATION
-		${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac
-	)
-endif()
--- a/src/pamac-user-daemon/alpm_config.vala
+++ b/src/pamac-user-daemon/alpm_config.vala
@@ -1 +0,0 @@
-../alpm_config.vala
--- a/src/pamac-user-daemon/meson.build
+++ b/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.6.4')
+cfg_pamac_user_daemon.set('VERSION', '7.0.2')
 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]
@@ -17,12 +20,10 @@ pamac_user_daemon_deps += [gio_2_0_dep]
 pamac_user_daemon_deps += [glib_2_0_dep]
 pamac_user_daemon_deps += [gobject_2_0_dep]
 pamac_user_daemon_sources = [cfgfile_2]
-pamac_user_daemon_sources += ['alpm_config.vala']
-pamac_user_daemon_sources += ['pamac_config.vala']
 pamac_user_daemon_sources += ['user_daemon.vala']
 pamac_user_daemon_vala_args = ['--pkg','posix']
 pamac_user_daemon_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')]
-pamac_user_daemon_dependencies = [pamacclassic_library]
+pamac_user_daemon_dependencies = [Pamac_library]
 pamac_user_daemon_c_args = []
 if ENABLE_UPDATE_ICON
  pamac_user_daemon_vala_args += ['-D', 'ENABLE_UPDATE_ICON']
@@ -40,7 +41,15 @@ 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)

--- a/src/pamac-user-daemon/pamac_config.vala
+++ b/src/pamac-user-daemon/pamac_config.vala
@@ -1 +0,0 @@
-../pamac_config.vala
--- a/src/pamac-user-daemon/user_daemon.vala
+++ b/src/pamac-user-daemon/user_daemon.vala
@@ -34,10 +34,10 @@ namespace Pamac {
 #else
 		private bool check_aur_updates;
 		private bool aur_updates_checked;
-#endif
 		private Json.Array aur_updates_results;
 		private HashTable<string, Json.Array> aur_search_results;
 		private HashTable<string, Json.Object> aur_infos;
+#endif

 		public signal void get_updates_finished (Updates updates);

@@ -49,10 +49,16 @@ namespace Pamac {
 			aur_search_results = new HashTable<string, Json.Array> (str_hash, str_equal);
 			aur_infos = new HashTable<string, Json.Object> (str_hash, str_equal);
 #endif
-			refresh_handle ();
+			try {
+				refresh_handle ();
+			} catch (IOError e) {
+				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+			}
 		}

-		public void refresh_handle () {
+		public void refresh_handle () throws DBusError, IOError {
 			alpm_config.reload ();
 			alpm_handle = alpm_config.get_handle ();
 			if (alpm_handle == null) {
@@ -67,15 +73,15 @@ namespace Pamac {
 			}
 		}

-		public bool get_checkspace () {
+		public bool get_checkspace () throws DBusError, IOError {
 			return alpm_handle.checkspace == 1 ? true : false;
 		}

-		public string get_lockfile () {
+		public string get_lockfile () throws DBusError, IOError {
 			return alpm_handle.lockfile;
 		}

-		public string[] get_ignorepkgs () {
+		public string[] get_ignorepkgs () throws DBusError, IOError {
 			string[] result = {};
 			unowned Alpm.List<unowned string> ignorepkgs = alpm_handle.ignorepkgs;
 			while (ignorepkgs != null) {
@@ -86,14 +92,14 @@ namespace Pamac {
 			return result;
 		}

-		public bool should_hold (string pkgname) {
+		public bool should_hold (string pkgname) throws DBusError, IOError {
 			if (alpm_config.get_holdpkgs ().find_custom (pkgname, strcmp) != null) {
 				return true;
 			}
 			return false;
 		}

-		public uint get_pkg_reason (string pkgname) {
+		public uint get_pkg_reason (string pkgname) throws DBusError, IOError {
 			unowned Alpm.Package? pkg = alpm_handle.localdb.get_pkg (pkgname);
 			if (pkg != null) {
 				return pkg.reason;
@@ -101,7 +107,7 @@ namespace Pamac {
 			return 0;
 		}

-		public uint get_pkg_origin (string pkgname) {
+		public uint get_pkg_origin (string pkgname) throws DBusError, IOError {
 			unowned Alpm.Package? pkg = alpm_handle.localdb.get_pkg (pkgname);
 			if (pkg != null) {
 				return pkg.origin;
@@ -153,7 +159,7 @@ namespace Pamac {
 			}
 		}

-		public async AlpmPackage[] get_installed_pkgs () {
+		public async AlpmPackage[] get_installed_pkgs () throws DBusError, IOError {
 			AlpmPackage[] pkgs = {};
 			unowned Alpm.List<unowned Alpm.Package> pkgcache = alpm_handle.localdb.pkgcache;
 			while (pkgcache != null) {
@@ -164,7 +170,7 @@ namespace Pamac {
 			return pkgs;
 		}

-		public async AlpmPackage[] get_explicitly_installed_pkgs () {
+		public async AlpmPackage[] get_explicitly_installed_pkgs () throws DBusError, IOError {
 			AlpmPackage[] pkgs = {};
 			unowned Alpm.List<unowned Alpm.Package> pkgcache = alpm_handle.localdb.pkgcache;
 			while (pkgcache != null) {
@@ -177,7 +183,7 @@ namespace Pamac {
 			return pkgs;
 		}

-		public async AlpmPackage[] get_foreign_pkgs () {
+		public async AlpmPackage[] get_foreign_pkgs () throws DBusError, IOError {
 			AlpmPackage[] pkgs = {};
 			unowned Alpm.List<unowned Alpm.Package> pkgcache = alpm_handle.localdb.pkgcache;
 			while (pkgcache != null) {
@@ -201,7 +207,7 @@ namespace Pamac {
 			return pkgs;
 		}

-		public async AlpmPackage[] get_orphans () {
+		public async AlpmPackage[] get_orphans () throws DBusError, IOError {
 			AlpmPackage[] pkgs = {};
 			unowned Alpm.List<unowned Alpm.Package> pkgcache = alpm_handle.localdb.pkgcache;
 			while (pkgcache != null) {
@@ -224,11 +230,11 @@ namespace Pamac {
 			return pkgs;
 		}

-		public AlpmPackage get_installed_pkg (string pkgname) {
+		public AlpmPackage get_installed_pkg (string pkgname) throws DBusError, IOError {
 			return initialise_pkg_struct (alpm_handle.localdb.get_pkg (pkgname));
 		}

-		public AlpmPackage find_installed_satisfier (string depstring) {
+		public AlpmPackage find_installed_satisfier (string depstring) throws DBusError, IOError {
 			return initialise_pkg_struct (Alpm.find_satisfier (alpm_handle.localdb.pkgcache, depstring));
 		}

@@ -246,7 +252,7 @@ namespace Pamac {
 			return pkg;
 		}

-		public AlpmPackage get_sync_pkg (string pkgname) {
+		public AlpmPackage get_sync_pkg (string pkgname) throws DBusError, IOError {
 			return initialise_pkg_struct (get_syncpkg (pkgname));
 		}

@@ -264,7 +270,7 @@ namespace Pamac {
 			return pkg;
 		}

-		public AlpmPackage find_sync_satisfier (string depstring) {
+		public AlpmPackage find_sync_satisfier (string depstring) throws DBusError, IOError {
 			return initialise_pkg_struct (find_dbs_satisfier (depstring));
 		}

@@ -293,7 +299,7 @@ namespace Pamac {
 			return result;
 		}

-		public async AlpmPackage[] search_pkgs (string search_string) {
+		public async AlpmPackage[] search_pkgs (string search_string) throws DBusError, IOError {
 			AlpmPackage[] result = {};
 			Alpm.List<unowned Alpm.Package> alpm_pkgs = search_all_dbs (search_string);
 			unowned Alpm.List<unowned Alpm.Package> list = alpm_pkgs;
@@ -323,9 +329,9 @@ namespace Pamac {
 			};
 		}

-		public async AURPackage[] search_in_aur (string search_string) {
+		public async AURPackage[] search_in_aur (string search_string) throws DBusError, IOError {
 			if (!aur_search_results.contains (search_string)) {
-				Json.Array pkgs = yield AUR.search (search_string.split (" "));
+				Json.Array pkgs = yield search (search_string.split (" "));
 				aur_search_results.insert (search_string, pkgs);
 			}
 			AURPackage[] result = {};
@@ -340,7 +346,7 @@ namespace Pamac {
 			return result;
 		}

-		public async AURPackageDetails get_aur_details (string pkgname) {
+		public async AURPackageDetails get_aur_details (string pkgname) throws DBusError, IOError {
 			string name = "";
 			string version = "";
 			string desc = "";
@@ -362,7 +368,7 @@ namespace Pamac {
 			string[] conflicts = {};
 			var details = AURPackageDetails ();
 			if (!aur_infos.contains (pkgname)) {
-				Json.Array results = yield AUR.multiinfo ({pkgname});
+				Json.Array results = yield multiinfo ({pkgname});
 				if (results.get_length () > 0) {
 					aur_infos.insert (pkgname, results.get_object_element (0));
 				}
@@ -483,7 +489,7 @@ namespace Pamac {
 		}
 #endif

-		public string[] get_repos_names () {
+		public string[] get_repos_names () throws DBusError, IOError {
 			string[] repos_names = {};
 			unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
 			while (syncdbs != null) {
@@ -494,7 +500,7 @@ namespace Pamac {
 			return repos_names;
 		}

-		public async AlpmPackage[] get_repo_pkgs (string repo) {
+		public async AlpmPackage[] get_repo_pkgs (string repo) throws DBusError, IOError {
 			AlpmPackage[] pkgs = {};
 			unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
 			while (syncdbs != null) {
@@ -518,7 +524,7 @@ namespace Pamac {
 			return pkgs;
 		}

-		public string[] get_groups_names () {
+		public string[] get_groups_names () throws DBusError, IOError {
 			string[] groups_names = {};
 			unowned Alpm.List<unowned Alpm.Group> groupcache = alpm_handle.localdb.groupcache;
 			while (groupcache != null) {
@@ -574,7 +580,7 @@ namespace Pamac {
 			return result;
 		}

-		public async AlpmPackage[] get_group_pkgs (string groupname) {
+		public async AlpmPackage[] get_group_pkgs (string groupname) throws DBusError, IOError {
 			AlpmPackage[] pkgs = {};
 			Alpm.List<unowned Alpm.Package> alpm_pkgs = group_pkgs (groupname);
 			unowned Alpm.List<unowned Alpm.Package> list = alpm_pkgs;
@@ -586,7 +592,7 @@ namespace Pamac {
 			return pkgs;
 		}

-		public string[] get_pkg_uninstalled_optdeps (string pkgname) {
+		public string[] get_pkg_uninstalled_optdeps (string pkgname) throws DBusError, IOError {
 			string[] optdeps = {};
 			unowned Alpm.Package? alpm_pkg = alpm_handle.localdb.get_pkg (pkgname);
 			if (alpm_pkg == null) {
@@ -605,7 +611,7 @@ namespace Pamac {
 			return optdeps;
 		}

-		public AlpmPackageDetails get_pkg_details (string pkgname) {
+		public AlpmPackageDetails get_pkg_details (string pkgname) throws DBusError, IOError {
 			string name = "";
 			string version = "";
 			string desc = "";
@@ -779,7 +785,7 @@ namespace Pamac {
 			return details;
 		}

-		public string[] get_pkg_files (string pkgname) {
+		public string[] get_pkg_files (string pkgname) throws DBusError, IOError {
 			string[] files = {};
 			unowned Alpm.Package? alpm_pkg = alpm_handle.localdb.get_pkg (pkgname);
 			if (alpm_pkg != null) {
@@ -813,7 +819,10 @@ namespace Pamac {

 		private int get_updates () {
 			AlpmPackage[] updates_infos = {};
+#if DISABLE_AUR
+#else
 			unowned Alpm.Package? pkg = null;
+#endif
 			unowned Alpm.Package? candidate = null;
 			// use a tmp handle
 			var tmp_handle = alpm_config.get_handle (false, true);
@@ -843,7 +852,10 @@ namespace Pamac {
 					syncdbs.next ();
 				}
 			}
+#if DISABLE_AUR
+#else
 			string[] local_pkgs = {};
+#endif
 			unowned Alpm.List<unowned Alpm.Package> pkgcache = tmp_handle.localdb.pkgcache;
 			while (pkgcache != null) {
 				unowned Alpm.Package installed_pkg = pkgcache.data;
@@ -882,8 +894,8 @@ namespace Pamac {
 			if (check_aur_updates) {
 				// get aur updates
 				if (!aur_updates_checked) {
-					AUR.multiinfo.begin (local_pkgs, (obj, res) => {
-						aur_updates_results = AUR.multiinfo.end (res);
+					multiinfo.begin (local_pkgs, (obj, res) => {
+						aur_updates_results = multiinfo.end (res);
 						aur_updates_checked = true;
 						var updates = Updates () {
 							repos_updates = (owned) updates_infos,
@@ -936,16 +948,16 @@ namespace Pamac {
 #endif

 #if DISABLE_AUR
-		public void start_get_updates () {
+		public void start_get_updates () throws DBusError, IOError {
 #else
-		public void start_get_updates (bool check_aur_updates_) {
+		public void start_get_updates (bool check_aur_updates_) throws DBusError, IOError {
 			check_aur_updates = check_aur_updates_;
 #endif
 			new Thread<int> ("get updates thread", get_updates);
 		}

 		[DBus (no_reply = true)]
-		public void quit () {
+		public void quit () throws DBusError, IOError {
 			loop.quit ();
 		}
 	// End of Daemon Object
@@ -1020,8 +1032,10 @@ void on_bus_acquired (DBusConnection conn) {

 void main () {
 	// i18n
+	Intl.bindtextdomain(Constants.GETTEXT_PACKAGE, Path.build_filename(Constants.DATADIR,"locale"));
 	Intl.setlocale (LocaleCategory.ALL, "");
-	Intl.textdomain (GETTEXT_PACKAGE);
+	Intl.textdomain(Constants.GETTEXT_PACKAGE);
+	Intl.bind_textdomain_codeset(Constants.GETTEXT_PACKAGE, "utf-8" );

 	Bus.own_name (BusType.SESSION,
 				"org.pamac.user",
--- a/src/pamac_config.vala
+++ b/src/pamac_config.vala
@@ -19,7 +19,7 @@
 */

 namespace Pamac {
-	class Config {
+	public class Config {
 		HashTable<string,string> _environment_variables;

 		public bool recurse { get; private set; }
--- a/src/pamacclassic.pc
+++ b/src/pamacclassic.pc
@@ -1,10 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@DOLLAR@{prefix}/${CMAKE_INSTALL_LIBDIR}
-includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}
-
-Name: pamacclassic
-Description: pamacclassic
-Version: 6.6.4
-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
--- a/src/preferences_dialog.vala
+++ b/src/preferences_dialog.vala
@@ -1,7 +1,7 @@
 /*
 *  pamac-vala
 *
- *  Copyright (C) 2017 Chris Cromer <cromer@cromnix.org>
+ *  Copyright (C) 2017-2019 Chris Cromer <cromer@cromnix.org>
 *  Copyright (C) 2015-2017 Guillaume Benoit <guillaume@manjaro.org>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -117,8 +117,8 @@ namespace Pamac {
 			cache_only_uninstalled_checkbutton.active = transaction.rm_only_uninstalled;

 			// Set up terminal
-			terminal_background.set_use_alpha (false);
-			terminal_foreground.set_use_alpha (false);
+			terminal_background.use_alpha = false;
+			terminal_foreground.use_alpha = false;
 			Gdk.RGBA rgba = Gdk.RGBA ();
 			bool tmp = rgba.parse (transaction.terminal_background);
 			terminal_background.rgba = rgba;
@@ -274,10 +274,10 @@ namespace Pamac {

 		void on_select_font () {
 			var settings = new Settings ("org.pamac.main");
-			settings.set_string ("terminal-font", terminal_font.get_font_name ());
+			settings.set_string ("terminal-font", terminal_font.get_font ());
 			config_changed();
 			transaction.start_save_pamac_config ();
-			transaction.update_terminal_font (terminal_font.get_font_name ());
+			transaction.update_terminal_font (terminal_font.get_font ());
 		}

 #if DISABLE_AUR
--- a/src/transaction.vala
+++ b/src/transaction.vala
@@ -1,7 +1,7 @@
 /*
 *  pamac-vala
 *
- *  Copyright (C) 2017 Chris Cromer <cromer@cromnix.org>
+ *  Copyright (C) 2017-2019 Chris Cromer <cromer@cromnix.org>
 *  Copyright (C) 2014-2017 Guillaume Benoit <guillaume@manjaro.org>
 *
 *  This program is free software; you can redistribute it and/or modify
@@ -19,82 +19,85 @@
 */

 //using Math
+//using Vte
+//using Posix

 namespace Pamac {
+	
 	[DBus (name = "org.pamac.user")]
 	interface UserDaemon : Object {
-		public abstract void refresh_handle () throws IOError;
-		public abstract AlpmPackage get_installed_pkg (string pkgname) throws IOError;
-		public abstract bool get_checkspace () throws IOError;
-		public abstract string[] get_ignorepkgs () throws IOError;
-		public abstract bool should_hold (string pkgname) throws IOError;
-		public abstract uint get_pkg_reason (string pkgname) throws IOError;
-		public abstract uint get_pkg_origin (string pkgname) throws IOError;
-		public abstract async AlpmPackage[] get_installed_pkgs () throws IOError;
-		public abstract async AlpmPackage[] get_explicitly_installed_pkgs () throws IOError;
-		public abstract async AlpmPackage[] get_foreign_pkgs () throws IOError;
-		public abstract async AlpmPackage[] get_orphans () throws IOError;
-		public abstract AlpmPackage find_installed_satisfier (string depstring) throws IOError;
-		public abstract AlpmPackage get_sync_pkg (string pkgname) throws IOError;
-		public abstract AlpmPackage find_sync_satisfier (string depstring) throws IOError;
-		public abstract async AlpmPackage[] search_pkgs (string search_string) throws IOError;
+		public abstract void refresh_handle () throws DBusError, IOError;
+		public abstract AlpmPackage get_installed_pkg (string pkgname) throws DBusError, IOError;
+		public abstract bool get_checkspace () throws DBusError, IOError;
+		public abstract string[] get_ignorepkgs () throws DBusError, IOError;
+		public abstract bool should_hold (string pkgname) throws DBusError, IOError;
+		public abstract uint get_pkg_reason (string pkgname) throws DBusError, IOError;
+		public abstract uint get_pkg_origin (string pkgname) throws DBusError, IOError;
+		public abstract async AlpmPackage[] get_installed_pkgs () throws DBusError, IOError;
+		public abstract async AlpmPackage[] get_explicitly_installed_pkgs () throws DBusError, IOError;
+		public abstract async AlpmPackage[] get_foreign_pkgs () throws DBusError, IOError;
+		public abstract async AlpmPackage[] get_orphans () throws DBusError, IOError;
+		public abstract AlpmPackage find_installed_satisfier (string depstring) throws DBusError, IOError;
+		public abstract AlpmPackage get_sync_pkg (string pkgname) throws DBusError, IOError;
+		public abstract AlpmPackage find_sync_satisfier (string depstring) throws DBusError, IOError;
+		public abstract async AlpmPackage[] search_pkgs (string search_string) throws DBusError, IOError;
 #if DISABLE_AUR
 #else
-		public abstract async AURPackage[] search_in_aur (string search_string) throws IOError;
+		public abstract async AURPackage[] search_in_aur (string search_string) throws DBusError, IOError;
 #endif
-		public abstract string[] get_repos_names () throws IOError;
-		public abstract async AlpmPackage[] get_repo_pkgs (string repo) throws IOError;
-		public abstract string[] get_groups_names () throws IOError;
-		public abstract async AlpmPackage[] get_group_pkgs (string groupname) throws IOError;
-		public abstract AlpmPackageDetails get_pkg_details (string pkgname) throws IOError;
-		public abstract string[] get_pkg_files (string pkgname) throws IOError;
+		public abstract string[] get_repos_names () throws DBusError, IOError;
+		public abstract async AlpmPackage[] get_repo_pkgs (string repo) throws DBusError, IOError;
+		public abstract string[] get_groups_names () throws DBusError, IOError;
+		public abstract async AlpmPackage[] get_group_pkgs (string groupname) throws DBusError, IOError;
+		public abstract AlpmPackageDetails get_pkg_details (string pkgname) throws DBusError, IOError;
+		public abstract string[] get_pkg_files (string pkgname) throws DBusError, IOError;
 #if DISABLE_AUR
 #else
-		public abstract async AURPackageDetails get_aur_details (string pkgname) throws IOError;
+		public abstract async AURPackageDetails get_aur_details (string pkgname) throws DBusError, IOError;
 #endif
-		public abstract string[] get_pkg_uninstalled_optdeps (string pkgname) throws IOError;
+		public abstract string[] get_pkg_uninstalled_optdeps (string pkgname) throws DBusError, IOError;
 #if DISABLE_AUR
-		public abstract void start_get_updates () throws IOError;
+		public abstract void start_get_updates () throws DBusError, IOError;
 #else
-		public abstract void start_get_updates (bool check_aur_updates) throws IOError;
+		public abstract void start_get_updates (bool check_aur_updates) throws DBusError, IOError;
 #endif
 		[DBus (no_reply = true)]
-		public abstract void quit () throws IOError;
+		public abstract void quit () throws DBusError, IOError;
 		public signal void get_updates_finished (Updates updates);
 	}
 	[DBus (name = "org.pamac.system")]
 	interface SystemDaemon : Object {
-		public abstract void set_environment_variables (HashTable<string,string> variables) throws IOError;
-		public abstract string[] get_mirrors_countries () throws IOError;
-		public abstract ErrorInfos get_current_error () throws IOError;
-		public abstract bool get_lock () throws IOError;
-		public abstract bool unlock () throws IOError;
-		public abstract void start_get_authorization () throws IOError;
-		public abstract void start_save_pamac_config () throws IOError;
-		public abstract void start_write_alpm_config (HashTable<string,Variant> new_alpm_conf) throws IOError;
-		public abstract void start_write_mirrors_config (HashTable<string,Variant> new_mirrors_conf) throws IOError;
-		public abstract void start_generate_mirrors_list () throws IOError;
-		public abstract void clean_cache (uint64 keep_nb, bool only_uninstalled) throws IOError;
-		public abstract void start_set_pkgreason (string pkgname, uint reason) throws IOError;
-		public abstract void start_refresh (bool force) throws IOError;
-		public abstract void start_sysupgrade_prepare (bool enable_downgrade, string[] temporary_ignorepkgs) throws IOError;
+		public abstract void set_environment_variables (HashTable<string,string> variables) throws DBusError, IOError;
+		public abstract string[] get_mirrors_countries () throws DBusError, IOError;
+		public abstract ErrorInfos get_current_error () throws DBusError, IOError;
+		public abstract bool get_lock () throws DBusError, IOError;
+		public abstract bool unlock () throws DBusError, IOError;
+		public abstract void start_get_authorization () throws DBusError, IOError;
+		public abstract void start_save_pamac_config () throws DBusError, IOError;
+		public abstract void start_write_alpm_config (HashTable<string,Variant> new_alpm_conf) throws DBusError, IOError;
+		public abstract void start_write_mirrors_config (HashTable<string,Variant> new_mirrors_conf) throws DBusError, IOError;
+		public abstract void start_generate_mirrors_list () throws DBusError, IOError;
+		public abstract void clean_cache (uint64 keep_nb, bool only_uninstalled) throws DBusError, IOError;
+		public abstract void start_set_pkgreason (string pkgname, uint reason) throws DBusError, IOError;
+		public abstract void start_refresh (bool force) throws DBusError, IOError;
+		public abstract void start_sysupgrade_prepare (bool enable_downgrade, string[] temporary_ignorepkgs) throws DBusError, IOError;
 #if DISABLE_AUR
-		public abstract void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load) throws IOError;
+		public abstract void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load) throws DBusError, IOError;
 #else
-		public abstract void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load, string[] to_build) throws IOError;
+		public abstract void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load, string[] to_build) throws DBusError, IOError;
 #endif
-		public abstract void choose_provider (int provider) throws IOError;
-		public abstract TransactionSummary get_transaction_summary () throws IOError;
-		public abstract void start_trans_commit () throws IOError;
-		public abstract void trans_release () throws IOError;
-		public abstract void trans_cancel () throws IOError;
+		public abstract void choose_provider (int provider) throws DBusError, IOError;
+		public abstract TransactionSummary get_transaction_summary () throws DBusError, IOError;
+		public abstract void start_trans_commit () throws DBusError, IOError;
+		public abstract void trans_release () throws DBusError, IOError;
+		public abstract void trans_cancel () throws DBusError, IOError;
 #if DISABLE_AUR
-		public abstract void start_get_updates () throws IOError;
+		public abstract void start_get_updates () throws DBusError, IOError;
 #else
-		public abstract void start_get_updates (bool check_aur_updates) throws IOError;
+		public abstract void start_get_updates (bool check_aur_updates) throws DBusError, IOError;
 #endif
 		[DBus (no_reply = true)]
-		public abstract void quit () throws IOError;
+		public abstract void quit () throws DBusError, IOError;
 		public signal void get_updates_finished (Updates updates);
 		public signal void emit_event (uint primary_event, uint secondary_event, string[] details);
 		public signal void emit_providers (string depend, string[] providers);
@@ -344,6 +347,9 @@ namespace Pamac {
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
 				return ErrorInfos ();
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				return ErrorInfos ();
 			}
 		}

@@ -354,6 +360,8 @@ namespace Pamac {
 				countries = system_daemon.get_mirrors_countries ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return countries;
 		}
@@ -365,6 +373,8 @@ namespace Pamac {
 				locked = system_daemon.get_lock ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return locked;
 		}
@@ -375,6 +385,8 @@ namespace Pamac {
 				unlocked = system_daemon.unlock ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return unlocked;
 		}
@@ -390,6 +402,8 @@ namespace Pamac {
 				system_daemon.start_get_authorization ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			yield;
 			system_daemon.disconnect (handler_id);
@@ -403,6 +417,9 @@ namespace Pamac {
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
 				system_daemon.save_pamac_config_finished.disconnect (on_save_pamac_config_finished);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				system_daemon.save_pamac_config_finished.disconnect (on_save_pamac_config_finished);
 			}
 		}

@@ -413,6 +430,9 @@ namespace Pamac {
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
 				system_daemon.write_alpm_config_finished.disconnect (on_write_alpm_config_finished);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				system_daemon.write_alpm_config_finished.disconnect (on_write_alpm_config_finished);
 			}
 		}

@@ -423,6 +443,9 @@ namespace Pamac {
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
 				system_daemon.write_mirrors_config_finished.disconnect (on_write_mirrors_config_finished);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				system_daemon.write_mirrors_config_finished.disconnect (on_write_mirrors_config_finished);
 			}
 		}

@@ -435,7 +458,7 @@ namespace Pamac {
 					copy_item.activate.connect (() => {term.copy_clipboard ();});
 					right_click_menu.append (copy_item);
 					right_click_menu.show_all ();
-					right_click_menu.popup (null, null, null, event.button, event.time);
+					right_click_menu.popup_at_pointer (event);
 					return true;
 				}
 			}
@@ -480,8 +503,8 @@ namespace Pamac {
 						}
 					} catch (Error e) {
 						// cancelled
-						process.send_signal (Posix.SIGINT);
-						process.send_signal (Posix.SIGKILL);
+						process.send_signal (Posix.Signal.INT);
+						process.send_signal (Posix.Signal.KILL);
 					}
 					Idle.add ((owned) callback);
 				});
@@ -529,6 +552,11 @@ namespace Pamac {
 				stop_progressbar_pulse ();
 				system_daemon.generate_mirrors_list_data.disconnect (on_generate_mirrors_list_data);
 				system_daemon.generate_mirrors_list_finished.disconnect (on_generate_mirrors_list_finished);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				stop_progressbar_pulse ();
+				system_daemon.generate_mirrors_list_data.disconnect (on_generate_mirrors_list_data);
+				system_daemon.generate_mirrors_list_finished.disconnect (on_generate_mirrors_list_finished);
 			}
 		}

@@ -537,6 +565,8 @@ namespace Pamac {
 				system_daemon.clean_cache (keep_nb, only_uninstalled);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 		}

@@ -547,6 +577,9 @@ namespace Pamac {
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
 				system_daemon.set_pkgreason_finished.disconnect (on_set_pkgreason_finished);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				system_daemon.set_pkgreason_finished.disconnect (on_set_pkgreason_finished);
 			}
 		}

@@ -566,6 +599,11 @@ namespace Pamac {
 						system_daemon.refresh_finished.disconnect (on_refresh_finished);
 						success = false;
 						finish_transaction ();
+					} catch (DBusError e) {
+						stderr.printf ("DBusError: %s\n", e.message);
+						system_daemon.refresh_finished.disconnect (on_refresh_finished);
+						success = false;
+						finish_transaction ();
 					}
 				} else {
 					success = false;
@@ -579,6 +617,8 @@ namespace Pamac {
 				user_daemon.refresh_handle ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 		}

@@ -588,6 +628,8 @@ namespace Pamac {
 				checkspace = user_daemon.get_checkspace ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return checkspace;
 		}
@@ -598,6 +640,8 @@ namespace Pamac {
 				ignorepkgs = user_daemon.get_ignorepkgs ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return ignorepkgs;
 		}
@@ -613,6 +657,14 @@ namespace Pamac {
 					desc = "",
 					repo = ""
 				};
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				return AlpmPackage () {
+					name = "",
+					version = "",
+					desc = "",
+					repo = ""
+				};
 			}
 		}

@@ -627,6 +679,14 @@ namespace Pamac {
 					desc = "",
 					repo = ""
 				};
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				return AlpmPackage () {
+					name = "",
+					version = "",
+					desc = "",
+					repo = ""
+				};
 			}
 		}

@@ -636,6 +696,8 @@ namespace Pamac {
 				should_hold = user_daemon.should_hold (pkgname);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return should_hold;
 		}
@@ -646,6 +708,8 @@ namespace Pamac {
 				reason = user_daemon.get_pkg_reason (pkgname);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return reason;
 		}
@@ -656,6 +720,8 @@ namespace Pamac {
 				origin = user_daemon.get_pkg_origin (pkgname);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return origin;
 		}
@@ -666,6 +732,8 @@ namespace Pamac {
 				pkgs = yield user_daemon.get_installed_pkgs ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return pkgs;
 		}
@@ -676,6 +744,8 @@ namespace Pamac {
 				pkgs = yield user_daemon.get_explicitly_installed_pkgs ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return pkgs;
 		}
@@ -686,6 +756,8 @@ namespace Pamac {
 				pkgs = yield user_daemon.get_foreign_pkgs ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return pkgs;
 		}
@@ -696,6 +768,8 @@ namespace Pamac {
 				pkgs = yield user_daemon.get_orphans ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return pkgs;
 		}
@@ -711,6 +785,14 @@ namespace Pamac {
 					desc = "",
 					repo = ""
 				};
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				return AlpmPackage () {
+					name = "",
+					version = "",
+					desc = "",
+					repo = ""
+				};
 			}
 		}

@@ -725,6 +807,14 @@ namespace Pamac {
 					desc = "",
 					repo = ""
 				};
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				return AlpmPackage () {
+					name = "",
+					version = "",
+					desc = "",
+					repo = ""
+				};
 			}
 		}

@@ -734,6 +824,8 @@ namespace Pamac {
 				pkgs = yield user_daemon.search_pkgs (search_string);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return pkgs;
 		}
@@ -746,6 +838,8 @@ namespace Pamac {
 				pkgs = yield user_daemon.search_in_aur (search_string);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return pkgs;
 		}
@@ -757,6 +851,8 @@ namespace Pamac {
 				repos_names = user_daemon.get_repos_names ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return repos_names;
 		}
@@ -767,6 +863,8 @@ namespace Pamac {
 				pkgs = yield user_daemon.get_repo_pkgs (repo);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return pkgs;
 		}
@@ -777,6 +875,8 @@ namespace Pamac {
 				groups_names = user_daemon.get_groups_names ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return groups_names;
 		}
@@ -787,6 +887,8 @@ namespace Pamac {
 				pkgs = yield user_daemon.get_group_pkgs (group_name);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return pkgs;
 		}
@@ -797,6 +899,8 @@ namespace Pamac {
 				optdeps = user_daemon.get_pkg_uninstalled_optdeps (pkgname);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return optdeps;
 		}
@@ -820,6 +924,22 @@ namespace Pamac {
 					downloadsize = "",
 					installsize = ""
 				};
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				return AlpmPackageDetails () {
+					name = "",
+					version = "",
+					desc = "",
+					repo = "",
+					url = "",
+					packager = "",
+					builddate = "",
+					installdate = "",
+					reason = "",
+					has_signature = "",
+					downloadsize = "",
+					installsize = ""
+				};
 			}
 		}

@@ -829,6 +949,9 @@ namespace Pamac {
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
 				return {};
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				return {};
 			}
 		}

@@ -847,6 +970,8 @@ namespace Pamac {
 				pkg = yield user_daemon.get_aur_details (pkgname);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			return pkg;
 		}
@@ -864,6 +989,10 @@ namespace Pamac {
 				stderr.printf ("IOError: %s\n", e.message);
 				success = false;
 				finish_transaction ();
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				success = false;
+				finish_transaction ();
 			}
 		}

@@ -879,6 +1008,10 @@ namespace Pamac {
 				stderr.printf ("IOError: %s\n", e.message);
 				success = false;
 				finish_transaction ();
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				success = false;
+				finish_transaction ();
 			}
 		}

@@ -897,6 +1030,10 @@ namespace Pamac {
 				stderr.printf ("IOError: %s\n", e.message);
 				success = false;
 				finish_transaction ();
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				success = false;
+				finish_transaction ();
 			}
 		}

@@ -989,6 +1126,11 @@ namespace Pamac {
 				stop_progressbar_pulse ();
 				success = false;
 				finish_transaction ();
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				stop_progressbar_pulse ();
+				success = false;
+				finish_transaction ();
 			}
 		}

@@ -1056,6 +1198,8 @@ namespace Pamac {
 						system_daemon.choose_provider (index);
 					} catch (IOError e) {
 						stderr.printf ("IOError: %s\n", e.message);
+					} catch (DBusError e) {
+						stderr.printf ("DBusError: %s\n", e.message);
 					}
 				}
 				index++;
@@ -1077,6 +1221,8 @@ namespace Pamac {
 				summary = system_daemon.get_transaction_summary ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			var iter = Gtk.TreeIter ();
 			if (summary.to_remove.length > 0) {
@@ -1206,6 +1352,10 @@ namespace Pamac {
 				stderr.printf ("IOError: %s\n", e.message);
 				success = false;
 				finish_transaction ();
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
+				success = false;
+				finish_transaction ();
 			}
 		}

@@ -1297,6 +1447,8 @@ namespace Pamac {
 					system_daemon.trans_cancel ();
 				} catch (IOError e) {
 					stderr.printf ("IOError: %s\n", e.message);
+				} catch (DBusError e) {
+					stderr.printf ("DBusError: %s\n", e.message);
 				}
 #if DISABLE_AUR
 #else
@@ -1312,6 +1464,8 @@ namespace Pamac {
 				system_daemon.trans_release ();
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 			warning_textbuffer = new StringBuilder ();
 		}
@@ -1324,6 +1478,8 @@ namespace Pamac {
 				}
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 		}

@@ -1982,6 +2138,8 @@ namespace Pamac {
 				system_daemon.set_environment_variables (pamac_config.environment_variables);
 			} catch (IOError e) {
 				stderr.printf ("IOError: %s\n", e.message);
+			} catch (DBusError e) {
+				stderr.printf ("DBusError: %s\n", e.message);
 			}
 		}

--- a/src/vapis/CMakeLists.txt
+++ b/src/vapis/CMakeLists.txt
@@ -1,3 +0,0 @@
-### CMakeLists automatically created with AutoVala
-### Do not edit
-
--- a/src/vapis/libalpm.vapi
+++ b/src/vapis/libalpm.vapi
@@ -36,11 +36,11 @@ 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);
+	public unowned Package? find_satisfier(Alpm.List<unowned Package> pkgs, string depstring);

-	public unowned Package? pkg_find(Alpm.List<Package> haystack, string needle);
+	public unowned Package? pkg_find(Alpm.List<unowned Package> haystack, string needle);

 	public int pkg_vercmp(string a, string b);

@@ -48,7 +48,7 @@ namespace Alpm {
 	 * If a member exists in several databases, only the first database is used.
 	 * IgnorePkg is also handled.
 	 */
-	public Alpm.List<unowned Package?> find_group_pkgs(Alpm.List<DB> dbs, string name);
+	public Alpm.List<unowned Package?> find_group_pkgs(Alpm.List<unowned DB> dbs, string name);

 	/** Returns the string corresponding to an error number. */
 	public unowned string strerror(Errno err);
@@ -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
@@ -243,7 +252,7 @@ namespace Alpm {
 		public string? fetch_pkgurl(string url);

 		[CCode (cname = "alpm_find_dbs_satisfier")]
-		public unowned Package? find_dbs_satisfier(Alpm.List<DB> dbs, string depstring);
+		public unowned Package? find_dbs_satisfier(Alpm.List<unowned DB> dbs, string depstring);

 		/** Returns the current error code from the handle. */
 		[CCode (cname = "alpm_errno")]
@@ -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;
 		}
@@ -371,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<unowned Package> search(Alpm.List<unowned string> needles);

 		public int check_pgp_signature(out SigList siglist);
 	}
@@ -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
@@ -535,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<unowned DB> dbs);

 		public int check_pgp_signature(out SigList siglist);
 	}
@@ -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,
Author	SHA1	Message	Date
Chris Cromer	e35b4c3ada	Fix build with new version of vala	2019-09-17 19:18:57 -03:00
Chris Cromer	ac4595a8d4	new version	2019-07-19 08:44:16 -04:00
Chris Cromer	285431e0ab	fix tray	2019-07-19 08:42:19 -04:00
Chris Cromer	cd1f361c51	fix path assertion error	2019-07-19 08:32:30 -04:00
Chris Cromer	3b66f68b2c	update deprecated code	2019-07-06 20:28:51 -04:00
Chris Cromer	d7cf388ece	ignore build directory	2019-07-06 15:27:51 -04:00
Chris Cromer	bd560cce39	fix url and copyright year #1	2019-07-06 15:26:48 -04:00
Chris Cromer	7b8bab847d	remove cmake support	2019-07-06 15:24:14 -04:00
Chris Cromer	5c10b15c2b	fix gir issue under cmake	2019-07-03 20:06:11 -04:00
Chris Cromer	2e516f79eb	fix build under cmake	2019-06-29 12:28:08 -04:00
Chris Cromer	b2d5118615	update to work with newever versions of vala	2019-06-29 12:07:48 -04:00
Chris Cromer	783baf464b	libalpm 5.1.0 compat	2018-06-02 14:51:40 -04:00