Compare commits

..

29 commits

Author SHA1 Message Date
Miro Hrončok
354e0b14ae Orphaned for 6+ weeks 2020-08-13 11:26:28 +02:00
Fedora Release Engineering
78a5954c80 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 03:25:17 +00:00
Fedora Release Engineering
4c0ce67fa8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 00:35:51 +00:00
Fedora Release Engineering
907fd8083e - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 03:53:08 +00:00
Peter Robinson
b6864e882e Add isa to devel requires 2020-01-22 19:30:50 +00:00
Fedora Release Engineering
6ff96915a3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 08:03:49 +00:00
Peter Robinson
8562e20525 Fix FTBFS, Build using gnu++98, Sync patches from Debian, Package cleanups 2019-06-09 18:04:30 +01:00
Fedora Release Engineering
ca42c14187 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 01:52:10 +00:00
8c194db13b Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:06 +01:00
ba185f4fe7
Remove obsolete ldconfig scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-22 18:39:14 +01:00
5ca592373e add BuildRequires: gcc-c++
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-19 20:56:42 +02:00
Fedora Release Engineering
11e32befeb - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 04:43:18 +00:00
Fedora Release Engineering
a18456eea1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 15:47:30 +00:00
Fedora Release Engineering
dd2419b5be - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 23:14:25 +00:00
Fedora Release Engineering
1398631598 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 12:19:16 +00:00
Fedora Release Engineering
53fb83d154 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 12:24:43 +00:00
Dennis Gilmore
52684c1f17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 23:31:43 +00:00
Dennis Gilmore
334d18fbef - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 10:04:02 +00:00
Kalev Lember
04c51c2d9a Rebuilt for GCC 5 C++11 ABI change 2015-05-02 14:13:36 +02:00
Till Maas
a6f6c47f91 Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
2015-02-21 22:18:39 +01:00
73450b7dc3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 19:41:29 +00:00
Adam Jackson
b9dbe6622e ha ha whoops 2014-06-16 10:32:57 -04:00
Dennis Gilmore
0a81d92444 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 14:15:26 -05:00
Adam Jackson
46a9252755 Move t1lib from Libs: to Libs.private in pc files, it's an implementation
detail, consumers (abiword) don't need to link against it themselves.
2014-05-28 11:43:55 -04:00
Dennis Gilmore
4ee0803978 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 12:02:35 -05:00
Peter Robinson
e533071f5f fix FTBFS, update SPEC 2013-05-19 18:35:38 +01:00
Dennis Gilmore
e301e4bcff - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-13 18:45:53 -06:00
Dennis Gilmore
ea2dd72ef1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-19 06:22:20 -05:00
2495b88d72 build fixes 2012-02-27 13:57:27 -05:00
12 changed files with 1 additions and 703 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
gtkmathview-0.8.0.tar.gz

1
dead.package Normal file
View file

@ -0,0 +1 @@
Orphaned for 6+ weeks

View file

@ -1,47 +0,0 @@
diff -up gtkmathview-0.7.6/src/engine/mathml/traverseAux.cc.broken gtkmathview-0.7.6/src/engine/mathml/traverseAux.cc
--- gtkmathview-0.7.6/src/engine/mathml/traverseAux.cc.broken 2008-03-14 14:09:58.000000000 -0400
+++ gtkmathview-0.7.6/src/engine/mathml/traverseAux.cc 2008-03-14 14:10:16.000000000 -0400
@@ -21,6 +21,7 @@
// <luca.padovani@cs.unibo.it>
#include <config.h>
+#include <algorithm>
#include <assert.h>
#include "traverseAux.hh"
diff -up gtkmathview-0.7.6/src/engine/mathml/mathVariantAux.cc.broken gtkmathview-0.7.6/src/engine/mathml/mathVariantAux.cc
--- gtkmathview-0.7.6/src/engine/mathml/mathVariantAux.cc.broken 2008-03-14 14:08:07.000000000 -0400
+++ gtkmathview-0.7.6/src/engine/mathml/mathVariantAux.cc 2008-03-14 14:09:37.000000000 -0400
@@ -21,7 +21,7 @@
// <luca.padovani@cs.unibo.it>
#include <config.h>
-
+#include <cstring>
#include <cassert>
#include "mathVariantAux.hh"
diff -up gtkmathview-0.7.6/src/engine/mathml/MathMLTableFormatter.cc.broken gtkmathview-0.7.6/src/engine/mathml/MathMLTableFormatter.cc
--- gtkmathview-0.7.6/src/engine/mathml/MathMLTableFormatter.cc.broken 2008-03-14 14:05:11.000000000 -0400
+++ gtkmathview-0.7.6/src/engine/mathml/MathMLTableFormatter.cc 2008-03-14 14:05:35.000000000 -0400
@@ -21,7 +21,7 @@
// <lpadovan@cs.unibo.it>
#include <config.h>
-
+#include <algorithm>
#include <cassert>
#include "Adapters.hh"
diff -up gtkmathview-0.7.6/mathmlsvg/main.cc.broken gtkmathview-0.7.6/mathmlsvg/main.cc
--- gtkmathview-0.7.6/mathmlsvg/main.cc.broken 2008-03-14 14:13:10.000000000 -0400
+++ gtkmathview-0.7.6/mathmlsvg/main.cc 2008-03-14 14:13:46.000000000 -0400
@@ -21,7 +21,7 @@
// <lpadovan@cs.unibo.it>
#include <config.h>
-
+#include <cstring>
#include <cassert>
#include <fstream>

