File gtkmathview-0.8.0-fridrich.patch of Package mingw32-gtkmathview

Overview Repositories Revisions Requests Users Attributes Meta

File gtkmathview-0.8.0-fridrich.patch of Package mingw32-gtkmathview (Revision 14dc9b29ddbe45a985837ad96465bc13)

Currently displaying revision 14dc9b29ddbe45a985837ad96465bc13 , Show latest

--- gtkmathview-0.8.0/mathmlsvg/main.cc	2007-08-17 12:02:46.000000000 +0200
+++ gtkmathview-0.8.0/mathmlsvg/main.cc	2009-06-16 09:52:44.000000000 +0200
@@ -20,6 +20,9 @@
 
 #include <cassert>
 #include <fstream>
+#include <string.h>
+
+#include <getopt.h>
 
 #include <popt.h>
 
--- gtkmathview-0.8.0/mathmlsvg/SMS.cc	2007-08-17 12:02:46.000000000 +0200
+++ gtkmathview-0.8.0/mathmlsvg/SMS.cc	2009-06-16 09:48:46.000000000 +0200
@@ -19,6 +19,7 @@
 #include <config.h>
 
 #include <sstream>
+#include <string.h>
 #include "defs.h"
 #include "AbstractLogger.hh"
 #include "ValueConversion.hh"
@@ -703,6 +704,7 @@
   if (asLocation(args[0], loc1) && asLocation(args[1], loc2))
   // delete "return 0" and insert here the code
     return 0;
+  return 0;
 }
 
 SmartPtr<Value>
--- gtkmathview-0.8.0/src/backend/common/Makefile.am	2007-10-15 09:04:19.000000000 +0200
+++ gtkmathview-0.8.0/src/backend/common/Makefile.am	2009-06-16 10:37:24.000000000 +0200
@@ -76,7 +76,7 @@
 MAYBE_T1LIB_L = $(NULL)
 endif
 
-libbackend_common_la_CPPFLAGS = -DGMV_MathView_DLL
+libbackend_common_la_CPPFLAGS = -DGMV_MathView_DLL $(GLIB_CFLAGS)
 libbackend_common_la_SOURCES = \
   Area.cc \
   AreaFactory.cc \
--- gtkmathview-0.8.0/src/backend/common/t1lib_T1FontManager.cc	2007-08-17 12:02:44.000000000 +0200
+++ gtkmathview-0.8.0/src/backend/common/t1lib_T1FontManager.cc	2009-06-16 10:35:17.000000000 +0200
@@ -20,6 +20,8 @@
 
 #include <t1lib.h>
 
+#include <glib.h>
+
 #include "AbstractLogger.hh"
 #include "Configuration.hh"
 #include "t1lib_T1Font.hh"
