Browse Source

update to new autovala 1.2.0 cmake and meson files

pull/11/head v6.4.1
Chris Cromer 3 years ago
parent
commit
f545ec85d7
23 changed files with 52 additions and 102 deletions
  1. +0
    -4
      .gitignore
  2. +7
    -2
      autogen.sh
  3. +1
    -14
      data/mime/CMakeLists.txt
  4. +1
    -14
      data/polkit/CMakeLists.txt
  5. +0
    -20
      doc/CMakeLists.txt
  6. +2
    -8
      meson.build
  7. +13
    -10
      pamac.avprj
  8. +1
    -1
      po/pamac.pot
  9. +3
    -3
      src/CMakeLists.txt
  10. +3
    -3
      src/meson.build
  11. +2
    -2
      src/pamac-clean-cache/CMakeLists.txt
  12. +1
    -1
      src/pamac-clean-cache/meson.build
  13. +2
    -2
      src/pamac-install/CMakeLists.txt
  14. +1
    -1
      src/pamac-install/meson.build
  15. +2
    -2
      src/pamac-manager/CMakeLists.txt
  16. +1
    -1
      src/pamac-manager/meson.build
  17. +2
    -2
      src/pamac-system-daemon/CMakeLists.txt
  18. +1
    -1
      src/pamac-system-daemon/meson.build
  19. +2
    -2
      src/pamac-tray/CMakeLists.txt
  20. +1
    -1
      src/pamac-tray/meson.build
  21. +2
    -2
      src/pamac-user-daemon/CMakeLists.txt
  22. +1
    -1
      src/pamac-user-daemon/meson.build
  23. +3
    -5
      src/pamacclassic.pc

+ 0
- 4
.gitignore View File

@ -6,7 +6,3 @@ data/interface/#*#
PKGBUILD
*.pkg.tar.xz
*.pkg.tar.xz.sig
/build
.bzrignore
.hgignore
data/local/

+ 7
- 2
autogen.sh View File

@ -8,5 +8,10 @@ make
make clean
popd
# Update the autovala environment
autovala update
# Update the autovala project file
autovala refresh
# Remove unused folders and files made by autovala
rm -rf ./{install,packages,doc} ./data/{local,bash_completion} ./.hgignore ./.bzrignore
# Generate the cmake and meson build files
autovala cmake
autovala meson

+ 1
- 14
data/mime/CMakeLists.txt View File

@ -1,17 +1,4 @@
### 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
/usr/share/mime/packages
)
ELSE()
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml
DESTINATION
/usr/share/mime/packages
)
ENDIF()
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/x-alpm-package.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/)

+ 1
- 14
data/polkit/CMakeLists.txt View File

@ -1,17 +1,4 @@
### 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
/usr/share/polkit-1/actions
)
ELSE()
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy
DESTINATION
/usr/share/polkit-1/actions
)
ENDIF()
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.pamac.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)

+ 0
- 20
doc/CMakeLists.txt View File

@ -1,20 +0,0 @@
### 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-classic
)
ELSE()
install(FILES
${file_data}
DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/doc/pamac-classic
)
ENDIF()
endforeach()

+ 2
- 8
meson.build View File

@ -35,10 +35,6 @@ meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/lib/systemd/system',join_paths(meson.current_source_dir(),'data/systemd','pamac-mirrorlist.timer'))
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/polkit-1/actions',join_paths(meson.current_source_dir(),'data/polkit','org.pamac.policy'))
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/usr/share/mime/packages',join_paths(meson.current_source_dir(),'data/mime','x-alpm-package.xml'))
if DISABLE_AUR
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),'/etc',join_paths(meson.current_source_dir(),'data/config/noaur','pamac.conf'))
@ -58,10 +54,6 @@ pamac_transaction_gresource_xml_generator = generator(find_program('glib-compile
pamac_transaction_gresource_xml_file_c = pamac_transaction_gresource_xml_generator.process(['data/pamac.transaction.gresource.xml'])
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'),join_paths(meson.current_source_dir(),'data/local','','*'))
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'doc'),join_paths(meson.current_source_dir(),'doc','','*'))
install_data('data/pamac-install.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications'))
install_data('data/pamac-manager.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications'))
if ENABLE_UPDATE_ICON
@ -90,6 +82,8 @@ install_data('data/icons/24x24/status/pamac-tray-no-update.png',install_dir: joi
install_data('data/icons/24x24/status/pamac-tray-update.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/24x24/apps'))
install_data('data/icons/32x32/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/32x32/apps'))
install_data('data/pixmaps/package-generic.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac-classic'))
install_data( 'data/polkit/org.pamac.policy',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'polkit-1','actions'))
install_data( 'data/mime/x-alpm-package.xml',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'mime','packages'))
subdir('src')
subdir('src/pamac-user-daemon')
subdir('src/pamac-tray')

