24 changed files with 25482 additions and 320 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,28 +1 @@
-/qtbase-everywhere-src-6.0.0.tar.xz
+SOURCES/qtbase-everywhere-src-6.8.1.tar.xz
 /qtbase-everywhere-src-6.0.1.tar.xz
 /qtbase-everywhere-src-6.0.3.tar.xz
 /qtbase-everywhere-src-6.1.0.tar.xz
 /qtbase-everywhere-src-6.1.1.tar.xz
 /qtbase-everywhere-src-6.1.2.tar.xz
 /qtbase-everywhere-src-6.2.0-beta3.tar.xz
 /qtbase-everywhere-src-6.2.0-beta4.tar.xz
 /qtbase-everywhere-src-6.2.0-rc.tar.xz
 /qtbase-everywhere-src-6.2.0-rc2.tar.xz
 /qtbase-everywhere-src-6.2.0.tar.xz
 /qtbase-everywhere-src-6.2.1.tar.xz
 /qtbase-everywhere-src-6.2.2.tar.xz
 /qtbase-everywhere-src-6.2.3.tar.xz
 /qtbase-everywhere-src-6.3.0.tar.xz
 /qtbase-everywhere-src-6.3.1.tar.xz
 /qtbase-everywhere-src-6.4.0.tar.xz
 /qtbase-everywhere-src-6.4.1.tar.xz
 /qtbase-everywhere-src-6.4.2.tar.xz
 /qtbase-everywhere-src-6.4.3.tar.xz
 /qtbase-everywhere-src-6.5.0.tar.xz
 /qtbase-everywhere-src-6.5.1.tar.xz
 /qtbase-everywhere-src-6.5.2.tar.xz
 /qt-everywhere-src-6.5.3.tar.xz
 /qtbase-everywhere-src-6.5.3.tar.xz
 /qtbase-everywhere-src-6.6.0.tar.xz
 /qtbase-everywhere-src-6.6.1.tar.xz
 /qtbase-everywhere-src-6.6.2.tar.xz
--- a/.qt6-qtbase.metadata
+++ b/.qt6-qtbase.metadata
@ -0,0 +1 @@
 ac3cfaee831310f03288ab32adc7ccc60b501205 SOURCES/qtbase-everywhere-src-6.8.1.tar.xz
--- a/SOURCES/10-qt6-check-opengl2.sh
+++ b/SOURCES/10-qt6-check-opengl2.sh
--- a/SOURCES/macros.qt6-qtbase
+++ b/SOURCES/macros.qt6-qtbase
--- a/SOURCES/qconfig-multilib.h
+++ b/SOURCES/qconfig-multilib.h
--- a/SOURCES/qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch
+++ b/SOURCES/qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch
--- a/SOURCES/qtbase-cxxflag.patch
+++ b/SOURCES/qtbase-cxxflag.patch
--- a/SOURCES/qtbase-extract-emoji-data-from-unicode-files.patch
+++ b/SOURCES/qtbase-extract-emoji-data-from-unicode-files.patch
--- a/SOURCES/qtbase-introduce-emoji-segmenter-to-3rdparty-code.patch
+++ b/SOURCES/qtbase-introduce-emoji-segmenter-to-3rdparty-code.patch
@ -0,0 +1,569 @@
 From aa7d479be0df3e118580e87f30e061445dfb37e3 Mon Sep 17 00:00:00 2001
 From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
 Date: Fri, 02 Feb 2024 15:45:20 +0100
 Subject: [PATCH] Introduce emoji-segmenter to 3rdparty code
 This is a parser for emoji sequences developed by Google
 which is used in multiple other projects for parsing
 sequences of characters to see if they should be represented
 as color emojis or as monochrome text.
 [ChangeLog][Third-Party Code] Added the emoji-segmenter to
 third party code, for supporting complex emoji sequences.
 This can be configured using the -emojisegmenter option.
 Task-number: QTBUG-111801
 Change-Id: I7f87b0751415024d29f074d133850027f0003e29
 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 ---
 diff --git a/config_help.txt b/config_help.txt
 index 039582da..417c2067 100644
 --- a/config_help.txt
 +++ b/config_help.txt
@@ -295,6 +295,7 @@ Gui, printing, widget options:
   -cups ................ Enable CUPS support [auto] (Unix only)
 +  -emojisegmenter ...... Enable complex emoji sequences [yes]
   -fontconfig .......... Enable Fontconfig support [auto] (Unix only)
   -freetype ............ Select used FreeType [system/qt/no]
   -harfbuzz ............ Select used HarfBuzz-NG [system/qt/no]
 diff --git a/src/3rdparty/emoji-segmenter/CONTRIBUTING.md b/src/3rdparty/emoji-segmenter/CONTRIBUTING.md
 new file mode 100644
 index 00000000..db177d4a
 --- /dev/null
 +++ b/src/3rdparty/emoji-segmenter/CONTRIBUTING.md
