From 3b232ac1a884adffd6ddd712b1a2e0ceec0d6780 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mar 17 2010 12:33:55 +0000 Subject: - New upstream 2.29.0 release --- diff --git a/.cvsignore b/.cvsignore index fe4a48d..7065ad1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mutter-2.28.1-20100127.tar.bz2 +mutter-2.29.0.tar.bz2 diff --git a/mutter-2.28.1-add-needed.patch b/mutter-2.28.1-add-needed.patch deleted file mode 100644 index cce72e9..0000000 --- a/mutter-2.28.1-add-needed.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mutter-2.28.1/src/tools/Makefile.am.jx mutter-2.28.1/src/tools/Makefile.am ---- mutter-2.28.1/src/tools/Makefile.am.jx 2010-01-25 11:07:32.000000000 -0500 -+++ mutter-2.28.1/src/tools/Makefile.am 2010-02-16 18:59:50.000000000 -0500 -@@ -26,7 +26,7 @@ noinst_PROGRAMS=mutter-mag mutter-graysc - - mutter_message_LDADD= @MUTTER_MESSAGE_LIBS@ - mutter_window_demo_LDADD= @MUTTER_WINDOW_DEMO_LIBS@ --mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@ -+mutter_mag_LDADD= @MUTTER_WINDOW_DEMO_LIBS@ -lm - mutter_grayscale_LDADD = @MUTTER_WINDOW_DEMO_LIBS@ - - EXTRA_DIST=$(icon_DATA) diff --git a/mutter-fixKeySym.patch b/mutter-fixKeySym.patch deleted file mode 100644 index b3fa4e6..0000000 --- a/mutter-fixKeySym.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e14132b8269e4b2ff1194e2d3412198e7d8168f1 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Wed, 03 Feb 2010 19:17:10 +0000 -Subject: [introspection] Include xlib.gir - -We need this for KeySym at least. - -https://bugzilla.gnome.org/show_bug.cgi?id=607125 ---- -diff --git a/src/Makefile.am b/src/Makefile.am -index 5f76835..a3d892d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -214,6 +214,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mu - --include=Clutter-1.0 \ - --pkg=clutter-1.0 \ - --pkg=gtk+-2.0 \ -+ --include=xlib-2.0 \ - --include=xfixes-4.0 \ - --program=$$pwd/mutter \ - $(filter %.c,$(mutter_SOURCES)) \ --- -cgit v0.8.3.1 diff --git a/mutter-math-workaround.patch b/mutter-math-workaround.patch deleted file mode 100644 index c9b8073..0000000 --- a/mutter-math-workaround.patch +++ /dev/null @@ -1,90 +0,0 @@ -Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=520209 - -diff --git a/src/compositor/mutter-window-group.c b/src/compositor/mutter-window-group.c -index e89327e..fdb75a2 100644 ---- a/src/compositor/mutter-window-group.c -+++ b/src/compositor/mutter-window-group.c -@@ -1,6 +1,6 @@ - /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - --#define _ISOC99_SOURCE /* for roundf */ -+#define _BSD_SOURCE /* for rintf */ - #include - - #include "mutter-window-private.h" -@@ -27,7 +27,7 @@ G_DEFINE_TYPE (MutterWindowGroup, mutter_window_group, CLUTTER_TYPE_GROUP); - static inline int - round_to_fixed (float x) - { -- return roundf (x * 256); -+ return rintf (x * 256); - } - - /* We can only (easily) apply our logic for figuring out what a window -diff --git a/src/compositor/mutter-window.c b/src/compositor/mutter-window.c -index 83080f8..e07be3d 100644 ---- a/src/compositor/mutter-window.c -+++ b/src/compositor/mutter-window.c -@@ -1,6 +1,6 @@ - /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - --#define _ISOC99_SOURCE /* for roundf */ -+#define _BSD_SOURCE /* for rintf */ - #include - - #include -@@ -1420,10 +1420,10 @@ mutter_window_set_visible_region_beneath (MutterWindow *self, - */ - clutter_actor_get_allocation_box (priv->shadow, &box); - -- shadow_rect.x = roundf (box.x1); -- shadow_rect.y = roundf (box.y1); -- shadow_rect.width = roundf (box.x2 - box.x1); -- shadow_rect.height = roundf (box.y2 - box.y1); -+ shadow_rect.x = rintf (box.x1); -+ shadow_rect.y = rintf (box.y1); -+ shadow_rect.width = rintf (box.x2 - box.x1); -+ shadow_rect.height = rintf (box.y2 - box.y1); - - overlap = gdk_region_rect_in (beneath_region, &shadow_rect); - -diff --git a/src/compositor/shadow.c b/src/compositor/shadow.c -index b204440..67fa538 100644 ---- a/src/compositor/shadow.c -+++ b/src/compositor/shadow.c -@@ -1,6 +1,6 @@ - /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - --#define _GNU_SOURCE /* For M_PI */ -+#define _BSD_SOURCE /* For M_PI */ - - #include - -diff --git a/src/tools/mutter-mag.c b/src/tools/mutter-mag.c -index 7c5cb3e..09e2a43 100644 ---- a/src/tools/mutter-mag.c -+++ b/src/tools/mutter-mag.c -@@ -19,8 +19,7 @@ - * 02111-1307, USA. - */ - --#define _GNU_SOURCE --#define _XOPEN_SOURCE 600 /* C99 -- for rint() */ -+#define _BSD_SOURCE /* for rint() */ - - #include - #include -diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c -index 32fbc70..adfa922 100644 ---- a/src/ui/preview-widget.c -+++ b/src/ui/preview-widget.c -@@ -21,9 +21,6 @@ - * 02111-1307, USA. - */ - --#define _GNU_SOURCE --#define _XOPEN_SOURCE 600 /* for the maths routines over floats */ -- - #include - #include - #include "preview-widget.h" diff --git a/mutter.spec b/mutter.spec index 382d05d..6763f56 100644 --- a/mutter.spec +++ b/mutter.spec @@ -1,24 +1,12 @@ -# Tarfile created using git -# git clone git://git.gnome.org/anjal -# git archive --format=tar --prefix=%{name}-%{version}/ %{git_version} | bzip2 > %{name}-%{version}-%{gitdate}.tar.bz2 - -%define gitdate 20100127 -%define git_version 5764176 -%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2 -%define snapshot %{gitdate}git%{git_version} - Name: mutter -Version: 2.28.1 -Release: 0.2%{?dist} +Version: 2.29.0 +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter Group: User Interface/Desktops License: GPLv2+ -URL: http://git.gnome.org/cgit/mutter -# Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.28/%{name}-%{version}.tar.bz2 -Source0: %{tarfile} -Patch0: mutter-fixKeySym.patch -Patch1: mutter-2.28.1-add-needed.patch +Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.29/%{name}-%{version}.tar.bz2 +Patch0: mutter-clutter12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: clutter-devel @@ -42,7 +30,6 @@ BuildRequires: intltool BuildRequires: gnome-doc-utils BuildRequires: desktop-file-utils -#Temp while we're using git master BuildRequires: libtool BuildRequires: gnome-common @@ -77,11 +64,9 @@ utilities for testing Metacity/Mutter themes. %prep %setup -q -%patch0 -p1 -b .fixKeySym -%patch1 -p1 -b .add-needed +%patch0 -p1 -b .clutter12 -# run autogen.sh until we have a proper release -NOCONFIGURE=yes ./autogen.sh +autoreconf %build %configure --with-clutter --disable-static @@ -168,6 +153,9 @@ gconftool-2 --makefile-install-rule \ %doc %{_mandir}/man1/mutter-window-demo.1.gz %changelog +* Wed Mar 17 2010 Peter Robinson 2.29.0-1 +- New upstream 2.29.0 release + * Tue Feb 16 2010 Adam Jackson 2.28.1-0.2 - mutter-2.28.1-add-needed.patch: Fix FTBFS from --no-add-needed diff --git a/sources b/sources index 1fcd2b8..5373f67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -16cd4fc93466166a55e2e7a0275a8b7f mutter-2.28.1-20100127.tar.bz2 +8676b7b42b1b923afbd3363d1711acf9 mutter-2.29.0.tar.bz2