From 9e6f3860287a16dbf8843bfe7f6f96f87f1b8a6d Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Wed, 5 Dec 2012 11:14:21 -0500 Subject: Add 0005-gcc-4.7-build-fixes.patch and missingLib.diff in gtkmathview --- extra/gtkmathview/0005-gcc-4.7-build-fixes.patch | 57 ++ extra/gtkmathview/PKGBUILD | 10 +- extra/gtkmathview/missingLib.diff | 925 +++++++++++++++++++++++ 3 files changed, 990 insertions(+), 2 deletions(-) create mode 100644 extra/gtkmathview/0005-gcc-4.7-build-fixes.patch create mode 100644 extra/gtkmathview/missingLib.diff diff --git a/extra/gtkmathview/0005-gcc-4.7-build-fixes.patch b/extra/gtkmathview/0005-gcc-4.7-build-fixes.patch new file mode 100644 index 000000000..bae680af3 --- /dev/null +++ b/extra/gtkmathview/0005-gcc-4.7-build-fixes.patch @@ -0,0 +1,57 @@ +Index: b/src/frontend/common/TemplateBuilder.hh +=================================================================== +--- a/src/frontend/common/TemplateBuilder.hh ++++ b/src/frontend/common/TemplateBuilder.hh +@@ -47,12 +47,12 @@ + SmartPtr + getElement(const typename Model::Element& el) const + { +- if (SmartPtr elem = smart_cast(linkerAssoc(el))) ++ if (SmartPtr elem = smart_cast(this->linkerAssoc(el))) + return elem; + else + { +- SmartPtr elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); +- linkerAdd(el, elem); ++ elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); ++ this->linkerAdd(el, elem); + return elem; + } + } +Index: b/src/frontend/common/TemplateElementIterator.hh +=================================================================== +--- a/src/frontend/common/TemplateElementIterator.hh ++++ b/src/frontend/common/TemplateElementIterator.hh +@@ -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: b/mathmlsvg/main.cc +=================================================================== +--- a/mathmlsvg/main.cc ++++ b/mathmlsvg/main.cc +@@ -18,6 +18,7 @@ + + #include + ++#include + #include + #include + #include +Index: b/mathmlps/main.cc +=================================================================== +--- a/mathmlps/main.cc ++++ b/mathmlps/main.cc +@@ -18,6 +18,7 @@ + + #include + ++#include + #include + #include + #include diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD index dc75031e1..4843b101a 100644 --- a/extra/gtkmathview/PKGBUILD +++ b/extra/gtkmathview/PKGBUILD @@ -13,15 +13,21 @@ depends=('popt' 'gtk2' 't1lib' 'gmetadom') options=('!libtool') source=("http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz" 'gtkmathview-0.8.0-gcc44.patch' - 'gtkmathview-0.8.0-cond-t1.patch') + 'gtkmathview-0.8.0-cond-t1.patch' + '0005-gcc-4.7-build-fixes.patch' + 'missingLib.diff') md5sums=('b53564e553728d4b69f7d366dfeb5299' '9fd261db865336c89ebf0f3545af9bc4' - 'a79a27e00908e75712bc9453b669fe61') + 'a79a27e00908e75712bc9453b669fe61' + '9505d53cd858759ad8fb297c84395323' + '6b00674713f981a4ffe87f6e812da823') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch + patch -Np1 -i ${srcdir}/0005-gcc-4.7-build-fixes.patch + patch -Np1 -i ${srcdir}/missingLib.diff ./configure --prefix=/usr \ --sysconfdir=/etc make diff --git a/extra/gtkmathview/missingLib.diff b/extra/gtkmathview/missingLib.diff new file mode 100644 index 000000000..4423ef6f7 --- /dev/null +++ b/extra/gtkmathview/missingLib.diff @@ -0,0 +1,925 @@ +Index: 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 \ + $(top_builddir)/src/view/libmathview_frontend_libxml2.la \ ++ $(top_builddir)/src/libmathview.la \ + $(NULL) + + INCLUDES = \ +Index: 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 \ + $(top_builddir)/src/view/libmathview_frontend_libxml2.la \ +- $(am__DEPENDENCIES_1) ++ $(top_builddir)/src/libmathview.la $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -188,6 +188,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@ +@@ -268,6 +269,7 @@ + $(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 = \ +@@ -300,9 +302,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mathmlps/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mathmlps/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign mathmlps/Makefile ++ $(AUTOMAKE) --gnu mathmlps/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +Index: 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 \ + $(top_builddir)/src/view/libmathview_frontend_libxml2.la \ ++ $(top_builddir)/src/libmathview.la \ ++ -lxml2 \ + $(NULL) + + INCLUDES = \ +Index: 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 \ + $(top_builddir)/src/view/libmathview_frontend_libxml2.la \ +- $(am__DEPENDENCIES_1) ++ $(top_builddir)/src/libmathview.la $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -192,6 +192,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@ +@@ -285,6 +286,8 @@ + $(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 = \ +@@ -318,9 +321,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign mathmlsvg/Makefile'; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu mathmlsvg/Makefile'; \ + cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign mathmlsvg/Makefile ++ $(AUTOMAKE) --gnu mathmlsvg/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +Index: gtkmathview-0.8.0/viewer/Makefile.in +=================================================================== +--- 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) ++ ++test_loading_reader_SOURCES = test_loading_reader.c ++test_loading_reader_LDFLASG = -no-install -static ++test_loading_reader_LDADD = \ ++ -lstdc++ \ ++ $(XML_LIBS) \ ++ $(GTK_LIBS) \ ++ $(T1_LIBS) \ ++ $(T1_LIBS_X) \ ++ $(top_builddir)/src/widget/libgtkmathview_libxml2_reader.la \ ++ $(NULL) ++ ++INCLUDES = \ ++ -I$(top_builddir)/auto/ \ ++ -I$(top_srcdir)/src/common/ \ ++ -I$(top_srcdir)/src/common/mathvariants \ ++ -I$(top_srcdir)/src/frontend/gmetadom/ \ ++ -I$(top_srcdir)/src/engine/common \ ++ -I$(top_srcdir)/src/engine/mathml \ ++ -I$(top_srcdir)/src/engine/boxml \ ++ -I$(top_srcdir)/src/widget \ ++ -I$(top_srcdir)/src/view \ ++ -I$(top_srcdir)/src/backend/common/ \ ++ -I$(top_srcdir)/src/backend/gtk/ \ ++ $(POPT_CFLAGS) \ ++ $(GTK_CFLAGS) \ ++ $(XML_CFLAGS) \ ++ $(DOM_CFLAGS) \ ++ $(XML_CFLAGS) \ ++ $(NULL) ++ ++all: all-am ++ ++.SUFFIXES: ++.SUFFIXES: .c .cc .lo .o .obj ++$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ ++ && exit 0; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu viewer/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu viewer/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++install-binPROGRAMS: $(bin_PROGRAMS) ++ @$(NORMAL_INSTALL) ++ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ if test -f $$p \ ++ || test -f $$p1 \ ++ ; then \ ++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ else :; fi; \ ++ done ++ ++uninstall-binPROGRAMS: ++ @$(NORMAL_UNINSTALL) ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done ++ ++clean-binPROGRAMS: ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f $$p $$f"; \ ++ rm -f $$p $$f ; \ ++ done ++ ++clean-noinstPROGRAMS: ++ @list='$(noinst_PROGRAMS)'; for p in $$list; do \ ++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f $$p $$f"; \ ++ rm -f $$p $$f ; \ ++ done ++mathmlviewer$(EXEEXT): $(mathmlviewer_OBJECTS) $(mathmlviewer_DEPENDENCIES) ++ @rm -f mathmlviewer$(EXEEXT) ++ $(CXXLINK) $(mathmlviewer_LDFLAGS) $(mathmlviewer_OBJECTS) $(mathmlviewer_LDADD) $(LIBS) ++mathmlviewer.static$(EXEEXT): $(mathmlviewer_static_OBJECTS) $(mathmlviewer_static_DEPENDENCIES) ++ @rm -f mathmlviewer.static$(EXEEXT) ++ $(CXXLINK) $(mathmlviewer_static_LDFLAGS) $(mathmlviewer_static_OBJECTS) $(mathmlviewer_static_LDADD) $(LIBS) ++test_building$(EXEEXT): $(test_building_OBJECTS) $(test_building_DEPENDENCIES) ++ @rm -f test_building$(EXEEXT) ++ $(CXXLINK) $(test_building_LDFLAGS) $(test_building_OBJECTS) $(test_building_LDADD) $(LIBS) ++test_embedding$(EXEEXT): $(test_embedding_OBJECTS) $(test_embedding_DEPENDENCIES) ++ @rm -f test_embedding$(EXEEXT) ++ $(CXXLINK) $(test_embedding_LDFLAGS) $(test_embedding_OBJECTS) $(test_embedding_LDADD) $(LIBS) ++test_loading$(EXEEXT): $(test_loading_OBJECTS) $(test_loading_DEPENDENCIES) ++ @rm -f test_loading$(EXEEXT) ++ $(CXXLINK) $(test_loading_LDFLAGS) $(test_loading_OBJECTS) $(test_loading_LDADD) $(LIBS) ++test_loading_reader$(EXEEXT): $(test_loading_reader_OBJECTS) $(test_loading_reader_DEPENDENCIES) ++ @rm -f test_loading_reader$(EXEEXT) ++ $(LINK) $(test_loading_reader_LDFLAGS) $(test_loading_reader_OBJECTS) $(test_loading_reader_LDADD) $(LIBS) ++test_rendering$(EXEEXT): $(test_rendering_OBJECTS) $(test_rendering_DEPENDENCIES) ++ @rm -f test_rendering$(EXEEXT) ++ $(CXXLINK) $(test_rendering_LDFLAGS) $(test_rendering_OBJECTS) $(test_rendering_LDADD) $(LIBS) ++ ++mostlyclean-compile: ++ -rm -f *.$(OBJEXT) ++ ++distclean-compile: ++ -rm -f *.tab.c ++ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aux.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/guiGTK.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_building.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_embedding.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_loading.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_loading_reader.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rendering.Po@am__quote@ ++ ++.c.o: ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c $< ++ ++.c.obj: ++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` ++ ++.c.lo: ++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< ++ ++.cc.o: ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< ++ ++.cc.obj: ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` ++ ++.cc.lo: ++@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ ++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++ ++distclean-libtool: ++ -rm -f libtool ++uninstall-info-am: ++ ++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ mkid -fID $$unique ++tags: TAGS ++ ++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ ++ test -n "$$unique" || unique=$$empty_fix; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ ++ fi ++ctags: CTAGS ++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ++ $(TAGS_FILES) $(LISP) ++ tags=; \ ++ here=`pwd`; \ ++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ++ unique=`for i in $$list; do \ ++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ++ done | \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ ++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ++ $$tags $$unique ++ ++GTAGS: ++ here=`$(am__cd) $(top_builddir) && pwd` \ ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here ++ ++distclean-tags: ++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ++ list='$(DISTFILES)'; for file in $$list; do \ ++ case $$file in \ ++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ++ esac; \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ++ dir="/$$dir"; \ ++ $(mkdir_p) "$(distdir)$$dir"; \ ++ else \ ++ dir=''; \ ++ fi; \ ++ if test -d $$d/$$file; then \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ++ fi; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(PROGRAMS) $(HEADERS) ++installdirs: ++ for dir in "$(DESTDIR)$(bindir)"; do \ ++ test -z "$$dir" || $(mkdir_p) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ `test -z '$(STRIP)' || \ ++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-binPROGRAMS clean-generic clean-libtool \ ++ clean-noinstPROGRAMS mostlyclean-am ++ ++distclean: distclean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-libtool distclean-tags ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: ++ ++install-exec-am: install-binPROGRAMS ++ ++install-info: install-info-am ++ ++install-man: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -rf ./$(DEPDIR) ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ++ mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-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. ++ ++@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) ++@COND_GMETADOM_TRUE@am__append_1 = mathmlviewer ++noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_3) $(am__EXEEXT_4) \ ++ $(am__EXEEXT_5) ++@COND_GMETADOM_TRUE@@COND_PROFILE_TRUE@am__append_2 = mathmlviewer.static ++@COND_LIBXML2_TRUE@am__append_3 = test_embedding test_loading \ ++@COND_LIBXML2_TRUE@ test_building test_rendering ++@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 = ++@COND_GMETADOM_TRUE@am__EXEEXT_2 = mathmlviewer$(EXEEXT) ++am__installdirs = "$(DESTDIR)$(bindir)" ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) ++@COND_GMETADOM_TRUE@@COND_PROFILE_TRUE@am__EXEEXT_3 = mathmlviewer.static$(EXEEXT) ++@COND_LIBXML2_TRUE@am__EXEEXT_4 = test_embedding$(EXEEXT) \ ++@COND_LIBXML2_TRUE@ test_loading$(EXEEXT) \ ++@COND_LIBXML2_TRUE@ test_building$(EXEEXT) \ ++@COND_LIBXML2_TRUE@ test_rendering$(EXEEXT) ++@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) ++ ++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 \ ++ $(top_builddir)/src/libmathview.la \ ++ $(top_builddir)/src/engine/boxml/libboxml.la \ + $(top_builddir)/src/view/libmathview_frontend_libxml2.la \ + $(NULL) + +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 \ ++ $(top_builddir)/src/engine/boxml/libboxml.la \ + $(T1_LIBS) \ + $(T1_LIBS_X) \ + $(NULL) +@@ -88,6 +89,8 @@ + $(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) + -- cgit v1.2.3-54-g00ecf From e45256216e1810c532395137dfe07f1e1e16180c Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Wed, 5 Dec 2012 23:43:35 -0500 Subject: Add google-gadgets-0.11.2-glib-2.31.patch and google-gadgets-0.11.2-gcc-4.7.patch --- community/google-gadgets/PKGBUILD | 11 +- .../google-gadgets-0.11.2-gcc-4.7.patch | 325 +++++++++++++++++++++ .../google-gadgets-0.11.2-glib-2.31.patch | 25 ++ 3 files changed, 358 insertions(+), 3 deletions(-) create mode 100644 community/google-gadgets/google-gadgets-0.11.2-gcc-4.7.patch create mode 100644 community/google-gadgets/google-gadgets-0.11.2-glib-2.31.patch diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD index 21e2e2b7a..34c643492 100644 --- a/community/google-gadgets/PKGBUILD +++ b/community/google-gadgets/PKGBUILD @@ -20,9 +20,13 @@ makedepends=('gstreamer0.10-base-plugins' 'libwebkit' 'zip' 'flex') options=('!libtool') source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2" - "wifi-types.patch") + "wifi-types.patch" + "google-gadgets-0.11.2-glib-2.31.patch" + "google-gadgets-0.11.2-gcc-4.7.patch") md5sums=('279305553bcbf74f3e3615f6abc36a5e' - 'f0df71c60a174e9d629db87b8bd9e102') + 'f0df71c60a174e9d629db87b8bd9e102' + '1b9c7769d6659ea77069e9c22592797a' + 'b62bc8592b5a44cb34cb7a7e4a6cf62e') build() { cd "$srcdir/$_realname-$pkgver" @@ -32,7 +36,8 @@ build() { # # xulrunner 2.0 is incompatible; # we build without smjs-script/browser-element - + patch -Np1 -i ${srcdir}/google-gadgets-0.11.2-glib-2.31.patch + patch -Np1 -i ${srcdir}/google-gadgets-0.11.2-gcc-4.7.patch patch -p1 <$srcdir/wifi-types.patch ./configure --prefix=/usr \ --disable-werror \ diff --git a/community/google-gadgets/google-gadgets-0.11.2-gcc-4.7.patch b/community/google-gadgets/google-gadgets-0.11.2-gcc-4.7.patch new file mode 100644 index 000000000..2e77e10fd --- /dev/null +++ b/community/google-gadgets/google-gadgets-0.11.2-gcc-4.7.patch @@ -0,0 +1,325 @@ +Author: Pino Toscano +Description: Fix building with GCC 4.7 + This patch fixes the two kinds of issues that arise with GCC 4.7: + - include for functions like access(), fork(), readlink(), etc + - fix argument-dependent lookup issues by qualifying the lookup of functions +Forwarded: no +Last-Update: 2012-04-04 + +--- a/ggadget/scriptable_enumerator.h ++++ b/ggadget/scriptable_enumerator.h +@@ -68,22 +68,22 @@ + + protected: + virtual void DoClassRegister() { +- RegisterMethod("atEnd", ++ this->RegisterMethod("atEnd", + NewSlot(&E::AtEnd, + &ScriptableEnumerator + ::enumerator_)); +- RegisterMethod("moveFirst", ++ this->RegisterMethod("moveFirst", + NewSlot(&E::MoveFirst, + &ScriptableEnumerator + ::enumerator_)); +- RegisterMethod("moveNext", ++ this->RegisterMethod("moveNext", + NewSlot(&E::MoveNext, + &ScriptableEnumerator + ::enumerator_)); +- RegisterMethod("item", ++ this->RegisterMethod("item", + NewSlot(&ScriptableEnumerator + ::GetItem)); +- RegisterProperty("count", ++ this->RegisterProperty("count", + NewSlot(&E::GetCount, + &ScriptableEnumerator + ::enumerator_), +--- a/ggadget/uuid.cc ++++ b/ggadget/uuid.cc +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include "string_utils.h" + +--- a/ggadget/xml_dom.cc ++++ b/ggadget/xml_dom.cc +@@ -1327,15 +1327,15 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterProperty("data", NewSlot(&DOMCharacterData::GetData), ++ this->RegisterProperty("data", NewSlot(&DOMCharacterData::GetData), + NewSlot(&DOMCharacterData::SetData)); +- RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL); +- RegisterMethod("substringData", ++ this->RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL); ++ this->RegisterMethod("substringData", + NewSlot(&DOMCharacterData::ScriptSubstringData)); +- RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData)); +- RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData)); +- RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData)); +- RegisterMethod("replaceData", ++ this->RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData)); ++ this->RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData)); ++ this->RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData)); ++ this->RegisterMethod("replaceData", + NewSlot(&DOMCharacterData::ScriptReplaceData)); + } + +@@ -1377,20 +1377,20 @@ + private: + UTF16String ScriptSubstringData(size_t offset, size_t count) { + UTF16String result; +- CheckException(SubstringData(offset, count, &result)); ++ this->CheckException(SubstringData(offset, count, &result)); + return result; + } + + void ScriptInsertData(size_t offset, const UTF16String &arg) { +- CheckException(InsertData(offset, arg)); ++ this->CheckException(InsertData(offset, arg)); + } + + void ScriptDeleteData(size_t offset, size_t count) { +- CheckException(DeleteData(offset, count)); ++ this->CheckException(DeleteData(offset, count)); + } + + void ScriptReplaceData(size_t offset, size_t count, const UTF16String &arg) { +- CheckException(ReplaceData(offset, count, arg)); ++ this->CheckException(ReplaceData(offset, count, arg)); + } + + DOMCharacterDataImpl impl_; +@@ -1417,10 +1417,10 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL); ++ this->RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL); + // Our DOMAttrs are always specified, because we don't support DTD for now. +- RegisterConstant("specified", true); +- RegisterProperty("value", NewSlot(&DOMAttr::GetValue), ++ this->RegisterConstant("specified", true); ++ this->RegisterProperty("value", NewSlot(&DOMAttr::GetValue), + NewSlot(&DOMAttr::SetValue)); + // ownerElement is a DOM2 property, so not registered for now. + } +@@ -1516,19 +1516,19 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL); +- RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute)); +- RegisterMethod("setAttribute", ++ this->RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL); ++ this->RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute)); ++ this->RegisterMethod("setAttribute", + NewSlot(&DOMElement::ScriptSetAttribute)); +- RegisterMethod("removeAttribute", ++ this->RegisterMethod("removeAttribute", + NewSlot(&DOMElement::RemoveAttribute)); +- RegisterMethod("getAttributeNode", ++ this->RegisterMethod("getAttributeNode", + NewSlot(&DOMElement::GetAttributeNodeNotConst)); +- RegisterMethod("setAttributeNode", ++ this->RegisterMethod("setAttributeNode", + NewSlot(&DOMElement::ScriptSetAttributeNode)); +- RegisterMethod("removeAttributeNode", ++ this->RegisterMethod("removeAttributeNode", + NewSlot(&DOMElement::ScriptRemoveAttributeNode)); +- RegisterMethod("getElementsByTagName", ++ this->RegisterMethod("getElementsByTagName", + NewSlot(&Super::GetElementsByTagNameNotConst)); + } + +@@ -1696,16 +1696,16 @@ + } + + virtual void DoClassRegister() { +- RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL); +- RegisterMethod("getNamedItem", ++ this->RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL); ++ this->RegisterMethod("getNamedItem", + NewSlot(&AttrsNamedMap::GetNamedItemNotConst)); +- RegisterMethod("setNamedItem", ++ this->RegisterMethod("setNamedItem", + NewSlot(&AttrsNamedMap::ScriptSetNamedItem)); +- RegisterMethod("removeNamedItem", ++ this->RegisterMethod("removeNamedItem", + NewSlot(&AttrsNamedMap::ScriptRemoveNamedItem)); +- RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst)); ++ this->RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst)); + // Microsoft compatibility. +- RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst)); ++ this->RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst)); + } + + virtual DOMNodeInterface *GetNamedItem(const std::string &name) { +@@ -1875,7 +1875,7 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText)); ++ this->RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText)); + } + + virtual NodeType GetNodeType() const { return TEXT_NODE; } +@@ -2060,9 +2060,9 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterProperty("target", ++ this->RegisterProperty("target", + NewSlot(&DOMProcessingInstruction::GetTarget), NULL); +- RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData), ++ this->RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData), + NewSlot(&DOMProcessingInstruction::SetData)); + } + +@@ -2109,7 +2109,7 @@ + DEFINE_CLASS_ID(0xd23149a89cf24e12, DOMImplementationInterface); + + virtual void DoClassRegister() { +- RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature)); ++ this->RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature)); + } + + virtual bool HasFeature(const char *feature, const char *version) const { +@@ -2129,13 +2129,13 @@ + void SetCode(int code) { code_ = code; } + + virtual void DoClassRegister() { +- RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL); +- RegisterConstant("filepos", 0); +- RegisterConstant("line", 0); +- RegisterConstant("linepos", 0); +- RegisterConstant("reason", ""); +- RegisterConstant("srcText", ""); +- RegisterConstant("url", ""); ++ this->RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL); ++ this->RegisterConstant("filepos", 0); ++ this->RegisterConstant("line", 0); ++ this->RegisterConstant("linepos", 0); ++ this->RegisterConstant("reason", ""); ++ this->RegisterConstant("srcText", ""); ++ this->RegisterConstant("url", ""); + } + + private: +@@ -2180,45 +2180,45 @@ + + virtual void DoClassRegister() { + Super::DoClassRegister(); +- RegisterConstant("doctype", static_cast(NULL)); +- RegisterConstant("implementation", &dom_implementation_); +- RegisterProperty("documentElement", ++ this->RegisterConstant("doctype", static_cast(NULL)); ++ this->RegisterConstant("implementation", &dom_implementation_); ++ this->RegisterProperty("documentElement", + NewSlot(&DOMDocument::GetDocumentElementNotConst), NULL); +- RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML)); +- RegisterMethod("createElement", ++ this->RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML)); ++ this->RegisterMethod("createElement", + NewSlot(&DOMDocument::ScriptCreateElement)); +- RegisterMethod("createDocumentFragment", ++ this->RegisterMethod("createDocumentFragment", + NewSlot(&DOMDocument::CreateDocumentFragment)); +- RegisterMethod("createTextNode", ++ this->RegisterMethod("createTextNode", + NewSlot(&DOMDocument::CreateTextNode)); +- RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment)); +- RegisterMethod("createCDATASection", ++ this->RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment)); ++ this->RegisterMethod("createCDATASection", + NewSlot(&DOMDocument::CreateCDATASection)); +- RegisterMethod("createProcessingInstruction", ++ this->RegisterMethod("createProcessingInstruction", + NewSlot(&DOMDocument::ScriptCreateProcessingInstruction)); +- RegisterMethod("createAttribute", ++ this->RegisterMethod("createAttribute", + NewSlot(&DOMDocument::ScriptCreateAttribute)); +- RegisterMethod("createEntityReference", ++ this->RegisterMethod("createEntityReference", + NewSlot(&DOMDocument::ScriptCreateEntityReference)); +- RegisterMethod("getElementsByTagName", ++ this->RegisterMethod("getElementsByTagName", + NewSlot(&Super::GetElementsByTagNameNotConst)); +- RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode)); ++ this->RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode)); + // Compatibility with Microsoft DOM. +- RegisterProperty("parsed", NewFixedGetterSlot(true), NULL); +- RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL); +- RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter)); +- RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter)); +- RegisterProperty("preserveWhiteSpace", ++ this->RegisterProperty("parsed", NewFixedGetterSlot(true), NULL); ++ this->RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL); ++ this->RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter)); ++ this->RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter)); ++ this->RegisterProperty("preserveWhiteSpace", + NewSlot(&DOMDocument::PreservesWhiteSpace), + NewSlot(&DOMDocument::SetPreserveWhiteSpace)); +- RegisterMethod("getProperty", NewSlot(DummyGetProperty)); +- RegisterMethod("setProperty", NewSlot(DummySetProperty)); ++ this->RegisterMethod("getProperty", NewSlot(DummyGetProperty)); ++ this->RegisterMethod("setProperty", NewSlot(DummySetProperty)); + // Compatibility with Microsoft DOM: XMLHttpRequest functions. +- RegisterProperty("async", NewSlot(&DOMDocument::IsAsync), ++ this->RegisterProperty("async", NewSlot(&DOMDocument::IsAsync), + NewSlot(&DOMDocument::SetAsync)); +- RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL); +- RegisterMethod("load", NewSlot(&DOMDocument::Load)); +- RegisterClassSignal("onreadystatechange", ++ this->RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL); ++ this->RegisterMethod("load", NewSlot(&DOMDocument::Load)); ++ this->RegisterClassSignal("onreadystatechange", + &DOMDocument::onreadystatechange_signal_); + } + +--- a/ggadget/xdg/icon_theme.cc ++++ b/ggadget/xdg/icon_theme.cc +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include + #include +--- a/extensions/qt_system_framework/qt_system_framework.cc ++++ b/extensions/qt_system_framework/qt_system_framework.cc +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #define Initialize qt_system_framework_LTX_Initialize + #define Finalize qt_system_framework_LTX_Finalize +--- a/extensions/linux_system_framework/process.cc ++++ b/extensions/linux_system_framework/process.cc +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_X11 + #include +--- a/gadgets/designer/designer_script_utils.cc ++++ b/gadgets/designer/designer_script_utils.cc +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + namespace ggadget { + namespace designer { diff --git a/community/google-gadgets/google-gadgets-0.11.2-glib-2.31.patch b/community/google-gadgets/google-gadgets-0.11.2-glib-2.31.patch new file mode 100644 index 000000000..912f47235 --- /dev/null +++ b/community/google-gadgets/google-gadgets-0.11.2-glib-2.31.patch @@ -0,0 +1,25 @@ +--- google-gadgets-for-linux-0.11.2.orig/ggadget/gtk/main_loop.cc 2009-12-28 05:39:59.000000000 -0500 ++++ google-gadgets-for-linux-0.11.2/ggadget/gtk/main_loop.cc 2012-12-03 19:27:35.160966552 -0500 +@@ -16,9 +16,8 @@ + + #include + #include +-#include ++#include + #include +-#include + #include + #include "main_loop.h" + #include "utilities.h" + +--- google-gadgets-for-linux-0.11.2.orig/hosts/gtk/main.cc 2009-09-22 04:12:00.000000000 -0500 ++++ google-gadgets-for-linux-0.11.2/hosts/gtk/main.cc 2012-12-01 03:56:37.320907813 -0500 +@@ -15,7 +15,7 @@ + */ + + #include +-#include ++#include + #include + #include + #include -- cgit v1.2.3-54-g00ecf From 14bebd3dada7119d2752f26c90b3e326b3c6ee57 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Thu, 6 Dec 2012 01:18:58 -0500 Subject: Fix refocus-gimp-2.0.patch in gimp-refocus --- community/gimp-refocus/PKGBUILD | 2 +- community/gimp-refocus/refocus-gimp-2.0.patch | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/community/gimp-refocus/PKGBUILD b/community/gimp-refocus/PKGBUILD index 6c031e39c..1bdf44954 100644 --- a/community/gimp-refocus/PKGBUILD +++ b/community/gimp-refocus/PKGBUILD @@ -13,7 +13,7 @@ depends=('gimp') source=(http://downloads.sourceforge.net/sourceforge/refocus/refocus-${pkgver}.tar.gz \ refocus-gimp-2.0.patch refocus-mirror-fix.patch refocus-gimp-preview.patch) md5sums=('8d4eac4ef45c904fb5e73021696bec94' - '8ef9dfe697cd20be2be14c1ee53a240a' + '0280f3d4c4d7838da459d8070abb6966' '532593cba030feab8ffa7800fc9cd782' '6b55dbdc656646c765064cf21e1a3c57') diff --git a/community/gimp-refocus/refocus-gimp-2.0.patch b/community/gimp-refocus/refocus-gimp-2.0.patch index 259ee9f87..db359487c 100644 --- a/community/gimp-refocus/refocus-gimp-2.0.patch +++ b/community/gimp-refocus/refocus-gimp-2.0.patch @@ -35,11 +35,14 @@ diff -u -u -r1.1.1.1 configure.in AM_PATH_GTK_2_0(2.0.0) AM_PATH_GLIB_2_0(2.0.0) -@@ -106,5 +106,6 @@ +@@ -106,5 +106,9 @@ #Check if erf is defined in the mathlibrary AC_CHECK_LIB(m, erf, AC_DEFINE(HAVE_ERF)) -AC_OUTPUT([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ]) ++#Check if ceil is defined in the mathlibrary ++AC_CHECK_LIB(m, ceil) ++ +AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ]) +AC_OUTPUT -- cgit v1.2.3-54-g00ecf From 5744b9c41fe6cb916e3ce6b4b0cad8597ef9e409 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Thu, 6 Dec 2012 05:58:58 -0500 Subject: Add gshutdown-0.2-glib.patch --- community/gshutdown/PKGBUILD | 8 ++- community/gshutdown/gshutdown-0.2-glib.patch | 100 +++++++++++++++++++++++++++ 2 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 community/gshutdown/gshutdown-0.2-glib.patch diff --git a/community/gshutdown/PKGBUILD b/community/gshutdown/PKGBUILD index 31bb7d762..36a1fc53a 100644 --- a/community/gshutdown/PKGBUILD +++ b/community/gshutdown/PKGBUILD @@ -11,12 +11,14 @@ url="http://gshutdown.tuxfamily.org" license=('GPL') depends=('libglade' 'libnotify') makedepends=('pkg-config') -source=(http://gshutdown.tuxfamily.org/release/$pkgname-$pkgver.tar.gz) -md5sums=('c0662f6b74fa1be10e4d34bfc5731d9b') -sha1sums=('ab73b1d6c36831df82d231ffa333cdf394fd5b3e') +source=(http://gshutdown.tuxfamily.org/release/$pkgname-$pkgver.tar.gz + gshutdown-0.2-glib.patch) +md5sums=('c0662f6b74fa1be10e4d34bfc5731d9b' + '8d624b2651240d5dffd5fd208a5354ff') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i ${srcdir}/gshutdown-0.2-glib.patch sed -i 's/notify_notification_new("GShutdown", message, NULL, GTK_WIDGET(widget));/notify_notification_new("GShutdown", message, GTK_WIDGET(widget));/' src/gui.c LDFLAGS="-lX11 -lXau" ./configure --prefix=/usr --mandir=/usr/share make diff --git a/community/gshutdown/gshutdown-0.2-glib.patch b/community/gshutdown/gshutdown-0.2-glib.patch new file mode 100644 index 000000000..1bf1d52db --- /dev/null +++ b/community/gshutdown/gshutdown-0.2-glib.patch @@ -0,0 +1,100 @@ +--- gshutdown-0.2.orig/src/timer.h 2007-04-14 17:33:39.000000000 -0500 ++++ gshutdown-0.2/src/timer.h 2012-12-06 05:12:38.525897810 -0500 +@@ -21,7 +21,7 @@ + #ifndef __GSHUTDOWN_TIMER__ + #define __GSHUTDOWN_TIMER__ + +-#include ++#include + + guint time_left(); + gboolean timer_notify(); + +--- gshutdown-0.2.orig/src/misc.h 2007-04-14 17:33:39.000000000 -0500 ++++ gshutdown-0.2/src/misc.h 2012-12-06 05:13:01.306051982 -0500 +@@ -20,7 +20,7 @@ + #ifndef __GSHUTDOWN_MISC__ + #define __GSHUTDOWN_MISC__ + +-#include /* gchar */ ++#include /* gchar */ + + /* Return a data file path. e.g: gshutdown.glade */ + gchar *data_path(gchar *filename); + +--- gshutdown-0.2.orig/src/values.h 2007-05-19 06:42:54.000000000 -0500 ++++ gshutdown-0.2/src/values.h 2012-12-06 05:24:45.017440329 -0500 +@@ -21,7 +21,7 @@ + #ifndef __GSHUTDOWN_VALUES__ + #define __GSHUTDOWN_VALUES__ + +-#include ++#include + #include "action.h" + + typedef enum { + +--- gshutdown-0.2.orig/src/values.c 2007-04-14 17:33:40.000000000 -0500 ++++ gshutdown-0.2/src/values.c 2012-12-06 05:30:03.170195207 -0500 +@@ -20,8 +20,7 @@ + + #include + #include +-#include +-#include /* g_build_path */ ++#include + #include "values.h" + #include "gui.h" + #include "detectwm.h" + +--- gshutdown-0.2.orig/src/detectwm.h 2007-04-14 17:33:39.000000000 -0500 ++++ gshutdown-0.2/src/detectwm.h 2012-12-06 05:35:18.027783235 -0500 +@@ -21,7 +21,7 @@ + #ifndef __GSHUTDOWN_WMDETECT__ + #define __GSHUTDOWN_WMDETECT__ + +-#include ++#include + + gchar *detect_window_manager(); + +--- gshutdown-0.2.orig/src/misc.c 2007-04-14 17:33:39.000000000 -0500 ++++ gshutdown-0.2/src/misc.c 2012-12-06 05:38:44.229476612 -0500 +@@ -20,12 +20,7 @@ + + #include /* X_OK */ + #include +-#include +-#include /* g_strdup_printf */ +-#include /* g_free */ +-#include /* g_getenv */ +-#include /* g_file_test() */ +-#include /* g_shell_parse_argv */ ++#include + #include "config.h" + #include "misc.h" + #include "main.h" + +--- gshutdown-0.2.orig/src/timer.c 2007-05-19 06:30:38.000000000 -0500 ++++ gshutdown-0.2/src/timer.c 2012-12-06 05:42:37.654561395 -0500 +@@ -18,7 +18,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#include ++#include + #include "timer.h" + #include "values.h" + #include "gui.h" + +--- gshutdown-0.2.orig/src/main.c 2007-06-24 08:03:38.000000000 -0500 ++++ gshutdown-0.2/src/main.c 2012-12-06 05:46:46.729676922 -0500 +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include /* g_atexit() */ ++#include /* g_atexit() */ + #include "main.h" + #include "gui.h" + #include "misc.h" -- cgit v1.2.3-54-g00ecf From ea54a1d2aaff7d180e380c130e2cfe01e7ef8cc0 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 7 Dec 2012 11:19:13 -0500 Subject: Rebuild packages --- community/bonnie++/PKGBUILD | 2 +- community/cmatrix/PKGBUILD | 4 ++-- community/gimp-refocus/PKGBUILD | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD index 9b7d990f4..28d4c6a9b 100644 --- a/community/bonnie++/PKGBUILD +++ b/community/bonnie++/PKGBUILD @@ -4,7 +4,7 @@ pkgname=bonnie++ pkgver=1.03e -pkgrel=6 +pkgrel=6.1 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray" arch=('i686' 'x86_64' 'mips64el') url="http://www.coker.com.au/bonnie++/" diff --git a/community/cmatrix/PKGBUILD b/community/cmatrix/PKGBUILD index 2506b8326..3f356a518 100644 --- a/community/cmatrix/PKGBUILD +++ b/community/cmatrix/PKGBUILD @@ -3,9 +3,9 @@ pkgname=cmatrix pkgver=1.2a -pkgrel=6 +pkgrel=6.1 pkgdesc="Let you see the matrix code in your console" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.asty.org/cmatrix/" license=('GPL') depends=('ncurses' 'fontconfig') diff --git a/community/gimp-refocus/PKGBUILD b/community/gimp-refocus/PKGBUILD index 1bdf44954..4c6d8ba49 100644 --- a/community/gimp-refocus/PKGBUILD +++ b/community/gimp-refocus/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gimp-refocus pkgver=0.9.0 -pkgrel=3 +pkgrel=3.1 pkgdesc="A sharpen plugin for gimp using FIR Wiener filtering" arch=('i686' 'x86_64' 'mips64el') url="http://refocus.sourceforge.net/" -- cgit v1.2.3-54-g00ecf