[libreoffice] 04/06: cleanup: remove obsolete rhino-build-optional.diff, there's --disable-scripting-javascript

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit c10ce21ff654346aa4ff5464ce543140af6db5ec
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Mar 27 15:07:55 2017 +0200

    cleanup: remove obsolete rhino-build-optional.diff, there's --disable-scripting-javascript
---
 patches/rhino-build-optional.diff | 59 ---------------------------------------
 patches/series                    |  1 -
 2 files changed, 60 deletions(-)

diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
deleted file mode 100644
index 72a7608..0000000
--- a/patches/rhino-build-optional.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/configure.ac b/configure.in
-index 6037452..2251d85 100644
---- libreoffice-3.5.0/configure.ac
-+++ libreoffice-3.5.0/configure.ac
-@@ -7507,6 +7508,7 @@ AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript
- if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
-    AC_MSG_RESULT([yes])
-    ENABLE_SCRIPTING_JAVASCRIPT=YES
-+   BUILD_TYPE="$BUILD_TYPE RHINO"
- else
-    AC_MSG_RESULT([no])
-    ENABLE_SCRIPTING_JAVASCRIPT=NO
-diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
-index b926b07..67f8a71 100644
---- libreoffice-3.5.0/scripting/Module_scripting.mk
-+++ libreoffice-3.5.0/scripting/Module_scripting.mk
-@@ -54,7 +55,8 @@ $(eval $(call gb_Module_add_targets,scripting,\
- 	Pyuno_mailmerge \
- 	Zip_scriptbindinglib \
- 	Zip_ScriptsBeanShell \
--	Zip_ScriptsJavaScript \
-+	$(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
-+		Zip_ScriptsJavaScript) \
- 	Zip_ScriptsPython \
- ))
- 
-diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
-index 2bd4c61..f874898 100644
---- libreoffice-3.5.0/scripting/prj/build.lst
-+++ libreoffice-3.5.0/scripting/prj/build.lst
-@@ -1,2 +1,2 @@
--tc	scripting	:	filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
-+tc	scripting	:	filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 RHINO:rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
- tc	scripting\prj						nmake	-	all	tc1_prj NULL
---- libreoffice-3.5.0/scp2/source/ooo/file_ooo.scp
-+++ libreoffice-3.5.0/scp2/source/ooo/file_ooo.scp
-@@ -701,13 +701,15 @@ File gid_File_Scripts_Java
-     ARCHIVE_TXT_FILE_BODY;
-     Name = "ScriptsJava.zip";
- End
--#endif
- 
-+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
- File gid_File_Scripts_Javascript
-     Dir = gid_Dir_Share_Scripts;
-     ARCHIVE_TXT_FILE_BODY;
-     Name = "ScriptsJavaScript.zip";
- End
-+#endif
-+#endif
- 
- // new user interface configuration files
- File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
---- libreoffice-3.5.0/tail_build/prj/build.lst-old   2011-10-20 22:44:37.000000000 +0000
-+++ libreoffice-3.5.0/tail_build/prj/build.lst       2011-10-20 22:44:49.000000000 +0000
-@@ -1,2 +1,2 @@
--tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:m [...]
-+tb      tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo DESKTOP:codemaker CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:m [...]
- tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/patches/series b/patches/series
index 9ed06c4..ae8c6bd 100644
--- a/patches/series
+++ b/patches/series
@@ -2,7 +2,6 @@ debian-opt.diff
 jurt-soffice-location.diff
 split-evoab.diff
 debian-debug.diff
-#rhino-build-optional.diff
 #fix-system-lpsolve-build.diff
 build-against-shared-lpsolve.diff
 install-fixes.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git