[packages/kde4-kdelibs] multiple build fixes

[atler]

commit aed5c1f5e840c435908c70f76c39ce966edefd8d
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Jan 18 15:55:05 2022 +0100

    multiple build fixes

 build.patch       | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 kde4-kdelibs.spec |  3 +++
 2 files changed, 71 insertions(+)
---
diff --git a/kde4-kdelibs.spec b/kde4-kdelibs.spec
index 4b9b9ce..916cf6b 100644
--- a/kde4-kdelibs.spec
+++ b/kde4-kdelibs.spec
@@ -32,6 +32,7 @@ Patch7:		strigi-64bit.patch
 Patch8:		%{name}-exiv2.patch
 Patch9:		%{name}-hunspell.patch
 Patch10:	%{name}-openssl-1.1.patch
+Patch11:	build.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	Qt3Support-devel >= %{qtver}
@@ -250,6 +251,7 @@ KDE.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %if "%{pld_release}" == "ti"
 sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp
@@ -261,6 +263,7 @@ sed -i -e 's#PLDLINUX_VERSION#PLD/3.0 (Th)#g' kio/kio/kprotocolmanager.cpp
 %build
 install -d build
 cd build
+export CXXFLAGS="%{rpmcppflags} %{rpmcxxflags} -std=c++14"
 %cmake .. \
 	-DASPELL_EXECUTABLE="%{_bindir}/aspell" \
 	-DCONFIG_INSTALL_DIR=%{_datadir}/config \
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..19c45b1
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,68 @@
+--- kdelibs-4.14.38/kdecore/localization/klocale_kde.cpp.orig	2017-11-05 02:51:22.000000000 +0100
++++ kdelibs-4.14.38/kdecore/localization/klocale_kde.cpp	2022-01-18 13:24:06.290688517 +0100
+@@ -2438,12 +2438,8 @@
+ 
+ bool KLocalePrivate::use12Clock() const
+ {
+-    if ((timeFormat().contains(QString::fromLatin1("%I")) > 0) ||
+-        (timeFormat().contains(QString::fromLatin1("%l")) > 0)) {
+-        return true;
+-    } else {
+-        return false;
+-    }
++    return timeFormat().contains(QString::fromLatin1("%I")) ||
++        timeFormat().contains(QString::fromLatin1("%l"));
+ }
+ 
+ void KLocalePrivate::setDayPeriods(const QList<KDayPeriod> &dayPeriods)
+--- kdelibs-4.14.38/kimgio/jp2.cpp.orig	2017-11-05 02:51:22.000000000 +0100
++++ kdelibs-4.14.38/kimgio/jp2.cpp	2022-01-18 13:25:01.453554790 +0100
+@@ -103,13 +103,13 @@
+         stream->bufmode_ |= bufmode & JAS_STREAM_BUFMODEMASK;
+ }
+ 
+-static int qiodevice_read(jas_stream_obj_t *obj, char *buf, int cnt)
++static int qiodevice_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
+ {
+         QIODevice *io = (QIODevice*) obj;
+         return io->read(buf, cnt);
+ }
+ 
+-static int qiodevice_write(jas_stream_obj_t *obj, char *buf, int cnt)
++static int qiodevice_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
+ {
+         QIODevice *io = (QIODevice*) obj;
+         return io->write(buf, cnt);
+--- kdelibs-4.14.38/dnssd/servicemodel.cpp.orig	2017-11-05 02:51:22.000000000 +0100
++++ kdelibs-4.14.38/dnssd/servicemodel.cpp	2022-01-18 14:28:11.023786338 +0100
+@@ -87,7 +87,7 @@
+ 		case Host: return srv[index.row()]->hostName();
+ 		case Port: return srv[index.row()]->port();
+ 	    }
+-	case ServicePtrRole: QVariant ret;
++	case (int) ServicePtrRole: QVariant ret;
+ 			     ret.setValue(srv[index.row()]);
+ 			    return ret;
+     }
+--- kdelibs-4.14.38/kio/kfile/kpropertiesdialog.cpp.orig	2017-11-05 02:51:22.000000000 +0100
++++ kdelibs-4.14.38/kio/kfile/kpropertiesdialog.cpp	2022-01-18 15:40:04.590904703 +0100
+@@ -3306,7 +3306,7 @@
+ 
+     if (preferredTerminal == "konsole")
+     {
+-        terminalCloseBool = (d->m_terminalOptionStr.contains( "--noclose" ) > 0);
++        terminalCloseBool = d->m_terminalOptionStr.contains( "--noclose" );
+         w.terminalCloseCheck->setChecked(terminalCloseBool);
+         d->m_terminalOptionStr.remove( "--noclose");
+     }
+--- kdelibs-4.14.38/kio/kfile/kopenwithdialog.cpp.orig	2017-11-05 02:51:22.000000000 +0100
++++ kdelibs-4.14.38/kio/kfile/kopenwithdialog.cpp	2022-01-18 15:42:08.510645262 +0100
+@@ -713,7 +713,7 @@
+         // ### indicate that default value was restored
+         d->terminal->setChecked(d->curService->terminal());
+         QString terminalOptions = d->curService->terminalOptions();
+-        d->nocloseonexit->setChecked((terminalOptions.contains(QLatin1String("--noclose")) > 0));
++        d->nocloseonexit->setChecked(terminalOptions.contains(QLatin1String("--noclose")));
+         d->m_terminaldirty = false; // slotTerminalToggled changed it
+     }
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdelibs.git/commitdiff/aed5c1f5e840c435908c70f76c39ce966edefd8d