From: "Andreas K. Hüttel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
Date: Fri, 18 Feb 2022 20:09:33 +0000 (UTC) [thread overview]
Message-ID: <1645214936.5ff5d5c8f4b48fa53945c6255663d2e44ee2ea69.dilfridge@gentoo> (raw)
commit: 5ff5d5c8f4b48fa53945c6255663d2e44ee2ea69
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 20:08:56 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 20:08:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff5d5c8
app-office/libreoffice: Add fix for KF-5.91
Closes: https://bugs.gentoo.org/833524
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../files/libreoffice-7.2.5.2-kf591.patch | 56 ++++++++++++++++++++++
.../libreoffice/libreoffice-7.2.5.2-r1.ebuild | 3 ++
app-office/libreoffice/libreoffice-7.2.9999.ebuild | 3 ++
.../libreoffice/libreoffice-7.3.0.3-r1.ebuild | 3 ++
.../libreoffice/libreoffice-7.3.1.1-r1.ebuild | 3 ++
app-office/libreoffice/libreoffice-7.3.9999.ebuild | 3 ++
6 files changed, 71 insertions(+)
diff --git a/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch b/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch
new file mode 100644
index 000000000000..ac920867e4d5
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.2.5.2-kf591.patch
@@ -0,0 +1,56 @@
+From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn@posteo.de>
+Date: Wed, 16 Feb 2022 13:38:47 +0100
+Subject: configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91
+
+The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
+subdirectory in kcoreaddons commit
+
+ commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
+ Author: Ahmad Samir <a.samirh78@gmail.com>
+ Date: Sat Jan 15 14:14:13 2022 +0200
+
+ Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
+
+ Instead of /usr/include/KF5/kcoreaddons_version.h.
+
+ For more details see:
+ https://invent.kde.org/frameworks/kservice/-/merge_requests/79
+
+ GIT_SILENT
+
+Adapt the KF5 check to check for the 'KFileWidget' header and
+the 'libKF5KIOFileWidgets.so' library instead.
+This is more exact anyway, since we require KIOFileWidgets,
+and the previous check didn't ensure that.
+(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
+configure would previously pass, but the build fail.)
+
+[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
+
+Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6acb3107cea3..4e84f9a33980 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13017,8 +13017,8 @@ then
+ kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+ fi
+
+- kf5_test_include="KF5/kcoreaddons_version.h"
+- kf5_test_library="libKF5CoreAddons.so"
++ kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
++ kf5_test_library="libKF5KIOFileWidgets.so"
+ kf5_libdirs="$qt5_libdir $kf5_libdirs"
+
+ dnl kf5 KDE4 support compatibility installed
+--
+cgit v1.2.1
+
diff --git a/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
index bdf13f03b39c..f9cc748f0b85 100644
--- a/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.5.2-r1.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
# 7.3 branch
"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.2.9999.ebuild b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
index e2b8f99a1ca1..32c95181ca6e 100644
--- a/app-office/libreoffice/libreoffice-7.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.2.9999.ebuild
@@ -296,6 +296,9 @@ PATCHES=(
# 7.3 branch
"${FILESDIR}/${PN}-7.2.2.2-makefile-gengal.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
index 702733b0f4d2..a192705bcdf3 100644
--- a/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.0.3-r1.ebuild
@@ -297,6 +297,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild b/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
index e4211ec16391..96318dc2ec53 100644
--- a/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.1.1-r1.ebuild
@@ -297,6 +297,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 74a8caa49137..c8ad5df807a3 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -297,6 +297,9 @@ PATCHES=(
"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+ # master branch
+ "${FILESDIR}/${PN}-7.2.5.2-kf591.patch"
)
S="${WORKDIR}/${PN}-${MY_PV}"
next reply other threads:[~2022-02-18 20:09 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 20:09 Andreas K. Hüttel [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-29 16:32 [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/ Andreas Sturmlechner
2024-03-25 12:05 Andreas Sturmlechner
2024-03-25 12:05 Andreas Sturmlechner
2024-02-20 20:49 Andreas Sturmlechner
2024-02-14 19:55 Andreas Sturmlechner
2024-01-27 0:48 Andreas Sturmlechner
2024-01-07 9:29 Andreas Sturmlechner
2023-12-07 18:50 Andreas Sturmlechner
2023-11-21 22:36 Andreas Sturmlechner
2023-06-10 9:39 Andreas Sturmlechner
2023-05-13 21:25 Andreas Sturmlechner
2023-02-01 13:22 Andreas Sturmlechner
2022-09-02 4:38 Sam James
2022-05-13 22:51 Conrad Kostecki
2022-05-08 21:57 Sam James
2021-09-14 13:39 Andreas Sturmlechner
2021-09-13 5:19 Andreas Sturmlechner
2021-05-21 14:28 Andreas Sturmlechner
2021-03-12 21:12 Andreas Sturmlechner
2020-12-17 13:31 Andreas Sturmlechner
2020-08-07 23:24 Andreas Sturmlechner
2020-05-14 20:10 Andreas Sturmlechner
2019-12-26 8:36 Andreas Sturmlechner
2019-10-29 17:39 Andreas Sturmlechner
2019-10-29 17:39 Andreas Sturmlechner
2019-04-03 12:02 Andreas Sturmlechner
2019-02-14 18:36 Andreas Sturmlechner
2019-01-16 8:17 Andreas Sturmlechner
2019-01-09 10:00 Andreas Sturmlechner
2019-01-09 10:00 Andreas Sturmlechner
2018-11-22 21:48 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-07-14 8:20 Andreas Sturmlechner
2018-06-10 9:19 Andreas Sturmlechner
2018-05-29 14:59 Andreas Sturmlechner
2018-02-10 9:43 Andreas Sturmlechner
2018-02-09 23:14 Andreas Sturmlechner
2018-02-04 18:58 Andreas Sturmlechner
2018-01-07 16:02 Andreas Sturmlechner
2018-01-05 0:35 Andreas Sturmlechner
2017-06-25 21:54 Andreas Sturmlechner
2017-02-12 0:13 Andreas Sturmlechner
2016-11-29 19:55 Andreas Hüttel
2016-09-17 21:32 Andreas Hüttel
2016-07-26 7:39 Lars Wendler
2016-03-19 21:39 Andreas Hüttel
2015-11-28 0:13 Andreas Hüttel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1645214936.5ff5d5c8f4b48fa53945c6255663d2e44ee2ea69.dilfridge@gentoo \
--to=dilfridge@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox