-
Notifications
You must be signed in to change notification settings - Fork 519
Test updated libnotify library #6819
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
Draft
AenBleidd
wants to merge
1
commit into
master
Choose a base branch
from
vko_check_updated_libnotify_library
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions
15
3rdParty/vcpkg_ports/ports/libnotify/0001-fix-parameter-name-omitted-error.patch
This file contains hidden or 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,15 @@ | ||
| diff --git a/libnotify/launch-context.c b/libnotify/launch-context.c | ||
| index facb43c..9469042 100644 | ||
| --- a/libnotify/launch-context.c | ||
| +++ b/libnotify/launch-context.c | ||
| @@ -49,8 +49,8 @@ notification_app_launch_context_finalize (GObject *object) | ||
|
|
||
| static char * | ||
| notification_app_launch_context_get_startup_notify_id (GAppLaunchContext *context, | ||
| - GAppInfo *, | ||
| - GList *) | ||
| + GAppInfo *gai, | ||
| + GList *gl) | ||
| { | ||
| NotificationAppLaunchContext *self = NOTIFICATION_APP_LAUNCH_CONTEXT (context); | ||
|
|
13 changes: 13 additions & 0 deletions
13
3rdParty/vcpkg_ports/ports/libnotify/0002-fix-static-build.patch
This file contains hidden or 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,13 @@ | ||
| diff --git a/libnotify/meson.build b/libnotify/meson.build | ||
| index b50d9cc..118c34c 100644 | ||
| --- a/libnotify/meson.build | ||
| +++ b/libnotify/meson.build | ||
| @@ -55,7 +55,7 @@ notify_dep = declare_dependency( | ||
| sources: headers + [enum_types[1]], | ||
| ) | ||
|
|
||
| -libnotify_lib = shared_library(LIBNAME, | ||
| +libnotify_lib = library(LIBNAME, | ||
| dependencies: notify_dep, | ||
| sources: [ | ||
| sources, |
This file contains hidden or 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,53 @@ | ||
| string(REGEX MATCH [[^[0-9][0-9]*\.[1-9][0-9]*]] VERSION_MAJOR_MINOR ${VERSION}) | ||
| vcpkg_download_distfile(ARCHIVE | ||
| URLS | ||
| "https://download.gnome.org/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" | ||
| "https://www.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/sources/${PORT}/${VERSION_MAJOR_MINOR}/${PORT}-${VERSION}.tar.xz" | ||
| FILENAME "GNOME-${PORT}-${VERSION}.tar.xz" | ||
| SHA512 0fedd230d3c8b9bd3c783794e690752cf6388fc178854267effe3ba26aaa9248415cdf0ab994f596ace8bef59e0c1e41196f42a225221d7f0e1efc54683c310a | ||
| ) | ||
|
|
||
| vcpkg_extract_source_archive(SOURCE_PATH | ||
| ARCHIVE "${ARCHIVE}" | ||
| PATCHES | ||
| 0001-fix-parameter-name-omitted-error.patch | ||
| 0002-fix-static-build.patch | ||
| ) | ||
|
|
||
| vcpkg_list(SET RELEASE_OPTIONS) | ||
| if("introspection" IN_LIST FEATURES) | ||
| vcpkg_list(APPEND RELEASE_OPTIONS -Dintrospection=enabled) | ||
| vcpkg_get_gobject_introspection_programs(PYTHON3 GIR_COMPILER GIR_SCANNER) | ||
| else() | ||
| vcpkg_list(APPEND RELEASE_OPTIONS -Dintrospection=disabled) | ||
| endif() | ||
|
|
||
| vcpkg_configure_meson( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS | ||
| -Dtests=false | ||
| -Dman=false | ||
| -Dgtk_doc=false | ||
| -Ddocbook_docs=disabled | ||
| OPTIONS_RELEASE | ||
| ${RELEASE_OPTIONS} | ||
| OPTIONS_DEBUG | ||
| -Dintrospection=disabled | ||
| ADDITIONAL_BINARIES | ||
| "g-ir-compiler='${GIR_COMPILER}'" | ||
| "g-ir-scanner='${GIR_SCANNER}'" | ||
| "glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'" | ||
| "glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'" | ||
| ) | ||
|
|
||
| vcpkg_install_meson() | ||
|
|
||
| vcpkg_copy_pdbs() | ||
|
|
||
| vcpkg_fixup_pkgconfig() | ||
|
|
||
| file(REMOVE_RECURSE | ||
| "${CURRENT_PACKAGES_DIR}/debug/include" | ||
| "${CURRENT_PACKAGES_DIR}/debug/share" | ||
| ) | ||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") | ||
This file contains hidden or 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,40 @@ | ||
| { | ||
| "name": "libnotify", | ||
| "version": "0.8.8", | ||
| "port-version": 1, | ||
| "description": "A library for sending desktop notifications", | ||
| "homepage": "https://gitlab.gnome.org/GNOME/libnotify", | ||
| "license": "LGPL-2.1-or-later", | ||
| "supports": "linux", | ||
| "dependencies": [ | ||
| { | ||
| "name": "gdk-pixbuf", | ||
| "default-features": false | ||
| }, | ||
| "glib", | ||
| { | ||
| "name": "glib", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-tool-meson", | ||
| "host": true | ||
| } | ||
| ], | ||
| "features": { | ||
| "introspection": { | ||
| "description": "Enable GObject introspection", | ||
| "supports": "!static", | ||
| "dependencies": [ | ||
| { | ||
| "name": "gdk-pixbuf", | ||
| "default-features": false, | ||
| "features": [ | ||
| "introspection" | ||
| ] | ||
| }, | ||
| "gobject-introspection" | ||
| ] | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
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.
The variable name RELEASE_OPTIONS is inconsistent with the naming convention used in other similar ports in this repository. Other GNOME library ports (gdk-pixbuf at line 22 and gtk3 at line 35) use OPTIONS_RELEASE for this purpose. Consider renaming RELEASE_OPTIONS to OPTIONS_RELEASE to maintain consistency across the codebase, even though both approaches are functionally equivalent.