Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/xfe/files: xfe-1.33-flags.patch xfe-1.33-desktopfile.patch
Date: Tue, 25 Dec 2012 22:29:06
Message-Id: 20121225222855.E576E2171D@flycatcher.gentoo.org
1 hasufell 12/12/25 22:28:55
2
3 Added: xfe-1.33-flags.patch xfe-1.33-desktopfile.patch
4 Log:
5 bump to EAPI=5, use l10n.eclass for LINGUAS handling, respect flags in debug mode, add missing dependencies, fix desktop file
6
7 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
8
9 Revision Changes Path
10 1.1 x11-misc/xfe/files/xfe-1.33-flags.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xfe/files/xfe-1.33-flags.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xfe/files/xfe-1.33-flags.patch?rev=1.1&content-type=text/plain
14
15 Index: xfe-1.33-flags.patch
16 ===================================================================
17 From: Julian Ospald <hasufell@g.o>
18 Date: Tue Dec 25 17:42:56 UTC 2012
19 Subject: build system
20
21 add a "--enable-minimal-flags" option to
22 respect system flags
23
24 --- xfe-1.33/configure.ac
25 +++ xfe-1.33/configure.ac
26 @@ -5,7 +5,7 @@
27 # Initialize
28 AC_INIT([xfe], [1.33])
29 AC_CONFIG_SRCDIR([src/XFileExplorer.cpp])
30 -AM_INIT_AUTOMAKE
31 +AM_INIT_AUTOMAKE([-Wall])
32 AM_CONFIG_HEADER([config.h])
33
34
35 @@ -177,6 +177,10 @@
36 AC_ARG_ENABLE(debug,[ --enable-debug compile for debugging])
37 AC_MSG_RESULT([$enable_debug])
38
39 +# Add debug symbols
40 +AC_MSG_CHECKING(minimalflags)
41 +AC_ARG_ENABLE(minimalflags,[ --enable-minimalflags respect system flags as much as possible])
42 +AC_MSG_RESULT([$enable_minimalflags])
43
44 # Building for release
45 AC_MSG_CHECKING(for release build)
46 @@ -184,29 +188,37 @@
47 AC_MSG_RESULT([$enable_release])
48
49
50 -# Setting CXXFLAGS
51 -if test "x$enable_debug" = "xyes" ; then
52 - CXXFLAGS="${CXXFLAGS} -Wall -g -DDEBUG"
53 -elif test "x$enable_release" = "xyes" ; then
54 - CXXFLAGS="-DNDEBUG ${CXXFLAGS} "
55 - if test "${GXX}" = "yes" ; then
56 - CXXFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer -fno-strict-aliasing ${CXXFLAGS}"
57 +if test "x$enable_minimalflags" = "xyes" ; then
58 + if test "x$enable_debug" = "xyes" ; then
59 + CPPFLAGS="$CPPFLAGS -DDEBUG"
60 + else
61 + CPPFLAGS="$CPPFLAGS -DNDEBUG"
62 fi
63 else
64 - CXXFLAGS="-O2 ${CXXFLAGS}"
65 -fi
66 + # Setting CXXFLAGS
67 + if test "x$enable_debug" = "xyes" ; then
68 + CXXFLAGS="${CXXFLAGS} -g -DDEBUG"
69 + elif test "x$enable_release" = "xyes" ; then
70 + CXXFLAGS="-DNDEBUG ${CXXFLAGS} "
71 + if test "${GXX}" = "yes" ; then
72 + CXXFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer -fno-strict-aliasing ${CXXFLAGS}"
73 + fi
74 + else
75 + CXXFLAGS="-O2 ${CXXFLAGS}"
76 + fi
77
78
79 -# Setting CFLAGS
80 -if test "x$enable_debug" = "xyes" ; then
81 - CFLAGS="${CFLAGS} -Wall -g -DDEBUG"
82 -elif test "x$enable_release" = "xyes" ; then
83 - CFLAGS="-DNDEBUG ${CFLAGS}"
84 - if test "${GCC}" = "yes" ; then
85 - CFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer -fno-strict-aliasing ${CFLAGS}"
86 + # Setting CFLAGS
87 + if test "x$enable_debug" = "xyes" ; then
88 + CFLAGS="${CFLAGS} -g -DDEBUG"
89 + elif test "x$enable_release" = "xyes" ; then
90 + CFLAGS="-DNDEBUG ${CFLAGS}"
91 + if test "${GCC}" = "yes" ; then
92 + CFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer -fno-strict-aliasing ${CFLAGS}"
93 + fi
94 + else
95 + CFLAGS="-O2 ${CFLAGS}"
96 fi
97 -else
98 - CFLAGS="-O2 ${CFLAGS}"
99 fi
100
101
102
103
104
105 1.1 x11-misc/xfe/files/xfe-1.33-desktopfile.patch
106
107 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xfe/files/xfe-1.33-desktopfile.patch?rev=1.1&view=markup
108 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xfe/files/xfe-1.33-desktopfile.patch?rev=1.1&content-type=text/plain
109
110 Index: xfe-1.33-desktopfile.patch
111 ===================================================================
112 From: Julian Ospald <hasufell@g.o>
113 Date: Tue Dec 25 18:01:35 UTC 2012
114 Subject: fix desktop file
115
116 --- xfe-1.33/xfp.desktop.in.in
117 +++ xfe-1.33/xfp.desktop.in.in
118 @@ -6,7 +6,6 @@
119 Terminal=false
120 Type=Application
121 StartupNotify=@STARTUPNOTIFY@
122 -MimeType=text/plain;
123 MimeType=application/x-deb;application/x-debian-package;application/x-rpm;
124 Icon=xfp
125 Categories=Utility;PackageManager;