pool/mutter
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 17896 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/mutter based on submit request 17896 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/17896
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=3
This commit is contained in:
OBS User autobuild 2009-08-17 13:14:13 +00:00 committed by Git OBS Bridge
parent 6cc464fdd0
commit 81a78c6ce8
6 changed files with 44 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mutter-2.27.1.tar.bz2
View File

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

3
mutter-2.27.2.tar.bz2 Normal file
View File

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

75
mutter-build-fix.patch
View File

@ -1,75 +0,0 @@
commit ec2c197e1fa12698850b655da054e5528ce8a727
Author: Owen W. Taylor <otaylor@fishsoup.net>
Date: Fri Jul 17 07:51:21 2009 -0400
Fix confusion about MetaPreview in introspection build
MetaPreview is only built into libmutter-private, and not included in
the mutter executable. Linking mutter against libmutter-private was
inadvertently added when the introspection build process was set up,
but isn't actually needed, and if -Wl,-as-needed is added during the
build process, then the libmutter-private dependency will be skipped.
* Don't link mutter (or the test programs) against libmutter-private
* Exclude meta-preview.h from the set of headers we feed into the
introspection build process
Reported by Patryk Zawadzki
http://bugzilla.gnome.org/show_bug.cgi?id=587975
diff --git a/src/Makefile.am b/src/Makefile.am
index c51a339..b675ab8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -147,6 +147,8 @@ libmutter_private_la_LIBADD = @MUTTER_LIBS@
libmutterincludedir = $(includedir)/mutter/mutter-private
+# Headers installed for plugins; introspected information will
+# be extracted into Mutter-<version>.gir
libmutterinclude_base_headers = \
include/alttabhandler.h \
include/boxes.h \
@@ -154,7 +156,6 @@ libmutterinclude_base_headers = \
include/main.h \
include/util.h \
include/common.h \
- ui/preview-widget.h \
ui/theme-parser.h \
ui/theme.h \
include/prefs.h \
@@ -171,7 +172,10 @@ libmutterinclude_base_headers = \
include/mutter-window.h
# Excluded from scanning for introspection but installed
+# preview-widget.h: only part of libmutter-private
+# atomnames.h: macros cause problems for scanning process
libmutterinclude_extra_headers = \
+ ui/preview-widget.h \
include/atomnames.h
libmutterinclude_HEADERS = \
@@ -221,7 +225,7 @@ Meta-$(api_version).typelib: $(G_IR_COMPILER) Meta-$(api_version).gir
endif
EFENCE=
-mutter_LDADD=@MUTTER_LIBS@ libmutter-private.la $(EFENCE)
+mutter_LDADD=@MUTTER_LIBS@ $(EFENCE)
mutter_LDFLAGS=-export-dynamic
mutter_theme_viewer_LDADD= @MUTTER_LIBS@ libmutter-private.la
@@ -232,9 +236,9 @@ testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyn
noinst_PROGRAMS=testboxes testgradient testasyncgetprop
-testboxes_LDADD= @MUTTER_LIBS@ libmutter-private.la
-testgradient_LDADD= @MUTTER_LIBS@ libmutter-private.la
-testasyncgetprop_LDADD= @MUTTER_LIBS@ libmutter-private.la
+testboxes_LDADD= @MUTTER_LIBS@
+testgradient_LDADD= @MUTTER_LIBS@
+testasyncgetprop_LDADD= @MUTTER_LIBS@
@INTLTOOL_DESKTOP_RULE@

41
mutter-clutter-1.0.patch
View File

