Browse Source

fix build under cmake

tags/v6.7.2
Chris Cromer 1 year ago
parent
commit
2e516f79eb
Signed by: cromer GPG Key ID: 39CC813FF3C8708A
18 changed files with 67 additions and 67 deletions
  1. +32
    -32
      data/polkit/org.pamac.policy
  2. +8
    -8
      pamac.avprj
  3. +1
    -1
      po/pamac.pot
  4. +4
    -4
      src/CMakeLists.txt
  5. +3
    -3
      src/meson.build
  6. +2
    -2
      src/pamac-clean-cache/CMakeLists.txt
  7. +1
    -1
      src/pamac-clean-cache/meson.build
  8. +2
    -2
      src/pamac-install/CMakeLists.txt
  9. +1
    -1
      src/pamac-install/meson.build
  10. +2
    -2
      src/pamac-manager/CMakeLists.txt
  11. +1
    -1
      src/pamac-manager/meson.build
  12. +2
    -2
      src/pamac-system-daemon/CMakeLists.txt
  13. +1
    -1
      src/pamac-system-daemon/meson.build
  14. +2
    -2
      src/pamac-tray/CMakeLists.txt
  15. +1
    -1
      src/pamac-tray/meson.build
  16. +2
    -2
      src/pamac-user-daemon/CMakeLists.txt
  17. +1
    -1
      src/pamac-user-daemon/meson.build
  18. +1
    -1
      src/pamacclassic.pc

+ 32
- 32
data/polkit/org.pamac.policy View File

@@ -6,49 +6,49 @@
<icon_name>package-x-generic</icon_name>
<action id="org.pamac.commit">
<message>Authentication is required</message>
<message xml:lang="es">Se necesita autenticación</message>
<message xml:lang="az_AZ">Kimlik tələb olunur</message>
<message xml:lang="id">Membutuhkan Otentifikasi</message>
<message xml:lang="nl_NL">Authenticatie vereist</message>
<message xml:lang="hr">Potrebna je autorizacija</message>
<message xml:lang="zh_TW">需要授權</message>
<message xml:lang="zh_CN">需要验证</message>
<message xml:lang="uk">Потрібна авторизація</message>
<message xml:lang="ast">Ríquese l'autenticación</message>
<message xml:lang="bg">Изисква се идентификация</message>
<message xml:lang="tr">Kimlik doğrulaması gerekli</message>
<message xml:lang="sv">Autentisering krävs</message>
<message xml:lang="sr@latin">Autentifikacija je neophodna</message>
<message xml:lang="sl">Zahtevana je overitev</message>
<message xml:lang="sk">Vyžaduje sa overenie totožnosti</message>
<message xml:lang="ru">Запрошена авторизация</message>
<message xml:lang="de">Authentifizierung erforderlich</message>
<message xml:lang="fa_IR">تائید هویت شکست خورد</message>
<message xml:lang="it">Autenticazione richiesta</message>
<message xml:lang="lt">Reikalingas tapatybės nustatymas</message>
<message xml:lang="he">נדרש אישור</message>
<message xml:lang="tr">Kimlik doğrulaması gerekli</message>
<message xml:lang="ca">Cal autenticació</message>
<message xml:lang="pt_PT">Autenticação necessária</message>
<message xml:lang="pt_BR">Autenticação necessária</message>
<message xml:lang="ja">認証が必要です</message>
<message xml:lang="pt">Autenticação necessária</message>
<message xml:lang="pl">Wymagane jest uwierzytelnienie</message>
<message xml:lang="nl_NL">Authenticatie vereist</message>
<message xml:lang="nl">Verificatie vereist</message>
<message xml:lang="nb">Autentisering kreves</message>
<message xml:lang="lt">Reikalingas tapatybės nustatymas</message>
<message xml:lang="ko">인증이 필요합니다</message>
<message xml:lang="ja">認証が必要です</message>
<message xml:lang="it">Autenticazione richiesta</message>
<message xml:lang="is">Auðkenningar er krafist</message>
<message xml:lang="id">Membutuhkan Otentifikasi</message>
<message xml:lang="hu">Hitelesítés szükséges</message>
<message xml:lang="nl">Verificatie vereist</message>
<message xml:lang="hr">Potrebna je autorizacija</message>
<message xml:lang="hi">प्रमाणीकरण की आवश्यकता है</message>
<message xml:lang="he">נדרש אישור</message>
<message xml:lang="gl">A autenticación é necesaria</message>
<message xml:lang="fr">Authentification nécessaire</message>
<message xml:lang="fa_IR">تائید هویت شکست خورد</message>
<message xml:lang="eu">Autentifikazioa behar da</message>
<message xml:lang="es_MX">Se requiere autenticación</message>
<message xml:lang="es_419">Se requiere autenticación</message>
<message xml:lang="pt">Autenticação necessária</message>
<message xml:lang="hi">प्रमाणीकरण की आवश्यकता है</message>
<message xml:lang="pl">Wymagane jest uwierzytelnienie</message>
<message xml:lang="zh_CN">需要验证</message>
<message xml:lang="sv">Autentisering krävs</message>
<message xml:lang="ca_ES">Cal autenticació</message>
<message xml:lang="da">Godkendelse er påkrævet</message>
<message xml:lang="cs">Je vyžadováno ověření</message>
<message xml:lang="es">Se necesita autenticación</message>
<message xml:lang="el_GR">Απαιτείται πιστοποίηση</message>
<message xml:lang="ko">인증이 필요합니다</message>
<message xml:lang="eu">Autentifikazioa behar da</message>
<message xml:lang="el">Απαιτείται πιστοποίηση</message>
<message xml:lang="fr">Authentification nécessaire</message>
<message xml:lang="sr@latin">Autentifikacija je neophodna</message>
<message xml:lang="sl">Zahtevana je overitev</message>
<message xml:lang="zh_TW">需要授權</message>
<message xml:lang="gl">A autenticación é necesaria</message>
<message xml:lang="is">Auðkenningar er krafist</message>
<message xml:lang="de">Authentifizierung erforderlich</message>
<message xml:lang="da">Godkendelse er påkrævet</message>
<message xml:lang="cs">Je vyžadováno ověření</message>
<message xml:lang="ca_ES">Cal autenticació</message>
<message xml:lang="ca">Cal autenticació</message>
<message xml:lang="bg">Изисква се идентификация</message>
<message xml:lang="az_AZ">Kimlik tələb olunur</message>
<message xml:lang="ast">Ríquese l'autenticación</message>
<message xml:lang="ar">صلاحيات مطلوبة</message>
<defaults>
<allow_any>no</allow_any>


