* [gentoo-commits] gentoo-x86 commit in games-emulation/yabause/files: yabause-0.9.12-cmake.patch yabause-0.9.12-RWX.patch
@ 2013-02-18 0:36 Julian Ospald (hasufell)
0 siblings, 0 replies; only message in thread
From: Julian Ospald (hasufell) @ 2013-02-18 0:36 UTC (permalink / raw
To: gentoo-commits
hasufell 13/02/18 00:36:27
Added: yabause-0.9.12-cmake.patch yabause-0.9.12-RWX.patch
Log:
version bump wrt #452298
(Portage version: 2.2.0_alpha162/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Revision Changes Path
1.1 games-emulation/yabause/files/yabause-0.9.12-cmake.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.12-cmake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.12-cmake.patch?rev=1.1&content-type=text/plain
Index: yabause-0.9.12-cmake.patch
===================================================================
From: Julian Ospald <hasufell@gentoo.org>
Date: Mon Feb 18 00:04:44 UTC 2013
Subject: build system
make bindir translation dir modifiable
--- yabause-0.9.12/src/gtk/CMakeLists.txt
+++ yabause-0.9.12/src/gtk/CMakeLists.txt
@@ -59,7 +59,10 @@
yab_port_success(yabause-gtk)
configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
-install(TARGETS yabause-gtk DESTINATION "bin")
+# paths
+set(BINDIR "bin" CACHE STRING "dir to binary")
+
+install(TARGETS yabause-gtk DESTINATION ${BINDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
install(FILES "yabause.png" DESTINATION "share/pixmaps")
--- yabause-0.9.12/src/qt/CMakeLists.txt
+++ yabause-0.9.12/src/qt/CMakeLists.txt
@@ -184,6 +184,9 @@
yab_port_success(yabause-qt)
configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
+# paths
+set(BINDIR "bin" CACHE STRING "dir to binary")
+
if (WIN32)
install(TARGETS yabause-qt DESTINATION ".")
if (GLUT_FOUND)
@@ -208,8 +211,8 @@
install(FILES ${Mingw_Path}/mingwm10.dll DESTINATION ".")
endif ()
else ()
- install(TARGETS yabause-qt DESTINATION "bin")
+ install(TARGETS yabause-qt DESTINATION ${BINDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
install(FILES "resources/icons/yabause.png" DESTINATION "share/pixmaps")
-endif ()
\ No newline at end of file
+endif ()
--- yabause-0.9.12/l10n/CMakeLists.txt
+++ yabause-0.9.12/l10n/CMakeLists.txt
@@ -2,9 +2,12 @@
set(LANGS de es fr it lt pt pt_BR sv)
+# paths
+set(TRANSDIR "share/yabause/yts" CACHE STRING "dir to translation files")
+
if (UNIX AND NOT APPLE)
foreach(LANG ${LANGS})
- install(FILES "yabause_${LANG}.yts" DESTINATION "share/yabause/yts" RENAME "${LANG}.yts")
+ install(FILES "yabause_${LANG}.yts" DESTINATION ${TRANSDIR} RENAME "${LANG}.yts")
endforeach()
elseif (WIN32)
foreach(LANG ${LANGS})
1.1 games-emulation/yabause/files/yabause-0.9.12-RWX.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.12-RWX.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-emulation/yabause/files/yabause-0.9.12-RWX.patch?rev=1.1&content-type=text/plain
Index: yabause-0.9.12-RWX.patch
===================================================================
http://www.gentoo.org/proj/en/hardened/gnu-stack.xml
--- src/sh2_dynarec/linkage_x64.s
+++ src/sh2_dynarec/linkage_x64.s
@@ -747,3 +747,7 @@
ret
/* Set breakpoint here for debugging */
.size breakpoint, .-breakpoint
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
--- src/sh2_dynarec/linkage_x86.s
+++ src/sh2_dynarec/linkage_x86.s
@@ -743,3 +743,7 @@
ret
/* Set breakpoint here for debugging */
.size breakpoint, .-breakpoint
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-18 0:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-18 0:36 [gentoo-commits] gentoo-x86 commit in games-emulation/yabause/files: yabause-0.9.12-cmake.patch yabause-0.9.12-RWX.patch Julian Ospald (hasufell)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox