Mudlet: bump (#4138)

This commit is contained in:
miqlas
2019-09-02 10:59:30 +02:00
committed by Jérôme Duval
parent 53bb7b63e0
commit 85a7de7c9f
2 changed files with 34 additions and 6 deletions

View File

@@ -18,16 +18,17 @@ COPYRIGHT="2008-2013 Heiko Koehn
2017 Tom Scheper
2017 Fae"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/Mudlet/Mudlet/archive/Mudlet-$portVersion.tar.gz"
CHECKSUM_SHA256="dabbd6ef6d0c085847ca37fc66b32b4fe81a1af5cefedeef03f1743bda53e84d"
CHECKSUM_SHA256="109d542d789426f589925702a06c1793609fc10952ce5620519b02299be21c9b"
SOURCE_DIR="Mudlet-Mudlet-$portVersion"
srcGitRev_2="d6a71925bda26dcab2b32571b14338ffb7a18e2e"
srcGitRev_2="051d679cfff2c006e3c740ef6c0466180b2e79cd"
SOURCE_URI_2="https://github.com/edbee/edbee-lib/archive/$srcGitRev_2.tar.gz"
CHECKSUM_SHA256_2="871e0aa4507d8b6ca86f71b977ec1161cb3309760cba2e520f3eaffb70891d35"
CHECKSUM_SHA256_2="93005068dd13b29621d9c1a6b59194a808ea1147fca7cbd5ed1117ea70f2ff46"
SOURCE_FILENAME_2="edbee-lib-$srcGitRev_2.tar.gz"
SOURCE_DIR_2="edbee-lib-$srcGitRev_2"
ADDITIONAL_FILES="mudlet.rdef.in"
PATCHES="mudlet-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
@@ -67,7 +68,7 @@ BUILD_REQUIRES="
devel:libGL$secondaryArchSuffix
devel:libGLU$secondaryArchSuffix
devel:libhunspell_1.7$secondaryArchSuffix
devel:liblua$secondaryArchSuffix
devel:liblua$secondaryArchSuffix >= 5.1
devel:libpcre$secondaryArchSuffix
devel:libpcrecpp$secondaryArchSuffix
devel:libpcreposix$secondaryArchSuffix
@@ -92,6 +93,7 @@ BUILD_PREREQUIRES="
cmd:diff
cmd:g++$secondaryArchSuffix
cmd:grep
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:python2
@@ -107,10 +109,14 @@ BUILD()
rm -rf 3rdparty/edbee-lib
ln -sfn $sourceDir2 3rdparty/edbee-lib
touch translations/translated/translation-stats.json # Shouldn't be required
rm -rf build_haiku
mkdir -p build_haiku
cd build_haiku
export LUA_DIR="`finddir B_SYSTEM_HEADERS_DIRECTORY`/lua5.1"
export LUA_DIR="$portPackageLinksDir/lua${secondaryArchSuffix}_devel/develop/headers/$ARCH_SUBDIR/lua5.1"
export HUNSPELL_DIR="$portPackageLinksDir/hunspell${secondaryArchSuffix}_devel/develop/"
cmake .. \
-DCMAKE_INSTALL_PREFIX=$appsDir/Mudlet

View File

@@ -0,0 +1,22 @@
From 26d17dec7c5f449772fdf7fef2b9137bbcbeac09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 25 Aug 2019 20:21:04 +0200
Subject: Hunspell 1.7 support
diff --git a/cmake/FindHUNSPELL.cmake b/cmake/FindHUNSPELL.cmake
index 40935f4..a6a0b19 100644
--- a/cmake/FindHUNSPELL.cmake
+++ b/cmake/FindHUNSPELL.cmake
@@ -21,7 +21,7 @@ FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.h
)
FIND_LIBRARY(HUNSPELL_LIBRARY_RELEASE
- NAMES hunspell libhunspell hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3
+ NAMES hunspell libhunspell libhunspell-1.7 hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3
HINTS
${HUNSPELL_DIR} $ENV{HUNSPELL_DIR}
PATH_SUFFIXES lib64 lib
--
2.23.0