@ -1,41 +0,0 @@
Index: mutter-2.27.1/configure.in
===================================================================
--- mutter-2.27.1.orig/configure.in
+++ mutter-2.27.1/configure.in
@@ -228,7 +228,7 @@ else
fi
CLUTTER_VERSION=0.9.3
-CLUTTER_PACKAGE=clutter-0.9
+CLUTTER_PACKAGE=clutter-1.0
AC_SUBST(CLUTTER_PACKAGE)
if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
Index: mutter-2.27.1/configure
===================================================================
--- mutter-2.27.1.orig/configure
+++ mutter-2.27.1/configure
@@ -18893,7 +18893,7 @@ $as_echo "$as_me: error: no. Mutter requ
fi
CLUTTER_VERSION=0.9.3
-CLUTTER_PACKAGE=clutter-0.9
+CLUTTER_PACKAGE=clutter-1.0
if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
Index: mutter-2.27.1/src/Makefile.am
===================================================================
--- mutter-2.27.1.orig/src/Makefile.am
+++ mutter-2.27.1/src/Makefile.am
@@ -210,8 +210,8 @@ Meta-$(api_version).gir: $(G_IR_SCANNER)
--include=GObject-2.0 \
--include=Gdk-2.0 \
--include=Gtk-2.0 \
- --include=Clutter-0.9 \
- --pkg=clutter-0.9 \
+ --include=Clutter-1.0 \
+ --pkg=clutter-1.0 \
--pkg=gtk+-2.0 \
--include=xfixes-4.0 \
--program=$$pwd/mutter \

37
mutter.changes
View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
Thu Aug 13 00:55:24 CEST 2009 - vuntz@novell.com
- Update to version 2.27.2:
+ Fix confusion about MetaPreview in introspection build
+ Queue redraws on MutterWindow's MutterShapedTexture
+ Pass event to clutter when the plugin doesn't have
xevent_filter
+ Build using Clutter 1.0
+ Don't explicitly set the size of the MutterWindow texture
+ Pass through all scroll events to compositor
+ Tolerate all standard _NET_WM_WINDOW_TYPE types for managed
windows
+ Set up correct initial values for override redirect windows
+ Add focus-window property to MetaDisplay
+ Accessors for pid and name of client machine associated with
MetaWindow
+ Added MetaWindow::window-type property
+ Added public prototype for
meta_window_is_ancestor_of_transient()
+ Avoid overflow when window maximum size hint is set to INT_MAX
+ Fix check for zero-sized textures in MutterShaped texture
+ Remove deprecated glib/gtk symbols
+ Handle FocusIn events for override redirect windows correctly
+ Elimitate use of arithmetic expansion for portability
+ Don't allow override-redirect windows to be META_WINDOW_NORMAL
+ Free MutterWindow description string in finalize() not
dispose()
+ Take extra reference on the texture inside MutterWindow
+ Use correct timestamp for focus stealing prevention
+ Export meta_screen_get_startup_sequences, add change signal
+ Fix use of uninitialized memory in edge-resistance.c
+ Updated translations.
- Drop mutter-build-fix.patch: fixed upstream.
- Drop mutter-clutter-1.0.patch: fixed upstream.
- Remove gnome-common BuildRequires and gnome-autogen.sh call.
-------------------------------------------------------------------
Mon Aug 3 12:04:51 CEST 2009 - vuntz@novell.com

17
mutter.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package mutter (Version 2.27.1)
# spec file for package mutter (Version 2.27.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -30,18 +30,12 @@ BuildRequires: intltool
BuildRequires: startup-notification-devel
BuildRequires: update-desktop-files
BuildRequires: zenity
# Needed by the patch
BuildRequires: gnome-common
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.27.1
Release: 2
Version: 2.27.2
Release: 1
Summary: Window and compositing manager based on Clutter
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM mutter-build-fix.patch vuntz@novell.com -- Taken from git
Patch0: mutter-build-fix.patch
# PATCH-FIX-UPSTREAM mutter-clutter-1.0.patch vuntz@novell.com -- Requires clutter-1.0 instead of clutter-0.9
Patch1: mutter-clutter-1.0.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: zenity
@ -69,13 +63,10 @@ to develop applications that require these.
%lang_package
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
NOCONFIGURE=1 gnome-autogen.sh
%configure \
--libexecdir=%{_prefix}/lib/%{name} \
--libexecdir=%{_libexecdir}/%{name} \
--disable-static \
--disable-schemas-install
%__make %{?jobs:-j%jobs}