13 changed files with 365 additions and 190 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,9 +3,3 @@ 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
-
-Makefile
-.cvsignore
-bodhi.**
-**.src.rpm
--- a/49
+++ b/49
@ -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
--- a/21
+++ b/21
@ -1,28 +1,33 @@
 #!/bin/sh
 # Based on Ogre-Samples by Alexey Torkhov shipped with ogre-samples package.

-DATADIR=/usr/share
-
 runSample()
 {
  sample=$1
  echo "Running $sample..."
-  $DATADIR/MYGUI/Tools/$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 resources.xml; do
-  cp -f $DATADIR/MYGUI/Tools/$i .
+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 $DATADIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do
+  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do
    runSample `echo $i | sed 's|./||'`
  done
 elif [ $# -ge 1 ]; then
@ -32,14 +37,14 @@ elif [ $# -ge 1 ]; then
  done
 else
  echo "Usage:" `basename $0` "[-a] [tool [...]]"
-  echo "  -a     : Run all tools installed to $DATADIR/MYGUI/Tools/"
+  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 $DATADIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do
+  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do
    echo "  * $i" | sed 's|./||'
  done
  echo
--- a/mygui-add-missing-soname.patch
+++ b/mygui-add-missing-soname.patch
@ -1,11 +0,0 @@
-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)
--- a/mygui-fonteditor.desktop
+++ b/mygui-fonteditor.desktop
@ -1,11 +0,0 @@
-# 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
--- a/mygui-imageeditor.desktop
+++ b/mygui-imageeditor.desktop
@ -1,11 +0,0 @@
-# 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
--- a/mygui-layouteditor.desktop
+++ b/mygui-layouteditor.desktop
@ -1,11 +1,9 @@
-# Created with jdDesktopEntryEdit 1.6
 [Desktop Entry]
-Type=Application
 Name=MyGUI Layout Editor
 GenericName=MyGUI Layout Editor
-Comment=Design UIs using MyGUI library
-Icon=mygui_le
+Comment=Design UIs usgin MyGUI library
 Exec=MyGUI-Tools LayoutEditor
+Icon=preferences-system-windows.png
+Terminal=false
+Type=Application
 Categories=Development;
-StartupNotify=true
-StartupWMClass=LayoutEditor
--- a/mygui-libCommon-fixup.patch
+++ 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)
--- a/mygui-skineditor.desktop
+++ b/mygui-skineditor.desktop
@ -1,11 +0,0 @@
-# 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
--- a/mygui.spec
+++ b/mygui.spec
@ -1,48 +1,42 @@
 Name:           mygui
-Version:        3.4.3
-Release:        %autorelease
-Summary:        Fast, simple and flexible GUI library for games and 3D applications.
+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/MyGUI%{version}/mygui-MyGUI%{version}.tar.gz
-# Demo and tools resources configuration
-Source1:        resources.xml
-# Script to run MyGui tools
+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
-# Desktop files
-Source3:        mygui-layouteditor.desktop
-Source4:        mygui-imageeditor.desktop
-Source5:        mygui-fonteditor.desktop
-Source6:        mygui-skineditor.desktop
-Patch0:         mygui-add-missing-soname.patch
+# 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:  cmake
-BuildRequires:  cmake(SDL2)
-BuildRequires:  desktop-file-utils
-BuildRequires:  dos2unix
-BuildRequires:  doxygen
-BuildRequires:  freetype-devel 
 BuildRequires:  gcc-c++
-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
+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 cross-platform library for creating graphical user interfaces (GUIs) for games and 3D applications.
+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}%{?_isa} = %{version}-%{release}
-Requires:       mesa-libGL-devel
-Requires:       ois-devel
-Requires:       pkgconfig
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig, ois-devel, ogre-devel

 %description    devel
 The %{name}-devel package contains libraries and header files for
@ -57,140 +51,183 @@ 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}%{?_isa} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}

 %description tools
-This package contains the MyGUI tools, installed in %{_bindir}. 
+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. They are
-renamed to be prefixed with mygui (ie mygui-LayoutEditor)
+FontEditor, ImageEditor and SkinEditor are also provided.
+An helper script MyGUI-Tools is provided and installed in %{_bindir}.
+

 %prep
-%setup -qn %{name}-MyGUI%{version}
-%patch -P0 -p1 -b .orig
+%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
-%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}
+# 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
-%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
+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 %{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}

-# Replace resources.xml with our version of it
-rm -f %{buildroot}%{_bindir}/resources.xml
-install %{SOURCE1} %{buildroot}%{_datadir}/MYGUI/Tools/resources.xml
+# Copy Media files
+mkdir -p %{buildroot}%{_datadir}/MyGUI/
+cp -a Media %{buildroot}%{_datadir}/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
+# 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
+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-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
+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

-# 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
+# CMake hurts my brain.
+cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/

-# 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
-%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
-%dir %{_datadir}/MYGUI/Media
-%{_datadir}/MYGUI/Media/Common
-%{_datadir}/MYGUI/Media/MyGUI_Media
-%{_datadir}/MYGUI/Media/Wrapper
+%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}/MYGUI
-%{_libdir}/libMyGUI.OpenGLPlatform.so
-%{_libdir}/libMyGUICommon.so
-%{_libdir}/libMyGUIEngine.so
-%{_libdir}/pkgconfig/MYGUI.pc
+%{_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.txt Tools/LayoutEditor/Readme.txt
+%doc Tools/README Tools/LayoutEditor/Readme.txt
 %{_bindir}/MyGUI-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
+%{_libdir}/MYGUI/Tools
+%{_datadir}/MyGUI/Media/Tools
 %{_datadir}/applications/mygui-layouteditor.desktop
-%{_datadir}/applications/mygui-skineditor.desktop
-%{_datadir}/applications/mygui-fonteditor.desktop
-%{_datadir}/applications/mygui-imageeditor.desktop


 %changelog
-%autochangelog
-* Tue Jun 25 2025 Claire Robsahm <inquiries@chapien.net> - 3.4.3-4
- Made libraries and icons explicit rather than wildcard.
- Removed unnecessary dependencies and sorted them alphabetically.
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

-* Mon Jun 09 2025 Claire Robsahm <inquiries@chapien.net> - 3.4.3-1
- Updated to 3.4.3. Build using OpenGL instead of OGRE.
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-15
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
--- a/mygui_multilib_cflags.patch
+++ 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
+   
--- a/resources.xml
+++ b/resources.xml
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Paths>
-  <Path root="true">/usr/share/MYGUI/Media</Path>
-  <Path>/usr/share/MYGUI/Media/MyGUI_Media</Path>
+  <Path root="true">/usr/share/MyGUI/Media</Path>
+  <Path>/usr/share/MyGUI/Media/MyGUI_Media</Path>
+  <Path>/usr/share/MyGUI/Media/Tools/LayoutEditor</Path>
 </Paths>
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (mygui-MyGUI3.4.3.tar.gz) = 88c69ca2e706af364b72d425f95013eb285501881d8094f8d67e31a54c45ca11b0eb5b62c382af0d4c43f69aa8197648259ac306b72efa7ef3e25eecb9b039cb
+3e5e63cce16192db8db0b5f8b84237d4  mygui-8a05127d7c5bb6772df88185b1f99d8052c379a4.tar.gz