[gtk-osx] Patch around GDesktopAppInfo not implemented on Macs.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Patch around GDesktopAppInfo not implemented on Macs.
- Date: Sat, 26 May 2018 18:28:52 +0000 (UTC)
commit 54c99bd9b593e1dd41ca477abbf23cc7e66da131
Author: John Ralls <jralls ceridwen us>
Date: Sat May 26 11:28:40 2018 -0700
Patch around GDesktopAppInfo not implemented on Macs.
modulesets-stable/gtk-osx.modules | 1 +
...14-GDesktopAppInfo-not-implemented-on-Mac.patch | 49 ++++++++++++++++++++++
2 files changed, 50 insertions(+)
---
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 10fd76b..4b565bd 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -205,6 +205,7 @@
<patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtk-quartz-fix-pixelated-image-surfaces-in-retina-hidpi-.patch"
strip="1"/>
<patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtk3-14-get-scale-factor.patch"
strip="1"/>
<patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtk-3.14-stylecontext-unnecessary-assert.patch"
strip="1"/>
+ <patch
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/gtk-3.14-GDesktopAppInfo-not-implemented-on-Mac.patch"
strip="1"/>
</branch>
<dependencies>
<dep package="glib"/>
diff --git a/patches/gtk-3.14-GDesktopAppInfo-not-implemented-on-Mac.patch
b/patches/gtk-3.14-GDesktopAppInfo-not-implemented-on-Mac.patch
new file mode 100644
index 0000000..b2f2ae6
--- /dev/null
+++ b/patches/gtk-3.14-GDesktopAppInfo-not-implemented-on-Mac.patch
@@ -0,0 +1,49 @@
+--- a/gtk/gtkapplicationwindow.c 2015-07-21 07:22:36.000000000 -0700
++++ b/gtk/gtkapplicationwindow.c 2018-05-26 11:11:10.000000000 -0700
+@@ -29,7 +29,7 @@
+ #include "gtkintl.h"
+ #include "gtksettings.h"
+
+-#ifdef HAVE_GIO_UNIX
++#if !defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
+ #include <gio/gdesktopappinfo.h>
+ #endif
+
+@@ -255,7 +255,7 @@
+ {
+ gchar *retval = NULL;
+
+-#ifdef HAVE_GIO_UNIX
++#if !defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
+ GDesktopAppInfo *app_info;
+ const gchar *app_name = NULL;
+ gchar *desktop_file;
+--- a/gtk/gtk-launch.c 2014-11-26 18:54:55.000000000 -0800
++++ b/gtk/gtk-launch.c 2018-05-26 11:16:49.000000000 -0700
+@@ -28,7 +28,7 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+-#ifdef G_OS_UNIX
++#if !defined(G_OS_UNIX) && !defined(__APPLE)
+ #include <gio/gdesktopappinfo.h>
+ #endif
+ #include <gtk.h>
+@@ -47,7 +47,7 @@
+ GOptionContext *context = NULL;
+ gchar *summary;
+ gchar *app_name;
+-#ifdef G_OS_UNIX
++#if !defined(G_OS_UNIX) && !defined(__APPLE)
+ gchar *desktop_file_name;
+ #endif
+ GAppInfo *info = NULL;
+@@ -109,7 +109,7 @@
+ gtk_init (&argc, &argv);
+
+ app_name = *args;
+-#ifdef G_OS_UNIX
++#if !defined(G_OS_UNIX) && !defined(__APPLE)
+ if (g_str_has_suffix (app_name, ".desktop"))
+ desktop_file_name = g_strdup (app_name);
+ else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]