diff options
| author | mabrand <mabrand@mabrand.nl> | 2015-09-28 00:00:26 (GMT) |
|---|---|---|
| committer | mabrand <mabrand@mabrand.nl> | 2015-09-28 00:00:26 (GMT) |
| commit | 2ae1ce9a8aa12de6d63d6bf9d9428428963c4084 (patch) | |
| tree | 628632f4634ffc3511f8319bcbe6dfe054bc2bdf | |
| parent | c53691cff612e6e5c7878a79b3757ad6ccb952bd (diff) | |
| parent | bfed636462f892c49f5bdae7b4303cc11500d0d8 (diff) | |
| download | mxe-2ae1ce9a8aa12de6d63d6bf9d9428428963c4084.zip mxe-2ae1ce9a8aa12de6d63d6bf9d9428428963c4084.tar.gz mxe-2ae1ce9a8aa12de6d63d6bf9d9428428963c4084.tar.bz2 | |
Merge pull request #889 from mabrand/unrtf
new package: unrtf
| -rw-r--r-- | index.html | 4 | ||||
| -rw-r--r-- | src/unrtf-1.patch | 70 | ||||
| -rw-r--r-- | src/unrtf.mk | 24 |
3 files changed, 98 insertions, 0 deletions
@@ -2459,6 +2459,10 @@ local-pkg-list: $(LOCAL_PKG_LIST)</pre> <td class="website"><a href="http://www.twolame.org/">TwoLAME</a></td> </tr> <tr> + <td class="package">unrtf</td> + <td class="website"><a href="https://www.gnu.org/software/unrtf/">unRTF</a></td> + </tr> + <tr> <td class="package">vamp-plugin-sdk</td> <td class="website"><a href="http://vamp-plugins.org/">Vamp Plugins SDK</a></td> </tr> diff --git a/src/unrtf-1.patch b/src/unrtf-1.patch new file mode 100644 index 0000000..2d8ad309 --- /dev/null +++ b/src/unrtf-1.patch @@ -0,0 +1,70 @@ +This file is part of MXE. +See index.html for further information. + +From f023435f7ba175b0b43b3cd9406199656ac6a707 Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Thu, 24 Sep 2015 23:47:04 +0200 +Subject: [PATCH 1/2] don't include <arpa/inet.h> on WIN32 + + +diff --git a/src/output.c b/src/output.c +index 86d8b5c..74c7426 100644 +--- a/src/output.c ++++ b/src/output.c +@@ -58,7 +58,12 @@ + #include <string.h> + #endif + ++#ifndef WIN32 + #include <arpa/inet.h> ++#else ++#include <winsock2.h> ++#include <stdint.h> ++#endif + + #include "malloc.h" + #include "defs.h" +-- +2.1.4 + + +From 74601257ca9a5a80a5097311951397976aa7c10b Mon Sep 17 00:00:00 2001 +From: Mark Brand <mabrand@mabrand.nl> +Date: Sat, 26 Sep 2015 12:36:36 +0200 +Subject: [PATCH 2/2] use StrStrI instead of strcasestr on WIN32 + + +diff --git a/src/convert.c b/src/convert.c +index c76d7d6..9382f7b 100644 +--- a/src/convert.c ++++ b/src/convert.c +@@ -107,6 +107,11 @@ + #include <string.h> + #endif + ++#ifdef WIN32 ++/* For StrStrI */ ++#include <shlwapi.h> ++#endif ++ + #include <errno.h> + + #include "defs.h" +@@ -602,7 +607,13 @@ process_font_table (Word *w) + else { + /* If there is "symbol" in the font name, use + * symbol encoding, else no local encoding */ +- if (strcasestr(name, "symbol")) ++ if ( ++#ifdef WIN32 ++ StrStrI ++#else ++ strcasestr ++#endif ++ (name, "symbol")) + font_table[total_fonts].encoding = "SYMBOL"; + else + font_table[total_fonts].encoding = 0; +-- +2.1.4 + diff --git a/src/unrtf.mk b/src/unrtf.mk new file mode 100644 index 0000000..850cc09 --- /dev/null +++ b/src/unrtf.mk @@ -0,0 +1,24 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := unrtf +$(PKG)_VERSION := 0.21.9 +$(PKG)_CHECKSUM := 22a37826f96d754e335fb69f8036c068c00dd01ee9edd9461a36df0085fb8ddd +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libiconv + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://git.savannah.gnu.org/cgit/unrtf.git/refs/' | \ + $(SED) -n "s,.*<a href='/cgit/unrtf.git/tag/?id=v\([0-9.]*\)'>.*,\1,p" | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./bootstrap + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + LIBS='-liconv -lws2_32' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef |