From 6df007636e2f6b3ff00df9aba70fd1aedb71764d Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 16 Feb 2018 15:43:03 -0300 Subject: [PATCH] fix #18 --- data/polkit/org.pamac.policy | 2 +- pamac.avprj | 16 ++++++++-------- po/LINGUAS | 2 +- po/meson.build | 2 +- po/pamac.pot | 2 +- src/CMakeLists.txt | 6 +++--- src/meson.build | 6 +++--- src/pamac-clean-cache/CMakeLists.txt | 4 ++-- src/pamac-clean-cache/meson.build | 2 +- src/pamac-install/CMakeLists.txt | 4 ++-- src/pamac-install/meson.build | 2 +- src/pamac-manager/CMakeLists.txt | 4 ++-- src/pamac-manager/manager_window.vala | 10 ++++++++-- src/pamac-manager/meson.build | 2 +- src/pamac-system-daemon/CMakeLists.txt | 4 ++-- src/pamac-system-daemon/meson.build | 2 +- src/pamac-tray/CMakeLists.txt | 4 ++-- src/pamac-tray/meson.build | 2 +- src/pamac-user-daemon/CMakeLists.txt | 4 ++-- src/pamac-user-daemon/meson.build | 2 +- src/pamacclassic.pc | 2 +- 21 files changed, 45 insertions(+), 39 deletions(-) diff --git a/data/polkit/org.pamac.policy b/data/polkit/org.pamac.policy index f1137fd..45093a7 100644 --- a/data/polkit/org.pamac.policy +++ b/data/polkit/org.pamac.policy @@ -6,6 +6,7 @@ package-x-generic Authentication is required + Se necesita autenticación Kimlik tələb olunur Membutuhkan Otentifikasi Authenticatie vereist @@ -44,7 +45,6 @@ Απαιτείται πιστοποίηση Authentification nécessaire Autentifikacija je neophodna - Se necesita autenticación Zahtevana je overitev 需要授權 A autenticación é necesaria diff --git a/pamac.avprj b/pamac.avprj index 0be50a4..decb129 100644 --- a/pamac.avprj +++ b/pamac.avprj @@ -1,7 +1,7 @@ ### AutoVala Project ### autovala_version: 27 project_name: pamac -project_version: 6.6.3 +project_version: 6.6.4 vala_version: 0.38 custom: data/systemd/pamac-system.service /usr/lib/systemd/system @@ -22,7 +22,7 @@ define: KDE_TRAY vapidir: src/vapis vala_binary: src/pamac-clean-cache/pamac-clean-cache -*version: 6.6.3 +*version: 6.6.4 vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 @@ -33,7 +33,7 @@ vala_check_package: json-glib-1.0 *vala_source: pamac_config.vala vala_binary: src/pamac-install/pamac-install -*version: 6.6.3 +*version: 6.6.4 use_gresource: pamac_installer_gresource_xml vala_local_package: pamacclassic vala_check_package: gtk+-3.0 @@ -45,7 +45,7 @@ vala_check_package: json-glib-1.0 *vala_source: progress_dialog.vala vala_binary: src/pamac-manager/pamac-manager -*version: 6.6.3 +*version: 6.6.4 alias: pamac-updater use_gresource: pamac_manager_gresource_xml vala_local_package: pamacclassic @@ -59,7 +59,7 @@ vala_check_package: json-glib-1.0 *vala_source: manager_window.vala vala_binary: src/pamac-system-daemon/pamac-system-daemon -*version: 6.6.3 +*version: 6.6.4 vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 @@ -77,7 +77,7 @@ vala_check_package: polkit-gobject-1 *vala_source: system_daemon.vala vala_binary: src/pamac-tray/pamac-tray -*version: 6.6.3 +*version: 6.6.4 vala_local_package: pamacclassic vala_package: posix vala_check_package: json-glib-1.0 @@ -101,7 +101,7 @@ end *vala_source: tray.vala vala_binary: src/pamac-user-daemon/pamac-user-daemon -*version: 6.6.3 +*version: 6.6.4 vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 @@ -117,7 +117,7 @@ vala_check_package: libsoup-2.4 vala_library: src/pamac-classic -*version: 6.6.3 +*version: 6.6.4 namespace: pamacclassic use_gresource: pamac_transaction_gresource_xml vala_package: posix diff --git a/po/LINGUAS b/po/LINGUAS index e14069b..9936470 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -af ar es_ES nn sl_SI cs_CZ is gl be sr_RS zh_TW pl_PL uz fi is_IS sr_RS@latin sl es sr@latin fr ro sr el eu ml ur_PK ko el_GR de_DE cs bs si zh da ca_ES sv it_IT vi eo es_AR zh_CN pl hi pt en_GB es_419 es_MX fa nl hu bn hr_HR nb ja pt_BR pt_PT nl_BE ca tr he hi_IN et lt fo it fa_IR de_CH de ka bs_BA ru ms sk bg ast uk hr es_SV nl_NL cy id az_AZ +af ar es_ES nn sl_SI cs_CZ is gl be sr_RS zh_TW pl_PL uz fi is_IS sr_RS@latin sl sr@latin fr ro sr el eu ml ur_PK ko el_GR de_DE cs bs si zh da ca_ES sv it_IT vi eo es_AR zh_CN pl hi pt en_GB es_419 es_MX fa nl hu bn hr_HR nb ja pt_BR pt_PT nl_BE ca tr he hi_IN et lt fo it fa_IR de_CH de ka bs_BA ru ms sk bg ast uk hr es_SV nl_NL cy id az_AZ es diff --git a/po/meson.build b/po/meson.build index 3fe769a..d815d2c 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,2 +1,2 @@ i18n = import('i18n') -i18n.gettext('pamac', languages: ['af', 'ar', 'es_ES', 'nn', 'sl_SI', 'cs_CZ', 'is', 'gl', 'be', 'sr_RS', 'zh_TW', 'pl_PL', 'uz', 'fi', 'is_IS', 'sr_RS@latin', 'sl', 'es', 'sr@latin', 'fr', 'ro', 'sr', 'el', 'eu', 'ml', 'ur_PK', 'ko', 'el_GR', 'de_DE', 'cs', 'bs', 'si', 'zh', 'da', 'ca_ES', 'sv', 'it_IT', 'vi', 'eo', 'es_AR', 'zh_CN', 'pl', 'hi', 'pt', 'en_GB', 'es_419', 'es_MX', 'fa', 'nl', 'hu', 'bn', 'hr_HR', 'nb', 'ja', 'pt_BR', 'pt_PT', 'nl_BE', 'ca', 'tr', 'he', 'hi_IN', 'et', 'lt', 'fo', 'it', 'fa_IR', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ']) +i18n.gettext('pamac', languages: ['af', 'ar', 'es_ES', 'nn', 'sl_SI', 'cs_CZ', 'is', 'gl', 'be', 'sr_RS', 'zh_TW', 'pl_PL', 'uz', 'fi', 'is_IS', 'sr_RS@latin', 'sl', 'sr@latin', 'fr', 'ro', 'sr', 'el', 'eu', 'ml', 'ur_PK', 'ko', 'el_GR', 'de_DE', 'cs', 'bs', 'si', 'zh', 'da', 'ca_ES', 'sv', 'it_IT', 'vi', 'eo', 'es_AR', 'zh_CN', 'pl', 'hi', 'pt', 'en_GB', 'es_419', 'es_MX', 'fa', 'nl', 'hu', 'bn', 'hr_HR', 'nb', 'ja', 'pt_BR', 'pt_PT', 'nl_BE', 'ca', 'tr', 'he', 'hi_IN', 'et', 'lt', 'fo', 'it', 'fa_IR', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ', 'es']) diff --git a/po/pamac.pot b/po/pamac.pot index 1e5b2e7..701670f 100644 --- a/po/pamac.pot +++ b/po/pamac.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pamac\n" "Report-Msgid-Bugs-To: cromer@cromnix.org\n" -"POT-Creation-Date: 2017-11-16 21:42-0300\n" +"POT-Creation-Date: 2018-02-16 15:41-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a3408bd..b307f92 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.3") +set (VERSION "6.6.4") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") @@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.pc ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.deps ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps) -set (VERSION "6.6.3") +set (VERSION "6.6.4") add_definitions (${DEPS_CFLAGS}) link_libraries ( ${DEPS_LIBRARIES} ) link_directories ( ${DEPS_LIBRARY_DIRS} ) @@ -101,7 +101,7 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} ) target_link_libraries( pamacclassic m ) set_target_properties( pamacclassic PROPERTIES VERSION - 6.6.3 + 6.6.4 SOVERSION 6 ) diff --git a/src/meson.build b/src/meson.build index 09dbdb4..6c710bc 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,7 @@ cfg_pamac_classic.set('PKGDATADIR', join_paths(get_option('prefix'),get_option(' cfg_pamac_classic.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_classic.set('RELEASE_NAME', 'pamac') cfg_pamac_classic.set('PREFIX', get_option('prefix')) -cfg_pamac_classic.set('VERSION', '6.6.3') +cfg_pamac_classic.set('VERSION', '6.6.4') cfg_pamac_classic.set('TESTSRCDIR', meson.source_root()) cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic) @@ -59,7 +59,7 @@ pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : fals pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir'] -pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,version: '6.6.3',soversion: '6',install: true) +pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,version: '6.6.4',soversion: '6',install: true) pamac_classic_requires = [] pamac_classic_requires += ['gdk-3.0'] @@ -74,7 +74,7 @@ pamac_classic_requires += ['glib-2.0'] pamac_classic_requires += ['gobject-2.0'] pkg_mod = import('pkgconfig') pkg_mod.generate(libraries : pamacclassic_library, - version : '6.6.3', + version : '6.6.4', name : 'pamacclassic', filebase : 'pamacclassic', description : 'pamacclassic', diff --git a/src/pamac-clean-cache/CMakeLists.txt b/src/pamac-clean-cache/CMakeLists.txt index 8a2a347..9015411 100644 --- a/src/pamac-clean-cache/CMakeLists.txt +++ b/src/pamac-clean-cache/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.3") +set (VERSION "6.6.4") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.6.3") +set (VERSION "6.6.4") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-clean-cache/meson.build b/src/pamac-clean-cache/meson.build index 5aa1061..cb42e6a 100644 --- a/src/pamac-clean-cache/meson.build +++ b/src/pamac-clean-cache/meson.build @@ -4,7 +4,7 @@ cfg_pamac_clean_cache.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti cfg_pamac_clean_cache.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac') cfg_pamac_clean_cache.set('PREFIX', get_option('prefix')) -cfg_pamac_clean_cache.set('VERSION', '6.6.3') +cfg_pamac_clean_cache.set('VERSION', '6.6.4') cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root()) cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache) diff --git a/src/pamac-install/CMakeLists.txt b/src/pamac-install/CMakeLists.txt index 4bf3181..b9a1dd7 100644 --- a/src/pamac-install/CMakeLists.txt +++ b/src/pamac-install/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.3") +set (VERSION "6.6.4") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.6.3") +set (VERSION "6.6.4") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-install/meson.build b/src/pamac-install/meson.build index 505c1da..edd3f4c 100644 --- a/src/pamac-install/meson.build +++ b/src/pamac-install/meson.build @@ -4,7 +4,7 @@ cfg_pamac_install.set('PKGDATADIR', join_paths(get_option('prefix'),get_option(' cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_install.set('RELEASE_NAME', 'pamac') cfg_pamac_install.set('PREFIX', get_option('prefix')) -cfg_pamac_install.set('VERSION', '6.6.3') +cfg_pamac_install.set('VERSION', '6.6.4') cfg_pamac_install.set('TESTSRCDIR', meson.source_root()) cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install) diff --git a/src/pamac-manager/CMakeLists.txt b/src/pamac-manager/CMakeLists.txt index dc146e0..c8790c5 100644 --- a/src/pamac-manager/CMakeLists.txt +++ b/src/pamac-manager/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.3") +set (VERSION "6.6.4") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.6.3") +set (VERSION "6.6.4") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-manager/manager_window.vala b/src/pamac-manager/manager_window.vala index d738fd3..7f5eb36 100644 --- a/src/pamac-manager/manager_window.vala +++ b/src/pamac-manager/manager_window.vala @@ -1580,13 +1580,19 @@ namespace Pamac { if (pkg.name != "") { selected_pkgs.append (pkgname); // there is for sure a pkg to remove - remove_item.sensitive = true; + if (filters_stack.visible_child_name == "search" + && !transaction.to_remove.contains (pkgname) + && !transaction.to_build.contains (pkgname) + && !transaction.to_update.contains (pkgname)) { + remove_item.sensitive = true; + } } else { selected_aur.append (pkgname); } } foreach (unowned string pkgname in selected_aur) { - if (transaction.to_build.contains (pkgname)) { + if (transaction.to_remove.contains (pkgname) + || transaction.to_build.contains (pkgname)) { deselect_item.sensitive = true; } else { install_item.sensitive = true; diff --git a/src/pamac-manager/meson.build b/src/pamac-manager/meson.build index e5293a9..2b7dc75 100644 --- a/src/pamac-manager/meson.build +++ b/src/pamac-manager/meson.build @@ -4,7 +4,7 @@ cfg_pamac_manager.set('PKGDATADIR', join_paths(get_option('prefix'),get_option(' cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_manager.set('RELEASE_NAME', 'pamac') cfg_pamac_manager.set('PREFIX', get_option('prefix')) -cfg_pamac_manager.set('VERSION', '6.6.3') +cfg_pamac_manager.set('VERSION', '6.6.4') cfg_pamac_manager.set('TESTSRCDIR', meson.source_root()) cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager) diff --git a/src/pamac-system-daemon/CMakeLists.txt b/src/pamac-system-daemon/CMakeLists.txt index 9eee140..72c23ee 100644 --- a/src/pamac-system-daemon/CMakeLists.txt +++ b/src/pamac-system-daemon/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.3") +set (VERSION "6.6.4") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.6.3") +set (VERSION "6.6.4") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-system-daemon/meson.build b/src/pamac-system-daemon/meson.build index 27545e3..8aed5fe 100644 --- a/src/pamac-system-daemon/meson.build +++ b/src/pamac-system-daemon/meson.build @@ -4,7 +4,7 @@ cfg_pamac_system_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_op cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac') cfg_pamac_system_daemon.set('PREFIX', get_option('prefix')) -cfg_pamac_system_daemon.set('VERSION', '6.6.3') +cfg_pamac_system_daemon.set('VERSION', '6.6.4') cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon) diff --git a/src/pamac-tray/CMakeLists.txt b/src/pamac-tray/CMakeLists.txt index ac566bf..4ea52f1 100644 --- a/src/pamac-tray/CMakeLists.txt +++ b/src/pamac-tray/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.3") +set (VERSION "6.6.4") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.6.3") +set (VERSION "6.6.4") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-tray/meson.build b/src/pamac-tray/meson.build index 1c220aa..24c7375 100644 --- a/src/pamac-tray/meson.build +++ b/src/pamac-tray/meson.build @@ -4,7 +4,7 @@ cfg_pamac_tray.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('dat cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_tray.set('RELEASE_NAME', 'pamac') cfg_pamac_tray.set('PREFIX', get_option('prefix')) -cfg_pamac_tray.set('VERSION', '6.6.3') +cfg_pamac_tray.set('VERSION', '6.6.4') cfg_pamac_tray.set('TESTSRCDIR', meson.source_root()) cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray) diff --git a/src/pamac-user-daemon/CMakeLists.txt b/src/pamac-user-daemon/CMakeLists.txt index d2d256c..6588912 100644 --- a/src/pamac-user-daemon/CMakeLists.txt +++ b/src/pamac-user-daemon/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.6.3") +set (VERSION "6.6.4") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.6.3") +set (VERSION "6.6.4") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-user-daemon/meson.build b/src/pamac-user-daemon/meson.build index 4aa73e1..4df9e53 100644 --- a/src/pamac-user-daemon/meson.build +++ b/src/pamac-user-daemon/meson.build @@ -4,7 +4,7 @@ cfg_pamac_user_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac') cfg_pamac_user_daemon.set('PREFIX', get_option('prefix')) -cfg_pamac_user_daemon.set('VERSION', '6.6.3') +cfg_pamac_user_daemon.set('VERSION', '6.6.4') cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon) diff --git a/src/pamacclassic.pc b/src/pamacclassic.pc index 5765410..6617903 100644 --- a/src/pamacclassic.pc +++ b/src/pamacclassic.pc @@ -4,7 +4,7 @@ includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR} Name: pamacclassic Description: pamacclassic -Version: 6.6.3 +Version: 6.6.4 Libs: -L@DOLLAR@{libdir} -lpamacclassic Cflags: -I@DOLLAR@{includedir} Requires: gdk-3.0 gtk+-3.0 json-glib-1.0 libalpm libnotify libsoup-2.4 vte-2.91 gio-2.0 glib-2.0 gobject-2.0