cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak build: this wants ruby=1.8 due to ruby-iconv.

Browse Source 
Build failure reported by naddy@
OK bcallah@ (maintainer)
This commit is contained in:
dcoppa 2013-10-14 13:52:46 +00:00
parent 10cab6f0c3
commit b541eaf307
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
games/easyrpg/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.5 2013/10/06 17:41:57 jeremy Exp $
# $OpenBSD: Makefile,v 1.6 2013/10/14 13:52:46 dcoppa Exp $
V = 0.1.1
COMMENT = free interpreter for RPG Maker 2000/2003 and EasyRPG games
DISTFILES = EasyRPG_Player-${V}-src.zip \
EasyRPG_Readers-${V}-src.zip
PKGNAME = easyrpg-${V}
REVISION = 2
REVISION = 3
CATEGORIES = games x11
HOMEPAGE = https://easy-rpg.org/
@ -26,6 +26,11 @@ MODULES += converters/libiconv \
lang/lua \
lang/ruby
# iconv is deprecated with ruby>1.8
MODRUBY_REV = 1.8
BUILD_DEPENDS = ${MODRUBY_ICONV_DEPENDS}
LIB_DEPENDS = audio/libsndfile \
audio/openal \
devel/boost \

33
games/easyrpg/patches/patch-builds_cmake_CMakeLists_txt
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-builds_cmake_CMakeLists_txt,v 1.3 2013/06/23 15:30:41 dcoppa Exp $
$OpenBSD: patch-builds_cmake_CMakeLists_txt,v 1.4 2013/10/14 13:52:46 dcoppa Exp $
We don't need Git because we're using releases.
--- builds/cmake/CMakeLists.txt.orig Sat Apr 20 19:12:11 2013
+++ builds/cmake/CMakeLists.txt Sun Jun 23 16:56:34 2013
+++ builds/cmake/CMakeLists.txt Mon Oct 14 15:38:37 2013
@@ -9,12 +9,6 @@ set(DEFAULT_EASYRPG_READERS_PATH "${CMAKE_CURRENT_SOUR
if(NOT EASYRPG_READERS_PATH)
set(EASYRPG_READERS_PATH "${DEFAULT_EASYRPG_READERS_PATH}")
@ -17,19 +17,38 @@ We don't need Git because we're using releases.
add_subdirectory(
${EASYRPG_READERS_PATH}/builds/cmake
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${EASYRPG_READERS_PATH}/builds/cmake)
@@ -27,13 +21,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_
@@ -27,14 +21,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_
add_definitions(
${PNG_DEFINITIONS}
-
-D UNIX=1
- -D USE_SDL=1)
-
-if(CMAKE_GENERATOR MATCHES "Makefile")
- add_definitions(-fno-rtti)
-endif()
+ -D USE_SDL=1
+ -pthread)
-if(CMAKE_GENERATOR MATCHES "Makefile")
- add_definitions(-fno-rtti)
-endif()
-
# wine checking
find_program(WINE_EXECUTABLE wine)
if(EXISTS ${WINE_EXECUTABLE})
@@ -45,7 +35,7 @@ endif()
set(SHINONOME_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../lib/shinonome")
set(SHINONOME_SRCS "${SHINONOME_PATH}/gothic.cxx" "${SHINONOME_PATH}/mincho.cxx")
include_directories(${SHINONOME_PATH})
-find_package(Ruby)
+find_package(Ruby 1.8)
if(RUBY_FOUND)
set(SHINONOME_GENERATOR "${SHINONOME_PATH}/generate_cxx_font.rb")
add_custom_command(
@@ -132,7 +122,7 @@ endif()
add_library(${PROJECT_NAME}_Static STATIC ${SRCS})
# RTP Table
-find_package(Ruby)
+find_package(Ruby 1.8)
if(RUBY_FOUND)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/../../src/rtp_table_bom.h"