updated version: 0.2.2

stiglers-eponym · Feb 20, 2022 · 237d796 · 237d796
1 parent f83115f
commit 237d796
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 62 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
 
     - name: Build
       run: |
-       cmake -B build_dir -DUSE_MUPDF=ON -DUSE_POPPLER=ON -DUSE_MUJS=OFF -DUSE_GUMBO=OFF -DUSE_TRANSLATIONS=ON -DQT_VERSION_MAJOR=5 -DQT_VERSION_MINOR=12 -DGIT_VERSION=OFF -DCMAKE_BUILD_TYPE='Release'
+       cmake -B build_dir -DUSE_MUPDF=ON -DUSE_POPPLER=ON -DUSE_MUJS=OFF -DUSE_GUMBO=OFF -DUSE_TRANSLATIONS=ON -DQT_VERSION_MAJOR=5 -DQT_VERSION_MINOR=12 -DGIT_VERSION=OFF -DCMAKE_BUILD_TYPE='Release' -DCPACK_GENERATOR='DEB;' -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_INSTALL_SYSCONFDIR='/etc' -DINSTALL_LICENSE=OFF
        cmake --build build_dir
 
     - name: Perform CodeQL Analysis
@@ -65,4 +65,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: beamerpresenter-full-x86_64.deb
-        path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-full-0.2.2-beta-qt5.12-x86_64.deb
+        path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-full-0.2.2-qt5.12-x86_64.deb
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,7 +75,7 @@ set(ABS_TRANSLATION_PATH "${ABS_TRANSLATION_PATH}/")
 
 
 # Set app version string
