[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.0-1-13-g39e1c00
The following commit has been merged in the debian-experimental-4.0 branch:
commit 39e1c00ab19f97e777d1461cf40f01df6d3b8825
Author: Rene Engelhard <rene@debian.org>
Date: Tue Feb 12 23:25:53 2013 +0100
don't use -notimestamp only when building with gjdoc
diff --git a/changelog b/changelog
index 1305fdf..fc72d61 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,7 @@
libreoffice (1:4.0.0-2) UNRELEASED; urgency=low
- * debian/patches/gendocu-no-notimestamp.diff: revert upstream change to use
- -notimestamp for javadoc, as it breaks on kfreebsd (-> gjdoc..)
+ * debian/patches/gendocu-no-notimestamp-with-gjdoc.diff: don't run
+ with -notimestamp for javadoc if we use gjdoc (-> kfreebsd-*)
-- Rene Engelhard <rene@debian.org> Fri, 08 Feb 2013 22:14:15 +0100
diff --git a/patches/gendocu-no-notimestamp-with-gjdoc.diff b/patches/gendocu-no-notimestamp-with-gjdoc.diff
new file mode 100644
index 0000000..96b56e2
--- /dev/null
+++ b/patches/gendocu-no-notimestamp-with-gjdoc.diff
@@ -0,0 +1,45 @@
+diff --git a/config_host.mk.in b/config_host.mk.in
+index d7ede5a..8a8f425 100644
+--- a/config_host.mk.in
++++ b/config_host.mk.in
+@@ -263,6 +263,7 @@ export JAVACISGCJ=@JAVACISGCJ@
+ export JAVACISKAFFE=@JAVACISKAFFE@
+ export JAVACOMPILER=@JAVACOMPILER@
+ export JAVADOC=@JAVADOC@
++export JAVADOCISGJDOC=@JAVADOCISGJDOC@
+ @x_JAVALIB@ export JAVALIB=@JAVALIB@
+ export JAVA_HOME=@JAVA_HOME@
+ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
+diff --git a/configure.ac b/configure.ac
+index 0cbc7e8..7930ad8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5987,7 +5987,12 @@ if test "$SOLAR_JAVA" != ""; then
+ JAVADOC=`cygpath -d "$JAVADOC"`
+ JAVADOC=`cygpath -u "$JAVADOC"`
+ fi
++
++ if test `$JAVADOC --version 2>&1 | $GREP -c "gjdoc"` -gt 0; then
++ JAVADOCISGJDOC="yes"
++ fi
+ fi
++AC_SUBST(JAVADOCISGJDOC)
+
+ if test "$SOLAR_JAVA" != ""; then
+ # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
+diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
+index 7345e72..6d3cc03 100644
+--- a/odk/pack/gendocu/makefile.mk
++++ b/odk/pack/gendocu/makefile.mk
+@@ -59,7 +59,10 @@ JAVA_BEAN_SRC_FILES=\
+ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
+ $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
+
+-JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
++JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
++.IF "$(JAVADOCISGJDOC)" != "yes"
++JAVADOCPARAMS+= -notimestamp
++.ENDIF
+
+ JAVADOCLOG = $(MISC)$/javadoc_log.txt
+
diff --git a/patches/gendocu-no-notimestamp.diff b/patches/gendocu-no-notimestamp.diff
deleted file mode 100644
index bc372ee..0000000
--- a/patches/gendocu-no-notimestamp.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-22:17 <@_rene_> vmiklos: hmm, I need to locally revert
- ac631f9ebddbc3674f9628d941e81a7ee73c6c66. kfreebsd-* (yet) only
- has java-gcj-compat/gcj-jdk available thus javadoc is de-facto
- gjdoc and that doesn't know -notimestamp...
-22:17 < IZBot> core - odk: use javadoc -notimestamp, so generated docs don't
- unnecessarily differ after each build -
-http://cgit.freedesktop.org/libreoffice/core/commit/?id=ac631f9ebddbc3674f9628d941e81a7ee73c6c66
-22:18 <@_rene_> .oO ( otoh, maybe I'll just implement a --without-docs option,
- as they don't even need to be built when you only build the
- binaries... )
-22:21 <@_rene_> vmiklos: see
-https://buildd.debian.org/status/logs.php?pkg=libreoffice&ver=1%3A4.0.0-1&arch=kfreebsd-i386 :)
-
---- a/odk/pack/gendocu/makefile.mk-old 2013-02-08 22:21:38.581488115 +0100
-+++ b/odk/pack/gendocu/makefile.mk 2013-02-08 22:21:53.449487676 +0100
-@@ -59,7 +59,7 @@
- $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
- $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
-
--JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
-+JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api ./java $(JAVA_PACKAGES)
-
- JAVADOCLOG = $(MISC)$/javadoc_log.txt
-
diff --git a/patches/series b/patches/series
index ef0ebd5..08e1dfe 100644
--- a/patches/series
+++ b/patches/series
@@ -27,4 +27,4 @@ build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
sdremote-close-on-non-bluetooth.diff
-gendocu-no-notimestamp.diff
+gendocu-no-notimestamp-with-gjdoc.diff
--
LibreOffice packaging repository
Reply to: