forked from pool/qt6-tools
Accepting request 1036926 from KDE:Qt6
Qt 6.4.1 (forwarded request 1036897 from cgiboudeaux) OBS-URL: https://build.opensuse.org/request/show/1036926 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-tools?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
299b1fc041
@ -1,69 +0,0 @@
|
||||
From 6495329e6de803025e6e4e8291b648f94893551c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de>
|
||||
Date: Sat, 1 Oct 2022 07:19:52 +0200
|
||||
Subject: [PATCH] lupdate: Fix build with clang 15+
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The signature of InclusionDirective changed for clang 15.
|
||||
|
||||
Pick-to: 6.4
|
||||
Change-Id: Ic259b3508088671b40f6f615524137ce8837c487
|
||||
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
||||
---
|
||||
src/linguist/lupdate/lupdatepreprocessoraction.cpp | 13 +++++++++++--
|
||||
src/linguist/lupdate/lupdatepreprocessoraction.h | 7 ++++++-
|
||||
2 files changed, 17 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
|
||||
index abfab34e5..d963747d8 100644
|
||||
--- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
|
||||
+++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
|
||||
@@ -156,14 +156,23 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange,
|
||||
// To list the included files
|
||||
void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/,
|
||||
const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/,
|
||||
- clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file,
|
||||
+ clang::CharSourceRange /*filenameRange*/,
|
||||
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
|
||||
+ const clang::Optional<clang::FileEntryRef> file,
|
||||
+#else
|
||||
+ const clang::FileEntry *file,
|
||||
+#endif
|
||||
clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/,
|
||||
const clang::Module */*imported*/, clang::SrcMgr::CharacteristicKind /*fileType*/)
|
||||
{
|
||||
if (!file)
|
||||
return;
|
||||
|
||||
- clang::StringRef fileNameRealPath = file->tryGetRealPathName();
|
||||
+ clang::StringRef fileNameRealPath = file->
|
||||
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
|
||||
+ getFileEntry().
|
||||
+#endif
|
||||
+ tryGetRealPathName();
|
||||
if (!LupdatePrivate::isFileSignificant(fileNameRealPath.str()))
|
||||
return;
|
||||
|
||||
diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h
|
||||
index b1ee468d4..3e44cee83 100644
|
||||
--- a/src/linguist/lupdate/lupdatepreprocessoraction.h
|
||||
+++ b/src/linguist/lupdate/lupdatepreprocessoraction.h
|
||||
@@ -51,7 +51,12 @@ private:
|
||||
void SourceRangeSkipped(clang::SourceRange sourceRange, clang::SourceLocation endifLoc) override;
|
||||
void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/,
|
||||
clang::StringRef /*fileName*/, bool /*isAngled*/,
|
||||
- clang::CharSourceRange /*filenameRange*/, const clang::FileEntry *file,
|
||||
+ clang::CharSourceRange /*filenameRange*/,
|
||||
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
|
||||
+ const clang::Optional<clang::FileEntryRef> file,
|
||||
+#else
|
||||
+ const clang::FileEntry *file,
|
||||
+#endif
|
||||
clang::StringRef /*searchPath*/, clang::StringRef /*relativePath*/,
|
||||
const clang::Module */*imported*/,
|
||||
clang::SrcMgr::CharacteristicKind /*fileType*/) override;
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 15 11:53:25 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.4.1:
|
||||
* https://www.qt.io/blog/qt-6.4.1-released
|
||||
- Drop patch, fixed upstream:
|
||||
* 0001-lupdate-Fix-build-with-clang-15.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 8 06:49:06 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define real_version 6.4.0
|
||||
%define real_version 6.4.1
|
||||
%define short_version 6.4
|
||||
%define tar_name qttools-everywhere-src
|
||||
%define tar_suffix %{nil}
|
||||
@ -27,7 +27,7 @@
|
||||
%endif
|
||||
#
|
||||
Name: qt6-tools%{?pkg_suffix}
|
||||
Version: 6.4.0
|
||||
Version: 6.4.1
|
||||
Release: 0
|
||||
Summary: Qt 6 Tools libraries and tools
|
||||
# TODO Check if it's still valid
|
||||
@ -46,8 +46,6 @@ Source13: org.qt.assistant6.desktop
|
||||
# The 48x48 icon was removed from qttools
|
||||
Source14: linguist6.png
|
||||
Source99: qt6-tools-rpmlintrc
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: 0001-lupdate-Fix-build-with-clang-15.patch
|
||||
# clang-devel in Leap 15.3 points to clang7...
|
||||
%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150300
|
||||
BuildRequires: clang11-devel
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:97f3d5f88c458be7a8f7b7b08efc06c4ebad39ca51669476b18bf9e4c11afba2
|
||||
size 8738432
|
||||
3
qttools-everywhere-src-6.4.1.tar.xz
Normal file
3
qttools-everywhere-src-6.4.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9e20562c6b04c21fbdb4ed89e59226169ffeaafaab8f45f7d81ea49b0e4b0933
|
||||
size 8739172
|
||||
Loading…
Reference in New Issue
Block a user