Skip to content

Commit 663a056

Browse files
committed
Fix deb and rpm packaing issues
1 parent 70bb509 commit 663a056

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

packaging/debian/rules

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ export QT_SELECT := 5
2121
override_dh_auto_configure:
2222
# The existence of an empty .git directory triggers syncqt.
2323
mkdir .git || true
24-
dh_auto_configure --
24+
# This is required to use Cmake FetchContent
25+
dh_auto_configure -- \
26+
-DFETCHCONTENT_FULLY_DISCONNECTED=OFF

packaging/rpm/fedora/flameshot.spec

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,15 @@ Features:
5555
%cmake -G Ninja \
5656
-DCMAKE_BUILD_TYPE=Release \
5757
-DUSE_WAYLAND_CLIPBOARD:BOOL=ON \
58+
-DQTCOLORWIDGETS_INSTALL=OFF
5859
%cmake_build
5960

6061
%install
6162
%cmake_install
63+
rm -rf %{buildroot}%{_includedir}/QtColorWidgets
64+
rm -rf %{buildroot}%{_libdir}/cmake/QtColorWidgets
65+
rm -f %{buildroot}%{_libdir}/libQtColorWidgets.*
66+
rm -f %{buildroot}%{_libdir}/pkgconfig/QtColorWidgets.pc
6267
# https://fedoraproject.org/wiki/PackagingDrafts/find_lang
6368
%find_lang Internationalization --with-qt
6469
%fdupes %{buildroot}%{_datadir}/icons

packaging/rpm/opensuse/flameshot.spec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,16 @@ Features:
5151
%autosetup -p1
5252

5353
%build
54-
%cmake -DCMAKE_BUILD_TYPE=Release
54+
%cmake -DCMAKE_BUILD_TYPE=Release -DQTCOLORWIDGETS_INSTALL=OFF
55+
5556
%cmake_build
5657

5758
%install
5859
%cmake_install
60+
rm -rf %{buildroot}%{_includedir}/QtColorWidgets
61+
rm -rf %{buildroot}%{_libdir}/cmake/QtColorWidgets
62+
rm -f %{buildroot}%{_libdir}/libQtColorWidgets.*
63+
rm -f %{buildroot}%{_libdir}/pkgconfig/QtColorWidgets.pc
5964
# https://fedoraproject.org/wiki/PackagingDrafts/find_lang
6065
%find_lang Internationalization --with-qt
6166
%suse_update_desktop_file -r org.flameshot.Flameshot Utility X-SuSE-DesktopUtility

0 commit comments

Comments
 (0)