rpm/gnome-desktop
SHA256
1
0
Fork 0
forked from pool/gnome-desktop
Code Pull Requests Activity

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

Browse Source 
Copy from home:vuntz:branches:GNOME:Factory/gnome-desktop via accept of submit request 27488 revision 2.
Request was accepted with message:
accept

OBS-URL: https://build.opensuse.org/request/show/27488
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=64
This commit is contained in:
Vincent Untz 2009-12-24 15:30:16 +00:00 committed by Git OBS Bridge
parent 1e96d91fc8
commit c370e0285a
6 changed files with 68 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-desktop-2.28.0.tar.bz2
View File

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

3
gnome-desktop-2.29.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:25e016d9ac169bf96f2c0b9ee2d44e91c889861969c0d58c5c77ec288d012963
size 1616707

32
gnome-desktop-fate300461-desktop-gettext.patch
View File

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

17
gnome-desktop-recently-used-apps.patch
View File

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

29
gnome-desktop.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Wed Dec 23 10:22:42 CET 2009 - vuntz@opensuse.org
- Update to version 2.29.4:
+ GnomeBG:
- Per-monitor background support
- Memory leak fixes
+ Updated translations.
-------------------------------------------------------------------
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 Tue Sep 22 13:53:10 CEST 2009 - dimstar@opensuse.org

13
gnome-desktop.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-desktop (Version 2.28.0) # spec file for package gnome-desktop (Version 2.29.4)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,9 +18,9 @@
Name: gnome-desktop Name: gnome-desktop
Version: 2.28.0 Version: 2.29.4
Release: 1 Release: 1
License: GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later License: GFDLv1.1 ; GPLv2+ ; LGPLv2.1+
Summary: The GNOME Desktop API Library Summary: The GNOME Desktop API Library
Url: http://www.gnome.org Url: http://www.gnome.org
Group: System/GUI/GNOME Group: System/GUI/GNOME
@ -56,7 +56,7 @@ distribution: the GPL, GNOME's .desktop files, the gnome-about program,
some man pages, and GNOME's core graphics files and icons. some man pages, and GNOME's core graphics files and icons.
%package -n libgnome-desktop-2-11 %package -n libgnome-desktop-2-11
License: GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later License: GFDLv1.1 ; GPLv2+ ; LGPLv2.1+
Summary: The GNOME Desktop API Library Summary: The GNOME Desktop API Library
Group: System/GUI/GNOME Group: System/GUI/GNOME
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
@ -72,7 +72,7 @@ distribution: the GPL, GNOME's .desktop files, the gnome-about program,
some man pages, and GNOME's core graphics files and icons. some man pages, and GNOME's core graphics files and icons.
%package devel %package devel
License: LGPL v2.1 or later License: LGPLv2.1+
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/GNOME Group: Development/Libraries/GNOME
Requires: gconf2-devel Requires: gconf2-devel
@ -105,6 +105,9 @@ make %{?jobs:-j%jobs}
%install %install
%makeinstall %makeinstall
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
%find_lang %{name}-2.0 %find_lang %{name}-2.0
%find_lang fdl %{name}-2.0.lang %find_lang fdl %{name}-2.0.lang
%find_lang gpl %{name}-2.0.lang %find_lang gpl %{name}-2.0.lang