diff --git a/office/misc/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch b/office/misc/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch new file mode 100644 index 0000000000..7a3f22e94c --- /dev/null +++ b/office/misc/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch @@ -0,0 +1,33 @@ +--- libetonyek-0.1.6/configure.ac ++++ libetonyek-0.1.6/configure.ac +@@ -24,8 +24,8 @@ AC_LANG([C++]) + # Configure options + # ================= + AC_ARG_WITH([mdds], +- AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]), +- [], [with_mdds="1.0"]) ++ AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]), ++ [], [with_mdds="1.2"]) + + # =========================== + # Find required base packages +@@ -47,7 +47,7 @@ AC_PROG_SED + + AM_MISSING_PROG([GPERF], [gperf]) + +-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])]) ++AS_IF([test "$with_mdds" != "0.x"], [AX_CXX_COMPILE_STDCXX_11([noext])]) + + # =============== + # Find librevenge +@@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS]) + # ========= + # Find mdds + # ========= +-AS_IF([test "$with_mdds" = "1.0"], [ +- PKG_CHECK_MODULES([MDDS], [mdds-1.0]) ++AS_IF([test "$with_mdds" != "0.x"], [ ++ PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds]) + ], [ + PKG_CHECK_MODULES([MDDS], [mdds]) + AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type]) diff --git a/office/misc/libetonyek/pspec.xml b/office/misc/libetonyek/pspec.xml index 5a1596d0b7..65c4ba9fc8 100644 --- a/office/misc/libetonyek/pspec.xml +++ b/office/misc/libetonyek/pspec.xml @@ -25,6 +25,9 @@ mdds-devel http://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.6.tar.xz + + libetonyek-0.1.6-mdds-1.2.patch + @@ -59,7 +62,7 @@ - 2017-04-11 + 2017-04-14 0.1.6 Rebuild Alihan Öztürk