@@ -34,12 +36,12 @@
 {
   if (firstTime)
     {
-      if (getenv("T1LIB_CONFIG") == NULL)
+      if (g_getenv("T1LIB_CONFIG") == NULL)
 	{
 	  logger->out(LOG_WARNING, "T1LIB_CONFIG environment variable not set");
 
 	  String path = configuration->getString(logger, "default/t1lib/configuration", "");
-	  setenv("T1LIB_CONFIG", path.c_str(), 1);
+	  g_setenv("T1LIB_CONFIG", path.c_str(), 1);
 	}
 
       const void* res = T1_InitLib(LOGFILE | IGNORE_FONTDATABASE);
--- gtkmathview-0.8.0/src/common/gmv_defines.h	2007-08-17 12:02:45.000000000 +0200
+++ gtkmathview-0.8.0/src/common/gmv_defines.h	2009-06-16 09:57:57.000000000 +0200
@@ -20,7 +20,7 @@
 #ifndef __gmv_defines_h__
 #define __gmv_defines_h__
 
-#if defined(WIN32)
+#if defined(_MSC_VER)
 
 /*
 src/Makefile.am:lib_LTLIBRARIES = libmathview.la
@@ -100,6 +100,6 @@
 #define GMV_FrontEnd_EXPORT
 #define GMV_Widget_EXPORT
 
-#endif /* WIN32 */
+#endif /* _MSC_VER */
 
 #endif /* __gmv_defines_h__ */
--- gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc	2007-08-17 12:02:38.000000000 +0200
+++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc	2009-06-16 09:42:22.000000000 +0200
@@ -22,6 +22,8 @@
 
 #include "mathVariantAux.hh"
 
+#include <string.h>
+
 static MathVariantAttributes vattr[] = {
   { T_NORMAL,            "serif",         T_NORMAL,    T_NORMAL },
   { T_BOLD,              "serif",         T_BOLD,      T_NORMAL },
--- /dev/null	2009-06-10 18:59:04.000000000 +0200
+++ gtkmathview-0.8.0/ac-helpers/binreloc.m4	2009-06-16 10:39:37.000000000 +0200
@@ -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)
+])
--- /dev/null	2009-06-10 18:59:04.000000000 +0200
+++ gtkmathview-0.8.0/autogen.sh	2009-06-16 10:38:32.000000000 +0200
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+AUTOMAKE=automake
+ACLOCAL=aclocal
+$AUTOMAKE --version | perl -ne 'if (/$GNU $AUTOMAKE$ ([0-9].[0-9])/) {print; if ($1 < 1.7) {exit 1;}}'
+#AUTOMAKE=automake-1.7
+#ACLOCAL=aclocal-1.7
+if [ $? -ne 0 ]; then
+$AUTOMAKE --version | perl -ne 'if (/$GNU $AUTOMAKE$ ([0-9].[0-9])/) {print; if ($1 < 1.7) {exit 1;}}'
+
+if [ $? -ne 0 ]; then
+    echo "Error: you need automake 1.7 or later.  Please upgrade."
+    exit 1
+fi
+fi
+
+echo "libtoolize --force --copy"
+libtoolize --force --copy || {
+    echo "libtoolize failed! Unable to continue."
+    exit 1
+}
+
+# Produce aclocal.m4, so autoconf gets the automake macros it needs
+# 
+echo "Creating aclocal.m4: $ACLOCAL $ACLOCAL_FLAGS"
+
+ACLOCAL_FLAGS="-I ac-helpers $ACLOCAL_FLAGS"
+$ACLOCAL $ACLOCAL_FLAGS || {
+    echo "$ACLOCAL failed! Unable to continue."
+    exit 1
+}
+
+if test -f autom4te.cache/requests; then
+    echo "Checking for PKG_CHECK_MODULES in aclocal.m4 or autom4te.cache/requests ..."
+    pkgcheckdef=`grep PKG_CHECK_MODULES autom4te.cache/requests``grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
+else
+    echo "Checking for PKG_CHECK_MODULES in aclocal.m4 ..."
+    pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
+fi
+
+if test "x$pkgcheckdef" = "x"; then
+  echo "Running $ACLOCAL -I ac-helpers/pkg-config $ACLOCAL_FLAGS"
+  $ACLOCAL -I ac-helpers/pkg-config $ACLOCAL_FLAGS || {
+    echo "$ACLOCAL failed! Unable to continue."
+    exit 1
+  }
+  if test -f autom4te.cache/requests; then
+      echo "Checking for PKG_CHECK_MODULES in aclocal.m4 or autom4te.cache/requests ..."
+      pkgcheckdef=`grep PKG_CHECK_MODULES autom4te.cache/requests``grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
+  else
+      echo "Checking for PKG_CHECK_MODULES in aclocal.m4 ..."
+      pkgcheckdef=`grep PKG_CHECK_MODULES aclocal.m4 | grep AC_DEFUN`
+  fi
+  if test "x$pkgcheckdef" = "x"; then
+    echo ""
+    echo "error: PKG_CHECK_MODULES isn't defined"
+    echo ""
+    echo "   Either pkg.m4 wasn't in aclocal's search path or pkgconfig"
+    echo "   (or pkgconfig-devel?) isn't installed."
+    echo ""
+    echo "   If pkg-config is installed in <prefix> then re-run autogen.sh:"
+    echo ""
+    echo "       ACLOCAL_FLAGS=\"-I <prefix>/share/aclocal\" ./autogen.sh"
+    echo ""
+    exit
+  fi
+fi
+
+autoheader
+
+# Produce all the `GNUmakefile.in's and create neat missing things
+# like `install-sh', etc.
+# 
+echo "$AUTOMAKE --add-missing --copy --foreign"
+
+$AUTOMAKE --add-missing --copy --foreign || {
+    echo ""
+    echo "* * * warning: possible errors while running automake"
+    echo ""
+}
+
+echo "autoconf"
+autoconf || {
+    echo "autoconf failed! Unable to continue."
+    exit 1
+}
--- gtkmathview-0.8.0/src/backend/svg/Makefile.am	2007-04-25 10:14:33.000000000 +0200
+++ gtkmathview-0.8.0/src/backend/svg/Makefile.am	2009-06-16 14:17:22.000000000 +0200
@@ -29,7 +29,7 @@
 endif
 
 libmathview_backend_svg_la_CPPFLAGS = -DGMV_BackEnd_DLL
