Fix qml problem related to Qt 5.13

3 files changed, 32 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6a8ac126101..de2af1aee342 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Jun 30 17:54:03 UTC 2018
+# Tue Jul  9 17:57:22 UTC 2019
 pkgbase = yacreader
 	pkgdesc = A comic reader for cross-platform reading and managing your digital comic collection.
 	pkgver = 9.5.0
-	pkgrel = 1
+	pkgrel = 3
 	url = http://www.yacreader.com
 	install = yacreader.install
 	arch = i686
@@ -13,6 +13,7 @@ pkgbase = yacreader
 	depends = qt5-multimedia
 	depends = qt5-script
 	depends = qt5-quickcontrols
+	depends = qt5-graphicaleffects
 	depends = hicolor-icon-theme
 	depends = glu
 	depends = libunarr
@@ -21,7 +22,9 @@ pkgbase = yacreader
 	optdepends = qrencode: YACReaderLibrary server info qr codes
 	conflicts = yacreader-bin
 	source = https://github.com/YACReader/yacreader/releases/download/9.5.0/yacreader-9.5.0-src.tar.xz
+	source = qml_error.patch
 	sha256sums = a6f25edb38c5438301b1364464903995d45bae4532a5ebc8d6586f39cdf16533
+	sha256sums = 7d143e6a70dc692af3ca9d9b20aacf75ecfa954948456ea93713f3d46da858d8
 
 pkgname = yacreader
 
diff --git a/PKGBUILD b/PKGBUILD
index d14017585e9b..b6b16cb9dac7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,27 @@
 # Maintainer: Felix Kauselmann <licorn at gmail dot com>
 pkgname=yacreader
 pkgver=9.5.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A comic reader for cross-platform reading and managing your digital comic collection."
 arch=('i686' 'x86_64')
 url="http://www.yacreader.com"
 license=('GPL3')
-depends=('qt5-base' 'qt5-multimedia' 'qt5-script' 'qt5-quickcontrols' 'hicolor-icon-theme' 'glu' 'libunarr' 'libpdfium')
+depends=('qt5-base' 'qt5-multimedia' 'qt5-script' 'qt5-quickcontrols' 'qt5-graphicaleffects' 'hicolor-icon-theme' 'glu' 'libunarr' 'libpdfium')
 optdepends=(
     'qt5-imageformats: Support for extra image formats'
     'qrencode: YACReaderLibrary server info qr codes'
 )
 conflicts=('yacreader-bin')
 install='yacreader.install'
-source=( "https://github.com/YACReader/yacreader/releases/download/${pkgver}/yacreader-${pkgver}-src.tar.xz" )
-sha256sums=('a6f25edb38c5438301b1364464903995d45bae4532a5ebc8d6586f39cdf16533')
+source=( "https://github.com/YACReader/yacreader/releases/download/${pkgver}/yacreader-${pkgver}-src.tar.xz" "qml_error.patch" )
+sha256sums=('a6f25edb38c5438301b1364464903995d45bae4532a5ebc8d6586f39cdf16533'
+            '7d143e6a70dc692af3ca9d9b20aacf75ecfa954948456ea93713f3d46da858d8')
+
+prepare() {
+  cd $srcdir/$pkgname-$pkgver/
+  patch -p1 --binary -i $srcdir/qml_error.patch
+  
+}
 
 build() {
   cd $srcdir/$pkgname-$pkgver/
diff --git a/qml_error.patch b/qml_error.patch
new file mode 100644
index 000000000000..79611449bd31
--- /dev/null
+++ b/qml_error.patch
@@ -0,0 +1,16 @@
+diff --git a/YACReaderLibrary/qml/GridComicsView.qml b/YACReaderLibrary/qml/GridComicsView.qml

+index fd12c3c..17adb73 100644

+--- a/YACReaderLibrary/qml/GridComicsView.qml

++++ b/YACReaderLibrary/qml/GridComicsView.qml

+@@ -460,8 +460,7 @@ Rectangle {

+             }

+         }

+ 

+-        Component {

+-            id: currentComicView

++        property Component currentComicView: Component {

+             Rectangle {

+                 id: currentComicViewTopView

+                 color: "#00000000"

+diff --git a/common/gl/yacreader_flow_gl.cpp b/common/gl/yacreader_flow_gl.cpp

+index d9da8ae..f292d4e 100644
\ No newline at end of file