deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-19 12:10:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix build error

Browse Source
This commit is contained in:
deepend
2026-02-22 15:04:10 -07:00
parent 44019bcab2
commit 8b344e8bfe
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meson_options.txt
View File

@@ -2,13 +2,8 @@
option('gtk-frontend', type: 'boolean', option('gtk-frontend', type: 'boolean',
description: 'Main graphical interface' description: 'Main graphical interface'
) )
<<<<<<< ours
option('gtk3', type: 'boolean', value: true, deprecated: true, option('gtk3', type: 'boolean', value: true, deprecated: true,
description: 'Deprecated: GTK frontend always builds against GTK 3' description: 'Deprecated: GTK frontend always builds against GTK 3'
=======
option('gtk3', type: 'boolean', value: true,
description: 'Deprecated: GTK frontend is always built against GTK 3 (option is ignored)'
>>>>>>> theirs
) )
option('text-frontend', type: 'boolean', value: false, option('text-frontend', type: 'boolean', value: false,
description: 'Text interface (not generally useful)' description: 'Text interface (not generally useful)'
@@ -28,11 +23,7 @@ option('libcanberra', type: 'feature', value: 'auto',
description: 'Support for sound alerts, Unix only' description: 'Support for sound alerts, Unix only'
) )
option('appindicator', type: 'feature', value: 'auto', option('appindicator', type: 'feature', value: 'auto',
<<<<<<< ours
description: 'Use Ayatana/AppIndicator-based tray backend for GTK frontend (non-Windows only)' description: 'Use Ayatana/AppIndicator-based tray backend for GTK frontend (non-Windows only)'
=======
description: 'Use Ayatana/AppIndicator-based tray backend for GTK frontend builds'
>>>>>>> theirs
) )
# Install options # Install options