https://bugs.kde.org/show_bug.cgi?id=429103

--- Comment #29 from caulier.gil...@gmail.com ---
Git commit e396fae4584cfae0fe99d859cf863f4bb631489a by Gilles Caulier.
Committed on 06/12/2020 at 16:09.
Pushed by cgilles into branch 'master'.

MacOS BigSur support: add patch to bild KF5.76 under Macports, where onlt Qt
5.14.2 is available for the moment.

M  +1    -1    project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
A  +14   -0   
project/bundles/3rdparty/ext_kf5_frameworks/kiconthemes-qt5.14.patch

https://invent.kde.org/graphics/digikam/commit/e396fae4584cfae0fe99d859cf863f4bb631489a

diff --git a/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
b/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
index db275d67b6..47483c2cbd 100755
--- a/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_kf5_frameworks/CMakeLists.txt
@@ -228,7 +228,7 @@ InstallKF5Component(kwidgetsaddons      ${KF5_VERSION} ""
 InstallKF5Component(kitemviews          ${KF5_VERSION} ""                     
                                             "")
 InstallKF5Component(kcompletion         ${KF5_VERSION} ""                     
                                             "")
 InstallKF5Component(kconfigwidgets      ${KF5_VERSION} ""                     
                                             "")
-InstallKF5Component(kiconthemes         ${KF5_VERSION} ""                     
                                             "")
+InstallKF5Component(kiconthemes         ${KF5_VERSION} ""                     
                                             "kiconthemes-qt5.14.patch")
 InstallKF5Component(kservice            ${KF5_VERSION} ""                     
                                             "")
 InstallKF5Component(kglobalaccel        ${KF5_VERSION} ""                     
                                             "")
 InstallKF5Component(kcalendarcore       ${KF5_VERSION} ""                     
                                             "")
diff --git
a/project/bundles/3rdparty/ext_kf5_frameworks/kiconthemes-qt5.14.patch
b/project/bundles/3rdparty/ext_kf5_frameworks/kiconthemes-qt5.14.patch
new file mode 100644
index 0000000000..9ecd6b2d46
--- /dev/null
+++ b/project/bundles/3rdparty/ext_kf5_frameworks/kiconthemes-qt5.14.patch
@@ -0,0 +1,14 @@
+diff --git a/src/tools/ksvg2icns/ksvg2icns.cpp
b/src/tools/ksvg2icns/ksvg2icns.cpp
+index 08a7805..b217f84 100644
+--- a/src/tools/ksvg2icns/ksvg2icns.cpp
++++ b/src/tools/ksvg2icns/ksvg2icns.cpp
+@@ -35,7 +35,9 @@ static bool writeImage(QSvgRenderer &svg, int size, const
QString &outFile1, con
+     out.fill(Qt::transparent);
+
+     QPainter painter(&out);
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+     svg.setAspectRatioMode(Qt::KeepAspectRatio);
++#endif
+     svg.render(&painter);
+     painter.end();
+

-- 
You are receiving this mail because:
You are watching all bug changes.

Reply via email to