diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-07-30 13:40:52 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-07-31 12:40:51 +0200 |
| commit | 634844354ee6ed884128086a80c3ee32c889d8c9 (patch) | |
| tree | afdf2d9c4c5962ac7631d1f21dda03796307b666 /sysui/CustomTarget_share.mk | |
| parent | e569b9d40eb02f53a3f13024af4ab1dc9ca7634a (diff) | |
sysui: fix rpm errors in freedesktop-menus (4.14.1)
RPM build errors:
Explicit %attr() mode not applicable to symlink: /workdir/CustomTarget/sysui/rpm/libreofficedev/freedesktop/usr/bin/libreofficedev6.1
Installed (but unpackaged) file(s) found:
/usr/local/lib/girepository-1.0/LOKDocView-0.1.typelib
/usr/share/gir-1.0/LOKDocView-0.1.gir
The LOKDocView problem turned out to be the result of the first
incremental build after adding --with-package-format, and previously it
was avoided with a if in configure; moving the commands out of
create_tree.sh should be more obvious and reliable though.
Change-Id: I69c1566e26eeaa1d8bf88a3650a78da6ddfb5a3b
Reviewed-on: https://gerrit.libreoffice.org/76596
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'sysui/CustomTarget_share.mk')
| -rw-r--r-- | sysui/CustomTarget_share.mk | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index b0a1577d4beb..231aa4ff930d 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -127,6 +127,9 @@ $(eval $(call gb_CustomTarget_register_targets,sysui/share,\ $(product)/openoffice.keys \ $(product)/openoffice.sh \ $(product)/create_tree.sh \ + $(if $(INTROSPECTION_SCANNER),\ + $(product)/LOKDocView-0.1.gir \ + $(product)/LOKDocView-0.1.typelib) \ $(product)/launcherlist) \ )) @@ -171,6 +174,30 @@ $(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh \ cat $< >> $@ chmod 774 $@ +# Generate gobject-introspection files +# These are *not* packaged in rpms because there's no good place to put them +# where the system will actually find them and where it won't conflict with a +# distro packaged LO; on Fedora 30 at least there's no /opt path in +# $XDG_DATA_DIRS +ifneq ($(INTROSPECTION_SCANNER),) + +$(share_WORKDIR)/%/LOKDocView-0.1.gir: \ + $(call gb_Library_get_target,libreofficekitgtk) + mkdir -p $(dir $@) + g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \ + "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \ + `${PKG_CONFIG} --cflags 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" \ + --include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \ + --namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc --symbol-prefix=lok_doc \ + --output="$@" --warn-all --no-libtool + +$(share_WORKDIR)/%/LOKDocView-0.1.typelib: $(share_WORKDIR)/%/LOKDocView-0.1.gir + g-ir-compiler "$<" --output="$@" + +endif $(share_WORKDIR)/%/launcherlist: $(LAUNCHERS) mkdir -p $(dir $@) |