From owner-svn-ports-branches@freebsd.org Thu Jan 28 05:36:56 2021 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B88644F82C3; Thu, 28 Jan 2021 05:36:56 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DR8Nm4sDWz4cZt; Thu, 28 Jan 2021 05:36:56 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 990CD2291; Thu, 28 Jan 2021 05:36:56 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10S5auAd085164; Thu, 28 Jan 2021 05:36:56 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10S5auP2085163; Thu, 28 Jan 2021 05:36:56 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202101280536.10S5auP2085163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 28 Jan 2021 05:36:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r563112 - branches/2021Q1/graphics/xournalpp/files X-SVN-Group: ports-branches X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: branches/2021Q1/graphics/xournalpp/files X-SVN-Commit-Revision: 563112 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jan 2021 05:36:56 -0000 Author: yuri Date: Thu Jan 28 05:36:56 2021 New Revision: 563112 URL: https://svnweb.freebsd.org/changeset/ports/563112 Log: MFH: r561886 graphics/xournalpp: Patch the bug that the upstream didn't fix for a while Reported by: fallout Added: branches/2021Q1/graphics/xournalpp/files/patch-src_gui_dialog_toolbarCustomize_ToolbarAdapter.cpp - copied unchanged from r561886, head/graphics/xournalpp/files/patch-src_gui_dialog_toolbarCustomize_ToolbarAdapter.cpp Modified: Directory Properties: branches/2021Q1/ (props changed) Copied: branches/2021Q1/graphics/xournalpp/files/patch-src_gui_dialog_toolbarCustomize_ToolbarAdapter.cpp (from r561886, head/graphics/xournalpp/files/patch-src_gui_dialog_toolbarCustomize_ToolbarAdapter.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/graphics/xournalpp/files/patch-src_gui_dialog_toolbarCustomize_ToolbarAdapter.cpp Thu Jan 28 05:36:56 2021 (r563112, copy of r561886, head/graphics/xournalpp/files/patch-src_gui_dialog_toolbarCustomize_ToolbarAdapter.cpp) @@ -0,0 +1,13 @@ +- fix for https://github.com/xournalpp/xournalpp/issues/2222 that the upstream didn't fix for a while now + +--- src/gui/dialog/toolbarCustomize/ToolbarAdapter.cpp.orig 2021-01-17 23:11:38 UTC ++++ src/gui/dialog/toolbarCustomize/ToolbarAdapter.cpp +@@ -271,7 +271,7 @@ bool ToolbarAdapter::toolbarDragMotionCb(GtkToolbar* t + + ToolItemDragDropData* d = ToolItemDragCurrentData::getData(); + +- g_return_val_if_fail(d != NULL, NULL); ++ g_return_val_if_fail(d != NULL, false); + + if (d->type == TOOL_ITEM_ITEM) + {