diff --git a/.configure-custom.sh b/.configure-custom.sh new file mode 100644 index 0000000..b1af833 --- /dev/null +++ b/.configure-custom.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +ENABLE_VARS="kde-tray|ON|KDE_TRAY" +ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray" +DISABLE_VARS="aur|ON|DISABLE_AUR" +DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac" diff --git a/.gitignore b/.gitignore index 28d5e38..432165c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,8 @@ -pkgbuild -resources/*~ -resources/*.c -src/*.c -src/pamac.h -src/pamac.vapi -src/libpamac.so -src/pamac-user-daemon -src/pamac-system-daemon -src/pamac-tray -src/pamac-tray-appindicator -src/pamac-manager -src/pamac-install -src/pamac-updater -src/pamac-refresh -data/polkit/org.manjaro.pamac.policy po/*.mo po/*~ po/locale -*.swp +PKGBUILD +*.pkg.tar.xz +*.pkg.tar.xz.sig +data/polkit/org.pamac.policy +/build diff --git a/AUTHORS b/AUTHORS index e7cb480..bc01a95 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,5 @@ -Main developers: +Pamac classic devleopers: + Chris Cromer + +Pamac developers: Guillaume Benoit diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..81b6314 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,82 @@ +### 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(DISABLE_AUR "DISABLE_AUR" OFF) +option(KDE_TRAY "KDE_TRAY" 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/dbus) +add_subdirectory(data/config) +add_subdirectory(data) +add_subdirectory(data/icons/24x24/status) +add_subdirectory(data/icons/16x16/apps) +add_subdirectory(data/config/noaur) +add_subdirectory(data/icons/32x32/apps) +add_subdirectory(data/interface) +add_subdirectory(src) +add_subdirectory(src/aur) +add_subdirectory(src/pamac-user-daemon) +add_subdirectory(src/pamac-tray) +add_subdirectory(src/pamac-install) +add_subdirectory(src/pamac-manager) +add_subdirectory(src/pamac-system-daemon) + diff --git a/Makefile b/Makefile deleted file mode 100644 index aef5126..0000000 --- a/Makefile +++ /dev/null @@ -1,92 +0,0 @@ - -prefix ?= /usr -bindir := $(prefix)/bin -libdir := $(prefix)/lib -includedir := $(prefix)/include -datadir := $(prefix)/share -localedir := $(datadir)/locale -sysconfdir ?= /etc - -use_appindicator ?= false - -all: - cd resources && make resources - cd src && make binaries - [ $(use_appindicator) = true ] && cd src && make pamac-tray-appindicator || echo "no appindicator support" - cd po && make gettext - -clean: - cd resources && make clean - cd src && make clean - cd po && make clean - -install: install_pamac-tray-appindicator - mkdir -p $(prefix)/share/icons/hicolor - cp -r data/icons/* $(prefix)/share/icons/hicolor - mkdir -p $(localedir) - cp -r po/locale/* $(localedir) - install -Dm644 src/pamac.h $(includedir)/pamac.h - install -Dm644 src/pamac.vapi $(datadir)/vala/vapi/pamac.vapi - install -Dm755 src/libpamac.so $(libdir)/libpamac.so - install -Dm755 src/pamac-user-daemon $(bindir)/pamac-user-daemon - install -Dm744 src/pamac-system-daemon $(bindir)/pamac-system-daemon - install -Dm755 src/pamac-tray $(bindir)/pamac-tray - install -Dm755 src/pamac-manager $(bindir)/pamac-manager - ln -srf $(bindir)/pamac-manager $(bindir)/pamac-updater - install -Dm755 src/pamac-install $(bindir)/pamac-install - install -Dm644 data/applications/pamac-tray.desktop $(sysconfdir)/xdg/autostart/pamac-tray.desktop - install -Dm644 data/applications/pamac-manager.desktop $(datadir)/applications/pamac-manager.desktop - install -Dm644 data/applications/pamac-updater.desktop $(datadir)/applications/pamac-updater.desktop - install -Dm644 data/applications/pamac-install.desktop $(datadir)/applications/pamac-install.desktop - install -Dm644 data/config/pamac.conf $(sysconfdir)/pamac.conf - install -Dm644 data/dbus/org.manjaro.pamac.system.conf $(sysconfdir)/dbus-1/system.d/org.manjaro.pamac.system.conf - install -Dm644 data/dbus/org.manjaro.pamac.user.service $(datadir)/dbus-1/services/org.manjaro.pamac.user.service - install -Dm644 data/dbus/org.manjaro.pamac.system.service $(datadir)/dbus-1/system-services/org.manjaro.pamac.system.service - install -Dm644 data/systemd/pamac-system.service $(libdir)/systemd/system/pamac-system.service - install -Dm644 data/systemd/pamac-cleancache.service $(libdir)/systemd/system/pamac-cleancache.service - install -Dm644 data/systemd/pamac-cleancache.timer $(libdir)/systemd/system/pamac-cleancache.timer - install -Dm644 data/systemd/pamac-mirrorlist.service $(libdir)/systemd/system/pamac-mirrorlist.service - install -Dm644 data/systemd/pamac-mirrorlist.timer $(libdir)/systemd/system/pamac-mirrorlist.timer - mkdir -p $(sysconfdir)/systemd/system/multi-user.target.wants - ln -srf $(libdir)/systemd/system/pamac-cleancache.timer $(sysconfdir)/systemd/system/multi-user.target.wants - ln -srf $(libdir)/systemd/system/pamac-mirrorlist.timer $(sysconfdir)/systemd/system/multi-user.target.wants - install -Dm644 data/polkit/org.manjaro.pamac.policy $(datadir)/polkit-1/actions/org.manjaro.pamac.policy - install -Dm644 data/mime/x-alpm-package.xml $(datadir)/mime/packages/x-alpm-package.xml - -install_pamac-tray-appindicator: - install -Dm755 src/pamac-tray-appindicator $(bindir)/pamac-tray-appindicator &> /dev/null && \ - install -Dm644 data/applications/pamac-tray-appindicator.desktop $(sysconfdir)/xdg/autostart/pamac-tray-appindicator.desktop &> /dev/null || echo no appindicator support - -uninstall: - rm -f $(datadir)/icons/hicolor/16x16/apps/system-software-install.png - rm -f $(datadir)/icons/hicolor/24x24/status/pamac-tray-no-update.png - rm -f $(datadir)/icons/hicolor/24x24/status/pamac-tray-update.png - rm -f $(datadir)/icons/hicolor/32x32/apps/system-software-install.png - rm -f $(datadir)/locale/*/LC_MESSAGES/pamac.mo - rm -f $(includedir)/pamac.h - rm -f $(datadir)/vala/vapi/pamac.vapi - rm -f $(libdir)/libpamac.so - rm -f $(bindir)/pamac-user-daemon - rm -f $(bindir)/pamac-system-daemon - rm -f $(bindir)/pamac-tray - rm -f $(bindir)/pamac-tray-appindicator - rm -f $(bindir)/pamac-manager - rm -f $(bindir)/pamac-updater - rm -f $(bindir)/pamac-install - rm -f $(sysconfdir)/xdg/autostart/pamac-tray.desktop - rm -f $(sysconfdir)/xdg/autostart/pamac-tray-appindicator.desktop - rm -f $(datadir)/applications/pamac-manager.desktop - rm -f $(datadir)/applications/pamac-updater.desktop - rm -f $(datadir)/applications/pamac-install.desktop - rm -f $(sysconfdir)/pamac.conf - rm -f $(sysconfdir)/dbus-1/system.d/org.manjaro.pamac.system.conf - rm -f $(datadir)/dbus-1/services/org.manjaro.pamac.user.service - rm -f $(datadir)/dbus-1/system-services/org.manjaro.pamac.system.service - rm -f $(libdir)/systemd/system/pamac-system.service - rm -f $(libdir)/systemd/system/pamac-cleancache.service - rm -f $(sysconfdir)/systemd/system/pamac-cleancache.timer - rm -f $(libdir)/systemd/system/pamac-mirrorlist.service - rm -f $(sysconfdir)/systemd/system/pamac-mirrorlist.timer - rm -f $(libdir)/systemd/system/multi-user.target.wants/pamac-cleancache.timer - rm -f $(datadir)/polkit-1/actions/org.manjaro.pamac.policy - rm -f $(datadir)/mime/packages/x-alpm-package.xml diff --git a/README b/README deleted file mode 100644 index a4e0e9c..0000000 --- a/README +++ /dev/null @@ -1,12 +0,0 @@ -A DBus daemon and Gtk3 frontend for libalpm written in Vala - -Features: -- Alpm bindings for Vala -- a DBus daemon to perform every tasks with root access using polkit to check authorizations -- a Gtk3 Package Manager -- a Gtk3 Updates Manager -- a Tray icon with configurable periodic refresh and updates notifications -- a complete AUR support: - * multiple words search capability - * Enable/Disable check updates from AUR - * Build and update AUR packages diff --git a/README.md b/README.md new file mode 100644 index 0000000..cea0d78 --- /dev/null +++ b/README.md @@ -0,0 +1,67 @@ +# Pamac-classic + +A graphical package manager for pacman + +# Features: + +- Alpm bindings for Vala +- A DBus daemon to perform every tasks with root access using polkit to check authorizations +- A Gtk3 Package Manager +- A Gtk3 Updates Manager +- A Tray icon with configurable periodic refresh and updates notifications +- Complete AUR support: + * Multiple words search capability + * Enable/Disable check updates from AUR + * Build and update AUR packages + +# How to build + +## Requirements + +- GTK+: 3.0 +- GIO: 2.0 +- GLib: 2.0 +- GObject: 2.0 +- Json-Glib: 1.0 +- libalpm +- libcurl +- LibSoup: 2.4 +- polkit-gobject-1 +- libnotify +- vte: 2.91 +- appindicator-gtk3 (optional to build KDE tray icon) +- CMake +- Vala +- AutoVala (optional to regenerate CMake files) + +## Using CMake + +``` +mkdir build +cd build +cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_SYSCONFDIR=/etc +make +``` +### Extra build flags + +- -DDISABLE_AUR=ON (to disable AUR in Pamac) +- -DKDE_TRAY=true (to build kde tray icon instead of gtk tray icon) + +## Using configure + +The configure script is just a wrapper for CMake, in the background the build process is the same. + +``` +./configure --prefix=/usr \ + --libdir=/usr/lib \ + --sysconfdir=/etc +make +``` + +### Extra configure options + +- --disable-aur (to disable Aur in Pamac) +- --enable-kde-tray (to build kde tray icon instead of gtk tray icon) \ No newline at end of file diff --git a/TODO b/TODO deleted file mode 100644 index 8b13789..0000000 --- a/TODO +++ /dev/null @@ -1 +0,0 @@ - diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..1076e7b --- /dev/null +++ b/autogen.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +# Generate translations for certain files such as polkit +pushd "${PWD}"/po +make +make clean +popd + +# Update the autovala environment +export AUTOVALA_CMAKE_SCRIPT="${PWD}"/autovala/cmake +autovala refresh +autovala cmake +cp "${PWD}"/autovala/configure "${PWD}"/configure +cp "${PWD}"/autovala/configure-custom.sh "${PWD}"/.configure-custom.sh diff --git a/autovala/cmake/CMakeLists.txt b/autovala/cmake/CMakeLists.txt new file mode 100644 index 0000000..618fc46 --- /dev/null +++ b/autovala/cmake/CMakeLists.txt @@ -0,0 +1,17 @@ +### 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() + diff --git a/autovala/cmake/FindVala.cmake b/autovala/cmake/FindVala.cmake new file mode 100644 index 0000000..4ddc9a5 --- /dev/null +++ b/autovala/cmake/FindVala.cmake @@ -0,0 +1,80 @@ +## +# 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") diff --git a/autovala/cmake/FindValadoc.cmake b/autovala/cmake/FindValadoc.cmake new file mode 100644 index 0000000..2fc0c73 --- /dev/null +++ b/autovala/cmake/FindValadoc.cmake @@ -0,0 +1,20 @@ + +# 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) diff --git a/autovala/cmake/GObjectIntrospectionMacros.cmake b/autovala/cmake/GObjectIntrospectionMacros.cmake new file mode 100644 index 0000000..6a0dc0b --- /dev/null +++ b/autovala/cmake/GObjectIntrospectionMacros.cmake @@ -0,0 +1,34 @@ +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() diff --git a/autovala/cmake/GSettings.cmake b/autovala/cmake/GSettings.cmake new file mode 100644 index 0000000..8fd745c --- /dev/null +++ b/autovala/cmake/GSettings.cmake @@ -0,0 +1,42 @@ +# 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() diff --git a/autovala/cmake/InstallSymlink.cmake b/autovala/cmake/InstallSymlink.cmake new file mode 100644 index 0000000..68fabef --- /dev/null +++ b/autovala/cmake/InstallSymlink.cmake @@ -0,0 +1,28 @@ +## +# This module with create symlinks during install +## + +macro(install_symlink _filepath _sympath) + get_filename_component(_symname ${_sympath} NAME) + get_filename_component(_installdir ${_sympath} PATH) + + if (BINARY_PACKAGING_MODE) + execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink + ${_filepath} + ${CMAKE_CURRENT_BINARY_DIR}/${_symname}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_symname} + DESTINATION ${_installdir}) + else () + install(CODE " + if (\"\$ENV{DESTDIR}\" STREQUAL \"\") + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink + ${_filepath} + ${_installdir}/${_symname}) + else () + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink + ${_filepath} + \$ENV{DESTDIR}/${_installdir}/${_symname}) + endif () + ") + endif () +endmacro(install_symlink) diff --git a/autovala/cmake/Makefile b/autovala/cmake/Makefile new file mode 100644 index 0000000..aee34c9 --- /dev/null +++ b/autovala/cmake/Makefile @@ -0,0 +1,286 @@ +# 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 + diff --git a/autovala/cmake/ParseArguments.cmake b/autovala/cmake/ParseArguments.cmake new file mode 100644 index 0000000..717c0f5 --- /dev/null +++ b/autovala/cmake/ParseArguments.cmake @@ -0,0 +1,36 @@ +## +# 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) diff --git a/autovala/cmake/README b/autovala/cmake/README new file mode 100644 index 0000000..9d45b32 --- /dev/null +++ b/autovala/cmake/README @@ -0,0 +1,10 @@ + 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 + diff --git a/autovala/cmake/README.Vala.rst b/autovala/cmake/README.Vala.rst new file mode 100644 index 0000000..bcc59b7 --- /dev/null +++ b/autovala/cmake/README.Vala.rst @@ -0,0 +1,173 @@ +========== +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 + .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 + .h and _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 diff --git a/autovala/cmake/Tests.cmake b/autovala/cmake/Tests.cmake new file mode 100644 index 0000000..76ba0b7 --- /dev/null +++ b/autovala/cmake/Tests.cmake @@ -0,0 +1,5 @@ +# 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() diff --git a/autovala/cmake/Translations.cmake b/autovala/cmake/Translations.cmake new file mode 100644 index 0000000..f4d6853 --- /dev/null +++ b/autovala/cmake/Translations.cmake @@ -0,0 +1,66 @@ +# 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() diff --git a/autovala/cmake/ValaPrecompile.cmake b/autovala/cmake/ValaPrecompile.cmake new file mode 100644 index 0000000..0061c12 --- /dev/null +++ b/autovala/cmake/ValaPrecompile.cmake @@ -0,0 +1,243 @@ +## +# 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 +# .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 +# .h and _internal.h +# +# GENERATE_GIR +# Have the compiler generate a GObject-Introspection repository file with +# name: .gir. This can be later used to create a binary typelib +# using the GI compiler. +# +# GENERATE_SYMBOLS +# Output a .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) diff --git a/autovala/cmake/ValaVersion.cmake b/autovala/cmake/ValaVersion.cmake new file mode 100644 index 0000000..07946de --- /dev/null +++ b/autovala/cmake/ValaVersion.cmake @@ -0,0 +1,153 @@ +## +# 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 . +# +# 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) diff --git a/autovala/cmake/Valadoc.cmake b/autovala/cmake/Valadoc.cmake new file mode 100644 index 0000000..cc79074 --- /dev/null +++ b/autovala/cmake/Valadoc.cmake @@ -0,0 +1,38 @@ +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) diff --git a/autovala/configure b/autovala/configure new file mode 100755 index 0000000..12c63e7 --- /dev/null +++ b/autovala/configure @@ -0,0 +1,314 @@ +#!/bin/sh + +# Autotools-style (./configure) wrapper for 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 +# by Evan Nemerson +# , 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 +# . +# +# To the extent possible under law, the author(s) hereby waive all +# copyright and related or neighboring rights to this work. For +# details, see + +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 <&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}" diff --git a/autovala/configure-custom.sh b/autovala/configure-custom.sh new file mode 100644 index 0000000..b1af833 --- /dev/null +++ b/autovala/configure-custom.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +ENABLE_VARS="kde-tray|ON|KDE_TRAY" +ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray" +DISABLE_VARS="aur|ON|DISABLE_AUR" +DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac" diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt new file mode 100644 index 0000000..618fc46 --- /dev/null +++ b/cmake/CMakeLists.txt @@ -0,0 +1,17 @@ +### 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() + diff --git a/cmake/FindVala.cmake b/cmake/FindVala.cmake new file mode 100644 index 0000000..4ddc9a5 --- /dev/null +++ b/cmake/FindVala.cmake @@ -0,0 +1,80 @@ +## +# 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") diff --git a/cmake/FindValadoc.cmake b/cmake/FindValadoc.cmake new file mode 100644 index 0000000..2fc0c73 --- /dev/null +++ b/cmake/FindValadoc.cmake @@ -0,0 +1,20 @@ + +# 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) diff --git a/cmake/GObjectIntrospectionMacros.cmake b/cmake/GObjectIntrospectionMacros.cmake new file mode 100644 index 0000000..6a0dc0b --- /dev/null +++ b/cmake/GObjectIntrospectionMacros.cmake @@ -0,0 +1,34 @@ +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() diff --git a/cmake/GSettings.cmake b/cmake/GSettings.cmake new file mode 100644 index 0000000..8fd745c --- /dev/null +++ b/cmake/GSettings.cmake @@ -0,0 +1,42 @@ +# 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() diff --git a/cmake/InstallSymlink.cmake b/cmake/InstallSymlink.cmake new file mode 100644 index 0000000..68fabef --- /dev/null +++ b/cmake/InstallSymlink.cmake @@ -0,0 +1,28 @@ +## +# This module with create symlinks during install +## + +macro(install_symlink _filepath _sympath) + get_filename_component(_symname ${_sympath} NAME) + get_filename_component(_installdir ${_sympath} PATH) + + if (BINARY_PACKAGING_MODE) + execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink + ${_filepath} + ${CMAKE_CURRENT_BINARY_DIR}/${_symname}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_symname} + DESTINATION ${_installdir}) + else () + install(CODE " + if (\"\$ENV{DESTDIR}\" STREQUAL \"\") + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink + ${_filepath} + ${_installdir}/${_symname}) + else () + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink + ${_filepath} + \$ENV{DESTDIR}/${_installdir}/${_symname}) + endif () + ") + endif () +endmacro(install_symlink) diff --git a/cmake/Makefile b/cmake/Makefile new file mode 100644 index 0000000..aee34c9 --- /dev/null +++ b/cmake/Makefile @@ -0,0 +1,286 @@ +# 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 + diff --git a/cmake/ParseArguments.cmake b/cmake/ParseArguments.cmake new file mode 100644 index 0000000..717c0f5 --- /dev/null +++ b/cmake/ParseArguments.cmake @@ -0,0 +1,36 @@ +## +# 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) diff --git a/cmake/README b/cmake/README new file mode 100644 index 0000000..9d45b32 --- /dev/null +++ b/cmake/README @@ -0,0 +1,10 @@ + 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 + diff --git a/cmake/README.Vala.rst b/cmake/README.Vala.rst new file mode 100644 index 0000000..bcc59b7 --- /dev/null +++ b/cmake/README.Vala.rst @@ -0,0 +1,173 @@ +========== +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 + .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 + .h and _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 diff --git a/cmake/Tests.cmake b/cmake/Tests.cmake new file mode 100644 index 0000000..76ba0b7 --- /dev/null +++ b/cmake/Tests.cmake @@ -0,0 +1,5 @@ +# 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() diff --git a/cmake/Translations.cmake b/cmake/Translations.cmake new file mode 100644 index 0000000..f4d6853 --- /dev/null +++ b/cmake/Translations.cmake @@ -0,0 +1,66 @@ +# 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() diff --git a/cmake/ValaPrecompile.cmake b/cmake/ValaPrecompile.cmake new file mode 100644 index 0000000..0061c12 --- /dev/null +++ b/cmake/ValaPrecompile.cmake @@ -0,0 +1,243 @@ +## +# 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 +# .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 +# .h and _internal.h +# +# GENERATE_GIR +# Have the compiler generate a GObject-Introspection repository file with +# name: .gir. This can be later used to create a binary typelib +# using the GI compiler. +# +# GENERATE_SYMBOLS +# Output a .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) diff --git a/cmake/ValaVersion.cmake b/cmake/ValaVersion.cmake new file mode 100644 index 0000000..07946de --- /dev/null +++ b/cmake/ValaVersion.cmake @@ -0,0 +1,153 @@ +## +# 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 . +# +# 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) diff --git a/cmake/Valadoc.cmake b/cmake/Valadoc.cmake new file mode 100644 index 0000000..cc79074 --- /dev/null +++ b/cmake/Valadoc.cmake @@ -0,0 +1,38 @@ +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) diff --git a/configure b/configure new file mode 100755 index 0000000..12c63e7 --- /dev/null +++ b/configure @@ -0,0 +1,314 @@ +#!/bin/sh + +# Autotools-style (./configure) wrapper for 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 +# by Evan Nemerson +# , 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 +# . +# +# To the extent possible under law, the author(s) hereby waive all +# copyright and related or neighboring rights to this work. For +# details, see + +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 <&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}" diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt new file mode 100644 index 0000000..70565e0 --- /dev/null +++ b/data/CMakeLists.txt @@ -0,0 +1,87 @@ +### 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) +if (DISABLE_AUR) + EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml) +EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml) +ADD_CUSTOM_COMMAND ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.c + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml ${CMAKE_CURRENT_SOURCE_DIR}/interface/manager_window_no_aur.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_no_aur.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml + + COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml +) + +add_custom_target(pamac_manager_gresource_xml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.c) +SET (pamac_manager_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.c PARENT_SCOPE) +SET (pamac_manager_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.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_no_aur.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.gresource.xml) +EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.gresource.xml) +ADD_CUSTOM_COMMAND ( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.c + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.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_no_aur.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_no_aur.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.gresource.xml + + COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.gresource.xml +) + +add_custom_target(pamac_transaction_gresource_xml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.c) +SET (pamac_transaction_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.c PARENT_SCOPE) +SET (pamac_transaction_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.h PARENT_SCOPE) +else () +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) +endif () +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/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-updater.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ ) +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 "Autostart file data/pamac-tray-appindicator.desktop will not be installed. You must create your own .desktop file and put it at ~/.config/autostart") +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 "Autostart file data/pamac-tray.desktop will not be installed. You must create your own .desktop file and put it at ~/.config/autostart") +endif() +endif () diff --git a/data/config/CMakeLists.txt b/data/config/CMakeLists.txt new file mode 100644 index 0000000..37dfe8f --- /dev/null +++ b/data/config/CMakeLists.txt @@ -0,0 +1,19 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + +if (NOT(DISABLE_AUR)) + IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf + DESTINATION + ${CMAKE_INSTALL_SYSCONFDIR} + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf + DESTINATION + ${CMAKE_INSTALL_SYSCONFDIR} + ) +ENDIF() + +endif () diff --git a/data/config/noaur/CMakeLists.txt b/data/config/noaur/CMakeLists.txt new file mode 100644 index 0000000..2c963ac --- /dev/null +++ b/data/config/noaur/CMakeLists.txt @@ -0,0 +1,19 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + +if (DISABLE_AUR) + IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf + DESTINATION + ${CMAKE_INSTALL_SYSCONFDIR} + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/pamac.conf + DESTINATION + ${CMAKE_INSTALL_SYSCONFDIR} + ) +ENDIF() + +endif () diff --git a/data/config/noaur/pamac.conf b/data/config/noaur/pamac.conf new file mode 100644 index 0000000..017231c --- /dev/null +++ b/data/config/noaur/pamac.conf @@ -0,0 +1,11 @@ +### Pamac configuration file + +## When removing a package, also remove those dependencies +## that are not required by other packages (recurse option): +#RemoveUnrequiredDeps + +## How often to check for updates, value in hours (0 to disable): +RefreshPeriod = 6 + +## When there are no updates available, hide the tray icon: +#NoUpdateHideIcon diff --git a/data/dbus/CMakeLists.txt b/data/dbus/CMakeLists.txt new file mode 100644 index 0000000..7f973d1 --- /dev/null +++ b/data/dbus/CMakeLists.txt @@ -0,0 +1,45 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + +IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf + DESTINATION + ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.conf + DESTINATION + ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d + ) +ENDIF() + +IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service + DESTINATION + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.user.service + DESTINATION + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services + ) +ENDIF() + +IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service + DESTINATION + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system-services + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.system.service + DESTINATION + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system-services + ) +ENDIF() + diff --git a/data/dbus/org.manjaro.pamac.system.conf b/data/dbus/org.pamac.system.conf similarity index 64% rename from data/dbus/org.manjaro.pamac.system.conf rename to data/dbus/org.pamac.system.conf index b826875..9c61ac9 100644 --- a/data/dbus/org.manjaro.pamac.system.conf +++ b/data/dbus/org.pamac.system.conf @@ -4,19 +4,19 @@ - + - + - - - diff --git a/data/dbus/org.manjaro.pamac.system.service b/data/dbus/org.pamac.system.service similarity index 76% rename from data/dbus/org.manjaro.pamac.system.service rename to data/dbus/org.pamac.system.service index e1e2929..f6a7474 100644 --- a/data/dbus/org.manjaro.pamac.system.service +++ b/data/dbus/org.pamac.system.service @@ -1,5 +1,5 @@ [D-BUS Service] -Name=org.manjaro.pamac.system +Name=org.pamac.system Exec=/usr/bin/pamac-system-daemon User=root SystemdService=pamac-system.service diff --git a/data/dbus/org.manjaro.pamac.user.service b/data/dbus/org.pamac.user.service similarity index 63% rename from data/dbus/org.manjaro.pamac.user.service rename to data/dbus/org.pamac.user.service index 29fa0fc..3d5bfe8 100644 --- a/data/dbus/org.manjaro.pamac.user.service +++ b/data/dbus/org.pamac.user.service @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.manjaro.pamac.user +Name=org.pamac.user Exec=/usr/bin/pamac-user-daemon diff --git a/data/icons/16x16/apps/CMakeLists.txt b/data/icons/16x16/apps/CMakeLists.txt new file mode 100644 index 0000000..7f35970 --- /dev/null +++ b/data/icons/16x16/apps/CMakeLists.txt @@ -0,0 +1,8 @@ +### 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() diff --git a/data/icons/24x24/status/CMakeLists.txt b/data/icons/24x24/status/CMakeLists.txt new file mode 100644 index 0000000..0696336 --- /dev/null +++ b/data/icons/24x24/status/CMakeLists.txt @@ -0,0 +1,9 @@ +### 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() diff --git a/data/icons/32x32/apps/CMakeLists.txt b/data/icons/32x32/apps/CMakeLists.txt new file mode 100644 index 0000000..37dc37c --- /dev/null +++ b/data/icons/32x32/apps/CMakeLists.txt @@ -0,0 +1,8 @@ +### 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() diff --git a/data/interface/CMakeLists.txt b/data/interface/CMakeLists.txt new file mode 100644 index 0000000..00dba60 --- /dev/null +++ b/data/interface/CMakeLists.txt @@ -0,0 +1,18 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + +if (DISABLE_AUR) + else () +endif () +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/choose_ignorepkgs_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/choose_provider_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/history_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/progress_box.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/transaction_sum_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +if (DISABLE_AUR) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/manager_window_no_aur.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/preferences_dialog_no_aur.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +else () +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/manager_window.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/preferences_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +endif () diff --git a/resources/choose_ignorepkgs_dialog.ui b/data/interface/choose_ignorepkgs_dialog.ui similarity index 100% rename from resources/choose_ignorepkgs_dialog.ui rename to data/interface/choose_ignorepkgs_dialog.ui diff --git a/resources/choose_provider_dialog.ui b/data/interface/choose_provider_dialog.ui similarity index 100% rename from resources/choose_provider_dialog.ui rename to data/interface/choose_provider_dialog.ui diff --git a/resources/history_dialog.ui b/data/interface/history_dialog.ui similarity index 100% rename from resources/history_dialog.ui rename to data/interface/history_dialog.ui diff --git a/resources/manager_window.ui b/data/interface/manager_window.ui similarity index 100% rename from resources/manager_window.ui rename to data/interface/manager_window.ui diff --git a/data/interface/manager_window_no_aur.ui b/data/interface/manager_window_no_aur.ui new file mode 100644 index 0000000..e641351 --- /dev/null +++ b/data/interface/manager_window_no_aur.ui @@ -0,0 +1,935 @@ + + + + + + False + + + True + False + 6 + vertical + 6 + + + True + True + True + Refresh databases + + + + False + True + 0 + + + + + True + True + True + View History + + + + False + True + 1 + + + + + True + True + True + Install Local Packages + + + + False + True + 2 + + + + + True + True + True + Preferences + + + + False + True + 3 + + + + + True + True + True + About + + + + False + True + 4 + + + + + main + 1 + + + + + diff --git a/resources/preferences_dialog.ui b/data/interface/preferences_dialog.ui similarity index 100% rename from resources/preferences_dialog.ui rename to data/interface/preferences_dialog.ui diff --git a/data/interface/preferences_dialog_no_aur.ui b/data/interface/preferences_dialog_no_aur.ui new file mode 100644 index 0000000..349fe18 --- /dev/null +++ b/data/interface/preferences_dialog_no_aur.ui @@ -0,0 +1,617 @@ + + + + + + 10 + 3 + 1 + 10 + + + 1 + 1000 + 6 + 1 + 10 + + + diff --git a/resources/progress_box.ui b/data/interface/progress_box.ui similarity index 100% rename from resources/progress_box.ui rename to data/interface/progress_box.ui diff --git a/resources/progress_dialog.ui b/data/interface/progress_dialog.ui similarity index 100% rename from resources/progress_dialog.ui rename to data/interface/progress_dialog.ui diff --git a/resources/transaction_sum_dialog.ui b/data/interface/transaction_sum_dialog.ui similarity index 100% rename from resources/transaction_sum_dialog.ui rename to data/interface/transaction_sum_dialog.ui diff --git a/data/mime/CMakeLists.txt b/data/mime/CMakeLists.txt new file mode 100644 index 0000000..6f33c81 --- /dev/null +++ b/data/mime/CMakeLists.txt @@ -0,0 +1,17 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + +IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml + DESTINATION + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/mime/packages + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml + DESTINATION + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/mime/packages + ) +ENDIF() + diff --git a/data/applications/pamac-install.desktop b/data/pamac-install.desktop similarity index 100% rename from data/applications/pamac-install.desktop rename to data/pamac-install.desktop diff --git a/data/applications/pamac-manager.desktop b/data/pamac-manager.desktop similarity index 100% rename from data/applications/pamac-manager.desktop rename to data/pamac-manager.desktop diff --git a/data/applications/pamac-tray-appindicator.desktop b/data/pamac-tray-appindicator.desktop similarity index 84% rename from data/applications/pamac-tray-appindicator.desktop rename to data/pamac-tray-appindicator.desktop index df40f9f..d14a7fe 100644 --- a/data/applications/pamac-tray-appindicator.desktop +++ b/data/pamac-tray-appindicator.desktop @@ -6,3 +6,4 @@ Terminal=false Type=Application StartupNotify=true OnlyShowIn=KDE; +X-GNOME-Autostart-enabled=true \ No newline at end of file diff --git a/data/applications/pamac-tray.desktop b/data/pamac-tray.desktop similarity index 84% rename from data/applications/pamac-tray.desktop rename to data/pamac-tray.desktop index 727f714..99df7f5 100644 --- a/data/applications/pamac-tray.desktop +++ b/data/pamac-tray.desktop @@ -6,3 +6,4 @@ Terminal=false Type=Application StartupNotify=false NotShowIn=KDE; +X-GNOME-Autostart-enabled=true \ No newline at end of file diff --git a/data/applications/pamac-updater.desktop b/data/pamac-updater.desktop similarity index 100% rename from data/applications/pamac-updater.desktop rename to data/pamac-updater.desktop diff --git a/data/pamac.installer.gresource.xml b/data/pamac.installer.gresource.xml new file mode 100644 index 0000000..cabbe08 --- /dev/null +++ b/data/pamac.installer.gresource.xml @@ -0,0 +1,6 @@ + + + + interface/progress_dialog.ui + + diff --git a/data/pamac.manager.gresource.xml b/data/pamac.manager.gresource.xml new file mode 100644 index 0000000..5824bc3 --- /dev/null +++ b/data/pamac.manager.gresource.xml @@ -0,0 +1,15 @@ + + + + interface/manager_window.ui + interface/history_dialog.ui + pixmaps/package-available.png + pixmaps/package-available-locked.png + pixmaps/package-install.png + pixmaps/package-installed-locked.png + pixmaps/package-installed-updated.png + pixmaps/package-reinstall.png + pixmaps/package-remove.png + pixmaps/package-upgrade.png + + diff --git a/data/pamac.manager_no_aur.gresource.xml b/data/pamac.manager_no_aur.gresource.xml new file mode 100644 index 0000000..dc0c512 --- /dev/null +++ b/data/pamac.manager_no_aur.gresource.xml @@ -0,0 +1,15 @@ + + + + interface/manager_window_no_aur.ui + interface/history_dialog.ui + pixmaps/package-available.png + pixmaps/package-available-locked.png + pixmaps/package-install.png + pixmaps/package-installed-locked.png + pixmaps/package-installed-updated.png + pixmaps/package-reinstall.png + pixmaps/package-remove.png + pixmaps/package-upgrade.png + + diff --git a/data/pamac.transaction.gresource.xml b/data/pamac.transaction.gresource.xml new file mode 100644 index 0000000..ac97627 --- /dev/null +++ b/data/pamac.transaction.gresource.xml @@ -0,0 +1,13 @@ + + + + interface/progress_dialog.ui + interface/progress_box.ui + interface/choose_provider_dialog.ui + interface/transaction_sum_dialog.ui + + + interface/preferences_dialog.ui + interface/choose_ignorepkgs_dialog.ui + + diff --git a/data/pamac.transaction_no_aur.gresource.xml b/data/pamac.transaction_no_aur.gresource.xml new file mode 100644 index 0000000..69edc1c --- /dev/null +++ b/data/pamac.transaction_no_aur.gresource.xml @@ -0,0 +1,13 @@ + + + + interface/progress_dialog.ui + interface/progress_box.ui + interface/choose_provider_dialog.ui + interface/transaction_sum_dialog.ui + + + interface/preferences_dialog_no_aur.ui + interface/choose_ignorepkgs_dialog.ui + + diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt new file mode 100644 index 0000000..9fa2564 --- /dev/null +++ b/data/pixmaps/CMakeLists.txt @@ -0,0 +1,12 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-available-locked.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-available.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-generic.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-install.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-installed-locked.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-installed-updated.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-reinstall.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-remove.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-upgrade.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) diff --git a/resources/package-available-locked.png b/data/pixmaps/package-available-locked.png similarity index 100% rename from resources/package-available-locked.png rename to data/pixmaps/package-available-locked.png diff --git a/resources/package-available.png b/data/pixmaps/package-available.png similarity index 100% rename from resources/package-available.png rename to data/pixmaps/package-available.png diff --git a/resources/package-generic.png b/data/pixmaps/package-generic.png similarity index 100% rename from resources/package-generic.png rename to data/pixmaps/package-generic.png diff --git a/resources/package-install.png b/data/pixmaps/package-install.png similarity index 100% rename from resources/package-install.png rename to data/pixmaps/package-install.png diff --git a/resources/package-installed-locked.png b/data/pixmaps/package-installed-locked.png similarity index 100% rename from resources/package-installed-locked.png rename to data/pixmaps/package-installed-locked.png diff --git a/resources/package-installed-updated.png b/data/pixmaps/package-installed-updated.png similarity index 100% rename from resources/package-installed-updated.png rename to data/pixmaps/package-installed-updated.png diff --git a/resources/package-reinstall.png b/data/pixmaps/package-reinstall.png similarity index 100% rename from resources/package-reinstall.png rename to data/pixmaps/package-reinstall.png diff --git a/resources/package-remove.png b/data/pixmaps/package-remove.png similarity index 100% rename from resources/package-remove.png rename to data/pixmaps/package-remove.png diff --git a/resources/package-upgrade.png b/data/pixmaps/package-upgrade.png similarity index 100% rename from resources/package-upgrade.png rename to data/pixmaps/package-upgrade.png diff --git a/data/polkit/CMakeLists.txt b/data/polkit/CMakeLists.txt new file mode 100644 index 0000000..d2c61d6 --- /dev/null +++ b/data/polkit/CMakeLists.txt @@ -0,0 +1,17 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + +IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy + DESTINATION + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy + DESTINATION + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions + ) +ENDIF() + diff --git a/data/polkit/org.manjaro.pamac.policy.in b/data/polkit/org.pamac.policy.in similarity index 80% rename from data/polkit/org.manjaro.pamac.policy.in rename to data/polkit/org.pamac.policy.in index 1482bdd..e8fd737 100644 --- a/data/polkit/org.manjaro.pamac.policy.in +++ b/data/polkit/org.pamac.policy.in @@ -3,10 +3,10 @@ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> - Manjaro - http://manjaro.org/ + Pamac + https://github.com/cromnix/pamac-classic/ package-x-generic - + Authentication is required no diff --git a/data/systemd/CMakeLists.txt b/data/systemd/CMakeLists.txt new file mode 100644 index 0000000..b9a0035 --- /dev/null +++ b/data/systemd/CMakeLists.txt @@ -0,0 +1,73 @@ +### 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 + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/pamac-system.service + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ENDIF() + +IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.service) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.service + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.service + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ENDIF() + +IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.timer) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.timer + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/pamac-cleancache.timer + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ENDIF() + +IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.service) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.service + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.service + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ENDIF() + +IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.timer) + install(DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.timer + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ELSE() + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/pamac-mirrorlist.timer + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/systemd/system + ) +ENDIF() + diff --git a/data/systemd/pamac-system.service b/data/systemd/pamac-system.service index c9b1431..4233e47 100644 --- a/data/systemd/pamac-system.service +++ b/data/systemd/pamac-system.service @@ -3,5 +3,5 @@ Description=Pamac System Session [Service] Type=dbus -BusName=org.manjaro.pamac.system +BusName=org.pamac.system ExecStart=/usr/bin/pamac-system-daemon diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..1750f02 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,20 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + +file(GLOB list_data RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *) +foreach(file_data ${list_data}) + IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${file_data}) + install(DIRECTORY + ${file_data} + DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ) + ELSE() + install(FILES + ${file_data} + DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ) + ENDIF() +endforeach() + diff --git a/pamac.avprj b/pamac.avprj new file mode 100644 index 0000000..a57caa4 --- /dev/null +++ b/pamac.avprj @@ -0,0 +1,249 @@ +### AutoVala Project ### +autovala_version: 24 +project_name: pamac +*vala_version: 0.38 + +custom: data/dbus/org.pamac.system.conf ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d +custom: data/dbus/org.pamac.user.service ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services +custom: data/dbus/org.pamac.system.service ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/system-services +custom: data/systemd/pamac-system.service ${CMAKE_INSTALL_LIBDIR}/systemd/system +custom: data/systemd/pamac-cleancache.service ${CMAKE_INSTALL_LIBDIR}/systemd/system +custom: data/systemd/pamac-cleancache.timer ${CMAKE_INSTALL_LIBDIR}/systemd/system +custom: data/systemd/pamac-mirrorlist.service ${CMAKE_INSTALL_LIBDIR}/systemd/system +custom: data/systemd/pamac-mirrorlist.timer ${CMAKE_INSTALL_LIBDIR}/systemd/system +custom: data/polkit/org.pamac.policy ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions +custom: data/mime/x-alpm-package.xml ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/mime/packages +if DISABLE_AUR +custom: data/config/noaur/pamac.conf ${CMAKE_INSTALL_SYSCONFDIR} +else +custom: data/config/pamac.conf ${CMAKE_INSTALL_SYSCONFDIR} +end + +define: KDE_TRAY +*define: DISABLE_AUR + +*gresource: pamac_installer_gresource_xml data/pamac.installer.gresource.xml +if DISABLE_AUR +gresource: pamac_manager_gresource_xml data/pamac.manager_no_aur.gresource.xml +gresource: pamac_transaction_gresource_xml data/pamac.transaction_no_aur.gresource.xml +else +gresource: pamac_manager_gresource_xml data/pamac.manager.gresource.xml +gresource: pamac_transaction_gresource_xml data/pamac.transaction.gresource.xml +end + +vapidir: src/vapis + +vala_binary: src/pamac-install/pamac-install +version: 6.0.0 +use_gresource: pamac_installer_gresource_xml +vala_local_package: Pamac +vala_check_package: gtk+-3.0 +*vala_check_package: gio-2.0 +*vala_check_package: glib-2.0 +*vala_check_package: gobject-2.0 +*vala_source: installer.vala +*vala_source: progress_dialog.vala + +vala_binary: src/pamac-manager/pamac-manager +version: 6.0.0 +use_gresource: pamac_manager_gresource_xml +vala_local_package: Pamac +vala_check_package: gtk+-3.0 +*vala_check_package: gio-2.0 +*vala_check_package: glib-2.0 +*vala_check_package: gobject-2.0 +*vala_source: history_dialog.vala +*vala_source: manager.vala +*vala_source: manager_window.vala + +vala_binary: src/pamac-system-daemon/pamac-system-daemon +version: 6.0.0 +vala_local_package: Pamac +if NOT DISABLE_AUR +vala_local_package: AUR +end +vala_package: posix +vala_check_package: gtk+-3.0 +vala_check_package: json-glib-1.0 +vala_check_package: libalpm +vala_check_package: libcurl +vala_check_package: libsoup-2.4 +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.0.0 +vala_local_package: Pamac +if NOT DISABLE_AUR +vala_local_package: AUR +end +vala_package: posix +vala_check_package: json-glib-1.0 +vala_check_package: libnotify +if KDE_TRAY +vala_check_package: appindicator3-0.1 +else +vala_check_package: gtk+-3.0 +end +*vala_check_package: gio-2.0 +*vala_check_package: glib-2.0 +*vala_check_package: gobject-2.0 +if KDE_TRAY +vala_source: tray-appindicator.vala +else +vala_source: tray-gtk.vala +end +*vala_source: pamac_config.vala +*vala_source: tray.vala +*vala_source: user_daemon.vala + +vala_binary: src/pamac-user-daemon/pamac-user-daemon +version: 6.0.0 +vala_local_package: AUR +vala_local_package: Pamac +vala_package: posix +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: gio-2.0 +*vala_check_package: glib-2.0 +*vala_check_package: gobject-2.0 +*vala_source: alpm_config.vala +*vala_source: user_daemon.vala + + +vala_library: src/pamac +version: 6.0.0 +*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: libalpm +vala_check_package: libnotify +vala_check_package: vte-2.91 +*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: choose_ignorepkgs_dialog.vala +*vala_source: choose_provider_dialog.vala +*vala_source: common.vala +*vala_source: mirrors_config.vala +*vala_source: package.vala +*vala_source: pamac_config.vala +*vala_source: preferences_dialog.vala +*vala_source: progress_box.vala +*vala_source: transaction.vala +*vala_source: transaction_sum_dialog.vala + +vala_library: src/aur/aur +version: 6.0.0 +*namespace: AUR +vala_check_package: json-glib-1.0 +vala_check_package: libsoup-2.4 +*vala_check_package: glib-2.0 +*vala_source: aur.vala + + +*po: po + +*translate: glade data/interface/choose_ignorepkgs_dialog.ui +*translate: glade data/interface/choose_provider_dialog.ui +*translate: glade data/interface/history_dialog.ui +*translate: glade data/interface/progress_box.ui +*translate: glade data/interface/progress_dialog.ui +*translate: glade data/interface/transaction_sum_dialog.ui +*translate: vala src/alpm_config.vala +*translate: vala src/aur/aur.vala +*translate: vala src/choose_ignorepkgs_dialog.vala +*translate: vala src/choose_provider_dialog.vala +*translate: vala src/common.vala +*translate: vala src/mirrors_config.vala +*translate: vala src/package.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/pamac_config.vala +*translate: vala src/pamac-tray/tray.vala +*translate: vala src/pamac-tray/user_daemon.vala +*translate: vala src/pamac-user-daemon/alpm_config.vala +*translate: vala src/pamac-user-daemon/user_daemon.vala +*translate: vala src/pamac_config.vala +*translate: vala src/preferences_dialog.vala +*translate: vala src/progress_box.vala +*translate: vala src/transaction.vala +*translate: vala src/transaction_sum_dialog.vala +if DISABLE_AUR +translate: glade data/interface/manager_window_no_aur.ui +translate: glade data/interface/preferences_dialog_no_aur.ui +else +translate: glade data/interface/manager_window.ui +translate: glade data/interface/preferences_dialog.ui +end +if KDE_TRAY +translate: vala src/pamac-tray/tray-appindicator.vala +else +translate: vala src/pamac-tray/tray-gtk.vala +end + +*doc: doc + +*desktop: data/pamac-install.desktop +*desktop: data/pamac-manager.desktop +*desktop: data/pamac-updater.desktop + +if KDE_TRAY +autostart: data/pamac-tray-appindicator.desktop +else +autostart: data/pamac-tray.desktop +end + +*glade: data/interface/choose_ignorepkgs_dialog.ui +*glade: data/interface/choose_provider_dialog.ui +*glade: data/interface/history_dialog.ui +*glade: data/interface/progress_box.ui +*glade: data/interface/transaction_sum_dialog.ui +if DISABLE_AUR +glade: data/interface/manager_window_no_aur.ui +glade: data/interface/preferences_dialog_no_aur.ui +else +glade: data/interface/manager_window.ui +glade: data/interface/preferences_dialog.ui +end + +*full_icon: Hicolor Applications data/icons/16x16/apps/system-software-install.png +*full_icon: Hicolor Applications data/icons/24x24/status/pamac-tray-no-update.png +*full_icon: Hicolor Applications data/icons/24x24/status/pamac-tray-update.png +*full_icon: Hicolor Applications data/icons/32x32/apps/system-software-install.png + +*pixmap: data/pixmaps/package-available-locked.png +*pixmap: data/pixmaps/package-available.png +*pixmap: data/pixmaps/package-generic.png +*pixmap: data/pixmaps/package-install.png +*pixmap: data/pixmaps/package-installed-locked.png +*pixmap: data/pixmaps/package-installed-updated.png +*pixmap: data/pixmaps/package-reinstall.png +*pixmap: data/pixmaps/package-remove.png +*pixmap: data/pixmaps/package-upgrade.png + +# These depends are needed to enable parallel builds +include: src/pamac-install/CMakeDepends.txt +include: src/pamac-manager/CMakeDepends.txt +include: src/pamac-system-daemon/CMakeDepends.txt +include: src/pamac-tray/CMakeDepends.txt +include: src/pamac-user-daemon/CMakeDepends.txt + diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt new file mode 100644 index 0000000..83a6b20 --- /dev/null +++ b/po/CMakeLists.txt @@ -0,0 +1,6 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + +include (Translations) +add_translations_directory("pamac") +add_translations_catalog("pamac" ../src/pamac-install ../src/pamac-manager ../src/pamac-system-daemon ../src/pamac-tray ../src/pamac-user-daemon ../src ../src/aur ../data/interface ) diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..b8ee1cb --- /dev/null +++ b/po/LINGUAS @@ -0,0 +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 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 es_419 de_CH de ka bs_BA ru ms sk bg ast uk hr es_SV nl_NL cy id az_AZ diff --git a/po/Makefile b/po/Makefile index 0a4edcd..a5205d9 100644 --- a/po/Makefile +++ b/po/Makefile @@ -3,13 +3,12 @@ MSGLANGS=$(notdir $(wildcard *.po)) MSGOBJS=$(addprefix locale/,$(MSGLANGS:.po=/LC_MESSAGES/pamac.mo)) -gettext: ../data/polkit/org.manjaro.pamac.policy.in $(MSGOBJS) - itstool -j ../data/polkit/org.manjaro.pamac.policy.in -o ../data/polkit/org.manjaro.pamac.policy $(MSGLANGS:.po=.mo) +gettext: ../data/polkit/org.pamac.policy.in $(MSGOBJS) + itstool -j ../data/polkit/org.pamac.policy.in -o ../data/polkit/org.pamac.policy $(MSGLANGS:.po=.mo) clean: rm -rf locale rm -f *.mo - rm -f ../data/polkit/org.manjaro.pamac.policy locale/%/LC_MESSAGES/pamac.mo: %.po msgfmt -c -o $*.mo $*.po diff --git a/po/POTFILES.in b/po/POTFILES.in new file mode 100644 index 0000000..eca5cc8 --- /dev/null +++ b/po/POTFILES.in @@ -0,0 +1,38 @@ +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/pamac_config.vala +src/pamac-tray/tray.vala +src/pamac-tray/user_daemon.vala +src/pamac-user-daemon/alpm_config.vala +src/pamac-user-daemon/user_daemon.vala +src/alpm_config.vala +src/choose_ignorepkgs_dialog.vala +src/choose_provider_dialog.vala +src/common.vala +src/mirrors_config.vala +src/package.vala +src/pamac_config.vala +src/preferences_dialog.vala +src/progress_box.vala +src/transaction.vala +src/transaction_sum_dialog.vala +src/aur/aur.vala +data/interface/choose_ignorepkgs_dialog.ui +data/interface/choose_provider_dialog.ui +data/interface/history_dialog.ui +data/interface/progress_box.ui +data/interface/progress_dialog.ui +data/interface/transaction_sum_dialog.ui +data/interface/manager_window_no_aur.ui +data/interface/preferences_dialog_no_aur.ui +data/interface/manager_window.ui +data/interface/preferences_dialog.ui diff --git a/po/af.po b/po/af.po index 3a3d8c4..76a107d 100644 --- a/po/af.po +++ b/po/af.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Afrikaans (http://www.transifex.com/manjarolinux/manjaro-pamac/language/af/)\n" +"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: af\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/ar.po b/po/ar.po index c4f6e65..070857b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Hamine Anisse , 2016 # hamza rydhwan , 2016 @@ -14,18 +14,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Arabic (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ar/)\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "صلاحيات مطلوبة" @@ -569,6 +569,10 @@ msgstr "كيف سيتم التحقق من توفر تحديثات في اغلب msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr " حول العالم" @@ -679,9 +683,7 @@ msgid "Remove unrequired dependencies" msgstr "حذف الاعتماديات الغير مطلوبة" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "عند إزالة الحزمة، أيضا إزالة تبعياته التي ليست مطلوبة من قبل حزم أخرى" #: ../resources/preferences_dialog.ui @@ -724,7 +726,9 @@ msgstr "مستودعات رسمية" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "مستودعات الأعضاء يعرض لمخاطر ولمشاكل محتملة\nيجب أن يكون المستخدمون على دراية بعملية الإنشاء." +msgstr "" +"مستودعات الأعضاء يعرض لمخاطر ولمشاكل محتملة\n" +"يجب أن يكون المستخدمون على دراية بعملية الإنشاء." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/ast.po b/po/ast.po index 5bb572e..5429995 100644 --- a/po/ast.po +++ b/po/ast.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # enolp , 2015-2016 # Ḷḷumex03 , 2013-2014 @@ -13,18 +13,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Asturian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ast/)\n" +"Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ast\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Ríquese l'autenticación" @@ -556,6 +556,10 @@ msgstr "¿Cuándo quies guetar anovamientos? Valor n'hores" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Mundiu" @@ -666,9 +670,7 @@ msgid "Remove unrequired dependencies" msgstr "Desaniciar dependencies non riquíes" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Al desaniciar un paquete tamién se desanicien les sos dependencies que dengún paquete rique" #: ../resources/preferences_dialog.ui @@ -711,7 +713,9 @@ msgstr "Repositorios oficiales" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR ye un repositoriu calteníu pola comunidá asina que pue presentar riesgos potenciales y problemes.\nTolos usuarios d'AUR deberíen tar familiarizaos col procesu de construcción." +msgstr "" +"AUR ye un repositoriu calteníu pola comunidá asina que pue presentar riesgos potenciales y problemes.\n" +"Tolos usuarios d'AUR deberíen tar familiarizaos col procesu de construcción." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/az_AZ.po b/po/az_AZ.po index df3b2a0..1e72d23 100644 --- a/po/az_AZ.po +++ b/po/az_AZ.po @@ -2,24 +2,24 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Zaur Baku , 2017 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Azerbaijani (Azerbaijan) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/az_AZ/)\n" +"Language: az_AZ\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: az_AZ\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Kimlik tələb olunur" @@ -551,6 +551,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/be.po b/po/be.po index a83832e..d7319a2 100644 --- a/po/be.po +++ b/po/be.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Belarusian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/be/)\n" +"Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: be\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -556,6 +556,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -666,9 +670,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/bg.po b/po/bg.po index c7a8a38..ca87848 100644 --- a/po/bg.po +++ b/po/bg.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Galin Iskrenov , 2013-2017 # Georgi Georgiev , 2014 @@ -14,18 +14,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-08-01 11:22+0000\n" "Last-Translator: Galin Iskrenov \n" "Language-Team: Bulgarian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/bg/)\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Изисква се идентификация" @@ -557,6 +557,10 @@ msgstr "Колко често да се проверява за актуализ msgid "Number of versions of each package to keep in the cache" msgstr "Брой версии от всеки пакет запазени в кеша" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "По света" @@ -667,9 +671,7 @@ msgid "Remove unrequired dependencies" msgstr "Премахни ненужни зависимости" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Премахвайки пакет, премахвате и зависимости, които не са необходими на други пакети" #: ../resources/preferences_dialog.ui @@ -712,7 +714,9 @@ msgstr "Официални хранилища" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR е хранилище на общността с потенциални рискове и проблеми.\nВсички AUR потребители трябва да са запознати с процеса за изграждане." +msgstr "" +"AUR е хранилище на общността с потенциални рискове и проблеми.\n" +"Всички AUR потребители трябва да са запознати с процеса за изграждане." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/bn.po b/po/bn.po index 4f9ce75..9ea4950 100644 --- a/po/bn.po +++ b/po/bn.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Bengali (http://www.transifex.com/manjarolinux/manjaro-pamac/language/bn/)\n" +"Language: bn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/bs.po b/po/bs.po index 988ea86..2a40ffc 100644 --- a/po/bs.po +++ b/po/bs.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Bosnian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/bs/)\n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bs\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -553,6 +553,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -663,9 +667,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/bs_BA.po b/po/bs_BA.po index e896db9..df8ecfb 100644 --- a/po/bs_BA.po +++ b/po/bs_BA.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/bs_BA/)\n" +"Language: bs_BA\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bs_BA\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -553,6 +553,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -663,9 +667,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/ca.po b/po/ca.po index 1ed0cd2..ed83260 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # acutbal , 2017 # Davidmp , 2015 @@ -16,18 +16,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 14:18+0000\n" "Last-Translator: Davidmp \n" "Language-Team: Catalan (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ca/)\n" +"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Cal autenticació" @@ -559,6 +559,10 @@ msgstr "Freqüència per comprovar si hi ha actualitzacions, valor en hores" msgid "Number of versions of each package to keep in the cache" msgstr "Nombre de versions de cada paquet per mantenir a la memòria cau" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Tot el món" @@ -669,9 +673,7 @@ msgid "Remove unrequired dependencies" msgstr "Elimina les dependències no requerides" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "En eliminar un paquet, elimina'n també les dependències que no siguin requerides per altres paquets" #: ../resources/preferences_dialog.ui @@ -714,7 +716,9 @@ msgstr "Repositoris oficials" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "L'AUR és un repositori mantingut per la comunitat; per tant, pot comportar riscos i problemes.\nTots els usuaris de l'AUR haurien d'estar familiaritzats amb el procés de construcció." +msgstr "" +"L'AUR és un repositori mantingut per la comunitat; per tant, pot comportar riscos i problemes.\n" +"Tots els usuaris de l'AUR haurien d'estar familiaritzats amb el procés de construcció." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/ca_ES.po b/po/ca_ES.po index 1a9f264..01bfe38 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # acutbal , 2017 # Davidmp , 2014 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Catalan (Spain) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ca_ES/)\n" +"Language: ca_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ca_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Cal autenticació" @@ -554,6 +554,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -664,9 +668,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/create_pot_file.sh b/po/create_pot_file.sh index 07d9b69..2988dff 100755 --- a/po/create_pot_file.sh +++ b/po/create_pot_file.sh @@ -1,5 +1,5 @@ #! /bin/sh xgettext --from-code=UTF-8 --add-location=file \ - --package-name=Pamac --msgid-bugs-address=guillaume@manjaro.org \ + --package-name=Pamac --msgid-bugs-address=cromer@cromnix.org \ --files-from=files_to_translate --keyword=translatable --output=pamac.pot diff --git a/po/cs.po b/po/cs.po index 46730be..dbb8cbe 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # halfark , 2014,2016 # Libor Schejbal , 2013 @@ -14,18 +14,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Czech (http://www.transifex.com/manjarolinux/manjaro-pamac/language/cs/)\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Je vyžadováno ověření" @@ -560,6 +560,10 @@ msgstr "Jak často kontrolovat aktualizace, hodnota v hodinách" msgid "Number of versions of each package to keep in the cache" msgstr "Počet verzí od každého balíčku udržovaného v paměti cache." +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Celosvětový" @@ -670,9 +674,7 @@ msgid "Remove unrequired dependencies" msgstr "Odebrat nepotřebné závislosti" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Při odebírání balíčku také odebrat jeho závislosti, které nejsou vyžadovány jinými balíčky" #: ../resources/preferences_dialog.ui @@ -715,7 +717,9 @@ msgstr "Oficiální repozitáře" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR je komunitně udržovaný repozitář, to sebou nese potencionální rizika a problémy.\nVšichni uživatelé AUR by měli znát postup vytváření balíčku neboli buildu." +msgstr "" +"AUR je komunitně udržovaný repozitář, to sebou nese potencionální rizika a problémy.\n" +"Všichni uživatelé AUR by měli znát postup vytváření balíčku neboli buildu." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 7ecd037..e616914 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Scibex , 2013 # Scibex , 2013 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/cs_CZ/)\n" +"Language: cs_CZ\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -557,6 +557,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -667,9 +671,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/cy.po b/po/cy.po index 7f94b79..2db8d23 100644 --- a/po/cy.po +++ b/po/cy.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Welsh (http://www.transifex.com/manjarolinux/manjaro-pamac/language/cy/)\n" +"Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cy\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -556,6 +556,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -666,9 +670,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/da.po b/po/da.po index 070edf1..33d5627 100644 --- a/po/da.po +++ b/po/da.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Andreas Martin Mørch , 2013 # GigoloJoe , 2014 @@ -18,18 +18,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Danish (http://www.transifex.com/manjarolinux/manjaro-pamac/language/da/)\n" +"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Godkendelse er påkrævet" @@ -561,6 +561,10 @@ msgstr "Hvor ofte der checkes efter opdatering, værdi opgives i timer" msgid "Number of versions of each package to keep in the cache" msgstr "Antal versioner af hver pakke der skal gemmes i cache" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Worldwide" @@ -671,9 +675,7 @@ msgid "Remove unrequired dependencies" msgstr "Fjern unødvendige afhængigheder" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Ved fjernelse af pakke, fjern også afhængigheder der ikke bliver brugt af andre pakker" #: ../resources/preferences_dialog.ui @@ -716,7 +718,9 @@ msgstr "Officielle Repositories" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR er et samfunds vedligeholdt repository så det kan forårsage risici og problemer.\nAlle AUR brugere burde være bekendt med bygge processen." +msgstr "" +"AUR er et samfunds vedligeholdt repository så det kan forårsage risici og problemer.\n" +"Alle AUR brugere burde være bekendt med bygge processen." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/de.po b/po/de.po index f4b1c7e..e56d113 100644 --- a/po/de.po +++ b/po/de.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Bankman , 2016 # Bankman , 2016 @@ -25,18 +25,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: German (http://www.transifex.com/manjarolinux/manjaro-pamac/language/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Authentifizierung erforderlich" @@ -568,6 +568,10 @@ msgstr "Wie oft soll nach Erneuerungen geprüft werden? (Wert in Stunden)" msgid "Number of versions of each package to keep in the cache" msgstr "Anzahl der im Cache verbleibenden Paketversionen" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Weltweit" @@ -678,9 +682,7 @@ msgid "Remove unrequired dependencies" msgstr "Entferne nicht benötigte Abhängigkeiten" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Wenn ein Paket entfernt wird, werden auch seine Abhängigkeiten entfernt, soweit sie nicht von einem anderen Paket benötigt werden" #: ../resources/preferences_dialog.ui @@ -723,7 +725,9 @@ msgstr "Offizielle Repositorien" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "Das AUR ist ein von der Gemeinschaft gepflegtes Repositorium, das Risiken birgt und Probleme verursachen kann.\nAlle Benutzer des AUR sollten mit dem Erstellen von Paketen vertraut sein." +msgstr "" +"Das AUR ist ein von der Gemeinschaft gepflegtes Repositorium, das Risiken birgt und Probleme verursachen kann.\n" +"Alle Benutzer des AUR sollten mit dem Erstellen von Paketen vertraut sein." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/de_CH.po b/po/de_CH.po index ea6742f..879be59 100644 --- a/po/de_CH.po +++ b/po/de_CH.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: German (Switzerland) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/de_CH/)\n" +"Language: de_CH\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de_CH\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/de_DE.po b/po/de_DE.po index 1cfa9d4..5d1ed36 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: German (Germany) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/de_DE/)\n" +"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/el.po b/po/el.po index 81cbe70..25bf727 100644 --- a/po/el.po +++ b/po/el.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # angel_solomos, 2013 # angel_solomos, 2013 @@ -19,18 +19,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Greek (http://www.transifex.com/manjarolinux/manjaro-pamac/language/el/)\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Απαιτείται πιστοποίηση" @@ -562,6 +562,10 @@ msgstr "Πόσο συχνά να ελέγχονται αναβαθμίσεις, msgid "Number of versions of each package to keep in the cache" msgstr "Αριθμός των εκδόσεων για κάθε πακέτο που θα κρατηθεί στην αποθήκη" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Παγκόσμιο" @@ -672,9 +676,7 @@ msgid "Remove unrequired dependencies" msgstr "Αφαίρεση αχρησιμοποίητων εξαρτήσεων" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Όταν αφαιρείτε ένα πακέτο, επίσης αφαιρέστε και τις εξαρτήσεις του, που δεν χρειάζονται απο άλλα πακέτα" #: ../resources/preferences_dialog.ui diff --git a/po/el_GR.po b/po/el_GR.po index be59001..375be00 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -2,24 +2,24 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # kouros kouros , 2016-2017 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Greek (Greece) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/el_GR/)\n" +"Language: el_GR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el_GR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Απαιτείται πιστοποίηση" @@ -551,6 +551,10 @@ msgstr "Πόσο συχνά να ελέγχονται αναβαθμίσεις, msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Παγκόσμιο" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "Αφαίρεση αχρησιμοποίητων εξαρτήσεων" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Όταν αφαιρείτε ένα πακέτο, επίσης αφαιρέστε και τις εξαρτήσεις του, που δεν χρειάζονται απο άλλα πακέτα" #: ../resources/preferences_dialog.ui diff --git a/po/en_GB.po b/po/en_GB.po index fdaf889..bdcfb80 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # J Fernyhough , 2013 # J Fernyhough , 2013 @@ -10,18 +10,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/en_GB/)\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -553,6 +553,10 @@ msgstr "How often to check for updates, value in hours" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Worldwide" @@ -663,9 +667,7 @@ msgid "Remove unrequired dependencies" msgstr "Remove unrequired dependencies" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "When removing a package, also remove its dependencies that are not required by other packages" #: ../resources/preferences_dialog.ui @@ -708,7 +710,9 @@ msgstr "Official Repositories" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR is a community maintained repository so it presents potential risks and problems.\nAll AUR users should be familiar with the build process." +msgstr "" +"AUR is a community maintained repository so it presents potential risks and problems.\n" +"All AUR users should be familiar with the build process." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/eo.po b/po/eo.po index be2d208..aca249f 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Anderson Tavares , 2013 # Anderson Tavares , 2013 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Esperanto (http://www.transifex.com/manjarolinux/manjaro-pamac/language/eo/)\n" +"Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -554,6 +554,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -664,9 +668,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/es.po b/po/es.po index 73605e4..c1e33f7 100644 --- a/po/es.po +++ b/po/es.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Chazy Chaz , 2017 # danpergal84 , 2013-2016 @@ -19,18 +19,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Spanish (http://www.transifex.com/manjarolinux/manjaro-pamac/language/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Se necesita autenticación" @@ -562,6 +562,10 @@ msgstr "Frecuencia para buscar actualizaciones, valor en horas" msgid "Number of versions of each package to keep in the cache" msgstr "Número de versiones de cada paquete a guardar en cache" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "Carpeta de compilación" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Mundial" @@ -672,9 +676,7 @@ msgid "Remove unrequired dependencies" msgstr "Eliminar dependencias innecesarias " #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Al eliminar un paquete, eliminar también las dependencias que no son requeridas por otros paquetes" #: ../resources/preferences_dialog.ui @@ -717,7 +719,9 @@ msgstr "Repositorios oficiales" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR es un repositorio comunitario por lo que presenta riesgos potenciales y problemas.\nTodos los usuarios de AUR deben estar familiarizados con el proceso de construcción." +msgstr "" +"AUR es un repositorio comunitario por lo que presenta riesgos potenciales y problemas.\n" +"Todos los usuarios de AUR deben estar familiarizados con el proceso de construcción." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/es_419.po b/po/es_419.po index 19f22df..038b21f 100644 --- a/po/es_419.po +++ b/po/es_419.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Joaquín Ludzcanoff , 2016 # Julián Federico Hipólito , 2016-2017 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Spanish (Latin America) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/es_419/)\n" +"Language: es_419\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_419\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Se requiere autenticación" @@ -554,6 +554,10 @@ msgstr "Cuán seguido revisar por actualizaciones, valor en horas" msgid "Number of versions of each package to keep in the cache" msgstr "Número de versiones de cada paquete a mantener en caché" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "Carpeta de compilación" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Mundial" @@ -664,9 +668,7 @@ msgid "Remove unrequired dependencies" msgstr "Remover dependencias no requeridas" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Al remover un paquete, también remover sus dependencias que otros paquetes no requieren" #: ../resources/preferences_dialog.ui @@ -709,7 +711,9 @@ msgstr "Repositorios Oficiales" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR es un repositorio mantenido por la comunidad por lo que presenta potenciales riesgos y problemas.\nTodos los usuarios de AUR deben estar familiarizados con el proceso de construcción." +msgstr "" +"AUR es un repositorio mantenido por la comunidad por lo que presenta potenciales riesgos y problemas.\n" +"Todos los usuarios de AUR deben estar familiarizados con el proceso de construcción." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/es_AR.po b/po/es_AR.po index 83ecfa7..492719f 100644 --- a/po/es_AR.po +++ b/po/es_AR.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/es_AR/)\n" +"Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "Carpeta de compilación" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/es_ES.po b/po/es_ES.po index 4f22497..ced96c5 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/es_ES/)\n" +"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "Carpeta de compilación" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/es_MX.po b/po/es_MX.po index 2ab0c4b..4aef48c 100644 --- a/po/es_MX.po +++ b/po/es_MX.po @@ -2,24 +2,24 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Omar Jair Purata Funes , 2016 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/es_MX/)\n" +"Language: es_MX\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Se requiere autenticación" @@ -551,6 +551,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "Carpeta de compilación" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/es_SV.po b/po/es_SV.po index a4d35d5..0e5769c 100644 --- a/po/es_SV.po +++ b/po/es_SV.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Spanish (El Salvador) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/es_SV/)\n" +"Language: es_SV\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_SV\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "Carpeta de compilación" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/et.po b/po/et.po index 83a9163..dac9237 100644 --- a/po/et.po +++ b/po/et.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Kus Mis , 2013 # Kalle Kadakas , 2015 @@ -10,18 +10,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Estonian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/et/)\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -553,6 +553,10 @@ msgstr "Kui tihti kontrollida uuendusi, väärtus tundides" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -663,9 +667,7 @@ msgid "Remove unrequired dependencies" msgstr "Eemalda mitte-nõutud sõltuvused" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Paketi eemaldamisel eemalda ka tema sõltuvused, mis ei ole enam ühegi teise paketi poolt nõutud" #: ../resources/preferences_dialog.ui diff --git a/po/eu.po b/po/eu.po index e07958f..15545a5 100644 --- a/po/eu.po +++ b/po/eu.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # John Smith , 2015 # John Smith , 2015 @@ -12,18 +12,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Basque (http://www.transifex.com/manjarolinux/manjaro-pamac/language/eu/)\n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Autentifikazioa behar da" @@ -555,6 +555,10 @@ msgstr "Eguneraketak egiaztatzeko maiztasuna, orduetan" msgid "Number of versions of each package to keep in the cache" msgstr "Katxean gorde beharreko pakete bakotzeko bertsio kopurua" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Mundu mailakoa" @@ -665,9 +669,7 @@ msgid "Remove unrequired dependencies" msgstr "Kendu behar ez diren menpekotasunak" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Pakete bat kentzean, bere menpekotasunak kendu ere beste paketeren batek behar ez baditu" #: ../resources/preferences_dialog.ui @@ -710,7 +712,9 @@ msgstr "Biltegi ofizialak" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR komunitatean mantendutako biltegi bat da eta arrisku zein arazo potentzialak ditu\nAUR erabiltzaile guztiek eraikitzeko prozesua ezagutu beharko lukete." +msgstr "" +"AUR komunitatean mantendutako biltegi bat da eta arrisku zein arazo potentzialak ditu\n" +"AUR erabiltzaile guztiek eraikitzeko prozesua ezagutu beharko lukete." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/fa.po b/po/fa.po index d66cb8f..2d071c9 100644 --- a/po/fa.po +++ b/po/fa.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Reza Gharibi , 2013 # Hootan Baraary , 2013 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Persian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/fa/)\n" +"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -551,6 +551,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/fa_IR.po b/po/fa_IR.po index 4c3d87a..8ed05f2 100644 --- a/po/fa_IR.po +++ b/po/fa_IR.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Reza Gharibi , 2013 # Hootan Baraary , 2013 @@ -17,18 +17,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Persian (Iran) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/fa_IR/)\n" +"Language: fa_IR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fa_IR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "تائید هویت شکست خورد" @@ -557,6 +557,10 @@ msgstr "اغلب چگونگی به روز رسانی بسته را چک کنید msgid "Number of versions of each package to keep in the cache" msgstr "تعدادی از نسخه های هر بسته را در حافظه موقت نگهداری کن" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "در سراسر جهان" @@ -667,9 +671,7 @@ msgid "Remove unrequired dependencies" msgstr "حذف وابستگی های غیرضروری" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "زمانی که یک بسته را حذف می کنید، وابستگی های آن نیز که توسط بسته های دیگر مورد نیاز نیست حذف می گردد." #: ../resources/preferences_dialog.ui diff --git a/po/fi.po b/po/fi.po index d8843dc..53402c4 100644 --- a/po/fi.po +++ b/po/fi.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # EscoP, 2015 # EscoP, 2015 @@ -16,18 +16,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Finnish (http://www.transifex.com/manjarolinux/manjaro-pamac/language/fi/)\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -559,6 +559,10 @@ msgstr "Kuinka usein tarkistetaan päivityksiä, arvo tunneissa" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Maailmanlaajuinen" @@ -669,9 +673,7 @@ msgid "Remove unrequired dependencies" msgstr "Poista ei-vaaditut riippuvuudet" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Pakettia poistettaessa, poista myös pakettiriippuvuudet jotka eivät ole muiden pakettien käytössä" #: ../resources/preferences_dialog.ui diff --git a/po/fo.po b/po/fo.po index 70f0b1f..486ea0c 100644 --- a/po/fo.po +++ b/po/fo.po @@ -2,25 +2,25 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # klaemint, 2014 # klaemint, 2014 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Faroese (http://www.transifex.com/manjarolinux/manjaro-pamac/language/fo/)\n" +"Language: fo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -552,6 +552,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -662,9 +666,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/fr.po b/po/fr.po index 47c7834..7c26954 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Charles Monzat , 2015-2017 # DasFranck , 2013 @@ -20,18 +20,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-31 13:03+0000\n" "Last-Translator: Charles Monzat \n" "Language-Team: French (http://www.transifex.com/manjarolinux/manjaro-pamac/language/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Authentification nécessaire" @@ -563,6 +563,10 @@ msgstr "Fréquence de vérification des mises à jour, valeur en heures " msgid "Number of versions of each package to keep in the cache" msgstr "Nombre de versions de chaque paquet à conserver dans le cache " +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Monde entier" @@ -673,9 +677,7 @@ msgid "Remove unrequired dependencies" msgstr "Désinstaller les dépendances inutiles" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "En désinstallant un paquet, désinstaller également les dépendances qui ne sont pas requises par d'autres paquets" #: ../resources/preferences_dialog.ui @@ -718,7 +720,9 @@ msgstr "Dépôts officiels" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR est maintenu par la communauté, donc il présente des risques potentiels.\nSes utilisateurs devraient tous être familiers avec la construction de paquets." +msgstr "" +"AUR est maintenu par la communauté, donc il présente des risques potentiels.\n" +"Ses utilisateurs devraient tous être familiers avec la construction de paquets." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/gl.po b/po/gl.po index 90c784a..b4d28a8 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2,24 +2,24 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Noel Rodríguez Freire , 2015-2017 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Galician (http://www.transifex.com/manjarolinux/manjaro-pamac/language/gl/)\n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "A autenticación é necesaria" @@ -551,6 +551,10 @@ msgstr "Cantas veces para comprobar actualizacións, o valor en horas" msgid "Number of versions of each package to keep in the cache" msgstr "Número de versións de cada paquete para gardar na caché" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "En todo o Mundo" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "Elimina dependencias sen contrapartida" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Ao eliminar un paquete, tamén eliminar súas dependencias que non son esixidos por outros paquetes" #: ../resources/preferences_dialog.ui @@ -706,7 +708,9 @@ msgstr "Repositorios oficiais" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR é un repositorio comunitario polo que presenta riscos potencias e problemas.\nTodos os usuarios de AUR deben estar familiarizados co el proceso de construción." +msgstr "" +"AUR é un repositorio comunitario polo que presenta riscos potencias e problemas.\n" +"Todos os usuarios de AUR deben estar familiarizados co el proceso de construción." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/he.po b/po/he.po index 8fab295..33f849e 100644 --- a/po/he.po +++ b/po/he.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Xc Vb , 2014 # GenghisKhan , 2013-2016 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Hebrew (http://www.transifex.com/manjarolinux/manjaro-pamac/language/he/)\n" +"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "נדרש אישור" @@ -554,6 +554,10 @@ msgstr "מהי תדירות בדיקת העדכונים, בשעות" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "כלל עולמי" @@ -664,9 +668,7 @@ msgid "Remove unrequired dependencies" msgstr "הסר תוספים לא נחוצים" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "בעת הסרת חבילה, הסר גם את התלויות שלה אשר לא נחוצות על ידי חבילות אחרות" #: ../resources/preferences_dialog.ui @@ -709,7 +711,9 @@ msgstr "מאגרים רשמיים" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "‏AUR הינו מאגר מתוחזק קהילה כך שהוא טומן בחובו סיכונים ובעיות.\nכל משתמשי AUR צריכים להיות בקיעים עם תהליך הבניה." +msgstr "" +"‏AUR הינו מאגר מתוחזק קהילה כך שהוא טומן בחובו סיכונים ובעיות.\n" +"כל משתמשי AUR צריכים להיות בקיעים עם תהליך הבניה." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/hi.po b/po/hi.po index 369f217..3e8dc5a 100644 --- a/po/hi.po +++ b/po/hi.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # confidential man , 2016 # sivananda , 2014 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Hindi (http://www.transifex.com/manjarolinux/manjaro-pamac/language/hi/)\n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "प्रमाणीकरण की आवश्यकता है" @@ -554,6 +554,10 @@ msgstr "घंटे में अपडेट, मूल्य के लिए msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -664,9 +668,7 @@ msgid "Remove unrequired dependencies" msgstr "संयुक्त राष्ट्र आवश्यक निर्भरता निकालें" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/hi_IN.po b/po/hi_IN.po index a7cf69c..765b1ec 100644 --- a/po/hi_IN.po +++ b/po/hi_IN.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Hindi (India) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/hi_IN/)\n" +"Language: hi_IN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hi_IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/hr.po b/po/hr.po index fbd5586..e2d49c8 100644 --- a/po/hr.po +++ b/po/hr.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Lovro Kudelić , 2016 # Lovro Kudelić , 2016-2017 @@ -12,18 +12,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-08-02 13:28+0000\n" "Last-Translator: Lovro Kudelić \n" "Language-Team: Croatian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/hr/)\n" +"Language: hr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hr\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Potrebna je autorizacija" @@ -558,6 +558,10 @@ msgstr "Koliko često provjeravati ažuriranja, vrijednost u satima" msgid "Number of versions of each package to keep in the cache" msgstr "Broj različitih verzija paketa za spremiti u predmemoriju" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Globalno" @@ -668,9 +672,7 @@ msgid "Remove unrequired dependencies" msgstr "Ukloni nepotrebne zavisnosti" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Prilikom uklanjanja paketa, ukloniti njegove zavisnosti koje ne zahtijevaju drugi paketi" #: ../resources/preferences_dialog.ui @@ -713,7 +715,9 @@ msgstr "Službeni repozitoriji" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR je repozitorij održavan od strane zajednice te tako predstavlja potencijalne rizike i probleme.\nSvi AUR korisnici bi trebali biti upoznati s procesom stvaranja paketa." +msgstr "" +"AUR je repozitorij održavan od strane zajednice te tako predstavlja potencijalne rizike i probleme.\n" +"Svi AUR korisnici bi trebali biti upoznati s procesom stvaranja paketa." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/hr_HR.po b/po/hr_HR.po index 514b51c..9930af0 100644 --- a/po/hr_HR.po +++ b/po/hr_HR.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/hr_HR/)\n" +"Language: hr_HR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hr_HR\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -553,6 +553,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -663,9 +667,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/hu.po b/po/hu.po index a521559..4a6e533 100644 --- a/po/hu.po +++ b/po/hu.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Lajos Pasztor , 2013 # Lajos Pasztor , 2013-2016 @@ -12,18 +12,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Hungarian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/hu/)\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Hitelesítés szükséges" @@ -555,6 +555,10 @@ msgstr "Milyen gyakran ellenőrizze a frissítéseket? Értékek órában" msgid "Number of versions of each package to keep in the cache" msgstr "A cache- ben csomagonként megtartandó példányok száma:" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Világszerte" @@ -665,9 +669,7 @@ msgid "Remove unrequired dependencies" msgstr "Nem megkövetelt függőségek eltávolítása" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Csomag eltávolításakor távolítsa el a függőségeket amik nem megköveteltek más csomagok által" #: ../resources/preferences_dialog.ui @@ -710,7 +712,9 @@ msgstr "Hivatalos tárolók" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "Az AUR egy közösségileg karbantartott tároló, így lehetséges veszélyek és problémák forrása.\nAz AUR felhasználónak ismernie kell a telepítési folyamatot." +msgstr "" +"Az AUR egy közösségileg karbantartott tároló, így lehetséges veszélyek és problémák forrása.\n" +"Az AUR felhasználónak ismernie kell a telepítési folyamatot." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/id.po b/po/id.po index c7ff0d8..dc56b46 100644 --- a/po/id.po +++ b/po/id.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Brings Rain , 2016 # Budiman Jojo , 2014-2015 @@ -23,18 +23,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Indonesian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/id/)\n" +"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Membutuhkan Otentifikasi" @@ -563,6 +563,10 @@ msgstr "Berapa lama untuk memeriksa pembaharuan, nilai dalam jam" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Seluruh dunia" @@ -673,9 +677,7 @@ msgid "Remove unrequired dependencies" msgstr "Hapus dependensi yang tidak dibutuhkan" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Ketika menghapus paket, hapus juga dependensi paket tersebut yang tidak dibuthkan paket lainnya" #: ../resources/preferences_dialog.ui @@ -718,7 +720,9 @@ msgstr "Repositori Resmi" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR adalah sebuah komunitas perawatan repositori sehingga menyajikan potensi risiko dan masalah.\nSemua pengguna AUR harus akrab dengan proses pembangunan." +msgstr "" +"AUR adalah sebuah komunitas perawatan repositori sehingga menyajikan potensi risiko dan masalah.\n" +"Semua pengguna AUR harus akrab dengan proses pembangunan." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/is.po b/po/is.po index 7c76ccd..10c814d 100644 --- a/po/is.po +++ b/po/is.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Kristján Magnússon, 2015 # Kristján Magnússon, 2015-2017 @@ -10,18 +10,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Icelandic (http://www.transifex.com/manjarolinux/manjaro-pamac/language/is/)\n" +"Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: is\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Auðkenningar er krafist" @@ -553,6 +553,10 @@ msgstr "Hversu oft á að athuga með uppfærslur, í klukkustundum" msgid "Number of versions of each package to keep in the cache" msgstr "Fjöldi af útgáfum af hverjum pakka til að halda í skyndiminni" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Út um allan heim" @@ -663,9 +667,7 @@ msgid "Remove unrequired dependencies" msgstr "Fjarlægja ónauðsynlegar kerfiskröfur" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Þegar pakki er fjarlægður, fjarlægja þá einnig pakka sem honum eru háðir ef þeirra er ekki krafist af öðrum pökkum" #: ../resources/preferences_dialog.ui @@ -708,7 +710,9 @@ msgstr "Opinber hugbúnaðarsöfn" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR er hugbúnaðarsafn sem viðhaldið er af fjölda sjálfboðaliða þannig að því fylgir ákveðin áhætta.\nAllir notendur AUR ættu að vera meðvitaðir um byggingaferlið." +msgstr "" +"AUR er hugbúnaðarsafn sem viðhaldið er af fjölda sjálfboðaliða þannig að því fylgir ákveðin áhætta.\n" +"Allir notendur AUR ættu að vera meðvitaðir um byggingaferlið." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/is_IS.po b/po/is_IS.po index 8ce8cac..a9253fe 100644 --- a/po/is_IS.po +++ b/po/is_IS.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Icelandic (Iceland) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/is_IS/)\n" +"Language: is_IS\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: is_IS\n" "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/it.po b/po/it.po index b042c13..def13a2 100644 --- a/po/it.po +++ b/po/it.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Bernardo Miguel Savone , 2013-2014 # Corrado Carbè , 2015 @@ -21,18 +21,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Italian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Autenticazione richiesta" @@ -564,6 +564,10 @@ msgstr "Con quale frequenza controllare gli aggiornamenti, il valore in ore" msgid "Number of versions of each package to keep in the cache" msgstr "Numero di versioni di ogni pacchetto da conservare nella cache" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Mondiale" @@ -674,9 +678,7 @@ msgid "Remove unrequired dependencies" msgstr "Rimuovere le dipendenze non necessarie" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Quando si rimuove un pacchetto, rimuovere anche le dipendenze che non sono richieste da altri pacchetti" #: ../resources/preferences_dialog.ui @@ -719,7 +721,9 @@ msgstr "Repository Ufficiali" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR è un repository mantenuto dalla comunità e presenta pertanto potenziali rischi e problemi.\nTutti gli utenti AUR dovrebbero conoscere il processo di compilazione." +msgstr "" +"AUR è un repository mantenuto dalla comunità e presenta pertanto potenziali rischi e problemi.\n" +"Tutti gli utenti AUR dovrebbero conoscere il processo di compilazione." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/it_IT.po b/po/it_IT.po index 1a8d43c..b20d337 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Italian (Italy) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/it_IT/)\n" +"Language: it_IT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: it_IT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/ja.po b/po/ja.po index a1283a1..3fc29b2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # BALLOON a.k.a. Fu-sen., 2015 # ふうせん Fu-sen. | BALLOON a.k.a. Fu-sen., 2015 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Japanese (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ja/)\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "認証が必要です" @@ -551,6 +551,10 @@ msgstr "どれくらいの頻度で更新をチェックしますか、時間で msgid "Number of versions of each package to keep in the cache" msgstr "各パッケージのバージョン番号をキャッシュに保存する" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "ワールドワイド" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "必要ではない依存関係を削除" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "パッケージを削除する際、他のパッケージでは必要とされていない依存パッケージも削除" #: ../resources/preferences_dialog.ui @@ -706,7 +708,9 @@ msgstr "公式リポジトリ" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR はコミュニティによって維持されているリポジトリです。潜在的なリスクや問題があるかもしれません。\nすべての AUR ユーザーはビルドプロセスに精通している必要があります。" +msgstr "" +"AUR はコミュニティによって維持されているリポジトリです。潜在的なリスクや問題があるかもしれません。\n" +"すべての AUR ユーザーはビルドプロセスに精通している必要があります。" #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/ka.po b/po/ka.po index 7ca9648..dbc0b09 100644 --- a/po/ka.po +++ b/po/ka.po @@ -2,25 +2,25 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # arabuli , 2015 # arabuli , 2015 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Georgian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ka/)\n" +"Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ka\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -549,6 +549,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -659,9 +663,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/ko.po b/po/ko.po index ee8a0cb..b9ee3ef 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Eric Park , 2017 # lego37yoon , 2013 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Korean (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ko/)\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "인증이 필요합니다" @@ -551,6 +551,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/lt.po b/po/lt.po index 2aa9fd4..49b03da 100644 --- a/po/lt.po +++ b/po/lt.po @@ -2,25 +2,25 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Moo, 2015 # Moo, 2015-2017 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 15:15+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/lt/)\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Reikalingas tapatybės nustatymas" @@ -555,6 +555,10 @@ msgstr "Kaip dažnai tikrinti ar yra atnaujinimų, reikšmė valandomis" msgid "Number of versions of each package to keep in the cache" msgstr "Podėlyje laikomas kiekvieno paketo versijų skaičius" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Viso pasaulio" @@ -665,9 +669,7 @@ msgid "Remove unrequired dependencies" msgstr "Šalinti nereikalingas priklausomybes" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Šalinant paketą, tuo pačiu šalinti ir jo priklausomybes, kurios nėra reikalaujamos kitų paketų" #: ../resources/preferences_dialog.ui @@ -710,7 +712,9 @@ msgstr "Oficialios saugyklos" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR yra bendruomenės palaikoma saugykla, taigi, sukelia tam tikrą riziką ir problemas.\nVisi AUR naudotojai turėtų būti susipažinę su kompiliavimo procesu." +msgstr "" +"AUR yra bendruomenės palaikoma saugykla, taigi, sukelia tam tikrą riziką ir problemas.\n" +"Visi AUR naudotojai turėtų būti susipažinę su kompiliavimo procesu." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/ml.po b/po/ml.po index 968e520..fa22352 100644 --- a/po/ml.po +++ b/po/ml.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Malayalam (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ml/)\n" +"Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ml\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/ms.po b/po/ms.po index 692bba6..5aaf2a2 100644 --- a/po/ms.po +++ b/po/ms.po @@ -2,24 +2,24 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Puretech , 2013 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Malay (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ms/)\n" +"Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ms\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -548,6 +548,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -658,9 +662,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/nb.po b/po/nb.po index 6fb1823..fccc6ef 100644 --- a/po/nb.po +++ b/po/nb.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Morten Rene , 2014 # Bård Spein , 2013 @@ -23,18 +23,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/manjarolinux/manjaro-pamac/language/nb/)\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Autentisering kreves" @@ -140,7 +140,9 @@ msgstr "%s ser ut til å bli avkortet: %jd/%jd bytes\n" #: ../src/system_daemon.vala #, c-format msgid "failed retrieving file '%s' from %s : %s\n" -msgstr "klarte ikke å hente filen '%s' fra %s : %s\n\n" +msgstr "" +"klarte ikke å hente filen '%s' fra %s : %s\n" +"\n" #: ../src/transaction.vala msgid "Copy" @@ -566,6 +568,10 @@ msgstr "Hvor ofte skal oppdateringer sees etter, verdi i timer " msgid "Number of versions of each package to keep in the cache" msgstr "Antall versjoner av hver pakke som skal beholdes i hurtiglageret" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Verdensomspennende" @@ -676,9 +682,7 @@ msgid "Remove unrequired dependencies" msgstr "Fjern avhengige pakker som er unødvendige" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Når du fjerner en pakke, fjern også dets avhengigheter som ikke kreves av andre pakker" #: ../resources/preferences_dialog.ui @@ -721,7 +725,9 @@ msgstr "Offisielle pakkebrønner " msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR er en pakkebrønn som vedlikeholdes av fellesskapet og kan derfor introdusere risikoer og problemer.\nAlle AUR-brukere bør kjenne fremgangsmåten for å bygge pakker. " +msgstr "" +"AUR er en pakkebrønn som vedlikeholdes av fellesskapet og kan derfor introdusere risikoer og problemer.\n" +"Alle AUR-brukere bør kjenne fremgangsmåten for å bygge pakker. " #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/nl.po b/po/nl.po index f1a27ea..978876a 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Douwe Bootsma , 2013 # Douwe Bootsma , 2013-2015 @@ -22,18 +22,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 09:20+0000\n" "Last-Translator: Heimen Stoffels \n" "Language-Team: Dutch (http://www.transifex.com/manjarolinux/manjaro-pamac/language/nl/)\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Verificatie vereist" @@ -565,6 +565,10 @@ msgstr "Controle interval voor updates, waarde in uren" msgid "Number of versions of each package to keep in the cache" msgstr "Aantal in de cache te houden versies van elk pakket" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Wereldwijd" @@ -675,9 +679,7 @@ msgid "Remove unrequired dependencies" msgstr "Verwijder onnodige afhankelijkheden" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Bij het verwijderen van een pakket ook afhankelijkheden verwijderen die niet meer gebruikt worden door andere pakketten" #: ../resources/preferences_dialog.ui @@ -720,7 +722,9 @@ msgstr "Officiële repositories" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR is een gemeenschap onderhouden repository en kan mogelijk risico's en problemen introduceren. \n Alle AUR gebruikers worden geacht met het bouwproces vertrouwd te zijn." +msgstr "" +"AUR is een gemeenschap onderhouden repository en kan mogelijk risico's en problemen introduceren. \n" +" Alle AUR gebruikers worden geacht met het bouwproces vertrouwd te zijn." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/nl_BE.po b/po/nl_BE.po index 0a7da53..5ae5756 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -2,24 +2,24 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Kevin Andriessens , 2015 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Dutch (Belgium) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/nl_BE/)\n" +"Language: nl_BE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl_BE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -551,6 +551,10 @@ msgstr "Hoe vaak voor updates kijken, waarde in uren" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Wereldwijd " @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "Verwijder onnodige afhankelijkheiden" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Bij het verwijderen van een pakket, ook zijn afhankelijkheden verwijderen die niet nodig zijn voor andere pakketten" #: ../resources/preferences_dialog.ui @@ -706,7 +708,9 @@ msgstr "Officiële Repositories" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR is een repository geadministreerd door de community en daardoor kan het voor potentiële gevaren en problemen zorgen.\nAlle AUR gebruikers zouden familiair moeten zijn met het bouw-process." +msgstr "" +"AUR is een repository geadministreerd door de community en daardoor kan het voor potentiële gevaren en problemen zorgen.\n" +"Alle AUR gebruikers zouden familiair moeten zijn met het bouw-process." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/nl_NL.po b/po/nl_NL.po index 8ba9cf8..bb0a354 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Douwe Bootsma , 2013 # Guillaume Benoit , 2013 @@ -12,18 +12,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 09:19+0000\n" "Last-Translator: Heimen Stoffels \n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/nl_NL/)\n" +"Language: nl_NL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Authenticatie vereist" @@ -555,6 +555,10 @@ msgstr "Hoe vaak moet er worden gecontroleerd op updates? (waarde in uren)" msgid "Number of versions of each package to keep in the cache" msgstr "Aantal in de cache te houden versies van elk pakket" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Wereldwijd" @@ -665,9 +669,7 @@ msgid "Remove unrequired dependencies" msgstr "Niet-benodigde afhankelijkheden verwijderen" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Verwijder, bij het verwijderen van een pakket, ook de afhankelijkheden die niet vereist zijn door andere pakketten" #: ../resources/preferences_dialog.ui @@ -710,7 +712,9 @@ msgstr "Officiële pakketbronnen" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR is een pakketbron die beheerd wordt door de gemeenschap. Dit kan leiden tot risico's en problemen.\nAlle AUR-gebruikers dienen bekend te zijn met het bouwproces." +msgstr "" +"AUR is een pakketbron die beheerd wordt door de gemeenschap. Dit kan leiden tot risico's en problemen.\n" +"Alle AUR-gebruikers dienen bekend te zijn met het bouwproces." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/nn.po b/po/nn.po index 77d926f..8a0bb0a 100644 --- a/po/nn.po +++ b/po/nn.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/manjarolinux/manjaro-pamac/language/nn/)\n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/pamac.pot b/po/pamac.pot index db19312..633d27a 100644 --- a/po/pamac.pot +++ b/po/pamac.pot @@ -1,12 +1,13 @@ # Translation of Pamac. +# Copyright (C) 2017 Chris Cromer # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. # msgid "" msgstr "" -"Project-Id-Version: Pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Project-Id-Version: Pamac-Classic\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -17,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" diff --git a/po/pl.po b/po/pl.po index 477c985..7b458d8 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Daniel Napora , 2016-2017 # Dominik “Devhost97” G , 2016 @@ -18,18 +18,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-08-02 11:35+0000\n" "Last-Translator: Piotr Strębski \n" "Language-Team: Polish (http://www.transifex.com/manjarolinux/manjaro-pamac/language/pl/)\n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Wymagane jest uwierzytelnienie" @@ -567,6 +567,10 @@ msgstr "Jak często sprawdzać aktualizacje, wartość w godzinach" msgid "Number of versions of each package to keep in the cache" msgstr "Liczba wersji każdego pakietu do przechowywania w pamięci podręcznej" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Ogólnoświatowe" @@ -677,9 +681,7 @@ msgid "Remove unrequired dependencies" msgstr "Usuwanie niewymaganych zależności" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Podczas usuwania pakietu usuwać także te zależności, które nie są już wymagane przez inne pakiety" #: ../resources/preferences_dialog.ui @@ -722,7 +724,9 @@ msgstr "Repozytoria oficjalne" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR jest repozytorium zarządzanym przez społeczność, w związku z czym stanowi potencjalne źródło ryzyka i problemów.\nWszyscy użytkownicy AUR powinni być zaznajomieni z procesem tworzenia pakietów. " +msgstr "" +"AUR jest repozytorium zarządzanym przez społeczność, w związku z czym stanowi potencjalne źródło ryzyka i problemów.\n" +"Wszyscy użytkownicy AUR powinni być zaznajomieni z procesem tworzenia pakietów. " #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/pl_PL.po b/po/pl_PL.po index d6c65dd..0abc0b7 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Polish (Poland) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/pl_PL/)\n" +"Language: pl_PL\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pl_PL\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -556,6 +556,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -666,9 +670,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/pot_head b/po/pot_head index 9ab3ae1..c5a1c1f 100644 --- a/po/pot_head +++ b/po/pot_head @@ -17,6 +17,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" diff --git a/po/pt.po b/po/pt.po index c3913a2..bfe87c7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,24 +2,24 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # José Vieira , 2017 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Portuguese (http://www.transifex.com/manjarolinux/manjaro-pamac/language/pt/)\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Autenticação necessária" @@ -551,6 +551,10 @@ msgstr "Frequência de verificação de actualizações, valor em horas" msgid "Number of versions of each package to keep in the cache" msgstr "Número de versões de cada pacote a manter na cache" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Mundial" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "Remover dependências não requeridas" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Ao remover um pacote, remover também todas as suas dependências que não sejam requeridas por outros pacotes" #: ../resources/preferences_dialog.ui @@ -706,7 +708,9 @@ msgstr "Repositórios Oficiais" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR é um repositório mantido pela comunidade, pelo que apresenta riscos e problemas potenciais.\nTodos os utilizadores do AUR devem estar familiarizados com o processo de compilação." +msgstr "" +"AUR é um repositório mantido pela comunidade, pelo que apresenta riscos e problemas potenciais.\n" +"Todos os utilizadores do AUR devem estar familiarizados com o processo de compilação." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6d24013..8162b3e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Adriano Martins , 2016 # Aldo Oliveira , 2014-2015,2017 @@ -25,18 +25,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Autenticação necessária" @@ -568,6 +568,10 @@ msgstr "Vezes para verificar se há atualizações, o valor em horas" msgid "Number of versions of each package to keep in the cache" msgstr "Número de versões de cada pacote a manter na cache" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Mundial" @@ -678,9 +682,7 @@ msgid "Remove unrequired dependencies" msgstr "Remover dependências desnecessárias" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Ao remover um pacote, também remover as dependências que não são exigidas por outros pacotes" #: ../resources/preferences_dialog.ui @@ -723,7 +725,9 @@ msgstr "Repositórios oficiais" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR é um repositório mantido pela comunidade de modo que apresenta riscos e problemas potenciais.\nTodos os usuários do AUR devem estar familiarizados com o processo de compilação." +msgstr "" +"AUR é um repositório mantido pela comunidade de modo que apresenta riscos e problemas potenciais.\n" +"Todos os usuários do AUR devem estar familiarizados com o processo de compilação." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/pt_PT.po b/po/pt_PT.po index 797ac9b..52226e2 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # António Correia, 2014 # António Correia, 2014-2015,2017 @@ -16,18 +16,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/pt_PT/)\n" +"Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Autenticação necessária" @@ -559,6 +559,10 @@ msgstr "Frequência de verificação de actualizações, valor em horas" msgid "Number of versions of each package to keep in the cache" msgstr "Número de versões de cada pacote a manter na cache" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Mundial" @@ -669,9 +673,7 @@ msgid "Remove unrequired dependencies" msgstr "Remover dependências não requeridas" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Ao remover um pacote, remover também todas as suas dependências que não sejam requeridas por outros pacotes" #: ../resources/preferences_dialog.ui @@ -714,7 +716,9 @@ msgstr "Repositórios Oficiais" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR é um repositório mantido pela comunidade, pelo que apresenta riscos e problemas potenciais.\nTodos os utilizadores do AUR devem estar familiarizados com o processo de compilação." +msgstr "" +"AUR é um repositório mantido pela comunidade, pelo que apresenta riscos e problemas potenciais.\n" +"Todos os utilizadores do AUR devem estar familiarizados com o processo de compilação." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/ro.po b/po/ro.po index d5d10dc..b33086e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Aaron , 2015 # Aaron , 2015 @@ -12,18 +12,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Romanian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ro/)\n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -558,6 +558,10 @@ msgstr "Frecvența de verificare a actualizărilor, în ore" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Mondial" @@ -668,9 +672,7 @@ msgid "Remove unrequired dependencies" msgstr "Elimină dependențe ce nu sunt necesare" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Când se elimină un pachet, se vor elimina și acele dependențe ce nu sunt cerute de alte pachete" #: ../resources/preferences_dialog.ui diff --git a/po/ru.po b/po/ru.po index bae328e..efddcf3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Александр, 2015 # Андрей Болконский , 2013 @@ -26,18 +26,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Russian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Запрошена авторизация" @@ -575,6 +575,10 @@ msgstr "Укажите интервал поиска обновлений, в ч msgid "Number of versions of each package to keep in the cache" msgstr "Сохранять в кэше предыдущие версии пакетов в количестве" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Мировой" @@ -685,9 +689,7 @@ msgid "Remove unrequired dependencies" msgstr "Удалить ненужные зависимости" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "При удалении пакета, также произвести удаление неиспользуемых сопутствующих зависимостей" #: ../resources/preferences_dialog.ui @@ -730,7 +732,9 @@ msgstr "Официальные репозитории" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR это поддерживаемый сообществом репозиторий, представляющий потенциальные риски и проблемы.\nВсе пользователи AUR должны быть знакомы с процессом сборки." +msgstr "" +"AUR это поддерживаемый сообществом репозиторий, представляющий потенциальные риски и проблемы.\n" +"Все пользователи AUR должны быть знакомы с процессом сборки." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/si.po b/po/si.po index 7158a18..980b49e 100644 --- a/po/si.po +++ b/po/si.po @@ -2,25 +2,25 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Enindu Alahapperuma , 2014 # Enindu Alahapperuma , 2014 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Sinhala (http://www.transifex.com/manjarolinux/manjaro-pamac/language/si/)\n" +"Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: si\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -552,6 +552,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -662,9 +666,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/sk.po b/po/sk.po index 3c459e9..48157c7 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Dušan Kazik, 2014 # Dušan Kazik , 2014-2017 @@ -13,18 +13,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 06:06+0000\n" "Last-Translator: Dušan Kazik \n" "Language-Team: Slovak (http://www.transifex.com/manjarolinux/manjaro-pamac/language/sk/)\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Vyžaduje sa overenie totožnosti" @@ -559,6 +559,10 @@ msgstr "Ako často kontrolovať aktualizácie, hodnota je v hodinách" msgid "Number of versions of each package to keep in the cache" msgstr "Počet verzií každého balíka, ktoré ponechať vo vyrovnávacej pamäti" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Celého sveta" @@ -669,9 +673,7 @@ msgid "Remove unrequired dependencies" msgstr "Odstrániť nepožadované závislosti" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Pri odstránení balíka tiež odstráni závislosti, ktoré nie sú potrebné inými balíkmi" #: ../resources/preferences_dialog.ui @@ -714,7 +716,9 @@ msgstr "Oficiálne repozitáre" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR je repozitár spravovaný komunitou, preto predstavuje potenciálne hrozby a problémy.\nVšetci používatelia repozitára AUR by mali byť oboznámení s procesom zostavovania balíkov." +msgstr "" +"AUR je repozitár spravovaný komunitou, preto predstavuje potenciálne hrozby a problémy.\n" +"Všetci používatelia repozitára AUR by mali byť oboznámení s procesom zostavovania balíkov." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/sl.po b/po/sl.po index cc74362..4ecfcc7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Al Manja , 2017 # ansich , 2014 @@ -14,18 +14,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Slovenian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Zahtevana je overitev" @@ -563,6 +563,10 @@ msgstr "Kako pogosto naj se preverja za posodobitve, vrednost v urah" msgid "Number of versions of each package to keep in the cache" msgstr "Število verzij za vsak paket shranjenih v predpomnilniku" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Svetovno" @@ -673,9 +677,7 @@ msgid "Remove unrequired dependencies" msgstr "Odstrani nezahtevane odvisnosti" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Ob odstranjevanju paketov odstrani tudi tiste odvisnosti, ki niso zahtevani s strani drugih paketov" #: ../resources/preferences_dialog.ui @@ -718,7 +720,9 @@ msgstr "Uradna skladišča" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR je skladišče, ki ga urejajo uporabniki, zaradi česar je lahko potencialni vir tveganj in težav.\nPriporočljivo je, da so vsi uporabniki AUR seznanjeni s procesom izgradnje programov." +msgstr "" +"AUR je skladišče, ki ga urejajo uporabniki, zaradi česar je lahko potencialni vir tveganj in težav.\n" +"Priporočljivo je, da so vsi uporabniki AUR seznanjeni s procesom izgradnje programov." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/sl_SI.po b/po/sl_SI.po index 9b114af..9172ad9 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Slovenian (Slovenia) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/sl_SI/)\n" +"Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl_SI\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -556,6 +556,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -666,9 +670,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/sr.po b/po/sr.po index c4bbaa6..f658258 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # philm , 2015 # Драгољуб Шишовић, 2014 @@ -10,18 +10,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Serbian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/sr/)\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -556,6 +556,10 @@ msgstr "Колико често да се проверавају ажурира msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Широм света" @@ -666,9 +670,7 @@ msgid "Remove unrequired dependencies" msgstr "Уклони непотребне зависности" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "При уклањању пакета, такође уклони и све његове зависности које више нису потребне ни једном другом пакету" #: ../resources/preferences_dialog.ui diff --git a/po/sr@latin.po b/po/sr@latin.po index 31e9506..d564cfe 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Aleksa, 2016 # kakonema , 2013-2014 @@ -13,18 +13,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/sr@latin/)\n" +"Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Autentifikacija je neophodna" @@ -559,6 +559,10 @@ msgstr "Koliko često da proveravam ažuriranja, vrednost u satima" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -669,9 +673,7 @@ msgid "Remove unrequired dependencies" msgstr "Ukloni nepotrebne zavisnosti" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/sr_RS.po b/po/sr_RS.po index 201709c..2e3bd22 100644 --- a/po/sr_RS.po +++ b/po/sr_RS.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Serbian (Serbia) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/sr_RS/)\n" +"Language: sr_RS\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr_RS\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -553,6 +553,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -663,9 +667,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po index 33ad3d9..f00360a 100644 --- a/po/sr_RS@latin.po +++ b/po/sr_RS@latin.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Serbian (Latin) (Serbia) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/sr_RS@latin/)\n" +"Language: sr_RS@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr_RS@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -553,6 +553,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -663,9 +667,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/sv.po b/po/sv.po index 0bc9724..4372544 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Alexander Lindberg , 2013-2014 # Mattias Johansson , 2014 @@ -16,18 +16,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Swedish (http://www.transifex.com/manjarolinux/manjaro-pamac/language/sv/)\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Autentisering krävs" @@ -559,6 +559,10 @@ msgstr "Hur ofta söka efter uppdateringar, ange i timmar" msgid "Number of versions of each package to keep in the cache" msgstr "Antal versioner av varje paket att behålla i cachen" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Världsomspännande" @@ -669,9 +673,7 @@ msgid "Remove unrequired dependencies" msgstr "Ta bort icke-nödvändiga beroenden" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "När ett paket tas bort, ta även bort de beroenden paketet har, men som inga andra paket kräver" #: ../resources/preferences_dialog.ui @@ -714,7 +716,9 @@ msgstr "Officiella förråd" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR är ett gemensamt under- och tillhandahållet förråd som kan medföra risker och problem.\nAlla AUR-användare bör vara bekanta med byggprocessen." +msgstr "" +"AUR är ett gemensamt under- och tillhandahållet förråd som kan medföra risker och problem.\n" +"Alla AUR-användare bör vara bekanta med byggprocessen." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/tr.po b/po/tr.po index dbaa7d8..c785657 100644 --- a/po/tr.po +++ b/po/tr.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Demiray Muhterem , 2013-2017 # Guillaume Benoit , 2013 @@ -12,18 +12,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-08-04 06:07+0000\n" "Last-Translator: Demiray Muhterem \n" "Language-Team: Turkish (http://www.transifex.com/manjarolinux/manjaro-pamac/language/tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Kimlik doğrulaması gerekli" @@ -129,7 +129,9 @@ msgstr "%s kesintiye uğramış gibi görünüyor: %jd/%jd bytes\n" #: ../src/system_daemon.vala #, c-format msgid "failed retrieving file '%s' from %s : %s\n" -msgstr "%s üzerinden '%s dosyası alınamadı: %s\n\n" +msgstr "" +"%s üzerinden '%s dosyası alınamadı: %s\n" +"\n" #: ../src/transaction.vala msgid "Copy" @@ -555,6 +557,10 @@ msgstr "Güncellemeler ne sıklıkta kontrol edilecek, saat belirtin" msgid "Number of versions of each package to keep in the cache" msgstr "Önbellekte tutlacak her bir paketin sürüm sayısı" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "Küresel" @@ -665,9 +671,7 @@ msgid "Remove unrequired dependencies" msgstr "Gereksiz bağımlılıkları kaldır" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "Bir paket kaldırılırken, başka bir uygulama aynı bağımlılıkları kullanmıyorsa paketi bağımlılıkları ile birlikte kaldır" #: ../resources/preferences_dialog.ui @@ -710,7 +714,9 @@ msgstr "Resmi Depolar" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR topluluk depolarının potansiyel riskler ve sorunlar içerebileceğini unutmayın.\nAUR hakkında bilgi sahibi iseniz bunları biliyor olmalısınız." +msgstr "" +"AUR topluluk depolarının potansiyel riskler ve sorunlar içerebileceğini unutmayın.\n" +"AUR hakkında bilgi sahibi iseniz bunları biliyor olmalısınız." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/uk.po b/po/uk.po index 836fd8a..3604862 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # dsafsadf , 2017 # Rax Garfield , 2012 @@ -19,18 +19,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Ukrainian (http://www.transifex.com/manjarolinux/manjaro-pamac/language/uk/)\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "Потрібна авторизація" @@ -565,6 +565,10 @@ msgstr "Як часто перевіряти оновлення (значенн msgid "Number of versions of each package to keep in the cache" msgstr "Кількість версій кожного пакунка зберігається в кеш-пам'яті" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "По всьому світу" @@ -675,9 +679,7 @@ msgid "Remove unrequired dependencies" msgstr "Вилучити непотрібні залежності" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "При вилученні пакунку, також видаляйте його залежності, що не потребуються іншими пакунками" #: ../resources/preferences_dialog.ui @@ -720,7 +722,9 @@ msgstr "Офіційні репозиторії" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR це репозиторій, що підтримується спільнотою, а отже являє собою потенційні ризики та проблеми.\nВсі користувачі AUR мають знати про процес побудови." +msgstr "" +"AUR це репозиторій, що підтримується спільнотою, а отже являє собою потенційні ризики та проблеми.\n" +"Всі користувачі AUR мають знати про процес побудови." #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/ur_PK.po b/po/ur_PK.po index 42faff0..ba7f268 100644 --- a/po/ur_PK.po +++ b/po/ur_PK.po @@ -2,24 +2,24 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Taimur , 2015 msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Urdu (Pakistan) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/ur_PK/)\n" +"Language: ur_PK\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ur_PK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -551,6 +551,10 @@ msgstr "اپ ڈیٹس چیک کرنے کی کثرت کی وضاحت گھنٹو msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "بین القوامی" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "غیر ضروری انحصار پیکج نکال دیں" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "تمام انحصاری پیکجز جو کہ کسی دوسرے پیکیج کی ضروری نہ ہوں، ان کو بھی پیکیج کو غیر انسٹال کرتے وقت نکال دیں" #: ../resources/preferences_dialog.ui diff --git a/po/uz.po b/po/uz.po index f7ad672..a7da03d 100644 --- a/po/uz.po +++ b/po/uz.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # philm , 2015 # Umidjon Almasov , 2013-2014 @@ -10,18 +10,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Uzbek (http://www.transifex.com/manjarolinux/manjaro-pamac/language/uz/)\n" +"Language: uz\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: uz\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "Qanchalik tez yangilanishlar tekshirilsin, qiymati soatda" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "Talab etilmagan qaramliklarni olib tashlash" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/vi.po b/po/vi.po index 26fc7c1..5abb06f 100644 --- a/po/vi.po +++ b/po/vi.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Duy Truong Nguyen , 2014 # philm , 2015 @@ -10,18 +10,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Vietnamese (http://www.transifex.com/manjarolinux/manjaro-pamac/language/vi/)\n" +"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -550,6 +550,10 @@ msgstr "Bao lâu sẽ kiểm tra cập nhật, tính bằng giờ" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -660,9 +664,7 @@ msgid "Remove unrequired dependencies" msgstr "Gỡ bỏ phần phụ thuộc không cần thiết" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/zh.po b/po/zh.po index 2616aca..7759b83 100644 --- a/po/zh.po +++ b/po/zh.po @@ -2,23 +2,23 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Chinese (http://www.transifex.com/manjarolinux/manjaro-pamac/language/zh/)\n" +"Language: zh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "" @@ -547,6 +547,10 @@ msgstr "" msgid "Number of versions of each package to keep in the cache" msgstr "" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "" @@ -657,9 +661,7 @@ msgid "Remove unrequired dependencies" msgstr "" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "" #: ../resources/preferences_dialog.ui diff --git a/po/zh_CN.po b/po/zh_CN.po index dcce3da..d341bc4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Daetalus , 2014 # Daetalus , 2014 @@ -13,18 +13,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 02:40+0000\n" "Last-Translator: philm \n" "Language-Team: Chinese (China) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "需要验证" @@ -553,6 +553,10 @@ msgstr "检查更新的频率，单位为小时" msgid "Number of versions of each package to keep in the cache" msgstr "每个软件包保留在缓存中的版本数目" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "全世界" @@ -663,9 +667,7 @@ msgid "Remove unrequired dependencies" msgstr "移除不需要的依赖" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "移除软件包时，也移除该软件包需要，但其他软件包不需要的依赖" #: ../resources/preferences_dialog.ui @@ -708,7 +710,9 @@ msgstr "官方软件仓库" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR 是由社区维护的仓库，所以它具有潜在的风险和问题。\n所有 AUR 用户都应当熟悉构建过程。" +msgstr "" +"AUR 是由社区维护的仓库，所以它具有潜在的风险和问题。\n" +"所有 AUR 用户都应当熟悉构建过程。" #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/po/zh_TW.po b/po/zh_TW.po index bdcdae9..6c94385 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2,7 +2,7 @@ # Copyright (C) 2013-2016 Manjaro Developers # This file is distributed under the same license as the Pamac package. # Guillaume Benoit , 2013-2016. -# +# # Translators: # Hsiu-Ming Chang , 2016 # Hsiu-Ming Chang , 2016 @@ -11,18 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: manjaro-pamac\n" -"Report-Msgid-Bugs-To: guillaume@manjaro.org\n" +"Report-Msgid-Bugs-To: cromer@cromnix.org\n" "POT-Creation-Date: 2016-04-24 08:44+0200\n" "PO-Revision-Date: 2017-07-30 12:17+0000\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/manjarolinux/manjaro-pamac/language/zh_TW/)\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: data/polkit/org.manjaro.pamac.policy +#: data/polkit/org.pamac.policy msgid "Authentication is required" msgstr "需要授權" @@ -551,6 +551,10 @@ msgstr "請選擇您想要檢查更新的頻率，單位是小時" msgid "Number of versions of each package to keep in the cache" msgstr "每個軟體包要保留在快取中的版本數量" +#: ../src/preferences_dialog.vala +msgid "Build directory" +msgstr "" + #: ../src/preferences_dialog.vala msgid "Worldwide" msgstr "全世界" @@ -661,9 +665,7 @@ msgid "Remove unrequired dependencies" msgstr "移除不需要的相依性" #: ../resources/preferences_dialog.ui -msgid "" -"When removing a package, also remove its dependencies that are not required " -"by other packages" +msgid "When removing a package, also remove its dependencies that are not required by other packages" msgstr "當移除一個軟體包時，同時移除它的不被其他軟體包需要的相依性" #: ../resources/preferences_dialog.ui @@ -706,7 +708,9 @@ msgstr "官方套件庫" msgid "" "AUR is a community maintained repository so it presents potential risks and problems.\n" "All AUR users should be familiar with the build process." -msgstr "AUR 是一個社群維護的套件庫，所以它可能會有一些潛在的危險與問題。\n所有 AUR 的使用者都應該要對構建過程有相當程度的了解。" +msgstr "" +"AUR 是一個社群維護的套件庫，所以它可能會有一些潛在的危險與問題。\n" +"所有 AUR 的使用者都應該要對構建過程有相當程度的了解。" #: ../resources/preferences_dialog.ui msgid "Enable AUR support" diff --git a/resources/Makefile b/resources/Makefile deleted file mode 100644 index 9e1f28d..0000000 --- a/resources/Makefile +++ /dev/null @@ -1,38 +0,0 @@ - -MANAGER_RESOURCES_FILES = manager_window.ui \ - history_dialog.ui \ - package-available.png \ - package-available-locked.png \ - package-install.png \ - package-installed-locked.png \ - package-installed-updated.png \ - package-reinstall.png \ - package-remove.png - -INSTALLER_RESOURCES_FILES = progress_dialog.ui - -TRANSACTION_RESOURCES_FILES = progress_box.ui \ - choose_provider_dialog.ui \ - transaction_sum_dialog.ui \ - preferences_dialog.ui \ - choose_ignorepkgs_dialog.ui - -TRANSACTION_GRESOURCE_FILE = pamac.transaction.gresource.xml - -MANAGER_GRESOURCE_FILE = pamac.manager.gresource.xml - -INSTALLER_GRESOURCE_FILE = pamac.installer.gresource.xml - -resources: transaction_resources.c manager_resources.c installer_resources.c - -clean: - rm -f *.c - -transaction_resources.c: $(TRANSACTION_GRESOURCE_FILE) $(TRANSACTION_RESOURCES_FILES) - glib-compile-resources $(TRANSACTION_GRESOURCE_FILE) --target=transaction_resources.c --generate-source - -manager_resources.c: $(MANAGER_GRESOURCE_FILE) $(MANAGER_RESOURCES_FILES) - glib-compile-resources $(MANAGER_GRESOURCE_FILE) --target=manager_resources.c --generate-source - -installer_resources.c: $(INSTALLER_GRESOURCE_FILE) $(INSTALLER_RESOURCES_FILES) - glib-compile-resources $(INSTALLER_GRESOURCE_FILE) --target=installer_resources.c --generate-source diff --git a/resources/pamac.installer.gresource.xml b/resources/pamac.installer.gresource.xml deleted file mode 100644 index a4e7da0..0000000 --- a/resources/pamac.installer.gresource.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - progress_dialog.ui - - diff --git a/resources/pamac.manager.gresource.xml b/resources/pamac.manager.gresource.xml deleted file mode 100644 index 99dba71..0000000 --- a/resources/pamac.manager.gresource.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - manager_window.ui - history_dialog.ui - package-available.png - package-available-locked.png - package-install.png - package-installed-locked.png - package-installed-updated.png - package-reinstall.png - package-remove.png - package-upgrade.png - - diff --git a/resources/pamac.transaction.gresource.xml b/resources/pamac.transaction.gresource.xml deleted file mode 100644 index 90c24d1..0000000 --- a/resources/pamac.transaction.gresource.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - progress_dialog.ui - progress_box.ui - choose_provider_dialog.ui - transaction_sum_dialog.ui - - - preferences_dialog.ui - choose_ignorepkgs_dialog.ui - - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..768b146 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,144 @@ +### 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.0.0") +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}/Pamac.pc ${CMAKE_CURRENT_BINARY_DIR}/Pamac.pc) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Pamac.deps ${CMAKE_CURRENT_BINARY_DIR}/Pamac.deps) +set (VERSION "6.0.0") +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} libalpm) +set (VALA_PACKAGES ${VALA_PACKAGES} libnotify) +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) +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 (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 () +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 () +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=Pamac --gir Pamac-6.0.gir ) +set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction_no_aur.gresource.xml ) +set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction.gresource.xml ) + +vala_precompile(VALA_C Pamac + ${APP_SOURCES} +PACKAGES + ${VALA_PACKAGES} +OPTIONS + ${COMPILE_OPTIONS} +GENERATE_VAPI + Pamac +GENERATE_HEADER + Pamac +) + +SET (VALA_C ${VALA_C} ${pamac_transaction_gresource_xml_C_FILE}) +add_library(Pamac SHARED ${VALA_C}) + +add_dependencies (Pamac pamac_transaction_gresource_xml) +set_target_properties( Pamac PROPERTIES +VERSION + 6.0.0 +SOVERSION + 6 ) + + +install(TARGETS + Pamac +LIBRARY DESTINATION + ${CMAKE_INSTALL_LIBDIR}/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/Pamac.h +DESTINATION + ${CMAKE_INSTALL_INCLUDEDIR}/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/Pamac.vapi +DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/Pamac.deps +DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/Pamac-6.0.gir +DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/Pamac.pc +DESTINATION + ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ +) +if(HAVE_VALADOC) + valadoc(Pamac + ${CMAKE_BINARY_DIR}/valadoc/Pamac + ${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 * +************************************************ + +\") " ) \ No newline at end of file diff --git a/src/Config.vala.base b/src/Config.vala.base new file mode 100644 index 0000000..c57c9c4 --- /dev/null +++ b/src/Config.vala.base @@ -0,0 +1,10 @@ +namespace PamacConstants { + public const string DATADIR = "@DATADIR@"; + public const string PKGDATADIR = "@PKGDATADIR@"; + public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; + public const string RELEASE_NAME = "@RELEASE_NAME@"; + public const string VERSION = "@VERSION@"; +#if UNITEST + public const string TESTSRCDIR = "@TESTSRCDIR@"; +#endif +} diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index 4603838..0000000 --- a/src/Makefile +++ /dev/null @@ -1,129 +0,0 @@ - -ALPM_VALA_FLAGS = --pkg=libalpm \ - --pkg=gio-2.0 \ - --vapidir=../vapi \ - -X -D_FILE_OFFSET_BITS=64 - -COMMON_VALA_FLAGS = -X -w \ - --pkg=posix \ - -X -DGETTEXT_PACKAGE="pamac" \ - --target-glib=2.38 - -TRANSACTION_VALA_FLAGS = --pkg=gtk+-3.0 \ - --pkg=gdk-3.0 \ - --pkg=vte-2.91 \ - -X -lm - -PAMAC_LIB_FLAGS = -X -I. \ - -X -L. \ - -X -lpamac \ - --vapidir=./ \ - --pkg=pamac \ - -COMMON_SOURCES = common.vala \ - package.vala \ - pamac_config.vala - -TRANSACTION_SOURCES = transaction.vala \ - choose_provider_dialog.vala \ - transaction_sum_dialog.vala \ - progress_box.vala - -PREFERENCES_SOURCES = preferences_dialog.vala \ - choose_ignorepkgs_dialog.vala \ - mirrors_config.vala - -TRANSACTION_GRESOURCE_FILE = ../resources/pamac.transaction.gresource.xml - -MANAGER_GRESOURCE_FILE = ../resources/pamac.manager.gresource.xml - -INSTALLER_GRESOURCE_FILE = ../resources/pamac.installer.gresource.xml - -binaries: pamac-user-daemon pamac-system-daemon pamac-tray pamac-manager pamac-install - -clean: - rm -f *.c pamac.h pamac.vapi libpamac.so pamac-user-daemon pamac-system-daemon pamac-tray pamac-tray-appindicator pamac-manager pamac-install - -pamac-tray: $(COMMON_SOURCES) alpm_config.vala tray.vala tray-gtk.vala - valac -o pamac-tray \ - $(COMMON_VALA_FLAGS) \ - --pkg=gtk+-3.0 \ - --pkg=libnotify \ - $(COMMON_SOURCES) \ - tray-gtk.vala \ - tray.vala - -pamac-tray-appindicator: $(COMMON_SOURCES) alpm_config.vala tray.vala tray-appindicator.vala - valac -o pamac-tray-appindicator \ - $(COMMON_VALA_FLAGS) \ - --pkg=gtk+-3.0 \ - --pkg=appindicator3-0.1 \ - --pkg=libnotify \ - $(COMMON_SOURCES) \ - tray-appindicator.vala \ - tray.vala - -pamac-user-daemon: ../vapi/libalpm.vapi alpm_config.vala common.vala package.vala aur.vala user_daemon.vala - valac -o pamac-user-daemon \ - $(COMMON_VALA_FLAGS) \ - $(ALPM_VALA_FLAGS) \ - --pkg=json-glib-1.0 \ - --pkg=libsoup-2.4 \ - --thread \ - alpm_config.vala \ - common.vala \ - package.vala \ - aur.vala \ - user_daemon.vala - -pamac-system-daemon: ../vapi/libalpm.vapi ../vapi/polkit-gobject-1.vapi ../vapi/libcurl.vapi alpm_config.vala $(COMMON_SOURCES) aur.vala mirrors_config.vala system_daemon.vala - valac -o pamac-system-daemon \ - $(COMMON_VALA_FLAGS) \ - $(ALPM_VALA_FLAGS) \ - --pkg=polkit-gobject-1 \ - --pkg=libcurl \ - --pkg=json-glib-1.0 \ - --pkg=libsoup-2.4 \ - --thread \ - alpm_config.vala \ - $(COMMON_SOURCES) \ - aur.vala \ - mirrors_config.vala \ - system_daemon.vala - -libpamac.so: $(COMMON_SOURCES) $(TRANSACTION_SOURCES) $(PREFERENCES_SOURCES) ../resources/transaction_resources.c - valac -o libpamac.so \ - -X -fPIC \ - -X --shared \ - -H pamac.h \ - --vapi=pamac.vapi \ - --library=libpamac \ - $(COMMON_VALA_FLAGS) \ - $(TRANSACTION_VALA_FLAGS) \ - --gresources=$(TRANSACTION_GRESOURCE_FILE) \ - ../resources/transaction_resources.c \ - $(COMMON_SOURCES) \ - $(TRANSACTION_SOURCES) \ - $(PREFERENCES_SOURCES) - -pamac-manager: libpamac.so ../resources/manager_resources.c history_dialog.vala manager_window.vala manager.vala - valac -o pamac-manager \ - $(COMMON_VALA_FLAGS) \ - $(PAMAC_LIB_FLAGS) \ - --pkg=gtk+-3.0 \ - --pkg=gdk-3.0 \ - --gresources=$(MANAGER_GRESOURCE_FILE) \ - ../resources/manager_resources.c \ - history_dialog.vala \ - manager_window.vala \ - manager.vala - -pamac-install: libpamac.so ../resources/installer_resources.c progress_dialog.vala installer.vala - valac -o pamac-install \ - $(COMMON_VALA_FLAGS) \ - $(PAMAC_LIB_FLAGS) \ - --pkg=gtk+-3.0 \ - --gresources=$(INSTALLER_GRESOURCE_FILE) \ - ../resources/installer_resources.c \ - progress_dialog.vala \ - installer.vala diff --git a/src/Pamac.deps b/src/Pamac.deps new file mode 100644 index 0000000..a345ae5 --- /dev/null +++ b/src/Pamac.deps @@ -0,0 +1,9 @@ +posix +gdk-3.0 +gtk+-3.0 +libalpm +libnotify +vte-2.91 +gio-2.0 +glib-2.0 +gobject-2.0 diff --git a/src/Pamac.pc b/src/Pamac.pc new file mode 100644 index 0000000..1b9f8f3 --- /dev/null +++ b/src/Pamac.pc @@ -0,0 +1,12 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +real_prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@DOLLAR@{prefix} +libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR} +includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} + +Name: Pamac +Description: Pamac +Version: 6.0.0 +Libs: -L@DOLLAR@{libdir} -lPamac +Cflags: -I@DOLLAR@{includedir} +Requires: gdk-3.0 gtk+-3.0 libalpm libnotify vte-2.91 gio-2.0 glib-2.0 gobject-2.0 diff --git a/src/PamacUserDaemon.deps b/src/PamacUserDaemon.deps new file mode 100644 index 0000000..a345ae5 --- /dev/null +++ b/src/PamacUserDaemon.deps @@ -0,0 +1,9 @@ +posix +gdk-3.0 +gtk+-3.0 +libalpm +libnotify +vte-2.91 +gio-2.0 +glib-2.0 +gobject-2.0 diff --git a/src/PamacUserDaemon.pc b/src/PamacUserDaemon.pc new file mode 100644 index 0000000..736265f --- /dev/null +++ b/src/PamacUserDaemon.pc @@ -0,0 +1,12 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +real_prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@DOLLAR@{prefix} +libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR} +includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} + +Name: PamacUserDaemon +Description: PamacUserDaemon +Version: 5.2.1 +Libs: -L@DOLLAR@{libdir} -lPamacUserDaemon +Cflags: -I@DOLLAR@{includedir} +Requires: gdk-3.0 gtk+-3.0 libalpm libnotify vte-2.91 gio-2.0 glib-2.0 gobject-2.0 diff --git a/src/alpm_config.vala b/src/alpm_config.vala index 9d86b21..8fea5ce 100644 --- a/src/alpm_config.vala +++ b/src/alpm_config.vala @@ -1,6 +1,7 @@ /* * alpm_config * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -73,14 +74,6 @@ class AlpmConfig { reload (); } - public unowned GLib.List get_holdpkgs () { - return holdpkgs; - } - - public unowned GLib.List get_syncfirsts () { - return syncfirsts; - } - public void reload () { // set default options cachedirs = new GLib.List (); @@ -134,85 +127,6 @@ class AlpmConfig { } } - public Alpm.Handle? get_handle (bool files_db = false, bool tmp_db = false) { - Alpm.Errno error = 0; - Alpm.Handle? handle = null; - if (tmp_db) { - string tmp_dbpath = "/tmp/pamac-checkdbs"; - try { - Process.spawn_command_line_sync ("mkdir -p %s/sync".printf (tmp_dbpath)); - Process.spawn_command_line_sync ("ln -sf %s/local %s".printf (dbpath, tmp_dbpath)); - Process.spawn_command_line_sync ("chmod -R 777 %s/sync".printf (tmp_dbpath)); - handle = new Alpm.Handle (rootdir, tmp_dbpath, out error); - } catch (SpawnError e) { - stderr.printf ("SpawnError: %s\n", e.message); - } - } else { - handle = new Alpm.Handle (rootdir, dbpath, out error); - } - if (error == Alpm.Errno.DB_VERSION) { - try { - Process.spawn_command_line_sync ("pacman-db-upgrade", null, null, null); - } catch (SpawnError e) { - stdout.printf ("Error: %s\n", e.message); - } - handle = new Alpm.Handle (rootdir, dbpath, out error); - } - if (handle == null) { - stderr.printf ("Failed to initialize alpm library" + " (%s)\n".printf (Alpm.strerror (error))); - return null; - } - // define options - if (files_db) { - handle.dbext = ".files"; - } - if (!tmp_db) { - handle.logfile = logfile; - } - handle.gpgdir = gpgdir; - handle.arch = arch; - handle.deltaratio = deltaratio; - handle.usesyslog = usesyslog; - handle.checkspace = checkspace; - handle.defaultsiglevel = siglevel; - localfilesiglevel = merge_siglevel (siglevel, localfilesiglevel, localfilesiglevel_mask); - remotefilesiglevel = merge_siglevel (siglevel, remotefilesiglevel, remotefilesiglevel_mask); - handle.localfilesiglevel = localfilesiglevel; - handle.remotefilesiglevel = remotefilesiglevel; - foreach (unowned string cachedir in cachedirs) { - handle.add_cachedir (cachedir); - } - foreach (unowned string hookdir in hookdirs) { - handle.add_hookdir (hookdir); - } - foreach (unowned string ignoregroup in ignoregroups) { - handle.add_ignoregroup (ignoregroup); - } - foreach (unowned string ignorepkg in ignorepkgs) { - handle.add_ignorepkg (ignorepkg); - } - foreach (unowned string noextract in noextracts) { - handle.add_noextract (noextract); - } - foreach (unowned string noupgrade in noupgrades) { - handle.add_noupgrade (noupgrade); - } - // register dbs - foreach (unowned AlpmRepo repo in repo_order) { - repo.siglevel = merge_siglevel (siglevel, repo.siglevel, repo.siglevel_mask); - unowned Alpm.DB db = handle.register_syncdb (repo.name, repo.siglevel); - foreach (unowned string url in repo.urls) { - db.add_server (url.replace ("$repo", repo.name).replace ("$arch", handle.arch)); - } - if (repo.usage == 0) { - db.usage = Alpm.DB.Usage.ALL; - } else { - db.usage = repo.usage; - } - } - return handle; - } - void parse_file (string path, string? section = null) { string? current_section = section; var file = GLib.File.new_for_path (path); @@ -336,66 +250,6 @@ class AlpmConfig { } } - public void write (HashTable new_conf) { - var file = GLib.File.new_for_path (conf_path); - if (file.query_exists ()) { - try { - // Open file for reading and wrap returned FileInputStream into a - // DataInputStream, so we can read line by line - var dis = new DataInputStream (file.read ()); - string? line; - string[] data = {}; - // Read lines until end of file (null) is reached - while ((line = dis.read_line ()) != null) { - if (line.length == 0) { - data += "\n"; - continue; - } - if (line.contains ("IgnorePkg")) { - if (new_conf.contains ("IgnorePkg")) { - string val = new_conf.get ("IgnorePkg").get_string (); - if (val == "") { - data += "#IgnorePkg =\n"; - } else { - data += "IgnorePkg = %s\n".printf (val); - } - new_conf.remove ("IgnorePkg"); - } else { - data += line + "\n"; - } - } else if (line.contains ("CheckSpace")) { - if (new_conf.contains ("CheckSpace")) { - bool val = new_conf.get ("CheckSpace").get_boolean (); - if (val) { - data += "CheckSpace\n"; - } else { - data += "#CheckSpace\n"; - } - new_conf.remove ("CheckSpace"); - } else { - data += line + "\n"; - } - } else { - data += line + "\n"; - } - } - // delete the file before rewrite it - file.delete (); - // creating a DataOutputStream to the file - var dos = new DataOutputStream (file.create (FileCreateFlags.REPLACE_DESTINATION)); - foreach (unowned string new_line in data) { - // writing a short string to the stream - dos.put_string (new_line); - } - reload (); - } catch (GLib.Error e) { - GLib.stderr.printf("%s\n", e.message); - } - } else { - GLib.stderr.printf ("File '%s' doesn't exist.\n", conf_path); - } - } - Alpm.DB.Usage define_usage (string conf_string) { Alpm.DB.Usage usage = 0; foreach (unowned string directive in conf_string.split(" ")) { @@ -481,8 +335,4 @@ class AlpmConfig { } siglevel &= ~Alpm.Signature.Level.USE_DEFAULT; } - - Alpm.Signature.Level merge_siglevel(Alpm.Signature.Level sigbase, Alpm.Signature.Level sigover, Alpm.Signature.Level sigmask) { - return (sigmask != 0) ? (sigover & sigmask) | (sigbase & ~sigmask) : sigover; - } } diff --git a/src/aur/AUR.deps b/src/aur/AUR.deps new file mode 100644 index 0000000..6c584d7 --- /dev/null +++ b/src/aur/AUR.deps @@ -0,0 +1,3 @@ +json-glib-1.0 +libsoup-2.4 +glib-2.0 diff --git a/src/aur/AUR.pc b/src/aur/AUR.pc new file mode 100644 index 0000000..b8bb804 --- /dev/null +++ b/src/aur/AUR.pc @@ -0,0 +1,12 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +real_prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@DOLLAR@{prefix} +libdir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_LIBDIR} +includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} + +Name: AUR +Description: AUR +Version: 6.0.0 +Libs: -L@DOLLAR@{libdir} -lAUR +Cflags: -I@DOLLAR@{includedir} +Requires: json-glib-1.0 libsoup-2.4 glib-2.0 diff --git a/src/aur/CMakeLists.txt b/src/aur/CMakeLists.txt new file mode 100644 index 0000000..015ad21 --- /dev/null +++ b/src/aur/CMakeLists.txt @@ -0,0 +1,117 @@ +### 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.0.0") +set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") +set (DOLLAR "$") + +configure_file (${CMAKE_SOURCE_DIR}/src/aur/Config.vala.base ${CMAKE_BINARY_DIR}/src/aur/Config.vala) +add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.pc ${CMAKE_CURRENT_BINARY_DIR}/AUR.pc) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.deps ${CMAKE_CURRENT_BINARY_DIR}/AUR.deps) +set (VERSION "6.0.0") +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} json-glib-1.0) +set (VALA_PACKAGES ${VALA_PACKAGES} libsoup-2.4) +set (VALA_PACKAGES ${VALA_PACKAGES} glib-2.0) + +set (APP_SOURCES ${APP_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Config.vala) +set (APP_SOURCES ${APP_SOURCES} aur.vala) + +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 () +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 () +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=AUR --gir AUR-6.0.gir ) + +vala_precompile(VALA_C AUR + ${APP_SOURCES} +PACKAGES + ${VALA_PACKAGES} +OPTIONS + ${COMPILE_OPTIONS} +GENERATE_VAPI + AUR +GENERATE_HEADER + AUR +) + +add_library(AUR SHARED ${VALA_C}) + +set_target_properties( AUR PROPERTIES +VERSION + 6.0.0 +SOVERSION + 6 ) + + +install(TARGETS + AUR +LIBRARY DESTINATION + ${CMAKE_INSTALL_LIBDIR}/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/AUR.h +DESTINATION + ${CMAKE_INSTALL_INCLUDEDIR}/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/AUR.vapi +DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/AUR.deps +DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/AUR-6.0.gir +DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/ +) +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/AUR.pc +DESTINATION + ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ +) +if(HAVE_VALADOC) + valadoc(AUR + ${CMAKE_BINARY_DIR}/valadoc/AUR + ${APP_SOURCES} + PACKAGES + ${VALA_PACKAGES} + CUSTOM_VAPIS + ${CUSTOM_VAPIS_LIST} + ) + install(DIRECTORY + ${CMAKE_BINARY_DIR}/valadoc + DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac + ) +endif() diff --git a/src/aur/Config.vala.base b/src/aur/Config.vala.base new file mode 100644 index 0000000..7fb47c1 --- /dev/null +++ b/src/aur/Config.vala.base @@ -0,0 +1,10 @@ +namespace AURConstants { + public const string DATADIR = "@DATADIR@"; + public const string PKGDATADIR = "@PKGDATADIR@"; + public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; + public const string RELEASE_NAME = "@RELEASE_NAME@"; + public const string VERSION = "@VERSION@"; +#if UNITEST + public const string TESTSRCDIR = "@TESTSRCDIR@"; +#endif +} diff --git a/src/aur.vala b/src/aur/aur.vala similarity index 98% rename from src/aur.vala rename to src/aur/aur.vala index 4d01487..ad44df9 100644 --- a/src/aur.vala +++ b/src/aur/aur.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify diff --git a/src/choose_ignorepkgs_dialog.vala b/src/choose_ignorepkgs_dialog.vala index c67baf4..43973b3 100644 --- a/src/choose_ignorepkgs_dialog.vala +++ b/src/choose_ignorepkgs_dialog.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2015-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -17,9 +18,11 @@ * along with this program. If not, see . */ +//using GIO + namespace Pamac { - [GtkTemplate (ui = "/org/manjaro/pamac/preferences/choose_ignorepkgs_dialog.ui")] + [GtkTemplate (ui = "/org/pamac/preferences/interface/choose_ignorepkgs_dialog.ui")] class ChooseIgnorepkgsDialog : Gtk.Dialog { [GtkChild] diff --git a/src/choose_provider_dialog.vala b/src/choose_provider_dialog.vala index 73651d3..3ecc15c 100644 --- a/src/choose_provider_dialog.vala +++ b/src/choose_provider_dialog.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -17,9 +18,11 @@ * along with this program. If not, see . */ +//using GIO + namespace Pamac { - [GtkTemplate (ui = "/org/manjaro/pamac/transaction/choose_provider_dialog.ui")] + [GtkTemplate (ui = "/org/pamac/transaction/interface/choose_provider_dialog.ui")] class ChooseProviderDialog : Gtk.Dialog { public ChooseProviderDialog (Gtk.ApplicationWindow? window) { diff --git a/src/clean_cache.vala b/src/clean_cache.vala deleted file mode 100644 index 982335c..0000000 --- a/src/clean_cache.vala +++ /dev/null @@ -1,32 +0,0 @@ -/* - * pamac-vala - * - * Copyright (C) 2014-2017 Guillaume Benoit - * - * This program 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. - * - * This program 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 get of the GNU General Public License - * along with this program. If not, see . - */ - -int main () { - var pamac_config = new Pamac.Config ("/etc/pamac.conf"); - string rm_only_uninstalled_str = ""; - if (pamac_config.rm_only_uninstalled) { - rm_only_uninstalled_str = "-u"; - } - try { - Process.spawn_command_line_sync ("paccache -q --nocolor %s -r -k %llu".printf (rm_only_uninstalled_str, pamac_config.keep_num_pkgs)); - } catch (SpawnError e) { - stderr.printf ("SpawnError: %s\n", e.message); - } - return 0; -} diff --git a/src/common.vala b/src/common.vala index 514d40d..5fecac8 100644 --- a/src/common.vala +++ b/src/common.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2015 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -33,14 +34,20 @@ namespace Pamac { public UpdateInfos[] to_reinstall; public UpdateInfos[] to_remove; public UpdateInfos[] to_build; +#if DISABLE_AUR +#else public UpdateInfos[] aur_conflicts_to_remove; public string[] aur_pkgbases_to_build; +#endif } public struct Updates { public bool is_syncfirst; public AlpmPackage[] repos_updates; +#if DISABLE_AUR +#else public AURPackage[] aur_updates; +#endif } public struct ErrorInfos { diff --git a/src/mirrors_config.vala b/src/mirrors_config.vala index d929fef..044c38e 100644 --- a/src/mirrors_config.vala +++ b/src/mirrors_config.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -74,57 +75,5 @@ namespace Pamac { GLib.stderr.printf ("File '%s' doesn't exist.\n", path); } } - - public void write (HashTable new_conf) { - var file = GLib.File.new_for_path (conf_path); - if (file.query_exists ()) { - try { - // Open file for reading and wrap returned FileInputStream into a - // DataInputStream, so we can read line by line - var dis = new DataInputStream (file.read ()); - string? line; - var data = new GLib.List (); - // Read lines until end of file (null) is reached - while ((line = dis.read_line ()) != null) { - if (line.length == 0) { - data.append ("\n"); - continue; - } - unowned Variant variant; - if (line.contains ("Method")) { - if (new_conf.lookup_extended ("Method", null, out variant)) { - data.append ("Method = %s\n".printf (variant.get_string ())); - } else { - data.append (line + "\n"); - } - } else if (line.contains ("OnlyCountry")) { - if (new_conf.lookup_extended ("OnlyCountry", null, out variant)) { - if (variant.get_string () == "ALL") { - data.append ("#%s\n".printf (line)); - } else { - data.append ("OnlyCountry = %s\n".printf (variant.get_string ())); - } - } else { - data.append (line + "\n"); - } - } else { - data.append (line + "\n"); - } - } - // delete the file before rewrite it - file.delete (); - // creating a DataOutputStream to the file - var dos = new DataOutputStream (file.create (FileCreateFlags.REPLACE_DESTINATION)); - foreach (unowned string new_line in data) { - // writing a short string to the stream - dos.put_string (new_line); - } - } catch (GLib.Error e) { - GLib.stderr.printf("%s\n", e.message); - } - } else { - GLib.stderr.printf ("File '%s' doesn't exist.\n", file.get_path ()); - } - } } } diff --git a/src/package.vala b/src/package.vala index bbb6282..a159660 100644 --- a/src/package.vala +++ b/src/package.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -53,6 +54,8 @@ namespace Pamac { public string[] backups; } +#if DISABLE_AUR +#else public struct AURPackage { public string name; public string version; @@ -82,4 +85,5 @@ namespace Pamac { public string[] replaces; public string[] conflicts; } +#endif } diff --git a/src/pamac-install/CMakeDepends.txt b/src/pamac-install/CMakeDepends.txt new file mode 100644 index 0000000..5db7cfd --- /dev/null +++ b/src/pamac-install/CMakeDepends.txt @@ -0,0 +1 @@ +add_dependencies(pamac-install Pamac) diff --git a/src/pamac-install/CMakeLists.txt b/src/pamac-install/CMakeLists.txt new file mode 100644 index 0000000..d177538 --- /dev/null +++ b/src/pamac-install/CMakeLists.txt @@ -0,0 +1,90 @@ +### 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.0.0") +set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") +set (DOLLAR "$") + +configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala) +add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") +set (VERSION "6.0.0") +add_definitions (${DEPS_CFLAGS}) +include_directories ( ${CMAKE_BINARY_DIR}/src ) +link_libraries ( ${DEPS_LIBRARIES} -lPamac ) +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} 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/Pamac.vapi) + +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 () +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 () +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}) +add_dependencies (pamac-install pamac_installer_gresource_xml) + + +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() +include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt) diff --git a/src/pamac-install/Config.vala.base b/src/pamac-install/Config.vala.base new file mode 100644 index 0000000..1728fb1 --- /dev/null +++ b/src/pamac-install/Config.vala.base @@ -0,0 +1,10 @@ +namespace Constants { + public const string DATADIR = "@DATADIR@"; + public const string PKGDATADIR = "@PKGDATADIR@"; + public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; + public const string RELEASE_NAME = "@RELEASE_NAME@"; + public const string VERSION = "@VERSION@"; +#if UNITEST + public const string TESTSRCDIR = "@TESTSRCDIR@"; +#endif +} diff --git a/src/installer.vala b/src/pamac-install/installer.vala similarity index 96% rename from src/installer.vala rename to src/pamac-install/installer.vala index 00b1969..63b65ab 100644 --- a/src/installer.vala +++ b/src/pamac-install/installer.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -26,7 +27,7 @@ namespace Pamac { bool important_details; public Installer () { - application_id = "org.manjaro.pamac.installer"; + application_id = "org.pamac.installer"; flags |= ApplicationFlags.HANDLES_OPEN; } @@ -98,7 +99,7 @@ namespace Pamac { bool check_pamac_running () { Application app; bool run = false; - app = new Application ("org.manjaro.pamac.manager", 0); + app = new Application ("org.pamac.manager", 0); try { app.register (); } catch (GLib.Error e) { diff --git a/src/progress_dialog.vala b/src/pamac-install/progress_dialog.vala similarity index 87% rename from src/progress_dialog.vala rename to src/pamac-install/progress_dialog.vala index d183f6b..c208c65 100644 --- a/src/progress_dialog.vala +++ b/src/pamac-install/progress_dialog.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -17,9 +18,11 @@ * along with this program. If not, see . */ +//using GIO + namespace Pamac { - [GtkTemplate (ui = "/org/manjaro/pamac/installer/progress_dialog.ui")] + [GtkTemplate (ui = "/org/pamac/installer/interface/progress_dialog.ui")] class ProgressDialog : Gtk.ApplicationWindow { [GtkChild] diff --git a/src/pamac-manager/CMakeDepends.txt b/src/pamac-manager/CMakeDepends.txt new file mode 100644 index 0000000..fd24176 --- /dev/null +++ b/src/pamac-manager/CMakeDepends.txt @@ -0,0 +1,3 @@ +add_dependencies(pamac-manager Pamac) +include (InstallSymlink) +install_symlink(pamac-manager ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/pamac-updater) diff --git a/src/pamac-manager/CMakeLists.txt b/src/pamac-manager/CMakeLists.txt new file mode 100644 index 0000000..134e503 --- /dev/null +++ b/src/pamac-manager/CMakeLists.txt @@ -0,0 +1,92 @@ +### 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.0.0") +set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") +set (DOLLAR "$") + +configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala) +add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") +set (VERSION "6.0.0") +add_definitions (${DEPS_CFLAGS}) +include_directories ( ${CMAKE_BINARY_DIR}/src ) +link_libraries ( ${DEPS_LIBRARIES} -lPamac ) +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} 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/Pamac.vapi) + +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 () +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 () +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_no_aur.gresource.xml ) +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}) +add_dependencies (pamac-manager pamac_manager_gresource_xml) + + +install(TARGETS + pamac-manager +RUNTIME DESTINATION + ${CMAKE_INSTALL_BINDIR} +) +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() +include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt) diff --git a/src/pamac-manager/Config.vala.base b/src/pamac-manager/Config.vala.base new file mode 100644 index 0000000..1728fb1 --- /dev/null +++ b/src/pamac-manager/Config.vala.base @@ -0,0 +1,10 @@ +namespace Constants { + public const string DATADIR = "@DATADIR@"; + public const string PKGDATADIR = "@PKGDATADIR@"; + public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; + public const string RELEASE_NAME = "@RELEASE_NAME@"; + public const string VERSION = "@VERSION@"; +#if UNITEST + public const string TESTSRCDIR = "@TESTSRCDIR@"; +#endif +} diff --git a/src/history_dialog.vala b/src/pamac-manager/history_dialog.vala similarity index 88% rename from src/history_dialog.vala rename to src/pamac-manager/history_dialog.vala index c7aafb2..72f0108 100644 --- a/src/history_dialog.vala +++ b/src/pamac-manager/history_dialog.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -17,9 +18,11 @@ * along with this program. If not, see . */ +//using GIO + namespace Pamac { - [GtkTemplate (ui = "/org/manjaro/pamac/manager/history_dialog.ui")] + [GtkTemplate (ui = "/org/pamac/manager/interface/history_dialog.ui")] class HistoryDialog : Gtk.Dialog { [GtkChild] diff --git a/src/manager.vala b/src/pamac-manager/manager.vala similarity index 95% rename from src/manager.vala rename to src/pamac-manager/manager.vala index 72878dc..2f82684 100644 --- a/src/manager.vala +++ b/src/pamac-manager/manager.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -25,7 +26,7 @@ namespace Pamac { bool started; public Manager () { - application_id = "org.manjaro.pamac.manager"; + application_id = "org.pamac.manager"; flags = ApplicationFlags.HANDLES_COMMAND_LINE; } @@ -96,7 +97,7 @@ namespace Pamac { bool check_pamac_running () { Application app; bool run = false; - app = new Application ("org.manjaro.pamac.installer", 0); + app = new Application ("org.pamac.installer", 0); try { app.register (); } catch (GLib.Error e) { diff --git a/src/manager_window.vala b/src/pamac-manager/manager_window.vala similarity index 96% rename from src/manager_window.vala rename to src/pamac-manager/manager_window.vala index 55f53ba..2ea16b0 100644 --- a/src/manager_window.vala +++ b/src/pamac-manager/manager_window.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -17,7 +18,9 @@ * along with this program. If not, see . */ -const string VERSION = "5.2.1"; +//using GIO + +const string VERSION = Constants.VERSION; namespace Pamac { @@ -36,7 +39,11 @@ namespace Pamac { } } - [GtkTemplate (ui = "/org/manjaro/pamac/manager/manager_window.ui")] +#if DISABLE_AUR + [GtkTemplate (ui = "/org/pamac/manager/interface/manager_window_no_aur.ui")] +#else + [GtkTemplate (ui = "/org/pamac/manager/interface/manager_window.ui")] +#endif class ManagerWindow : Gtk.ApplicationWindow { // icons Gdk.Pixbuf? installed_icon; @@ -59,10 +66,13 @@ namespace Pamac { Gtk.TreeView packages_treeview; [GtkChild] Gtk.TreeViewColumn packages_state_column; +#if DISABLE_AUR +#else [GtkChild] Gtk.TreeView aur_treeview; [GtkChild] Gtk.TreeViewColumn aur_state_column; +#endif [GtkChild] public Gtk.Stack filters_stack; [GtkChild] @@ -126,7 +136,10 @@ namespace Pamac { Gtk.MenuItem remove_item; Gtk.MenuItem details_item; GLib.List selected_pkgs; +#if DISABLE_AUR +#else GLib.List selected_aur; +#endif // liststores Gtk.ListStore search_list; @@ -134,7 +147,10 @@ namespace Pamac { Gtk.ListStore states_list; Gtk.ListStore repos_list; Gtk.ListStore packages_list; +#if DISABLE_AUR +#else Gtk.ListStore aur_list; +#endif public Queue display_package_queue; string current_package_displayed; @@ -155,7 +171,10 @@ namespace Pamac { public ManagerWindow (Gtk.Application application) { Object (application: application); +#if DISABLE_AUR +#else support_aur (false); +#endif button_back.visible = false; transaction_infobox.visible = false; refreshing = false; @@ -241,6 +260,8 @@ namespace Pamac { }); packages_state_renderer.activated.connect (on_packages_state_icon_activated); +#if DISABLE_AUR +#else aur_list = new Gtk.ListStore (6, typeof (uint), //origin typeof (string), //name @@ -285,16 +306,17 @@ namespace Pamac { cellrenderer.set ("pixbuf", pixbuf); }); aur_state_renderer.activated.connect (on_aur_state_icon_activated); +#endif try { - installed_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-installed-updated.png"); - uninstalled_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-available.png"); - to_install_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-install.png"); - to_reinstall_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-reinstall.png"); - to_remove_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-remove.png"); - to_upgrade_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-upgrade.png"); - installed_locked_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-installed-locked.png"); - available_locked_icon = new Gdk.Pixbuf.from_resource ("/org/manjaro/pamac/manager/package-available-locked.png"); + installed_icon = new Gdk.Pixbuf.from_resource ("/org/pamac/manager/pixmaps/package-installed-updated.png"); + uninstalled_icon = new Gdk.Pixbuf.from_resource ("/org/pamac/manager/pixmaps/package-available.png"); + to_install_icon = new Gdk.Pixbuf.from_resource ("/org/pamac/manager/pixmaps/package-install.png"); + to_reinstall_icon = new Gdk.Pixbuf.from_resource ("/org/pamac/manager/pixmaps/package-reinstall.png"); + to_remove_icon = new Gdk.Pixbuf.from_resource ("/org/pamac/manager/pixmaps/package-remove.png"); + to_upgrade_icon = new Gdk.Pixbuf.from_resource ("/org/pamac/manager/pixmaps/package-upgrade.png"); + installed_locked_icon = new Gdk.Pixbuf.from_resource ("/org/pamac/manager/pixmaps/package-installed-locked.png"); + available_locked_icon = new Gdk.Pixbuf.from_resource ("/org/pamac/manager/pixmaps/package-available-locked.png"); } catch (GLib.Error e) { stderr.printf (e.message); } @@ -302,8 +324,11 @@ namespace Pamac { transaction = new Transaction (this as Gtk.ApplicationWindow); transaction.start_downloading.connect (on_start_downloading); transaction.stop_downloading.connect (on_stop_downloading); +#if DISABLE_AUR +#else transaction.start_building.connect (on_start_building); transaction.stop_building.connect (on_stop_building); +#endif transaction.important_details_outpout.connect (on_important_details_outpout); transaction.finished.connect (on_transaction_finished); transaction.write_pamac_config_finished.connect (on_write_pamac_config_finished); @@ -316,7 +341,10 @@ namespace Pamac { main_stack.add_named (transaction.term_window, "term"); transaction_infobox.pack_start (transaction.progress_box); +#if DISABLE_AUR +#else support_aur (transaction.enable_aur); +#endif display_package_queue = new Queue (); @@ -333,10 +361,15 @@ namespace Pamac { return false; } +#if DISABLE_AUR + void on_write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon) { + } +#else void on_write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon, bool enable_aur, bool search_aur) { support_aur (enable_aur); } +#endif void on_set_pkgreason_finished () { transaction.unlock (); @@ -346,12 +379,17 @@ namespace Pamac { if (transaction.get_installed_pkg (current_package_displayed).name != "" || transaction.get_sync_pkg (current_package_displayed).name != "") { display_package_properties (current_package_displayed); +#if DISABLE_AUR +#else } else { display_aur_properties (current_package_displayed); +#endif } } - } + } +#if DISABLE_AUR +#else void support_aur (bool enable_aur) { if (enable_aur) { if (filters_stack.visible_child_name == "search") { @@ -361,6 +399,7 @@ namespace Pamac { packages_stackswitcher.visible = false; } } +#endif void try_lock_and_run (TransactionAction action) { if (transaction.get_lock ()) { @@ -411,7 +450,11 @@ namespace Pamac { // fix an possible visibility issue transaction_infobox.show_all (); } else { +#if DISABLE_AUR + uint total_pending = transaction.to_install.length + transaction.to_remove.length; +#else uint total_pending = transaction.to_install.length + transaction.to_remove.length + transaction.to_build.length; +#endif if (total_pending == 0) { transaction.progress_box.action_label.label = ""; cancel_button.sensitive = false; @@ -601,6 +644,8 @@ namespace Pamac { reinstall_togglebutton.visible = true; reinstall_togglebutton.active = transaction.to_install.contains (details.name); } +#if DISABLE_AUR +#else } else { transaction.get_aur_details.begin (details.name, (obj, res) => { AURPackageDetails aur_details = transaction.get_aur_details.end (res); @@ -616,6 +661,7 @@ namespace Pamac { } } }); +#endif } } else if (details.origin == 3) { //Alpm.Package.From.SYNCDB remove_togglebutton.visible = false; @@ -726,6 +772,8 @@ namespace Pamac { } } +#if DISABLE_AUR +#else void set_aur_details (string pkgname) { name_label.set_text (""); desc_label.set_text (""); @@ -826,6 +874,7 @@ namespace Pamac { this.get_window ().set_cursor (null); }); } +#endif [GtkCallback] void on_install_togglebutton_toggled () { @@ -833,14 +882,20 @@ namespace Pamac { install_togglebutton.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION); if (transaction.get_pkg_origin (current_package_displayed) == 3) { //Alpm.Package.From.SYNCDB transaction.to_install.add (current_package_displayed); +#if DISABLE_AUR +#else } else { transaction.to_build.add (current_package_displayed); +#endif } } else { install_togglebutton.get_style_context ().remove_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION); if (transaction.to_install.remove (current_package_displayed)) { +#if DISABLE_AUR +#else } else { transaction.to_build.remove (current_package_displayed); +#endif } } set_pendings_operations (); @@ -871,14 +926,20 @@ namespace Pamac { AlpmPackage find_pkg = transaction.get_sync_pkg (current_package_displayed); if (find_pkg.name != "") { transaction.to_install.add (current_package_displayed); +#if DISABLE_AUR +#else } else { // availability in AUR was checked in set_package_details transaction.to_build.add (current_package_displayed); +#endif } } else { reinstall_togglebutton.get_style_context ().remove_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION); transaction.to_install.remove (current_package_displayed); +#if DISABLE_AUR +#else transaction.to_build.remove (current_package_displayed); +#endif } set_pendings_operations (); } @@ -915,6 +976,8 @@ namespace Pamac { this.get_window ().set_cursor (null); } +#if DISABLE_AUR +#else void populate_aur_list (AURPackage[] pkgs) { // populate liststore aur_treeview.freeze_notify (); @@ -941,14 +1004,21 @@ namespace Pamac { aur_treeview.thaw_notify (); this.get_window ().set_cursor (null); } +#endif void refresh_packages_list () { switch (filters_stack.visible_child_name) { case "search": +#if DISABLE_AUR +#else aur_list.clear (); +#endif filters_stack.visible = true; set_pendings_operations (); +#if DISABLE_AUR +#else packages_stackswitcher.visible = transaction.enable_aur; +#endif if (packages_stack.visible_child_name == "updated") { packages_stack.visible_child_name = "repos"; } @@ -983,7 +1053,10 @@ namespace Pamac { break; case "updates": packages_list.clear (); +#if DISABLE_AUR +#else aur_list.clear (); +#endif var attention_val = GLib.Value (typeof (bool)); attention_val.set_boolean (false); filters_stack.child_set_property (filters_stack.get_child_by_name ("updates"), @@ -1007,11 +1080,14 @@ namespace Pamac { set_package_details (current_package_displayed); } +#if DISABLE_AUR +#else void display_aur_properties (string pkgname) { current_package_displayed = pkgname; files_scrolledwindow.visible = false; set_aur_details (current_package_displayed); } +#endif [GtkCallback] void on_packages_treeview_row_activated (Gtk.TreeView treeview, Gtk.TreePath path, Gtk.TreeViewColumn column) { @@ -1057,6 +1133,8 @@ namespace Pamac { while (Gtk.events_pending ()) { Gtk.main_iteration (); } +#if DISABLE_AUR +#else transaction.get_aur_details.begin (depstring, (obj, res) => { this.get_window ().set_cursor (null); if (transaction.get_aur_details.end (res).name != "") { @@ -1073,6 +1151,7 @@ namespace Pamac { } } }); +#endif } } } @@ -1127,6 +1206,8 @@ namespace Pamac { set_pendings_operations (); } +#if DISABLE_AUR +#else [GtkCallback] void on_aur_treeview_row_activated (Gtk.TreeView treeview, Gtk.TreePath path, Gtk.TreeViewColumn column) { if (column.title == dgettext (null, "Name")) { @@ -1171,6 +1252,7 @@ namespace Pamac { } set_pendings_operations (); } +#endif [GtkCallback] public void on_button_back_clicked () { @@ -1179,6 +1261,8 @@ namespace Pamac { AlpmPackage pkg = transaction.get_installed_pkg (pkgname); if (pkg.name == "") { pkg = transaction.get_sync_pkg (pkgname); +#if DISABLE_AUR +#else } if (pkg.name == "") { transaction.get_aur_details.begin (pkgname, (obj, res) => { @@ -1194,6 +1278,7 @@ namespace Pamac { } } }); +#endif } else { display_package_properties (pkgname); } @@ -1208,9 +1293,12 @@ namespace Pamac { transaction.to_install.add (pkgname); } } +#if DISABLE_AUR +#else foreach (unowned string pkgname in selected_aur) { transaction.to_build.add (pkgname); } +#endif set_pendings_operations (); } @@ -1219,9 +1307,12 @@ namespace Pamac { if (selected_pkgs.length () == 1) { display_package_properties (selected_pkgs.data); main_stack.visible_child_name = "details"; +#if DISABLE_AUR +#else } else if (selected_aur.length () == 1) { display_aur_properties (selected_aur.data); main_stack.visible_child_name = "details"; +#endif } } @@ -1246,6 +1337,8 @@ namespace Pamac { transaction.to_remove.remove (pkgname); } } +#if DISABLE_AUR +#else foreach (unowned string pkgname in selected_aur) { if (transaction.to_build.remove (pkgname)) { } else { @@ -1253,6 +1346,7 @@ namespace Pamac { transaction.temporary_ignorepkgs.add (pkgname); } } +#endif set_pendings_operations (); } @@ -1261,10 +1355,13 @@ namespace Pamac { transaction.temporary_ignorepkgs.remove (pkgname); transaction.to_update.add (pkgname); } +#if DISABLE_AUR +#else foreach (unowned string pkgname in selected_aur) { transaction.temporary_ignorepkgs.remove (pkgname); transaction.to_update.add (pkgname); } +#endif set_pendings_operations (); } @@ -1289,11 +1386,14 @@ namespace Pamac { populate_packages_list (transaction.search_pkgs.end (res)); }); break; +#if DISABLE_AUR +#else case "aur": transaction.search_in_aur.begin (search_string, (obj, res) => { populate_aur_list (transaction.search_in_aur.end (res)); }); break; +#endif default: break; } @@ -1302,6 +1402,8 @@ namespace Pamac { default: break; } +#if DISABLE_AUR +#else if (packages_stack.visible_child_name == "aur") { var attention_val = GLib.Value (typeof (bool)); attention_val.set_boolean (false); @@ -1309,6 +1411,7 @@ namespace Pamac { "needs-attention", attention_val); } +#endif } [GtkCallback] @@ -1325,7 +1428,10 @@ namespace Pamac { } GLib.List selected_paths = selection.get_selected_rows (null); selected_pkgs = new GLib.List (); +#if DISABLE_AUR +#else selected_aur = new GLib.List (); +#endif deselect_item.sensitive = false; upgrade_item.sensitive = false; install_item.sensitive = false; @@ -1400,6 +1506,8 @@ namespace Pamac { return false; } +#if DISABLE_AUR +#else [GtkCallback] bool on_aur_treeview_button_press_event (Gdk.EventButton event) { aur_treeview.grab_focus (); @@ -1473,6 +1581,7 @@ namespace Pamac { } return false; } +#endif [GtkCallback] void on_search_entry_activate () { @@ -1556,6 +1665,8 @@ namespace Pamac { // get custom sort by relevance packages_list.set_sort_column_id (Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, 0); populate_packages_list (pkgs); +#if DISABLE_AUR +#else if (transaction.search_aur) { if (pkgs.length == 0) { transaction.search_in_aur.begin (search_string, (obj, res) => { @@ -1575,15 +1686,22 @@ namespace Pamac { }); } } +#endif }); +#if DISABLE_AUR +#else aur_list.clear (); +#endif break; +#if DISABLE_AUR +#else case "aur": transaction.search_in_aur.begin (search_string, (obj, res) => { populate_aur_list (transaction.search_in_aur.end (res)); }); packages_list.clear (); break; +#endif default: break; } @@ -1647,6 +1765,8 @@ namespace Pamac { } } populate_packages_list (pkgs); +#if DISABLE_AUR +#else if (transaction.to_build.length != 0) { packages_stackswitcher.visible = true; AURPackage[] aur_pkgs = {}; @@ -1677,6 +1797,7 @@ namespace Pamac { }); } } +#endif } } } @@ -1817,18 +1938,16 @@ namespace Pamac { [GtkCallback] void on_about_button_clicked () { - string[] authors = {"Guillaume Benoit"}; Gtk.show_about_dialog ( this, "program_name", "Pamac", "icon_name", "system-software-install", "logo_icon_name", "system-software-install", "comments", dgettext (null, "A Gtk3 frontend for libalpm"), - "copyright", "Copyright © 2017 Guillaume Benoit", - "authors", authors, + "copyright", "Copyright © 2017 Chris Cromer\nCopyright © 2017 Guillaume Benoit", "version", VERSION, "license_type", Gtk.License.GPL_3_0, - "website", "http://github.com/manjaro/pamac"); + "website", "http://github.com/cromnix/pamac-classic"); } [GtkCallback] @@ -1837,7 +1956,11 @@ namespace Pamac { if (transaction_running || sysupgrade_running) { main_stack.visible_child_name = "term"; } else { +#if DISABLE_AUR + uint total_pending = transaction.to_install.length + transaction.to_remove.length; +#else uint total_pending = transaction.to_install.length + transaction.to_remove.length + transaction.to_build.length; +#endif if (total_pending == 0) { main_stack.visible_child_name = "term"; } else { @@ -1901,7 +2024,10 @@ namespace Pamac { } else if (sysupgrade_running) { sysupgrade_running = false; transaction.cancel (); +#if DISABLE_AUR +#else transaction.to_build.remove_all (); +#endif } else { transaction.clear_lists (); set_pendings_operations (); @@ -1910,8 +2036,11 @@ namespace Pamac { if (transaction.get_installed_pkg (current_package_displayed).name != "" || transaction.get_sync_pkg (current_package_displayed).name != "") { display_package_properties (current_package_displayed); +#if DISABLE_AUR +#else } else { display_aur_properties (current_package_displayed); +#endif } } while (Gtk.events_pending ()) { @@ -1938,7 +2067,11 @@ namespace Pamac { if (filters_stack.visible_child_name == "updates") { transaction.to_update.remove_all (); packages_stackswitcher.visible = false; +#if DISABLE_AUR + if ((updates.repos_updates.length) == 0) { +#else if ((updates.repos_updates.length + updates.aur_updates.length) == 0) { +#endif filters_stack.visible = false; if (!refreshing && !transaction_running && !sysupgrade_running) { transaction_infobox.visible = false; @@ -1954,6 +2087,8 @@ namespace Pamac { } populate_packages_list (updates.repos_updates); } +#if DISABLE_AUR +#else if (updates.aur_updates.length > 0) { packages_stackswitcher.visible = true; foreach (unowned AURPackage pkg in updates.aur_updates) { @@ -1966,9 +2101,15 @@ namespace Pamac { packages_stack.visible_child_name = "aur"; } } +#endif set_pendings_operations (); } - } else if ((updates.repos_updates.length + updates.aur_updates.length) > 0) { + } +#if DISABLE_AUR + else if ((updates.repos_updates.length) > 0) { +#else + else if ((updates.repos_updates.length + updates.aur_updates.length) > 0) { +#endif this.get_window ().set_cursor (null); var attention_val = GLib.Value (typeof (bool)); attention_val.set_boolean (true); @@ -1986,6 +2127,8 @@ namespace Pamac { cancel_button.sensitive = false; } +#if DISABLE_AUR +#else void on_start_building () { cancel_button.sensitive = true; } @@ -1993,6 +2136,7 @@ namespace Pamac { void on_stop_building () { cancel_button.sensitive = false; } +#endif void on_important_details_outpout (bool must_show) { if (must_show) { @@ -2016,8 +2160,11 @@ namespace Pamac { if (transaction.get_installed_pkg (current_package_displayed).name != "" || transaction.get_sync_pkg (current_package_displayed).name != "") { display_package_properties (current_package_displayed); +#if DISABLE_AUR +#else } else { display_aur_properties (current_package_displayed); +#endif } } else if (main_stack.visible_child_name == "term") { button_back.visible = true; @@ -2028,7 +2175,10 @@ namespace Pamac { run_sysupgrade (); } else if (sysupgrade_running) { sysupgrade_running = false; +#if DISABLE_AUR +#else transaction.to_build.remove_all (); +#endif transaction.unlock (); refresh_packages_list (); } else { diff --git a/src/pamac-system-daemon/CMakeDepends.txt b/src/pamac-system-daemon/CMakeDepends.txt new file mode 100644 index 0000000..fff2392 --- /dev/null +++ b/src/pamac-system-daemon/CMakeDepends.txt @@ -0,0 +1 @@ +add_dependencies(pamac-system-daemon AUR Pamac) diff --git a/src/pamac-system-daemon/CMakeLists.txt b/src/pamac-system-daemon/CMakeLists.txt new file mode 100644 index 0000000..60d200e --- /dev/null +++ b/src/pamac-system-daemon/CMakeLists.txt @@ -0,0 +1,98 @@ +### 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.0.0") +set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") +set (DOLLAR "$") + +configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala) +add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") +set (VERSION "6.0.0") +add_definitions (${DEPS_CFLAGS}) +include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) +link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) +link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) +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/Pamac.vapi) +if (NOT DISABLE_AUR) + set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi) +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 () +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 () +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}) + + +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() +include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt) diff --git a/src/pamac-system-daemon/Config.vala.base b/src/pamac-system-daemon/Config.vala.base new file mode 100644 index 0000000..1728fb1 --- /dev/null +++ b/src/pamac-system-daemon/Config.vala.base @@ -0,0 +1,10 @@ +namespace Constants { + public const string DATADIR = "@DATADIR@"; + public const string PKGDATADIR = "@PKGDATADIR@"; + public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; + public const string RELEASE_NAME = "@RELEASE_NAME@"; + public const string VERSION = "@VERSION@"; +#if UNITEST + public const string TESTSRCDIR = "@TESTSRCDIR@"; +#endif +} diff --git a/src/pamac-system-daemon/alpm_config.vala b/src/pamac-system-daemon/alpm_config.vala new file mode 100644 index 0000000..2c40be3 --- /dev/null +++ b/src/pamac-system-daemon/alpm_config.vala @@ -0,0 +1,489 @@ +/* + * alpm_config + * + * Copyright (C) 2017 Chris Cromer + * Copyright (C) 2014-2017 Guillaume Benoit + * + * This program 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. + * + * This program 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 get of the GNU General Public License + * along with this program. If not, see . + */ + +[Compact] +class AlpmRepo { + public string name; + public Alpm.Signature.Level siglevel; + public Alpm.Signature.Level siglevel_mask; + public Alpm.DB.Usage usage; + public GLib.List urls; + + public AlpmRepo (string name) { + this.name = name; + siglevel = Alpm.Signature.Level.USE_DEFAULT; + usage = 0; + urls = new GLib.List (); + } + + public static int compare_name (AlpmRepo a, AlpmRepo b) { + return strcmp (a.name, b.name); + } + + public static int search_name (AlpmRepo a, string name) { + return strcmp (a.name, name); + } + +} + +class AlpmConfig { + string conf_path; + string? rootdir; + string? dbpath; + string? logfile; + string? gpgdir; + string? arch; + double deltaratio; + int usesyslog; + public int checkspace; + GLib.List cachedirs; + GLib.List hookdirs; + GLib.List ignoregroups; + GLib.List ignorepkgs; + GLib.List noextracts; + GLib.List noupgrades; + GLib.List holdpkgs; + GLib.List syncfirsts; + Alpm.Signature.Level siglevel; + Alpm.Signature.Level localfilesiglevel; + Alpm.Signature.Level remotefilesiglevel; + Alpm.Signature.Level siglevel_mask; + Alpm.Signature.Level localfilesiglevel_mask; + Alpm.Signature.Level remotefilesiglevel_mask; + GLib.List repo_order; + + public AlpmConfig (string path) { + conf_path = path; + reload (); + } + + public unowned GLib.List get_holdpkgs () { + return holdpkgs; + } + + public unowned GLib.List get_syncfirsts () { + return syncfirsts; + } + + public void reload () { + // set default options + cachedirs = new GLib.List (); + hookdirs = new GLib.List (); + ignoregroups = new GLib.List (); + ignorepkgs = new GLib.List (); + noextracts = new GLib.List (); + noupgrades = new GLib.List (); + holdpkgs = new GLib.List (); + syncfirsts = new GLib.List (); + usesyslog = 0; + checkspace = 0; + deltaratio = 0.7; + siglevel = Alpm.Signature.Level.PACKAGE | Alpm.Signature.Level.PACKAGE_OPTIONAL | Alpm.Signature.Level.DATABASE | Alpm.Signature.Level.DATABASE_OPTIONAL; + localfilesiglevel = Alpm.Signature.Level.USE_DEFAULT; + remotefilesiglevel = Alpm.Signature.Level.USE_DEFAULT; + repo_order = new GLib.List (); + // parse conf file + parse_file (conf_path); + // if rootdir is set and dbpath/logfile are not + // set, then set those as well to reside under the root. + if (rootdir != null) { + if (dbpath == null) { + dbpath = Path.build_path ("/", rootdir, "var/lib/pacman/"); + } + if (logfile == null) { + logfile = Path.build_path ("/", rootdir, "var/log/pacman.log"); + } + } else { + rootdir = "/"; + if (dbpath == null) { + dbpath = "/var/lib/pacman/"; + } + if (logfile == null) { + logfile = "/var/log/pacman.log"; + } + } + if (cachedirs.length () == 0) { + cachedirs.append ("/var/cache/pacman/pkg/"); + } + if (hookdirs.length () == 0) { + hookdirs.append ("/etc/pacman.d/hooks/"); + } + if (gpgdir == null) { + // gpgdir it is not relative to rootdir, even if + // rootdir is defined because it contains configuration data. + gpgdir = "/etc/pacman.d/gnupg/"; + } + if (arch == null) { + arch = Posix.utsname().machine; + } + } + + public Alpm.Handle? get_handle (bool files_db = false, bool tmp_db = false) { + Alpm.Errno error = 0; + Alpm.Handle? handle = null; + if (tmp_db) { + string tmp_dbpath = "/tmp/pamac-checkdbs"; + try { + Process.spawn_command_line_sync ("mkdir -p %s/sync".printf (tmp_dbpath)); + Process.spawn_command_line_sync ("ln -sf %s/local %s".printf (dbpath, tmp_dbpath)); + Process.spawn_command_line_sync ("chmod -R 777 %s/sync".printf (tmp_dbpath)); + handle = new Alpm.Handle (rootdir, tmp_dbpath, out error); + } catch (SpawnError e) { + stderr.printf ("SpawnError: %s\n", e.message); + } + } else { + handle = new Alpm.Handle (rootdir, dbpath, out error); + } + if (error == Alpm.Errno.DB_VERSION) { + try { + Process.spawn_command_line_sync ("pacman-db-upgrade", null, null, null); + } catch (SpawnError e) { + stdout.printf ("Error: %s\n", e.message); + } + handle = new Alpm.Handle (rootdir, dbpath, out error); + } + if (handle == null) { + stderr.printf ("Failed to initialize alpm library" + " (%s)\n".printf (Alpm.strerror (error))); + return null; + } + // define options + if (files_db) { + handle.dbext = ".files"; + } + if (!tmp_db) { + handle.logfile = logfile; + } + handle.gpgdir = gpgdir; + handle.arch = arch; + handle.deltaratio = deltaratio; + handle.usesyslog = usesyslog; + handle.checkspace = checkspace; + handle.defaultsiglevel = siglevel; + localfilesiglevel = merge_siglevel (siglevel, localfilesiglevel, localfilesiglevel_mask); + remotefilesiglevel = merge_siglevel (siglevel, remotefilesiglevel, remotefilesiglevel_mask); + handle.localfilesiglevel = localfilesiglevel; + handle.remotefilesiglevel = remotefilesiglevel; + foreach (unowned string cachedir in cachedirs) { + handle.add_cachedir (cachedir); + } + foreach (unowned string hookdir in hookdirs) { + handle.add_hookdir (hookdir); + } + foreach (unowned string ignoregroup in ignoregroups) { + handle.add_ignoregroup (ignoregroup); + } + foreach (unowned string ignorepkg in ignorepkgs) { + handle.add_ignorepkg (ignorepkg); + } + foreach (unowned string noextract in noextracts) { + handle.add_noextract (noextract); + } + foreach (unowned string noupgrade in noupgrades) { + handle.add_noupgrade (noupgrade); + } + // register dbs + foreach (unowned AlpmRepo repo in repo_order) { + repo.siglevel = merge_siglevel (siglevel, repo.siglevel, repo.siglevel_mask); + unowned Alpm.DB db = handle.register_syncdb (repo.name, repo.siglevel); + foreach (unowned string url in repo.urls) { + db.add_server (url.replace ("$repo", repo.name).replace ("$arch", handle.arch)); + } + if (repo.usage == 0) { + db.usage = Alpm.DB.Usage.ALL; + } else { + db.usage = repo.usage; + } + } + return handle; + } + + void parse_file (string path, string? section = null) { + string? current_section = section; + var file = GLib.File.new_for_path (path); + if (file.query_exists ()) { + try { + // Open file for reading and wrap returned FileInputStream into a + // DataInputStream, so we can read line by line + var dis = new DataInputStream (file.read ()); + string? line; + // Read lines until end of file (null) is reached + while ((line = dis.read_line ()) != null) { + if (line.length == 0) { + continue; + } + // ignore whole line and end of line comments + string[] splitted = line.split ("#", 2); + line = splitted[0].strip (); + if (line.length == 0) { + continue; + } + if (line[0] == '[' && line[line.length-1] == ']') { + current_section = line[1:-1]; + if (current_section != "options") { + var repo = new AlpmRepo (current_section); + if (repo_order.find_custom (repo, AlpmRepo.compare_name) == null) { + repo_order.append ((owned) repo); + } + } + continue; + } + splitted = line.split ("=", 2); + unowned string key = splitted[0]._strip (); + unowned string? val = null; + if (splitted.length == 2) { + val = splitted[1]._strip (); + } + if (key == "Include") { + parse_file (val, current_section); + } + if (current_section == "options") { + if (key == "RootDir") { + rootdir = val; + } else if (key == "DBPath") { + dbpath = val; + } else if (key == "CacheDir") { + foreach (unowned string dir in val.split (" ")) { + cachedirs.append (dir); + } + } else if (key == "HookDir") { + foreach (unowned string dir in val.split (" ")) { + hookdirs.append (dir); + } + } else if (key == "LogFile") { + logfile = val; + } else if (key == "GPGDir") { + gpgdir = val; + } else if (key == "LogFile") { + logfile = val; + } else if (key == "Architecture") { + if (val == "auto") { + arch = Posix.utsname ().machine; + } else { + arch = val; + } + } else if (key == "UseDelta") { + deltaratio = double.parse (val); + } else if (key == "UseSysLog") { + usesyslog = 1; + } else if (key == "CheckSpace") { + checkspace = 1; + } else if (key == "SigLevel") { + process_siglevel (val, ref siglevel, ref siglevel_mask); + } else if (key == "LocalFileSigLevel") { + process_siglevel (val, ref localfilesiglevel, ref localfilesiglevel_mask); + } else if (key == "RemoteFileSigLevel") { + process_siglevel (val, ref remotefilesiglevel, ref remotefilesiglevel_mask); + } else if (key == "HoldPkg") { + foreach (unowned string name in val.split (" ")) { + holdpkgs.append (name); + } + } else if (key == "SyncFirst") { + foreach (unowned string name in val.split (" ")) { + syncfirsts.append (name); + } + } else if (key == "IgnoreGroup") { + foreach (unowned string name in val.split (" ")) { + ignoregroups.append (name); + } + } else if (key == "IgnorePkg") { + foreach (unowned string name in val.split (" ")) { + ignorepkgs.append (name); + } + } else if (key == "Noextract") { + foreach (unowned string name in val.split (" ")) { + noextracts.append (name); + } + } else if (key == "NoUpgrade") { + foreach (unowned string name in val.split (" ")) { + noupgrades.append (name); + } + } + } else { + unowned GLib.List? found = repo_order.search (current_section, (SearchFunc) AlpmRepo.search_name); + if (found != null) { + unowned AlpmRepo repo = found.data; + if (key == "Server") { + repo.urls.append (val); + } else if (key == "SigLevel") { + process_siglevel (val, ref repo.siglevel, ref repo.siglevel_mask); + } else if (key == "Usage") { + repo.usage = define_usage (val); + } + } + } + } + } catch (GLib.Error e) { + GLib.stderr.printf("%s\n", e.message); + } + } else { + GLib.stderr.printf ("File '%s' doesn't exist.\n", path); + } + } + + public void write (HashTable new_conf) { + var file = GLib.File.new_for_path (conf_path); + if (file.query_exists ()) { + try { + // Open file for reading and wrap returned FileInputStream into a + // DataInputStream, so we can read line by line + var dis = new DataInputStream (file.read ()); + string? line; + string[] data = {}; + // Read lines until end of file (null) is reached + while ((line = dis.read_line ()) != null) { + if (line.length == 0) { + data += "\n"; + continue; + } + if (line.contains ("IgnorePkg")) { + if (new_conf.contains ("IgnorePkg")) { + string val = new_conf.get ("IgnorePkg").get_string (); + if (val == "") { + data += "#IgnorePkg =\n"; + } else { + data += "IgnorePkg = %s\n".printf (val); + } + new_conf.remove ("IgnorePkg"); + } else { + data += line + "\n"; + } + } else if (line.contains ("CheckSpace")) { + if (new_conf.contains ("CheckSpace")) { + bool val = new_conf.get ("CheckSpace").get_boolean (); + if (val) { + data += "CheckSpace\n"; + } else { + data += "#CheckSpace\n"; + } + new_conf.remove ("CheckSpace"); + } else { + data += line + "\n"; + } + } else { + data += line + "\n"; + } + } + // delete the file before rewrite it + file.delete (); + // creating a DataOutputStream to the file + var dos = new DataOutputStream (file.create (FileCreateFlags.REPLACE_DESTINATION)); + foreach (unowned string new_line in data) { + // writing a short string to the stream + dos.put_string (new_line); + } + reload (); + } catch (GLib.Error e) { + GLib.stderr.printf("%s\n", e.message); + } + } else { + GLib.stderr.printf ("File '%s' doesn't exist.\n", conf_path); + } + } + + Alpm.DB.Usage define_usage (string conf_string) { + Alpm.DB.Usage usage = 0; + foreach (unowned string directive in conf_string.split(" ")) { + if (directive == "Sync") { + usage |= Alpm.DB.Usage.SYNC; + } else if (directive == "Search") { + usage |= Alpm.DB.Usage.SEARCH; + } else if (directive == "Install") { + usage |= Alpm.DB.Usage.INSTALL; + } else if (directive == "Upgrade") { + usage |= Alpm.DB.Usage.UPGRADE; + } else if (directive == "All") { + usage |= Alpm.DB.Usage.ALL; + } + } + return usage; + } + + void process_siglevel (string conf_string, ref Alpm.Signature.Level siglevel, ref Alpm.Signature.Level siglevel_mask) { + foreach (unowned string directive in conf_string.split(" ")) { + bool affect_package = false; + bool affect_database = false; + if ("Package" in directive) { + affect_package = true; + } else if ("Database" in directive) { + affect_database = true; + } else { + affect_package = true; + affect_database = true; + } + if ("Never" in directive) { + if (affect_package) { + siglevel &= ~Alpm.Signature.Level.PACKAGE; + siglevel_mask |= Alpm.Signature.Level.PACKAGE; + } + if (affect_database) { + siglevel &= ~Alpm.Signature.Level.DATABASE; + siglevel_mask |= Alpm.Signature.Level.DATABASE; + } + } else if ("Optional" in directive) { + if (affect_package) { + siglevel |= (Alpm.Signature.Level.PACKAGE | Alpm.Signature.Level.PACKAGE_OPTIONAL); + siglevel_mask |= (Alpm.Signature.Level.PACKAGE | Alpm.Signature.Level.PACKAGE_OPTIONAL); + } + if (affect_database) { + siglevel |= (Alpm.Signature.Level.DATABASE | Alpm.Signature.Level.DATABASE_OPTIONAL); + siglevel_mask |= (Alpm.Signature.Level.DATABASE | Alpm.Signature.Level.DATABASE_OPTIONAL); + } + } else if ("Required" in directive) { + if (affect_package) { + siglevel |= Alpm.Signature.Level.PACKAGE; + siglevel_mask |= Alpm.Signature.Level.PACKAGE; + siglevel &= ~Alpm.Signature.Level.PACKAGE_OPTIONAL; + siglevel_mask |= Alpm.Signature.Level.PACKAGE_OPTIONAL; + } + if (affect_database) { + siglevel |= Alpm.Signature.Level.DATABASE; + siglevel_mask |= Alpm.Signature.Level.DATABASE; + siglevel &= ~Alpm.Signature.Level.DATABASE_OPTIONAL; + siglevel_mask |= Alpm.Signature.Level.DATABASE_OPTIONAL; + } + } else if ("TrustedOnly" in directive) { + if (affect_package) { + siglevel &= ~(Alpm.Signature.Level.PACKAGE_MARGINAL_OK | Alpm.Signature.Level.PACKAGE_UNKNOWN_OK); + siglevel_mask |= (Alpm.Signature.Level.PACKAGE_MARGINAL_OK | Alpm.Signature.Level.PACKAGE_UNKNOWN_OK); + } + if (affect_database) { + siglevel &= ~(Alpm.Signature.Level.DATABASE_MARGINAL_OK | Alpm.Signature.Level.DATABASE_UNKNOWN_OK); + siglevel_mask |= (Alpm.Signature.Level.DATABASE_MARGINAL_OK | Alpm.Signature.Level.DATABASE_UNKNOWN_OK); + } + } else if ("TrustAll" in directive) { + if (affect_package) { + siglevel |= (Alpm.Signature.Level.PACKAGE_MARGINAL_OK | Alpm.Signature.Level.PACKAGE_UNKNOWN_OK); + siglevel_mask |= (Alpm.Signature.Level.PACKAGE_MARGINAL_OK | Alpm.Signature.Level.PACKAGE_UNKNOWN_OK); + } + if (affect_database) { + siglevel |= (Alpm.Signature.Level.DATABASE_MARGINAL_OK | Alpm.Signature.Level.DATABASE_UNKNOWN_OK); + siglevel_mask |= (Alpm.Signature.Level.DATABASE_MARGINAL_OK | Alpm.Signature.Level.DATABASE_UNKNOWN_OK); + } + } else { + GLib.stderr.printf("unrecognized siglevel: %s\n", conf_string); + } + } + siglevel &= ~Alpm.Signature.Level.USE_DEFAULT; + } + + Alpm.Signature.Level merge_siglevel(Alpm.Signature.Level sigbase, Alpm.Signature.Level sigover, Alpm.Signature.Level sigmask) { + return (sigmask != 0) ? (sigover & sigmask) | (sigbase & ~sigmask) : sigover; + } +} diff --git a/src/pamac-system-daemon/mirrors_config.vala b/src/pamac-system-daemon/mirrors_config.vala new file mode 100644 index 0000000..b237e95 --- /dev/null +++ b/src/pamac-system-daemon/mirrors_config.vala @@ -0,0 +1,131 @@ +/* + * pamac-vala + * + * Copyright (C) 2017 Chris Cromer + * Copyright (C) 2014-2017 Guillaume Benoit + * + * This program 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. + * + * This program 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 get of the GNU General Public License + * along with this program. If not, see . + */ + +namespace Pamac { + class MirrorsConfig { + string conf_path; + + public string choosen_generation_method { get; private set; } + public string choosen_country { get; private set; } + + public MirrorsConfig (string path) { + conf_path = path; + reload (); + } + + public void reload () { + // set default options + choosen_generation_method = "rank"; + choosen_country = "ALL"; + parse_file (conf_path); + } + + void parse_file (string path) { + var file = GLib.File.new_for_path (path); + if (file.query_exists ()) { + try { + // Open file for reading and wrap returned FileInputStream into a + // DataInputStream, so we can read line by line + var dis = new DataInputStream (file.read ()); + string? line; + // Read lines until end of file (null) is reached + while ((line = dis.read_line ()) != null) { + if (line.length == 0) { + continue; + } + // ignore whole line and end of line comments + string[] splitted = line.split ("#", 2); + line = splitted[0].strip (); + if (line.length == 0) { + continue; + } + splitted = line.split ("=", 2); + unowned string key = splitted[0]._strip (); + unowned string? val = null; + if (splitted.length == 2) { + val = splitted[1]._strip (); + } + if (key == "Method") { + choosen_generation_method = val; + } else if (key == "OnlyCountry") { + choosen_country = val; + } + } + } catch (Error e) { + GLib.stderr.printf("%s\n", e.message); + } + } else { + GLib.stderr.printf ("File '%s' doesn't exist.\n", path); + } + } + + public void write (HashTable new_conf) { + var file = GLib.File.new_for_path (conf_path); + if (file.query_exists ()) { + try { + // Open file for reading and wrap returned FileInputStream into a + // DataInputStream, so we can read line by line + var dis = new DataInputStream (file.read ()); + string? line; + var data = new GLib.List (); + // Read lines until end of file (null) is reached + while ((line = dis.read_line ()) != null) { + if (line.length == 0) { + data.append ("\n"); + continue; + } + unowned Variant variant; + if (line.contains ("Method")) { + if (new_conf.lookup_extended ("Method", null, out variant)) { + data.append ("Method = %s\n".printf (variant.get_string ())); + } else { + data.append (line + "\n"); + } + } else if (line.contains ("OnlyCountry")) { + if (new_conf.lookup_extended ("OnlyCountry", null, out variant)) { + if (variant.get_string () == "ALL") { + data.append ("#%s\n".printf (line)); + } else { + data.append ("OnlyCountry = %s\n".printf (variant.get_string ())); + } + } else { + data.append (line + "\n"); + } + } else { + data.append (line + "\n"); + } + } + // delete the file before rewrite it + file.delete (); + // creating a DataOutputStream to the file + var dos = new DataOutputStream (file.create (FileCreateFlags.REPLACE_DESTINATION)); + foreach (unowned string new_line in data) { + // writing a short string to the stream + dos.put_string (new_line); + } + } catch (GLib.Error e) { + GLib.stderr.printf("%s\n", e.message); + } + } else { + GLib.stderr.printf ("File '%s' doesn't exist.\n", file.get_path ()); + } + } + } +} diff --git a/src/pamac-system-daemon/pamac_config.vala b/src/pamac-system-daemon/pamac_config.vala new file mode 100644 index 0000000..0d36947 --- /dev/null +++ b/src/pamac-system-daemon/pamac_config.vala @@ -0,0 +1,285 @@ +/* + * pamac-vala + * + * Copyright (C) 2017 Chris Cromer + * Copyright (C) 2014-2017 Guillaume Benoit + * + * This program 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. + * + * This program 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 get of the GNU General Public License + * along with this program. If not, see . + */ + +namespace Pamac { + class Config { + string conf_path; + HashTable _environment_variables; + + public bool recurse { get; private set; } + public uint64 refresh_period { get; private set; } + public bool no_update_hide_icon { get; private set; } + public bool enable_aur { get; private set; } + public bool search_aur { get; private set; } + public string aur_build_dir { get; private set; } + public bool check_aur_updates { get; private set; } + public unowned HashTable environment_variables { + get { + return _environment_variables; + } + } + + public Config (string path) { + conf_path = path; + //get environment variables + _environment_variables = new HashTable (str_hash, str_equal); + var utsname = Posix.utsname(); + _environment_variables.insert ("HTTP_USER_AGENT", "pamac (%s %s)".printf (utsname.sysname, utsname.machine)); + unowned string? variable = Environment.get_variable ("http_proxy"); + if (variable != null) { + _environment_variables.insert ("http_proxy", variable); + } + variable = Environment.get_variable ("https_proxy"); + if (variable != null) { + _environment_variables.insert ("https_proxy", variable); + } + variable = Environment.get_variable ("ftp_proxy"); + if (variable != null) { + _environment_variables.insert ("ftp_proxy", variable); + } + variable = Environment.get_variable ("socks_proxy"); + if (variable != null) { + _environment_variables.insert ("socks_proxy", variable); + } + variable = Environment.get_variable ("no_proxy"); + if (variable != null) { + _environment_variables.insert ("no_proxy", variable); + } + // set default option + refresh_period = 6; + reload (); + } + + public void reload () { + // set default options + recurse = false; + no_update_hide_icon = false; + enable_aur = false; + search_aur = false; + aur_build_dir = "/tmp"; + check_aur_updates = false; + parse_file (conf_path); + } + + void parse_file (string path) { + var file = GLib.File.new_for_path (path); + if (file.query_exists ()) { + try { + // Open file for reading and wrap returned FileInputStream into a + // DataInputStream, so we can read line by line + var dis = new DataInputStream (file.read ()); + string? line; + // Read lines until end of file (null) is reached + while ((line = dis.read_line ()) != null) { + if (line.length == 0) { + continue; + } + // ignore whole line and end of line comments + string[] splitted = line.split ("#", 2); + line = splitted[0].strip (); + if (line.length == 0) { + continue; + } + splitted = line.split ("=", 2); + unowned string key = splitted[0]._strip (); + if (key == "RemoveUnrequiredDeps") { + recurse = true; + } else if (key == "RefreshPeriod") { + if (splitted.length == 2) { + unowned string val = splitted[1]._strip (); + refresh_period = uint64.parse (val); + } + } else if (key == "NoUpdateHideIcon") { + no_update_hide_icon = true; + } else if (key == "EnableAUR") { + enable_aur = true; + } else if (key == "SearchInAURByDefault") { + search_aur = true; + } else if (key == "BuildDirectory") { + if (splitted.length == 2) { + aur_build_dir = splitted[1]._strip (); + } + } else if (key == "CheckAURUpdates") { + check_aur_updates = true; + } + } + } catch (GLib.Error e) { + GLib.stderr.printf("%s\n", e.message); + } + } else { + GLib.stderr.printf ("File '%s' doesn't exist.\n", path); + } + } + + public void write (HashTable new_conf) { + var file = GLib.File.new_for_path (conf_path); + var data = new GLib.List (); + if (file.query_exists ()) { + try { + // Open file for reading and wrap returned FileInputStream into a + // DataInputStream, so we can read line by line + var dis = new DataInputStream (file.read ()); + string? line; + // Read lines until end of file (null) is reached + while ((line = dis.read_line ()) != null) { + if (line.length == 0) { + data.append ("\n"); + continue; + } + unowned Variant variant; + if (line.contains ("RemoveUnrequiredDeps")) { + if (new_conf.lookup_extended ("RemoveUnrequiredDeps", null, out variant)) { + if (variant.get_boolean ()) { + data.append ("RemoveUnrequiredDeps\n"); + } else { + data.append ("#RemoveUnrequiredDeps\n"); + } + new_conf.remove ("RemoveUnrequiredDeps"); + } else { + data.append (line + "\n"); + } + } else if (line.contains ("RefreshPeriod")) { + if (new_conf.lookup_extended ("RefreshPeriod", null, out variant)) { + data.append ("RefreshPeriod = %llu\n".printf (variant.get_uint64 ())); + new_conf.remove ("RefreshPeriod"); + } else { + data.append (line + "\n"); + } + } else if (line.contains ("NoUpdateHideIcon")) { + if (new_conf.lookup_extended ("NoUpdateHideIcon", null, out variant)) { + if (variant.get_boolean ()) { + data.append ("NoUpdateHideIcon\n"); + } else { + data.append ("#NoUpdateHideIcon\n"); + } + new_conf.remove ("NoUpdateHideIcon"); + } else { + data.append (line + "\n"); + } + } else if (line.contains ("EnableAUR")) { + if (new_conf.lookup_extended ("EnableAUR", null, out variant)) { + if (variant.get_boolean ()) { + data.append ("EnableAUR\n"); + } else { + data.append ("#EnableAUR\n"); + } + new_conf.remove ("EnableAUR"); + } else { + data.append (line + "\n"); + } + } else if (line.contains ("SearchInAURByDefault")) { + if (new_conf.lookup_extended ("SearchInAURByDefault", null, out variant)) { + if (variant.get_boolean ()) { + data.append ("SearchInAURByDefault\n"); + } else { + data.append ("#SearchInAURByDefault\n"); + } + new_conf.remove ("SearchInAURByDefault"); + } else { + data.append (line + "\n"); + } + } else if (line.contains ("BuildDirectory")) { + if (new_conf.lookup_extended ("BuildDirectory", null, out variant)) { + data.append ("BuildDirectory = %s\n".printf (variant.get_string ())); + new_conf.remove ("BuildDirectory"); + } else { + data.append (line + "\n"); + } + } else if (line.contains ("CheckAURUpdates")) { + if (new_conf.lookup_extended ("CheckAURUpdates", null, out variant)) { + if (variant.get_boolean ()) { + data.append ("CheckAURUpdates\n"); + } else { + data.append ("#CheckAURUpdates\n"); + } + new_conf.remove ("CheckAURUpdates"); + } else { + data.append (line + "\n"); + } + } else { + data.append (line + "\n"); + } + } + // delete the file before rewrite it + file.delete (); + } catch (GLib.Error e) { + GLib.stderr.printf("%s\n", e.message); + } + } else { + GLib.stderr.printf ("File '%s' doesn't exist.\n", conf_path); + } + // create lines for unexisted options + if (new_conf.size () != 0) { + data.append ("\n"); + var iter = HashTableIter (new_conf); + unowned string key; + unowned Variant val; + while (iter.next (out key, out val)) { + if (key == "RemoveUnrequiredDeps") { + if (val.get_boolean ()) { + data.append ("RemoveUnrequiredDeps\n"); + } else { + data.append ("#RemoveUnrequiredDeps\n"); + } + } else if (key == "RefreshPeriod") { + data.append ("RefreshPeriod = %llu\n".printf (val.get_uint64 ())); + } else if (key =="NoUpdateHideIcon") { + if (val.get_boolean ()) { + data.append ("NoUpdateHideIcon\n"); + } else { + data.append ("#NoUpdateHideIcon\n"); + } + } else if (key == "EnableAUR") { + if (val.get_boolean ()) { + data.append ("EnableAUR\n"); + } else { + data.append ("#EnableAUR\n"); + } + } else if (key == "SearchInAURByDefault") { + if (val.get_boolean ()) { + data.append ("SearchInAURByDefault\n"); + } else { + data.append ("#SearchInAURByDefault\n"); + } + } else if (key == "BuildDirectory") { + data.append ("BuildDirectory = %s\n".printf (val.get_string ())); + } else if (key == "CheckAURUpdates") { + if (val.get_boolean ()) { + data.append ("CheckAURUpdates\n"); + } else { + data.append ("#CheckAURUpdates\n"); + } + } + } + } + // write the file + try { + // creating a DataOutputStream to the file + var dos = new DataOutputStream (file.create (FileCreateFlags.REPLACE_DESTINATION)); + foreach (unowned string new_line in data) { + // writing a short string to the stream + dos.put_string (new_line); + } + } catch (GLib.Error e) { + GLib.stderr.printf("%s\n", e.message); + } + } + } +} diff --git a/src/system_daemon.vala b/src/pamac-system-daemon/system_daemon.vala similarity index 97% rename from src/system_daemon.vala rename to src/pamac-system-daemon/system_daemon.vala index c28ef89..5ac942e 100644 --- a/src/system_daemon.vala +++ b/src/pamac-system-daemon/system_daemon.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -37,7 +38,7 @@ public class AlpmAction { } namespace Pamac { - [DBus (name = "org.manjaro.pamac.system")] + [DBus (name = "org.pamac.system")] public class SystemDaemon: Object { private AlpmConfig alpm_config; private Alpm.Handle? alpm_handle; @@ -48,25 +49,40 @@ namespace Pamac { private bool refreshed; private bool force_refresh; private bool enable_downgrade; +#if DISABLE_AUR +#else private bool check_aur_updates; private bool aur_updates_checked; +#endif private HashTable new_alpm_conf; private Alpm.TransFlag flags; private string[] to_install; private string[] to_remove; private string[] to_load; +#if DISABLE_AUR +#else private string[] to_build; private UpdateInfos[] to_build_infos; private GLib.List aur_pkgbases_to_build; private GenericSet aur_desc_list; private GenericSet already_checked_aur_dep; +#endif private HashTable to_install_as_dep; +#if DISABLE_AUR +#else private string aurdb_path; +#endif private string[] temporary_ignorepkgs; +#if DISABLE_AUR +#else private UpdateInfos[] aur_conflicts_to_remove; +#endif private ThreadPool thread_pool; private BusName lock_id; +#if DISABLE_AUR +#else private Json.Array aur_updates_results; +#endif private GLib.File lockfile; public ErrorInfos current_error; public Timer timer; @@ -86,8 +102,12 @@ namespace Pamac { public signal void trans_prepare_finished (bool success); public signal void trans_commit_finished (bool success); public signal void get_authorization_finished (bool authorized); +#if DISABLE_AUR + public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon); +#else public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon, bool enable_aur, bool search_aur, string aur_build_dir, bool check_aur_updates); +#endif public signal void write_alpm_config_finished (bool checkspace); public signal void write_mirrors_config_finished (string choosen_country, string choosen_generation_method); public signal void generate_mirrors_list_data (string line); @@ -95,12 +115,18 @@ namespace Pamac { public SystemDaemon () { alpm_config = new AlpmConfig ("/etc/pacman.conf"); +#if DISABLE_AUR +#else aur_pkgbases_to_build = new GLib.List (); aur_desc_list = new GenericSet (str_hash, str_equal); already_checked_aur_dep = new GenericSet (str_hash, str_equal); +#endif to_install_as_dep = new HashTable (str_hash, str_equal); +#if DISABLE_AUR +#else aurdb_path = "/tmp/pamac-aur"; aur_updates_results = new Json.Array (); +#endif timer = new Timer (); lock_id = new BusName (""); refresh_handle (); @@ -297,7 +323,7 @@ namespace Pamac { Polkit.Subject subject = Polkit.SystemBusName.new (sender); authority.check_authorization.begin ( subject, - "org.manjaro.pamac.commit", + "org.pamac.commit", null, Polkit.CheckAuthorizationFlags.ALLOW_USER_INTERACTION, null, @@ -338,8 +364,12 @@ namespace Pamac { pamac_config.write (new_pamac_conf); pamac_config.reload (); } +#if DISABLE_AUR + write_pamac_config_finished (pamac_config.recurse, pamac_config.refresh_period, pamac_config.no_update_hide_icon); +#else write_pamac_config_finished (pamac_config.recurse, pamac_config.refresh_period, pamac_config.no_update_hide_icon, pamac_config.enable_aur, pamac_config.search_aur, pamac_config.aur_build_dir, pamac_config.check_aur_updates); +#endif }); } @@ -583,6 +613,8 @@ namespace Pamac { return pkg; } +#if DISABLE_AUR +#else private AURPackage initialise_aur_struct (Json.Object json_object) { string installed_version = ""; unowned Alpm.Package? pkg = alpm_handle.localdb.get_pkg (json_object.get_string_member ("Name")); @@ -743,6 +775,7 @@ namespace Pamac { yield check_aur_dep_list (dep_to_check); } } +#endif private void get_updates () { AlpmPackage[] updates_infos = {}; @@ -762,8 +795,12 @@ namespace Pamac { if (updates_infos.length != 0) { var updates = Updates () { is_syncfirst = true, +#if DISABLE_AUR + repos_updates = (owned) updates_infos +#else repos_updates = (owned) updates_infos, aur_updates = {} +#endif }; get_updates_finished (updates); } else { @@ -778,6 +815,8 @@ namespace Pamac { var infos = initialise_pkg_struct (candidate); infos.installed_version = installed_pkg.version; updates_infos += (owned) infos; +#if DISABLE_AUR +#else } else { if (check_aur_updates && (!aur_updates_checked)) { // check if installed_pkg is a local pkg @@ -794,10 +833,13 @@ namespace Pamac { local_pkgs += installed_pkg.name; } } +#endif } } pkgcache.next (); } +#if DISABLE_AUR +#else if (check_aur_updates) { // get aur updates if (!aur_updates_checked) { @@ -820,16 +862,26 @@ namespace Pamac { get_updates_finished (updates); } } else { +#endif var updates = Updates () { is_syncfirst = false, +#if DISABLE_AUR + repos_updates = (owned) updates_infos +#else repos_updates = (owned) updates_infos, aur_updates = {} +#endif }; get_updates_finished (updates); +#if DISABLE_AUR +#else } +#endif } } +#if DISABLE_AUR +#else private AURPackage[] get_aur_updates_infos () { AURPackage[] aur_updates_infos = {}; aur_updates_results.foreach_element ((array, index, node) => { @@ -845,9 +897,14 @@ namespace Pamac { }); return aur_updates_infos; } +#endif +#if DISABLE_AUR + public void start_get_updates () { +#else public void start_get_updates (bool check_aur_updates_) { check_aur_updates = check_aur_updates_; +#endif try { thread_pool.add (new AlpmAction (get_updates)); } catch (ThreadError e) { @@ -1165,6 +1222,8 @@ namespace Pamac { trans_prepare_finished (success); } +#if DISABLE_AUR +#else private void build_prepare () { // create a fake aur db try { @@ -1343,13 +1402,22 @@ namespace Pamac { } } } +#endif +#if DISABLE_AUR + public void start_trans_prepare (Alpm.TransFlag flags_, + string[] to_install_, + string[] to_remove_, + string[] to_load_, + GLib.BusName sender) { +#else public void start_trans_prepare (Alpm.TransFlag flags_, string[] to_install_, string[] to_remove_, string[] to_load_, string[] to_build_, GLib.BusName sender) { +#endif if (lock_id != sender) { trans_prepare_finished (false); return; @@ -1358,6 +1426,8 @@ namespace Pamac { to_install = to_install_; to_remove = to_remove_; to_load = to_load_; +#if DISABLE_AUR +#else to_build = to_build_; to_build_infos = {}; aur_pkgbases_to_build = new GLib.List (); @@ -1370,12 +1440,16 @@ namespace Pamac { } }); } else { +#endif try { thread_pool.add (new AlpmAction (trans_prepare)); } catch (ThreadError e) { stderr.printf ("Thread Error %s\n", e.message); } +#if DISABLE_AUR +#else } +#endif } public void choose_provider (int provider) { @@ -1430,6 +1504,8 @@ namespace Pamac { pkgs_to_remove.next (); } UpdateInfos[] conflicts_to_remove = {}; +#if DISABLE_AUR +#else foreach (unowned UpdateInfos infos in aur_conflicts_to_remove){ conflicts_to_remove += infos; } @@ -1438,15 +1514,20 @@ namespace Pamac { foreach (unowned string name in aur_pkgbases_to_build) { pkgbases_to_build += name; } +#endif var summary = TransactionSummary () { to_install = (owned) to_install, to_upgrade = (owned) to_upgrade, to_downgrade = (owned) to_downgrade, to_reinstall = (owned) to_reinstall, +#if DISABLE_AUR + to_remove = (owned) to_remove +#else to_remove = (owned) to_remove, to_build = to_build_infos, aur_conflicts_to_remove = conflicts_to_remove, aur_pkgbases_to_build = pkgbases_to_build +#endif }; return summary; } @@ -1976,7 +2057,7 @@ private void cb_log (Alpm.LogLevel level, string fmt, va_list args) { void on_bus_acquired (DBusConnection conn) { system_daemon = new Pamac.SystemDaemon (); try { - conn.register_object ("/org/manjaro/pamac/system", system_daemon); + conn.register_object ("/org/pamac/system", system_daemon); } catch (IOError e) { stderr.printf ("Could not register service\n"); @@ -1990,7 +2071,7 @@ void main () { Intl.textdomain (GETTEXT_PACKAGE); Bus.own_name (BusType.SYSTEM, - "org.manjaro.pamac.system", + "org.pamac.system", BusNameOwnerFlags.NONE, on_bus_acquired, null, diff --git a/src/pamac-tray/CMakeDepends.txt b/src/pamac-tray/CMakeDepends.txt new file mode 100644 index 0000000..c703932 --- /dev/null +++ b/src/pamac-tray/CMakeDepends.txt @@ -0,0 +1 @@ +add_dependencies(pamac-tray Pamac AUR) diff --git a/src/pamac-tray/CMakeLists.txt b/src/pamac-tray/CMakeLists.txt new file mode 100644 index 0000000..c93df2d --- /dev/null +++ b/src/pamac-tray/CMakeLists.txt @@ -0,0 +1,106 @@ +### 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.0.0") +set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") +set (DOLLAR "$") + +configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala) +add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") +set (VERSION "6.0.0") +add_definitions (${DEPS_CFLAGS}) +include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) +link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) +link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) +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} 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} pamac_config.vala) +set (APP_SOURCES ${APP_SOURCES} tray.vala) +set (APP_SOURCES ${APP_SOURCES} user_daemon.vala) + +set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi) +if (NOT DISABLE_AUR) + set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi) +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 () +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 () +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}) + + +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() +if (KDE_TRAY) + else () +endif () +include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt) diff --git a/src/pamac-tray/Config.vala.base b/src/pamac-tray/Config.vala.base new file mode 100644 index 0000000..1728fb1 --- /dev/null +++ b/src/pamac-tray/Config.vala.base @@ -0,0 +1,10 @@ +namespace Constants { + public const string DATADIR = "@DATADIR@"; + public const string PKGDATADIR = "@PKGDATADIR@"; + public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; + public const string RELEASE_NAME = "@RELEASE_NAME@"; + public const string VERSION = "@VERSION@"; +#if UNITEST + public const string TESTSRCDIR = "@TESTSRCDIR@"; +#endif +} diff --git a/src/pamac-tray/pamac_config.vala b/src/pamac-tray/pamac_config.vala new file mode 120000 index 0000000..95475bb --- /dev/null +++ b/src/pamac-tray/pamac_config.vala @@ -0,0 +1 @@ +../pamac_config.vala \ No newline at end of file diff --git a/src/tray-appindicator.vala b/src/pamac-tray/tray-appindicator.vala similarity index 97% rename from src/tray-appindicator.vala rename to src/pamac-tray/tray-appindicator.vala index 646cd85..ab80c18 100644 --- a/src/tray-appindicator.vala +++ b/src/pamac-tray/tray-appindicator.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify diff --git a/src/tray-gtk.vala b/src/pamac-tray/tray-gtk.vala similarity index 96% rename from src/tray-gtk.vala rename to src/pamac-tray/tray-gtk.vala index f5d2a6a..0d22b99 100644 --- a/src/tray-gtk.vala +++ b/src/pamac-tray/tray-gtk.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify diff --git a/src/tray.vala b/src/pamac-tray/tray.vala similarity index 91% rename from src/tray.vala rename to src/pamac-tray/tray.vala index edae105..c6e366a 100644 --- a/src/tray.vala +++ b/src/pamac-tray/tray.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -25,15 +26,7 @@ const string noupdate_icon_name = "pamac-tray-no-update"; const string noupdate_info = _("Your system is up-to-date"); namespace Pamac { - [DBus (name = "org.manjaro.pamac.user")] - interface UserDaemon : Object { - public abstract void refresh_handle () throws IOError; - public abstract string get_lockfile () throws IOError; - public abstract void start_get_updates (bool check_aur_updates) throws IOError; - [DBus (no_reply = true)] - public abstract void quit () throws IOError; - public signal void get_updates_finished (Updates updates); - } + [DBus (name = "org.pamac.user")] public abstract class TrayIcon: Gtk.Application { Notify.Notification notification; @@ -44,7 +37,7 @@ namespace Pamac { GLib.File lockfile; public TrayIcon () { - application_id = "org.manjaro.pamac.tray"; + application_id = "org.pamac.tray"; flags = ApplicationFlags.FLAGS_NONE; } @@ -52,7 +45,7 @@ namespace Pamac { void start_daemon () { try { - daemon = Bus.get_proxy_sync (BusType.SESSION, "org.manjaro.pamac.user", "/org/manjaro/pamac/user"); + daemon = Bus.get_proxy_sync (BusType.SESSION, "org.pamac.user", "/org/pamac/user"); daemon.get_updates_finished.connect (on_get_updates_finished); } catch (IOError e) { stderr.printf ("IOError: %s\n", e.message); @@ -117,7 +110,11 @@ namespace Pamac { var pamac_config = new Pamac.Config ("/etc/pamac.conf"); if (pamac_config.refresh_period != 0) { try { +#if DISABLE_AUR + daemon.start_get_updates (); +#else daemon.start_get_updates (pamac_config.enable_aur && pamac_config.check_aur_updates); +#endif } catch (IOError e) { stderr.printf ("IOError: %s\n", e.message); } @@ -126,7 +123,11 @@ namespace Pamac { } void on_get_updates_finished (Updates updates) { +#if DISABLE_AUR + uint updates_nb = updates.repos_updates.length; +#else uint updates_nb = updates.repos_updates.length + updates.aur_updates.length; +#endif if (updates_nb == 0) { set_icon (noupdate_icon_name); set_tooltip (noupdate_info); @@ -187,7 +188,7 @@ namespace Pamac { bool check_pamac_running () { Application app; bool run = false; - app = new Application ("org.manjaro.pamac.manager", 0); + app = new Application ("org.pamac.manager", 0); try { app.register (); } catch (GLib.Error e) { @@ -197,7 +198,7 @@ namespace Pamac { if (run) { return run; } - app = new Application ("org.manjaro.pamac.installer", 0); + app = new Application ("org.pamac.installer", 0); try { app.register (); } catch (GLib.Error e) { diff --git a/src/pamac-tray/user_daemon.vala b/src/pamac-tray/user_daemon.vala new file mode 100644 index 0000000..3905afc --- /dev/null +++ b/src/pamac-tray/user_daemon.vala @@ -0,0 +1,61 @@ +/* + * pamac-vala + * + * Copyright (C) 2017 Chris Cromer + * Copyright (C) 2014-2017 Guillaume Benoit + * + * This program 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. + * + * This program 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 get of the GNU General Public License + * along with this program. If not, see . + */ + +namespace Pamac { + [DBus (name = "org.pamac.user")] + interface UserDaemon : Object { + public abstract void refresh_handle () throws IOError; +#if DISABLE_AUR + public abstract void start_get_updates () throws IOError; +#else + public abstract void start_get_updates (bool check_aur_updates) throws IOError; +#endif + [DBus (no_reply = true)] + public abstract void quit () throws IOError; + public signal void get_updates_finished (Updates updates); + public abstract string get_lockfile () throws IOError; + } + [DBus (name = "org.pamac.system")] + interface SystemDaemon : Object { + [DBus (no_reply = true)] + 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); + public signal void emit_progress (uint progress, string pkgname, uint percent, uint n_targets, uint current_target); + public signal void emit_download (string filename, uint64 xfered, uint64 total); + public signal void emit_totaldownload (uint64 total); + public signal void emit_log (uint level, string msg); + public signal void set_pkgreason_finished (); + public signal void refresh_finished (bool success); + public signal void trans_prepare_finished (bool success); + public signal void trans_commit_finished (bool success); + public signal void get_authorization_finished (bool authorized); +#if DISABLE_AUR + public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon); +#else + public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon, + bool enable_aur, bool search_aur, string aur_build_dir, bool check_aur_updates); +#endif + public signal void write_alpm_config_finished (bool checkspace); + public signal void write_mirrors_config_finished (string choosen_country, string choosen_generation_method); + public signal void generate_mirrors_list_data (string line); + public signal void generate_mirrors_list_finished (); + } +} diff --git a/src/pamac-user-daemon/CMakeDepends.txt b/src/pamac-user-daemon/CMakeDepends.txt new file mode 100644 index 0000000..465abe6 --- /dev/null +++ b/src/pamac-user-daemon/CMakeDepends.txt @@ -0,0 +1 @@ +add_dependencies(pamac-user-daemon Pamac AUR) diff --git a/src/pamac-user-daemon/CMakeLists.txt b/src/pamac-user-daemon/CMakeLists.txt new file mode 100644 index 0000000..a340b7a --- /dev/null +++ b/src/pamac-user-daemon/CMakeLists.txt @@ -0,0 +1,92 @@ +### 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.0.0") +set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") +set (DOLLAR "$") + +configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala) +add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") +set (VERSION "6.0.0") +add_definitions (${DEPS_CFLAGS}) +include_directories ( ${CMAKE_BINARY_DIR}/src/aur ${CMAKE_BINARY_DIR}/src ) +link_libraries ( ${DEPS_LIBRARIES} -lAUR -lPamac ) +link_directories ( ${DEPS_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/src/aur ${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} user_daemon.vala) + +set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/aur/AUR.vapi) +set (CUSTOM_VAPIS_LIST ${CUSTOM_VAPIS_LIST} ${CMAKE_BINARY_DIR}/src/Pamac.vapi) + +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 () +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 () +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}) + + +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() +include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeDepends.txt) diff --git a/src/pamac-user-daemon/Config.vala.base b/src/pamac-user-daemon/Config.vala.base new file mode 100644 index 0000000..1728fb1 --- /dev/null +++ b/src/pamac-user-daemon/Config.vala.base @@ -0,0 +1,10 @@ +namespace Constants { + public const string DATADIR = "@DATADIR@"; + public const string PKGDATADIR = "@PKGDATADIR@"; + public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; + public const string RELEASE_NAME = "@RELEASE_NAME@"; + public const string VERSION = "@VERSION@"; +#if UNITEST + public const string TESTSRCDIR = "@TESTSRCDIR@"; +#endif +} diff --git a/src/pamac-user-daemon/alpm_config.vala b/src/pamac-user-daemon/alpm_config.vala new file mode 120000 index 0000000..90ff71b --- /dev/null +++ b/src/pamac-user-daemon/alpm_config.vala @@ -0,0 +1 @@ +../pamac-system-daemon/alpm_config.vala \ No newline at end of file diff --git a/src/user_daemon.vala b/src/pamac-user-daemon/user_daemon.vala similarity index 98% rename from src/user_daemon.vala rename to src/pamac-user-daemon/user_daemon.vala index 0378863..ee8a974 100644 --- a/src/user_daemon.vala +++ b/src/pamac-user-daemon/user_daemon.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -23,69 +24,17 @@ const string GETTEXT_PACKAGE = "pamac"; Pamac.UserDaemon user_daemon; MainLoop loop; -private int alpm_pkg_compare_name (Alpm.Package pkg_a, Alpm.Package pkg_b) { - return strcmp (pkg_a.name, pkg_b.name); -} - -private string global_search_string; - -private int alpm_pkg_sort_search_by_relevance (Alpm.Package pkg_a, Alpm.Package pkg_b) { - if (global_search_string != null) { - // display exact match first - if (pkg_a.name == global_search_string) { - return 0; - } - if (pkg_b.name == global_search_string) { - return 1; - } - if (pkg_a.name.has_prefix (global_search_string + "-")) { - if (pkg_b.name.has_prefix (global_search_string + "-")) { - return strcmp (pkg_a.name, pkg_b.name); - } - return 0; - } - if (pkg_b.name.has_prefix (global_search_string + "-")) { - if (pkg_a.name.has_prefix (global_search_string + "-")) { - return strcmp (pkg_a.name, pkg_b.name); - } - return 1; - } - if (pkg_a.name.has_prefix (global_search_string)) { - if (pkg_b.name.has_prefix (global_search_string)) { - return strcmp (pkg_a.name, pkg_b.name); - } - return 0; - } - if (pkg_b.name.has_prefix (global_search_string)) { - if (pkg_a.name.has_prefix (global_search_string)) { - return strcmp (pkg_a.name, pkg_b.name); - } - return 1; - } - if (pkg_a.name.contains (global_search_string)) { - if (pkg_b.name.contains (global_search_string)) { - return strcmp (pkg_a.name, pkg_b.name); - } - return 0; - } - if (pkg_b.name.contains (global_search_string)) { - if (pkg_a.name.contains (global_search_string)) { - return strcmp (pkg_a.name, pkg_b.name); - } - return 1; - } - } - return strcmp (pkg_a.name, pkg_b.name); -} - namespace Pamac { - [DBus (name = "org.manjaro.pamac.user")] + [DBus (name = "org.pamac.user")] public class UserDaemon: Object { private AlpmConfig alpm_config; private Alpm.Handle? alpm_handle; private Alpm.Handle? files_handle; +#if DISABLE_AUR +#else private bool check_aur_updates; private bool aur_updates_checked; +#endif private Json.Array aur_updates_results; private HashTable aur_search_results; private HashTable aur_infos; @@ -94,9 +43,12 @@ namespace Pamac { public UserDaemon () { alpm_config = new AlpmConfig ("/etc/pacman.conf"); +#if DISABLE_AUR +#else aur_updates_results = new Json.Array (); aur_search_results = new HashTable (str_hash, str_equal); aur_infos = new HashTable (str_hash, str_equal); +#endif refresh_handle (); } @@ -348,6 +300,8 @@ namespace Pamac { return result; } +#if DISABLE_AUR +#else private AURPackage initialise_aur_struct (Json.Object json_object) { string installed_version = ""; unowned Alpm.Package? pkg = alpm_handle.localdb.get_pkg (json_object.get_string_member ("Name")); @@ -522,6 +476,7 @@ namespace Pamac { details.conflicts = (owned) conflicts; return details; } +#endif public string[] get_repos_names () { string[] repos_names = {}; @@ -563,7 +518,7 @@ namespace Pamac { unowned Alpm.List groupcache = alpm_handle.localdb.groupcache; while (groupcache != null) { unowned Alpm.Group group = groupcache.data; - if (!(group.name in groups_names)) { + if (!(group.name in groups_names)) { groups_names += group.name; } groupcache.next (); @@ -574,7 +529,7 @@ namespace Pamac { groupcache = db.groupcache; while (groupcache != null) { unowned Alpm.Group group = groupcache.data; - if (!(group.name in groups_names)) { + if (!(group.name in groups_names)) { groups_names += group.name; } groupcache.next (); @@ -867,6 +822,8 @@ namespace Pamac { var infos = initialise_pkg_struct (candidate); infos.installed_version = installed_pkg.version; updates_infos += (owned) infos; +#if DISABLE_AUR +#else } else { if (check_aur_updates && (!aur_updates_checked)) { // check if installed_pkg is a local pkg @@ -883,10 +840,13 @@ namespace Pamac { local_pkgs += installed_pkg.name; } } +#endif } } pkgcache.next (); } +#if DISABLE_AUR +#else if (check_aur_updates) { // get aur updates if (!aur_updates_checked) { @@ -907,15 +867,25 @@ namespace Pamac { get_updates_finished (updates); } } else { +#endif var updates = Updates () { +#if DISABLE_AUR + repos_updates = (owned) updates_infos +#else repos_updates = (owned) updates_infos, aur_updates = {} +#endif }; get_updates_finished (updates); +#if DISABLE_AUR +#else } +#endif return 0; } +#if DISABLE_AUR +#else private AURPackage[] get_aur_updates_infos () { AURPackage[] aur_updates_infos = {}; aur_updates_results.foreach_element ((array, index, node) => { @@ -931,9 +901,14 @@ namespace Pamac { }); return aur_updates_infos; } +#endif +#if DISABLE_AUR + public void start_get_updates () { +#else public void start_get_updates (bool check_aur_updates_) { check_aur_updates = check_aur_updates_; +#endif new Thread ("get updates thread", get_updates); } @@ -945,10 +920,65 @@ namespace Pamac { } } +private int alpm_pkg_compare_name (Alpm.Package pkg_a, Alpm.Package pkg_b) { + return strcmp (pkg_a.name, pkg_b.name); +} + +private string global_search_string; + +private int alpm_pkg_sort_search_by_relevance (Alpm.Package pkg_a, Alpm.Package pkg_b) { + if (global_search_string != null) { + // display exact match first + if (pkg_a.name == global_search_string) { + return 0; + } + if (pkg_b.name == global_search_string) { + return 1; + } + if (pkg_a.name.has_prefix (global_search_string + "-")) { + if (pkg_b.name.has_prefix (global_search_string + "-")) { + return strcmp (pkg_a.name, pkg_b.name); + } + return 0; + } + if (pkg_b.name.has_prefix (global_search_string + "-")) { + if (pkg_a.name.has_prefix (global_search_string + "-")) { + return strcmp (pkg_a.name, pkg_b.name); + } + return 1; + } + if (pkg_a.name.has_prefix (global_search_string)) { + if (pkg_b.name.has_prefix (global_search_string)) { + return strcmp (pkg_a.name, pkg_b.name); + } + return 0; + } + if (pkg_b.name.has_prefix (global_search_string)) { + if (pkg_a.name.has_prefix (global_search_string)) { + return strcmp (pkg_a.name, pkg_b.name); + } + return 1; + } + if (pkg_a.name.contains (global_search_string)) { + if (pkg_b.name.contains (global_search_string)) { + return strcmp (pkg_a.name, pkg_b.name); + } + return 0; + } + if (pkg_b.name.contains (global_search_string)) { + if (pkg_a.name.contains (global_search_string)) { + return strcmp (pkg_a.name, pkg_b.name); + } + return 1; + } + } + return strcmp (pkg_a.name, pkg_b.name); +} + void on_bus_acquired (DBusConnection conn) { user_daemon = new Pamac.UserDaemon (); try { - conn.register_object ("/org/manjaro/pamac/user", user_daemon); + conn.register_object ("/org/pamac/user", user_daemon); } catch (IOError e) { stderr.printf ("Could not register service\n"); @@ -962,7 +992,7 @@ void main () { Intl.textdomain (GETTEXT_PACKAGE); Bus.own_name (BusType.SESSION, - "org.manjaro.pamac.user", + "org.pamac.user", BusNameOwnerFlags.NONE, on_bus_acquired, null, diff --git a/src/pamac_config.vala b/src/pamac_config.vala index b2cee75..8c17b23 100644 --- a/src/pamac_config.vala +++ b/src/pamac_config.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -25,10 +26,13 @@ namespace Pamac { public bool recurse { get; private set; } public uint64 refresh_period { get; private set; } public bool no_update_hide_icon { get; private set; } +#if DISABLE_AUR +#else public bool enable_aur { get; private set; } public bool search_aur { get; private set; } public string aur_build_dir { get; private set; } public bool check_aur_updates { get; private set; } +#endif public unowned HashTable environment_variables { get { return _environment_variables; @@ -70,10 +74,13 @@ namespace Pamac { // set default options recurse = false; no_update_hide_icon = false; +#if DISABLE_AUR +#else enable_aur = false; search_aur = false; aur_build_dir = "/tmp"; check_aur_updates = false; +#endif parse_file (conf_path); } @@ -107,6 +114,8 @@ namespace Pamac { } } else if (key == "NoUpdateHideIcon") { no_update_hide_icon = true; +#if DISABLE_AUR +#else } else if (key == "EnableAUR") { enable_aur = true; } else if (key == "SearchInAURByDefault") { @@ -117,6 +126,7 @@ namespace Pamac { } } else if (key == "CheckAURUpdates") { check_aur_updates = true; +#endif } } } catch (GLib.Error e) { @@ -126,159 +136,5 @@ namespace Pamac { GLib.stderr.printf ("File '%s' doesn't exist.\n", path); } } - - public void write (HashTable new_conf) { - var file = GLib.File.new_for_path (conf_path); - var data = new GLib.List (); - if (file.query_exists ()) { - try { - // Open file for reading and wrap returned FileInputStream into a - // DataInputStream, so we can read line by line - var dis = new DataInputStream (file.read ()); - string? line; - // Read lines until end of file (null) is reached - while ((line = dis.read_line ()) != null) { - if (line.length == 0) { - data.append ("\n"); - continue; - } - unowned Variant variant; - if (line.contains ("RemoveUnrequiredDeps")) { - if (new_conf.lookup_extended ("RemoveUnrequiredDeps", null, out variant)) { - if (variant.get_boolean ()) { - data.append ("RemoveUnrequiredDeps\n"); - } else { - data.append ("#RemoveUnrequiredDeps\n"); - } - new_conf.remove ("RemoveUnrequiredDeps"); - } else { - data.append (line + "\n"); - } - } else if (line.contains ("RefreshPeriod")) { - if (new_conf.lookup_extended ("RefreshPeriod", null, out variant)) { - data.append ("RefreshPeriod = %llu\n".printf (variant.get_uint64 ())); - new_conf.remove ("RefreshPeriod"); - } else { - data.append (line + "\n"); - } - } else if (line.contains ("NoUpdateHideIcon")) { - if (new_conf.lookup_extended ("NoUpdateHideIcon", null, out variant)) { - if (variant.get_boolean ()) { - data.append ("NoUpdateHideIcon\n"); - } else { - data.append ("#NoUpdateHideIcon\n"); - } - new_conf.remove ("NoUpdateHideIcon"); - } else { - data.append (line + "\n"); - } - } else if (line.contains ("EnableAUR")) { - if (new_conf.lookup_extended ("EnableAUR", null, out variant)) { - if (variant.get_boolean ()) { - data.append ("EnableAUR\n"); - } else { - data.append ("#EnableAUR\n"); - } - new_conf.remove ("EnableAUR"); - } else { - data.append (line + "\n"); - } - } else if (line.contains ("SearchInAURByDefault")) { - if (new_conf.lookup_extended ("SearchInAURByDefault", null, out variant)) { - if (variant.get_boolean ()) { - data.append ("SearchInAURByDefault\n"); - } else { - data.append ("#SearchInAURByDefault\n"); - } - new_conf.remove ("SearchInAURByDefault"); - } else { - data.append (line + "\n"); - } - } else if (line.contains ("BuildDirectory")) { - if (new_conf.lookup_extended ("BuildDirectory", null, out variant)) { - data.append ("BuildDirectory = %s\n".printf (variant.get_string ())); - new_conf.remove ("BuildDirectory"); - } else { - data.append (line + "\n"); - } - } else if (line.contains ("CheckAURUpdates")) { - if (new_conf.lookup_extended ("CheckAURUpdates", null, out variant)) { - if (variant.get_boolean ()) { - data.append ("CheckAURUpdates\n"); - } else { - data.append ("#CheckAURUpdates\n"); - } - new_conf.remove ("CheckAURUpdates"); - } else { - data.append (line + "\n"); - } - } else { - data.append (line + "\n"); - } - } - // delete the file before rewrite it - file.delete (); - } catch (GLib.Error e) { - GLib.stderr.printf("%s\n", e.message); - } - } else { - GLib.stderr.printf ("File '%s' doesn't exist.\n", conf_path); - } - // create lines for unexisted options - if (new_conf.size () != 0) { - data.append ("\n"); - var iter = HashTableIter (new_conf); - unowned string key; - unowned Variant val; - while (iter.next (out key, out val)) { - if (key == "RemoveUnrequiredDeps") { - if (val.get_boolean ()) { - data.append ("RemoveUnrequiredDeps\n"); - } else { - data.append ("#RemoveUnrequiredDeps\n"); - } - } else if (key == "RefreshPeriod") { - data.append ("RefreshPeriod = %llu\n".printf (val.get_uint64 ())); - } else if (key =="NoUpdateHideIcon") { - if (val.get_boolean ()) { - data.append ("NoUpdateHideIcon\n"); - } else { - data.append ("#NoUpdateHideIcon\n"); - } - } else if (key == "EnableAUR") { - if (val.get_boolean ()) { - data.append ("EnableAUR\n"); - } else { - data.append ("#EnableAUR\n"); - } - } else if (key == "SearchInAURByDefault") { - if (val.get_boolean ()) { - data.append ("SearchInAURByDefault\n"); - } else { - data.append ("#SearchInAURByDefault\n"); - } - } else if (key == "BuildDirectory") { - data.append ("BuildDirectory = %s\n".printf (val.get_string ())); - } else if (key == "CheckAURUpdates") { - if (val.get_boolean ()) { - data.append ("CheckAURUpdates\n"); - } else { - data.append ("#CheckAURUpdates\n"); - } - } - } - } - // write the file - try { - // creating a DataOutputStream to the file - var dos = new DataOutputStream (file.create (FileCreateFlags.REPLACE_DESTINATION)); - foreach (unowned string new_line in data) { - // writing a short string to the stream - dos.put_string (new_line); - } - } catch (GLib.Error e) { - GLib.stderr.printf("%s\n", e.message); - } - } } } diff --git a/src/preferences_dialog.vala b/src/preferences_dialog.vala index c019de6..a4a4718 100644 --- a/src/preferences_dialog.vala +++ b/src/preferences_dialog.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2015-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -19,7 +20,11 @@ namespace Pamac { - [GtkTemplate (ui = "/org/manjaro/pamac/preferences/preferences_dialog.ui")] +#if DISABLE_AUR + [GtkTemplate (ui = "/org/pamac/preferences/interface/preferences_dialog_no_aur.ui")] +#else + [GtkTemplate (ui = "/org/pamac/preferences/interface/preferences_dialog.ui")] +#endif class PreferencesDialog : Gtk.Dialog { [GtkChild] @@ -46,6 +51,8 @@ namespace Pamac { Gtk.ComboBoxText mirrors_list_generation_method_comboboxtext; [GtkChild] Gtk.Button generate_mirrors_list_button; +#if DISABLE_AUR +#else [GtkChild] Gtk.Switch enable_aur_button; [GtkChild] @@ -56,6 +63,7 @@ namespace Pamac { Gtk.FileChooserButton aur_build_dir_file_chooser; [GtkChild] Gtk.CheckButton check_aur_updates_checkbutton; +#endif [GtkChild] Gtk.Label cache_keep_nb_label; [GtkChild] @@ -74,7 +82,10 @@ namespace Pamac { this.transaction = transaction; refresh_period_label.set_markup (dgettext (null, "How often to check for updates, value in hours") +":"); cache_keep_nb_label.set_markup (dgettext (null, "Number of versions of each package to keep in the cache") +":"); +#if DISABLE_AUR +#else aur_build_dir_label.set_markup (dgettext (null, "Build directory") +":"); +#endif remove_unrequired_deps_button.active = transaction.recurse; check_space_button.active = transaction.get_checkspace (); if (transaction.refresh_period == 0) { @@ -135,6 +146,8 @@ namespace Pamac { transaction.write_mirrors_config_finished.connect (on_write_mirrors_config_finished); } +#if DISABLE_AUR +#else enable_aur_button.active = transaction.enable_aur; search_aur_checkbutton.active = transaction.search_aur; search_aur_checkbutton.sensitive = transaction.enable_aur; @@ -153,6 +166,7 @@ namespace Pamac { search_aur_checkbutton.toggled.connect (on_search_aur_checkbutton_toggled); aur_build_dir_file_chooser.file_set.connect (on_aur_build_dir_set); check_aur_updates_checkbutton.toggled.connect (on_check_aur_updates_checkbutton_toggled); +#endif } bool on_remove_unrequired_deps_button_state_set (bool new_state) { @@ -189,6 +203,8 @@ namespace Pamac { transaction.start_write_pamac_config (new_pamac_conf); } +#if DISABLE_AUR +#else bool on_enable_aur_button_state_set (bool new_state) { var new_pamac_conf = new HashTable (str_hash, str_equal); new_pamac_conf.insert ("EnableAUR", new Variant.boolean (new_state)); @@ -213,9 +229,14 @@ namespace Pamac { new_pamac_conf.insert ("CheckAURUpdates", new Variant.boolean (check_aur_updates_checkbutton.active)); transaction.start_write_pamac_config (new_pamac_conf); } +#endif +#if DISABLE_AUR + void on_write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon) { +#else void on_write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon, bool enable_aur, bool search_aur, string aur_build_dir, bool check_aur_updates) { +#endif remove_unrequired_deps_button.state = recurse; if (refresh_period == 0) { check_updates_button.state = false; @@ -233,6 +254,8 @@ namespace Pamac { ignorepkgs_box.sensitive = true; } no_update_hide_icon_checkbutton.active = no_update_hide_icon; +#if DISABLE_AUR +#else enable_aur_button.state = enable_aur; search_aur_checkbutton.active = search_aur; search_aur_checkbutton.sensitive = enable_aur; @@ -240,6 +263,7 @@ namespace Pamac { aur_build_dir_file_chooser.sensitive = enable_aur; check_aur_updates_checkbutton.active = check_aur_updates; check_aur_updates_checkbutton.sensitive = enable_aur; +#endif } bool on_check_space_button_state_set (bool new_state) { diff --git a/src/progress_box.vala b/src/progress_box.vala index ce402b3..d5c2e8f 100644 --- a/src/progress_box.vala +++ b/src/progress_box.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -17,9 +18,11 @@ * along with this program. If not, see . */ +//using GIO + namespace Pamac { - [GtkTemplate (ui = "/org/manjaro/pamac/transaction/progress_box.ui")] + [GtkTemplate (ui = "/org/pamac/transaction/interface/progress_box.ui")] public class ProgressBox : Gtk.Box { [GtkChild] diff --git a/src/transaction.vala b/src/transaction.vala index 9fbe267..7e3075b 100644 --- a/src/transaction.vala +++ b/src/transaction.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -18,7 +19,7 @@ */ namespace Pamac { - [DBus (name = "org.manjaro.pamac.user")] + [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; @@ -35,21 +36,31 @@ namespace Pamac { 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; +#if DISABLE_AUR +#else public abstract async AURPackage[] search_in_aur (string search_string) throws 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; +#if DISABLE_AUR +#else public abstract async AURPackageDetails get_aur_details (string pkgname) throws IOError; +#endif public abstract string[] get_pkg_uninstalled_optdeps (string pkgname) throws IOError; +#if DISABLE_AUR + public abstract void start_get_updates () throws IOError; +#else public abstract void start_get_updates (bool check_aur_updates) throws IOError; +#endif [DBus (no_reply = true)] public abstract void quit () throws IOError; public signal void get_updates_finished (Updates updates); } - [DBus (name = "org.manjaro.pamac.system")] + [DBus (name = "org.pamac.system")] interface SystemDaemon : Object { public abstract void set_environment_variables (HashTable variables) throws IOError; public abstract string[] get_mirrors_countries () throws IOError; @@ -65,13 +76,21 @@ namespace Pamac { 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; +#if DISABLE_AUR + public abstract void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load) throws IOError; +#else public abstract void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load, string[] to_build) throws 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; +#if DISABLE_AUR + public abstract void start_get_updates () throws IOError; +#else public abstract void start_get_updates (bool check_aur_updates) throws IOError; +#endif [DBus (no_reply = true)] public abstract void quit () throws IOError; public signal void get_updates_finished (Updates updates); @@ -86,8 +105,12 @@ namespace Pamac { public signal void trans_prepare_finished (bool success); public signal void trans_commit_finished (bool success); public signal void get_authorization_finished (bool authorized); +#if DISABLE_AUR + public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon); +#else public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon, bool enable_aur, bool search_aur, string aur_build_dir, bool check_aur_updates); +#endif public signal void write_alpm_config_finished (bool checkspace); public signal void write_mirrors_config_finished (string choosen_country, string choosen_generation_method); public signal void generate_mirrors_list_data (string line); @@ -112,14 +135,17 @@ namespace Pamac { public Mode mode; Pamac.Config pamac_config; +#if DISABLE_AUR +#else public bool check_aur_updates { get { return pamac_config.check_aur_updates; } } public bool enable_aur { get { return pamac_config.enable_aur; } } + public bool search_aur { get { return pamac_config.search_aur; } } + public string aur_build_dir { get { return pamac_config.aur_build_dir; } } +#endif public unowned GLib.HashTable environment_variables { get {return pamac_config.environment_variables; } } public bool no_update_hide_icon { get { return pamac_config.no_update_hide_icon; } } public bool recurse { get { return pamac_config.recurse; } } public uint64 refresh_period { get { return pamac_config.refresh_period; } } - public bool search_aur { get { return pamac_config.search_aur; } } - public string aur_build_dir { get { return pamac_config.aur_build_dir; } } //Alpm.TransFlag int flags; @@ -127,10 +153,16 @@ namespace Pamac { public GenericSet to_install; public GenericSet to_remove; public GenericSet to_load; +#if DISABLE_AUR +#else public GenericSet to_build; +#endif public GenericSet to_update; +#if DISABLE_AUR +#else Queue to_build_queue; string[] aur_pkgs_to_install; +#endif GenericSet previous_to_install; GenericSet previous_to_remove; public GenericSet transaction_summary; @@ -145,8 +177,11 @@ namespace Pamac { bool sysupgrade_after_trans; bool enable_downgrade; bool no_confirm_commit; +#if DISABLE_AUR +#else bool build_after_sysupgrade; bool building; +#endif uint64 previous_xfered; uint64 download_rate; uint64 rates_nb; @@ -159,20 +194,30 @@ namespace Pamac { public ProgressBox progress_box; Vte.Terminal term; Vte.Pty pty; +#if DISABLE_AUR +#else Cancellable build_cancellable; +#endif public Gtk.ScrolledWindow term_window; //parent window public Gtk.ApplicationWindow? application_window { get; private set; } public signal void start_downloading (); public signal void stop_downloading (); +#if DISABLE_AUR +#else public signal void start_building (); public signal void stop_building (); +#endif public signal void important_details_outpout (bool must_show); public signal void finished (bool success); public signal void set_pkgreason_finished (); +#if DISABLE_AUR + public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon); +#else public signal void write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon, bool enable_aur, bool search_aur, string aur_build_dir, bool check_aur_updates); +#endif public signal void write_alpm_config_finished (bool checkspace); public signal void write_mirrors_config_finished (string choosen_country, string choosen_generation_method); public signal void generate_mirrors_list (); @@ -189,9 +234,15 @@ namespace Pamac { to_install = new GenericSet (str_hash, str_equal); to_remove = new GenericSet (str_hash, str_equal); to_load = new GenericSet (str_hash, str_equal); +#if DISABLE_AUR +#else to_build = new GenericSet (str_hash, str_equal); +#endif to_update = new GenericSet (str_hash, str_equal); +#if DISABLE_AUR +#else to_build_queue = new Queue (); +#endif previous_to_install = new GenericSet (str_hash, str_equal); previous_to_remove = new GenericSet (str_hash, str_equal); transaction_summary = new GenericSet (str_hash, str_equal); @@ -224,14 +275,20 @@ namespace Pamac { term_window.visible = true; term_window.propagate_natural_height = true; term_window.add (term); +#if DISABLE_AUR +#else build_cancellable = new Cancellable (); +#endif // progress data previous_textbar = ""; previous_filename = ""; sysupgrade_after_trans = false; no_confirm_commit = false; +#if DISABLE_AUR +#else build_after_sysupgrade = false; building = false; +#endif timer = new Timer (); success = false; warning_textbuffer = new StringBuilder (); @@ -374,6 +431,8 @@ namespace Pamac { } } +#if DISABLE_AUR +#else async int spawn_in_term (string[] args, string? working_directory = null) { SourceFunc callback = spawn_in_term.callback; int status = 1; @@ -403,6 +462,7 @@ namespace Pamac { } return status; } +#endif void reset_progress_box (string action) { show_in_term (action); @@ -649,6 +709,8 @@ namespace Pamac { return pkgs; } +#if DISABLE_AUR +#else public async AURPackage[] search_in_aur (string search_string) { AURPackage[] pkgs = {}; try { @@ -658,6 +720,7 @@ namespace Pamac { } return pkgs; } +#endif public string[] get_repos_names () { string[] repos_names = {}; @@ -738,6 +801,8 @@ namespace Pamac { } } +#if DISABLE_AUR +#else public async AURPackageDetails get_aur_details (string pkgname) { var pkg = AURPackageDetails () { name = "", @@ -754,11 +819,16 @@ namespace Pamac { } return pkg; } +#endif public void start_get_updates () { user_daemon.get_updates_finished.connect (on_get_updates_finished); try { +#if DISABLE_AUR + user_daemon.start_get_updates (); +#else user_daemon.start_get_updates (pamac_config.enable_aur && pamac_config.check_aur_updates); +#endif } catch (IOError e) { stderr.printf ("IOError: %s\n", e.message); success = false; @@ -769,7 +839,11 @@ namespace Pamac { void start_get_updates_for_sysupgrade () { system_daemon.get_updates_finished.connect (on_get_updates_for_sysupgrade_finished); try { +#if DISABLE_AUR + system_daemon.start_get_updates (); +#else system_daemon.start_get_updates (pamac_config.enable_aur && pamac_config.check_aur_updates); +#endif } catch (IOError e) { stderr.printf ("IOError: %s\n", e.message); success = false; @@ -820,6 +894,14 @@ namespace Pamac { // run as a standard transaction run (); } else { +#if DISABLE_AUR + if (updates.repos_updates.length != 0) { + sysupgrade_simple (enable_downgrade); + } else { + finish_transaction (); + stop_progressbar_pulse (); + } +#else if (updates.aur_updates.length != 0) { clear_lists (); foreach (unowned AURPackage infos in updates.aur_updates) { @@ -843,13 +925,17 @@ namespace Pamac { stop_progressbar_pulse (); } } +#endif } } public void clear_lists () { to_install.remove_all (); to_remove.remove_all (); +#if DISABLE_AUR +#else to_build.remove_all (); +#endif to_load.remove_all (); } @@ -858,9 +944,15 @@ namespace Pamac { previous_to_remove.remove_all (); } +#if DISABLE_AUR + void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load) { + try { + system_daemon.start_trans_prepare (transflags, to_install, to_remove, to_load); +#else void start_trans_prepare (int transflags, string[] to_install, string[] to_remove, string[] to_load, string[] to_build) { try { system_daemon.start_trans_prepare (transflags, to_install, to_remove, to_load, to_build); +#endif } catch (IOError e) { stderr.printf ("IOError: %s\n", e.message); stop_progressbar_pulse (); @@ -876,7 +968,10 @@ namespace Pamac { string[] to_install_ = {}; string[] to_remove_ = {}; string[] to_load_ = {}; +#if DISABLE_AUR +#else string[] to_build_ = {}; +#endif foreach (unowned string name in to_install) { to_install_ += name; } @@ -886,12 +981,19 @@ namespace Pamac { foreach (unowned string path in to_load) { to_load_ += path; } +#if DISABLE_AUR +#else foreach (unowned string name in to_build) { to_build_ += name; } +#endif connecting_system_daemon (); connecting_dbus_signals (); +#if DISABLE_AUR + start_trans_prepare (flags, to_install_, to_remove_, to_load_); +#else start_trans_prepare (flags, to_install_, to_remove_, to_load_, to_build_); +#endif } void choose_provider (string depend, string[] providers) { @@ -959,6 +1061,8 @@ namespace Pamac { transaction_sum_dialog.sum_list.get_iter (out iter, new Gtk.TreePath.from_indices (pos)); transaction_sum_dialog.sum_list.set (iter, 0, "%s".printf (dgettext (null, "To remove") + ":")); } +#if DISABLE_AUR +#else if (summary.aur_conflicts_to_remove.length > 0) { // do not add type enum because it is just infos foreach (unowned UpdateInfos infos in summary.aur_conflicts_to_remove) { @@ -972,6 +1076,7 @@ namespace Pamac { transaction_sum_dialog.sum_list.get_iter (out iter, new Gtk.TreePath.from_indices (pos)); transaction_sum_dialog.sum_list.set (iter, 0, "%s".printf (dgettext (null, "To remove") + ":")); } +#endif if (summary.to_downgrade.length > 0) { type |= Type.STANDARD; foreach (unowned UpdateInfos infos in summary.to_downgrade) { @@ -987,6 +1092,8 @@ namespace Pamac { transaction_sum_dialog.sum_list.get_iter (out iter, new Gtk.TreePath.from_indices (pos)); transaction_sum_dialog.sum_list.set (iter, 0, "%s".printf (dgettext (null, "To downgrade") + ":")); } +#if DISABLE_AUR +#else if (summary.to_build.length > 0) { type |= Type.BUILD; // populate build queue @@ -1006,6 +1113,7 @@ namespace Pamac { transaction_sum_dialog.sum_list.get_iter (out iter, new Gtk.TreePath.from_indices (pos)); transaction_sum_dialog.sum_list.set (iter, 0, "%s".printf (dgettext (null, "To build") + ":")); } +#endif if (summary.to_install.length > 0) { type |= Type.STANDARD; foreach (unowned UpdateInfos infos in summary.to_install) { @@ -1070,6 +1178,8 @@ namespace Pamac { } } +#if DISABLE_AUR +#else async void build_aur_packages () { string pkgname = to_build_queue.pop_head (); string action = dgettext (null, "Building %s").printf (pkgname) + "..."; @@ -1143,17 +1253,24 @@ namespace Pamac { finish_transaction (); } } +#endif public void cancel () { +#if DISABLE_AUR +#else if (building) { build_cancellable.cancel (); } else { +#endif try { system_daemon.trans_cancel (); } catch (IOError e) { stderr.printf ("IOError: %s\n", e.message); } +#if DISABLE_AUR +#else } +#endif show_in_term ("\n" + dgettext (null, "Transaction cancelled") + ".\n"); progress_box.action_label.label = ""; warning_textbuffer = new StringBuilder (); @@ -1639,11 +1756,14 @@ namespace Pamac { while (Gtk.events_pending ()) { Gtk.main_iteration (); } +#if DISABLE_AUR +#else if (type == Type.BUILD) { // there only AUR packages to build release (); on_trans_commit_finished (true); } else { +#endif // backup to_install and to_remove foreach (unowned string name in to_install) { previous_to_install.add (name); @@ -1654,7 +1774,10 @@ namespace Pamac { to_install.remove_all (); to_remove.remove_all (); start_commit (); +#if DISABLE_AUR +#else } +#endif } else { transaction_sum_dialog.hide (); unowned string action = dgettext (null, "Transaction cancelled"); @@ -1662,15 +1785,21 @@ namespace Pamac { progress_box.action_label.label = action; release (); transaction_summary.remove_all (); +#if DISABLE_AUR +#else to_build_queue.clear (); +#endif sysupgrade_after_trans = false; success = false; finish_transaction (); } +#if DISABLE_AUR +#else } else if (build_after_sysupgrade) { // there only AUR packages to build release (); on_trans_commit_finished (true); +#endif } else { //var err = ErrorInfos (); //err.message = dgettext (null, "Nothing to do") + "\n"; @@ -1694,6 +1823,8 @@ namespace Pamac { if (success) { show_warnings (); to_load.remove_all (); +#if DISABLE_AUR +#else if (to_build_queue.get_length () != 0) { show_in_term (""); clear_previous_lists (); @@ -1707,22 +1838,29 @@ namespace Pamac { } }); } else { +#endif clear_previous_lists (); if (sysupgrade_after_trans) { sysupgrade_after_trans = false; sysupgrade (false); +#if DISABLE_AUR +#else } else if (build_after_sysupgrade) { build_after_sysupgrade = false; disconnecting_dbus_signals (); // build aur updates in to_build run (); +#endif } else { unowned string action = dgettext (null, "Transaction successfully finished"); show_in_term (action + ".\n"); progress_box.action_label.label = action; finish_transaction (); } +#if DISABLE_AUR +#else } +#endif } else { // if it is an authentication or a download error, database was not modified var err = get_current_error (); @@ -1739,7 +1877,10 @@ namespace Pamac { to_load.remove_all (); } clear_previous_lists (); +#if DISABLE_AUR +#else to_build_queue.clear (); +#endif warning_textbuffer = new StringBuilder (); handle_error (err); } @@ -1753,16 +1894,24 @@ namespace Pamac { set_pkgreason_finished (); } +#if DISABLE_AUR + void on_write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon) { +#else void on_write_pamac_config_finished (bool recurse, uint64 refresh_period, bool no_update_hide_icon, bool enable_aur, bool search_aur, string aur_build_dir, bool check_aur_updates) { +#endif system_daemon.write_pamac_config_finished.disconnect (on_write_pamac_config_finished); pamac_config.reload (); flags = (1 << 4); //Alpm.TransFlag.CASCADE if (pamac_config.recurse) { flags |= (1 << 5); //Alpm.TransFlag.RECURSE } +#if DISABLE_AUR + write_pamac_config_finished (recurse, refresh_period, no_update_hide_icon); +#else write_pamac_config_finished (recurse, refresh_period, no_update_hide_icon, enable_aur, search_aur, aur_build_dir, check_aur_updates); +#endif } void on_write_alpm_config_finished (bool checkspace) { @@ -1789,7 +1938,7 @@ namespace Pamac { void connecting_user_daemon () { try { - user_daemon = Bus.get_proxy_sync (BusType.SESSION, "org.manjaro.pamac.user", "/org/manjaro/pamac/user"); + user_daemon = Bus.get_proxy_sync (BusType.SESSION, "org.pamac.user", "/org/pamac/user"); } catch (IOError e) { stderr.printf ("IOError: %s\n", e.message); } @@ -1797,7 +1946,7 @@ namespace Pamac { void connecting_system_daemon () { try { - system_daemon = Bus.get_proxy_sync (BusType.SYSTEM, "org.manjaro.pamac.system", "/org/manjaro/pamac/system"); + system_daemon = Bus.get_proxy_sync (BusType.SYSTEM, "org.pamac.system", "/org/pamac/system"); // Set environment variables system_daemon.set_environment_variables (pamac_config.environment_variables); } catch (IOError e) { diff --git a/src/transaction_sum_dialog.vala b/src/transaction_sum_dialog.vala index 8a4c772..bf2088a 100644 --- a/src/transaction_sum_dialog.vala +++ b/src/transaction_sum_dialog.vala @@ -1,6 +1,7 @@ /* * pamac-vala * + * Copyright (C) 2017 Chris Cromer * Copyright (C) 2014-2017 Guillaume Benoit * * This program is free software; you can redistribute it and/or modify @@ -17,9 +18,11 @@ * along with this program. If not, see . */ +//using GIO + namespace Pamac { - [GtkTemplate (ui = "/org/manjaro/pamac/transaction/transaction_sum_dialog.ui")] + [GtkTemplate (ui = "/org/pamac/transaction/interface/transaction_sum_dialog.ui")] class TransactionSumDialog : Gtk.Dialog { [GtkChild] diff --git a/src/vapis/CMakeLists.txt b/src/vapis/CMakeLists.txt new file mode 100644 index 0000000..b099c9c --- /dev/null +++ b/src/vapis/CMakeLists.txt @@ -0,0 +1,3 @@ +### CMakeLists automatically created with AutoVala +### Do not edit + diff --git a/vapi/appstream-glib.vapi b/src/vapis/appstream-glib.vapi similarity index 100% rename from vapi/appstream-glib.vapi rename to src/vapis/appstream-glib.vapi diff --git a/vapi/libalpm.vapi b/src/vapis/libalpm.vapi similarity index 100% rename from vapi/libalpm.vapi rename to src/vapis/libalpm.vapi diff --git a/vapi/libcurl.vapi b/src/vapis/libcurl.vapi similarity index 100% rename from vapi/libcurl.vapi rename to src/vapis/libcurl.vapi diff --git a/vapi/polkit-gobject-1.vapi b/src/vapis/polkit-gobject-1.vapi similarity index 100% rename from vapi/polkit-gobject-1.vapi rename to src/vapis/polkit-gobject-1.vapi diff --git a/util/alpm-util.c b/util/alpm-util.c deleted file mode 100644 index ec9a5c0..0000000 --- a/util/alpm-util.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "alpm-util.h" - -alpm_pkg_t* alpm_pkg_load_file (alpm_handle_t* handle, const char* filename, int full, alpm_siglevel_t level) { - alpm_pkg_t* p; - if (alpm_pkg_load(handle, filename, full, level, &p) != -1) { - return p; - } else { - return NULL; - } -} - -alpm_list_t* alpm_pkg_get_files_list (alpm_pkg_t* pkg) { - alpm_list_t* list = NULL; - alpm_filelist_t* pkgfiles; - size_t i; - - pkgfiles = alpm_pkg_get_files(pkg); - - for(i = 0; i < pkgfiles->count; i++) { - const alpm_file_t* file = pkgfiles->files + i; - list = alpm_list_add(list, file); - } - return list; -} - -void* alpm_list_get_data (alpm_list_t* list) { - if (list) { - return list->data; - } else { - return NULL; - } -} - -alpm_list_t* alpm_list_sort (alpm_list_t* list, alpm_list_fn_cmp fn) { - list = alpm_list_msort (list, alpm_list_count (list), fn); - return list; -} - -alpm_list_t* alpm_list_new () { - return NULL; -} - -void alpm_list_free_data (alpm_list_t* list) { - alpm_list_free_inner (list, free); -} - -void alpm_list_iterator (alpm_list_t* list, alpm_list_iterator_t* iter) { - iter->pos = list; -} - -void* alpm_list_iterator_next_value (alpm_list_iterator_t* iter) { - if (iter->pos) { - void* data = alpm_list_get_data (iter->pos); - iter->pos = alpm_list_next (iter->pos); - return data; - } else { - return NULL; - } -} diff --git a/util/alpm-util.h b/util/alpm-util.h deleted file mode 100644 index 7cebc82..0000000 --- a/util/alpm-util.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef ALPM_UTIL_H -#define ALPM_UTIL_H - -#include - -typedef struct __alpm_list_iterator_t { - alpm_list_t* pos; -} alpm_list_iterator_t; - -void* alpm_list_get_data (alpm_list_t* list); -alpm_list_t* alpm_list_sort (alpm_list_t* list, alpm_list_fn_cmp fn); -alpm_list_t* alpm_list_new (); -void alpm_list_free_data (alpm_list_t* list); -void alpm_list_iterator (alpm_list_t* list, alpm_list_iterator_t* i); -void* alpm_list_iterator_next_value (alpm_list_iterator_t* iter); - -alpm_pkg_t* alpm_pkg_load_file (alpm_handle_t* handle, const char* filename, int full, alpm_siglevel_t level); -alpm_list_t* alpm_pkg_get_files_list (alpm_pkg_t* pkg); - -#endif //!ALPM_UTIL_H