Commit Graph

47 Commits

Author SHA1 Message Date
hanpinlong 16732d52eb
!7 rebuild
Merge pull request !7 from hanpinlong/openkylin/yangtze
2023-05-06 02:21:31 +00:00
韩品龙 9b9e10aa65 rebuild 2023-05-06 10:19:54 +08:00
hanpinlong 868d3aa486
!6 try rebuild
Merge pull request !6 from hanpinlong/openkylin/yangtze
2023-05-06 01:26:03 +00:00
韩品龙 5068d8b493 rebuild 2023-05-06 09:22:22 +08:00
hanpinlong 1ffba57fcd
!5 处理编译错误2
Merge pull request !5 from hanpinlong/openkylin/yangtze
2023-05-05 09:27:51 +00:00
韩品龙 86ca2acfe9 fix-build-error 2023-05-05 17:25:02 +08:00
hanpinlong 048fa1b158
!4 处理编译错误1
Merge pull request !4 from hanpinlong/openkylin/yangtze
2023-05-05 08:39:08 +00:00
韩品龙 3c0ac47400 fix build-error 2023-05-05 16:35:41 +08:00
hanpinlong 24b4191368
!3 try rebuild
Merge pull request !3 from hanpinlong/openkylin/yangtze
2023-05-05 07:43:57 +00:00
韩品龙 7c955e77ab try to rebuild 2023-05-05 15:29:19 +08:00
韩品龙 45f317b035 merge upstream 5.15.8 2023-05-05 14:09:45 +08:00
Fnoily 9a2751b91b
!1 ISSUE #I66RY2
Merge pull request !1 from Fnoily/openkylin/yangtze
2023-01-04 08:46:10 +00:00
fnoily bc231ad4ee update chanellog 2023-01-04 16:24:09 +08:00
fnoily e62a8a4709 [PATCH] 1.Del-touch-point-without-target.patch
2.Fix-touch-failure-after-right-click-menu.patch
2023-01-04 16:18:02 +08:00
openKylinBot c205944890 changed debian/source/format to native 2022-05-14 17:41:02 +08:00
openKylinBot 45a58851a9 apply patches 2022-05-14 17:41:02 +08:00
openKylinBot c2a0d75dd0 format patches 2022-05-14 17:41:02 +08:00
Rex Dieter d15c3bad99 properly cast types for libglvnd 1.3.4
Origin: https://src.fedoraproject.org/rpms/qt5-qtbase/blob/rawhide/f/qtbase-everywhere-src-5.15.2-libglvnd.patch

Gbp-Pq: Name cast_types_for_egl_x11_test.diff
2022-05-14 17:41:01 +08:00
Helmut Grohne e54e6798fd call pkgconfig in order to be able to cross build qtbase with MySql.
Qt's build system calls mysql_config... which won't work in a cross build
environment like Debian's, as it will throw an exec format error.

In order to solve this call pkgconfig and use mysqlclient.pc.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=971604
Forwarded: not-needed
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>

Gbp-Pq: Name cross_build_mysql.diff
2022-05-14 17:41:01 +08:00
Pino Toscano b188e29799 Limit Linux-only code with Q_OS_LINUX
The QStorageInfo/QStorageIterator implementation used for Linux is used also
on Hurd, as it uses an interface provided by GNU libc.
QStorageIterator::device() tries to use PATH_MAX (unavailable on the Hurd)
to lookup a /dev/block/ path, which exists on Linux only; hence, perform that
check within a Q_OS_LINUX block.
Forwarded: no
Last-Update: 2020-04-19

Gbp-Pq: Name qstorageinfo_linux.diff
2022-05-14 17:41:01 +08:00
Pino Toscano c8020902a0 Avoid unconditional PATH_MAX usage
Use a "safe" size in case PATH_MAX is not defined; in the end, this should not
be used, as a allocating realpath() will be used instead.
Forwarded: no
Last-Update: 2020-04-19

Gbp-Pq: Name path_max.diff
2022-05-14 17:41:01 +08:00
Martin Smith 84894965b7 pass default include directories to qdoc
Bug: https://bugs.debian.org/908328
Forwarded: no
Last-Update: 2020-01-28

