Date: Wed, 8 Feb 2017 18:44:55 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433663 - in head/editors/libreoffice: . files Message-ID: <201702081844.v18IitGu006151@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Feb 8 18:44:55 2017 New Revision: 433663 URL: https://svnweb.freebsd.org/changeset/ports/433663 Log: - Stop crashing when GTK3 GUI is enabled. - Always use gtk_dialog_get_action_area(). It was available since GTK 2.14. PR: 203563 Added: head/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx (contents, props changed) Modified: head/editors/libreoffice/Makefile Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Wed Feb 8 18:08:31 2017 (r433662) +++ head/editors/libreoffice/Makefile Wed Feb 8 18:44:55 2017 (r433663) @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 2 +PORTREVISION= 3 MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ http://dev-www.libreoffice.org/src/:src \ http://dev-www.libreoffice.org/extern/:ext Added: head/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx Wed Feb 8 18:44:55 2017 (r433663) @@ -0,0 +1,28 @@ +--- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx.orig 2017-01-12 00:54:33 UTC ++++ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +@@ -418,8 +418,11 @@ shrinkFilterName( const OUString &rFilte + static void + dialog_remove_buttons(GtkWidget *pActionArea) + { +- GList *pChildren = +- gtk_container_get_children( GTK_CONTAINER( pActionArea ) ); ++ GtkContainer *pContainer = GTK_CONTAINER( pActionArea ); ++ ++ g_return_if_fail( pContainer != nullptr ); ++ ++ GList *pChildren = gtk_container_get_children( pContainer ); + + for( GList *p = pChildren; p; p = p->next ) + { +@@ -436,10 +439,10 @@ dialog_remove_buttons( GtkDialog *pDialo + { + g_return_if_fail( GTK_IS_DIALOG( pDialog ) ); + +-#if GTK_CHECK_VERSION(3,0,0) + #if GTK_CHECK_VERSION(3,12,0) + dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog)); + #endif ++#if GTK_CHECK_VERSION(2,14,0) + dialog_remove_buttons(gtk_dialog_get_action_area(pDialog)); + #else + dialog_remove_buttons(pDialog->action_area);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702081844.v18IitGu006151>