diff --git a/.gitignore b/.gitignore
index 89bcb18..0f25d1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,11 @@
 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
+/mygui-MyGUI3.4.3.tar.gz
+
+Makefile
+.cvsignore
+bodhi.**
+**.src.rpm
diff --git a/MyGUI-Demos b/MyGUI-Demos
deleted file mode 100644
index 1acee56..0000000
--- a/MyGUI-Demos
+++ /dev/null
@@ -1,48 +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` "(sample)"
-  echo
-  echo "sample - runs specified sample from list"
-  echo
-  echo -n "Available samples:"
-  for i in `(cd $LIBDIR/MYGUI/Demos/; find -type f -perm +111 | sort)`; do
-    echo -n " $i" | sed 's|./||'
-  done
-  echo
-fi
diff --git a/MyGUI-Tools b/MyGUI-Tools
index bdc07fb..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
@@ -36,13 +31,16 @@ elif [ $# -ge 1 ]; then
     shift
   done
 else
-  echo "Usage:" `basename $0` "(tool)"
+  echo "Usage:" `basename $0` "[-a] [tool [...]]"
+  echo "  -a     : Run all tools installed to $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:"
-  for i in `(cd $LIBDIR/MYGUI/Tools/; find -type f -perm +111 | sort)`; do
-    echo -n " $i" | sed 's|./||'
+  echo
+  for i in `(cd $DATADIR/MYGUI/Tools/; find -type f -perm /111 | sort)`; do
+    echo "  * $i" | sed 's|./||'
   done
   echo
 fi
diff --git a/mygui-add-findpoco.patch b/mygui-add-findpoco.patch
deleted file mode 100644
index 031a7a8..0000000
--- a/mygui-add-findpoco.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- /dev/null	2011-01-04 01:26:14.849718001 -0600
-+++ CMake/Packages/FindPOCO.cmake	2011-01-04 03:59:04.000000000 -0600
-@@ -0,0 +1,101 @@
-+#-------------------------------------------------------------------
-+# This file is part of the CMake build system for OGRE
-+#     (Object-oriented Graphics Rendering Engine)
-+# For the latest info, see http://www.ogre3d.org/
-+#
-+# The contents of this file are placed in the public domain. Feel
-+# free to make use of it in any way you like.
-+#-------------------------------------------------------------------
-+
-+# - Try to find POCO libraries
-+# Once done, this will define
-+#
-+#  POCO_FOUND - system has POCO
-+#  POCO_INCLUDE_DIRS - the POCO include directories 
-+#  POCO_LIBRARIES - link these to use POCO
-+
-+include(FindPkgMacros)
-+findpkg_begin(POCO)
-+
-+# Get path, convert backslashes as ${ENV_${var}}
-+getenv_path(POCO_HOME)
-+getenv_path(POCO_ROOT)
-+getenv_path(POCO_BASE)
-+
-+# construct search paths
-+set(POCO_PREFIX_PATH 
-+  ${POCO_HOME} ${ENV_POCO_HOME} 
-+  ${POCO_ROOT} ${ENV_POCO_ROOT}
-+  ${POCO_BASE} ${ENV_POCO_BASE}
-+)
-+# redo search if prefix path changed
-+clear_if_changed(POCO_PREFIX_PATH
-+  POCO_LIBRARY_FWK
-+  POCO_LIBRARY_REL
-+  POCO_LIBRARY_DBG
-+  POCO_INCLUDE_DIR
-+)
-+
-+create_search_paths(POCO)
-+set(POCO_INC_SEARCH_PATH ${POCO_INC_SEARCH_PATH} ${POCO_PREFIX_PATH})
-+
-+
-+set(POCO_LIBRARY_NAMES PocoFoundation PocoFoundationmt)
-+get_debug_names(POCO_LIBRARY_NAMES)
-+
-+use_pkgconfig(POCO_PKGC POCO)
-+
-+findpkg_framework(POCO)
-+
-+find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include)
-+find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+make_library_set(POCO_LIBRARY)
-+
-+findpkg_finish(POCO)
-+
-+if (NOT POCO_FOUND)
-+  return()
-+endif ()
-+
-+
-+# Look for Poco's Util package
-+findpkg_begin(POCO_Util)
-+set(POCO_Util_LIBRARY_NAMES PocoUtil PocoUtilmt)
-+get_debug_names(POCO_Util_LIBRARY_NAMES)
-+find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include)
-+find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+make_library_set(POCO_Util_LIBRARY)
-+findpkg_finish(POCO_Util)
-+
-+# Look for Poco's Net package
-+findpkg_begin(POCO_Net)
-+set(POCO_Net_LIBRARY_NAMES PocoNet PocoNetmt)
-+get_debug_names(POCO_Net_LIBRARY_NAMES)
-+find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include)
-+find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+make_library_set(POCO_Net_LIBRARY)
-+findpkg_finish(POCO_Net)
-+
-+# Look for Poco's NetSSL package
-+findpkg_begin(POCO_NetSSL)
-+set(POCO_NetSSL_LIBRARY_NAMES PocoNetSSL PocoNetSSLmt)
-+get_debug_names(POCO_NetSSL_LIBRARY_NAMES)
-+find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include)
-+find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+make_library_set(POCO_NetSSL_LIBRARY)
-+findpkg_finish(POCO_NetSSL)
-+
-+# Look for Poco's XML package
-+findpkg_begin(POCO_XML)
-+set(POCO_XML_LIBRARY_NAMES PocoXML PocoXMLmt)
-+get_debug_names(POCO_XML_LIBRARY_NAMES)
-+find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include)
-+find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686)
-+make_library_set(POCO_XML_LIBRARY)
-+findpkg_finish(POCO_XML)
-+
diff --git a/mygui-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-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-ogrethreadlibs.patch b/mygui-ogrethreadlibs.patch
deleted file mode 100644
index bde162d..0000000
--- a/mygui-ogrethreadlibs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- CMake/Packages/FindOGRE.cmake.orig	2011-01-04 02:41:08.000000000 -0600
-+++ CMake/Packages/FindOGRE.cmake	2011-01-04 02:42:16.000000000 -0600
-@@ -259,6 +259,12 @@
- 	endif ()
-   endif ()
-   
-+  if (NOT OGRE_DEPS_FOUND)
-+    pkg_message(OGRE "Could not find all required dependencies for the Ogre package.")
-+    set(OGRE_FOUND FALSE)
-+  endif ()
-+endif ()
-+
-   if (OGRE_CONFIG_THREADS)
-     if (OGRE_CONFIG_THREAD_PROVIDER EQUAL 1)
-       find_package(Boost COMPONENTS thread QUIET)
-@@ -284,12 +290,6 @@
-     endif ()
-   endif ()
-   
--  if (NOT OGRE_DEPS_FOUND)
--    pkg_message(OGRE "Could not find all required dependencies for the Ogre package.")
--    set(OGRE_FOUND FALSE)
--  endif ()
--endif ()
--
- if (NOT OGRE_FOUND)
-   return()
- endif ()
-@@ -485,4 +485,4 @@
- find_path(OGRE_MEDIA_DIR NAMES packs/OgreCore.zip HINTS ${OGRE_MEDIA_SEARCH_PATH}
-   PATHS ${OGRE_PREFIX_PATH} PATH_SUFFIXES ${OGRE_MEDIA_SEARCH_SUFFIX})
- 
--endif () # if from line 51-56
-\ No newline at end of file
-+endif () # if from line 51-56
diff --git a/mygui-pc-fixes.patch b/mygui-pc-fixes.patch
deleted file mode 100644
index 3572d62..0000000
--- a/mygui-pc-fixes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur MyGUI3.0.orig/CMake/Templates/MYGUI.pc.in MyGUI3.0/CMake/Templates/MYGUI.pc.in
---- MyGUI3.0.orig/CMake/Templates/MYGUI.pc.in	2011-05-02 16:54:18.429693639 -0600
-+++ MyGUI3.0/CMake/Templates/MYGUI.pc.in	2011-05-02 16:56:38.701732685 -0600
-@@ -7,6 +7,5 @@
- Description: Fast, flexible and simple GUI
- Version: @MYGUI_VERSION@
- URL: http://www.my-gui.sourceforge.net
--Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.Ogr
--ePlatform @MYGUI_ADDITIONAL_LIBS@
--Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@
-+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.OgrePlatform @MYGUI_ADDITIONAL_LIBS@
-+Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
diff --git a/mygui-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 95b9cf0..c73c711 100644
--- a/mygui.spec
+++ b/mygui.spec
@@ -1,52 +1,48 @@
 Name:           mygui
-Version:        3.0.1
-Release:        13%{?dist}
-Summary:        Fast, simple and flexible GUI library for Ogre
-Group:          Development/Libraries
-# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here)
-License:        LGPLv3+ 
+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:        http://downloads.sourceforge.net/my-gui/MyGUI_3.0.1_source.zip
-# 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
-# Fix compilation problems with gcc4.4
-Patch1:         mygui_missing_headers.patch
-# Explicitly include thread library used by Ogre to avoid DSO issue
-Patch2:         mygui-ogrethreadlibs.patch
-# Get find poco from ogre
-Patch3:         mygui-add-findpoco.patch
-# Fix pc file issues. 
-Patch4:         mygui-pc-fixes.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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
+Patch0:         mygui-add-missing-soname.patch
 
-BuildRequires:  automake, autoconf, libtool, freetype-devel, desktop-file-utils
-BuildRequires:  ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix
-%if 0%{?fedora} < 12
-BuildRequires:  e2fsprogs-devel
-%else
+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
-%endif
+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
-Group:          Development/Libraries
-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
@@ -55,206 +51,268 @@ developing applications that use %{name}.
 
 %package        devel-doc
 Summary:        Development documentation for MyGUI
-Group:          Development/Libraries
 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
-Group:          Development/Libraries
-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 
-Group:          Development/Libraries
-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,
-ImageSetViewer and FontViewer are simple tools to preview graphical
-resources in the media repository. 
-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 -q -n MyGUI3.0
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p1
-# Fix eol 
-sed -i 's/\r//' COPYING.LESSER
-# 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: ImageSetViewer, FontViewer 
-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}
+%patch -P0 -p1 -b .orig
 
 
 %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}/
-
-# Create config for ldconfig
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{_libdir}/MYGUI" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf 
-
-# Install the samples 
-mkdir -p %{buildroot}%{_libdir}/MYGUI/Demos 
-cp -p %{SOURCE3} bin/plugins.cfg %{buildroot}%{_libdir}/MYGUI/Demos
-sed -i 's|^PluginFolder=.*$|PluginFolder=%{_libdir}/OGRE|' \
-    %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
-sed -i 's|^Plugin=RenderSystem_Direct3D9$|#Plugin=RenderSystem_Direct3D9|' \
-    %{buildroot}%{_libdir}/MYGUI/Demos/plugins.cfg
-# Remove sample showing plugin usage
-rm bin/Demo_PluginStrangeButton
-for file in bin/Demo_* ; do
-  install -Dp -m 755 $file %{buildroot}%{_libdir}/MYGUI/Demos/`basename $file`
-done
-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/ImageSetViewer bin/FontViewer ; 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
 
-# Install libMyGUI.OgrePlatform.so
-mkdir -p %{buildroot}%{_libdir}/MYGUI
-install -Dp -m 755 %{_lib}/libMyGUI.OgrePlatform.so %{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
 
-# Move plugins to %{libdir}/MYGUI (no plugins atm)
-#mv %{buildroot}%{_libdir}/libPlugin*.so %{buildroot}%{_libdir}/MYGUI
+# 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
 
+# 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
 
-%clean
-rm -rf %{buildroot}
-
-
-%post -p /sbin/ldconfig
-
-
-%postun -p /sbin/ldconfig
+# 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
-%defattr(-,root,root,-)
-%doc COPYING.LESSER
-%{_libdir}/*.so.*
-%{_libdir}/MYGUI
-%dir %{_datadir}/MyGUI/Media
-%{_datadir}/MyGUI/Media/Common
-%{_datadir}/MyGUI/Media/MyGUI_Media
-%config(noreplace) %{_sysconfdir}/ld.so.conf.d/* 
-
+%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
 
 %files devel
-%defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-
+%{_includedir}/MYGUI
+%{_libdir}/libMyGUI.OpenGLPlatform.so
+%{_libdir}/libMyGUICommon.so
+%{_libdir}/libMyGUIEngine.so
+%{_libdir}/pkgconfig/MYGUI.pc
 
 %files devel-doc
-%defattr(-,root,root,-)
 %doc Docs/html
 
-
-%files demos
-%defattr(-,root,root,-)
-%doc Demos/README
-%{_bindir}/MyGUI-Demos
-%{_libdir}/MYGUI/Demos
-%{_datadir}/MyGUI/Media/Demos
-%{_datadir}/MyGUI/Media/Wrapper
-
-
 %files tools
-%defattr(-,root,root,-)
-%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
+%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.
+
+* Mon Jun 09 2025 Claire Robsahm <inquiries@chapien.net> - 3.4.3-1
+- Updated to 3.4.3. Build using OpenGL instead of OGRE.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 3.2.2-10
+- Rebuilt for Boost 1.69
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 23 2018 Jonathan Wakely <jwakely@redhat.com> - 3.2.2-7
+- Rebuilt for Boost 1.66
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> - 3.2.2-4
+- Rebuilt for Boost 1.64
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Jan 28 2017 Jonathan Wakely <jwakely@redhat.com> - 3.2.2-2
+- Rebuilt for Boost 1.63
+
+* Sat Mar 05 2016 Bruno Wolff III <bruno@wolff.to> - 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 <corsepiu@fedoraproject.org> - 3.2.1-9
+- Reflect freetype header location having changed (F24FTBFS).
+- Remove %%defattr.
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 3.2.1-7
+- Rebuilt for Boost 1.59
+
+* Wed Aug 05 2015 Jonathan Wakely <jwakely@redhat.com> 3.2.1-6
+- Rebuilt for Boost 1.58
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri May 22 2015 Bruno Wolff III <bruno@wolff.to> - 3.2.1-4
+- Make sure FTBFS issue is fixed
+
+* Mon Feb 09 2015 Bruno Wolff III <bruno@wolff.to> - 3.2.1-3
+- Rebuild for boost update
+
+* Tue Dec 30 2014 Bruno Wolff III <bruno@wolff.to> - 3.2.1-2
+- Don't use removed find -perm option (+) in MyGUI-Demos and MyGUI-Tools
+
+* Tue Dec 30 2014 Bruno Wolff III <bruno@wolff.to> - 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 <rel-eng@lists.fedoraproject.org> - 3.2.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Tue Jun 10 2014 Ralf Corsépius <corsepiu@fedoraproject.org> - 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 <rel-eng@lists.fedoraproject.org> - 3.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 23 2014 David Tardon <dtardon@redhat.com> - 3.2.0-8
+- rebuild for boost 1.55.0
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sun Jul 28 2013 Petr Machata <pmachata@redhat.com> - 3.2.0-6
+- Rebuild for boost 1.54.0
+
+* Thu Apr 25 2013 Tom Callaway <spot@fedoraproject.org> - 3.2.0-5
+- rebuild to include libCommon
+
+* Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 3.2.0-4
+- Rebuild for Boost-1.53.0
+
+* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 3.2.0-3
+- Rebuild for Boost-1.53.0
+
+* Wed Dec 26 2012 Kevin Fenzi <kevin@scrye.com> 3.2.0-2
+- Rebuild for new libCommon
+
+* Tue Dec 04 2012 Bruno Wolff III <bruno@wolff.to> - 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 <bruno@wolff.to> - 3.0.1-16
+- Rebuild for boost 1.50
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Apr 04 2012 Bruno Wolff III <bruno@wolff.to> - 3.0.1-14
+- Rebuild for ogre 1.7.4
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-13
 - Rebuilt for c++ ABI breakage
 
@@ -264,7 +322,7 @@ rm -rf %{buildroot}
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Fri Nov 20 2011 Bruno Wolff III <bruno@wolff.to> - 3.0.1-10
+* Sun Nov 20 2011 Bruno Wolff III <bruno@wolff.to> - 3.0.1-10
 - Rebuild for boost soname bump
 
 * Fri Jul 22 2011 Bruno Wolff III <bruno@wolff.to> - 3.0.1-9
@@ -311,7 +369,7 @@ rm -rf %{buildroot}
 - Fix includes dir
 - Remove plugin
 
-* Fri Oct 13 2009 Guido Grazioli <guido.grazioli@gmail.com> - 3.0.0-1.2332svn
+* Fri Oct 23 2009 Guido Grazioli <guido.grazioli@gmail.com> - 3.0.0-1.2332svn
 - Upstream to svn revision 2332
 - Patch cmake build scripts to support multilib
 - Fix package summaries
diff --git a/mygui_missing_headers.patch b/mygui_missing_headers.patch
deleted file mode 100644
index f66da47..0000000
--- a/mygui_missing_headers.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h.orig	2011-01-03 02:46:05.000000000 -0600
-+++ Platforms/Ogre/OgrePlatform/include/MyGUI_OgrePlatform.h	2011-01-03 02:46:51.000000000 -0600
-@@ -14,7 +14,7 @@
- #include "MyGUI_OgreRenderManager.h"
- #include "MyGUI_OgreDataManager.h"
- #include "MyGUI_OgreDiagnostic.h"
--#include "MyGUI_OgreTexture.h"
-+#include "MyGUI_LogManager.h"
- 
- namespace MyGUI
- {
---- Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h.orig	2011-01-03 02:47:54.000000000 -0600
-+++ Platforms/Ogre/OgrePlatform/include/MyGUI_OgreRenderManager.h	2011-01-03 02:48:20.000000000 -0600
-@@ -13,6 +13,7 @@
- #include "MyGUI_RenderFormat.h"
- #include "MyGUI_IVertexBuffer.h"
- #include "MyGUI_RenderManager.h"
-+#include "MyGUI_Types.h"
- 
- #include <Ogre.h>
- 
---- MyGUIEngine/include/MyGUI_IRenderTarget.h.orig	2011-01-03 02:48:43.000000000 -0600
-+++ MyGUIEngine/include/MyGUI_IRenderTarget.h	2011-01-03 02:49:21.000000000 -0600
-@@ -23,6 +23,7 @@
- #ifndef __MYGUI_I_RENDER_TARGET_H__
- #define __MYGUI_I_RENDER_TARGET_H__
- 
-+#include <string>
- #include "MyGUI_Prerequest.h"
- #include "MyGUI_RenderTargetInfo.h"
- 
diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch
deleted file mode 100644
index 4420ff9..0000000
--- a/mygui_multilib_cflags.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- CMakeLists.txt.orig	2011-01-03 01:50:52.000000000 -0600
-+++ CMakeLists.txt	2011-01-03 02:06:08.000000000 -0600
-@@ -85,8 +85,8 @@
- set(MYGUI_LIBRARIES MyGUIEngine)
- 
- # Specify build paths
--set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
--set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
-+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
- if (WIN32 OR APPLE)
- 	if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-@@ -139,18 +139,18 @@
- # Set compiler specific build flags
- if (CMAKE_COMPILER_IS_GNUCXX)
- 	add_definitions(-fdiagnostics-show-option)
--	add_definitions(-msse)
-+#	add_definitions(-msse)
- 	if (MYGUI_RENDERSYSTEM EQUAL 2)
- 		# to avoid warnings from OGRE sources
--		add_definitions(-isystem ${OGRE_INCLUDE_DIR})
-+#		add_definitions(-isystem ${OGRE_INCLUDE_DIR})
- 	endif ()
- 	# very interesting option, but way too many warnings
- 	#add_definitions(-Weffc++)
--	add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter)
-+#	add_definitions(-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter)
- 	#add_definitions(-pedantic)
- 
- 	# MyGUI_UString.h ignored from warnings because of this
--	add_definitions(-Wshadow)
-+#	add_definitions(-Wshadow)
- endif ()
- 
- if (MSVC)
---- CMake/ConfigureBuild.cmake.orig	2011-01-03 02:08:15.000000000 -0600
-+++ CMake/ConfigureBuild.cmake	2011-01-03 02:06:36.000000000 -0600
-@@ -44,7 +44,7 @@
-   else ()
-     configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
-   endif ()
--  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
-+  install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
- 
-   # configure additional packages
-   
---- CMake/Utils/MyGUIConfigTargets.cmake.orig	2011-01-03 02:08:44.000000000 -0600
-+++ CMake/Utils/MyGUIConfigTargets.cmake	2011-01-03 02:12:12.000000000 -0600
-@@ -38,14 +38,14 @@
- function(mygui_install_target TARGETNAME SUFFIX)
- 	install(TARGETS ${TARGETNAME}
- 		RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
--		LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
--		ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-+		LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-+		ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- 		FRAMEWORK DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
- 	)
- 	install(TARGETS ${TARGETNAME}
- 		RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
--		LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
--		ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
-+		LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
-+		ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo
- 		FRAMEWORK DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
- 	)
- 	install(TARGETS ${TARGETNAME}
---- CMake/Templates/MYGUI.pc.in.orig	2011-01-03 02:12:38.000000000 -0600
-+++ CMake/Templates/MYGUI.pc.in	2011-01-03 02:15:43.000000000 -0600
-@@ -1,11 +1,12 @@
- prefix=@MYGUI_PREFIX_PATH@
- exec_prefix=${prefix}
--libdir=${prefix}/lib
-+libdir=${prefix}/lib@LIB_SUFFIX@
- includedir=${prefix}/include
- 
- Name: MyGUI
- Description: Fast, flexible and simple GUI
- Version: @MYGUI_VERSION@
- URL: http://www.my-gui.sourceforge.net
--Libs: -L${libdir} -lMyGUIEngine@MYGUI_LIB_SUFFIX@ @MYGUI_ADDITIONAL_LIBS@
--Cflags: -I${includedir} -I${includedir}/MYGUI @MYGUI_CFLAGS@
-+Libs: -L${libdir} -L${libdir}/MYGUI -lMyGUIEngine@MYGUI_LIB_SUFFIX@ -lMyGUI.Ogr
-+ePlatform @MYGUI_ADDITIONAL_LIBS@
-+Cflags: -I${includedir} -I${includedir}/MyGUI @MYGUI_CFLAGS@
diff --git a/resources.xml b/resources.xml
index 569d089..feb7f0f 100644
--- a/resources.xml
+++ b/resources.xml
@@ -1,7 +1,6 @@
 <?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>/usr/share/MyGUI/Media/Tools/LayoutEditor</Path>
+  <Path root="true">/usr/share/MYGUI/Media</Path>
+  <Path>/usr/share/MYGUI/Media/MyGUI_Media</Path>
 </Paths>
diff --git a/sources b/sources
index 985dcbd..eb9a966 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9e82bf60081be58fea3f64d32e2ab3a  MyGUI_3.0.1_source.zip
+SHA512 (mygui-MyGUI3.4.3.tar.gz) = 88c69ca2e706af364b72d425f95013eb285501881d8094f8d67e31a54c45ca11b0eb5b62c382af0d4c43f69aa8197648259ac306b72efa7ef3e25eecb9b039cb