From 1cb061c48c73cff3da70319776daf8c24b9bc264 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 31 Jul 2023 13:43:50 +0200 Subject: [PATCH] Resolves: rhbz#2225976 Only pass -I... arguments to g-ir-scanner --- ...uments-to-g-ir-scanner-by-using-pkg-.patch | 36 +++++++++++++++++++ libreoffice.spec | 1 + 2 files changed, 37 insertions(+) create mode 100644 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch diff --git a/0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch b/0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch new file mode 100644 index 0000000..917dd6a --- /dev/null +++ b/0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch @@ -0,0 +1,36 @@ +From caddaaa6afd2709f72dfb6160a485d405ac03966 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Tue, 11 Jul 2023 20:21:15 +0200 +Subject: [PATCH] Only pass -I... arguments to g-ir-scanner by using + pkg-config's --cflags-only-I +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise it is possible that e.g. -Wl,--export-dynamic is passed which is fatal. + +Change-Id: I1735641e3149c86456e1164b67509a719e09d446 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154340 +Reviewed-by: René Engelhard +Tested-by: Caolán McNamara +Reviewed-by: Caolán McNamara +--- + sysui/CustomTarget_share.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk +index b86521a3a80f..912048b2ad66 100644 +--- a/sysui/CustomTarget_share.mk ++++ b/sysui/CustomTarget_share.mk +@@ -167,7 +167,7 @@ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \ + mkdir -p $(dir $@) + PYTHONWARNINGS=default g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \ + "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \ +- `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` \ ++ `${PKG_CONFIG} --cflags-only-I gobject-introspection-1.0 gtk+-3.0` \ + -I"${SRCDIR}/include/" \ + --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \ + --library=libreofficekitgtk --library-path="${INSTDIR}/program" \ +-- +2.41.0 + diff --git a/libreoffice.spec b/libreoffice.spec index a8e096f..cf04047 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -273,6 +273,7 @@ Patch5: 0001-aarch64-failing-here.patch Patch6: 0001-include-filename-if-the-test-fails.patch # backported Patch7: 0001-fix-testSignDocument_PEM_PDF.patch +Patch8: 0001-Only-pass-I.-arguments-to-g-ir-scanner-by-using-pkg-.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch