Update to 1.7.0-3: Fix startupHints, remove obsolete dependencies and patches. Thanks to Vekhir!

3 files changed, 6 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f62869cabebb..7869933da749 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openboard
 	pkgdesc = Interactive whiteboard software for schools and universities
 	pkgver = 1.7.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://openboard.ch/index.en.html
 	arch = x86_64
 	arch = i686
@@ -11,7 +11,6 @@ pkgbase = openboard
 	depends = qt5-multimedia
 	depends = qt5-svg
 	depends = qt5-script
-	depends = qt5-webkit
 	depends = qt5-tools
 	depends = qt5-xmlpatterns
 	depends = qt5-webengine
@@ -20,7 +19,7 @@ pkgbase = openboard
 	depends = openssl
 	depends = libfdk-aac
 	depends = sdl
-	depends = ffmpeg4.4
+	depends = ffmpeg
 	depends = quazip
 	depends = poppler
 	source = https://github.com/OpenBoard-org/OpenBoard/archive/v1.7.0.tar.gz
@@ -28,12 +27,10 @@ pkgbase = openboard
 	source = qchar.patch
 	source = quazip.patch
 	source = drop_ThirdParty_repo.patch
-	source = ffmpeg.patch
 	sha256sums = 03b5e6f728339528b8580542302f1d80567f814b10cb94b83df9c996eca125a3
 	sha256sums = 64289f9d91cb25fa79fb988f19d43a542d67380fcf27668d0da1ee4ba1e705eb
 	sha256sums = b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549
 	sha256sums = 7e790bc63831b611a6c068d3208f16cf3fff5294b69ccd6a0592d64538c7d493
 	sha256sums = a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14
-	sha256sums = b2c8d92275c976af195f1b8f8df0ae1a61781a1c20ccc10b41fdc81178427bd3
 
 pkgname = openboard
diff --git a/PKGBUILD b/PKGBUILD
index f87a2a69467e..fc2b0763fa8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 pkgname=openboard
 pkgver=1.7.0
 _src_folder="OpenBoard-${pkgver}"
-pkgrel=2
+pkgrel=3
 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' 'qt5-tools' 'qt5-xmlpatterns' 'qt5-webengine' 'libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg4.4')
+depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-tools' 'qt5-xmlpatterns' 'qt5-webengine' '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
 makedepends=('patch')
@@ -17,13 +17,11 @@ source=("https://github.com/OpenBoard-org/OpenBoard/archive/v${pkgver}.tar.gz"
 source+=(qchar.patch)
 source+=(quazip.patch)
 source+=(drop_ThirdParty_repo.patch)
-source+=(ffmpeg.patch)
 sha256sums=('03b5e6f728339528b8580542302f1d80567f814b10cb94b83df9c996eca125a3'
             '64289f9d91cb25fa79fb988f19d43a542d67380fcf27668d0da1ee4ba1e705eb'
             'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549'
             '7e790bc63831b611a6c068d3208f16cf3fff5294b69ccd6a0592d64538c7d493'
-            'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14'
-            'b2c8d92275c976af195f1b8f8df0ae1a61781a1c20ccc10b41fdc81178427bd3')
+            'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14')
 
 prepare() {
   cd "$srcdir"/$_src_folder
@@ -35,8 +33,6 @@ prepare() {
   patch -f -p1 < "$srcdir"/quazip.patch
   msg2 "gcc11"
   sed 's/_serialize/serialize/g' -i src/pdf-merger/Object.{h,cpp}
-  msg2 "ffpmeg"
-  patch -f -p1 < "$srcdir"/ffmpeg.patch
 }
 
 build() {
@@ -51,7 +47,7 @@ package() {
   cd "$srcdir"/$_src_folder
 
   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/
+  cp -rp "$srcdir"/$_src_folder/resources/{customizations,etc,i18n,library,startupHints} -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/
diff --git a/ffmpeg.patch b/ffmpeg.patch
deleted file mode 100644
index 295cb59120cf..000000000000
--- a/ffmpeg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/podcast/podcast.pri	2021-04-13 19:05:29.000000000 +0200
-+++ b/src/podcast/podcast.pri	2022-03-22 08:34:21.095697431 +0100
-@@ -59,8 +59,9 @@
- 
- 
-     DEPENDPATH += /usr/lib/x86_64-linux-gnu
-+    INCLUDEPATH += /usr/include/ffmpeg4.4
- 
--    LIBS += -lavformat -lavcodec -lswscale -lavutil \
-+    LIBS += -L/usr/lib/ffmpeg4.4 -lavformat -lavcodec -lswscale -lavutil \
-             -lva-x11 \
-             -lva \
-             -lxcb-shm \