diff --git a/packaging/debian/rules b/packaging/debian/rules index fbd696f2..a20fdc9b 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -21,4 +21,6 @@ export QT_SELECT := 5 override_dh_auto_configure: # The existence of an empty .git directory triggers syncqt. mkdir .git || true - dh_auto_configure -- + # This is required to use Cmake FetchContent + dh_auto_configure -- \ + -DFETCHCONTENT_FULLY_DISCONNECTED=OFF \ No newline at end of file diff --git a/packaging/rpm/fedora/flameshot.spec b/packaging/rpm/fedora/flameshot.spec index c0aa98a3..94462871 100644 --- a/packaging/rpm/fedora/flameshot.spec +++ b/packaging/rpm/fedora/flameshot.spec @@ -55,10 +55,15 @@ Features: %cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_WAYLAND_CLIPBOARD:BOOL=ON \ + -DQTCOLORWIDGETS_INSTALL=OFF %cmake_build %install %cmake_install +rm -rf %{buildroot}%{_includedir}/QtColorWidgets +rm -rf %{buildroot}%{_libdir}/cmake/QtColorWidgets +rm -f %{buildroot}%{_libdir}/libQtColorWidgets.* +rm -f %{buildroot}%{_libdir}/pkgconfig/QtColorWidgets.pc # https://fedoraproject.org/wiki/PackagingDrafts/find_lang %find_lang Internationalization --with-qt %fdupes %{buildroot}%{_datadir}/icons diff --git a/packaging/rpm/opensuse/flameshot.spec b/packaging/rpm/opensuse/flameshot.spec index 4bd136ec..17cc5ba3 100644 --- a/packaging/rpm/opensuse/flameshot.spec +++ b/packaging/rpm/opensuse/flameshot.spec @@ -51,11 +51,16 @@ Features: %autosetup -p1 %build -%cmake -DCMAKE_BUILD_TYPE=Release +%cmake -DCMAKE_BUILD_TYPE=Release -DQTCOLORWIDGETS_INSTALL=OFF + %cmake_build %install %cmake_install +rm -rf %{buildroot}%{_includedir}/QtColorWidgets +rm -rf %{buildroot}%{_libdir}/cmake/QtColorWidgets +rm -f %{buildroot}%{_libdir}/libQtColorWidgets.* +rm -f %{buildroot}%{_libdir}/pkgconfig/QtColorWidgets.pc # https://fedoraproject.org/wiki/PackagingDrafts/find_lang %find_lang Internationalization --with-qt %suse_update_desktop_file -r org.flameshot.Flameshot Utility X-SuSE-DesktopUtility