Changes of Revision 3

djv.changes Changed
x
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Mon Oct  5 18:16:23 UTC 2015 - avvissu@yandex.ru
4
+
5
+- Fix build on openSUSE > 13.2: djv-1.0.5_qt5-5.5.patch
6
+
7
+-------------------------------------------------------------------
8
 Mon Sep 14 04:53:38 UTC 2015 - avvissu@yandex.ru
9
 
10
 - Initial release
11
djv.spec Changed
18
 
1
@@ -36,6 +36,8 @@
2
 Patch3:         djv-1.0.5_doc.patch
3
 # PATCH-FIX-UPSTREAM link_library.patch avvissu@yandex.ru -- Build with --no-undefined
4
 Patch4:         djv-1.0.5_link_library.patch
5
+# PATCH-FIX-UPSTREAM qt5-5.5.patch avvissu@yandex.ru -- Fix build with Qt5 >= 5.5
6
+Patch5:         djv-1.0.5_qt5-5.5.patch
7
 BuildRequires:  cmake >= 3.0
8
 BuildRequires:  doxygen
9
 BuildRequires:  fdupes
10
@@ -133,6 +135,7 @@
11
 %patch2 -p1
12
 %patch3 -p1
13
 %patch4 -p1
14
+%patch5 -p1
15
 
16
 # Change exec-path
17
 sed -i '/Exec/s|[/].*|%{name}_view|' $(grep -rl 'djv_view.sh')
18
djv-1.0.5_qt5-5.5.patch Added
13
 
1
@@ -0,0 +1,11 @@
2
+diff -U 3 -H -d -r -N -- djv-1.0.5git.20141225.orig/lib/djvCore/djvOpenGlImage.cpp djv-1.0.5git.20141225/lib/djvCore/djvOpenGlImage.cpp
3
+--- djv-1.0.5git.20141225.orig/lib/djvCore/djvOpenGlImage.cpp  2015-09-14 09:12:05.000000000 +0300
4
++++ djv-1.0.5git.20141225/lib/djvCore/djvOpenGlImage.cpp   2015-10-05 21:00:18.200072382 +0300
5
+@@ -38,6 +38,7 @@
6
+ #include <djvError.h>
7
+ #include <djvMatrixUtil.h>
8
+ #include <djvOpenGlOffscreenBuffer.h>
9
++#include <QScopedPointer>
10
+ 
11
+ //------------------------------------------------------------------------------
12
+ // djvOpenGlImageXform
13