Attachment #13455 for bug #46478

View | Details | Raw Unified | Return to bug 46478
Collapse All | Expand All




diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
index 9733f20..f3e24af 100644
--- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
+++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
@@ -157,7 +157,9 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange,
 void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/,
     const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/,
     clang::CharSourceRange /*filenameRange*/,
-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0))
+    clang::OptionalFileEntryRef file,
+#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
     const clang::Optional<clang::FileEntryRef> file,
 #else
     const clang::FileEntry *file,
diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h
index 3e44cee..be67798 100644
--- a/src/linguist/lupdate/lupdatepreprocessoraction.h
+++ b/src/linguist/lupdate/lupdatepreprocessoraction.h
@@ -52,7 +52,9 @@ private:
     void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/,
                             clang::StringRef /*fileName*/, bool /*isAngled*/,
                             clang::CharSourceRange /*filenameRange*/,
-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0))
+                            clang::OptionalFileEntryRef file,
+#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
                             const clang::Optional<clang::FileEntryRef> file,
 #else
                             const clang::FileEntry *file,

Lines 24-29 Requires: %name-common = %EVR Link Here

(-)a/qttools.spec (-1 / +2 lines)
24		24
25	Source: %qt_module-everywhere-src-%version.tar	25	Source: %qt_module-everywhere-src-%version.tar
26	Patch1: alt-run-qttools-with-qt6-suffix.patch	26	Patch1: alt-run-qttools-with-qt6-suffix.patch
		27	Patch2: alt-clang16.patch
27		28
28	Source20: assistant.desktop	29	Source20: assistant.desktop
29	Source21: designer.desktop	30	Source21: designer.desktop
Lines 149-154 Requires: libqt6-core = %_qt6_version Link Here
149	%prep	150	%prep
150	%setup -n %qt_module-everywhere-src-%version	151	%setup -n %qt_module-everywhere-src-%version
151	#%patch1 -p1	152	#%patch1 -p1
		153	%patch2 -p1
152		154
153	%build	155	%build
154	%define qdoc_found %{expand:%%(if [ -e %_qt6_bindir/qdoc ]; then echo 1; else echo 0; fi)}	156	%define qdoc_found %{expand:%%(if [ -e %_qt6_bindir/qdoc ]; then echo 1; else echo 0; fi)}
155	-

Return to bug 46478

Line 0 Link Here

(-)a/alt-clang16.patch (+30 lines)
	1	diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
	2	index 9733f20..f3e24af 100644
	3	--- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp
	4	+++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp
	5	@@ -157,7 +157,9 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange,
	6	void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /hashLoc/,
	7	const clang::Token & /includeTok/, clang::StringRef /fileName/, bool /isAngled/,
	8	clang::CharSourceRange /filenameRange/,
	9	-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
	10	+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0))
	11	+ clang::OptionalFileEntryRef file,
	12	+#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
	13	const clang::Optional<clang::FileEntryRef> file,
	14	#else
	15	const clang::FileEntry *file,
	16	diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h
	17	index 3e44cee..be67798 100644
	18	--- a/src/linguist/lupdate/lupdatepreprocessoraction.h
	19	+++ b/src/linguist/lupdate/lupdatepreprocessoraction.h
	20	@@ -52,7 +52,9 @@ private:
	21	void InclusionDirective(clang::SourceLocation /hashLoc/, const clang::Token &/includeTok/,
	22	clang::StringRef /fileName/, bool /isAngled/,
	23	clang::CharSourceRange /filenameRange/,
	24	-#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
	25	+#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0))
	26	+ clang::OptionalFileEntryRef file,
	27	+#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0))
	28	const clang::Optional<clang::FileEntryRef> file,
	29	#else
	30	const clang::FileEntry *file,