From 57f5d39961ba1ec14d28757f5e9c48da52c4a2de Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Wed, 4 Apr 2012 21:40:08 -0500 Subject: [PATCH 01/75] Rebuild for ogre 1.7.4 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 95b9cf0..32006c3 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.0.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -255,6 +255,9 @@ rm -rf %{buildroot} %changelog +* Wed Apr 04 2012 Bruno Wolff III - 3.0.1-14 +- Rebuild for ogre 1.7.4 + * Tue Feb 28 2012 Fedora Release Engineering - 3.0.1-13 - Rebuilt for c++ ABI breakage From 569e660d23ffeebca7f0043940651769fe2e99d8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 22:25:26 -0500 Subject: [PATCH 02/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 32006c3..2b31510 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.0.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -255,6 +255,9 @@ rm -rf %{buildroot} %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 3.0.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Apr 04 2012 Bruno Wolff III - 3.0.1-14 - Rebuild for ogre 1.7.4 From e4009adf46c5d71ace5311d7deb41bfaa0214af3 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 10 Aug 2012 13:11:08 -0500 Subject: [PATCH 03/75] Rebuild for boost 1.50 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 2b31510..ba3f51a 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.0.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -255,6 +255,9 @@ rm -rf %{buildroot} %changelog +* Fri Aug 10 2012 Bruno Wolff III - 3.0.1-16 +- Rebuild for boost 1.50 + * Fri Jul 20 2012 Fedora Release Engineering - 3.0.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 361343a0ab2b17101c14cee0c94a0a3ae53bd73d Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 12:06:50 -0600 Subject: [PATCH 04/75] Initial shot at updating to 3.2.0 --- .gitignore | 1 + mygui.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 89bcb18..c44b84d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ mygui-2.3.0-2332svn.tar.bz2 /MyGUI_3.0.1_source.zip +/MyGUI_3.2.0.zip diff --git a/mygui.spec b/mygui.spec index ba3f51a..b560ff7 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui -Version: 3.0.1 -Release: 16%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -255,6 +255,10 @@ rm -rf %{buildroot} %changelog +* Tue Dec 04 2012 Bruno Wolff III - 3.2.0-1 +- Update to upstream 3.2.0 +- Changelog: http://redmine.mygui.info/repositories/entry/mygui/tags/MyGUI3.2/ChangeLog.txt + * Fri Aug 10 2012 Bruno Wolff III - 3.0.1-16 - Rebuild for boost 1.50 diff --git a/sources b/sources index 985dcbd..d0b5cdd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e9e82bf60081be58fea3f64d32e2ab3a MyGUI_3.0.1_source.zip +7c20486a0db82f497d8b7c5300613b61 MyGUI_3.2.0.zip From db9f0c2307ea933f984502e15823e8b809db2e18 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 12:12:15 -0600 Subject: [PATCH 05/75] Fix a couple of changelog dates to be legal --- mygui.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mygui.spec b/mygui.spec index b560ff7..dedcbbc 100644 --- a/mygui.spec +++ b/mygui.spec @@ -277,7 +277,7 @@ rm -rf %{buildroot} * Fri Jan 13 2012 Fedora Release Engineering - 3.0.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Fri Nov 20 2011 Bruno Wolff III - 3.0.1-10 +* Sun Nov 20 2011 Bruno Wolff III - 3.0.1-10 - Rebuild for boost soname bump * Fri Jul 22 2011 Bruno Wolff III - 3.0.1-9 @@ -324,7 +324,7 @@ rm -rf %{buildroot} - Fix includes dir - Remove plugin -* Fri Oct 13 2009 Guido Grazioli - 3.0.0-1.2332svn +* Fri Oct 23 2009 Guido Grazioli - 3.0.0-1.2332svn - Upstream to svn revision 2332 - Patch cmake build scripts to support multilib - Fix package summaries From ed412e8202735868b1e6f0debe8f4674624f4b4b Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 12:15:21 -0600 Subject: [PATCH 06/75] Fix a couple of explicit references to the old version --- mygui.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mygui.spec b/mygui.spec index dedcbbc..117fd18 100644 --- a/mygui.spec +++ b/mygui.spec @@ -6,7 +6,7 @@ Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) License: LGPLv3+ URL: http://mygui.info/ -Source0: http://downloads.sourceforge.net/my-gui/MyGUI_3.0.1_source.zip +Source0: http://downloads.sourceforge.net/my-gui/MyGUI_3.2.0.zip # Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples Source1: MyGUI-Demos # Another helper for the tools @@ -89,7 +89,7 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep -%setup -q -n MyGUI3.0 +%setup -q %patch0 -p0 %patch1 -p0 %patch2 -p0 From 76f3a7f37174024f910ec1e984330be099af5a01 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 12:22:47 -0600 Subject: [PATCH 07/75] Set the build directory to match current archive name --- mygui.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mygui.spec b/mygui.spec index 117fd18..ed4eac5 100644 --- a/mygui.spec +++ b/mygui.spec @@ -6,7 +6,7 @@ Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) License: LGPLv3+ URL: http://mygui.info/ -Source0: http://downloads.sourceforge.net/my-gui/MyGUI_3.2.0.zip +Source0: http://downloads.sourceforge.net/my-gui/MyGUI_%{version}.zip # Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples Source1: MyGUI-Demos # Another helper for the tools @@ -89,7 +89,7 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep -%setup -q +%setup -n MyGUI_%{version} %patch0 -p0 %patch1 -p0 %patch2 -p0 From de0152c12fb59acfa42969ad9c48bd2df3e8116a Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 13:43:13 -0600 Subject: [PATCH 08/75] Make it easier to figure out patch issues --- mygui.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mygui.spec b/mygui.spec index ed4eac5..77a0c1a 100644 --- a/mygui.spec +++ b/mygui.spec @@ -90,11 +90,11 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep %setup -n MyGUI_%{version} -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -%patch4 -p1 +%patch0 -p0 -b multilib +%patch1 -p0 -b headers +%patch2 -p0 -b threadlibs +%patch3 -p0 -b poco +%patch4 -p1 -b pc # Fix eol sed -i 's/\r//' COPYING.LESSER # Fix non-UTF8 files From 36e84e4fac8f075a204aa3d5d4b0939507d77512 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 13:44:49 -0600 Subject: [PATCH 09/75] Make the patch labels standout more --- mygui.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mygui.spec b/mygui.spec index 77a0c1a..65119ac 100644 --- a/mygui.spec +++ b/mygui.spec @@ -90,11 +90,11 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep %setup -n MyGUI_%{version} -%patch0 -p0 -b multilib -%patch1 -p0 -b headers -%patch2 -p0 -b threadlibs -%patch3 -p0 -b poco -%patch4 -p1 -b pc +%patch0 -p0 -b .multilib +%patch1 -p0 -b .headers +%patch2 -p0 -b .threadlibs +%patch3 -p0 -b .poco +%patch4 -p1 -b .pc # Fix eol sed -i 's/\r//' COPYING.LESSER # Fix non-UTF8 files From 25510858117cd8cd588c06e4b3c786b000c732aa Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 14:33:31 -0600 Subject: [PATCH 10/75] Fix up mutlilib_cflags patch --- mygui_multilib_cflags.patch | 149 ++++++++++++++++++------------------ 1 file changed, 76 insertions(+), 73 deletions(-) diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch index 4420ff9..9d45f04 100644 --- a/mygui_multilib_cflags.patch +++ b/mygui_multilib_cflags.patch @@ -1,74 +1,78 @@ ---- CMakeLists.txt.orig 2011-01-03 01:50:52.000000000 -0600 -+++ CMakeLists.txt 2011-01-03 02:06:08.000000000 -0600 +--- CMakeLists.txt.multilib 2012-12-04 13:45:07.742668108 -0600 ++++ CMakeLists.txt 2012-12-04 14:14:21.062506043 -0600 @@ -85,8 +85,8 @@ - set(MYGUI_LIBRARIES MyGUIEngine) - - # Specify build paths --set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) --set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) -+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) -+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) - if (WIN32 OR APPLE) - if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -@@ -139,18 +139,18 @@ - # Set compiler specific build flags - if (CMAKE_COMPILER_IS_GNUCXX) - add_definitions(-fdiagnostics-show-option) -- add_definitions(-msse) -+# add_definitions(-msse) - if (MYGUI_RENDERSYSTEM EQUAL 2) - # to avoid warnings from OGRE sources -- add_definitions(-isystem ${OGRE_INCLUDE_DIR}) -+# add_definitions(-isystem ${OGRE_INCLUDE_DIR}) - endif () - # very interesting option, but way too many warnings - #add_definitions(-Weffc++) -- add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter) -+# add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter) - #add_definitions(-pedantic) - - # MyGUI_UString.h ignored from warnings because of this -- add_definitions(-Wshadow) -+# add_definitions(-Wshadow) - endif () - - if (MSVC) ---- CMake/ConfigureBuild.cmake.orig 2011-01-03 02:08:15.000000000 -0600 -+++ CMake/ConfigureBuild.cmake 2011-01-03 02:06:36.000000000 -0600 -@@ -44,7 +44,7 @@ - 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 lib${LIB_SUFFIX}/pkgconfig) - - # configure additional packages - ---- CMake/Utils/MyGUIConfigTargets.cmake.orig 2011-01-03 02:08:44.000000000 -0600 -+++ CMake/Utils/MyGUIConfigTargets.cmake 2011-01-03 02:12:12.000000000 -0600 -@@ -38,14 +38,14 @@ - function(mygui_install_target TARGETNAME SUFFIX) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - FRAMEWORK DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - FRAMEWORK DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo - ) - install(TARGETS ${TARGETNAME} ---- CMake/Templates/MYGUI.pc.in.orig 2011-01-03 02:12:38.000000000 -0600 -+++ CMake/Templates/MYGUI.pc.in 2011-01-03 02:15:43.000000000 -0600 -@@ -1,11 +1,12 @@ + set(MYGUI_LIBRARIES MyGUIEngine) + + # Specify build paths +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) + if (WIN32 OR APPLE) + if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +@@ -178,13 +178,13 @@ + + # Set compiler specific build flags + if (CMAKE_COMPILER_IS_GNUCXX) +- add_definitions(-msse) ++# add_definitions(-msse) + if (NOT MYGUI_HIGH_LEVEL_WARNINGS) + add_definitions(-w) + else () + if (MYGUI_RENDERSYSTEM EQUAL 2) + # to avoid warnings from OGRE +- add_definitions(-isystem ${OGRE_INCLUDE_DIR}) ++# add_definitions(-isystem ${OGRE_INCLUDE_DIR}) + endif () + if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) + # to avoid warnings from OIS +@@ -195,11 +195,11 @@ + endif () + # very interesting option, but way too many warnings + #add_definitions(-Weffc++) +- add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter) +- add_definitions(-pedantic) ++# add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter) ++# add_definitions(-pedantic) + + # MyGUI_UString.h ignored from warnings because of this +- add_definitions(-Wshadow) ++# add_definitions(-Wshadow) + endif () + endif () + +--- CMake/Utils/MyGUIConfigTargets.cmake.multilib 2012-12-04 13:45:07.745668489 -0600 ++++ CMake/Utils/MyGUIConfigTargets.cmake 2012-12-04 14:19:27.623468365 -0600 +@@ -57,14 +57,14 @@ + function(mygui_install_target TARGETNAME SUFFIX) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" +- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" +- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None "" + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo +- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo +- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo + ) + install(TARGETS ${TARGETNAME} +@@ -326,4 +326,4 @@ + INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) + set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) + endif () +-endfunction(mygui_config_sample) +\ No newline at end of file ++endfunction(mygui_config_sample) +--- CMake/Templates/MYGUI.pc.in.multilib 2012-12-04 13:45:07.747668743 -0600 ++++ CMake/Templates/MYGUI.pc.in 2012-12-04 14:25:52.928438645 -0600 +@@ -1,11 +1,11 @@ prefix=@MYGUI_PREFIX_PATH@ exec_prefix=${prefix} -libdir=${prefix}/lib @@ -78,9 +82,8 @@ Name: MyGUI Description: Fast, flexible and simple GUI Version: @MYGUI_VERSION@ - URL: http://www.my-gui.sourceforge.net + URL: http://mygui.info -Libs: -L${libdir} -lMyGUIEngine@MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@ -Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@ -+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.Ogr -+ePlatform @MYGUI_ADDITIONAL_LIBS@ ++Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@ +Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@ From 326929f1af075d76b2c9fb736f592a1c035e5cea Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 14:40:45 -0600 Subject: [PATCH 11/75] Missing headers patch doesn't look to be needed anymore --- mygui.spec | 3 --- mygui_missing_headers.patch | 31 ------------------------------- 2 files changed, 34 deletions(-) delete mode 100644 mygui_missing_headers.patch diff --git a/mygui.spec b/mygui.spec index 65119ac..8b24c50 100644 --- a/mygui.spec +++ b/mygui.spec @@ -17,8 +17,6 @@ Source3: resources.xml Source4: mygui-layouteditor.desktop # Fix multilib and flags with cmake Patch0: mygui_multilib_cflags.patch -# Fix compilation problems with gcc4.4 -Patch1: mygui_missing_headers.patch # Explicitly include thread library used by Ogre to avoid DSO issue Patch2: mygui-ogrethreadlibs.patch # Get find poco from ogre @@ -91,7 +89,6 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep %setup -n MyGUI_%{version} %patch0 -p0 -b .multilib -%patch1 -p0 -b .headers %patch2 -p0 -b .threadlibs %patch3 -p0 -b .poco %patch4 -p1 -b .pc diff --git a/mygui_missing_headers.patch b/mygui_missing_headers.patch deleted file mode 100644 index f66da47..0000000 --- a/mygui_missing_headers.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h.orig 2011-01-03 02:46:05.000000000 -0600 -+++ Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h 2011-01-03 02:46:51.000000000 -0600 -@@ -14,7 +14,7 @@ - #include "MyGUI_OgreRenderManager.h" - #include "MyGUI_OgreDataManager.h" - #include "MyGUI_OgreDiagnostic.h" --#include "MyGUI_OgreTexture.h" -+#include "MyGUI_LogManager.h" - - namespace MyGUI - { ---- Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h.orig 2011-01-03 02:47:54.000000000 -0600 -+++ Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h 2011-01-03 02:48:20.000000000 -0600 -@@ -13,6 +13,7 @@ - #include "MyGUI_RenderFormat.h" - #include "MyGUI_IVertexBuffer.h" - #include "MyGUI_RenderManager.h" -+#include "MyGUI_Types.h" - - #include - ---- MyGUIEngine/include/MyGUI_IRenderTarget.h.orig 2011-01-03 02:48:43.000000000 -0600 -+++ MyGUIEngine/include/MyGUI_IRenderTarget.h 2011-01-03 02:49:21.000000000 -0600 -@@ -23,6 +23,7 @@ - #ifndef __MYGUI_I_RENDER_TARGET_H__ - #define __MYGUI_I_RENDER_TARGET_H__ - -+#include - #include "MyGUI_Prerequest.h" - #include "MyGUI_RenderTargetInfo.h" - From 8e9e4c927c3c399aeab83f5a87d36e815c8c9859 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 14:45:55 -0600 Subject: [PATCH 12/75] The threadlibs patch is unusable We may need to do things some other way if the DSO problem still shows up with the new way Ogre is being brought in. --- mygui-ogrethreadlibs.patch | 35 ----------------------------------- mygui.spec | 3 --- 2 files changed, 38 deletions(-) delete mode 100644 mygui-ogrethreadlibs.patch diff --git a/mygui-ogrethreadlibs.patch b/mygui-ogrethreadlibs.patch deleted file mode 100644 index bde162d..0000000 --- a/mygui-ogrethreadlibs.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- CMake/Packages/FindOGRE.cmake.orig 2011-01-04 02:41:08.000000000 -0600 -+++ CMake/Packages/FindOGRE.cmake 2011-01-04 02:42:16.000000000 -0600 -@@ -259,6 +259,12 @@ - endif () - endif () - -+ if (NOT OGRE_DEPS_FOUND) -+ pkg_message(OGRE "Could not find all required dependencies for the Ogre package.") -+ set(OGRE_FOUND FALSE) -+ endif () -+endif () -+ - if (OGRE_CONFIG_THREADS) - if (OGRE_CONFIG_THREAD_PROVIDER EQUAL 1) - find_package(Boost COMPONENTS thread QUIET) -@@ -284,12 +290,6 @@ - endif () - endif () - -- if (NOT OGRE_DEPS_FOUND) -- pkg_message(OGRE "Could not find all required dependencies for the Ogre package.") -- set(OGRE_FOUND FALSE) -- endif () --endif () -- - if (NOT OGRE_FOUND) - return() - endif () -@@ -485,4 +485,4 @@ - find_path(OGRE_MEDIA_DIR NAMES packs/OgreCore.zip HINTS ${OGRE_MEDIA_SEARCH_PATH} - PATHS ${OGRE_PREFIX_PATH} PATH_SUFFIXES ${OGRE_MEDIA_SEARCH_SUFFIX}) - --endif () # if from line 51-56 -\ No newline at end of file -+endif () # if from line 51-56 diff --git a/mygui.spec b/mygui.spec index 8b24c50..d8cfcbf 100644 --- a/mygui.spec +++ b/mygui.spec @@ -17,8 +17,6 @@ Source3: resources.xml Source4: mygui-layouteditor.desktop # Fix multilib and flags with cmake Patch0: mygui_multilib_cflags.patch -# Explicitly include thread library used by Ogre to avoid DSO issue -Patch2: mygui-ogrethreadlibs.patch # Get find poco from ogre Patch3: mygui-add-findpoco.patch # Fix pc file issues. @@ -89,7 +87,6 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep %setup -n MyGUI_%{version} %patch0 -p0 -b .multilib -%patch2 -p0 -b .threadlibs %patch3 -p0 -b .poco %patch4 -p1 -b .pc # Fix eol From 7efcff85111f0093812d277bb767c6358c6592b4 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 14:50:14 -0600 Subject: [PATCH 13/75] Poco isn't being referred to so we can drop this patch There is a possibility that this got used indirectly from Ogre and we may need to do something about this later. --- mygui-add-findpoco.patch | 104 --------------------------------------- mygui.spec | 2 - 2 files changed, 106 deletions(-) delete mode 100644 mygui-add-findpoco.patch diff --git a/mygui-add-findpoco.patch b/mygui-add-findpoco.patch deleted file mode 100644 index 031a7a8..0000000 --- a/mygui-add-findpoco.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- /dev/null 2011-01-04 01:26:14.849718001 -0600 -+++ CMake/Packages/FindPOCO.cmake 2011-01-04 03:59:04.000000000 -0600 -@@ -0,0 +1,101 @@ -+#------------------------------------------------------------------- -+# This file is part of the CMake build system for OGRE -+# (Object-oriented Graphics Rendering Engine) -+# For the latest info, see http://www.ogre3d.org/ -+# -+# The contents of this file are placed in the public domain. Feel -+# free to make use of it in any way you like. -+#------------------------------------------------------------------- -+ -+# - Try to find POCO libraries -+# Once done, this will define -+# -+# POCO_FOUND - system has POCO -+# POCO_INCLUDE_DIRS - the POCO include directories -+# POCO_LIBRARIES - link these to use POCO -+ -+include(FindPkgMacros) -+findpkg_begin(POCO) -+ -+# Get path, convert backslashes as ${ENV_${var}} -+getenv_path(POCO_HOME) -+getenv_path(POCO_ROOT) -+getenv_path(POCO_BASE) -+ -+# construct search paths -+set(POCO_PREFIX_PATH -+ ${POCO_HOME} ${ENV_POCO_HOME} -+ ${POCO_ROOT} ${ENV_POCO_ROOT} -+ ${POCO_BASE} ${ENV_POCO_BASE} -+) -+# redo search if prefix path changed -+clear_if_changed(POCO_PREFIX_PATH -+ POCO_LIBRARY_FWK -+ POCO_LIBRARY_REL -+ POCO_LIBRARY_DBG -+ POCO_INCLUDE_DIR -+) -+ -+create_search_paths(POCO) -+set(POCO_INC_SEARCH_PATH ${POCO_INC_SEARCH_PATH} ${POCO_PREFIX_PATH}) -+ -+ -+set(POCO_LIBRARY_NAMES PocoFoundation PocoFoundationmt) -+get_debug_names(POCO_LIBRARY_NAMES) -+ -+use_pkgconfig(POCO_PKGC POCO) -+ -+findpkg_framework(POCO) -+ -+find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include) -+find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+make_library_set(POCO_LIBRARY) -+ -+findpkg_finish(POCO) -+ -+if (NOT POCO_FOUND) -+ return() -+endif () -+ -+ -+# Look for Poco's Util package -+findpkg_begin(POCO_Util) -+set(POCO_Util_LIBRARY_NAMES PocoUtil PocoUtilmt) -+get_debug_names(POCO_Util_LIBRARY_NAMES) -+find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include) -+find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+make_library_set(POCO_Util_LIBRARY) -+findpkg_finish(POCO_Util) -+ -+# Look for Poco's Net package -+findpkg_begin(POCO_Net) -+set(POCO_Net_LIBRARY_NAMES PocoNet PocoNetmt) -+get_debug_names(POCO_Net_LIBRARY_NAMES) -+find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include) -+find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+make_library_set(POCO_Net_LIBRARY) -+findpkg_finish(POCO_Net) -+ -+# Look for Poco's NetSSL package -+findpkg_begin(POCO_NetSSL) -+set(POCO_NetSSL_LIBRARY_NAMES PocoNetSSL PocoNetSSLmt) -+get_debug_names(POCO_NetSSL_LIBRARY_NAMES) -+find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include) -+find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+make_library_set(POCO_NetSSL_LIBRARY) -+findpkg_finish(POCO_NetSSL) -+ -+# Look for Poco's XML package -+findpkg_begin(POCO_XML) -+set(POCO_XML_LIBRARY_NAMES PocoXML PocoXMLmt) -+get_debug_names(POCO_XML_LIBRARY_NAMES) -+find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include) -+find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) -+make_library_set(POCO_XML_LIBRARY) -+findpkg_finish(POCO_XML) -+ diff --git a/mygui.spec b/mygui.spec index d8cfcbf..0c8992a 100644 --- a/mygui.spec +++ b/mygui.spec @@ -17,8 +17,6 @@ Source3: resources.xml Source4: mygui-layouteditor.desktop # Fix multilib and flags with cmake Patch0: mygui_multilib_cflags.patch -# Get find poco from ogre -Patch3: mygui-add-findpoco.patch # Fix pc file issues. Patch4: mygui-pc-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From f5b3633d11750ea7cfc2dab8eb420a8d1738db30 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 14:52:08 -0600 Subject: [PATCH 14/75] Don't try to use the removed patch --- mygui.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 0c8992a..405ef47 100644 --- a/mygui.spec +++ b/mygui.spec @@ -85,7 +85,6 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep %setup -n MyGUI_%{version} %patch0 -p0 -b .multilib -%patch3 -p0 -b .poco %patch4 -p1 -b .pc # Fix eol sed -i 's/\r//' COPYING.LESSER From d765e9ff01be66c13e54a3a1f72940d88de70273 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 14:58:03 -0600 Subject: [PATCH 15/75] Combine the pc-fixes patch with the multilibs_cflags patch --- mygui-pc-fixes.patch | 12 ------------ mygui.spec | 3 --- mygui_multilib_cflags.patch | 4 +--- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 mygui-pc-fixes.patch diff --git a/mygui-pc-fixes.patch b/mygui-pc-fixes.patch deleted file mode 100644 index 3572d62..0000000 --- a/mygui-pc-fixes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur MyGUI3.0.orig/CMake/Templates/MYGUI.pc.in MyGUI3.0/CMake/Templates/MYGUI.pc.in ---- MyGUI3.0.orig/CMake/Templates/MYGUI.pc.in 2011-05-02 16:54:18.429693639 -0600 -+++ MyGUI3.0/CMake/Templates/MYGUI.pc.in 2011-05-02 16:56:38.701732685 -0600 -@@ -7,6 +7,5 @@ - Description: Fast, flexible and simple GUI - Version: @MYGUI_VERSION@ - URL: http://www.my-gui.sourceforge.net --Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.Ogr --ePlatform @MYGUI_ADDITIONAL_LIBS@ --Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@ -+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@ -+Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@ diff --git a/mygui.spec b/mygui.spec index 405ef47..6dc64bf 100644 --- a/mygui.spec +++ b/mygui.spec @@ -17,8 +17,6 @@ Source3: resources.xml Source4: mygui-layouteditor.desktop # Fix multilib and flags with cmake Patch0: mygui_multilib_cflags.patch -# Fix pc file issues. -Patch4: mygui-pc-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake, autoconf, libtool, freetype-devel, desktop-file-utils @@ -85,7 +83,6 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep %setup -n MyGUI_%{version} %patch0 -p0 -b .multilib -%patch4 -p1 -b .pc # Fix eol sed -i 's/\r//' COPYING.LESSER # Fix non-UTF8 files diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch index 9d45f04..e873b92 100644 --- a/mygui_multilib_cflags.patch +++ b/mygui_multilib_cflags.patch @@ -72,7 +72,7 @@ +endfunction(mygui_config_sample) --- CMake/Templates/MYGUI.pc.in.multilib 2012-12-04 13:45:07.747668743 -0600 +++ CMake/Templates/MYGUI.pc.in 2012-12-04 14:25:52.928438645 -0600 -@@ -1,11 +1,11 @@ +@@ -1,10 +1,10 @@ prefix=@MYGUI_PREFIX_PATH@ exec_prefix=${prefix} -libdir=${prefix}/lib @@ -84,6 +84,4 @@ Version: @MYGUI_VERSION@ URL: http://mygui.info -Libs: -L${libdir} -lMyGUIEngine@MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@ --Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@ +Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@ -+Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@ From 34881ee36acfd7d1298ef7a80f6f689ab70179f2 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 4 Dec 2012 15:03:53 -0600 Subject: [PATCH 16/75] Missed a library when combining the patches --- mygui_multilib_cflags.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch index e873b92..cdb2b9c 100644 --- a/mygui_multilib_cflags.patch +++ b/mygui_multilib_cflags.patch @@ -70,9 +70,9 @@ -endfunction(mygui_config_sample) \ No newline at end of file +endfunction(mygui_config_sample) ---- CMake/Templates/MYGUI.pc.in.multilib 2012-12-04 13:45:07.747668743 -0600 -+++ CMake/Templates/MYGUI.pc.in 2012-12-04 14:25:52.928438645 -0600 -@@ -1,10 +1,10 @@ +--- CMake/Templates/MYGUI.pc.in.multilib 2012-12-04 14:58:50.668799275 -0600 ++++ CMake/Templates/MYGUI.pc.in 2012-12-04 15:02:40.398996802 -0600 +@@ -1,11 +1,11 @@ prefix=@MYGUI_PREFIX_PATH@ exec_prefix=${prefix} -libdir=${prefix}/lib @@ -85,3 +85,4 @@ URL: http://mygui.info -Libs: -L${libdir} -lMyGUIEngine@MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@ +Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@ + Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@ From a1a34cda3948eab8fdaf643298c90e36e3da8f3e Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 11 Dec 2012 03:24:29 -0600 Subject: [PATCH 17/75] Don't remove dropped plugin --- mygui.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/mygui.spec b/mygui.spec index 6dc64bf..2651d99 100644 --- a/mygui.spec +++ b/mygui.spec @@ -142,8 +142,6 @@ sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg -# Remove sample showing plugin usage -rm bin/Demo_PluginStrangeButton for file in bin/Demo_* ; do install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file` done From 7276c4a5a2a584bb957ea6627ed6e21a9027188a Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 11 Dec 2012 04:48:52 -0600 Subject: [PATCH 18/75] Need to use correct multilib location for MYGUI.pc --- mygui_multilib_cflags.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch index cdb2b9c..0ad8773 100644 --- a/mygui_multilib_cflags.patch +++ b/mygui_multilib_cflags.patch @@ -86,3 +86,14 @@ -Libs: -L${libdir} -lMyGUIEngine@MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@ +Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@ Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@ +--- CMake/ConfigureBuild.cmake.orig 2012-12-11 04:44:39.998238526 -0600 ++++ CMake/ConfigureBuild.cmake 2012-12-11 04:45:26.291122114 -0600 +@@ -47,7 +47,7 @@ + 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 lib${LIB_SUFFIX}/pkgconfig) + + # configure additional packages + From 58422a9ca63c024f4a89285706f7315fad0dbcc7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 26 Dec 2012 14:37:31 -0700 Subject: [PATCH 19/75] Rebuild for new libCommon --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 2651d99..78ae2c3 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -241,6 +241,9 @@ rm -rf %{buildroot} %changelog +* Wed Dec 26 2012 Kevin Fenzi 3.2.0-2 +- Rebuild for new libCommon + * Tue Dec 04 2012 Bruno Wolff III - 3.2.0-1 - Update to upstream 3.2.0 - Changelog: http://redmine.mygui.info/repositories/entry/mygui/tags/MyGUI3.2/ChangeLog.txt From d3ef4374d8af5a7eee7ec4985d06419a72808669 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sat, 9 Feb 2013 23:07:22 +0100 Subject: [PATCH 20/75] Rebuild for Boost-1.53.0 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 78ae2c3..f82d9f7 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -241,6 +241,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 09 2013 Denis Arnaud - 3.2.0-3 +- Rebuild for Boost-1.53.0 + * Wed Dec 26 2012 Kevin Fenzi 3.2.0-2 - Rebuild for new libCommon From 08d4fd4a6b45424e0e3d88b93484c7671e570ca1 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Sun, 10 Feb 2013 02:33:28 +0100 Subject: [PATCH 21/75] Rebuild for Boost-1.53.0 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index f82d9f7..b104ebc 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -241,6 +241,9 @@ rm -rf %{buildroot} %changelog +* Sun Feb 10 2013 Denis Arnaud - 3.2.0-4 +- Rebuild for Boost-1.53.0 + * Sat Feb 09 2013 Denis Arnaud - 3.2.0-3 - Rebuild for Boost-1.53.0 From 39a6140f28a43f75154845b52a7ecbebaf900454 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 25 Apr 2013 14:56:45 -0400 Subject: [PATCH 22/75] rebuild to include libCommon --- mygui-libCommon-fixup.patch | 11 +++++++++++ mygui.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 mygui-libCommon-fixup.patch diff --git a/mygui-libCommon-fixup.patch b/mygui-libCommon-fixup.patch new file mode 100644 index 0000000..55d6149 --- /dev/null +++ b/mygui-libCommon-fixup.patch @@ -0,0 +1,11 @@ +diff -up MyGUI_3.2.0/Common/CMakeLists.txt.fixup MyGUI_3.2.0/Common/CMakeLists.txt +--- MyGUI_3.2.0/Common/CMakeLists.txt.fixup 2013-04-25 14:47:11.128845465 -0400 ++++ MyGUI_3.2.0/Common/CMakeLists.txt 2013-04-25 14:47:16.497845545 -0400 +@@ -82,6 +82,7 @@ elseif(MYGUI_SAMPLES_INPUT EQUAL 3) + endif() + + add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) ++set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) + + if(MYGUI_RENDERSYSTEM EQUAL 1) + add_dependencies(${PROJECTNAME} MyGUI.DirectXPlatform) diff --git a/mygui.spec b/mygui.spec index b104ebc..b94bedb 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -17,6 +17,8 @@ Source3: resources.xml Source4: mygui-layouteditor.desktop # Fix multilib and flags with cmake Patch0: mygui_multilib_cflags.patch +# Fixup libCommon +Patch1: mygui-libCommon-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake, autoconf, libtool, freetype-devel, desktop-file-utils @@ -83,6 +85,7 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep %setup -n MyGUI_%{version} %patch0 -p0 -b .multilib +%patch1 -p1 -b .fixup # Fix eol sed -i 's/\r//' COPYING.LESSER # Fix non-UTF8 files @@ -188,6 +191,8 @@ ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \ ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \ %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf +# CMake hurts my brain. +cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ %clean rm -rf %{buildroot} @@ -241,6 +246,9 @@ rm -rf %{buildroot} %changelog +* Thu Apr 25 2013 Tom Callaway - 3.2.0-5 +- rebuild to include libCommon + * Sun Feb 10 2013 Denis Arnaud - 3.2.0-4 - Rebuild for Boost-1.53.0 From d9ca338fffc11ddfe3e92b3a0387c0ccaa3e9106 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Sun, 28 Jul 2013 20:27:49 +0200 Subject: [PATCH 23/75] Rebuild for boost 1.54.0 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index b94bedb..a6ba4c8 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -246,6 +246,9 @@ rm -rf %{buildroot} %changelog +* Sun Jul 28 2013 Petr Machata - 3.2.0-6 +- Rebuild for boost 1.54.0 + * Thu Apr 25 2013 Tom Callaway - 3.2.0-5 - rebuild to include libCommon From 4c053f7c8f78d71ee4280d4347f71f64b4d28fc7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 07:21:09 -0500 Subject: [PATCH 24/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index a6ba4c8..c04859c 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -246,6 +246,9 @@ rm -rf %{buildroot} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 3.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Sun Jul 28 2013 Petr Machata - 3.2.0-6 - Rebuild for boost 1.54.0 From 0b7d51d1138ed324364344466315ddaed0f1a7a0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 23 May 2014 11:39:54 +0200 Subject: [PATCH 25/75] rebuild for boost 1.55.0 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index c04859c..e4c3883 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -246,6 +246,9 @@ rm -rf %{buildroot} %changelog +* Fri May 23 2014 David Tardon - 3.2.0-8 +- rebuild for boost 1.55.0 + * Sat Aug 03 2013 Fedora Release Engineering - 3.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 1ad815171920199ed23dcfec1e1c39441ba808fe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 06:40:27 -0500 Subject: [PATCH 26/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index e4c3883..adcbb53 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -246,6 +246,9 @@ rm -rf %{buildroot} %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 23 2014 David Tardon - 3.2.0-8 - rebuild for boost 1.55.0 From fa1f2c9fdef61a74453ae89ec7ab01c7a28ccc3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Tue, 10 Jun 2014 16:43:02 +0200 Subject: [PATCH 27/75] Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255). - Remove BR: autoconf, automake, libtool (unused). - Remove BR: e2fsprogs-devel (unused). --- mygui.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/mygui.spec b/mygui.spec index adcbb53..260fac7 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -21,13 +21,9 @@ Patch0: mygui_multilib_cflags.patch Patch1: mygui-libCommon-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake, autoconf, libtool, freetype-devel, desktop-file-utils +BuildRequires: freetype-devel, desktop-file-utils BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix -%if 0%{?fedora} < 12 -BuildRequires: e2fsprogs-devel -%else BuildRequires: libuuid-devel -%endif Requires: dejavu-sans-fonts @@ -106,6 +102,10 @@ This package contains MyGUI demos; to run the demos, launch the helper script %{_bindir}/MyGUI-Demos EOT +%if %{?fedora} > 20 +# Fedora > 20 has freetype2/freetype.h +sed -i -e 's,freetype/freetype.h,freetype2/freetype.h,' CMake/Packages/FindFreetype.cmake +%endif %build # Plugins are windows only atm @@ -246,6 +246,11 @@ rm -rf %{buildroot} %changelog +* Tue Jun 10 2014 Ralf Corsépius - 3.2.0-10 +- Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255). +- Remove BR: autoconf, automake, libtool (unused). +- Remove BR: e2fsprogs-devel (unused). + * Sat Jun 07 2014 Fedora Release Engineering - 3.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e9d31aa3ed8c658a7d56e2d126b8b16c5ac22177 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 10:50:35 +0000 Subject: [PATCH 28/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 260fac7..42f896c 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,6 +1,6 @@ Name: mygui Version: 3.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -246,6 +246,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jun 10 2014 Ralf Corsépius - 3.2.0-10 - Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255). - Remove BR: autoconf, automake, libtool (unused). From 1f8235bf34040074029a1c76f8fa99f4f1acea7b Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 16:59:14 -0600 Subject: [PATCH 29/75] Very basic changes for 3.2.1 This is just basic stuff to get the build process started for the changes between 3.2.0 and 3.2.1. --- .gitignore | 1 + mygui-libCommon-fixup.patch | 9 ++-- mygui.spec | 26 +++++++---- mygui_multilib_cflags.patch | 93 ++++++++++++++++++++----------------- sources | 2 +- 5 files changed, 73 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index c44b84d..6c62643 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ mygui-2.3.0-2332svn.tar.bz2 /MyGUI_3.0.1_source.zip /MyGUI_3.2.0.zip +/mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz diff --git a/mygui-libCommon-fixup.patch b/mygui-libCommon-fixup.patch index 55d6149..8d7dd82 100644 --- a/mygui-libCommon-fixup.patch +++ b/mygui-libCommon-fixup.patch @@ -1,11 +1,10 @@ -diff -up MyGUI_3.2.0/Common/CMakeLists.txt.fixup MyGUI_3.2.0/Common/CMakeLists.txt ---- MyGUI_3.2.0/Common/CMakeLists.txt.fixup 2013-04-25 14:47:11.128845465 -0400 -+++ MyGUI_3.2.0/Common/CMakeLists.txt 2013-04-25 14:47:16.497845545 -0400 -@@ -82,6 +82,7 @@ elseif(MYGUI_SAMPLES_INPUT EQUAL 3) +--- Common/CMakeLists.txt.orig 2014-12-30 15:54:04.262556059 -0600 ++++ Common/CMakeLists.txt 2014-12-30 15:54:58.750481194 -0600 +@@ -89,6 +89,7 @@ endif() add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) +set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) if(MYGUI_RENDERSYSTEM EQUAL 1) - add_dependencies(${PROJECTNAME} MyGUI.DirectXPlatform) + add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform) diff --git a/mygui.spec b/mygui.spec index 42f896c..1b70617 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,12 +1,14 @@ Name: mygui -Version: 3.2.0 -Release: 11%{?dist} +Version: 3.2.1 +%global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +Release: 1%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) -License: LGPLv3+ +License: MIT URL: http://mygui.info/ -Source0: http://downloads.sourceforge.net/my-gui/MyGUI_%{version}.zip +Source0: https://github.com/MyGUI/mygui/archive/%{commit}/mygui-%{commit}.tar.gz # Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples Source1: MyGUI-Demos # Another helper for the tools @@ -18,7 +20,7 @@ Source4: mygui-layouteditor.desktop # Fix multilib and flags with cmake Patch0: mygui_multilib_cflags.patch # Fixup libCommon -Patch1: mygui-libCommon-fixup.patch +Patch1: mygui-libCommon-fixup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, desktop-file-utils @@ -79,11 +81,9 @@ An helper script MyGUI-Tools is provided and installed in %{_bindir}. %prep -%setup -n MyGUI_%{version} +%setup -qn %{name}-%{commit} %patch0 -p0 -b .multilib -%patch1 -p1 -b .fixup -# Fix eol -sed -i 's/\r//' COPYING.LESSER +%patch1 -p0 -b .fixup # Fix non-UTF8 files for file in Tools/LayoutEditor/Readme.txt ; do dos2unix -n $file timestamp && \ @@ -206,7 +206,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc COPYING.LESSER +%doc COPYING.MIT %{_libdir}/*.so.* %{_libdir}/MYGUI %dir %{_datadir}/MyGUI/Media @@ -246,6 +246,12 @@ rm -rf %{buildroot} %changelog +* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-1 +- License changed from LGPLv3 to MIT +- Source location changed from sourceforge to github +- Change log: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.1 +- Adjust patches for changes to cmake files + * Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch index 0ad8773..e9df86b 100644 --- a/mygui_multilib_cflags.patch +++ b/mygui_multilib_cflags.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.multilib 2012-12-04 13:45:07.742668108 -0600 -+++ CMakeLists.txt 2012-12-04 14:14:21.062506043 -0600 +--- CMakeLists.txt.orig 2014-08-19 14:49:43.000000000 -0500 ++++ CMakeLists.txt 2014-12-30 13:30:19.146348141 -0600 @@ -85,8 +85,8 @@ set(MYGUI_LIBRARIES MyGUIEngine) @@ -11,40 +11,32 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) if (WIN32 OR APPLE) if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -@@ -178,13 +178,13 @@ - - # Set compiler specific build flags - if (CMAKE_COMPILER_IS_GNUCXX) -- add_definitions(-msse) -+# add_definitions(-msse) - if (NOT MYGUI_HIGH_LEVEL_WARNINGS) - add_definitions(-w) +@@ -181,7 +181,7 @@ else () - if (MYGUI_RENDERSYSTEM EQUAL 2) + if (MYGUI_RENDERSYSTEM EQUAL 3) # to avoid warnings from OGRE -- add_definitions(-isystem ${OGRE_INCLUDE_DIR}) -+# add_definitions(-isystem ${OGRE_INCLUDE_DIR}) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") endif () if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) # to avoid warnings from OIS -@@ -195,11 +195,11 @@ +@@ -192,11 +192,11 @@ endif () # very interesting option, but way too many warnings #add_definitions(-Weffc++) -- add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter) -- add_definitions(-pedantic) -+# add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter) -+# add_definitions(-pedantic) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") # MyGUI_UString.h ignored from warnings because of this -- add_definitions(-Wshadow) -+# add_definitions(-Wshadow) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") endif () endif () ---- CMake/Utils/MyGUIConfigTargets.cmake.multilib 2012-12-04 13:45:07.745668489 -0600 -+++ CMake/Utils/MyGUIConfigTargets.cmake 2012-12-04 14:19:27.623468365 -0600 -@@ -57,14 +57,14 @@ +--- CMake/Utils/MyGUIConfigTargets.cmake.orig 2014-12-30 13:33:38.747716449 -0600 ++++ CMake/Utils/MyGUIConfigTargets.cmake 2014-12-30 13:42:54.115300813 -0600 +@@ -61,26 +61,26 @@ function(mygui_install_target TARGETNAME SUFFIX) install(TARGETS ${TARGETNAME} RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" @@ -63,31 +55,48 @@ FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo ) install(TARGETS ${TARGETNAME} -@@ -326,4 +326,4 @@ + RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel +- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel +- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug +- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug +- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug + ) + endfunction(mygui_install_target) +@@ -423,12 +423,12 @@ + if (MYGUI_INSTALL_PDB) + # install debug pdb files + if (MYGUI_STATIC) +- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb +- DESTINATION lib${MYGUI_LIB_DEBUG_PATH} ++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb ++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH} + CONFIGURATIONS Debug + ) +- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb +- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH} ++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb ++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH} + CONFIGURATIONS RelWithDebInfo + ) + else () +@@ -455,4 +455,4 @@ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) endif () -endfunction(mygui_config_sample) \ No newline at end of file +endfunction(mygui_config_sample) ---- CMake/Templates/MYGUI.pc.in.multilib 2012-12-04 14:58:50.668799275 -0600 -+++ CMake/Templates/MYGUI.pc.in 2012-12-04 15:02:40.398996802 -0600 -@@ -1,11 +1,11 @@ - prefix=@MYGUI_PREFIX_PATH@ - exec_prefix=${prefix} --libdir=${prefix}/lib -+libdir=${prefix}/lib@LIB_SUFFIX@ - includedir=${prefix}/include - - Name: MyGUI - Description: Fast, flexible and simple GUI - Version: @MYGUI_VERSION@ - URL: http://mygui.info --Libs: -L${libdir} -lMyGUIEngine@MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@ -+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@ - Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@ ---- CMake/ConfigureBuild.cmake.orig 2012-12-11 04:44:39.998238526 -0600 -+++ CMake/ConfigureBuild.cmake 2012-12-11 04:45:26.291122114 -0600 +--- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600 ++++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600 @@ -47,7 +47,7 @@ else () configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY) diff --git a/sources b/sources index d0b5cdd..f8ffa33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c20486a0db82f497d8b7c5300613b61 MyGUI_3.2.0.zip +7b9da3d1234aece171faa904b3856ec1 mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz From ed36140ae565bcecbe1198d60e605f756e4d3c44 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 17:03:19 -0600 Subject: [PATCH 30/75] Fix unowned directory issue --- mygui.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 1b70617..7d421b7 100644 --- a/mygui.spec +++ b/mygui.spec @@ -208,7 +208,8 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc COPYING.MIT %{_libdir}/*.so.* -%{_libdir}/MYGUI +%dir %{_libdir}/MYGUI +%dir %{_datadir}/MyGUI %dir %{_datadir}/MyGUI/Media %{_datadir}/MyGUI/Media/Common %{_datadir}/MyGUI/Media/MyGUI_Media From 23bf138de13b9636e58ada5f2d4419bcd6756b86 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 17:06:53 -0600 Subject: [PATCH 31/75] The main .so files are no longer under /usr/lib/MYGUI We used to need to install a ldconfig file for things to find the libraries, but that was pointless. When we fixed where the general libs were put we didn't remove the obsolete ldconfig file. --- mygui.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/mygui.spec b/mygui.spec index 7d421b7..5a35c81 100644 --- a/mygui.spec +++ b/mygui.spec @@ -134,10 +134,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' # Remove binaries installed in %%{_bindir} rm -rf %{buildroot}/%{_bindir}/ -# Create config for ldconfig -mkdir -p %{buildroot}/etc/ld.so.conf.d -echo "%{_libdir}/MYGUI" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf - # Install the samples mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos @@ -198,12 +194,6 @@ cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ rm -rf %{buildroot} -%post -p /sbin/ldconfig - - -%postun -p /sbin/ldconfig - - %files %defattr(-,root,root,-) %doc COPYING.MIT @@ -213,7 +203,6 @@ rm -rf %{buildroot} %dir %{_datadir}/MyGUI/Media %{_datadir}/MyGUI/Media/Common %{_datadir}/MyGUI/Media/MyGUI_Media -%config(noreplace) %{_sysconfdir}/ld.so.conf.d/* %files devel @@ -252,6 +241,8 @@ rm -rf %{buildroot} - Source location changed from sourceforge to github - Change log: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.1 - Adjust patches for changes to cmake files +- Fix unowned directory +- Remove obsolete ldconfig file * Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 9cb22f6a1310c02ad312d6ae7449042f52ebd8b5 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 17:29:09 -0600 Subject: [PATCH 32/75] The supplied tools changed ImageSetViewer was dropped. EditorFramework, ImageEditor and SkinEditor were added. --- mygui.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mygui.spec b/mygui.spec index 5a35c81..c0eaaa8 100644 --- a/mygui.spec +++ b/mygui.spec @@ -75,8 +75,7 @@ Requires: %{name} = %{version}-%{release} %description tools This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. LayoutEditor is an application for designing UIs using MyGUI library, -ImageSetViewer and FontViewer are simple tools to preview graphical -resources in the media repository. +FontViewer, ImageEditor, SkinEditor and EditorFramework are also provided. An helper script MyGUI-Tools is provided and installed in %{_bindir}. @@ -93,8 +92,9 @@ for file in Tools/LayoutEditor/Readme.txt ; do done # Generate README for -tools and -demos cat > Tools/README << EOT -This package contains the MyGUI tools: ImageSetViewer, FontViewer -and LayoutEditor; to run the tools, launch the helper script +This package contains the MyGUI tools: ImageEditor, FontViewer, +EditorFramework, SkinEditor and LayoutEditor; to run the tools, +launch the helper script %{_bindir}/MyGUI-Tools EOT cat > Demos/README << EOT @@ -154,7 +154,7 @@ sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg -for file in bin/LayoutEditor bin/ImageSetViewer bin/FontViewer ; do +for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/EditorFramework bin/FontViewer ; do install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file` done install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}/ @@ -243,6 +243,7 @@ rm -rf %{buildroot} - Adjust patches for changes to cmake files - Fix unowned directory - Remove obsolete ldconfig file +- The supplied tools changed * Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 6331d69f870b785b7092c997379f756a2d10704c Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 17:42:16 -0600 Subject: [PATCH 33/75] EditorFramework isn't built I am not sure if it is not supposed to be stand alone or if some config needs to be changed to build it. But if it isn't built by default we can live without it for now. --- mygui.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mygui.spec b/mygui.spec index c0eaaa8..6bc949a 100644 --- a/mygui.spec +++ b/mygui.spec @@ -75,7 +75,7 @@ Requires: %{name} = %{version}-%{release} %description tools This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. LayoutEditor is an application for designing UIs using MyGUI library, -FontViewer, ImageEditor, SkinEditor and EditorFramework are also provided. +FontViewer, ImageEditor and SkinEditor are also provided. An helper script MyGUI-Tools is provided and installed in %{_bindir}. @@ -93,7 +93,7 @@ done # Generate README for -tools and -demos cat > Tools/README << EOT This package contains the MyGUI tools: ImageEditor, FontViewer, -EditorFramework, SkinEditor and LayoutEditor; to run the tools, +SkinEditor and LayoutEditor; to run the tools, launch the helper script %{_bindir}/MyGUI-Tools EOT @@ -154,7 +154,7 @@ sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg -for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/EditorFramework bin/FontViewer ; do +for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/FontViewer ; do install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file` done install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}/ From 5f60801adeedc3d231e7d71643f379b95d9372ba Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 17:51:55 -0600 Subject: [PATCH 34/75] FontViewer changed to FontEditor --- mygui.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mygui.spec b/mygui.spec index 6bc949a..f88d6b3 100644 --- a/mygui.spec +++ b/mygui.spec @@ -75,7 +75,7 @@ Requires: %{name} = %{version}-%{release} %description tools This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. LayoutEditor is an application for designing UIs using MyGUI library, -FontViewer, ImageEditor and SkinEditor are also provided. +FontEditor, ImageEditor and SkinEditor are also provided. An helper script MyGUI-Tools is provided and installed in %{_bindir}. @@ -92,7 +92,7 @@ for file in Tools/LayoutEditor/Readme.txt ; do done # Generate README for -tools and -demos cat > Tools/README << EOT -This package contains the MyGUI tools: ImageEditor, FontViewer, +This package contains the MyGUI tools: ImageEditor, FontEditor, SkinEditor and LayoutEditor; to run the tools, launch the helper script %{_bindir}/MyGUI-Tools @@ -154,7 +154,7 @@ sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg -for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/FontViewer ; do +for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/FontEditor ; do install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file` done install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}/ From 4af1721faf287c38ce6b1d1b52521b693a2985be Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 21:20:07 -0600 Subject: [PATCH 35/75] Put libMyGUI.OgrePlatform.so in the normal library location --- mygui.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/mygui.spec b/mygui.spec index f88d6b3..4007839 100644 --- a/mygui.spec +++ b/mygui.spec @@ -166,12 +166,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} mkdir -p %{buildroot}%{_datadir}/MyGUI/ cp -a Media %{buildroot}%{_datadir}/MyGUI/ -# Install libMyGUI.OgrePlatform.so +# The subpackages put stuff in this directory mkdir -p %{buildroot}%{_libdir}/MYGUI -install -Dp -m 755 %{_lib}/libMyGUI.OgrePlatform.so %{buildroot}%{_libdir}/MYGUI/ - -# Move plugins to %{libdir}/MYGUI (no plugins atm) -#mv %{buildroot}%{_libdir}/libPlugin*.so %{buildroot}%{_libdir}/MYGUI # Strip away code in media dir #rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/ From aeaee77dbdd93ddcd1cdfff1a7fb0994a2b8bd1e Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 22:12:16 -0600 Subject: [PATCH 36/75] libX11-devel is now required for building I am not sure why this changed, but without this /usr/lib/X11/Xlib.h was needed, but not found. --- mygui.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 4007839..257dedd 100644 --- a/mygui.spec +++ b/mygui.spec @@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, desktop-file-utils BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix -BuildRequires: libuuid-devel +BuildRequires: libuuid-devel, libX11-devel Requires: dejavu-sans-fonts @@ -240,6 +240,7 @@ rm -rf %{buildroot} - Fix unowned directory - Remove obsolete ldconfig file - The supplied tools changed +- libX11-devel is now required for building * Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 28518b187a2ebea1b3326aeb52e17820518a8ee1 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 22:14:06 -0600 Subject: [PATCH 37/75] Obsolete BUILDROOT definition removed --- mygui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 257dedd..3da41c5 100644 --- a/mygui.spec +++ b/mygui.spec @@ -21,7 +21,6 @@ Source4: mygui-layouteditor.desktop Patch0: mygui_multilib_cflags.patch # Fixup libCommon Patch1: mygui-libCommon-fixup.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, desktop-file-utils BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix @@ -241,6 +240,7 @@ rm -rf %{buildroot} - Remove obsolete ldconfig file - The supplied tools changed - libX11-devel is now required for building +- Obsolete BUILDROOT definition removed * Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 045809f220e9c7b351a59d3d7e665ebce77f1a5b Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Tue, 30 Dec 2014 23:17:16 -0600 Subject: [PATCH 38/75] Don't use removed find option MyGUI-Demos and MyGUI-Tools used + instead of / with the -perm predicate. This no longer works and needed to be updated. --- MyGUI-Demos | 13 +++++++------ MyGUI-Tools | 11 +++++++---- mygui.spec | 5 ++++- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/MyGUI-Demos b/MyGUI-Demos index 1acee56..3777ae5 100644 --- a/MyGUI-Demos +++ b/MyGUI-Demos @@ -27,7 +27,7 @@ done set +e if [ "$1" = "-a" ]; then - for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do + for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do runSample `echo $i | sed 's|./||'` done elif [ $# -ge 1 ]; then @@ -36,13 +36,14 @@ elif [ $# -ge 1 ]; then shift done else - echo "Usage:" `basename $0` "(sample)" - echo - echo "sample - runs specified sample from list" + echo "Usage:" `basename $0` "[-a] [sample [...]]" + echo " -a : Run all samples installed to $LIBDIR/MYGUI/Demos/" + echo " sample : Run the sample(s) named 'sample' (see list bellow)" echo echo -n "Available samples:" - for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do - echo -n " $i" | sed 's|./||' + echo + for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do + echo " * $i" | sed 's|./||' done echo fi diff --git a/MyGUI-Tools b/MyGUI-Tools index bdc07fb..d9e66a4 100644 --- a/MyGUI-Tools +++ b/MyGUI-Tools @@ -27,7 +27,7 @@ done set +e if [ "$1" = "-a" ]; then - for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do + for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do runSample `echo $i | sed 's|./||'` done elif [ $# -ge 1 ]; then @@ -36,13 +36,16 @@ elif [ $# -ge 1 ]; then shift done else - echo "Usage:" `basename $0` "(tool)" + echo "Usage:" `basename $0` "[-a] [tool [...]]" + echo " -a : Run all tools installed to $LIBDIR/MYGUI/Tools/" + echo " sample : Run the tool(s) named 'tool' (see list bellow)" echo echo "tool - Runs specified tool from list" echo echo -n "Available tools:" - for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do - echo -n " $i" | sed 's|./||' + echo + for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do + echo " * $i" | sed 's|./||' done echo fi diff --git a/mygui.spec b/mygui.spec index 3da41c5..ff4ae00 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.1 %global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -231,6 +231,9 @@ rm -rf %{buildroot} %changelog +* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-2 +- Don't use removed find -perm option (+) in MyGUI-Demos and MyGUI-Tools + * Tue Dec 30 2014 Bruno Wolff III - 3.2.1-1 - License changed from LGPLv3 to MIT - Source location changed from sourceforge to github From 7f728750947ec1bb8ba199d2621e789c260867b1 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 9 Feb 2015 22:54:24 -0600 Subject: [PATCH 39/75] Rebuild for boost update --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index ff4ae00..ea04fc7 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.1 %global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -231,6 +231,9 @@ rm -rf %{buildroot} %changelog +* Mon Feb 09 2014 Bruno Wolff III - 3.2.1-3 +- Rebuild for boost update + * Tue Dec 30 2014 Bruno Wolff III - 3.2.1-2 - Don't use removed find -perm option (+) in MyGUI-Demos and MyGUI-Tools From 7ac68ce31e45cf39f0522a57f70523d2158cd776 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Mon, 9 Feb 2015 23:03:43 -0600 Subject: [PATCH 40/75] Fix year --- mygui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index ea04fc7..b5c2f9f 100644 --- a/mygui.spec +++ b/mygui.spec @@ -231,7 +231,7 @@ rm -rf %{buildroot} %changelog -* Mon Feb 09 2014 Bruno Wolff III - 3.2.1-3 +* Mon Feb 09 2015 Bruno Wolff III - 3.2.1-3 - Rebuild for boost update * Tue Dec 30 2014 Bruno Wolff III - 3.2.1-2 From 40d434eba6693209a75d7e33443b90cb18fdaaa6 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 22 May 2015 19:24:37 -0500 Subject: [PATCH 41/75] Make sure FTBFS issue is fixed mygui had recently been FTBFS but scratch builds seem to be working again. This might be related to the recent FTBFS / linking issue with Ogre. --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index b5c2f9f..1df4071 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.1 %global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -231,6 +231,9 @@ rm -rf %{buildroot} %changelog +* Fri May 22 2015 Bruno Wolff III - 3.2.1-4 +- Make sure FTBFS issue is fixed + * Mon Feb 09 2015 Bruno Wolff III - 3.2.1-3 - Rebuild for boost update From 3eec696b77697106fbc276d6ffe88dc929672fc8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 21:18:18 +0000 Subject: [PATCH 42/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 1df4071..939317c 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.1 %global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -231,6 +231,9 @@ rm -rf %{buildroot} %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 3.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri May 22 2015 Bruno Wolff III - 3.2.1-4 - Make sure FTBFS issue is fixed From 35393f8b8044368876657bed46c197458d455408 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 5 Aug 2015 18:03:27 +0100 Subject: [PATCH 43/75] Rebuilt for Boost 1.58 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 939317c..64dd5a7 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.1 %global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 5%{?dist} +Release: 6%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -231,6 +231,9 @@ rm -rf %{buildroot} %changelog +* Wed Aug 05 2015 Jonathan Wakely 3.2.1-6 +- Rebuilt for Boost 1.58 + * Wed Jun 17 2015 Fedora Release Engineering - 3.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From dcf08bdc03bcd0d2e0097497a7e32717865c7309 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 27 Aug 2015 20:47:17 +0100 Subject: [PATCH 44/75] Rebuilt for Boost 1.59 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 64dd5a7..8997b49 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.1 %global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 6%{?dist} +Release: 7%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -231,6 +231,9 @@ rm -rf %{buildroot} %changelog +* Thu Aug 27 2015 Jonathan Wakely - 3.2.1-7 +- Rebuilt for Boost 1.59 + * Wed Aug 05 2015 Jonathan Wakely 3.2.1-6 - Rebuilt for Boost 1.58 From dc3bc7470ea4a855f6d42f89dcfba3e0be5cff4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 08:57:11 +0000 Subject: [PATCH 45/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 8997b49..bf8869b 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.1 %global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 7%{?dist} +Release: 8%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -231,6 +231,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 3.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Aug 27 2015 Jonathan Wakely - 3.2.1-7 - Rebuilt for Boost 1.59 From 751429877f351a5f32584f8412dea6794d3ae4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Thu, 4 Feb 2016 15:01:16 +0100 Subject: [PATCH 46/75] Reflect freetype header location having changed (F24FTBFS). - Remove %defattr. --- mygui.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/mygui.spec b/mygui.spec index bf8869b..1532461 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.1 %global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 8%{?dist} +Release: 9%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -101,7 +101,7 @@ This package contains MyGUI demos; to run the demos, launch the helper script %{_bindir}/MyGUI-Demos EOT -%if %{?fedora} > 20 +%if (%{?fedora} > 20) && (%{?fedora} < 24) # Fedora > 20 has freetype2/freetype.h sed -i -e 's,freetype/freetype.h,freetype2/freetype.h,' CMake/Packages/FindFreetype.cmake %endif @@ -190,7 +190,6 @@ rm -rf %{buildroot} %files -%defattr(-,root,root,-) %doc COPYING.MIT %{_libdir}/*.so.* %dir %{_libdir}/MYGUI @@ -201,19 +200,16 @@ rm -rf %{buildroot} %files devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %files devel-doc -%defattr(-,root,root,-) %doc Docs/html %files demos -%defattr(-,root,root,-) %doc Demos/README %{_bindir}/MyGUI-Demos %{_libdir}/MYGUI/Demos @@ -222,7 +218,6 @@ rm -rf %{buildroot} %files tools -%defattr(-,root,root,-) %doc Tools/README Tools/LayoutEditor/Readme.txt %{_bindir}/MyGUI-Tools %{_libdir}/MYGUI/Tools @@ -231,6 +226,10 @@ rm -rf %{buildroot} %changelog +* Thu Feb 04 2016 Ralf Corsépius - 3.2.1-9 +- Reflect freetype header location having changed (F24FTBFS). +- Remove %%defattr. + * Thu Feb 04 2016 Fedora Release Engineering - 3.2.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 3592f8a994088d489d1162c72bca1524ada248f9 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 5 Mar 2016 08:06:50 -0600 Subject: [PATCH 47/75] Update to 3.2.2 --- .gitignore | 1 + mygui-libCommon-fixup.patch | 18 ++-- mygui.spec | 10 ++- mygui_multilib_cflags.patch | 164 +++++++++++++----------------------- sources | 2 +- 5 files changed, 76 insertions(+), 119 deletions(-) diff --git a/.gitignore b/.gitignore index 6c62643..8ac56fd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ mygui-2.3.0-2332svn.tar.bz2 /MyGUI_3.0.1_source.zip /MyGUI_3.2.0.zip /mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz +/mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz diff --git a/mygui-libCommon-fixup.patch b/mygui-libCommon-fixup.patch index 8d7dd82..6f3a107 100644 --- a/mygui-libCommon-fixup.patch +++ b/mygui-libCommon-fixup.patch @@ -1,10 +1,10 @@ ---- Common/CMakeLists.txt.orig 2014-12-30 15:54:04.262556059 -0600 -+++ Common/CMakeLists.txt 2014-12-30 15:54:58.750481194 -0600 +--- Common/CMakeLists.txt.orig 2016-03-05 07:17:23.175753455 -0600 ++++ Common/CMakeLists.txt 2016-03-05 07:18:03.880751014 -0600 @@ -89,6 +89,7 @@ - endif() - - add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) -+set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) - - if(MYGUI_RENDERSYSTEM EQUAL 1) - add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform) + endif() + + add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) ++set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) + + if(MYGUI_RENDERSYSTEM EQUAL 1) + add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform) diff --git a/mygui.spec b/mygui.spec index 1532461..37ea096 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,8 +1,8 @@ Name: mygui -Version: 3.2.1 -%global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 +Version: 3.2.2 +%global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 9%{?dist} +Release: 1%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -226,6 +226,10 @@ rm -rf %{buildroot} %changelog +* Sat Mar 05 2016 Bruno Wolff III - 3.2.2-1 +- mygui 3.2.2 +- Release notes: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.2 + * Thu Feb 04 2016 Ralf Corsépius - 3.2.1-9 - Reflect freetype header location having changed (F24FTBFS). - Remove %%defattr. diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch index e9df86b..e894932 100644 --- a/mygui_multilib_cflags.patch +++ b/mygui_multilib_cflags.patch @@ -1,108 +1,60 @@ ---- CMakeLists.txt.orig 2014-08-19 14:49:43.000000000 -0500 -+++ CMakeLists.txt 2014-12-30 13:30:19.146348141 -0600 +--- CMakeLists.txt.orig 2016-03-05 07:12:23.873771406 -0600 ++++ CMakeLists.txt 2016-03-05 07:15:14.743761158 -0600 @@ -85,8 +85,8 @@ - set(MYGUI_LIBRARIES MyGUIEngine) - - # Specify build paths --set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) --set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) -+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) -+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) - if (WIN32 OR APPLE) - if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -@@ -181,7 +181,7 @@ - else () - if (MYGUI_RENDERSYSTEM EQUAL 3) - # to avoid warnings from OGRE -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") - endif () - if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) - # to avoid warnings from OIS -@@ -192,11 +192,11 @@ - endif () - # very interesting option, but way too many warnings - #add_definitions(-Weffc++) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") - - # MyGUI_UString.h ignored from warnings because of this -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") - endif () - endif () - ---- CMake/Utils/MyGUIConfigTargets.cmake.orig 2014-12-30 13:33:38.747716449 -0600 -+++ CMake/Utils/MyGUIConfigTargets.cmake 2014-12-30 13:42:54.115300813 -0600 -@@ -61,26 +61,26 @@ - function(mygui_install_target TARGETNAME SUFFIX) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None "" - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel -- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug -- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug - ) - endfunction(mygui_install_target) -@@ -423,12 +423,12 @@ - if (MYGUI_INSTALL_PDB) - # install debug pdb files - if (MYGUI_STATIC) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -- DESTINATION lib${MYGUI_LIB_DEBUG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH} - CONFIGURATIONS Debug - ) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH} - CONFIGURATIONS RelWithDebInfo - ) - else () -@@ -455,4 +455,4 @@ - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) - set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) - endif () --endfunction(mygui_config_sample) -\ No newline at end of file -+endfunction(mygui_config_sample) ---- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600 -+++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600 -@@ -47,7 +47,7 @@ - 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 lib${LIB_SUFFIX}/pkgconfig) + set(MYGUI_LIBRARIES MyGUIEngine) - # configure additional packages - + # Specify build paths +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) + if (WIN32 OR APPLE) + if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +@@ -181,35 +181,35 @@ + # Set compiler specific build flags + if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") + if (NOT MYGUI_HIGH_LEVEL_WARNINGS) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") + else () + if (MYGUI_RENDERSYSTEM EQUAL 3) + # to avoid warnings from OGRE +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") + endif () + if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) + # to avoid warnings from OIS +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") + endif () + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") + # might be useful +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") + # not useful +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") + else () + # very interesting option, but way too many warnings + #add_definitions(-Weffc++) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") + if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Intel") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") + endif () + + # MyGUI_UString.h ignored from warnings because of this +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") + endif () + endif () + endif () diff --git a/sources b/sources index f8ffa33..10dc1d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b9da3d1234aece171faa904b3856ec1 mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz +3e5e63cce16192db8db0b5f8b84237d4 mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz From 67686f15ecdf8ab03d856cd3768d69bcc70536aa Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 5 Mar 2016 11:05:59 -0600 Subject: [PATCH 48/75] Fix up the multilib patch While adjusting the patch, I managed to lose some important parts. I need to put those back with some minor adjustments. --- mygui_multilib_cflags.patch | 65 +++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch index e894932..77370b4 100644 --- a/mygui_multilib_cflags.patch +++ b/mygui_multilib_cflags.patch @@ -58,3 +58,68 @@ endif () endif () endif () +--- CMake/Utils/MyGUIConfigTargets.cmake.orig 2016-03-05 10:59:52.896952810 -0600 ++++ CMake/Utils/MyGUIConfigTargets.cmake 2016-03-05 10:49:28.588990252 -0600 +@@ -61,26 +61,26 @@ + function(mygui_install_target TARGETNAME SUFFIX) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" +- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" +- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None "" + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo +- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo +- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel +- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel +- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug +- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug +- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug + ) + endfunction(mygui_install_target) +@@ -430,12 +430,12 @@ + if (MYGUI_INSTALL_PDB) + # install debug pdb files + if (MYGUI_STATIC) +- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb +- DESTINATION lib${MYGUI_LIB_DEBUG_PATH} ++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb ++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH} + CONFIGURATIONS Debug + ) +- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb +- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH} ++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb ++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH} + CONFIGURATIONS RelWithDebInfo + ) + else () +--- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600 ++++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600 +@@ -47,7 +47,7 @@ + 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 lib${LIB_SUFFIX}/pkgconfig) + + # configure additional packages + From a7e0a8977aa202b9268db47ad03989a22790b004 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 28 Jan 2017 07:30:02 +0000 Subject: [PATCH 49/75] Rebuilt for Boost 1.63 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 37ea096..de4fab6 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -226,6 +226,9 @@ rm -rf %{buildroot} %changelog +* Sat Jan 28 2017 Jonathan Wakely - 3.2.2-2 +- Rebuilt for Boost 1.63 + * Sat Mar 05 2016 Bruno Wolff III - 3.2.2-1 - mygui 3.2.2 - Release notes: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.2 From ea50b99625d2f9988043803d47bfb99913c22d3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 21:55:42 +0000 Subject: [PATCH 50/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index de4fab6..425ca87 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 2%{?dist} +Release: 3%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -226,6 +226,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Jan 28 2017 Jonathan Wakely - 3.2.2-2 - Rebuilt for Boost 1.63 From d404df21eac7ca481f3ddecc4ad7995b795e4a1f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 21 Jul 2017 09:31:54 +0200 Subject: [PATCH 51/75] Rebuilt for Boost 1.64 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 425ca87..71b5f58 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -226,6 +226,9 @@ rm -rf %{buildroot} %changelog +* Fri Jul 21 2017 Kalev Lember - 3.2.2-4 +- Rebuilt for Boost 1.64 + * Fri Feb 10 2017 Fedora Release Engineering - 3.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 2ec67a69dc6bb2d15fdf6117a2cade40476b7509 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 22:31:14 +0000 Subject: [PATCH 52/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 71b5f58..5ec0f24 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 4%{?dist} +Release: 5%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -226,6 +226,9 @@ rm -rf %{buildroot} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jul 21 2017 Kalev Lember - 3.2.2-4 - Rebuilt for Boost 1.64 From e206ce601bcff6d7ce948b62ff55254e772782e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 03:43:19 +0000 Subject: [PATCH 53/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 5ec0f24..f731cff 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 5%{?dist} +Release: 6%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -226,6 +226,9 @@ rm -rf %{buildroot} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 3.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From fdb893d6b848fd5ae553ef2fbe8d18594f2d3fdd Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 23 Jan 2018 18:01:07 +0000 Subject: [PATCH 54/75] Rebuilt for Boost 1.66 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index f731cff..06741c1 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 6%{?dist} +Release: 7%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -226,6 +226,9 @@ rm -rf %{buildroot} %changelog +* Tue Jan 23 2018 Jonathan Wakely - 3.2.2-7 +- Rebuilt for Boost 1.66 + * Thu Aug 03 2017 Fedora Release Engineering - 3.2.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 94276575cb6610bf68d4047bd81291ee2b3fed54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 03:35:56 +0000 Subject: [PATCH 55/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 06741c1..72b52ef 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 7%{?dist} +Release: 8%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -226,6 +226,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 3.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 23 2018 Jonathan Wakely - 3.2.2-7 - Rebuilt for Boost 1.66 From a66283a3127d31c4cb52dc37e1f921affc4bd129 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:22:15 +0100 Subject: [PATCH 56/75] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- mygui.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/mygui.spec b/mygui.spec index 72b52ef..096f46d 100644 --- a/mygui.spec +++ b/mygui.spec @@ -185,9 +185,6 @@ ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \ # CMake hurts my brain. cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ -%clean -rm -rf %{buildroot} - %files %doc COPYING.MIT From 9889d439b58930b3c2f324b3e229467ba79cf742 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:49 +0200 Subject: [PATCH 57/75] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- mygui.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mygui.spec b/mygui.spec index 096f46d..0eee98e 100644 --- a/mygui.spec +++ b/mygui.spec @@ -22,6 +22,7 @@ Patch0: mygui_multilib_cflags.patch # Fixup libCommon Patch1: mygui-libCommon-fixup.patch +BuildRequires: gcc-c++ BuildRequires: freetype-devel, desktop-file-utils BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix BuildRequires: libuuid-devel, libX11-devel From 83fced381971b7ce32af8bb8d07821a03752ea22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 11:14:24 +0000 Subject: [PATCH 58/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 0eee98e..99a4b09 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 8%{?dist} +Release: 9%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -224,6 +224,9 @@ cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 3.2.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 66a7954b7bcfbf84e92708412c9791c423e0c789 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 25 Jan 2019 11:32:50 +0000 Subject: [PATCH 59/75] Rebuilt for Boost 1.69 --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 99a4b09..1f30894 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 9%{?dist} +Release: 10%{?dist} Summary: Fast, simple and flexible GUI library for Ogre Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) @@ -224,6 +224,9 @@ cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ %changelog +* Fri Jan 25 2019 Jonathan Wakely - 3.2.2-10 +- Rebuilt for Boost 1.69 + * Fri Jul 13 2018 Fedora Release Engineering - 3.2.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From eea19ca1e41c11d59b77667803e551cc6002a8d3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:55 +0100 Subject: [PATCH 60/75] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- mygui.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mygui.spec b/mygui.spec index 1f30894..5b43d06 100644 --- a/mygui.spec +++ b/mygui.spec @@ -4,7 +4,6 @@ Version: 3.2.2 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Release: 10%{?dist} Summary: Fast, simple and flexible GUI library for Ogre -Group: Development/Libraries # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) License: MIT URL: http://mygui.info/ @@ -36,7 +35,6 @@ flexible and simple in using. %package devel Summary: Development files for MyGUI -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig, ois-devel, ogre-devel @@ -47,7 +45,6 @@ developing applications that use %{name}. %package devel-doc Summary: Development documentation for MyGUI -Group: Development/Libraries BuildArch: noarch %description devel-doc @@ -57,7 +54,6 @@ developing applications that use %{name}. %package demos Summary: MyGUI demo executables and media -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description demos @@ -69,7 +65,6 @@ script MyGUI-Demos is provided and installed in %{_bindir}. %package tools Summary: MyGUI tools -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description tools From e248c296e4699dbbe3f8ad8ec6cf895f6c0b685f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:47:24 +0000 Subject: [PATCH 61/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 5b43d06..1a7be7f 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 10%{?dist} +Release: 11%{?dist} Summary: Fast, simple and flexible GUI library for Ogre # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) License: MIT @@ -219,6 +219,9 @@ cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 3.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jan 25 2019 Jonathan Wakely - 3.2.2-10 - Rebuilt for Boost 1.69 From 289bf22b22dd03456edaaf624c9a02bf35d438ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 18:04:20 +0000 Subject: [PATCH 62/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 1a7be7f..8ed3c64 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 11%{?dist} +Release: 12%{?dist} Summary: Fast, simple and flexible GUI library for Ogre # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) License: MIT @@ -219,6 +219,9 @@ cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 3.2.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 3.2.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0a220028e924350e7f36551cece5a4a90403ad6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 14:23:23 +0000 Subject: [PATCH 63/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 8ed3c64..e3a57d0 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 12%{?dist} +Release: 13%{?dist} Summary: Fast, simple and flexible GUI library for Ogre # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) License: MIT @@ -219,6 +219,9 @@ cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 3.2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 3.2.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 783554a518844ac512b27caf7dbbde6dc20fb8c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:42:09 +0000 Subject: [PATCH 64/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index e3a57d0..15e7d00 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 13%{?dist} +Release: 14%{?dist} Summary: Fast, simple and flexible GUI library for Ogre # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) License: MIT @@ -219,6 +219,9 @@ cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 3.2.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 3.2.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 3a5ef1cd81d7a89c1e257aaab5ea441543eed8d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 04:37:24 +0000 Subject: [PATCH 65/75] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mygui.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 15e7d00..609af65 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 14%{?dist} +Release: 15%{?dist} Summary: Fast, simple and flexible GUI library for Ogre # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) License: MIT @@ -219,6 +219,10 @@ cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.2.2-15 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 3.2.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5b4d1825d768542965ff31b54e1a26eaa22be1e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 4 Jan 2021 10:33:29 +0100 Subject: [PATCH 66/75] Orphaned for 6+ weeks --- .gitignore | 5 - MyGUI-Demos | 49 ---- MyGUI-Tools | 51 ----- dead.package | 1 + mygui-layouteditor.desktop | 9 - mygui-libCommon-fixup.patch | 10 - mygui.spec | 435 ------------------------------------ mygui_multilib_cflags.patch | 125 ----------- resources.xml | 7 - sources | 1 - 10 files changed, 1 insertion(+), 692 deletions(-) delete mode 100644 .gitignore delete mode 100644 MyGUI-Demos delete mode 100644 MyGUI-Tools create mode 100644 dead.package delete mode 100644 mygui-layouteditor.desktop delete mode 100644 mygui-libCommon-fixup.patch delete mode 100644 mygui.spec delete mode 100644 mygui_multilib_cflags.patch delete mode 100644 resources.xml delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8ac56fd..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -mygui-2.3.0-2332svn.tar.bz2 -/MyGUI_3.0.1_source.zip -/MyGUI_3.2.0.zip -/mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz -/mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz diff --git a/MyGUI-Demos b/MyGUI-Demos deleted file mode 100644 index 3777ae5..0000000 --- a/MyGUI-Demos +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. - -runSample() -{ - sample=$1 - echo "Running $sample..." - $LIBDIR/MYGUI/Demos/$sample -} - -set -e - -# find out LIBDIR -if [ -f /usr/lib64/MYGUI/Demos/resources.xml ]; then - LIBDIR=/usr/lib64 -else - LIBDIR=/usr/lib -fi - -mkdir -p $HOME/.mygui-demos -cd $HOME/.mygui-demos - -for i in plugins.cfg resources.xml; do - cp -f $LIBDIR/MYGUI/Demos/$i . -done - -set +e - -if [ "$1" = "-a" ]; then - for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do - runSample `echo $i | sed 's|./||'` - done -elif [ $# -ge 1 ]; then - while [ $# -ge 1 ]; do - runSample $1 - shift - done -else - echo "Usage:" `basename $0` "[-a] [sample [...]]" - echo " -a : Run all samples installed to $LIBDIR/MYGUI/Demos/" - echo " sample : Run the sample(s) named 'sample' (see list bellow)" - echo - echo -n "Available samples:" - echo - for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do - echo " * $i" | sed 's|./||' - done - echo -fi diff --git a/MyGUI-Tools b/MyGUI-Tools deleted file mode 100644 index d9e66a4..0000000 --- a/MyGUI-Tools +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. - -runSample() -{ - sample=$1 - echo "Running $sample..." - $LIBDIR/MYGUI/Tools/$sample -} - -set -e - -# find out LIBDIR -if [ -f /usr/lib64/MYGUI/Tools/resources.xml ]; then - LIBDIR=/usr/lib64 -else - LIBDIR=/usr/lib -fi - -mkdir -p $HOME/.mygui-tools -cd $HOME/.mygui-tools - -for i in plugins.cfg resources.xml; do - cp -f $LIBDIR/MYGUI/Tools/$i . -done - -set +e - -if [ "$1" = "-a" ]; then - for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do - runSample `echo $i | sed 's|./||'` - done -elif [ $# -ge 1 ]; then - while [ $# -ge 1 ]; do - runSample $1 - shift - done -else - echo "Usage:" `basename $0` "[-a] [tool [...]]" - echo " -a : Run all tools installed to $LIBDIR/MYGUI/Tools/" - echo " sample : Run the tool(s) named 'tool' (see list bellow)" - echo - echo "tool - Runs specified tool from list" - echo - echo -n "Available tools:" - echo - for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do - echo " * $i" | sed 's|./||' - done - echo -fi diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/mygui-layouteditor.desktop b/mygui-layouteditor.desktop deleted file mode 100644 index 4bb4efa..0000000 --- a/mygui-layouteditor.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=MyGUI Layout Editor -GenericName=MyGUI Layout Editor -Comment=Design UIs usgin MyGUI library -Exec=MyGUI-Tools LayoutEditor -Icon=preferences-system-windows.png -Terminal=false -Type=Application -Categories=Development; diff --git a/mygui-libCommon-fixup.patch b/mygui-libCommon-fixup.patch deleted file mode 100644 index 6f3a107..0000000 --- a/mygui-libCommon-fixup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Common/CMakeLists.txt.orig 2016-03-05 07:17:23.175753455 -0600 -+++ Common/CMakeLists.txt 2016-03-05 07:18:03.880751014 -0600 -@@ -89,6 +89,7 @@ - endif() - - add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) -+set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) - - if(MYGUI_RENDERSYSTEM EQUAL 1) - add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform) diff --git a/mygui.spec b/mygui.spec deleted file mode 100644 index 609af65..0000000 --- a/mygui.spec +++ /dev/null @@ -1,435 +0,0 @@ -Name: mygui -Version: 3.2.2 -%global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 15%{?dist} -Summary: Fast, simple and flexible GUI library for Ogre -# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) -License: MIT -URL: http://mygui.info/ -Source0: https://github.com/MyGUI/mygui/archive/%{commit}/mygui-%{commit}.tar.gz -# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples -Source1: MyGUI-Demos -# Another helper for the tools -Source2: MyGUI-Tools -# Demo and tools resources configuration -Source3: resources.xml -# LayoutEditor desktop entry -Source4: mygui-layouteditor.desktop -# Fix multilib and flags with cmake -Patch0: mygui_multilib_cflags.patch -# Fixup libCommon -Patch1: mygui-libCommon-fixup.patch - -BuildRequires: gcc-c++ -BuildRequires: freetype-devel, desktop-file-utils -BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix -BuildRequires: libuuid-devel, libX11-devel - -Requires: dejavu-sans-fonts - - -%description -MyGUI is a GUI library for Ogre Rendering Engine which aims to be fast, -flexible and simple in using. - -%package devel -Summary: Development files for MyGUI -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig, ois-devel, ogre-devel - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - - -%package devel-doc -Summary: Development documentation for MyGUI -BuildArch: noarch - -%description devel-doc -The %{name}-devel-doc package contains reference documentation for -developing applications that use %{name}. - - -%package demos -Summary: MyGUI demo executables and media -Requires: %{name} = %{version}-%{release} - -%description demos -This package contains the compiled (not the source) sample applications coming -with MyGUI. It also contains some media (meshes, textures,...) needed by these -samples. The samples are installed in %{_libdir}/MYGUI/Demos, and an helper -script MyGUI-Demos is provided and installed in %{_bindir}. - - -%package tools -Summary: MyGUI tools -Requires: %{name} = %{version}-%{release} - -%description tools -This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. -LayoutEditor is an application for designing UIs using MyGUI library, -FontEditor, ImageEditor and SkinEditor are also provided. -An helper script MyGUI-Tools is provided and installed in %{_bindir}. - - -%prep -%setup -qn %{name}-%{commit} -%patch0 -p0 -b .multilib -%patch1 -p0 -b .fixup -# Fix non-UTF8 files -for file in Tools/LayoutEditor/Readme.txt ; do - dos2unix -n $file timestamp && \ - iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp && \ - touch -r timestamp $file && \ - rm timestamp -done -# Generate README for -tools and -demos -cat > Tools/README << EOT -This package contains the MyGUI tools: ImageEditor, FontEditor, -SkinEditor and LayoutEditor; to run the tools, -launch the helper script -%{_bindir}/MyGUI-Tools -EOT -cat > Demos/README << EOT -This package contains MyGUI demos; to run the demos, launch the -helper script %{_bindir}/MyGUI-Demos -EOT - -%if (%{?fedora} > 20) && (%{?fedora} < 24) -# Fedora > 20 has freetype2/freetype.h -sed -i -e 's,freetype/freetype.h,freetype2/freetype.h,' CMake/Packages/FindFreetype.cmake -%endif - -%build -# Plugins are windows only atm -%cmake . \ - -DMYGUI_INSTALL_PDB:INTERNAL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release \ - -DMYGUI_BUILD_PLUGINS:BOOL=OFF -DCMAKE_CXX_FLAGS_RELEASE= \ - -DCMAKE_SKIP_RPATH:BOOL=ON -make %{?_smp_mflags} -# Generate doxygen documentation -pushd Docs -doxygen -rm -f html/installdox -popd - - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="install -p" -# install missing headers -mkdir -p %{buildroot}/%{_includedir}/MyGUI/ -install -Dp -m 644 MyGUIEngine/include/*Alloc*.h %{buildroot}/%{_includedir}/MyGUI/ -install -Dp -m 644 Platforms/Ogre/OgrePlatform/include/* %{buildroot}/%{_includedir}/MyGUI/ - -# Remove any archive -find %{buildroot} -name '*.la' -exec rm -f {} ';' -# Remove binaries installed in %%{_bindir} -rm -rf %{buildroot}/%{_bindir}/ - -# Install the samples -mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos -cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos -sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ - %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg -sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ - %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg -for file in bin/Demo_* ; do - install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file` -done -mkdir -p %{buildroot}%{_bindir} -install -Dp -m 755 %{SOURCE1} %{buildroot}%{_bindir}/ - -# Install the tools -mkdir -p %{buildroot}%{_libdir}/MYGUI/Tools -cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Tools -sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ - %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg -sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ - %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg -for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/FontEditor ; do - install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file` -done -install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}/ - -# Install desktop entry for LayoutEditor -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} - -# Copy Media files -mkdir -p %{buildroot}%{_datadir}/MyGUI/ -cp -a Media %{buildroot}%{_datadir}/MyGUI/ - -# The subpackages put stuff in this directory -mkdir -p %{buildroot}%{_libdir}/MYGUI - -# Strip away code in media dir -#rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/ -# Strip away unittests media -rm -rf %{buildroot}%{_datadir}/MyGUI/Media/UnitTests - -# Remove CMake stuff from Media -rm -f %{buildroot}%{_datadir}/MyGUI/Media/CMakeLists.txt - -# Link fonts from dejavu package -ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \ - %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans.ttf -ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \ - %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf - -# CMake hurts my brain. -cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ - - -%files -%doc COPYING.MIT -%{_libdir}/*.so.* -%dir %{_libdir}/MYGUI -%dir %{_datadir}/MyGUI -%dir %{_datadir}/MyGUI/Media -%{_datadir}/MyGUI/Media/Common -%{_datadir}/MyGUI/Media/MyGUI_Media - - -%files devel -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc - - -%files devel-doc -%doc Docs/html - - -%files demos -%doc Demos/README -%{_bindir}/MyGUI-Demos -%{_libdir}/MYGUI/Demos -%{_datadir}/MyGUI/Media/Demos -%{_datadir}/MyGUI/Media/Wrapper - - -%files tools -%doc Tools/README Tools/LayoutEditor/Readme.txt -%{_bindir}/MyGUI-Tools -%{_libdir}/MYGUI/Tools -%{_datadir}/MyGUI/Media/Tools -%{_datadir}/applications/mygui-layouteditor.desktop - - -%changelog -* Sat Aug 01 2020 Fedora Release Engineering - 3.2.2-15 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 3.2.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 3.2.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 3.2.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 3.2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 25 2019 Jonathan Wakely - 3.2.2-10 -- Rebuilt for Boost 1.69 - -* Fri Jul 13 2018 Fedora Release Engineering - 3.2.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 3.2.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 3.2.2-7 -- Rebuilt for Boost 1.66 - -* Thu Aug 03 2017 Fedora Release Engineering - 3.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 21 2017 Kalev Lember - 3.2.2-4 -- Rebuilt for Boost 1.64 - -* Fri Feb 10 2017 Fedora Release Engineering - 3.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Jan 28 2017 Jonathan Wakely - 3.2.2-2 -- Rebuilt for Boost 1.63 - -* Sat Mar 05 2016 Bruno Wolff III - 3.2.2-1 -- mygui 3.2.2 -- Release notes: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.2 - -* Thu Feb 04 2016 Ralf Corsépius - 3.2.1-9 -- Reflect freetype header location having changed (F24FTBFS). -- Remove %%defattr. - -* Thu Feb 04 2016 Fedora Release Engineering - 3.2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Aug 27 2015 Jonathan Wakely - 3.2.1-7 -- Rebuilt for Boost 1.59 - -* Wed Aug 05 2015 Jonathan Wakely 3.2.1-6 -- Rebuilt for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 3.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 22 2015 Bruno Wolff III - 3.2.1-4 -- Make sure FTBFS issue is fixed - -* Mon Feb 09 2015 Bruno Wolff III - 3.2.1-3 -- Rebuild for boost update - -* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-2 -- Don't use removed find -perm option (+) in MyGUI-Demos and MyGUI-Tools - -* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-1 -- License changed from LGPLv3 to MIT -- Source location changed from sourceforge to github -- Change log: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.1 -- Adjust patches for changes to cmake files -- Fix unowned directory -- Remove obsolete ldconfig file -- The supplied tools changed -- libX11-devel is now required for building -- Obsolete BUILDROOT definition removed - -* Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jun 10 2014 Ralf Corsépius - 3.2.0-10 -- Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255). -- Remove BR: autoconf, automake, libtool (unused). -- Remove BR: e2fsprogs-devel (unused). - -* Sat Jun 07 2014 Fedora Release Engineering - 3.2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 David Tardon - 3.2.0-8 -- rebuild for boost 1.55.0 - -* Sat Aug 03 2013 Fedora Release Engineering - 3.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Jul 28 2013 Petr Machata - 3.2.0-6 -- Rebuild for boost 1.54.0 - -* Thu Apr 25 2013 Tom Callaway - 3.2.0-5 -- rebuild to include libCommon - -* Sun Feb 10 2013 Denis Arnaud - 3.2.0-4 -- Rebuild for Boost-1.53.0 - -* Sat Feb 09 2013 Denis Arnaud - 3.2.0-3 -- Rebuild for Boost-1.53.0 - -* Wed Dec 26 2012 Kevin Fenzi 3.2.0-2 -- Rebuild for new libCommon - -* Tue Dec 04 2012 Bruno Wolff III - 3.2.0-1 -- Update to upstream 3.2.0 -- Changelog: http://redmine.mygui.info/repositories/entry/mygui/tags/MyGUI3.2/ChangeLog.txt - -* Fri Aug 10 2012 Bruno Wolff III - 3.0.1-16 -- Rebuild for boost 1.50 - -* Fri Jul 20 2012 Fedora Release Engineering - 3.0.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Apr 04 2012 Bruno Wolff III - 3.0.1-14 -- Rebuild for ogre 1.7.4 - -* Tue Feb 28 2012 Fedora Release Engineering - 3.0.1-13 -- Rebuilt for c++ ABI breakage - -* Tue Jan 17 2012 Bruno Wolff III - 3.0.1-12 -- Rebuild for ois 1.3 - -* Fri Jan 13 2012 Fedora Release Engineering - 3.0.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Nov 20 2011 Bruno Wolff III - 3.0.1-10 -- Rebuild for boost soname bump - -* Fri Jul 22 2011 Bruno Wolff III - 3.0.1-9 -- Rebuild for boost 1.47 - -* Sun May 15 2011 Bruno Wolff III - 3.0.1-8 -- Rebuild for ogre 1.7.3 - -* Mon May 02 2011 Kevin Fenzi - 3.0.1-7 -- Fix pc file issues. Fixes bug #693352 - -* Wed Apr 06 2011 Bruno Wolff III - 3.0.1-6 -- Rebuild for boost soname bump to 1.46.1 in rawhide. - -* Tue Feb 08 2011 Fedora Release Engineering - 3.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Feb 07 2011 Thomas Spura - 3.0.1-4 -- rebuild for new boost - -* Sat Jan 08 2011 Bruno Wolff III - 3.0.1-3 -- Clean up a few more rpmlint warnings - -* Sat Jan 08 2011 Bruno Wolff III - 3.0.1-2 -- Try to fix rpath issue - -* Fri Jan 07 2011 Bruno Wolff III - 3.0.1-1 -- Update to 3.0.1 release -- Rebuild for ogre update - -* Fri Nov 27 2009 Guido Grazioli - 3.0.0-0.4.2332svn -- Install OGRE platform headers - -* Wed Nov 18 2009 Guido Grazioli - 3.0.0-0.3.2332svn -- Fix macros usage -- Fix Release tag -- Add desktop entry for LayoutEditor -- Update patch to fix missing undefined non-weak symbols -- Improve summaries and descriptions -- Remove redundant VERBOSE flag -- Add graphviz BR to generate doxygen graphs - -* Fri Oct 30 2009 Guido Grazioli - 3.0.0-2.2332svn -- Fix includes dir -- Remove plugin - -* Fri Oct 23 2009 Guido Grazioli - 3.0.0-1.2332svn -- Upstream to svn revision 2332 -- Patch cmake build scripts to support multilib -- Fix package summaries -- Fix changelog -- Fix %%doc -- Add Require: ogre-devel to -devel subpackage -- Add -devel-doc subpackage -- Revert source tarball from xz to bzip2 - -* Sat Oct 03 2009 Guido Grazioli - 2.3.0-4.1861svn -- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480) - -* Thu Oct 01 2009 Guido Grazioli - 2.3.0-3.1861svn -- Improve package summary -- Provide scripts to run MyGUI tools - -* Wed Sep 30 2009 Guido Grazioli - 2.3.0-2.1861svn -- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+ -- Fix License - -* Tue Sep 29 2009 Guido Grazioli - 2.3.0-1.1861svn -- Rename from libmygui to mygui -- Symlink fonts in media dir to dejavu-sans-fonts ones -- Add doxygen generated docs to -devel -- Provide a generic script to setup and run demos -- Fix rpmlint warnings - -* Mon Sep 28 2009 Guido Grazioli - 2.3.0-0.1861svn -- Initial packaging diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch deleted file mode 100644 index 77370b4..0000000 --- a/mygui_multilib_cflags.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- CMakeLists.txt.orig 2016-03-05 07:12:23.873771406 -0600 -+++ CMakeLists.txt 2016-03-05 07:15:14.743761158 -0600 -@@ -85,8 +85,8 @@ - set(MYGUI_LIBRARIES MyGUIEngine) - - # Specify build paths --set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) --set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) -+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) -+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) - if (WIN32 OR APPLE) - if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -@@ -181,35 +181,35 @@ - # Set compiler specific build flags - if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") - if (NOT MYGUI_HIGH_LEVEL_WARNINGS) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") - else () - if (MYGUI_RENDERSYSTEM EQUAL 3) - # to avoid warnings from OGRE -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") - endif () - if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) - # to avoid warnings from OIS -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") - endif () - - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") - # might be useful -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") - # not useful -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") - else () - # very interesting option, but way too many warnings - #add_definitions(-Weffc++) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") - if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Intel") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") - endif () - - # MyGUI_UString.h ignored from warnings because of this -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") - endif () - endif () - endif () ---- CMake/Utils/MyGUIConfigTargets.cmake.orig 2016-03-05 10:59:52.896952810 -0600 -+++ CMake/Utils/MyGUIConfigTargets.cmake 2016-03-05 10:49:28.588990252 -0600 -@@ -61,26 +61,26 @@ - function(mygui_install_target TARGETNAME SUFFIX) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None "" - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel -- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug -- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug - ) - endfunction(mygui_install_target) -@@ -430,12 +430,12 @@ - if (MYGUI_INSTALL_PDB) - # install debug pdb files - if (MYGUI_STATIC) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -- DESTINATION lib${MYGUI_LIB_DEBUG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH} - CONFIGURATIONS Debug - ) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH} - CONFIGURATIONS RelWithDebInfo - ) - else () ---- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600 -+++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600 -@@ -47,7 +47,7 @@ - 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 lib${LIB_SUFFIX}/pkgconfig) - - # configure additional packages - diff --git a/resources.xml b/resources.xml deleted file mode 100644 index 569d089..0000000 --- a/resources.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - /usr/share/MyGUI/Media - /usr/share/MyGUI/Media/MyGUI_Media - /usr/share/MyGUI/Media/Tools/LayoutEditor - diff --git a/sources b/sources deleted file mode 100644 index 10dc1d0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -3e5e63cce16192db8db0b5f8b84237d4 mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz From 1ed2c0b10684542c70286827e14567bdd375bbf1 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 2 Mar 2021 11:18:01 +0100 Subject: [PATCH 67/75] Revert "Orphaned for 6+ weeks" This reverts commit 5b4d1825d768542965ff31b54e1a26eaa22be1e4. Unretirement request: https://pagure.io/releng/issue/10047 Signed-off-by: Tomas Hrcka --- .gitignore | 5 + MyGUI-Demos | 49 ++++ MyGUI-Tools | 51 +++++ dead.package | 1 - mygui-layouteditor.desktop | 9 + mygui-libCommon-fixup.patch | 10 + mygui.spec | 435 ++++++++++++++++++++++++++++++++++++ mygui_multilib_cflags.patch | 125 +++++++++++ resources.xml | 7 + sources | 1 + 10 files changed, 692 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 MyGUI-Demos create mode 100644 MyGUI-Tools delete mode 100644 dead.package create mode 100644 mygui-layouteditor.desktop create mode 100644 mygui-libCommon-fixup.patch create mode 100644 mygui.spec create mode 100644 mygui_multilib_cflags.patch create mode 100644 resources.xml create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8ac56fd --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +mygui-2.3.0-2332svn.tar.bz2 +/MyGUI_3.0.1_source.zip +/MyGUI_3.2.0.zip +/mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz +/mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz diff --git a/MyGUI-Demos b/MyGUI-Demos new file mode 100644 index 0000000..3777ae5 --- /dev/null +++ b/MyGUI-Demos @@ -0,0 +1,49 @@ +#!/bin/sh +# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. + +runSample() +{ + sample=$1 + echo "Running $sample..." + $LIBDIR/MYGUI/Demos/$sample +} + +set -e + +# find out LIBDIR +if [ -f /usr/lib64/MYGUI/Demos/resources.xml ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +mkdir -p $HOME/.mygui-demos +cd $HOME/.mygui-demos + +for i in plugins.cfg resources.xml; do + cp -f $LIBDIR/MYGUI/Demos/$i . +done + +set +e + +if [ "$1" = "-a" ]; then + for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do + runSample `echo $i | sed 's|./||'` + done +elif [ $# -ge 1 ]; then + while [ $# -ge 1 ]; do + runSample $1 + shift + done +else + echo "Usage:" `basename $0` "[-a] [sample [...]]" + echo " -a : Run all samples installed to $LIBDIR/MYGUI/Demos/" + echo " sample : Run the sample(s) named 'sample' (see list bellow)" + echo + echo -n "Available samples:" + echo + for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do + echo " * $i" | sed 's|./||' + done + echo +fi diff --git a/MyGUI-Tools b/MyGUI-Tools new file mode 100644 index 0000000..d9e66a4 --- /dev/null +++ b/MyGUI-Tools @@ -0,0 +1,51 @@ +#!/bin/sh +# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. + +runSample() +{ + sample=$1 + echo "Running $sample..." + $LIBDIR/MYGUI/Tools/$sample +} + +set -e + +# find out LIBDIR +if [ -f /usr/lib64/MYGUI/Tools/resources.xml ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +mkdir -p $HOME/.mygui-tools +cd $HOME/.mygui-tools + +for i in plugins.cfg resources.xml; do + cp -f $LIBDIR/MYGUI/Tools/$i . +done + +set +e + +if [ "$1" = "-a" ]; then + for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do + runSample `echo $i | sed 's|./||'` + done +elif [ $# -ge 1 ]; then + while [ $# -ge 1 ]; do + runSample $1 + shift + done +else + echo "Usage:" `basename $0` "[-a] [tool [...]]" + echo " -a : Run all tools installed to $LIBDIR/MYGUI/Tools/" + echo " sample : Run the tool(s) named 'tool' (see list bellow)" + echo + echo "tool - Runs specified tool from list" + echo + echo -n "Available tools:" + echo + for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do + echo " * $i" | sed 's|./||' + done + echo +fi diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/mygui-layouteditor.desktop b/mygui-layouteditor.desktop new file mode 100644 index 0000000..4bb4efa --- /dev/null +++ b/mygui-layouteditor.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=MyGUI Layout Editor +GenericName=MyGUI Layout Editor +Comment=Design UIs usgin MyGUI library +Exec=MyGUI-Tools LayoutEditor +Icon=preferences-system-windows.png +Terminal=false +Type=Application +Categories=Development; diff --git a/mygui-libCommon-fixup.patch b/mygui-libCommon-fixup.patch new file mode 100644 index 0000000..6f3a107 --- /dev/null +++ b/mygui-libCommon-fixup.patch @@ -0,0 +1,10 @@ +--- Common/CMakeLists.txt.orig 2016-03-05 07:17:23.175753455 -0600 ++++ Common/CMakeLists.txt 2016-03-05 07:18:03.880751014 -0600 +@@ -89,6 +89,7 @@ + endif() + + add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) ++set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) + + if(MYGUI_RENDERSYSTEM EQUAL 1) + add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform) diff --git a/mygui.spec b/mygui.spec new file mode 100644 index 0000000..609af65 --- /dev/null +++ b/mygui.spec @@ -0,0 +1,435 @@ +Name: mygui +Version: 3.2.2 +%global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +Release: 15%{?dist} +Summary: Fast, simple and flexible GUI library for Ogre +# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) +License: MIT +URL: http://mygui.info/ +Source0: https://github.com/MyGUI/mygui/archive/%{commit}/mygui-%{commit}.tar.gz +# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples +Source1: MyGUI-Demos +# Another helper for the tools +Source2: MyGUI-Tools +# Demo and tools resources configuration +Source3: resources.xml +# LayoutEditor desktop entry +Source4: mygui-layouteditor.desktop +# Fix multilib and flags with cmake +Patch0: mygui_multilib_cflags.patch +# Fixup libCommon +Patch1: mygui-libCommon-fixup.patch + +BuildRequires: gcc-c++ +BuildRequires: freetype-devel, desktop-file-utils +BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix +BuildRequires: libuuid-devel, libX11-devel + +Requires: dejavu-sans-fonts + + +%description +MyGUI is a GUI library for Ogre Rendering Engine which aims to be fast, +flexible and simple in using. + +%package devel +Summary: Development files for MyGUI +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig, ois-devel, ogre-devel + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%package devel-doc +Summary: Development documentation for MyGUI +BuildArch: noarch + +%description devel-doc +The %{name}-devel-doc package contains reference documentation for +developing applications that use %{name}. + + +%package demos +Summary: MyGUI demo executables and media +Requires: %{name} = %{version}-%{release} + +%description demos +This package contains the compiled (not the source) sample applications coming +with MyGUI. It also contains some media (meshes, textures,...) needed by these +samples. The samples are installed in %{_libdir}/MYGUI/Demos, and an helper +script MyGUI-Demos is provided and installed in %{_bindir}. + + +%package tools +Summary: MyGUI tools +Requires: %{name} = %{version}-%{release} + +%description tools +This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. +LayoutEditor is an application for designing UIs using MyGUI library, +FontEditor, ImageEditor and SkinEditor are also provided. +An helper script MyGUI-Tools is provided and installed in %{_bindir}. + + +%prep +%setup -qn %{name}-%{commit} +%patch0 -p0 -b .multilib +%patch1 -p0 -b .fixup +# Fix non-UTF8 files +for file in Tools/LayoutEditor/Readme.txt ; do + dos2unix -n $file timestamp && \ + iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp && \ + touch -r timestamp $file && \ + rm timestamp +done +# Generate README for -tools and -demos +cat > Tools/README << EOT +This package contains the MyGUI tools: ImageEditor, FontEditor, +SkinEditor and LayoutEditor; to run the tools, +launch the helper script +%{_bindir}/MyGUI-Tools +EOT +cat > Demos/README << EOT +This package contains MyGUI demos; to run the demos, launch the +helper script %{_bindir}/MyGUI-Demos +EOT + +%if (%{?fedora} > 20) && (%{?fedora} < 24) +# Fedora > 20 has freetype2/freetype.h +sed -i -e 's,freetype/freetype.h,freetype2/freetype.h,' CMake/Packages/FindFreetype.cmake +%endif + +%build +# Plugins are windows only atm +%cmake . \ + -DMYGUI_INSTALL_PDB:INTERNAL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release \ + -DMYGUI_BUILD_PLUGINS:BOOL=OFF -DCMAKE_CXX_FLAGS_RELEASE= \ + -DCMAKE_SKIP_RPATH:BOOL=ON +make %{?_smp_mflags} +# Generate doxygen documentation +pushd Docs +doxygen +rm -f html/installdox +popd + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" +# install missing headers +mkdir -p %{buildroot}/%{_includedir}/MyGUI/ +install -Dp -m 644 MyGUIEngine/include/*Alloc*.h %{buildroot}/%{_includedir}/MyGUI/ +install -Dp -m 644 Platforms/Ogre/OgrePlatform/include/* %{buildroot}/%{_includedir}/MyGUI/ + +# Remove any archive +find %{buildroot} -name '*.la' -exec rm -f {} ';' +# Remove binaries installed in %%{_bindir} +rm -rf %{buildroot}/%{_bindir}/ + +# Install the samples +mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos +cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos +sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ + %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg +sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ + %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg +for file in bin/Demo_* ; do + install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file` +done +mkdir -p %{buildroot}%{_bindir} +install -Dp -m 755 %{SOURCE1} %{buildroot}%{_bindir}/ + +# Install the tools +mkdir -p %{buildroot}%{_libdir}/MYGUI/Tools +cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Tools +sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ + %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg +sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ + %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg +for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/FontEditor ; do + install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file` +done +install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}/ + +# Install desktop entry for LayoutEditor +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} + +# Copy Media files +mkdir -p %{buildroot}%{_datadir}/MyGUI/ +cp -a Media %{buildroot}%{_datadir}/MyGUI/ + +# The subpackages put stuff in this directory +mkdir -p %{buildroot}%{_libdir}/MYGUI + +# Strip away code in media dir +#rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/ +# Strip away unittests media +rm -rf %{buildroot}%{_datadir}/MyGUI/Media/UnitTests + +# Remove CMake stuff from Media +rm -f %{buildroot}%{_datadir}/MyGUI/Media/CMakeLists.txt + +# Link fonts from dejavu package +ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \ + %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans.ttf +ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \ + %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf + +# CMake hurts my brain. +cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ + + +%files +%doc COPYING.MIT +%{_libdir}/*.so.* +%dir %{_libdir}/MYGUI +%dir %{_datadir}/MyGUI +%dir %{_datadir}/MyGUI/Media +%{_datadir}/MyGUI/Media/Common +%{_datadir}/MyGUI/Media/MyGUI_Media + + +%files devel +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc + + +%files devel-doc +%doc Docs/html + + +%files demos +%doc Demos/README +%{_bindir}/MyGUI-Demos +%{_libdir}/MYGUI/Demos +%{_datadir}/MyGUI/Media/Demos +%{_datadir}/MyGUI/Media/Wrapper + + +%files tools +%doc Tools/README Tools/LayoutEditor/Readme.txt +%{_bindir}/MyGUI-Tools +%{_libdir}/MYGUI/Tools +%{_datadir}/MyGUI/Media/Tools +%{_datadir}/applications/mygui-layouteditor.desktop + + +%changelog +* Sat Aug 01 2020 Fedora Release Engineering - 3.2.2-15 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.2.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 3.2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 3.2.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 3.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jan 25 2019 Jonathan Wakely - 3.2.2-10 +- Rebuilt for Boost 1.69 + +* Fri Jul 13 2018 Fedora Release Engineering - 3.2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 3.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 23 2018 Jonathan Wakely - 3.2.2-7 +- Rebuilt for Boost 1.66 + +* Thu Aug 03 2017 Fedora Release Engineering - 3.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jul 21 2017 Kalev Lember - 3.2.2-4 +- Rebuilt for Boost 1.64 + +* Fri Feb 10 2017 Fedora Release Engineering - 3.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Jan 28 2017 Jonathan Wakely - 3.2.2-2 +- Rebuilt for Boost 1.63 + +* Sat Mar 05 2016 Bruno Wolff III - 3.2.2-1 +- mygui 3.2.2 +- Release notes: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.2 + +* Thu Feb 04 2016 Ralf Corsépius - 3.2.1-9 +- Reflect freetype header location having changed (F24FTBFS). +- Remove %%defattr. + +* Thu Feb 04 2016 Fedora Release Engineering - 3.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Aug 27 2015 Jonathan Wakely - 3.2.1-7 +- Rebuilt for Boost 1.59 + +* Wed Aug 05 2015 Jonathan Wakely 3.2.1-6 +- Rebuilt for Boost 1.58 + +* Wed Jun 17 2015 Fedora Release Engineering - 3.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri May 22 2015 Bruno Wolff III - 3.2.1-4 +- Make sure FTBFS issue is fixed + +* Mon Feb 09 2015 Bruno Wolff III - 3.2.1-3 +- Rebuild for boost update + +* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-2 +- Don't use removed find -perm option (+) in MyGUI-Demos and MyGUI-Tools + +* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-1 +- License changed from LGPLv3 to MIT +- Source location changed from sourceforge to github +- Change log: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.1 +- Adjust patches for changes to cmake files +- Fix unowned directory +- Remove obsolete ldconfig file +- The supplied tools changed +- libX11-devel is now required for building +- Obsolete BUILDROOT definition removed + +* Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jun 10 2014 Ralf Corsépius - 3.2.0-10 +- Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255). +- Remove BR: autoconf, automake, libtool (unused). +- Remove BR: e2fsprogs-devel (unused). + +* Sat Jun 07 2014 Fedora Release Engineering - 3.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 David Tardon - 3.2.0-8 +- rebuild for boost 1.55.0 + +* Sat Aug 03 2013 Fedora Release Engineering - 3.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Jul 28 2013 Petr Machata - 3.2.0-6 +- Rebuild for boost 1.54.0 + +* Thu Apr 25 2013 Tom Callaway - 3.2.0-5 +- rebuild to include libCommon + +* Sun Feb 10 2013 Denis Arnaud - 3.2.0-4 +- Rebuild for Boost-1.53.0 + +* Sat Feb 09 2013 Denis Arnaud - 3.2.0-3 +- Rebuild for Boost-1.53.0 + +* Wed Dec 26 2012 Kevin Fenzi 3.2.0-2 +- Rebuild for new libCommon + +* Tue Dec 04 2012 Bruno Wolff III - 3.2.0-1 +- Update to upstream 3.2.0 +- Changelog: http://redmine.mygui.info/repositories/entry/mygui/tags/MyGUI3.2/ChangeLog.txt + +* Fri Aug 10 2012 Bruno Wolff III - 3.0.1-16 +- Rebuild for boost 1.50 + +* Fri Jul 20 2012 Fedora Release Engineering - 3.0.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 04 2012 Bruno Wolff III - 3.0.1-14 +- Rebuild for ogre 1.7.4 + +* Tue Feb 28 2012 Fedora Release Engineering - 3.0.1-13 +- Rebuilt for c++ ABI breakage + +* Tue Jan 17 2012 Bruno Wolff III - 3.0.1-12 +- Rebuild for ois 1.3 + +* Fri Jan 13 2012 Fedora Release Engineering - 3.0.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Nov 20 2011 Bruno Wolff III - 3.0.1-10 +- Rebuild for boost soname bump + +* Fri Jul 22 2011 Bruno Wolff III - 3.0.1-9 +- Rebuild for boost 1.47 + +* Sun May 15 2011 Bruno Wolff III - 3.0.1-8 +- Rebuild for ogre 1.7.3 + +* Mon May 02 2011 Kevin Fenzi - 3.0.1-7 +- Fix pc file issues. Fixes bug #693352 + +* Wed Apr 06 2011 Bruno Wolff III - 3.0.1-6 +- Rebuild for boost soname bump to 1.46.1 in rawhide. + +* Tue Feb 08 2011 Fedora Release Engineering - 3.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Feb 07 2011 Thomas Spura - 3.0.1-4 +- rebuild for new boost + +* Sat Jan 08 2011 Bruno Wolff III - 3.0.1-3 +- Clean up a few more rpmlint warnings + +* Sat Jan 08 2011 Bruno Wolff III - 3.0.1-2 +- Try to fix rpath issue + +* Fri Jan 07 2011 Bruno Wolff III - 3.0.1-1 +- Update to 3.0.1 release +- Rebuild for ogre update + +* Fri Nov 27 2009 Guido Grazioli - 3.0.0-0.4.2332svn +- Install OGRE platform headers + +* Wed Nov 18 2009 Guido Grazioli - 3.0.0-0.3.2332svn +- Fix macros usage +- Fix Release tag +- Add desktop entry for LayoutEditor +- Update patch to fix missing undefined non-weak symbols +- Improve summaries and descriptions +- Remove redundant VERBOSE flag +- Add graphviz BR to generate doxygen graphs + +* Fri Oct 30 2009 Guido Grazioli - 3.0.0-2.2332svn +- Fix includes dir +- Remove plugin + +* Fri Oct 23 2009 Guido Grazioli - 3.0.0-1.2332svn +- Upstream to svn revision 2332 +- Patch cmake build scripts to support multilib +- Fix package summaries +- Fix changelog +- Fix %%doc +- Add Require: ogre-devel to -devel subpackage +- Add -devel-doc subpackage +- Revert source tarball from xz to bzip2 + +* Sat Oct 03 2009 Guido Grazioli - 2.3.0-4.1861svn +- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480) + +* Thu Oct 01 2009 Guido Grazioli - 2.3.0-3.1861svn +- Improve package summary +- Provide scripts to run MyGUI tools + +* Wed Sep 30 2009 Guido Grazioli - 2.3.0-2.1861svn +- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+ +- Fix License + +* Tue Sep 29 2009 Guido Grazioli - 2.3.0-1.1861svn +- Rename from libmygui to mygui +- Symlink fonts in media dir to dejavu-sans-fonts ones +- Add doxygen generated docs to -devel +- Provide a generic script to setup and run demos +- Fix rpmlint warnings + +* Mon Sep 28 2009 Guido Grazioli - 2.3.0-0.1861svn +- Initial packaging diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch new file mode 100644 index 0000000..77370b4 --- /dev/null +++ b/mygui_multilib_cflags.patch @@ -0,0 +1,125 @@ +--- CMakeLists.txt.orig 2016-03-05 07:12:23.873771406 -0600 ++++ CMakeLists.txt 2016-03-05 07:15:14.743761158 -0600 +@@ -85,8 +85,8 @@ + set(MYGUI_LIBRARIES MyGUIEngine) + + # Specify build paths +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) + if (WIN32 OR APPLE) + if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +@@ -181,35 +181,35 @@ + # Set compiler specific build flags + if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") + if (NOT MYGUI_HIGH_LEVEL_WARNINGS) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") + else () + if (MYGUI_RENDERSYSTEM EQUAL 3) + # to avoid warnings from OGRE +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") + endif () + if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) + # to avoid warnings from OIS +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") + endif () + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") + # might be useful +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") + # not useful +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") + else () + # very interesting option, but way too many warnings + #add_definitions(-Weffc++) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") + if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Intel") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") + endif () + + # MyGUI_UString.h ignored from warnings because of this +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") + endif () + endif () + endif () +--- CMake/Utils/MyGUIConfigTargets.cmake.orig 2016-03-05 10:59:52.896952810 -0600 ++++ CMake/Utils/MyGUIConfigTargets.cmake 2016-03-05 10:49:28.588990252 -0600 +@@ -61,26 +61,26 @@ + function(mygui_install_target TARGETNAME SUFFIX) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" +- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" +- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None "" + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo +- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo +- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel +- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel +- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug +- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug +- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug + ) + endfunction(mygui_install_target) +@@ -430,12 +430,12 @@ + if (MYGUI_INSTALL_PDB) + # install debug pdb files + if (MYGUI_STATIC) +- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb +- DESTINATION lib${MYGUI_LIB_DEBUG_PATH} ++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb ++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH} + CONFIGURATIONS Debug + ) +- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb +- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH} ++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb ++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH} + CONFIGURATIONS RelWithDebInfo + ) + else () +--- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600 ++++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600 +@@ -47,7 +47,7 @@ + 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 lib${LIB_SUFFIX}/pkgconfig) + + # configure additional packages + diff --git a/resources.xml b/resources.xml new file mode 100644 index 0000000..569d089 --- /dev/null +++ b/resources.xml @@ -0,0 +1,7 @@ + + + + /usr/share/MyGUI/Media + /usr/share/MyGUI/Media/MyGUI_Media + /usr/share/MyGUI/Media/Tools/LayoutEditor + diff --git a/sources b/sources new file mode 100644 index 0000000..10dc1d0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +3e5e63cce16192db8db0b5f8b84237d4 mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz From a6c8d82ec1c365663943de0ad0adf98470352ac5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:39:53 +0000 Subject: [PATCH 68/75] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mygui.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mygui.spec b/mygui.spec index 609af65..2a4ace2 100644 --- a/mygui.spec +++ b/mygui.spec @@ -2,7 +2,7 @@ Name: mygui Version: 3.2.2 %global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 15%{?dist} +Release: 16%{?dist} Summary: Fast, simple and flexible GUI library for Ogre # UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) License: MIT @@ -219,6 +219,9 @@ cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 3.2.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 3.2.2-15 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9c0f3e3899cb0b2ee40974c6be2ee5d19d2027f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 22 Nov 2021 13:10:55 +0100 Subject: [PATCH 69/75] Orphaned for 6+ weeks --- .gitignore | 5 - MyGUI-Demos | 49 ---- MyGUI-Tools | 51 ----- dead.package | 1 + mygui-layouteditor.desktop | 9 - mygui-libCommon-fixup.patch | 10 - mygui.spec | 438 ------------------------------------ mygui_multilib_cflags.patch | 125 ---------- resources.xml | 7 - sources | 1 - 10 files changed, 1 insertion(+), 695 deletions(-) delete mode 100644 .gitignore delete mode 100644 MyGUI-Demos delete mode 100644 MyGUI-Tools create mode 100644 dead.package delete mode 100644 mygui-layouteditor.desktop delete mode 100644 mygui-libCommon-fixup.patch delete mode 100644 mygui.spec delete mode 100644 mygui_multilib_cflags.patch delete mode 100644 resources.xml delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8ac56fd..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -mygui-2.3.0-2332svn.tar.bz2 -/MyGUI_3.0.1_source.zip -/MyGUI_3.2.0.zip -/mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz -/mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz diff --git a/MyGUI-Demos b/MyGUI-Demos deleted file mode 100644 index 3777ae5..0000000 --- a/MyGUI-Demos +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. - -runSample() -{ - sample=$1 - echo "Running $sample..." - $LIBDIR/MYGUI/Demos/$sample -} - -set -e - -# find out LIBDIR -if [ -f /usr/lib64/MYGUI/Demos/resources.xml ]; then - LIBDIR=/usr/lib64 -else - LIBDIR=/usr/lib -fi - -mkdir -p $HOME/.mygui-demos -cd $HOME/.mygui-demos - -for i in plugins.cfg resources.xml; do - cp -f $LIBDIR/MYGUI/Demos/$i . -done - -set +e - -if [ "$1" = "-a" ]; then - for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do - runSample `echo $i | sed 's|./||'` - done -elif [ $# -ge 1 ]; then - while [ $# -ge 1 ]; do - runSample $1 - shift - done -else - echo "Usage:" `basename $0` "[-a] [sample [...]]" - echo " -a : Run all samples installed to $LIBDIR/MYGUI/Demos/" - echo " sample : Run the sample(s) named 'sample' (see list bellow)" - echo - echo -n "Available samples:" - echo - for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do - echo " * $i" | sed 's|./||' - done - echo -fi diff --git a/MyGUI-Tools b/MyGUI-Tools deleted file mode 100644 index d9e66a4..0000000 --- a/MyGUI-Tools +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. - -runSample() -{ - sample=$1 - echo "Running $sample..." - $LIBDIR/MYGUI/Tools/$sample -} - -set -e - -# find out LIBDIR -if [ -f /usr/lib64/MYGUI/Tools/resources.xml ]; then - LIBDIR=/usr/lib64 -else - LIBDIR=/usr/lib -fi - -mkdir -p $HOME/.mygui-tools -cd $HOME/.mygui-tools - -for i in plugins.cfg resources.xml; do - cp -f $LIBDIR/MYGUI/Tools/$i . -done - -set +e - -if [ "$1" = "-a" ]; then - for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do - runSample `echo $i | sed 's|./||'` - done -elif [ $# -ge 1 ]; then - while [ $# -ge 1 ]; do - runSample $1 - shift - done -else - echo "Usage:" `basename $0` "[-a] [tool [...]]" - echo " -a : Run all tools installed to $LIBDIR/MYGUI/Tools/" - echo " sample : Run the tool(s) named 'tool' (see list bellow)" - echo - echo "tool - Runs specified tool from list" - echo - echo -n "Available tools:" - echo - for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do - echo " * $i" | sed 's|./||' - done - echo -fi diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/mygui-layouteditor.desktop b/mygui-layouteditor.desktop deleted file mode 100644 index 4bb4efa..0000000 --- a/mygui-layouteditor.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=MyGUI Layout Editor -GenericName=MyGUI Layout Editor -Comment=Design UIs usgin MyGUI library -Exec=MyGUI-Tools LayoutEditor -Icon=preferences-system-windows.png -Terminal=false -Type=Application -Categories=Development; diff --git a/mygui-libCommon-fixup.patch b/mygui-libCommon-fixup.patch deleted file mode 100644 index 6f3a107..0000000 --- a/mygui-libCommon-fixup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Common/CMakeLists.txt.orig 2016-03-05 07:17:23.175753455 -0600 -+++ Common/CMakeLists.txt 2016-03-05 07:18:03.880751014 -0600 -@@ -89,6 +89,7 @@ - endif() - - add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) -+set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) - - if(MYGUI_RENDERSYSTEM EQUAL 1) - add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform) diff --git a/mygui.spec b/mygui.spec deleted file mode 100644 index 2a4ace2..0000000 --- a/mygui.spec +++ /dev/null @@ -1,438 +0,0 @@ -Name: mygui -Version: 3.2.2 -%global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 16%{?dist} -Summary: Fast, simple and flexible GUI library for Ogre -# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) -License: MIT -URL: http://mygui.info/ -Source0: https://github.com/MyGUI/mygui/archive/%{commit}/mygui-%{commit}.tar.gz -# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples -Source1: MyGUI-Demos -# Another helper for the tools -Source2: MyGUI-Tools -# Demo and tools resources configuration -Source3: resources.xml -# LayoutEditor desktop entry -Source4: mygui-layouteditor.desktop -# Fix multilib and flags with cmake -Patch0: mygui_multilib_cflags.patch -# Fixup libCommon -Patch1: mygui-libCommon-fixup.patch - -BuildRequires: gcc-c++ -BuildRequires: freetype-devel, desktop-file-utils -BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix -BuildRequires: libuuid-devel, libX11-devel - -Requires: dejavu-sans-fonts - - -%description -MyGUI is a GUI library for Ogre Rendering Engine which aims to be fast, -flexible and simple in using. - -%package devel -Summary: Development files for MyGUI -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig, ois-devel, ogre-devel - -%description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. - - -%package devel-doc -Summary: Development documentation for MyGUI -BuildArch: noarch - -%description devel-doc -The %{name}-devel-doc package contains reference documentation for -developing applications that use %{name}. - - -%package demos -Summary: MyGUI demo executables and media -Requires: %{name} = %{version}-%{release} - -%description demos -This package contains the compiled (not the source) sample applications coming -with MyGUI. It also contains some media (meshes, textures,...) needed by these -samples. The samples are installed in %{_libdir}/MYGUI/Demos, and an helper -script MyGUI-Demos is provided and installed in %{_bindir}. - - -%package tools -Summary: MyGUI tools -Requires: %{name} = %{version}-%{release} - -%description tools -This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. -LayoutEditor is an application for designing UIs using MyGUI library, -FontEditor, ImageEditor and SkinEditor are also provided. -An helper script MyGUI-Tools is provided and installed in %{_bindir}. - - -%prep -%setup -qn %{name}-%{commit} -%patch0 -p0 -b .multilib -%patch1 -p0 -b .fixup -# Fix non-UTF8 files -for file in Tools/LayoutEditor/Readme.txt ; do - dos2unix -n $file timestamp && \ - iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp && \ - touch -r timestamp $file && \ - rm timestamp -done -# Generate README for -tools and -demos -cat > Tools/README << EOT -This package contains the MyGUI tools: ImageEditor, FontEditor, -SkinEditor and LayoutEditor; to run the tools, -launch the helper script -%{_bindir}/MyGUI-Tools -EOT -cat > Demos/README << EOT -This package contains MyGUI demos; to run the demos, launch the -helper script %{_bindir}/MyGUI-Demos -EOT - -%if (%{?fedora} > 20) && (%{?fedora} < 24) -# Fedora > 20 has freetype2/freetype.h -sed -i -e 's,freetype/freetype.h,freetype2/freetype.h,' CMake/Packages/FindFreetype.cmake -%endif - -%build -# Plugins are windows only atm -%cmake . \ - -DMYGUI_INSTALL_PDB:INTERNAL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release \ - -DMYGUI_BUILD_PLUGINS:BOOL=OFF -DCMAKE_CXX_FLAGS_RELEASE= \ - -DCMAKE_SKIP_RPATH:BOOL=ON -make %{?_smp_mflags} -# Generate doxygen documentation -pushd Docs -doxygen -rm -f html/installdox -popd - - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="install -p" -# install missing headers -mkdir -p %{buildroot}/%{_includedir}/MyGUI/ -install -Dp -m 644 MyGUIEngine/include/*Alloc*.h %{buildroot}/%{_includedir}/MyGUI/ -install -Dp -m 644 Platforms/Ogre/OgrePlatform/include/* %{buildroot}/%{_includedir}/MyGUI/ - -# Remove any archive -find %{buildroot} -name '*.la' -exec rm -f {} ';' -# Remove binaries installed in %%{_bindir} -rm -rf %{buildroot}/%{_bindir}/ - -# Install the samples -mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos -cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos -sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ - %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg -sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ - %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg -for file in bin/Demo_* ; do - install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file` -done -mkdir -p %{buildroot}%{_bindir} -install -Dp -m 755 %{SOURCE1} %{buildroot}%{_bindir}/ - -# Install the tools -mkdir -p %{buildroot}%{_libdir}/MYGUI/Tools -cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Tools -sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ - %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg -sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ - %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg -for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/FontEditor ; do - install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file` -done -install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}/ - -# Install desktop entry for LayoutEditor -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} - -# Copy Media files -mkdir -p %{buildroot}%{_datadir}/MyGUI/ -cp -a Media %{buildroot}%{_datadir}/MyGUI/ - -# The subpackages put stuff in this directory -mkdir -p %{buildroot}%{_libdir}/MYGUI - -# Strip away code in media dir -#rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/ -# Strip away unittests media -rm -rf %{buildroot}%{_datadir}/MyGUI/Media/UnitTests - -# Remove CMake stuff from Media -rm -f %{buildroot}%{_datadir}/MyGUI/Media/CMakeLists.txt - -# Link fonts from dejavu package -ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \ - %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans.ttf -ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \ - %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf - -# CMake hurts my brain. -cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ - - -%files -%doc COPYING.MIT -%{_libdir}/*.so.* -%dir %{_libdir}/MYGUI -%dir %{_datadir}/MyGUI -%dir %{_datadir}/MyGUI/Media -%{_datadir}/MyGUI/Media/Common -%{_datadir}/MyGUI/Media/MyGUI_Media - - -%files devel -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc - - -%files devel-doc -%doc Docs/html - - -%files demos -%doc Demos/README -%{_bindir}/MyGUI-Demos -%{_libdir}/MYGUI/Demos -%{_datadir}/MyGUI/Media/Demos -%{_datadir}/MyGUI/Media/Wrapper - - -%files tools -%doc Tools/README Tools/LayoutEditor/Readme.txt -%{_bindir}/MyGUI-Tools -%{_libdir}/MYGUI/Tools -%{_datadir}/MyGUI/Media/Tools -%{_datadir}/applications/mygui-layouteditor.desktop - - -%changelog -* Thu Jul 22 2021 Fedora Release Engineering - 3.2.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Aug 01 2020 Fedora Release Engineering - 3.2.2-15 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 3.2.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 3.2.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 3.2.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 3.2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 25 2019 Jonathan Wakely - 3.2.2-10 -- Rebuilt for Boost 1.69 - -* Fri Jul 13 2018 Fedora Release Engineering - 3.2.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 3.2.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 23 2018 Jonathan Wakely - 3.2.2-7 -- Rebuilt for Boost 1.66 - -* Thu Aug 03 2017 Fedora Release Engineering - 3.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 21 2017 Kalev Lember - 3.2.2-4 -- Rebuilt for Boost 1.64 - -* Fri Feb 10 2017 Fedora Release Engineering - 3.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Jan 28 2017 Jonathan Wakely - 3.2.2-2 -- Rebuilt for Boost 1.63 - -* Sat Mar 05 2016 Bruno Wolff III - 3.2.2-1 -- mygui 3.2.2 -- Release notes: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.2 - -* Thu Feb 04 2016 Ralf Corsépius - 3.2.1-9 -- Reflect freetype header location having changed (F24FTBFS). -- Remove %%defattr. - -* Thu Feb 04 2016 Fedora Release Engineering - 3.2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Aug 27 2015 Jonathan Wakely - 3.2.1-7 -- Rebuilt for Boost 1.59 - -* Wed Aug 05 2015 Jonathan Wakely 3.2.1-6 -- Rebuilt for Boost 1.58 - -* Wed Jun 17 2015 Fedora Release Engineering - 3.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 22 2015 Bruno Wolff III - 3.2.1-4 -- Make sure FTBFS issue is fixed - -* Mon Feb 09 2015 Bruno Wolff III - 3.2.1-3 -- Rebuild for boost update - -* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-2 -- Don't use removed find -perm option (+) in MyGUI-Demos and MyGUI-Tools - -* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-1 -- License changed from LGPLv3 to MIT -- Source location changed from sourceforge to github -- Change log: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.1 -- Adjust patches for changes to cmake files -- Fix unowned directory -- Remove obsolete ldconfig file -- The supplied tools changed -- libX11-devel is now required for building -- Obsolete BUILDROOT definition removed - -* Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Tue Jun 10 2014 Ralf Corsépius - 3.2.0-10 -- Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255). -- Remove BR: autoconf, automake, libtool (unused). -- Remove BR: e2fsprogs-devel (unused). - -* Sat Jun 07 2014 Fedora Release Engineering - 3.2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 David Tardon - 3.2.0-8 -- rebuild for boost 1.55.0 - -* Sat Aug 03 2013 Fedora Release Engineering - 3.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Jul 28 2013 Petr Machata - 3.2.0-6 -- Rebuild for boost 1.54.0 - -* Thu Apr 25 2013 Tom Callaway - 3.2.0-5 -- rebuild to include libCommon - -* Sun Feb 10 2013 Denis Arnaud - 3.2.0-4 -- Rebuild for Boost-1.53.0 - -* Sat Feb 09 2013 Denis Arnaud - 3.2.0-3 -- Rebuild for Boost-1.53.0 - -* Wed Dec 26 2012 Kevin Fenzi 3.2.0-2 -- Rebuild for new libCommon - -* Tue Dec 04 2012 Bruno Wolff III - 3.2.0-1 -- Update to upstream 3.2.0 -- Changelog: http://redmine.mygui.info/repositories/entry/mygui/tags/MyGUI3.2/ChangeLog.txt - -* Fri Aug 10 2012 Bruno Wolff III - 3.0.1-16 -- Rebuild for boost 1.50 - -* Fri Jul 20 2012 Fedora Release Engineering - 3.0.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Apr 04 2012 Bruno Wolff III - 3.0.1-14 -- Rebuild for ogre 1.7.4 - -* Tue Feb 28 2012 Fedora Release Engineering - 3.0.1-13 -- Rebuilt for c++ ABI breakage - -* Tue Jan 17 2012 Bruno Wolff III - 3.0.1-12 -- Rebuild for ois 1.3 - -* Fri Jan 13 2012 Fedora Release Engineering - 3.0.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Nov 20 2011 Bruno Wolff III - 3.0.1-10 -- Rebuild for boost soname bump - -* Fri Jul 22 2011 Bruno Wolff III - 3.0.1-9 -- Rebuild for boost 1.47 - -* Sun May 15 2011 Bruno Wolff III - 3.0.1-8 -- Rebuild for ogre 1.7.3 - -* Mon May 02 2011 Kevin Fenzi - 3.0.1-7 -- Fix pc file issues. Fixes bug #693352 - -* Wed Apr 06 2011 Bruno Wolff III - 3.0.1-6 -- Rebuild for boost soname bump to 1.46.1 in rawhide. - -* Tue Feb 08 2011 Fedora Release Engineering - 3.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Feb 07 2011 Thomas Spura - 3.0.1-4 -- rebuild for new boost - -* Sat Jan 08 2011 Bruno Wolff III - 3.0.1-3 -- Clean up a few more rpmlint warnings - -* Sat Jan 08 2011 Bruno Wolff III - 3.0.1-2 -- Try to fix rpath issue - -* Fri Jan 07 2011 Bruno Wolff III - 3.0.1-1 -- Update to 3.0.1 release -- Rebuild for ogre update - -* Fri Nov 27 2009 Guido Grazioli - 3.0.0-0.4.2332svn -- Install OGRE platform headers - -* Wed Nov 18 2009 Guido Grazioli - 3.0.0-0.3.2332svn -- Fix macros usage -- Fix Release tag -- Add desktop entry for LayoutEditor -- Update patch to fix missing undefined non-weak symbols -- Improve summaries and descriptions -- Remove redundant VERBOSE flag -- Add graphviz BR to generate doxygen graphs - -* Fri Oct 30 2009 Guido Grazioli - 3.0.0-2.2332svn -- Fix includes dir -- Remove plugin - -* Fri Oct 23 2009 Guido Grazioli - 3.0.0-1.2332svn -- Upstream to svn revision 2332 -- Patch cmake build scripts to support multilib -- Fix package summaries -- Fix changelog -- Fix %%doc -- Add Require: ogre-devel to -devel subpackage -- Add -devel-doc subpackage -- Revert source tarball from xz to bzip2 - -* Sat Oct 03 2009 Guido Grazioli - 2.3.0-4.1861svn -- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480) - -* Thu Oct 01 2009 Guido Grazioli - 2.3.0-3.1861svn -- Improve package summary -- Provide scripts to run MyGUI tools - -* Wed Sep 30 2009 Guido Grazioli - 2.3.0-2.1861svn -- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+ -- Fix License - -* Tue Sep 29 2009 Guido Grazioli - 2.3.0-1.1861svn -- Rename from libmygui to mygui -- Symlink fonts in media dir to dejavu-sans-fonts ones -- Add doxygen generated docs to -devel -- Provide a generic script to setup and run demos -- Fix rpmlint warnings - -* Mon Sep 28 2009 Guido Grazioli - 2.3.0-0.1861svn -- Initial packaging diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch deleted file mode 100644 index 77370b4..0000000 --- a/mygui_multilib_cflags.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- CMakeLists.txt.orig 2016-03-05 07:12:23.873771406 -0600 -+++ CMakeLists.txt 2016-03-05 07:15:14.743761158 -0600 -@@ -85,8 +85,8 @@ - set(MYGUI_LIBRARIES MyGUIEngine) - - # Specify build paths --set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) --set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) -+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) -+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) - if (WIN32 OR APPLE) - if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -@@ -181,35 +181,35 @@ - # Set compiler specific build flags - if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") - if (NOT MYGUI_HIGH_LEVEL_WARNINGS) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") - else () - if (MYGUI_RENDERSYSTEM EQUAL 3) - # to avoid warnings from OGRE -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") - endif () - if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) - # to avoid warnings from OIS -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") - endif () - - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") - # might be useful -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") - # not useful -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") - else () - # very interesting option, but way too many warnings - #add_definitions(-Weffc++) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") - if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Intel") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") - endif () - - # MyGUI_UString.h ignored from warnings because of this -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") - endif () - endif () - endif () ---- CMake/Utils/MyGUIConfigTargets.cmake.orig 2016-03-05 10:59:52.896952810 -0600 -+++ CMake/Utils/MyGUIConfigTargets.cmake 2016-03-05 10:49:28.588990252 -0600 -@@ -61,26 +61,26 @@ - function(mygui_install_target TARGETNAME SUFFIX) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None "" - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel -- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug -- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug - ) - endfunction(mygui_install_target) -@@ -430,12 +430,12 @@ - if (MYGUI_INSTALL_PDB) - # install debug pdb files - if (MYGUI_STATIC) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -- DESTINATION lib${MYGUI_LIB_DEBUG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH} - CONFIGURATIONS Debug - ) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH} - CONFIGURATIONS RelWithDebInfo - ) - else () ---- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600 -+++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600 -@@ -47,7 +47,7 @@ - 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 lib${LIB_SUFFIX}/pkgconfig) - - # configure additional packages - diff --git a/resources.xml b/resources.xml deleted file mode 100644 index 569d089..0000000 --- a/resources.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - /usr/share/MyGUI/Media - /usr/share/MyGUI/Media/MyGUI_Media - /usr/share/MyGUI/Media/Tools/LayoutEditor - diff --git a/sources b/sources deleted file mode 100644 index 10dc1d0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -3e5e63cce16192db8db0b5f8b84237d4 mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz From 446fa9787f5a0250eb695e448a7291c777f566f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 6 Jul 2025 12:07:05 +0000 Subject: [PATCH 70/75] Unretirement request: https://pagure.io/releng/issue/12806 Signed-off-by: Fedora Release Engineering --- .gitignore | 5 + MyGUI-Demos | 49 ++++ MyGUI-Tools | 51 +++++ dead.package | 1 - mygui-layouteditor.desktop | 9 + mygui-libCommon-fixup.patch | 10 + mygui.spec | 438 ++++++++++++++++++++++++++++++++++++ mygui_multilib_cflags.patch | 125 ++++++++++ resources.xml | 7 + sources | 1 + 10 files changed, 695 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 MyGUI-Demos create mode 100644 MyGUI-Tools delete mode 100644 dead.package create mode 100644 mygui-layouteditor.desktop create mode 100644 mygui-libCommon-fixup.patch create mode 100644 mygui.spec create mode 100644 mygui_multilib_cflags.patch create mode 100644 resources.xml create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8ac56fd --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +mygui-2.3.0-2332svn.tar.bz2 +/MyGUI_3.0.1_source.zip +/MyGUI_3.2.0.zip +/mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz +/mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz diff --git a/MyGUI-Demos b/MyGUI-Demos new file mode 100644 index 0000000..3777ae5 --- /dev/null +++ b/MyGUI-Demos @@ -0,0 +1,49 @@ +#!/bin/sh +# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. + +runSample() +{ + sample=$1 + echo "Running $sample..." + $LIBDIR/MYGUI/Demos/$sample +} + +set -e + +# find out LIBDIR +if [ -f /usr/lib64/MYGUI/Demos/resources.xml ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +mkdir -p $HOME/.mygui-demos +cd $HOME/.mygui-demos + +for i in plugins.cfg resources.xml; do + cp -f $LIBDIR/MYGUI/Demos/$i . +done + +set +e + +if [ "$1" = "-a" ]; then + for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do + runSample `echo $i | sed 's|./||'` + done +elif [ $# -ge 1 ]; then + while [ $# -ge 1 ]; do + runSample $1 + shift + done +else + echo "Usage:" `basename $0` "[-a] [sample [...]]" + echo " -a : Run all samples installed to $LIBDIR/MYGUI/Demos/" + echo " sample : Run the sample(s) named 'sample' (see list bellow)" + echo + echo -n "Available samples:" + echo + for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do + echo " * $i" | sed 's|./||' + done + echo +fi diff --git a/MyGUI-Tools b/MyGUI-Tools new file mode 100644 index 0000000..d9e66a4 --- /dev/null +++ b/MyGUI-Tools @@ -0,0 +1,51 @@ +#!/bin/sh +# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. + +runSample() +{ + sample=$1 + echo "Running $sample..." + $LIBDIR/MYGUI/Tools/$sample +} + +set -e + +# find out LIBDIR +if [ -f /usr/lib64/MYGUI/Tools/resources.xml ]; then + LIBDIR=/usr/lib64 +else + LIBDIR=/usr/lib +fi + +mkdir -p $HOME/.mygui-tools +cd $HOME/.mygui-tools + +for i in plugins.cfg resources.xml; do + cp -f $LIBDIR/MYGUI/Tools/$i . +done + +set +e + +if [ "$1" = "-a" ]; then + for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do + runSample `echo $i | sed 's|./||'` + done +elif [ $# -ge 1 ]; then + while [ $# -ge 1 ]; do + runSample $1 + shift + done +else + echo "Usage:" `basename $0` "[-a] [tool [...]]" + echo " -a : Run all tools installed to $LIBDIR/MYGUI/Tools/" + echo " sample : Run the tool(s) named 'tool' (see list bellow)" + echo + echo "tool - Runs specified tool from list" + echo + echo -n "Available tools:" + echo + for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do + echo " * $i" | sed 's|./||' + done + echo +fi diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/mygui-layouteditor.desktop b/mygui-layouteditor.desktop new file mode 100644 index 0000000..4bb4efa --- /dev/null +++ b/mygui-layouteditor.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=MyGUI Layout Editor +GenericName=MyGUI Layout Editor +Comment=Design UIs usgin MyGUI library +Exec=MyGUI-Tools LayoutEditor +Icon=preferences-system-windows.png +Terminal=false +Type=Application +Categories=Development; diff --git a/mygui-libCommon-fixup.patch b/mygui-libCommon-fixup.patch new file mode 100644 index 0000000..6f3a107 --- /dev/null +++ b/mygui-libCommon-fixup.patch @@ -0,0 +1,10 @@ +--- Common/CMakeLists.txt.orig 2016-03-05 07:17:23.175753455 -0600 ++++ Common/CMakeLists.txt 2016-03-05 07:18:03.880751014 -0600 +@@ -89,6 +89,7 @@ + endif() + + add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) ++set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) + + if(MYGUI_RENDERSYSTEM EQUAL 1) + add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform) diff --git a/mygui.spec b/mygui.spec new file mode 100644 index 0000000..2a4ace2 --- /dev/null +++ b/mygui.spec @@ -0,0 +1,438 @@ +Name: mygui +Version: 3.2.2 +%global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +Release: 16%{?dist} +Summary: Fast, simple and flexible GUI library for Ogre +# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) +License: MIT +URL: http://mygui.info/ +Source0: https://github.com/MyGUI/mygui/archive/%{commit}/mygui-%{commit}.tar.gz +# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples +Source1: MyGUI-Demos +# Another helper for the tools +Source2: MyGUI-Tools +# Demo and tools resources configuration +Source3: resources.xml +# LayoutEditor desktop entry +Source4: mygui-layouteditor.desktop +# Fix multilib and flags with cmake +Patch0: mygui_multilib_cflags.patch +# Fixup libCommon +Patch1: mygui-libCommon-fixup.patch + +BuildRequires: gcc-c++ +BuildRequires: freetype-devel, desktop-file-utils +BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix +BuildRequires: libuuid-devel, libX11-devel + +Requires: dejavu-sans-fonts + + +%description +MyGUI is a GUI library for Ogre Rendering Engine which aims to be fast, +flexible and simple in using. + +%package devel +Summary: Development files for MyGUI +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig, ois-devel, ogre-devel + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%package devel-doc +Summary: Development documentation for MyGUI +BuildArch: noarch + +%description devel-doc +The %{name}-devel-doc package contains reference documentation for +developing applications that use %{name}. + + +%package demos +Summary: MyGUI demo executables and media +Requires: %{name} = %{version}-%{release} + +%description demos +This package contains the compiled (not the source) sample applications coming +with MyGUI. It also contains some media (meshes, textures,...) needed by these +samples. The samples are installed in %{_libdir}/MYGUI/Demos, and an helper +script MyGUI-Demos is provided and installed in %{_bindir}. + + +%package tools +Summary: MyGUI tools +Requires: %{name} = %{version}-%{release} + +%description tools +This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. +LayoutEditor is an application for designing UIs using MyGUI library, +FontEditor, ImageEditor and SkinEditor are also provided. +An helper script MyGUI-Tools is provided and installed in %{_bindir}. + + +%prep +%setup -qn %{name}-%{commit} +%patch0 -p0 -b .multilib +%patch1 -p0 -b .fixup +# Fix non-UTF8 files +for file in Tools/LayoutEditor/Readme.txt ; do + dos2unix -n $file timestamp && \ + iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp && \ + touch -r timestamp $file && \ + rm timestamp +done +# Generate README for -tools and -demos +cat > Tools/README << EOT +This package contains the MyGUI tools: ImageEditor, FontEditor, +SkinEditor and LayoutEditor; to run the tools, +launch the helper script +%{_bindir}/MyGUI-Tools +EOT +cat > Demos/README << EOT +This package contains MyGUI demos; to run the demos, launch the +helper script %{_bindir}/MyGUI-Demos +EOT + +%if (%{?fedora} > 20) && (%{?fedora} < 24) +# Fedora > 20 has freetype2/freetype.h +sed -i -e 's,freetype/freetype.h,freetype2/freetype.h,' CMake/Packages/FindFreetype.cmake +%endif + +%build +# Plugins are windows only atm +%cmake . \ + -DMYGUI_INSTALL_PDB:INTERNAL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release \ + -DMYGUI_BUILD_PLUGINS:BOOL=OFF -DCMAKE_CXX_FLAGS_RELEASE= \ + -DCMAKE_SKIP_RPATH:BOOL=ON +make %{?_smp_mflags} +# Generate doxygen documentation +pushd Docs +doxygen +rm -f html/installdox +popd + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="install -p" +# install missing headers +mkdir -p %{buildroot}/%{_includedir}/MyGUI/ +install -Dp -m 644 MyGUIEngine/include/*Alloc*.h %{buildroot}/%{_includedir}/MyGUI/ +install -Dp -m 644 Platforms/Ogre/OgrePlatform/include/* %{buildroot}/%{_includedir}/MyGUI/ + +# Remove any archive +find %{buildroot} -name '*.la' -exec rm -f {} ';' +# Remove binaries installed in %%{_bindir} +rm -rf %{buildroot}/%{_bindir}/ + +# Install the samples +mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos +cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos +sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ + %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg +sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ + %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg +for file in bin/Demo_* ; do + install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file` +done +mkdir -p %{buildroot}%{_bindir} +install -Dp -m 755 %{SOURCE1} %{buildroot}%{_bindir}/ + +# Install the tools +mkdir -p %{buildroot}%{_libdir}/MYGUI/Tools +cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Tools +sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ + %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg +sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ + %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg +for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/FontEditor ; do + install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file` +done +install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}/ + +# Install desktop entry for LayoutEditor +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} + +# Copy Media files +mkdir -p %{buildroot}%{_datadir}/MyGUI/ +cp -a Media %{buildroot}%{_datadir}/MyGUI/ + +# The subpackages put stuff in this directory +mkdir -p %{buildroot}%{_libdir}/MYGUI + +# Strip away code in media dir +#rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/ +# Strip away unittests media +rm -rf %{buildroot}%{_datadir}/MyGUI/Media/UnitTests + +# Remove CMake stuff from Media +rm -f %{buildroot}%{_datadir}/MyGUI/Media/CMakeLists.txt + +# Link fonts from dejavu package +ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \ + %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans.ttf +ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \ + %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf + +# CMake hurts my brain. +cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ + + +%files +%doc COPYING.MIT +%{_libdir}/*.so.* +%dir %{_libdir}/MYGUI +%dir %{_datadir}/MyGUI +%dir %{_datadir}/MyGUI/Media +%{_datadir}/MyGUI/Media/Common +%{_datadir}/MyGUI/Media/MyGUI_Media + + +%files devel +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc + + +%files devel-doc +%doc Docs/html + + +%files demos +%doc Demos/README +%{_bindir}/MyGUI-Demos +%{_libdir}/MYGUI/Demos +%{_datadir}/MyGUI/Media/Demos +%{_datadir}/MyGUI/Media/Wrapper + + +%files tools +%doc Tools/README Tools/LayoutEditor/Readme.txt +%{_bindir}/MyGUI-Tools +%{_libdir}/MYGUI/Tools +%{_datadir}/MyGUI/Media/Tools +%{_datadir}/applications/mygui-layouteditor.desktop + + +%changelog +* Thu Jul 22 2021 Fedora Release Engineering - 3.2.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 3.2.2-15 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.2.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 3.2.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 3.2.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 3.2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jan 25 2019 Jonathan Wakely - 3.2.2-10 +- Rebuilt for Boost 1.69 + +* Fri Jul 13 2018 Fedora Release Engineering - 3.2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 3.2.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Jan 23 2018 Jonathan Wakely - 3.2.2-7 +- Rebuilt for Boost 1.66 + +* Thu Aug 03 2017 Fedora Release Engineering - 3.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Jul 21 2017 Kalev Lember - 3.2.2-4 +- Rebuilt for Boost 1.64 + +* Fri Feb 10 2017 Fedora Release Engineering - 3.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Jan 28 2017 Jonathan Wakely - 3.2.2-2 +- Rebuilt for Boost 1.63 + +* Sat Mar 05 2016 Bruno Wolff III - 3.2.2-1 +- mygui 3.2.2 +- Release notes: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.2 + +* Thu Feb 04 2016 Ralf Corsépius - 3.2.1-9 +- Reflect freetype header location having changed (F24FTBFS). +- Remove %%defattr. + +* Thu Feb 04 2016 Fedora Release Engineering - 3.2.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Aug 27 2015 Jonathan Wakely - 3.2.1-7 +- Rebuilt for Boost 1.59 + +* Wed Aug 05 2015 Jonathan Wakely 3.2.1-6 +- Rebuilt for Boost 1.58 + +* Wed Jun 17 2015 Fedora Release Engineering - 3.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri May 22 2015 Bruno Wolff III - 3.2.1-4 +- Make sure FTBFS issue is fixed + +* Mon Feb 09 2015 Bruno Wolff III - 3.2.1-3 +- Rebuild for boost update + +* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-2 +- Don't use removed find -perm option (+) in MyGUI-Demos and MyGUI-Tools + +* Tue Dec 30 2014 Bruno Wolff III - 3.2.1-1 +- License changed from LGPLv3 to MIT +- Source location changed from sourceforge to github +- Change log: https://github.com/MyGUI/mygui/releases/tag/MyGUI3.2.1 +- Adjust patches for changes to cmake files +- Fix unowned directory +- Remove obsolete ldconfig file +- The supplied tools changed +- libX11-devel is now required for building +- Obsolete BUILDROOT definition removed + +* Sun Aug 17 2014 Fedora Release Engineering - 3.2.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jun 10 2014 Ralf Corsépius - 3.2.0-10 +- Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255). +- Remove BR: autoconf, automake, libtool (unused). +- Remove BR: e2fsprogs-devel (unused). + +* Sat Jun 07 2014 Fedora Release Engineering - 3.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 David Tardon - 3.2.0-8 +- rebuild for boost 1.55.0 + +* Sat Aug 03 2013 Fedora Release Engineering - 3.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Jul 28 2013 Petr Machata - 3.2.0-6 +- Rebuild for boost 1.54.0 + +* Thu Apr 25 2013 Tom Callaway - 3.2.0-5 +- rebuild to include libCommon + +* Sun Feb 10 2013 Denis Arnaud - 3.2.0-4 +- Rebuild for Boost-1.53.0 + +* Sat Feb 09 2013 Denis Arnaud - 3.2.0-3 +- Rebuild for Boost-1.53.0 + +* Wed Dec 26 2012 Kevin Fenzi 3.2.0-2 +- Rebuild for new libCommon + +* Tue Dec 04 2012 Bruno Wolff III - 3.2.0-1 +- Update to upstream 3.2.0 +- Changelog: http://redmine.mygui.info/repositories/entry/mygui/tags/MyGUI3.2/ChangeLog.txt + +* Fri Aug 10 2012 Bruno Wolff III - 3.0.1-16 +- Rebuild for boost 1.50 + +* Fri Jul 20 2012 Fedora Release Engineering - 3.0.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 04 2012 Bruno Wolff III - 3.0.1-14 +- Rebuild for ogre 1.7.4 + +* Tue Feb 28 2012 Fedora Release Engineering - 3.0.1-13 +- Rebuilt for c++ ABI breakage + +* Tue Jan 17 2012 Bruno Wolff III - 3.0.1-12 +- Rebuild for ois 1.3 + +* Fri Jan 13 2012 Fedora Release Engineering - 3.0.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Nov 20 2011 Bruno Wolff III - 3.0.1-10 +- Rebuild for boost soname bump + +* Fri Jul 22 2011 Bruno Wolff III - 3.0.1-9 +- Rebuild for boost 1.47 + +* Sun May 15 2011 Bruno Wolff III - 3.0.1-8 +- Rebuild for ogre 1.7.3 + +* Mon May 02 2011 Kevin Fenzi - 3.0.1-7 +- Fix pc file issues. Fixes bug #693352 + +* Wed Apr 06 2011 Bruno Wolff III - 3.0.1-6 +- Rebuild for boost soname bump to 1.46.1 in rawhide. + +* Tue Feb 08 2011 Fedora Release Engineering - 3.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Feb 07 2011 Thomas Spura - 3.0.1-4 +- rebuild for new boost + +* Sat Jan 08 2011 Bruno Wolff III - 3.0.1-3 +- Clean up a few more rpmlint warnings + +* Sat Jan 08 2011 Bruno Wolff III - 3.0.1-2 +- Try to fix rpath issue + +* Fri Jan 07 2011 Bruno Wolff III - 3.0.1-1 +- Update to 3.0.1 release +- Rebuild for ogre update + +* Fri Nov 27 2009 Guido Grazioli - 3.0.0-0.4.2332svn +- Install OGRE platform headers + +* Wed Nov 18 2009 Guido Grazioli - 3.0.0-0.3.2332svn +- Fix macros usage +- Fix Release tag +- Add desktop entry for LayoutEditor +- Update patch to fix missing undefined non-weak symbols +- Improve summaries and descriptions +- Remove redundant VERBOSE flag +- Add graphviz BR to generate doxygen graphs + +* Fri Oct 30 2009 Guido Grazioli - 3.0.0-2.2332svn +- Fix includes dir +- Remove plugin + +* Fri Oct 23 2009 Guido Grazioli - 3.0.0-1.2332svn +- Upstream to svn revision 2332 +- Patch cmake build scripts to support multilib +- Fix package summaries +- Fix changelog +- Fix %%doc +- Add Require: ogre-devel to -devel subpackage +- Add -devel-doc subpackage +- Revert source tarball from xz to bzip2 + +* Sat Oct 03 2009 Guido Grazioli - 2.3.0-4.1861svn +- Add BR: rpm >= 4.6.1-2 needed for F-10 builds (BZ #514480) + +* Thu Oct 01 2009 Guido Grazioli - 2.3.0-3.1861svn +- Improve package summary +- Provide scripts to run MyGUI tools + +* Wed Sep 30 2009 Guido Grazioli - 2.3.0-2.1861svn +- Add BR: libuuid-devel instead of BR: e2fsprogs-devel for F12+ +- Fix License + +* Tue Sep 29 2009 Guido Grazioli - 2.3.0-1.1861svn +- Rename from libmygui to mygui +- Symlink fonts in media dir to dejavu-sans-fonts ones +- Add doxygen generated docs to -devel +- Provide a generic script to setup and run demos +- Fix rpmlint warnings + +* Mon Sep 28 2009 Guido Grazioli - 2.3.0-0.1861svn +- Initial packaging diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch new file mode 100644 index 0000000..77370b4 --- /dev/null +++ b/mygui_multilib_cflags.patch @@ -0,0 +1,125 @@ +--- CMakeLists.txt.orig 2016-03-05 07:12:23.873771406 -0600 ++++ CMakeLists.txt 2016-03-05 07:15:14.743761158 -0600 +@@ -85,8 +85,8 @@ + set(MYGUI_LIBRARIES MyGUIEngine) + + # Specify build paths +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) + if (WIN32 OR APPLE) + if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) +@@ -181,35 +181,35 @@ + # Set compiler specific build flags + if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") + if (NOT MYGUI_HIGH_LEVEL_WARNINGS) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") + else () + if (MYGUI_RENDERSYSTEM EQUAL 3) + # to avoid warnings from OGRE +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") + endif () + if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) + # to avoid warnings from OIS +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") + endif () + + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") + # might be useful +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") + # not useful +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") + else () + # very interesting option, but way too many warnings + #add_definitions(-Weffc++) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") + if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Intel") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") + endif () + + # MyGUI_UString.h ignored from warnings because of this +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") ++# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") + endif () + endif () + endif () +--- CMake/Utils/MyGUIConfigTargets.cmake.orig 2016-03-05 10:59:52.896952810 -0600 ++++ CMake/Utils/MyGUIConfigTargets.cmake 2016-03-05 10:49:28.588990252 -0600 +@@ -61,26 +61,26 @@ + function(mygui_install_target TARGETNAME SUFFIX) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" +- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" +- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None "" + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo +- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo +- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel +- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel +- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel + ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug +- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug +- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug + FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug + ) + endfunction(mygui_install_target) +@@ -430,12 +430,12 @@ + if (MYGUI_INSTALL_PDB) + # install debug pdb files + if (MYGUI_STATIC) +- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb +- DESTINATION lib${MYGUI_LIB_DEBUG_PATH} ++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb ++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH} + CONFIGURATIONS Debug + ) +- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb +- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH} ++ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb ++ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH} + CONFIGURATIONS RelWithDebInfo + ) + else () +--- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600 ++++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600 +@@ -47,7 +47,7 @@ + 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 lib${LIB_SUFFIX}/pkgconfig) + + # configure additional packages + diff --git a/resources.xml b/resources.xml new file mode 100644 index 0000000..569d089 --- /dev/null +++ b/resources.xml @@ -0,0 +1,7 @@ + + + + /usr/share/MyGUI/Media + /usr/share/MyGUI/Media/MyGUI_Media + /usr/share/MyGUI/Media/Tools/LayoutEditor + diff --git a/sources b/sources new file mode 100644 index 0000000..10dc1d0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +3e5e63cce16192db8db0b5f8b84237d4 mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz From 7453b8822b9280f48192887912db761a7934172c Mon Sep 17 00:00:00 2001 From: Chapien Date: Tue, 8 Jul 2025 07:28:19 -0700 Subject: [PATCH 71/75] Unretiring mygui. Changed specfile to reflect modern mygui. - Source now points to new upstream repo - Desktop files created for other tools - Built using openGL instead of OGRE now - No longer build demos. Might build demos again later. --- .gitignore | 1 + MyGUI-Demos | 49 ------- MyGUI-Tools | 21 ++- mygui-fonteditor.desktop | 11 ++ mygui-imageeditor.desktop | 11 ++ mygui-layouteditor.desktop | 10 +- mygui-libCommon-fixup.patch | 10 -- mygui-skineditor.desktop | 11 ++ mygui.spec | 280 ++++++++++++++++-------------------- mygui_multilib_cflags.patch | 125 ---------------- resources.xml | 5 +- sources | 2 +- 12 files changed, 171 insertions(+), 365 deletions(-) delete mode 100644 MyGUI-Demos create mode 100644 mygui-fonteditor.desktop create mode 100644 mygui-imageeditor.desktop delete mode 100644 mygui-libCommon-fixup.patch create mode 100644 mygui-skineditor.desktop delete mode 100644 mygui_multilib_cflags.patch diff --git a/.gitignore b/.gitignore index 8ac56fd..8c97cf9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ mygui-2.3.0-2332svn.tar.bz2 /MyGUI_3.2.0.zip /mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz /mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz +/mygui-MyGUI3.4.3.tar.gz diff --git a/MyGUI-Demos b/MyGUI-Demos deleted file mode 100644 index 3777ae5..0000000 --- a/MyGUI-Demos +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. - -runSample() -{ - sample=$1 - echo "Running $sample..." - $LIBDIR/MYGUI/Demos/$sample -} - -set -e - -# find out LIBDIR -if [ -f /usr/lib64/MYGUI/Demos/resources.xml ]; then - LIBDIR=/usr/lib64 -else - LIBDIR=/usr/lib -fi - -mkdir -p $HOME/.mygui-demos -cd $HOME/.mygui-demos - -for i in plugins.cfg resources.xml; do - cp -f $LIBDIR/MYGUI/Demos/$i . -done - -set +e - -if [ "$1" = "-a" ]; then - for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do - runSample `echo $i | sed 's|./||'` - done -elif [ $# -ge 1 ]; then - while [ $# -ge 1 ]; do - runSample $1 - shift - done -else - echo "Usage:" `basename $0` "[-a] [sample [...]]" - echo " -a : Run all samples installed to $LIBDIR/MYGUI/Demos/" - echo " sample : Run the sample(s) named 'sample' (see list bellow)" - echo - echo -n "Available samples:" - echo - for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm /111 | sort)`; do - echo " * $i" | sed 's|./||' - done - echo -fi diff --git a/MyGUI-Tools b/MyGUI-Tools index d9e66a4..d9073f2 100644 --- a/MyGUI-Tools +++ b/MyGUI-Tools @@ -1,33 +1,28 @@ #!/bin/sh # Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package. +DATADIR=/usr/share + runSample() { sample=$1 echo "Running $sample..." - $LIBDIR/MYGUI/Tools/$sample + $DATADIR/MYGUI/Tools/$sample } set -e -# find out LIBDIR -if [ -f /usr/lib64/MYGUI/Tools/resources.xml ]; then - LIBDIR=/usr/lib64 -else - LIBDIR=/usr/lib -fi - mkdir -p $HOME/.mygui-tools cd $HOME/.mygui-tools -for i in plugins.cfg resources.xml; do - cp -f $LIBDIR/MYGUI/Tools/$i . +for i in resources.xml; do + cp -f $DATADIR/MYGUI/Tools/$i . done set +e if [ "$1" = "-a" ]; then - for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do + for i in `(cd $DATADIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do runSample `echo $i | sed 's|./||'` done elif [ $# -ge 1 ]; then @@ -37,14 +32,14 @@ elif [ $# -ge 1 ]; then done else echo "Usage:" `basename $0` "[-a] [tool [...]]" - echo " -a : Run all tools installed to $LIBDIR/MYGUI/Tools/" + echo " -a : Run all tools installed to $DATADIR/MYGUI/Tools/" echo " sample : Run the tool(s) named 'tool' (see list bellow)" echo echo "tool - Runs specified tool from list" echo echo -n "Available tools:" echo - for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do + for i in `(cd $DATADIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do echo " * $i" | sed 's|./||' done echo diff --git a/mygui-fonteditor.desktop b/mygui-fonteditor.desktop new file mode 100644 index 0000000..4f0d2a4 --- /dev/null +++ b/mygui-fonteditor.desktop @@ -0,0 +1,11 @@ +# Created with jdDesktopEntryEdit 1.6 +[Desktop Entry] +Type=Application +Name=MyGUI Font Editor +GenericName=MyGUI Font Editor +Comment=Design Fonts using MyGUI library +Icon=mygui_fe +Exec=MyGUI-Tools FontEditor +Categories=Development; +StartupNotify=true +StartupWMClass=FontEditor \ No newline at end of file diff --git a/mygui-imageeditor.desktop b/mygui-imageeditor.desktop new file mode 100644 index 0000000..bbf5301 --- /dev/null +++ b/mygui-imageeditor.desktop @@ -0,0 +1,11 @@ +# Created with jdDesktopEntryEdit 1.6 +[Desktop Entry] +Type=Application +Name=MyGUI Image Editor +GenericName=MyGUI Image Editor +Comment=Edit Images using MyGUI library +Icon=mygui_ie +Exec=MyGUI-Tools ImageEditor +Categories=Development; +StartupNotify=true +StartupWMClass=ImageEditor \ No newline at end of file diff --git a/mygui-layouteditor.desktop b/mygui-layouteditor.desktop index 4bb4efa..87593cd 100644 --- a/mygui-layouteditor.desktop +++ b/mygui-layouteditor.desktop @@ -1,9 +1,11 @@ +# Created with jdDesktopEntryEdit 1.6 [Desktop Entry] +Type=Application Name=MyGUI Layout Editor GenericName=MyGUI Layout Editor -Comment=Design UIs usgin MyGUI library +Comment=Design UIs using MyGUI library +Icon=mygui_le Exec=MyGUI-Tools LayoutEditor -Icon=preferences-system-windows.png -Terminal=false -Type=Application Categories=Development; +StartupNotify=true +StartupWMClass=LayoutEditor \ No newline at end of file diff --git a/mygui-libCommon-fixup.patch b/mygui-libCommon-fixup.patch deleted file mode 100644 index 6f3a107..0000000 --- a/mygui-libCommon-fixup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Common/CMakeLists.txt.orig 2016-03-05 07:17:23.175753455 -0600 -+++ Common/CMakeLists.txt 2016-03-05 07:18:03.880751014 -0600 -@@ -89,6 +89,7 @@ - endif() - - add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) -+set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) - - if(MYGUI_RENDERSYSTEM EQUAL 1) - add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform) diff --git a/mygui-skineditor.desktop b/mygui-skineditor.desktop new file mode 100644 index 0000000..6974a8b --- /dev/null +++ b/mygui-skineditor.desktop @@ -0,0 +1,11 @@ +# Created with jdDesktopEntryEdit 1.6 +[Desktop Entry] +Type=Application +Name=MyGUI Skin Editor +GenericName=MyGUI Skin Editor +Comment=Design Skins using MyGUI library +Icon=mygui_se +Exec=MyGUI-Tools SkinEditor +Categories=Development; +StartupNotify=true +StartupWMClass=SkinEditor \ No newline at end of file diff --git a/mygui.spec b/mygui.spec index 2a4ace2..41042d6 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,42 +1,47 @@ Name: mygui -Version: 3.2.2 -%global commit 8a05127d7c5bb6772df88185b1f99d8052c379a4 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 16%{?dist} -Summary: Fast, simple and flexible GUI library for Ogre -# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) +Version: 3.4.3 +Release: %autorelease +Summary: Fast, simple and flexible GUI library for games and 3D applications. License: MIT URL: http://mygui.info/ -Source0: https://github.com/MyGUI/mygui/archive/%{commit}/mygui-%{commit}.tar.gz -# Helper to run demos, based on A. Torkhov Ogre-Samples shipped with ogre-samples -Source1: MyGUI-Demos -# Another helper for the tools -Source2: MyGUI-Tools +Source0: https://github.com/MyGUI/mygui/archive/MyGUI%{version}/mygui-MyGUI%{version}.tar.gz # Demo and tools resources configuration -Source3: resources.xml -# LayoutEditor desktop entry -Source4: mygui-layouteditor.desktop -# Fix multilib and flags with cmake -Patch0: mygui_multilib_cflags.patch -# Fixup libCommon -Patch1: mygui-libCommon-fixup.patch +Source1: resources.xml +# Script to run MyGui tools +Source2: MyGUI-Tools +# Desktop files +Source3: mygui-layouteditor.desktop +Source4: mygui-imageeditor.desktop +Source5: mygui-fonteditor.desktop +Source6: mygui-skineditor.desktop +BuildRequires: cmake +BuildRequires: cmake(SDL2) +BuildRequires: desktop-file-utils +BuildRequires: dos2unix +BuildRequires: doxygen +BuildRequires: freetype-devel BuildRequires: gcc-c++ -BuildRequires: freetype-devel, desktop-file-utils -BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix -BuildRequires: libuuid-devel, libX11-devel +BuildRequires: glew-devel +BuildRequires: graphviz +BuildRequires: libuuid-devel +BuildRequires: libX11-devel +BuildRequires: mesa-libGL-devel +BuildRequires: ninja-build +BuildRequires: ois-devel +BuildRequires: SDL2_image-devel Requires: dejavu-sans-fonts - %description -MyGUI is a GUI library for Ogre Rendering Engine which aims to be fast, -flexible and simple in using. +MyGUI is a cross-platform library for creating graphical user interfaces (GUIs) for games and 3D applications. %package devel Summary: Development files for MyGUI -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig, ois-devel, ogre-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: mesa-libGL-devel +Requires: ois-devel +Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for @@ -51,183 +56,138 @@ BuildArch: noarch The %{name}-devel-doc package contains reference documentation for developing applications that use %{name}. - -%package demos -Summary: MyGUI demo executables and media -Requires: %{name} = %{version}-%{release} - -%description demos -This package contains the compiled (not the source) sample applications coming -with MyGUI. It also contains some media (meshes, textures,...) needed by these -samples. The samples are installed in %{_libdir}/MYGUI/Demos, and an helper -script MyGUI-Demos is provided and installed in %{_bindir}. - - %package tools Summary: MyGUI tools -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description tools -This package contains the MyGUI tools, installed in %{_libdir}/MYGUI/Tools. +This package contains the MyGUI tools, installed in %{_bindir}. LayoutEditor is an application for designing UIs using MyGUI library, -FontEditor, ImageEditor and SkinEditor are also provided. -An helper script MyGUI-Tools is provided and installed in %{_bindir}. - +FontEditor, ImageEditor and SkinEditor are also provided. They are +renamed to be prefixed with mygui (ie mygui-LayoutEditor) %prep -%setup -qn %{name}-%{commit} -%patch0 -p0 -b .multilib -%patch1 -p0 -b .fixup -# Fix non-UTF8 files -for file in Tools/LayoutEditor/Readme.txt ; do - dos2unix -n $file timestamp && \ - iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp && \ - touch -r timestamp $file && \ - rm timestamp -done -# Generate README for -tools and -demos -cat > Tools/README << EOT -This package contains the MyGUI tools: ImageEditor, FontEditor, -SkinEditor and LayoutEditor; to run the tools, -launch the helper script -%{_bindir}/MyGUI-Tools -EOT -cat > Demos/README << EOT -This package contains MyGUI demos; to run the demos, launch the -helper script %{_bindir}/MyGUI-Demos -EOT +%setup -qn %{name}-MyGUI%{version} -%if (%{?fedora} > 20) && (%{?fedora} < 24) -# Fedora > 20 has freetype2/freetype.h -sed -i -e 's,freetype/freetype.h,freetype2/freetype.h,' CMake/Packages/FindFreetype.cmake -%endif %build -# Plugins are windows only atm -%cmake . \ - -DMYGUI_INSTALL_PDB:INTERNAL=FALSE -DCMAKE_BUILD_TYPE:STRING=Release \ - -DMYGUI_BUILD_PLUGINS:BOOL=OFF -DCMAKE_CXX_FLAGS_RELEASE= \ - -DCMAKE_SKIP_RPATH:BOOL=ON -make %{?_smp_mflags} -# Generate doxygen documentation +%cmake -G Ninja \ + -DMYGUI_BUILD_DEMOS=FALSE \ + -DMYGUI_BUILD_DOCS=TRUE \ + -DMYGUI_BUILD_PLUGINS=OFF \ + -DMYGUI_BUILD_TOOLS=TRUE \ + -DMYGUI_DONT_USE_OBSOLETE=ON \ + -DMYGUI_INSTALL_DEMOS=FALSE \ + -DMYGUI_INSTALL_DOCS=TRUE \ + -DMYGUI_INSTALL_PDB=FALSE \ + -DMYGUI_INSTALL_TOOLS=TRUE \ + -DMYGUI_RENDERSYSTEM=4 \ + -DMYGUI_USE_SYSTEM_GLEW=TRUE +%cmake_build +cd %{_vpath_builddir} pushd Docs doxygen -rm -f html/installdox popd - %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="install -p" -# install missing headers -mkdir -p %{buildroot}/%{_includedir}/MyGUI/ -install -Dp -m 644 MyGUIEngine/include/*Alloc*.h %{buildroot}/%{_includedir}/MyGUI/ -install -Dp -m 644 Platforms/Ogre/OgrePlatform/include/* %{buildroot}/%{_includedir}/MyGUI/ - -# Remove any archive -find %{buildroot} -name '*.la' -exec rm -f {} ';' -# Remove binaries installed in %%{_bindir} -rm -rf %{buildroot}/%{_bindir}/ - -# Install the samples -mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos -cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos -sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ - %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg -sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ - %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg -for file in bin/Demo_* ; do - install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file` -done -mkdir -p %{buildroot}%{_bindir} -install -Dp -m 755 %{SOURCE1} %{buildroot}%{_bindir}/ - -# Install the tools -mkdir -p %{buildroot}%{_libdir}/MYGUI/Tools -cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Tools -sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \ - %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg -sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \ - %{buildroot}%{_libdir}/MYGUI/Tools/plugins.cfg -for file in bin/LayoutEditor bin/ImageEditor bin/SkinEditor bin/FontEditor ; do - install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Tools/`basename $file` -done -install -Dp -m 755 %{SOURCE2} %{buildroot}%{_bindir}/ +%cmake_install +install -d %{buildroot}%{_datadir}/doc/mygui-devel-doc/html +install -d %{buildroot}%{_datadir}/MYGUI/Tools +install -D %{_vpath_builddir}/Docs/html/* %{buildroot}%{_datadir}/doc/mygui-devel-doc/html # Install desktop entry for LayoutEditor +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE3} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} +desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE6} -# Copy Media files -mkdir -p %{buildroot}%{_datadir}/MyGUI/ -cp -a Media %{buildroot}%{_datadir}/MyGUI/ +# Replace resources.xml with our version of it +rm -f %{buildroot}%{_bindir}/resources.xml +install %{SOURCE1} %{buildroot}%{_datadir}/MYGUI/Tools/resources.xml -# The subpackages put stuff in this directory -mkdir -p %{buildroot}%{_libdir}/MYGUI +# Move tools out of bin and into datadir/tools +mv %{buildroot}%{_bindir}/ImageEditor %{buildroot}%{_datadir}/MYGUI/Tools/ImageEditor +mv %{buildroot}%{_bindir}/FontEditor %{buildroot}%{_datadir}/MYGUI/Tools/FontEditor +mv %{buildroot}%{_bindir}/LayoutEditor %{buildroot}%{_datadir}/MYGUI/Tools/LayoutEditor +mv %{buildroot}%{_bindir}/SkinEditor %{buildroot}%{_datadir}/MYGUI/Tools/SkinEditor + +# Install our handy tools script +install -Dpm755 %{SOURCE2} %{buildroot}%{_bindir}/MyGUI-Tools -# Strip away code in media dir -#rm -rf %{buildroot}%{_datadir}/MyGUI/Media/Tools/LayoutEditor/CodeTemplates/ # Strip away unittests media -rm -rf %{buildroot}%{_datadir}/MyGUI/Media/UnitTests +rm -rf %{buildroot}%{_datadir}/MYGUI/Media/UnitTests # Remove CMake stuff from Media -rm -f %{buildroot}%{_datadir}/MyGUI/Media/CMakeLists.txt +rm -f %{buildroot}%{_datadir}/MYGUI/Media/CMakeLists.txt # Link fonts from dejavu package -ln -fs %{_datadir}/fonts/dejavu/DejaVuSans.ttf \ - %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans.ttf -ln -fs %{_datadir}/fonts/dejavu/DejaVuSans-ExtraLight.ttf \ - %{buildroot}%{_datadir}/MyGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf +ln -fs %{_datadir}/fonts/dejavu-sans-fonts/DejaVuSans.ttf \ + %{buildroot}%{_datadir}/MYGUI/Media/MyGUI_Media/DejaVuSans.ttf +ln -fs %{_datadir}/fonts/dejavu-sans-fonts/DejaVuSans-ExtraLight.ttf \ + %{buildroot}%{_datadir}/MYGUI/Media/MyGUI_Media/DejaVuSans-ExtraLight.ttf -# CMake hurts my brain. -cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ +# Move icons to appropriate directory +for size in 16 24 32 48 96 256 ; do + install -Dpm644 Media/Common/Sources/Icons/MyGUI_Icon_FE_${size}x${size}.png %{buildroot}%{_iconsdir}/hicolor/${size}x${size}/apps/mygui_fe.png + install -Dpm644 Media/Common/Sources/Icons/MyGUI_Icon_IE_${size}x${size}.png %{buildroot}%{_iconsdir}/hicolor/${size}x${size}/apps/mygui_ie.png + install -Dpm644 Media/Common/Sources/Icons/MyGUI_Icon_SE_${size}x${size}.png %{buildroot}%{_iconsdir}/hicolor/${size}x${size}/apps/mygui_se.png +done +# Layout Editor is missing 32x32 icons, so we're doing them seperately. +for size in 16 24 48 96 256 ; do + install -Dpm644 Media/Common/Sources/Icons/MyGUI_Icon_LE_${size}x${size}.png %{buildroot}%{_iconsdir}/hicolor/${size}x${size}/apps/mygui_le.png +done + +%check +%ctest %files -%doc COPYING.MIT -%{_libdir}/*.so.* -%dir %{_libdir}/MYGUI -%dir %{_datadir}/MyGUI -%dir %{_datadir}/MyGUI/Media -%{_datadir}/MyGUI/Media/Common -%{_datadir}/MyGUI/Media/MyGUI_Media - +%license COPYING.MIT +%doc README.md +%{_libdir}/libMyGUICommon.so.%{version} +%{_libdir}/libMyGUIEngine.so.%{version} +%dir %{_datadir}/MYGUI +%dir %{_datadir}/MYGUI/Media +%{_datadir}/MYGUI/Media/Common +%{_datadir}/MYGUI/Media/MyGUI_Media +%{_datadir}/MYGUI/Media/Wrapper %files devel -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc - +%{_includedir}/MYGUI +%{_libdir}/libEditorFramework.so +%{_libdir}/libMyGUI.OpenGLPlatform.so +%{_libdir}/libMyGUICommon.so +%{_libdir}/libMyGUIEngine.so +%{_libdir}/pkgconfig/MYGUI.pc %files devel-doc %doc Docs/html - -%files demos -%doc Demos/README -%{_bindir}/MyGUI-Demos -%{_libdir}/MYGUI/Demos -%{_datadir}/MyGUI/Media/Demos -%{_datadir}/MyGUI/Media/Wrapper - - %files tools -%doc Tools/README Tools/LayoutEditor/Readme.txt +%doc Tools/Readme.txt Tools/LayoutEditor/Readme.txt %{_bindir}/MyGUI-Tools -%{_libdir}/MYGUI/Tools -%{_datadir}/MyGUI/Media/Tools +%{_datadir}/MYGUI/Tools/resources.xml +%{_datadir}/MYGUI/Tools/LayoutEditor +%{_datadir}/MYGUI/Tools/ImageEditor +%{_datadir}/MYGUI/Tools/FontEditor +%{_datadir}/MYGUI/Tools/SkinEditor +%{_datadir}/MYGUI/Media/Tools +%{_datadir}/MYGUI/Media/Demos +%{_iconsdir}/hicolor/*/apps/mygui_*.png %{_datadir}/applications/mygui-layouteditor.desktop +%{_datadir}/applications/mygui-skineditor.desktop +%{_datadir}/applications/mygui-fonteditor.desktop +%{_datadir}/applications/mygui-imageeditor.desktop %changelog -* Thu Jul 22 2021 Fedora Release Engineering - 3.2.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +%autochangelog +* Tue Jun 25 2025 Claire Robsahm - 3.4.3-4 +- Made libraries and icons explicit rather than wildcard. +- Removed unnecessary dependencies and sorted them alphabetically. -* Sat Aug 01 2020 Fedora Release Engineering - 3.2.2-15 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 3.2.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Mon Jun 09 2025 Claire Robsahm - 3.4.3-1 +- Updated to 3.4.3. Build using OpenGL instead of OGRE. * Wed Jan 29 2020 Fedora Release Engineering - 3.2.2-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch deleted file mode 100644 index 77370b4..0000000 --- a/mygui_multilib_cflags.patch +++ /dev/null @@ -1,125 +0,0 @@ ---- CMakeLists.txt.orig 2016-03-05 07:12:23.873771406 -0600 -+++ CMakeLists.txt 2016-03-05 07:15:14.743761158 -0600 -@@ -85,8 +85,8 @@ - set(MYGUI_LIBRARIES MyGUIEngine) - - # Specify build paths --set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) --set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) -+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) -+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) - if (WIN32 OR APPLE) - if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -@@ -181,35 +181,35 @@ - # Set compiler specific build flags - if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") - if (NOT MYGUI_HIGH_LEVEL_WARNINGS) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") - else () - if (MYGUI_RENDERSYSTEM EQUAL 3) - # to avoid warnings from OGRE -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") - endif () - if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) - # to avoid warnings from OIS -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OIS_INCLUDE_DIR}") - endif () - - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") - # might be useful -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-sign-conversion -Wno-conversion -Wno-c++11-extensions -Wno-documentation -Wno-old-style-cast") - # not useful -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-float-equal -Wno-padded -Wno-padded -Wno-weak-vtables -Wno-duplicate-enum -Wno-exit-time-destructors -Wno-unused-parameter -Wno-global-constructors") - else () - # very interesting option, but way too many warnings - #add_definitions(-Weffc++) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") - if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Intel") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wctor-dtor-privacy") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-show-option") - endif () - - # MyGUI_UString.h ignored from warnings because of this -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") - endif () - endif () - endif () ---- CMake/Utils/MyGUIConfigTargets.cmake.orig 2016-03-05 10:59:52.896952810 -0600 -+++ CMake/Utils/MyGUIConfigTargets.cmake 2016-03-05 10:49:28.588990252 -0600 -@@ -61,26 +61,26 @@ - function(mygui_install_target TARGETNAME SUFFIX) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None "" - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel -- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug -- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug - ) - endfunction(mygui_install_target) -@@ -430,12 +430,12 @@ - if (MYGUI_INSTALL_PDB) - # install debug pdb files - if (MYGUI_STATIC) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -- DESTINATION lib${MYGUI_LIB_DEBUG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH} - CONFIGURATIONS Debug - ) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH} - CONFIGURATIONS RelWithDebInfo - ) - else () ---- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600 -+++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600 -@@ -47,7 +47,7 @@ - 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 lib${LIB_SUFFIX}/pkgconfig) - - # configure additional packages - diff --git a/resources.xml b/resources.xml index 569d089..feb7f0f 100644 --- a/resources.xml +++ b/resources.xml @@ -1,7 +1,6 @@ - /usr/share/MyGUI/Media - /usr/share/MyGUI/Media/MyGUI_Media - /usr/share/MyGUI/Media/Tools/LayoutEditor + /usr/share/MYGUI/Media + /usr/share/MYGUI/Media/MyGUI_Media diff --git a/sources b/sources index 10dc1d0..eb9a966 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e5e63cce16192db8db0b5f8b84237d4 mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz +SHA512 (mygui-MyGUI3.4.3.tar.gz) = 88c69ca2e706af364b72d425f95013eb285501881d8094f8d67e31a54c45ca11b0eb5b62c382af0d4c43f69aa8197648259ac306b72efa7ef3e25eecb9b039cb From 31a871c5249ca927ec79bd95c0c8d53c42a129c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:32:12 +0000 Subject: [PATCH 72/75] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 841fed546c25004bbc8eb8cbef568364125db36c Mon Sep 17 00:00:00 2001 From: Chapien Date: Fri, 25 Jul 2025 22:55:58 -0700 Subject: [PATCH 73/75] gitignore update --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 8c97cf9..2e86e48 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ mygui-2.3.0-2332svn.tar.bz2 /mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz /mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz /mygui-MyGUI3.4.3.tar.gz + +bodhi.** +**.src.rpm From 3e232207a754f13955243fc60ad15f277edcb9f4 Mon Sep 17 00:00:00 2001 From: Chapien Date: Fri, 25 Jul 2025 23:04:40 -0700 Subject: [PATCH 74/75] cleaned up --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2e86e48..0f25d1d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,7 @@ mygui-2.3.0-2332svn.tar.bz2 /mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz /mygui-MyGUI3.4.3.tar.gz +Makefile +.cvsignore bodhi.** **.src.rpm From 1228281b0cbf55838b17976df64dece25c299906 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 29 Jul 2025 21:00:00 +0200 Subject: [PATCH 75/75] move two shared libraries from -devel to main package - add missing SONAME to libMyGUI.OpenGLPlatform.so --- mygui-add-missing-soname.patch | 11 +++++++++++ mygui.spec | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 mygui-add-missing-soname.patch diff --git a/mygui-add-missing-soname.patch b/mygui-add-missing-soname.patch new file mode 100644 index 0000000..c030be0 --- /dev/null +++ b/mygui-add-missing-soname.patch @@ -0,0 +1,11 @@ +diff -up mygui-MyGUI3.4.3/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt.orig mygui-MyGUI3.4.3/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt +--- mygui-MyGUI3.4.3/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt.orig 2023-08-06 23:45:08.000000000 +0200 ++++ mygui-MyGUI3.4.3/Platforms/OpenGL/OpenGLPlatform/CMakeLists.txt 2025-07-29 20:49:36.561869888 +0200 +@@ -41,6 +41,7 @@ link_directories(${OPENGL_LIB_DIR}) + install(FILES ${HEADER_FILES} + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/MYGUI" + ) ++set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION "${MYGUI_VERSION_MAJOR}.${MYGUI_VERSION_MINOR}.${MYGUI_VERSION_PATCH}") + mygui_install_target(${PROJECTNAME} "") + + if (MYGUI_HIGH_LEVEL_WARNINGS) diff --git a/mygui.spec b/mygui.spec index 41042d6..c73c711 100644 --- a/mygui.spec +++ b/mygui.spec @@ -14,6 +14,7 @@ Source3: mygui-layouteditor.desktop Source4: mygui-imageeditor.desktop Source5: mygui-fonteditor.desktop Source6: mygui-skineditor.desktop +Patch0: mygui-add-missing-soname.patch BuildRequires: cmake BuildRequires: cmake(SDL2) @@ -68,6 +69,7 @@ renamed to be prefixed with mygui (ie mygui-LayoutEditor) %prep %setup -qn %{name}-MyGUI%{version} +%patch -P0 -p1 -b .orig %build @@ -144,6 +146,8 @@ done %files %license COPYING.MIT %doc README.md +%{_libdir}/libEditorFramework.so +%{_libdir}/libMyGUI.OpenGLPlatform.so.%{version} %{_libdir}/libMyGUICommon.so.%{version} %{_libdir}/libMyGUIEngine.so.%{version} %dir %{_datadir}/MYGUI @@ -154,7 +158,6 @@ done %files devel %{_includedir}/MYGUI -%{_libdir}/libEditorFramework.so %{_libdir}/libMyGUI.OpenGLPlatform.so %{_libdir}/libMyGUICommon.so %{_libdir}/libMyGUIEngine.so