+ 13
- 10
pamac.avprj View File

@ -1,6 +1,7 @@
### AutoVala Project ###
autovala_version: 26
autovala_version: 27
project_name: pamac-classic
project_version: 6.4.1
vala_version: 0.38
custom: data/systemd/pamac-system.service /usr/lib/systemd/system
@ -8,8 +9,6 @@ custom: data/systemd/pamac-cleancache.service /usr/lib/systemd/system
custom: data/systemd/pamac-cleancache.timer /usr/lib/systemd/system
custom: data/systemd/pamac-mirrorlist.service /usr/lib/systemd/system
custom: data/systemd/pamac-mirrorlist.timer /usr/lib/systemd/system
custom: data/polkit/org.pamac.policy /usr/share/polkit-1/actions
custom: data/mime/x-alpm-package.xml /usr/share/mime/packages
if DISABLE_AUR
custom: data/config/noaur/pamac.conf /etc
else
@ -27,7 +26,7 @@ define: KDE_TRAY
vapidir: src/vapis
vala_binary: src/pamac-clean-cache/pamac-clean-cache
version: 6.4.0
*version: 6.4.1
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: gtk+-3.0
@ -39,7 +38,7 @@ vala_check_package: json-glib-1.0
*vala_source: pamac_config.vala
vala_binary: src/pamac-install/pamac-install
version: 6.4.0
*version: 6.4.1
use_gresource: pamac_installer_gresource_xml
vala_local_package: pamacclassic
vala_check_package: gtk+-3.0
@ -51,7 +50,7 @@ vala_check_package: json-glib-1.0
*vala_source: progress_dialog.vala
vala_binary: src/pamac-manager/pamac-manager
version: 6.4.0
*version: 6.4.1
alias: pamac-updater
use_gresource: pamac_manager_gresource_xml
vala_local_package: pamacclassic
@ -65,7 +64,7 @@ vala_check_package: json-glib-1.0
*vala_source: manager_window.vala
vala_binary: src/pamac-system-daemon/pamac-system-daemon
version: 6.4.0
*version: 6.4.1
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: gtk+-3.0
@ -83,7 +82,7 @@ vala_check_package: polkit-gobject-1
*vala_source: system_daemon.vala
vala_binary: src/pamac-tray/pamac-tray
version: 6.4.0
*version: 6.4.1
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: json-glib-1.0
@ -107,7 +106,7 @@ end
*vala_source: tray.vala
vala_binary: src/pamac-user-daemon/pamac-user-daemon
version: 6.4.0
*version: 6.4.1
vala_local_package: pamacclassic
vala_package: posix
vala_check_package: gtk+-3.0
@ -122,7 +121,7 @@ vala_check_package: libsoup-2.4
vala_library: src/pamac-classic
version: 6.4.0
*version: 6.4.1
namespace: pamacclassic
use_gresource: pamac_transaction_gresource_xml
vala_package: posix
@ -222,3 +221,7 @@ end
*pixmap: data/pixmaps/package-generic.png
*polkit: data/polkit/org.pamac.policy
*mimetype: data/mime/x-alpm-package.xml

+ 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: 2017-10-29 17:33-0300\n"
"POT-Creation-Date: 2017-10-30 20:11-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

+ 3
- 3
src/CMakeLists.txt View File

