From owner-svn-ports-all@FreeBSD.ORG Tue Jun 10 00:01:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7F6E236; Tue, 10 Jun 2014 00:01:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C98E820DE; Tue, 10 Jun 2014 00:01:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5A01aHw015066; Tue, 10 Jun 2014 00:01:36 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5A01atF015058; Tue, 10 Jun 2014 00:01:36 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201406100001.s5A01atF015058@svn.freebsd.org> From: "Jason E. Hale" Date: Tue, 10 Jun 2014 00:01:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357231 - in head/sysutils/gapcmon: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2014 00:01:37 -0000 Author: jhale Date: Tue Jun 10 00:01:35 2014 New Revision: 357231 URL: http://svnweb.freebsd.org/changeset/ports/357231 QAT: https://qat.redports.org/buildarchive/r357231/ Log: - Support staging - Rename patch file to eliminate ':' Added: head/sysutils/gapcmon/files/patch-src__eggtrayicon.c - copied unchanged from r357227, head/sysutils/gapcmon/files/patch-src:eggtrayicon.c Deleted: head/sysutils/gapcmon/files/patch-src:eggtrayicon.c Modified: head/sysutils/gapcmon/Makefile head/sysutils/gapcmon/pkg-plist Modified: head/sysutils/gapcmon/Makefile ============================================================================== --- head/sysutils/gapcmon/Makefile Mon Jun 9 23:50:24 2014 (r357230) +++ head/sysutils/gapcmon/Makefile Tue Jun 10 00:01:35 2014 (r357231) @@ -16,23 +16,6 @@ USE_GNOME= gconf2 USES= pkgconfig gmake tar:bzip2 GNU_CONFIGURE= yes -PORTDOCS= AUTHORS ChangeLog INSTALL README - -NO_STAGE= yes - OPTIONS_DEFINE= DOCS -.include - -post-extract: - @${REINPLACE_CMD} 's|install-gapcmondocDATA \\|\\|' \ - ${WRKSRC}/Makefile.in - -post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} - .include Copied: head/sysutils/gapcmon/files/patch-src__eggtrayicon.c (from r357227, head/sysutils/gapcmon/files/patch-src:eggtrayicon.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/gapcmon/files/patch-src__eggtrayicon.c Tue Jun 10 00:01:35 2014 (r357231, copy of r357227, head/sysutils/gapcmon/files/patch-src:eggtrayicon.c) @@ -0,0 +1,90 @@ +--- src/eggtrayicon.c.orig Fri May 12 10:54:17 2006 ++++ src/eggtrayicon.c Mon Jan 1 12:46:03 2007 +@@ -61,6 +61,9 @@ + static void egg_tray_icon_realize(GtkWidget * widget); + static void egg_tray_icon_unrealize(GtkWidget * widget); + ++static void egg_tray_icon_add (GtkContainer *container, ++ GtkWidget *widget); ++ + static void egg_tray_icon_update_manager_window(EggTrayIcon * icon, + gboolean dock_if_realized); + static void egg_tray_icon_manager_window_destroyed(EggTrayIcon * icon); +@@ -101,6 +104,7 @@ + { + GObjectClass *gobject_class = (GObjectClass *) klass; + GtkWidgetClass *widget_class = (GtkWidgetClass *) klass; ++ GtkContainerClass *container_class = (GtkContainerClass *)klass; + + parent_class = g_type_class_peek_parent(klass); + +@@ -109,6 +113,8 @@ + widget_class->realize = egg_tray_icon_realize; + widget_class->unrealize = egg_tray_icon_unrealize; + ++ container_class->add = egg_tray_icon_add; ++ + g_object_class_install_property(gobject_class, + PROP_ORIENTATION, + g_param_spec_enum("orientation", +@@ -298,6 +304,36 @@ + } + } + ++static gboolean ++transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) ++{ ++ gdk_window_clear_area (widget->window, event->area.x, event->area.y, ++ event->area.width, event->area.height); ++ return FALSE; ++} ++ ++static void ++make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, ++ gpointer user_data) ++{ ++ gdk_window_set_back_pixmap (widget->window, NULL, TRUE); ++} ++ ++static void ++make_transparent (GtkWidget *widget, gpointer user_data) ++{ ++ if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) ++ return; ++ ++ gtk_widget_set_app_paintable (widget, TRUE); ++ gtk_widget_set_double_buffered (widget, FALSE); ++ gdk_window_set_back_pixmap (widget->window, NULL, TRUE); ++ g_signal_connect (widget, "expose_event", ++ G_CALLBACK (transparent_expose_event), NULL); ++ g_signal_connect_after (widget, "style_set", ++ G_CALLBACK (make_transparent_again), NULL); ++} ++ + static void egg_tray_icon_manager_window_destroyed(EggTrayIcon * icon) + { + GdkWindow *gdkwin; +@@ -327,6 +363,8 @@ + if (GTK_WIDGET_CLASS(parent_class)->realize) + GTK_WIDGET_CLASS(parent_class)->realize(widget); + ++ make_transparent (widget, NULL); ++ + screen = gtk_widget_get_screen(widget); + display = gdk_screen_get_display(screen); + xdisplay = gdk_x11_display_get_xdisplay(display); +@@ -352,6 +390,14 @@ + + /* Add a root window filter so that we get changes on MANAGER */ + gdk_window_add_filter(root_window, egg_tray_icon_manager_filter, icon); ++} ++ ++static void ++egg_tray_icon_add (GtkContainer *container, GtkWidget *widget) ++{ ++ g_signal_connect (widget, "realize", ++ G_CALLBACK (make_transparent), NULL); ++ GTK_CONTAINER_CLASS (parent_class)->add (container, widget); + } + + EggTrayIcon *egg_tray_icon_new_for_screen(GdkScreen * screen, const char *name) Modified: head/sysutils/gapcmon/pkg-plist ============================================================================== --- head/sysutils/gapcmon/pkg-plist Mon Jun 9 23:50:24 2014 (r357230) +++ head/sysutils/gapcmon/pkg-plist Tue Jun 10 00:01:35 2014 (r357231) @@ -1,8 +1,16 @@ bin/gapcmon share/applications/gapcmon.desktop +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +@comment %%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +@comment %%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +@comment %%PORTDOCS%%%%DOCSDIR%%/gapcmon.desktop share/pixmaps/apcupsd.png share/pixmaps/charging.png share/pixmaps/gapc_prefs.png share/pixmaps/onbatt.png share/pixmaps/online.png share/pixmaps/unplugged.png +%%PORTDOCS%%@dirrm %%DOCSDIR%%