Accepting request 1132065 from home:dlshcbmuipmam:branches:games
Version bump to 3.4.3 OBS-URL: https://build.opensuse.org/request/show/1132065 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=30
This commit is contained in:
Dirk Stoecker
Git OBS Bridge
parent
83a771b08d
commit
5385062929
@ -1,42 +0,0 @@
|
||||
From 4bd1332d39cfd3d42030f96903c18d8d0847f768 Mon Sep 17 00:00:00 2001
|
||||
From: Ferdinand Thiessen <rpm@fthiessen.de>
|
||||
Date: Mon, 20 Dec 2021 00:44:24 +0100
|
||||
Subject: [PATCH] Fix linking with -Wl,--no-undefined
|
||||
|
||||
---
|
||||
CMake/Packages/FindSDL2.cmake | 6 ++++++
|
||||
Common/CMakeLists.txt | 2 +-
|
||||
2 files changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake
|
||||
index ca4d209c4..4261f0efd 100644
|
||||
--- a/CMake/Packages/FindSDL2.cmake
|
||||
+++ b/CMake/Packages/FindSDL2.cmake
|
||||
@@ -97,5 +97,11 @@ IF(NOT SDL2_FOUND)
|
||||
VERSION_VAR SDL2_VERSION_STRING)
|
||||
|
||||
mark_as_advanced(SDL2_INCLUDE_DIR SDL2_LIBRARY)
|
||||
+ add_library(SDL2::Main INTERFACE IMPORTED)
|
||||
+ set_target_properties(
|
||||
+ SDL2::Main PROPERTIES
|
||||
+ INTERFACE_LINK_LIBRARIES "${SDL2_LIBRARY}"
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
|
||||
+ )
|
||||
CMAKE_POLICY(POP)
|
||||
ENDIF(NOT SDL2_FOUND)
|
||||
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
|
||||
index 1340f4373..18953e5a0 100644
|
||||
--- a/Common/CMakeLists.txt
|
||||
+++ b/Common/CMakeLists.txt
|
||||
@@ -99,7 +99,7 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
|
||||
|
||||
mygui_set_platform_name(${MYGUI_RENDERSYSTEM})
|
||||
add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
|
||||
-target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
|
||||
+target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform SDL2::Main)
|
||||
if (MYGUI_INSTALL_TOOLS OR MYGUI_INSTALL_DEMOS)
|
||||
set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION "${MYGUI_VERSION_MAJOR}.${MYGUI_VERSION_MINOR}.${MYGUI_VERSION_PATCH}")
|
||||
mygui_install_target(${PROJECTNAME} "")
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
From 4a53f10e0260c30a38824f843b32a6d809dcc08e Mon Sep 17 00:00:00 2001
|
||||
From: Ferdinand Thiessen <rpm@fthiessen.de>
|
||||
Date: Mon, 20 Dec 2021 02:01:19 +0100
|
||||
Subject: [PATCH 2/3] Install libMyGUICommon if tools or demos are installed,
|
||||
fixes #157
|
||||
|
||||
---
|
||||
CMake/Utils/MyGUIConfigTargets.cmake | 8 ++++----
|
||||
Common/CMakeLists.txt | 6 +++++-
|
||||
2 files changed, 9 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
|
||||
index 8fb1ce43f..dc7618e67 100644
|
||||
--- a/CMake/Utils/MyGUIConfigTargets.cmake
|
||||
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
|
||||
@@ -173,13 +173,13 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER)
|
||||
endif ()
|
||||
set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
|
||||
|
||||
- add_dependencies(${PROJECTNAME} MyGUIEngine Common)
|
||||
+ add_dependencies(${PROJECTNAME} MyGUIEngine MyGUICommon)
|
||||
|
||||
mygui_config_sample(${PROJECTNAME})
|
||||
|
||||
# link Common, Platform and MyGUIEngine
|
||||
target_link_libraries(${PROJECTNAME}
|
||||
- Common
|
||||
+ MyGUICommon
|
||||
)
|
||||
|
||||
if (NOT EMSCRIPTEN)
|
||||
@@ -285,12 +285,12 @@ function(mygui_dll PROJECTNAME SOLUTIONFOLDER)
|
||||
|
||||
mygui_config_lib(${PROJECTNAME})
|
||||
|
||||
- add_dependencies(${PROJECTNAME} MyGUIEngine Common)
|
||||
+ add_dependencies(${PROJECTNAME} MyGUIEngine MyGUICommon)
|
||||
|
||||
mygui_config_sample(${PROJECTNAME})
|
||||
|
||||
target_link_libraries(${PROJECTNAME}
|
||||
- Common
|
||||
+ MyGUICommon
|
||||
)
|
||||
|
||||
if (NOT EMSCRIPTEN)
|
||||
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
|
||||
index 2b160ff05..1340f4373 100644
|
||||
--- a/Common/CMakeLists.txt
|
||||
+++ b/Common/CMakeLists.txt
|
||||
@@ -3,7 +3,7 @@ function(mygui_add_base_manager_include PLATFORM_ID)
|
||||
include_directories(../../Common/Base/${MYGUI_PLATFORM_NAME})
|
||||
endfunction(mygui_add_base_manager_include)
|
||||
|
||||
-set (PROJECTNAME Common)
|
||||
+set (PROJECTNAME MyGUICommon)
|
||||
|
||||
include_directories(
|
||||
.
|
||||
@@ -100,5 +100,9 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
|
||||
mygui_set_platform_name(${MYGUI_RENDERSYSTEM})
|
||||
add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
|
||||
target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
|
||||
+if (MYGUI_INSTALL_TOOLS OR MYGUI_INSTALL_DEMOS)
|
||||
+ set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION "${MYGUI_VERSION_MAJOR}.${MYGUI_VERSION_MINOR}.${MYGUI_VERSION_PATCH}")
|
||||
+ mygui_install_target(${PROJECTNAME} "")
|
||||
+endif()
|
||||
|
||||
add_dependencies(${PROJECTNAME} MyGUIEngine)
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,3 +1,51 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 8 01:19:24 UTC 2023 - Adriankhl <adrian.k.h.lai@outlook.com>
|
||||
|
||||
- Update version 3.4.3
|
||||
* Core
|
||||
* Allow passing lambdas into MyGUI::newDelegate without explicitly wrapping them into std::function
|
||||
* Widgets
|
||||
* Add missing eventClipboardChanged when trying to cut/copy with no text selected
|
||||
* Fixed rare crash when changing widget style after it was clicked in the same frame
|
||||
* Fixed TabItem left disabled when rapidly switching between tabs
|
||||
* Improve performance of the TabControl tabs switching
|
||||
* Fixed ignoring "FontHeight" property when "FontName" is also set
|
||||
* Move MyGUI::DEFAULT to deprecated, add TabControl::DEFAULT_WIDTH instead
|
||||
* Platforms
|
||||
* Fix build with Ogre 14
|
||||
* Tools
|
||||
* Minor fixes for macOS
|
||||
* Use macOS Command key in tools
|
||||
# Other
|
||||
* Switch to C++17
|
||||
* Use string_view, unique_ptr and some other stuff
|
||||
* Various code improvements, including range base for migration and some other minor stuff
|
||||
* Add some missing MYGUI_DONT_USE_OBSOLETE checks for deprecated stuff
|
||||
* Remove MYGUI_DEBUG_MODE from headers to avoid issues with mixed debug/release builds
|
||||
* Core
|
||||
* Add missing MYGUI_EXPORT for ControllerRepeatClick (was not linking in non-static builds)
|
||||
* Use commands for key combinations on EditBox, provide macOS proper bindings
|
||||
* Add support for string_view in UString
|
||||
* Widgets
|
||||
* ComboBox and ListBox: make "AddItem" use LanguageManager::replaceTags same way it is done for caption properties
|
||||
* EditBox: Allow text input while holding Ctrl (Allow key combinations involving CTRL that produce printable characters)
|
||||
* Platforms
|
||||
* OpenGL: Fix build with libX11-free wayland setup
|
||||
* Ogre: Correct vertex color order for ogre 13
|
||||
* Demos and Tools
|
||||
* Use SDL_WINDOWEVENT_FOCUS_GAINED/SDL_WINDOWEVENT_FOCUS_LOST events for better detection when window should have low FPS
|
||||
* Fix macOS resources paths, do not use MACOSX_BUNDLE
|
||||
* Fix various deprecated or incorrect resources usage
|
||||
* Other
|
||||
* Add missing MYGUI_EXPORT to fix C4275 warnings
|
||||
* Various minor build fixes and improvements
|
||||
* Enable more warnings in MYGUI_HIGH_LEVEL_WARNINGS mode
|
||||
* Use GNUInstallDirs to install includes
|
||||
- Remove mygui-add-missing-include.patch
|
||||
- Remove MyGUI-install-libCommon.patch
|
||||
- Remove 0001-Fix-linking-with-Wl-no-undefined.patch
|
||||
- Add MYGUI_DONT_USE_OBSOLETE=ON setting
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 26 13:54:31 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
||||
11
MyGUI.spec
11
MyGUI.spec
@ -18,9 +18,9 @@
|
||||
|
||||
|
||||
%define capname MYGUI
|
||||
%define _sover 3_4_1
|
||||
%define _sover 3_4_3
|
||||
Name: MyGUI
|
||||
Version: 3.4.1
|
||||
Version: 3.4.3
|
||||
Release: 0
|
||||
Summary: A GUI library for Ogre Rendering Engine
|
||||
License: MIT
|
||||
@ -29,12 +29,6 @@ URL: http://mygui.info/
|
||||
Source: https://github.com/MyGUI/mygui/archive/MyGUI%{version}.tar.gz
|
||||
Source1: %{name}.png
|
||||
Source99: %{name}-rpmlintrc
|
||||
# PATCH-FIX-UPSTREAM MyGUI-install-libCommon.patch -- https://github.com/MyGUI/mygui/pull/233
|
||||
Patch0: MyGUI-install-libCommon.patch
|
||||
# PATCH-FIX-UPSTREAM 0001-Fix-linking-with-Wl-no-undefined.patch -- https://github.com/MyGUI/mygui/pull/232
|
||||
Patch1: 0001-Fix-linking-with-Wl-no-undefined.patch
|
||||
# PATCH-FIX-UPSTREAM mygui-add-missing-include.patch -- Add missing include
|
||||
Patch2: mygui-add-missing-include.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: dejavu
|
||||
BuildRequires: dos2unix
|
||||
@ -155,6 +149,7 @@ This subpackage contains the development documentation for MyGUI.
|
||||
-DMYGUI_INSTALL_DEMOS=ON \
|
||||
-DMYGUI_INSTALL_DOCS=ON \
|
||||
-DMYGUI_INSTALL_MEDIA=ON \
|
||||
-DMYGUI_DONT_USE_OBSOLETE=ON \
|
||||
-DMYGUI_FULL_RPATH=OFF \
|
||||
-DCMAKE_SKIP_RPATH=ON \
|
||||
-DCMAKE_BUILD_TYPE=release \
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bdf730bdeb4ad89e6b8223967db01aa5274d2b93adc2c0d6aa4842faeed4de1a
|
||||
size 22433198
|
||||
3
MyGUI3.4.3.tar.gz
Normal file
3
MyGUI3.4.3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:33c91b531993047e77cace36d6fea73634b8c17bd0ed193d4cd12ac7c6328abd
|
||||
size 18797995
|
||||
@ -1,12 +0,0 @@
|
||||
Index: mygui-MyGUI3.4.1/MyGUIEngine/include/MyGUI_Types.h
|
||||
===================================================================
|
||||
--- mygui-MyGUI3.4.1.orig/MyGUIEngine/include/MyGUI_Types.h
|
||||
+++ mygui-MyGUI3.4.1/MyGUIEngine/include/MyGUI_Types.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <vector>
|
||||
#include <map>
|
||||
#include <string>
|
||||
+#include <cstdint>
|
||||
|
||||
#include "MyGUI_Align.h"
|
||||
#include "MyGUI_TPoint.h"
|
||||
Loading…
Reference in New Issue
Block a user