-set(APP_VERSION "${beamerpresenter_VERSION}-beta")
+set(APP_VERSION "${beamerpresenter_VERSION}")
 option(GIT_VERSION "include git commit count in version" ON)
 if (GIT_VERSION AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
     execute_process(

diff --git a/INSTALL.md b/INSTALL.md
@@ -16,11 +16,11 @@ The simplest way to install BeamerPresenter (besides the AUR) is to directly ins
 For example, the commands for installing BeamerPresenter with poppler as PDF engine and Qt 5 after downloading the corresponding file are:
 ```sh
 # Ubuntu 20.04:
-sudo apt install ./beamerpresenter-poppler-0.2.2-beta2-qt5.12-x86_64.deb
+sudo apt install ./beamerpresenter-poppler-0.2.2-qt5.12-x86_64.deb
 # Ubuntu 21.10:
-sudo apt install ./beamerpresenter-poppler-0.2.2-beta2-qt5.15-x86_64.deb
+sudo apt install ./beamerpresenter-poppler-0.2.2-qt5.15-x86_64.deb
 # Arch/Manjaro
-sudo pacman -U beamerpresenter-poppler-qt5-0.2.2_beta2-1-x86_64.pkg.tar.zst
+sudo pacman -U beamerpresenter-poppler-qt5-0.2.2-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.flatpak
@@ -95,10 +95,10 @@ Optional, for showing videos:
 ### Download
 Download the sources:
 ```sh
-wget https://github.com/stiglers-eponym/BeamerPresenter/archive/v0.2.2_beta2.tar.gz
-sha256sum -c - <<< "cf8904563e9b1a9a1ed0cecb65e27ae1ba99e173d9b69cf1e53275294abb9811 v0.2.2_beta2.tar.gz"
-tar -xf v0.2.2_beta2.tar.gz
-cd BeamerPresenter-0.2.2_beta2
+wget https://github.com/stiglers-eponym/BeamerPresenter/archive/v0.2.2.tar.gz
+sha256sum -c - <<< "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx v0.2.2.tar.gz"
+tar -xf v0.2.2.tar.gz
+cd BeamerPresenter-0.2.2
 ```
 Alternatively, you can clone the git repository
 ```sh

diff --git a/README.md b/README.md
@@ -69,11 +69,11 @@ The simplest way to install BeamerPresenter (besides the AUR) is to directly ins
 For example, the commands for installing BeamerPresenter with poppler as PDF engine and Qt 5 after downloading the corresponding file are:
 ```sh
 # Ubuntu 20.04:
-sudo apt install ./beamerpresenter-poppler-0.2.2-beta2-qt5.12-x86_64.deb
+sudo apt install ./beamerpresenter-poppler-0.2.2-qt5.12-x86_64.deb
 # Ubuntu 21.10:
-sudo apt install ./beamerpresenter-poppler-0.2.2-beta2-qt5.15-x86_64.deb
+sudo apt install ./beamerpresenter-poppler-0.2.2-qt5.15-x86_64.deb
 # Arch/Manjaro
-sudo pacman -U beamerpresenter-poppler-qt5-0.2.2_beta2-1-x86_64.pkg.tar.zst
+sudo pacman -U beamerpresenter-poppler-qt5-0.2.2-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.flatpak

diff --git a/config/gui.json b/config/gui.json
@@ -22,7 +22,7 @@
           {
             "type" : "toc",
             "title" : "Outline",
-            "color" : "yellow"
+            "color" : "white"
           },
           {
             "type" : "thumbnails",

diff --git a/man/beamerpresenter-ui.5 b/man/beamerpresenter-ui.5
@@ -1,4 +1,4 @@
-.TH beamerpresenter-ui 5 "2022-02-12" "0.2.2_beta"
+.TH beamerpresenter-ui 5 "2022-02-20" "0.2.2"
 .
 .SH NAME
 beamerpresenter-ui \- user interface of BeamerPresenter

diff --git a/man/beamerpresenter.1 b/man/beamerpresenter.1
@@ -1,4 +1,4 @@
-.TH BeamerPresenter 1 "2022-01-02" "0.2.2_beta"
+.TH BeamerPresenter 1 "2022-02-20" "0.2.2"
 .SH NAME
 BeamerPresenter \- modular multi-screen PDF presenter
 .

diff --git a/man/beamerpresenter.conf.5 b/man/beamerpresenter.conf.5
@@ -1,4 +1,4 @@
-.TH beamerpresenter.conf 5 "2022-01-22" "0.2.2_beta"
+.TH beamerpresenter.conf 5 "2022-02-20" "0.2.2"
 .
 .SH NAME
 beamerpresenter.conf \- configuration file for BeamerPresenter

diff --git 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.2_beta2'
+pkgver='0.2.2'
 pkgrel=1
 pkgdesc="Modular multi-screen pdf presenter (using MuPDF)"
 arch=('x86_64')
@@ -22,7 +22,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=('cf8904563e9b1a9a1ed0cecb65e27ae1ba99e173d9b69cf1e53275294abb9811')
+sha256sums=('SKIP')
 
 build() {
     mkdir -p "${pkgname}-${pkgver}/build"
@@ -40,13 +40,12 @@ build() {
         -DINSTALL_LICENSE=OFF \
         -DQT_VERSION_MAJOR="${_qt_version_major}" \
         -DQT_VERSION_MINOR="${_qt_version_minor}" \
-        -DCREATE_SHARED_LIBRARIES=OFF \
         -DCMAKE_INSTALL_PREFIX='/usr' \
         -DCMAKE_INSTALL_SYSCONFDIR='/etc'
     cmake --build "${pkgname}-${pkgver}/build"
 }
 
 package() {
     DESTDIR="${pkgdir}" cmake --install "${pkgname}-${pkgver}/build"
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 "${srcdir}/BeamerPresenter-${pkgver}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git 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.2_beta2'
+pkgver='0.2.2'
 pkgrel=1
 pkgdesc="Modular multi-screen pdf presenter (using Poppler)"
 arch=('x86_64')
@@ -22,7 +22,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=('cf8904563e9b1a9a1ed0cecb65e27ae1ba99e173d9b69cf1e53275294abb9811')
+sha256sums=('SKIP')
 
 build() {
     mkdir -p "${pkgname}-${pkgver}/build"
@@ -40,13 +40,12 @@ build() {
         -DINSTALL_LICENSE=OFF \
         -DQT_VERSION_MAJOR="${_qt_version_major}" \
         -DQT_VERSION_MINOR="${_qt_version_minor}" \
-        -DCREATE_SHARED_LIBRARIES=OFF \
         -DCMAKE_INSTALL_PREFIX='/usr' \
         -DCMAKE_INSTALL_SYSCONFDIR='/etc'
     cmake --build "${pkgname}-${pkgver}/build"
 }
 
 package() {
     DESTDIR="${pkgdir}" cmake --install "${pkgname}-${pkgver}/build"
-    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 "${srcdir}/BeamerPresenter-${pkgver}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git 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.2\_beta2):
+You can install the newly created package using (for version 0.2.2):
 ```sh
-sudo pacman -U beamerpresenter-poppler-qt6-0.2.2_beta2-1-x86_64.pkg.tar.zst
+sudo pacman -U beamerpresenter-poppler-qt6-0.2.2-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'`).
 
@@ -24,12 +24,12 @@ sudo apt install --no-install-recommends cmake zlib1g-dev qtmultimedia5-dev qtto
 ```
 In Ubuntu 21.10 you additionally need `libmujs-dev`.
 
-For version 0.2.2-beta2 the source can be downloaded [here](https://github.com/stiglers-eponym/BeamerPresenter/archive/refs/tags/v0.2.2_beta2.tar.gz).
+For version 0.2.2 the source can be downloaded [here](https://github.com/stiglers-eponym/BeamerPresenter/archive/refs/tags/v0.2.2.tar.gz).
 Check and unpack the download:
 ```sh
-sha256sum -c - <<< "cf8904563e9b1a9a1ed0cecb65e27ae1ba99e173d9b69cf1e53275294abb9811 v0.2.2_beta2.tar.gz"
-tar -xvf v0.2.2_beta2.tar.gz
-cd BeamerPresenter-0.2.2_beta2
+sha256sum -c - <<< "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx v0.2.2.tar.gz"
+tar -xvf v0.2.2.tar.gz
+cd BeamerPresenter-0.2.2
 ```
 
 Now configure the package using CMake. This requires the configuration of the Qt version (major and minor version), and the PDF engine (Poppler or MuPDF). The Qt minor version is only needed for version checking of dependencies.
@@ -65,7 +65,7 @@ cpack --config build_dir/CPackConfig.cmake
 
 Now you can install the package:
 ```sh
-sudo apt install ./beamerpresenter-poppler-0.2.2-beta2-qt5.12-x86_64.deb
+sudo apt install ./beamerpresenter-poppler-0.2.2-qt5.12-x86_64.deb
 ```