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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-desktop?expand=0&rev=45

Browse Source
This commit is contained in:
OBS User unknown 2009-02-10 11:12:20 +00:00 committed by Git OBS Bridge
parent 780d09c5f7
commit b9925f5ee5
10 changed files with 311 additions and 1402 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
baselibs.conf
View File

@ -1,4 +1,4 @@
gnome-desktop gnome-desktop
libgnome-desktop-2-7 libgnome-desktop-2-11
obsoletes "gnome-desktop-<targettype> <= <version>" obsoletes "gnome-desktop-<targettype> <= <version>"
provides "gnome-desktop-<targettype> = <version>" provides "gnome-desktop-<targettype> = <version>"

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

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0337976c3c557b60b9c5d49f3c0f40b7e6873a60d57910ba7d55287375b6cab9
size 3084443

8
gnome-desktop-desktop.patch
View File

@ -2,7 +2,7 @@ Index: gnome-about/gnome-about.desktop.in.in
=================================================================== ===================================================================
--- gnome-about/gnome-about.desktop.in.in.orig --- gnome-about/gnome-about.desktop.in.in.orig
+++ gnome-about/gnome-about.desktop.in.in +++ gnome-about/gnome-about.desktop.in.in
@@ -1,12 +1,12 @@ @@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
_Name=About GNOME _Name=About GNOME
@ -11,9 +11,3 @@ Index: gnome-about/gnome-about.desktop.in.in
Exec=gnome-about Exec=gnome-about
Icon=gnome-logo-icon-transparent Icon=gnome-logo-icon-transparent
Terminal=false Terminal=false
Type=Application
-Categories=GNOME;GTK;Core;
+Categories=GNOME;GTK;Core;Documentation;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-desktop

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

