summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/gtkmathview/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/gtkmathview/files')
-rw-r--r--x11-libs/gtkmathview/files/binreloc.m477
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch22
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch49
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch61
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch10
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch101
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch61
7 files changed, 381 insertions, 0 deletions
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..f85a828e1f23
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch
@@ -0,0 +1,10 @@
+--- src/common/AbstractLogger.cc.orig 2009-04-25 20:39:35.815053524 +0100
++++ 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-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
+