Update to 1.3.5-2: Fix compilation with most recent openssl and Qt versions.

5 files changed, 68 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a615a092d58..1041861ce71d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Apr  6 09:44:10 UTC 2017
+# Tue May  9 14:20:59 UTC 2017
 pkgbase = openboard
 	pkgdesc = Interactive whiteboard software for schools and universities
 	pkgver = 1.3.5
-	pkgrel = 1
+	pkgrel = 2
 	url = http://openboard.ch/index.en.html
 	arch = x86_64
 	arch = i686
@@ -15,10 +15,17 @@ pkgbase = openboard
 	depends = qt5-webkit
 	depends = libpaper
 	depends = bzip2
+	depends = openssl-1.0
 	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.3.5.tar.gz
 	source = https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip
+	source = ssl10.patch
+	source = qchar.patch
+	source = qtmultimediadefs.patch
 	md5sums = d3ff4e88b5c8f1913c12a7686ef86329
 	md5sums = fa1ff089f0bcc15d2a510bb90cdd3002
+	md5sums = 9dbccb56e4079b75c606dc40c3e77f00
+	md5sums = bf2c524f3897cfcfb4315bcd92d4206e
+	md5sums = 0d18be8088442762c2a3d5e6e1f1a911
 
 pkgname = openboard
 
diff --git a/PKGBUILD b/PKGBUILD
index 410d5bcf60a7..96384dd367fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,30 @@
 # Maintainer: Frank Siegert <frank.siegert@googlemail.com>
 pkgname=openboard
 pkgver=1.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive whiteboard software for schools and universities"
 arch=('x86_64' 'i686')
 url="http://openboard.ch/index.en.html"
 license=('GPL3')
-depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'libpaper' 'bzip2')
+depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'libpaper' 'bzip2' 'openssl-1.0')
 source=("https://github.com/OpenBoard-org/OpenBoard/archive/v$pkgver.tar.gz"
-        "https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip")
+        "https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip"
+        ssl10.patch
+        qchar.patch
+        qtmultimediadefs.patch)
 md5sums=('d3ff4e88b5c8f1913c12a7686ef86329'
-         'fa1ff089f0bcc15d2a510bb90cdd3002')
+         'fa1ff089f0bcc15d2a510bb90cdd3002'
+         '9dbccb56e4079b75c606dc40c3e77f00'
+         'bf2c524f3897cfcfb4315bcd92d4206e'
+         '0d18be8088442762c2a3d5e6e1f1a911')
 
 prepare() {
   mv "$srcdir/OpenBoard-ThirdParty-master" "$srcdir/OpenBoard-ThirdParty"
+
+  cd $srcdir/OpenBoard-$pkgver
+  patch -p1 < $srcdir/ssl10.patch
+  patch -p1 < $srcdir/qchar.patch
+  patch -p1 < $srcdir/qtmultimediadefs.patch
 }
 
 build() {
diff --git a/qchar.patch b/qchar.patch
new file mode 100644
index 000000000000..c9f6bff1b93a
--- /dev/null
+++ b/qchar.patch
@@ -0,0 +1,12 @@
+diff -u -ubr a/src/core/UBTextTools.cpp b/src/core/UBTextTools.cpp
+--- a/src/core/UBTextTools.cpp	2017-05-09 15:59:42.177965830 +0200
++++ b/src/core/UBTextTools.cpp	2017-05-09 16:00:08.547747097 +0200
+@@ -34,7 +34,7 @@
+ 
+ 
+     for(int i = 0; i < _html.length(); i+=1){
+-        if(_html.at(i) != '\0')
++        if(_html.at(i) != QChar('\0'))
+             clean.append(_html.at(i));
+     }
+     return clean;
diff --git a/qtmultimediadefs.patch b/qtmultimediadefs.patch
new file mode 100644
index 000000000000..76469af18da3
--- /dev/null
+++ b/qtmultimediadefs.patch
@@ -0,0 +1,13 @@
+diff -u -ubr a/src/domain/UBGraphicsMediaItemDelegate.h b/src/domain/UBGraphicsMediaItemDelegate.h
+--- a/src/domain/UBGraphicsMediaItemDelegate.h	2017-05-09 16:15:51.919921697 +0200
++++ b/src/domain/UBGraphicsMediaItemDelegate.h	2017-05-09 16:08:00.763830080 +0200
+@@ -32,7 +32,8 @@
+ 
+ #include <QtGui>
+ #include <QTimer>
+-#include <QtMultimedia>
++//#include <QtMultimedia>
++#include <QMediaPlayer>
+ 
+ #include "core/UB.h"
+ #include "UBGraphicsItemDelegate.h"
diff --git a/ssl10.patch b/ssl10.patch
new file mode 100644
index 000000000000..e5acf0286bef
--- /dev/null
+++ b/ssl10.patch
@@ -0,0 +1,19 @@
+--- a/OpenBoard.pro	2017-02-26 00:44:23.000000000 +0100
++++ b/OpenBoard.pro	2017-05-09 15:58:37.448502744 +0200
+@@ -44,6 +44,7 @@
+ QT += core
+ 
+ INCLUDEPATH += src
++INCLUDEPATH = "/usr/include/openssl-1.0" + $${INCLUDEPATH}
+ 
+ include($$THIRD_PARTY_PATH/libs.pri)
+ include(src/adaptors/adaptors.pri)
+@@ -400,7 +401,7 @@
+ 
+ linux-g++* {
+     CONFIG += link_prl
+-    LIBS += -lcrypto
++    LIBS += -l:libcrypto.so.1.0.0
+     #LIBS += -lprofiler
+     LIBS += -lX11
+     QMAKE_CFLAGS += -fopenmp