diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | quazip.patch | 11 |
3 files changed, 29 insertions, 19 deletions
@@ -6,21 +6,21 @@ pkgbase = openboard-develop arch = x86_64 arch = i686 license = GPL3 - depends = qt5-base - depends = qt5-multimedia - depends = qt5-svg - depends = qt5-script - depends = qt5-webkit - depends = qt5-tools - depends = qt5-xmlpatterns - depends = qt5-webengine + makedepends = patch + makedepends = qt6-tools + depends = qt6-base + depends = qt6-declarative + depends = qt6-multimedia + depends = qt6-svg + depends = qt6-webchannel + depends = qt6-webengine depends = libpaper depends = bzip2 depends = openssl depends = libfdk-aac depends = sdl depends = ffmpeg - depends = quazip-qt5 + depends = quazip-qt6 depends = poppler provides = openboard=1.7.1 conflicts = openboard @@ -1,6 +1,8 @@ #!/hint/bash # Maintainer: bartus <arch-user-repoᘓbartus.33mail.com> +## Configuration env vars: +((ENABLE_QT5)) && qt="qt5" || qt="qt6" pkgname=openboard-develop _pkgver=1.7.1rc-240202 @@ -13,9 +15,11 @@ url="http://openboard.ch/index.en.html" license=('GPL3') provides=("${pkgname%-develop}=${pkgver}") conflicts=("${pkgname%-develop}") -depends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'qt5-script' 'qt5-webkit' 'qt5-tools' 'qt5-xmlpatterns' 'qt5-webengine' 'libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg') -depends+=(quazip-qt5) #drop internal quazip and use system one. +depends+=(${qt}-{base,declarative,multimedia,svg,webchannel,webengine}) +depends+=('libpaper' 'bzip2' 'openssl' 'libfdk-aac' 'sdl' 'ffmpeg') +depends+=(quazip-${qt}) #drop internal quazip and use system one. depends+=(poppler) #replace internal xpdf with poppler and drop freetype/xpdf from deps +makedepends=('patch' ${qt}-tools) source=("openboard_v${_pkgver}.tar.gz::https://github.com/OpenBoard-org/OpenBoard/archive/v${_pkgver}.tar.gz" openboard.desktop) source+=(qchar.patch) @@ -24,17 +28,17 @@ source+=(drop_ThirdParty_repo.patch) sha256sums=('99cef28d0b40f2f7904552456f26c4c3f8a653088e2f189c5036f4a8bf26e43c' '18ee4fab83b0c92490c81c2aaace98f669d07d7260cc0f83a24acb8d6224e5e7' 'b40fdab85f5921d0404c07db64628a2428a87d39193d2797bbef2e69b1d51549' - 'da603ed16eb15cb81f641aaf669963553f16c823688eb27b788d36892edb35b2' + '1ebd1025762ac97fa47ddcfae8d10a68bb6499d79c1f36dff52f6a10a1e3fa74' 'a6a9bc1f9c9bee0345b735fcf422245ae7946f96f6c34520dd63530a98978c14') prepare() { cd "$srcdir"/$_src_folder msg2 "drop_ThirdParty_repo" - patch -p1 < "$srcdir"/drop_ThirdParty_repo.patch + patch -f -p1 < "$srcdir"/drop_ThirdParty_repo.patch msg2 "qchar" - patch -p1 < "$srcdir"/qchar.patch + patch -f -p1 < "$srcdir"/qchar.patch msg2 "quazip" - patch -p1 < "$srcdir"/quazip.patch + patch -f -p1 < "$srcdir"/quazip.patch msg2 "gcc11" sed 's/_serialize/serialize/g' -i src/pdf-merger/Object.{h,cpp} } @@ -42,6 +46,7 @@ prepare() { build() { cd "$srcdir"/$_src_folder # convert translations to binary form + ((ENABLE_QT5)) || export PATH="/usr/lib/qt6/bin/:$PATH" lrelease OpenBoard.pro qmake OpenBoard.pro -spec linux-g++ make @@ -51,7 +56,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/quazip.patch b/quazip.patch index b0d65d4dca1b..8b76c23ef677 100644 --- a/quazip.patch +++ b/quazip.patch @@ -1,8 +1,13 @@ --- OpenBoard-1.7.1rc-240202/OpenBoard.pro 2024-02-02 14:42:21.000000000 +0100 +++ OpenBoard-1.7.1rc-240202.new/OpenBoard.pro 2024-03-12 15:11:04.682694326 +0100 -@@ -465,8 +465,8 @@ - LIBS += -lquazip6 - INCLUDEPATH += "/usr/include/quazip6" +@@ -462,11 +462,11 @@ + LIBS += -lX11 + + greaterThan(QT_MAJOR_VERSION, 5) { +- LIBS += -lquazip6 +- INCLUDEPATH += "/usr/include/quazip6" ++ LIBS += "-lquazip1-qt6" ++ INCLUDEPATH += /usr/include/QuaZip-Qt6-1.4/quazip } else { - LIBS += -lquazip5 - INCLUDEPATH += "/usr/include/quazip5" |