svn commit: r424401 - in head/x11-toolkits/girara: . files
Guido Falsi
madpilot at FreeBSD.org
Fri Oct 21 09:11:53 UTC 2016
Author: madpilot
Date: Fri Oct 21 09:11:51 2016
New Revision: 424401
URL: https://svnweb.freebsd.org/changeset/ports/424401
Log:
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 at abinet.ru>.
Bug has been reported upstream.
PR: 213595
Submitted by: Michael Danilov <mike.d.ft402 at gmail.com>
MFH: 2016Q4
Added:
head/x11-toolkits/girara/files/patch-girara_callbacks.h (contents, props changed)
head/x11-toolkits/girara/files/patch-girara_macros.h (contents, props changed)
Modified:
head/x11-toolkits/girara/Makefile
Modified: head/x11-toolkits/girara/Makefile
==============================================================================
--- head/x11-toolkits/girara/Makefile Fri Oct 21 09:05:59 2016 (r424400)
+++ head/x11-toolkits/girara/Makefile Fri Oct 21 09:11:51 2016 (r424401)
@@ -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' \
Added: head/x11-toolkits/girara/files/patch-girara_callbacks.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/girara/files/patch-girara_callbacks.h Fri Oct 21 09:11:51 2016 (r424401)
@@ -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
Added: head/x11-toolkits/girara/files/patch-girara_macros.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/girara/files/patch-girara_macros.h Fri Oct 21 09:11:51 2016 (r424401)
@@ -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
More information about the svn-ports-head
mailing list