OBS User autobuild 2009-12-08 09:34:40 +00:00 committed by Git OBS Bridge
parent 66a97060f1
commit 1e96d91fc8
6 changed files with 32 additions and 56 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:976fde6c0764b7b26b633030032b992c4dcbbaefd29d118303de5f7258794ae5
size 3244945

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5149b966a95b3d9fada30c9f08b23a8a955b06bf5b88730e74378bb347eb482c
size 1615623

View File

@ -1,8 +1,8 @@
Index: libgnome-desktop/gnome-desktop-item.c
===================================================================
--- libgnome-desktop/gnome-desktop-item.c.orig
+++ libgnome-desktop/gnome-desktop-item.c
@@ -85,6 +85,7 @@ struct _GnomeDesktopItem {
--- libgnome-desktop/gnome-desktop-item.c (révision 5293)
+++ libgnome-desktop/gnome-desktop-item.c (copie de travail)
@@ -81,6 +81,7 @@ struct _GnomeDesktopItem {
GHashTable *main_hash;
char *location;
@ -10,16 +10,16 @@ Index: libgnome-desktop/gnome-desktop-item.c
time_t mtime;
@@ -140,6 +141,8 @@ static GnomeDesktopItem *gnome_desktop_i
static void update_recently_used_apps (const GnomeDesktopItem *item);
@@ -134,6 +135,8 @@ static GnomeDesktopItem *gnome_desktop_i
GnomeDesktopItemLoadFlags flags,
GError **error);
+static const char *lookup (const GnomeDesktopItem *item, const char *key);
+
static int
readbuf_getc (ReadBuf *rb)
{
@@ -387,6 +390,7 @@ gnome_desktop_item_new (void)
@@ -394,6 +397,7 @@ gnome_desktop_item_new (void)
"1.0");
retval->launch_time = 0;
@ -27,7 +27,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
return retval;
}
@@ -465,6 +469,10 @@ gnome_desktop_item_copy (const GnomeDesk
@@ -472,6 +476,10 @@ gnome_desktop_item_copy (const GnomeDesk
copy_string_hash,
retval->main_hash);
@ -38,7 +38,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
return retval;
}
@@ -916,6 +924,9 @@ gnome_desktop_item_unref (GnomeDesktopIt
@@ -923,6 +931,9 @@ gnome_desktop_item_unref (GnomeDesktopIt
g_free (item->location);
item->location = NULL;
@ -48,7 +48,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
g_free (item);
}
@@ -1004,6 +1015,71 @@ lookup_locale (const GnomeDesktopItem *i
@@ -1011,6 +1022,71 @@ lookup_locale (const GnomeDesktopItem *i
}
static const char *
@ -120,7 +120,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
lookup_best_locale (const GnomeDesktopItem *item, const char *key)
{
const char * const *langs_pointer;
@@ -1013,6 +1089,14 @@ lookup_best_locale (const GnomeDesktopIt
@@ -1020,6 +1096,14 @@ lookup_best_locale (const GnomeDesktopIt
for (i = 0; langs_pointer[i] != NULL; i++) {
const char *ret = NULL;
@ -135,7 +135,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
ret = lookup_locale (item, key, langs_pointer[i]);
if (ret != NULL)
return ret;
@@ -2720,11 +2804,21 @@ gnome_desktop_item_get_localestring_lang
@@ -2946,11 +3030,21 @@ gnome_desktop_item_get_localestring_lang
const char *attr,
const char *language)
{
@ -158,7 +158,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
}
/**
@@ -2752,6 +2846,14 @@ gnome_desktop_item_get_attr_locale (cons
@@ -2978,6 +3072,14 @@ gnome_desktop_item_get_attr_locale (cons
for (i = 0; langs_pointer[i] != NULL; i++) {
const char *value = NULL;
@ -173,7 +173,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
value = lookup_locale (item, attr, langs_pointer[i]);
if (value)
return langs_pointer[i];
@@ -2772,6 +2874,9 @@ gnome_desktop_item_get_languages (const
@@ -2998,6 +3100,9 @@ gnome_desktop_item_get_languages (const
for (li = item->languages; li != NULL; li = li->next) {
char *language = li->data;
@ -183,7 +183,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
if (attr == NULL ||
lookup_locale (item, attr, language) != NULL) {
list = g_list_prepend (list, language);
@@ -3489,6 +3594,8 @@ try_english_key (GnomeDesktopItem *item,
@@ -3715,6 +3820,8 @@ try_english_key (GnomeDesktopItem *item,
str = NULL;
for (i = 0; locales[i] != NULL && str == NULL; i++) {
@ -192,7 +192,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
str = g_strdup (lookup_locale (item, key, locales[i]));
}
if (str != NULL) {
@@ -3757,6 +3864,10 @@ ditem_load (ReadBuf *rb,
@@ -3983,6 +4090,10 @@ ditem_load (ReadBuf *rb,
readbuf_close (rb);
@ -208,10 +208,10 @@ Index: libgnome-desktop/libgnome/gnome-desktop-item.h
--- libgnome-desktop/libgnome/gnome-desktop-item.h.orig
+++ libgnome-desktop/libgnome/gnome-desktop-item.h
@@ -97,6 +97,7 @@ typedef struct _GnomeDesktopItem GnomeDe
#define GNOME_DESKTOP_ITEM_DOC_PATH "X-GNOME-DocPath" /* string */
#define GNOME_DESKTOP_ITEM_DOC_PATH "X-GNOME-DocPath" /* string */
#define GNOME_DESKTOP_ITEM_SUBSTITUTEUID "X-KDE-SubstituteUID" /*boolean*/
#define GNOME_DESKTOP_ITEM_ROOT_ONLY "X-KDE-RootOnly" /*boolean*/
+#define GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain" /* string */
/* The vfolder proposal */
#define GNOME_DESKTOP_ITEM_CATEGORIES "Categories" /* string */
#define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN "OnlyShowIn" /* string */
#define GNOME_DESKTOP_ITEM_CATEGORIES "Categories" /* string */
#define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN "OnlyShowIn" /* string */

View File

@ -1,8 +1,7 @@
Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
===================================================================
--- gnome-desktop-2.28.1.orig/libgnome-desktop/gnome-desktop-item.c
+++ gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
@@ -52,6 +52,8 @@
diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-desktop-2.22.1-patched/libgnome-desktop/gnome-desktop-item.c
--- gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c 2008-04-21 12:09:49.695084000 +0200
+++ gnome-desktop-2.22.1-patched/libgnome-desktop/gnome-desktop-item.c 2008-04-21 12:24:25.530379000 +0200
@@ -55,6 +55,8 @@
#include <gtk/gtk.h>
#endif
@ -10,8 +9,8 @@ Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
+
#define sure_string(s) ((s)!=NULL?(s):"")
#define GNOME_DESKTOP_USE_UNSTABLE_API
@@ -136,6 +138,8 @@ static GnomeDesktopItem *gnome_desktop_i
#undef GNOME_DISABLE_DEPRECATED
@@ -135,6 +137,8 @@ static GnomeDesktopItem *gnome_desktop_i
GnomeDesktopItemLoadFlags flags,
GError **error);
@ -20,7 +19,7 @@ Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
static int
readbuf_getc (ReadBuf *rb)
{
@@ -2111,6 +2115,8 @@ gnome_desktop_item_launch_on_screen_with
@@ -2116,6 +2120,8 @@ gnome_desktop_item_launch_on_screen_with
(flags & GNOME_DESKTOP_ITEM_LAUNCH_DO_NOT_REAP_CHILD),
error);
@ -29,7 +28,7 @@ Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
return ret;
}
@@ -3873,3 +3879,39 @@ gnome_desktop_item_error_quark (void)
@@ -4155,3 +4161,39 @@ gnome_desktop_item_error_quark (void)
return q;
}

View File

@ -1,23 +1,3 @@
-------------------------------------------------------------------
Wed Dec 2 11:33:44 CET 2009 - vuntz@opensuse.org
- Update to version 2.29.3:
+ Build improvement
- Changes from version 2.29.2:
+ GnomeRR:
- Allow rotation if the virtual size has the correct number of
pixels
- Add gamma API
+ Updated translations.
-------------------------------------------------------------------
Sat Nov 14 21:12:37 CET 2009 - vuntz@opensuse.org
- Update to version 2.28.1:
+ Updated translations.
- Respin gnome-desktop-fate300461-desktop-gettext.patch and
gnome-desktop-recently-used-apps.patch to apply without fuzz.
-------------------------------------------------------------------
Tue Sep 22 13:53:10 CEST 2009 - dimstar@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package gnome-desktop (Version 2.29.3)
# spec file for package gnome-desktop (Version 2.28.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -18,7 +18,7 @@
Name: gnome-desktop
Version: 2.29.3
Version: 2.28.0
Release: 1
License: GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later
Summary: The GNOME Desktop API Library
@ -105,9 +105,6 @@ make %{?jobs:-j%jobs}
%install
%makeinstall
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
%find_lang %{name}-2.0
%find_lang fdl %{name}-2.0.lang
%find_lang gpl %{name}-2.0.lang