From ac4595a8d41ef143d200798ec2e5e334bd371a9e Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 19 Jul 2019 08:44:16 -0400 Subject: [PATCH] new version --- pamac.avprj | 16 ++++++++-------- po/pamac.pot | 2 +- src/meson.build | 16 ++++++++++++---- src/pamac-clean-cache/meson.build | 2 +- src/pamac-install/meson.build | 2 +- src/pamac-manager/meson.build | 2 +- src/pamac-system-daemon/meson.build | 2 +- src/pamac-tray/meson.build | 2 +- src/pamac-user-daemon/meson.build | 2 +- 9 files changed, 27 insertions(+), 19 deletions(-) diff --git a/pamac.avprj b/pamac.avprj index 965c4fe..3c12507 100644 --- a/pamac.avprj +++ b/pamac.avprj @@ -1,7 +1,7 @@ ### AutoVala Project ### autovala_version: 30 project_name: pamac -project_version: 7.0.0 +project_version: 7.0.1 vala_version: 0.44 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: 7.0.0 +*version: 7.0.1 vala_local_package: Pamac vala_vapi: ../vapis/libalpm.vapi vala_package: posix @@ -32,7 +32,7 @@ vala_check_package: json-glib-1.0 *vala_source: clean_cache.vala vala_binary: src/pamac-install/pamac-install -*version: 7.0.0 +*version: 7.0.1 use_gresource: pamac_installer_gresource_xml vala_local_package: Pamac vala_vapi: ../vapis/libalpm.vapi @@ -45,7 +45,7 @@ vala_check_package: json-glib-1.0 *vala_source: progress_dialog.vala vala_binary: src/pamac-manager/pamac-manager -*version: 7.0.0 +*version: 7.0.1 alias: pamac-updater use_gresource: pamac_manager_gresource_xml vala_local_package: Pamac @@ -60,7 +60,7 @@ vala_check_package: json-glib-1.0 *vala_source: manager_window.vala vala_binary: src/pamac-system-daemon/pamac-system-daemon -*version: 7.0.0 +*version: 7.0.1 vala_local_package: Pamac vala_package: posix vala_check_package: gtk+-3.0 @@ -75,7 +75,7 @@ vala_check_package: polkit-gobject-1 *vala_source: system_daemon.vala vala_binary: src/pamac-tray/pamac-tray -*version: 7.0.0 +*version: 7.0.1 vala_local_package: Pamac vala_package: posix vala_check_package: json-glib-1.0 @@ -97,7 +97,7 @@ end *vala_source: tray.vala vala_binary: src/pamac-user-daemon/pamac-user-daemon -*version: 7.0.0 +*version: 7.0.1 vala_local_package: Pamac vala_package: posix vala_check_package: gtk+-3.0 @@ -111,7 +111,7 @@ vala_check_package: libsoup-2.4 vala_library: src/pamac -*version: 7.0.0 +*version: 7.0.1 *namespace: Pamac use_gresource: pamac_transaction_gresource_xml *vala_package: posix diff --git a/po/pamac.pot b/po/pamac.pot index 460b0b3..f7458b2 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: 2019-07-06 20:25-0400\n" +"POT-Creation-Date: 2019-07-19 08:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/meson.build b/src/meson.build index 84af0b5..3809436 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,7 @@ cfg_pamac.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir' cfg_pamac.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac.set('RELEASE_NAME', 'pamac') cfg_pamac.set('PREFIX', get_option('prefix')) -cfg_pamac.set('VERSION', '7.0.0') +cfg_pamac.set('VERSION', '7.0.1') cfg_pamac.set('TESTSRCDIR', meson.source_root()) cfgfile_1 = configure_file( @@ -64,14 +64,22 @@ pamac_deps += [meson.get_compiler('c').find_library('m', required : false)] pamac_link_args = ['-rdynamic'] Pamac_library = shared_library('Pamac', pamac_sources, + vala_gir: 'Pamac-1.0.gir', dependencies: pamac_deps, vala_args: pamac_vala_args, c_args: pamac_c_args, link_args: pamac_link_args, - version: '7.0.0', + version: '7.0.1', soversion: '7', install: true, - install_dir: [true, true, true]) + install_dir: [true, true, true, true]) + +g_ir_compiler = find_program('g-ir-compiler') +custom_target('Pamac typelib', command: [g_ir_compiler, '--shared-library=libPamac', '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'Pamac-1.0.gir')], + output: 'Pamac-1.0.typelib', + depends: Pamac_library, + install: true, + install_dir: join_paths(get_option('libdir'), 'girepository-1.0')) pamac_requires = [] pamac_requires += ['atk'] @@ -90,7 +98,7 @@ pamac_requires += ['vte-2.91'] pamac_requires += ['x11'] pkg_mod = import('pkgconfig') pkg_mod.generate(libraries : Pamac_library, - version : '7.0.0', + version : '7.0.1', name : 'Pamac', filebase : 'Pamac', description : 'Pamac', diff --git a/src/pamac-clean-cache/meson.build b/src/pamac-clean-cache/meson.build index e3b381a..67a9c17 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', '7.0.0') +cfg_pamac_clean_cache.set('VERSION', '7.0.1') cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root()) cfgfile_4 = configure_file( diff --git a/src/pamac-install/meson.build b/src/pamac-install/meson.build index 0531490..682bc8f 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', '7.0.0') +cfg_pamac_install.set('VERSION', '7.0.1') cfg_pamac_install.set('TESTSRCDIR', meson.source_root()) cfgfile_5 = configure_file( diff --git a/src/pamac-manager/meson.build b/src/pamac-manager/meson.build index 08eb876..13578d8 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', '7.0.0') +cfg_pamac_manager.set('VERSION', '7.0.1') cfg_pamac_manager.set('TESTSRCDIR', meson.source_root()) cfgfile_6 = configure_file( diff --git a/src/pamac-system-daemon/meson.build b/src/pamac-system-daemon/meson.build index d611cd4..2ea74f3 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', '7.0.0') +cfg_pamac_system_daemon.set('VERSION', '7.0.1') cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_7 = configure_file( diff --git a/src/pamac-tray/meson.build b/src/pamac-tray/meson.build index 4582b10..97366ad 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', '7.0.0') +cfg_pamac_tray.set('VERSION', '7.0.1') cfg_pamac_tray.set('TESTSRCDIR', meson.source_root()) cfgfile_3 = configure_file( diff --git a/src/pamac-user-daemon/meson.build b/src/pamac-user-daemon/meson.build index 7f01a53..6972a2a 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', '7.0.0') +cfg_pamac_user_daemon.set('VERSION', '7.0.1') cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_2 = configure_file(