@@ -0,0 +1,28 @@
 +# How to Contribute
 +
 +We'd love to accept your patches and contributions to this project. There are
 +just a few small guidelines you need to follow.
 +
 +## Contributor License Agreement
 +
 +Contributions to this project must be accompanied by a Contributor License
 +Agreement. You (or your employer) retain the copyright to your contribution;
 +this simply gives us permission to use and redistribute your contributions as
 +part of the project. Head over to <https://cla.developers.google.com/> to see
 +your current agreements on file or to sign a new one.
 +
 +You generally only need to submit a CLA once, so if you've already submitted one
 +(even if it was for a different project), you probably don't need to do it
 +again.
 +
 +## Code reviews
 +
 +All submissions, including submissions by project members, require review. We
 +use GitHub pull requests for this purpose. Consult
 +[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
 +information on using pull requests.
 +
 +## Community Guidelines
 +
 +This project follows
 +[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
 diff --git a/src/3rdparty/emoji-segmenter/NEWS b/src/3rdparty/emoji-segmenter/NEWS
 new file mode 100644
 index 00000000..3fd07f1c
 --- /dev/null
 +++ b/src/3rdparty/emoji-segmenter/NEWS
@@ -0,0 +1,28 @@
 +Overview of changes leading to 0.4.0
 +Friday, November 15, 2024
 +====================================
 +
 +* Add `make size` targe to
 +  determine binary size.
 +* Set has_vs for
 +  emoji_keycap_sequence
 +
 +Overview of changes leading to 0.3.0
 +Tuesday, September 5, 2024
 +====================================
 +
 +* Add segmentation for variation
 +  selector pairs, VS15 and VS16,
 +  needed for font-variant-emoji.
 +
 +Overview of changes leading to 0.2.0
 +Tuesday, Februar 20, 2024
 +====================================
 +
 +* Change Ragel mode to -F1
 +
 +Overview of changes leading to 0.1.0
 +Tuesday, January 29, 2019
 +====================================
 +
 +* Initial release
 diff --git a/src/3rdparty/emoji-segmenter/README.md b/src/3rdparty/emoji-segmenter/README.md
 new file mode 100644
 index 00000000..571a1a45
 --- /dev/null
 +++ b/src/3rdparty/emoji-segmenter/README.md
@@ -0,0 +1,103 @@
 +Emoji Segmenter
 +===
 +
 +This repository contains a Ragel grammar and generated C code for segmenting
 +runs of text into text-presentation and emoji-presentation runs. It is currently
 +used in projects such as Chromium and Pango for deciding which preferred
 +presentation, color or text, a run of text should have.
 +
 +The goal is to stay very close to the grammar definitions in [Unicode Technical
 +Standard #51](http://www.unicode.org/reports/tr51/).
 +
 +API
 +===
 +
 +By including the `emoji_presentation_scanner.c` file, you will be able to call
 +the following API
 +
 +```
 +scan_emoji_presentation (emoji_text_iter_t p,
 +    const emoji_text_iter_t pe,
 +    bool* is_emoji,
 +    bool* has_vs)
 +```
 +
 +This API call will scan `emoji_text_iter_t p` for the next grammar-token and
 +return an iterator that points to the end of the next token. An end iterator
 +needs be specified as `pe` so that the scanner can compare against this and
 +knows where to stop. In the reference parameter `is_emoji` it returns whether
 +this token has emoji-presentation text-presentation, `has_vs` is set to true
 +if the token contains a variation selector.
 +
 +A grammar token is either a combination of an emoji plus variation selector 15
 +for text presentation, an emoji presentation sequence (emoji + VS16), an emoji
 +presentation emoji or emoji sequence, or a single text presentation character.
 +
 +`emoji_text_iter_t` is an iterator type over a buffer of the character classes
 +that are defined at the beginning of the the Ragel file, e.g. `EMOJI`,
 +`EMOJI_TEXT_PRESENTATION`, `REGIONAL_INDICATOR`, `KEYCAP_BASE`, etc.
 +
 +By typedef'ing `emoji_text_iter_t` to your own iterator type, you can implement
 +an adapter class that iterates over an input text buffer in any encoding, and on
 +dereferencing returns the correct Ragel class by implementing something similar
 +to the following Unicode character class to Ragel class mapping, example taken
 +from Chromium:
 +
 +```
 +char EmojiSegmentationCategory(UChar32 codepoint) {
 +  // Specific ones first.
 +  if (codepoint == kCombiningEnclosingKeycapCharacter)
 +    return COMBINING_ENCLOSING_KEYCAP;
 +  if (codepoint == kCombiningEnclosingCircleBackslashCharacter)
 +    return COMBINING_ENCLOSING_CIRCLE_BACKSLASH;
 +  if (codepoint == kZeroWidthJoinerCharacter)
 +    return ZWJ;
 +  if (codepoint == kVariationSelector15Character)
 +    return VS15;
 +  if (codepoint == kVariationSelector16Character)
 +    return VS16;
 +  if (codepoint == 0x1F3F4)
 +    return TAG_BASE;
 +  if ((codepoint >= 0xE0030 && codepoint <= 0xE0039) ||
 +      (codepoint >= 0xE0061 && codepoint <= 0xE007A))
 +    return TAG_SEQUENCE;
 +  if (codepoint == 0xE007F)
 +    return TAG_TERM;
 +  if (Character::IsEmojiModifierBase(codepoint))
 +    return EMOJI_MODIFIER_BASE;
 +  if (Character::IsModifier(codepoint))
 +    return EMOJI_MODIFIER;
 +  if (Character::IsRegionalIndicator(codepoint))
 +    return REGIONAL_INDICATOR;
 +  if (Character::IsEmojiKeycapBase(codepoint))
 +    return KEYCAP_BASE;
 +
 +  if (Character::IsEmojiEmojiDefault(codepoint))
 +    return EMOJI_EMOJI_PRESENTATION;
 +  if (Character::IsEmojiTextDefault(codepoint))
 +    return EMOJI_TEXT_PRESENTATION;
 +  if (Character::IsEmoji(codepoint))
 +    return EMOJI;
 +
 +  // Ragel state machine will interpret unknown category as "any".
 +  return kMaxEmojiScannerCategory;
 +}
 +```
 +
 +Update/Build requisites
 +===
 +
 +You need to have ragel installed if you want to modify the grammar and generate a new C file as output.
 +
 +`apt-get install ragel`
 +
 +then run
 +
 +`make`
 +
 +to update the `emoji_presentation_scanner.c` and `emoji_presentation_scanner_vs.c` output C source file.
 +
 +Contributing
 +===
 +
 +See the CONTRIBUTING.md file for how to contribute.
 diff --git a/src/3rdparty/emoji-segmenter/REUSE.toml b/src/3rdparty/emoji-segmenter/REUSE.toml
 new file mode 100644
 index 00000000..53d2dc47
 --- /dev/null
 +++ b/src/3rdparty/emoji-segmenter/REUSE.toml
@@ -0,0 +1,7 @@
 +version = 1
 +
 +[[annotations]]
 +path = ["**"]
 +precedence = "closest"
 +SPDX-FileCopyrightText = "Copyright 2019 Google LLC"
 +SPDX-License-Identifier = "Apache-2.0"
 diff --git a/src/3rdparty/emoji-segmenter/emoji_presentation_scanner.c b/src/3rdparty/emoji-segmenter/emoji_presentation_scanner.c
 new file mode 100644
 index 00000000..00b7700a
 --- /dev/null
 +++ b/src/3rdparty/emoji-segmenter/emoji_presentation_scanner.c
@@ -0,0 +1,251 @@
 +
 +#line 1 "emoji_presentation_scanner.rl"
 +/* Copyright 2019 Google LLC
 + *
 + * Licensed under the Apache License, Version 2.0 (the "License");
 + * you may not use this file except in compliance with the License.
 + * You may obtain a copy of the License at
 + *
 + *     https://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +
 +#include <stdbool.h>
 +
 +#ifndef EMOJI_LINKAGE
 +#define EMOJI_LINKAGE static
 +#endif
 +
 +
 +#line 23 "emoji_presentation_scanner.c"
 +static const unsigned char _emoji_presentation_trans_keys[] = {
 +	0u, 13u, 14u, 15u, 0u, 13u, 9u, 12u, 10u, 12u, 10u, 10u, 4u, 12u, 4u, 12u, 
 +	6u, 6u, 9u, 12u, 8u, 8u, 8u, 10u, 9u, 14u, 0
 +};
 +
 +static const char _emoji_presentation_key_spans[] = {
 +	14, 2, 14, 4, 3, 1, 9, 9, 
 +	1, 4, 1, 3, 6
 +};
 +
 +static const char _emoji_presentation_index_offsets[] = {
 +	0, 15, 18, 33, 38, 42, 44, 54, 
 +	64, 66, 71, 73, 77
 +};
 +
 +static const char _emoji_presentation_indicies[] = {
 +	1, 1, 1, 2, 0, 0, 0, 1, 
 +	0, 0, 0, 0, 0, 1, 0, 4, 
 +	5, 3, 6, 6, 7, 8, 9, 9, 
 +	10, 11, 9, 9, 9, 9, 9, 12, 
 +	9, 5, 13, 14, 15, 0, 13, 16, 
 +	17, 16, 13, 0, 17, 16, 16, 16, 
 +	16, 16, 13, 16, 17, 16, 17, 16, 
 +	16, 16, 16, 5, 13, 14, 15, 16, 
 +	5, 18, 5, 13, 19, 20, 18, 14, 
 +	21, 23, 22, 13, 22, 5, 13, 14, 
 +	15, 16, 4, 16, 0
 +};
 +
 +static const char _emoji_presentation_trans_targs[] = {
 +	2, 4, 6, 2, 1, 2, 3, 3, 
 +	7, 2, 8, 9, 12, 0, 2, 5, 
 +	2, 5, 2, 10, 11, 2, 2, 2
 +};
 +
 +static const char _emoji_presentation_trans_actions[] = {
 +	1, 2, 2, 3, 0, 4, 7, 2, 
 +	2, 8, 0, 7, 2, 0, 9, 10, 
 +	11, 2, 12, 0, 10, 13, 14, 15
 +};
 +
 +static const char _emoji_presentation_to_state_actions[] = {
 +	0, 0, 5, 0, 0, 0, 0, 0, 
 +	0, 0, 0, 0, 0
 +};
 +
 +static const char _emoji_presentation_from_state_actions[] = {
 +	0, 0, 6, 0, 0, 0, 0, 0, 
 +	0, 0, 0, 0, 0
 +};
 +
 +static const char _emoji_presentation_eof_trans[] = {
 +	1, 4, 0, 1, 17, 1, 17, 17, 
 +	19, 19, 22, 23, 17
 +};
 +
 +static const int emoji_presentation_start = 2;
 +
 +static const int emoji_presentation_en_text_and_emoji_run = 2;
 +
 +
 +#line 26 "emoji_presentation_scanner.rl"
 +
 +
 +
 +#line 100 "emoji_presentation_scanner.rl"
 +
 +
 +EMOJI_LINKAGE emoji_text_iter_t
 +scan_emoji_presentation (emoji_text_iter_t p,
 +    const emoji_text_iter_t pe,
 +    bool* is_emoji,
 +    bool* has_vs)
 +{
 +  emoji_text_iter_t ts;
 +  emoji_text_iter_t te;
 +  const emoji_text_iter_t eof = pe;
 +
 +  (void)ts;
 +
 +  unsigned act;
 +  int cs;
 +
 +  
 +#line 100 "emoji_presentation_scanner.c"
 +	{
 +	cs = emoji_presentation_start;
 +	ts = 0;
 +	te = 0;
 +	act = 0;
 +	}
 +
 +#line 106 "emoji_presentation_scanner.c"
 +	{
 +	int _slen;
 +	int _trans;
 +	const unsigned char *_keys;
 +	const char *_inds;
 +	if ( p == pe )
 +		goto _test_eof;
 +_resume:
 +	switch ( _emoji_presentation_from_state_actions[cs] ) {
 +	case 6:
 +#line 1 "NONE"
 +	{ts = p;}
 +	break;
 +#line 118 "emoji_presentation_scanner.c"
 +	}
 +
 +	_keys = _emoji_presentation_trans_keys + (cs<<1);
 +	_inds = _emoji_presentation_indicies + _emoji_presentation_index_offsets[cs];
 +
 +	_slen = _emoji_presentation_key_spans[cs];
 +	_trans = _inds[ _slen > 0 && _keys[0] <=(*p) &&
 +		(*p) <= _keys[1] ?
 +		(*p) - _keys[0] : _slen ];
 +
 +_eof_trans:
 +	cs = _emoji_presentation_trans_targs[_trans];
 +
 +	if ( _emoji_presentation_trans_actions[_trans] == 0 )
 +		goto _again;
 +
 +	switch ( _emoji_presentation_trans_actions[_trans] ) {
 +	case 9:
 +#line 94 "emoji_presentation_scanner.rl"
 +	{te = p+1;{ *is_emoji = false; *has_vs = true; return te; }}
 +	break;
 +	case 15:
 +#line 95 "emoji_presentation_scanner.rl"
 +	{te = p+1;{ *is_emoji = true; *has_vs = true; return te; }}
 +	break;
 +	case 4:
 +#line 96 "emoji_presentation_scanner.rl"
 +	{te = p+1;{ *is_emoji = true; *has_vs = false; return te; }}
 +	break;
 +	case 8:
 +#line 97 "emoji_presentation_scanner.rl"
 +	{te = p+1;{ *is_emoji = false; *has_vs = false; return te; }}
 +	break;
 +	case 13:
 +#line 94 "emoji_presentation_scanner.rl"
 +	{te = p;p--;{ *is_emoji = false; *has_vs = true; return te; }}
 +	break;
 +	case 14:
 +#line 95 "emoji_presentation_scanner.rl"
 +	{te = p;p--;{ *is_emoji = true; *has_vs = true; return te; }}
 +	break;
 +	case 11:
 +#line 96 "emoji_presentation_scanner.rl"
 +	{te = p;p--;{ *is_emoji = true; *has_vs = false; return te; }}
 +	break;
 +	case 12:
 +#line 97 "emoji_presentation_scanner.rl"
 +	{te = p;p--;{ *is_emoji = false; *has_vs = false; return te; }}
 +	break;
 +	case 3:
 +#line 96 "emoji_presentation_scanner.rl"
 +	{{p = ((te))-1;}{ *is_emoji = true; *has_vs = false; return te; }}
 +	break;
 +	case 1:
 +#line 1 "NONE"
 +	{	switch( act ) {
 +	case 2:
 +	{{p = ((te))-1;} *is_emoji = true; *has_vs = true; return te; }
 +	break;
 +	case 3:
 +	{{p = ((te))-1;} *is_emoji = true; *has_vs = false; return te; }
 +	break;
 +	case 4:
 +	{{p = ((te))-1;} *is_emoji = false; *has_vs = false; return te; }
 +	break;
 +	}
 +	}
 +	break;
 +	case 10:
 +#line 1 "NONE"
 +	{te = p+1;}
 +#line 95 "emoji_presentation_scanner.rl"
 +	{act = 2;}
 +	break;
 +	case 2:
 +#line 1 "NONE"
 +	{te = p+1;}
 +#line 96 "emoji_presentation_scanner.rl"
 +	{act = 3;}
 +	break;
 +	case 7:
 +#line 1 "NONE"
 +	{te = p+1;}
 +#line 97 "emoji_presentation_scanner.rl"
 +	{act = 4;}
 +	break;
 +#line 188 "emoji_presentation_scanner.c"
 +	}
 +
 +_again:
 +	switch ( _emoji_presentation_to_state_actions[cs] ) {
 +	case 5:
 +#line 1 "NONE"
 +	{ts = 0;}
 +	break;
 +#line 195 "emoji_presentation_scanner.c"
 +	}
 +
 +	if ( ++p != pe )
 +		goto _resume;
 +	_test_eof: {}
 +	if ( p == eof )
 +	{
 +	if ( _emoji_presentation_eof_trans[cs] > 0 ) {
 +		_trans = _emoji_presentation_eof_trans[cs] - 1;
 +		goto _eof_trans;
 +	}
 +	}
 +
 +	}
 +
 +#line 118 "emoji_presentation_scanner.rl"
 +
 +
 +  /* Should not be reached. */
 +  *is_emoji = false;
 +  *has_vs = false;
 +  return p;
 +}
 diff --git a/src/3rdparty/emoji-segmenter/patch/0001-Compile-with-warnings-are-errors.patch b/src/3rdparty/emoji-segmenter/patch/0001-Compile-with-warnings-are-errors.patch
 new file mode 100644
 index 00000000..0cc1868c
 --- /dev/null
 +++ b/src/3rdparty/emoji-segmenter/patch/0001-Compile-with-warnings-are-errors.patch
@@ -0,0 +1,26 @@
 +From 4ced1426e27320e00b0dd28693df5d95c648d230 Mon Sep 17 00:00:00 2001
 +From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
 +Date: Thu, 14 Nov 2024 09:42:11 +0100
 +Subject: [PATCH] Compile with warnings-are-errors
 +
 +Change-Id: Icea8febefc90f3f047143e5b76ff511145c0dcae
 +---
 + src/3rdparty/emoji-segmenter/emoji_presentation_scanner.c | 2 ++
 + 1 file changed, 2 insertions(+)
 +
 +diff --git a/src/3rdparty/emoji-segmenter/emoji_presentation_scanner.c b/src/3rdparty/emoji-segmenter/emoji_presentation_scanner.c
 +index 56e2e78033..ce7e01846c 100644
 +--- a/src/3rdparty/emoji-segmenter/emoji_presentation_scanner.c
 ++++ b/src/3rdparty/emoji-segmenter/emoji_presentation_scanner.c
 +@@ -101,6 +101,8 @@ scan_emoji_presentation (emoji_text_iter_t p,
 +   emoji_text_iter_t te;
 +   const emoji_text_iter_t eof = pe;
 + 
 ++  (void)ts;
 ++
 +   unsigned act;
 +   int cs;
 + 
 +-- 
 +2.40.0.windows.1
 +
 diff --git a/src/3rdparty/emoji-segmenter/qt_attribution.json b/src/3rdparty/emoji-segmenter/qt_attribution.json
 new file mode 100644
 index 00000000..64083381
 --- /dev/null
 +++ b/src/3rdparty/emoji-segmenter/qt_attribution.json
@@ -0,0 +1,16 @@
 +{
 +    "Id": "emoji-segmenter",
 +    "Name": "Emoji Segmenter",
 +    "QDocModule": "qtgui",
 +    "QtUsage": "Used in QtGui for parsing complex emoji sequences. Can be configured using the -emojisegmenter option.",
 +    "SecurityCritical": true,
 +
 +    "Description": "A parser for emoji sequences.",
 +    "Homepage": "https://github.com/google/emoji-segmenter",
 +    "Version": "0.4.0",
 +    "DownloadLocation": "https://github.com/google/emoji-segmenter/releases/tag/0.4.0",
 +
 +    "License": "Apache License 2.0",
 +    "LicenseId": "Apache-2.0",
 +    "Copyright": "Copyright 2019 Google LLC"
 +}
 diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
 index 0e53f512..44bef7d3 100644
 --- a/src/gui/configure.cmake
 +++ b/src/gui/configure.cmake
@@ -689,6 +689,12 @@ qt_feature("direct2d1_1" PRIVATE
     LABEL "Direct 2D 1.1"
     CONDITION QT_FEATURE_direct2d AND TEST_d2d1_1
 )
 +qt_feature("emojisegmenter" PUBLIC PRIVATE
 +    SECTION "Fonts"
 +    LABEL "Emoji Segmenter"
 +    PURPOSE "Supports parsing complex emoji sequences for better font resolution."
 +)
 +qt_feature_definition("emojisegmenter" "QT_NO_EMOJISEGMENTER" NEGATE VALUE "1")
 qt_feature("evdev" PRIVATE
     LABEL "evdev"
     CONDITION QT_FEATURE_thread AND TEST_evdev
@@ -1285,6 +1291,7 @@ qt_feature("wayland" PUBLIC
 qt_configure_add_summary_section(NAME "Qt Gui")
 qt_configure_add_summary_entry(ARGS "accessibility")
 +qt_configure_add_summary_entry(ARGS "emojisegmenter")
 qt_configure_add_summary_entry(ARGS "freetype")
 qt_configure_add_summary_entry(ARGS "system-freetype")
 qt_configure_add_summary_entry(ARGS "harfbuzz")
 diff --git a/src/gui/qt_cmdline.cmake b/src/gui/qt_cmdline.cmake
 index 446618eb..5465b2c6 100644
 --- a/src/gui/qt_cmdline.cmake
 +++ b/src/gui/qt_cmdline.cmake
@@ -10,6 +10,7 @@ qt_commandline_option(eglfs TYPE boolean)
 qt_commandline_option(evdev TYPE boolean)
 qt_commandline_option(fontconfig TYPE boolean)
 qt_commandline_option(freetype TYPE enum VALUES no qt system)
 +qt_commandline_option(emojisegmenter TYPE boolean)
 qt_commandline_option(gbm TYPE boolean)
 qt_commandline_option(gif TYPE boolean)
 qt_commandline_option(harfbuzz TYPE enum VALUES no qt system)
--- a/SOURCES/qtbase-libglvnd.patch
+++ b/SOURCES/qtbase-libglvnd.patch
--- a/SOURCES/qtbase-moc-macros.patch
+++ b/SOURCES/qtbase-moc-macros.patch
--- a/SOURCES/qtbase-mysql.patch
+++ b/SOURCES/qtbase-mysql.patch
--- a/SOURCES/qtbase-use-emoji-segmenter-to-apply-emoji-fonts-automatically.patch
+++ b/SOURCES/qtbase-use-emoji-segmenter-to-apply-emoji-fonts-automatically.patch
--- a/SOURCES/qtbase-use-only-major-minor-for-private-api-tag.patch
+++ b/SOURCES/qtbase-use-only-major-minor-for-private-api-tag.patch
@ -0,0 +1,13 @@
 diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
 index 6a62b85c..1fc1f88d 100644
 --- a/cmake/QtFlagHandlingHelpers.cmake
 +++ b/cmake/QtFlagHandlingHelpers.cmake
@@ -71,7 +71,7 @@ function(qt_internal_add_linker_version_script target)
         string(APPEND contents "\n};\nQt_${PROJECT_VERSION_MAJOR}")
         if(QT_FEATURE_elf_private_full_version)
 -            string(APPEND contents ".${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 +            string(APPEND contents ".${PROJECT_VERSION_MINOR}")
         endif()
         string(APPEND contents "_PRIVATE_API { qt_private_api_tag*;\n")
         if(arg_PRIVATE_HEADERS)
--- a/SOURCES/qtbase-version-check.patch
+++ b/SOURCES/qtbase-version-check.patch
--- a/SOURCES/qtlogging.ini
+++ b/SOURCES/qtlogging.ini
--- a/SPECS/qt6-qtbase.spec
+++ b/SPECS/qt6-qtbase.spec
@ -2,7 +2,7 @@
 %global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
 %global multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64
-%ifarch s390x ppc64le aarch64 armv7hl
+%ifarch s390x ppc64le aarch64 armv7hl riscv64
 %global no_sse2  1
 %endif
@ -12,6 +12,14 @@
 %endif
 %endif
 %if 0%{?rhel} >= 10
 # Use mutter on RHEL 10+ since it's the only shipped compositor
 %global wlheadless_compositor mutter
 %else
 # Use the simple reference compositor to simplify dependencies
 %global wlheadless_compositor weston
 %endif
 %global platform linux-g++
 %if 0%{?use_clang}
@ -30,15 +38,16 @@ BuildRequires: pkgconfig(libsystemd)
 %global examples 1
 ## skip for now, until we're better at it --rex
-#global tests 1
+#global tests 0
 %global build_tests 1
 #global unstable 0
 %global prerelease rc2
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
-Version: 6.6.2
+Version: 6.8.1
-Release: 1%{?dist}
+Release: 5%{?dist}
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://qt-project.org/
@ -65,8 +74,8 @@ Source6: 10-qt6-check-opengl2.sh
 # macros
 Source10: macros.qt6-qtbase
-Patch1: qtbase-tell-the-truth-about-private-API.patch
+Patch1:  qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch
-Patch2: qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch
+Patch2:  qtbase-use-only-major-minor-for-private-api-tag.patch
 # upstreamable patches
 # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
@ -87,16 +96,13 @@ Patch56: qtbase-mysql.patch
 # fix FTBFS against libglvnd-1.3.4+
 Patch58: qtbase-libglvnd.patch
 # Bug 1954359 - Many emoji don't show up in Qt apps because qt does not handle 'emoji' font family
 # FIXME: this change seems to completely break font rendering for some people
 # Patch60: qtbase-cache-emoji-font.patch
 %if 0%{?fedora} < 39
 # Latest QGnomePlatform needs to be specified to be used
 Patch100: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch
 %endif
 ## upstream patches
 Patch150: qtbase-extract-emoji-data-from-unicode-files.patch
 Patch151: qtbase-introduce-emoji-segmenter-to-3rdparty-code.patch
 Patch152: qtbase-use-emoji-segmenter-to-apply-emoji-fonts-automatically.patch
 ## RHEL specific patches
 # Patch300: qtbase-fix-tests.patch
 # Do not check any files in %%{_qt6_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
@ -117,7 +123,12 @@ BuildRequires: ninja-build
 BuildRequires: cups-devel
 BuildRequires: desktop-file-utils
 BuildRequires: findutils
 %if 0%{?fedora} || 0%{?epel}
 BuildRequires: double-conversion-devel
 %else
 Provides:      bundled(double-conversion)
 %endif
 Provides:      bundled(emoji-segmenter)
 %if 0%{?fedora} || 0%{?epel}
 BuildRequires: libb2-devel
 %else
@ -164,8 +175,6 @@ BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(gbm)
 BuildRequires: pkgconfig(libglvnd)
 BuildRequires: pkgconfig(x11)
 # only needed for GLES2 and GLES3 builds
 #BuildRequires: pkgconfig(glesv2)
 %global sqlite 1
 BuildRequires: pkgconfig(sqlite3) >= 3.7
@ -178,7 +187,6 @@ BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(
 BuildRequires: pkgconfig(zlib)
 BuildRequires: perl
 BuildRequires: perl-generators
 # see patch68
 BuildRequires: python3
 BuildRequires: qt6-rpm-macros
@ -186,9 +194,11 @@ BuildRequires: qt6-rpm-macros
 BuildRequires: dbus-x11
 BuildRequires: mesa-dri-drivers
 BuildRequires: time
-BuildRequires: xorg-x11-server-Xvfb
+BuildRequires: (wlheadless-run and %{wlheadless_compositor})
 %endif
 Requires:      qt6-filesystem
 Requires: %{name}-common = %{version}-%{release}
 ## Sql drivers
@ -247,7 +257,7 @@ Requires: cups-devel
 %package examples
 Summary: Programming examples for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-
+Requires: %{name}-gui%{?_isa} = %{version}-%{release}
 %description examples
 %{summary}.
@ -263,6 +273,16 @@ Requires: pkgconfig(zlib)
 %description static
 %{summary}.
 %if 0%{?build_tests}
 %package tests
 Summary: Unit tests for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: %{name}-gui%{?_isa} = %{version}-%{release}
 %description tests
 %{summary}.
 %endif
 %if 0%{?ibase}
 %package ibase
 Summary: IBase driver for Qt6's SQL classes
@ -360,6 +380,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
 -DQT_FEATURE_sse2=%{?no_sse2:OFF}%{!?no_sse2:ON} \
 -DQT_FEATURE_icu=ON \
 -DQT_FEATURE_enable_new_dtags=ON \
 -DQT_FEATURE_emojisegmenter=ON \
 -DQT_FEATURE_journald=%{?journald:ON}%{!?journald:OFF} \
 -DQT_FEATURE_openssl_linked=ON \
 -DQT_FEATURE_openssl_hash=ON \
@ -378,23 +399,31 @@ export MAKEFLAGS="%{?_smp_mflags}"
 -DQT_FEATURE_sql_sqlite=ON \
 -DQT_FEATURE_rpath=OFF \
 -DQT_FEATURE_zstd=ON \
 -DQT_FEATURE_elf_private_full_version=ON \
 %{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \
 %{?pcre:-DQT_FEATURE_system_pcre2=ON} \
 %{?sqlite:-DQT_FEATURE_system_sqlite=ON} \
 -DBUILD_SHARED_LIBS=ON \
 -DQT_BUILD_EXAMPLES=%{?examples:ON}%{!?examples:OFF} \
- -DQT_BUILD_TESTS=%{?tests:ON}%{!?tests:OFF} \
+ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} \
 -DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} \
 -DQT_QMAKE_TARGET_MKSPEC=%{platform}
 # FIXME
 #  -DQT_FEATURE_directfb=ON \
 %cmake_build
 %install
 %if 0%{?build_tests}
 %qt6_dont_autoinstall_tests
 %endif
 %cmake_install
 %if 0%{?build_tests}
 %qt6_install_tests
 %endif
 install -m644 -p -D %{SOURCE1} %{buildroot}%{_qt6_datadir}/qtlogging.ini
 # Qt6.pc
@ -420,7 +449,7 @@ translationdir=%{_qt6_translationdir}
 Name: Qt6
 Description: Qt6 Configuration
-Version: 6.6.2
+Version: 6.8.1
 EOF
 # rpm macros
@ -434,7 +463,7 @@ sed -i \
  %{buildroot}%{_rpmmacrodir}/macros.qt6-qtbase
 # create/own dirs
-mkdir -p %{buildroot}{%{_qt6_archdatadir}/mkspecs/modules,%{_qt6_importdir},%{_qt6_libexecdir},%{_qt6_plugindir}/{designer,iconengines,script,styles},%{_qt6_translationdir}}
+mkdir -p %{buildroot}%{_qt6_plugindir}/{designer,iconengines,script,styles}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/QtProject
 # hardlink files to {_bindir}, add -qt6 postfix to not conflict
@ -478,10 +507,25 @@ install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10
 mkdir -p %{buildroot}%{_qt6_headerdir}/QtXcb
 install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt6_headerdir}/QtXcb/
-rm %{buildroot}/%{_qt6_libexecdir}/qt-cmake-private-install.cmake
+# Copied from OpenSUSE packages
 # CMake modules for plugins are not useful
 rm %{buildroot}%{_qt6_libdir}/cmake/*/*Plugin{Config,ConfigVersion,Targets*}.cmake
-# Use better location for some new scripts in qtbase-6.0.1
+# These files are only useful for the Qt continuous integration
-mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake
+rm %{buildroot}%{_qt6_libexecdir}/ensure_pro_file.cmake
 rm %{buildroot}%{_qt6_libexecdir}/qt-android-runner.py
 rm %{buildroot}%{_qt6_libexecdir}/qt-testrunner.py
 rm %{buildroot}%{_qt6_libexecdir}/sanitizer-testrunner.py
 # Not useful for desktop installs
 rm -r %{buildroot}%{_qt6_libdir}/cmake/Qt6ExamplesAssetDownloaderPrivate
 rm -r %{buildroot}%{_qt6_headerdir}/QtExamplesAssetDownloader
 rm %{buildroot}%{_qt6_descriptionsdir}/ExamplesAssetDownloaderPrivate.json
 rm %{buildroot}%{_qt6_libdir}/libQt6ExamplesAssetDownloader.*
 rm %{buildroot}%{_qt6_libdir}/qt6/metatypes/qt6examplesassetdownloaderprivate_*_metatypes.json
 # This is only for Apple platforms and has a python2 dep
 rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
 %check
 # verify Qt6.pc
@ -496,7 +540,7 @@ export LD_LIBRARY_PATH=%{buildroot}%{_qt6_libdir}
 # dbus tests error out when building if session bus is not available
 dbus-launch --exit-with-session \
 %make_build sub-tests  -k ||:
-xvfb-run -a --server-args="-screen 0 1280x1024x32" \
+wlheadless-run -c %{wlheadless_compositor} -- \
 dbus-launch --exit-with-session \
 time \
 make check -k ||:
@ -508,6 +552,7 @@ make check -k ||:
 %license LICENSES/GPL*
 %license LICENSES/LGPL*
 %dir %{_sysconfdir}/xdg/QtProject/
 %{_qt6_archdatadir}/sbom/qtbase-%{qt_version}.spdx
 %{_qt6_libdir}/libQt6Concurrent.so.6*
 %{_qt6_libdir}/libQt6Core.so.6*
 %{_qt6_libdir}/libQt6DBus.so.6*
@ -515,19 +560,9 @@ make check -k ||:
 %{_qt6_libdir}/libQt6Sql.so.6*
 %{_qt6_libdir}/libQt6Test.so.6*
 %{_qt6_libdir}/libQt6Xml.so.6*
 %dir %{_qt6_docdir}/
 %{_qt6_docdir}/global/
 %{_qt6_docdir}/config/
 %{_qt6_importdir}/
 %{_qt6_translationdir}/
 %if "%{_qt6_prefix}" != "%{_prefix}"
 %dir %{_qt6_prefix}/
 %endif
 %dir %{_qt6_archdatadir}/
 %dir %{_qt6_datadir}/
 %{_qt6_datadir}/qtlogging.ini
 %dir %{_qt6_libexecdir}/
 %dir %{_qt6_plugindir}/
 %dir %{_qt6_plugindir}/designer/
 %dir %{_qt6_plugindir}/generic/
 %dir %{_qt6_plugindir}/iconengines/
@ -544,14 +579,14 @@ make check -k ||:
 %{_qt6_plugindir}/sqldrivers/libqsqlite.so
 %{_qt6_plugindir}/tls/libqcertonlybackend.so
 %{_qt6_plugindir}/tls/libqopensslbackend.so
 %{_bindir}/qtpaths*
 %{_qt6_bindir}/qtpaths*
 %files common
 # mostly empty for now, consider: filesystem/dir ownership, licenses
 %{_rpmmacrodir}/macros.qt6-qtbase
 %files devel
 %dir %{_qt6_libdir}/qt6/modules
 %dir %{_qt6_libdir}/qt6/metatypes
 %dir %{_qt6_libdir}/cmake/Qt6
 %dir %{_qt6_libdir}/cmake/Qt6/platforms
 %dir %{_qt6_libdir}/cmake/Qt6/platforms/Platform
@ -565,16 +600,9 @@ make check -k ||:
 %dir %{_qt6_libdir}/cmake/Qt6CoreTools
 %dir %{_qt6_libdir}/cmake/Qt6DBus
 %dir %{_qt6_libdir}/cmake/Qt6DBusTools
 %dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate
 %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate
 %dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6Gui
 %dir %{_qt6_libdir}/cmake/Qt6GuiTools
 %dir %{_qt6_libdir}/cmake/Qt6HostInfo
 %dir %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6Network
 %dir %{_qt6_libdir}/cmake/Qt6OpenGL
 %dir %{_qt6_libdir}/cmake/Qt6OpenGLWidgets
@ -584,16 +612,12 @@ make check -k ||:
 %dir %{_qt6_libdir}/cmake/Qt6Widgets
 %dir %{_qt6_libdir}/cmake/Qt6WidgetsTools
 %dir %{_qt6_libdir}/cmake/Qt6Xml
 %if "%{_qt6_bindir}" != "%{_bindir}"
 %dir %{_qt6_bindir}
 %endif
 %{_bindir}/androiddeployqt
 %{_bindir}/androiddeployqt6
 %{_bindir}/androidtestrunner
 %{_bindir}/qdbuscpp2xml*
 %{_bindir}/qdbusxml2cpp*
 %{_bindir}/qmake*
 %{_bindir}/qtpaths*
 %{_bindir}/qt-cmake
 %{_bindir}/qt-cmake-create
 %{_bindir}/qt-configure-module
@ -604,17 +628,16 @@ make check -k ||:
 %{_qt6_bindir}/qdbuscpp2xml
 %{_qt6_bindir}/qdbusxml2cpp
 %{_qt6_bindir}/qmake
 %{_qt6_bindir}/qtpaths*
 %{_qt6_bindir}/qt-cmake
 %{_qt6_bindir}/qt-cmake-create
 %{_qt6_bindir}/qt-configure-module
 %{_qt6_libexecdir}/qt-cmake-private
 %{_qt6_libexecdir}/qt-cmake-private-install.cmake
 %{_qt6_libexecdir}/qt-cmake-standalone-test
 %{_qt6_libexecdir}/cmake_automoc_parser
 %{_qt6_libexecdir}/qt-internal-configure-examples
 %{_qt6_libexecdir}/qt-internal-configure-tests
 %{_qt6_libexecdir}/sanitizer-testrunner.py
 %{_qt6_libexecdir}/syncqt
 %{_qt6_libexecdir}/android_emulator_launcher.sh
 %{_qt6_libexecdir}/moc
 %{_qt6_libexecdir}/tracegen
 %{_qt6_libexecdir}/tracepointgen
@ -622,16 +645,9 @@ make check -k ||:
 %{_qt6_libexecdir}/qvkgen
 %{_qt6_libexecdir}/rcc
 %{_qt6_libexecdir}/uic
 %{_qt6_libexecdir}/qt-testrunner.py
 %{_qt6_libdir}/qt6/modules/*.json
 %if "%{_qt6_headerdir}" != "%{_includedir}"
 %dir %{_qt6_headerdir}
 %endif
 %{_qt6_headerdir}/QtConcurrent/
 %{_qt6_headerdir}/QtCore/
 %{_qt6_headerdir}/QtDBus/
 %{_qt6_headerdir}/QtInputSupport
 %{_qt6_headerdir}/QtExampleIcons
 %{_qt6_headerdir}/QtGui/
 %{_qt6_headerdir}/QtNetwork/
 %{_qt6_headerdir}/QtOpenGL/
@ -642,10 +658,6 @@ make check -k ||:
 %{_qt6_headerdir}/QtWidgets/
 %{_qt6_headerdir}/QtXcb/
 %{_qt6_headerdir}/QtXml/
 %{_qt6_headerdir}/QtEglFSDeviceIntegration
 %{_qt6_headerdir}/QtEglFsKmsGbmSupport
 %{_qt6_headerdir}/QtEglFsKmsSupport
 %{_qt6_mkspecsdir}/
 %{_qt6_libdir}/libQt6Concurrent.prl
 %{_qt6_libdir}/libQt6Concurrent.so
 %{_qt6_libdir}/libQt6Core.prl
@ -669,13 +681,11 @@ make check -k ||:
 %{_qt6_libdir}/libQt6Widgets.prl
 %{_qt6_libdir}/libQt6Widgets.so
 %{_qt6_libdir}/libQt6XcbQpa.prl
-%{_qt6_libdir}/libQt6XcbQpa.so 
+%{_qt6_libdir}/libQt6XcbQpa.so
 %{_qt6_libdir}/libQt6Xml.prl
 %{_qt6_libdir}/libQt6Xml.so
-%{_qt6_libdir}/libQt6EglFSDeviceIntegration.prl
+%{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/REUSE.toml
-%{_qt6_libdir}/libQt6EglFSDeviceIntegration.so
+%{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/REUSE.toml
 %{_qt6_libdir}/libQt6EglFsKmsGbmSupport.prl
 %{_qt6_libdir}/libQt6EglFsKmsGbmSupport.so
 %{_qt6_libdir}/cmake/Qt6/*.h.in
 %{_qt6_libdir}/cmake/Qt6/*.cmake
 %{_qt6_libdir}/cmake/Qt6/*.cmake.in
@ -702,21 +712,14 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6BuildInternals/QtStandaloneTestTemplateProject/Main.cmake
 %{_qt6_libdir}/cmake/Qt6Concurrent/*.cmake
 %{_qt6_libdir}/cmake/Qt6Core/*.cmake
 %{_qt6_libdir}/cmake/Qt6Core/Qt6CoreResourceInit.in.cpp
 %{_qt6_libdir}/cmake/Qt6Core/Qt6CoreConfigureFileTemplate.in
 %{_qt6_libdir}/cmake/Qt6CoreTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6DBus/*.cmake
 %{_qt6_libdir}/cmake/Qt6DBusTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Gui/*.cmake
 %{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6HostInfo/*.cmake
 %{_qt6_libdir}/cmake/Qt6InputSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Network/*.cmake
 %{_qt6_libdir}/cmake/Qt6OpenGL/*.cmake
 %{_qt6_libdir}/cmake/Qt6OpenGLWidgets/*.cmake
@ -726,36 +729,104 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6Test/*.cmake
 %{_qt6_libdir}/cmake/Qt6Widgets/*.cmake
 %{_qt6_libdir}/cmake/Qt6WidgetsTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Xml/*.cmake
-%{_qt6_libdir}/qt6/metatypes/*.json
+%{_qt6_descriptionsdir}/Concurrent.json
-%{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
+%{_qt6_descriptionsdir}/Core.json
 %{_qt6_descriptionsdir}/DBus.json
 %{_qt6_descriptionsdir}/Gui.json
 %{_qt6_descriptionsdir}/Network.json
 %{_qt6_descriptionsdir}/OpenGL.json
 %{_qt6_descriptionsdir}/OpenGLWidgets.json
 %{_qt6_descriptionsdir}/PrintSupport.json
 %{_qt6_descriptionsdir}/Sql.json
 %{_qt6_descriptionsdir}/Test.json
 %{_qt6_descriptionsdir}/Widgets.json
 %{_qt6_descriptionsdir}/Xml.json
 %{_qt6_metatypesdir}/qt6concurrent_*_metatypes.json
 %{_qt6_metatypesdir}/qt6core_*_metatypes.json
 %{_qt6_metatypesdir}/qt6dbus_*_metatypes.json
 %{_qt6_metatypesdir}/qt6gui_*_metatypes.json
 %{_qt6_metatypesdir}/qt6network_*_metatypes.json
 %{_qt6_metatypesdir}/qt6opengl_*_metatypes.json
 %{_qt6_metatypesdir}/qt6openglwidgets_*_metatypes.json
 %{_qt6_metatypesdir}/qt6printsupport_*_metatypes.json
 %{_qt6_metatypesdir}/qt6sql_*_metatypes.json
 %{_qt6_metatypesdir}/qt6test_*_metatypes.json
 %{_qt6_metatypesdir}/qt6widgets_*_metatypes.json
 %{_qt6_metatypesdir}/qt6xml_*_metatypes.json
 %{_qt6_libdir}/pkgconfig/*.pc
 %{_qt6_mkspecsdir}/*
 ## private-devel globs
 %exclude %{_qt6_headerdir}/*/%{qt_version}/
 %files private-devel
 %{_qt6_headerdir}/QtEglFSDeviceIntegration
 %{_qt6_headerdir}/QtEglFsKmsGbmSupport
 %{_qt6_headerdir}/QtEglFsKmsSupport
 %dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate
 %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate
 %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake
 %if 0%{?egl}
 %{_qt6_libdir}/libQt6EglFsKmsSupport.prl
 %{_qt6_libdir}/libQt6EglFsKmsSupport.so
 %endif
-## private-devel globs
+%{_qt6_libdir}/libQt6EglFSDeviceIntegration.prl
-%exclude %{_qt6_headerdir}/*/%{qt_version}/
+%{_qt6_libdir}/libQt6EglFSDeviceIntegration.so
-
+%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.prl
-%files private-devel
+%{_qt6_libdir}/libQt6EglFsKmsGbmSupport.so
 %{_qt6_descriptionsdir}/EglFSDeviceIntegrationPrivate.json
 %{_qt6_descriptionsdir}/EglFsKmsGbmSupportPrivate.json
 %{_qt6_descriptionsdir}/EglFsKmsSupportPrivate.json
 %{_qt6_descriptionsdir}/XcbQpaPrivate.json
 %{_qt6_metatypesdir}/qt6eglfsdeviceintegrationprivate_*_metatypes.json
 %{_qt6_metatypesdir}/qt6eglfskmsgbmsupportprivate_*_metatypes.json
 %{_qt6_metatypesdir}/qt6eglfskmssupportprivate_*_metatypes.json
 %{_qt6_metatypesdir}/qt6xcbqpaprivate_*_metatypes.json
 %{_qt6_headerdir}/*/%{qt_version}/
 %files static
 %dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate
 %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake
 %{_qt6_headerdir}/QtExampleIcons
 %{_qt6_libdir}/libQt6ExampleIcons.a
 %{_qt6_libdir}/libQt6ExampleIcons.prl
 %{_qt6_descriptionsdir}/ExampleIconsPrivate.json
 %dir %{_qt6_archdatadir}/objects-*
 %{_qt6_archdatadir}/objects-*/ExampleIconsPrivate_resources_1/
 %{_qt6_metatypesdir}/qt6exampleiconsprivate_*_metatypes.json
 %dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate
 %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate/*.cmake
 %{_qt6_headerdir}/QtDeviceDiscoverySupport
 %{_qt6_libdir}/libQt6DeviceDiscoverySupport.*a
 %{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl
-%{_qt6_libdir}/libQt6ExampleIcons.a
+%{_qt6_descriptionsdir}/DeviceDiscoverySupportPrivate.json
-%{_qt6_libdir}/libQt6ExampleIcons.prl
+%{_qt6_metatypesdir}/qt6devicediscoverysupportprivate_*_metatypes.json
 %dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
 %{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake
 %{_qt6_headerdir}/QtFbSupport
 %{_qt6_libdir}/libQt6FbSupport.*a
 %{_qt6_libdir}/libQt6FbSupport.prl
 %{_qt6_descriptionsdir}/FbSupportPrivate.json
 %{_qt6_metatypesdir}/qt6fbsupportprivate_*_metatypes.json
 %dir %{_qt6_libdir}/cmake/Qt6InputSupportPrivate
 %{_qt6_libdir}/cmake/Qt6InputSupportPrivate/*.cmake
 %{_qt6_headerdir}/QtInputSupport
 %{_qt6_libdir}/libQt6InputSupport.*a
 %{_qt6_libdir}/libQt6InputSupport.prl
 %{_qt6_descriptionsdir}/InputSupportPrivate.json
 %{_qt6_metatypesdir}/qt6inputsupportprivate_*_metatypes.json
 %dir %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate
 %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate/*.cmake
 %{_qt6_headerdir}/QtKmsSupport
 %{_qt6_libdir}/libQt6KmsSupport.*a
 %{_qt6_libdir}/libQt6KmsSupport.prl
 %{_qt6_descriptionsdir}/KmsSupportPrivate.json
 %{_qt6_metatypesdir}/qt6kmssupportprivate_*_metatypes.json
 %if 0%{?examples}
 %files examples
 %{_qt6_examplesdir}/
@ -830,15 +901,82 @@ make check -k ||:
 %{_qt6_plugindir}/platforms/libqvnc.so
 %{_qt6_plugindir}/platforms/libqvkkhrdisplay.so
 %{_qt6_plugindir}/xcbglintegrations/libqxcb-glx-integration.so
 %{_qt6_plugindir}/printsupport/libcupsprintersupport.so
 # Platformthemes
 %{_qt6_plugindir}/platformthemes/libqxdgdesktopportal.so
 %{_qt6_plugindir}/platformthemes/libqgtk3.so
 %{_qt6_plugindir}/printsupport/libcupsprintersupport.so
 %if 0%{?build_tests}
 %files tests
 %{_qt6_archdatadir}/tests
 %endif
 %changelog
-* Thu Feb 15 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
+* Wed Dec 11 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-5
- 6.6.2
+- Move libcupsprintersupport back to -gui as it depends on gui libs
  Resolves: RHEL-53982
 * Sat Dec 07 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-4
 - Move all mkspecs to -devel
  Resolves: RHEL-53982
 * Thu Dec 05 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-3
 - Move more stuff into -private-devel
  Resolves: RHEL-53982
 * Tue Dec 03 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-2
 - Do not install ExamplesAssetDownloader
  Resolves: RHEL-53982
 * Mon Dec 02 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-1
 - 6.8.1
  Resolves: RHEL-4218
  Resolves: RHEL-53982
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-6
 - Bump release for October 2024 mass rebuild:
  Resolves: RHEL-64018
 * Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 6.7.1-5
 - Rebuilt for MSVSphere 10
 * Mon Jul 22 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-5
 - Use qt6-filesystem
  Resolves: RHEL-50035
 * Mon Jul 08 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-4
 - HTTP2: Delay any communication until encrypted() can be responded to
  Resolves: RHEL-46346
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-3
 - Bump release for June 2024 mass rebuild
 * Tue Jun 04 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-2
 - Add rpminspect.yaml and fix some rpminspect issues
  Resolves: RHEL-36430
 * Fri May 31 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-1
 - 6.7.1
  Resolves: RHEL-36430
 * Mon May 13 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-3
 - QGtk3Theme: Add support for xdg-desktop-portal to get color scheme
  Resolves: RHEL-36168
 * Wed Apr 24 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-2
 - Use bundled double-conversion in RHEL builds
  Resolves: RHEL-32788
 * Wed Apr 17 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
 - 6.7.0
  + sync with Fedora
  Resolves: RHEL-27845
  Resolves: RHEL-32788
 * Wed Mar 27 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-6
 - Add -tests subpackage with unit tests that can run in CI
  Resolves: RHEL-28239
 * Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 6.6.1-5
 - Rebuild for ICU 74
--- a/qmake-qt6.sh
+++ b/qmake-qt6.sh
@ -1,10 +0,0 @@
 #!/bin/sh
 # An attempt at providing a qmake wrapper for projects that 
 # lack native qmake support (ie, qmake is run by buildsystem
 # instead of developer or fedora packager).
 QMAKE="$(rpm --eval %{_qt6_qmake})"
 QMAKE_FLAGS="$(rpm --eval %{?_qt6_qmake_flags})"
 eval $QMAKE $QMAKE_FLAGS $@
--- a/qtbase-cache-emoji-font.patch
+++ b/qtbase-cache-emoji-font.patch
@ -1,85 +0,0 @@
 diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp
 index 474644b8..f61e6e83 100644
 --- a/src/gui/text/unix/qfontconfigdatabase.cpp
 +++ b/src/gui/text/unix/qfontconfigdatabase.cpp
@@ -592,6 +592,7 @@ void QFontconfigDatabase::populateFontDatabase()
         ++f;
     }
 +    cacheEmojiFontFamily();
     //QPA has very lazy population of the font db. We want it to be initialized when
     //QApplication is constructed, so that the population procedure can do something like this to
     //set the default font
@@ -735,6 +736,9 @@ QStringList QFontconfigDatabase::fallbacksForFamily(const QString &family, QFont
     if (!pattern)
         return fallbackFamilies;
 +    if (!m_cacheEmojiFontFamily.isEmpty())
 +        fallbackFamilies << m_cacheEmojiFontFamily;
 +
     FcValue value;
     value.type = FcTypeString;
     const QByteArray cs = family.toUtf8();
@@ -1016,4 +1020,47 @@ void QFontconfigDatabase::setupFontEngine(QFontEngineFT *engine, const QFontDef
     engine->glyphFormat = format;
 }
 +void QFontconfigDatabase::cacheEmojiFontFamily()
 +{
 +    FcPattern *pattern;
 +    pattern = FcPatternCreate();
 +
 +    FcValue value;
 +    value.type = FcTypeString;
 +    value.u.s = (const FcChar8 *)"emoji";
 +    FcPatternAdd(pattern,FC_FAMILY,value,true);
 +
 +    FcLangSet *ls = FcLangSetCreate();
 +    FcLangSetAdd(ls, (const FcChar8*)"und-zsye");
 +    FcPatternAddLangSet(pattern, FC_LANG, ls);
 +
 +    FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
 +    FcDefaultSubstitute(pattern);
 +
 +    FcResult result = FcResultMatch;
 +    FcFontSet *fontSet = FcFontSort(nullptr,pattern,FcTrue,nullptr,&result);
 +    FcPatternDestroy(pattern);
 +
 +    if (fontSet) {
 +        for (int i = 0; i < fontSet->nfont; i++) {
 +            FcChar8 *value = nullptr;
 +            if (FcPatternGetString(fontSet->fonts[i], FC_FAMILY, 0, &value) != FcResultMatch)
 +                continue;
 +
 +            FcLangSet *rls = nullptr;
 +            if (FcPatternGetLangSet(fontSet->fonts[i], FC_LANG, 0, &rls) != FcResultMatch)
 +                continue;
 +
 +            if (!FcLangSetContains(rls, ls))
 +                continue;
 +
 +            m_cacheEmojiFontFamily = QString::fromUtf8((const char *)value);
 +            break;
 +        }
 +        FcFontSetDestroy(fontSet);
 +    }
 +
 +    FcLangSetDestroy(ls);
 +}
 +
 QT_END_NAMESPACE
 diff --git a/src/gui/text/unix/qfontconfigdatabase_p.h b/src/gui/text/unix/qfontconfigdatabase_p.h
 index cf15306e..90b94087 100644
 --- a/src/gui/text/unix/qfontconfigdatabase_p.h
 +++ b/src/gui/text/unix/qfontconfigdatabase_p.h
@@ -37,7 +37,10 @@ public:
     QFont defaultFont() const override;
 private:
 +    void cacheEmojiFontFamily();
     void setupFontEngine(QFontEngineFT *engine, const QFontDef &fontDef) const;
 +
 +    QString m_cacheEmojiFontFamily;
 };
 QT_END_NAMESPACE
--- a/qtbase-firebird.patch
+++ b/qtbase-firebird.patch
@ -1,32 +0,0 @@
 diff --git a/cmake/FindInterbase.cmake b/cmake/FindInterbase.cmake
 index 22f866d8..4ef16e75 100644
 --- a/cmake/FindInterbase.cmake
 +++ b/cmake/FindInterbase.cmake
@@ -19,12 +19,12 @@
 #     The Interbase client library
 find_path(Interbase_INCLUDE_DIR
 -          NAMES ibase.h
 +          NAMES firebird/ibase.h
           HINTS ${Interbase_INCLUDEDIR}
 )
 find_library(Interbase_LIBRARY
 -             NAMES firebase_ms fbclient gds
 +             NAMES firebase_ms fbclient gds fbclient
              HINTS ${Interbase_LIBDIR}
 )
 diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
 index 9109c2b4..7477d5ee 100644
 --- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
 +++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
@@ -52,7 +52,7 @@
 //
 #include <QtSql/qsqldriver.h>
 -#include <ibase.h>
 +#include <firebird/ibase.h>
 #ifdef QT_PLUGIN
 #define Q_EXPORT_SQLDRIVER_IBASE
--- a/qtbase-multilib-optflags.patch
+++ b/qtbase-multilib-optflags.patch
@ -1,33 +0,0 @@
 diff -r -u a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
 --- a/mkspecs/linux-g++/qmake.conf	2015-10-30 06:20:01.000000000 -0200
 +++ b/mkspecs/linux-g++/qmake.conf	2015-11-05 11:23:23.230741601 -0200
@@ -5,6 +5,7 @@
 MAKEFILE_GENERATOR      = UNIX
 CONFIG                 += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 +QMAKE_CFLAGS_RELEASE   += -O2
 include(../common/linux.conf)
 include(../common/gcc-base-unix.conf)
 diff -r -u a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf
 --- a/mkspecs/linux-g++-32/qmake.conf	2015-10-30 06:20:01.000000000 -0200
 +++ b/mkspecs/linux-g++-32/qmake.conf	2015-11-05 11:22:19.761494470 -0200
@@ -10,6 +10,7 @@
 QMAKE_CFLAGS            = -m32
 QMAKE_LFLAGS            = -m32
 +QMAKE_CFLAGS_RELEASE   += -O2
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
 diff -r -u a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
 --- a/mkspecs/linux-g++-64/qmake.conf	2015-10-30 06:20:01.000000000 -0200
 +++ b/mkspecs/linux-g++-64/qmake.conf	2015-11-05 11:22:49.497610248 -0200
@@ -13,6 +13,7 @@
 QMAKE_CFLAGS            = -m64
 QMAKE_LFLAGS            = -m64
 +QMAKE_CFLAGS_RELEASE   += -O2
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
--- a/qtbase-tell-the-truth-about-private-API.patch
+++ b/qtbase-tell-the-truth-about-private-API.patch
@ -1,28 +0,0 @@
 From 25e78cce15fdf737cc48ed5d7683ad1d01b55621 Mon Sep 17 00:00:00 2001
 From: Christophe Giboudeaux <christophe@krop.fr>
 Date: Sun, 20 Sep 2020 09:57:22 +0200
 Subject: [PATCH] Tell the truth about private API
 Mark private API with symbols only for the current patch release
 This change is a port of the libqt5-qtbase patch which was
 added during the Qt 5.6 cycle.
 ---
 cmake/QtFlagHandlingHelpers.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
 index d8597326cc..f9da7b2171 100644
 --- a/cmake/QtFlagHandlingHelpers.cmake
 +++ b/cmake/QtFlagHandlingHelpers.cmake
@@ -23,7 +23,7 @@ function(qt_internal_add_linker_version_script target)
     endif()
     if(TEST_ld_version_script)
 -        set(contents "Qt_${PROJECT_VERSION_MAJOR}_PRIVATE_API {\n    qt_private_api_tag*;\n")
 +        set(contents "Qt_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}_PRIVATE_API {\n    qt_private_api_tag*;\n")
         if(arg_PRIVATE_HEADERS)
             foreach(ph ${arg_PRIVATE_HEADERS})
                 string(APPEND contents "    @FILE:${ph}@\n")
 --
 2.40.0
--- a/qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch
+++ b/qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch
@ -1,12 +0,0 @@
 diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp
 index 1efd759b..d0129f73 100644
 --- a/src/gui/platform/unix/qgenericunixthemes.cpp
 +++ b/src/gui/platform/unix/qgenericunixthemes.cpp
@@ -977,6 +977,7 @@ QStringList QGenericUnixTheme::themeNames()
                 result.push_back(QLatin1StringView(QKdeTheme::name));
 #endif
             } else if (gtkBasedEnvironments.contains(desktopName)) {
 +                result.push_back(QStringLiteral("qgnomeplatform"));
                 // prefer the GTK3 theme implementation with native dialogs etc.
                 result.push_back(QStringLiteral("gtk3"));
                 // fallback to the generic Gnome theme if loading the GTK3 theme fails
--- a/1
+++ b/1
@ -1 +0,0 @@
 SHA512 (qtbase-everywhere-src-6.6.2.tar.xz) = ea343bcf269779a4e078ed8baddfbe6c5ec4a34275c7d72b3f3928da60feece2ddc9ce4a380c6536a4e1654b483cee8918f8ad3038904725d2dd1c653ae83ece
		`@ -0,0 +1 @@`
							`ac3cfaee831310f03288ab32adc7ccc60b501205 SOURCES/qtbase-everywhere-src-6.8.1.tar.xz`
		`@ -1 +0,0 @@`
			`SHA512 (qtbase-everywhere-src-6.6.2.tar.xz) = ea343bcf269779a4e078ed8baddfbe6c5ec4a34275c7d72b3f3928da60feece2ddc9ce4a380c6536a4e1654b483cee8918f8ad3038904725d2dd1c653ae83ece`