From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
Date: Wed, 14 Feb 2024 19:55:19 +0000 (UTC) [thread overview]
Message-ID: <1707940504.d9d6ce294d0657b3393b30d85792a27c064ec6f3.asturm@gentoo> (raw)
commit: d9d6ce294d0657b3393b30d85792a27c064ec6f3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 19:42:49 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 19:55:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d6ce29
app-office/libreoffice: Fix install Qt6/KF6 vcl plugin w/o Qt5/KF5
See also: https://gerrit.libreoffice.org/c/core/+/163313
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/libreoffice-24.2-kf6-configure.patch | 61 ++++++++++++++++++++++
app-office/libreoffice/libreoffice-24.2.1.1.ebuild | 7 +--
2 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch b/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch
new file mode 100644
index 000000000000..2a4952d7e7cc
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-24.2-kf6-configure.patch
@@ -0,0 +1,61 @@
+From ec69b448f4b6296edb6b28ced5ecb710be82438b Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn@posteo.de>
+Date: Tue, 13 Feb 2024 16:25:35 +0100
+Subject: [PATCH] scp2: Take ENABLE_{KF,QT}6 into account
+
+The qt6 and kf6 VCL plugins are also part
+of the kde install set, so take
+`ENABLE_QT6` and `ENABLE_KF6` into
+account when deciding whether to install
+it.
+
+This makes packaging these VCL plugins work
+when building with `--enable-qt6` and/or
+`--enable-kf6`, but without `--enable-qt5`
+and `--enable-kf5`.
+
+Command that can be used for testing:
+
+ make DESTDIR=/tmp/dummy distro-pack-install -o build -o check
+
+(Then, check whether the "installation" in /tmp/dummy
+contains the VCL plugins as expected.)
+
+Thanks to Andreas Sturmlechner for reporting
+the issue on IRC #libreoffice-dev on 2024-02-12.
+
+Change-Id: Ieea67468e3388f8b7b66f53221574c6225516b44
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163313
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
+---
+ scp2/InstallScript_setup_osl.mk | 2 +-
+ scp2/Module_scp2.mk | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
+index 6f7b58204225e..cf69165c1b60f 100644
+--- a/scp2/InstallScript_setup_osl.mk
++++ b/scp2/InstallScript_setup_osl.mk
+@@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
+ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\
+ scp2/gnome \
+ ) \
+- $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\
++ $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\
+ scp2/kde \
+ ) \
+ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
+diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
+index 25ae8167df561..651413fa2c17e 100644
+--- a/scp2/Module_scp2.mk
++++ b/scp2/Module_scp2.mk
+@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
+ $(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK3)),\
+ InstallModule_gnome \
+ ) \
+- $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_KF5) $(ENABLE_GTK3_KDE5)),\
++ $(if $(filter TRUE,$(ENABLE_QT5) $(ENABLE_QT6) $(ENABLE_KF5) $(ENABLE_KF6) $(ENABLE_GTK3_KDE5)),\
+ InstallModule_kde \
+ ) \
+ ))
diff --git a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
index 588451cdcb06..c9eed10d3c29 100644
--- a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild
@@ -313,12 +313,13 @@ PATCHES=(
"${FILESDIR}/${PN}-6.1-nomancompress.patch"
"${FILESDIR}/${PN}-24.2-qtdetect.patch"
- # not yet upstream, sourced from Mandriva
- "${FILESDIR}/${PN}-24.2-kf6-buildfix.patch"
-
# maybe upstreamable
"${FILESDIR}/${PN}-7.5.8.2-icu-74-compatibility.patch"
+ # git master, pending 24.2
+ "${FILESDIR}/${PN}-24.2-kf6-configure.patch"
+ "${FILESDIR}/${PN}-24.2-kf6-buildfix.patch"
+
)
S="${WORKDIR}/${PN}-${MY_PV}"
next reply other threads:[~2024-02-14 19:55 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-14 19:55 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-28 11:56 [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/ Andreas Sturmlechner
2025-03-03 11:05 Sam James
2025-02-26 20:50 Andreas Sturmlechner
2025-02-22 22:26 Sam James
2025-01-13 17:12 Andreas Sturmlechner
2024-11-14 21:29 Andreas Sturmlechner
2024-06-29 16:32 Andreas Sturmlechner
2024-03-25 12:05 Andreas Sturmlechner
2024-03-25 12:05 Andreas Sturmlechner
2024-02-20 20:49 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
2022-02-18 20:09 Andreas K. Hüttel
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=1707940504.d9d6ce294d0657b3393b30d85792a27c064ec6f3.asturm@gentoo \
--to=asturm@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