Compare commits
1 Commits
c10s-boots
...
c10s
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
69b0bbb612 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,3 +21,4 @@
|
||||
/qtwebchannel-everywhere-src-6.8.1.tar.xz
|
||||
/qtwebchannel-everywhere-src-6.9.0.tar.xz
|
||||
/qtwebchannel-everywhere-src-6.9.1.tar.xz
|
||||
/qtwebchannel-everywhere-src-6.10.1.tar.xz
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From a0492ee8494bb323f69bf104d6359affd7bf20b1 Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Edelev <alexey.edelev@qt.io>
|
||||
Date: Wed, 19 Feb 2025 19:48:10 +0100
|
||||
Subject: [PATCH] Add the missing linking of CorePrivate to WebChannelQuick
|
||||
module
|
||||
|
||||
It worked previously since Qt::Qml linking propagated it as
|
||||
private interface.
|
||||
|
||||
Change-Id: I65edd1aed1e1ed16df9f6da8ea78bd7d752ee198
|
||||
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
||||
---
|
||||
src/webchannelquick/CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/webchannelquick/CMakeLists.txt b/src/webchannelquick/CMakeLists.txt
|
||||
index e96028f..c936bb4 100644
|
||||
--- a/src/webchannelquick/CMakeLists.txt
|
||||
+++ b/src/webchannelquick/CMakeLists.txt
|
||||
@@ -14,5 +14,6 @@ qt_internal_add_qml_module(WebChannelQuick
|
||||
DEFINES
|
||||
QT_NO_CONTEXTLESS_CONNECT
|
||||
LIBRARIES
|
||||
+ Qt::CorePrivate
|
||||
Qt::WebChannelPrivate
|
||||
)
|
||||
@ -6,14 +6,13 @@
|
||||
%global prerelease rc2
|
||||
%endif
|
||||
|
||||
%global examples 1
|
||||
# FIXME: needs bootstrap
|
||||
%global build_tests 1
|
||||
%global examples 1
|
||||
|
||||
Summary: Qt6 - WebChannel component
|
||||
Name: qt6-%{qt_module}
|
||||
Version: 6.9.1
|
||||
Release: 3%{?dist}
|
||||
Version: 6.10.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||
Url: http://qt.io
|
||||
@ -27,7 +26,6 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
|
||||
%endif
|
||||
|
||||
## Upstream patches
|
||||
Patch0: 0001-Add-missing-linking-CorePrivate.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
@ -35,7 +33,7 @@ BuildRequires: ninja-build
|
||||
BuildRequires: qt6-rpm-macros
|
||||
BuildRequires: qt6-qtbase-devel >= %{version}
|
||||
BuildRequires: qt6-qtbase-private-devel
|
||||
#libQt6Core.so.6(Qt_5_PRIVATE_API)(64bit)
|
||||
#libQt6Core.so.6(Qt_6_PRIVATE_API)(64bit)
|
||||
%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
|
||||
BuildRequires: qt6-qtdeclarative-devel
|
||||
BuildRequires: qt6-qtwebsockets-devel
|
||||
@ -59,7 +57,6 @@ Requires: qt6-qtbase-devel%{?_isa}
|
||||
%package examples
|
||||
Summary: Programming examples for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
# BuildRequires: qt6-qtwebchannel-devel >= %{version}
|
||||
%description examples
|
||||
%{summary}.
|
||||
%endif
|
||||
@ -67,7 +64,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%if 0%{?build_tests}
|
||||
%package tests
|
||||
Summary: Unit tests for %{name}
|
||||
BuildRequires: qt6-qtwebchannel-devel >= %{version}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%description tests
|
||||
%{summary}.
|
||||
@ -152,6 +148,10 @@ popd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Nov 24 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.1-1
|
||||
- 6.10.1
|
||||
Resolves: RHEL-109197
|
||||
|
||||
* Tue Jun 24 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.1-3
|
||||
- Add the missing linking of CorePrivate to WebChannelQuick module
|
||||
Resolves: RHEL-78557
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (qtwebchannel-everywhere-src-6.9.1.tar.xz) = acc7b1394c35c604ac0921e2276fab465e27723f71b39bb4125e74142da656cfcce31e0ac1f867ed756214d2b38c72739fbb5e7a5043811a4e03e5b912e8f099
|
||||
SHA512 (qtwebchannel-everywhere-src-6.10.1.tar.xz) = e4ac180d92e9a090bafd39335b721d735d5168eec6d5f632323b63b1e6f01bc6551354f0bf56c3f7ed79c5cba54b724e7011367e95dc2285e4fdbca6259d7eab
|
||||
|
||||
Loading…
Reference in New Issue
Block a user