From 9889d439b58930b3c2f324b3e229467ba79cf742 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:49 +0200 Subject: [PATCH 01/19] 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 02/19] - 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 03/19] 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 04/19] 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 05/19] - 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 06/19] - 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 07/19] - 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 08/19] - 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 09/19] - 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 10/19] 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 11/19] 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 12/19] - 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 13/19] 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 14/19] 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 15/19] 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 16/19] 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 17/19] 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 18/19] 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 19/19] 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