Gbp-Pq: Name qdoc_default_incdirs.diff
2022-05-14 17:41:01 +08:00
Dmitry Shachnev 47fd91bb89 guard UTIME_NOW/UTIME_OMIT usages
Forwarded: no
Last-Update: 2018-02-22

Gbp-Pq: Name nonlinux_utime.diff
2022-05-14 17:41:01 +08:00
Dmitry Shachnev 7378d28c3d support ARMv4 architecture, needed for armel builds
Forwarded: no
Last-Update: 2016-07-01

Gbp-Pq: Name armv4.diff
2022-05-14 17:41:01 +08:00
Dmitry Shachnev 1924e95bf8 catch linker warnings in some config tests
Without this, qmake wrongly thinks that the tests succeed, for example:

./config.tests/unix/futimens/futimens.cpp:44: warning: futimens is not implemented and will always fail
test config.corelib.tests.futimens succeeded
Forwarded: https://codereview.qt-project.org/163214 (rejected)
Bug: https://bugs.debian.org/827935
Last-Update: 2019-03-02

Gbp-Pq: Name gnukfreebsd_linker_warnings.diff
2022-05-14 17:41:01 +08:00
Fathi Boudra cde9636976 build ibase sql plugin against firebird
Forwarded: no
Last-Update: 2017-06-30

Gbp-Pq: Name link_fbclient.diff
2022-05-14 17:41:01 +08:00
Lisandro Damián Nicanor Pérez Meyer 8f107b318c remove non-used privacy-breach code
This code makes Lintian unhappy. But we are really not using it, it only
gets inserted when building the online doc.
Anyways the best way to calm down Lintian is to simply remove it.
Forwarded: not-needed
Last-Update: 2015-02-18

Gbp-Pq: Name remove_privacy_breaches.diff
2022-05-14 17:41:01 +08:00
Dmitry Shachnev 5b9624d6e5 disable htmlinfo example which contains non-free files
Forwarded: not-needed
Last-Update: 2014-12-17

