From owner-svn-ports-all@freebsd.org Sat Jul 11 06:02:22 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CBCC0997C48; Sat, 11 Jul 2015 06:02:22 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org (repo.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 AF8261A03; Sat, 11 Jul 2015 06:02:22 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6B62MlT068733; Sat, 11 Jul 2015 06:02:22 GMT (envelope-from olivierd@FreeBSD.org) Received: (from olivierd@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6B62KWU068724; Sat, 11 Jul 2015 06:02:20 GMT (envelope-from olivierd@FreeBSD.org) Message-Id: <201507110602.t6B62KWU068724@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivierd set sender to olivierd@FreeBSD.org using -f From: Olivier Duchateau Date: Sat, 11 Jul 2015 06:02:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r391727 - in head/editors/mousepad: . 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.20 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: Sat, 11 Jul 2015 06:02:22 -0000 Author: olivierd Date: Sat Jul 11 06:02:20 2015 New Revision: 391727 URL: https://svnweb.freebsd.org/changeset/ports/391727 Log: - Add patches in order to fix warnings, when color scheme is not defined - Bump PORTREVISION PR: 199181 Reported by: Obtained from: Xfce upstream repository Added: head/editors/mousepad/files/patch-mousepad_mousepad-action-group.c (contents, props changed) head/editors/mousepad/files/patch-mousepad_mousepad-settings.c (contents, props changed) head/editors/mousepad/files/patch-mousepad_mousepad-view.c (contents, props changed) head/editors/mousepad/files/patch-mousepad_mousepad-window.c (contents, props changed) Modified: head/editors/mousepad/Makefile Modified: head/editors/mousepad/Makefile ============================================================================== --- head/editors/mousepad/Makefile Sat Jul 11 06:01:29 2015 (r391726) +++ head/editors/mousepad/Makefile Sat Jul 11 06:02:20 2015 (r391727) @@ -3,7 +3,7 @@ PORTNAME= mousepad PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors xfce MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib GNU_CONFIGURE= yes -USES= desktop-file-utils gettext gmake libtool pkgconfig perl5 tar:bzip2 +USES= desktop-file-utils gettext gmake libtool perl5 pkgconfig tar:bzip2 USE_GNOME= glib20 intltool intlhack OPTIONS_DEFINE= GTK3 Added: head/editors/mousepad/files/patch-mousepad_mousepad-action-group.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/mousepad/files/patch-mousepad_mousepad-action-group.c Sat Jul 11 06:02:20 2015 (r391727) @@ -0,0 +1,25 @@ +--- mousepad/mousepad-action-group.c.orig 2014-09-01 20:50:07 UTC ++++ mousepad/mousepad-action-group.c +@@ -283,7 +283,8 @@ void + mousepad_action_group_set_active_style_scheme (MousepadActionGroup *self, + GtkSourceStyleScheme *scheme) + { +- GtkAction *action; ++ GtkAction *action; ++ const gchar *scheme_name = NULL; + + g_return_if_fail (MOUSEPAD_IS_ACTION_GROUP (self)); + +@@ -303,8 +304,11 @@ mousepad_action_group_set_active_style_s + self->locked = FALSE; + + /* update the setting when the active action is changed */ ++ if (scheme != NULL) ++ scheme_name = gtk_source_style_scheme_get_id(scheme); ++ + self->locked = TRUE; +- MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, gtk_source_style_scheme_get_id (scheme)); ++ MOUSEPAD_SETTING_SET_STRING (COLOR_SCHEME, scheme_name); + self->locked = FALSE; + + g_object_notify (G_OBJECT (self), "active-style-scheme"); Added: head/editors/mousepad/files/patch-mousepad_mousepad-settings.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/mousepad/files/patch-mousepad_mousepad-settings.c Sat Jul 11 06:02:20 2015 (r391727) @@ -0,0 +1,11 @@ +--- mousepad/mousepad-settings.c.orig 2014-09-01 20:50:07 UTC ++++ mousepad/mousepad-settings.c +@@ -298,7 +298,7 @@ void + mousepad_setting_set_string (const gchar *path, + const gchar *value) + { +- mousepad_setting_set (path, "s", value); ++ mousepad_setting_set (path, "s", value != NULL ? value : ""); + } + + Added: head/editors/mousepad/files/patch-mousepad_mousepad-view.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/mousepad/files/patch-mousepad_mousepad-view.c Sat Jul 11 06:02:20 2015 (r391727) @@ -0,0 +1,12 @@ +--- mousepad/mousepad-view.c.orig 2014-09-01 20:50:07 UTC ++++ mousepad/mousepad-view.c +@@ -257,7 +257,8 @@ mousepad_view_buffer_changed (MousepadVi + GtkSourceStyleScheme *scheme; + + manager = gtk_source_style_scheme_manager_get_default (); +- scheme = gtk_source_style_scheme_manager_get_scheme (manager, view->color_scheme); ++ scheme = gtk_source_style_scheme_manager_get_scheme (manager, ++ view->color_scheme ? view->color_scheme : ""); + gtk_source_buffer_set_style_scheme (buffer, scheme); + + gtk_source_buffer_set_highlight_matching_brackets (buffer, view->match_braces); Added: head/editors/mousepad/files/patch-mousepad_mousepad-window.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/mousepad/files/patch-mousepad_mousepad-window.c Sat Jul 11 06:02:20 2015 (r391727) @@ -0,0 +1,18 @@ +--- mousepad/mousepad-window.c.orig 2014-09-01 20:58:02 UTC ++++ mousepad/mousepad-window.c +@@ -717,12 +717,13 @@ mousepad_window_action_group_style_schem + MousepadActionGroup *group) + { + GtkSourceStyleScheme *scheme; +- const gchar *scheme_id; ++ const gchar *scheme_id = NULL; + gint npages, i; + + /* get the new active language */ + scheme = mousepad_action_group_get_active_style_scheme (group); +- scheme_id = gtk_source_style_scheme_get_id (scheme); ++ if (scheme != NULL) ++ scheme_id = gtk_source_style_scheme_get_id (scheme); + + /* update the color scheme on all the documents */ + npages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->notebook));