Created
August 23, 2013 05:17
-
-
Save thefloweringash/6315767 to your computer and use it in GitHub Desktop.
Xpra 0.10.1: FreeBSD compatibility
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
--- ./xpra/codecs/enc_x264/enc_x264.c.orig 2013-08-06 21:11:22.000000000 +1200 | |
+++ ./xpra/codecs/enc_x264/enc_x264.c 2013-08-23 17:08:56.000000000 +1200 | |
@@ -17,7 +17,7 @@ | |
#ifdef _WIN32 | |
#define _STDINT_H | |
#endif | |
-#if !defined(__APPLE__) | |
+#if !defined(__APPLE__) && !defined(__FreeBSD__) | |
#include <malloc.h> | |
#endif | |
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
--- ./xpra/codecs/memalign/memalign.c.orig 2013-07-26 20:27:21.000000000 +1200 | |
+++ ./xpra/codecs/memalign/memalign.c 2013-08-23 17:08:56.000000000 +1200 | |
@@ -13,7 +13,7 @@ | |
#ifdef _WIN32 | |
#define _STDINT_H | |
#endif | |
-#if !defined(__APPLE__) | |
+#if !defined(__APPLE__) && !defined(__FreeBSD__) | |
#include <malloc.h> | |
#endif | |
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
--- ./xpra/scripts/server.py.orig 2013-07-26 20:27:21.000000000 +1200 | |
+++ ./xpra/scripts/server.py 2013-08-23 17:10:06.000000000 +1200 | |
@@ -9,6 +9,7 @@ | |
# http://lists.partiwm.org/pipermail/parti-discuss/2008-September/000042.html | |
# (also do not import anything that imports gtk) | |
import gobject | |
+import glib | |
import subprocess | |
import sys | |
import os.path | |
@@ -451,7 +452,7 @@ | |
# Now we can safely load gtk and connect: | |
assert "gtk" not in sys.modules | |
import gtk.gdk #@Reimport | |
- gtk.gdk.threads_init() | |
+ glib.threads_init() | |
display = gtk.gdk.Display(display_name) | |
manager = gtk.gdk.display_manager_get() | |
default_display = manager.get_default_display() |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment