diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-board/cockatrice/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-board/cockatrice/files')
-rw-r--r-- | games-board/cockatrice/files/cockatrice-20120702-build.patch | 103 | ||||
-rw-r--r-- | games-board/cockatrice/files/cockatrice-20120702-underlinking.patch | 29 |
2 files changed, 132 insertions, 0 deletions
diff --git a/games-board/cockatrice/files/cockatrice-20120702-build.patch b/games-board/cockatrice/files/cockatrice-20120702-build.patch new file mode 100644 index 000000000000..6876fcd78d42 --- /dev/null +++ b/games-board/cockatrice/files/cockatrice-20120702-build.patch @@ -0,0 +1,103 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu Aug 2 21:27:25 UTC 2012 +Subject: build system + +add install rule for cockatrice binary +make paths for ICONDIR and DESKTOPDIR modifiable + +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -8,7 +8,9 @@ + add_subdirectory(oracle) + endif(NOT WITHOUT_CLIENT) + ++set(DATADIR "share/cockatrice" CACHE PATH "Data dir") ++ + FILE(GLOB sounds "${CMAKE_CURRENT_SOURCE_DIR}/sounds/*.raw") +-INSTALL(FILES ${sounds} DESTINATION share/cockatrice/sounds) ++INSTALL(FILES ${sounds} DESTINATION ${DATADIR}/sounds) + FILE(GLOB zonebg "${CMAKE_CURRENT_SOURCE_DIR}/zonebg/*.*") +-INSTALL(FILES ${zonebg} DESTINATION share/cockatrice/zonebg) +\ No newline at end of file ++INSTALL(FILES ${zonebg} DESTINATION ${DATADIR}/zonebg) +--- servatrice/CMakeLists.txt ++++ servatrice/CMakeLists.txt +@@ -2,6 +2,9 @@ + SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + PROJECT(servatrice) + ++# cmake modules ++include(GNUInstallDirs) ++ + SET(servatrice_SOURCES + src/main.cpp + src/passwordhasher.cpp +@@ -51,3 +54,5 @@ + COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/../common/getversion.cmake + ) + ++# install rules ++INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/servatrice DESTINATION ${CMAKE_INSTALL_BINDIR}) +--- cockatrice/CMakeLists.txt ++++ cockatrice/CMakeLists.txt +@@ -158,7 +158,13 @@ + ) + + if (UNIX AND NOT APPLE) +- set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/cockatrice/translations\\") ++ if(IS_ABSOLUTE ${DATADIR}) ++ set(_DATADIR ${DATADIR}) ++ else() ++ set(_DATADIR ${CMAKE_INSTALL_PREFIX}/${DATADIR}) ++ endif() ++ ++ set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"${_DATADIR}/translations\\") + endif (UNIX AND NOT APPLE) + + set(cockatrice_RESOURCES cockatrice.qrc) +@@ -201,6 +207,11 @@ + set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -O0") + set(CMAKE_CXX_FLAGS_RELEASE "-s -O2") + ++# paths ++set(ICONDIR share/icons CACHE STRING "icon dir") ++set(DESKTOPDIR share/applications CACHE STRING "desktop file destination") ++ ++ + QT4_WRAP_CPP(cockatrice_HEADERS_MOC ${cockatrice_HEADERS}) + QT4_ADD_TRANSLATION(cockatrice_QM ${cockatrice_TS}) + QT4_ADD_RESOURCES(cockatrice_RESOURCES_RCC ${cockatrice_RESOURCES}) +@@ -218,10 +229,10 @@ + + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin) + if (NOT WIN32 AND NOT APPLE) +- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION share/icons/hicolor/48x48/apps) +- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION share/icons/hicolor/scalable/apps) +- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION share/applications) +- INSTALL(FILES ${cockatrice_QM} DESTINATION share/cockatrice/translations) ++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.png DESTINATION ${ICONDIR}/hicolor/48x48/apps) ++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/cockatrice.svg DESTINATION ${ICONDIR}/hicolor/scalable/apps) ++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cockatrice.desktop DESTINATION ${DESKTOPDIR}) ++ INSTALL(FILES ${cockatrice_QM} DESTINATION ${DATADIR}/translations) + ENDIF(NOT WIN32 AND NOT APPLE) + + add_custom_command( +--- oracle/CMakeLists.txt ++++ oracle/CMakeLists.txt +@@ -1,6 +1,9 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + PROJECT(oracle) + ++# paths ++set(DESKTOPDIR share/appliactions CACHE STRING "path to .desktop files") ++ + SET(oracle_SOURCES src/main.cpp src/oracleimporter.cpp src/window_main.cpp ../cockatrice/src/carddatabase.cpp ../cockatrice/src/settingscache.cpp) + SET(oracle_HEADERS src/oracleimporter.h src/window_main.h ../cockatrice/src/carddatabase.h ../cockatrice/src/settingscache.h) + +@@ -21,5 +24,5 @@ + + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/oracle DESTINATION bin) + IF (NOT WIN32 AND NOT APPLE) +- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION share/applications) ++ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR}) + ENDIF (NOT WIN32 AND NOT APPLE) diff --git a/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch b/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch new file mode 100644 index 000000000000..2117751c1cf5 --- /dev/null +++ b/games-board/cockatrice/files/cockatrice-20120702-underlinking.patch @@ -0,0 +1,29 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu Aug 2 22:12:00 UTC 2012 +Subject: underlinking + +add -lpthread to cockatrice amd servatrice LIBS to support linkers that +don't permit underlinking + +--- cockatrice/CMakeLists.txt ++++ cockatrice/CMakeLists.txt +@@ -219,7 +219,7 @@ + INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR}) + + ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_HEADERS_MOC}) +-TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY}) ++TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${QT_LIBRARIES} ${QT_MOBILITY_MULTIMEDIAKIT_LIBRARY} -lpthread) + + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cockatrice DESTINATION bin) + if (NOT WIN32 AND NOT APPLE) +--- servatrice/CMakeLists.txt ++++ servatrice/CMakeLists.txt +@@ -46,7 +46,7 @@ + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + + ADD_EXECUTABLE(servatrice ${servatrice_SOURCES} ${servatrice_HEADERS_MOC}) +-TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${LIBGCRYPT_LIBRARY}) ++TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${QT_LIBRARIES} ${LIBGCRYPT_LIBRARY} -lpthread) + + #add_custom_target(versionheader ALL DEPENDS version_header) + add_custom_command( |