[120388] trunk/dports/devel/girara

devans at macports.org devans at macports.org
Mon May 26 10:08:22 PDT 2014


Revision: 120388
          https://trac.macports.org/changeset/120388
Author:   devans at macports.org
Date:     2014-05-26 10:08:22 -0700 (Mon, 26 May 2014)
Log Message:
-----------
girara: maintainer build fix (#43804).

Modified Paths:
--------------
    trunk/dports/devel/girara/Portfile

Added Paths:
-----------
    trunk/dports/devel/girara/files/patch-session.c.diff

Modified: trunk/dports/devel/girara/Portfile
===================================================================
--- trunk/dports/devel/girara/Portfile	2014-05-26 16:54:52 UTC (rev 120387)
+++ trunk/dports/devel/girara/Portfile	2014-05-26 17:08:22 UTC (rev 120388)
@@ -10,7 +10,7 @@
 categories          devel gnome
 platforms           darwin
 license             zlib
-maintainers         gmail.com:starkhalo
+maintainers         gmail.com:starkhalo openmaintainer
 description         Cross-platform widget toolkit based on GTK+
 long_description \
     girara is a library that implements a user interface that focuses on    \
@@ -33,6 +33,13 @@
 patchfiles          patch-Makefile.diff \
                     patch-config.mk.diff
 
+# https://trac.macports.org/ticket/43794
+# Due to #43794 "error: #pragma GCC diagnostic not allowed inside functions"
+# port needs patching to build on GCC < 4.6
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52116
+# https://bugs.freedesktop.org/show_bug.cgi?id=52614
+patchfiles-append   patch-session.c.diff
+
 depends_build       port:pkgconfig
 
 depends_lib         path:lib/libglib-2.0.dylib:glib2 \

Added: trunk/dports/devel/girara/files/patch-session.c.diff
===================================================================
--- trunk/dports/devel/girara/files/patch-session.c.diff	                        (rev 0)
+++ trunk/dports/devel/girara/files/patch-session.c.diff	2014-05-26 17:08:22 UTC (rev 120388)
@@ -0,0 +1,56 @@
+--- session.c	2014-02-17 08:50:37.000000000 -0600
++++ /Users/harciga/dev/pwmt/girara/session.c	2014-05-25 22:46:03.000000000 -0500
+@@ -43,6 +43,8 @@
+   }
+ }
+ 
++IGNORE_DEPRECATED
++
+ girara_session_t*
+ girara_session_create()
+ {
+@@ -117,14 +119,14 @@
+   session->gtk.tabs              = GTK_NOTEBOOK(gtk_notebook_new());
+ 
+   /* deprecated members */
+-  IGNORE_DEPRECATED
+   session->settings               = session->private_data->settings;
+   session->global.command_history = girara_get_command_history(session);
+-  UNIGNORE
+ 
+   return session;
+ }
+ 
++UNIGNORE
++
+ bool
+ girara_session_init(girara_session_t* session, const char* sessionname)
+ {
+@@ -418,6 +420,8 @@
+   g_slice_free(girara_session_private_t, session);
+ }
+ 
++IGNORE_DEPRECATED
++
+ bool
+ girara_session_destroy(girara_session_t* session)
+ {
+@@ -487,9 +491,7 @@
+   /* clean up private data */
+   girara_session_private_free(session->private_data);
+   session->private_data = NULL;
+-  IGNORE_DEPRECATED
+   session->settings = NULL;
+-  UNIGNORE
+ 
+   /* clean up session */
+   g_slice_free(girara_session_t, session);
+@@ -497,6 +499,8 @@
+   return TRUE;
+ }
+ 
++UNIGNORE
++
+ char*
+ girara_buffer_get(girara_session_t* session)
+ {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140526/fc6649b0/attachment.html>


More information about the macports-changes mailing list