forked from pool/gnome-desktop
Accepting request 57480 from home:vuntz:branches:GNOME:Factory
OBS-URL: https://build.opensuse.org/request/show/57480 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=96
This commit is contained in:
parent
f4bda4e1d2
commit
5d4f33ecda
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9ef820b487c6a529dec418e5b41ff4309e0da9d947d09bb6bade4d193129d2cb
|
|
||||||
size 1349752
|
|
3
gnome-desktop-2.91.4.tar.bz2
Normal file
3
gnome-desktop-2.91.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:c3742e2f5ff79188a656d9908ea0e4a0f583fa8f1fc159a2e04a8b9cf4c9445a
|
||||||
|
size 1226137
|
@ -1,12 +0,0 @@
|
|||||||
Index: gnome-about/gnome-about.desktop.in.in
|
|
||||||
===================================================================
|
|
||||||
--- gnome-about/gnome-about.desktop.in.in.orig
|
|
||||||
+++ gnome-about/gnome-about.desktop.in.in
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
[Desktop Entry]
|
|
||||||
_Name=About GNOME
|
|
||||||
-_Comment=Learn more about GNOME
|
|
||||||
+_GenericName=Learn more about GNOME
|
|
||||||
Exec=gnome-about
|
|
||||||
Icon=gnome-logo-icon-transparent
|
|
||||||
Terminal=false
|
|
@ -1,77 +0,0 @@
|
|||||||
From 260f6d2431088c5cd0ad1eb8d57f0ec994240f08 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benjamin Otte <otte@redhat.com>
|
|
||||||
Date: Tue, 30 Nov 2010 21:25:03 +0000
|
|
||||||
Subject: Remove unnecessary cast
|
|
||||||
|
|
||||||
The symbol will be removed soon, so better get rid of it.
|
|
||||||
---
|
|
||||||
diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
|
|
||||||
index 27aea30..76c61a8 100644
|
|
||||||
--- a/libgnome-desktop/gnome-bg.c
|
|
||||||
+++ b/libgnome-desktop/gnome-bg.c
|
|
||||||
@@ -1094,7 +1094,7 @@ gnome_bg_create_surface (GnomeBG *bg,
|
|
||||||
|
|
||||||
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
|
|
||||||
width, height);
|
|
||||||
- gnome_bg_draw (bg, pixbuf, gdk_window_get_screen (GDK_DRAWABLE (window)), is_root);
|
|
||||||
+ gnome_bg_draw (bg, pixbuf, gdk_window_get_screen (window), is_root);
|
|
||||||
gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
|
|
||||||
g_object_unref (pixbuf);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
cgit v0.8.3.1
|
|
||||||
|
|
||||||
From ff299bbed74e9603ea7c780de8805110d88dec28 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benjamin Otte <otte@redhat.com>
|
|
||||||
Date: Wed, 01 Dec 2010 11:37:59 +0000
|
|
||||||
Subject: Replace GDK macro usage with proper function name
|
|
||||||
|
|
||||||
---
|
|
||||||
diff --git a/libgnome-desktop/gnome-bg-crossfade.c b/libgnome-desktop/gnome-bg-crossfade.c
|
|
||||||
index df6a285..02a120e 100644
|
|
||||||
--- a/libgnome-desktop/gnome-bg-crossfade.c
|
|
||||||
+++ b/libgnome-desktop/gnome-bg-crossfade.c
|
|
||||||
@@ -373,7 +373,7 @@ animations_are_disabled (GnomeBGCrossfade *fade)
|
|
||||||
static void
|
|
||||||
draw_background (GnomeBGCrossfade *fade)
|
|
||||||
{
|
|
||||||
- if (GDK_WINDOW_TYPE (fade->priv->window) == GDK_WINDOW_ROOT) {
|
|
||||||
+ if (gdk_window_get_window_type (fade->priv->window) == GDK_WINDOW_ROOT) {
|
|
||||||
XClearArea (GDK_WINDOW_XDISPLAY (fade->priv->window),
|
|
||||||
GDK_WINDOW_XID (fade->priv->window),
|
|
||||||
0, 0,
|
|
||||||
@@ -494,7 +494,7 @@ gnome_bg_crossfade_start (GnomeBGCrossfade *fade,
|
|
||||||
g_return_if_fail (fade->priv->fading_surface != NULL);
|
|
||||||
g_return_if_fail (fade->priv->end_surface != NULL);
|
|
||||||
g_return_if_fail (!gnome_bg_crossfade_is_started (fade));
|
|
||||||
- g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN);
|
|
||||||
+ g_return_if_fail (gdk_window_get_window_type (window) != GDK_WINDOW_FOREIGN);
|
|
||||||
|
|
||||||
source = g_timeout_source_new (1000 / 60.0);
|
|
||||||
g_source_set_callback (source,
|
|
||||||
--
|
|
||||||
cgit v0.8.3.1
|
|
||||||
|
|
||||||
From 24863ae9ea04dec397e41892cff21ae5ce9cef38 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benjamin Otte <otte@redhat.com>
|
|
||||||
Date: Thu, 02 Dec 2010 21:02:16 +0000
|
|
||||||
Subject: rr: Use gdk_x11_window_get_xid()
|
|
||||||
|
|
||||||
... instead of removed gdk_x11_drawable_get_xid()
|
|
||||||
---
|
|
||||||
diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
|
|
||||||
index 7e8bc22..6b8379b 100644
|
|
||||||
--- a/libgnome-desktop/gnome-rr.c
|
|
||||||
+++ b/libgnome-desktop/gnome-rr.c
|
|
||||||
@@ -668,7 +668,7 @@ gnome_rr_screen_new (GdkScreen *gdk_screen,
|
|
||||||
|
|
||||||
screen->gdk_screen = gdk_screen;
|
|
||||||
screen->gdk_root = gdk_screen_get_root_window (gdk_screen);
|
|
||||||
- screen->xroot = gdk_x11_drawable_get_xid (screen->gdk_root);
|
|
||||||
+ screen->xroot = gdk_x11_window_get_xid (screen->gdk_root);
|
|
||||||
screen->xdisplay = dpy;
|
|
||||||
screen->xscreen = gdk_x11_screen_get_xscreen (screen->gdk_screen);
|
|
||||||
screen->connector_type_atom = XInternAtom (dpy, "ConnectorType", FALSE);
|
|
||||||
--
|
|
||||||
cgit v0.8.3.1
|
|
||||||
|
|
@ -1,3 +1,22 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 7 17:48:32 CET 2011 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 2.91.4:
|
||||||
|
+ Remove gnome-about: a System Information panel in
|
||||||
|
gnome-control-center replaces it.
|
||||||
|
+ libgnome-desktop:
|
||||||
|
- Adapt to GTK+ 3 changes.
|
||||||
|
+ Misc
|
||||||
|
- Don't export private symbols in the shared library.
|
||||||
|
+ Updated translations.
|
||||||
|
- Drop gnome-desktop-gdk_functions.patch: fixed upstream.
|
||||||
|
- Drop gnome-desktop-desktop.patch: gnome-about got removed.
|
||||||
|
- Remove gnome-about packaging (that was disabled via
|
||||||
|
IS_DEFAULT_GNOME_DESKTOP): gnome-about got removed.
|
||||||
|
- Do not pass --disable-date-in-gnome-version and
|
||||||
|
--with-gnome-distributor="SUSE" to configure: the options don't
|
||||||
|
exist anymore.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Dec 14 19:42:40 CET 2010 - vuntz@opensuse.org
|
Tue Dec 14 19:42:40 CET 2010 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package gnome-desktop (Version 2.91.3)
|
# spec file for package gnome-desktop (Version 2.91.4)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -19,18 +19,14 @@
|
|||||||
%define IS_DEFAULT_GNOME_DESKTOP 0
|
%define IS_DEFAULT_GNOME_DESKTOP 0
|
||||||
|
|
||||||
Name: gnome-desktop
|
Name: gnome-desktop
|
||||||
Version: 2.91.3
|
Version: 2.91.4
|
||||||
Release: 2
|
Release: 1
|
||||||
License: LGPLv2.1+
|
License: 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
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
# PATCH-FIX-UPSTREAM gnome-desktop-gdk_functions.patch dimstar@opensuse.org -- Replace GDK macro usage with proper function name, taken from git.
|
|
||||||
Patch0: gnome-desktop-gdk_functions.patch
|
|
||||||
# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
|
|
||||||
Patch2: gnome-desktop-desktop.patch
|
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gnome-doc-utils-devel
|
BuildRequires: gnome-doc-utils-devel
|
||||||
BuildRequires: intltool
|
BuildRequires: intltool
|
||||||
@ -50,19 +46,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
This package contains the gnome-about program as well as some
|
This package contains the gnome-about program as well as some
|
||||||
desktop-wide documents.
|
desktop-wide documents.
|
||||||
|
|
||||||
%if %IS_DEFAULT_GNOME_DESKTOP
|
|
||||||
|
|
||||||
%package -n gnome-about
|
|
||||||
License: GPLv2+
|
|
||||||
Summary: Information dialog about GNOME
|
|
||||||
Group: System/GUI/GNOME
|
|
||||||
Recommends: %{name}-lang
|
|
||||||
|
|
||||||
%description -n gnome-about
|
|
||||||
The gnome-about program helps find which version of GNOME is
|
|
||||||
installed.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%package -n libgnome-desktop-3-0
|
%package -n libgnome-desktop-3-0
|
||||||
License: LGPLv2.1+
|
License: LGPLv2.1+
|
||||||
Summary: The GNOME Desktop API Library
|
Summary: The GNOME Desktop API Library
|
||||||
@ -103,20 +86,15 @@ gtk-doc.
|
|||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
translation-update-upstream
|
translation-update-upstream
|
||||||
%patch2 -p0
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-pic\
|
%configure --with-pic\
|
||||||
--disable-static\
|
--disable-static\
|
||||||
--disable-scrollkeeper\
|
|
||||||
--with-gnome-distributor="SUSE"\
|
|
||||||
%if ! %IS_DEFAULT_GNOME_DESKTOP
|
%if ! %IS_DEFAULT_GNOME_DESKTOP
|
||||||
--disable-gnome-about \
|
|
||||||
--disable-desktop-docs \
|
--disable-desktop-docs \
|
||||||
%endif
|
%endif
|
||||||
--disable-date-in-gnome-version
|
--disable-scrollkeeper
|
||||||
make %{?jobs:-j%jobs}
|
make %{?jobs:-j%jobs}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -147,17 +125,6 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
%postun -n libgnome-desktop-3-0 -p /sbin/ldconfig
|
%postun -n libgnome-desktop-3-0 -p /sbin/ldconfig
|
||||||
|
|
||||||
%if %IS_DEFAULT_GNOME_DESKTOP
|
|
||||||
|
|
||||||
%files -n gnome-about
|
|
||||||
%defattr (-, root, root)
|
|
||||||
%doc COPYING
|
|
||||||
%{_bindir}/gnome-about
|
|
||||||
%{_datadir}/applications/gnome-about.desktop
|
|
||||||
%{_datadir}/gnome-about/
|
|
||||||
%doc %{_mandir}/man1/gnome-about.1*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files -n libgnome-desktop-3-0
|
%files -n libgnome-desktop-3-0
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%doc AUTHORS COPYING.LIB NEWS README
|
%doc AUTHORS COPYING.LIB NEWS README
|
||||||
|
Loading…
x
Reference in New Issue
Block a user