Date: Monday, October 29, 2018 @ 04:15:32
Author: lcarlier
Revision: 399349
archrelease: copy trunk to community-x86_64
Added:
kphotoalbum/repos/community-x86_64/PKGBUILD
(from rev 399348, kphotoalbum/trunk/PKGBUILD)
kphotoalbum/repos/community-x86_64/kphotoalbum-qt-5.10.patch
(from rev 399348, kphotoalbum/trunk/kphotoalbum-qt-5.10.patch)
Deleted:
kphotoalbum/repos/community-x86_64/PKGBUILD
kphotoalbum/repos/community-x86_64/kphotoalbum-qt-5.10.patch
---------------------------+
PKGBUILD | 83 ++++++++++++++++++++++------------------
kphotoalbum-qt-5.10.patch | 90 ++++++++++++++++++++++----------------------
2 files changed, 90 insertions(+), 83 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-29 04:15:26 UTC (rev 399348)
+++ PKGBUILD 2018-10-29 04:15:32 UTC (rev 399349)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Laurent Carlier <lordhea...@gmail.com>
-# Contributor: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
-# Contributor: Jonathan Schaeffer <joschaeffer ][ gmail ? com>
-# Contributor: chfoxli <lg ][ romandie ? com>
-
-pkgname=kphotoalbum
-pkgver=5.3
-pkgrel=1
-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"{,.sig})
-sha256sums=('c1175489c70902511d7fa7c261a65d4dd19a3a651a1811edea3034e36fda88d1'
- 'SKIP')
-validpgpkeys=('8A53F0CB9F752E6F4F72FEC6F8DECD0DDF0F74A8') # Tobias Leupold
<tobias.leup...@gmx.de>
-
-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 399348,
kphotoalbum/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-10-29 04:15:32 UTC (rev 399349)
@@ -0,0 +1,45 @@
+# Maintainer: Laurent Carlier <lordhea...@gmail.com>
+# Contributor: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
+# Contributor: Jonathan Schaeffer <joschaeffer ][ gmail ? com>
+# Contributor: chfoxli <lg ][ romandie ? com>
+
+pkgname=kphotoalbum
+pkgver=5.4
+pkgrel=1
+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=('d031ce9eec4c16d628e1152cee4ab6aeef5194ce6517dd7b6493e60d45ad852d'
+ 'SKIP'
+ '78fd0e12826c9fa8c36f3be5bf8a7048ed1382be1a813d985bc65eba9b52ba66')
+validpgpkeys=('8A53F0CB9F752E6F4F72FEC6F8DECD0DDF0F74A8') # Tobias Leupold
<tobias.leup...@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
+}
Deleted: kphotoalbum-qt-5.10.patch
===================================================================
--- kphotoalbum-qt-5.10.patch 2018-10-29 04:15:26 UTC (rev 399348)
+++ kphotoalbum-qt-5.10.patch 2018-10-29 04:15:32 UTC (rev 399349)
@@ -1,45 +0,0 @@
-From 211f74bec0101d56714787b3a722e7f324ce2ae2 Mon Sep 17 00:00:00 2001
-From: Sylvain Stanchina <sylv...@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
-
Copied: kphotoalbum/repos/community-x86_64/kphotoalbum-qt-5.10.patch (from rev
399348, kphotoalbum/trunk/kphotoalbum-qt-5.10.patch)
===================================================================
--- kphotoalbum-qt-5.10.patch (rev 0)
+++ kphotoalbum-qt-5.10.patch 2018-10-29 04:15:32 UTC (rev 399349)
@@ -0,0 +1,45 @@
+From 211f74bec0101d56714787b3a722e7f324ce2ae2 Mon Sep 17 00:00:00 2001
+From: Sylvain Stanchina <sylv...@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
+
