|
 |
135360 |
From 132994c95901d1b5876c6eb468aae294ff00655b Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
Date: Fri, 18 Sep 2015 09:10:30 +0200
|
|
|
135360 |
Subject: [PATCH 2/2] sysui: introspection wants ${INSTDIR}, not
|
|
|
135360 |
${DESTDIR}/${INSTALLDIR}
|
|
|
135360 |
|
|
|
135360 |
The later can be empty for the generic rpm case.
|
|
|
135360 |
|
|
|
135360 |
Change-Id: I69c62dcd2a16004c7927c9cf67837463e6411a8d
|
|
|
135360 |
Reviewed-on: https://gerrit.libreoffice.org/18675
|
|
|
135360 |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
135360 |
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
(cherry picked from commit c722e9e728ec6c9df0285f5dd2041aa58f66f686)
|
|
|
135360 |
---
|
|
|
135360 |
configure.ac | 5 ++++-
|
|
|
135360 |
sysui/desktop/share/create_tree.sh | 2 +-
|
|
|
135360 |
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/configure.ac b/configure.ac
|
|
|
135360 |
index f3fe04da124b..c5183b7cc448 100644
|
|
|
135360 |
--- a/configure.ac
|
|
|
135360 |
+++ b/configure.ac
|
|
|
135360 |
@@ -9917,7 +9917,10 @@ if test "x$enable_gtk3" = "xyes"; then
|
|
|
135360 |
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
|
|
|
135360 |
if test "x$ENABLE_GTK3" = "xTRUE"; then
|
|
|
135360 |
R="gtk3"
|
|
|
135360 |
- GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION)
|
|
|
135360 |
+ dnl Avoid installed by unpackaged files for now.
|
|
|
135360 |
+ if test -z "$PKGFORMAT"; then
|
|
|
135360 |
+ GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION)
|
|
|
135360 |
+ fi
|
|
|
135360 |
else
|
|
|
135360 |
AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not found])
|
|
|
135360 |
fi
|
|
|
135360 |
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
|
|
|
135360 |
index c73b89af3ab5..86d2837fed0f 100755
|
|
|
135360 |
--- a/sysui/desktop/share/create_tree.sh
|
|
|
135360 |
+++ b/sysui/desktop/share/create_tree.sh
|
|
|
135360 |
@@ -93,7 +93,7 @@ if [ -n "$INTROSPECTION_SCANNER" ]; then
|
|
|
135360 |
g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
|
|
|
135360 |
`${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \
|
|
|
135360 |
--include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
|
|
|
135360 |
- --library=libreofficekitgtk --library-path="${DESTDIR}/${INSTALLDIR}/program" \
|
|
|
135360 |
+ --library=libreofficekitgtk --library-path="${INSTDIR}/program" \
|
|
|
135360 |
--include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \
|
|
|
135360 |
--namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc --symbol-prefix=lok_doc \
|
|
|
135360 |
--output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|