Attachment 102368 Details for Bug 142152 – file.diff

[patch] file.diff

file.diff (text/plain), 1.97 KB, created by Barbara on 2009-12-30 01:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Barbara

Created: 2009-12-30 01:10:04 UTC

Size: 1.97 KB

patch

obsolete

>--- Makefile.orig	2009-12-13 00:50:06.000000000 +0100
>+++ Makefile	2009-12-30 00:33:53.000000000 +0100
>@@ -26,8 +26,6 @@
> RUN_DEPENDS=	${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois \
> 		xset:${PORTSDIR}/x11/xset
> 
>-BROKEN=		does not build
>-
> USE_ZIP=	yes
> USE_XORG=	x11 xt xaw sm ice xext
> WRKSRC=		${WRKDIR}/${PORTNAME}-source-${PORTVERSION}/build
>@@ -79,6 +77,12 @@
> 		${WRKSRC}/configurator/CMakeLists.txt
> .endif
> 
>+post-configure:
>+#	@${REINPLACE_CMD} -e 's/-pthread;-D_THREAD_SAFE //; \
>+	@${REINPLACE_CMD} -e 's/;-D_THREAD_SAFE//; \
>+			s/-isystem /-I/g' \
>+		${WRKSRC}/configurator/CMakeFiles/rorconfig.dir/flags.make
>+
> do-install:
> # libs
> 	${MKDIR} ${PREFIX}/lib/${PORTNAME}
>--- files/patch-configurator-CMakeLists.txt.orig	2009-08-14 01:45:26.000000000 +0200
>+++ files/patch-configurator-CMakeLists.txt	2009-12-30 00:06:42.000000000 +0100
>@@ -1,6 +1,16 @@
>---- configurator/CMakeLists.txt.orig	2009-06-25 22:30:12.000000000 +0400
>-+++ configurator/CMakeLists.txt	2009-08-13 19:19:37.000000000 +0400
>-@@ -27,9 +27,10 @@
>+--- configurator/CMakeLists.txt.orig	2009-06-25 22:30:12.000000000 +0200
>++++ configurator/CMakeLists.txt	2009-12-30 00:04:55.000000000 +0100
>+@@ -12,8 +12,7 @@
>+ 
>+ FIND_PACKAGE(wxWidgets COMPONENTS base core html net)
>+ IF(wxWidgets_FOUND)
>+-  include_directories(${wxWidgets_INCLUDE_DIRS})
>+-  add_definitions(${wxWidgets_DEFINITIONS} ${wxWidgets_CXX_FLAGS})
>++  include(${wxWidgets_USE_FILE})
>+ 
>+   IF(WIN32)
>+     include_directories(${wxWidgets_INCLUDE_DIRS}/msvc)
>+@@ -27,9 +26,10 @@
>    link_directories (${wxWidgets_LIB_DIR})
>    include_directories (${RoR_Dependencies_SOURCE_DIR}/rorserver-sf/source)
>    include_directories (${RoR_Dependencies_SOURCE_DIR}/ogrenew/OgreMain/include)
>@@ -13,7 +23,7 @@
>  
>    SET(config_source ${config_source} ${RoR_SOURCE_DIR}/main/source/InputEngine.cpp)
>  
>-@@ -48,7 +49,7 @@
>+@@ -48,7 +48,7 @@
>  
>    add_executable(rorconfig ${config_source} ${config_headers} ${config_res})
>    TARGET_LINK_LIBRARIES(rorconfig ${wxWidgets_LIBRARIES} )

Actions: View | Diff

Attachments on bug 142152: 102368