|
 |
f325b2 |
From 7901933672c1d2dcd0148f0c8e9c8ee625d009b8 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Mon, 14 Sep 2015 14:12:29 +0200
|
|
|
f325b2 |
Subject: [PATCH 1/2] sysui: g-ir-scanner is not available in when
|
|
|
f325b2 |
introspection is disabled
|
|
|
f325b2 |
|
|
|
f325b2 |
Should fix the RHEL6 build.
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I3d6e6a2b43c2d6a43ea0686600cf2f893c518cc8
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/18566
|
|
|
f325b2 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
f325b2 |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
(cherry picked from commit d8026ad65c8d50868f0f2fc0d2bd95820cddea83)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
config_host.mk.in | 1 +
|
|
|
f325b2 |
sysui/CustomTarget_share.mk | 1 +
|
|
|
f325b2 |
sysui/desktop/share/create_tree.sh | 24 +++++++++++++-----------
|
|
|
f325b2 |
3 files changed, 15 insertions(+), 11 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/config_host.mk.in b/config_host.mk.in
|
|
|
f325b2 |
index 4ce14b085201..263f5323b7e5 100644
|
|
|
f325b2 |
--- a/config_host.mk.in
|
|
|
f325b2 |
+++ b/config_host.mk.in
|
|
|
f325b2 |
@@ -281,6 +281,7 @@ export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@
|
|
|
f325b2 |
export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER@
|
|
|
f325b2 |
export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@
|
|
|
f325b2 |
export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
|
|
|
f325b2 |
+export INTROSPECTION_SCANNER=@INTROSPECTION_SCANNER@
|
|
|
f325b2 |
export ILIB=@ILIB@
|
|
|
f325b2 |
export INSTALLDIR=@INSTALLDIR@
|
|
|
f325b2 |
export INSTALLDIRNAME=@INSTALLDIRNAME@
|
|
|
f325b2 |
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
|
|
|
f325b2 |
index 84907d1003c4..79bafd7f66ad 100644
|
|
|
f325b2 |
--- a/sysui/CustomTarget_share.mk
|
|
|
f325b2 |
+++ b/sysui/CustomTarget_share.mk
|
|
|
f325b2 |
@@ -184,6 +184,7 @@ $(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh $(share_
|
|
|
f325b2 |
echo "ICON_SOURCE_DIR=$(SRCDIR)/sysui/desktop/icons" >> $@
|
|
|
f325b2 |
echo "APPDATA_SOURCE_DIR=$(SRCDIR)/sysui/desktop/appstream-appdata" >> $@
|
|
|
f325b2 |
echo "PRODUCTVERSION=$(PRODUCTVERSION)" >> $@
|
|
|
f325b2 |
+ echo "INTROSPECTION_SCANNER=$(INTROSPECTION_SCANNER)" >> $@
|
|
|
f325b2 |
cat $< >> $@
|
|
|
f325b2 |
chmod 774 $@
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
|
|
|
f325b2 |
index 45b7c6cb09db..c73b89af3ab5 100755
|
|
|
f325b2 |
--- a/sysui/desktop/share/create_tree.sh
|
|
|
f325b2 |
+++ b/sysui/desktop/share/create_tree.sh
|
|
|
f325b2 |
@@ -88,15 +88,17 @@ for i in base calc draw impress writer; do
|
|
|
f325b2 |
done
|
|
|
f325b2 |
|
|
|
f325b2 |
# Generate gobject-introspection files
|
|
|
f325b2 |
-mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0"
|
|
|
f325b2 |
-g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
|
|
|
f325b2 |
- `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \
|
|
|
f325b2 |
- --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
|
|
|
f325b2 |
- --library=libreofficekitgtk --library-path="${DESTDIR}/${INSTALLDIR}/program" \
|
|
|
f325b2 |
- --include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \
|
|
|
f325b2 |
- --namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc --symbol-prefix=lok_doc \
|
|
|
f325b2 |
- --output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool
|
|
|
f325b2 |
+if [ -n "$INTROSPECTION_SCANNER" ]; then
|
|
|
f325b2 |
+ mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0"
|
|
|
f325b2 |
+ g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
|
|
|
f325b2 |
+ `${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \
|
|
|
f325b2 |
+ --include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
|
|
|
f325b2 |
+ --library=libreofficekitgtk --library-path="${DESTDIR}/${INSTALLDIR}/program" \
|
|
|
f325b2 |
+ --include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \
|
|
|
f325b2 |
+ --namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc --symbol-prefix=lok_doc \
|
|
|
f325b2 |
+ --output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool
|
|
|
f325b2 |
|
|
|
f325b2 |
-mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0"
|
|
|
f325b2 |
-g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \
|
|
|
f325b2 |
- --output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib"
|
|
|
f325b2 |
+ mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0"
|
|
|
f325b2 |
+ g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \
|
|
|
f325b2 |
+ --output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib"
|
|
|
f325b2 |
+fi
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|