From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F4116138AC9 for ; Mon, 18 Feb 2013 00:36:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8069BE056C; Mon, 18 Feb 2013 00:36:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 019FAE056C for ; Mon, 18 Feb 2013 00:36:29 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E579633DC18 for ; Mon, 18 Feb 2013 00:36:28 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2322) id A4A0A2171E; Mon, 18 Feb 2013 00:36:27 +0000 (UTC) From: "Julian Ospald (hasufell)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hasufell@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in games-emulation/yabause/files: yabause-0.9.12-cmake.patch yabause-0.9.12-RWX.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: yabause-0.9.12-cmake.patch yabause-0.9.12-RWX.patch X-VCS-Directories: games-emulation/yabause/files X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130218003627.A4A0A2171E@flycatcher.gentoo.org> Date: Mon, 18 Feb 2013 00:36:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bd6fd127-7f0a-4328-8a9a-e2703d0128e0 X-Archives-Hash: f42bb290037baebe6b25a7dcfeefb1bc 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 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