diff options
Diffstat (limited to 'x11-libs/gtkmathview')
-rw-r--r-- | x11-libs/gtkmathview/Manifest | 14 | ||||
-rw-r--r-- | x11-libs/gtkmathview/files/binreloc.m4 | 77 | ||||
-rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch | 22 | ||||
-rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch | 49 | ||||
-rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch | 61 | ||||
-rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch | 10 | ||||
-rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch | 101 | ||||
-rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch | 99 | ||||
-rw-r--r-- | x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch | 61 | ||||
-rw-r--r-- | x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild | 77 | ||||
-rw-r--r-- | x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild | 84 | ||||
-rw-r--r-- | x11-libs/gtkmathview/metadata.xml | 13 |
12 files changed, 668 insertions, 0 deletions
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest new file mode 100644 index 000000000000..754b94905c62 --- /dev/null +++ b/x11-libs/gtkmathview/Manifest @@ -0,0 +1,14 @@ +AUX binreloc.m4 2563 SHA256 cc9c0d1dd10f7664aaa37c7d77e426fa976eb8cd96a739760545c75db7c1096b SHA512 f19802e6c97001cc90b74700bf9be4aabf9d127cc28f05a5d3807fa952d31ec53526b07ec95a7c3d1c28e48e2cc5624ce38502cfe90c805b90ec5091b82febab WHIRLPOOL 17d1ec7552dbdf5a67bfcfcfc526f343ef17aa85354639b38cc1bf52bc6009262f140e8b19de82c5c1d27ebd89c6e7a7e86ce5c60e2a8b921fd4771abeaffb4e +AUX gtkmathview-0.8.0-cond-t1.patch 1270 SHA256 731894b852a8f692a3a1778bf6666a43e6afaa38e30b73d90272ae56d65bf709 SHA512 bd5aa2385d9452d05293ec59670f1640c35875c1fcba5197b793093f3322900d7ca6fd005d2cc6622215d83746d738722a59f2ee656312284eaf6c2ca0498d13 WHIRLPOOL 79f36abafbe08ca9ab8cbf377f127d3151c84aea4dd5ae00566e2a02b0ca9b4b05c9ed3e11ad63f6dfc2553f78440a195cd2d9f6df964c73182c189adb184632 +AUX gtkmathview-0.8.0-fix-template.patch 2209 SHA256 b5c43c185ec0920882eb8f27e46082baf32c0e9583c62bfc28d1c6a2ca4e0a7b SHA512 d65275e14542e5cf45b19731c2ecac9cfa88454abb5f0a35c6ed94e2ae75d082c826eabc530e4d4430af87f86573f7fa1271930713fe22c8cbdb0fe45e4c80d3 WHIRLPOOL 2d1f28b248ace3a407213f711e9c224a36d6f7fb7c77116d1e8b02c9993231a25b716adc0e480df7570bcc9b17aa000aa061f232b22f8fb382847e8bcdc30460 +AUX gtkmathview-0.8.0-gcc43.patch 1437 SHA256 49bac4edcbad1b06614e889f28fc89f4b6d4a013e0e14f0a6bffc9e92a68e047 SHA512 3d1e57a17bdf539e10a72463b293e4a7870df63b47da6d69bb2519277d815582df652db29e3e22d8d4e50f489e9f7a485d04b90118e00be47c1699e46492d67d WHIRLPOOL 203f49e5953cd466ed1f798598d370738445d9078bb2e7a0ae7e8c40eb93795d1c2217534f2efcefb7dbc257559e2954d54bb8d9fa2d4fec1f81915386e434bb +AUX gtkmathview-0.8.0-gcc44.patch 263 SHA256 0b1b5fdd85b019ca6db975c786c42902939e2e945130f230441cf34208ef947e SHA512 fed98000cd4ac710f8b683fbf2c5a0ecfa4064d56af314e0367e6ae84a7c6fdcc56cefb2a2998854f765783b5c3ce6d930e6969087dd88acef47d4cfb26ef3b6 WHIRLPOOL 243900486b005e357735faac2adfbfe61e856e10b6025881ef8b08aca46d76823630da4654efff234b4d65e14d15b742e9305f7295793bc58b4de01f5815d3be +AUX gtkmathview-0.8.0-gcc47.patch 3123 SHA256 520ca656ce5ebd32efe7183cbb09b270c2cb80099632628afc397070089d5d92 SHA512 e5c7a1d32bd578ad56d5008bd46f99f49a1d292f46b1f525da8f6c4d20b3fde796d93c7520f5161f43dabba7e7275aa1daf990b08d1aad0ac3445af6b9989f5a WHIRLPOOL 3c1e89b29de2cecee1e151f0df7f14e7988a123cb58372ab0c0653a04bf0b305330c434e726964d0574062e28d7f7f3bf1da34d65dbec966eeb5233ddbc662a2 +AUX gtkmathview-0.8.0-gcc6.patch 2043 SHA256 74d32fe6a816e78c2e53920342ef51379bedb79515f44b39f54eb59a1702605b SHA512 c2a9d5b1bf14130ddea729a7cbe158f2029ba18ff5c3fd89882e1948e5eb1b903f4f4a7d3c02fb33f9fa9e3dff9db80516a6c3c895daa5f4b5612dfa2e5f4629 WHIRLPOOL 2a9429fa6f472f601c2cbbeb627ca9016ba4a68bfd409d32b92169652b642d78fa017f9a53d4b4aa6f3bb2ef61f3513510649b631711b61ed49c2090d7aae5d8 +AUX gtkmathview-0.8.0-underlinking.patch 1926 SHA256 d0a466e074f0344529410f988a2097b0103cf86eca760c8f1a6da6a0a2cbd682 SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d WHIRLPOOL 10543128125189822f9b066c555d8126071332d464161210c0f94593307913d896a32cf6f75abac510edaf0409a73ff67ee5d843581fdc07dc8a5e40c79fc402 +DIST gtkmathview-0.8.0.tar.gz 987328 SHA256 1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb WHIRLPOOL ade6b30a20e8f0e38b2a9935733425759eb69db3d28ad9ebc28f5441fc82571a52787381d4d3f48852f9bcf1550318048a316bd92c9151fdf3074bf3f4edd591 +EBUILD gtkmathview-0.8.0-r2.ebuild 1986 SHA256 3c2a12775484d4bfe7e1b43cd079528ce9a628a5e3af76571fa5e54fc9ba5501 SHA512 e4115e71579be885119f9e9ce20e5748d5dbdcd105b64c8a8a03d09f964a673b74e220de80f966a7437f79497537789bf9c9147bcd7b16a0b15a7fbf99857293 WHIRLPOOL 3d52aa436938cd030d0cb11244bdfc143cd44ecd1dfe330914dcd1a3924f24cb4bd97579c42024510df16dc45e0c906743ef7c4175a0c378ef2a18c3274a8738 +EBUILD gtkmathview-0.8.0-r3.ebuild 1995 SHA256 4275e9eb7be4132be237ae0b3d72967487667acfb77b7c3cddcfd42c427d066d SHA512 17d8cfac37861a617436e22c250b6a14ea571a12fa05e5ab68c7f055cae36fd3a70941ff39330ff57fedfc5767b30304966fb7a560c6825409c70cc2da98d323 WHIRLPOOL f470c56346cfd8cc7916719a170ac833ffca21b81c25fd37064262dbfb35628efa80d24cff41211f30033d7e72113d964a41b91426cf94d65feb0371fc11c0f4 +MISC ChangeLog 3112 SHA256 cc24ebf9f7734f7c75a28e112d1ca81bb9de798e1bde2fdcfcf0e363443396f5 SHA512 01f670edf42c940441599280b655db961dfe54d3823bb916bcb48fe91e72c5c9a6dec18e419f8c4f52410cd3f6144abf899cb6dc4eb7f4974c0430f195d7c626 WHIRLPOOL be37c0e7bca0af9d8dab8045d14cbfab6abe21dc3c89347a7d7a3dbd49a11ee5e3232b95d7cb5b6383cfeebe91650d945552c8a5bc8eb61531b7ebbf9b8154da +MISC ChangeLog-2015 8477 SHA256 af24b199e754b29bdf78cf6cd63dce6436430bc0da059a5332e9b282aa0ab114 SHA512 3afa717f85b6deefe57e129ffc5f422f4c503edbaf70a5b8effedede253952e82660b4cd4de77d347a2103e17100f3a96dc32028f905650373bdc149fc64b14c WHIRLPOOL 07360ec4ab95e9e31682b8b91bb39059e4b3c3a7484addcbd3664f5c703a25afc5d3b63c019d3f694560ae4f99a2fbf4f129611d4114529a50cbf3e3c22af844 +MISC metadata.xml 413 SHA256 cb1148098db7af900af1e2e78bc310f0e444263d9441bd7be4b860a461f41246 SHA512 734ee7fb5aa123fb2794a22b1a374e514a92a640e7bbd35ee53de045126d0b330f177db4018ddf76e9932f984a2f5c1646d3a3f642b29972df0af88f64fb1352 WHIRLPOOL 3e082567600f946e6cd9311fbd618ff8315a02cf25c8dcce4c1458d194f527405e54cc08cf9b57c9a867ffe6d34e68f14211929cad697f9a06211200dd669d57 diff --git a/x11-libs/gtkmathview/files/binreloc.m4 b/x11-libs/gtkmathview/files/binreloc.m4 new file mode 100644 index 000000000000..46696bf64567 --- /dev/null +++ b/x11-libs/gtkmathview/files/binreloc.m4 @@ -0,0 +1,77 @@ +# Check for binary relocation support +# Hongli Lai +# http://autopackage.org/ + +AC_DEFUN([AM_BINRELOC], +[ + AC_ARG_ENABLE(binreloc, + [ --enable-binreloc compile with binary relocation support + (default=disable)], + enable_binreloc=$enableval,enable_binreloc=no) + + AC_ARG_ENABLE(binreloc-threads, + [ --enable-binreloc-threads compile binary relocation with threads support + (default=yes)], + enable_binreloc_threads=$enableval,enable_binreloc_threads=yes) + + BINRELOC_CFLAGS= + BINRELOC_LIBS= + if test "x$enable_binreloc" = "xauto"; then + AC_CHECK_FILE([/proc/self/maps]) + AC_CACHE_CHECK([whether everything is installed to the same prefix], + [br_cv_valid_prefixes], [ + if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \ + "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \ + "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc' + then + br_cv_valid_prefixes=yes + else + br_cv_valid_prefixes=no + fi + ]) + fi + AC_CACHE_CHECK([whether binary relocation support should be enabled], + [br_cv_binreloc], + [if test "x$enable_binreloc" = "xyes"; then + br_cv_binreloc=yes + elif test "x$enable_binreloc" = "xauto"; then + if test "x$br_cv_valid_prefixes" = "xyes" -a \ + "x$ac_cv_file__proc_self_maps" = "xyes"; then + br_cv_binreloc=yes + else + br_cv_binreloc=no + fi + else + br_cv_binreloc=no + fi]) + + if test "x$br_cv_binreloc" = "xyes"; then + BINRELOC_CFLAGS="-DENABLE_BINRELOC" + AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?]) + if test "x$enable_binreloc_threads" = "xyes"; then + AC_CHECK_LIB([pthread], [pthread_getspecific]) + fi + + AC_CACHE_CHECK([whether binary relocation should use threads], + [br_cv_binreloc_threads], + [if test "x$enable_binreloc_threads" = "xyes"; then + if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then + br_cv_binreloc_threads=yes + else + br_cv_binreloc_threads=no + fi + else + br_cv_binreloc_threads=no + fi]) + + if test "x$br_cv_binreloc_threads" = "xyes"; then + BINRELOC_LIBS="-lpthread" + AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?]) + else + BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0" + AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?]) + fi + fi + AC_SUBST(BINRELOC_CFLAGS) + AC_SUBST(BINRELOC_LIBS) +]) diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch new file mode 100644 index 000000000000..9f134745da72 --- /dev/null +++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch @@ -0,0 +1,22 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc +--- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc 2007-08-17 06:02:40.000000000 -0400 ++++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc 2008-06-26 14:46:31.000000000 -0400 +@@ -24,7 +24,6 @@ + #include "PS_StreamRenderingContext.hh" + #include "String.hh" + #include "FontDataBase.hh" +-#include "T1_FontDataBase.hh" + + PS_StreamRenderingContext::PS_StreamRenderingContext(const SmartPtr<AbstractLogger>& logger, + std::ostream& os, +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh +--- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh 2007-08-17 06:02:40.000000000 -0400 ++++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh 2008-06-26 14:46:31.000000000 -0400 +@@ -25,7 +25,6 @@ + #include "PS_RenderingContext.hh" + #include "String.hh" + #include "FontDataBase.hh" +-#include "T1_FontDataBase.hh" + + class GMV_BackEnd_EXPORT PS_StreamRenderingContext : public PS_RenderingContext + { 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; diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch new file mode 100644 index 000000000000..63b49180e4ac --- /dev/null +++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch @@ -0,0 +1,61 @@ +diff --git a/mathmlps/main.cc b/mathmlps/main.cc +index b1a10b7..6d1f58e 100644 +--- a/mathmlps/main.cc ++++ b/mathmlps/main.cc +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <cassert> ++#include <cstring> + #include <fstream> + + #include <popt.h> +diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc +index d513e43..1f1f9d1 100644 +--- a/mathmlsvg/SMS.cc ++++ b/mathmlsvg/SMS.cc +@@ -22,6 +22,7 @@ + + #include <config.h> + ++#include <cstring> + #include <sstream> + #include "defs.h" + #include "AbstractLogger.hh" +diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc +index ee031a8..fcc9f5c 100644 +--- a/mathmlsvg/main.cc ++++ b/mathmlsvg/main.cc +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <cassert> ++#include <cstring> + #include <fstream> + + #include <popt.h> +diff --git a/src/backend/ps/T1_FontDataBase.cc b/src/backend/ps/T1_FontDataBase.cc +index c4299ba..538f18d 100644 +--- a/src/backend/ps/T1_FontDataBase.cc ++++ b/src/backend/ps/T1_FontDataBase.cc +@@ -23,7 +23,7 @@ + #include <t1lib.h> + #include <config.h> + #include <map> +-#include <string> ++#include <cstring> + #include <stdlib.h> + #include <iostream> + #include <list> +diff --git a/src/engine/mathml/mathVariantAux.cc b/src/engine/mathml/mathVariantAux.cc +index 7792ca5..92e4716 100644 +--- a/src/engine/mathml/mathVariantAux.cc ++++ b/src/engine/mathml/mathVariantAux.cc +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <cassert> ++#include <cstring> + + #include "mathVariantAux.hh" + diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch new file mode 100644 index 000000000000..f15a6ff73fa8 --- /dev/null +++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch @@ -0,0 +1,10 @@ +--- a/src/common/AbstractLogger.cc.orig 2009-04-25 20:39:35.815053524 +0100 ++++ b/src/common/AbstractLogger.cc 2009-04-25 20:40:01.240595176 +0100 +@@ -19,6 +19,7 @@ + #include <config.h> + + #include <stdarg.h> ++#include <stdio.h> + + #include "AbstractLogger.hh" + diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch new file mode 100644 index 000000000000..48180ea12fe8 --- /dev/null +++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch @@ -0,0 +1,101 @@ +From bf7e95285e8df1bc3b86085791de7cf94c2f544f Mon Sep 17 00:00:00 2001 +From: Luca <luca@ant.local> +Date: Tue, 10 Apr 2012 16:39:57 +0200 +Subject: [PATCH] + patches from Vincent Untz + +Conflicts: + + CONTRIBUTORS +--- + mathmlps/main.cc | 7 +++++++ + mathmlsvg/SMS.cc | 1 + + mathmlsvg/main.cc | 7 +++++++ + src/frontend/common/TemplateBuilder.hh | 7 ++++--- + src/frontend/common/TemplateElementIterator.hh | 2 +- + 5 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/mathmlps/main.cc b/mathmlps/main.cc +index 48339af..6de113c 100644 +--- a/mathmlps/main.cc ++++ b/mathmlps/main.cc +@@ -21,6 +21,13 @@ + #include <cassert> + #include <cstring> + #include <fstream> ++#ifdef __linux__ ++/* to get getopt on Linux */ ++#ifndef __USE_POSIX2 ++#define __USE_POSIX2 ++#endif ++#endif ++#include <unistd.h> + + #include <popt.h> + +diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc +index be7add8..f4b0ddc 100644 +--- a/mathmlsvg/SMS.cc ++++ b/mathmlsvg/SMS.cc +@@ -704,6 +704,7 @@ SMS::fun_depart(const HandlerArgs& args) const + if (asLocation(args[0], loc1) && asLocation(args[1], loc2)) + // delete "return 0" and insert here the code + return 0; ++ return 0; + } + + SmartPtr<Value> +diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc +index c49e8ac..42e7895 100644 +--- a/mathmlsvg/main.cc ++++ b/mathmlsvg/main.cc +@@ -21,6 +21,13 @@ + #include <cassert> + #include <cstring> + #include <fstream> ++#ifdef __linux__ ++/* to get getopt on Linux */ ++#ifndef __USE_POSIX2 ++#define __USE_POSIX2 ++#endif ++#endif ++#include <unistd.h> + + #include <popt.h> + +diff --git a/src/frontend/common/TemplateBuilder.hh b/src/frontend/common/TemplateBuilder.hh +index f5c8341..2b9a1ac 100644 +--- a/src/frontend/common/TemplateBuilder.hh ++++ b/src/frontend/common/TemplateBuilder.hh +@@ -47,12 +47,13 @@ protected: + SmartPtr<typename ElementBuilder::type> + getElement(const typename Model::Element& el) const + { +- if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el))) ++ SmartPtr<typename ElementBuilder::type> elem; ++ if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el))) + return elem; + else + { +- SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); +- linkerAdd(el, elem); ++ elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); ++ this->linkerAdd(el, elem); + return elem; + } + } +diff --git a/src/frontend/common/TemplateElementIterator.hh b/src/frontend/common/TemplateElementIterator.hh +index 5366040..25b5fef 100644 +--- a/src/frontend/common/TemplateElementIterator.hh ++++ b/src/frontend/common/TemplateElementIterator.hh +@@ -43,7 +43,7 @@ protected: + findValidNodeForward(const typename Model::Node& p0) const + { + for (typename Model::Node p = p0; p; p = Model::getNextSibling(p)) +- if (valid(p)) return Model::asElement(p); ++ if (this->valid(p)) return Model::asElement(p); + return typename Model::Element(); + } + +-- +1.7.8.6 + diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch new file mode 100644 index 000000000000..7361f8e90c7c --- /dev/null +++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc6.patch @@ -0,0 +1,99 @@ +From: Gert Wollny <gw.fossdev@gmail.com> +Date: Sun, 26 Jun 2016 13:25:00 +0200 +Description: gcc 6.0 build fixes +Bug: https://bugs.debian.org/811682 + +--- a/src/engine/common/View.cc ++++ b/src/engine/common/View.cc +@@ -291,7 +291,7 @@ + } + } + +- return false; ++ return SmartPtr<Element>(); + } + + bool +--- a/src/backend/common/tfm/TFM.hh ++++ b/src/backend/common/tfm/TFM.hh +@@ -37,7 +37,7 @@ + unsigned char face; + const char* codingScheme; + int designSize; +- int checksum; ++ unsigned int checksum; + unsigned int nDimensions; + unsigned int nCharacters; + }; +@@ -52,7 +52,7 @@ + struct Kerning + { + UChar8 index; +- int value; ++ unsigned int value; + }; + + struct Ligature +@@ -67,7 +67,7 @@ + UChar8 index; + int width; + int height; +- int depth; ++ unsigned int depth; + int italicCorrection; + unsigned char nKernings; + const Kerning* kerning; +--- a/src/backend/common/ComputerModernShaper.cc ++++ b/src/backend/common/ComputerModernShaper.cc +@@ -578,7 +578,7 @@ + }; + #endif + +-static ComputerModernShaper::PlainChar cmsMap[] = ++static ComputerModernShaper::PlainChar32 cmsMap[] = + { + { 0x007B, 0x66 }, // LEFT CURLY BRACKET + { 0x007D, 0x67 }, // RIGHT CURLY BRACKET +--- a/src/backend/common/StandardSymbolsShaper.hh ++++ b/src/backend/common/StandardSymbolsShaper.hh +@@ -32,20 +32,20 @@ + struct HStretchyChar + { + Char16 ch; +- Char8 normal; +- Char8 left; +- Char8 glue; +- Char8 right; ++ UChar8 normal; ++ UChar8 left; ++ UChar8 glue; ++ UChar8 right; + }; + + struct VStretchyChar + { + Char16 ch; +- Char8 normal; +- Char8 top; +- Char8 glue; +- Char8 middle; +- Char8 bottom; ++ UChar8 normal; ++ UChar8 top; ++ UChar8 glue; ++ UChar8 middle; ++ UChar8 bottom; + }; + + protected: +--- a/src/backend/common/StandardSymbolsShaper.cc ++++ b/src/backend/common/StandardSymbolsShaper.cc +@@ -29,7 +29,7 @@ + #include "ShapingContext.hh" + + struct GlyphMap { +- Char8 index; ++ UChar8 index; + Char16 ch; + }; + diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch new file mode 100644 index 000000000000..35cb9bec6a9d --- /dev/null +++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch @@ -0,0 +1,61 @@ +From 319c39458e72be82ed1ce60f0a386a146964f507 Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru <sylvestre@debian.org> +Date: Sun, 13 Mar 2011 19:00:15 +0100 +Subject: [PATCH] Fix underlinking (required to build with gold link editor) + +See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554753 +--- + mathmlps/Makefile.am | 1 + + mathmlsvg/Makefile.am | 2 ++ + viewer/Makefile.am | 3 +++ + 3 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/mathmlps/Makefile.am b/mathmlps/Makefile.am +index 201f410..717cd20 100644 +--- a/mathmlps/Makefile.am ++++ b/mathmlps/Makefile.am +@@ -17,6 +17,7 @@ mathmlps_LDADD = \ + $(GLIB_LIBS) \ + $(top_builddir)/src/backend/ps/libmathview_backend_ps.la \ + $(top_builddir)/src/view/libmathview_frontend_libxml2.la \ ++ $(top_builddir)/src/libmathview.la \ + $(NULL) + + INCLUDES = \ +diff --git a/mathmlsvg/Makefile.am b/mathmlsvg/Makefile.am +index 2290230..8007350 100644 +--- a/mathmlsvg/Makefile.am ++++ b/mathmlsvg/Makefile.am +@@ -30,6 +30,8 @@ mathmlsvg_LDADD = \ + $(GLIB_LIBS) \ + $(top_builddir)/src/backend/svg/libmathview_backend_svg.la \ + $(top_builddir)/src/view/libmathview_frontend_libxml2.la \ ++ $(top_builddir)/src/libmathview.la \ ++ -lxml2 \ + $(NULL) + + INCLUDES = \ +diff --git a/viewer/Makefile.am b/viewer/Makefile.am +index 7b950a0..67220b4 100644 +--- a/viewer/Makefile.am ++++ b/viewer/Makefile.am +@@ -31,6 +31,7 @@ mathmlviewer_static_LDADD = \ + $(DOM_LIBS) \ + $(GTK_LIBS) \ + $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \ ++ $(top_builddir)/src/engine/boxml/libboxml.la \ + $(T1_LIBS) \ + $(T1_LIBS_X) \ + $(NULL) +@@ -88,6 +89,8 @@ test_rendering_LDADD = \ + $(T1_LIBS_X) \ + $(GLIB_LIBS) \ + $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \ ++ $(top_builddir)/src/libmathview.la \ ++ $(top_builddir)/src/engine/boxml/libboxml.la \ + $(top_builddir)/src/view/libmathview_frontend_libxml2.la \ + $(NULL) + +-- +1.7.8 + diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild new file mode 100644 index 000000000000..4b57785e9a43 --- /dev/null +++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit autotools eutils + +DESCRIPTION="Rendering engine for MathML documents" +HOMEPAGE="http://helm.cs.unibo.it/mml-widget/" +SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz" + +LICENSE="LGPL-3" + +SLOT="0" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86" +IUSE="gtk mathml svg t1lib" + +RDEPEND=">=dev-libs/glib-2.2.1:2 + >=dev-libs/popt-1.7 + >=dev-libs/libxml2-2.6.7:2 + gtk? ( >=x11-libs/gtk+-2.2.1:2 + >=media-libs/t1lib-5:5 + x11-libs/pango + || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) ) + mathml? ( media-fonts/texcm-ttf ) + t1lib? ( >=media-libs/t1lib-5:5 )" +DEPEND="${RDEPEND} + dev-libs/libxslt + virtual/pkgconfig" + +DOCS="ANNOUNCEMENT AUTHORS BUGS ChangeLog CONTRIBUTORS HISTORY NEWS README TODO" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-gcc44.patch \ + "${FILESDIR}"/${P}-cond-t1.patch + + # Fix building against libxml2[icu], bug #356095 + epatch "${FILESDIR}"/${P}-fix-template.patch + + # Fix building with gold, bug #369117; requires eautoreconf + epatch "${FILESDIR}/${P}-underlinking.patch" + + epatch "${FILESDIR}/${P}-gcc47.patch" + + # m4 macros from upstream git, required for eautoreconf + if [[ ! -d ac-helpers ]]; then + mkdir ac-helpers || die "mkdir failed" + cp "${FILESDIR}/binreloc.m4" ac-helpers || die "cp failed" + fi + + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + + AT_M4DIR=ac-helpers eautoreconf +} + +src_configure() { + # --disable-popt will build only the library and not the frontend + # TFM is needed for SVG, default value is 2 + econf $(use_enable gtk) \ + $(use_enable svg) \ + $(use_with t1lib) \ + --with-popt \ + --enable-libxml2 \ + --enable-libxml2-reader \ + --enable-ps \ + --enable-tfm=2 \ + --enable-builder-cache \ + --enable-breaks \ + --enable-boxml \ + --disable-gmetadom \ + --disable-static +} + +src_install() { + default + prune_libtool_files +} diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild new file mode 100644 index 000000000000..13d87d522276 --- /dev/null +++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools + +DESCRIPTION="Rendering engine for MathML documents" +HOMEPAGE="http://helm.cs.unibo.it/mml-widget/" +SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz" + +LICENSE="LGPL-3" + +SLOT="0" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86" +IUSE="gtk mathml svg t1lib" + +RDEPEND=" + >=dev-libs/glib-2.2.1:2 + >=dev-libs/popt-1.7 + >=dev-libs/libxml2-2.6.7:2 + gtk? ( + >=media-libs/t1lib-5:5 + >=x11-libs/gtk+-2.2.1:2 + x11-libs/pango + x11-libs/pangox-compat + ) + mathml? ( media-fonts/texcm-ttf ) + t1lib? ( >=media-libs/t1lib-5:5 ) +" +DEPEND="${RDEPEND} + dev-libs/libxslt + virtual/pkgconfig +" + +DOCS=( ANNOUNCEMENT AUTHORS BUGS ChangeLog CONTRIBUTORS HISTORY NEWS README TODO ) + +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-gcc44.patch + "${FILESDIR}"/${P}-cond-t1.patch + # Fix building against libxml2[icu], bug #356095 + "${FILESDIR}"/${P}-fix-template.patch + # Fix building with gold, bug #369117; requires eautoreconf + "${FILESDIR}"/${P}-underlinking.patch + "${FILESDIR}"/${P}-gcc47.patch + "${FILESDIR}"/${P}-gcc6.patch +) + +src_prepare() { + default + + # m4 macros from upstream git, required for eautoreconf + if [[ ! -d ac-helpers ]]; then + mkdir ac-helpers || die "mkdir failed" + cp "${FILESDIR}"/binreloc.m4 ac-helpers || die "cp failed" + fi + + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die + + AT_M4DIR=ac-helpers eautoreconf +} + +src_configure() { + # --disable-popt will build only the library and not the frontend + # TFM is needed for SVG, default value is 2 + econf $(use_enable gtk) \ + $(use_enable svg) \ + $(use_with t1lib) \ + --with-popt \ + --enable-libxml2 \ + --enable-libxml2-reader \ + --enable-ps \ + --enable-tfm=2 \ + --enable-builder-cache \ + --enable-breaks \ + --enable-boxml \ + --disable-gmetadom \ + --disable-static +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/x11-libs/gtkmathview/metadata.xml b/x11-libs/gtkmathview/metadata.xml new file mode 100644 index 000000000000..ff2703fcd58b --- /dev/null +++ b/x11-libs/gtkmathview/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="mathml">Install additional fonts for proper mathml + support.</flag> + <flag name="t1lib">Enable <pkg>media-libs/t1lib</pkg> support</flag> +</use> +</pkgmetadata> |