cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update metacity to 2.24.0

Browse Source 
- compositor code is enabled now, so you can have funky effects too ;-)
* add a message on how to enable it, as it's disabled by default

feedback and ok ajacoutot@
This commit is contained in:
jasper 2008-11-21 19:01:18 +00:00
parent 9b10ad4a49
commit 701113121f
6 changed files with 36 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
x11/gnome/metacity/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.31 2008/07/02 17:42:55 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.32 2008/11/21 19:01:18 jasper Exp $
COMMENT= lightweight window manager
GNOME_PROJECT= metacity
GNOME_VERSION= 2.20.2
SHARED_LIBS= metacity-private 0.0
GNOME_VERSION= 2.24.0
SHARED_LIBS += metacity-private 0.0 # .0.0
CATEGORIES= x11
PKGNAME= ${DISTNAME}p1
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -16,9 +15,10 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
expat fontconfig freetype glib-2.0 glitz gmodule-2.0 \
gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre png pthread z pixman-1
dbus-1 dbus-glib-1 expat fontconfig freetype gio-2.0 \
glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
png pthread z
MODULES= devel/gettext \
x11/gnome
@ -31,8 +31,7 @@ SEPARATE_BUILD= concurrent
USE_X11= Yes
DESKTOP_FILES= Yes
CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/metacity \
--disable-schemas-install \
--disable-compositor
--disable-schemas-install
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"

10
x11/gnome/metacity/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/metacity-2.20.2.tar.bz2) = O5hgMGKYYGdLIZ/DXCJrGw==
RMD160 (gnome/metacity-2.20.2.tar.bz2) = eyR4wTJ6a6BGZbtCmX/aeSF7HgA=
SHA1 (gnome/metacity-2.20.2.tar.bz2) = BHedB2JzJgQLSBON//oH3iuIggw=
SHA256 (gnome/metacity-2.20.2.tar.bz2) = afKS+SiVu0+RWgVH5Et2gld/nBaK6jY4zPxLuou2qr4=
SIZE (gnome/metacity-2.20.2.tar.bz2) = 2035610
MD5 (gnome/metacity-2.24.0.tar.bz2) = 1Kp4LV9xtsQlFLI5aEpKow==
RMD160 (gnome/metacity-2.24.0.tar.bz2) = dYwm4WP9yE3O4eOGq4y+/DjN16U=
SHA1 (gnome/metacity-2.24.0.tar.bz2) = Cy4343JJjiamkm+7aOllVsbbZJc=
SHA256 (gnome/metacity-2.24.0.tar.bz2) = kO7Qo2quMC21KvEiIMTPhjyczOvSMwFRBPLYjLF+wHY=
SIZE (gnome/metacity-2.24.0.tar.bz2) = 2160557

92
x11/gnome/metacity/patches/patch-src_constraints_c
View File

