Date: Mon, 31 Oct 2016 17:07:19 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425014 - in head/x11/xfce4-terminal: . files Message-ID: <201610311707.u9VH7JaL087803@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Mon Oct 31 17:07:19 2016 New Revision: 425014 URL: https://svnweb.freebsd.org/changeset/ports/425014 Log: Update to 0.8.1 Added: head/x11/xfce4-terminal/files/patch-terminal_terminal-screen.c (contents, props changed) Modified: head/x11/xfce4-terminal/Makefile head/x11/xfce4-terminal/distinfo Modified: head/x11/xfce4-terminal/Makefile ============================================================================== --- head/x11/xfce4-terminal/Makefile Mon Oct 31 16:48:29 2016 (r425013) +++ head/x11/xfce4-terminal/Makefile Mon Oct 31 17:07:19 2016 (r425014) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xfce4-terminal -PORTVERSION= 0.8.0 +PORTVERSION= 0.8.1 CATEGORIES= x11 xfce MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 Modified: head/x11/xfce4-terminal/distinfo ============================================================================== --- head/x11/xfce4-terminal/distinfo Mon Oct 31 16:48:29 2016 (r425013) +++ head/x11/xfce4-terminal/distinfo Mon Oct 31 17:07:19 2016 (r425014) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476710906 -SHA256 (xfce4/xfce4-terminal-0.8.0.tar.bz2) = e915c05a3d07b66d153e1ba8614f904f9c12b2dd8372b27d24c0d339743d5b0a -SIZE (xfce4/xfce4-terminal-0.8.0.tar.bz2) = 868612 +TIMESTAMP = 1477933186 +SHA256 (xfce4/xfce4-terminal-0.8.1.tar.bz2) = ddfe53a89d315a4a9170ca6d2cee2d33145bd63630062b2e867fb3a5fcde5fdf +SIZE (xfce4/xfce4-terminal-0.8.1.tar.bz2) = 871184 Added: head/x11/xfce4-terminal/files/patch-terminal_terminal-screen.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/xfce4-terminal/files/patch-terminal_terminal-screen.c Mon Oct 31 17:07:19 2016 (r425014) @@ -0,0 +1,58 @@ +Revert commit, because default size is not anymore enabled. + +--- terminal/terminal-screen.c.orig 2016-10-25 16:07:56 UTC ++++ terminal/terminal-screen.c +@@ -1673,47 +1673,31 @@ terminal_screen_get_geometry (TerminalSc + * + * I don't like this way, but its required to work-around a Gtk+ + * bug (maybe also caused by a Vte bug, not sure). +- * +- * Code borrowed from gnome-terminal (terminal_window_update_geometry). + **/ + void + terminal_screen_set_window_geometry_hints (TerminalScreen *screen, + GtkWindow *window) + { + GdkGeometry hints; +- GtkRequisition vbox_request; +- GtkAllocation toplevel_allocation, vbox_allocation; + glong char_width, char_height; +- glong grid_width, grid_height; +- glong chrome_width, chrome_height; +- gint csd_width, csd_height; ++ gint xpad, ypad; + + terminal_return_if_fail (TERMINAL_IS_SCREEN (screen)); + terminal_return_if_fail (VTE_IS_TERMINAL (screen->terminal)); + terminal_return_if_fail (gtk_widget_get_realized (screen)); + terminal_return_if_fail (gtk_widget_get_realized (window)); + +- terminal_screen_get_geometry (screen, &char_width, &char_height, NULL, NULL); +- terminal_screen_get_size (screen, &grid_width, &grid_height); +- +- gtk_widget_get_preferred_size (TERMINAL_WINDOW (window)->vbox, NULL, &vbox_request); +- chrome_width = vbox_request.width - (char_width * grid_width); +- chrome_height = vbox_request.height - (char_height * grid_height); +- +- gtk_widget_get_allocation (TERMINAL_WINDOW (window)->vbox, &vbox_allocation); +- gtk_widget_get_allocation (GTK_WIDGET (window), &toplevel_allocation); +- csd_width = toplevel_allocation.width - vbox_allocation.width; +- csd_height = toplevel_allocation.height - vbox_allocation.height; ++ terminal_screen_get_geometry (screen, &char_width, &char_height, &xpad, &ypad); + +- hints.base_width = chrome_width + csd_width; +- hints.base_height = chrome_height + csd_height; ++ hints.base_width = xpad; ++ hints.base_height = ypad; + hints.width_inc = char_width; + hints.height_inc = char_height; + hints.min_width = hints.base_width + hints.width_inc * 4; + hints.min_height = hints.base_height + hints.height_inc * 2; + +- gtk_window_set_geometry_hints (window, +- NULL, ++ gtk_window_set_geometry_hints (GTK_WINDOW (window), ++ screen->terminal, + &hints, + GDK_HINT_RESIZE_INC + | GDK_HINT_MIN_SIZE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610311707.u9VH7JaL087803>