[gentoo-commits] repo/gentoo:master commit in: app-text/crengine-ng/files/, app-text/crengine-ng/
commit: 1f900c793171831a395e9aa608ef9812933f8e93 Author: Andrey Grozin gentoo org> AuthorDate: Fri Feb 17 13:40:46 2023 + Commit: Andrey Grozin gentoo org> CommitDate: Fri Feb 17 13:40:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f900c79 app-text/crengine-ng: remove old version Signed-off-by: Andrey Grozin gentoo.org> app-text/crengine-ng/Manifest | 1 - app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild | 60 -- app-text/crengine-ng/files/crengine-ng-0.9.4.patch | 55 3 files changed, 116 deletions(-) diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest index f88a6bc96aaf..7fdc7ee16a25 100644 --- a/app-text/crengine-ng/Manifest +++ b/app-text/crengine-ng/Manifest @@ -1,2 +1 @@ -DIST crengine-ng-0.9.4.tar.bz2 3566778 BLAKE2B ded7b6b620ad8d24c65d45b166b08b3f74f1d68d67920e7ba9665570e3fef9d9bee9032e683ad8b0eab31fb12bc2ac03390e9ef0cd46702f28c78d5aff54a728 SHA512 491046d44088842a454c58ba71a2b5ce69e4692e4d1e16f082c096936f776c6ea9fd70ae93251348cff36ed46e5ad7991cc64099c5f313acb17e35ca08ea2698 DIST crengine-ng-0.9.7.tar.bz2 3594561 BLAKE2B 65adf26be6198a29c26a506e5e00dde809a6bd9371e7f226ca954a89e0dfc68f314891f9e060a3055e5313673c266a26954353479f486abcf1bb87951202f64c SHA512 94775722f8ff3680c36278e2cecd864b5e3f9de7940aa0e681b683cc5136c8098650e495c3f0729af187839e45d6409993fdc2fc2738250cacd406f2540fdc31 diff --git a/app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild b/app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild deleted file mode 100644 index 75782c9ba4db.. --- a/app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit cmake - -DESCRIPTION="Cross-platform library designed to implement e-book readers" -HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng; -SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs" - -CDEPEND="sys-libs/zlib - png? ( media-libs/libpng:0 ) - jpeg? ( media-libs/libjpeg-turbo ) - >=media-libs/freetype-2.10.0 - harfbuzz? ( media-libs/harfbuzz:= ) - libunibreak? ( dev-libs/libunibreak:= ) - fribidi? ( dev-libs/fribidi ) - zstd? ( app-arch/zstd:= ) - libutf8proc? ( dev-libs/libutf8proc:= ) - fontconfig? ( media-libs/fontconfig )" - -RDEPEND="${CDEPEND}" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - ${CDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}.patch ) - -src_configure() { - CMAKE_USE_DIR="${S}" - CMAKE_BUILD_TYPE="Release" - local mycmakeargs=( - -DCRE_BUILD_SHARED=ON - -DCRE_BUILD_STATIC=$(usex static-libs) - -DUSE_COLOR_BACKBUFFER=ON - -DWITH_LIBPNG=$(usex png) - -DWITH_LIBJPEG=$(usex jpeg) - -DWITH_FREETYPE=ON - -DWITH_HARFBUZZ=$(usex harfbuzz) - -DWITH_LIBUNIBREAK=$(usex libunibreak) - -DWITH_FRIBIDI=$(usex fribidi) - -DWITH_ZSTD=$(usex zstd) - -DWITH_UTF8PROC=$(usex libutf8proc) - -DUSE_GIF=$(usex gif) - -DUSE_NANOSVG=$(usex svg) - -DUSE_CHM=$(usex chm) - -DUSE_ANTIWORD=ON - -DUSE_FONTCONFIG=$(usex fontconfig) - -DUSE_SHASUM=OFF - -DBUILD_TOOLS=OFF - -DENABLE_UNITTESTING=OFF - -DENABLE_LTO=$(usex lto) - ) - cmake_src_configure -} diff --git a/app-text/crengine-ng/files/crengine-ng-0.9.4.patch b/app-text/crengine-ng/files/crengine-ng-0.9.4.patch deleted file mode 100644 index 227071816d5b.. --- a/app-text/crengine-ng/files/crengine-ng-0.9.4.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 62106833d4e8af5325ed7a55c7a897e43a52bb20 Mon Sep 17 00:00:00 2001 -From: Aleksey Chernov -Date: Sun, 1 Jan 2023 09:55:04 +0400 -Subject: [PATCH] Compile warnings/errors fixed: `strcasecmp` missing - prototype. - - thirdparty/antiword/antiword.h | 3 +++ - thirdparty/chmlib/src/chm_lib.c | 6 +- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/thirdparty/antiword/antiword.h b/thirdparty/antiword/antiword.h -index e6f4d68f..0abce7af 100644 a/thirdparty/antiword/antiword.h -+++ b/thirdparty/antiword/antiword.h -@@ -31,6 +31,9 @@ - #else - #include - #endif /* __riscos */ -+#include -+#include -+ - #include "wordconst.h" - #include "wordtypes.h" - #include "fail.h" -diff --git a/thirdparty/chmlib/src/chm_lib.c b/thirdparty/chmlib/src/chm_lib.c -index 637a32b2..2e26db1e 100644 a/thirdparty/chmlib/src/chm_lib.c -+++ b/thirdparty/chmlib/src/chm_lib.c -@@ -59,6 +59,7 @@ - #include - #include - #include
[gentoo-commits] repo/gentoo:master commit in: app-text/crengine-ng/files/, app-text/crengine-ng/
commit: 09803522a2796b647f85a4aaa4e877792fefccf5 Author: Andrey Grozin gentoo org> AuthorDate: Tue Jan 3 10:42:58 2023 + Commit: Andrey Grozin gentoo org> CommitDate: Tue Jan 3 10:42:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09803522 app-text/crengine-ng: compilation fixes Closes: https://bugs.gentoo.org/889078 Signed-off-by: Andrey Grozin gentoo.org> app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild | 60 ++ app-text/crengine-ng/files/crengine-ng-0.9.4.patch | 55 2 files changed, 115 insertions(+) diff --git a/app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild b/app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild new file mode 100644 index ..75782c9ba4db --- /dev/null +++ b/app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit cmake + +DESCRIPTION="Cross-platform library designed to implement e-book readers" +HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng; +SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs" + +CDEPEND="sys-libs/zlib + png? ( media-libs/libpng:0 ) + jpeg? ( media-libs/libjpeg-turbo ) + >=media-libs/freetype-2.10.0 + harfbuzz? ( media-libs/harfbuzz:= ) + libunibreak? ( dev-libs/libunibreak:= ) + fribidi? ( dev-libs/fribidi ) + zstd? ( app-arch/zstd:= ) + libutf8proc? ( dev-libs/libutf8proc:= ) + fontconfig? ( media-libs/fontconfig )" + +RDEPEND="${CDEPEND}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + ${CDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}.patch ) + +src_configure() { + CMAKE_USE_DIR="${S}" + CMAKE_BUILD_TYPE="Release" + local mycmakeargs=( + -DCRE_BUILD_SHARED=ON + -DCRE_BUILD_STATIC=$(usex static-libs) + -DUSE_COLOR_BACKBUFFER=ON + -DWITH_LIBPNG=$(usex png) + -DWITH_LIBJPEG=$(usex jpeg) + -DWITH_FREETYPE=ON + -DWITH_HARFBUZZ=$(usex harfbuzz) + -DWITH_LIBUNIBREAK=$(usex libunibreak) + -DWITH_FRIBIDI=$(usex fribidi) + -DWITH_ZSTD=$(usex zstd) + -DWITH_UTF8PROC=$(usex libutf8proc) + -DUSE_GIF=$(usex gif) + -DUSE_NANOSVG=$(usex svg) + -DUSE_CHM=$(usex chm) + -DUSE_ANTIWORD=ON + -DUSE_FONTCONFIG=$(usex fontconfig) + -DUSE_SHASUM=OFF + -DBUILD_TOOLS=OFF + -DENABLE_UNITTESTING=OFF + -DENABLE_LTO=$(usex lto) + ) + cmake_src_configure +} diff --git a/app-text/crengine-ng/files/crengine-ng-0.9.4.patch b/app-text/crengine-ng/files/crengine-ng-0.9.4.patch new file mode 100644 index ..227071816d5b --- /dev/null +++ b/app-text/crengine-ng/files/crengine-ng-0.9.4.patch @@ -0,0 +1,55 @@ +From 62106833d4e8af5325ed7a55c7a897e43a52bb20 Mon Sep 17 00:00:00 2001 +From: Aleksey Chernov +Date: Sun, 1 Jan 2023 09:55:04 +0400 +Subject: [PATCH] Compile warnings/errors fixed: `strcasecmp` missing + prototype. + +--- + thirdparty/antiword/antiword.h | 3 +++ + thirdparty/chmlib/src/chm_lib.c | 6 +- + 2 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/thirdparty/antiword/antiword.h b/thirdparty/antiword/antiword.h +index e6f4d68f..0abce7af 100644 +--- a/thirdparty/antiword/antiword.h b/thirdparty/antiword/antiword.h +@@ -31,6 +31,9 @@ + #else + #include + #endif /* __riscos */ ++#include ++#include ++ + #include "wordconst.h" + #include "wordtypes.h" + #include "fail.h" +diff --git a/thirdparty/chmlib/src/chm_lib.c b/thirdparty/chmlib/src/chm_lib.c +index 637a32b2..2e26db1e 100644 +--- a/thirdparty/chmlib/src/chm_lib.c b/thirdparty/chmlib/src/chm_lib.c +@@ -59,6 +59,7 @@ + #include + #include + #include ++#include + #ifdef CHM_DEBUG + #include + #endif +@@ -70,14 +71,9 @@ + #ifdef WIN32 + #include + #include +-#ifdef _WIN32_WCE + #define strcasecmp _stricmp + #define strncasecmp _strnicmp + #else +-#define strcasecmp _stricmp +-#define strncasecmp _strnicmp +-#endif +-#else + /* basic Linux system includes */ + #define _XOPEN_SOURCE 500 + #include +-- +2.37.4 +