X Strike Force X.Org X11 SVN commit: r3701 - in trunk/app/compiz: . debian debian/patches
Author: beatle
Date: 2006-10-09 22:12:20 -0400 (Mon, 09 Oct 2006)
New Revision: 3701
Added:
trunk/app/compiz/debian/patches/012_metacity-theme-support.patch
Removed:
trunk/app/compiz/debian/patches/012_metabuttonspace-define.patch
Modified:
trunk/app/compiz/configure
trunk/app/compiz/debian/changelog
Log:
Implement cleaner backwards-compatible metacity theme support and make sure
the configure script doesn't require libmetacity-private >= 2.15.21 anymore.
Modified: trunk/app/compiz/configure
===================================================================
--- trunk/app/compiz/configure 2006-10-10 00:06:46 UTC (rev 3700)
+++ trunk/app/compiz/configure 2006-10-10 02:12:20 UTC (rev 3701)
@@ -24362,12 +24362,12 @@
pkg_cv_METACITY_CFLAGS="$METACITY_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.15.21\"") >&5
- ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.15.21") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libmetacity-private") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_METACITY_CFLAGS=`$PKG_CONFIG --cflags "libmetacity-private >= 2.15.21" 2>/dev/null`
+ pkg_cv_METACITY_CFLAGS=`$PKG_CONFIG --cflags "libmetacity-private" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -24380,12 +24380,12 @@
pkg_cv_METACITY_LIBS="$METACITY_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.15.21\"") >&5
- ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.15.21") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmetacity-private\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libmetacity-private") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_METACITY_LIBS=`$PKG_CONFIG --libs "libmetacity-private >= 2.15.21" 2>/dev/null`
+ pkg_cv_METACITY_LIBS=`$PKG_CONFIG --libs "libmetacity-private" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -24404,9 +24404,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- METACITY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmetacity-private >= 2.15.21"`
+ METACITY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmetacity-private"`
else
- METACITY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmetacity-private >= 2.15.21"`
+ METACITY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmetacity-private"`
fi
# Put the nasty error message in config.log where it belongs
echo "$METACITY_PKG_ERRORS" >&5
Modified: trunk/app/compiz/debian/changelog
===================================================================
--- trunk/app/compiz/debian/changelog 2006-10-10 00:06:46 UTC (rev 3700)
+++ trunk/app/compiz/debian/changelog 2006-10-10 02:12:20 UTC (rev 3701)
@@ -5,10 +5,11 @@
+ Drop 012_freedesktop-schema.patch, applied upstream.
* Replace 010_snap-by-default by the upstream patch 010_snap-inverted and
add 011_snap-by-default to enable snapping by default.
- * Add 012_metabuttonspace-define.patch which adds the definition of the
- MetaButtonSpace needed to build metacity theme support.
+ * Add 012_metacity-theme-support.patch which uses an older version of the
+ metacity library for theme support so that compiz can be built for Debian
+ unstable.
- -- Thierry Reding <thierry@gilfi.de> Tue, 10 Oct 2006 01:57:18 +0200
+ -- Thierry Reding <thierry@gilfi.de> Tue, 10 Oct 2006 04:04:11 +0200
compiz (0.0.13+git20060928-4) UNRELEASED; urgency=low
Deleted: trunk/app/compiz/debian/patches/012_metabuttonspace-define.patch
===================================================================
--- trunk/app/compiz/debian/patches/012_metabuttonspace-define.patch 2006-10-10 00:06:46 UTC (rev 3700)
+++ trunk/app/compiz/debian/patches/012_metabuttonspace-define.patch 2006-10-10 02:12:20 UTC (rev 3701)
@@ -1,39 +0,0 @@
-Define the MetaButtonSpace structure locally when building metacity theme
-support so that the dependency on libmetacity >= 2.15.21 can be dropped.
-
-Index: configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -218,7 +218,7 @@
- LIBS="$save_LIBS"
-
- if test "x$use_metacity" = "xyes"; then
-- PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.15.21,
-+ PKG_CHECK_MODULES(METACITY, libmetacity-private,
- [use_metacity=yes], [use_metacity=no])
- fi
-
-Index: gtk/window-decorator/gtk-window-decorator.c
-===================================================================
---- a/gtk/window-decorator/gtk-window-decorator.c
-+++ b/gtk/window-decorator/gtk-window-decorator.c
-@@ -2788,6 +2788,18 @@
- }
-
- #ifdef USE_METACITY
-+typedef struct _MetaButtonSpace MetaButtonSpace;
-+struct _MetaButtonSpace
-+{
-+ /* The reason for two different rectangles here is Fitts' law & maximized
-+ * windows; see #97703 for more details.
-+ * visible - The screen area where the button's image is drawn
-+ * clickable - The screen area where the button can be activated by clicking
-+ */
-+ GdkRectangle visible;
-+ GdkRectangle clickable;
-+};
-+
- static void
- meta_get_button_position (decor_t *d,
- gint i,
Copied: trunk/app/compiz/debian/patches/012_metacity-theme-support.patch (from rev 3700, trunk/app/compiz/debian/patches/012_metabuttonspace-define.patch)
===================================================================
--- trunk/app/compiz/debian/patches/012_metacity-theme-support.patch (rev 0)
+++ trunk/app/compiz/debian/patches/012_metacity-theme-support.patch 2006-10-10 02:12:20 UTC (rev 3701)
@@ -0,0 +1,44 @@
+Use GdkRectangle instead of MetaButtonSpace for backwards compatibility with
+older versions of libmetacity.
+
+Index: gtk/window-decorator/gtk-window-decorator.c
+===================================================================
+--- a/gtk/window-decorator/gtk-window-decorator.c
++++ b/gtk/window-decorator/gtk-window-decorator.c
+@@ -2803,7 +2803,7 @@
+ MetaFrameFlags flags;
+ MetaTheme *theme;
+ GdkRectangle clip;
+- MetaButtonSpace *space;
++ GdkRectangle *space;
+
+ theme = meta_theme_get_current ();
+
+@@ -2823,10 +2823,10 @@
+ break;
+ }
+
+- *x = space->clickable.x;
+- *y = space->clickable.y;
+- *w = space->clickable.width;
+- *h = space->clickable.height;
++ *x = space->x;
++ *y = space->y;
++ *w = space->width;
++ *h = space->height;
+ }
+ #endif
+
+Index: configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -218,7 +218,7 @@
+ LIBS="$save_LIBS"
+
+ if test "x$use_metacity" = "xyes"; then
+- PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.15.21,
++ PKG_CHECK_MODULES(METACITY, libmetacity-private,
+ [use_metacity=yes], [use_metacity=no])
+ fi
+
Reply to: