From 3c7cfedbafb1ba59fbb60ea37e85ec9783bcc543 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 12 Aug 2019 11:57:18 +0300 Subject: [PATCH 1/5] abiword: Add patch from Debian to fix building with libical 3 Signed-off-by: Adrian Bunk --- recipes-abiword/abiword/abiword/libical3.patch | 15 +++++++++++++++ recipes-abiword/abiword/abiword_3.0.2.bb | 1 + 2 files changed, 16 insertions(+) create mode 100644 recipes-abiword/abiword/abiword/libical3.patch diff --git a/recipes-abiword/abiword/abiword/libical3.patch b/recipes-abiword/abiword/abiword/libical3.patch new file mode 100644 index 0000000..97b7a81 --- /dev/null +++ b/recipes-abiword/abiword/abiword/libical3.patch @@ -0,0 +1,15 @@ +Index: src/text/ptbl/xp/pd_DocumentRDF.cpp +=================================================================== +--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp (revision 35456) ++++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp (revision 35457) +@@ -2266,8 +2266,8 @@ + icalcomponent_set_uid( c, m_uid.c_str() ); + icalcomponent_set_location( c, m_location.c_str() ); + icalcomponent_set_description( c, m_desc.c_str() ); +- icalcomponent_set_dtstart( c, icaltime_from_timet( m_dtstart, 0 ) ); +- icalcomponent_set_dtend( c, icaltime_from_timet( m_dtend, 0 ) ); ++ icalcomponent_set_dtstart( c, icaltime_from_timet_with_zone( m_dtstart, 0, NULL ) ); ++ icalcomponent_set_dtend( c, icaltime_from_timet_with_zone( m_dtend, 0, NULL ) ); + + char* data = icalcomponent_as_ical_string( c ); + std::ofstream oss( filename.c_str() ); diff --git a/recipes-abiword/abiword/abiword_3.0.2.bb b/recipes-abiword/abiword/abiword_3.0.2.bb index 36b056f..90f8e3f 100644 --- a/recipes-abiword/abiword/abiword_3.0.2.bb +++ b/recipes-abiword/abiword/abiword_3.0.2.bb @@ -27,6 +27,7 @@ RCONFLICTS_${PN} = "${PN}-embedded" SRC_URI = "http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \ file://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \ file://0001-Bug-13770-Require-C-11-from-now-on.patch \ + file://libical3.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a" From 2e30d0aa69c380b47a0c76a56a6e5fb17b71b888 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 12 Aug 2019 10:27:49 +0300 Subject: [PATCH 2/5] abiword: Remove office-layer check now that it is in the layer Signed-off-by: Adrian Bunk --- recipes-abiword/abiword/abiword_3.0.2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-abiword/abiword/abiword_3.0.2.bb b/recipes-abiword/abiword/abiword_3.0.2.bb index 90f8e3f..de3829d 100644 --- a/recipes-abiword/abiword/abiword_3.0.2.bb +++ b/recipes-abiword/abiword/abiword_3.0.2.bb @@ -16,7 +16,7 @@ DEPENDS = " \ asio \ evolution-data-server \ libxslt \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)} \ + redland rasqal \ " RDEPENDS_${PN}_append_libc-glibc = " \ glibc-gconv-ibm850 glibc-gconv-cp1252 \ @@ -44,7 +44,7 @@ REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= " \ collab-backend-xmpp collab-backend-tcp \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libical', '', d)} \ + libical \ " PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2" PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant" From d6b78d4a436e01452f4ee593f6fe27c906b9a71a Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 12 Aug 2019 10:34:23 +0300 Subject: [PATCH 3/5] t1lib: Moved from meta-oe Used by gtkmathview. Signed-off-by: Adrian Bunk --- .../t1lib/t1lib-5.1.2/configure.patch | 141 +++++++++++++++++ .../t1lib/t1lib-5.1.2/format_security.patch | 58 +++++++ .../t1lib/t1lib-5.1.2/libtool.patch | 144 ++++++++++++++++++ recipes-support/t1lib/t1lib_5.1.2.bb | 29 ++++ 4 files changed, 372 insertions(+) create mode 100644 recipes-support/t1lib/t1lib-5.1.2/configure.patch create mode 100644 recipes-support/t1lib/t1lib-5.1.2/format_security.patch create mode 100644 recipes-support/t1lib/t1lib-5.1.2/libtool.patch create mode 100644 recipes-support/t1lib/t1lib_5.1.2.bb diff --git a/recipes-support/t1lib/t1lib-5.1.2/configure.patch b/recipes-support/t1lib/t1lib-5.1.2/configure.patch new file mode 100644 index 0000000..976e038 --- /dev/null +++ b/recipes-support/t1lib/t1lib-5.1.2/configure.patch @@ -0,0 +1,141 @@ +From 81c1ba940415595584a837ab1078c64855072f0c Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Mon, 21 Nov 2011 12:00:54 +0100 +Subject: [PATCH] t1lib: add 5.1.2 + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- + configure.in | 95 ++++++++++++++++++++++++------------------------------------ + 1 file changed, 38 insertions(+), 57 deletions(-) + +diff --git a/configure.in b/configure.in +index eade4c0..e649ea9 100644 +--- a/configure.in ++++ b/configure.in +@@ -74,9 +74,9 @@ T1LIB_PATCHLEVEL=builtin(eval, MACRO_T1LIB_LT_REVISION) + T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\" + + +-dnl We use this file by Andreas Zeller to check for libXaw +-builtin(include, ac-tools/ice_find_athena.m4) +-builtin(include, ac-tools/aclocal.m4) ++#dnl We use this file by Andreas Zeller to check for libXaw ++#builtin(include, ac-tools/ice_find_athena.m4) ++#builtin(include, ac-tools/aclocal.m4) + + dnl We want these before the checks, so the checks can modify their values. + test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS) +@@ -162,6 +162,7 @@ fi + + dnl **** Check for underscore on external symbols **** + ++AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix]) + AC_CACHE_CHECK("whether external symbols need an underscore prefix", + ac_cv_c_extern_prefix, + [saved_libs=$LIBS +@@ -179,68 +180,48 @@ then + AC_DEFINE(NEED_UNDERSCORE_PREFIX) + fi + +-dnl **** Check which ANSI integer type is 16 bit +- +-AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type, +- AC_TRY_RUN([ +-int main(void) { +- if (sizeof(short)==2) +- return(0); +- else if (sizeof(int)==2) +- return(1); +- else +- return(2); +-}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=)) +-if test "$ac_16bit_type" = "short" +-then +- T1_AA_TYPE16="-DT1_AA_TYPE16=short" +- T1_INT16="short" +-else +- T1_AA_TYPE16="-DT1_AA_TYPE16=int" +- T1_INT16="int" ++dnl **** Check which ANSI integer type is 16 bit ++T1_AA_TYPE16="" ++for type in short int; do ++ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then ++ T1_AA_TYPE16="-DT1_AA_TYPE16=$type" ++ T1_INT16="$type" ++ break ++ fi ++done ++ ++if test x"$T1_AA_TYPE16" = "x"; then ++ AC_MSG_ERROR("Unable to determine which integer type is 16 bit.") + fi + +- + dnl **** Check which ANSI integer type is 32 bit +- +-AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type, +- AC_TRY_RUN([ +-int main(void) { +- if (sizeof(int)==4) +- return(0); +- else if (sizeof(long)==4) +- return(1); +- else +- return(2); +-}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=)) +-if test "$ac_32bit_type" = "int" +-then +- T1_AA_TYPE32="-DT1_AA_TYPE32=int" +- T1_INT32="int" +-else +- T1_AA_TYPE32="-DT1_AA_TYPE32=long" +- T1_INT32="long" ++T1_AA_TYPE32="" ++for type in int long; do ++ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then ++ T1_AA_TYPE32="-DT1_AA_TYPE32=$type" ++ T1_INT32="$type" ++ break ++ fi ++done ++ ++if test x"$T1_AA_TYPE32" = "x"; then ++ AC_MSG_ERROR("Unable to determine which integer type is 32 bit.") + fi + +- + dnl **** Check which ANSI integer type is 64 bit +- +-AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type, +- AC_TRY_RUN([ +-int main(void) { +- if (sizeof(long)==8) +- return(0); +- else +- return(1); +-}], ac_64bit_type="long", ac_64bit_type="")) +-if test "$ac_64bit_type" = "long" +-then +- T1_AA_TYPE64="-DT1_AA_TYPE64=long" +-else +- T1_AA_TYPE64= ++T1_AA_TYPE64="" ++for type in long long_long; do ++ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then ++ AC_MSG_WARN("$type is 64 bit") ++ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\"" ++ break ++ fi ++done ++ ++if test x"$T1_AA_TYPE64" = "x"; then ++ AC_MSG_ERROR("Unable to determine which integer type is 64 bit.") + fi + +- + CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\"" + + dnl **** Check for functions and header files **** diff --git a/recipes-support/t1lib/t1lib-5.1.2/format_security.patch b/recipes-support/t1lib/t1lib-5.1.2/format_security.patch new file mode 100644 index 0000000..bc2476b --- /dev/null +++ b/recipes-support/t1lib/t1lib-5.1.2/format_security.patch @@ -0,0 +1,58 @@ +From cea83003de3ffebde92becd1e599fe3b28f0a7c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 6 Mar 2017 23:13:36 -0800 +Subject: [PATCH] t1lib: Fix printf format string errors + +Fix printf formats to use format qualifiers +fixes + +error: format string is not a string literal (potentially insecure) [-Werror,-Wformat-security] + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +--- + lib/t1lib/t1subset.c | 2 +- + lib/type1/objects.c | 2 +- + lib/type1/objects.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/t1lib/t1subset.c b/lib/t1lib/t1subset.c +index da427b2..e76974f 100644 +--- a/lib/t1lib/t1subset.c ++++ b/lib/t1lib/t1subset.c +@@ -759,7 +759,7 @@ char *T1_SubsetFont( int FontID, + tr_len); + T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf, + T1LOG_DEBUG); +- l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */ ++ l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */ + } + + /* compute size of output file */ +diff --git a/lib/type1/objects.c b/lib/type1/objects.c +index c413a0f..f828e6a 100644 +--- a/lib/type1/objects.c ++++ b/lib/type1/objects.c +@@ -957,7 +957,7 @@ struct xobject *TypeErr(name, obj, expect, ret) /* non-ANSI avoids overly strict + + sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", + name, TypeFmt(expect), TypeFmt(obj->type)); +- IfTrace0(TRUE,typemsg); ++ IfTrace1(TRUE, "%s", typemsg); + + ObjectPostMortem(obj); + +diff --git a/lib/type1/objects.h b/lib/type1/objects.h +index 13cbae7..3a1d337 100644 +--- a/lib/type1/objects.h ++++ b/lib/type1/objects.h +@@ -214,7 +214,7 @@ struct xobject { + /*SHARED*/ + /* NDW: personally, I want to see status and error messages! */ + #define IfTrace0(condition,model) \ +- {if (condition) printf(model);} ++ {if (condition) fputs(model,stdout);} + #define IfTrace1(condition,model,arg0) \ + {if (condition) printf(model,arg0);} + #define IfTrace2(condition,model,arg0,arg1) \ diff --git a/recipes-support/t1lib/t1lib-5.1.2/libtool.patch b/recipes-support/t1lib/t1lib-5.1.2/libtool.patch new file mode 100644 index 0000000..da54f87 --- /dev/null +++ b/recipes-support/t1lib/t1lib-5.1.2/libtool.patch @@ -0,0 +1,144 @@ +From bab41f5e1fc1fc809da1371e6a0222e0eb21e5f0 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Mon, 21 Nov 2011 12:00:54 +0100 +Subject: [PATCH] t1lib: add 5.1.2 + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- + Makefile.in | 5 +++-- + examples/Makefile.in | 5 +++-- + lib/Makefile.in | 6 ++++-- + lib/t1lib/Makefile.in | 6 ++++-- + lib/type1/Makefile.in | 6 ++++-- + type1afm/Makefile.in | 6 ++++-- + xglyph/Makefile.in | 6 ++++-- + 7 files changed, 26 insertions(+), 14 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 29c3468..396c020 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -18,7 +18,8 @@ + # Last modified: 2005-05-01 + # + +-SHELL = /bin/sh ++SHELL = @SHELL@ ++LIBTOOL = @LIBTOOL@ + CC = @CC@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ +@@ -149,7 +150,7 @@ distclean: clean + $(RM) examples/Makefile + $(RM) xglyph/Makefile + $(RM) doc/Makefile +- $(RM) libtool ++ $(RM) $(LIBTOOL) + + + # The following two targets are for building and cleaning the python- +diff --git a/examples/Makefile.in b/examples/Makefile.in +index b301db5..7a6a514 100644 +--- a/examples/Makefile.in ++++ b/examples/Makefile.in +@@ -14,9 +14,10 @@ + # Last modified: 2001-04-01 + # + ++top_builddir = @top_builddir@ + +-LIBTOOL = ../libtool +-SHELL = /bin/sh ++LIBTOOL = @LIBTOOL@ ++SHELL = @SHELL@ + CC = @CC@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ +diff --git a/lib/Makefile.in b/lib/Makefile.in +index 89e5e86..6e0f960 100644 +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -15,8 +15,10 @@ + # + # Contributions by H.Kakugawa to use libtool! + +-LIBTOOL = ../libtool +-SHELL = /bin/sh ++top_builddir = @top_builddir@ ++ ++LIBTOOL = @LIBTOOL@ ++SHELL = @SHELL@ + CC = @CC@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ +diff --git a/lib/t1lib/Makefile.in b/lib/t1lib/Makefile.in +index a6c2478..32434b3 100644 +--- a/lib/t1lib/Makefile.in ++++ b/lib/t1lib/Makefile.in +@@ -14,8 +14,10 @@ + # + # Modified by H.Kakugawa to use libtool + +-LIBTOOL = ../../libtool +-SHELL = /bin/sh ++top_builddir = @top_builddir@ ++ ++LIBTOOL = @LIBTOOL@ ++SHELL = @SHELL@ + CC = @CC@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ +diff --git a/lib/type1/Makefile.in b/lib/type1/Makefile.in +index 241f124..42efa94 100644 +--- a/lib/type1/Makefile.in ++++ b/lib/type1/Makefile.in +@@ -14,8 +14,10 @@ + # + # Modified by H.Kakugawa to use libtool + +-LIBTOOL = ../../libtool +-SHELL = /bin/sh ++top_builddir = @top_builddir@ ++ ++LIBTOOL = @LIBTOOL@ ++SHELL = @SHELL@ + CC = @CC@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ +diff --git a/type1afm/Makefile.in b/type1afm/Makefile.in +index 61611e1..9b51406 100644 +--- a/type1afm/Makefile.in ++++ b/type1afm/Makefile.in +@@ -15,8 +15,10 @@ + # + # Modified by H.Kakugawa to use libtool + +-LIBTOOL = ../libtool +-SHELL = /bin/sh ++top_builddir = @top_builddir@ ++ ++LIBTOOL = @LIBTOOL@ ++SHELL = @SHELL@ + CC = @CC@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ +diff --git a/xglyph/Makefile.in b/xglyph/Makefile.in +index 8da9b63..741334c 100644 +--- a/xglyph/Makefile.in ++++ b/xglyph/Makefile.in +@@ -15,8 +15,10 @@ + # + # Modified by H.Kakugawa to use libtool + +-LIBTOOL = ../libtool +-SHELL = /bin/sh ++top_builddir = @top_builddir@ ++ ++LIBTOOL = @LIBTOOL@ ++SHELL = @SHELL@ + CC = @CC@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ diff --git a/recipes-support/t1lib/t1lib_5.1.2.bb b/recipes-support/t1lib/t1lib_5.1.2.bb new file mode 100644 index 0000000..826dbda --- /dev/null +++ b/recipes-support/t1lib/t1lib_5.1.2.bb @@ -0,0 +1,29 @@ +SUMMARY = "A Type1 Font Rastering Library" +SECTION = "libs" +DEPENDS = "virtual/libx11 libxaw" + +LICENSE = "LGPLv2 & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \ + file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \ +" + +SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \ + file://configure.patch \ + file://libtool.patch \ + file://format_security.patch" +SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c" +SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59" + +inherit autotools-brokensep distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +# Fix GNU_HASH problem +TARGET_CC_ARCH += "${LDFLAGS}" + +EXTRA_OECONF = "--with-x --without-athena" +EXTRA_OEMAKE = "without_doc" + +FILES_${PN} += " ${datadir}/t1lib/t1lib.config" +FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf" + From 678476b11325d0a0e70ca3a5666fb5101a75ff93 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 12 Aug 2019 10:35:02 +0300 Subject: [PATCH 4/5] gtkmathview: Moved from meta-oe Used by abiword. Signed-off-by: Adrian Bunk --- ...formatting-for-modern-c-11-compilers.patch | 31 +++++++ ...ude-cstdio-to-get-printf-definitions.patch | 28 ++++++ ...der-detection-of-hash_map-is-broken-.patch | 63 +++++++++++++ .../0003-gcc-6.0-build-fixes.patch | 93 +++++++++++++++++++ .../gtkmathview/gtkmathview/use_hostcxx.patch | 18 ++++ .../gtkmathview/gtkmathview_0.8.0.bb | 28 ++++++ 6 files changed, 261 insertions(+) create mode 100644 recipes-support/gtkmathview/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch create mode 100644 recipes-support/gtkmathview/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch create mode 100644 recipes-support/gtkmathview/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch create mode 100644 recipes-support/gtkmathview/gtkmathview/0003-gcc-6.0-build-fixes.patch create mode 100644 recipes-support/gtkmathview/gtkmathview/use_hostcxx.patch create mode 100644 recipes-support/gtkmathview/gtkmathview_0.8.0.bb diff --git a/recipes-support/gtkmathview/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch b/recipes-support/gtkmathview/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch new file mode 100644 index 0000000..8b00966 --- /dev/null +++ b/recipes-support/gtkmathview/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch @@ -0,0 +1,31 @@ +From 90411a7f5e0e9582e79f0a8ccc1e2f158615e451 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 19 May 2018 23:18:11 -0700 +Subject: [PATCH] Fix formatting for modern c++11 compilers + +Fixes +error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/backend/svg/SVG_RenderingContext.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/backend/svg/SVG_RenderingContext.cc b/src/backend/svg/SVG_RenderingContext.cc +index 55d6097..0d50702 100644 +--- a/src/backend/svg/SVG_RenderingContext.cc ++++ b/src/backend/svg/SVG_RenderingContext.cc +@@ -68,7 +68,7 @@ void + SVG_RenderingContext::documentStart(const BoundingBox& bbox) + { + beginDocument(bbox); +- metadata("Created by "PACKAGE" version "VERSION); ++ metadata("Created by " PACKAGE " version " VERSION); + } + + void +-- +2.17.0 + diff --git a/recipes-support/gtkmathview/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch b/recipes-support/gtkmathview/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch new file mode 100644 index 0000000..c5814bf --- /dev/null +++ b/recipes-support/gtkmathview/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch @@ -0,0 +1,28 @@ +From c92890c5e18bb6ee23bdb14074bacf306dd9428f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 May 2015 20:35:01 -0700 +Subject: [PATCH] include cstdio to get printf definitions + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/engine/boxml/BoxMLHOVElement.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/engine/boxml/BoxMLHOVElement.cc b/src/engine/boxml/BoxMLHOVElement.cc +index 1a2812c..96c9eea 100644 +--- a/src/engine/boxml/BoxMLHOVElement.cc ++++ b/src/engine/boxml/BoxMLHOVElement.cc +@@ -21,7 +21,7 @@ + // . + + #include +- ++#include + #include "BoxMLAttributeSignatures.hh" + #include "BoxMLHOVElement.hh" + #include "BoxMLHElement.hh" +-- +2.1.4 + diff --git a/recipes-support/gtkmathview/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch b/recipes-support/gtkmathview/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch new file mode 100644 index 0000000..b879d6a --- /dev/null +++ b/recipes-support/gtkmathview/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch @@ -0,0 +1,63 @@ +From 9c226fbc6a42540cb492fcfcb81ff16fffb086d6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 30 Aug 2016 23:24:53 +0200 +Subject: [PATCH] configure.ac: header detection of hash_map is broken - pin to + correct implementation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + configure.ac | 31 ++++--------------------------- + 1 file changed, 4 insertions(+), 27 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4f2118e..16c09d5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -252,35 +252,12 @@ 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 is provided]) +- GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1 +- ], +- [ +- GMV_HAVE_UNORDERED_MAP_CFLAGS= +- ] +-) ++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 is provided]) +- GMV_HAVE_HASH_MAP_CFLAGS=-DGMV_HAVE_HASH_MAP=1 +- ], +- [ +- GMV_HAVE_HASH_MAP_CFLAGS= +- ] +-) ++GMV_HAVE_HASH_MAP_CFLAGS= + AC_SUBST(GMV_HAVE_HASH_MAP_CFLAGS) +-AC_CHECK_HEADERS(ext/hash_map, +- [ +- AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if is provided]) +- GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1 +- ], +- [ +- GMV_HAVE_EXT_HASH_MAP_CFLAGS= +- ] +-) ++AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if is provided]) ++GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1 + AC_SUBST(GMV_HAVE_EXT_HASH_MAP_CFLAGS) + + AC_MSG_CHECKING([whether the C++ compiler supports the standard character traits]) +-- +2.5.5 + diff --git a/recipes-support/gtkmathview/gtkmathview/0003-gcc-6.0-build-fixes.patch b/recipes-support/gtkmathview/gtkmathview/0003-gcc-6.0-build-fixes.patch new file mode 100644 index 0000000..356274d --- /dev/null +++ b/recipes-support/gtkmathview/gtkmathview/0003-gcc-6.0-build-fixes.patch @@ -0,0 +1,93 @@ +From: Gert Wollny +Date: Sun, 26 Jun 2016 13:25:00 +0200 +Description: gcc 6.0 build fixes +Bug: https://bugs.debian.org/811682 + +Slightly adapted to our environment + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- a/src/engine/common/View.cc ++++ b/src/engine/common/View.cc +@@ -291,7 +291,7 @@ + } + } + +- return false; ++ return SmartPtr(); + } + + 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/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; + }; + diff --git a/recipes-support/gtkmathview/gtkmathview/use_hostcxx.patch b/recipes-support/gtkmathview/gtkmathview/use_hostcxx.patch new file mode 100644 index 0000000..3fe6328 --- /dev/null +++ b/recipes-support/gtkmathview/gtkmathview/use_hostcxx.patch @@ -0,0 +1,18 @@ +Use build_cc to compile the programs to run on build host +helps with cross compiling + +Upstream-Status: Inappropriate [Cross-compiled OE specific] + +diff --git a/src/common/mathvariants/Makefile.am b/src/common/mathvariants/Makefile.am +index 636ccf0..ed9921d 100644 +--- a/src/common/mathvariants/Makefile.am ++++ b/src/common/mathvariants/Makefile.am +@@ -52,7 +52,7 @@ XSLTPROC = xsltproc + %.cc : %_gen.cc $(srcdir)/variant.top $(srcdir)/variant.bot + cat $(srcdir)/variant.top >$@ + $(XSLTPROC) --novalid --param temp "false()" $(srcdir)/extract.xsl $(<:%_gen.cc=$(srcdir)/xml/%.xml) >>$@ +- $(CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $< ++ $(BUILD_CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $< + echo "Char32 " >>$@ + basename map_variant_$@ .cc | tr "-" "_" >>$@ + echo "(Char32 ch)" >>$@ diff --git a/recipes-support/gtkmathview/gtkmathview_0.8.0.bb b/recipes-support/gtkmathview/gtkmathview_0.8.0.bb new file mode 100644 index 0000000..9ee9e30 --- /dev/null +++ b/recipes-support/gtkmathview/gtkmathview_0.8.0.bb @@ -0,0 +1,28 @@ +HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/" +DEPENDS = "t1lib gtk+ popt libxslt-native libxml2" + +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" + +PR = "r3" +SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec" +PV = "0.8.0+git${SRCPV}" + +SRC_URI = "git://github.com/GNOME/gtkmathview.git \ + file://use_hostcxx.patch \ + file://0001-include-cstdio-to-get-printf-definitions.patch \ + file://0002-configure.ac-header-detection-of-hash_map-is-broken-.patch \ + file://0003-gcc-6.0-build-fixes.patch \ + file://0001-Fix-formatting-for-modern-c-11-compilers.patch \ +" + +S = "${WORKDIR}/git" + +inherit distro_features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" + +do_configure_append() { + # avoid host polution inf pkg-config files + sed -i "s:${STAGING_DIR_HOST}::g" `find -name '*.pc'` +} From 8222eff1d287a3beead04841e4abca695b4efedc Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 12 Aug 2019 10:38:09 +0300 Subject: [PATCH 5/5] wv: Moved from meta-gnome Used by abiword. Signed-off-by: Adrian Bunk --- ...reign-mode-to-avoid-errors-with-miss.patch | 29 +++++++++++++++++++ ...c-Specify-print-format-in-rtf_output.patch | 26 +++++++++++++++++ recipes-support/wv/wv_1.2.9.bb | 18 ++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 recipes-support/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch create mode 100644 recipes-support/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch create mode 100644 recipes-support/wv/wv_1.2.9.bb diff --git a/recipes-support/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch b/recipes-support/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch new file mode 100644 index 0000000..a8c5bc7 --- /dev/null +++ b/recipes-support/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch @@ -0,0 +1,29 @@ +From eebe1f27f4b27b05eb4b9b55f9df1124acf4d092 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Fri, 1 Aug 2014 12:25:24 +0200 +Subject: [PATCH] configure: use 'foreign' mode to avoid errors with missing + NEWS/AUTHORS/etc + +Upstream-status: Pending + +Signed-off-by: Koen Kooi +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3d7eef6..1784bdd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,7 +41,7 @@ VERSION=$WV_VERSION + PACKAGE=wv + + dnl Initialize automake stuff +-AM_INIT_AUTOMAKE($PACKAGE, $VERSION) ++AM_INIT_AUTOMAKE([foreign]) + + # Specify a configuration file + AM_CONFIG_HEADER(config.h) +-- +1.9.0 + diff --git a/recipes-support/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch b/recipes-support/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch new file mode 100644 index 0000000..2fc3f36 --- /dev/null +++ b/recipes-support/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch @@ -0,0 +1,26 @@ +From 079529b8d5e339e2211fa2f8c15543a738a627bc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 27 Jun 2017 14:50:51 -0700 +Subject: [PATCH] wvRTF.c: Specify print format in rtf_output() + +Signed-off-by: Khem Raj +--- + wvRTF.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wvRTF.c b/wvRTF.c +index 361d258..4f24b30 100644 +--- a/wvRTF.c ++++ b/wvRTF.c +@@ -192,7 +192,7 @@ output_rtfUserData (rtfUserData * ud) + rtf_output_char ('{'); + + /* font color */ +- rtf_output (rtfColors[ud->cCol]); ++ rtf_output ("%s", rtfColors[ud->cCol]); + + /* font face */ + rtf_output ("\\f%d", ud->cFont); +-- +2.13.2 + diff --git a/recipes-support/wv/wv_1.2.9.bb b/recipes-support/wv/wv_1.2.9.bb new file mode 100644 index 0000000..72b8508 --- /dev/null +++ b/recipes-support/wv/wv_1.2.9.bb @@ -0,0 +1,18 @@ +SUMMARY = "Programs for accessing Microsoft Word documents" +HOMEPAGE = "http://wvware.sourceforge.net/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f" + +DEPENDS = "libgsf glib-2.0 libpng" + +SRC_URI = "https://www.abisource.com/downloads/wv/${PV}/${BP}.tar.gz \ + file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \ + file://0001-wvRTF.c-Specify-print-format-in-rtf_output.patch \ + " + +SRC_URI[md5sum] = "dbccf2e9f747e50c913b7e3d126b73f7" +SRC_URI[sha256sum] = "4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d" + +inherit autotools pkgconfig + +EXTRA_OECONF = ""