diff options
author | 2012-08-04 15:29:51 +0000 | |
---|---|---|
committer | 2012-08-04 15:29:51 +0000 | |
commit | ec0fbb105762d3adf7369963878506f43634ad42 (patch) | |
tree | a298e3cbeb17e4c5119c93d8635375c538a1f7f7 /games-board/cockatrice/files | |
parent | Version bump (diff) | |
download | historical-ec0fbb105762d3adf7369963878506f43634ad42.tar.gz historical-ec0fbb105762d3adf7369963878506f43634ad42.tar.bz2 historical-ec0fbb105762d3adf7369963878506f43634ad42.zip |
initial commit based on ebuild of Alexander Berntsen
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'games-board/cockatrice/files')
-rw-r--r-- | games-board/cockatrice/files/cockatrice-20120702-build.patch | 75 | ||||
-rw-r--r-- | games-board/cockatrice/files/cockatrice-20120702-underlinking.patch | 29 |
2 files changed, 104 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..f374bac5a618 --- /dev/null +++ b/games-board/cockatrice/files/cockatrice-20120702-build.patch @@ -0,0 +1,75 @@ +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 + +--- 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 +@@ -201,6 +201,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,9 +223,9 @@ + + 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 ${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 share/cockatrice/translations) + ENDIF(NOT WIN32 AND NOT APPLE) + +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu Aug 2 22:50:59 UTC 2012 +Subject: + +--- 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( |