diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | sysui/CustomTarget_share.mk | 27 | ||||
| -rw-r--r-- | sysui/desktop/freedesktop/freedesktop-menus.spec | 2 | ||||
| -rwxr-xr-x | sysui/desktop/share/create_tree.sh | 15 |
4 files changed, 29 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index f423018d574f..b3f5390428fe 100644 --- a/configure.ac +++ b/configure.ac @@ -10431,10 +10431,7 @@ if test "x$enable_gtk3" = "xyes"; then if test "x$ENABLE_GTK3" = "xTRUE"; then AC_DEFINE(ENABLE_GTK3) R="gtk3" - dnl Avoid installed by unpackaged files for now. - if test -z "$PKGFORMAT"; then - GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION) - fi + GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION) else AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not found]) fi 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 $@) diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index bdc378554065..f646bb7ff8ca 100644 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -394,7 +394,7 @@ done # compat symlinks %attr(0755,root,root) /opt/%unixfilename %endif -%attr(0755, root, root) /usr/bin/* +/usr/bin/* /usr/share/applications/%unixfilename-base.desktop /usr/share/applications/%unixfilename-calc.desktop /usr/share/applications/%unixfilename-draw.desktop diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 9fc2b998c86f..36dc4ff7a0e6 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -83,18 +83,3 @@ for i in base calc draw impress writer; do done cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/org.${PREFIX}.kde.metainfo.xml" -# Generate gobject-introspection files -if [ -n "$INTROSPECTION_SCANNER" ]; then - mkdir -p "${DESTDIR}/${PREFIXDIR}/share/gir-1.0" - 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="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool - - mkdir -p "${DESTDIR}/${LIBDIR}/girepository-1.0" - g-ir-compiler "${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" \ - --output="${DESTDIR}/${LIBDIR}/girepository-1.0/LOKDocView-0.1.typelib" -fi |