Accepting request 743230 from home:Vogtinator:qt5.14
Qt 5.14.0 Beta 2 OBS-URL: https://build.opensuse.org/request/show/743230 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qt3d?expand=0&rev=3
This commit is contained in:
parent
e6f9f9db59
commit
c86034d544
@ -1,19 +0,0 @@
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Subject: Fix no return in nonvoid function error
|
||||
|
||||
Optflags include -Werror=return-type, which does not like qt3d without this.
|
||||
|
||||
Index: qt3d-everywhere-src-5.14.0-alpha/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
|
||||
===================================================================
|
||||
--- qt3d-everywhere-src-5.14.0-alpha.orig/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
|
||||
+++ qt3d-everywhere-src-5.14.0-alpha/src/render/renderers/opengl/graphicshelpers/imagesubmissioncontext.cpp
|
||||
@@ -73,6 +73,9 @@ GLenum glAccessEnumForShaderImageAccess(
|
||||
return GL_WRITE_ONLY;
|
||||
case QShaderImage::ReadWrite:
|
||||
return GL_READ_WRITE;
|
||||
+ default:
|
||||
+ Q_UNREACHABLE();
|
||||
+ return GL_NONE;
|
||||
}
|
||||
}
|
||||
|
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 24 13:22:23 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.14.0-beta2:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 15 12:34:18 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.14.0-beta1:
|
||||
* New bugfix release
|
||||
* No changelog available
|
||||
- Drop patches, now upstream:
|
||||
* fix-return-nonvoid-function.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 30 13:29:53 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
@ -21,20 +21,18 @@
|
||||
%define libname libQt53DCore5
|
||||
|
||||
Name: libqt5-qt3d
|
||||
Version: 5.14.0~alpha
|
||||
Version: 5.14.0~beta2
|
||||
Release: 0
|
||||
Summary: Qt 5 3D Addon
|
||||
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
|
||||
Group: Development/Libraries/X11
|
||||
Url: https://www.qt.io
|
||||
%define base_name libqt5
|
||||
%define real_version 5.14.0-alpha
|
||||
%define real_version 5.14.0-beta2
|
||||
%define so_version 5.14.0
|
||||
%define tar_version qt3d-everywhere-src-5.14.0-alpha
|
||||
%define tar_version qt3d-everywhere-src-5.14.0-beta2
|
||||
Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
|
||||
Source1: baselibs.conf
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch1: fix-return-nonvoid-function.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libQt5Bootstrap-devel-static >= %{version}
|
||||
BuildRequires: libQt5Concurrent-devel >= %{version}
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ea9fbfaf8f13ff4a1eb22233cdccdfd11317274788d54143354a7be929aa60b7
|
||||
size 82188104
|
3
qt3d-everywhere-src-5.14.0-beta2.tar.xz
Normal file
3
qt3d-everywhere-src-5.14.0-beta2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ca3abadd89dee3c0455e42e8ddd7673339344b9648de8f487c03fc20bf5ee7a1
|
||||
size 81627488
|
Loading…
Reference in New Issue
Block a user