This commit is contained in:
parent
1601df3150
commit
f68bf229f2
26
glib2-bnc379332-desktop-su.patch
Normal file
26
glib2-bnc379332-desktop-su.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
Index: gio/gdesktopappinfo.c
|
||||||
|
===================================================================
|
||||||
|
--- gio/gdesktopappinfo.c (révision 6873)
|
||||||
|
+++ gio/gdesktopappinfo.c (copie de travail)
|
||||||
|
@@ -259,7 +259,20 @@ g_desktop_app_info_new_from_filename (co
|
||||||
|
info->only_show_in = g_key_file_get_string_list (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN, NULL, NULL);
|
||||||
|
info->not_show_in = g_key_file_get_string_list (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, NULL, NULL);
|
||||||
|
info->try_exec = try_exec;
|
||||||
|
- info->exec = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL);
|
||||||
|
+ if (g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP,
|
||||||
|
+ "X-KDE-SubstituteUID", NULL) &&
|
||||||
|
+ g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP,
|
||||||
|
+ "X-KDE-RootOnly", NULL))
|
||||||
|
+ {
|
||||||
|
+ char *real_exec;
|
||||||
|
+ real_exec = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL);
|
||||||
|
+ info->exec = g_strdup_printf ("gnomesu -- %s", real_exec);
|
||||||
|
+ g_free (real_exec);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ info->exec = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, NULL);
|
||||||
|
+ }
|
||||||
|
info->path = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_PATH, NULL);
|
||||||
|
info->terminal = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TERMINAL, NULL) != FALSE;
|
||||||
|
info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE;
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 1 12:52:01 CEST 2008 - vuntz@suse.de
|
||||||
|
|
||||||
|
- Add glib2-bnc379332-desktop-su.patch to launch .desktop files as
|
||||||
|
root when X-KDE-SubstituteUID and X-KDE-RootOnly are there.
|
||||||
|
Fix bnc#379332.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Apr 29 17:32:20 CEST 2008 - cthiel@suse.de
|
Tue Apr 29 17:32:20 CEST 2008 - cthiel@suse.de
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ License: LGPL v2.1 or later
|
|||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 2.16.3
|
Version: 2.16.3
|
||||||
Release: 8
|
Release: 10
|
||||||
Summary: A Library with Convenient Functions Written in C
|
Summary: A Library with Convenient Functions Written in C
|
||||||
Url: http://www.gtk.org/
|
Url: http://www.gtk.org/
|
||||||
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
|
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
|
||||||
@ -44,6 +44,8 @@ Patch5: glib2-bnc373149-bgo523877-gbookmark-optimizations.diff
|
|||||||
Patch6: glib2-libtool.diff
|
Patch6: glib2-libtool.diff
|
||||||
# PATCH-FIX-UPSTREAM glib2-fix-bookmark-leak.diff federico@novell.com -- Don't leak apps_by_name in GBookmarkFile metadata items
|
# PATCH-FIX-UPSTREAM glib2-fix-bookmark-leak.diff federico@novell.com -- Don't leak apps_by_name in GBookmarkFile metadata items
|
||||||
Patch7: glib2-fix-bookmark-leak.diff
|
Patch7: glib2-fix-bookmark-leak.diff
|
||||||
|
# PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID
|
||||||
|
Patch8: glib2-bnc379332-desktop-su.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
# For temporary %%pre script only.
|
# For temporary %%pre script only.
|
||||||
@ -372,6 +374,7 @@ Authors:
|
|||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
%patch6
|
%patch6
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
|
%patch8
|
||||||
cp -a %{S:1} %{S:2} %{S:3} .
|
cp -a %{S:1} %{S:2} %{S:3} .
|
||||||
cp -a %{S:4} gnome_defaults.conf
|
cp -a %{S:4} gnome_defaults.conf
|
||||||
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
|
if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then
|
||||||
@ -502,6 +505,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%dir %{_datadir}/gtk-doc/html
|
%dir %{_datadir}/gtk-doc/html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 01 2008 vuntz@suse.de
|
||||||
|
- Add glib2-bnc379332-desktop-su.patch to launch .desktop files as
|
||||||
|
root when X-KDE-SubstituteUID and X-KDE-RootOnly are there.
|
||||||
|
Fix bnc#379332.
|
||||||
* Tue Apr 29 2008 cthiel@suse.de
|
* Tue Apr 29 2008 cthiel@suse.de
|
||||||
- obsolete glib2-<arch> via baselibs.conf
|
- obsolete glib2-<arch> via baselibs.conf
|
||||||
* Tue Apr 22 2008 hpj@suse.de
|
* Tue Apr 22 2008 hpj@suse.de
|
||||||
|
Loading…
Reference in New Issue
Block a user