From 435bae02119ac7825e2576bd8a58dcadc8241442 Mon Sep 17 00:00:00 2001 From: zhang_wenyu1 Date: Tue, 26 Nov 2024 15:22:20 +0800 Subject: [PATCH 1/6] libabw: add recipe for libabw and modify manifest.yaml 1. add recipe for libabw 2. modify manifest.yaml Signed-off-by: zhang_wenyu --- .oebuild/manifest.yaml | 3 +++ .../recipes-filter/libabw/libabw_%.bbappend | 6 ++++++ .../recipes-filter/libabw/libabw_0.1.3.bb | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 meta-openeuler/recipes-filter/libabw/libabw_%.bbappend create mode 100644 meta-openeuler/recipes-filter/libabw/libabw_0.1.3.bb diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 34ef45c66dd..fa870aa93cc 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -2208,3 +2208,6 @@ manifest_list: clucene-core: remote_url: https://gitee.com/src-openeuler/clucene.git version: ab6b4df2f4dfebbd991ee377293b7bd512281c6a + libabw: + remote_url: https://gitee.com/src-openeuler/libabw.git + version: e8dd8ddf336f876792358818b6e0acfacd86080e diff --git a/meta-openeuler/recipes-filter/libabw/libabw_%.bbappend b/meta-openeuler/recipes-filter/libabw/libabw_%.bbappend new file mode 100644 index 00000000000..0c2adf4e296 --- /dev/null +++ b/meta-openeuler/recipes-filter/libabw/libabw_%.bbappend @@ -0,0 +1,6 @@ +# source bb: yocto-meta-openeuler/meta-openeuler/recipes-filter/libabw/libabw_0.1.3.bb +SRC_URI:prepend = " \ + file://${BPN}-${PV}.tar.xz \ +" + +SRC_URI[sha256sum] = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed" diff --git a/meta-openeuler/recipes-filter/libabw/libabw_0.1.3.bb b/meta-openeuler/recipes-filter/libabw/libabw_0.1.3.bb new file mode 100644 index 00000000000..4247adc4ea5 --- /dev/null +++ b/meta-openeuler/recipes-filter/libabw/libabw_0.1.3.bb @@ -0,0 +1,18 @@ +SUMMARY = "Library that parses the file format of AbiWord documents" +HOMEPAGE = "https://wiki.documentfoundation.org/DLP/Libraries/libabw" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = " \ + file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \ +" + +SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "0ec0331abbbf653f08eecceb1fb787a0" +SRC_URI[sha256sum] = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed" + +inherit autotools pkgconfig + +DEPENDS = " \ + gperf-native \ + libxml2 \ + librevenge \ +" -- Gitee From 0d4d8a72926a494de94ba2535571f5188480dd4c Mon Sep 17 00:00:00 2001 From: zhang_wenyu1 Date: Tue, 26 Nov 2024 15:25:26 +0800 Subject: [PATCH 2/6] libcdr: add recipe for libcdr and modify manifest.yaml 1. add recipe for libcdr 2. modify manifest.yaml Signed-off-by: zhang_wenyu --- .oebuild/manifest.yaml | 3 ++ .../files/0001-Fix-build-with-ICU-68.patch | 39 +++++++++++++++++++ .../recipes-filter/libcdr/libcdr_%.bbappend | 4 ++ .../recipes-filter/libcdr/libcdr_0.1.7.bb | 15 +++++++ 4 files changed, 61 insertions(+) create mode 100644 meta-openeuler/recipes-filter/libcdr/files/0001-Fix-build-with-ICU-68.patch create mode 100644 meta-openeuler/recipes-filter/libcdr/libcdr_%.bbappend create mode 100644 meta-openeuler/recipes-filter/libcdr/libcdr_0.1.7.bb diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index fa870aa93cc..af521ac2887 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -2211,3 +2211,6 @@ manifest_list: libabw: remote_url: https://gitee.com/src-openeuler/libabw.git version: e8dd8ddf336f876792358818b6e0acfacd86080e + libcdr: + remote_url: https://gitee.com/src-openeuler/libcdr.git + version: 2709995fe0094a11f51dad11e8e51ec3599d8b78 diff --git a/meta-openeuler/recipes-filter/libcdr/files/0001-Fix-build-with-ICU-68.patch b/meta-openeuler/recipes-filter/libcdr/files/0001-Fix-build-with-ICU-68.patch new file mode 100644 index 00000000000..c5af6dda559 --- /dev/null +++ b/meta-openeuler/recipes-filter/libcdr/files/0001-Fix-build-with-ICU-68.patch @@ -0,0 +1,39 @@ +From 489797a235041ca43a288f5ce38aace8975bc987 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 24 Nov 2020 22:23:42 +0100 +Subject: [PATCH] Fix build with ICU >= 68 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/lib/libcdr_utils.cpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp +index 09ab42e..54a6fa3 100644 +--- a/src/lib/libcdr_utils.cpp ++++ b/src/lib/libcdr_utils.cpp +@@ -97,6 +97,17 @@ static unsigned short getEncodingFromICUName(const char *name) + return 0; + } + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ + static unsigned short getEncoding(const unsigned char *buffer, unsigned bufferLength) + { + if (!buffer) +-- +2.26.2 diff --git a/meta-openeuler/recipes-filter/libcdr/libcdr_%.bbappend b/meta-openeuler/recipes-filter/libcdr/libcdr_%.bbappend new file mode 100644 index 00000000000..26c17936b37 --- /dev/null +++ b/meta-openeuler/recipes-filter/libcdr/libcdr_%.bbappend @@ -0,0 +1,4 @@ +# source bb: yocto-meta-openeuler/meta-openeuler/recipes-filter/libcdr/libcdr_0.1.7.bb +SRC_URI:prepend = " \ + file://${BPN}-${PV}.tar.xz \ +" diff --git a/meta-openeuler/recipes-filter/libcdr/libcdr_0.1.7.bb b/meta-openeuler/recipes-filter/libcdr/libcdr_0.1.7.bb new file mode 100644 index 00000000000..67264dbb4c5 --- /dev/null +++ b/meta-openeuler/recipes-filter/libcdr/libcdr_0.1.7.bb @@ -0,0 +1,15 @@ +SUMMARY = "CorelDraw file format importer library for LibreOffice" +HOMEPAGE = "https://wiki.documentfoundation.org/DLP/Libraries/libcdr" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = " \ + file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \ +" +SRC_URI = " \ + https://dev-www.libreoffice.org/src/libcdr/${BPN}-${PV}.tar.xz \ + file://0001-Fix-build-with-ICU-68.patch \ +" +SRC_URI[sha256sum] = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4" + +inherit autotools pkgconfig + +DEPENDS = "icu lcms librevenge" -- Gitee From 5c3e204a3cdd838671a581b3e4e803f31e689913 Mon Sep 17 00:00:00 2001 From: zhang_wenyu1 Date: Tue, 26 Nov 2024 15:27:45 +0800 Subject: [PATCH 3/6] libe-book: add recipe for libe-book and modify manifest.yaml 1. add recipe for libe-book 2. modify manifest.yaml Signed-off-by: zhang_wenyu --- .oebuild/manifest.yaml | 3 ++ .../files/0001-Fix-build-with-ICU-68.patch | 37 +++++++++++++++++++ .../libe-book/libe-book_%.bbappend | 5 +++ .../libe-book/libe-book_0.1.3.bb | 17 +++++++++ 4 files changed, 62 insertions(+) create mode 100644 meta-openeuler/recipes-filter/libe-book/files/0001-Fix-build-with-ICU-68.patch create mode 100644 meta-openeuler/recipes-filter/libe-book/libe-book_%.bbappend create mode 100644 meta-openeuler/recipes-filter/libe-book/libe-book_0.1.3.bb diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index af521ac2887..6c153c7b1ab 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -2214,3 +2214,6 @@ manifest_list: libcdr: remote_url: https://gitee.com/src-openeuler/libcdr.git version: 2709995fe0094a11f51dad11e8e51ec3599d8b78 + libe-book: + remote_url: https://gitee.com/src-openeuler/libe-book.git + version: f26094895f5017fa076aa37607ec4439d5164228 diff --git a/meta-openeuler/recipes-filter/libe-book/files/0001-Fix-build-with-ICU-68.patch b/meta-openeuler/recipes-filter/libe-book/files/0001-Fix-build-with-ICU-68.patch new file mode 100644 index 00000000000..6091af70d55 --- /dev/null +++ b/meta-openeuler/recipes-filter/libe-book/files/0001-Fix-build-with-ICU-68.patch @@ -0,0 +1,37 @@ +From 70a92974df1d3b35811c2354fcec00c791159b82 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 24 Nov 2020 22:38:21 +0100 +Subject: [PATCH] Fix build with ICU >= 68 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + src/lib/EBOOKCharsetConverter.cpp | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/lib/EBOOKCharsetConverter.cpp b/src/lib/EBOOKCharsetConverter.cpp +index 0d85fa3..2631ba4 100644 +--- a/src/lib/EBOOKCharsetConverter.cpp ++++ b/src/lib/EBOOKCharsetConverter.cpp +@@ -26,6 +26,17 @@ class ConverterException + { + }; + ++// Since icu 68.1 icu we have to: ++#ifndef TRUE ++// Taken from umachibe.h: ++/** ++ * The TRUE value of a UBool. ++ * ++ * @deprecated ICU 68 Use standard "true" instead. ++ */ ++# define TRUE true ++#endif ++ + /** Guess character set of the text. + + @param[in] text the text +-- +2.26.2 diff --git a/meta-openeuler/recipes-filter/libe-book/libe-book_%.bbappend b/meta-openeuler/recipes-filter/libe-book/libe-book_%.bbappend new file mode 100644 index 00000000000..3f52f38a823 --- /dev/null +++ b/meta-openeuler/recipes-filter/libe-book/libe-book_%.bbappend @@ -0,0 +1,5 @@ +# source bb: yocto-meta-openeuler/meta-openeuler/recipes-filter/libe-book/libe-book_0.1.3.bb +SRC_URI:prepend = " \ + file://${BPN}-${PV}.tar.xz \ + file://0001-fix-gcc10-build.patch \ +" diff --git a/meta-openeuler/recipes-filter/libe-book/libe-book_0.1.3.bb b/meta-openeuler/recipes-filter/libe-book/libe-book_0.1.3.bb new file mode 100644 index 00000000000..eaf28134e74 --- /dev/null +++ b/meta-openeuler/recipes-filter/libe-book/libe-book_0.1.3.bb @@ -0,0 +1,17 @@ +SUMMARY = "A library for import of reflowable e-book formats" +HOMEPAGE = "http://sourceforge.net/projects/libebook" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \ +" + +SRC_URI = " \ + https://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz \ + file://0001-Fix-build-with-ICU-68.patch \ +" +SRC_URI[md5sum] = "2956f1c5e7950b0018979a132165da8b" +SRC_URI[sha256sum] = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9" + +inherit autotools pkgconfig + +DEPENDS = "icu libxml2 librevenge liblangtag boost-native gperf-native" -- Gitee From 28e97351c0bb3fa0d9f8835293cbcb964d95abfd Mon Sep 17 00:00:00 2001 From: zhang_wenyu1 Date: Tue, 26 Nov 2024 15:30:27 +0800 Subject: [PATCH 4/6] libetonyek: add recipe for libetonyek and modify manifest.yaml 1. add recipe for libetonyek 2. modify manifest.yaml Signed-off-by: zhang_wenyu --- .oebuild/manifest.yaml | 3 +++ .../files/0001-Fix-build-with-gcc-10.patch | 27 +++++++++++++++++++ .../libetonyek/libetonyek_%.bbappend | 24 +++++++++++++++++ .../libetonyek/libetonyek_0.1.9.bb | 15 +++++++++++ 4 files changed, 69 insertions(+) create mode 100644 meta-openeuler/recipes-filter/libetonyek/files/0001-Fix-build-with-gcc-10.patch create mode 100644 meta-openeuler/recipes-filter/libetonyek/libetonyek_%.bbappend create mode 100644 meta-openeuler/recipes-filter/libetonyek/libetonyek_0.1.9.bb diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 6c153c7b1ab..4d60a925cbf 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -2217,3 +2217,6 @@ manifest_list: libe-book: remote_url: https://gitee.com/src-openeuler/libe-book.git version: f26094895f5017fa076aa37607ec4439d5164228 + libetonyek: + remote_url: https://gitee.com/src-openeuler/libetonyek.git + version: 6f5295c7e95407380346132957f79f66efb0111b diff --git a/meta-openeuler/recipes-filter/libetonyek/files/0001-Fix-build-with-gcc-10.patch b/meta-openeuler/recipes-filter/libetonyek/files/0001-Fix-build-with-gcc-10.patch new file mode 100644 index 00000000000..82099fb6189 --- /dev/null +++ b/meta-openeuler/recipes-filter/libetonyek/files/0001-Fix-build-with-gcc-10.patch @@ -0,0 +1,27 @@ +From 4e4e9ac5990ff2436ed127eff6690b06a68bd034 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 5 Jun 2020 17:35:01 +0200 +Subject: [PATCH] Fix build with gcc 10 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + src/lib/NUM3Parser.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/NUM3Parser.cpp b/src/lib/NUM3Parser.cpp +index 6dc0e9a..8290290 100644 +--- a/src/lib/NUM3Parser.cpp ++++ b/src/lib/NUM3Parser.cpp +@@ -8,6 +8,7 @@ + */ + + #include ++#include + + #include "NUM3Parser.h" + +-- +2.26.2 diff --git a/meta-openeuler/recipes-filter/libetonyek/libetonyek_%.bbappend b/meta-openeuler/recipes-filter/libetonyek/libetonyek_%.bbappend new file mode 100644 index 00000000000..c4e8a815caf --- /dev/null +++ b/meta-openeuler/recipes-filter/libetonyek/libetonyek_%.bbappend @@ -0,0 +1,24 @@ +# source bb: yocto-meta-openeuler/meta-openeuler/recipes-filter/libetonyek/libetonyek_0.1.9.bb +PV = "0.1.10" + +SRC_URI:remove = " \ + file://0001-Fix-build-with-gcc-10.patch \ +" + +SRC_URI:prepend = " \ + file://${BPN}-${PV}.tar.xz \ +" + +DEPENDS:remove = " mdds-1.2" +DEPENDS:append = " mdds-2.0 boost" + +EXTRA_OECONF += " --disable-silent-rules --disable-static --disable-werror --with-mdds=2.0 " + +CXXFLAGS += " -std=c++17 " + +do_configure:append() { + sed -i \ + -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + libtool +} diff --git a/meta-openeuler/recipes-filter/libetonyek/libetonyek_0.1.9.bb b/meta-openeuler/recipes-filter/libetonyek/libetonyek_0.1.9.bb new file mode 100644 index 00000000000..1b1b5e4c1de --- /dev/null +++ b/meta-openeuler/recipes-filter/libetonyek/libetonyek_0.1.9.bb @@ -0,0 +1,15 @@ +SUMMARY = "A library for import of import of Apple iWork documents" +HOMEPAGE = "http://wiki.documentfoundation.org/DLP/Libraries/libetonyek" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad" + +SRC_URI = " \ + http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-Fix-build-with-gcc-10.patch \ +" +SRC_URI[md5sum] = "b891c14c5233f93fb7db052b5762a692" +SRC_URI[sha256sum] = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a" + +inherit autotools pkgconfig + +DEPENDS = "glm icu lcms libxml2 librevenge liblangtag mdds-1.2" -- Gitee From 1598cd3abf3146fdd879c4a2741b8398ae2397ee Mon Sep 17 00:00:00 2001 From: zhang_wenyu1 Date: Tue, 26 Nov 2024 16:23:58 +0800 Subject: [PATCH 5/6] librevenge: add recipe for librevenge and modify manifest.yaml 1. add recipe for librevenge 2. modify manifest.yaml Signed-off-by: zhang_wenyu --- .oebuild/manifest.yaml | 3 + .../files/0001-Fix-build-with-gcc8.patch | 57 +++++++++++++++++++ .../librevenge/librevenge_%.bbappend | 4 ++ .../librevenge/librevenge_0.0.4.bb | 21 +++++++ 4 files changed, 85 insertions(+) create mode 100644 meta-openeuler/recipes-support/librevenge/files/0001-Fix-build-with-gcc8.patch create mode 100644 meta-openeuler/recipes-support/librevenge/librevenge_%.bbappend create mode 100644 meta-openeuler/recipes-support/librevenge/librevenge_0.0.4.bb diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 4d60a925cbf..0e48f645204 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -2220,3 +2220,6 @@ manifest_list: libetonyek: remote_url: https://gitee.com/src-openeuler/libetonyek.git version: 6f5295c7e95407380346132957f79f66efb0111b + librevenge: + remote_url: https://gitee.com/src-openeuler/librevenge.git + version: 8b0bc08266c21e7c7493a63ef86efea1f4fdedfa diff --git a/meta-openeuler/recipes-support/librevenge/files/0001-Fix-build-with-gcc8.patch b/meta-openeuler/recipes-support/librevenge/files/0001-Fix-build-with-gcc8.patch new file mode 100644 index 00000000000..b5c553859e0 --- /dev/null +++ b/meta-openeuler/recipes-support/librevenge/files/0001-Fix-build-with-gcc8.patch @@ -0,0 +1,57 @@ +From 090c85c00f9985f67000cf4d6a9544ce4c30ca43 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 2 Jul 2018 14:18:37 +0200 +Subject: [PATCH] Fix build with gcc8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/lib/RVNGHTMLTextTableStyle.cpp | 2 +- + src/lib/RVNGHTMLTextTextStyle.cpp | 2 +- + src/lib/RVNGZipStream.cpp | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/lib/RVNGHTMLTextTableStyle.cpp b/src/lib/RVNGHTMLTextTableStyle.cpp +index 719ec6a..cca62c8 100644 +--- a/src/lib/RVNGHTMLTextTableStyle.cpp ++++ b/src/lib/RVNGHTMLTextTableStyle.cpp +@@ -169,7 +169,7 @@ std::string RVNGHTMLTextTableStyleManager::getCellContent(RVNGPropertyList const + if (pList["fo:background-color"]) + s << "\tbackground-color:" << pList["fo:background-color"]->getStr().cstr() << ";\n"; + +- static char const *(type[]) = {"border", "border-left", "border-top", "border-right", "border-bottom" }; ++ static char const *type[] = {"border", "border-left", "border-top", "border-right", "border-bottom" }; + for (int i = 0; i < 5; i++) + { + std::string field("fo:"); +diff --git a/src/lib/RVNGHTMLTextTextStyle.cpp b/src/lib/RVNGHTMLTextTextStyle.cpp +index 5dc7d62..1622572 100644 +--- a/src/lib/RVNGHTMLTextTextStyle.cpp ++++ b/src/lib/RVNGHTMLTextTextStyle.cpp +@@ -281,7 +281,7 @@ std::string RVNGHTMLTextParagraphStyleManager::getContent(RVNGPropertyList const + + void RVNGHTMLTextParagraphStyleManager::parseBorders(RVNGPropertyList const &pList, std::ostream &out) const + { +- static char const *(type[]) = {"border", "border-left", "border-top", "border-right", "border-bottom" }; ++ static char const *type[] = {"border", "border-left", "border-top", "border-right", "border-bottom" }; + for (int i = 0; i < 5; i++) + { + std::string field("fo:"); +diff --git a/src/lib/RVNGZipStream.cpp b/src/lib/RVNGZipStream.cpp +index b15eac5..42be5eb 100644 +--- a/src/lib/RVNGZipStream.cpp ++++ b/src/lib/RVNGZipStream.cpp +@@ -478,6 +478,7 @@ RVNGInputStream *RVNGZipStream::getSubstream(RVNGInputStream *input, const char + // TODO: return partial result on Z_BUF_ERROR/Z_DATA_ERROR? + default: + data.clear(); ++ __attribute__((fallthrough)); + // fall-through intended + case Z_STREAM_END: + done = true; +-- +2.14.4 diff --git a/meta-openeuler/recipes-support/librevenge/librevenge_%.bbappend b/meta-openeuler/recipes-support/librevenge/librevenge_%.bbappend new file mode 100644 index 00000000000..40efdae6d54 --- /dev/null +++ b/meta-openeuler/recipes-support/librevenge/librevenge_%.bbappend @@ -0,0 +1,4 @@ +# source bb: yocto-meta-openeuler/meta-openeuler/recipes-support/librevenge/librevenge_0.0.4.bb +SRC_URI:prepend = " \ + file://${BPN}-${PV}.tar.xz \ +" diff --git a/meta-openeuler/recipes-support/librevenge/librevenge_0.0.4.bb b/meta-openeuler/recipes-support/librevenge/librevenge_0.0.4.bb new file mode 100644 index 00000000000..5fecdf4b656 --- /dev/null +++ b/meta-openeuler/recipes-support/librevenge/librevenge_0.0.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "library for REVerses ENGineered formats filters" +HOMEPAGE = "http://sf.net/p/libwpd/librevenge/" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = " \ + file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \ +" + +SRC_URI = " \ + http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2 \ + file://0001-Fix-build-with-gcc8.patch \ +" +SRC_URI[md5sum] = "5b9ac52ec77d4d19157cf5962ebc0aea" +SRC_URI[sha256sum] = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf" + +inherit autotools pkgconfig + +DEPENDS = "cppunit zlib boost" + +do_install:append() { + sed -i '/^Libs:/ s/$/ -lboost_system/' ${D}${libdir}/pkgconfig/librevenge-0.0.pc +} -- Gitee From 50086d2eb253b66dafe36c5d5d58212c2ae08f85 Mon Sep 17 00:00:00 2001 From: zhang_wenyu1 Date: Tue, 26 Nov 2024 16:37:14 +0800 Subject: [PATCH 6/6] liblangtag: add recipe for liblangtag and modify manifest.yaml 1. add recipe for liblangtag 2. modify manifest.yaml Signed-off-by: zhang_wenyu --- .oebuild/manifest.yaml | 3 ++ ...add-missing-HAVE_INTROSPECTION-check.patch | 30 +++++++++++++++++++ ...ove-untranslated-AX_CHECK_ENABLE_DEB.patch | 30 +++++++++++++++++++ .../liblangtag/liblangtag_%.bbappend | 15 ++++++++++ .../liblangtag/liblangtag_0.6.3.bb | 21 +++++++++++++ 5 files changed, 99 insertions(+) create mode 100644 meta-openeuler/recipes-support/liblangtag/files/0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch create mode 100644 meta-openeuler/recipes-support/liblangtag/files/0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch create mode 100644 meta-openeuler/recipes-support/liblangtag/liblangtag_%.bbappend create mode 100644 meta-openeuler/recipes-support/liblangtag/liblangtag_0.6.3.bb diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index 0e48f645204..dface26b28e 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -2223,3 +2223,6 @@ manifest_list: librevenge: remote_url: https://gitee.com/src-openeuler/librevenge.git version: 8b0bc08266c21e7c7493a63ef86efea1f4fdedfa + liblangtag: + remote_url: https://gitee.com/src-openeuler/liblangtag.git + version: 335ff8f5ebc901e4be675f485ae05957afc91068 diff --git a/meta-openeuler/recipes-support/liblangtag/files/0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch b/meta-openeuler/recipes-support/liblangtag/files/0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch new file mode 100644 index 00000000000..0ecb6808d90 --- /dev/null +++ b/meta-openeuler/recipes-support/liblangtag/files/0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch @@ -0,0 +1,30 @@ +From 1da0e92dfee9d3ecaad6dc7aabf1a3bc466cb314 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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 diff --git a/meta-openeuler/recipes-support/liblangtag/files/0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch b/meta-openeuler/recipes-support/liblangtag/files/0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch new file mode 100644 index 00000000000..3001db0d751 --- /dev/null +++ b/meta-openeuler/recipes-support/liblangtag/files/0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch @@ -0,0 +1,30 @@ +From 0efc6ebe13ec12599ba05c587e58fb249d569f6c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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 diff --git a/meta-openeuler/recipes-support/liblangtag/liblangtag_%.bbappend b/meta-openeuler/recipes-support/liblangtag/liblangtag_%.bbappend new file mode 100644 index 00000000000..57843bbd492 --- /dev/null +++ b/meta-openeuler/recipes-support/liblangtag/liblangtag_%.bbappend @@ -0,0 +1,15 @@ +# source bb: yocto-meta-openeuler/meta-openeuler/recipes-support/liblangtag/liblangtag_0.6.3.bb +PV = "0.6.4" + +SRC_URI:remove = " \ + file://0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch \ + file://0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch \ +" + +SRC_URI:prepend = " \ + file://${BPN}-${PV}.tar.bz2 \ + file://liblangtag-noparallel-gir.patch \ + file://0001-ro-MD-ro-to-get-make-check-to-succeed.patch \ +" + +SRC_URI[sha256sum] = "5701062c17d3e73ddaa49956cbfa5d47d2f8221988dec561c0af2118c1c8a564" diff --git a/meta-openeuler/recipes-support/liblangtag/liblangtag_0.6.3.bb b/meta-openeuler/recipes-support/liblangtag/liblangtag_0.6.3.bb new file mode 100644 index 00000000000..83cf627f60d --- /dev/null +++ b/meta-openeuler/recipes-support/liblangtag/liblangtag_0.6.3.bb @@ -0,0 +1,21 @@ +SUMMARY = "An interface library to access tags for identifying languages" +HOMEPAGE = "http://tagoh.bitbucket.org/liblangtag/" +LICENSE = "LGPL-3.0-only" +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 \ +" +SRC_URI[sha256sum] = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd" + +inherit autotools pkgconfig gobject-introspection + +export GIR_EXTRA_LIBS_PATH="${B}/liblangtag/.libs" + +BBCLASSEXTEND = "native" -- Gitee