|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
From caddaaa6afd2709f72dfb6160a485d405ac03966 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
From: Rico Tzschichholz <ricotz@ubuntu.com>
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Date: Tue, 11 Jul 2023 20:21:15 +0200
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Subject: [PATCH] Only pass -I... arguments to g-ir-scanner by using
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
pkg-config's --cflags-only-I
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
MIME-Version: 1.0
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Content-Type: text/plain; charset=UTF-8
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Content-Transfer-Encoding: 8bit
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Otherwise it is possible that e.g. -Wl,--export-dynamic is passed which is fatal.
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Change-Id: I1735641e3149c86456e1164b67509a719e09d446
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154340
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Reviewed-by: René Engelhard <rene@debian.org>
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
---
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
sysui/CustomTarget_share.mk | 2 +-
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
index b86521a3a80f..912048b2ad66 100644
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
--- a/sysui/CustomTarget_share.mk
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
+++ b/sysui/CustomTarget_share.mk
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
@@ -167,7 +167,7 @@ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
mkdir -p $(dir $@)
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
PYTHONWARNINGS=default g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
"${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
- `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` \
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
+ `${PKG_CONFIG} --cflags-only-I gobject-introspection-1.0 gtk+-3.0` \
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
-I"${SRCDIR}/include/" \
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
--include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
--library=libreofficekitgtk --library-path="${INSTDIR}/program" \
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
--
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
2.41.0
|
|
![](https://seccdn.libravatar.org/avatar/c89f0607eb9ec65833c823fb33bcb40a1bffc52efb8d20082f4a6e9761f696c8?s=16&d=retro) |
1cb061c |
|