@ -1,18 +1,8 @@
Add support of gettext for desktop entry files. Index: libgnome-desktop/gnome-desktop-item.c
We only support this for the following keys: Name, GenericName, Comment. We
don't support all keys because it can create issues for the Icon key (which is
localizable -- which can result in a broken icon).
Translations that are present in the desktop entry take precedence over
translations via gettext. If we don't do this, then user modifications won't
appear since they will have lower precedence.
Index: gnome-desktop-2.23.91/libgnome-desktop/gnome-desktop-item.c
=================================================================== ===================================================================
--- gnome-desktop-2.23.91.orig/libgnome-desktop/gnome-desktop-item.c --- libgnome-desktop/gnome-desktop-item.c (révision 5293)
+++ gnome-desktop-2.23.91/libgnome-desktop/gnome-desktop-item.c +++ libgnome-desktop/gnome-desktop-item.c (copie de travail)
@@ -84,6 +84,7 @@ struct _GnomeDesktopItem { @@ -81,6 +81,7 @@ struct _GnomeDesktopItem {
GHashTable *main_hash; GHashTable *main_hash;
char *location; char *location;
@ -20,16 +10,16 @@ Index: gnome-desktop-2.23.91/libgnome-desktop/gnome-desktop-item.c
time_t mtime; time_t mtime;
@@ -139,6 +140,8 @@ static GnomeDesktopItem *gnome_desktop_i @@ -134,6 +135,8 @@ static GnomeDesktopItem *gnome_desktop_i
GnomeDesktopItemLoadFlags flags,
static void update_recently_used_apps (const GnomeDesktopItem *item); GError **error);
+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)
{ {
@@ -399,6 +402,7 @@ gnome_desktop_item_new (void) @@ -394,6 +397,7 @@ gnome_desktop_item_new (void)
"1.0"); "1.0");
retval->launch_time = 0; retval->launch_time = 0;
@ -37,7 +27,7 @@ Index: gnome-desktop-2.23.91/libgnome-desktop/gnome-desktop-item.c
return retval; return retval;
} }
@@ -477,6 +481,10 @@ gnome_desktop_item_copy (const GnomeDesk @@ -472,6 +476,10 @@ gnome_desktop_item_copy (const GnomeDesk
copy_string_hash, copy_string_hash,
retval->main_hash); retval->main_hash);
@ -48,7 +38,7 @@ Index: gnome-desktop-2.23.91/libgnome-desktop/gnome-desktop-item.c
return retval; return retval;
} }
@@ -924,6 +932,9 @@ gnome_desktop_item_unref (GnomeDesktopIt @@ -923,6 +931,9 @@ gnome_desktop_item_unref (GnomeDesktopIt
g_free (item->location); g_free (item->location);
item->location = NULL; item->location = NULL;
@ -58,90 +48,151 @@ Index: gnome-desktop-2.23.91/libgnome-desktop/gnome-desktop-item.c
g_free (item); g_free (item);
} }
@@ -999,16 +1010,79 @@ lookup (const GnomeDesktopItem *item, co @@ -1011,6 +1022,71 @@ lookup_locale (const GnomeDesktopItem *i
}
static const char * static const char *
lookup_locale (const GnomeDesktopItem *item, const char *key, const char *locale) +lookup_gettext (const GnomeDesktopItem *item, const char *key)
{ +{
+ const char *ret; + const char *ret;
+ const char *msg_locale;
+ const char *value;
+ +
+ ret = NULL; + ret = NULL;
+
if (locale == NULL ||
strcmp (locale, "C") == 0) {
- return lookup (item, key);
+ ret = lookup (item, key);
} else {
- const char *ret;
char *full = g_strdup_printf ("%s[%s]", key, locale);
ret = lookup (item, full);
g_free (full);
- return ret;
}
+ +
+ /* we're only interested in gettext translation if we don't have a + /* we're only interested in gettext translation if we don't have a
+ * translation in the .desktop file itself and if the key is one of the + * translation in the .desktop file itself and if the key is one of the
+ * keys we know we want to translate: Name, GenericName, Comment. + * keys we know we want to translate: Name, GenericName, Comment.
+ * Blindly doing this for all keys can give strange result for the + * Blindly doing this for all keys can give strange result for the
+ * icons, since the Icon is a locale string in the spec, eg. */ + * icons, since the Icon is a locale string in the spec, eg. */
+ if (!ret && item->gettext_domain && + if (!(item->gettext_domain &&
+ (strcmp (key, GNOME_DESKTOP_ITEM_NAME) == 0 || + (strcmp (key, GNOME_DESKTOP_ITEM_NAME) == 0 ||
+ strcmp (key, GNOME_DESKTOP_ITEM_GENERIC_NAME) == 0 || + strcmp (key, GNOME_DESKTOP_ITEM_GENERIC_NAME) == 0 ||
+ strcmp (key, GNOME_DESKTOP_ITEM_COMMENT) == 0)) { + strcmp (key, GNOME_DESKTOP_ITEM_COMMENT) == 0)))
+ const char *msg_locale = setlocale (LC_MESSAGES, NULL); + return NULL;
+ +
+ /* only get translation in the mo file if the requested locale + msg_locale = setlocale (LC_MESSAGES, NULL);
+ * is the LC_MESSAGES one. Ideally, we should do more and + if (!msg_locale)
+ * change LC_MESSAGES to use the requested locale, but there's + return NULL;
+ * no guarantee it's installed on the system and it might have
+ * some side-effects. Since this is a corner case, let's ignore
+ * it. */
+ if (msg_locale && locale &&
+ strcmp (msg_locale, locale) == 0) {
+ const char *value = lookup (item, key);
+ +
+ if (item->location && value != NULL && value[0] != '\0') { + value = lookup (item, key);
+ GFile *file; + if (value == NULL || value[0] == '\0')
+ char *basename; + return NULL;
+ +
+ file = g_file_new_for_uri (item->location); + if (item->location) {
+ basename = g_file_get_basename (file); + GFile *file;
+ g_object_unref (file); + char *basename;
+ +
+ if (basename) { + file = g_file_new_for_uri (item->location);
+ char *context; + basename = g_file_get_basename (file);
+ char *context_value; + g_object_unref (file);
+ +
+ context = g_strdup_printf ("%s(%s)", key, + if (basename) {
+ basename); + char *context;
+ context_value = g_strdup_printf ("%s%s%s", + char *context_value;
+ context, ": ", value);
+ ret = g_dgettext (item->gettext_domain,
+ context_value);
+ if (ret == context_value)
+ ret = NULL;
+ +
+ g_free (context_value); + context = g_strdup_printf ("%s(%s)", key,
+ g_free (context); + basename);
+ g_free (basename); + context_value = g_strdup_printf ("%s%s%s",
+ } + context, ": ", value);
+ } + ret = g_dgettext (item->gettext_domain,
+ context_value);
+ if (ret == context_value)
+ ret = NULL;
+ +
+ if (!ret && value != NULL && value[0] != '\0') { + g_free (context_value);
+ ret = g_dgettext (item->gettext_domain, value); + g_free (context);
+ /* don't accept no translation, since we might + g_free (basename);
+ * have something better later, with another
+ * locale */
+ if (ret == value)
+ ret = NULL;
+ }
+ } + }
+ } + }
+ +
+ if (!ret) {
+ ret = g_dgettext (item->gettext_domain, value);
+ /* don't accept no translation */
+ if (ret == value)
+ ret = NULL;
+ }
+
+ return ret;
+}
+
+static const char *
lookup_best_locale (const GnomeDesktopItem *item, const char *key)
{
const char * const *langs_pointer;
@@ -1020,6 +1096,14 @@ lookup_best_locale (const GnomeDesktopIt
for (i = 0; langs_pointer[i] != NULL; i++) {
const char *ret = NULL;
+ /* if we reach C, it means there were no inline translations so
+ * far, so let's try gettext first */
+ if (strcmp (langs_pointer[i], "C") == 0) {
+ ret = lookup_gettext (item, key);
+ if (ret != NULL)
+ return ret;
+ }
+
ret = lookup_locale (item, key, langs_pointer[i]);
if (ret != NULL)
return ret;
@@ -2946,11 +3030,21 @@ gnome_desktop_item_get_localestring_lang
const char *attr,
const char *language)
{
+ const char *msg_locale;
+ const char *ret;
+
g_return_val_if_fail (item != NULL, NULL);
g_return_val_if_fail (item->refcount > 0, NULL);
g_return_val_if_fail (attr != NULL, NULL);
- return lookup_locale (item, attr, language);
+ msg_locale = setlocale (LC_MESSAGES, NULL);
+
+ ret = lookup_locale (item, attr, language);
+ /* let's try gettext if the requested language is the current one */
+ if (!ret && language && strcmp (msg_locale, language))
+ ret = lookup_gettext (item, attr);
+
+ return ret; + return ret;
} }
static const char * /**
@@ -4039,6 +4113,10 @@ ditem_load (ReadBuf *rb, @@ -2978,6 +3072,14 @@ gnome_desktop_item_get_attr_locale (cons
for (i = 0; langs_pointer[i] != NULL; i++) {
const char *value = NULL;
+ /* if we reach C, it means there were no inline translations so
+ * far, so let's try gettext first */
+ if (strcmp (langs_pointer[i], "C") == 0) {
+ value = lookup_gettext (item, attr);
+ if (value)
+ return setlocale (LC_MESSAGES, NULL);
+ }
+
value = lookup_locale (item, attr, langs_pointer[i]);
if (value)
return langs_pointer[i];
@@ -2998,6 +3100,9 @@ gnome_desktop_item_get_languages (const
for (li = item->languages; li != NULL; li = li->next) {
char *language = li->data;
+ /* no gettext support here: this wouldn't give us a lot. Worst
+ * case, an desktop item editor won't see that there's a
+ * translation for the current locale. */
if (attr == NULL ||
lookup_locale (item, attr, language) != NULL) {
list = g_list_prepend (list, language);
@@ -3715,6 +3820,8 @@ try_english_key (GnomeDesktopItem *item,
str = NULL;
for (i = 0; locales[i] != NULL && str == NULL; i++) {
+ /* no gettext support here: this function is for broken
+ * .desktop files anyway */
str = g_strdup (lookup_locale (item, key, locales[i]));
}
if (str != NULL) {
@@ -3983,6 +4090,10 @@ ditem_load (ReadBuf *rb,
readbuf_close (rb); readbuf_close (rb);
@ -152,15 +203,15 @@ Index: gnome-desktop-2.23.91/libgnome-desktop/gnome-desktop-item.c
return item; return item;
} }
Index: gnome-desktop-2.23.91/libgnome-desktop/libgnome/gnome-desktop-item.h Index: libgnome-desktop/libgnome/gnome-desktop-item.h
=================================================================== ===================================================================
--- gnome-desktop-2.23.91.orig/libgnome-desktop/libgnome/gnome-desktop-item.h --- libgnome-desktop/libgnome/gnome-desktop-item.h.orig
+++ gnome-desktop-2.23.91/libgnome-desktop/libgnome/gnome-desktop-item.h +++ libgnome-desktop/libgnome/gnome-desktop-item.h
@@ -98,6 +98,7 @@ typedef struct _GnomeDesktopItem GnomeDe @@ -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_SUBSTITUTEUID "X-KDE-SubstituteUID" /*boolean*/
#define GNOME_DESKTOP_ITEM_ROOT_ONLY "X-KDE-RootOnly" /*boolean*/ #define GNOME_DESKTOP_ITEM_ROOT_ONLY "X-KDE-RootOnly" /*boolean*/
+#define GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain" /* string */ +#define GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain" /* string */
/* The vfolder proposal */ /* The vfolder proposal */
#define GNOME_DESKTOP_ITEM_CATEGORIES "Categories" /* string */ #define GNOME_DESKTOP_ITEM_CATEGORIES "Categories" /* string */
#define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN "OnlyShowIn" /* string */ #define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN "OnlyShowIn" /* string */

36
gnome-desktop-foreign-for-screen.patch
View File

@ -1,36 +0,0 @@
libgnome-desktop/gnome-bg.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
index d9d6709..c1932da 100644
--- a/libgnome-desktop/gnome-bg.c
+++ b/libgnome-desktop/gnome-bg.c
@@ -880,6 +880,7 @@ make_root_pixmap (GdkScreen *screen, gint width, gint height)
Pixmap result;
GdkPixmap *gdk_pixmap;
int screen_num;
+ int depth;
screen_num = gdk_screen_get_number (screen);
@@ -902,14 +903,17 @@ make_root_pixmap (GdkScreen *screen, gint width, gint height)
XSetCloseDownMode (display, RetainPermanent);
+ depth = DefaultDepth (display, screen_num);
+
result = XCreatePixmap (display,
RootWindow (display, screen_num),
- width, height,
- DefaultDepth (display, screen_num));
+ width, height, depth);
XCloseDisplay (display);
- gdk_pixmap = gdk_pixmap_foreign_new (result);
+ gdk_pixmap = gdk_pixmap_foreign_new_for_screen (screen, result,
+ width, height, depth);
+
gdk_drawable_set_colormap (
GDK_DRAWABLE (gdk_pixmap),
gdk_drawable_get_colormap (gdk_screen_get_root_window (screen)));

1133
gnome-desktop-randr-gerror.diff
View File

File diff suppressed because it is too large Load Diff

78
gnome-desktop.changes
View File

@ -1,9 +1,52 @@
-------------------------------------------------------------------
Sun Feb 1 15:46:02 EST 2009 - mboman@suse.de
- Update to version 2.25.5:
+ GnomeBG: use gdk_color_equal() instead of custom function
+ GnomeRR: use XRRGetScreenResourcesCurrent instead of
XRRGetScreenResources when available (xrandr 1.3) because it's
cheaper
+ GnomeBG: emit "transitioned" signal instead of "changed" signal for
new frames in a slideshow background
+ GnomeBG: reorganize code a bit
+ GnomeBG: add fading API to support fading between two backgrounds
+ Translation updates
-------------------------------------------------------------------
Sun Feb 1 02:10:51 CET 2009 - vuntz@novell.com
- Update gnome-desktop-fate300461-desktop-gettext.patch: the inline
translations were ignored if they were not matching the first
language returned by g_get_language_names(), and gettext was
used. This was not the intended behavior, and made it impossible
to customize the name/comment of a launcher, eg.
-------------------------------------------------------------------
Fri Jan 23 16:56:13 CET 2009 - vuntz@novell.com
- Remove static libraries.
- Remove part of gnome-desktop-desktop.patch that is already
handled with %suse_update_desktop_file
- Sanitize BuildRequires and Requires.
- Minor tweaks.
-------------------------------------------------------------------
Fri Jan 23 04:10:09 CET 2009 - vuntz@novell.com
- Really drop gnome-desktop-foreign-for-screen.patch, fixed
upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jan 17 02:59:53 CET 2009 - crrodriguez@suse.de Sat Jan 17 02:59:53 CET 2009 - crrodriguez@suse.de
- remove "la" files, baby step to clean up all references - remove "la" files, baby step to clean up all references
to libavahi-*.la to libavahi-*.la
-------------------------------------------------------------------
Sat Jan 10 13:54:07 CST 2009 - mboman@suse.de
- Remove gnome-desktop-randr-gerror.diff. Fixed upstream
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 9 13:54:07 CST 2009 - federico@novell.com Fri Jan 9 13:54:07 CST 2009 - federico@novell.com
@ -14,6 +57,41 @@ Fri Jan 9 13:54:07 CST 2009 - federico@novell.com
- Removed gnome-desktop-randr-cloned-outputs.diff, as it is already - Removed gnome-desktop-randr-cloned-outputs.diff, as it is already
part of the patch above. part of the patch above.
-------------------------------------------------------------------
Tue Jan 6 13:25:52 EST 2009 - mboman@suse.de
- Update to version 2.25.4:
+ Translation updates
-------------------------------------------------------------------
Sat Dec 20 10:08:21 EST 2008 - mboman@suse.de
- Update to version 2.25.3:
+ libgnome-desktop
- GnomeRR: plug leaks
- GnomeRR: add API-breaking error reporting API
- GnomeBG: fix potential crash with some empty slideshow
- Build fixes
+ Translation updates
-------------------------------------------------------------------
Sun Dec 14 11:03:00 EST 2008 - mboman@suse.de
- Update to version 2.25.2:
+ libgnome-desktop
- GnomeDesktopThumbnail: reenable check for preview::icon
- GnomeRR: add Lenovo display name
- GnomeBG: plug a leak
- GnomeDesktopThumbnail: fix potential crash when a temporary file
cannot be created
+ Misc
- Require glib 2.19.1
- Update a bit API documentation
- Require GTK+ 2.14.0
+ Translation updates
- Remove icon-search-path.dif. Not valid due to API/ABI changes
- Remove gnome-desktop-randr-cloned-outputs.diff. Fixed upstream
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 11 11:03:18 CET 2008 - rodrigo@novell.com Tue Nov 11 11:03:18 CET 2008 - rodrigo@novell.com

124
gnome-desktop.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-desktop (Version 2.24.1) # spec file for package gnome-desktop (Version 2.25.5)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,32 +19,33 @@
Name: gnome-desktop Name: gnome-desktop
BuildRequires: fdupes gnome-common gnome-doc-utils gnome-doc-utils-devel BuildRequires: fdupes
BuildRequires: gtk-doc intltool libgnomeui-devel perl-XML-Parser BuildRequires: gconf2-devel
BuildRequires: scrollkeeper startup-notification-devel BuildRequires: gnome-common
BuildRequires: gnome-doc-utils-devel
BuildRequires: gtk-doc
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: scrollkeeper
BuildRequires: startup-notification-devel
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
Obsoletes: gnome-core Obsoletes: gnome-core
Version: 2.24.1 Version: 2.25.5
Release: 6 Release: 1
Summary: The GNOME Desktop API Library Summary: The GNOME Desktop API Library
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Url: http://www.gnome.org Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch: icon-search-path.dif
Patch1: X-KDE-SubstituteUID.dif Patch1: X-KDE-SubstituteUID.dif
Patch2: gnome-desktop-desktop.patch Patch2: gnome-desktop-desktop.patch
# PATCH-FEATURE-OPENSUSE gnome-desktop-recently-used-apps.patch -- Add launched .desktop files to recently used apps. # PATCH-FEATURE-OPENSUSE gnome-desktop-recently-used-apps.patch -- Add launched .desktop files to recently used apps.
Patch3: gnome-desktop-recently-used-apps.patch Patch3: gnome-desktop-recently-used-apps.patch
# PATCH-FEATURE-OPENSUSE gnome-desktop-fate300461-desktop-gettext.patch fate300461 vuntz@novell.com -- Look for translation of desktop entry strings via gettext # PATCH-FEATURE-OPENSUSE gnome-desktop-fate300461-desktop-gettext.patch fate300461 vuntz@novell.com -- Look for translation of desktop entry strings via gettext
Patch5: gnome-desktop-fate300461-desktop-gettext.patch Patch5: gnome-desktop-fate300461-desktop-gettext.patch
# PATCH-FIX-UPSTREAM gnome-desktop-foreign-for-screen.patch bgo#555701 rodrigo@novell.com
Patch7: gnome-desktop-foreign-for-screen.patch
# PATCH-FEATURE-UPSTREAM gnome-desktop-randr-gerror.diff federico@novell.com - Add GError reporting to the GnomeRR API for RANDR
Patch8: gnome-desktop-randr-gerror.diff
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
Requires: libgnome-desktop-2-7 = %{version} Requires: libgnome-desktop-2-11 = %{version}
%description %description
This package contains the libgnome-desktop library that contains APIs This package contains the libgnome-desktop library that contains APIs
@ -66,13 +67,13 @@ Authors:
Havoc Pennington <hp@redhat.com> Havoc Pennington <hp@redhat.com>
Anders Carlsson <andersca@gnu.org> Anders Carlsson <andersca@gnu.org>
%package -n libgnome-desktop-2-7 %package -n libgnome-desktop-2-11
License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later License: GNU Free Documentation License, Version 1.1 (GFDL 1.1); GPL v2 or later; LGPL v2.1 or later
Summary: The GNOME Desktop API Library Summary: The GNOME Desktop API Library
Group: System/GUI/GNOME Group: System/GUI/GNOME
Requires: %{name} >= %{version} Requires: %{name} >= %{version}
%description -n libgnome-desktop-2-7 %description -n libgnome-desktop-2-11
This package contains the libgnome-desktop library that contains APIs This package contains the libgnome-desktop library that contains APIs
that really belong in libgnome/libgnomeui but have not seen enough that really belong in libgnome/libgnomeui but have not seen enough
testing or development to be considered stable. Use them at your own testing or development to be considered stable. Use them at your own
@ -96,7 +97,7 @@ Authors:
License: LGPL v2.1 or later License: LGPL v2.1 or later
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: %{name} = %{version} gtk2-devel libgnomeui-devel libopenssl-devel startup-notification-devel Requires: %{name} = %{version} gconf2-devel gtk2-devel startup-notification-devel
%description devel %description devel
This package contains all necessary include files and libraries needed This package contains all necessary include files and libraries needed
@ -133,13 +134,10 @@ Authors:
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch -p1
%patch1 %patch1
%patch2 -p0 %patch2 -p0
%patch3 -p1 %patch3 -p1
%patch5 -p1 %patch5 -p0
%patch7 -p1
%patch8 -p1
%build %build
autoreconf -f -i autoreconf -f -i
@ -147,7 +145,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure --with-pic\ %configure --with-pic\
--disable-static\ --disable-static\
--disable-scrollkeeper\ --disable-scrollkeeper\
--with-kde-datadir=/opt/kde3\
--with-gnome-distributor="SUSE" --with-gnome-distributor="SUSE"
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
@ -155,20 +152,18 @@ make %{?jobs:-j%jobs}
%makeinstall %makeinstall
%find_lang %{name}-2.0 %find_lang %{name}-2.0
%find_lang fdl %{name}-2.0.lang %find_lang fdl %{name}-2.0.lang
# This no longer seems to exist.
# %find_lang gnome-feedback %{name}-2.0.lang
%find_lang gpl %{name}-2.0.lang %find_lang gpl %{name}-2.0.lang
%find_lang lgpl %{name}-2.0.lang %find_lang lgpl %{name}-2.0.lang
%suse_update_desktop_file gnome-about Documentation %suse_update_desktop_file gnome-about Documentation
%fdupes $RPM_BUILD_ROOT
%{__rm} -vf %{buildroot}%{_libdir}/*.la %{__rm} -vf %{buildroot}%{_libdir}/*.la
%fdupes $RPM_BUILD_ROOT
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post -n libgnome-desktop-2-7 -p /sbin/ldconfig %post -n libgnome-desktop-2-11 -p /sbin/ldconfig
%postun -n libgnome-desktop-2-7 -p /sbin/ldconfig %postun -n libgnome-desktop-2-11 -p /sbin/ldconfig
%files %files
%defattr (-, root, root) %defattr (-, root, root)
@ -176,16 +171,21 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/* %{_bindir}/*
%{_datadir}/applications/gnome-about.desktop %{_datadir}/applications/gnome-about.desktop
%{_datadir}/gnome-about %{_datadir}/gnome-about
%{_datadir}/omf/* %doc %{_datadir}/omf/*
%{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/*.png
%{_datadir}/pixmaps/*.xpm %{_datadir}/pixmaps/*.xpm
%doc %{_mandir}/man?/*.* %doc %{_mandir}/man?/*.*
%files -n libgnome-desktop-2-7 %files -n libgnome-desktop-2-11
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files lang -f %{name}-2.0.lang %files lang -f %{name}-2.0.lang
## ha/ig does not exist in Factory currently
##%if %suse_version <= 1110
# exclude locales which don't exist on old versions of openSUSE
%exclude %{_datadir}/locale/ig/LC_MESSAGES/*
##%endif
%files devel %files devel
%defattr (-, root, root) %defattr (-, root, root)
@ -198,9 +198,37 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/gnome-desktop %{_datadir}/gtk-doc/html/gnome-desktop
%changelog %changelog
* Sat Jan 17 2009 crrodriguez@suse.de * Sun Feb 01 2009 mboman@suse.de
- Update to version 2.25.5:
+ GnomeBG: use gdk_color_equal() instead of custom function
+ GnomeRR: use XRRGetScreenResourcesCurrent instead of
XRRGetScreenResources when available (xrandr 1.3) because it's
cheaper
+ GnomeBG: emit "transitioned" signal instead of "changed" signal for
new frames in a slideshow background
+ GnomeBG: reorganize code a bit
+ GnomeBG: add fading API to support fading between two backgrounds
+ Translation updates
* Sat Jan 31 2009 vuntz@novell.com
- Update gnome-desktop-fate300461-desktop-gettext.patch: the inline
translations were ignored if they were not matching the first
language returned by g_get_language_names(), and gettext was
used. This was not the intended behavior, and made it impossible
to customize the name/comment of a launcher, eg.
* Fri Jan 23 2009 vuntz@novell.com
- Remove static libraries.
- Remove part of gnome-desktop-desktop.patch that is already
handled with %%suse_update_desktop_file
- Sanitize BuildRequires and Requires.
- Minor tweaks.
* Thu Jan 22 2009 vuntz@novell.com
- Really drop gnome-desktop-foreign-for-screen.patch, fixed
upstream.
* Fri Jan 16 2009 crrodriguez@suse.de
- remove "la" files, baby step to clean up all references - remove "la" files, baby step to clean up all references
to libavahi-*.la to libavahi-*.la
* Sat Jan 10 2009 mboman@suse.de
- Remove gnome-desktop-randr-gerror.diff. Fixed upstream
* Fri Jan 09 2009 federico@novell.com * Fri Jan 09 2009 federico@novell.com
- Added gnome-desktop-randr-gerror.diff. This adds GError reporting - Added gnome-desktop-randr-gerror.diff. This adds GError reporting
to the GnomeRR API, which in turn lets gnome-settings-daemon and to the GnomeRR API, which in turn lets gnome-settings-daemon and
@ -208,12 +236,38 @@ rm -rf $RPM_BUILD_ROOT
fails in multihead configuration. fails in multihead configuration.
- Removed gnome-desktop-randr-cloned-outputs.diff, as it is already - Removed gnome-desktop-randr-cloned-outputs.diff, as it is already
part of the patch above. part of the patch above.
* Tue Jan 06 2009 mboman@suse.de
- Update to version 2.25.4:
+ Translation updates
* Sat Dec 20 2008 mboman@suse.de
- Update to version 2.25.3:
+ libgnome-desktop
- GnomeRR: plug leaks
- GnomeRR: add API-breaking error reporting API
- GnomeBG: fix potential crash with some empty slideshow
- Build fixes
+ Translation updates
* Sun Dec 14 2008 mboman@suse.de
- Update to version 2.25.2:
+ libgnome-desktop
- GnomeDesktopThumbnail: reenable check for preview::icon
- GnomeRR: add Lenovo display name
- GnomeBG: plug a leak
- GnomeDesktopThumbnail: fix potential crash when a temporary file
cannot be created
+ Misc
- Require glib 2.19.1
- Update a bit API documentation
- Require GTK+ 2.14.0
+ Translation updates
- Remove icon-search-path.dif. Not valid due to API/ABI changes
- Remove gnome-desktop-randr-cloned-outputs.diff. Fixed upstream
* Tue Nov 11 2008 rodrigo@novell.com * Tue Nov 11 2008 rodrigo@novell.com
- Add upstream patch for bgo#555701 - Add upstream patch for bgo#555701
* Wed Oct 22 2008 maw@suse.de * Wed Oct 22 2008 maw@suse.de
- Update to version 2.24.1: - Update to version 2.24.1:
+ Updated translations. + Updated translations.
* Sat Oct 04 2008 mboman@suse.de * Fri Oct 03 2008 mboman@suse.de
- Update to version 2.24.0: - Update to version 2.24.0:
+ GnomeRR: don't try and set the screen size if turning off any of the + GnomeRR: don't try and set the screen size if turning off any of the
CRTC's failed CRTC's failed
@ -322,7 +376,7 @@ rm -rf $RPM_BUILD_ROOT
for multilib support for multilib support
* Tue Apr 01 2008 vuntz@suse.de * Tue Apr 01 2008 vuntz@suse.de
- Remove uz@cyrillic workaround (see bnc#372941) - Remove uz@cyrillic workaround (see bnc#372941)
* Fri Mar 14 2008 maw@suse.de * Thu Mar 13 2008 maw@suse.de
- Update to version 2.22.0: - Update to version 2.22.0:
+ Updated translations. + Updated translations.
* Tue Mar 04 2008 maw@suse.de * Tue Mar 04 2008 maw@suse.de
@ -378,7 +432,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Aug 14 2007 maw@suse.de * Tue Aug 14 2007 maw@suse.de
- Rename the uz@cyrillic locale directory to uz@Cyrl to avoid - Rename the uz@cyrillic locale directory to uz@Cyrl to avoid
unowned directories. unowned directories.
* Wed Aug 08 2007 maw@suse.de * Tue Aug 07 2007 maw@suse.de
- Use %%fdupes - Use %%fdupes
- Split off a -lang subpackage - Split off a -lang subpackage
- s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun. - s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun.
@ -397,7 +451,7 @@ rm -rf $RPM_BUILD_ROOT
- Removed invalid desktop Category "Application" (#254654). - Removed invalid desktop Category "Application" (#254654).
* Fri Apr 27 2007 sbrabec@suse.cz * Fri Apr 27 2007 sbrabec@suse.cz
- Do not call meinproc (#227624). - Do not call meinproc (#227624).
* Thu Apr 12 2007 maw@suse.de * Wed Apr 11 2007 maw@suse.de
- Update to version 2.18.1 - Update to version 2.18.1
- Minor fixes - Minor fixes
- Updated translations for both the documentation (ar and ca) - Updated translations for both the documentation (ar and ca)
@ -420,7 +474,7 @@ rm -rf $RPM_BUILD_ROOT
* Wed Nov 15 2006 jimmyk@suse.de * Wed Nov 15 2006 jimmyk@suse.de
- Updated recently-used-apps.patch to be compatible with new recently-used - Updated recently-used-apps.patch to be compatible with new recently-used
format, BNC #221392. format, BNC #221392.
* Fri Oct 13 2006 ro@suse.de * Thu Oct 12 2006 ro@suse.de
- added gnome-doc-utils-devel to buildreq - added gnome-doc-utils-devel to buildreq
* Mon Oct 02 2006 jhargadon@suse.de * Mon Oct 02 2006 jhargadon@suse.de
- update to version 2.16.1 - update to version 2.16.1
@ -501,11 +555,11 @@ rm -rf $RPM_BUILD_ROOT
- Update to version 2.9.91 - Update to version 2.9.91
* Tue Feb 08 2005 sbrabec@suse.cz * Tue Feb 08 2005 sbrabec@suse.cz
- Changed Categories for gnome-about (#50440). - Changed Categories for gnome-about (#50440).
* Sun Feb 06 2005 gekker@suse.de * Sat Feb 05 2005 gekker@suse.de
- Update to version 2.9.90.1 - Update to version 2.9.90.1
* Sat Jan 22 2005 gekker@suse.de * Sat Jan 22 2005 gekker@suse.de
- Fixing the broken build - Fixing the broken build
* Fri Jan 21 2005 gekker@suse.de * Thu Jan 20 2005 gekker@suse.de
- Update to version 2.9.4 - Update to version 2.9.4
* Tue Nov 02 2004 ro@suse.de * Tue Nov 02 2004 ro@suse.de
- locale rename: no -> nb - locale rename: no -> nb

99
icon-search-path.dif
View File

@ -1,99 +0,0 @@
diff -ruN gnome-desktop-2.2.2/libgnome-desktop/gnome-desktop-item.c gnome-desktop-n/libgnome-desktop/gnome-desktop-item.c
--- gnome-desktop-2.2.2/libgnome-desktop/gnome-desktop-item.c 2003-05-14 14:40:38.000000000 +0200
+++ gnome-desktop-n/libgnome-desktop/gnome-desktop-item.c 2003-09-15 14:55:59.000000000 +0200
@@ -2340,6 +2340,11 @@
static GSList *hicolor_kde_32 = NULL;
static GSList *hicolor_kde_22 = NULL;
static GSList *hicolor_kde_16 = NULL;
+static GSList *crystalsvg_kde_48 = NULL;
+static GSList *crystalsvg_kde_32 = NULL;
+static GSList *crystalsvg_kde_22 = NULL;
+static GSList *crystalsvg_kde_16 = NULL;
+
/* XXX: maybe we don't care about locolor
static GSList *locolor_kde_48 = NULL;
static GSList *locolor_kde_32 = NULL;
@@ -2397,6 +2402,10 @@
ADD_DIRS (hicolor, 32);
ADD_DIRS (hicolor, 22);
ADD_DIRS (hicolor, 16);
+ ADD_DIRS (crystalsvg, 48);
+ ADD_DIRS (crystalsvg, 32);
+ ADD_DIRS (crystalsvg, 22);
+ ADD_DIRS (crystalsvg, 16);
/* XXX: maybe we don't care about locolor
ADD_DIRS (locolor, 48);
@@ -2423,6 +2432,15 @@
g_slist_copy (hicolor_kde_22));
list = g_slist_concat (list,
g_slist_copy (hicolor_kde_16));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_48));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_32));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_16));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_22));
+
} else if (size > 22) {
/* 23-32 */
list = g_slist_concat (g_slist_copy (hicolor_kde_32),
@@ -2431,6 +2449,15 @@
g_slist_copy (hicolor_kde_22));
list = g_slist_concat (list,
g_slist_copy (hicolor_kde_16));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_48));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_32));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_16));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_22));
+
} else if (size > 16) {
/* 17-22 */
list = g_slist_concat (g_slist_copy (hicolor_kde_22),
@@ -2439,6 +2466,15 @@
g_slist_copy (hicolor_kde_48));
list = g_slist_concat (list,
g_slist_copy (hicolor_kde_16));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_48));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_32));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_16));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_22));
+
} else {
/* 1-16 */
list = g_slist_concat (g_slist_copy (hicolor_kde_16),
@@ -2447,6 +2483,15 @@
g_slist_copy (hicolor_kde_32));
list = g_slist_concat (list,
g_slist_copy (hicolor_kde_48));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_48));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_32));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_16));
+ list = g_slist_concat (list,
+ g_slist_copy (crystalsvg_kde_22));
+
}
list = g_slist_append (list, kde_icondir);
@@ -2463,7 +2508,7 @@
char *try_prefixes[] = {
"/usr",
"/opt/kde",
- "/opt/kde2",
+ "/opt/kde3",
"/usr/local",
"/kde",
"/kde2",