Permalink
Browse files

remove no-suffix patch

we just rename the binaries which are not referenced in the code anyway
since we do not want to rename the libs we can just install them using
globs
  • Loading branch information...
1 parent 99cf343 commit a46f8a41367c3d2c42eba533f259c6f572d8157f hasufell committed May 7, 2012
View
5 games-fps/unvanquished/Manifest
@@ -1,9 +1,8 @@
AUX config/maprotation.cfg.example 276 RMD160 4d48391de805287bcdbcaa64e43b4161887cf808 SHA1 e000e741e5c64ca8b0e2980a97881a95666c0da9 SHA256 5a054d08e1b9a8cd1a000b978f16b64e9398eccb83e196e2d42cf7849f53319a
AUX config/server.cfg.example 1024 RMD160 ec2dcad8c7e7bd22e27761e7075e0f31d2d3b325 SHA1 505ea11fc2570089a1f043f7ad05800016a95954 SHA256 8dd30ba7626df2c5b8332cbf87e04ea87a7c895ca9294839ccd9fe991ed688fd
-AUX unvanquished-0.3.5-cmake.patch 9579 RMD160 11a77369b96fc61b422a3913db01af6ae7e32f51 SHA1 7b117e3b2ef7525381c1c3c56bde6159d5a2754a SHA256 77c517eb8c983b7717010f6b7026b9f13402432f6498a1284bcda4e7e6648915
-AUX unvanquished-0.3.5-nosuffix.patch 818 RMD160 659ba5a68deb6883369330d39fc41fc4b79b368c SHA1 23e07720960ee944c5c22feb95ccf4042a7d3012 SHA256 ba9a453e163a67040830beaef6ac197d2666af11a1abca891bdc1752e99e8644
+AUX unvanquished-0.3.5-cmake.patch 8401 RMD160 221ab152671bca7c2a1574b5808d38d2298b154e SHA1 172399ac04414bffaa37a9069ace243472cbe031 SHA256 f7c8357c023aa67c264b2013d005fb8551b4e31e44cb8ec03e86088c0dc8e451
AUX unvanquished-server.sh 221 RMD160 ec9cf6992ac2a2b9235db11acb15b3a62b83783e SHA1 1c0ab638df154760c3bf72407c628d407bad57bd SHA256 71551c079964295c2ce170f8738bae6d42f0c0d2d54fbe405c96b1ed39b6e18e
AUX unvanquished.sh 194 RMD160 0e9cb71b6f02ea1561221f4067aa50f932978285 SHA1 240b92cc953bdf54635b7a7c7702946f1a010036 SHA256 b6c5b8811bada06a66536b5782801a8d895d6ab4dd90f3a3e1190521fcab4e1a
DIST unvanquished-0.3.5.tar.gz 86175170 RMD160 a6d9738079f6497cd54a8f3ca679899112c05161 SHA1 42a9d6240c0398aa1db2be0c66926e92e6085a6e SHA256 7a8df48bc1c46511bf9c730d2ea1d46cd4a235e33f6e8425bfc7dba462601249
-EBUILD unvanquished-0.3.5.ebuild 3658 RMD160 0bed4d87fdd3d614b8eba14a01792f8122734584 SHA1 4912ad25a0f742bbb19bec20b9ed4b1c6fc74669 SHA256 3b8e6dc48d1186d40731d5d6529d9e0dde0043604aaad3c586e5c52b1fed98c1
+EBUILD unvanquished-0.3.5.ebuild 3647 RMD160 ca7c4f034023c013e69fac6df44c6242046e31db SHA1 55d6fd29597d4f1acf4a25ab8603cfde5f5c7b68 SHA256 de1292b8e3f720d3b5fad650bae540ca7f3bd1cd52cd303d90768b496bb3dfdf
MISC metadata.xml 1274 RMD160 47f1419402699fc362f1009cc017ac89f20c6ff7 SHA1 9e94a83300281d40383382cf26e50d27ded8db32 SHA256 0c06bb947598d5a8992e596eb95fcfc481bfff7473e3f2b3160d404bbf0c2b07
View
20 games-fps/unvanquished/files/unvanquished-0.3.5-cmake.patch
@@ -3,7 +3,7 @@ Date: Sun May 6 22:02:13 UTC 2012
Subject: build system
unset hardcoded install-destinations
-remove arch suffixes
+remove arch suffixes for binaries to avoid trouble within the ebuild
respect flags
--- CMakeLists.txt
@@ -172,24 +172,6 @@ respect flags
)
endif()
-@@ -1161,7 +1046,7 @@
- # Setup target renderer
- add_library( renderer SHARED ${RENDERERLIST} ${MOUNT_DIR}/engine/sys/sdl_glimp.c ${MOUNT_DIR}/engine/sys/sdl_gamma.c ${SHAREDLIST} )
- set_property( TARGET renderer PROPERTY COMPILE_DEFINITIONS BUILD_FREETYPE USE_REFENTITY_ANIMATIONSYSTEM )
-- set_target_properties( renderer PROPERTIES OUTPUT_NAME "rendererGL${BUILD_ARCH}" )
-+ set_target_properties( renderer PROPERTIES OUTPUT_NAME "rendererGL" )
- target_link_libraries( renderer m )
-
- # This section finds and provides REQUIRED dependencies to target renderer
-@@ -1192,7 +1077,7 @@
- # Setup target rendererGL
- add_library( rendererGL SHARED ${SHAREDLIST} ${OPENEXRLIST} ${RENDERERGLLIST} ${MOUNT_DIR}/engine/sys/sdl_glimp.c ${MOUNT_DIR}/engine/sys/sdl_gamma.c )
- set_property( TARGET rendererGL PROPERTY COMPILE_DEFINITIONS BUILD_FREETYPE FT_FREETYPE USE_XREAL_RENDERER USE_REFENTITY_ANIMATIONSYSTEM )
-- set_target_properties( rendererGL PROPERTIES OUTPUT_NAME "rendererGL3${BUILD_ARCH}" )
-+ set_target_properties( rendererGL PROPERTIES OUTPUT_NAME "rendererGL3" )
- target_link_libraries( rendererGL ${OS_LIBRARIES} )
-
- # This section finds and provides REQUIRED dependencies to target rendererGL
@@ -1255,11 +1140,11 @@
include_directories( ${MOUNT_DIR}/libs/cpuinfo ${NEWTON_INCLUDES} )
target_link_libraries( client ${OS_LIBRARIES} ${NEWTON_LIBRARY} )
View
24 games-fps/unvanquished/files/unvanquished-0.3.5-nosuffix.patch
@@ -1,24 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun May 6 23:14:59 UTC 2012
-Subject:
-
---- src/engine/client/cl_main.c
-+++ src/engine/client/cl_main.c
-@@ -4661,7 +4661,7 @@
-
- #if !defined( REF_HARD_LINKED )
-
-- Com_sprintf( dllName, sizeof( dllName ), "%s/" DLL_PREFIX "renderer%s" ARCH_STRING DLL_EXT, fn, renderer );
-+ Com_sprintf( dllName, sizeof( dllName ), "%s/" DLL_PREFIX "renderer%s" DLL_EXT, fn, renderer );
-
- Com_Printf( "Loading \"%s\"...", dllName );
-
-@@ -4670,7 +4670,7 @@
- Com_Printf( "failed:\n\"%s\"\n", Sys_LibraryError() );
-
- //fall back to default
-- Com_sprintf( dllName, sizeof( dllName ), "%s/" DLL_PREFIX "rendererGL" ARCH_STRING DLL_EXT, fn );
-+ Com_sprintf( dllName, sizeof( dllName ), "%s/" DLL_PREFIX "rendererGL" DLL_EXT, fn );
-
- Com_Printf( "Loading \"%s\"...", dllName );
-
View
2 games-fps/unvanquished/unvanquished-0.3.5.ebuild
@@ -61,7 +61,7 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-{cmake,nosuffix}.patch
+ epatch "${FILESDIR}"/${P}-cmake.patch
# set paths
sed \

0 comments on commit a46f8a4

Please sign in to comment.