+ 8
- 8
pamac.avprj View File

@@ -1,7 +1,7 @@
### AutoVala Project ###
autovala_version: 30
project_name: pamac
project_version: 6.7.1
project_version: 6.7.2
vala_version: 0.38

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

vala_binary: src/pamac-clean-cache/pamac-clean-cache
*version: 6.7.1
*version: 6.7.2
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: gtk+-3.0
@@ -33,7 +33,7 @@ vala_check_package: json-glib-1.0
*vala_source: pamac_config.vala

vala_binary: src/pamac-install/pamac-install
*version: 6.7.1
*version: 6.7.2
use_gresource: pamac_installer_gresource_xml
vala_local_package: pamacclassic
vala_check_package: gtk+-3.0
@@ -45,7 +45,7 @@ vala_check_package: json-glib-1.0
*vala_source: progress_dialog.vala

vala_binary: src/pamac-manager/pamac-manager
*version: 6.7.1
*version: 6.7.2
alias: pamac-updater
use_gresource: pamac_manager_gresource_xml
vala_local_package: pamacclassic
@@ -59,7 +59,7 @@ vala_check_package: json-glib-1.0
*vala_source: manager_window.vala

vala_binary: src/pamac-system-daemon/pamac-system-daemon
*version: 6.7.1
*version: 6.7.2
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: gtk+-3.0
@@ -77,7 +77,7 @@ vala_check_package: polkit-gobject-1
*vala_source: system_daemon.vala

vala_binary: src/pamac-tray/pamac-tray
*version: 6.7.1
*version: 6.7.2
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: json-glib-1.0
@@ -101,7 +101,7 @@ end
*vala_source: tray.vala

vala_binary: src/pamac-user-daemon/pamac-user-daemon
*version: 6.7.1
*version: 6.7.2
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: gtk+-3.0
@@ -117,7 +117,7 @@ vala_check_package: libsoup-2.4


vala_library: src/pamac-classic
*version: 6.7.1
*version: 6.7.2
namespace: pamacclassic
use_gresource: pamac_transaction_gresource_xml
vala_package: posix


