lomiri.lomiri-thumbnailer: 3.0.3 -> 3.0.4

NixOS · Jan 16, 2025 · f50a032 · f50a032
1 parent 51157cc
commit f50a032
Show file tree

Hide file tree

Showing 6 changed files with 334 additions and 58 deletions.
diff --git a/...rvices/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch b/...rvices/lomiri-thumbnailer/1001-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DO.patch
@@ -0,0 +1,25 @@
+From e8893fcae7e732c9e15ccd6d54a62b5b3862e445 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <[email protected]>
+Date: Thu, 16 Jan 2025 17:12:36 +0100
+Subject: [PATCH 1/5] doc/liblomiri-thumbnailer-qt: Honour CMAKE_INSTALL_DOCDIR
+
+---
+ doc/liblomiri-thumbnailer-qt/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
+index 91e12a0..3e96f80 100644
+--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
++++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
+@@ -28,7 +28,7 @@ add_doxygen(
+ )
+
+ install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html
+-        DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/doc/liblomiri-thumbnailer-qt)
++        DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+ add_subdirectory(examples)
+
+-- 
+2.47.0
+
diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1002-Re-enable-documentation.patch
@@ -0,0 +1,97 @@
+From 37687a195052186432923276bc2c2358b3622ab1 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <[email protected]>
+Date: Thu, 16 Jan 2025 17:12:44 +0100
+Subject: [PATCH 2/5] Re-enable documentation
+
+---
+ CMakeLists.txt                                |  6 +++++-
+ debian/liblomiri-thumbnailer-qt-doc.install   |  1 +
+ ...lomiri-thumbnailer-qt-doc.install.disabled |  1 -
+ doc/liblomiri-thumbnailer-qt/CMakeLists.txt   | 21 ++++++++-----------
+ 4 files changed, 15 insertions(+), 14 deletions(-)
+ create mode 100644 debian/liblomiri-thumbnailer-qt-doc.install
+ delete mode 100644 debian/liblomiri-thumbnailer-qt-doc.install.disabled
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 464ac70..cade10f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -184,7 +184,11 @@ if (${BUILD_TESTING})
+ endif()
+ add_subdirectory(include)
+ add_subdirectory(man)
+-#add_subdirectory(doc)
++
++option(ENABLE_DOC "Build documentation" ON)
++if(ENABLE_DOC)
++    add_subdirectory(doc)
++endif()
+
+ #enable_coverage_report(
+ #    TARGETS
+diff --git a/debian/liblomiri-thumbnailer-qt-doc.install b/debian/liblomiri-thumbnailer-qt-doc.install
+new file mode 100644
+index 0000000..ff56aee
+--- /dev/null
++++ b/debian/liblomiri-thumbnailer-qt-doc.install
+@@ -0,0 +1 @@
++usr/share/doc/lomiri-thumbnailer/*
+diff --git a/debian/liblomiri-thumbnailer-qt-doc.install.disabled b/debian/liblomiri-thumbnailer-qt-doc.install.disabled
+deleted file mode 100644
+index db055cf..0000000
+--- a/debian/liblomiri-thumbnailer-qt-doc.install.disabled
++++ /dev/null
+@@ -1 +0,0 @@
+-usr/share/doc/liblomiri-thumbnailer-qt/*
+diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
+index 3e96f80..fe98e4c 100644
+--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
++++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
+@@ -1,35 +1,32 @@
+-include(UseDoxygen OPTIONAL)
++find_package(DoxygenBuilder REQUIRED)
+
+ file(GLOB libthumbnailer_headers "${PROJECT_SOURCE_DIR}/include/lomiri/thumbnailer/qt/*.h")
+
+ add_doxygen(
+     liblomiri-thumbnailer-qt-doc
++    PROJECT_NAME
++        "Thumbnailer Qt API"
+     INPUT
+         ${CMAKE_CURRENT_SOURCE_DIR}/tutorial.dox
+         ${libthumbnailer_headers}
+-    OUTPUT_DIRECTORY
+-        ${CMAKE_BINARY_DIR}/doc/liblomiri-thumbnailer-qt
++    EXAMPLE_PATH
++        ${CMAKE_CURRENT_SOURCE_DIR}
+     STRIP_FROM_PATH
+         "${CMAKE_SOURCE_DIR}/src"
+     STRIP_FROM_INC_PATH
+         "${CMAKE_SOURCE_DIR}/include"
++    DOXYFILE_IN
++        ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+     EXCLUDE_PATTERNS
+         */internal/*
+     EXCLUDE_SYMBOLS
+         *::internal*
+         *::Priv
+-    EXAMPLE_PATH
+-        ${CMAKE_CURRENT_SOURCE_DIR}
+-    DOXYFILE_IN
+-        ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
+-    PROJECT_NAME
+-        "Thumbnailer Qt API"
++    INSTALL
++        ${CMAKE_INSTALL_DOCDIR}
+     ALL
+ )
+
+-install(DIRECTORY ${PROJECT_BINARY_DIR}/doc/liblomiri-thumbnailer-qt/html
+-        DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-
+ add_subdirectory(examples)
+
+ list(APPEND UNIT_TEST_TARGETS qt_example_test)
+-- 
+2.47.0
+
diff --git a/...rvices/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch b/...rvices/lomiri-thumbnailer/1003-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_m.patch
@@ -0,0 +1,25 @@
+From 010d19f85f4f8d73f96f054e5d293951fae1f9de Mon Sep 17 00:00:00 2001
+From: OPNA2608 <[email protected]>
+Date: Thu, 16 Jan 2025 17:12:45 +0100
+Subject: [PATCH 3/5] doc/liblomiri-thumbnailer-qt/examples: Drop
+ qt5_use_modules usage
+
+Leftover from a0d81863f3f48717507cfa181030a8ffb0c4e881
+---
+ doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt
+index db8139f..825a821 100644
+--- a/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt
++++ b/doc/liblomiri-thumbnailer-qt/examples/CMakeLists.txt
+@@ -1,6 +1,5 @@
+ include_directories(${CMAKE_BINARY_DIR}/tests ${CMAKE_SOURCE_DIR}/tests)
+ add_executable(qt_example_test qt_example_test.cpp)
+-qt5_use_modules(qt_example_test Core Gui Network Test)
+ target_link_libraries(qt_example_test
+     gtest
+     Qt5::Core
+-- 
+2.47.0
+
diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/1004-Re-enable-coverge-reporting.patch
@@ -0,0 +1,131 @@
+From ffec02835aa44e93c96c48b7a33be3f51a3571a1 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <[email protected]>
+Date: Thu, 16 Jan 2025 17:12:46 +0100
+Subject: [PATCH 4/5] Re-enable coverge reporting
+
+---
+ CMakeLists.txt                              | 51 +++++++++++++--------
+ doc/CMakeLists.txt                          |  6 ++-
+ doc/liblomiri-thumbnailer-qt/CMakeLists.txt |  8 ++--
+ tests/CMakeLists.txt                        |  2 -
+ 4 files changed, 40 insertions(+), 27 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cade10f..cbfd9c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -134,7 +134,14 @@ endif()
+
+ include(CTest)
+
+-#include(EnableCoverageReport)
++if (cmake_build_type_lower MATCHES coverage)
++    find_package(CoverageReport REQUIRED)
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" )
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" )
++    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -coverage" )
++    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -coverage" )
++endif()
++
+
+ include(cmake/UseGSettings.cmake)
+
+@@ -169,6 +176,8 @@ include_directories(${TAGLIB_DEPS_INCLUDE_DIRS})
+ include_directories(include)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+
++set(UNIT_TEST_TARGETS "")
++
+ add_subdirectory(src)
+ add_subdirectory(data)
+ add_subdirectory(plugins/Lomiri/Thumbnailer.0.1)
+@@ -190,22 +199,24 @@ if(ENABLE_DOC)
+     add_subdirectory(doc)
+ endif()
+
+-#enable_coverage_report(
+-#    TARGETS
+-#        recovery_test         # Need to turn on coverage for this, to get the helper template instrumented.
+-#        testutils
+-#        test-seq
+-#        thumbnailer-admin
+-#        thumbnailer-qml
+-#        thumbnailer-qml-static
+-#        lomiri-thumbnailer-qt
+-#        thumbnailer-service
+-#        thumbnailer-static
+-#        vs-thumb
+-#        vs-thumb-static
+-#    FILTER
+-#        ${CMAKE_SOURCE_DIR}/tests/*
+-#        ${CMAKE_BINARY_DIR}/*
+-#    TESTS
+-#        ${UNIT_TEST_TARGETS}
+-#)
++if (cmake_build_type_lower MATCHES coverage)
++    enable_coverage_report(
++        TARGETS
++            recovery_test         # Need to turn on coverage for this, to get the helper template instrumented.
++            testutils
++            test-seq
++            lomiri-thumbnailer-admin
++            LomiriThumbnailer-qml
++            thumbnailer-qml-static
++            lomiri-thumbnailer-qt
++            thumbnailer-service
++            thumbnailer-static
++            vs-thumb
++            vs-thumb-static
++        FILTER
++            ${CMAKE_SOURCE_DIR}/tests/*
++            ${CMAKE_BINARY_DIR}/*
++        TESTS
++            ${UNIT_TEST_TARGETS}
++    )
++endif()
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 11f4449..249f5e0 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1,4 +1,6 @@
+ add_subdirectory(liblomiri-thumbnailer-qt)
+
+-list(APPEND UNIT_TEST_TARGETS qt_example_test)
+-set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
++if(BUILD_TESTING)
++    list(APPEND UNIT_TEST_TARGETS qt_example_test)
++    set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
++endif()
+diff --git a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
+index fe98e4c..078be07 100644
+--- a/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
++++ b/doc/liblomiri-thumbnailer-qt/CMakeLists.txt
+@@ -27,7 +27,9 @@ add_doxygen(
+     ALL
+ )
+
+-add_subdirectory(examples)
++if(BUILD_TESTING)
++    add_subdirectory(examples)
+
+-list(APPEND UNIT_TEST_TARGETS qt_example_test)
+-set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
++    list(APPEND UNIT_TEST_TARGETS qt_example_test)
++    set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)
++endif()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 03a4900..97cb3a1 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -42,8 +42,6 @@ set(slow_test_dirs
+     stress
+ )
+
+-set(UNIT_TEST_TARGETS "")
+-
+ foreach(dir ${unit_test_dirs})
+     add_subdirectory(${dir})
+     list(APPEND UNIT_TEST_TARGETS "${dir}_test")
+-- 
+2.47.0
+
diff --git a/...sktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch b/...sktops/lomiri/services/lomiri-thumbnailer/1005-Make-GTest-available-to-example-test.patch
@@ -0,0 +1,38 @@
+From d9152f5e1f77a6c3bbc759eec58811410de7b85a Mon Sep 17 00:00:00 2001
+From: OPNA2608 <[email protected]>
+Date: Thu, 16 Jan 2025 17:12:49 +0100
+Subject: [PATCH 5/5] Make GTest available to example test
+
+---
+ CMakeLists.txt       | 2 ++
+ tests/CMakeLists.txt | 1 -
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cbfd9c0..0663b44 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -189,6 +189,8 @@ if (${BUILD_TESTING})
+     find_package(Qt5QuickTest REQUIRED)
+     find_package(Qt5Network REQUIRED)
+
++    find_package(GMock REQUIRED)
++
+     add_subdirectory(tests)
+ endif()
+ add_subdirectory(include)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 97cb3a1..92eae14 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -3,7 +3,6 @@
+
+ set(old_cxx_flags ${CMAKE_CXX_FLAGS})
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wno-old-style-cast -Wno-missing-field-initializers")
+-find_package(GMock)
+ set(CMAKE_CXX_FLAGS ${old_cxx_flags})
+
+ set(TESTDATADIR ${CMAKE_CURRENT_SOURCE_DIR}/media)
+-- 
+2.47.0
+