Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package MyGUI for openSUSE:Factory checked in at 2022-01-19 00:35:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MyGUI (Old) and /work/SRC/openSUSE:Factory/.MyGUI.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MyGUI" Wed Jan 19 00:35:12 2022 rev:7 rq:947139 version:3.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/MyGUI/MyGUI.changes 2021-11-03 17:27:14.737369372 +0100 +++ /work/SRC/openSUSE:Factory/.MyGUI.new.1892/MyGUI.changes 2022-01-19 00:35:34.974307080 +0100 @@ -1,0 +2,29 @@ +Sun Dec 19 16:48:27 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Update to version 3.4.1 + * Implement new MSDF font + * Add new eventWidgetDestroyed + * Add support for custom shaders for each render item + * Add support for Unicode code points outside of the + Basic Multilingual Plane + * Allow std::function in the MyGUI::newDelegate + * Allow const functions and const classes in the MyGUI::newDelegate + * Some bug fixes + * Widgets + * Some bug fixes in ListBox and EditBox + * Button: make Button without "normal_checked" skin display + "pushed" skin + * Window: add borders snapping, when resizing it + * Platform Ogre: + * make it possible to use OGRE_RESOURCEMANAGER_STRICT=1 mode + * use Ogre::Renderable to render Gui, this fixes several issues + with recent Ogre version + * LayoutEditor: fix multi language support +- Update MyGUI-install-libCommon.patch +- Add 0001-Fix-linking-with-Wl-no-undefined.patch +- Drop upstream fixed MyGUI-lib_suffix.patch, + MyGUI-gcc47-visibility.patch, + MyGUI-libs-versioning.patch +- Add rpmlintrc + +------------------------------------------------------------------- Old: ---- MyGUI-gcc47-visibility.patch MyGUI-lib_suffix.patch MyGUI-libs-versioning.patch MyGUI3.4.0.tar.gz New: ---- 0001-Fix-linking-with-Wl-no-undefined.patch MyGUI-rpmlintrc MyGUI3.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MyGUI.spec ++++++ --- /var/tmp/diff_new_pack.KzD4Im/_old 2022-01-19 00:35:36.130307906 +0100 +++ /var/tmp/diff_new_pack.KzD4Im/_new 2022-01-19 00:35:36.134307909 +0100 @@ -18,9 +18,9 @@ %define capname MYGUI -%define _sover 3_4_0 +%define _sover 3_4_1 Name: MyGUI -Version: 3.4.0 +Version: 3.4.1 Release: 0 Summary: A GUI library for Ogre Rendering Engine License: MIT @@ -28,14 +28,11 @@ URL: http://mygui.info/ Source: https://github.com/MyGUI/mygui/archive/MyGUI%{version}.tar.gz Source1: %{name}.png -# PATCH-FIX-UPSTREAM MyGUI-lib_suffix.patch -Patch0: %{name}-lib_suffix.patch -# PATCH-FIX-UPSTREAM MyGUI-gcc47-visibility.patch -Patch1: %{name}-gcc47-visibility.patch -# PATCH-FEATURE-OPENSUSE MyGUI-libs-versioning.patch -- Add versioning to libs; Upstream seems uninterested: https://github.com/MyGUI/mygui/issues/157 -Patch2: MyGUI-libs-versioning.patch -# PATCH-FEATURE-OPENSUSE MyGUI-install-libCommon.patch -- Use cmake to install libCommon -Patch3: MyGUI-install-libCommon.patch +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 BuildRequires: cmake BuildRequires: dejavu BuildRequires: dos2unix @@ -47,8 +44,6 @@ BuildRequires: libX11-devel BuildRequires: libboost_system-devel BuildRequires: ogre-devel -# MyGUI wants to copy plugins.cfg installed by ogre-demos -BuildRequires: ogre-demos BuildRequires: pkgconfig BuildRequires: unzip BuildRequires: update-desktop-files @@ -92,6 +87,16 @@ This package contains the shared library for package MyGUI. +%package -n libMyGUICommon%{_sover} +Summary: Shared library for MyGUI +Group: System/Libraries + +%description -n libMyGUICommon%{_sover} +MyGUI is a library for creating Graphical User Interfaces (GUIs) +for games and 3D applications. + +This package contains the shared library used by most MyGUI tools and demos. + %package tools Summary: Tools applications for MyGUI Group: Development/Tools/GUI Builders @@ -107,6 +112,7 @@ Summary: Development files for MyGUI Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Requires: libMyGUICommon%{_sover} = %{version} Requires: libMyGUIEngine%{_sover} = %{version} Requires: libOIS-devel Requires: libOgreMain-devel @@ -137,24 +143,19 @@ %autopatch -p1 %build -# this is probably an error in OGRE packaging... but let's just fix the build. -export OGRE_LIBRARIES="`pkg-config --libs OGRE` -lboost_system" %cmake \ + -DMYGUI_STATIC=OFF \ + -DMYGUI_USE_FREETYPE=ON \ + -DMYGUI_BUILD_PLUGINS=ON \ + -DMYGUI_BUILD_TOOLS=ON \ + -DMYGUI_BUILD_WRAPPER=OFF \ + -DMYGUI_INSTALL_TOOLS=ON \ + -DMYGUI_INSTALL_DEMOS=ON \ + -DMYGUI_INSTALL_DOCS=ON \ + -DMYGUI_INSTALL_MEDIA=ON \ + -DMYGUI_FULL_RPATH=OFF \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_BUILD_TYPE=release \ - -DOGRE_LIBRARIES="$OGRE_LIBRARIES" \ - -DMYGUI_STATIC=FALSE \ - -DMYGUI_USE_FREETYPE=TRUE \ - -DMYGUI_BUILD_SAMPLES=TRUE \ - -DMYGUI_BUILD_PLUGINS=TRUE \ - -DMYGUI_BUILD_TOOLS=TRUE \ - -DMYGUI_BUILD_WRAPPER=FALSE \ - -DMYGUI_INSTALL_SAMPLES=TRUE \ - -DMYGUI_INSTALL_TOOLS=TRUE \ - -DMYGUI_INSTALL_DOCS=TRUE \ - -DMYGUI_INSTALL_MEDIA=TRUE \ - -DMYGUI_INSTALL_SAMPLES_SOURCE=TRUE \ - -DMYGUI_FULL_RPATH=FALSE \ - -DCMAKE_SKIP_RPATH=TRUE \ -DOGRE_CONFIG_DIR=%{_datadir}/OGRE %cmake_build @@ -252,15 +253,12 @@ %post -n libMyGUIEngine%{_sover} -p /sbin/ldconfig %postun -n libMyGUIEngine%{_sover} -p /sbin/ldconfig -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post -n libMyGUICommon%{_sover} -p /sbin/ldconfig +%postun -n libMyGUICommon%{_sover} -p /sbin/ldconfig %files %doc README.md %license COPYING.MIT -%{_bindir}/%{name}.sh -%{_libdir}/lib*.so.* -%exclude %{_libdir}/libMyGUIEngine.so.* %{_libdir}/Plugin_*.so %{_datadir}/%{capname}/ %exclude %{_datadir}/%{capname}/Media/Demos/ @@ -277,11 +275,15 @@ %files -n libMyGUIEngine%{_sover} %{_libdir}/libMyGUIEngine.so.* +%files -n libMyGUICommon%{_sover} +%{_libdir}/libMyGUICommon.so.* + %files demo %{_bindir}/%{name}-Demo_* %{_datadir}/%{capname}/Media/Demos/ %files tools +%{_bindir}/%{name}.sh %{_bindir}/FontEditor %{_bindir}/ImageEditor %{_bindir}/LayoutEditor ++++++ 0001-Fix-linking-with-Wl-no-undefined.patch ++++++ >From 4bd1332d39cfd3d42030f96903c18d8d0847f768 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen <[email protected]> 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 ++++++ MyGUI-install-libCommon.patch ++++++ --- /var/tmp/diff_new_pack.KzD4Im/_old 2022-01-19 00:35:36.178307940 +0100 +++ /var/tmp/diff_new_pack.KzD4Im/_new 2022-01-19 00:35:36.182307942 +0100 @@ -1,11 +1,73 @@ -Index: mygui-MyGUI3.4.0/Common/CMakeLists.txt -=================================================================== ---- mygui-MyGUI3.4.0.orig/Common/CMakeLists.txt -+++ mygui-MyGUI3.4.0/Common/CMakeLists.txt -@@ -173,3 +173,5 @@ if(NOT WIN32) - include_directories(${X11_INCLUDE_DIR}) - endif(UNIX AND NOT APPLE) - endif() -+ -+mygui_install_target(${PROJECTNAME} "") +From 4a53f10e0260c30a38824f843b32a6d809dcc08e Mon Sep 17 00:00:00 2001 +From: Ferdinand Thiessen <[email protected]> +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 + ++++++ MyGUI-rpmlintrc ++++++ # This is a template not a devel file addFilter("MyGUI-tools.*: E: devel-file-in-non-devel-package") ++++++ MyGUI3.4.0.tar.gz -> MyGUI3.4.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/MyGUI/MyGUI3.4.0.tar.gz /work/SRC/openSUSE:Factory/.MyGUI.new.1892/MyGUI3.4.1.tar.gz differ: char 13, line 1
