Drop OpenBoard-ThirdParty

commit 4d3609b56f76fd340de3b7925476520ac24cb17a
Author: bartus <szczepaniak.bartek+github@gmail.com>
Date:   Fri Apr 12 14:50:39 2019 +0200

    add post install scrip, fix permissions when using `cp`

commit eb17fa575c76748f36726f4f9ea7c65e40722cd1
Author: bartus <szczepaniak.bartek+github@gmail.com>
Date:   Fri Apr 12 14:37:42 2019 +0200

    finally drop ThirdParty repo

    move libs.pri config to main repo

commit abdd61a5125dab0121ff22301d61d0b4290dab14
Author: bartus <szczepaniak.bartek+github@gmail.com>
Date:   Fri Apr 12 14:24:46 2019 +0200

    really drop freetype, and some patch refactor

commit d48abd4e3a22a82bed08ea13ffbd94b6807067a2
Merge: a5936b5 c4028de
Author: bartus <szczepaniak.bartek+github@gmail.com>
Date:   Fri Apr 12 14:11:56 2019 +0200

    Merge branch 'replace_xpdf_with_poppler' into drop_all_internall_deps

commit c4028de000750b8ba1e26129f616074c0d826cb4
Author: bartus <szczepaniak.bartek+github@gmail.com>
Date:   Fri Apr 12 13:55:42 2019 +0200

    replace xpdf with poppler

    and drop xpdf from internal deps

commit a5936b5dfe5caea8500e818c337d1d39217cc18f
Author: bartus <szczepaniak.bartek+github@gmail.com>
Date:   Fri Apr 12 13:41:47 2019 +0200

    remove unneeded changes

commit 0a95277478c414735024f7ae81e18e97e5e372c1
Author: bartus <szczepaniak.bartek+github@gmail.com>
Date:   Fri Apr 12 13:33:51 2019 +0200

    drop quazip from internall deps

6 files changed, 256 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3659fb65b4dc..b75d6ebcabad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = openboard-develop
 	pkgdesc = Interactive whiteboard software for schools and universities
 	pkgver = 1.5.3
-	pkgrel = 2
+	pkgrel = 3
 	url = http://openboard.ch/index.en.html
+	install = openboard.install
 	arch = x86_64
 	arch = i686
 	license = GPL3
@@ -19,20 +20,26 @@ pkgbase = openboard-develop
 	depends = libfdk-aac
 	depends = sdl
 	depends = ffmpeg
+	depends = quazip
+	depends = poppler
 	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.5.3.tar.gz
-	source = https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip
 	source = qchar.patch
 	source = qwebkit.patch
 	source = https://github.com/OpenBoard-org/OpenBoard/pull/218.diff
 	source = https://github.com/OpenBoard-org/OpenBoard/pull/223.diff
 	source = openboard.desktop
+	source = quazip.diff
+	source = poppler.patch
+	source = drop_ThirdParty_repo.patch
 	md5sums = fe3644033dccfd16c80b683210e4ac57
-	md5sums = fa1ff089f0bcc15d2a510bb90cdd3002
 	md5sums = bf2c524f3897cfcfb4315bcd92d4206e
 	md5sums = 60f64db6bf627015f4747879c4b30fd3
 	md5sums = f484614cc48181287607afb5a45ef644
 	md5sums = 04c421c140e983d41975943ede5fe61a
 	md5sums = 21d1749400802f8fc0669feaf77de683
+	md5sums = 30a7928f696f958d5e8f06e02c49639f
+	md5sums = 8b774d204501bb8515ee224651a7d624
+	md5sums = 879116c683374b2dde291014e44a29fe
 
 pkgname = openboard-develop
 
diff --git a/PKGBUILD b/PKGBUILD
index 5d40289ef48c..b4cd27b47c69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,48 @@
 # Maintainer: Frank Siegert <frank.siegert@googlemail.com>
+# Contributor: bartus <arch-user-repoᘓbartus.33mail.com>
 pkgname=openboard-develop
+pkgname=openboard
 pkgver=1.5.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Interactive whiteboard software for schools and universities"
 arch=('x86_64' 'i686')
 url="http://openboard.ch/index.en.html"
+install=openboard.install
 license=('GPL3')
 depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'qt5-tools' 'qt5-xmlpatterns' 'libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg')