View file

@ -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"

View file

@ -1,66 +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();
}

View file

@ -1,11 +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"

View file

@ -1,20 +0,0 @@
From 2102063ce75c41f8ba13370eb2ddf63a7d3ec86e Mon Sep 17 00:00:00 2001
From: Luca Padovani <padovani@di.unito.it>
Date: Fri, 14 May 2010 09:17:53 +0000
Subject: modified: src/backend/common/ComputerModernShaper.cc
applied patch by Andrew Stacey
---
diff --git a/src/backend/common/ComputerModernShaper.cc b/src/backend/common/ComputerModernShaper.cc
index e44f36f..0372422 100644
--- a/src/backend/common/ComputerModernShaper.cc
+++ b/src/backend/common/ComputerModernShaper.cc
@@ -975,7 +975,7 @@ static ComputerModernShaper::PlainChar msbmMap[] =
static ComputerModernShaper::PlainChar32 msbmMap32[] =
{
{ 0x1D538, 0x41 }, //double A
- { 0x1D538, 0x42 }, //double B
+ { 0x1D539, 0x42 }, //double B
{ 0x1D53B, 0x44 }, //double D
{ 0x1D53C, 0x45 }, //double E
{ 0x1D53D, 0x46 }, //double F

View file

@ -1,79 +0,0 @@
From 3918e889f1d36b3ee4be0a06714c59ea42dc09f3 Mon Sep 17 00:00:00 2001
From: Luca Padovani <luca@src.gnome.org>
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

View file

@ -1,24 +0,0 @@
From b031525e2f07975654fb74c611a2b23933c9cbac Mon Sep 17 00:00:00 2001
From: Luca Padovani <padovani@di.unito.it>
Date: Thu, 24 Nov 2011 21:34:21 +0000
Subject: + applied patch by Matthew Wiebe
---
diff --git a/src/backend/common/ComputerModernShaper.cc b/src/backend/common/ComputerModernShaper.cc
index 0372422..5bc5c0a 100644
--- a/src/backend/common/ComputerModernShaper.cc
+++ b/src/backend/common/ComputerModernShaper.cc
@@ -1564,6 +1564,13 @@ ComputerModernShaper::registerShaper(const SmartPtr<ShaperManager>& sm, unsigned
{
assert(sm);
+ // make sure there are normal variant options for lower case greek letters
+ if (family->fontEnabled(ComputerModernFamily::FN_CMMI)) {
+ for (unsigned i = 0; cmmMap[i].ch; i++) {
+ sm->registerChar(cmmMap[i].ch, GlyphSpec(shaperId, makeFontId(ComputerModernFamily::FE_CMMI, NORMAL_VARIANT), cmmMap[i].index));
+ }
+ }
+
for (unsigned j = 0; j < sizeof(variantDesc) / sizeof(FontDesc); j++)
for (unsigned i = 0; cmrMap[i].ch; i++)
{

View file

@ -1,203 +0,0 @@
From 7d938ac846ebc5947455e6e56260f72607319811 Mon Sep 17 00:00:00 2001
From: Luca Padovani <luca@src.gnome.org>
Date: Tue, 10 Jun 2008 16:17:42 +0000
Subject: + applied patch by Ed Catmur for marshalling functions in recent GTK versions
svn path=/trunk/; revision=1182
---
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a15c16b..d51c0ca 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -38,3 +38,5 @@ In no particular order:
* Nicola Rossi
PostScript backend and accents
+* Ed Catmur
+ patch for marshalling functions in new gtk
diff --git a/configure.ac b/configure.ac
index 96ea726..85d26b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,6 +332,9 @@ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.2.1],,[AC_MSG_ERROR(could not find GLIB)]
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
+GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
+AC_SUBST(GLIB_GENMARSHAL)
+
have_gtk="no"
have_pango="no"
if test "$enable_gtk" = "auto" -o "$enable_gtk" = "yes"; then
diff --git a/src/widget/Makefile.am b/src/widget/Makefile.am
index 4135f0c..8222d78 100644
--- a/src/widget/Makefile.am
+++ b/src/widget/Makefile.am
@@ -68,10 +68,14 @@ libgtkmathview_libxml2_reader_la_LDFLAGS = -version-info @MATHVIEW_VERSION_INFO@
libgtkmathview_libxml2_la_LDFLAGS = -version-info @MATHVIEW_VERSION_INFO@
libgtkmathview_gmetadom_la_LDFLAGS = -version-info @MATHVIEW_VERSION_INFO@
-libgtkmathview_custom_reader_la_SOURCES = gtkmathview_custom_reader.cc
-libgtkmathview_libxml2_reader_la_SOURCES = gtkmathview_libxml2_reader.cc
-libgtkmathview_libxml2_la_SOURCES = gtkmathview_libxml2.cc
-libgtkmathview_gmetadom_la_SOURCES = gtkmathview_gmetadom.cc
+libgtkmathview_custom_reader_la_SOURCES = gtkmathview_custom_reader.cc \
+ gtkmathview_marshal.c
+libgtkmathview_libxml2_reader_la_SOURCES = gtkmathview_libxml2_reader.cc \
+ gtkmathview_marshal.c
+libgtkmathview_libxml2_la_SOURCES = gtkmathview_libxml2.cc \
+ gtkmathview_marshal.c
+libgtkmathview_gmetadom_la_SOURCES = gtkmathview_gmetadom.cc \
+ gtkmathview_marshal.c
libgtkmathview_custom_reader_la_CPPFLAGS = -DGMV_Widget_DLL
libgtkmathview_libxml2_reader_la_CPPFLAGS = -DGMV_Widget_DLL
@@ -81,6 +85,7 @@ libgtkmathview_gmetadom_la_CPPFLAGS = -DGMV_Widget_DLL
EXTRA_DIST = \
gtkmathview_common.cc \
gtkmathview_decorators_common.cc \
+ marshal.list \
$(NULL)
gtkdir = $(includedir)/$(PACKAGE)/gtk
@@ -94,6 +99,25 @@ gtk_HEADERS = \
gtkmathview_libxml2.h \
gtkmathview_gmetadom.h
+noinst_HEADERS = \
+ gtkmathview_marshal.h \
+ $(NULL)
+
+BUILT_SOURCES = \
+ gtkmathview_marshal.c \
+ gtkmathview_marshal.h \
+ $(NULL)
+
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(NULL)
+
+gtkmathview_marshal.h: marshal.list
+ $(GLIB_GENMARSHAL) --prefix=gtkmathview_marshal $< --header > $@
+
+gtkmathview_marshal.c: marshal.list
+ $(GLIB_GENMARSHAL) --prefix=gtkmathview_marshal $< --body > $@
+
INCLUDES = \
-I$(top_builddir)/auto \
-I$(top_srcdir)/auto \
diff --git a/src/widget/gtkmathview_common.cc b/src/widget/gtkmathview_common.cc
index 9e1d935..d8d8495 100644
--- a/src/widget/gtkmathview_common.cc
+++ b/src/widget/gtkmathview_common.cc
@@ -36,6 +36,8 @@
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
+#include "gtkmathview_marshal.h"
+
#include "gtkmathview_common.h"
#if GTKMATHVIEW_USES_CUSTOM_READER
#define GTK_MATH_VIEW_WIDGET_NAME "GtkMathView_Custom_Reader"
@@ -512,7 +514,7 @@ gtk_math_view_class_init(GtkMathViewClass* math_view_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(GtkMathViewClass,set_scroll_adjustments),
NULL, NULL,
- gtk_marshal_NONE__POINTER_POINTER,
+ gtkmathview_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE , 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
click_signal =
@@ -521,8 +523,8 @@ gtk_math_view_class_init(GtkMathViewClass* math_view_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(GtkMathViewClass, click),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
- G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
select_begin_signal=
g_signal_new("select_begin",
@@ -530,8 +532,8 @@ gtk_math_view_class_init(GtkMathViewClass* math_view_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(GtkMathViewClass, select_begin),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
- G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
select_over_signal =
g_signal_new("select_over",
@@ -539,8 +541,8 @@ gtk_math_view_class_init(GtkMathViewClass* math_view_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(GtkMathViewClass, select_over),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
- G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
select_end_signal =
g_signal_new("select_end",
@@ -548,8 +550,8 @@ gtk_math_view_class_init(GtkMathViewClass* math_view_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(GtkMathViewClass, select_end),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
- G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
select_abort_signal =
g_signal_new("select_abort",
@@ -557,7 +559,7 @@ gtk_math_view_class_init(GtkMathViewClass* math_view_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(GtkMathViewClass, select_abort),
NULL, NULL,
- gtk_marshal_NONE__NONE,
+ g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
element_over_signal =
@@ -566,8 +568,8 @@ gtk_math_view_class_init(GtkMathViewClass* math_view_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(GtkMathViewClass, element_over),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
- G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
decorate_under_signal =
g_signal_new("decorate_under",
@@ -575,8 +577,8 @@ gtk_math_view_class_init(GtkMathViewClass* math_view_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(GtkMathViewClass, decorate_under),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
- G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
decorate_over_signal =
g_signal_new("decorate_over",
@@ -584,8 +586,8 @@ gtk_math_view_class_init(GtkMathViewClass* math_view_class)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(GtkMathViewClass, decorate_over),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
- G_TYPE_NONE, 1, GTK_TYPE_POINTER);
+ g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
#if 0
g_object_class_install_property(gobject_class,
diff --git a/src/widget/marshal.list b/src/widget/marshal.list
new file mode 100644
index 0000000..cd48853
--- a/dev/null
+++ b/src/widget/marshal.list
@@ -0,0 +1 @@
+VOID:POINTER,POINTER

View file

@ -1,195 +0,0 @@
Summary: A MathML rendering library
Name: gtkmathview
Version: 0.8.0
Release: 9%{?dist}
Group: System Environment/Libraries
License: LGPLv3+
Source: http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-%{version}.tar.gz
URL: http://helm.cs.unibo.it/mml-widget/
BuildRequires: glib2-devel >= 2.2
BuildRequires: gtk2-devel >= 2.2
BuildRequires: libxml2-devel >= 2.6.7
BuildRequires: libxslt >= 1.0.32
BuildRequires: popt >= 1.7
BuildRequires: popt-devel >= 1.7
BuildRequires: t1lib-devel
BuildRequires: libtool
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: gtkmathview-0.8.0-gcc43.patch
Patch1: gtkmathview-0.8.0-includes.patch
# Fixes from git
Patch09: gtkmathview-marshalling-functions-git7d938a.patch
Patch10: gtkmathview-gcc-fixes-git3918e8.patch
Patch11: gtkmathview-fix-ComputerModernShaper-git210206.patch
Patch12: gtkmathview-lowercasegreek-gitb03152.patch
Patch20: gtkmathview-0.8.0-gcc47.patch
# these are currently f12+ only, but will propogate back to earlier
# branches soonish -- Rex
%if 0%{?fedora} > 11
Requires: lyx-fonts
%else
Requires: mathml-fonts
%endif
%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.
%package devel
Summary: Support files necessary to compile applications using gtkmathview
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: glib2-devel >= 2.2.1
Requires: gtk2-devel >= 2.2.1
Requires: libxml2-devel >= 2.6.7
Requires: popt >= 1.7.0
Requires: pkgconfig
%description devel
Libraries, headers, and support files needed for using gtkmathview.
%prep
%setup -q
%patch0 -p1 -b .gcc43
%patch1 -p1 -b .includes
%patch10 -p1 -b .git3918e8
%patch11 -p1 -b .git210206
%patch12 -p1 -b .gitb03152
%patch20 -p1 -b .gcc47
# AM_BINRELOC missing, just ignore
echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4
autoreconf -if
%build
%configure --disable-static
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/mathml2ps.1
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/mathmlviewer.1
%files
%defattr(-,root,root)
%doc COPYING README AUTHORS CONTRIBUTORS BUGS LICENSE
%{_bindir}/*
%{_libdir}/lib*.so.*
%{_sysconfdir}/gtkmathview/
%{_datadir}/gtkmathview/
%files devel
%defattr(-,root,root)
%{_libdir}/*.so
%{_libdir}/pkgconfig/mathview-core.pc
%{_libdir}/pkgconfig/mathview-frontend-libxml2.pc
%{_libdir}/pkgconfig/gtkmathview-custom-reader.pc
%{_libdir}/pkgconfig/gtkmathview-libxml2-reader.pc
%{_libdir}/pkgconfig/gtkmathview-libxml2.pc
%{_libdir}/pkgconfig/mathview-frontend-libxml2-reader.pc
%{_libdir}/pkgconfig/mathview-frontend-custom-reader.pc
%{_libdir}/pkgconfig/mathview-backend-svg.pc
%{_libdir}/pkgconfig/mathview-backend-gtk.pc
%{_libdir}/pkgconfig/mathview-backend-ps.pc
%{_includedir}/gtkmathview
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -r $RPM_BUILD_ROOT
%changelog
* Mon Feb 27 2012 Tom Callaway <spot@fedoraproject.org> - 0.8.0-9
- apply fixes from git
- fix build with gcc 4.7
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sat Jan 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.8.0-6
- Requires: lyx-fonts
* Tue Aug 04 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.8.0-5
- add lyx-fonts/mathml-fonts dep
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Tue Feb 28 2009 Caolán McNamara <caolanm@redhat.com> - 0.8.0-3
- add stdio.h for snprintf
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Tue Jul 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.8.0-1
- update to 0.8.0
- fix rpath
- fix gcc43 patch for 0.8.0
* Fri Mar 14 2008 Doug chapman <doug.chapman@hp.com> - 0.7.6-7
- fix GCC 4.3 build errors (BZ 434485)
- require popt-devel for build (BZ 426136)
* Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.7.6-6
- Autorebuild for GCC 4.3
* Thu Oct 12 2006 Marc Maurer <uwog@abisource.com> 0.7.6-5.fc6
- Add pkgconfig to the -devel requires (bug 206451)
* Mon Sep 16 2006 Marc Maurer <uwog@abisource.com> 0.7.6-4.fc6
- Rebuild for FC 6
* Thu Feb 16 2006 Marc Maurer <uwog@abisource.com> 0.7.6-3.fc5
- Rebuild for Fedora Extras 5
* Sun Feb 05 2006 Marc Maurer <uwog@abisource.com> - 0.7.6-2.fc5
- Use %%{?dist} in the release name
- Omit static libs (part of bug 171971)
- s/gtkmathview/%%{name} (part of bug 171971)
* Sun Dec 11 2005 Marc Maurer <uwog@abisource.com> - 0.7.6-1
- Update to 0.7.6
* Sun Sep 25 2005 Marc Maurer <uwog@abisource.com> - 0.7.5-1
- Update to 0.7.5
* Mon Sep 12 2005 Marc Maurer <uwog@abisource.com> - 0.7.4-1
- Update to 0.7.4
* Tue Aug 30 2005 Marc Maurer <uwog@abisource.com> - 0.7.3-5
- Drop more unneeded Requires
* Tue Aug 30 2005 Marc Maurer <uwog@abisource.com> - 0.7.3-4
- Drop the explicit Requires
* Mon Aug 29 2005 Marc Maurer <uwog@abisource.com> - 0.7.3-3
- Use smaller lines in the Description field
- Remove the --disable-gmetadom and --without-t1lib flags
- Add a '/' to directories in the files section
- Remove the mathmlviewer man page
* Tue Aug 23 2005 Marc Maurer <uwog@abisource.com> - 0.7.3-2
- Add the proper Requires and Buildrequires
- Make the description field more descriptive
- Add CONTRIBUTORS BUGS LICENSE to the doc section
- Disable gmetadom and t1lib
- Remove the mathml2ps man page
* Sun Aug 14 2005 Marc Maurer <uwog@abisource.com> - 0.7.3-1
- Initial version

View file

@ -1 +0,0 @@
b53564e553728d4b69f7d366dfeb5299 gtkmathview-0.8.0.tar.gz