diff options
| author |   Stefan Strogin <steils@gentoo.org> | 2021-11-16 10:03:02 +0200 |
|---|---|---|
| committer | Stefan Strogin <steils@gentoo.org> | 2021-11-16 08:06:59 +0000 |
| commit | ee601735af93825f6a1e7d693d0e9c67bc78a453 (patch) | |
| tree | bc796551a706990c5d9e283227ed2331d1b4aecd /dev-games/mygui/files | |
| parent | dev-games/mygui: upgrade to 3.4.1 (diff) | |
| download | gentoo-ee601735af93825f6a1e7d693d0e9c67bc78a453.tar.gz gentoo-ee601735af93825f6a1e7d693d0e9c67bc78a453.tar.bz2 gentoo-ee601735af93825f6a1e7d693d0e9c67bc78a453.zip | |
dev-games/mygui: drop old 3.4.0
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stefan Strogin <steils@gentoo.org>
Diffstat (limited to 'dev-games/mygui/files')
| -rw-r--r-- | dev-games/mygui/files/mygui-3.4.0-build.patch | 61 | ||||
| -rw-r--r-- | dev-games/mygui/files/mygui-3.4.0-underlinking.patch | 21 |
2 files changed, 0 insertions, 82 deletions
diff --git a/dev-games/mygui/files/mygui-3.4.0-build.patch b/dev-games/mygui/files/mygui-3.4.0-build.patch deleted file mode 100644 index 71ed87d8bcb8..000000000000 --- a/dev-games/mygui/files/mygui-3.4.0-build.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake ---- a/CMake/ConfigureBuild.cmake -+++ b/CMake/ConfigureBuild.cmake -@@ -4,6 +4,8 @@ - # also prepare package files for pkg-config and CMake. - ####################################################################### - -+include(GNUInstallDirs) -+ - # should we build static libs? - if (MYGUI_STATIC) - set(MYGUI_LIB_TYPE STATIC) -@@ -47,7 +49,7 @@ if (UNIX) - else () - configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY) - endif () -- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig) -+ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - # configure additional packages - -diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake ---- a/CMake/Utils/MyGUIConfigTargets.cmake -+++ b/CMake/Utils/MyGUIConfigTargets.cmake -@@ -1,6 +1,8 @@ - # Configure settings and install targets - # FIXME: Copypasted from Ogre and need lots of changes - -+include(GNUInstallDirs) -+ - if (WIN32) - set(MYGUI_RELEASE_PATH "/Release") - set(MYGUI_RELWDBG_PATH "/RelWithDebInfo") -@@ -32,6 +34,12 @@ endif () - - # install targets according to current build type - function(mygui_install_target TARGETNAME SUFFIX) -+ install(TARGETS ${TARGETNAME} -+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" CONFIGURATIONS Gentoo "" -+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo "" -+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo "" -+ FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Gentoo "" -+ ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" - LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -@@ -183,7 +191,13 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER) - endif () - add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) - endif () -- set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER}) -+ -+ # rename demo target -+ if (${SOLUTIONFOLDER} STREQUAL "Demos") -+ set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER} OUTPUT_NAME MYGUI-${PROJECTNAME}) -+ else() -+ set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER}) -+ endif() - - add_dependencies(${PROJECTNAME} MyGUIEngine Common) - diff --git a/dev-games/mygui/files/mygui-3.4.0-underlinking.patch b/dev-games/mygui/files/mygui-3.4.0-underlinking.patch deleted file mode 100644 index 1dcf2dbbbfda..000000000000 --- a/dev-games/mygui/files/mygui-3.4.0-underlinking.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Fri Jun 15 10:42:42 UTC 2012 -Subject: build system - -fix underlinking - -diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt ---- a/MyGUIEngine/CMakeLists.txt -+++ b/MyGUIEngine/CMakeLists.txt -@@ -44,7 +44,10 @@ if (MYGUI_USE_FREETYPE) - target_link_libraries(${PROJECTNAME} - ${FREETYPE_LIBRARIES} - ${ZLIB_LIBRARIES} -- ) -+ dl) -+else() -+ target_link_libraries(${PROJECTNAME} -+ dl) - endif() - - # platform specific dependencies |