-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
pidgin: update to 2.14.6 #32285
Merged
Merged
pidgin: update to 2.14.6 #32285
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| pidgin | ||
| libgnt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| diff --git a/meson.build b/meson.build | ||
| index 1084c82..7f824b9 100644 | ||
| --- a/meson.build | ||
| +++ b/meson.build | ||
| @@ -70,67 +70,77 @@ gnt_config.set('NO_LIBXML', not libxml.found()) | ||
| # Check for ncurses and other things used by it | ||
| ####################################################################### | ||
| ncurses_available = true | ||
| -ncurses_inc = [] | ||
| -# The order of this list is important to the condition that follows. | ||
| -ncurses_libs = [ | ||
| - compiler.find_library('ncursesw', required : false), | ||
| - compiler.find_library('panelw', required : false), | ||
| - compiler.find_library('tinfow', required : false), | ||
| +ncurses_widechar = true | ||
| +ncurses_header = 'ncurses.h' | ||
| +# Some distros put the headers in ncursesw/, some don't. These are ordered to | ||
| +# pick the last available as most-specific version. | ||
| +ncursesw_header_paths = ['', 'ncursesw/'] | ||
| +ncurses = [ | ||
| + dependency('ncursesw', required : false), | ||
| + dependency('panelw', required : false), | ||
| ] | ||
| -if not ncurses_libs[0].found() or not ncurses_libs[1].found() | ||
| - ncurses_available = false | ||
| -endif | ||
| - | ||
| -if host_machine.system() == 'windows' | ||
| - # FIXME: $host ? | ||
| - ncurses_sys_prefix = '/usr/$host/sys-root/mingw' | ||
| +if ncurses[0].found() and ncurses[1].found() | ||
| + foreach location : ncursesw_header_paths | ||
| + f = location + 'ncurses.h' | ||
| + if compiler.has_header_symbol(f, 'get_wch', | ||
| + prefix : '#define _XOPEN_SOURCE_EXTENDED') | ||
| + ncurses_header = f | ||
| + endif | ||
| + endforeach | ||
| else | ||
| - ncurses_sys_prefix = '/usr' | ||
| -endif | ||
| - | ||
| -ncurses_sys_dirs = [ncurses_sys_prefix + '/include/ncursesw', | ||
| - ncurses_sys_prefix + '/include'] | ||
| - | ||
| -if ncurses_available | ||
| - # Some distros put the headers in ncursesw/, some don't | ||
| - found_ncurses_h = false | ||
| - foreach location : ncurses_sys_dirs | ||
| - f = location + '/ncurses.h' | ||
| - if not found_ncurses_h | ||
| + ncurses_available = false | ||
| + ncurses_inc = [] | ||
| + ncurses_libs = [ | ||
| + compiler.find_library('ncursesw', required : false), | ||
| + compiler.find_library('panelw', required : false) | ||
| + ] | ||
| + if ncurses_libs[0].found() and ncurses_libs[1].found() | ||
| + foreach location : ncursesw_header_paths | ||
| + f = location + 'ncurses.h' | ||
| if compiler.has_header_symbol(f, 'get_wch', | ||
| prefix : '#define _XOPEN_SOURCE_EXTENDED') | ||
| - if location != '.' | ||
| - ncurses_inc += [include_directories(location)] | ||
| - endif | ||
| - found_ncurses_h = true | ||
| + ncurses_available = true | ||
| + ncurses_header = f | ||
| endif | ||
| + endforeach | ||
| + if ncurses_available | ||
| + ncurses = declare_dependency( | ||
| + include_directories : ncurses_inc, | ||
| + dependencies : ncurses_libs | ||
| + ) | ||
| endif | ||
| - endforeach | ||
| - | ||
| - if not found_ncurses_h | ||
| - ncurses_inc = [] | ||
| - ncurses_libs = [] | ||
| - ncurses_available = false | ||
| endif | ||
| -else | ||
| +endif | ||
| +if not ncurses_available | ||
| # ncursesw was not found. Look for plain old ncurses | ||
| - # The order of this list is important to the condition that follows. | ||
| - ncurses_libs = [ | ||
| - compiler.find_library('ncurses', required : false), | ||
| - compiler.find_library('panel', required : false), | ||
| - compiler.find_library('tinfo', required : false), | ||
| + ncurses = [ | ||
| + dependency('ncurses', required : false), | ||
| + dependency('panel', required : false), | ||
| ] | ||
| - ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() | ||
| - gnt_config.set('NO_WIDECHAR', true) | ||
| + if ncurses[0].found() and ncurses_libs[1].found() | ||
| + ncurses_available = true | ||
| + else | ||
| + ncurses_libs = [ | ||
| + compiler.find_library('ncurses', required : false), | ||
| + compiler.find_library('panel', required : false), | ||
| + ] | ||
| + ncurses_available = ncurses_libs[0].found() and ncurses_libs[1].found() | ||
| + ncurses = declare_dependency(dependencies : ncurses_libs) | ||
| + endif | ||
| + ncurses_widechar = false | ||
| +endif | ||
| +if not ncurses_available and host_machine.system() == 'windows' | ||
| + # Try pdcurses too. | ||
| + ncurses_header = 'curses.h' | ||
| + ncurses_libs = compiler.find_library('pdcurses', required : false) | ||
| + ncurses_available = compiler.has_header(ncurses_header) and ncurses_libs.found() | ||
| + ncurses = declare_dependency(dependencies : ncurses_libs) | ||
| endif | ||
| if not ncurses_available | ||
| error('ncurses could not be found!') | ||
| endif | ||
| - | ||
| -ncurses = declare_dependency( | ||
| - include_directories : ncurses_inc, | ||
| - dependencies : ncurses_libs | ||
| -) | ||
| +gnt_config.set('NCURSES_HEADER', ncurses_header) | ||
| +gnt_config.set10('NCURSES_WIDECHAR', ncurses_widechar) | ||
|
|
||
| libgnt_SOURCES = [ | ||
| 'gntwidget.c', |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # Template file for 'libgnt' | ||
| pkgname=libgnt | ||
| version=2.14.2 | ||
| revision=1 | ||
| build_style=meson | ||
| build_helper=gir | ||
| hostmakedepends="pkg-config glib-devel gtk-doc" | ||
| makedepends="libxml2-devel ncurses-devel python3-devel glib-devel gtk-doc" | ||
| short_desc="GLib Ncurses Toolkit" | ||
| maintainer="Orphaned <orphan@voidlinux.org>" | ||
| license="GPL-2.0-or-later" | ||
| homepage="https://keep.imfreedom.org/libgnt/" | ||
| distfiles="${SOURCEFORGE_SITE}/pidgin/libgnt/${version}/libgnt-${version}.tar.xz" | ||
| checksum=61cf74b14eef10868b2d892e975aa78614f094c8f4d30dfd1aaedf52e6120e75 | ||
|
|
||
| pre_configure() { | ||
| # disable doc for cross builds | ||
| if [ "$CROSS_BUILD" ]; then | ||
| vsed -i "/subdir('doc')/d" meson.build | ||
| fi | ||
| } | ||
|
|
||
| libgnt-devel_package() { | ||
| depends="libglib-devel libgnt>=${version}_${revision}" | ||
| short_desc+=" - development files" | ||
| pkg_install() { | ||
| vmove usr/include | ||
| vmove usr/lib/pkgconfig | ||
| vmove usr/lib/libgnt.so | ||
| } | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wow, the existence of such a thing hurts me :D