Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-games/mygui/files: mygui-3.2.1-FHS.patch
Date: Sun, 24 Aug 2014 18:01:24
Message-Id: 20140824180119.3B07D3D0D@oystercatcher.gentoo.org
1 hasufell 14/08/24 18:01:18
2
3 Added: mygui-3.2.1-FHS.patch
4 Log:
5 version bump
6
7 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
8
9 Revision Changes Path
10 1.1 dev-games/mygui/files/mygui-3.2.1-FHS.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/mygui/files/mygui-3.2.1-FHS.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/mygui/files/mygui-3.2.1-FHS.patch?rev=1.1&content-type=text/plain
14
15 Index: mygui-3.2.1-FHS.patch
16 ===================================================================
17 From: Julian Ospald <hasufell@g.o>
18 Date: Sat Oct 27 22:39:31 UTC 2012
19 Subject: FHS
20
21 paths hardcoded until upstream fixed the logic
22
23 --- Common/Base/Ogre/BaseManager.cpp
24 +++ Common/Base/Ogre/BaseManager.cpp
25 @@ -49,13 +49,13 @@
26 mWindow(nullptr),
27 mExit(false),
28 mPluginCfgName("plugins.cfg"),
29 - mResourceXMLName("resources.xml"),
30 + mResourceXMLName("/etc/MYGUI/resources.xml"),
31 mResourceFileName("MyGUI_Core.xml")
32 {
33 #if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
34 mResourcePath = macBundlePath() + "/Contents/Resources/";
35 #else
36 - mResourcePath = "";
37 + mResourcePath = "/etc/MYGUI/";
38 #endif
39 }
40
41 --- CMake/InstallResources.cmake
42 +++ CMake/InstallResources.cmake
43 @@ -24,7 +24,7 @@
44 else ()
45 install(FILES
46 ${MYGUI_BINARY_DIR}/bin/${FILENAME}
47 - DESTINATION "bin"
48 + DESTINATION "/etc/MYGUI"
49 )
50 endif ()
51 endfunction(install_file)
52 @@ -51,7 +51,7 @@
53 if (WIN32)
54 set(MYGUI_MEDIA_DIR "../../Media")
55 elseif (UNIX)
56 - set(MYGUI_MEDIA_DIR "../share/MYGUI/Media")
57 + set(MYGUI_MEDIA_DIR "${CMAKE_INSTALL_PREFIX}/share/MYGUI/Media")
58 else ()
59 set(MYGUI_MEDIA_DIR "../../Media")
60 endif ()