Index: head/x11-wm/compiz/Makefile =================================================================== --- head/x11-wm/compiz/Makefile (revision 265710) +++ head/x11-wm/compiz/Makefile (revision 265711) @@ -1,173 +1,173 @@ # New ports collection makefile for: compiz # Date created: Dec 20 2006 # Whom: Florent Thoumie # # $FreeBSD$ # PORTNAME= compiz PORTVERSION= 0.8.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= rnoland@FreeBSD.org COMMENT= Compiz Composite/Window Manager LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ gtop-2.0.7:${PORTSDIR}/devel/libgtop \ startup-notification-1.0:${PORTSDIR}/x11/startup-notification XORG_CAT= app GNU_CONFIGURE= yes USE_BZIP2= yes #USE_TGZ= yes USE_GMAKE= yes USE_GETTEXT= yes USE_GL= glu USE_GNOME= gnomehack gconf2 libxslt USE_XORG= xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto USE_LDCONFIG= yes USE_AUTOTOOLS= libtool GCONF_SCHEMAS= gwd.schemas \ compiz-annotate.schemas \ compiz-blur.schemas \ compiz-clone.schemas \ compiz-commands.schemas \ compiz-core.schemas \ compiz-cube.schemas \ compiz-dbus.schemas \ compiz-decoration.schemas \ compiz-fade.schemas \ compiz-fs.schemas \ compiz-gconf.schemas \ compiz-glib.schemas \ compiz-gnomecompat.schemas \ compiz-ini.schemas \ compiz-inotify.schemas \ compiz-kconfig.schemas \ compiz-minimize.schemas \ compiz-move.schemas \ compiz-obs.schemas \ compiz-place.schemas \ compiz-png.schemas \ compiz-regex.schemas \ compiz-resize.schemas \ compiz-rotate.schemas \ compiz-scale.schemas \ compiz-screenshot.schemas \ compiz-svg.schemas \ compiz-switcher.schemas \ compiz-video.schemas \ compiz-water.schemas \ compiz-wobbly.schemas \ compiz-zoom.schemas CONFIGURE_ARGS= --disable-kde4 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= RSVG "Enable librsvg2 support" on \ GTK "Enable gtk2 support" on \ METACITY "Enable Metacity support" on \ GNOME "Enable Gnome support" on \ DBUS "Enable DBUS support" on \ FUSEFS "Enable fusefs support" off \ KDE "Enable KDE support" off SUB_FILES= compiz-manager DESKTOP_ENTRIES= "Compiz Manager" \ "A wrapper script for starting compiz" \ "" \ "compiz-manager" \ "Application;Core;" \ false post-patch: @${REINPLACE_CMD} -e 's|libpng|libpng14|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \ ${WRKSRC}/configure post-install: ${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${PREFIX}/bin/compiz-manager .include .if !defined(WITHOUT_RSVG) CONFIGURE_ARGS+= --enable-librsvg USE_GNOME+= librsvg2 PLIST_SUB+= RSVG="" .else CONFIGURE_ARGS+= --disable-librsvg PLIST_SUB+= RSVG="@comment " .endif .if !defined(WITHOUT_GTK) CONFIGURE_ARGS+= --enable-gtk USE_GNOME+= glib20 libwnck PLIST_SUB+= GTK="" .else CONFIGURE_ARGS+= --disable-gtk PLIST_SUB+= GTK="@comment " .endif .if !defined(WITHOUT_METACITY) && !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK) CONFIGURE_ARGS+= --enable-metacity USE_GNOME+= metacity .else CONFIGURE_ARGS+= --disable-metacity .endif .if !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK) CONFIGURE_ARGS+= --enable-gnome \ --enable-gnome-keybindings USE_GNOME+= gnomecontrolcenter2 WINDOWSETTINGSDATADIR= \ `pkg-config --variable=prefix gnome-window-settings-2.0` WINDOWSETTINGSLIBDIR= \ `pkg-config --variable=libdir gnome-window-settings-2.0` PLIST_SUB+= GNOME="" \ WINDOWSETTINGSDATADIR="${WINDOWSETTINGSDATADIR}" \ WINDOWSETTINGSLIBDIR="${WINDOWSETTINGSLIBDIR}" .else CONFIGURE_ARGS+= --disable-gnome \ --disable-gnome-keybindings PLIST_SUB+= GNOME="@comment " .endif .if !defined(WITHOUT_DBUS) CONFIGURE_ARGS+= --enable-dbus BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus .if !defined(WITHOUT_GTK) && !defined(WITHOUT_GNOME) CONFIGURE_ARGS+= --enable-dbus-glib BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib .endif PLIST_SUB+= DBUS="" .else CONFIGURE_ARGS+= --disable-dbus --disable-dbus-glib PLIST_SUB+= DBUS="@comment " .endif .if defined(WITH_FUSEFS) CONFIGURE_ARGS+= --enable-fuse BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/fuse.pc:${PORTSDIR}/sysutils/fusefs-libs PLIST_SUB+= FUSEFS="" .else CONFIGURE_ARGS+= --disable-fuse PLIST_SUB+= FUSEFS="@comment " .endif .if defined(WITH_KDE) USE_KDEBASE_VER= 3 CONFIGURE_ARGS+= --enable-kde PLIST_SUB+= KDE="" # allow bsd.kde.mk to be included after bsd.port.mk .include "${PORTSDIR}/Mk/bsd.kde.mk" .else CONFIGURE_ARGS+= --disable-kde PLIST_SUB+= KDE="@comment " .endif .include Property changes on: head/x11-wm/compiz/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.28 \ No newline at end of property +1.29 \ No newline at end of property Index: head/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c =================================================================== --- head/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c (revision 265710) +++ head/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c (revision 265711) @@ -1,61 +1,233 @@ ---- gtk/window-decorator/gtk-window-decorator.c.orig 2009-08-15 09:24:40.000000000 +0200 -+++ gtk/window-decorator/gtk-window-decorator.c 2010-10-29 12:56:37.000000000 +0200 -@@ -2671,7 +2671,7 @@ get_window_prop (Window xwindow, +--- gtk/window-decorator/gtk-window-decorator.c.orig 2009-08-15 03:24:40.000000000 -0400 ++++ gtk/window-decorator/gtk-window-decorator.c 2010-11-24 15:21:52.000000000 -0500 +@@ -380,7 +380,7 @@ typedef struct _decor { + guint button_states[BUTTON_NUM]; + GdkPixmap *pixmap; + GdkPixmap *buffer_pixmap; +- GdkGC *gc; ++ cairo_t *cr; + decor_layout_t border_layout; + decor_context_t *context; + decor_shadow_t *shadow; +@@ -918,6 +918,17 @@ button_state_paint (cairo_t *cr, + } + + static void ++copy_to_front_buffer (decor_t *d) ++{ ++ if (!d->buffer_pixmap) ++ return; ++ ++ cairo_set_operator (d->cr, CAIRO_OPERATOR_SOURCE); ++ gdk_cairo_set_source_pixmap (d->cr, d->buffer_pixmap, 0, 0); ++ cairo_paint (d->cr); ++} ++ ++static void + draw_window_decoration (decor_t *d) + { + cairo_t *cr; +@@ -1298,16 +1309,7 @@ draw_window_decoration (decor_t *d) + + cairo_destroy (cr); + +- if (d->buffer_pixmap) +- gdk_draw_drawable (d->pixmap, +- d->gc, +- d->buffer_pixmap, +- 0, +- 0, +- 0, +- 0, +- d->width, +- d->height); ++ copy_to_front_buffer (d); + + if (d->prop_xid) + { +@@ -2103,16 +2105,7 @@ meta_draw_window_decoration (decor_t *d) + XRenderFreePicture (xdisplay, src); + } + +- if (d->buffer_pixmap) +- gdk_draw_drawable (d->pixmap, +- d->gc, +- d->buffer_pixmap, +- 0, +- 0, +- 0, +- 0, +- d->width, +- d->height); ++ copy_to_front_buffer (d); + + if (d->prop_xid) + { +@@ -2361,18 +2354,9 @@ draw_switcher_background (decor_t *d) + alpha); + + cairo_stroke (cr); +- + cairo_destroy (cr); + +- gdk_draw_drawable (d->pixmap, +- d->gc, +- d->buffer_pixmap, +- 0, +- 0, +- 0, +- 0, +- d->width, +- d->height); ++ copy_to_front_buffer (d); + + pixel = ((((a * style->bg[GTK_STATE_NORMAL].blue ) >> 24) & 0x0000ff) | + (((a * style->bg[GTK_STATE_NORMAL].green) >> 16) & 0x00ff00) | +@@ -2439,15 +2423,7 @@ draw_switcher_foreground (decor_t *d) + + cairo_destroy (cr); + +- gdk_draw_drawable (d->pixmap, +- d->gc, +- d->buffer_pixmap, +- 0, +- 0, +- 0, +- 0, +- d->width, +- d->height); ++ copy_to_front_buffer (d); + } + + static void +@@ -2671,7 +2647,7 @@ get_window_prop (Window xwindow, gdk_error_trap_push (); type = None; - result = XGetWindowProperty (gdk_display, + result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xwindow, atom, 0, G_MAXLONG, -@@ -4233,7 +4233,7 @@ show_tooltip (const char *text) +@@ -3512,15 +3488,15 @@ update_window_decoration_size (WnckWindo + if (d->buffer_pixmap) + g_object_unref (G_OBJECT (d->buffer_pixmap)); + +- if (d->gc) +- g_object_unref (G_OBJECT (d->gc)); +- + if (d->picture) + XRenderFreePicture (xdisplay, d->picture); + ++ if (d->cr) ++ cairo_destroy (d->cr); ++ + d->pixmap = pixmap; + d->buffer_pixmap = buffer_pixmap; +- d->gc = gdk_gc_new (pixmap); ++ d->cr = gdk_cairo_create (pixmap); + + d->picture = picture; + +@@ -3642,6 +3618,7 @@ update_switcher_window (WnckWindow *win, + { + g_object_ref (G_OBJECT (switcher_pixmap)); + d->pixmap = switcher_pixmap; ++ d->cr = gdk_cairo_create (switcher_pixmap); + } + + if (!d->buffer_pixmap && switcher_buffer_pixmap) +@@ -3729,9 +3706,6 @@ update_switcher_window (WnckWindow *win, + + if (width == d->width && height == d->height) + { +- if (!d->gc) +- d->gc = gdk_gc_new (d->pixmap); +- + if (!d->picture) + d->picture = + XRenderCreatePicture (xdisplay, +@@ -3765,8 +3739,8 @@ update_switcher_window (WnckWindow *win, + if (d->buffer_pixmap) + g_object_unref (G_OBJECT (d->buffer_pixmap)); + +- if (d->gc) +- g_object_unref (G_OBJECT (d->gc)); ++ if (d->cr) ++ cairo_destroy (d->cr); + + if (d->picture) + XRenderFreePicture (xdisplay, d->picture); +@@ -3782,7 +3756,7 @@ update_switcher_window (WnckWindow *win, + + d->pixmap = pixmap; + d->buffer_pixmap = buffer_pixmap; +- d->gc = gdk_gc_new (pixmap); ++ d->cr = gdk_cairo_create (pixmap); + + d->picture = XRenderCreatePicture (xdisplay, GDK_PIXMAP_XID (buffer_pixmap), + xformat, 0, NULL); +@@ -3817,10 +3791,10 @@ remove_frame_window (WnckWindow *win) + d->buffer_pixmap = NULL; + } + +- if (d->gc) ++ if (d->cr) + { +- g_object_unref (G_OBJECT (d->gc)); +- d->gc = NULL; ++ cairo_destroy (d->cr); ++ d->cr = NULL; + } + + if (d->picture) +@@ -4233,7 +4207,7 @@ show_tooltip (const char *text) static void hide_tooltip (void) { - if (GTK_WIDGET_VISIBLE (tip_window)) + if (gtk_widget_get_visible (tip_window)) g_get_current_time (&tooltip_last_popdown); gtk_widget_hide (tip_window); -@@ -4966,7 +4966,7 @@ force_quit_dialog_realize (GtkWidget *di +@@ -4966,7 +4940,7 @@ force_quit_dialog_realize (GtkWidget *di WnckWindow *win = data; gdk_error_trap_push (); - XSetTransientForHint (gdk_display, + XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_WINDOW_XID (dialog->window), wnck_window_get_xid (win)); gdk_display_sync (gdk_display_get_default ()); -@@ -4982,11 +4982,11 @@ get_client_machine (Window xwindow) +@@ -4982,11 +4956,11 @@ get_client_machine (Window xwindow) int format, result; char *retval; - atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE); + atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE); gdk_error_trap_push (); - result = XGetWindowProperty (gdk_display, + result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xwindow, atom, 0, G_MAXLONG, FALSE, XA_STRING, &type, &format, &nitems, -@@ -5038,7 +5038,7 @@ kill_window (WnckWindow *win) +@@ -5038,7 +5012,7 @@ kill_window (WnckWindow *win) } gdk_error_trap_push (); - XKillClient (gdk_display, wnck_window_get_xid (win)); + XKillClient (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid (win)); gdk_display_sync (gdk_display_get_default ()); gdk_error_trap_pop (); } -@@ -5623,7 +5623,7 @@ static int +@@ -5623,7 +5597,7 @@ static int update_shadow (void) { decor_shadow_options_t opt; - Display *xdisplay = gdk_display; + Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); GdkDisplay *display = gdk_display_get_default (); GdkScreen *screen = gdk_display_get_default_screen (display); Property changes on: head/x11-wm/compiz/files/patch-gtk_window-decorator_gtk-window-decorator.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property