Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
018830a683 | ||
|
|
7fe7940d64 | ||
|
|
da835e5a1f | ||
|
|
16f72f6de0 | ||
|
|
0ad80a6ea3 | ||
|
|
0e7ecadf17 | ||
|
|
b92e44ebdb | ||
|
|
18a8ecb118 | ||
|
|
cc8fadc478 | ||
|
|
56e566350a | ||
|
|
0eaa11c61a | ||
|
|
4d1fd3cd4f | ||
|
|
912ae9f4d4 | ||
|
|
0c710325cc | ||
|
|
f5f4814aae | ||
|
|
bbadf3f769 | ||
|
|
eafdf7ced7 | ||
|
|
a3164ef317 | ||
|
|
2a28a0833f | ||
|
|
bfa4570169 |
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
|
||||
"
|
||||
|
||||
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "b33fd0be3befdd1b37777e08ce058bd9"
|
||||
SRC_URI[sha256sum] = "72fe7bbbf2275242acdf67ad2f9b6c71ac9146a56c409def360dabcac5695b49"
|
||||
SRC_URI[md5sum] = "e369f30b5b861ee0fc4f9e6cbad701fe"
|
||||
SRC_URI[sha256sum] = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From f443422e9f039b809bd4fcde21704b9d6503edfa Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 31 Jul 2016 12:57:24 +0200
|
||||
Subject: [PATCH] make nitpickickng gcc6 happy
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upsatream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
src/lib/FB2Parser.cpp | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp
|
||||
index 6442c70..1450087 100644
|
||||
--- a/src/lib/FB2Parser.cpp
|
||||
+++ b/src/lib/FB2Parser.cpp
|
||||
@@ -103,7 +103,7 @@ private:
|
||||
bool m_firstBody;
|
||||
};
|
||||
|
||||
-class StylesheetContext : public FB2NodeContextBase
|
||||
+/*class StylesheetContext : public FB2NodeContextBase
|
||||
{
|
||||
public:
|
||||
explicit StylesheetContext(FB2ParserContext *parentContext);
|
||||
@@ -112,7 +112,7 @@ private:
|
||||
virtual FB2XMLParserContext *element(const FB2TokenData &name, const FB2TokenData &ns);
|
||||
virtual void endOfElement();
|
||||
virtual void attribute(const FB2TokenData &name, const FB2TokenData *ns, const char *value);
|
||||
-};
|
||||
+};*/
|
||||
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@ void FictionBookGathererContext::attribute(const FB2TokenData &, const FB2TokenD
|
||||
{
|
||||
}
|
||||
|
||||
-StylesheetContext::StylesheetContext(FB2ParserContext *const parentContext)
|
||||
+/*StylesheetContext::StylesheetContext(FB2ParserContext *const parentContext)
|
||||
: FB2NodeContextBase(parentContext)
|
||||
{
|
||||
}
|
||||
@@ -253,7 +253,7 @@ void StylesheetContext::attribute(const FB2TokenData &name, const FB2TokenData *
|
||||
break;
|
||||
}
|
||||
}
|
||||
-}
|
||||
+}*/
|
||||
|
||||
DocumentContext::DocumentContext(FB2ContentMap ¬es, FB2ContentMap &bitmaps, librevenge::RVNGTextInterface *const document)
|
||||
: FB2ParserContext(0)
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
|
||||
"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/libebook/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI = " \
|
||||
${SOURCEFORGE_MIRROR}/project/libebook/${BPN}-${PV}/${BPN}-${PV}.tar.xz \
|
||||
file://0001-make-nitpickickng-gcc6-happy.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "19d84f4a97aab32d350d1f47ea3da0b3"
|
||||
SRC_URI[sha256sum] = "7f894b1538b71c6cd96c976069c4dadb38b623612f0e35b2f6ee8a2c46bb88ec"
|
||||
|
||||
|
||||
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
|
||||
"
|
||||
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "8a2c7de34b5c02f4a75ba086bc5af57b"
|
||||
SRC_URI[sha256sum] = "fe12276a62bd5f5ca4f5bfbd4938a74d097084e1f9fe173e521f63203f56f055"
|
||||
SRC_URI[md5sum] = "dfe25b0c7739283a5c61a930ea1f9bf8"
|
||||
SRC_URI[sha256sum] = "df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
DEPENDS = "glm mdds icu lcms libxml2 librevenge"
|
||||
DEPENDS = "glm mdds icu lcms libxml2 librevenge liblangtag mdds-1"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \
|
||||
"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "a8364bf2e4ece2860ab96d6bee75f1d7"
|
||||
SRC_URI[sha256sum] = "fb3fcac71eefe4d80ea76c08d259109bb020836cbd9f8d73f06daed1801a637c"
|
||||
SRC_URI[md5sum] = "72ad446d76b157e30c1baf39bb288b99"
|
||||
SRC_URI[sha256sum] = "a59c5ffcbca0040d93a5b3cb00faf12659cf8b525f076081d1e7585d91d08eb5"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
|
||||
"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/libwpd/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "e0a76e8fb84a3aceb70bdb733c7431ac"
|
||||
SRC_URI[sha256sum] = "fb8706e38f6acf019f8b50262af2bf850821c6d10dad8708f13e54f1a08294dd"
|
||||
SRC_URI[md5sum] = "731fd5e5513c55ed64458a0a8c33a830"
|
||||
SRC_URI[sha256sum] = "03b210ab44f05e38091508cdca6ba0ff73de3ea8a168f849b8f1c5059c20b9e9"
|
||||
|
||||
inherit autotools pkgconfig perlnative
|
||||
|
||||
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
|
||||
"
|
||||
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "1e6fec3e30f4f47c4c2619ee232dec04"
|
||||
SRC_URI[sha256sum] = "cdbdf86605773339caab6477ff694a95a90aaa4d45bb6cdb59e4a7f76c91ef17"
|
||||
SRC_URI[md5sum] = "9f377b0690fa6e96a94bb309509860e9"
|
||||
SRC_URI[sha256sum] = "d896dc55dafd84ee3441e0ca497b810809f9eea44805a495c3843412309036d6"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
|
||||
"
|
||||
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI[md5sum] = "fda521a18bbfccc5f034ea02119e7998"
|
||||
SRC_URI[sha256sum] = "943e03b1e6c969af4c2133a6671c9630adf3aaf8d460156744a28f58c9f47cd8"
|
||||
SRC_URI[md5sum] = "691522167fe3b0c94becfe5d957883be"
|
||||
SRC_URI[sha256sum] = "430a067903660bb1b97daf4b045e408a1bb75ca45e615cf05fb1a4da65fc5a8c"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
|
||||
"
|
||||
|
||||
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "0773d79a1f240ef9f4f20242b13c5bb7"
|
||||
SRC_URI[sha256sum] = "f2bf5d65156a351ce404550dd822c8db8ab8740b393f61dba828d1b2cb33fe91"
|
||||
SRC_URI[md5sum] = "79b56bcc349264d686a67994506ad199"
|
||||
SRC_URI[sha256sum] = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"
|
||||
|
||||
inherit autotools pkgconfig perlnative
|
||||
|
||||
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
|
||||
"
|
||||
|
||||
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "17da9770cb8b317b7633f9807b32b71a"
|
||||
SRC_URI[sha256sum] = "28fc3580228a82948dfc01d07abd5076c8b0df76a68702c1a81eb88fdf377348"
|
||||
SRC_URI[md5sum] = "dfd066658ec9d2fb2262417039a8a1c3"
|
||||
SRC_URI[sha256sum] = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
|
||||
"
|
||||
|
||||
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI[md5sum] = "8a6c55542ce80203dd6d3b1cba99d4e5"
|
||||
SRC_URI[sha256sum] = "254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587"
|
||||
SRC_URI[md5sum] = "027fb17fb9e43553aa6624dc18f830ac"
|
||||
SRC_URI[sha256sum] = "0c30407865a873ff76b6d5b2d2aa599f6af68936638c81ca8292449324042a6c"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From b9fa2963cf12e6987b3a0acc219c4fa591e41be8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Wed, 3 Feb 2016 10:30:43 +0000
|
||||
Subject: [PATCH] fix gcc build error
|
||||
|
||||
error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type
|
||||
{aka double}' and 'int' to binary 'operator%'
|
||||
|
||||
apparently there's a template returning double for abs for the
|
||||
non-int/long/float/double argument case. So promote earlier to int so the
|
||||
abs<int> is called
|
||||
|
||||
Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae
|
||||
|
||||
Upstream-Status: Backport
|
||||
---
|
||||
sax/source/tools/converter.cxx | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
|
||||
index 744415e..cf061c9 100644
|
||||
--- a/sax/source/tools/converter.cxx
|
||||
+++ b/sax/source/tools/converter.cxx
|
||||
@@ -1250,7 +1250,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
|
||||
|
||||
|
||||
static void
|
||||
-lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset)
|
||||
+lcl_AppendTimezone(OUStringBuffer & i_rBuffer, int const nOffset)
|
||||
{
|
||||
if (0 == nOffset)
|
||||
{
|
||||
@@ -1435,7 +1435,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const sal_Int32 nYear)
|
||||
static void lcl_ConvertToUTC(
|
||||
sal_Int16 & o_rYear, sal_uInt16 & o_rMonth, sal_uInt16 & o_rDay,
|
||||
sal_uInt16 & o_rHours, sal_uInt16 & o_rMinutes,
|
||||
- sal_Int16 const nSourceOffset)
|
||||
+ int const nSourceOffset)
|
||||
{
|
||||
sal_Int16 nOffsetHours(abs(nSourceOffset) / 60);
|
||||
sal_Int16 const nOffsetMinutes(abs(nSourceOffset) % 60);
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 352f9fdff619b5a0a1414c29cfc47068165a599c Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Tue, 19 Jan 2016 10:43:21 +0100
|
||||
Subject: [PATCH] -Werror=shift-negative-value (GCC 6)
|
||||
|
||||
Change-Id: Ifc7b1d6675a8e8fb41dd47cc1282059c3790736f
|
||||
|
||||
Upstream-Status: Backport
|
||||
---
|
||||
include/basebmp/packedpixeliterator.hxx | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/include/basebmp/packedpixeliterator.hxx b/include/basebmp/packedpixeliterator.hxx
|
||||
index 776a45e..693f59b 100644
|
||||
--- a/include/basebmp/packedpixeliterator.hxx
|
||||
+++ b/include/basebmp/packedpixeliterator.hxx
|
||||
@@ -78,7 +78,7 @@ public:
|
||||
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
|
||||
/** Bit mask for one pixel (least significant bits)
|
||||
*/
|
||||
- bit_mask=~(~0 << bits_per_pixel)
|
||||
+ bit_mask=~(~0u << bits_per_pixel)
|
||||
};
|
||||
|
||||
private:
|
||||
@@ -238,7 +238,7 @@ public:
|
||||
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
|
||||
/** Bit mask for one pixel (least significant bits)
|
||||
*/
|
||||
- bit_mask=~(~0 << bits_per_pixel)
|
||||
+ bit_mask=~(~0u << bits_per_pixel)
|
||||
};
|
||||
|
||||
private:
|
||||
@@ -477,7 +477,7 @@ public:
|
||||
num_intraword_positions=sizeof(value_type)*8/bits_per_pixel,
|
||||
/** Bit mask for one pixel (least significant bits)
|
||||
*/
|
||||
- bit_mask=~(~0 << bits_per_pixel)
|
||||
+ bit_mask=~(~0u << bits_per_pixel)
|
||||
};
|
||||
|
||||
// TODO(F2): direction of iteration (ImageIterator can be made to
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -100,7 +100,7 @@ EXTRA_OECONF += " \
|
||||
do_configure() {
|
||||
olddir=`pwd`
|
||||
cd ${S}
|
||||
aclocal --system-acdir=${B}/aclocal-copy/ -I ${S}/m4
|
||||
aclocal --system-acdir=${WORKDIR}/aclocal-copy/ -I ${S}/m4
|
||||
gnu-configize
|
||||
autoconf
|
||||
cd $olddir
|
||||
@@ -121,6 +121,7 @@ do_compile() {
|
||||
BUILDDIR=${B} oe_runmake Library_configmgr
|
||||
BUILDDIR=${B} oe_runmake Library_fwk
|
||||
BUILDDIR=${B} oe_runmake Library_i18npool
|
||||
BUILDDIR=${B} oe_runmake Library_pyuno
|
||||
|
||||
# BUILDDIR=${B} oe_runmake Module_external
|
||||
}
|
||||
@@ -171,4 +172,8 @@ do_install() {
|
||||
# gengal script and binary to expected location
|
||||
install ${S}/svx/source/gengal/gengal.sh ${D}/${bindir}/gengal
|
||||
mv ${D}/${libdir}/gengal.bin ${D}/${bindir}
|
||||
|
||||
# unoconv
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${WORKDIR}/git/unoconv/unoconv ${D}/${bindir}
|
||||
}
|
||||
|
||||
@@ -69,6 +69,7 @@ DEPENDS += " \
|
||||
mythes \
|
||||
hyphen \
|
||||
graphite2 \
|
||||
liblangtag \
|
||||
"
|
||||
|
||||
# necessary to let the call for python-config succeed
|
||||
@@ -147,6 +148,7 @@ EXTRA_OECONF += " \
|
||||
--with-system-mythes \
|
||||
--with-system-altlinuxhyph \
|
||||
--with-system-graphite \
|
||||
--with-system-liblangtag \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ??= " \
|
||||
@@ -166,7 +168,7 @@ PACKAGECONFIG[postgresql] = "--enable-postgresql-sdbc --with-system-postgresql,
|
||||
do_configure() {
|
||||
olddir=`pwd`
|
||||
cd ${S}
|
||||
aclocal --system-acdir=${B}/aclocal-copy/ -I ${S}/m4
|
||||
aclocal --system-acdir=${WORKDIR}/aclocal-copy/ -I ${S}/m4
|
||||
gnu-configize
|
||||
autoconf
|
||||
cd $olddir
|
||||
@@ -191,6 +193,10 @@ do_configure() {
|
||||
|
||||
do_install() {
|
||||
make DESTDIR=${D} distro-pack-install
|
||||
|
||||
# unoconv
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${WORKDIR}/git/unoconv/unoconv ${D}/${bindir}
|
||||
}
|
||||
|
||||
|
||||
@@ -258,7 +264,7 @@ python lo_do_split_locales() {
|
||||
# en-US is fallback so it should be implemented everywhere (= folder created)
|
||||
langfallback = 'en-US'
|
||||
findCMD = 'find %s -name "*%s*"' % (dvar, langfallback)
|
||||
fallbacksearchresult = subprocess.Popen(findCMD, stdout=subprocess.PIPE, shell=True).communicate()[0]
|
||||
fallbacksearchresult = subprocess.Popen(findCMD, stdout=subprocess.PIPE, shell=True, universal_newlines=True).communicate()[0]
|
||||
# uncomment to see if we need more entries in LO_LANGUAGE_FILES
|
||||
# bb.note("fallbacksearchresult = %s" % fallbacksearchresult.replace(dvar, ''))
|
||||
|
||||
|
||||
@@ -9,8 +9,12 @@ LIC_FILES_CHKSUM = " \
|
||||
require libreoffice-version.inc
|
||||
|
||||
SRC_URI += " \
|
||||
git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \
|
||||
file://0001-update-ax_boost-scripts-to-fix-configure-with-system.patch \
|
||||
file://0002-fix-gcc-build-error.patch \
|
||||
file://0003-Werror-shift-negative-value-GCC-6.patch \
|
||||
"
|
||||
SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
|
||||
|
||||
inherit autotools-brokensep pkgconfig distutils-base perlnative
|
||||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 1da0e92dfee9d3ecaad6dc7aabf1a3bc466cb314 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 13 Mar 2016 12:05:40 +0100
|
||||
Subject: [PATCH 1/2] configure.ac: add missing HAVE_INTROSPECTION check
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9773fa8..e090875 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -384,6 +384,8 @@ if test "x$enable_introspection" != "xyes"; then
|
||||
has_gobject=no
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_GOBJECT, test x$has_gobject != xno)
|
||||
+AM_CONDITIONAL(HAVE_INTROSPECTION, test x$has_gobject != xno)
|
||||
+
|
||||
m4_ifdef([GTK_DOC_CHECK], [
|
||||
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
|
||||
],[
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 0efc6ebe13ec12599ba05c587e58fb249d569f6c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 13 Mar 2016 12:37:43 +0100
|
||||
Subject: [PATCH 2/2] configure.ac: remove untranslated AX_CHECK_ENABLE_DEBUG
|
||||
macro
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e090875..e177c46 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -18,7 +18,6 @@ AM_MAINTAINER_MODE
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_MACRO_DIR([m4macros])
|
||||
|
||||
-AX_CHECK_ENABLE_DEBUG([no], [ENABLE_DEBUG])
|
||||
AM_CONDITIONAL(ENABLE_DEBUG, test $ax_enable_debug = yes)
|
||||
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
--
|
||||
2.5.5
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From f82fc1451c10d93be031e18935e5ea7589e3f602 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sun, 31 Jul 2016 16:09:00 +0200
|
||||
Subject: [PATCH] move _lt_tag_filter_t after neum to fix build
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
liblangtag/lt-tag.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/liblangtag/lt-tag.h b/liblangtag/lt-tag.h
|
||||
index 939acf5..2cc3028 100644
|
||||
--- a/liblangtag/lt-tag.h
|
||||
+++ b/liblangtag/lt-tag.h
|
||||
@@ -53,8 +53,6 @@ typedef struct _lt_tag_t lt_tag_t;
|
||||
* This is used as a binary count sequence with lt_tag_get_string_with_filter()
|
||||
* to allow only given tags to be the outcome.
|
||||
*/
|
||||
-typedef enum _lt_tag_filter_t lt_tag_filter_t;
|
||||
-
|
||||
enum _lt_tag_filter_t {
|
||||
LT_TAG_FILTER_NONE = 0,
|
||||
LT_TAG_FILTER_LANGUAGE = 1 << 0,
|
||||
@@ -68,6 +66,8 @@ enum _lt_tag_filter_t {
|
||||
LT_TAG_FILTER_ALL = -1
|
||||
};
|
||||
|
||||
+typedef enum _lt_tag_filter_t lt_tag_filter_t;
|
||||
+
|
||||
lt_tag_t *lt_tag_new (void);
|
||||
lt_tag_t *lt_tag_ref (lt_tag_t *tag);
|
||||
void lt_tag_unref (lt_tag_t *tag);
|
||||
--
|
||||
2.5.5
|
||||
|
||||
35
recipes-support/liblangtag/liblangtag_0.6.0.bb
Normal file
35
recipes-support/liblangtag/liblangtag_0.6.0.bb
Normal file
@@ -0,0 +1,35 @@
|
||||
SUMMARY = "An interface library to access tags for identifying languages"
|
||||
HOMEPAGE = "http://tagoh.bitbucket.org/liblangtag/"
|
||||
LICENSE = "LGPLv3"
|
||||
LIC_FILES_CHKSUM = " \
|
||||
file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \
|
||||
"
|
||||
|
||||
DEPENDS = "libxml2"
|
||||
|
||||
SRC_URI = " \
|
||||
https://bitbucket.org/tagoh/${BPN}/downloads/${BPN}-${PV}.tar.bz2 \
|
||||
file://0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch \
|
||||
file://0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch \
|
||||
file://0003-move-_lt_tag_filter_t-after-neum-to-fix-build.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "dcd7a845a8a9b57ca96eb04a29083246"
|
||||
SRC_URI[sha256sum] = "df84efd7e3e67cc8a38ece1e23f080c70ea29b26590ee324d03f1df37bf46576"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
# broken
|
||||
EXTRA_OECONF += "--disable-introspection"
|
||||
|
||||
# Even though introspection is disabled , gobject-introspection package is still
|
||||
# needed for m4 macros.
|
||||
DEPENDS += "gobject-introspection"
|
||||
|
||||
do_configure_prepend() {
|
||||
if ! grep -q ${HOST_SYS}-libtool ${S}/configure.ac; then
|
||||
# align to native libtool
|
||||
sed -i 's:libtool :${HOST_SYS}-libtool :g' ${S}/configure.ac
|
||||
fi
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
Reference in New Issue
Block a user