Hello community, here is the log from the commit of package gtkmathview for openSUSE:Factory checked in at 2012-03-26 15:36:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkmathview (Old) and /work/SRC/openSUSE:Factory/.gtkmathview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtkmathview", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkmathview/gtkmathview.changes 2011-10-16 12:50:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtkmathview.new/gtkmathview.changes 2012-03-26 15:36:54.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Mar 21 11:09:37 UTC 2012 - [email protected] + +- Replace gtkmathview-gcc43-fixes.patch with proper fixes: + + Add gtkmathview-git-fixes.patch, taken from git. + + Define AM_BINRELOC macros in acinclude.m4 during %prep, to + avoid issue during autoreconf. +- Rebase gtkmathview-0.8.0-gcc47.patch. +- Add missing patch tags for all patches. + +------------------------------------------------------------------- +Mon Mar 19 09:33:52 UTC 2012 - [email protected] + +- Add gtkmathview-0.8.0-gcc47.patch: fix building with GCC 4.7; + patch taken from Fedora. + +------------------------------------------------------------------- Old: ---- gtkmathview-gcc43-fixes.patch New: ---- gtkmathview-0.8.0-gcc47.patch gtkmathview-git-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkmathview.spec ++++++ --- /var/tmp/diff_new_pack.1MlX77/_old 2012-03-26 15:36:55.000000000 +0200 +++ /var/tmp/diff_new_pack.1MlX77/_new 2012-03-26 15:36:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gtkmathview # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,71 +20,66 @@ Name: gtkmathview Version: 0.8.0 -Release: 3 +Release: 0 +Summary: A rendering engine for MathML documents License: GPL-2.0+ ; LGPL-3.0+ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ gtk2-devel >= 2.2.1 -BuildRequires: glib2-devel >= 2.2.1 -BuildRequires: libxml2-devel >= 2.6.7 libxslt popt-devel t1lib-devel -BuildRequires: libtool -BuildRequires: gmetadom-devel >= 0.1.8 +Group: System/Libraries Source0: %{name}-%{version}.tar.bz2 -Patch: gtkmathview-gcc43-fixes.patch +# PATCH-FIX-UPSTREAM gtkmathview-git-fixes.patch [email protected] -- Fixes from git +Patch0: gtkmathview-git-fixes.patch +# PATCH-FIX-UPSTREAM gtkmathview-other-fixes.patch [email protected] -- Missing return value (sent upstream by mail -- vuntz, 2012-03-21) Patch1: gtkmathview-other-fixes.patch -Group: System/Libraries -Summary: A rendering engine for MathML documents +# PATCH-FIX-UPSTREAM gtkmathview-0.8.0-gcc47.patch [email protected] -- Fix build with gcc 4.7 (sent upstream by mail -- vuntz, 2012-03-21) +Patch2: gtkmathview-0.8.0-gcc47.patch +BuildRequires: gcc-c++ +BuildRequires: glib2-devel >= 2.2.1 +BuildRequires: gmetadom-devel >= 0.1.8 +BuildRequires: gtk2-devel >= 2.2.1 +# needed for patch0 +BuildRequires: libtool +BuildRequires: libxml2-devel >= 2.6.7 +BuildRequires: libxslt +BuildRequires: popt-devel +BuildRequires: t1lib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GtkMathView is a C++ rendering engine for MathML documents. It provides an interactive view that can be used for browsing and editing MathML markup. - - -Authors: --------- - Luca Padovani - %package -n libgtkmathview -License: GPL-2.0+ ; LGPL-3.0+ -Group: System/Libraries Summary: A rendering engine for MathML documents +Group: System/Libraries %description -n libgtkmathview GtkMathView is a C++ rendering engine for MathML documents. It provides an interactive view that can be used for browsing and editing MathML markup. - - -Authors: --------- - Luca Padovani - %package devel -License: GPL-2.0+ ; LGPL-3.0+ Summary: A rendering engine for MathML documents -Requires: libgtkmathview = %{version} -Requires: t1lib-devel glib2-devel >= 2.2.1 Group: System/Libraries +Requires: glib2-devel >= 2.2.1 +Requires: libgtkmathview = %{version} +Requires: t1lib-devel %description devel GtkMathView is a C++ rendering engine for MathML documents. It provides an interactive view that can be used for browsing and editing MathML markup. - - -Authors: --------- - Luca Padovani - %prep %setup -q -%patch -p1 +%patch0 -p1 %patch1 -p1 +%patch2 -p1 +# needed for patch0 +# AM_BINRELOC missing, just ignore +echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4 %build +# needed for patch0 autoreconf -si %configure --disable-static make ++++++ gtkmathview-0.8.0-gcc47.patch ++++++ diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc47 gtkmathview-0.8.0/mathmlps/main.cc --- gtkmathview-0.8.0/mathmlps/main.cc.gcc47 2012-02-27 13:12:01.218602317 -0500 +++ gtkmathview-0.8.0/mathmlps/main.cc 2012-02-27 13:12:06.596555579 -0500 @@ -21,6 +21,13 @@ #include <cassert> #include <cstring> #include <fstream> +#ifdef __linux__ +/* to get getopt on Linux */ +#ifndef __USE_POSIX2 +#define __USE_POSIX2 +#endif +#endif +#include <unistd.h> #include <popt.h> diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47 gtkmathview-0.8.0/mathmlsvg/main.cc --- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47 2012-02-27 13:10:33.335366105 -0500 +++ gtkmathview-0.8.0/mathmlsvg/main.cc 2012-02-27 13:10:33.374365766 -0500 @@ -21,6 +21,13 @@ #include <cassert> #include <cstring> #include <fstream> +#ifdef __linux__ +/* to get getopt on Linux */ +#ifndef __USE_POSIX2 +#define __USE_POSIX2 +#endif +#endif +#include <unistd.h> #include <popt.h> diff -up gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh --- gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47 2007-08-17 06:02:34.000000000 -0400 +++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh 2012-02-27 13:10:33.376365750 -0500 @@ -47,12 +47,13 @@ protected: SmartPtr<typename ElementBuilder::type> getElement(const typename Model::Element& el) const { - if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el))) + SmartPtr<typename ElementBuilder::type> elem; + if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el))) return elem; else { - SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); - linkerAdd(el, elem); + elem = ElementBuilder::type::create(ElementBuilder::getContext(*this)); + this->linkerAdd(el, elem); return elem; } } diff -up gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh --- gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47 2007-08-17 06:02:34.000000000 -0400 +++ gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh 2012-02-27 13:10:33.377365741 -0500 @@ -43,7 +43,7 @@ protected: findValidNodeForward(const typename Model::Node& p0) const { for (typename Model::Node p = p0; p; p = Model::getNextSibling(p)) - if (valid(p)) return Model::asElement(p); + if (this->valid(p)) return Model::asElement(p); return typename Model::Element(); } ++++++ gtkmathview-git-fixes.patch ++++++ >From 73e8555a23bad9211ff02f366e0d0b07b05ed623 Mon Sep 17 00:00:00 2001 From: Luca Padovani <[email protected]> Date: Fri, 07 Mar 2008 11:11:11 +0000 Subject: + include cstring svn path=/trunk/; revision=1179 --- diff --git a/src/engine/mathml/mathVariantAux.cc b/src/engine/mathml/mathVariantAux.cc index 7792ca5..92e4716 100644 --- a/src/engine/mathml/mathVariantAux.cc +++ b/src/engine/mathml/mathVariantAux.cc @@ -23,6 +23,7 @@ #include <config.h> #include <cassert> +#include <cstring> #include "mathVariantAux.hh" -- cgit v0.9.0.2 >From b2f8d5e78c6b398a18e79fcbe44d1fd00366f380 Mon Sep 17 00:00:00 2001 From: Luca Padovani <[email protected]> Date: Fri, 07 Mar 2008 11:15:28 +0000 Subject: + include <cstring> svn path=/trunk/; revision=1180 --- diff --git a/src/backend/ps/T1_FontDataBase.cc b/src/backend/ps/T1_FontDataBase.cc index c4299ba..538f18d 100644 --- a/src/backend/ps/T1_FontDataBase.cc +++ b/src/backend/ps/T1_FontDataBase.cc @@ -23,7 +23,7 @@ #include <t1lib.h> #include <config.h> #include <map> -#include <string> +#include <cstring> #include <stdlib.h> #include <iostream> #include <list> -- cgit v0.9.0.2 >From d1f217fb81ede76c7b8197cb35c89307f2071675 Mon Sep 17 00:00:00 2001 From: Luca Padovani <[email protected]> Date: Fri, 07 Mar 2008 12:50:42 +0000 Subject: + include <cstring> svn path=/trunk/; revision=1181 --- diff --git a/mathmlps/main.cc b/mathmlps/main.cc index b1a10b7..6d1f58e 100644 --- a/mathmlps/main.cc +++ b/mathmlps/main.cc @@ -23,6 +23,7 @@ #include <config.h> #include <cassert> +#include <cstring> #include <fstream> #include <popt.h> diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc index d513e43..1f1f9d1 100644 --- a/mathmlsvg/SMS.cc +++ b/mathmlsvg/SMS.cc @@ -22,6 +22,7 @@ #include <config.h> +#include <cstring> #include <sstream> #include "defs.h" #include "AbstractLogger.hh" diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc index ee031a8..fcc9f5c 100644 --- a/mathmlsvg/main.cc +++ b/mathmlsvg/main.cc @@ -23,6 +23,7 @@ #include <config.h> #include <cassert> +#include <cstring> #include <fstream> #include <popt.h> -- cgit v0.9.0.2 >From 0eaedb53ba13b72490885f9585f8fedd64884611 Mon Sep 17 00:00:00 2001 From: Luca Padovani <[email protected]> Date: Tue, 11 Nov 2008 14:37:00 +0000 Subject: + fissati header svn path=/trunk/; revision=1183 --- diff --git a/src/common/AbstractLogger.cc b/src/common/AbstractLogger.cc index 1fc63dd..d4a4f77 100644 --- a/src/common/AbstractLogger.cc +++ b/src/common/AbstractLogger.cc @@ -22,7 +22,8 @@ #include <config.h> -#include <stdarg.h> +#include <cstdarg> +#include <cstdio> #include "AbstractLogger.hh" -- cgit v0.9.0.2 >From 3918e889f1d36b3ee4be0a06714c59ea42dc09f3 Mon Sep 17 00:00:00 2001 From: Luca Padovani <[email protected]> Date: Mon, 23 Mar 2009 17:34:14 +0000 Subject: + small fixes for removing gcc warnings svn path=/trunk/; revision=1185 --- diff --git a/configure.ac b/configure.ac index 85d26b9..4f2118e 100644 --- a/configure.ac +++ b/configure.ac @@ -252,6 +252,16 @@ AC_SUBST(GTKMATHVIEW_SIZEOF_WCHAR_T, "$ac_cv_sizeof_wchar_t") AC_LANG_PUSH(C++) +AC_CHECK_HEADERS(unordered_map, + [ + AC_DEFINE(GMV_HAVE_UNORDERED_MAP,1,[Define if <unordered_map> is provided]) + GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1 + ], + [ + GMV_HAVE_UNORDERED_MAP_CFLAGS= + ] +) +AC_SUBST(GMV_HAVE_UNORDERED_MAP_CFLAGS) AC_CHECK_HEADERS(hash_map, [ AC_DEFINE(GMV_HAVE_HASH_MAP,1,[Define if <hash_map> is provided]) diff --git a/src/backend/common/ComputerModernShaper.cc b/src/backend/common/ComputerModernShaper.cc index 8fa8c43..e44f36f 100644 --- a/src/backend/common/ComputerModernShaper.cc +++ b/src/backend/common/ComputerModernShaper.cc @@ -582,7 +582,7 @@ static UChar8 cmrTTFMap[] = }; #endif -static ComputerModernShaper::PlainChar cmsMap[] = +static ComputerModernShaper::PlainChar32 cmsMap[] = { { 0x007B, 0x66 }, // LEFT CURLY BRACKET { 0x007D, 0x67 }, // RIGHT CURLY BRACKET diff --git a/src/common/HashMap.hh b/src/common/HashMap.hh index d37b531..25cf8a2 100644 --- a/src/common/HashMap.hh +++ b/src/common/HashMap.hh @@ -24,14 +24,17 @@ #define __HashMap_hh__ // !!! BEGIN WARNING: hash_map is not part of the STL !!! -#if defined(GMV_HAVE_EXT_HASH_MAP) +#if defined(GMV_HAVE_UNORDERED_MAP) + #include <unordered_map> +#define HASH_MAP_NS std +#elif defined(GMV_HAVE_EXT_HASH_MAP) #include <ext/hash_map> #define HASH_MAP_NS __gnu_cxx #elif defined(GMV_HAVE_HASH_MAP) #include <hash_map> #define HASH_MAP_NS std #else -#error "no implementation of hash_map could be found" +#error "no implementation of unordered_map or hash_map could be found" #endif // !!! END WARNING: hash_map is not part of the STL !!! diff --git a/src/engine/mathml/MathMLTableFormatter.cc b/src/engine/mathml/MathMLTableFormatter.cc index 05ab60b..537b212 100644 --- a/src/engine/mathml/MathMLTableFormatter.cc +++ b/src/engine/mathml/MathMLTableFormatter.cc @@ -102,9 +102,6 @@ MathMLTableFormatter::init(const FormattingContext& ctxt, equalRows = ToBoolean(equalRowsV); equalColumns = ToBoolean(equalColumnsV); - assert(nGridRows >= 0); - assert(nGridColumns >= 0); - #if 0 std::cerr << "CI SIAMO: " << nRows << "x" << nColumns << std::endl << "grid: " << nGridRows << "x" << nGridColumns << std::endl -- cgit v0.9.0.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
