fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 09:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix arch package build and fix some build issues related to KFGuiAddons

Browse Source
This commit is contained in:
Jeremy Borgman
2025-05-31 13:14:08 -05:00
parent 277eb2f437
commit 728c586da2
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PKGBUILD
View File

@@ -1,18 +1,18 @@
pkgname=flameshot-git pkgname=flameshot-git
_pkgname=flameshot _pkgname=flameshot
pkgver=r1981.86a646c3 pkgver=r2022.277eb2f4
pkgrel=1 pkgrel=1
pkgdesc="Powerful yet simple to use screenshot software" pkgdesc="Powerful yet simple to use screenshot software"
arch=('i686' 'x86_64' 'aarch64' 'armv7h') arch=('i686' 'x86_64' 'aarch64' 'armv7h')
url="https://github.com/flameshot-org/flameshot" url="https://github.com/flameshot-org/flameshot"
license=('GPL-3.0-or-later') license=('GPL-3.0-or-later')
depends=('qt5-svg' 'hicolor-icon-theme' 'kguiaddons5') depends=('qt6-base' 'qt6-svg' 'hicolor-icon-theme' 'kguiaddons')
makedepends=('qt5-tools' 'cmake') makedepends=('qt6-tools' 'cmake' 'ninja')
optdepends=( optdepends=(
'gnome-shell-extension-appindicator: for system tray icon if you are using Gnome' 'gnome-shell-extension-appindicator: for system tray icon if you are using Gnome'
'grim: for wlroots wayland support' 'grim: for wlroots wayland support'
'xdg-desktop-portal: for wayland support, you will need the implementation for your wayland desktop environment' 'xdg-desktop-portal: for wayland support, you will need the implementation for your wayland desktop environment'
'qt5-imageformats: for additional export image formats (e.g. tiff, webp, and more)' 'qt6-imageformats: for additional export image formats (e.g. tiff, webp, and more)'
) )
provides=(flameshot) provides=(flameshot)
conflicts=(flameshot) conflicts=(flameshot)
@@ -31,13 +31,11 @@ pkgver() {
build() { build() {
cd "${srcdir}/${_pkgname}" cd "${srcdir}/${_pkgname}"
cmake -B build -S . \ cmake -GNinja -B build -S . \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_BUILD_TYPE=None \ -DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DUSE_WAYLAND_CLIPBOARD=1 \ -DUSE_WAYLAND_CLIPBOARD=1 \
-DDISABLE_UPDATE_CHECKER=1 \ -DDISABLE_UPDATE_CHECKER=1 \
-Wno-dev
cmake --build build cmake --build build
} }

4
src/CMakeLists.txt
View File

@@ -14,7 +14,7 @@ find_package(
) )
if (USE_WAYLAND_CLIPBOARD) if (USE_WAYLAND_CLIPBOARD)
find_package(KF5GuiAddons) find_package(KF6GuiAddons)
endif() endif()
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
@@ -224,7 +224,7 @@ target_link_libraries(
if (USE_WAYLAND_CLIPBOARD) if (USE_WAYLAND_CLIPBOARD)
target_compile_definitions(flameshot PRIVATE USE_WAYLAND_CLIPBOARD=1) target_compile_definitions(flameshot PRIVATE USE_WAYLAND_CLIPBOARD=1)
target_link_libraries(flameshot KF5::GuiAddons) target_link_libraries(flameshot KF6::GuiAddons)
endif() endif()
if (APPLE) if (APPLE)

1
src/core/flameshotdaemon.cpp
View File

@@ -14,6 +14,7 @@
#include <QDBusMessage> #include <QDBusMessage>
#include <QPixmap> #include <QPixmap>
#include <QRect> #include <QRect>
#include <QIODevice>
#if !defined(DISABLE_UPDATE_CHECKER) #if !defined(DISABLE_UPDATE_CHECKER)
#include <QDesktopServices> #include <QDesktopServices>