#3 some minor fixes
Merged 7 months ago by rdieter. Opened 7 months ago by sergiomb.
Unknown source rawhide  into  rawhide

file modified
+6 -2
@@ -46,8 +46,8 @@

  BuildRequires:  cmake(KF5I18n)

  BuildRequires:  cmake(KF5Purpose)

  BuildRequires:  cmake(KF5Notifications)

+ BuildRequires:  cmake(KF5Kirigami2)

  

- BuildRequires:  kf5-purpose-devel >= 1.1

  BuildRequires:  libappstream-glib

  BuildRequires:  pkgconfig(libaccounts-glib)

  BuildRequires:  pkgconfig(libudev)
@@ -56,6 +56,7 @@

  BuildRequires:  pkgconfig(gstreamer-1.0)

  BuildRequires:  pkgconfig(gstreamer-base-1.0)

  BuildRequires:  pkgconfig(gstreamer-video-1.0)

+ BuildRequires:  pkgconfig(Qt5Quick)

  

  %if 0%{?tests}

  BuildRequires: time
@@ -65,6 +66,9 @@

  

  # currently not linked, needs qml resources

  Requires: kf5-purpose >= 1.1

+ Requires: qt5-qtdeclarative

+ Requires: qt5-qtquickcontrols

+ Requires: qt5-qtgraphicaleffects

  

  %description

  Kamoso is an application to take pictures and videos out of your webcam.
@@ -76,7 +80,7 @@

  

  %build

  %cmake_kf5 \

-   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}

+   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} -Wno-dev

  

  %cmake_build

  

no initial comment

Would prefer to keep the purpose build time dep, and please make new runtime deps arch'd

If you can please place reasoning in the PR so we know the purpose of the changes that would be great.

2 years ago when I propose https://src.fedoraproject.org/rpms/kamoso/pull-request/1 , this are the leftovers, I just was cleaning and organizing my things ...

commit 1 :

  • cmake(KF5Purpose) is already in BR so we can remove - BuildRequires: kf5-purpose-devel >= 1.1

  • add "-Wno-dev" to avoid this message:

    CMake Warning (dev) at /usr/share/ECM/modules/ECMFindModuleHelpers.cmake:112 (message):
    Your project should require at least CMake 3.16.0 to use FindKF5.cmake
    Call Stack (most recent call first):
    /usr/share/ECM/find-modules/FindKF5.cmake:30 (ecm_find_package_version_check)
    CMakeLists.txt:17 (find_package)
    This warning is for project developers. Use -Wno-dev to suppress it.

commit 2:

  • Add BR cmake(KF5Kirigami2) and pkgconfig(Qt5Quick) suppress these messages:

    CMake Warning at CMakeLists.txt:23 (find_package):
    By not providing "FindKF5Kirigami2.cmake" in CMAKE_MODULE_PATH this project
    has asked CMake to find a package configuration file provided by
    "KF5Kirigami2", but CMake did not find one.
    Could not find a package configuration file provided by "KF5Kirigami2" with
    any of the following names:
    KF5Kirigami2Config.cmake
    kf5kirigami2-config.cmake
    Add the installation prefix of "KF5Kirigami2" to CMAKE_PREFIX_PATH or set
    "KF5Kirigami2_DIR" to a directory containing one of the above files. If
    "KF5Kirigami2" provides a separate development package or SDK, be sure it
    has been installed.

    • qmlplugindump failed for QtGraphicalEffects.
    • Could NOT find QtGraphicalEffects-QMLModule (missing: QtGraphicalEffects-QMLModule_FOUND)
    • qmlplugindump failed for QtQuick.Controls.
    • Could NOT find QtQuick.Controls-QMLModule (missing: QtQuick.Controls-QMLModule_FOUND)
    • qmlplugindump failed for QtQuick.Dialogs.
    • Could NOT find QtQuick.Dialogs-QMLModule (missing: QtQuick.Dialogs-QMLModule_FOUND)

    FindOpenGL found both a legacy GL library:
    OPENGL_gl_LIBRARY: /usr/lib64/libGL.so
    and GLVND libraries for OpenGL and GLX:
    OPENGL_opengl_LIBRARY: /usr/lib64/libOpenGL.so
    OPENGL_glx_LIBRARY: /usr/lib64/libGLX.so
    OpenGL_GL_PREFERENCE has not been set to "GLVND" or "LEGACY", so for
    compatibility with CMake 3.10 and below the legacy GL library will be used.

commit 3:

  • Requires qt5-qtdeclarative, qt5-qtgraphicaleffects and qt5-qtquickcontrols because it is need at runtime
    -- The following RUNTIME packages have been found:
    • KF5Kirigami2, A QtQuick based components set
      Required at runtime
    • QtGraphicalEffects-QMLModule, QML module 'QtGraphicalEffects' is a runtime dependency.
    • QtQml-QMLModule, QML module 'QtQml' is a runtime dependency.
    • QtQuick-QMLModule, QML module 'QtQuick' is a runtime dependency.
    • QtQuick.Controls-QMLModule, QML module 'QtQuick.Controls' is a runtime dependency.
    • QtQuick.Dialogs-QMLModule, QML module 'QtQuick.Dialogs' is a runtime dependency.
    • QtQuick.Layouts-QMLModule, QML module 'QtQuick.Layouts' is a runtime dependency.
    • QtQuick.Window-QMLModule, QML module 'QtQuick.Window' is a runtime dependency.

I checked with:

rpm -qf /usr/lib64/qt5/qml/QtQml/
rpm -qf /usr/lib64/qt5/qml/QtGraphicalEffects/
rpm -qf /usr/lib64/qt5/qml/QtQuick/Controls/
rpm -qf /usr/lib64/qt5/qml/QtQuick/Dialogs/

There's more good than bad here, I'll go ahead an merge, and make the deps arch'd in a seperate commit, thanks.

Pull-Request has been merged by rdieter

7 months ago
Metadata