forked from cromer/pamac-classic
update to work with newever versions of vala
This commit is contained in:
@@ -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.0")
|
||||
set (VERSION "6.7.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.7.0")
|
||||
set (VERSION "6.7.1")
|
||||
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-6.0.gir )
|
||||
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=pamacclassic --gir pamacclassic-1.0.gir )
|
||||
set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction.gresource.xml )
|
||||
|
||||
vala_precompile(VALA_C pamacclassic
|
||||
@@ -101,10 +101,16 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} )
|
||||
target_link_libraries( pamacclassic m )
|
||||
set_target_properties( pamacclassic PROPERTIES
|
||||
VERSION
|
||||
6.7.0
|
||||
6.7.1
|
||||
SOVERSION
|
||||
6 )
|
||||
|
||||
add_custom_command (
|
||||
TARGET pamacclassic
|
||||
POST_BUILD
|
||||
COMMAND g-ir-compiler --shared-library=libpamacclassic "${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.gir" --output="${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.typelib"
|
||||
)
|
||||
|
||||
|
||||
install(TARGETS
|
||||
pamacclassic
|
||||
@@ -127,10 +133,15 @@ DESTINATION
|
||||
${CMAKE_INSTALL_DATAROOTDIR}/vala/vapi/
|
||||
)
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-6.0.gir
|
||||
${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.gir
|
||||
DESTINATION
|
||||
${CMAKE_INSTALL_DATAROOTDIR}/gir-1.0/
|
||||
)
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/pamacclassic-1.0.typelib
|
||||
DESTINATION
|
||||
lib/girepository-1.0/
|
||||
)
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc
|
||||
DESTINATION
|
||||
|
@@ -1,4 +1,4 @@
|
||||
namespace pamacclassicConstants {
|
||||
namespace pamacclassic {
|
||||
public const string DATADIR = "@DATADIR@";
|
||||
public const string PKGDATADIR = "@PKGDATADIR@";
|
||||
public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
|
||||
|
@@ -4,10 +4,13 @@ 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.0')
|
||||
cfg_pamac_classic.set('VERSION', '6.7.1')
|
||||
cfg_pamac_classic.set('TESTSRCDIR', meson.source_root())
|
||||
|
||||
cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic)
|
||||
cfgfile_1 = configure_file(
|
||||
input: 'Config.vala.base',
|
||||
output: 'Config.vala',
|
||||
configuration: cfg_pamac_classic)
|
||||
|
||||
pamac_classic_deps = [gdk_3_0_dep]
|
||||
pamac_classic_deps += [gtk_3_0_dep]
|
||||
@@ -57,10 +60,16 @@ if DISABLE_AUR
|
||||
endif
|
||||
pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : false)]
|
||||
pamac_classic_link_args = ['-rdynamic']
|
||||
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,link_args: pamac_classic_link_args,version: '6.7.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,
|
||||
link_args: pamac_classic_link_args,
|
||||
version: '6.7.1',
|
||||
soversion: '6',
|
||||
install: true,
|
||||
install_dir: [true, true, true])
|
||||
|
||||
pamac_classic_requires = []
|
||||
pamac_classic_requires += ['gdk-3.0']
|
||||
@@ -75,12 +84,10 @@ 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.0',
|
||||
version : '6.7.1',
|
||||
name : 'pamacclassic',
|
||||
filebase : 'pamacclassic',
|
||||
description : 'pamacclassic',
|
||||
requires : pamac_classic_requires)
|
||||
|
||||
install_data(join_paths(meson.current_source_dir(),'pamacclassic.deps'),install_dir: join_paths(get_option('prefix'),'share','vala','vapi'))
|
||||
meson.add_install_script(join_paths(meson.source_root(),'meson_scripts','install_library.sh'),'src','pamacclassic','pamacclassic-6.0.gir')
|
||||
|
||||
|
@@ -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.0")
|
||||
set (VERSION "6.7.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.7.0")
|
||||
set (VERSION "6.7.1")
|
||||
add_definitions (${DEPS_CFLAGS})
|
||||
include_directories ( ${CMAKE_BINARY_DIR}/src )
|
||||
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
|
||||
|
@@ -4,10 +4,13 @@ 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.0')
|
||||
cfg_pamac_clean_cache.set('VERSION', '6.7.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)
|
||||
cfgfile_4 = configure_file(
|
||||
input: 'Config.vala.base',
|
||||
output: 'Config.vala',
|
||||
configuration: cfg_pamac_clean_cache)
|
||||
|
||||
pamac_clean_cache_deps = [gtk_3_0_dep]
|
||||
pamac_clean_cache_deps += [json_glib_1_0_dep]
|
||||
@@ -39,5 +42,12 @@ endif
|
||||
pamac_clean_cache_link_args = ['-rdynamic']
|
||||
pamac_clean_cache_hfolders = ['../../src']
|
||||
|
||||
executable('pamac-clean-cache',pamac_clean_cache_sources,dependencies: pamac_clean_cache_deps,vala_args: pamac_clean_cache_vala_args,c_args: pamac_clean_cache_c_args,link_args: pamac_clean_cache_link_args,link_with: pamac_clean_cache_dependencies,include_directories: include_directories(pamac_clean_cache_hfolders),install: true)
|
||||
executable('pamac-clean-cache',pamac_clean_cache_sources,
|
||||
dependencies: pamac_clean_cache_deps,
|
||||
vala_args: pamac_clean_cache_vala_args,
|
||||
c_args: pamac_clean_cache_c_args,
|
||||
link_args: pamac_clean_cache_link_args,
|
||||
link_with: pamac_clean_cache_dependencies,
|
||||
include_directories: include_directories(pamac_clean_cache_hfolders),
|
||||
install: true)
|
||||
|
||||
|
@@ -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.0")
|
||||
set (VERSION "6.7.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.7.0")
|
||||
set (VERSION "6.7.1")
|
||||
add_definitions (${DEPS_CFLAGS})
|
||||
include_directories ( ${CMAKE_BINARY_DIR}/src )
|
||||
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
|
||||
|
@@ -4,10 +4,13 @@ cfg_pamac_install.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
|
||||
cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac')
|
||||
cfg_pamac_install.set('RELEASE_NAME', 'pamac')
|
||||
cfg_pamac_install.set('PREFIX', get_option('prefix'))
|
||||
cfg_pamac_install.set('VERSION', '6.7.0')
|
||||
cfg_pamac_install.set('VERSION', '6.7.1')
|
||||
cfg_pamac_install.set('TESTSRCDIR', meson.source_root())
|
||||
|
||||
cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install)
|
||||
cfgfile_5 = configure_file(
|
||||
input: 'Config.vala.base',
|
||||
output: 'Config.vala',
|
||||
configuration: cfg_pamac_install)
|
||||
|
||||
pamac_install_deps = [gtk_3_0_dep]
|
||||
pamac_install_deps += [json_glib_1_0_dep]
|
||||
@@ -41,5 +44,12 @@ endif
|
||||
pamac_install_link_args = ['-rdynamic']
|
||||
pamac_install_hfolders = ['../../src']
|
||||
|
||||
executable('pamac-install',pamac_install_sources,dependencies: pamac_install_deps,vala_args: pamac_install_vala_args,c_args: pamac_install_c_args,link_args: pamac_install_link_args,link_with: pamac_install_dependencies,include_directories: include_directories(pamac_install_hfolders),install: true)
|
||||
executable('pamac-install',pamac_install_sources,
|
||||
dependencies: pamac_install_deps,
|
||||
vala_args: pamac_install_vala_args,
|
||||
c_args: pamac_install_c_args,
|
||||
link_args: pamac_install_link_args,
|
||||
link_with: pamac_install_dependencies,
|
||||
include_directories: include_directories(pamac_install_hfolders),
|
||||
install: true)
|
||||
|
||||
|
@@ -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.0")
|
||||
set (VERSION "6.7.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.7.0")
|
||||
set (VERSION "6.7.1")
|
||||
add_definitions (${DEPS_CFLAGS})
|
||||
include_directories ( ${CMAKE_BINARY_DIR}/src )
|
||||
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
|
||||
|
@@ -4,10 +4,13 @@ cfg_pamac_manager.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('
|
||||
cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac')
|
||||
cfg_pamac_manager.set('RELEASE_NAME', 'pamac')
|
||||
cfg_pamac_manager.set('PREFIX', get_option('prefix'))
|
||||
cfg_pamac_manager.set('VERSION', '6.7.0')
|
||||
cfg_pamac_manager.set('VERSION', '6.7.1')
|
||||
cfg_pamac_manager.set('TESTSRCDIR', meson.source_root())
|
||||
|
||||
cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager)
|
||||
cfgfile_6 = configure_file(
|
||||
input: 'Config.vala.base',
|
||||
output: 'Config.vala',
|
||||
configuration: cfg_pamac_manager)
|
||||
|
||||
pamac_manager_deps = [gtk_3_0_dep]
|
||||
pamac_manager_deps += [json_glib_1_0_dep]
|
||||
@@ -42,6 +45,13 @@ endif
|
||||
pamac_manager_link_args = ['-rdynamic']
|
||||
pamac_manager_hfolders = ['../../src']
|
||||
|
||||
executable('pamac-manager',pamac_manager_sources,dependencies: pamac_manager_deps,vala_args: pamac_manager_vala_args,c_args: pamac_manager_c_args,link_args: pamac_manager_link_args,link_with: pamac_manager_dependencies,include_directories: include_directories(pamac_manager_hfolders),install: true)
|
||||
executable('pamac-manager',pamac_manager_sources,
|
||||
dependencies: pamac_manager_deps,
|
||||
vala_args: pamac_manager_vala_args,
|
||||
c_args: pamac_manager_c_args,
|
||||
link_args: pamac_manager_link_args,
|
||||
link_with: pamac_manager_dependencies,
|
||||
include_directories: include_directories(pamac_manager_hfolders),
|
||||
install: true)
|
||||
|
||||
meson.add_install_script('sh', '-c', 'ln -sf pamac-manager ${DESTDIR}/${MESON_INSTALL_PREFIX}/bin/pamac-updater')
|
||||
|
@@ -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.0")
|
||||
set (VERSION "6.7.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.7.0")
|
||||
set (VERSION "6.7.1")
|
||||
add_definitions (${DEPS_CFLAGS})
|
||||
include_directories ( ${CMAKE_BINARY_DIR}/src )
|
||||
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
|
||||
|
@@ -4,10 +4,13 @@ cfg_pamac_system_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_op
|
||||
cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac')
|
||||
cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac')
|
||||
cfg_pamac_system_daemon.set('PREFIX', get_option('prefix'))
|
||||
cfg_pamac_system_daemon.set('VERSION', '6.7.0')
|
||||
cfg_pamac_system_daemon.set('VERSION', '6.7.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)
|
||||
cfgfile_7 = configure_file(
|
||||
input: 'Config.vala.base',
|
||||
output: 'Config.vala',
|
||||
configuration: cfg_pamac_system_daemon)
|
||||
|
||||
pamac_system_daemon_deps = [gtk_3_0_dep]
|
||||
pamac_system_daemon_deps += [json_glib_1_0_dep]
|
||||
@@ -46,5 +49,12 @@ endif
|
||||
pamac_system_daemon_link_args = ['-rdynamic']
|
||||
pamac_system_daemon_hfolders = ['../../src']
|
||||
|
||||
executable('pamac-system-daemon',pamac_system_daemon_sources,dependencies: pamac_system_daemon_deps,vala_args: pamac_system_daemon_vala_args,c_args: pamac_system_daemon_c_args,link_args: pamac_system_daemon_link_args,link_with: pamac_system_daemon_dependencies,include_directories: include_directories(pamac_system_daemon_hfolders),install: true)
|
||||
executable('pamac-system-daemon',pamac_system_daemon_sources,
|
||||
dependencies: pamac_system_daemon_deps,
|
||||
vala_args: pamac_system_daemon_vala_args,
|
||||
c_args: pamac_system_daemon_c_args,
|
||||
link_args: pamac_system_daemon_link_args,
|
||||
link_with: pamac_system_daemon_dependencies,
|
||||
include_directories: include_directories(pamac_system_daemon_hfolders),
|
||||
install: true)
|
||||
|
||||
|
@@ -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.0")
|
||||
set (VERSION "6.7.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.7.0")
|
||||
set (VERSION "6.7.1")
|
||||
add_definitions (${DEPS_CFLAGS})
|
||||
include_directories ( ${CMAKE_BINARY_DIR}/src )
|
||||
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
|
||||
|
@@ -4,10 +4,13 @@ cfg_pamac_tray.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('dat
|
||||
cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac')
|
||||
cfg_pamac_tray.set('RELEASE_NAME', 'pamac')
|
||||
cfg_pamac_tray.set('PREFIX', get_option('prefix'))
|
||||
cfg_pamac_tray.set('VERSION', '6.7.0')
|
||||
cfg_pamac_tray.set('VERSION', '6.7.1')
|
||||
cfg_pamac_tray.set('TESTSRCDIR', meson.source_root())
|
||||
|
||||
cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray)
|
||||
cfgfile_3 = configure_file(
|
||||
input: 'Config.vala.base',
|
||||
output: 'Config.vala',
|
||||
configuration: cfg_pamac_tray)
|
||||
|
||||
pamac_tray_deps = [json_glib_1_0_dep]
|
||||
pamac_tray_deps += [libalpm_dep]
|
||||
@@ -52,5 +55,12 @@ endif
|
||||
pamac_tray_link_args = ['-rdynamic']
|
||||
pamac_tray_hfolders = ['../../src']
|
||||
|
||||
executable('pamac-tray',pamac_tray_sources,dependencies: pamac_tray_deps,vala_args: pamac_tray_vala_args,c_args: pamac_tray_c_args,link_args: pamac_tray_link_args,link_with: pamac_tray_dependencies,include_directories: include_directories(pamac_tray_hfolders),install: true)
|
||||
executable('pamac-tray',pamac_tray_sources,
|
||||
dependencies: pamac_tray_deps,
|
||||
vala_args: pamac_tray_vala_args,
|
||||
c_args: pamac_tray_c_args,
|
||||
link_args: pamac_tray_link_args,
|
||||
link_with: pamac_tray_dependencies,
|
||||
include_directories: include_directories(pamac_tray_hfolders),
|
||||
install: true)
|
||||
|
||||
|
@@ -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.0")
|
||||
set (VERSION "6.7.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.7.0")
|
||||
set (VERSION "6.7.1")
|
||||
add_definitions (${DEPS_CFLAGS})
|
||||
include_directories ( ${CMAKE_BINARY_DIR}/src )
|
||||
link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic )
|
||||
|
@@ -4,10 +4,13 @@ cfg_pamac_user_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti
|
||||
cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac')
|
||||
cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac')
|
||||
cfg_pamac_user_daemon.set('PREFIX', get_option('prefix'))
|
||||
cfg_pamac_user_daemon.set('VERSION', '6.7.0')
|
||||
cfg_pamac_user_daemon.set('VERSION', '6.7.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)
|
||||
cfgfile_2 = configure_file(
|
||||
input: 'Config.vala.base',
|
||||
output: 'Config.vala',
|
||||
configuration: cfg_pamac_user_daemon)
|
||||
|
||||
pamac_user_daemon_deps = [gtk_3_0_dep]
|
||||
pamac_user_daemon_deps += [json_glib_1_0_dep]
|
||||
@@ -43,5 +46,12 @@ endif
|
||||
pamac_user_daemon_link_args = ['-rdynamic']
|
||||
pamac_user_daemon_hfolders = ['../../src']
|
||||
|
||||
executable('pamac-user-daemon',pamac_user_daemon_sources,dependencies: pamac_user_daemon_deps,vala_args: pamac_user_daemon_vala_args,c_args: pamac_user_daemon_c_args,link_args: pamac_user_daemon_link_args,link_with: pamac_user_daemon_dependencies,include_directories: include_directories(pamac_user_daemon_hfolders),install: true)
|
||||
executable('pamac-user-daemon',pamac_user_daemon_sources,
|
||||
dependencies: pamac_user_daemon_deps,
|
||||
vala_args: pamac_user_daemon_vala_args,
|
||||
c_args: pamac_user_daemon_c_args,
|
||||
link_args: pamac_user_daemon_link_args,
|
||||
link_with: pamac_user_daemon_dependencies,
|
||||
include_directories: include_directories(pamac_user_daemon_hfolders),
|
||||
install: true)
|
||||
|
||||
|
@@ -4,7 +4,7 @@ includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR}
|
||||
|
||||
Name: pamacclassic
|
||||
Description: pamacclassic
|
||||
Version: 6.7.0
|
||||
Version: 6.7.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
|
||||
|
@@ -38,9 +38,9 @@ namespace Alpm {
|
||||
}
|
||||
public int capabilities();
|
||||
|
||||
public unowned Package? find_satisfier(Alpm.List<Package> pkgs, string depstring);
|
||||
public unowned Package? find_satisfier(Alpm.List<weak Package> pkgs, string depstring);
|
||||
|
||||
public unowned Package? pkg_find(Alpm.List<Package> haystack, string needle);
|
||||
public unowned Package? pkg_find(Alpm.List<weak Package> haystack, string needle);
|
||||
|
||||
public int pkg_vercmp(string a, string b);
|
||||
|
||||
@@ -193,7 +193,7 @@ namespace Alpm {
|
||||
public unowned DB localdb {
|
||||
[CCode (cname = "alpm_get_localdb")] get;
|
||||
}
|
||||
public unowned Alpm.List<unowned DB> syncdbs {
|
||||
public unowned Alpm.List<weak DB> syncdbs {
|
||||
[CCode (cname = "alpm_get_syncdbs")] get;
|
||||
}
|
||||
|
||||
@@ -380,7 +380,7 @@ namespace Alpm {
|
||||
|
||||
public unowned Package? get_pkg(string name);
|
||||
public unowned Group? get_group(string name);
|
||||
public Alpm.List<unowned Package> search(Alpm.List<string> needles);
|
||||
public Alpm.List<weak Package> search(Alpm.List<weak string> needles);
|
||||
|
||||
public int check_pgp_signature(out SigList siglist);
|
||||
}
|
||||
@@ -550,7 +550,7 @@ namespace Alpm {
|
||||
public Alpm.List<string> compute_optionalfor();
|
||||
|
||||
[CCode (cname = "alpm_sync_newversion")]
|
||||
public unowned Package? sync_newversion(Alpm.List<DB> dbs);
|
||||
public unowned Package? sync_newversion(Alpm.List<weak DB> dbs);
|
||||
|
||||
public int check_pgp_signature(out SigList siglist);
|
||||
}
|
||||
|
Reference in New Issue
Block a user