From 23fde89da83c0152b17d6f93e45281e3daf2785c22528b0459609626e071e4f4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 13 Dec 2010 12:02:30 +0000 Subject: [PATCH 1/4] Updating link to change in openSUSE:Factory/gnome-desktop revision 74.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=d8fbf0623c5e9a63ade6c4137eff4140 --- gnome-desktop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 7f2c372..b657cd9 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -20,7 +20,7 @@ Name: gnome-desktop Version: 2.91.3 -Release: 1 +Release: 2 # FIXME: check if removal of locales in %install is still needed (last checked: 2010-12-11) License: LGPLv2.1+ Summary: The GNOME Desktop API Library From 1cb003de25d3120ea9b1606fe90c732175448688ca326683d47d37059c9c3b01 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 14 Dec 2010 18:41:07 +0000 Subject: [PATCH 2/4] Accepting request 55901 from home:dimstar:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/55901 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=94 --- gnome-desktop-gdk_functions.patch | 77 +++++++++++++++++++++++++++++++ gnome-desktop.changes | 6 +++ gnome-desktop.spec | 3 ++ 3 files changed, 86 insertions(+) create mode 100644 gnome-desktop-gdk_functions.patch diff --git a/gnome-desktop-gdk_functions.patch b/gnome-desktop-gdk_functions.patch new file mode 100644 index 0000000..a2879e8 --- /dev/null +++ b/gnome-desktop-gdk_functions.patch @@ -0,0 +1,77 @@ +From 260f6d2431088c5cd0ad1eb8d57f0ec994240f08 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte +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 +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 +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 + diff --git a/gnome-desktop.changes b/gnome-desktop.changes index b908bcb..5c5da78 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 14 08:31:03 UTC 2010 - dimstar@opensuse.org + +- Add gnome-desktop-gdk_functions.patch to fix build with latest + gtk3. Patch from upstream git, commit 260f6d, 24863a & ff299b. + ------------------------------------------------------------------- Sat Dec 11 11:40:50 CET 2010 - vuntz@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index b657cd9..83dbe1e 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -28,6 +28,8 @@ Url: http://www.gnome.org Group: System/GUI/GNOME Source: %{name}-%{version}.tar.bz2 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 @@ -102,6 +104,7 @@ gtk-doc. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %patch2 -p0 From f4bda4e1d2a7732d84cb27176d41153b8e7fe25e0706e503cf26c382b6990e62 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 14 Dec 2010 18:42:31 +0000 Subject: [PATCH 3/4] Accepting request 56004 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/56004 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=95 --- gnome-desktop.changes | 6 ++++++ gnome-desktop.spec | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 5c5da78..10f930b 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 14 19:42:40 CET 2010 - vuntz@opensuse.org + +- Stop removing kg locale on 11.4 and later: bnc#659001 has been + fixed. + ------------------------------------------------------------------- Tue Dec 14 08:31:03 UTC 2010 - dimstar@opensuse.org diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 83dbe1e..38ddd80 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -21,7 +21,6 @@ Name: gnome-desktop Version: 2.91.3 Release: 2 -# FIXME: check if removal of locales in %install is still needed (last checked: 2010-12-11) License: LGPLv2.1+ Summary: The GNOME Desktop API Library Url: http://www.gnome.org @@ -128,10 +127,9 @@ make %{?jobs:-j%jobs} %if 0%{?suse_version} <= 1120 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -# FIXME: waiting for https://bugzilla.novell.com/show_bug.cgi?id=659001 ; once the bug is resolved, remove the comment for %if -#%if 0%{?suse_version} <= 1130 +%if 0%{?suse_version} <= 1130 %{__rm} %{buildroot}%{_datadir}/locale/kg/LC_MESSAGES/* -#%endif +%endif %find_lang %{name}-3.0 %if %IS_DEFAULT_GNOME_DESKTOP %find_lang fdl %{name}-3.0.lang From 5d4f33ecda801e967dfcfb4b04eff2d48fa77df48f82d091b78fdf4917226d93 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Jan 2011 22:38:50 +0000 Subject: [PATCH 4/4] 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 --- gnome-desktop-2.91.3.tar.bz2 | 3 -- gnome-desktop-2.91.4.tar.bz2 | 3 ++ gnome-desktop-desktop.patch | 12 ----- gnome-desktop-gdk_functions.patch | 77 ------------------------------- gnome-desktop.changes | 19 ++++++++ gnome-desktop.spec | 41 ++-------------- 6 files changed, 26 insertions(+), 129 deletions(-) delete mode 100644 gnome-desktop-2.91.3.tar.bz2 create mode 100644 gnome-desktop-2.91.4.tar.bz2 delete mode 100644 gnome-desktop-desktop.patch delete mode 100644 gnome-desktop-gdk_functions.patch diff --git a/gnome-desktop-2.91.3.tar.bz2 b/gnome-desktop-2.91.3.tar.bz2 deleted file mode 100644 index 72b2702..0000000 --- a/gnome-desktop-2.91.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ef820b487c6a529dec418e5b41ff4309e0da9d947d09bb6bade4d193129d2cb -size 1349752 diff --git a/gnome-desktop-2.91.4.tar.bz2 b/gnome-desktop-2.91.4.tar.bz2 new file mode 100644 index 0000000..4124d99 --- /dev/null +++ b/gnome-desktop-2.91.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3742e2f5ff79188a656d9908ea0e4a0f583fa8f1fc159a2e04a8b9cf4c9445a +size 1226137 diff --git a/gnome-desktop-desktop.patch b/gnome-desktop-desktop.patch deleted file mode 100644 index 4d13782..0000000 --- a/gnome-desktop-desktop.patch +++ /dev/null @@ -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 diff --git a/gnome-desktop-gdk_functions.patch b/gnome-desktop-gdk_functions.patch deleted file mode 100644 index a2879e8..0000000 --- a/gnome-desktop-gdk_functions.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 260f6d2431088c5cd0ad1eb8d57f0ec994240f08 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte -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 -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 -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 - diff --git a/gnome-desktop.changes b/gnome-desktop.changes index 10f930b..fc7b9cf 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -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 diff --git a/gnome-desktop.spec b/gnome-desktop.spec index 38ddd80..6b8776e 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -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. # @@ -19,18 +19,14 @@ %define IS_DEFAULT_GNOME_DESKTOP 0 Name: gnome-desktop -Version: 2.91.3 -Release: 2 +Version: 2.91.4 +Release: 1 License: LGPLv2.1+ Summary: The GNOME Desktop API Library Url: http://www.gnome.org Group: System/GUI/GNOME Source: %{name}-%{version}.tar.bz2 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: gnome-doc-utils-devel BuildRequires: intltool @@ -50,19 +46,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build This package contains the gnome-about program as well as some 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 License: LGPLv2.1+ Summary: The GNOME Desktop API Library @@ -103,20 +86,15 @@ gtk-doc. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream -%patch2 -p0 %build %configure --with-pic\ --disable-static\ - --disable-scrollkeeper\ - --with-gnome-distributor="SUSE"\ %if ! %IS_DEFAULT_GNOME_DESKTOP - --disable-gnome-about \ --disable-desktop-docs \ %endif - --disable-date-in-gnome-version + --disable-scrollkeeper make %{?jobs:-j%jobs} %install @@ -147,17 +125,6 @@ rm -rf %{buildroot} %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 %defattr(-, root, root) %doc AUTHORS COPYING.LIB NEWS README