@ -1,92 +0,0 @@
$OpenBSD: patch-src_constraints_c,v 1.1 2008/07/02 17:42:55 ajacoutot Exp $
--- src/constraints.c.orig Mon Jan 7 23:39:42 2008
+++ src/constraints.c Wed Jul 2 13:53:20 2008
@@ -691,8 +691,7 @@ constrain_maximization (MetaWindow *window,
ConstraintPriority priority,
gboolean check_only)
{
- MetaRectangle target_size;
- MetaRectangle min_size, max_size;
+ MetaRectangle min_size, max_size, work_area;
gboolean hminbad, vminbad;
gboolean horiz_equal, vert_equal;
gboolean constraint_already_satisfied;
@@ -704,51 +703,20 @@ constrain_maximization (MetaWindow *window,
if (!window->maximized_horizontally && !window->maximized_vertically)
return TRUE;
- /* Calculate target_size = maximized size of (window + frame) */
- if (window->maximized_horizontally && window->maximized_vertically)
- target_size = info->work_area_xinerama;
- else
- {
- /* Amount of maximization possible in a single direction depends
- * on which struts could occlude the window given its current
- * position. For example, a vertical partial strut on the right
- * is only relevant for a horizontally maximized window when the
- * window is at a vertical position where it could be occluded
- * by that partial strut.
- */
- MetaDirection direction;
- GSList *active_workspace_struts;
-
- if (window->maximized_horizontally)
- direction = META_DIRECTION_HORIZONTAL;
- else
- direction = META_DIRECTION_VERTICAL;
- active_workspace_struts = window->screen->active_workspace->all_struts;
-
- target_size = info->current;
- extend_by_frame (&target_size, info->fgeom);
- meta_rectangle_expand_to_avoiding_struts (&target_size,
- &info->entire_xinerama,
- direction,
- active_workspace_struts);
- }
- /* Now make target_size = maximized size of client window */
- unextend_by_frame (&target_size, info->fgeom);
-
- /* Check min size constraints; max size constraints are ignored for maximized
- * windows, as per bug 327543.
- */
+ work_area = info->work_area_xinerama;
+ unextend_by_frame (&work_area, info->fgeom);
get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
- hminbad = target_size.width < min_size.width && window->maximized_horizontally;
- vminbad = target_size.height < min_size.height && window->maximized_vertically;
+
+ hminbad = work_area.width < min_size.width && window->maximized_horizontally;
+ vminbad = work_area.height < min_size.height && window->maximized_vertically;
if (hminbad || vminbad)
return TRUE;
/* Determine whether constraint is already satisfied; exit if it is */
- horiz_equal = target_size.x == info->current.x &&
- target_size.width == info->current.width;
- vert_equal = target_size.y == info->current.y &&
- target_size.height == info->current.height;
+ horiz_equal = work_area.x == info->current.x &&
+ work_area.width == info->current.width;
+ vert_equal = work_area.y == info->current.y &&
+ work_area.height == info->current.height;
constraint_already_satisfied =
(horiz_equal || !window->maximized_horizontally) &&
(vert_equal || !window->maximized_vertically);
@@ -758,13 +726,13 @@ constrain_maximization (MetaWindow *window,
/*** Enforce constraint ***/
if (window->maximized_horizontally)
{
- info->current.x = target_size.x;
- info->current.width = target_size.width;
+ info->current.x = work_area.x;
+ info->current.width = work_area.width;
}
if (window->maximized_vertically)
{
- info->current.y = target_size.y;
- info->current.height = target_size.height;
+ info->current.y = work_area.y;
+ info->current.height = work_area.height;
}
return TRUE;
}

2
x11/gnome/metacity/pkg/DESCR
View File

@ -1,2 +1,2 @@
Metacity is a simple window manager that integrates nicely with
GNOME 2.
GNOME.

10
x11/gnome/metacity/pkg/MESSAGE Normal file
View File

@ -0,0 +1,10 @@
To enable the compositor manager of metacity, issue the following
command:
gconftool-2 -s '/apps/metacity/general/compositing_manager' --type bool \
true
To disable it:
gconftool-2 -s '/apps/metacity/general/compositing_manager' --type bool \
false

17
x11/gnome/metacity/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2008/07/02 17:42:55 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.17 2008/11/21 19:01:18 jasper Exp $
%%SHARED%%
@bin bin/metacity
@bin bin/metacity-message
@ -21,6 +21,7 @@ lib/pkgconfig/libmetacity-private.pc
@man man/man1/metacity-theme-viewer.1
@man man/man1/metacity-window-demo.1
@man man/man1/metacity.1
share/applications/metacity.desktop
share/doc/metacity/
share/doc/metacity/README
share/doc/metacity/metacity-theme.dtd
@ -31,13 +32,16 @@ share/gnome-control-center/keybindings/
share/gnome-control-center/keybindings/50-metacity-desktop-key.xml
share/gnome-control-center/keybindings/50-metacity-key.xml
share/gnome/wm-properties/
share/gnome/wm-properties/metacity.desktop
share/gnome/wm-properties/metacity-wm.desktop
share/locale/am/
share/locale/am/LC_MESSAGES/
share/locale/am/LC_MESSAGES/metacity.mo
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/metacity.mo
share/locale/as/
share/locale/as/LC_MESSAGES/
share/locale/as/LC_MESSAGES/metacity.mo
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/metacity.mo
@ -103,6 +107,9 @@ share/locale/ja/LC_MESSAGES/metacity.mo
share/locale/ka/
share/locale/ka/LC_MESSAGES/
share/locale/ka/LC_MESSAGES/metacity.mo
share/locale/kn/
share/locale/kn/LC_MESSAGES/
share/locale/kn/LC_MESSAGES/metacity.mo
share/locale/ko/LC_MESSAGES/metacity.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
@ -161,9 +168,9 @@ share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/metacity.mo
share/locale/sr/LC_MESSAGES/metacity.mo
share/locale/sr@Latn/
share/locale/sr@Latn/LC_MESSAGES/
share/locale/sr@Latn/LC_MESSAGES/metacity.mo
share/locale/sr@latin/
share/locale/sr@latin/LC_MESSAGES/
share/locale/sr@latin/LC_MESSAGES/metacity.mo
share/locale/sv/LC_MESSAGES/metacity.mo
share/locale/ta/
share/locale/ta/LC_MESSAGES/