-libmathview_backend_svg_la_LDFLAGS = -version-info @MATHVIEW_VERSION_INFO@
+libmathview_backend_svg_la_LDFLAGS = -version-info @MATHVIEW_VERSION_INFO@ -no-undefined
 
 libmathview_backend_svg_la_SOURCES = \
   SVG_AreaFactory.hh \
@@ -56,6 +56,10 @@
   $(MAYBE_TFM_H) \
   $(NULL)
 
+libmathview_backend_svg_la_LIBADD = \
+  $(top_builddir)/src/common/libcommon.la \
+  $(top_builddir)/src/backend/common/libbackend_common.la
+
 mathviewdir = $(pkgincludedir)/MathView
 mathview_HEADERS = \
   SVG_Backend.hh \
--- gtkmathview-0.8.0/src/engine/boxml/Makefile.am	2007-04-25 10:14:28.000000000 +0200
+++ gtkmathview-0.8.0/src/engine/boxml/Makefile.am	2009-06-19 14:34:10.000000000 +0200
@@ -55,6 +55,8 @@
   -I$(top_srcdir)/src/common \
   -I$(top_srcdir)/src/common/mathvariants \
   -I$(top_srcdir)/src/engine/common \
+  -I$(top_srcdir)/src/engine/mathml \
   -I$(top_srcdir)/src/backend/common \
+  -I$(top_srcdir)/src/frontend/common \
   $(NULL)
 
--- gtkmathview-0.8.0/src/engine/adapters/Makefile.am	2007-04-25 10:14:32.000000000 +0200
+++ gtkmathview-0.8.0/src/engine/adapters/Makefile.am	2009-06-19 14:34:46.000000000 +0200
@@ -22,5 +22,6 @@
   -I$(top_srcdir)/src/engine/mathml \
   -I$(top_srcdir)/src/engine/boxml \
   -I$(top_srcdir)/src/backend/common \
+  -I$(top_srcdir)/src/frontend/common \
   $(NULL)
 
--- gtkmathview-0.8.0/src/common/AbstractLogger.cc	Sat Oct 24 08:16:47 2009
+++ gtkmathview-0.8.0/src/common/AbstractLogger.cc	Sat Oct 24 08:17:19 2009
@@ -19,6 +19,7 @@
 #include <config.h>
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #include "AbstractLogger.hh"

Places

File gtkmathview-0.8.0-fridrich.patch of Package mingw32-gtkmathview (Revision 14dc9b29ddbe45a985837ad96465bc13)

Places