[libreoffice] 01/01: generate-g-i-files.diff is upstream
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit e76aa979e5bd610795029a68d054121c2eb6133b
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 14 10:09:28 2015 +0200
generate-g-i-files.diff is upstream
---
changelog | 5 +-
patches/generate-g-i-files.diff | 155 ----------------------------------------
patches/series | 1 -
3 files changed, 1 insertion(+), 160 deletions(-)
diff --git a/changelog b/changelog
index a4f7327..046a74d 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,7 @@
-libreoffice (1:5.1.0~alpha1~git20150912-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~alpha1~git20150914-1) UNRELEASED; urgency=medium
* New upstream snapshot
- * debian/patches/generate-g-i-files.diff: add (fixed) patch from gerrit to
- generate the gobject-introspection stuff for LOKDocView.
- Soon to be land in master anyway
* debian/patches/series, debian/patches/disable-tiledrendering-test.diff:
remove again, seems to work again, and we need the functionallity for
liblibreofficekitgtk.so
diff --git a/patches/generate-g-i-files.diff b/patches/generate-g-i-files.diff
deleted file mode 100644
index 641bd38..0000000
--- a/patches/generate-g-i-files.diff
+++ /dev/null
@@ -1,155 +0,0 @@
-From: Pranav Kant <pranavk@gnome.org>
-Date: Sat, 15 Aug 2015 13:18:53 +0000 (+0530)
-Subject: create_tree.sh: Generate g-i files
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=0e1516dad013e6854d6ba25a26f1d02be5268038
-
-create_tree.sh: Generate g-i files
-
-Change-Id: I1749b5b02018cfe6f85a13aed8de4b31a09788e3
----
-
-diff --git a/configure.ac b/configure.ac
-index 65a313a..dda7e15 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -201,6 +201,11 @@ SRC_ROOT=`pwd`
- cd $BUILDDIR
- x_Cygwin=[\#]
-
-+dnl ======================================
-+dnl Required GObject introspection version
-+dnl ======================================
-+INTROSPECTION_REQUIRED_VERSION=1.32.0
-+
- dnl ===================================================================
- dnl Search all the common names for GNU Make
- dnl ===================================================================
-@@ -9957,6 +9962,7 @@ if test "x$enable_gtk3" = "xyes"; then
- 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="")
- if test "x$ENABLE_GTK3" = "xTRUE"; then
- R="gtk3"
-+ GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION)
- else
- AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not found])
- fi
-diff --git a/m4/introspection.m4 b/m4/introspection.m4
-new file mode 100644
-index 0000000..532bad8
---- /dev/null
-+++ b/m4/introspection.m4
-@@ -0,0 +1,94 @@
-+dnl -*- mode: autoconf -*-
-+dnl Copyright 2009 Johan Dahlin
-+dnl
-+dnl This file is free software; the author(s) gives unlimited
-+dnl permission to copy and/or distribute it, with or without
-+dnl modifications, as long as this notice is preserved.
-+dnl
-+
-+# serial 1
-+
-+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-+[
-+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-+
-+ dnl enable/disable introspection
-+ m4_if([$2], [require],
-+ [dnl
-+ enable_introspection=yes
-+ ],[dnl
-+ AC_ARG_ENABLE(introspection,
-+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-+ [Enable introspection for this build]),,
-+ [enable_introspection=auto])
-+ ])dnl
-+
-+ AC_MSG_CHECKING([for gobject-introspection])
-+
-+ dnl presence/version checking
-+ AS_CASE([$enable_introspection],
-+ [no], [dnl
-+ found_introspection="no (disabled, use --enable-introspection to enable)"
-+ ],dnl
-+ [yes],[dnl
-+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-+ found_introspection=yes,
-+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-+ ],dnl
-+ [auto],[dnl
-+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-+ dnl Canonicalize enable_introspection
-+ enable_introspection=$found_introspection
-+ ],dnl
-+ [dnl
-+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-+ ])dnl
-+
-+ AC_MSG_RESULT([$found_introspection])
-+
-+ INTROSPECTION_SCANNER=
-+ INTROSPECTION_COMPILER=
-+ INTROSPECTION_GENERATE=
-+ INTROSPECTION_GIRDIR=
-+ INTROSPECTION_TYPELIBDIR=
-+ if test "x$found_introspection" = "xyes"; then
-+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-+ fi
-+ AC_SUBST(INTROSPECTION_SCANNER)
-+ AC_SUBST(INTROSPECTION_COMPILER)
-+ AC_SUBST(INTROSPECTION_GENERATE)
-+ AC_SUBST(INTROSPECTION_GIRDIR)
-+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
-+ AC_SUBST(INTROSPECTION_CFLAGS)
-+ AC_SUBST(INTROSPECTION_LIBS)
-+ AC_SUBST(INTROSPECTION_MAKEFILE)
-+])
-+
-+
-+dnl Usage:
-+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-+[
-+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-+])
-+
-+dnl Usage:
-+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-+
-+
-+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-+[
-+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-+])
-diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
-index c6be0bb..3cda12f 100755
---- a/sysui/desktop/share/create_tree.sh
-+++ b/sysui/desktop/share/create_tree.sh
-@@ -87,3 +87,16 @@ for i in base calc draw impress writer; do
- cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml"
- done
-
-+# Generate gobject-introspection files
-+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="${DESTDIR}/${INSTALLDIR}/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"
diff --git a/patches/series b/patches/series
index a4901c4..5c7d51c 100644
--- a/patches/series
+++ b/patches/series
@@ -27,4 +27,3 @@ odk-no-dot.diff
hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
-generate-g-i-files.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: