update to work with newever versions of vala

This commit is contained in:
2019-06-29 12:07:48 -04:00
parent 783baf464b
commit b2d5118615
28 changed files with 195 additions and 88 deletions

View File

@@ -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')