summaryrefslogtreecommitdiffstats
path: root/academic/openboard
diff options
context:
space:
mode:
Diffstat (limited to 'academic/openboard')
-rw-r--r--academic/openboard/README3
-rw-r--r--academic/openboard/openboard.SlackBuild12
-rw-r--r--academic/openboard/openboard.info6
-rw-r--r--academic/openboard/quazip.patch19
-rw-r--r--academic/openboard/run-in-a-window.patch154
5 files changed, 18 insertions, 176 deletions
diff --git a/academic/openboard/README b/academic/openboard/README
index 22095c5feb..75711418bc 100644
--- a/academic/openboard/README
+++ b/academic/openboard/README
@@ -2,3 +2,6 @@ OpenBoard is an open source cross-platform teaching software for
interactive whiteboard designed primarily for use in schools and
universities. It can be used both with interactive whiteboards or
in a dual-screen setup with a pen-tablet display and a beamer.
+
+NOTE: Support for Qt6 is available upstream but not yet tested
+by maintainer.
diff --git a/academic/openboard/openboard.SlackBuild b/academic/openboard/openboard.SlackBuild
index 35027b03ed..46af39058c 100644
--- a/academic/openboard/openboard.SlackBuild
+++ b/academic/openboard/openboard.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for openboard
-# Copyright 2021-2022 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2021-2023 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=openboard
SRCNAM=OpenBoard
-VERSION=${VERSION:-1.6.3}
+VERSION=${VERSION:-1.7.1}
SRCVER=$(echo $VERSION | tr _ -)
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -50,16 +50,12 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2"
- LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
fi
set -e
@@ -87,9 +83,6 @@ sed -i "s|lquazip5|lquazip1-qt5|g" OpenBoard.pro
QUAZIPVER=`pkg-config --modversion quazip1-qt5`
sed -i "s|QuaZip-Qt5-1.1|QuaZip-Qt5-$QUAZIPVER|g" OpenBoard.pro plugins/cffadaptor/UBCFFAdaptor.pro
-# Patch to run in a window
-patch -p1 < $CWD/run-in-a-window.patch
-
qmake-qt5 OpenBoard.pro -spec linux-g++
make
@@ -106,6 +99,7 @@ install -D -m 644 $CWD/openboard.desktop $PKG/usr/share/applications/openboard.d
cd $PKG/usr/bin
ln -s /opt/openboard/OpenBoard $PKG/usr/bin/openboard
)
+strip --strip-unneeded /$PKG/opt/openboard/OpenBoard
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/academic/openboard/openboard.info b/academic/openboard/openboard.info
index 160870a41c..a21a6369a0 100644
--- a/academic/openboard/openboard.info
+++ b/academic/openboard/openboard.info
@@ -1,8 +1,8 @@
PRGNAM="openboard"
-VERSION="1.6.3"
+VERSION="1.7.1"
HOMEPAGE="https://github.com/OpenBoard-org/OpenBoard/"
-DOWNLOAD="https://github.com/OpenBoard-org/OpenBoard/archive/v1.6.3/OpenBoard-1.6.3.tar.gz"
-MD5SUM="a5ce73f56046569690baeae5b5ae45fa"
+DOWNLOAD="https://github.com/OpenBoard-org/OpenBoard/archive/v1.7.1/OpenBoard-1.7.1.tar.gz"
+MD5SUM="338d19d5fd281bf3c9a3bdfa51c2d241"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libpaper libass x264 libfdk-aac"
diff --git a/academic/openboard/quazip.patch b/academic/openboard/quazip.patch
index 782fbff72a..6a5cb79865 100644
--- a/academic/openboard/quazip.patch
+++ b/academic/openboard/quazip.patch
@@ -28,15 +28,14 @@
- resources/resources.qrc
\ No newline at end of file
+ resources/resources.qrc
---- OpenBoard-1.6.0a3/OpenBoard.pro.orig 2020-07-20 08:23:09.859918480 +0700
-+++ OpenBoard-1.6.0a3/OpenBoard.pro 2020-07-20 08:23:17.762002419 +0700
-@@ -434,7 +434,7 @@
- #LIBS += -lprofiler
- LIBS += -lX11
- LIBS += -lquazip5
-- INCLUDEPATH += "/usr/include/quazip5"
-+ INCLUDEPATH += "/usr/include/QuaZip-Qt5-1.1/quazip"
+--- OpenBoard-1.7.0/OpenBoard.pro.orig 2023-12-10 12:06:17.808153181 +0700
++++ OpenBoard-1.7.0/OpenBoard.pro 2023-12-10 12:10:09.448432404 +0700
+@@ -470,7 +470,7 @@
+ INCLUDEPATH += "/usr/include/quazip6"
+ } else {
+ LIBS += -lquazip5
+- INCLUDEPATH += "/usr/include/quazip5"
++ INCLUDEPATH += "/usr/include/QuaZip-Qt5-1.1/quazip"
+ }
LIBS += -lpoppler
- INCLUDEPATH += "/usr/include/poppler"
-
diff --git a/academic/openboard/run-in-a-window.patch b/academic/openboard/run-in-a-window.patch
deleted file mode 100644
index 84c9cca3eb..0000000000
--- a/academic/openboard/run-in-a-window.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Patch for OpenBoard v. 1.6.0a3 by Roberto Puzzanghera roberto.puzzanghera at sagredo.eu
-based on this patch http://webdiis.unizar.es/~spd/openboard/index.html.en
-
-OpenBoard runs in fullscreen mode. This seems to prevent the possibility to be recognized
-by Google meet as an application to share. This patch gets OpenBoard to optionally run in
-a window and solves the issue.
-
-With this patch OB runs in fullscreen mode by default. To run it in a window simply
-adjust this option to true in the config file:
-
-RunInWindow=true
-
-On linux the location of the config file is /opt/openboard/etc/OpenBoard.config. A user
-can override this file acting in local config file ~/.local/share/OpenBoard/OpenBoardUser.config
-
-=============================================================================================
-
-diff -ruN OpenBoard-1.6.0a3-original/OpenBoard.pro OpenBoard-1.6.0a3/OpenBoard.pro
---- OpenBoard-1.6.0a3-original/OpenBoard.pro 2020-05-22 18:40:49.000000000 +0200
-+++ OpenBoard-1.6.0a3/OpenBoard.pro 2020-10-24 10:58:50.421254271 +0200
-@@ -442,6 +442,10 @@
- QMAKE_CFLAGS += -fopenmp
- QMAKE_CXXFLAGS += -fopenmp
- QMAKE_LFLAGS += -fopenmp
-+# RunInWindow patch
-+ # Necessary for CentOS/RHEL and won't harm in other distributions
-+ INCLUDEPATH += /usr/include/ffmpeg
-+# end patch
- UB_LIBRARY.path = $$DESTDIR
- UB_I18N.path = $$DESTDIR/i18n
- UB_ETC.path = $$DESTDIR
-diff -ruN OpenBoard-1.6.0a3-original/resources/etc/OpenBoard.config OpenBoard-1.6.0a3/resources/etc/OpenBoard.config
---- OpenBoard-1.6.0a3-original/resources/etc/OpenBoard.config 2020-05-22 18:40:49.000000000 +0200
-+++ OpenBoard-1.6.0a3/resources/etc/OpenBoard.config 2020-10-24 10:59:50.005263852 +0200
-@@ -14,6 +14,7 @@
- PageCacheSize=20
- PreferredLanguage=fr_CH
- ProductWebAddress=http://www.openboard.ch
-+RunInWindow=false
- SoftwareUpdateURL=http://www.openboard.ch/update.json
- StartMode=
- SwapControlAndDisplayScreens=false
-diff -ruN OpenBoard-1.6.0a3-original/src/core/UBApplication.cpp OpenBoard-1.6.0a3/src/core/UBApplication.cpp
---- OpenBoard-1.6.0a3-original/src/core/UBApplication.cpp 2020-05-22 18:40:49.000000000 +0200
-+++ OpenBoard-1.6.0a3/src/core/UBApplication.cpp 2020-10-24 11:03:09.881941449 +0200
-@@ -277,8 +277,21 @@
- gs->setAttribute(QWebSettings::JavascriptCanAccessClipboard, true);
- gs->setAttribute(QWebSettings::DnsPrefetchEnabled, true);
-
-+ /* RunInWindow patch */
-+ if (UBSettings::settings()->appRunInWindow->get().toBool()) {
-+ mainWindow = new UBMainWindow(0,
-+ Qt::Window |
-+ Qt::WindowCloseButtonHint |
-+ Qt::WindowMinimizeButtonHint |
-+ Qt::WindowMaximizeButtonHint |
-+ Qt::WindowShadeButtonHint
-+ ); // deleted by application destructor
-+ } else {
-+ mainWindow = new UBMainWindow(0, Qt::FramelessWindowHint); // deleted by application destructor
-+ }
-+ /* mainWindow = new UBMainWindow(0, Qt::FramelessWindowHint); // deleted by application destructor */
-+ /* end patch */
-
-- mainWindow = new UBMainWindow(0, Qt::FramelessWindowHint); // deleted by application destructor
- mainWindow->setAttribute(Qt::WA_NativeWindow, true);
-
- mainWindow->actionCopy->setShortcuts(QKeySequence::Copy);
-diff -ruN OpenBoard-1.6.0a3-original/src/core/UBSettings.cpp OpenBoard-1.6.0a3/src/core/UBSettings.cpp
---- OpenBoard-1.6.0a3-original/src/core/UBSettings.cpp 2020-05-22 18:40:49.000000000 +0200
-+++ OpenBoard-1.6.0a3/src/core/UBSettings.cpp 2020-10-24 11:02:43.074387051 +0200
-@@ -265,6 +265,9 @@
- appLookForOpenSankoreInstall = new UBSetting(this, "App", "LookForOpenSankoreInstall", true);
-
- appStartMode = new UBSetting(this, "App", "StartMode", "");
-+ /* RunInWindow patch */
-+ appRunInWindow = new UBSetting(this, "App", "RunInWindow", false);
-+ /* end patch */
-
- featureSliderPosition = new UBSetting(this, "Board", "FeatureSliderPosition", 40);
-
-diff -ruN OpenBoard-1.6.0a3-original/src/core/UBSettings.h OpenBoard-1.6.0a3/src/core/UBSettings.h
---- OpenBoard-1.6.0a3-original/src/core/UBSettings.h 2020-05-22 18:40:49.000000000 +0200
-+++ OpenBoard-1.6.0a3/src/core/UBSettings.h 2020-10-24 11:06:13.206894166 +0200
-@@ -260,7 +260,9 @@
- UBSetting* appHideSwapDisplayScreens;
- UBSetting* appToolBarOrientationVertical;
- UBSetting* appPreferredLanguage;
--
-+ /* RunInWindow patch */
-+ UBSetting* appRunInWindow;
-+ /* end patch */
- UBSetting* appIsInSoftwareUpdateProcess;
-
- UBSetting* appLastSessionDocumentUUID;
-diff -ruN OpenBoard-1.6.0a3-original/src/frameworks/UBPlatformUtils_linux.cpp OpenBoard-1.6.0a3/src/frameworks/UBPlatformUtils_linux.cpp
---- OpenBoard-1.6.0a3-original/src/frameworks/UBPlatformUtils_linux.cpp 2020-05-22 18:40:49.000000000 +0200
-+++ OpenBoard-1.6.0a3/src/frameworks/UBPlatformUtils_linux.cpp 2020-10-24 11:00:43.708371185 +0200
-@@ -36,7 +36,9 @@
- #include <X11/keysym.h>
-
- #include "frameworks/UBFileSystemUtils.h"
--
-+/* RunInWindow patch */
-+#include "core/UBSettings.h"
-+/* end patch */
-
- void UBPlatformUtils::init()
- {
-@@ -439,7 +441,14 @@
-
- void UBPlatformUtils::showFullScreen(QWidget *pWidget)
- {
-- pWidget->showFullScreen();
-+ /* RunInWindow patch */
-+ /* pWidget->showFullScreen(); */
-+ if (UBSettings::settings()->appRunInWindow->get().toBool()) {
-+ pWidget->showNormal();
-+ } else {
-+ pWidget->showFullScreen();
-+ }
-+ /* end patch */
- }
-
- void UBPlatformUtils::showOSK(bool show)
-diff -ruN OpenBoard-1.6.0a3-original/src/frameworks/UBPlatformUtils_win.cpp OpenBoard-1.6.0a3/src/frameworks/UBPlatformUtils_win.cpp
---- OpenBoard-1.6.0a3-original/src/frameworks/UBPlatformUtils_win.cpp 2020-05-22 18:40:49.000000000 +0200
-+++ OpenBoard-1.6.0a3/src/frameworks/UBPlatformUtils_win.cpp 2020-10-24 11:01:26.170665369 +0200
-@@ -36,6 +36,9 @@
-
- #include "frameworks/UBFileSystemUtils.h"
- #include "core/memcheck.h"
-+/* RunInWindow patch */
-+#include "core/UBSettings.h"
-+/* end patch */
-
- void UBPlatformUtils::init()
- {
-@@ -436,7 +439,14 @@
-
- void UBPlatformUtils::showFullScreen(QWidget *pWidget)
- {
-- pWidget->showFullScreen();
-+ /* RunInWindow patch */
-+ /* pWidget->showFullScreen(); */
-+ if (UBSettings::settings()->appRunInWindow->get().toBool()) {
-+ pWidget->showNormal();
-+ } else {
-+ pWidget->showFullScreen();
-+ }
-+ /* end patch */
- }
-
- void UBPlatformUtils::showOSK(bool show)
generated by cgit v1.2.3 (git 2.32.0) at 2024-06-21 16:37:08 +0200