From 5aede38e7304fc5c3bd8a2034b25758b15a19fa0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Jan 2023 14:26:22 +0000 Subject: gentoo auto-resync : 03:01:2023 - 14:26:21 --- app-text/Manifest.gz | Bin 49095 -> 49099 bytes app-text/coolreader/Manifest | 2 +- app-text/coolreader/coolreader-3.2.59-r3.ebuild | 71 ------------------ app-text/coolreader/coolreader-3.2.59-r4.ebuild | 71 ++++++++++++++++++ app-text/crengine-ng/Manifest | 3 +- app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild | 60 ++++++++++++++++ app-text/crengine-ng/crengine-ng-0.9.4.ebuild | 58 --------------- app-text/crengine-ng/files/crengine-ng-0.9.4.patch | 55 ++++++++++++++ app-text/crwx-ng/Manifest | 3 +- app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild | 21 ------ app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild | 23 ++++++ app-text/crwx-ng/files/crwx-ng-0.2.0.patch | 62 ++++++++++++++++ app-text/hunspell/Manifest | 3 - .../files/hunspell-1.7.0-CVE-2019-16707.patch | 22 ------ app-text/hunspell/hunspell-1.7.0-r2.ebuild | 80 --------------------- 15 files changed, 276 insertions(+), 258 deletions(-) delete mode 100644 app-text/coolreader/coolreader-3.2.59-r3.ebuild create mode 100644 app-text/coolreader/coolreader-3.2.59-r4.ebuild create mode 100644 app-text/crengine-ng/crengine-ng-0.9.4-r1.ebuild delete mode 100644 app-text/crengine-ng/crengine-ng-0.9.4.ebuild create mode 100644 app-text/crengine-ng/files/crengine-ng-0.9.4.patch delete mode 100644 app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild create mode 100644 app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild create mode 100644 app-text/crwx-ng/files/crwx-ng-0.2.0.patch delete mode 100644 app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch delete mode 100644 app-text/hunspell/hunspell-1.7.0-r2.ebuild (limited to 'app-text') diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz index 10ec703553ee..695b1518d111 100644 Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest index afdbc19a06b8..efb20d3b2989 100644 --- a/app-text/coolreader/Manifest +++ b/app-text/coolreader/Manifest @@ -1,4 +1,4 @@ AUX coolreader-wxwidgets.patch 3660 BLAKE2B f7f736e0b9aedffe80f8327e0e0090439bdb529dd4d3e69e9b60c77e815e53d3d9ced76442c174f180362a9a198133e12bd486c4fea139ee07066f2d424b20d9 SHA512 f33f90b9a7254dc20c42218e6fd6781ebbdef988b1c758748197b71a9fdb62e02cc3ce8bb465b9c462d5dc61e5cdcebc523110e1172d3208853bb0291d8017f7 DIST coolreader-3.2.59.tar.gz 13596218 BLAKE2B a59d11aff93166de77add5d230539068172a81968414b9c38b6ca25f08bd7830b81c0b800055a4eefbd6bb1be94298bf74d240f981c928bd4514073d943bb33d SHA512 72fc05814ca4f6da5310f7b47fd7939bc1567e5dd7e7e75bc29e2b1436dc4901498622a770e89323581c3f0b3b9ec305050ca5917eceba4df4a07cff3e1748d6 -EBUILD coolreader-3.2.59-r3.ebuild 1936 BLAKE2B baf00032edc67c6e55938f111f9a86a5e1ecdc91853aa112eb5d68349ae0f2aa762fc2f9a5c192e42e5db4c4ed01142d11d73dca726fe5656e5d4028ac24721c SHA512 750b6576878ca62ceaf0e5cfbcb340f096c28d55b4862e081e812e3166e39dcd80c8996cfe0c7f6c7cddf268142d49ba98a4df27d9015fe99eab95892afcf069 +EBUILD coolreader-3.2.59-r4.ebuild 1949 BLAKE2B cec3bb701c3dd88a74405db4bda1b99715e9ae0fdbaeee9a9f571183914ee644623c48905985123ed00191478443ac012c4b242057c78f91616e26b4b6d00325 SHA512 227a8cc175bbb11eaf98fc9ddbf32c7f8ef81defb2edcbf1075f5843e3ac2a32d4a9fb4542aa7dc5c30b845b1ccafcf01f7ed6cd9560e67fe1dc371b80814199 MISC metadata.xml 630 BLAKE2B e179265deb3518a96cea13ec64fb83105edd9475bd6c9c47462e804d3f1ab3b4bfdc3b1f8911d1724a11f667d74fa506877e9e7340e5b6565702e8479cf71982 SHA512 b7eed2a628b86440649977391e0fb18ba3422b66f54a46ec60ab39cb9f4ed997b8efeae51c2efadb152d93841d05ff3c00303269a7368e93c0bf2d55d2b1645e diff --git a/app-text/coolreader/coolreader-3.2.59-r3.ebuild b/app-text/coolreader/coolreader-3.2.59-r3.ebuild deleted file mode 100644 index f2788c70a0f7..000000000000 --- a/app-text/coolreader/coolreader-3.2.59-r3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0-gtk3" -PLOCALES="bg cs de es hu pl ru uk" -inherit cmake plocale wxwidgets xdg - -CR_PV=$(ver_rs 3 '-') -SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-cr${CR_PV}" - -DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)" -HOMEPAGE="https://github.com/buggins/coolreader/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="wxwidgets" - -CDEPEND="sys-libs/zlib - app-arch/zstd:= - media-libs/libpng:0 - virtual/jpeg:0 - media-libs/freetype - dev-libs/fribidi - media-libs/fontconfig - media-libs/harfbuzz:= - dev-libs/libunibreak:= - dev-libs/libutf8proc:= - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) - !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )" -BDEPEND="${CDEPEND} - !wxwidgets? ( dev-qt/linguist-tools:5 )" -RDEPEND="${CDEPEND} - wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )" - -PATCHES=( "${FILESDIR}"/${PN}-wxwidgets.patch ) - -src_prepare() { - cmake_src_prepare - xdg_environment_reset - - # locales - plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts' - sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \ - -i "${S}"/cr3qt/CMakeLists.txt \ - || die "sed CMakeLists.txt failed" -} - -src_configure() { - CMAKE_USE_DIR="${S}" - CMAKE_BUILD_TYPE="Release" - if use wxwidgets; then - setup-wxwidgets - local mycmakeargs=(-DGUI=WX) - else - local mycmakeargs=(-DGUI=QT5) - fi - cmake_src_configure -} - -src_install() { - cmake_src_install - if ! use wxwidgets; then - mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed" - rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed" - gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed" - gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed" - fi -} diff --git a/app-text/coolreader/coolreader-3.2.59-r4.ebuild b/app-text/coolreader/coolreader-3.2.59-r4.ebuild new file mode 100644 index 000000000000..9f5dcc61edec --- /dev/null +++ b/app-text/coolreader/coolreader-3.2.59-r4.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0-gtk3" +PLOCALES="bg cs de es hu pl ru uk" +inherit cmake plocale wxwidgets xdg + +CR_PV=$(ver_rs 3 '-') +SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-cr${CR_PV}" + +DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)" +HOMEPAGE="https://github.com/buggins/coolreader/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="wxwidgets" + +CDEPEND="sys-libs/zlib + app-arch/zstd:= + media-libs/libpng:0 + media-libs/libjpeg-turbo + media-libs/freetype + dev-libs/fribidi + media-libs/fontconfig + media-libs/harfbuzz:= + dev-libs/libunibreak:= + dev-libs/libutf8proc:= + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) + !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )" +BDEPEND="${CDEPEND} + !wxwidgets? ( dev-qt/linguist-tools:5 )" +RDEPEND="${CDEPEND} + wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )" + +PATCHES=( "${FILESDIR}"/${PN}-wxwidgets.patch ) + +src_prepare() { + cmake_src_prepare + xdg_environment_reset + + # locales + plocale_find_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts' + sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(plocale_get_locales))|" \ + -i "${S}"/cr3qt/CMakeLists.txt \ + || die "sed CMakeLists.txt failed" +} + +src_configure() { + CMAKE_USE_DIR="${S}" + CMAKE_BUILD_TYPE="Release" + if use wxwidgets; then + setup-wxwidgets + local mycmakeargs=(-DGUI=WX) + else + local mycmakeargs=(-DGUI=QT5) + fi + cmake_src_configure +} + +src_install() { + cmake_src_install + if ! use wxwidgets; then + mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed" + rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed" + gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed" + gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed" + fi +} diff --git a/app-text/crengine-ng/Manifest b/app-text/crengine-ng/Manifest index f1ec490fbbe0..00d103cb39bd 100644 --- a/app-text/crengine-ng/Manifest +++ b/app-text/crengine-ng/Manifest @@ -1,3 +1,4 @@ +AUX crengine-ng-0.9.4.patch 1408 BLAKE2B 8a770656dc7b08f7c10fc945beca7ae19a851aa5d1c4aaa25541e29bf6851ffdfb4ecb53e6325539f5318534fc369a78b84849941ee8d73842132228f7fcfbd4 SHA512 ec9cc3de6c4ff46118f2ada8db3f4064cc17bba0dbc3e4b3c876aa1c71aa7da1594a45c2a88d42474f06cfc4c02a504f1ee1edc4224e8e3c6bd541c78fde876d DIST crengine-ng-0.9.4.tar.bz2 3566778 BLAKE2B ded7b6b620ad8d24c65d45b166b08b3f74f1d68d67920e7ba9665570e3fef9d9bee9032e683ad8b0eab31fb12bc2ac03390e9ef0cd46702f28c78d5aff54a728 SHA512 491046d44088842a454c58ba71a2b5ce69e4692e4d1e16f082c096936f776c6ea9fd70ae93251348cff36ed46e5ad7991cc64099c5f313acb17e35ca08ea2698 -EBUILD crengine-ng-0.9.4.ebuild 1604 BLAKE2B 5a58df581a2e0c326601de20e766240b194f73a8f38c42b1de0783c36a2f36f2431fdacdfccea694bcf5a5c3c5c4abbb690ecdf4cef1aef63bc1b0ff7b86e3c4 SHA512 34ba53829325903c482e23b6c9b8c99f407bf30c1a2b618da60645508cc8f79dbc1172f08de041734b632a64443a8fb24c9e72aa6fbbddd321369244580f5b5c +EBUILD crengine-ng-0.9.4-r1.ebuild 1642 BLAKE2B dbb5573307b258e0a6ea961761365b85c5a5ffbd310cfeebe5efd779940d7a3c35162b35789343b92a02324024bd5e50410acb551cc75064e16d4ebde42b15af SHA512 b5f28f68bcd54f92924f9c78c2b962e5752e91b0b9ea2f10fcc41e1f55ebabf1a7b3890719d13bd5f3d2522e5992c5b871d84ce2efbefd6928f9674255e93125 MISC metadata.xml 1232 BLAKE2B ecb2f3ff8720e43b48f6e211da27f0f34d3123644a429cb7853ae4044761793f5137dfbeaa0962093f2b722fdcfb6e3bf9ad432835fa6fa3f5bbf5f7f7abd78c SHA512 6aa7904c0d002926d4223c46b31de30f5ab06dee8291909498ecaa6deed3a6b547cfaa40df1ad7dca7e74faa55e95ab4fe4fa4ac0698202b5dd0221a50288036 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 000000000000..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/crengine-ng-0.9.4.ebuild b/app-text/crengine-ng/crengine-ng-0.9.4.ebuild deleted file mode 100644 index f17cdaadf91a..000000000000 --- a/app-text/crengine-ng/crengine-ng-0.9.4.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 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}" - -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 000000000000..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 + diff --git a/app-text/crwx-ng/Manifest b/app-text/crwx-ng/Manifest index 9b93b0857d69..1e7f16a45d9e 100644 --- a/app-text/crwx-ng/Manifest +++ b/app-text/crwx-ng/Manifest @@ -1,3 +1,4 @@ +AUX crwx-ng-0.2.0.patch 3504 BLAKE2B 4ba842f9961f57fcd86f6423232fc401f2af07a1b5b77213716519d5e2a29b156d8f304b126249f2336abe60b7ac8ce13921d9f58aff1ce4efa70fdb06537ce0 SHA512 5370b9111efc9db9f493fdead16245b1b03eccd7e178f3ec9df6765893c743879c23f56ee700794e4dbab2dc15186714e598db335fb5a624b5cd096d8814df40 DIST crwx-ng-0.2.0.tar.bz2 364917 BLAKE2B f8d541fa479fe3102d495ba43ce51d256f55b9724844d26b89db8396f2cbf90680dd312ecc0c816ee50fb498c8b69ba69d0db73f9ee5dcefc9991e8077754171 SHA512 0890a6066fca7178b483749e946659a6e4304f13694601024fe500e9b79351f7170403b136407a831abe7a040f775dd34c02d9411814c136da68ee6b69e00a99 -EBUILD crwx-ng-0.2.0-r1.ebuild 659 BLAKE2B 4f72aaf3febe1eb286053c39009f1f6c4beeaf2ff55a6e7d09e48ec02d90db383e318241156f2ec00b994f00e88d83afecb25126c9f99f73cd07ef7e62b7bb0c SHA512 5156ebf18e2a6671cb2d637c60c6a148aac3df52c8112969b7710c329e349f4b20735ee94036d558ea4de9bad43a6c857b616bca6344118a2a3ba32646793991 +EBUILD crwx-ng-0.2.0-r2.ebuild 700 BLAKE2B 4e80d8ea6377434b6f99a49ed8a95f7cdde613ab5f1793fbe2b330549ba37fecc6d8c8565da32c81f8c4419ec5af56cd37b01bd56a07592ac904d8b569077a8b SHA512 09cc9b248a4a7265270f37232292f6b20835182b86fb651a6117028dfc164acb34665c0b95fc51667f487aecfc67ab8c7f75a6ac31570b89717a35c20c749744 MISC metadata.xml 1177 BLAKE2B d2d0af2338da64845775c14b66725abb760d84d267ca93a44f2ea679e0125f0cb1815ecd312da919ab1d9050f957c9e763ceeb817df7b48bac024b15ed292e96 SHA512 3bdc42749dff929ae4fdb6b9bd2c84eadbae352de4baacdd4f08572cd20d1f336dcd2d003b41bd79d56b3476026ba4d57d89331fe038592b8adaef60d03f34d7 diff --git a/app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild b/app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild deleted file mode 100644 index c3c0174eacf2..000000000000 --- a/app-text/crwx-ng/crwx-ng-0.2.0-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -WX_GTK_VER="3.0-gtk3" -inherit cmake wxwidgets - -DESCRIPTION="Cross-platform e-book reader" -HOMEPAGE="https://gitlab.com/coolreader-ng/crwx-ng" -SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc" - -CDEPEND=">=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] - x11-libs/wxGTK:${WX_GTK_VER}" -BDEPEND="${CDEPEND}" -RDEPEND="${CDEPEND} - virtual/ttf-fonts" diff --git a/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild b/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild new file mode 100644 index 000000000000..c362c9d43f6d --- /dev/null +++ b/app-text/crwx-ng/crwx-ng-0.2.0-r2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +WX_GTK_VER="3.0-gtk3" +inherit cmake wxwidgets + +DESCRIPTION="Cross-platform e-book reader" +HOMEPAGE="https://gitlab.com/coolreader-ng/crwx-ng" +SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc" + +CDEPEND=">=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=] + x11-libs/wxGTK:${WX_GTK_VER}[X]" +BDEPEND="${CDEPEND}" +RDEPEND="${CDEPEND} + virtual/ttf-fonts" + +PATCHES=( "${FILESDIR}"/${P}.patch ) diff --git a/app-text/crwx-ng/files/crwx-ng-0.2.0.patch b/app-text/crwx-ng/files/crwx-ng-0.2.0.patch new file mode 100644 index 000000000000..f754ceb88d0b --- /dev/null +++ b/app-text/crwx-ng/files/crwx-ng-0.2.0.patch @@ -0,0 +1,62 @@ +From 146f22a7c56a3402c75b4a51b8b1940144dfd9fd Mon Sep 17 00:00:00 2001 +From: Aleksey Chernov +Date: Tue, 27 Dec 2022 10:11:16 +0400 +Subject: [PATCH] Compile error/warn fixed. + +--- + src/cr3.cpp | 25 +++++++++++-------------- + 1 file changed, 11 insertions(+), 14 deletions(-) + +diff --git a/src/cr3.cpp b/src/cr3.cpp +index 19d5c4a..00e733b 100644 +--- a/src/cr3.cpp ++++ b/src/cr3.cpp +@@ -341,14 +341,17 @@ void testFormatting() { + LFormattedText txt; + void addLine(const lChar32* str, int flags, LVFontRef font) { + lString32 s(str); +- txt.AddSourceLine(s.c_str(), /* pointer to unicode text string */ +- s.length(), /* number of chars in text, 0 for auto(strlen) */ +- 0x000000, /* text color */ +- 0xFFFFFF, /* background color */ +- font.get(), /* font to draw string */ +- NULL, flags, 16, /* interline space, *16 (16=single, 32=double) */ +- 30, /* first line margin */ +- NULL, 0); ++ txt.AddSourceLine(s.c_str(), /* pointer to unicode text string */ ++ s.length(), /* number of chars in text, 0 for auto(strlen) */ ++ 0x000000, /* text color */ ++ 0xFFFFFF, /* background color */ ++ font.get(), /* font to draw string */ ++ NULL, /* pointer to text lang config */ ++ flags, /* flags */ ++ 16, /* line height in screen pixels; *16 (16=single, 32=double) */ ++ 0, /* drift y from baseline */ ++ 30, /* first line margin */ ++ NULL, 0, 0); + } + void dump() { + formatted_text_fragment_t* buf = txt.GetBuffer(); +@@ -1380,9 +1383,6 @@ void cr3Frame::OnFileOpen(wxCommandEvent& WXUNUSED(event)) { + wxT(""), //const wxString& defaultFile = "", + wxT("All supported files|*.fb2;*.fbz;*.txt;*.zip;*.rtf;*.epub;*.tcr;*.html;*.htm;*.shtml;*.xhtml|FictionBook files (*.fb2)|*.fb2;*.fbz|RTF files (*.rtf)|*.rtf|Text files (*.txt, *.tcr)|*.txt;*.tcr|HTML files|*.html;*.htm;*.shtml;*.xhtml|EPUB files (*.epub)|*.epub|ZIP archieves (*.zip)|*.zip"), //const wxString& wildcard = "*.*", + wxFD_OPEN | wxFD_FILE_MUST_EXIST //long style = wxFD_DEFAULT_STYLE, +- //const wxPoint& pos = wxDefaultPosition, +- //const wxSize& sz = wxDefaultSize, +- //const wxString& name = "filedlg" + ); + + if (dlg.ShowModal() == wxID_OK) { +@@ -1410,9 +1410,6 @@ void cr3Frame::OnFileSave(wxCommandEvent& WXUNUSED(event)) { + wxT(""), //const wxString& defaultFile = "", + wxT("Wolf EBook files (*.wol)|*.wol"), //const wxString& wildcard = "*.*", + wxFD_SAVE | wxFD_OVERWRITE_PROMPT //long style = wxFD_DEFAULT_STYLE, +- //const wxPoint& pos = wxDefaultPosition, +- //const wxSize& sz = wxDefaultSize, +- //const wxString& name = "filedlg" + ); + WolOptions opts(this); + if (dlg.ShowModal() == wxID_OK && opts.ShowModal() == wxID_OK) { +-- +2.38.2 + diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest index 5019bdb2c0b4..bc8a50533331 100644 --- a/app-text/hunspell/Manifest +++ b/app-text/hunspell/Manifest @@ -1,10 +1,7 @@ -AUX hunspell-1.7.0-CVE-2019-16707.patch 811 BLAKE2B 5adc2e6009a0381bbe6ea10a64fb8847b070a37eb7fd6858f2e5180a19f4aff9f8ce007c5a948c6caa3b0de8454f3f87953bbe2c18a2ea43aaea3504d4d3c460 SHA512 e7674819a9da4c3d742d34338d68d137d8613f97be2d25bf20db5219d4dd626f59a63ed4757b92f34307f499f2d687014065cdea97b55c98db295a8290300d2d AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48 -DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 DIST hunspell-1.7.1.tar.gz 1074306 BLAKE2B 55b82ece0ca73fb8823fc2efaafa25dd317fb62a3f593f582049244374b7c8254fa570f86909f93ae68bcf43a625db6eec74efa2669f360a0e634f2c24bc6121 SHA512 e177fadd39e89abf47c6cec7d12d1976d21af5c924fb62402433af202c07db50156cd9f60ceae44952b05740e76a98548afb7ac12b666a9fa170ef52e6f8e808 DIST hunspell-1.7.2.tar.gz 1536202 BLAKE2B dba8b2b505a040e3a4df488f702dafe4fd226271e67a68e1c1f9c953cc86dfa6f0049d205a8c6616b779d559b82cc8595bf2b4e86ed63e3b42cc9e20b1fecc18 SHA512 49b3619bff12e111b6cc3f3d9463612b116f9b2a976896718e65f5bc4a83ece11100aaf56a4d18127ea39107446c495e12affe5ff3c9159ae8aba70e512f44ac -EBUILD hunspell-1.7.0-r2.ebuild 2316 BLAKE2B f470ea41b0e9c2993eb68bc8351ca737e209d44db4f5af1f712980d7806238abe1172ed5d12c92b316be77ea67f52824df76d801b2af7dea056a83287cec0427 SHA512 08f2bf11f5e6130e476cf05429d59615aae37c726aa2033a2da13c6b9a7ce13436dce070025fe73e44f2f5b1e996b66e4475f6ade2c3f6b66225a5da18bfe52a EBUILD hunspell-1.7.1.ebuild 2265 BLAKE2B 68cc8b03df9eba1f4fcbb66063ecc49157cd1c30acf0cc4dd2e6eca03d8eaa1490009281f474670a777d4479e3b1c9f21ce8e17b364e5f3990c085992290b0e4 SHA512 97b9896e07c3e004af7ed252968b21da15a626ebd4e2ad08c4bea1da61638f9c3d16a5be924c339e1d7d3164f9d13067ad53834fe2d8ffa61b8c5f82b62c4826 EBUILD hunspell-1.7.2.ebuild 2272 BLAKE2B 5806405bc5a10fac6267ee5932daf4fce35518e26b7a194bfaf5eb7681d97d34eb2266676720bd6a13ca2e374f32cf42760fb5cd389d4b137c8ddbc0748ee5f3 SHA512 3fff22c1f38645c6880632904abdf1c7b1b1439162439877eda0cabeb4fd23b2c0349cff563bd70a21511fc18df343b70fb95edda1030dc215f05642ed61406c MISC metadata.xml 301 BLAKE2B b51f61b0ee48d57bc3cb55e7b82b28395877d7c5b4b715f1e79330da95cf6874c1361341a0ac85ab0ecdc1420b2046d278913571ed69604142cf0cd73181099b SHA512 c83f8543e28a964670c59474527d3866c941e211c60c14b23a2c950ac8b9fad35983af5303820ad96920931ddcc676c0d7201ede9fc56f1b41e7c63e15b8a261 diff --git a/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch b/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch deleted file mode 100644 index 649eef5b293d..000000000000 --- a/app-text/hunspell/files/hunspell-1.7.0-CVE-2019-16707.patch +++ /dev/null @@ -1,22 +0,0 @@ -From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 12 Nov 2019 20:03:15 +0000 -Subject: [PATCH] invalid read memory access #624 - ---- - src/hunspell/suggestmgr.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx -index dba084e9..c23f165a 100644 ---- a/src/hunspell/suggestmgr.cxx -+++ b/src/hunspell/suggestmgr.cxx -@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( - int l2 = su2.size(); - // decapitalize dictionary word - if (complexprefixes) { -- if (su1[l1 - 1] == su2[l2 - 1]) -+ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) - return 1; - } else { - unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild deleted file mode 100644 index 18d75871d37b..000000000000 --- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id is -it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu" -inherit autotools flag-o-matic - -DESCRIPTION="Spell checker, morphological analyzer library and command-line tool" -HOMEPAGE="https://hunspell.github.io/" -SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MPL-1.1 GPL-2 LGPL-2.1" -SLOT="0/$(ver_cut 1-2)" -IUSE="ncurses nls readline static-libs" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - ncurses? ( sys-libs/ncurses:0= ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/gettext" - -PDEPEND="" -for lang in ${LANGS}; do - IUSE+=" l10n_${lang}" - case ${lang} in - de-1901) dict="de_1901" ;; - pt-BR) dict="pt-br" ;; - *) dict="${lang}" ;; - esac - PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )" -done -unset dict lang LANGS - -DOCS=( AUTHORS ChangeLog NEWS THANKS license.{hunspell,myspell} README.md ) - -PATCHES=( - # Upstream package creates some executables which names are too generic - # to be placed in /usr/bin - this patch prefixes them with 'hunspell-'. - # It modifies a Makefile.am file, hence eautoreconf. - "${FILESDIR}/${PN}-1.7.0-renameexes.patch" - - "${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614 - "${FILESDIR}/${PN}-1.7.0-CVE-2019-16707.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # missing somehow, and I am too lazy to fix it properly - [[ ${CHOST} == *-darwin* ]] && append-libs -liconv - - # I wanted to put the include files in /usr/include/hunspell. - # You can do that, libreoffice can find them anywhere, just - # ping me when you do so ; -- scarabeus - local myeconfargs=( - $(use_enable nls) - $(use_with ncurses ui) - $(use_with readline readline) - $(use_enable static-libs static) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die - - #342449 - pushd "${ED}"/usr/$(get_libdir)/ >/dev/null - ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so} - popd >/dev/null -} -- cgit v1.2.3