-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
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
gtk3-x11: fix build #54615
Merged
Merged
gtk3-x11: fix build #54615
Conversation
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
7c6f434c
approved these changes
Jan 26, 2019
I opened a PR upstream https://gitlab.gnome.org/GNOME/gtk/merge_requests/536 I also came up with a more proper fix but cannot really test it: --- a/gdk/x11/gdkapplaunchcontext-x11.c
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
@@ -26,10 +26,13 @@
#include "gdkintl.h"
#include "gdkprivate-x11.h"
-#include <glib.h>
-#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
+#if defined(HAVE_GIO_UNIX)
+if defined(__APPLE__)
+#include <gio/gosxappinfo.h>
+#else
#include <gio/gdesktopappinfo.h>
#endif
+#endif
#include <string.h>
#include <unistd.h>
@@ -354,13 +357,19 @@
else
workspace_str = NULL;
-#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
+#if defined(HAVE_GIO_UNIX)
+#if defined(__APPLE__)
+ if (G_IS_OSX_APP_INFO (info))
+ application_id = g_osx_app_info_get_id (G_OSX_APP_INFO (info));
+ else
+ application_id = NULL;
+#else
if (G_IS_DESKTOP_APP_INFO (info))
application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
else
application_id = NULL;
+#endif
#else
- application_id = NULL;
#warning Please add support for creating AppInfo from id for your OS
#endif
|
We need a similar patch for |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
6.topic: python
10.rebuild-darwin: 101-500
10.rebuild-linux: 0
This PR does not cause any packages to rebuild on Linux
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.
Motivation for this change
Closes: #54424, #54642
cc @matthewbauer @LnL7 @hedning
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)