diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-03-06 13:13:51 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-03-06 13:13:51 +0000 |
| commit | 7c40ec5b6a95eed2724b4f3627baff0f88755234 (patch) | |
| tree | b9899a78c74618ea145bda60d1e443d597f8ee6a /x11-libs/gtkmathview/files | |
| parent | Slot net-libs/webkit-gtk to 2 (diff) | |
| download | gentoo-2-7c40ec5b6a95eed2724b4f3627baff0f88755234.tar.gz gentoo-2-7c40ec5b6a95eed2724b4f3627baff0f88755234.tar.bz2 gentoo-2-7c40ec5b6a95eed2724b4f3627baff0f88755234.zip | |
Fix building against libxml2[icu], bug #356095 by Joaquim Uchoa. Thanks a lot to yury fedorchenko for the patch.
(Portage version: 2.1.9.42/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/gtkmathview/files')
| -rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch new file mode 100644 index 000000000000..3f566f7bf5f7 --- /dev/null +++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch @@ -0,0 +1,49 @@ +diff -urN gtkmathview-0.8.0_old/src/widget/gtkmathview_common.h gtkmathview-0.8.0/src/widget/gtkmathview_common.h +--- gtkmathview-0.8.0_old/src/widget/gtkmathview_common.h 2011-03-01 12:17:35.000000000 +0300 ++++ gtkmathview-0.8.0/src/widget/gtkmathview_common.h 2011-03-01 12:25:00.000000000 +0300 +@@ -22,6 +22,20 @@ + + #include <gtk/gtkwidget.h> + ++#if GTKMATHVIEW_USES_CUSTOM_READER ++#include "c_customXmlReader.h" ++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader ++#elif GTKMATHVIEW_USES_LIBXML2_READER ++#include <libxml/xmlreader.h> ++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader ++#elif GTKMATHVIEW_USES_LIBXML2 ++#include <libxml/tree.h> ++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2 ++#elif GTKMATHVIEW_USES_GMETADOM ++#include <gdome.h> ++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif /* __cplusplus */ +@@ -45,24 +59,16 @@ + typedef void* GtkMathViewReaderData; + + #if GTKMATHVIEW_USES_CUSTOM_READER +-#include "c_customXmlReader.h" +-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader + typedef void* GtkMathViewModelId; + typedef const char* GtkMathViewModelString; + #elif GTKMATHVIEW_USES_LIBXML2_READER +-#include <libxml/xmlreader.h> +-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader + typedef void* GtkMathViewModelId; + typedef const xmlChar* GtkMathViewModelString; + #elif GTKMATHVIEW_USES_LIBXML2 +-#include <libxml/tree.h> +-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2 + typedef xmlElement* GtkMathViewModelId; + typedef xmlDoc* GtkMathViewModelDocument; + typedef const xmlChar* GtkMathViewModelString; + #elif GTKMATHVIEW_USES_GMETADOM +-#include <gdome.h> +-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom + typedef GdomeElement* GtkMathViewModelId; + typedef GdomeDocument* GtkMathViewModelDocument; + typedef GdomeDOMString* GtkMathViewModelString; |