+ 1
- 1
po/pamac.pot View File

@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Pamac\n"
"Report-Msgid-Bugs-To: cromer@cromnix.org\n"
"POT-Creation-Date: 2019-06-29 12:05-0400\n"
"POT-Creation-Date: 2019-06-29 12:27-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"


+ 4
- 4
src/CMakeLists.txt View File

@@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.7.1")
set (VERSION "6.7.2")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

@@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.pc ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.deps ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps)
set (VERSION "6.7.1")
set (VERSION "6.7.2")
add_definitions (${DEPS_CFLAGS})
link_libraries ( ${DEPS_LIBRARIES} )
link_directories ( ${DEPS_LIBRARY_DIRS} )
@@ -78,7 +78,7 @@ if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "Rel
set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g")
endif()

set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic --gir pamacclassic-1.0.gir )
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic )
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction.gresource.xml )

vala_precompile(VALA_C pamacclassic
@@ -101,7 +101,7 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
target_link_libraries( pamacclassic m )
set_target_properties( pamacclassic PROPERTIES
VERSION
6.7.1
6.7.2
SOVERSION
6 )



+ 3
- 3
src/meson.build View File

@@ -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.7.1')
cfg_pamac_classic.set('VERSION', '6.7.2')
cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())

cfgfile_1 = configure_file(
@@ -66,7 +66,7 @@ pamacclassic_library = shared_library('pamacclassic', pamac_classic_sources,
vala_args: pamac_classic_vala_args,
c_args: pamac_classic_c_args,
link_args: pamac_classic_link_args,
version: '6.7.1',
version: '6.7.2',
soversion: '6',
install: true,
install_dir: [true, true, true])
@@ -84,7 +84,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.7.1',
version : '6.7.2',
name : 'pamacclassic',
filebase : 'pamacclassic',
description : 'pamacclassic',


+ 2
- 2
src/pamac-clean-cache/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.7.1")
set (VERSION "6.7.2")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.7.1")
set (VERSION "6.7.2")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )


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

@@ -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.7.1')
cfg_pamac_clean_cache.set('VERSION', '6.7.2')
cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())

cfgfile_4 = configure_file(


+ 2
- 2
src/pamac-install/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.7.1")
set (VERSION "6.7.2")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.7.1")
set (VERSION "6.7.2")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )


+ 1
- 1
src/pamac-install/meson.build View File

@@ -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.7.1')
cfg_pamac_install.set('VERSION', '6.7.2')
cfg_pamac_install.set('TESTSRCDIR', meson.source_root())

cfgfile_5 = configure_file(


+ 2
- 2
src/pamac-manager/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.7.1")
set (VERSION "6.7.2")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.7.1")
set (VERSION "6.7.2")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )


+ 1
- 1
src/pamac-manager/meson.build View File

@@ -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.7.1')
cfg_pamac_manager.set('VERSION', '6.7.2')
cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())

cfgfile_6 = configure_file(


+ 2
- 2
src/pamac-system-daemon/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.7.1")
set (VERSION "6.7.2")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.7.1")
set (VERSION "6.7.2")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )


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

@@ -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.7.1')
cfg_pamac_system_daemon.set('VERSION', '6.7.2')
cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())

cfgfile_7 = configure_file(


+ 2
- 2
src/pamac-tray/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.7.1")
set (VERSION "6.7.2")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.7.1")
set (VERSION "6.7.2")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )


+ 1
- 1
src/pamac-tray/meson.build View File

@@ -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.7.1')
cfg_pamac_tray.set('VERSION', '6.7.2')
cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())

cfgfile_3 = configure_file(


+ 2
- 2
src/pamac-user-daemon/CMakeLists.txt View File

@@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac")
set (RELEASE_NAME "pamac")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.7.1")
set (VERSION "6.7.2")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")

configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.7.1")
set (VERSION "6.7.2")
add_definitions (${DEPS_CFLAGS})
include_directories ( ${CMAKE_BINARY_DIR}/src )
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )


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

@@ -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.7.1')
cfg_pamac_user_daemon.set('VERSION', '6.7.2')
cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())

cfgfile_2 = configure_file(


+ 1
- 1
src/pamacclassic.pc View File

@@ -4,7 +4,7 @@ includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}

Name: pamacclassic
Description: pamacclassic
Version: 6.7.1
Version: 6.7.2
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

Loading…
Cancel
Save