Unify with openboard-develop

5 files changed, 65 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c45566f593b9..5c1fbe64948b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = openboard
 	pkgdesc = Interactive whiteboard software for schools and universities
-	pkgver = 1.5.4
-	pkgrel = 3
+	pkgver = 1.6.1
+	pkgrel = 1
 	url = http://openboard.ch/index.en.html
-	install = openboard.install
 	arch = x86_64
 	arch = i686
 	license = GPL3
@@ -22,20 +21,16 @@ pkgbase = openboard
 	depends = ffmpeg
 	depends = quazip
 	depends = poppler
-	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.5.4.tar.gz
-	source = qchar.patch
-	source = qwebkit.patch
+	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.6.1.tar.gz
 	source = openboard.desktop
+	source = qchar.patch
 	source = quazip.patch
-	source = poppler.patch
 	source = drop_ThirdParty_repo.patch
-	md5sums = 6eb3a76c7ac58f3f45c879b2f305d4b6
-	md5sums = bf2c524f3897cfcfb4315bcd92d4206e
-	md5sums = 60f64db6bf627015f4747879c4b30fd3
-	md5sums = 21d1749400802f8fc0669feaf77de683
-	md5sums = 6f97253e0d8e6eafe8ef4ffe6af6ab95
-	md5sums = 9a8f9ec3b244390b4c17a10494a94d29
-	md5sums = 879116c683374b2dde291014e44a29fe
+	sha256sums = cf5bfb570b9ac4e61e1670c5a433f1dcaf0de1e8dbcbd544f058711690afba79
+	sha256sums = 00688af02006bddeab797f624e5cbae66a5c02f4e14315d87d3f198f74797c17
+	sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
+	sha256sums = 8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7
+	sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14
 
 pkgname = openboard
 
diff --git a/PKGBUILD b/PKGBUILD
index 89f561ba0c9e..998f66e864b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,52 @@
 # Maintainer: Frank Siegert <frank.siegert@googlemail.com>
 # Contributor: bartus <arch-user-repoᘓbartus.33mail.com>
 pkgname=openboard
-pkgver=1.5.4
-pkgrel=3
+pkgver=1.6.1
+_src_folder="OpenBoard-${pkgver}"
+pkgrel=1
 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"
-        qchar.patch
-        qwebkit.patch
+source=("https://github.com/OpenBoard-org/OpenBoard/archive/v${pkgver}.tar.gz"
         openboard.desktop)
+source+=(qchar.patch)
 source+=(quazip.patch)
-source+=(poppler.patch)
 source+=(drop_ThirdParty_repo.patch)
-md5sums=('6eb3a76c7ac58f3f45c879b2f305d4b6'
-         'bf2c524f3897cfcfb4315bcd92d4206e'
-         '60f64db6bf627015f4747879c4b30fd3'
-         '21d1749400802f8fc0669feaf77de683'
-         '6f97253e0d8e6eafe8ef4ffe6af6ab95'
-         '9a8f9ec3b244390b4c17a10494a94d29'
-         '879116c683374b2dde291014e44a29fe')
+sha256sums=('cf5bfb570b9ac4e61e1670c5a433f1dcaf0de1e8dbcbd544f058711690afba79'
+            '00688af02006bddeab797f624e5cbae66a5c02f4e14315d87d3f198f74797c17'
+            'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
+            '8c0b28ebd6cade0a551b695af9c04a2c45052f2d955357825b3be97bf00d5be7'
+            'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14')
 
 prepare() {
-  cd $srcdir/OpenBoard-$pkgver
-  patch -p1 < $srcdir/drop_ThirdParty_repo.patch
-  patch -p1 < $srcdir/qchar.patch
-  patch -p1 < $srcdir/qwebkit.patch
-  patch -p1 < $srcdir/quazip.patch
-  patch -p1 < $srcdir/poppler.patch
+  cd "$srcdir"/$_src_folder
+  msg2 "drop_ThirdParty_repo"
+  patch -p1 < "$srcdir"/drop_ThirdParty_repo.patch
+  msg2 "qchar"
+  patch -p1 < "$srcdir"/qchar.patch
+  msg2 "quazip"
+  patch -p1 < "$srcdir"/quazip.patch
 }
 
 build() {
-  cd "$srcdir/OpenBoard-$pkgver"
+  cd "$srcdir"/$_src_folder
+# convert translations to binary form
+  lrelease OpenBoard.pro
   qmake OpenBoard.pro -spec linux-g++
   make
 }
 
 package() {
-  cd "$srcdir/OpenBoard-$pkgver"
+  cd "$srcdir"/$_src_folder
 
-  mkdir -p $pkgdir/opt/openboard
-
-  for i in customizations etc i18n library; do
-    cp -rp $srcdir/OpenBoard-$pkgver/resources/$i $pkgdir/opt/openboard;
-  done
-
-  cp -rp $srcdir/OpenBoard-$pkgver/resources/images/OpenBoard.png $pkgdir/opt/openboard/
-  cp -rp build/linux/release/product/OpenBoard $pkgdir/opt/openboard/
-
-  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
+  install -Dm755 build/linux/release/product/OpenBoard -t "$pkgdir"/opt/openboard/
+  cp -rp "$srcdir"/$_src_folder/resources/{customizations,etc,i18n,library} -t "$pkgdir"/opt/openboard/
+  install -Dm644 "$srcdir"/$_src_folder/resources/images/OpenBoard.png -t "$pkgdir"/usr/share/icons/hicolor/64x64/apps/
+  install -Dm644 "$srcdir"/openboard.desktop -t "$pkgdir"/usr/share/applications/
+  install -dm755 "$pkgdir"/usr/bin/
+  ln -s /opt/openboard/OpenBoard "$pkgdir"/usr/bin/openboard
 }
