haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libetonyek: apply mdds1.2 patch.

Browse Source
This commit is contained in:
Jerome Duval
2017-08-31 18:13:43 +02:00
parent 9e8f4ce19c
commit 3d51948ee3
2 changed files with 84 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app-text/libetonyek/libetonyek-0.1.6.recipe
View File

@@ -4,9 +4,10 @@ Keynote documents. It supports Keynote versions 2-5."
HOMEPAGE="http://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
COPYRIGHT="Fridrich Strba, David Tardon"
LICENSE="MPL v2.0"
REVISION="3"
REVISION="4"
SOURCE_URI="http://dev-www.libreoffice.org/src/libetonyek/libetonyek-$portVersion.tar.bz2"
CHECKSUM_SHA256="032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"
PATCHES="libetonyek-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -58,12 +59,11 @@ BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:libtoolize
cmd:autoconf
cmd:automake
cmd:autoheader
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:gperf
@@ -71,12 +71,8 @@ BUILD_PREREQUIRES="
BUILD()
{
libtoolize --force --copy --install
aclocal
autoheader
automake -a -c --foreign
autoconf
runConfigure ./configure
autoreconf -fi
runConfigure ./configure --with-mdds=1.2
make $jobArgs
}

79
app-text/libetonyek/patches/libetonyek-0.1.6.patchset Normal file
View File

@@ -0,0 +1,79 @@
From 94016811730f8242808a94a23bb6cab95fa2b4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Thu, 9 Jun 2016 10:50:41 +0200
Subject: Allow building with mdds-1.2
Change-Id: If8791b4c1c3fbefdd06af345276e0a724dff5482
diff --git a/configure.ac b/configure.ac
index ca4bb07..bb946eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ 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)]),
+ AS_HELP_STRING([--with-mdds=1.2|1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
[], [with_mdds="1.0"])
# ===========================
@@ -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" = "1.0" -o "$with_mdds" = "1.2" ], [AX_CXX_COMPILE_STDCXX_11([noext])])
# ===============
# Find librevenge
@@ -138,25 +138,27 @@ AC_SUBST([GLM_CFLAGS])
# =========
# Find mdds
# =========
-AS_IF([test "$with_mdds" = "1.0"], [
- PKG_CHECK_MODULES([MDDS], [mdds-1.0])
-], [
- PKG_CHECK_MODULES([MDDS], [mdds])
- AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
- old_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <mdds/flat_segment_tree.hpp>
- struct Value {};
- mdds::flat_segment_tree<int, Value> tree(0, 4, Value());
- ])], [
- AC_MSG_RESULT([yes])
- ], [
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([please install mdds >= 0.12.1])
- ])
- CPPFLAGS="$old_CPPFLAGS"
-])
+AS_CASE(["$with_mdds"],
+ ["1.2"], [PKG_CHECK_MODULES([MDDS], [mdds-1.2])],
+ ["1.0"], [PKG_CHECK_MODULES([MDDS], [mdds-1.0])],
+ [
+ PKG_CHECK_MODULES([MDDS], [mdds])
+ AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
+ old_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+ #include <mdds/flat_segment_tree.hpp>
+ struct Value {};
+ mdds::flat_segment_tree<int, Value> tree(0, 4, Value());
+ ])], [
+ AC_MSG_RESULT([yes])
+ ], [
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([please install mdds >= 0.12.1])
+ ])
+ CPPFLAGS="$old_CPPFLAGS"
+ ]
+)
# =================================
# Libtool/Version Makefile settings
--
2.13.1