Gbp-Pq: Name no_htmlinfo_example.diff
2022-05-14 17:41:01 +08:00
Pino Toscano 82a9d3f27a Initial GNU/kFreeBSD support
- add a gnukfreebsd-g++ qmake mkspec, mostly copied from the hurd-g++ one
- properly use LD_LIBRARY_PATH on GNU/* systems
Last-Update: 2015-06-03
Forwarded: no

Gbp-Pq: Name gnukfreebsd.diff
2022-05-14 17:41:01 +08:00
Debian Qt/KDE Maintainers db597cc481 handle even more include in enum cases
The solution in d3ed7dac8aa2f4ede0c409254b9dd44842086be0 was needlessly
complicated, and broke a valid use case.
The issue of no identifier being available to parse after the include
has been processed can instead be solved by moving the test for the
closing brace after the include processing.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=87973325f1b99f2b
Last-Update: 2022-04-07

Gbp-Pq: Name moc_handle_include.diff
2022-05-14 17:41:01 +08:00
Debian Qt/KDE Maintainers ba37f387b4 Fix builds of qtconcurrentthreadengine.h with GCC 11
Without this patch, all the code that #includes QtConcurrent headers
will fail to compile with GCC 11.
Origin: upstream, https://codereview.qt-project.org/c/qt/qtbase/+/339417
Last-Update: 2022-04-01

Gbp-Pq: Name gcc-11-qtconcurrentthreadengine.diff
2022-05-14 17:41:01 +08:00
Debian Qt/KDE Maintainers 377c552430 QProcess: ensure we don't accidentally execute something from CWD
Unless "." (or the empty string) is in $PATH, we're not supposed to find
executables in the current directory. This is how the Unix shells behave
and we match their behavior. It's also the behavior Qt had prior to 5.9
(commit 28666d167aa8e602c0bea25ebc4d51b55005db13). On Windows, searching
the current directory is the norm, so we keep that behavior.

This commit does not add an explicit check for an empty return from
QStandardPaths::findExecutable(). Instead, we allow that empty string to
go all the way to execve(2), which will fail with ENOENT. We could catch
it early, before fork(2), but why add code for the error case?

See https://kde.org/info/security/advisory-20220131-1.txt
Origin: upstream, https://download.qt.io/official_releases/qt/5.15/CVE-2022-25255-qprocess5-15.diff
Last-Update: 2022-02-21

Gbp-Pq: Name CVE-2022-25255.diff
2022-05-14 17:41:01 +08:00
Debian Qt/KDE Maintainers c190e34a6f upstream fixes to support OpenSSL 3.0
Origin: upstream, commits
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=3186ca3e3972cf46
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=408656c6f9de326c
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=ae6590e360fbb04d
 and a small part of
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4c0f81490ba0c4ec
Last-Update: 2021-12-09

Gbp-Pq: Name openssl3.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers 0db85e1da1 avoid processing-intensive painting of high number of tiny dashes
When stroking a dashed path, an unnecessary amount of processing would
be spent if there is a huge number of dashes visible, e.g. because of
scaling. Since the dashes are too small to be individually visible
anyway, just replace with a semi-transparent solid line for such
cases.
Origin: upstream, commits:
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=f4d791b330d02777
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6b400e3147dcfd8c
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=84aba80944a2e1c3
 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=cca8ed0547405b1c
Last-Update: 2021-11-27

Gbp-Pq: Name CVE-2021-38593.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers a982f33688 treat the MYSQL_FIELD as read-only
The MariaDB-connector-c version 3.2 and MariaDB server version 10.6
cooperate to avoid re-transferring the query metadata, so the fact that
we were modifying it was causing it to improperly decode the DATETIME
data types into string, as we had asked. We ended up with a 7-byte
string that was actually the date binary-encoded.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=549ee216fd5bf2b3
Last-Update: 2021-11-13

Gbp-Pq: Name mysql_field_readonly.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers a2bad8b5ef fix recursion crash when calling setStyleSheet with qproperty-styleSheet
When calling setStyleSheet with property qproperty-styleSheet,
QStyleSheetStyle::polish will call QStyleSheetStyle::setProperties,
and then QStyleSheetStyle::setProperties goes on to call setProperty.
Because there is property qproperty-styleSheet, it will update
stylesheet by calling QStyleSheetStyle::polish.
This causes the recursive call to crash.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e9cdcc7cb314586a
Last-Update: 2021-11-13

Gbp-Pq: Name fix_recursion_crash.diff
2022-05-14 17:41:00 +08:00
Liang Qi fdd828e560 [PATCH] xcb: add a timeout control when reading INCR property
For the first call of QXcbClipboard::clipboardReadProperty()
inside of clipboardReadIncrementalProperty() in getSelection(),
it will get a XCB_NONE reply before the contents arrived via
property change. Then we give a chance to read more.

Manually tested with following setups:
* examples/widgets/mainwindows/application with gvim(gtk3)
* examples/widgets/widgets/imageviewer with GIMP 2.10.18(based on
gtk2) and GIMP 2.99.6(based on gtk3 via flatpak)

Fixes: QTBUG-56595
Pick-to: 5.12 5.15 6.1 6.2
Done-With: JiDe Zhang <zhangjide@uniontech.com>
Change-Id: Ib45f08464d39ad79137b1da99808c89b7dca2d08
Reviewed-by: JiDe Zhang <zhangjide@uniontech.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

Gbp-Pq: Name xcb_add_a_timeout_control_when_reading_INCR_property.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers 96f1345c14 fix QTextFormat::FullWidthSelection for right-to-left text layouts
Using the QTextFormat::FullWidthSelection property to select a line
would previously not take into account right-to-left text layouts.

With this patch, the whole line should now be drawn correctly for both
left-to-right, and right-to-left layouts.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=a7894855f2f59028
Last-Update: 2021-08-15

Gbp-Pq: Name full_width_selection_rtl.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers 11abf4e0d0 remove the version number checks in favor of actual functionality
MariaDB library version 3.2 no longer returns the server version in the
10.x range but the library version itself, which is lower than 4.x. That
meant we concluded the server did not support prepared statements.

And because of the lack of prepared statements, all QDateTime
conversions failed, because of the timezone. I don't know if this was
intended or what, but it's a side issue.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=211369133cf40b2f
Last-Update: 2021-08-10

Gbp-Pq: Name mysql_remove_version_checks.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers 1115543648 QPushButton/fusion style: don't ignore QIcon::On icon
The fusion style did ignore the QIcon::On icon because it reset
State_On to avoid the visual shift of a pressed button.
But it's not needed to reset this flag - the shift does not happen
because the fusion style does return 0 as offset for
PM_ButtonShiftHorizontal/PM_ButtonShiftVertical so no shifting will
happen.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e9ccdf4d84157173
Last-Update: 2021-08-10

Gbp-Pq: Name fusion_checkable_qpushbutton.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers 47c2390d18 fix placement of placeholder text in QLineEdits with action icons
After dc794f7622bc00f7ca50fab65d6965695d6d2972, side widgets only got
space if they were not fading out, but the logic was not correctly
accounting for side widgets that never fade, such as buttons added via
QLineEdit::addAction.

Fix this to give visible widgets space, unless they are fading out. That
was the intent of the original change. Rename the variable to make its
purpose clearer, and reset it at the end of the fade-out animation.

Add a much-needed test that relies on private APIs to verify that the
effective margins are calculated correctly.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=0e6b31019f01c72e
Last-Update: 2021-08-10

Gbp-Pq: Name fix-placement-of-placeholder-text-in-QLineEdits-with-action-icons.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers cceb3bcf82 fix misplacement of placeholder text in QLineEdit with RTL content
The placeholder text was rendered in the wrong position after clicking
on the clear button in a QLineEdit with right-to-left content. The
button was still taking up space while it was fading out, so the first
paintEvent rendered the placeholder with space reserved for the clear
button. Once the button gets hidden, no new update was issued, so
garbage was left behind.

Fix this by not giving a fading-out clear button any margin space. The
result of this is that the placeholder text is visible underneath the
fading-out clear button. This is preferable to the placeholder text
being first rendered next to the fading-out clear button, and then
popping to the edge when the clear button is hidden (which would have
been the result of issuing a complete update for the line edit at the
end of the fade-out animation).
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=dc794f7622bc00f7
Last-Update: 2021-06-16

Gbp-Pq: Name fix-misplacement-of-placeholder-text-in-QLineEdit.diff
2022-05-14 17:41:00 +08:00
Zhang Yu 9c6088f7c0 [PATCH] Fix invalid pointer return with QGridLayout::itemAt(-1)
QGridLayout::takeAt() and QLayoutItem *itemAt() only check the upper bound.
If the index < 0, these function will return invalid pointer.

Fixes: QTBUG-91261
Pick-to: 5.15 6.0 6.1
Change-Id: Idfb9fb6228b9707f817353b04974da16205a835c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>

Gbp-Pq: Name fix-invalid-pointer-return-with-QGridLayout.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers 1841b90eaf adjust QMimeDatabase implementation
When multiple globs match, and the result from magic sniffing is
unrelated to any of those globs, globs have priority and one of them
should be picked up.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=0cbbba2aa5b47224
Last-Update: 2021-06-12

Gbp-Pq: Name mime_globs.diff
2022-05-14 17:41:00 +08:00
Debian Qt/KDE Maintainers 6e247f0fb7 include <limits> to fix GCC 11 build
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
Last-Update: 2022-03-03

Gbp-Pq: Name gcc_11_limits.diff
2022-05-14 17:41:00 +08:00
openKylinBot 9dcf79f8fe Import Debian changes 5.15.3+dfsg-ok1
qtbase-opensource-src (5.15.3+dfsg-ok1) yangtze; urgency=medium

  * Build for openKylin.
2022-05-14 17:39:14 +08:00
openKylinBot e082218519 Import Upstream version 5.15.3+dfsg 2022-05-14 17:39:13 +08:00