summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-04-30 16:24:37 +0000
committerJustin Lecher <jlec@gentoo.org>2011-04-30 16:24:37 +0000
commit83be9b55981b1e0f3ecc962306e48743913ec7cb (patch)
tree880691f8e30b93c24228866a1855d0cfae670585 /media-gfx/xaralx/files/30_gtk_wxwidgets_symbol_clash.dpatch
parentapp-misc/gpligc: Moved to virtual/jpeg (diff)
downloadsunrise-83be9b55981b1e0f3ecc962306e48743913ec7cb.tar.gz
sunrise-83be9b55981b1e0f3ecc962306e48743913ec7cb.tar.bz2
sunrise-83be9b55981b1e0f3ecc962306e48743913ec7cb.zip
media-gfx/xaralx: Fix deps for gnome3, Make it compile again, included patches from debian
svn path=/sunrise/; revision=11985
Diffstat (limited to 'media-gfx/xaralx/files/30_gtk_wxwidgets_symbol_clash.dpatch')
-rw-r--r--media-gfx/xaralx/files/30_gtk_wxwidgets_symbol_clash.dpatch21
1 files changed, 21 insertions, 0 deletions
diff --git a/media-gfx/xaralx/files/30_gtk_wxwidgets_symbol_clash.dpatch b/media-gfx/xaralx/files/30_gtk_wxwidgets_symbol_clash.dpatch
new file mode 100644
index 000000000..8ddea0bc2
--- /dev/null
+++ b/media-gfx/xaralx/files/30_gtk_wxwidgets_symbol_clash.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_gtk_wxwidgets_symbol_clash.dpatch by Joachim Breitner <nomeata@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoid symbol clash as it is avoided in http://trac.wxwidgets.org/changeset/61009
+
+@DPATCH@
+diff -urNad xaralx-0.7r1785~/wxOil/ftfonts.cpp xaralx-0.7r1785/wxOil/ftfonts.cpp
+--- xaralx-0.7r1785~/wxOil/ftfonts.cpp 2007-11-07 01:48:24.000000000 +0100
++++ xaralx-0.7r1785/wxOil/ftfonts.cpp 2009-10-08 10:44:37.000000000 +0200
+@@ -122,8 +122,10 @@
+ #include FT_TYPE1_TABLES_H
+
+ #ifdef __WXGTK20__
++#define GSocket GlibGSocket
+ #include <gtk/gtk.h>
+ extern GtkWidget *wxGetRootWindow();
++#undef GSocket
+ #endif
+
+ CC_IMPLEMENT_DYNCREATE( FTFontMan, CCObject )