Date: Monday, February 17, 2020 @ 07:54:54 Author: lcarlier Revision: 573865
upgpkg: kphotoalbum 5.6.1-1: upstream update 5.6.1 Modified: kphotoalbum/trunk/PKGBUILD Deleted: kphotoalbum/trunk/kphotoalbum-qt-5.10.patch ---------------------------+ PKGBUILD | 12 ++++------- kphotoalbum-qt-5.10.patch | 45 -------------------------------------------- 2 files changed, 5 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-17 07:38:09 UTC (rev 573864) +++ PKGBUILD 2020-02-17 07:54:54 UTC (rev 573865) @@ -5,8 +5,8 @@ # Contributor: chfoxli <lg ][ romandie ? com> pkgname=kphotoalbum -pkgver=5.5 -pkgrel=2 +pkgver=5.6.1 +pkgrel=1 pkgdesc="KDE Photo Album, picture collection manager" url="https://www.kphotoalbum.org/"; arch=('x86_64') @@ -14,11 +14,9 @@ depends=('libkipi' 'libkdcraw' 'libkgeomap' 'exiv2') makedepends=('extra-cmake-modules' 'plasma-framework' 'phonon-qt5' 'kdoctools' 'kparts' 'libkexiv2') optdepends=() -source=("https://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.sig} - kphotoalbum-qt-5.11.patch::"https://github.com/KDE/kphotoalbum/commit/47f4c00a.patch";) -sha256sums=('b5c343fbf5cb754b56f107a3326bb11eecb4ad13718a43659d0c27d5fab26df6' - 'SKIP' - '78fd0e12826c9fa8c36f3be5bf8a7048ed1382be1a813d985bc65eba9b52ba66') +source=("https://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.sig}) +sha256sums=('3214a45d32156c06b6ff37ea1ddf7a443e635aa285c283a02326154f2c468304' + 'SKIP') validpgpkeys=('8A53F0CB9F752E6F4F72FEC6F8DECD0DDF0F74A8') # Tobias Leupold <[email protected]> prepare() { Deleted: kphotoalbum-qt-5.10.patch =================================================================== --- kphotoalbum-qt-5.10.patch 2020-02-17 07:38:09 UTC (rev 573864) +++ kphotoalbum-qt-5.10.patch 2020-02-17 07:54:54 UTC (rev 573865) @@ -1,45 +0,0 @@ -From 211f74bec0101d56714787b3a722e7f324ce2ae2 Mon Sep 17 00:00:00 2001 -From: Sylvain Stanchina <[email protected]> -Date: Mon, 1 Jan 2018 21:57:32 +0100 -Subject: Fix crash with prepared SQL queries on Qt 5.10. - -Some explanations: The issue is related to SQL queries containing -placeholders ("?"). In Exif.Database.cpp, some queries are built using -the statement "QSqlQuery query( _queryString, m_db );" (or equivalent). -However, according to QT5.10 documentation, the queries are immediately -executed when constructed like that. If they contain one or more -placeholders "?", they are thus executed before their arguments have -been bound (by calls of bindValue()). In such cases, the application -crashes. ---- - Exif/Database.cpp | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/Exif/Database.cpp b/Exif/Database.cpp -index 1cc14c3..10747d2 100644 ---- a/Exif/Database.cpp -+++ b/Exif/Database.cpp -@@ -226,7 +226,8 @@ void Exif::Database::remove( const DB::FileName& fileName ) - if ( !isUsable() ) - return; - -- QSqlQuery query( QString::fromLatin1( "DELETE FROM exif WHERE fileName=?" ), m_db ); -+ QSqlQuery query( m_db); -+ query.prepare( QString::fromLatin1( "DELETE FROM exif WHERE fileName=?" )); - query.bindValue( 0, fileName.absolute() ); - if ( !query.exec() ) - showError( query ); -@@ -248,8 +251,8 @@ bool Exif::Database::insert(const DB::FileName& filename, Exiv2::ExifData data ) - } - _queryString = QString::fromLatin1( "INSERT OR REPLACE into exif values (?, %1) " ).arg( formalList.join( QString::fromLatin1( ", " ) ) ); - } -- -- QSqlQuery query( _queryString, m_db ); -+ QSqlQuery query(m_db); -+ query.prepare( _queryString ); - query.bindValue( 0, filename.absolute() ); - int i = 1; - for( const DatabaseElement *e : elements() ) --- -cgit v0.11.2 -
