From 67e2390c12bb3503be1ce53048b9835114020d17 Mon Sep 17 00:00:00 2001 From: Valentin Bruch Date: Sun, 1 Sep 2024 23:41:24 +0200 Subject: [PATCH] updated version number: 0.2.5 --- .github/workflows/MSYS2.yml | 7 +++---- CHANGELOG.md | 2 +- CMakeLists.txt | 2 +- INSTALL.md | 8 ++++---- README.md | 12 +++++++----- man/beamerpresenter-ui.5 | 2 +- man/beamerpresenter.1 | 2 +- man/beamerpresenter.conf.5 | 2 +- packaging/PKGBUILD_MSYS2 | 7 +++++-- packaging/PKGBUILD_MSYS2_git | 7 +++++-- packaging/PKGBUILD_mupdf | 4 ++-- packaging/PKGBUILD_poppler | 4 ++-- packaging/README.md | 6 +++--- ...thub.stiglers_eponym.BeamerPresenter.metainfo.xml | 1 + 14 files changed, 37 insertions(+), 29 deletions(-) diff --git a/.github/workflows/MSYS2.yml b/.github/workflows/MSYS2.yml index 89238e93..9e81c9d6 100644 --- a/.github/workflows/MSYS2.yml +++ b/.github/workflows/MSYS2.yml @@ -17,9 +17,8 @@ jobs: - { sys: mingw64, env: x86_64, renderer: mupdf, poppler: OFF, mupdf: ON, qt: 6, icon: '🟦' } - { sys: ucrt64, env: ucrt-x86_64, renderer: poppler, poppler: ON, mupdf: OFF, qt: 6, icon: '🟨' } - { sys: ucrt64, env: ucrt-x86_64, renderer: mupdf, poppler: OFF, mupdf: ON, qt: 6, icon: '🟨' } - # On clang64, beamerpresenter always crashes with segmentation fault. - #- { sys: clang64, env: clang-x86_64, renderer: poppler, poppler: ON, mupdf: OFF, qt: 6, icon: '🟧' } - #- { sys: clang64, env: clang-x86_64, renderer: mupdf, poppler: OFF, mupdf: ON, qt: 6, icon: '🟧' } + - { sys: clang64, env: clang-x86_64, renderer: poppler, poppler: ON, mupdf: OFF, qt: 6, icon: '🟧' } + - { sys: clang64, env: clang-x86_64, renderer: mupdf, poppler: OFF, mupdf: ON, qt: 6, icon: '🟧' } name: 🚧${{ matrix.icon }} ${{ matrix.sys }} ${{ matrix.renderer }} qt${{ matrix.qt }} | makepkg defaults: run: @@ -47,7 +46,7 @@ jobs: run: | cp packaging/PKGBUILD_MSYS2_git . dos2unix PKGBUILD_MSYS2_git - if [ ${{ matrix.sys }} != clang64 ]; then pacman -S --noconfirm --noprogressbar mingw-w64-${{ matrix.env }}-gcc; fi + if [ ${{ matrix.sys }} != clang64 ]; then pacman -S --noconfirm --noprogressbar mingw-w64-${{ matrix.env }}-gcc; else pacman -S --noconfirm --noprogressbar mingw-w64-${{ matrix.env }}-clang; fi makepkg-mingw --noconfirm --noprogressbar -sCLfp PKGBUILD_MSYS2_git - name: '📤 Upload artifact: package' diff --git a/CHANGELOG.md b/CHANGELOG.md index 71f135f7..f5abb24e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Changelog -## 0.2.5 (upcoming) +## 0.2.5 * embedded videos: play media files embedded in the PDF file (experimental) * bug fixes (includes crash on multi-touch) * page labels available in Qt PDF version diff --git a/CMakeLists.txt b/CMakeLists.txt index dff9f1ca..289aa04c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) project(beamerpresenter - VERSION 0.2.4 + VERSION 0.2.5 DESCRIPTION "Multi-screen PDF presentation viewer" HOMEPAGE_URL "https://github.com/stiglers-eponym/BeamerPresenter" LANGUAGES CXX) diff --git a/INSTALL.md b/INSTALL.md index b1b2641a..5d76e1d0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -8,13 +8,13 @@ The [releases](https://github.com/stiglers-eponym/BeamerPresenter/releases) incl These packages can be installed as shown in the following example, which uses Poppler as PDF engine (after downloading the corresponding file): ```sh # Ubuntu 24.04: -sudo apt install ./beamerpresenter-poppler-0.2.4-qt6-noble-x86_64.deb +sudo apt install ./beamerpresenter-poppler-0.2.5-qt6-noble-x86_64.deb # Ubuntu 22.04: -sudo apt install ./beamerpresenter-poppler-0.2.4-qt5-jammy-x86_64.deb +sudo apt install ./beamerpresenter-poppler-0.2.5-qt5-jammy-x86_64.deb # Ubuntu 20.04: -sudo apt install ./beamerpresenter-poppler-0.2.4-qt5-focal-x86_64.deb +sudo apt install ./beamerpresenter-poppler-0.2.5-qt5-focal-x86_64.deb # Arch/Manjaro/Endeavour -sudo pacman -U beamerpresenter-poppler-qt6-0.2.4-1-x86_64.pkg.tar.zst +sudo pacman -U beamerpresenter-poppler-qt6-0.2.5-1-x86_64.pkg.tar.zst # Flatpak flatpak install org.kde.Platform/x86_64/6.5 # can be skipped if already installed flatpak install BeamerPresenter-Qt6.flatpak diff --git a/README.md b/README.md index ab8c775b..8a48d509 100644 --- a/README.md +++ b/README.md @@ -53,14 +53,16 @@ More details can be found in the [installation manual](INSTALL.md). BeamerPresenter can be found in the [Nix repositories](https://search.nixos.org/packages?channel=unstable&type=packages&query=BeamerPresenter) and [in the AUR](https://aur.archlinux.org/packages/beamerpresenter) (for Arch/Manjaro/Endeavour, also as a [mainline version](https://aur.archlinux.org/packages/beamerpresenter-git)). The [releases](https://github.com/stiglers-eponym/BeamerPresenter/releases) come with packages for Arch/Manjaro/Endeavour, Ubuntu 20.04 / 22.04, and flatpak. -For example, the commands for installing BeamerPresenter with Poppler as PDF engine and Qt 5 after downloading the corresponding file are: +For example, the commands for installing BeamerPresenter with Poppler as PDF engine after downloading the corresponding file are: ```sh -# Ubuntu 20.04: -sudo apt install ./beamerpresenter-poppler-0.2.4-qt5-focal-x86_64.deb +# Ubuntu 24.04: +sudo apt install ./beamerpresenter-poppler-0.2.5-qt6-noble-x86_64.deb # Ubuntu 22.04: -sudo apt install ./beamerpresenter-poppler-0.2.4-qt5-jammy-x86_64.deb +sudo apt install ./beamerpresenter-poppler-0.2.5-qt5-jammy-x86_64.deb +# Ubuntu 20.04: +sudo apt install ./beamerpresenter-poppler-0.2.5-qt5-focal-x86_64.deb # Arch/Manjaro: -sudo pacman -U beamerpresenter-poppler-qt5-0.2.4-1-x86_64.pkg.tar.zst +sudo pacman -U beamerpresenter-poppler-qt5-0.2.5-1-x86_64.pkg.tar.zst # Flatpak: flatpak install org.kde.Platform/x86_64/5.15-21.08 # can be skipped if already installed flatpak install beamerpresenter-qt5.flatpak diff --git a/man/beamerpresenter-ui.5 b/man/beamerpresenter-ui.5 index b076c846..2235d342 100644 --- a/man/beamerpresenter-ui.5 +++ b/man/beamerpresenter-ui.5 @@ -1,4 +1,4 @@ -.TH beamerpresenter-ui 5 "2024-08-25" "0.2.4" +.TH beamerpresenter-ui 5 "2024-08-25" "0.2.5" . .SH NAME beamerpresenter-ui \- user interface of BeamerPresenter diff --git a/man/beamerpresenter.1 b/man/beamerpresenter.1 index f0e88d85..a7650a73 100644 --- a/man/beamerpresenter.1 +++ b/man/beamerpresenter.1 @@ -1,4 +1,4 @@ -.TH BeamerPresenter 1 "2024-09-01" "0.2.4" +.TH BeamerPresenter 1 "2024-09-01" "0.2.5" . .SH NAME BeamerPresenter \- modular multi-screen PDF presenter diff --git a/man/beamerpresenter.conf.5 b/man/beamerpresenter.conf.5 index 35f0ab7e..355afb06 100644 --- a/man/beamerpresenter.conf.5 +++ b/man/beamerpresenter.conf.5 @@ -1,4 +1,4 @@ -.TH beamerpresenter.conf 5 "2024-09-01" "0.2.4" +.TH beamerpresenter.conf 5 "2024-09-01" "0.2.5" . .SH NAME beamerpresenter.conf \- configuration file for BeamerPresenter diff --git a/packaging/PKGBUILD_MSYS2 b/packaging/PKGBUILD_MSYS2 index 57843c23..a064bf08 100644 --- a/packaging/PKGBUILD_MSYS2 +++ b/packaging/PKGBUILD_MSYS2 @@ -17,7 +17,7 @@ fi _basename='beamerpresenter' _pkgname="${_basename}${_renderer}-qt${_qt_version_major}" pkgname="${MINGW_PACKAGE_PREFIX}-${_pkgname}" -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="Modular multi-screen pdf presenter (mingw-w64)" arch=('any') @@ -30,7 +30,7 @@ provides=("beamerpresenter=${pkgver}") conflicts=('beamerpresenter') backup=("etc/xdg/beamerpresenter/beamerpresenter.conf" "etc/xdg/beamerpresenter/gui.json") source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz") -sha256sums=('4ccdd747b2c829411de3f33548a125f8e7f16a768e03f56f71bd6b3f27f5bca1') +sha256sums=('SKIP') if [ "${_use_mupdf}" == 'ON' ] then @@ -59,6 +59,9 @@ build() { -DUSE_EXTERNAL_RENDERER=OFF \ -DUSE_TRANSLATIONS=ON \ -DINSTALL_LICENSE=ON \ + -DLINK_MUPDF_THIRD=ON \ + -DLINK_MUJS=OFF \ + -DLINK_GUMBO=ON \ -DQT_VERSION_MAJOR="${_qt_version_major}" \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ -DCMAKE_INSTALL_SYSCONFDIR="/etc" diff --git a/packaging/PKGBUILD_MSYS2_git b/packaging/PKGBUILD_MSYS2_git index 5efdebcd..bd4975c4 100644 --- a/packaging/PKGBUILD_MSYS2_git +++ b/packaging/PKGBUILD_MSYS2_git @@ -17,7 +17,7 @@ fi _basename='beamerpresenter' _pkgname="${_basename}${_renderer}-qt${_qt_version_major}-git" pkgname="${MINGW_PACKAGE_PREFIX}-${_pkgname}" -pkgver=0.2.4_929.56cd52a +pkgver=0.2.5_981.4bee6d5 pkgrel=1 pkgdesc="Modular multi-screen pdf presenter (mingw-w64)" arch=('any') @@ -45,7 +45,7 @@ then fi pkgver() { - printf "0.2.4_%s.%s" \ + printf "0.2.5_%s.%s" \ "$(git -C "${srcdir}/BeamerPresenter" rev-list --count HEAD)" \ "$(git -C "${srcdir}/BeamerPresenter" rev-parse --short HEAD)" } @@ -65,6 +65,9 @@ build() { -DUSE_EXTERNAL_RENDERER=OFF \ -DUSE_TRANSLATIONS=ON \ -DINSTALL_LICENSE=ON \ + -DLINK_MUPDF_THIRD=ON \ + -DLINK_MUJS=OFF \ + -DLINK_GUMBO=ON \ -DQT_VERSION_MAJOR="${_qt_version_major}" \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ -DCMAKE_INSTALL_SYSCONFDIR="/etc" diff --git a/packaging/PKGBUILD_mupdf b/packaging/PKGBUILD_mupdf index c6516046..96b2f6ba 100644 --- a/packaging/PKGBUILD_mupdf +++ b/packaging/PKGBUILD_mupdf @@ -9,7 +9,7 @@ _qt_min_version="${_qt_version_major}.${_qt_version_minor}.0" _qt_max_version="${_qt_version_major}.$(( ${_qt_version_minor} + 1 )).0" pkgname="beamerpresenter-mupdf-qt${_qt_version_major}" -pkgver='0.2.4' +pkgver='0.2.5' pkgrel=1 pkgdesc="Modular multi-screen pdf presenter (using MuPDF)" arch=('x86_64') @@ -21,7 +21,7 @@ provides=("beamerpresenter=${pkgver}") conflicts=('beamerpresenter') backup=('etc/xdg/beamerpresenter/beamerpresenter.conf' 'etc/xdg/beamerpresenter/gui.json') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz") -sha256sums=('4ccdd747b2c829411de3f33548a125f8e7f16a768e03f56f71bd6b3f27f5bca1') +sha256sums=('SKIP') if [ "${_qt_version_major}" -eq "5" ] then diff --git a/packaging/PKGBUILD_poppler b/packaging/PKGBUILD_poppler index a15447bc..f6f57274 100644 --- a/packaging/PKGBUILD_poppler +++ b/packaging/PKGBUILD_poppler @@ -9,7 +9,7 @@ _qt_min_version="${_qt_version_major}.${_qt_version_minor}.0" _qt_max_version="${_qt_version_major}.$(( ${_qt_version_minor} + 1 )).0" pkgname="beamerpresenter-poppler-qt${_qt_version_major}" -pkgver='0.2.4' +pkgver='0.2.5' pkgrel=1 pkgdesc="Modular multi-screen pdf presenter (using Poppler)" arch=('x86_64') @@ -21,7 +21,7 @@ provides=("beamerpresenter=${pkgver}") conflicts=('beamerpresenter') backup=('etc/xdg/beamerpresenter/beamerpresenter.conf' 'etc/xdg/beamerpresenter/gui.json') source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz") -sha256sums=('4ccdd747b2c829411de3f33548a125f8e7f16a768e03f56f71bd6b3f27f5bca1') +sha256sums=('SKIP') if [ "${_qt_version_major}" -eq "5" ] then diff --git a/packaging/README.md b/packaging/README.md index de3dc1aa..24c34ee8 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -10,9 +10,9 @@ The version with poppler as PDF engine and Qt 6 can be build using: _qt_version_major=6 makepkg -p PKGBUILD_poppler ``` The packages for Qt 5 and with MuPDF can be built analogously. -You can install the newly created package using (for version 0.2.4): +You can install the newly created package using (for version 0.2.5): ```sh -sudo pacman -U beamerpresenter-poppler-qt6-0.2.4-1-x86_64.pkg.tar.zst +sudo pacman -U beamerpresenter-poppler-qt6-0.2.5-1-x86_64.pkg.tar.zst ``` The "mupdf-small" packages are compiled with a custom build of MuPDF with disabled javascript that excludes some fonts (MuPDF compiled with `XCFLAGS+=' -DTOFU -DTOFU_CJK -DTOFU_SIL -DFZ_ENABLE_JS=0'`). @@ -81,7 +81,7 @@ cpack --config build_dir/CPackConfig.cmake Now you can install the package: ```sh -sudo apt install ./beamerpresenter-poppler-0.2.4-qt6.4-x86_64.deb +sudo apt install ./beamerpresenter-poppler-0.2.5-qt6.4-x86_64.deb ``` diff --git a/packaging/io.github.stiglers_eponym.BeamerPresenter.metainfo.xml b/packaging/io.github.stiglers_eponym.BeamerPresenter.metainfo.xml index a054917e..07918b3e 100644 --- a/packaging/io.github.stiglers_eponym.BeamerPresenter.metainfo.xml +++ b/packaging/io.github.stiglers_eponym.BeamerPresenter.metainfo.xml @@ -44,6 +44,7 @@ +