Accepting request 902325 from KDE:Qt:5.15
Qt 5.15.2 + KDE patch collection OBS-URL: https://build.opensuse.org/request/show/902325 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3fa41fd20f
@ -1,40 +0,0 @@
|
||||
From 9bc2fa1c7ecd907dd513c07e69a95e5c994b8d9a Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Thu, 22 Apr 2021 16:41:52 +0200
|
||||
Subject: [PATCH] Include <limits> to fix build with GCC 11
|
||||
|
||||
Yarr.h is even broken in upstream WebKit as of now.
|
||||
|
||||
References: QTBUG-89977
|
||||
---
|
||||
src/3rdparty/masm/yarr/Yarr.h | 1 +
|
||||
src/qmldebug/qqmlprofilerevent_p.h | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/3rdparty/masm/yarr/Yarr.h b/src/3rdparty/masm/yarr/Yarr.h
|
||||
index ccf78f9880..2955ea7e72 100644
|
||||
--- a/src/3rdparty/masm/yarr/Yarr.h
|
||||
+++ b/src/3rdparty/masm/yarr/Yarr.h
|
||||
@@ -28,6 +28,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <limits.h>
|
||||
+#include <limits>
|
||||
#include "YarrErrorCode.h"
|
||||
|
||||
namespace JSC { namespace Yarr {
|
||||
diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h
|
||||
index a7e37d1964..3f13679a6a 100644
|
||||
--- a/src/qmldebug/qqmlprofilerevent_p.h
|
||||
+++ b/src/qmldebug/qqmlprofilerevent_p.h
|
||||
@@ -49,6 +49,7 @@
|
||||
|
||||
#include <initializer_list>
|
||||
#include <type_traits>
|
||||
+#include <limits>
|
||||
|
||||
//
|
||||
// W A R N I N G
|
||||
--
|
||||
2.20.1
|
||||
|
||||
23
0001-Revert-Bump-version.patch
Normal file
23
0001-Revert-Bump-version.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From d611fb1a24f584b8c1f79f449959171dd7d69cbd Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Mon, 21 Jun 2021 22:37:30 +0200
|
||||
Subject: [PATCH] Revert "Bump version"
|
||||
|
||||
This reverts commit 568763928a78b52373932b01be17e040f7c3fa50.
|
||||
---
|
||||
.qmake.conf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/.qmake.conf b/.qmake.conf
|
||||
index 4e82106546..85b893856b 100644
|
||||
--- a/.qmake.conf
|
||||
+++ b/.qmake.conf
|
||||
@@ -4,4 +4,4 @@ CONFIG += warning_clean
|
||||
DEFINES += QT_NO_LINKED_LIST
|
||||
DEFINES += QT_NO_JAVA_STYLE_ITERATORS
|
||||
|
||||
-MODULE_VERSION = 5.15.3
|
||||
+MODULE_VERSION = 5.15.2
|
||||
--
|
||||
2.20.1
|
||||
|
||||
18
_service
Normal file
18
_service
Normal file
@ -0,0 +1,18 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="changesgenerate">enable</param>
|
||||
<param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
|
||||
<param name="url">https://invent.kde.org/qt/qt/qtdeclarative.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="filename">qtdeclarative-everywhere-src</param>
|
||||
<param name="revision">kde/5.15</param>
|
||||
<param name="parent-tag">v5.15.2</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
</service>
|
||||
<service name="set_version" mode="disabled"/>
|
||||
<service name="tar" mode="buildtime"/>
|
||||
<service name="recompress" mode="buildtime">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
</services>
|
||||
4
_servicedata
Normal file
4
_servicedata
Normal file
@ -0,0 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://invent.kde.org/qt/qt/qtdeclarative.git</param>
|
||||
<param name="changesrevision">6683c414c5cc6ab46197c41bb1361c518ca84d3e</param></service></servicedata>
|
||||
@ -1,3 +1,47 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 23 07:01:57 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to version 5.15.2+kde29:
|
||||
* Remove unused QPointer<QQuickPointerMask>
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 21 20:37:30 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Switch to KDE's maintenance branch
|
||||
- Update to version 5.15.2+kde28:
|
||||
* Support ' in styled text
|
||||
* Document that StyledText also supports and "
|
||||
* Add missing limits include to fix build with GCC 11
|
||||
* Give a warning when StyledText encounters a non supported entity
|
||||
* doc: explain QQItem event delivery, handlers, setAcceptTouchEvents()
|
||||
* JIT: When making memory writable, include the exception handler
|
||||
* Fix IC properties in same file
|
||||
* QML: Fix proxy iteration
|
||||
* DesignerSupport: Don't skip already inspected objects
|
||||
* Show a tableview even if the syncView has an empty model
|
||||
* qqmlistmodel: Fix crash when modelCache is null
|
||||
* Use load(qt_tool) for qmltime
|
||||
* qv4qmlcontext: Fix bounded signal expressions when debugging
|
||||
* qmltypes.prf: Take abi into account for *_metatypes.json file names
|
||||
* Accessibility event is sent on item's geometry change
|
||||
* Fix crash when calling hasOwnProperty() on proxy object
|
||||
* QQuickTextInput: Store mask data in std::unique_ptr
|
||||
* Fix QML property cache leaks of delegate items
|
||||
* qmlfunctions.qdoc: Add clarification to QML_FOREIGN
|
||||
* Doc: mention that INCLUDEPATH must be set in some cases
|
||||
* QML Text doesn't reset lineCount when text is empty
|
||||
* Avoid GHS linker to optimize away QML type registrations
|
||||
* QQuickWindow: Check if QQuickItem was not deleted
|
||||
* QQuickView docs: show correct usage of setInitialProperties
|
||||
* Add changes file for Qt 5.15.2
|
||||
* Revert "qquickloader: Free memory of loaded components after source change"
|
||||
* Inline components: Fix custom parser support
|
||||
* Bump version
|
||||
- Add patch to reset version to 5.15.2:
|
||||
* 0001-Revert-Bump-version.patch
|
||||
- Drop patches, now upstream:
|
||||
* 0001-Include-limits-to-fix-build-with-GCC-11.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 22 14:43:09 UTC 2021 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
|
||||
@ -16,38 +16,39 @@
|
||||
#
|
||||
|
||||
|
||||
%define qt5_snapshot 0
|
||||
%define qt5_snapshot 1
|
||||
%define libname libQtQuick5
|
||||
%define base_name libqt5
|
||||
%define real_version 5.15.2
|
||||
%define so_version 5.15.2
|
||||
%define tar_version qtdeclarative-everywhere-src-5.15.2
|
||||
%define tar_version qtdeclarative-everywhere-src-%{version}
|
||||
Name: libqt5-qtdeclarative
|
||||
Version: 5.15.2
|
||||
Version: 5.15.2+kde29
|
||||
Release: 0
|
||||
Summary: Qt 5 Declarative Library
|
||||
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
|
||||
Group: Development/Libraries/X11
|
||||
URL: https://www.qt.io
|
||||
Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
|
||||
Source: %{tar_version}.tar.xz
|
||||
Source1: baselibs.conf
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch1: 0001-Revert-Bump-version.patch
|
||||
# PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case
|
||||
Patch100: sse2_nojit.patch
|
||||
Patch101: 0001-Include-limits-to-fix-build-with-GCC-11.patch
|
||||
Patch103: qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libQt5Core-private-headers-devel >= %{version}
|
||||
BuildRequires: libQt5Gui-private-headers-devel >= %{version}
|
||||
BuildRequires: libQt5Test-private-headers-devel >= %{version}
|
||||
BuildRequires: libQt5Widgets-private-headers-devel >= %{version}
|
||||
BuildRequires: libQt5Core-private-headers-devel >= %{real_version}
|
||||
BuildRequires: libQt5Gui-private-headers-devel >= %{real_version}
|
||||
BuildRequires: libQt5Test-private-headers-devel >= %{real_version}
|
||||
BuildRequires: libQt5Widgets-private-headers-devel >= %{real_version}
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python3-base
|
||||
BuildRequires: xz
|
||||
BuildRequires: pkgconfig(Qt5Core) >= %{version}
|
||||
BuildRequires: pkgconfig(Qt5Gui) >= %{version}
|
||||
BuildRequires: pkgconfig(Qt5Network) >= %{version}
|
||||
BuildRequires: pkgconfig(Qt5Sql) >= %{version}
|
||||
BuildRequires: pkgconfig(Qt5Widgets) >= %{version}
|
||||
BuildRequires: pkgconfig(Qt5Core) >= %{real_version}
|
||||
BuildRequires: pkgconfig(Qt5Gui) >= %{real_version}
|
||||
BuildRequires: pkgconfig(Qt5Network) >= %{real_version}
|
||||
BuildRequires: pkgconfig(Qt5Sql) >= %{real_version}
|
||||
BuildRequires: pkgconfig(Qt5Widgets) >= %{real_version}
|
||||
%if %{qt5_snapshot}
|
||||
#to create the forwarding headers
|
||||
BuildRequires: perl
|
||||
@ -68,8 +69,7 @@ This package contains base tools, like string, xml, and network
|
||||
handling.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{tar_version}
|
||||
%autopatch -p1
|
||||
%autosetup -p1 -n qtdeclarative-everywhere-src-%{version}
|
||||
|
||||
%package -n %{libname}
|
||||
Summary: Qt 5 Declarative Library
|
||||
@ -109,10 +109,10 @@ This package contains aditional tools for inspecting, testing, viewing, etc, QML
|
||||
Summary: Non-ABI stable experimental API
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name}-devel = %{version}
|
||||
Requires: libQt5Core-private-headers-devel >= %{version}
|
||||
Requires: libQt5Gui-private-headers-devel >= %{version}
|
||||
Requires: libQt5Test-private-headers-devel >= %{version}
|
||||
Requires: libQt5Widgets-private-headers-devel >= %{version}
|
||||
Requires: libQt5Core-private-headers-devel >= %{real_version}
|
||||
Requires: libQt5Gui-private-headers-devel >= %{real_version}
|
||||
Requires: libQt5Test-private-headers-devel >= %{real_version}
|
||||
Requires: libQt5Widgets-private-headers-devel >= %{real_version}
|
||||
Provides: libQt5Quick-private-headers-devel = %{version}
|
||||
Obsoletes: libQt5Quick-private-headers-devel < %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
3
qtdeclarative-everywhere-src-5.15.2+kde29.obscpio
Normal file
3
qtdeclarative-everywhere-src-5.15.2+kde29.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:697992a89338f08006f2ff92deebc9f529cb912d83da1164a71a3abced92c247
|
||||
size 143153679
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651
|
||||
size 21559880
|
||||
5
qtdeclarative-everywhere-src.obsinfo
Normal file
5
qtdeclarative-everywhere-src.obsinfo
Normal file
@ -0,0 +1,5 @@
|
||||
name: qtdeclarative-everywhere-src
|
||||
version: 5.15.2+kde29
|
||||
mtime: 1624360602
|
||||
commit: 6683c414c5cc6ab46197c41bb1361c518ca84d3e
|
||||
|
||||
Loading…
Reference in New Issue
Block a user