From ffe0bbfd85b1341f3b15f809ea92f330d2f7cea3 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Mon, 10 Feb 2014 03:34:10 +0000 Subject: Mon Feb 10 03:32:23 UTC 2014 --- extra/gtkmathview/PKGBUILD | 45 ++++++++++----- extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch | 56 ++++++++++++++++++ extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch | 67 ---------------------- extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch | 67 ++++++++++++++++++++++ extra/gtkmathview/gtkmathview-0.8.0-includes.patch | 12 ++++ 5 files changed, 165 insertions(+), 82 deletions(-) create mode 100644 extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch delete mode 100644 extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch create mode 100644 extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch create mode 100644 extra/gtkmathview/gtkmathview-0.8.0-includes.patch (limited to 'extra/gtkmathview') diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD index b09710324..d5e123ef6 100644 --- a/extra/gtkmathview/PKGBUILD +++ b/extra/gtkmathview/PKGBUILD @@ -1,33 +1,48 @@ -# $Id: PKGBUILD 198078 2013-10-30 12:40:13Z allan $ +# $Id: PKGBUILD 205608 2014-02-09 10:29:40Z andyrtr $ # Maintainer: Giovanni Scafora # Contributor: Jan de Groot pkgname=gtkmathview pkgver=0.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="C++ rendering engine for MathML documents" arch=('i686' 'x86_64') url="http://helm.cs.unibo.it/mml-widget/" -license=('GPL') -depends=('popt' 'gtk2' 't1lib' 'gmetadom') -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') +license=('LGPL3') +depends=('popt' 'gtk2' 't1lib' 'gmetadom' 'pangox-compat') +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) md5sums=('b53564e553728d4b69f7d366dfeb5299' - '9fd261db865336c89ebf0f3545af9bc4' - 'a79a27e00908e75712bc9453b669fe61') + '92eb2870c1922cbebd5566900cde220b' + 'a79a27e00908e75712bc9453b669fe61' + '8c8620aee002b30975e1e175ef9af7a7' + '4fc8daefbf27d49067b0c66bba54f428') -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch +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 + + # AM_BINRELOC missing, just ignore + echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4 + autoreconf -if +} + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ - --sysconfdir=/etc - make + --sysconfdir=/etc \ + --disable-static + make LIBTOOL=/usr/bin/libtool } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir}/ install } diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch new file mode 100644 index 000000000..437e3e2b1 --- /dev/null +++ b/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch @@ -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 + ++#include + #include + #include + +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 + ++#include + #include + #include + +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 + ++#include + #include + #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 + #include + #include +-#include ++#include + #include + #include + #include +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 + ++#include + #include + + #include "mathVariantAux.hh" diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch deleted file mode 100644 index a9069056b..000000000 --- a/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -urN gtkmathview-0.8.0-orig/mathmlps/main.cc gtkmathview-0.8.0/mathmlps/main.cc ---- gtkmathview-0.8.0-orig/mathmlps/main.cc 2008-04-03 22:43:06.000000000 +0400 -+++ gtkmathview-0.8.0/mathmlps/main.cc 2008-04-03 23:53:16.000000000 +0400 -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - #include - -diff -urN gtkmathview-0.8.0-orig/mathmlsvg/main.cc gtkmathview-0.8.0/mathmlsvg/main.cc ---- gtkmathview-0.8.0-orig/mathmlsvg/main.cc 2008-04-03 22:43:05.000000000 +0400 -+++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-04-03 23:43:31.000000000 +0400 -@@ -20,6 +20,7 @@ - - #include - #include -+#include - - #include - -diff -urN gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc gtkmathview-0.8.0/mathmlsvg/SMS.cc ---- gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc 2008-04-03 22:43:05.000000000 +0400 -+++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-04-03 23:25:12.000000000 +0400 -@@ -19,6 +19,7 @@ - #include - - #include -+#include - #include "defs.h" - #include "AbstractLogger.hh" - #include "ValueConversion.hh" -diff -urN gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc ---- gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc 2008-04-03 22:43:05.000000000 +0400 -+++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-04-03 23:10:05.000000000 +0400 -@@ -20,6 +20,8 @@ - - #include - -+#include -+ - #include "mathVariantAux.hh" - - static MathVariantAttributes vattr[] = { -diff -urN gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc ---- gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc 2007-08-17 12:02:40.000000000 +0200 -+++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-06-07 12:26:01.000000000 +0200 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "String.hh" - #include "T1_FontDataBase.hh" ---- a/src/common/AbstractLogger.cc 2009-06-12 16:29:57.000000000 -0700 -+++ b/src/common/AbstractLogger.cc 2009-06-12 16:29:57.000000000 -0700 -@@ -18,6 +18,8 @@ - - #include - -+#include -+ - #include - - #include "AbstractLogger.hh" diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch new file mode 100644 index 000000000..958617886 --- /dev/null +++ b/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch @@ -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 + #include + #include ++#ifdef __linux__ ++/* to get getopt on Linux */ ++#ifndef __USE_POSIX2 ++#define __USE_POSIX2 ++#endif ++#endif ++#include + + #include + +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 + #include + #include ++#ifdef __linux__ ++/* to get getopt on Linux */ ++#ifndef __USE_POSIX2 ++#define __USE_POSIX2 ++#endif ++#endif ++#include + + #include + +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 + getElement(const typename Model::Element& el) const + { +- if (SmartPtr elem = smart_cast(linkerAssoc(el))) ++ SmartPtr elem; ++ if (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; + } + } +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(); + } + + diff --git a/extra/gtkmathview/gtkmathview-0.8.0-includes.patch b/extra/gtkmathview/gtkmathview-0.8.0-includes.patch new file mode 100644 index 000000000..665c7827e --- /dev/null +++ b/extra/gtkmathview/gtkmathview-0.8.0-includes.patch @@ -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 + + #include ++#include + + #include "AbstractLogger.hh" + + -- cgit v1.2.3-54-g00ecf