@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.0")
set (VERSION "6.4.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.pc ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.deps ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps)
set (VERSION "6.4.0")
set (VERSION "6.4.1")
add_definitions (${DEPS_CFLAGS})
link_libraries ( ${DEPS_LIBRARIES} )
link_directories ( ${DEPS_LIBRARY_DIRS} )
@ -96,7 +96,7 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
target_link_libraries( pamacclassic m )
set_target_properties( pamacclassic PROPERTIES
VERSION
6.4.0
6.4.1
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-classic')
cfg_pamac_classic.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_classic.set('PREFIX', get_option('prefix'))
cfg_pamac_classic.set('VERSION', '6.4.0')
cfg_pamac_classic.set('VERSION', '6.4.1')
cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())
cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic)
@ -55,7 +55,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.4.0',soversion: '6',install: true)
pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,version: '6.4.1',soversion: '6',install: true)
pamac_classic_requires = []
pamac_classic_requires += ['gdk-3.0']
@ -70,7 +70,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.4.0',
version : '6.4.1',
name : 'pamacclassic',
filebase : 'pamacclassic',
description : 'pamacclassic',

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.0")
set (VERSION "6.4.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.0")
set (VERSION "6.4.1")
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-classic')
cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_clean_cache.set('PREFIX', get_option('prefix'))
cfg_pamac_clean_cache.set('VERSION', '6.4.0')
cfg_pamac_clean_cache.set('VERSION', '6.4.1')
cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root())
cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache)

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.0")
set (VERSION "6.4.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.0")
set (VERSION "6.4.1")
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-classic')
cfg_pamac_install.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_install.set('PREFIX', get_option('prefix'))
cfg_pamac_install.set('VERSION', '6.4.0')
cfg_pamac_install.set('VERSION', '6.4.1')
cfg_pamac_install.set('TESTSRCDIR', meson.source_root())
cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.0")
set (VERSION "6.4.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.0")
set (VERSION "6.4.1")
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-classic')
cfg_pamac_manager.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_manager.set('PREFIX', get_option('prefix'))
cfg_pamac_manager.set('VERSION', '6.4.0')
cfg_pamac_manager.set('VERSION', '6.4.1')
cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())
cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.0")
set (VERSION "6.4.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.0")
set (VERSION "6.4.1")
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-classic')
cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_system_daemon.set('PREFIX', get_option('prefix'))
cfg_pamac_system_daemon.set('VERSION', '6.4.0')
cfg_pamac_system_daemon.set('VERSION', '6.4.1')
cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root())
cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon)

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.0")
set (VERSION "6.4.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.0")
set (VERSION "6.4.1")
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-classic')
cfg_pamac_tray.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_tray.set('PREFIX', get_option('prefix'))
cfg_pamac_tray.set('VERSION', '6.4.0')
cfg_pamac_tray.set('VERSION', '6.4.1')
cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)

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

@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic")
set (RELEASE_NAME "pamac-classic")
set (CMAKE_C_FLAGS "")
set (PREFIX ${CMAKE_INSTALL_PREFIX})
set (VERSION "6.4.0")
set (VERSION "6.4.1")
set (TESTSRCDIR "${CMAKE_SOURCE_DIR}")
set (DOLLAR "$")
configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala)
add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
set (VERSION "6.4.0")
set (VERSION "6.4.1")
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-classic')
cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac-classic')
cfg_pamac_user_daemon.set('PREFIX', get_option('prefix'))
cfg_pamac_user_daemon.set('VERSION', '6.4.0')
cfg_pamac_user_daemon.set('VERSION', '6.4.1')
cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root())
cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon)

+ 3
- 5
src/pamacclassic.pc View File

@ -1,12 +1,10 @@
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}
libdir=@DOLLAR@{prefix}/${CMAKE_INSTALL_LIBDIR}
includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}
Name: pamacclassic
Description: pamacclassic
Version: 6.4.0
Version: 6.4.1
Libs: -L@DOLLAR@{libdir} -lpamacclassic
Cflags: -I@DOLLAR@{includedir}
Requires: gdk-3.0 gtk+-3.0 json-glib-1.0 libalpm libnotify libsoup-2.4 vte-2.91 gio-2.0 glib-2.0 gobject-2.0

Loading…
Cancel
Save