Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package adriconf for openSUSE:Factory checked in at 2026-05-30 23:00:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/adriconf (Old) and /work/SRC/openSUSE:Factory/.adriconf.new.1937 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "adriconf" Sat May 30 23:00:16 2026 rev:13 rq:1356052 version:2.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/adriconf/adriconf.changes 2025-09-26 22:27:00.956318734 +0200 +++ /work/SRC/openSUSE:Factory/.adriconf.new.1937/adriconf.changes 2026-05-30 23:02:40.207450636 +0200 @@ -1,0 +2,15 @@ +Sat May 30 15:38:19 UTC 2026 - Martin Pluskal <[email protected]> + +- Update to version 2.7.4 +- Stop using the deprecated %suse_update_desktop_file macro; + install the desktop file (Source1) directly and drop the + update-desktop-files BuildRequires +- Install the .desktop and icon as 0644 instead of 0755 +- Run the upstream unit tests via ctest in a %check section: + * Add adriconf-system-gtest.patch to build the tests against + the system GTest/GMock instead of downloading googletest at + build time (which needs network access), and to register the + test binary with CTest +- Drop obsolete Group tag + +------------------------------------------------------------------- Old: ---- adriconf-v2.7.3.tar.bz2 New: ---- adriconf-system-gtest.patch adriconf-v.2.7.4.tar.bz2 ----------(New B)---------- New:- Run the upstream unit tests via ctest in a %check section: * Add adriconf-system-gtest.patch to build the tests against the system GTest/GMock instead of downloading googletest at ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ adriconf.spec ++++++ --- /var/tmp/diff_new_pack.F4HkeO/_old 2026-05-30 23:02:40.863477604 +0200 +++ /var/tmp/diff_new_pack.F4HkeO/_new 2026-05-30 23:02:40.867477769 +0200 @@ -1,7 +1,7 @@ # # spec file for package adriconf # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,18 @@ Name: adriconf -Version: 2.7.3 +Version: 2.7.4 Release: 0 Summary: Advanced DRI Configurator License: GPL-3.0-only -Group: System/Packages URL: https://gitlab.freedesktop.org/mesa/adriconf -Source0: https://gitlab.freedesktop.org/mesa/adriconf/-/archive/v%{version}/adriconf-v%{version}.tar.bz2 +# NOTE: upstream tagged this release "v.2.7.4" (with a stray dot after v), +# unlike the plain "v2.7.x" used before, hence the "v." in the paths below. +Source0: https://gitlab.freedesktop.org/mesa/adriconf/-/archive/v.%{version}/adriconf-v.%{version}.tar.bz2 Source1: adriconf.desktop Source2: driconf-icon.png +# PATCH-FIX-OPENSUSE adriconf-system-gtest.patch [email protected] -- build unit tests against the system GTest/GMock instead of downloading googletest at build time +Patch0: adriconf-system-gtest.patch BuildRequires: Mesa-devel BuildRequires: cmake BuildRequires: gcc-c++ @@ -33,10 +36,11 @@ BuildRequires: libboost_filesystem-devel >= 1.60 BuildRequires: libboost_locale-devel >= 1.60 BuildRequires: pkgconfig -BuildRequires: update-desktop-files BuildRequires: pkgconfig(atkmm-2.36) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) +BuildRequires: pkgconfig(gmock) +BuildRequires: pkgconfig(gtest) BuildRequires: pkgconfig(gtkmm-4.0) BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libpci) @@ -51,23 +55,24 @@ %lang_package %prep -%autosetup -n %{name}-v%{version} +%autosetup -p1 -n %{name}-v.%{version} %build %cmake \ - -DENABLE_UNIT_TESTS=OFF + -DENABLE_UNIT_TESTS=ON %cmake_build %install %cmake_install -mkdir -p %{buildroot}/%{_datadir}/{applications,pixmaps} -install -Dpm 0755 %{SOURCE1} \ +install -Dpm 0644 %{SOURCE1} \ %{buildroot}/%{_datadir}/applications/%{name}.desktop -install -Dpm 0755 %{SOURCE2} \ +install -Dpm 0644 %{SOURCE2} \ %{buildroot}/%{_datadir}/pixmaps/%{name}.png -%suse_update_desktop_file %{buildroot}/%{_datadir}/applications/%{name}.desktop %find_lang %{name} +%check +%ctest + %files %license LICENSE %{_bindir}/adriconf ++++++ adriconf-system-gtest.patch ++++++ From: Martin Pluskal <[email protected]> Date: Sat, 30 May 2026 00:00:00 +0000 Subject: [PATCH] Build/register unit tests for the system GTest/GMock Use find_package(GTest) and the system gtest/gmock instead of downloading and building googletest at configure time (which needs network access and fails in offline build environments like OBS). Build the test binary as part of the normal build, enable testing at the top level and register the binary with CTest so it runs via 'ctest' / the %ctest macro from the top-level build directory. --- --- a/CMakeLists.txt 2026-05-30 17:59:01.189753484 +0200 +++ b/CMakeLists.txt 2026-05-30 17:59:01.229757938 +0200 @@ -147,14 +147,8 @@ # GTest and GMock setup if (ENABLE_UNIT_TESTS) - configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt) - execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" ) - execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" ) - - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - - add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src" "${CMAKE_BINARY_DIR}/googletest-build") + find_package(GTest REQUIRED) + enable_testing() add_subdirectory(tests) endif() --- a/tests/CMakeLists.txt 2026-05-30 17:59:01.193753930 +0200 +++ b/tests/CMakeLists.txt 2026-05-30 17:59:01.229757938 +0200 @@ -24,8 +24,9 @@ enable_testing() -add_executable(runUnitTests EXCLUDE_FROM_ALL ${SHARED_SOURCE_FILES} ${SOURCE_TESTS}) -target_link_libraries(runUnitTests gtest_main gmock) +add_executable(runUnitTests ${SHARED_SOURCE_FILES} ${SOURCE_TESTS}) +target_link_libraries(runUnitTests GTest::gtest_main GTest::gmock) +add_test(NAME runUnitTests COMMAND runUnitTests) target_link_libraries(runUnitTests ${GTKMM_LIBRARIES}) target_include_directories(runUnitTests PUBLIC ${GTKMM_INCLUDE_DIRS}) ++++++ adriconf-v2.7.3.tar.bz2 -> adriconf-v.2.7.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adriconf-v2.7.3/VERSION new/adriconf-v.2.7.4/VERSION --- old/adriconf-v2.7.3/VERSION 2025-08-19 20:59:22.000000000 +0200 +++ new/adriconf-v.2.7.4/VERSION 2026-04-08 19:39:58.000000000 +0200 @@ -1 +1 @@ -2.7.3 +2.7.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adriconf-v2.7.3/flatpak/org.freedesktop.adriconf.json new/adriconf-v.2.7.4/flatpak/org.freedesktop.adriconf.json --- old/adriconf-v2.7.3/flatpak/org.freedesktop.adriconf.json 2025-08-19 20:59:22.000000000 +0200 +++ new/adriconf-v.2.7.4/flatpak/org.freedesktop.adriconf.json 2026-04-08 19:39:58.000000000 +0200 @@ -1,7 +1,7 @@ { "app-id": "org.freedesktop.adriconf", "runtime": "org.gnome.Platform", - "runtime-version": "48", + "runtime-version": "50", "sdk": "org.gnome.Sdk", "command": "adriconf", "finish-args": [ @@ -13,21 +13,23 @@ ], "cleanup": [ "/include", + "/lib/cmake", "/lib/pkgconfig", - "*.a", - "*.la" + "/man", + "*.la", + "*.a" ], "modules": [ { "name": "sigc++", "buildsystem": "meson", "config-opts": [ - "-Dbuild-examples=false" + "-Dmaintainer-mode=false", + "-Dbuild-documentation=false", + "-Dbuild-examples=false", + "-Dbuild-tests=false" ], "cleanup": [ - "*.la", - "/include/sigc++-3.0", - "/lib/pkgconfig", "/lib/sigc++-3.0" ], "sources": [ @@ -42,13 +44,13 @@ "name": "cairomm", "buildsystem": "meson", "config-opts": [ - "-Dbuild-examples=false" + "-Dmaintainer-mode=false", + "-Dbuild-documentation=false", + "-Dbuild-examples=false", + "-Dbuild-tests=false" ], "cleanup": [ - "*.la", - "/include", - "/lib/cairomm-1.16", - "/lib/pkgconfig" + "/lib/cairomm-1.*" ], "sources": [ { @@ -62,33 +64,32 @@ "name": "glibmm", "buildsystem": "meson", "config-opts": [ + "-Dmaintainer-mode=false", + "-Dbuild-documentation=false", "-Dbuild-examples=false" ], "cleanup": [ - "*.la", - "/include/glibmm-2.68", - "/include/giomm-2.68", - "/lib/glibmm-2.68", - "/lib/giomm-2.68", - "/lib/libglibmm_generate_extra_defs*", - "/lib/pkgconfig" + "/lib/glibmm-2.*", + "/lib/giomm-2.*", + "/lib/libglibmm_generate_extra_defs*" ], "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/glibmm/2.84/glibmm-2.84.0.tar.xz";, - "sha256": "56ee5f51c8acfc0afdf46959316e4c8554cb50ed2b6bc5ce389d979cbb642509" + "url": "https://download.gnome.org/sources/glibmm/2.86/glibmm-2.86.0.tar.xz";, + "sha256": "39c0e9f6da046d679390774efdb9ad564436236736dc2f7825e614b2d4087826" } ] }, { "name": "pangomm", "buildsystem": "meson", + "config-opts": [ + "-Dmaintainer-mode=false", + "-Dbuild-documentation=false" + ], "cleanup": [ - "*.la", - "/include/pangomm-2.48", - "/lib/pangomm-2.48", - "/lib/pkgconfig" + "/lib/pangomm-2.*" ], "sources": [ { @@ -101,11 +102,12 @@ { "name": "atkmm", "buildsystem": "meson", + "config-opts": [ + "-Dmaintainer-mode=false", + "-Dbuild-documentation=false" + ], "cleanup": [ - "*.la", - "/include/atkmm-2.36", - "/lib/atkmm-2.36", - "/lib/pkgconfig" + "/lib/atkmm-2.*" ], "sources": [ { @@ -120,35 +122,25 @@ "buildsystem": "meson", "config-opts": [ "-Dmaintainer-mode=false", + "-Dbuild-documentation=false", "-Dbuild-demos=false", "-Dbuild-tests=false" ], "cleanup": [ - "*.a", - "*.la", - "/include", "/lib/gdkmm-4.0", - "/lib/gtkmm-4.0", - "/lib/pkgconfig", - "/man", - "/share/aclocal", - "/share/man", - "/share/pkgconfig" + "/lib/gtkmm-4.0" ], "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/gtkmm/4.18/gtkmm-4.18.0.tar.xz";, - "sha256": "2ee31c15479fc4d8e958b03c8b5fbbc8e17bc122c2a2f544497b4e05619e33ec" + "url": "https://download.gnome.org/sources/gtkmm/4.20/gtkmm-4.20.0.tar.xz";, + "sha256": "daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833" } ] }, { "name": "pugixml", - "cleanup": [ - "/lib/cmake" - ], - "buildsystem": "cmake", + "buildsystem": "cmake-ninja", "sources": [ { "type": "archive", @@ -161,10 +153,7 @@ "name": "libpci", "cleanup": [ "/sbin", - "/bin", - "/man", - "*.a", - "*.la" + "/bin" ], "sources": [ { @@ -190,21 +179,18 @@ "name": "adriconf", "buildsystem": "cmake-ninja", "config-opts": ["-DENABLE_UNIT_TESTS=0"], + "post-install": [ + "install -Dm644 flatpak/org.freedesktop.adriconf.metainfo.xml -t /app/share/metainfo/", + "install -Dm644 flatpak/org.freedesktop.adriconf.desktop -t /app/share/applications/", + "install -Dm644 flatpak/org.freedesktop.adriconf.png -t /app/share/icons/hicolor/256x256/apps/" + ], "sources": [ { "type": "git", - "url": "https://gitlab.freedesktop.org/mesa/adriconf/";, - "tag": "v2.7.2" - }, - { - "type": "file", - "path": "org.freedesktop.adriconf.metainfo.xml" + "url": "https://gitlab.freedesktop.org/mesa/adriconf.git";, + "tag": "v2.7.3", + "commit": "fd1ca19ddc30fdf70d5420f7dc2d2a7eef35a943" } - ], - "build-commands": [ - "install -Dm644 org.freedesktop.adriconf.metainfo.xml /app/share/metainfo/org.freedesktop.adriconf.metainfo.xml", - "install -Dm644 flatpak/org.freedesktop.adriconf.desktop /app/share/applications/org.freedesktop.adriconf.desktop", - "install -Dm644 flatpak/org.freedesktop.adriconf.png /app/share/icons/hicolor/256x256/apps/org.freedesktop.adriconf.png" ] } ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/adriconf-v2.7.3/flatpak/org.freedesktop.adriconf.metainfo.xml new/adriconf-v.2.7.4/flatpak/org.freedesktop.adriconf.metainfo.xml --- old/adriconf-v2.7.3/flatpak/org.freedesktop.adriconf.metainfo.xml 2025-08-19 20:59:22.000000000 +0200 +++ new/adriconf-v.2.7.4/flatpak/org.freedesktop.adriconf.metainfo.xml 2026-04-08 19:39:58.000000000 +0200 @@ -24,6 +24,16 @@ </screenshot> </screenshots> <releases> + <release version="2.7.4" date="2026-04-08" urgency="low"> + <description> + <p>This is a maintenance release</p> + <ul> + <li>Improve flatpak build configurations @yakushabb</li> + <li>Update all Flatpak dependencies to latest @yakushabb</li> + <li>Update Flatpak Sdk to Gnome 50 @yakushabb</li> + </ul> + </description> + </release> <release version="2.7.3" date="2025-08-19" urgency="low"> <description> <p>This is a maintenance release</p>
