diff --git a/.gitignore b/.gitignore index 6c62643..0f25d1d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,10 @@ 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 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-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-libCommon-fixup.patch b/mygui-libCommon-fixup.patch deleted file mode 100644 index 8d7dd82..0000000 --- a/mygui-libCommon-fixup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Common/CMakeLists.txt.orig 2014-12-30 15:54:04.262556059 -0600 -+++ Common/CMakeLists.txt 2014-12-30 15:54:58.750481194 -0600 -@@ -89,6 +89,7 @@ - endif() - - add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES}) -+set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR}) - - if(MYGUI_RENDERSYSTEM EQUAL 1) - add_dependencies(${PROJECTNAME} MyGUI.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 64dd5a7..c73c711 100644 --- a/mygui.spec +++ b/mygui.spec @@ -1,43 +1,48 @@ Name: mygui -Version: 3.2.1 -%global commit 375d52bee3b8f9f67dd6cd8e07547fa3e344c979 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -Release: 6%{?dist} -Summary: Fast, simple and flexible GUI library for Ogre -Group: Development/Libraries -# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here) +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 +Patch0: mygui-add-missing-soname.patch -BuildRequires: freetype-devel, desktop-file-utils -BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix -BuildRequires: libuuid-devel, libX11-devel +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 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 @@ -46,191 +51,197 @@ 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, -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} +%patch -P0 -p1 -b .orig -%if %{?fedora} > 20 -# Fedora > 20 has freetype2/freetype.h -sed -i -e 's,freetype/freetype.h,freetype2/freetype.h,' CMake/Packages/FindFreetype.cmake -%endif %build -# Plugins are windows only atm -%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 -%clean -rm -rf %{buildroot} +# 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.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}/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 - 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 - 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 + +* 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 diff --git a/mygui_multilib_cflags.patch b/mygui_multilib_cflags.patch deleted file mode 100644 index e9df86b..0000000 --- a/mygui_multilib_cflags.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- CMakeLists.txt.orig 2014-08-19 14:49:43.000000000 -0500 -+++ CMakeLists.txt 2014-12-30 13:30:19.146348141 -0600 -@@ -85,8 +85,8 @@ - set(MYGUI_LIBRARIES MyGUIEngine) - - # Specify build paths --set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) --set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib) -+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) -+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}) - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin) - if (WIN32 OR APPLE) - if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -@@ -181,7 +181,7 @@ - else () - if (MYGUI_RENDERSYSTEM EQUAL 3) - # to avoid warnings from OGRE -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OGRE_INCLUDE_DIR}") - endif () - if (MYGUI_SAMPLES_INPUT EQUAL 1 OR MYGUI_SAMPLES_INPUT EQUAL 3) - # to avoid warnings from OIS -@@ -192,11 +192,11 @@ - endif () - # very interesting option, but way too many warnings - #add_definitions(-Weffc++) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Woverloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") - - # MyGUI_UString.h ignored from warnings because of this -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshadow") - endif () - endif () - ---- CMake/Utils/MyGUIConfigTargets.cmake.orig 2014-12-30 13:33:38.747716449 -0600 -+++ CMake/Utils/MyGUIConfigTargets.cmake 2014-12-30 13:42:54.115300813 -0600 -@@ -61,26 +61,26 @@ - function(mygui_install_target TARGETNAME SUFFIX) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None "" - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo -- LIBRARY DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}${SUFFIX}" CONFIGURATIONS RelWithDebInfo - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS RelWithDebInfo - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel -- LIBRARY DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -- ARCHIVE DESTINATION "lib${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_MINSIZE_PATH}${SUFFIX}" CONFIGURATIONS MinSizeRel - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS MinSizeRel - ) - install(TARGETS ${TARGETNAME} - RUNTIME DESTINATION "bin${MYGUI_DEBUG_PATH}" CONFIGURATIONS Debug -- LIBRARY DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -- ARCHIVE DESTINATION "lib${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug -+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}${SUFFIX}" CONFIGURATIONS Debug - FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Debug - ) - endfunction(mygui_install_target) -@@ -423,12 +423,12 @@ - if (MYGUI_INSTALL_PDB) - # install debug pdb files - if (MYGUI_STATIC) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -- DESTINATION lib${MYGUI_LIB_DEBUG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH}/${PROJECTNAME}Static_d.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_DEBUG_PATH} - CONFIGURATIONS Debug - ) -- install(FILES ${MYGUI_BINARY_DIR}/lib${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -- DESTINATION lib${MYGUI_LIB_RELWDBG_PATH} -+ install(FILES ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH}/${PROJECTNAME}Static.pdb -+ DESTINATION lib${LIB_SUFFIX}${MYGUI_LIB_RELWDBG_PATH} - CONFIGURATIONS RelWithDebInfo - ) - else () -@@ -455,4 +455,4 @@ - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) - set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) - endif () --endfunction(mygui_config_sample) -\ No newline at end of file -+endfunction(mygui_config_sample) ---- CMake/ConfigureBuild.cmake.orig 2014-12-30 13:45:12.844932636 -0600 -+++ CMake/ConfigureBuild.cmake 2014-12-30 13:52:09.004824418 -0600 -@@ -47,7 +47,7 @@ - else () - configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY) - endif () -- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig) -+ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) - - # 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 f8ffa33..eb9a966 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b9da3d1234aece171faa904b3856ec1 mygui-375d52bee3b8f9f67dd6cd8e07547fa3e344c979.tar.gz +SHA512 (mygui-MyGUI3.4.3.tar.gz) = 88c69ca2e706af364b72d425f95013eb285501881d8094f8d67e31a54c45ca11b0eb5b62c382af0d4c43f69aa8197648259ac306b72efa7ef3e25eecb9b039cb