<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/223ca402be3ee7746aa660d707f69edad0804970">https://github.com/macports/macports-ports/commit/223ca402be3ee7746aa660d707f69edad0804970</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 223ca402be3ee7746aa660d707f69edad0804970
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sun Jul 14 15:08:31 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> gwenview: fix the build
</span>---
kde/gwenview/Portfile | 14 ++++--
kde/gwenview/files/patch-exiv2.diff | 73 +++++++++++++++++++++++++++++++
kde/gwenview/files/patch-fexceptions.diff | 12 +++++
3 files changed, 96 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/gwenview/Portfile b/kde/gwenview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ea9ff93791..e72349bd9cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/gwenview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/gwenview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup kde4 1.1
</span>
name gwenview
version 4.14.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</span> categories kde kde4
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +19,8 @@ checksums rmd160 493754167864154be07772bc85be168fb5a2b755 \
</span> sha256 2032d18bc20ea490f3d1298e015ffac2a7b96eb7a76c02578df0713c1ab427a0 \
size 2910652
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#Binaries do not link directly to openssl, nor use the ssl backend of kdelibs4,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#nor links to libkimap or libmailtransport from kdepimlibs4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Binaries do not link directly to openssl, nor use the ssl backend of kdelibs4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# nor links to libkimap or libmailtransport from kdepimlibs4
</span> license_noconflict openssl
depends_lib-append port:exiv2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,14 @@ depends_lib-append port:exiv2 \
</span>
patchfiles patch-fileutils.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# /opt/local/include/exiv2/slice.hpp: error: exception handling disabled, use -fexceptions to enable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fexceptions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-exiv2.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # kde4-baseapps is not universal
universal_variant no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/gwenview/files/patch-exiv2.diff b/kde/gwenview/files/patch-exiv2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..39e6440b1a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/gwenview/files/patch-exiv2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,73 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/exiv2imageloader.cpp 2014-09-30 17:11:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/exiv2imageloader.cpp 2024-07-14 14:12:10.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,17 +57,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d->mImage = Exiv2::ImageFactory::open((unsigned char*)data.constData(), data.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d->mImage->readMetadata();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0, 14, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // For some unknown reason, trying to catch Exiv2::Error fails with Exiv2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // >=0.14. For now, just catch std::exception. I would welcome any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // explanation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } catch (const std::exception& error) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d->mErrorMessage = error.what();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // In libexiv2 0.12, Exiv2::Error::what() returns an std::string.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } catch (const Exiv2::Error& error) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d->mErrorMessage = error.what().c_str();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/imagemetainfomodel.cpp 2014-09-30 17:11:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/imagemetainfomodel.cpp 2024-07-14 14:13:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,7 +280,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hash.insert(key, new MetaInfoGroup::Entry(key, label, value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } catch (const Exiv2::Error& error) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } catch (const std::exception& error) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kWarning() << "Failed to read some meta info:" << error.what();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/timeutils.cpp 2014-09-30 17:11:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/timeutils.cpp 2024-07-14 14:25:02.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +125,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ realTime = dt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } catch (const Exiv2::Error& error) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } catch (const std::exception& error) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kWarning() << "Failed to read date from exif header of" << path << ". Error:" << error.what();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/jpegcontent.cpp 2014-09-30 17:11:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/jpegcontent.cpp 2024-07-14 14:22:28.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -540,12 +540,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QImage image;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!d->mExifData.empty()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if(EXIV2_TEST_VERSION(0,17,91))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exiv2::ExifThumbC thumb(d->mExifData);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exiv2::DataBuf thumbnail = thumb.copy();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image.loadFromData(thumbnail.pData_, thumbnail.size_);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return image;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -566,12 +562,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (EXIV2_TEST_VERSION(0,17,91))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Exiv2::ExifThumb thumb(d->mExifData);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thumb.setJpegThumbnail((unsigned char*)array.data(), array.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool JpegContent::save(const QString& path)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/gwenview/files/patch-fexceptions.diff b/kde/gwenview/files/patch-fexceptions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ce55c285f6c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/gwenview/files/patch-fexceptions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt 2014-09-30 17:11:42.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-07-14 13:59:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,6 +84,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++string(REGEX REPLACE "-fno-exceptions -DQT_NO_EXCEPTIONS" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## dirs to build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(app)
</span></pre><pre style='margin:0'>
</pre>