Attachment #178813 for bug #216002

Lines 2-9 Link Here

(-)x11-toolkits/girara/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= girara	4	PORTNAME= girara
5	PORTVERSION= 0.2.6	5	PORTVERSION= 0.2.7
6	PORTREVISION= 2
7	CATEGORIES= x11-toolkits graphics	6	CATEGORIES= x11-toolkits graphics
8	MASTER_SITES= http://pwmt.org/projects/girara/download/	7	MASTER_SITES= http://pwmt.org/projects/girara/download/
9		8

Lines 1-2 Link Here

(-)x11-toolkits/girara/distinfo (-2 / +3 lines)
1	SHA256 (girara-0.2.6.tar.gz) = eba69b3522b4d149e06d133de52877913275873c505993fad08b6d7884ec9a0f	1	TIMESTAMP = 1484228386
2	SIZE (girara-0.2.6.tar.gz) = 75841	2	SHA256 (girara-0.2.7.tar.gz) = 98e6a343298ae46869c990bc6e0732555e19af2e386cdc1a911f109b1c5c32e5
		3	SIZE (girara-0.2.7.tar.gz) = 76723




--- 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




--- 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

Lines 7-12 Link Here

(-)x11-toolkits/girara/pkg-plist (+1 lines)
7	include/girara/entry.h	7	include/girara/entry.h
8	include/girara/girara.h	8	include/girara/girara.h
9	include/girara/input-history.h	9	include/girara/input-history.h
		10	include/girara/log.h
10	include/girara/macros.h	11	include/girara/macros.h
11	include/girara/session.h	12	include/girara/session.h
12	include/girara/settings.h	13	include/girara/settings.h

Return to bug 216002

Lines 1-19 Link Here

(-)x11-toolkits/girara/files/patch-girara_callbacks.h (-19 lines)
1	--- girara/callbacks.h.orig 2016-04-18 20:35:34 UTC
2	+++ girara/callbacks.h
3	@@ -4,6 +4,7 @@
4	#define GIRARA_CALLBACKS_H
5
6	#include "types.h"
7	+#include "macros.h"
8	#include <gtk/gtk.h>
9
10	/**
11	@@ -108,7 +109,7 @@ bool girara_callback_inputbar_activate(G
12	* @return FALSE An error occurred
13	*/
14	bool girara_callback_inputbar_key_press_event(GtkWidget* widget,
15	- GdkEventKey* event, girara_session_t* session);
16	+ GdkEventKey* event, girara_session_t* session) GIRARA_OPTNONE;
17
18	/**
19	* Default callback if the text of the input bar has changed

Lines 1-15 Link Here

(-)x11-toolkits/girara/files/patch-girara_macros.h (-15 lines)
1	--- girara/macros.h.orig 2015-04-13 20:49:26 UTC
2	+++ girara/macros.h
3	@@ -69,4 +69,12 @@
4	GIRARA_DO_PRAGMA(GCC diagnostic pop)
5	#endif
6
7	+#ifndef GIRARA_OPTNONE
8	+# if defined(__clang__)
9	+# define GIRARA_OPTNONE __attribute__ ((optnone))
10	+# else
11	+# define GIRARA_OPTNONE
12	+# endif
13	+#endif
14	+
15	#endif