deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-09-17 05:09:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #384 from salahcoronya/build-improvements

Browse Source 
Fix build bug and improve build process
This commit is contained in:
deepend-tildeclub
2026-09-11 02:13:17 -07:00
committed by GitHub
parent bf11ffb626 040021ee0e
commit ccee274847
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/misc/meson.build
View File

@@ -2,6 +2,7 @@ appdir = join_paths(get_option('datadir'), 'applications')
metainfodir = join_paths(get_option('datadir'), 'metainfo') metainfodir = join_paths(get_option('datadir'), 'metainfo')
mimedir = join_paths(get_option('datadir'), 'mime', 'packages') mimedir = join_paths(get_option('datadir'), 'mime', 'packages')
desktop_utils = find_program('desktop-file-validate', required: false) desktop_utils = find_program('desktop-file-validate', required: false)
appstreamcli = find_program('appstreamcli', required: false)
if get_option('gtk-frontend') if get_option('gtk-frontend')
if get_option('install-appdata') if get_option('install-appdata')
@@ -13,7 +14,6 @@ if get_option('gtk-frontend')
install_dir: metainfodir install_dir: metainfodir
) )
appstreamcli = find_program('appstreamcli', required: false)
if appstreamcli.found() if appstreamcli.found()
test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli, test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli,
args: ['validate', zoitechat_appdata] args: ['validate', zoitechat_appdata]

2
meson.build
View File

@@ -1,6 +1,6 @@
project('zoitechat', 'c', project('zoitechat', 'c',
version: run_command('cat', 'VERSION', check: true).stdout().strip(), version: run_command('cat', 'VERSION', check: true).stdout().strip(),
meson_version: '>= 0.55.0', meson_version: '>= 0.59.0',
default_options: [ default_options: [
'c_std=c17', 'c_std=c17',
'buildtype=debugoptimized', 'buildtype=debugoptimized',

2
plugins/sysinfo/meson.build
View File

@@ -26,7 +26,7 @@ if system == 'linux' or system == 'gnu' or system.startswith('gnu/') or system =
sysinfo_cargs += '-DHAVE_LIBPCI' sysinfo_cargs += '-DHAVE_LIBPCI'
sysinfo_sources += 'unix/pci.c' sysinfo_sources += 'unix/pci.c'
picidsdir = libpci.get_pkgconfig_variable('idsdir') picidsdir = libpci.get_variable(pkgconfig : 'idsdir')
pciids = join_paths(picidsdir, 'pci.ids') pciids = join_paths(picidsdir, 'pci.ids')
sysinfo_cargs += '-DPCIIDS_FILE="@0@"'.format(pciids) sysinfo_cargs += '-DPCIIDS_FILE="@0@"'.format(pciids)
endif endif

4
src/fe-gtk/meson.build
View File

@@ -110,7 +110,7 @@ zoitechat_theme_lib = static_library('zoitechat_theme',
iso_codes = dependency('iso-codes', required: false) iso_codes = dependency('iso-codes', required: false)
if iso_codes.found() if iso_codes.found()
zoitechat_gtk_sources += 'sexy-iso-codes.c' zoitechat_gtk_sources += 'sexy-iso-codes.c'
iso_codes_prefix = iso_codes.get_pkgconfig_variable('prefix') iso_codes_prefix = iso_codes.get_variable(pkgconfig : 'prefix')
zoitechat_gtk_cflags += '-DISO_CODES_PREFIX="@0@"'.format(iso_codes_prefix) zoitechat_gtk_cflags += '-DISO_CODES_PREFIX="@0@"'.format(iso_codes_prefix)
zoitechat_gtk_cflags += '-DISO_CODES_LOCALEDIR="@0@"'.format( zoitechat_gtk_cflags += '-DISO_CODES_LOCALEDIR="@0@"'.format(
join_paths(iso_codes_prefix, 'share/locale')) join_paths(iso_codes_prefix, 'share/locale'))
@@ -139,7 +139,7 @@ executable('zoitechat',
link_args: zoitechat_gtk_ldflags, link_args: zoitechat_gtk_ldflags,
pie: true, pie: true,
install: true, install: true,
gui_app: true, win_subsystem: 'windows',
) )
emoji_ui_tests = executable('emoji_ui_tests', emoji_ui_tests = executable('emoji_ui_tests',