[arch-commits] Commit in gtkmathview/repos (4 files)

[Giovanni Scafora]

    Date: Friday, June 12, 2009 @ 12:02:52
  Author: giovanni
Revision: 42291

Merged revisions 42289 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/gtkmathview/trunk

........
  r42289 | giovanni | 2009-06-12 08:50:49 -0700 (ven, 12 giu 2009) | 1 line
  
  upgpkg: gtkmathview 0.8.0-2
........

Added:
  gtkmathview/repos/extra-i686/gtkmathview-0.8.0-gcc44.patch
    (from rev 42289, gtkmathview/trunk/gtkmathview-0.8.0-gcc44.patch)
Modified:
  gtkmathview/repos/extra-i686/	(properties)
  gtkmathview/repos/extra-i686/PKGBUILD
Deleted:
  gtkmathview/repos/extra-i686/gtkmathview-0.8.0-gcc43.patch

-------------------------------+
 PKGBUILD                      |   12 ++++---
 gtkmathview-0.8.0-gcc43.patch |   56 ---------------------------------
 gtkmathview-0.8.0-gcc44.patch |   67 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 74 insertions(+), 61 deletions(-)


Property changes on: gtkmathview/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gtkmathview/trunk:1-32849
   + /gtkmathview/trunk:1-42290

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-12 15:51:28 UTC (rev 42290)
+++ extra-i686/PKGBUILD	2009-06-12 16:02:52 UTC (rev 42291)
@@ -4,7 +4,7 @@
 
 pkgname=gtkmathview
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ rendering engine for MathML documents"
 arch=('i686' 'x86_64')
 url="http://helm.cs.unibo.it/mml-widget/"
@@ -12,17 +12,19 @@
 depends=('popt' 'gtk2' 't1lib' 'gmetadom>=0.2.6')
 options=('!libtool')
 source=(http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz
-        gtkmathview-0.8.0-gcc43.patch
+        gtkmathview-0.8.0-gcc44.patch
         gtkmathview-0.8.0-cond-t1.patch)
 md5sums=('b53564e553728d4b69f7d366dfeb5299'
-         '554d7770a948bc76c9a6d8f3cc505ad2'
+         '9fd261db865336c89ebf0f3545af9bc4'
          'a79a27e00908e75712bc9453b669fe61')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc43.patch || return 1
+  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch || return 1
   patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc
   make || return 1
   make DESTDIR=${pkgdir}/ install
 }
+

Deleted: extra-i686/gtkmathview-0.8.0-gcc43.patch
===================================================================
--- extra-i686/gtkmathview-0.8.0-gcc43.patch	2009-06-12 15:51:28 UTC (rev 42290)
+++ extra-i686/gtkmathview-0.8.0-gcc43.patch	2009-06-12 16:02:52 UTC (rev 42291)
@@ -1,56 +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 <cassert>
- #include <fstream>
-+#include <cstring>
- 
- #include <popt.h>
- 
-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 <cassert>
- #include <fstream>
-+#include <cstring>
- 
- #include <popt.h>
- 
-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 <config.h>
- 
- #include <sstream>
-+#include <cstring>
- #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 <cassert>
- 
-+#include <cstring>
-+
- #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 <stdlib.h>
- #include <iostream>
- #include <list>
-+#include <cstring>
- 
- #include "String.hh"
- #include "T1_FontDataBase.hh"

Copied: gtkmathview/repos/extra-i686/gtkmathview-0.8.0-gcc44.patch (from rev 42289, gtkmathview/trunk/gtkmathview-0.8.0-gcc44.patch)
===================================================================
--- extra-i686/gtkmathview-0.8.0-gcc44.patch	                        (rev 0)
+++ extra-i686/gtkmathview-0.8.0-gcc44.patch	2009-06-12 16:02:52 UTC (rev 42291)
@@ -0,0 +1,67 @@
+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 <cassert>
+ #include <fstream>
++#include <cstring>
+ 
+ #include <popt.h>
+ 
+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 <cassert>
+ #include <fstream>
++#include <cstring>
+ 
+ #include <popt.h>
+ 
+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 <config.h>
+ 
+ #include <sstream>
++#include <cstring>
+ #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 <cassert>
+ 
++#include <cstring>
++
+ #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 <stdlib.h>
+ #include <iostream>
+ #include <list>
++#include <cstring>
+ 
+ #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 <config.h>
+ 
++#include <cstdio>
++
+ #include <stdarg.h>
+ 
+ #include "AbstractLogger.hh"