Date: Sat, 22 Oct 2016 04:56:15 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r424444 - in branches/2016Q4/x11-toolkits/girara: . files Message-ID: <201610220456.u9M4uFk0048646@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat Oct 22 04:56:15 2016 New Revision: 424444 URL: https://svnweb.freebsd.org/changeset/ports/424444 Log: MFH: r424401 Add patch to disable optimizations on a keyboard input function when using the clang compiler. This allows removing the requirement on gcc. Patch based on suggestion from Ivan <bsd@abinet.ru>. Bug has been reported upstream. PR: 213595 Submitted by: Michael Danilov <mike.d.ft402@gmail.com> Approved by: ports-secteam (feld) Added: branches/2016Q4/x11-toolkits/girara/files/patch-girara_callbacks.h - copied unchanged from r424401, head/x11-toolkits/girara/files/patch-girara_callbacks.h branches/2016Q4/x11-toolkits/girara/files/patch-girara_macros.h - copied unchanged from r424401, head/x11-toolkits/girara/files/patch-girara_macros.h Modified: branches/2016Q4/x11-toolkits/girara/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/x11-toolkits/girara/Makefile ============================================================================== --- branches/2016Q4/x11-toolkits/girara/Makefile Sat Oct 22 02:28:25 2016 (r424443) +++ branches/2016Q4/x11-toolkits/girara/Makefile Sat Oct 22 04:56:15 2016 (r424444) @@ -3,7 +3,7 @@ PORTNAME= girara PORTVERSION= 0.2.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits graphics MASTER_SITES= http://pwmt.org/projects/girara/download/ @@ -18,14 +18,10 @@ LIBDIR= ${PREFIX}/lib MAKE_ENV+= SFLAGS=${STRIP} \ VERBOSE=1 -OPTIONS_DEFINE= GCC NLS -# Force GCC by default due to problems in dependent port zathura with keyboard -# input when compiled using clang. -OPTIONS_DEFAULT=GCC +OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext -GCC_USE= GCC=yes post-patch: .SILENT ${REINPLACE_CMD} -e 's|$${LIBDIR}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ Copied: branches/2016Q4/x11-toolkits/girara/files/patch-girara_callbacks.h (from r424401, head/x11-toolkits/girara/files/patch-girara_callbacks.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/x11-toolkits/girara/files/patch-girara_callbacks.h Sat Oct 22 04:56:15 2016 (r424444, copy of r424401, head/x11-toolkits/girara/files/patch-girara_callbacks.h) @@ -0,0 +1,19 @@ +--- girara/callbacks.h.orig 2016-04-18 20:35:34 UTC ++++ girara/callbacks.h +@@ -4,6 +4,7 @@ + #define GIRARA_CALLBACKS_H + + #include "types.h" ++#include "macros.h" + #include <gtk/gtk.h> + + /** +@@ -108,7 +109,7 @@ bool girara_callback_inputbar_activate(G + * @return FALSE An error occurred + */ + bool girara_callback_inputbar_key_press_event(GtkWidget* widget, +- GdkEventKey* event, girara_session_t* session); ++ GdkEventKey* event, girara_session_t* session) GIRARA_OPTNONE; + + /** + * Default callback if the text of the input bar has changed Copied: branches/2016Q4/x11-toolkits/girara/files/patch-girara_macros.h (from r424401, head/x11-toolkits/girara/files/patch-girara_macros.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/x11-toolkits/girara/files/patch-girara_macros.h Sat Oct 22 04:56:15 2016 (r424444, copy of r424401, head/x11-toolkits/girara/files/patch-girara_macros.h) @@ -0,0 +1,15 @@ +--- girara/macros.h.orig 2015-04-13 20:49:26 UTC ++++ girara/macros.h +@@ -69,4 +69,12 @@ + GIRARA_DO_PRAGMA(GCC diagnostic pop) + #endif + ++#ifndef GIRARA_OPTNONE ++# if defined(__clang__) ++# define GIRARA_OPTNONE __attribute__ ((optnone)) ++# else ++# define GIRARA_OPTNONE ++# endif ++#endif ++ + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610220456.u9M4uFk0048646>