diff --git a/drop_ThirdParty_repo.patch b/drop_ThirdParty_repo.patch
index 058ede8829f8..91a0b1315d01 100644
--- a/drop_ThirdParty_repo.patch
+++ b/drop_ThirdParty_repo.patch
@@ -74,15 +74,3 @@ diff -Naur OpenBoard-1.5.3/libs.pri OpenBoard-1.5.3-new/libs.pri
 +}
 +
 +
-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
deleted file mode 100644
index d061748130f3..000000000000
--- a/openboard.install
+++ /dev/null
@@ -1,14 +0,0 @@
-
-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/quazip.patch b/quazip.patch
index 598b55284eac..7e1c554132e5 100644
--- a/quazip.patch
+++ b/quazip.patch
@@ -1,19 +1,31 @@
---- 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/QuaZip-Qt5-1.1/quazip
- 
- 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 @@
+diff -Naur OpenBoard-1.6.0a3.orig/OpenBoard.pro OpenBoard-1.6.0a3/OpenBoard.pro
+--- OpenBoard-1.6.0a3.orig/OpenBoard.pro	2020-05-22 18:40:49.000000000 +0200
++++ OpenBoard-1.6.0a3/OpenBoard.pro	2020-10-12 07:26:16.628748656 +0200
+@@ -433,8 +431,8 @@
+     LIBS += -lcrypto
+     #LIBS += -lprofiler
+     LIBS += -lX11
+-    LIBS += -lquazip5
+-    INCLUDEPATH += "/usr/include/quazip"
++    LIBS += "-lquazip1-qt5"
++    INCLUDEPATH += /usr/include/QuaZip-Qt5-1.1/quazip
+ 
+     LIBS += -lpoppler
+     INCLUDEPATH += "/usr/include/poppler"
+diff -Naur OpenBoard-1.6.0a3.orig/plugins/cffadaptor/UBCFFAdaptor.pro OpenBoard-1.6.0a3/plugins/cffadaptor/UBCFFAdaptor.pro
+--- OpenBoard-1.6.0a3.orig/plugins/cffadaptor/UBCFFAdaptor.pro	2020-05-22 18:40:49.000000000 +0200
++++ OpenBoard-1.6.0a3/plugins/cffadaptor/UBCFFAdaptor.pro	2020-10-12 07:20:08.496096917 +0200
+@@ -13,9 +13,6 @@
+ linux-g++-32: SUB_DIR = linux
+ linux-g++-64: SUB_DIR = linux
+ 
+-THIRD_PARTY_PATH = ../../../Sankore-ThirdParty
+-QUAZIP_DIR   = "$$PWD/../../../Sankore-ThirdParty/quazip/quazip-0.3"
+-
+ BUILD_DIR = build/$$SUB_DIR
+ CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
+ CONFIG(release, debug|release) {
+@@ -39,7 +36,7 @@
      QMAKE_POST_LINK += bash postScript_mac.sh "$$DESTDIR" "$$SANKORE_DIR/$$BUILD_DIR/product/Open-Sankore.app/Contents/MacOS"
  }
  
@@ -22,7 +34,7 @@
  
  QT       += xml xmlpatterns core
  QT       += gui
-@@ -51,9 +50,7 @@
+@@ -51,9 +48,7 @@
  
  INCLUDEPATH += src