Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdb for openSUSE:Factory checked in at 2021-06-26 21:25:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdb (Old) and /work/SRC/openSUSE:Factory/.kdb.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdb" Sat Jun 26 21:25:32 2021 rev:14 rq:902475 version:3.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdb/kdb.changes 2020-09-23 12:59:49.757803132 +0200 +++ /work/SRC/openSUSE:Factory/.kdb.new.2625/kdb.changes 2021-06-26 21:26:00.659386716 +0200 @@ -1,0 +2,11 @@ +Sat Jun 26 06:08:50 UTC 2021 - Wolfgang Bauer <[email protected]> + +- Add Fix-build-with-newer-Qt.patch to fix build after the latest + Qt update + +------------------------------------------------------------------- +Tue Apr 20 13:45:46 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Spec cleanup + +------------------------------------------------------------------- New: ---- Fix-build-with-newer-Qt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdb.spec ++++++ --- /var/tmp/diff_new_pack.R1xBRh/_old 2021-06-26 21:26:01.023387196 +0200 +++ /var/tmp/diff_new_pack.R1xBRh/_new 2021-06-26 21:26:01.027387201 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdb # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,11 +27,17 @@ Source0: https://download.kde.org/stable/%{name}/src/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM Patch0: Fix-build-with-PostgreSQL-12.patch +# PATCH-FIX-UPSTREAM +Patch1: Fix-build-with-newer-Qt.patch BuildRequires: extra-cmake-modules -BuildRequires: libicu-devel BuildRequires: libmysqlclient-devel BuildRequires: libmysqld-devel BuildRequires: pkgconfig +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 +BuildRequires: postgresql-server-devel +%else +BuildRequires: postgresql-devel +%endif BuildRequires: python-base BuildRequires: sqlite3-devel BuildRequires: cmake(KF5CoreAddons) @@ -40,11 +46,7 @@ BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 -BuildRequires: postgresql-server-devel -%else -BuildRequires: postgresql-devel -%endif +BuildRequires: pkgconfig(icu-uc) %description A database connectivity and creation framework for various database vendors @@ -71,7 +73,7 @@ %package mysql-driver Summary: Database connectivity and creation framework - MySQL driver Group: Productivity/Office/Suite -Supplements: packageand(libKDb3-%{sover}:mariadb) +Supplements: (libKDb3-%{sover} and mariadb) Obsoletes: calligra-kexi-mysql-driver < %{version} Provides: calligra-kexi-mysql-driver = %{version} @@ -81,7 +83,7 @@ %package postgresql-driver Summary: Database connectivity and creation framework - PostgreSQL driver Group: Productivity/Office/Suite -Supplements: packageand(libKDb3-%{sover}:postgresql) +Supplements: (libKDb3-%{sover} and postgresql) Obsoletes: calligra-kexi-postgresql-driver < %{version} Provides: calligra-kexi-postgresql-driver = %{version} @@ -91,7 +93,7 @@ %package sqlite3-driver Summary: Database connectivity and creation framework - SQLite3 driver Group: Productivity/Office/Suite -Supplements: packageand(libKDb3-%{sover}:sqlite3) +Supplements: (libKDb3-%{sover} and sqlite3) Obsoletes: calligra-kexi-sqlite3-driver < %{version} Provides: calligra-kexi-sqlite3-driver = %{version} @@ -101,19 +103,18 @@ %lang_package %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build %cmake_kf5 -d build -%make_jobs +%cmake_build %install - %kf5_makeinstall -C build - %find_lang %{name} %{name}.lang --all-name --with-qt +%kf5_makeinstall -C build +%find_lang %{name} %{name}.lang --all-name --with-qt - # Contains bogus entries - rm -f %{buildroot}%{_libdir}/pkgconfig/KDb3.pc +# Contains bogus entries +rm %{buildroot}%{_libdir}/pkgconfig/KDb3.pc %post -n libKDb3-%{sover} -p /sbin/ldconfig %postun -n libKDb3-%{sover} -p /sbin/ldconfig @@ -125,9 +126,8 @@ %files devel %license COPYING* %{_includedir}/KDb3/ -%{_libdir}/cmake/KDb3/ -#%%{_libdir}/pkgconfig/KDb3.pc %{_kf5_mkspecsdir}/qt_KDb3.pri +%{_libdir}/cmake/KDb3/ %{_libdir}/libKDb3.so %files sqlite3-driver ++++++ Fix-build-with-newer-Qt.patch ++++++ >From 3a31ad05fcc7682bf3b65143af99fdb9b2e1e248 Mon Sep 17 00:00:00 2001 From: Nicolas Fella <[email protected]> Date: Mon, 16 Nov 2020 16:41:27 +0100 Subject: [PATCH] Fix build with newer Qt (cherry picked from commit b36d74f13a1421437a725fb74502c993c359392a) --- src/KDb.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/KDb.cpp b/src/KDb.cpp index 5c3b601f..ee92c2ee 100644 --- a/src/KDb.cpp +++ b/src/KDb.cpp @@ -1635,33 +1635,33 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOBEscapingType type) for (int i = 0; i < size; i++) { const unsigned char val = array[i]; if (val < 32 || val >= 127 || val == 39 || val == 92) { - str[new_length++] = '\\'; - str[new_length++] = '\\'; - str[new_length++] = '0' + val / 64; - str[new_length++] = '0' + (val % 64) / 8; - str[new_length++] = '0' + val % 8; + str[new_length++] = QLatin1Char('\\'); + str[new_length++] = QLatin1Char('\\'); + str[new_length++] = QChar::fromLatin1('0' + val / 64); + str[new_length++] = QChar::fromLatin1('0' + (val % 64) / 8); + str[new_length++] = QChar::fromLatin1('0' + val % 8); } else { - str[new_length++] = val; + str[new_length++] = QChar::fromLatin1(val); } } } else { for (int i = 0; i < size; i++) { const unsigned char val = array[i]; - str[new_length++] = intToHexDigit(val / 16); - str[new_length++] = intToHexDigit(val % 16); + str[new_length++] = QChar::fromLatin1(intToHexDigit(val / 16)); + str[new_length++] = QChar::fromLatin1(intToHexDigit(val % 16)); } } if (type == BLOBEscapingType::XHex || type == BLOBEscapingType::Octal) { - str[new_length++] = '\''; + str[new_length++] = QLatin1Char('\''); } else if (type == BLOBEscapingType::ByteaHex) { - str[new_length++] = '\''; - str[new_length++] = ':'; - str[new_length++] = ':'; - str[new_length++] = 'b'; - str[new_length++] = 'y'; - str[new_length++] = 't'; - str[new_length++] = 'e'; - str[new_length++] = 'a'; + str[new_length++] = QLatin1Char('\''); + str[new_length++] = QLatin1Char(':'); + str[new_length++] = QLatin1Char(':'); + str[new_length++] = QLatin1Char('b'); + str[new_length++] = QLatin1Char('y'); + str[new_length++] = QLatin1Char('t'); + str[new_length++] = QLatin1Char('e'); + str[new_length++] = QLatin1Char('a'); } return str; } -- GitLab
