4639722def
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=53
77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
--- configure.ac.old 2013-08-13 18:06:46.000000000 +0200
|
|
+++ configure.ac 2013-08-16 13:00:37.000000000 +0200
|
|
@@ -1652,7 +1652,16 @@ AC_ARG_WITH(jdk-home,
|
|
|
|
AC_ARG_WITH(help,
|
|
AS_HELP_STRING([--with-help],
|
|
- [Enable the build of help.]))
|
|
+ [Enable the build of help. There is a special parameter "common" that
|
|
+ can be used to bundle only the common part, .e.g help-specific icons.
|
|
+ This is useful when you build the helpcontent separately.])
|
|
+ [
|
|
+ Usage: --with-help build the entire local help
|
|
+ --without-help no local help (default)
|
|
+ --with-help=common bundle common files for the local
|
|
+ help but do not build the whole help
|
|
+ ],
|
|
+,)
|
|
|
|
AC_ARG_WITH(java,
|
|
AS_HELP_STRING([--with-java],
|
|
@@ -4386,14 +4395,21 @@ fi
|
|
AC_SUBST(DO_FETCH_TARBALLS)
|
|
|
|
AC_MSG_CHECKING([whether to build help])
|
|
-if test "$with_help" = "yes" -a $_os != iOS -a $_os != Android; then
|
|
- AC_MSG_RESULT([yes])
|
|
+HELP_COMMON_ONLY=FALSE
|
|
+if test -n "$with_help" -a "$with_help" != "no" -a $_os != iOS -a $_os != Android; then
|
|
BUILD_TYPE="$BUILD_TYPE HELP"
|
|
- SCPDEFS="$SCPDEFS -DWITH_HELP"
|
|
GIT_NEEDED_SUBMODULES="helpcontent2 $GIT_NEEDED_SUBMODULES"
|
|
+ if test "$with_help" = "common" ; then
|
|
+ HELP_COMMON_ONLY=TRUE
|
|
+ AC_MSG_RESULT([common only])
|
|
+ else
|
|
+ SCPDEFS="$SCPDEFS -DWITH_HELP"
|
|
+ AC_MSG_RESULT([yes])
|
|
+ fi
|
|
else
|
|
AC_MSG_RESULT([no])
|
|
fi
|
|
+AC_SUBST(HELP_COMMON_ONLY)
|
|
|
|
dnl Test whether to include MySpell dictionaries
|
|
dnl ===================================================================
|
|
--- config_host.mk.in.old 2013-08-06 19:25:04.000000000 +0200
|
|
+++ config_host.mk.in 2013-08-16 13:05:10.000000000 +0200
|
|
@@ -228,6 +228,7 @@ export HAVE_NON_CONST_NPP_GETMIMEDESCRIP
|
|
export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
|
|
export HAVE_READDIR_R=@HAVE_READDIR_R@
|
|
export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
|
|
+export HELP_COMMON_ONLY=@HELP_COMMON_ONLY@
|
|
export HOST_PLATFORM=@host@
|
|
export HSQLDB_JAR=@HSQLDB_JAR@
|
|
export HSQLDB_USE_JDBC_4_1=@HSQLDB_USE_JDBC_4_1@
|
|
--- helpcontent2/Module_helpcontent2.mk.old 2013-08-06 19:24:32.000000000 +0200
|
|
+++ helpcontent2/Module_helpcontent2.mk 2013-08-16 14:51:47.000000000 +0200
|
|
@@ -9,6 +9,7 @@
|
|
|
|
$(eval $(call gb_Module_Module,helpcontent2))
|
|
|
|
+ifneq ($(HELP_COMMON_ONLY),TRUE)
|
|
$(eval $(call gb_Module_add_targets,helpcontent2,\
|
|
AllLangHelp_sbasic \
|
|
AllLangHelp_scalc \
|
|
@@ -19,6 +20,10 @@ $(eval $(call gb_Module_add_targets,help
|
|
AllLangHelp_simpress \
|
|
AllLangHelp_smath \
|
|
AllLangHelp_swriter \
|
|
+))
|
|
+endif
|
|
+
|
|
+$(eval $(call gb_Module_add_targets,helpcontent2,\
|
|
CustomTarget_imagelist \
|
|
Package_imagelist \
|
|
))
|