diff options
| author | ormorph <roma251078@mail.ru> | 2024-08-08 09:37:27 +0300 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2024-08-08 13:33:40 +0200 |
| commit | 756e57be490cb6e885ad346553442508e17c9c2b (patch) | |
| tree | 27361bb8d098db3ec5580bce9827b6841b473768 | |
| parent | 97a3d6fa346ffac2fd8ecd4c000fa782b8e8df1c (diff) | |
| download | tde-packaging-gentoo-756e57be490cb6e885ad346553442508e17c9c2b.tar.gz tde-packaging-gentoo-756e57be490cb6e885ad346553442508e17c9c2b.zip | |
Adding c++-20 support for tdegraphics-tdefile-plugins-14.1.2
Solution to issue #386
Signed-off-by: ormorph <roma251078@mail.ru>
(cherry picked from commit d70bead1c9dfb76edd30a31e11d719400b912552)
2 files changed, 16 insertions, 0 deletions
diff --git a/trinity-base/tdegraphics-tdefile-plugins/files/tdegraphics-tdefile-plugins-poppler-cxx20.patch b/trinity-base/tdegraphics-tdefile-plugins/files/tdegraphics-tdefile-plugins-poppler-cxx20.patch new file mode 100755 index 00000000..48059864 --- /dev/null +++ b/trinity-base/tdegraphics-tdefile-plugins/files/tdegraphics-tdefile-plugins-poppler-cxx20.patch @@ -0,0 +1,12 @@ +--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake 2024-08-08 09:26:10.425644153 +0300 ++++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake 2024-08-08 09:26:47.997642582 +0300 +@@ -14,6 +14,8 @@ + math( EXPR POPPLER_VERSION_C "(${POPPLER_VERSION_MAJOR}*1000000) + (${POPPLER_VERSION_MINOR}*1000) + ${POPPLER_VERSION_PATCH}" ) + set( POPPLER_VERSION_C ${POPPLER_VERSION_C} CACHE INTERNAL "Poppler library version as code number" ) + +-if( NOT POPPLER_VERSION_C LESS 21012000 ) ++if( NOT POPPLER_VERSION_C LESS 24004000 ) ++ set( POPPLER_CXX_FEATURES cxx_std_20 CACHE INTERNAL "C++ standard required by Poppler" ) ++elseif( NOT POPPLER_VERSION_C LESS 21012000 ) + set( POPPLER_CXX_FEATURES cxx_std_17 CACHE INTERNAL "C++ standard required by Poppler" ) + endif() diff --git a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-14.1.2.ebuild b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-14.1.2.ebuild index 76836f2a..37dc9a2e 100644 --- a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-14.1.2.ebuild +++ b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-14.1.2.ebuild @@ -21,6 +21,10 @@ DEPEND=" pdf? ( app-text/poppler )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-poppler-cxx20.patch" +) + src_configure() { local mycmakeargs=( -DWITH_TIFF="$(usex tiff)" |