pool/glib2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 77084 from home:vuntz:branches:GNOME:Factory

Browse Source 
Drop glib2-bnc379332-desktop-su.patch

OBS-URL: https://build.opensuse.org/request/show/77084
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=157
This commit is contained in:
Vincent Untz 2011-07-27 22:05:09 +00:00 committed by Git OBS Bridge
parent fc9009d0e9
commit c2ed2e721b
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
glib2-bnc379332-desktop-su.patch
View File

@ -1,26 +0,0 @@
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;

7
glib2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 26 15:18:31 CEST 2011 - vuntz@opensuse.org
- Drop glib2-bnc379332-desktop-su.patch: now that bnc#540627 is
fixed, we do not care about X-KDE-SubstituteUID anymore, so we
don't need the patch anymore.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 22 14:08:21 CEST 2011 - vuntz@opensuse.org Fri Jul 22 14:08:21 CEST 2011 - vuntz@opensuse.org

3
glib2.spec
View File

@ -42,8 +42,6 @@ Source6: macros.glib2
# Please update this file from the latest gtk-doc package: # Please update this file from the latest gtk-doc package:
Source7: gtk-doc.m4 Source7: gtk-doc.m4
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-OPENSUSE glib2-bnc379332-desktop-su.patch bnc379332 vuntz@novell.com -- Use X-KDE-SubstituteUID
Patch8: glib2-bnc379332-desktop-su.patch
# PATCH-FEATURE-UPSTREAM glib2-bgo569829-gettext-gkeyfile.patch fate300461 bgo569829 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that we share with Ubuntu and try to push upstream # PATCH-FEATURE-UPSTREAM glib2-bgo569829-gettext-gkeyfile.patch fate300461 bgo569829 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that we share with Ubuntu and try to push upstream
Patch10: glib2-bgo569829-gettext-gkeyfile.patch Patch10: glib2-bgo569829-gettext-gkeyfile.patch
# PATCH-FEATURE-OPENSUSE glib2-fate300461-gettext-gkeyfile-suse.patch fate300461 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that deals with the openSUSE specific infrastructure (with desktop_translations) # PATCH-FEATURE-OPENSUSE glib2-fate300461-gettext-gkeyfile-suse.patch fate300461 vuntz@novell.com -- Look for translation of desktop entry strings via gettext, part that deals with the openSUSE specific infrastructure (with desktop_translations)
@ -261,7 +259,6 @@ The GObject library provides an object-oriented framework for C.
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
translation-update-upstream translation-update-upstream
%patch8
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1