Bug#667195: add patch
Matthias Klose
doko at debian.org
Fri May 4 07:01:36 UTC 2012
tags 667195 + patch
thanks
-------------- next part --------------
diff -u gtkmathview-0.8.0/debian/changelog gtkmathview-0.8.0/debian/changelog
--- gtkmathview-0.8.0/debian/changelog
+++ gtkmathview-0.8.0/debian/changelog
@@ -1,3 +1,10 @@
+gtkmathview (0.8.0-7.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Fix build failure with GCC 4.7. Closes: #667195.
+
+ -- Matthias Klose <doko at debian.org> Fri, 04 May 2012 07:47:04 +0200
+
gtkmathview (0.8.0-7) unstable; urgency=low
* Update the Vcs URLs
diff -u gtkmathview-0.8.0/debian/patches/series gtkmathview-0.8.0/debian/patches/series
--- gtkmathview-0.8.0/debian/patches/series
+++ gtkmathview-0.8.0/debian/patches/series
@@ -4,2 +4,3 @@
0004-gcc-4.4-build-fixes.patch
+0005-gcc-4.7-build-fixes.patch
missingLib.diff
diff -u gtkmathview-0.8.0/debian/patches/missingLib.diff gtkmathview-0.8.0/debian/patches/missingLib.diff
--- gtkmathview-0.8.0/debian/patches/missingLib.diff
+++ gtkmathview-0.8.0/debian/patches/missingLib.diff
@@ -1,7 +1,7 @@
Index: gtkmathview-0.8.0/mathmlps/Makefile.am
===================================================================
---- gtkmathview-0.8.0.orig/mathmlps/Makefile.am
-+++ gtkmathview-0.8.0/mathmlps/Makefile.am
+--- gtkmathview-0.8.0.orig/mathmlps/Makefile.am 2007-08-17 10:02:46.000000000 +0000
++++ gtkmathview-0.8.0/mathmlps/Makefile.am 2012-05-04 05:51:15.523662212 +0000
@@ -17,6 +17,7 @@
$(GLIB_LIBS) \
$(top_builddir)/src/backend/ps/libmathview_backend_ps.la \
@@ -12,8 +12,8 @@
INCLUDES = \
Index: gtkmathview-0.8.0/mathmlps/Makefile.in
===================================================================
---- gtkmathview-0.8.0.orig/mathmlps/Makefile.in
-+++ gtkmathview-0.8.0/mathmlps/Makefile.in
+--- gtkmathview-0.8.0.orig/mathmlps/Makefile.in 2007-10-15 07:06:03.000000000 +0000
++++ gtkmathview-0.8.0/mathmlps/Makefile.in 2012-05-04 05:51:15.523662212 +0000
@@ -59,7 +59,7 @@
mathmlps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(top_builddir)/src/backend/ps/libmathview_backend_ps.la \
@@ -53,8 +53,8 @@
@case '$?' in \
Index: gtkmathview-0.8.0/mathmlsvg/Makefile.am
===================================================================
---- gtkmathview-0.8.0.orig/mathmlsvg/Makefile.am
-+++ gtkmathview-0.8.0/mathmlsvg/Makefile.am
+--- gtkmathview-0.8.0.orig/mathmlsvg/Makefile.am 2007-08-17 10:02:46.000000000 +0000
++++ gtkmathview-0.8.0/mathmlsvg/Makefile.am 2012-05-04 05:51:15.523662212 +0000
@@ -30,6 +30,8 @@
$(GLIB_LIBS) \
$(top_builddir)/src/backend/svg/libmathview_backend_svg.la \
@@ -66,8 +66,8 @@
INCLUDES = \
Index: gtkmathview-0.8.0/mathmlsvg/Makefile.in
===================================================================
---- gtkmathview-0.8.0.orig/mathmlsvg/Makefile.in
-+++ gtkmathview-0.8.0/mathmlsvg/Makefile.in
+--- gtkmathview-0.8.0.orig/mathmlsvg/Makefile.in 2007-10-15 07:06:04.000000000 +0000
++++ gtkmathview-0.8.0/mathmlsvg/Makefile.in 2012-05-04 05:51:15.523662212 +0000
@@ -63,7 +63,7 @@
mathmlsvg_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(top_builddir)/src/backend/svg/libmathview_backend_svg.la \
@@ -108,401 +108,36 @@
@case '$?' in \
Index: gtkmathview-0.8.0/viewer/Makefile.in
===================================================================
---- gtkmathview-0.8.0.orig/viewer/Makefile.in
-+++ gtkmathview-0.8.0/viewer/Makefile.in
-@@ -0,0 +1,757 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
-+ at COND_GMETADOM_TRUE@am__append_1 = mathmlviewer
-+noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_3) $(am__EXEEXT_4) \
-+ $(am__EXEEXT_5)
-+ at COND_GMETADOM_TRUE@@COND_PROFILE_TRUE at am__append_2 = mathmlviewer.static
-+ at COND_LIBXML2_TRUE@am__append_3 = test_embedding test_loading \
-+ at COND_LIBXML2_TRUE@ test_building test_rendering
-+ at COND_LIBXML2_READER_TRUE@am__append_4 = test_loading_reader
-+subdir = viewer
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+ $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+ $(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__EXEEXT_1 =
-+ at COND_GMETADOM_TRUE@am__EXEEXT_2 = mathmlviewer$(EXEEXT)
-+am__installdirs = "$(DESTDIR)$(bindir)"
-+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-+ at COND_GMETADOM_TRUE@@COND_PROFILE_TRUE at am__EXEEXT_3 = mathmlviewer.static$(EXEEXT)
-+ at COND_LIBXML2_TRUE@am__EXEEXT_4 = test_embedding$(EXEEXT) \
-+ at COND_LIBXML2_TRUE@ test_loading$(EXEEXT) \
-+ at COND_LIBXML2_TRUE@ test_building$(EXEEXT) \
-+ at COND_LIBXML2_TRUE@ test_rendering$(EXEEXT)
-+ at COND_LIBXML2_READER_TRUE@am__EXEEXT_5 = test_loading_reader$(EXEEXT)
-+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-+am_mathmlviewer_OBJECTS = main.$(OBJEXT) aux.$(OBJEXT) \
-+ guiGTK.$(OBJEXT)
-+mathmlviewer_OBJECTS = $(am_mathmlviewer_OBJECTS)
-+am__DEPENDENCIES_1 =
-+mathmlviewer_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
-+ $(am__DEPENDENCIES_1)
-+am_mathmlviewer_static_OBJECTS = main.$(OBJEXT) aux.$(OBJEXT) \
-+ guiGTK.$(OBJEXT)
-+mathmlviewer_static_OBJECTS = $(am_mathmlviewer_static_OBJECTS)
-+mathmlviewer_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1)
-+am_test_building_OBJECTS = test_building.$(OBJEXT)
-+test_building_OBJECTS = $(am_test_building_OBJECTS)
-+test_building_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) \
-+ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
-+ $(am__DEPENDENCIES_1)
-+am_test_embedding_OBJECTS = test_embedding.$(OBJEXT) dummy.$(OBJEXT)
-+test_embedding_OBJECTS = $(am_test_embedding_OBJECTS)
-+test_embedding_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) \
-+ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1)
-+am_test_loading_OBJECTS = test_loading.$(OBJEXT) dummy.$(OBJEXT)
-+test_loading_OBJECTS = $(am_test_loading_OBJECTS)
-+test_loading_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) \
-+ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
-+ $(am__DEPENDENCIES_1)
-+am_test_loading_reader_OBJECTS = test_loading_reader.$(OBJEXT)
-+test_loading_reader_OBJECTS = $(am_test_loading_reader_OBJECTS)
-+test_loading_reader_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) \
-+ $(top_builddir)/src/widget/libgtkmathview_libxml2_reader.la \
-+ $(am__DEPENDENCIES_1)
-+am_test_rendering_OBJECTS = test_rendering.$(OBJEXT)
-+test_rendering_OBJECTS = $(am_test_rendering_OBJECTS)
-+test_rendering_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
-+ $(top_builddir)/src/libmathview.la \
-+ $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
-+ $(am__DEPENDENCIES_1)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/depcomp
-+am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+ $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(mathmlviewer_SOURCES) $(mathmlviewer_static_SOURCES) \
-+ $(test_building_SOURCES) $(test_embedding_SOURCES) \
-+ $(test_loading_SOURCES) $(test_loading_reader_SOURCES) \
-+ $(test_rendering_SOURCES)
-+DIST_SOURCES = $(mathmlviewer_SOURCES) $(mathmlviewer_static_SOURCES) \
-+ $(test_building_SOURCES) $(test_embedding_SOURCES) \
-+ $(test_loading_SOURCES) $(test_loading_reader_SOURCES) \
-+ $(test_rendering_SOURCES)
-+HEADERS = $(noinst_HEADERS)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+AREAMODEL_VERSION_INFO = @AREAMODEL_VERSION_INFO@
-+AS = @AS@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CHAR_UNSIGNED = @CHAR_UNSIGNED@
-+COND_BOXML_FALSE = @COND_BOXML_FALSE@
-+COND_BOXML_TRUE = @COND_BOXML_TRUE@
-+COND_CUSTOM_READER_FALSE = @COND_CUSTOM_READER_FALSE@
-+COND_CUSTOM_READER_TRUE = @COND_CUSTOM_READER_TRUE@
-+COND_GMETADOM_FALSE = @COND_GMETADOM_FALSE@
-+COND_GMETADOM_TRUE = @COND_GMETADOM_TRUE@
-+COND_GTK_FALSE = @COND_GTK_FALSE@
-+COND_GTK_TRUE = @COND_GTK_TRUE@
-+COND_HAVE_POPT_FALSE = @COND_HAVE_POPT_FALSE@
-+COND_HAVE_POPT_TRUE = @COND_HAVE_POPT_TRUE@
-+COND_LIBXML2_FALSE = @COND_LIBXML2_FALSE@
-+COND_LIBXML2_READER_FALSE = @COND_LIBXML2_READER_FALSE@
-+COND_LIBXML2_READER_TRUE = @COND_LIBXML2_READER_TRUE@
-+COND_LIBXML2_TRUE = @COND_LIBXML2_TRUE@
-+COND_PROFILE_FALSE = @COND_PROFILE_FALSE@
-+COND_PROFILE_TRUE = @COND_PROFILE_TRUE@
-+COND_PS_FALSE = @COND_PS_FALSE@
-+COND_PS_TRUE = @COND_PS_TRUE@
-+COND_SVG_FALSE = @COND_SVG_FALSE@
-+COND_SVG_TRUE = @COND_SVG_TRUE@
-+COND_T1LIB_FALSE = @COND_T1LIB_FALSE@
-+COND_T1LIB_TRUE = @COND_T1LIB_TRUE@
-+COND_TFM_FALSE = @COND_TFM_FALSE@
-+COND_TFM_LEVEL_1_FALSE = @COND_TFM_LEVEL_1_FALSE@
-+COND_TFM_LEVEL_1_TRUE = @COND_TFM_LEVEL_1_TRUE@
-+COND_TFM_LEVEL_2_FALSE = @COND_TFM_LEVEL_2_FALSE@
-+COND_TFM_LEVEL_2_TRUE = @COND_TFM_LEVEL_2_TRUE@
-+COND_TFM_LEVEL_3_FALSE = @COND_TFM_LEVEL_3_FALSE@
-+COND_TFM_LEVEL_3_TRUE = @COND_TFM_LEVEL_3_TRUE@
-+COND_TFM_TRUE = @COND_TFM_TRUE@
-+COND_XSLTPROC_FALSE = @COND_XSLTPROC_FALSE@
-+COND_XSLTPROC_TRUE = @COND_XSLTPROC_TRUE@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DLLTOOL = @DLLTOOL@
-+DOM_CFLAGS = @DOM_CFLAGS@
-+DOM_LIBS = @DOM_LIBS@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+GLIB_CFLAGS = @GLIB_CFLAGS@
-+GLIB_LIBS = @GLIB_LIBS@
-+GMV_ENABLE_BOXML_CFLAGS = @GMV_ENABLE_BOXML_CFLAGS@
-+GMV_HAVE_EXT_HASH_MAP_CFLAGS = @GMV_HAVE_EXT_HASH_MAP_CFLAGS@
-+GMV_HAVE_HASH_MAP_CFLAGS = @GMV_HAVE_HASH_MAP_CFLAGS@
-+GREP = @GREP@
-+GTKMATHVIEW_SIZEOF_CHAR = @GTKMATHVIEW_SIZEOF_CHAR@
-+GTKMATHVIEW_SIZEOF_INT = @GTKMATHVIEW_SIZEOF_INT@
-+GTKMATHVIEW_SIZEOF_LONG = @GTKMATHVIEW_SIZEOF_LONG@
-+GTKMATHVIEW_SIZEOF_LONG_LONG = @GTKMATHVIEW_SIZEOF_LONG_LONG@
-+GTKMATHVIEW_SIZEOF_SHORT = @GTKMATHVIEW_SIZEOF_SHORT@
-+GTKMATHVIEW_SIZEOF_WCHAR_T = @GTKMATHVIEW_SIZEOF_WCHAR_T@
-+GTK_CFLAGS = @GTK_CFLAGS@
-+GTK_LIBS = @GTK_LIBS@
-+HAVE_XSLTPROC = @HAVE_XSLTPROC@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAJOR_VERSION = @MAJOR_VERSION@
-+MAKEINFO = @MAKEINFO@
-+MATHVIEW_VERSION = @MATHVIEW_VERSION@
-+MATHVIEW_VERSION_INFO = @MATHVIEW_VERSION_INFO@
-+MINOR_VERSION = @MINOR_VERSION@
-+OBJDUMP = @OBJDUMP@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PANGOX_CFLAGS = @PANGOX_CFLAGS@
-+PANGOX_LIBS = @PANGOX_LIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PKG_CONFIG = @PKG_CONFIG@
-+POPT_CFLAGS = @POPT_CFLAGS@
-+POPT_LIBS = @POPT_LIBS@
-+RANLIB = @RANLIB@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+STRIP = @STRIP@
-+T1_CFLAGS = @T1_CFLAGS@
-+T1_LIBS = @T1_LIBS@
-+T1_LIBS_X = @T1_LIBS_X@
-+USE_GCC_PCH_FALSE = @USE_GCC_PCH_FALSE@
-+USE_GCC_PCH_TRUE = @USE_GCC_PCH_TRUE@
-+VERSION = @VERSION@
-+WITH_BINRELOC_FALSE = @WITH_BINRELOC_FALSE@
-+WITH_BINRELOC_TRUE = @WITH_BINRELOC_TRUE@
-+XML_CFLAGS = @XML_CFLAGS@
-+XML_LIBS = @XML_LIBS@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+NULL =
-+noinst_HEADERS = guiGTK.h
-+mathmlviewer_static_SOURCES = main.cc aux.cc guiGTK.c
-+mathmlviewer_static_LDFLAGS = -no-install -static
-+mathmlviewer_static_LDADD = \
-+ $(POPT_LIBS) \
-+ $(DOM_LIBS) \
-+ $(GTK_LIBS) \
-+ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
-+ $(T1_LIBS) \
-+ $(T1_LIBS_X) \
-+ $(NULL)
-+
-+mathmlviewer_SOURCES = main.cc aux.cc guiGTK.c
-+mathmlviewer_LDADD = \
-+ $(POPT_LIBS) \
-+ $(DOM_LIBS) \
-+ $(GTK_LIBS) \
-+ $(T1_LIBS) \
-+ $(T1_LIBS_X) \
-+ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
-+ $(NULL)
-+
-+test_embedding_SOURCES = test_embedding.c dummy.cc
-+test_embedding_LDFLAGS = -no-install -static
-+test_embedding_LDADD = \
-+ -lstdc++ \
-+ $(XML_LIBS) \
-+ $(GTK_LIBS) \
-+ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
-+ $(T1_LIBS) \
-+ $(T1_LIBS_X) \
-+ $(NULL)
-+
-+test_loading_SOURCES = test_loading.c dummy.cc
-+test_loading_LDFLASG = -no-install -static
-+test_loading_LDADD = \
-+ -lstdc++ \
-+ $(XML_LIBS) \
-+ $(GTK_LIBS) \
-+ $(T1_LIBS) \
-+ $(T1_LIBS_X) \
-+ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
-+ $(NULL)
-+
-+test_building_SOURCES = test_building.cc
-+test_building_LDFLASG = -no-install -static
-+test_building_LDADD = \
-+ -lstdc++ \
-+ $(XML_LIBS) \
-+ $(GTK_LIBS) \
-+ $(T1_LIBS) \
-+ $(T1_LIBS_X) \
-+ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
-+ $(NULL)
-+
-+test_rendering_SOURCES = test_rendering.cc
-+test_rendering_LDFLASG = -no-install -static
-+test_rendering_LDADD = \
-+ -lstdc++ \
-+ $(XML_LIBS) \
-+ $(GTK_LIBS) \
-+ $(T1_LIBS) \
-+ $(T1_LIBS_X) \
-+ $(GLIB_LIBS) \
-+ $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
+--- gtkmathview-0.8.0.orig/viewer/Makefile.in 2007-10-15 07:06:25.000000000 +0000
++++ gtkmathview-0.8.0/viewer/Makefile.in 2012-05-04 05:51:15.523662212 +0000
+@@ -81,6 +81,7 @@
+ mathmlviewer_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++ $(top_builddir)/src/engine/boxml/libboxml.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+ am_test_building_OBJECTS = test_building.$(OBJEXT)
+@@ -117,6 +118,7 @@
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
++ $(top_builddir)/src/libmathview.la \
+ $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -254,6 +256,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGOX_CFLAGS = @PANGOX_CFLAGS@
+ PANGOX_LIBS = @PANGOX_LIBS@
+@@ -388,6 +391,767 @@
+ $(T1_LIBS_X) \
+ $(GLIB_LIBS) \
+ $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
+ $(top_builddir)/src/libmathview.la \
+ $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+ $(NULL)
@@ -846,79 +481,432 @@
+
+pdf-am:
+
-+ps: ps-am
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
++ clean-generic clean-libtool clean-noinstPROGRAMS ctags \
++ distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
++ html-am info info-am install install-am install-binPROGRAMS \
++ install-data install-data-am install-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-binPROGRAMS \
++ uninstall-info-am
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
++ at COND_GMETADOM_TRUE@am__append_1 = mathmlviewer
++noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_3) $(am__EXEEXT_4) \
++ $(am__EXEEXT_5)
++ at COND_GMETADOM_TRUE@@COND_PROFILE_TRUE at am__append_2 = mathmlviewer.static
++ at COND_LIBXML2_TRUE@am__append_3 = test_embedding test_loading \
++ at COND_LIBXML2_TRUE@ test_building test_rendering
++ at COND_LIBXML2_READER_TRUE@am__append_4 = test_loading_reader
++subdir = viewer
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__EXEEXT_1 =
++ at COND_GMETADOM_TRUE@am__EXEEXT_2 = mathmlviewer$(EXEEXT)
++am__installdirs = "$(DESTDIR)$(bindir)"
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++ at COND_GMETADOM_TRUE@@COND_PROFILE_TRUE at am__EXEEXT_3 = mathmlviewer.static$(EXEEXT)
++ at COND_LIBXML2_TRUE@am__EXEEXT_4 = test_embedding$(EXEEXT) \
++ at COND_LIBXML2_TRUE@ test_loading$(EXEEXT) \
++ at COND_LIBXML2_TRUE@ test_building$(EXEEXT) \
++ at COND_LIBXML2_TRUE@ test_rendering$(EXEEXT)
++ at COND_LIBXML2_READER_TRUE@am__EXEEXT_5 = test_loading_reader$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
++am_mathmlviewer_OBJECTS = main.$(OBJEXT) aux.$(OBJEXT) \
++ guiGTK.$(OBJEXT)
++mathmlviewer_OBJECTS = $(am_mathmlviewer_OBJECTS)
++am__DEPENDENCIES_1 =
++mathmlviewer_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++ $(am__DEPENDENCIES_1)
++am_mathmlviewer_static_OBJECTS = main.$(OBJEXT) aux.$(OBJEXT) \
++ guiGTK.$(OBJEXT)
++mathmlviewer_static_OBJECTS = $(am_mathmlviewer_static_OBJECTS)
++mathmlviewer_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
++am_test_building_OBJECTS = test_building.$(OBJEXT)
++test_building_OBJECTS = $(am_test_building_OBJECTS)
++test_building_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) \
++ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++ $(am__DEPENDENCIES_1)
++am_test_embedding_OBJECTS = test_embedding.$(OBJEXT) dummy.$(OBJEXT)
++test_embedding_OBJECTS = $(am_test_embedding_OBJECTS)
++test_embedding_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) \
++ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
++am_test_loading_OBJECTS = test_loading.$(OBJEXT) dummy.$(OBJEXT)
++test_loading_OBJECTS = $(am_test_loading_OBJECTS)
++test_loading_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) \
++ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++ $(am__DEPENDENCIES_1)
++am_test_loading_reader_OBJECTS = test_loading_reader.$(OBJEXT)
++test_loading_reader_OBJECTS = $(am_test_loading_reader_OBJECTS)
++test_loading_reader_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) \
++ $(top_builddir)/src/widget/libgtkmathview_libxml2_reader.la \
++ $(am__DEPENDENCIES_1)
++am_test_rendering_OBJECTS = test_rendering.$(OBJEXT)
++test_rendering_OBJECTS = $(am_test_rendering_OBJECTS)
++test_rendering_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(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 \
++ $(am__DEPENDENCIES_1)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(mathmlviewer_SOURCES) $(mathmlviewer_static_SOURCES) \
++ $(test_building_SOURCES) $(test_embedding_SOURCES) \
++ $(test_loading_SOURCES) $(test_loading_reader_SOURCES) \
++ $(test_rendering_SOURCES)
++DIST_SOURCES = $(mathmlviewer_SOURCES) $(mathmlviewer_static_SOURCES) \
++ $(test_building_SOURCES) $(test_embedding_SOURCES) \
++ $(test_loading_SOURCES) $(test_loading_reader_SOURCES) \
++ $(test_rendering_SOURCES)
++HEADERS = $(noinst_HEADERS)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++AREAMODEL_VERSION_INFO = @AREAMODEL_VERSION_INFO@
++AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CHAR_UNSIGNED = @CHAR_UNSIGNED@
++COND_BOXML_FALSE = @COND_BOXML_FALSE@
++COND_BOXML_TRUE = @COND_BOXML_TRUE@
++COND_CUSTOM_READER_FALSE = @COND_CUSTOM_READER_FALSE@
++COND_CUSTOM_READER_TRUE = @COND_CUSTOM_READER_TRUE@
++COND_GMETADOM_FALSE = @COND_GMETADOM_FALSE@
++COND_GMETADOM_TRUE = @COND_GMETADOM_TRUE@
++COND_GTK_FALSE = @COND_GTK_FALSE@
++COND_GTK_TRUE = @COND_GTK_TRUE@
++COND_HAVE_POPT_FALSE = @COND_HAVE_POPT_FALSE@
++COND_HAVE_POPT_TRUE = @COND_HAVE_POPT_TRUE@
++COND_LIBXML2_FALSE = @COND_LIBXML2_FALSE@
++COND_LIBXML2_READER_FALSE = @COND_LIBXML2_READER_FALSE@
++COND_LIBXML2_READER_TRUE = @COND_LIBXML2_READER_TRUE@
++COND_LIBXML2_TRUE = @COND_LIBXML2_TRUE@
++COND_PROFILE_FALSE = @COND_PROFILE_FALSE@
++COND_PROFILE_TRUE = @COND_PROFILE_TRUE@
++COND_PS_FALSE = @COND_PS_FALSE@
++COND_PS_TRUE = @COND_PS_TRUE@
++COND_SVG_FALSE = @COND_SVG_FALSE@
++COND_SVG_TRUE = @COND_SVG_TRUE@
++COND_T1LIB_FALSE = @COND_T1LIB_FALSE@
++COND_T1LIB_TRUE = @COND_T1LIB_TRUE@
++COND_TFM_FALSE = @COND_TFM_FALSE@
++COND_TFM_LEVEL_1_FALSE = @COND_TFM_LEVEL_1_FALSE@
++COND_TFM_LEVEL_1_TRUE = @COND_TFM_LEVEL_1_TRUE@
++COND_TFM_LEVEL_2_FALSE = @COND_TFM_LEVEL_2_FALSE@
++COND_TFM_LEVEL_2_TRUE = @COND_TFM_LEVEL_2_TRUE@
++COND_TFM_LEVEL_3_FALSE = @COND_TFM_LEVEL_3_FALSE@
++COND_TFM_LEVEL_3_TRUE = @COND_TFM_LEVEL_3_TRUE@
++COND_TFM_TRUE = @COND_TFM_TRUE@
++COND_XSLTPROC_FALSE = @COND_XSLTPROC_FALSE@
++COND_XSLTPROC_TRUE = @COND_XSLTPROC_TRUE@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
++DOM_CFLAGS = @DOM_CFLAGS@
++DOM_LIBS = @DOM_LIBS@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++GLIB_CFLAGS = @GLIB_CFLAGS@
++GLIB_LIBS = @GLIB_LIBS@
++GMV_ENABLE_BOXML_CFLAGS = @GMV_ENABLE_BOXML_CFLAGS@
++GMV_HAVE_EXT_HASH_MAP_CFLAGS = @GMV_HAVE_EXT_HASH_MAP_CFLAGS@
++GMV_HAVE_HASH_MAP_CFLAGS = @GMV_HAVE_HASH_MAP_CFLAGS@
++GREP = @GREP@
++GTKMATHVIEW_SIZEOF_CHAR = @GTKMATHVIEW_SIZEOF_CHAR@
++GTKMATHVIEW_SIZEOF_INT = @GTKMATHVIEW_SIZEOF_INT@
++GTKMATHVIEW_SIZEOF_LONG = @GTKMATHVIEW_SIZEOF_LONG@
++GTKMATHVIEW_SIZEOF_LONG_LONG = @GTKMATHVIEW_SIZEOF_LONG_LONG@
++GTKMATHVIEW_SIZEOF_SHORT = @GTKMATHVIEW_SIZEOF_SHORT@
++GTKMATHVIEW_SIZEOF_WCHAR_T = @GTKMATHVIEW_SIZEOF_WCHAR_T@
++GTK_CFLAGS = @GTK_CFLAGS@
++GTK_LIBS = @GTK_LIBS@
++HAVE_XSLTPROC = @HAVE_XSLTPROC@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAJOR_VERSION = @MAJOR_VERSION@
++MAKEINFO = @MAKEINFO@
++MATHVIEW_VERSION = @MATHVIEW_VERSION@
++MATHVIEW_VERSION_INFO = @MATHVIEW_VERSION_INFO@
++MINOR_VERSION = @MINOR_VERSION@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PANGOX_CFLAGS = @PANGOX_CFLAGS@
++PANGOX_LIBS = @PANGOX_LIBS@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POPT_CFLAGS = @POPT_CFLAGS@
++POPT_LIBS = @POPT_LIBS@
++RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++T1_CFLAGS = @T1_CFLAGS@
++T1_LIBS = @T1_LIBS@
++T1_LIBS_X = @T1_LIBS_X@
++USE_GCC_PCH_FALSE = @USE_GCC_PCH_FALSE@
++USE_GCC_PCH_TRUE = @USE_GCC_PCH_TRUE@
++VERSION = @VERSION@
++WITH_BINRELOC_FALSE = @WITH_BINRELOC_FALSE@
++WITH_BINRELOC_TRUE = @WITH_BINRELOC_TRUE@
++XML_CFLAGS = @XML_CFLAGS@
++XML_LIBS = @XML_LIBS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++NULL =
++noinst_HEADERS = guiGTK.h
++mathmlviewer_static_SOURCES = main.cc aux.cc guiGTK.c
++mathmlviewer_static_LDFLAGS = -no-install -static
++mathmlviewer_static_LDADD = \
++ $(POPT_LIBS) \
++ $(DOM_LIBS) \
++ $(GTK_LIBS) \
++ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++ $(top_builddir)/src/engine/boxml/libboxml.la \
++ $(T1_LIBS) \
++ $(T1_LIBS_X) \
++ $(NULL)
++
++mathmlviewer_SOURCES = main.cc aux.cc guiGTK.c
++mathmlviewer_LDADD = \
++ $(POPT_LIBS) \
++ $(DOM_LIBS) \
++ $(GTK_LIBS) \
++ $(T1_LIBS) \
++ $(T1_LIBS_X) \
++ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++ $(NULL)
+
-+ps-am:
++test_embedding_SOURCES = test_embedding.c dummy.cc
++test_embedding_LDFLAGS = -no-install -static
++test_embedding_LDADD = \
++ -lstdc++ \
++ $(XML_LIBS) \
++ $(GTK_LIBS) \
++ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++ $(T1_LIBS) \
++ $(T1_LIBS_X) \
++ $(NULL)
+
-+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++test_loading_SOURCES = test_loading.c dummy.cc
++test_loading_LDFLASG = -no-install -static
++test_loading_LDADD = \
++ -lstdc++ \
++ $(XML_LIBS) \
++ $(GTK_LIBS) \
++ $(T1_LIBS) \
++ $(T1_LIBS_X) \
++ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++ $(NULL)
+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-+ clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-+ distclean distclean-compile distclean-generic \
-+ distclean-libtool distclean-tags distdir dvi dvi-am html \
-+ html-am info info-am install install-am install-binPROGRAMS \
-+ install-data install-data-am install-exec install-exec-am \
-+ install-info install-info-am install-man install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-compile \
-+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+ tags uninstall uninstall-am uninstall-binPROGRAMS \
-+ uninstall-info-am
++test_building_SOURCES = test_building.cc
++test_building_LDFLASG = -no-install -static
++test_building_LDADD = \
++ -lstdc++ \
++ $(XML_LIBS) \
++ $(GTK_LIBS) \
++ $(T1_LIBS) \
++ $(T1_LIBS_X) \
++ $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++ $(NULL)
+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff --git a/viewer/Makefile.am b/viewer/Makefile.am
-index 7b950a0..67220b4 100644
---- gtkmathview-0.8.0.orig/viewer/Makefile.am
-+++ gtkmathview-0.8.0/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 \
++test_rendering_SOURCES = test_rendering.cc
++test_rendering_LDFLASG = -no-install -static
++test_rendering_LDADD = \
++ -lstdc++ \
++ $(XML_LIBS) \
++ $(GTK_LIBS) \
++ $(T1_LIBS) \
++ $(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)
-diff --git a/viewer/Makefile.in b/viewer/Makefile.in
-index 8527a9a..704a8ad 100644
---- gtkmathview-0.8.0.orig/viewer/Makefile.in
-+++ gtkmathview-0.8.0/viewer/Makefile.in
-@@ -81,6 +81,7 @@ mathmlviewer_static_OBJECTS = $(am_mathmlviewer_static_OBJECTS)
- mathmlviewer_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
-+ $(top_builddir)/src/engine/boxml/libboxml.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
- am_test_building_OBJECTS = test_building.$(OBJEXT)
-@@ -117,6 +118,8 @@ test_rendering_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(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 \
- $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -254,6 +257,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PANGOX_CFLAGS = @PANGOX_CFLAGS@
- PANGOX_LIBS = @PANGOX_LIBS@
-@@ -331,6 +335,7 @@ mathmlviewer_static_LDADD = \
+Index: gtkmathview-0.8.0/viewer/Makefile.am
+===================================================================
+--- gtkmathview-0.8.0.orig/viewer/Makefile.am 2007-08-17 10:02:45.000000000 +0000
++++ gtkmathview-0.8.0/viewer/Makefile.am 2012-05-04 05:51:15.523662212 +0000
+@@ -31,6 +31,7 @@
$(DOM_LIBS) \
$(GTK_LIBS) \
$(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
@@ -926,7 +914,7 @@
$(T1_LIBS) \
$(T1_LIBS_X) \
$(NULL)
-@@ -388,6 +393,8 @@ test_rendering_LDADD = \
+@@ -88,6 +89,8 @@
$(T1_LIBS_X) \
$(GLIB_LIBS) \
$(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
only in patch2:
unchanged:
--- gtkmathview-0.8.0.orig/debian/patches/0005-gcc-4.7-build-fixes.patch
+++ gtkmathview-0.8.0/debian/patches/0005-gcc-4.7-build-fixes.patch
@@ -0,0 +1,55 @@
+Index: gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh
+===================================================================
+--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateBuilder.hh 2012-05-04 05:46:58.835652664 +0000
++++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh 2012-05-04 05:56:53.519674790 +0000
+@@ -47,11 +47,11 @@
+ SmartPtr<typename ElementBuilder::type>
+ getElement(const typename Model::Element& el) const
+ {
+- if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++ if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+ return elem;
+ else
+ {
+- SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++ elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+ this->linkerAdd(el, elem);
+ return elem;
+ }
+Index: gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh
+===================================================================
+--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateElementIterator.hh 2007-08-17 10:02:34.000000000 +0000
++++ gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh 2012-05-04 05:59:06.691679743 +0000
+@@ -43,7 +43,7 @@
+ 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();
+ }
+
+Index: gtkmathview-0.8.0/mathmlsvg/main.cc
+===================================================================
+--- gtkmathview-0.8.0.orig/mathmlsvg/main.cc 2012-05-04 05:51:15.511662212 +0000
++++ gtkmathview-0.8.0/mathmlsvg/main.cc 2012-05-04 06:00:49.951683587 +0000
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <unistd.h>
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
+Index: gtkmathview-0.8.0/mathmlps/main.cc
+===================================================================
+--- gtkmathview-0.8.0.orig/mathmlps/main.cc 2012-05-04 05:51:15.511662212 +0000
++++ gtkmathview-0.8.0/mathmlps/main.cc 2012-05-04 06:03:14.567688966 +0000
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <unistd.h>
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
only in patch2:
unchanged:
--- gtkmathview-0.8.0.orig/src/frontend/common/TemplateBuilder.hh
+++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh
@@ -52,7 +52,7 @@
else
{
SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
- linkerAdd(el, elem);
+ this->linkerAdd(el, elem);
return elem;
}
}
More information about the debian-science-maintainers
mailing list