Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qtquick3d for
openSUSE:Factory checked in at 2024-07-24 15:31:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtquick3d (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.1869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtquick3d"
Wed Jul 24 15:31:32 2024 rev:18 rq:1189212 version:5.15.14+kde1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtquick3d/libqt5-qtquick3d.changes
2024-05-30 15:34:37.993010457 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtquick3d.new.1869/libqt5-qtquick3d.changes
2024-07-25 11:56:24.083629595 +0200
@@ -1,0 +2,5 @@
+Mon Jul 22 12:07:32 UTC 2024 - Christophe Marin <[email protected]>
+
+- Use system assimp unconditionally (boo#1228199)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtquick3d.spec ++++++
--- /var/tmp/diff_new_pack.OxMqiE/_old 2024-07-25 11:56:25.087672733 +0200
+++ /var/tmp/diff_new_pack.OxMqiE/_new 2024-07-25 11:56:25.087672733 +0200
@@ -16,14 +16,6 @@
#
-# Available on Tumbleweed for all archs
-# TODO revisit the condition for Leap > 15.2 / jump
-%if 0%{?suse_version} > 1500
-%bcond_without system_assimp
-%else
-%bcond_with system_assimp
-%endif
-
%define qt5_snapshot 1
%define base_name libqt5
%define real_version 5.15.14
@@ -40,11 +32,7 @@
# PATCH-FIX-UPSTREAM
Patch0: qt5-quick3d-assimp-5.1.patch
BuildRequires: fdupes
-%if %{with system_assimp}
BuildRequires: pkgconfig(assimp) >= 5.0.0
-%else
-BuildRequires: zlib-devel
-%endif
BuildRequires: libQt5Core-private-headers-devel >= 5.12
BuildRequires: libQt5Gui-private-headers-devel
BuildRequires: libQt5OpenGLExtensions-devel-static
@@ -138,15 +126,15 @@
%prep
%autosetup -p1 -n %{tar_version}
+rm -r src/3rdparty/assimp/{src,unzip}
+
%build
%if %{qt5_snapshot}
#force the configure script to generate the forwarding headers (it checks
whether .git directory exists)
mkdir .git
%endif
%qmake5 -- \
- %if %{with system_assimp}
-system-quick3d-assimp
- %endif
%make_jobs
