[arch-commits] Commit in kphotoalbum/repos (3 files)

Evangelos Foutras foutrelis at archlinux.org
Sat May 18 07:57:17 UTC 2019


    Date: Saturday, May 18, 2019 @ 07:57:16
  Author: foutrelis
Revision: 467827

archrelease: copy trunk to community-staging-x86_64

Added:
  kphotoalbum/repos/community-staging-x86_64/
  kphotoalbum/repos/community-staging-x86_64/PKGBUILD
    (from rev 467826, kphotoalbum/trunk/PKGBUILD)
  kphotoalbum/repos/community-staging-x86_64/kphotoalbum-qt-5.10.patch
    (from rev 467826, kphotoalbum/trunk/kphotoalbum-qt-5.10.patch)

---------------------------+
 PKGBUILD                  |   45 ++++++++++++++++++++++++++++++++++++++++++++
 kphotoalbum-qt-5.10.patch |   45 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)

Copied: kphotoalbum/repos/community-staging-x86_64/PKGBUILD (from rev 467826, kphotoalbum/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2019-05-18 07:57:16 UTC (rev 467827)
@@ -0,0 +1,45 @@
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
+# Contributor: Jonathan Schaeffer <joschaeffer ][ gmail ? com>
+# Contributor: chfoxli <lg ][ romandie ? com>
+
+pkgname=kphotoalbum
+pkgver=5.5
+pkgrel=2
+pkgdesc="KDE Photo Album, picture collection manager"
+url="https://www.kphotoalbum.org/"
+arch=('x86_64')
+license=('GPL')
+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')
+validpgpkeys=('8A53F0CB9F752E6F4F72FEC6F8DECD0DDF0F74A8') # Tobias Leupold <tobias.leupold at gmx.de>
+
+prepare() {
+  mkdir -p build
+
+#  cd $pkgname-$pkgver
+#  patch -p1 -i ../kphotoalbum-qt-5.11.patch # Fix build with Qt 5.11
+}
+
+build() {
+  cd build
+
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+
+  make DESTDIR="${pkgdir}" install
+}

Copied: kphotoalbum/repos/community-staging-x86_64/kphotoalbum-qt-5.10.patch (from rev 467826, kphotoalbum/trunk/kphotoalbum-qt-5.10.patch)
===================================================================
--- community-staging-x86_64/kphotoalbum-qt-5.10.patch	                        (rev 0)
+++ community-staging-x86_64/kphotoalbum-qt-5.10.patch	2019-05-18 07:57:16 UTC (rev 467827)
@@ -0,0 +1,45 @@
+From 211f74bec0101d56714787b3a722e7f324ce2ae2 Mon Sep 17 00:00:00 2001
+From: Sylvain Stanchina <sylvain at stanchina.fr>
+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
+


More information about the arch-commits mailing list