Date: Thursday, March 25, 2021 @ 10:50:55
Author: jgc
Revision: 410890
archrelease: copy trunk to extra-x86_64
Added:
gtkmathview/repos/extra-x86_64/PKGBUILD
(from rev 410889, gtkmathview/trunk/PKGBUILD)
gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-cond-t1.patch
(from rev 410889, gtkmathview/trunk/gtkmathview-0.8.0-cond-t1.patch)
gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-gcc43.patch
(from rev 410889, gtkmathview/trunk/gtkmathview-0.8.0-gcc43.patch)
gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-gcc47.patch
(from rev 410889, gtkmathview/trunk/gtkmathview-0.8.0-gcc47.patch)
gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-includes.patch
(from rev 410889, gtkmathview/trunk/gtkmathview-0.8.0-includes.patch)
gtkmathview/repos/extra-x86_64/gtkmathview-gcc6.patch
(from rev 410889, gtkmathview/trunk/gtkmathview-gcc6.patch)
gtkmathview/repos/extra-x86_64/gtkmathview-gcc7.patch
(from rev 410889, gtkmathview/trunk/gtkmathview-gcc7.patch)
Deleted:
gtkmathview/repos/extra-x86_64/PKGBUILD
gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-cond-t1.patch
gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-gcc43.patch
gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-gcc47.patch
gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-includes.patch
gtkmathview/repos/extra-x86_64/gtkmathview-gcc6.patch
gtkmathview/repos/extra-x86_64/gtkmathview-gcc7.patch
----------------------------------+
PKGBUILD | 111 ++++++++++----------
gtkmathview-0.8.0-cond-t1.patch | 44 ++++----
gtkmathview-0.8.0-gcc43.patch | 112 ++++++++++----------
gtkmathview-0.8.0-gcc47.patch | 134 ++++++++++++-------------
gtkmathview-0.8.0-includes.patch | 24 ++--
gtkmathview-gcc6.patch | 198 ++++++++++++++++++-------------------
gtkmathview-gcc7.patch | 54 +++++-----
7 files changed, 339 insertions(+), 338 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-25 10:50:45 UTC (rev 410889)
+++ PKGBUILD 2021-03-25 10:50:55 UTC (rev 410890)
@@ -1,55 +0,0 @@
-# Maintainer: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: Jan de Groot <j...@archlinux.org>
-
-pkgname=gtkmathview
-pkgver=0.8.0
-pkgrel=7
-pkgdesc="C++ rendering engine for MathML documents"
-arch=('x86_64')
-url="http://helm.cs.unibo.it/mml-widget/";
-license=('LGPL3')
-depends=('popt' 'gtk2' 't1lib' 'gmetadom')
-source=(http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz
- gtkmathview-0.8.0-gcc43.patch
- gtkmathview-0.8.0-cond-t1.patch
- gtkmathview-0.8.0-gcc47.patch
- gtkmathview-0.8.0-includes.patch
- gtkmathview-gcc6.patch
- gtkmathview-gcc7.patch)
-sha256sums=('1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43'
- 'e55785f4dafedfe97679ce51e0753ffdd5eb8036b1dd00653b22e6e89aa02beb'
- '731894b852a8f692a3a1778bf6666a43e6afaa38e30b73d90272ae56d65bf709'
- '1437647e6782547021a774df6ee3efd23c1b80941044d4bf44b283879636fb3e'
- '09641f1547c5a526fc901b417ba1b1ae59ea251e56164dbf765ee7132e0c988b'
- '4ed73eb412392adbb48ea069290bb2a4d0c2de98597f55171b35ab01f72e7734'
- '7921e647ef4bd5d94c5218a15b636fc1f01c4dc33f60175b6046bce726c9cfb9')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc43.patch
- patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc47.patch
- patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-includes.patch
- patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch
- patch -p1 -i ../gtkmathview-gcc6.patch # Debian patch
- patch -p1 -i ../gtkmathview-gcc7.patch # Debian patch
-
- # AM_BINRELOC missing, just ignore
- echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4
- autoreconf -if
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --disable-static \
- --disable-gtk
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR=${pkgdir}/ install
-}
-
Copied: gtkmathview/repos/extra-x86_64/PKGBUILD (from rev 410889,
gtkmathview/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-03-25 10:50:55 UTC (rev 410890)
@@ -0,0 +1,56 @@
+# Maintainer: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: Jan de Groot <j...@archlinux.org>
+
+pkgname=gtkmathview
+pkgver=0.8.0
+pkgrel=8
+pkgdesc="C++ rendering engine for MathML documents"
+arch=('x86_64')
+url="http://helm.cs.unibo.it/mml-widget/";
+license=('LGPL3')
+depends=('popt' 't1lib' 'libxml2' 'glib2')
+source=(http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz
+ gtkmathview-0.8.0-gcc43.patch
+ gtkmathview-0.8.0-cond-t1.patch
+ gtkmathview-0.8.0-gcc47.patch
+ gtkmathview-0.8.0-includes.patch
+ gtkmathview-gcc6.patch
+ gtkmathview-gcc7.patch)
+sha256sums=('1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43'
+ 'e55785f4dafedfe97679ce51e0753ffdd5eb8036b1dd00653b22e6e89aa02beb'
+ '731894b852a8f692a3a1778bf6666a43e6afaa38e30b73d90272ae56d65bf709'
+ '1437647e6782547021a774df6ee3efd23c1b80941044d4bf44b283879636fb3e'
+ '09641f1547c5a526fc901b417ba1b1ae59ea251e56164dbf765ee7132e0c988b'
+ '4ed73eb412392adbb48ea069290bb2a4d0c2de98597f55171b35ab01f72e7734'
+ '7921e647ef4bd5d94c5218a15b636fc1f01c4dc33f60175b6046bce726c9cfb9')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i ../gtkmathview-0.8.0-gcc43.patch
+ patch -p1 -i ../gtkmathview-0.8.0-gcc47.patch
+ patch -p1 -i ../gtkmathview-0.8.0-includes.patch
+ patch -p1 -i ../gtkmathview-0.8.0-cond-t1.patch
+ patch -p1 -i ../gtkmathview-gcc6.patch # Debian patch
+ patch -p1 -i ../gtkmathview-gcc7.patch # Debian patch
+
+ # AM_BINRELOC missing, just ignore
+ echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4
+ autoreconf -if
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-static \
+ --disable-gtk \
+ --disable-gmetadom
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}/" install
+}
+
Deleted: gtkmathview-0.8.0-cond-t1.patch
===================================================================
--- gtkmathview-0.8.0-cond-t1.patch 2021-03-25 10:50:45 UTC (rev 410889)
+++ gtkmathview-0.8.0-cond-t1.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -1,22 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN
gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc
gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc
---- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc
2007-08-17 06:02:40.000000000 -0400
-+++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc
2008-06-26 14:46:31.000000000 -0400
-@@ -24,7 +24,6 @@
- #include "PS_StreamRenderingContext.hh"
- #include "String.hh"
- #include "FontDataBase.hh"
--#include "T1_FontDataBase.hh"
-
- PS_StreamRenderingContext::PS_StreamRenderingContext(const
SmartPtr<AbstractLogger>& logger,
- std::ostream& os,
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN
gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh
gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh
---- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh
2007-08-17 06:02:40.000000000 -0400
-+++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh
2008-06-26 14:46:31.000000000 -0400
-@@ -25,7 +25,6 @@
- #include "PS_RenderingContext.hh"
- #include "String.hh"
- #include "FontDataBase.hh"
--#include "T1_FontDataBase.hh"
-
- class GMV_BackEnd_EXPORT PS_StreamRenderingContext : public
PS_RenderingContext
- {
Copied: gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-cond-t1.patch (from
rev 410889, gtkmathview/trunk/gtkmathview-0.8.0-cond-t1.patch)
===================================================================
--- gtkmathview-0.8.0-cond-t1.patch (rev 0)
+++ gtkmathview-0.8.0-cond-t1.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -0,0 +1,22 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN
gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc
gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc
+--- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc
2007-08-17 06:02:40.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc
2008-06-26 14:46:31.000000000 -0400
+@@ -24,7 +24,6 @@
+ #include "PS_StreamRenderingContext.hh"
+ #include "String.hh"
+ #include "FontDataBase.hh"
+-#include "T1_FontDataBase.hh"
+
+ PS_StreamRenderingContext::PS_StreamRenderingContext(const
SmartPtr<AbstractLogger>& logger,
+ std::ostream& os,
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN
gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh
gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh
+--- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh
2007-08-17 06:02:40.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh
2008-06-26 14:46:31.000000000 -0400
+@@ -25,7 +25,6 @@
+ #include "PS_RenderingContext.hh"
+ #include "String.hh"
+ #include "FontDataBase.hh"
+-#include "T1_FontDataBase.hh"
+
+ class GMV_BackEnd_EXPORT PS_StreamRenderingContext : public
PS_RenderingContext
+ {
Deleted: gtkmathview-0.8.0-gcc43.patch
===================================================================
--- gtkmathview-0.8.0-gcc43.patch 2021-03-25 10:50:45 UTC (rev 410889)
+++ gtkmathview-0.8.0-gcc43.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -1,56 +0,0 @@
-diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc43
gtkmathview-0.8.0/mathmlps/main.cc
---- gtkmathview-0.8.0/mathmlps/main.cc.gcc43 2008-07-29 16:40:04.000000000
-0400
-+++ gtkmathview-0.8.0/mathmlps/main.cc 2008-07-29 16:40:14.000000000 -0400
-@@ -18,6 +18,7 @@
-
- #include <config.h>
-
-+#include <cstring>
- #include <cassert>
- #include <fstream>
-
-diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43
gtkmathview-0.8.0/mathmlsvg/main.cc
---- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43 2007-08-17 06:02:46.000000000
-0400
-+++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-07-29 16:33:03.000000000
-0400
-@@ -18,6 +18,7 @@
-
- #include <config.h>
-
-+#include <cstring>
- #include <cassert>
- #include <fstream>
-
-diff -up gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43
gtkmathview-0.8.0/mathmlsvg/SMS.cc
---- gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43 2008-07-29 16:39:01.000000000
-0400
-+++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-07-29 16:39:07.000000000 -0400
-@@ -18,6 +18,7 @@
-
- #include <config.h>
-
-+#include <cstring>
- #include <sstream>
- #include "defs.h"
- #include "AbstractLogger.hh"
-diff -up gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43
gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc
---- gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43 2008-07-29
16:35:24.000000000 -0400
-+++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-07-29
16:35:28.000000000 -0400
-@@ -19,7 +19,7 @@
- #include <t1lib.h>
- #include <config.h>
- #include <map>
--#include <string>
-+#include <cstring>
- #include <stdlib.h>
- #include <iostream>
- #include <list>
-diff -up gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43
gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc
---- gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43
2007-08-17 06:02:38.000000000 -0400
-+++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-07-29
16:33:03.000000000 -0400
-@@ -18,6 +18,7 @@
-
- #include <config.h>
-
-+#include <cstring>
- #include <cassert>
-
- #include "mathVariantAux.hh"
Copied: gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-gcc43.patch (from rev
410889, gtkmathview/trunk/gtkmathview-0.8.0-gcc43.patch)
===================================================================
--- gtkmathview-0.8.0-gcc43.patch (rev 0)
+++ gtkmathview-0.8.0-gcc43.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -0,0 +1,56 @@
+diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc43
gtkmathview-0.8.0/mathmlps/main.cc
+--- gtkmathview-0.8.0/mathmlps/main.cc.gcc43 2008-07-29 16:40:04.000000000
-0400
++++ gtkmathview-0.8.0/mathmlps/main.cc 2008-07-29 16:40:14.000000000 -0400
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <cstring>
+ #include <cassert>
+ #include <fstream>
+
+diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43
gtkmathview-0.8.0/mathmlsvg/main.cc
+--- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43 2007-08-17 06:02:46.000000000
-0400
++++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-07-29 16:33:03.000000000
-0400
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <cstring>
+ #include <cassert>
+ #include <fstream>
+
+diff -up gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43
gtkmathview-0.8.0/mathmlsvg/SMS.cc
+--- gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43 2008-07-29 16:39:01.000000000
-0400
++++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-07-29 16:39:07.000000000 -0400
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <cstring>
+ #include <sstream>
+ #include "defs.h"
+ #include "AbstractLogger.hh"
+diff -up gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43
gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc
+--- gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43 2008-07-29
16:35:24.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-07-29
16:35:28.000000000 -0400
+@@ -19,7 +19,7 @@
+ #include <t1lib.h>
+ #include <config.h>
+ #include <map>
+-#include <string>
++#include <cstring>
+ #include <stdlib.h>
+ #include <iostream>
+ #include <list>
+diff -up gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43
gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc
+--- gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43
2007-08-17 06:02:38.000000000 -0400
++++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-07-29
16:33:03.000000000 -0400
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <cstring>
+ #include <cassert>
+
+ #include "mathVariantAux.hh"
Deleted: gtkmathview-0.8.0-gcc47.patch
===================================================================
--- gtkmathview-0.8.0-gcc47.patch 2021-03-25 10:50:45 UTC (rev 410889)
+++ gtkmathview-0.8.0-gcc47.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -1,67 +0,0 @@
-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 <cstring>
- #include <cassert>
- #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 <cstring>
- #include <cassert>
- #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();
- }
-
-
Copied: gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-gcc47.patch (from rev
410889, gtkmathview/trunk/gtkmathview-0.8.0-gcc47.patch)
===================================================================
--- gtkmathview-0.8.0-gcc47.patch (rev 0)
+++ gtkmathview-0.8.0-gcc47.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -0,0 +1,67 @@
+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 <cstring>
+ #include <cassert>
+ #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 <cstring>
+ #include <cassert>
+ #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();
+ }
+
+
Deleted: gtkmathview-0.8.0-includes.patch
===================================================================
--- gtkmathview-0.8.0-includes.patch 2021-03-25 10:50:45 UTC (rev 410889)
+++ gtkmathview-0.8.0-includes.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -1,12 +0,0 @@
-diff -ru gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc
gtkmathview-0.8.0/src/common/AbstractLogger.cc
---- gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc 2009-02-28
13:56:00.000000000 +0000
-+++ gtkmathview-0.8.0/src/common/AbstractLogger.cc 2009-02-28
13:56:28.000000000 +0000
-@@ -19,6 +19,7 @@
- #include <config.h>
-
- #include <stdarg.h>
-+#include <stdio.h>
-
- #include "AbstractLogger.hh"
-
-
Copied: gtkmathview/repos/extra-x86_64/gtkmathview-0.8.0-includes.patch (from
rev 410889, gtkmathview/trunk/gtkmathview-0.8.0-includes.patch)
===================================================================
--- gtkmathview-0.8.0-includes.patch (rev 0)
+++ gtkmathview-0.8.0-includes.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -0,0 +1,12 @@
+diff -ru gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc
gtkmathview-0.8.0/src/common/AbstractLogger.cc
+--- gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc 2009-02-28
13:56:00.000000000 +0000
++++ gtkmathview-0.8.0/src/common/AbstractLogger.cc 2009-02-28
13:56:28.000000000 +0000
+@@ -19,6 +19,7 @@
+ #include <config.h>
+
+ #include <stdarg.h>
++#include <stdio.h>
+
+ #include "AbstractLogger.hh"
+
+
Deleted: gtkmathview-gcc6.patch
===================================================================
--- gtkmathview-gcc6.patch 2021-03-25 10:50:45 UTC (rev 410889)
+++ gtkmathview-gcc6.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -1,99 +0,0 @@
-From: Gert Wollny <gw.foss...@gmail.com>
-Date: Sun, 26 Jun 2016 13:25:00 +0200
-Description: gcc 6.0 build fixes
-Bug: https://bugs.debian.org/811682
-
---- a/src/engine/common/View.cc
-+++ b/src/engine/common/View.cc
-@@ -291,7 +291,7 @@
- }
- }
-
-- return false;
-+ return nullptr;
- }
-
- bool
---- a/src/backend/common/tfm/TFM.hh
-+++ b/src/backend/common/tfm/TFM.hh
-@@ -37,7 +37,7 @@
- unsigned char face;
- const char* codingScheme;
- int designSize;
-- int checksum;
-+ unsigned int checksum;
- unsigned int nDimensions;
- unsigned int nCharacters;
- };
-@@ -52,7 +52,7 @@
- struct Kerning
- {
- UChar8 index;
-- int value;
-+ unsigned int value;
- };
-
- struct Ligature
-@@ -67,7 +67,7 @@
- UChar8 index;
- int width;
- int height;
-- int depth;
-+ unsigned int depth;
- int italicCorrection;
- unsigned char nKernings;
- const Kerning* kerning;
---- a/src/backend/common/ComputerModernShaper.cc
-+++ b/src/backend/common/ComputerModernShaper.cc
-@@ -578,7 +578,7 @@
- };
- #endif
-
--static ComputerModernShaper::PlainChar cmsMap[] =
-+static ComputerModernShaper::PlainChar32 cmsMap[] =
- {
- { 0x007B, 0x66 }, // LEFT CURLY BRACKET
- { 0x007D, 0x67 }, // RIGHT CURLY BRACKET
---- a/src/backend/common/StandardSymbolsShaper.hh
-+++ b/src/backend/common/StandardSymbolsShaper.hh
-@@ -32,20 +32,20 @@
- struct HStretchyChar
- {
- Char16 ch;
-- Char8 normal;
-- Char8 left;
-- Char8 glue;
-- Char8 right;
-+ UChar8 normal;
-+ UChar8 left;
-+ UChar8 glue;
-+ UChar8 right;
- };
-
- struct VStretchyChar
- {
- Char16 ch;
-- Char8 normal;
-- Char8 top;
-- Char8 glue;
-- Char8 middle;
-- Char8 bottom;
-+ UChar8 normal;
-+ UChar8 top;
-+ UChar8 glue;
-+ UChar8 middle;
-+ UChar8 bottom;
- };
-
- protected:
---- a/src/backend/common/StandardSymbolsShaper.cc
-+++ b/src/backend/common/StandardSymbolsShaper.cc
-@@ -29,7 +29,7 @@
- #include "ShapingContext.hh"
-
- struct GlyphMap {
-- Char8 index;
-+ UChar8 index;
- Char16 ch;
- };
-
Copied: gtkmathview/repos/extra-x86_64/gtkmathview-gcc6.patch (from rev 410889,
gtkmathview/trunk/gtkmathview-gcc6.patch)
===================================================================
--- gtkmathview-gcc6.patch (rev 0)
+++ gtkmathview-gcc6.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -0,0 +1,99 @@
+From: Gert Wollny <gw.foss...@gmail.com>
+Date: Sun, 26 Jun 2016 13:25:00 +0200
+Description: gcc 6.0 build fixes
+Bug: https://bugs.debian.org/811682
+
+--- a/src/engine/common/View.cc
++++ b/src/engine/common/View.cc
+@@ -291,7 +291,7 @@
+ }
+ }
+
+- return false;
++ return nullptr;
+ }
+
+ bool
+--- a/src/backend/common/tfm/TFM.hh
++++ b/src/backend/common/tfm/TFM.hh
+@@ -37,7 +37,7 @@
+ unsigned char face;
+ const char* codingScheme;
+ int designSize;
+- int checksum;
++ unsigned int checksum;
+ unsigned int nDimensions;
+ unsigned int nCharacters;
+ };
+@@ -52,7 +52,7 @@
+ struct Kerning
+ {
+ UChar8 index;
+- int value;
++ unsigned int value;
+ };
+
+ struct Ligature
+@@ -67,7 +67,7 @@
+ UChar8 index;
+ int width;
+ int height;
+- int depth;
++ unsigned int depth;
+ int italicCorrection;
+ unsigned char nKernings;
+ const Kerning* kerning;
+--- a/src/backend/common/ComputerModernShaper.cc
++++ b/src/backend/common/ComputerModernShaper.cc
+@@ -578,7 +578,7 @@
+ };
+ #endif
+
+-static ComputerModernShaper::PlainChar cmsMap[] =
++static ComputerModernShaper::PlainChar32 cmsMap[] =
+ {
+ { 0x007B, 0x66 }, // LEFT CURLY BRACKET
+ { 0x007D, 0x67 }, // RIGHT CURLY BRACKET
+--- a/src/backend/common/StandardSymbolsShaper.hh
++++ b/src/backend/common/StandardSymbolsShaper.hh
+@@ -32,20 +32,20 @@
+ struct HStretchyChar
+ {
+ Char16 ch;
+- Char8 normal;
+- Char8 left;
+- Char8 glue;
+- Char8 right;
++ UChar8 normal;
++ UChar8 left;
++ UChar8 glue;
++ UChar8 right;
+ };
+
+ struct VStretchyChar
+ {
+ Char16 ch;
+- Char8 normal;
+- Char8 top;
+- Char8 glue;
+- Char8 middle;
+- Char8 bottom;
++ UChar8 normal;
++ UChar8 top;
++ UChar8 glue;
++ UChar8 middle;
++ UChar8 bottom;
+ };
+
+ protected:
+--- a/src/backend/common/StandardSymbolsShaper.cc
++++ b/src/backend/common/StandardSymbolsShaper.cc
+@@ -29,7 +29,7 @@
+ #include "ShapingContext.hh"
+
+ struct GlyphMap {
+- Char8 index;
++ UChar8 index;
+ Char16 ch;
+ };
+
Deleted: gtkmathview-gcc7.patch
===================================================================
--- gtkmathview-gcc7.patch 2021-03-25 10:50:45 UTC (rev 410889)
+++ gtkmathview-gcc7.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -1,27 +0,0 @@
-Description: Fix "call of overloaded 'abs(guint32)' is ambiguous"
-Author: Dmitry Marakasov <amd...@freebsd.org>
-Origin:
https://svnweb.freebsd.org/ports/head/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc?view=markup
-Bug-Debian: https://bugs.debian.org/853436
-Last-Update: 2017-12-19
-
---- a/src/widget/gtkmathview_common.cc
-+++ b/src/widget/gtkmathview_common.cc
-@@ -909,7 +909,7 @@
- math_view->select_state == SELECT_STATE_NO &&
- fabs(math_view->button_press_x - event->x) <= CLICK_SPACE_RANGE &&
- fabs(math_view->button_press_y - event->y) <= CLICK_SPACE_RANGE &&
-- abs(math_view->button_press_time - event->time) <= CLICK_TIME_RANGE)
-+ abs((long)math_view->button_press_time - (long)event->time) <=
CLICK_TIME_RANGE)
- {
- // the mouse should have not moved more than one pixel in each
direction
- // and the time elapsed from the press event should be no more than
250ms
-@@ -969,7 +969,7 @@
- (math_view->select_state == SELECT_STATE_YES ||
- fabs(math_view->button_press_x - x) > CLICK_SPACE_RANGE ||
- fabs(math_view->button_press_y - y) > CLICK_SPACE_RANGE ||
-- abs(math_view->button_press_time - event->time) > CLICK_TIME_RANGE))
-+ abs((long)math_view->button_press_time - (long)event->time) >
CLICK_TIME_RANGE))
- {
- if (math_view->select_state == SELECT_STATE_NO)
- {
-
Copied: gtkmathview/repos/extra-x86_64/gtkmathview-gcc7.patch (from rev 410889,
gtkmathview/trunk/gtkmathview-gcc7.patch)
===================================================================
--- gtkmathview-gcc7.patch (rev 0)
+++ gtkmathview-gcc7.patch 2021-03-25 10:50:55 UTC (rev 410890)
@@ -0,0 +1,27 @@
+Description: Fix "call of overloaded 'abs(guint32)' is ambiguous"
+Author: Dmitry Marakasov <amd...@freebsd.org>
+Origin:
https://svnweb.freebsd.org/ports/head/x11-toolkits/gtkmathview/files/patch-src_widget_gtkmathview__common.cc?view=markup
+Bug-Debian: https://bugs.debian.org/853436
+Last-Update: 2017-12-19
+
+--- a/src/widget/gtkmathview_common.cc
++++ b/src/widget/gtkmathview_common.cc
+@@ -909,7 +909,7 @@
+ math_view->select_state == SELECT_STATE_NO &&
+ fabs(math_view->button_press_x - event->x) <= CLICK_SPACE_RANGE &&
+ fabs(math_view->button_press_y - event->y) <= CLICK_SPACE_RANGE &&
+- abs(math_view->button_press_time - event->time) <= CLICK_TIME_RANGE)
++ abs((long)math_view->button_press_time - (long)event->time) <=
CLICK_TIME_RANGE)
+ {
+ // the mouse should have not moved more than one pixel in each
direction
+ // and the time elapsed from the press event should be no more than
250ms
+@@ -969,7 +969,7 @@
+ (math_view->select_state == SELECT_STATE_YES ||
+ fabs(math_view->button_press_x - x) > CLICK_SPACE_RANGE ||
+ fabs(math_view->button_press_y - y) > CLICK_SPACE_RANGE ||
+- abs(math_view->button_press_time - event->time) > CLICK_TIME_RANGE))
++ abs((long)math_view->button_press_time - (long)event->time) >
CLICK_TIME_RANGE))
+ {
+ if (math_view->select_state == SELECT_STATE_NO)
+ {
+
