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

[Antonio Rojas]

    Date: Wednesday, January 3, 2018 @ 09:23:25
  Author: arojas
Revision: 278147

archrelease: copy trunk to community-x86_64

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

---------------------------+
 PKGBUILD                  |   79 +++++++++++++++++++++++---------------------
 kphotoalbum-qt-5.10.patch |   45 +++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-03 09:23:06 UTC (rev 278146)
+++ PKGBUILD	2018-01-03 09:23:25 UTC (rev 278147)
@@ -1,36 +0,0 @@
-# $Id$
-# 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.2
-pkgrel=2
-pkgdesc="KDE Photo Album, picture collection manager"
-url="https://www.kphotoalbum.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libkipi' 'libkdcraw' 'libkgeomap' 'exiv2')
-makedepends=('extra-cmake-modules' 'python' 'plasma-framework' 'phonon-qt5' 'kdoctools' 'kparts' 'libkexiv2')
-optdepends=()
-source=("https://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('9ad02080b21787d5824d0c4bb49be2a00822098adca7937e9c7497440d3b0b89')
-
-build() {
-  mkdir 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-x86_64/PKGBUILD (from rev 278146, kphotoalbum/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-03 09:23:25 UTC (rev 278147)
@@ -0,0 +1,43 @@
+# $Id$
+# 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.2
+pkgrel=3
+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' 'python' 'plasma-framework' 'phonon-qt5' 'kdoctools' 'kparts' 'libkexiv2')
+optdepends=()
+source=("https://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+        kphotoalbum-qt-5.10.patch)
+sha256sums=('9ad02080b21787d5824d0c4bb49be2a00822098adca7937e9c7497440d3b0b89'
+            '67efc8339a9754f28f5a438510b3f2b114dd9cc07ecc34e75c0e1aa72f1a6b80')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kphotoalbum-qt-5.10.patch # Fix crash with Qt 5.10
+}
+
+build() {
+  mkdir 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-x86_64/kphotoalbum-qt-5.10.patch (from rev 278146, kphotoalbum/trunk/kphotoalbum-qt-5.10.patch)
===================================================================
--- kphotoalbum-qt-5.10.patch	                        (rev 0)
+++ kphotoalbum-qt-5.10.patch	2018-01-03 09:23:25 UTC (rev 278147)
@@ -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
+