Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qFlipper for openSUSE:Factory checked in at 2024-04-23 18:55:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qFlipper (Old) and /work/SRC/openSUSE:Factory/.qFlipper.new.27645 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qFlipper" Tue Apr 23 18:55:48 2024 rev:5 rq:1169617 version:1.3.3+git0.1699609231.bfce851 Changes: -------- --- /work/SRC/openSUSE:Factory/qFlipper/qFlipper.changes 2024-02-26 19:45:33.410268773 +0100 +++ /work/SRC/openSUSE:Factory/.qFlipper.new.27645/qFlipper.changes 2024-04-23 18:56:10.814694221 +0200 @@ -1,0 +2,7 @@ +Sun Apr 21 15:16:37 UTC 2024 - Ben Greiner <c...@bnavigator.de> + +- Retire Qt5, long live Qt6! +- Fix plugin library path +- Make out-of-tree build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qFlipper.spec ++++++ --- /var/tmp/diff_new_pack.rRB3Ko/_old 2024-04-23 18:56:11.326712661 +0200 +++ /var/tmp/diff_new_pack.rRB3Ko/_new 2024-04-23 18:56:11.326712661 +0200 @@ -23,14 +23,16 @@ License: GPL-3.0-or-later URL: https://github.com/flipperdevices/qFlipper Source: %{name}-%{version}.tar.xz -BuildRequires: libqt5-linguist -BuildRequires: libqt5-qtbase-common-devel +BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Quick3D) -BuildRequires: pkgconfig(Qt5QuickControls2) -BuildRequires: pkgconfig(Qt5SerialPort) -BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: qt6-base-devel >= 6.3 +BuildRequires: qt6-declarative-devel +BuildRequires: qt6-linguist-devel +BuildRequires: qt6-qt5compat-devel +BuildRequires: qt6-serialport-devel +BuildRequires: qt6-svg-devel +BuildRequires: qt6-tools-devel +BuildRequires: qt6-wayland-devel BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(zlib) Requires: %{name}-base = %{version}-%{release} @@ -81,23 +83,36 @@ sed -i -e "s|^[ \t]*GIT_VERSION = .*|GIT_VERSION = $gitver|" qflipper_common.pri sed -i -e "s|^[ \t]*GIT_COMMIT = .*|GIT_COMMIT = $githash|" qflipper_common.pri sed -i -e "s|^[ \t]*GIT_TIMESTAMP = .*|GIT_TIMESTAMP = $gitdate|" qflipper_common.pri +sed -i 's|\$\$PREFIX/lib|\$\$PREFIX/%{_lib}|' plugins/flipperproto0/flipperproto0.pro +sed -i '/addLibraryPath/ s|../lib/|../%{_lib}/|' backend/applicationbackend.cpp %build -%qmake5 qFlipper.pro -spec linux-g++ CONFIG+=qtquickcompiler DEFINES+=DISABLE_APPLICATION_UPDATES +mkdir build +pushd build +%qmake6 ../qFlipper.pro \ + -spec linux-g++ \ + CONFIG+=qtquickcompiler \ + DEFINES+=DISABLE_APPLICATION_UPDATES %make_build qmake_all %make_build +popd %install -%qmake5_install +pushd build +%qmake6_install +popd %files %license LICENSE %doc README.md screenshot.png %{_bindir}/qFlipper %{_datadir}/applications/qFlipper.desktop +%dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/512x512 %dir %{_datadir}/icons/hicolor/512x512/apps %{_datadir}/icons/hicolor/512x512/apps/qFlipper.png +%dir %{_libdir}/qFlipper +%dir %{_libdir}/qFlipper/plugins %files cli %{_bindir}/qFlipper-cli @@ -106,7 +121,5 @@ %{_udevrulesdir}/42-flipperzero.rules %files libflipperproto -%dir %{_prefix}/lib/qFlipper -%dir %{_prefix}/lib/qFlipper/plugins -%{_prefix}/lib/qFlipper/plugins/libflipperproto0.so +%{_libdir}/qFlipper/plugins/libflipperproto0.so
