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

libmwaw: fix conv tools build.

Browse Source
This commit is contained in:
Jerome Duval
2017-04-08 13:01:34 +02:00
parent 0e22dd640f
commit 0f9be5df1a
2 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app-text/libmwaw/libmwaw-0.3.10.recipe
View File

@@ -7,7 +7,7 @@ COPYRIGHT="Fridrich Strba
David Tardon"
LICENSE="MPL v2.0
GNU LGPL v2.1"
REVISION="1"
REVISION="2"
SOURCE_URI="http://prdownloads.sourceforge.net/libmwaw/libmwaw-$portVersion.tar.bz2"
CHECKSUM_SHA256="b9ad0892e593354698f25e9a484a717471ec13352d4c8a458db20d250cfab333"
PATCHES="libmwaw-$portVersion.patchset"

77
app-text/libmwaw/patches/libmwaw-0.3.10.patchset
View File

@@ -1,14 +1,14 @@
From c6139ee764b898c8a90e898bb9fb94b89d854571 Mon Sep 17 00:00:00 2001
From 6ec91570c6791554153374eaf7e784d6643bcd75 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Mon, 21 Jul 2014 17:18:22 +0200
Subject: Haiku support
diff --git a/configure.ac b/configure.ac
index 12e7614..e318411 100644
index ee23c24..344a02a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -304,6 +304,7 @@ AC_COMPILE_IFELSE([
@@ -349,6 +349,7 @@ AC_COMPILE_IFELSE([
], [
AC_MSG_RESULT([yes, find Darwin getxattr])
[XATTR_CFLAGS="-DWITH_EXTENDED_FS=1"]
@@ -16,7 +16,7 @@ index 12e7614..e318411 100644
], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM(
@@ -314,12 +315,15 @@ AC_COMPILE_IFELSE([
@@ -359,12 +360,15 @@ AC_COMPILE_IFELSE([
], [
AC_MSG_RESULT([yes, find Linux getxattr])
[XATTR_CFLAGS="-DWITH_EXTENDED_FS=2"]
@@ -32,6 +32,71 @@ index 12e7614..e318411 100644
# =========
# Find zlib
diff --git a/src/conv/csv/Makefile.am b/src/conv/csv/Makefile.am
index 80284b7..438979f 100644
--- a/src/conv/csv/Makefile.am
+++ b/src/conv/csv/Makefile.am
@@ -16,7 +16,7 @@ else
mwaw2csv_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2CSV_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2CSV_WIN32_RESOURCE@
endif
diff --git a/src/conv/html/Makefile.am b/src/conv/html/Makefile.am
index 9151e15..5012006 100644
--- a/src/conv/html/Makefile.am
+++ b/src/conv/html/Makefile.am
@@ -16,7 +16,7 @@ else
mwaw2html_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2HTML_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2HTML_WIN32_RESOURCE@
endif
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index a49b894..41684a8 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -16,7 +16,7 @@ else
mwaw2raw_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2RAW_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2RAW_WIN32_RESOURCE@
endif
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index afd8937..0b47b60 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -16,7 +16,7 @@ else
mwaw2svg_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2SVG_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2SVG_WIN32_RESOURCE@
endif
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 7413611..ff907b9 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -16,7 +16,7 @@ else
mwaw2text_LDADD = \
../../lib/libmwaw-@MWAW_MAJOR_VERSION@.@MWAW_MINOR_VERSION@.la \
- ../helper/libconvHelper.la $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2TEXT_WIN32_RESOURCE@
+ ../helper/libconvHelper.la $(XATTR_LIBS) $(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) @MWAW2TEXT_WIN32_RESOURCE@
endif
diff --git a/src/tools/file/Makefile.am b/src/tools/file/Makefile.am
index 9b25e89..6260426 100644
--- a/src/tools/file/Makefile.am
@@ -48,7 +113,7 @@ index 9b25e89..6260426 100644
diff --git a/src/tools/zip/Makefile.am b/src/tools/zip/Makefile.am
old mode 100755
new mode 100644
index a8dd26d..28a9c51
index c44bf7f..5bee711
--- a/src/tools/zip/Makefile.am
+++ b/src/tools/zip/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = mwawZip
@@ -61,5 +126,5 @@ index a8dd26d..28a9c51
if STATIC_TOOLS
mwawZip_LDFLAGS = -all-static
--
1.8.3.4
2.11.0