+depends+=(quazip)  #drop internal quazip and use system one.
+depends+=(poppler) #replace internal xpdf with poppler and drop freetype/xpdf from deps
 source=("https://github.com/OpenBoard-org/OpenBoard/archive/v$pkgver.tar.gz"
-        "https://github.com/OpenBoard-org/OpenBoard-ThirdParty/archive/master.zip"
         qchar.patch
         qwebkit.patch
         https://github.com/OpenBoard-org/OpenBoard/pull/218.diff
         https://github.com/OpenBoard-org/OpenBoard/pull/223.diff
         openboard.desktop)
+source+=(quazip.diff)
+source+=(poppler.patch)
+source+=(drop_ThirdParty_repo.patch)
 md5sums=('fe3644033dccfd16c80b683210e4ac57'
-         'fa1ff089f0bcc15d2a510bb90cdd3002'
          'bf2c524f3897cfcfb4315bcd92d4206e'
          '60f64db6bf627015f4747879c4b30fd3'
          'f484614cc48181287607afb5a45ef644'
          '04c421c140e983d41975943ede5fe61a'
-         '21d1749400802f8fc0669feaf77de683')
+         '21d1749400802f8fc0669feaf77de683'
+         '30a7928f696f958d5e8f06e02c49639f'
+         '8b774d204501bb8515ee224651a7d624'
+         '879116c683374b2dde291014e44a29fe')
 
 prepare() {
-  rm -rf $srcdir/OpenBoard-ThirdParty
-  mv "$srcdir/OpenBoard-ThirdParty-master" "$srcdir/OpenBoard-ThirdParty"
-
   cd $srcdir/OpenBoard-$pkgver
   patch -p1 < $srcdir/qchar.patch
   patch -p1 < $srcdir/qwebkit.patch
   patch -p1 < $srcdir/218.diff
   patch -p1 < $srcdir/223.diff
+  patch -p1 < $srcdir/quazip.diff
+  patch -p1 < $srcdir/poppler.patch
+  patch -p1 < $srcdir/drop_ThirdParty_repo.patch
 }
 
 build() {
-  cd "$srcdir/OpenBoard-ThirdParty"
-  
-  cd freetype
-  qmake freetype.pro -spec linux-g++
-  make
-  cd ..
-
-  cd quazip
-  qmake quazip.pro -spec linux-g++
-  make
-  cd ..
-
-  cd xpdf/xpdf-3.04
-  ./configure --with-freetype2-library="../../freetype/lib/linux" --with-freetype2-includes="../../freetype/freetype-2.6.1/include"
-  cd ..
-  qmake xpdf.pro -spec linux-g++
-  make
-  cd ..
-
   cd "$srcdir/OpenBoard-$pkgver"
   qmake OpenBoard.pro -spec linux-g++
   make
@@ -70,9 +60,7 @@ package() {
   cp -rp $srcdir/OpenBoard-$pkgver/resources/images/OpenBoard.png $pkgdir/opt/openboard/
   cp -rp build/linux/release/product/OpenBoard $pkgdir/opt/openboard/
 
-  mkdir -p $pkgdir/usr/share/applications
-  cp $srcdir/openboard.desktop $pkgdir/usr/share/applications
-
-  mkdir -p $pkgdir/usr/bin
+  install -D -m 644 $srcdir/openboard.desktop $pkgdir/usr/share/applications/openboard.desktop
+  install -d -m 755 $pkgdir/usr/bin
   ln -s /opt/openboard/OpenBoard $pkgdir/usr/bin/openboard
 }
diff --git a/drop_ThirdParty_repo.patch b/drop_ThirdParty_repo.patch
new file mode 100644
index 000000000000..058ede8829f8
--- /dev/null
+++ b/drop_ThirdParty_repo.patch
@@ -0,0 +1,88 @@
+diff -Naur OpenBoard-1.5.3/libs.pri OpenBoard-1.5.3-new/libs.pri
+--- OpenBoard-1.5.3/libs.pri	1970-01-01 01:00:00.000000000 +0100
++++ OpenBoard-1.5.3-new/libs.pri	2019-04-12 14:26:16.566266531 +0200
+@@ -0,0 +1,72 @@
++
++linux-g++ {
++    SUB_LIB = "linux"
++}
++
++linux-g++-32 {
++    SUB_LIB = "linux"
++}
++linux-g++-64 {
++    SUB_LIB = "linux"
++}
++
++macx {
++    SUB_LIB = "macx"
++}
++
++win32 {
++    CONFIG( debug, debug|release ) {
++        SUB_LIB = "win32/debug"
++    } else {
++        SUB_LIB = "win32/release"
++    }
++}
++
++QUAZIP_DIR   = "/usr"
++LIBS        += "-lquazip5"
++
++LIBS        += "-lpoppler"
++INCLUDEPATH += "/usr/include/poppler"
++
++
++linux-g++ {
++    LIBS        += -lpaper
++}
++linux-g++-32 {
++    LIBS        += -lpaper
++}
++linux-g++-64 {
++    LIBS        += -lpaper
++}
++
++win32 {
++    INCLUDEPATH += "$$PWD/openssl/openssl-1.0.2-win32/include"
++    QMAKE_LIBDIR += "$$PWD/openssl/openssl-1.0.2-win32/lib/static"
++
++    CONFIG( debug, debug|release ) {
++        LIBS += -llibeay32
++        LIBS += -lMsvcrtd
++    } else {
++        LIBS += -llibeay32MT
++        LIBS += -lMsvcrt
++    }
++
++    LIBS += -lWmvcore
++    LIBS += -lWinmm
++	
++	# need those link if we want to change default printer and print usind shell command
++    LIBS        += "-L$$PWD/microsoft/lib" "-lWinspool"
++    LIBS        += "-L$$PWD/microsoft/lib" "-lshell32"
++}
++
++macx {
++    LIBS         += "-framework QuartzCore"
++    LIBS         += "-framework AudioToolbox"
++    LIBS         += "-framework CoreAudio"
++    LIBS         += "-framework ApplicationServices"
++    LIBS         += "-framework Cocoa"
++            
++    LIBS         += "-lcrypto"
++}
++
++
+diff -Naur OpenBoard-1.5.3/OpenBoard.pro OpenBoard-1.5.3-new/OpenBoard.pro
+--- OpenBoard-1.5.3/OpenBoard.pro	2019-04-10 09:04:25.000000000 +0200
++++ OpenBoard-1.5.3-new/OpenBoard.pro	2019-04-12 14:26:34.289438050 +0200
+@@ -45,7 +45,7 @@
+ 
+ INCLUDEPATH += src
+ 
+-include($$THIRD_PARTY_PATH/libs.pri)
++include(libs.pri)
+ include(src/adaptors/adaptors.pri)
+ include(src/api/api.pri)
+ include(src/board/board.pri)
diff --git a/openboard.install b/openboard.install
new file mode 100644
index 000000000000..d061748130f3
--- /dev/null
+++ b/openboard.install
@@ -0,0 +1,14 @@
+
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -qf /usr/share/icons/hicolor/
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
diff --git a/poppler.patch b/poppler.patch
new file mode 100644
index 000000000000..50c62230e093
--- /dev/null
+++ b/poppler.patch
@@ -0,0 +1,91 @@
+diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp
+index a3e828e4..583882aa 100644
+--- a/src/pdf/XPDFRenderer.cpp
++++ b/src/pdf/XPDFRenderer.cpp
+@@ -32,6 +32,7 @@
+ #include <QtGui>
+ 
+ #include <frameworks/UBPlatformUtils.h>
++#include <poppler/cpp/poppler-version.h>
+ 
+ #include "core/memcheck.h"
+ 
+@@ -51,7 +52,7 @@ XPDFRenderer::XPDFRenderer(const QString &filename, bool importingFile)
+         globalParams->setupBaseFonts(QFile::encodeName(UBPlatformUtils::applicationResourcesDirectory() + "/" + "fonts").data());
+     }
+ 
+-    mDocument = new PDFDoc(new GString(filename.toLocal8Bit()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction
++    mDocument = new PDFDoc(new GooString(filename.toLocal8Bit()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction
+     sInstancesCount.ref();
+ }
+ 
+@@ -99,16 +100,28 @@ QString XPDFRenderer::title() const
+ {
+     if (isValid())
+     {
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55
++        Object pdfInfo = mDocument->getDocInfo();
++#else
+         Object pdfInfo;
+         mDocument->getDocInfo(&pdfInfo);
++#endif
+         if (pdfInfo.isDict())
+         {
+-            Object title;
+             Dict *infoDict = pdfInfo.getDict();
+-            if (infoDict->lookup((char*)"Title", &title)->isString())
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55
++            Object title = infoDict->lookup((char*)"Title");
++#else
++            Object title;
++            infoDict->lookup((char*)"Title", &title);
++#endif
++            if (title.isString())
+             {
+-                GString *gstring = title.getString();
+-                return QString(gstring->getCString());
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 72
++                return QString(title.getString()->c_str());
++#else
++                return QString(title.getString()->getCString());
++#endif
+             }
+         }
+     }
+@@ -172,12 +185,12 @@ QImage* XPDFRenderer::createPDFImage(int pageNumber, qreal xscale, qreal yscale,
+         SplashColor paperColor = {0xFF, 0xFF, 0xFF}; // white
+         if(mSplash)
+             delete mSplash;
+-        mSplash = new SplashOutputDev(splashModeRGB8, 1, gFalse, paperColor);
+-        mSplash->startDoc(mDocument->getXRef());
++        mSplash = new SplashOutputDev(splashModeRGB8, 1, false, paperColor);
++        mSplash->startDoc(mDocument);
+         int rotation = 0; // in degrees (get it from the worldTransform if we want to support rotation)
+-        GBool useMediaBox = gFalse;
+-        GBool crop = gTrue;
+-        GBool printing = gFalse;
++        bool useMediaBox = false;
++        bool crop = true;
++        bool printing = false;
+         mSliceX = 0.;
+         mSliceY = 0.;
+ 
+diff --git a/src/pdf/XPDFRenderer.h b/src/pdf/XPDFRenderer.h
+index 8ab200bc..003a2055 100644
+--- a/src/pdf/XPDFRenderer.h
++++ b/src/pdf/XPDFRenderer.h
+@@ -36,10 +36,10 @@
+ #include "globals/UBGlobals.h"
+ 
+ THIRD_PARTY_WARNINGS_DISABLE
+-#include <xpdf/Object.h>
+-#include <xpdf/GlobalParams.h>
+-#include <xpdf/SplashOutputDev.h>
+-#include <xpdf/PDFDoc.h>
++#include <poppler/Object.h>
++#include <poppler/GlobalParams.h>
++#include <poppler/SplashOutputDev.h>
++#include <poppler/PDFDoc.h>
+ THIRD_PARTY_WARNINGS_ENABLE
+ 
+ class PDFDoc;
diff --git a/quazip.diff b/quazip.diff
new file mode 100644
index 000000000000..7bc5a0f121c2
--- /dev/null
+++ b/quazip.diff
@@ -0,0 +1,35 @@
+--- OpenBoard-1.5.3/OpenBoard.pro	2019-04-10 09:04:25.000000000 +0200
++++ OpenBoard-1.5.3-quazip/OpenBoard.pro	2019-04-12 08:54:40.265598779 +0200
+@@ -71,9 +71,7 @@
+ INCLUDEPATH += plugins/cffadaptor/src
+ 
+ #ThirdParty
+-DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
+-INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
+-include($$THIRD_PARTY_PATH/quazip/quazip.pri)
++INCLUDEPATH += /usr/include/quazip5/
+ 
+ FORMS += resources/forms/mainWindow.ui \
+    resources/forms/preferences.ui \
+--- OpenBoard-1.5.3/plugins/cffadaptor/UBCFFAdaptor.pro	2019-04-10 09:04:25.000000000 +0200
++++ OpenBoard-1.5.3-quazip/plugins/cffadaptor/UBCFFAdaptor.pro	2019-04-12 08:53:45.622844493 +0200
+@@ -39,7 +38,7 @@
+     QMAKE_POST_LINK += bash postScript_mac.sh "$$DESTDIR" "$$SANKORE_DIR/$$BUILD_DIR/product/Open-Sankore.app/Contents/MacOS"
+ }
+ 
+-LIBS     += "-L$$THIRD_PARTY_PATH/quazip/lib/$$SUB_DIR" "-lquazip"
++LIBS     += "-lquazip5"
+ 
+ QT       += xml xmlpatterns core
+ QT       += gui
+@@ -51,9 +50,7 @@
+ 
+ INCLUDEPATH += src
+ 
+-DEPENDPATH  += $$THIRD_PARTY_PATH/quazip/
+-INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
+-include($$THIRD_PARTY_PATH/quazip/quazip.pri)
++INCLUDEPATH += /usr/include/quazip5/
+ 
+ 
+ SOURCES += \