[146955] trunk/dports/devel/glib2-devel

ryandesign at macports.org ryandesign at macports.org
Mon Mar 21 21:08:31 PDT 2016


Revision: 146955
          https://trac.macports.org/changeset/146955
Author:   ryandesign at macports.org
Date:     2016-03-21 21:08:31 -0700 (Mon, 21 Mar 2016)
Log Message:
-----------
glib2-devel: fix build on OS X 10.6 and older by removing a patch for a problem fixed differently upstream

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

Removed Paths:
-------------
    trunk/dports/devel/glib2-devel/files/patch-glib-gdate.c.diff

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2016-03-22 03:55:48 UTC (rev 146954)
+++ trunk/dports/devel/glib2-devel/Portfile	2016-03-22 04:08:31 UTC (rev 146955)
@@ -52,11 +52,6 @@
     compiler.blacklist-append {clang < 600}
 }
 
-if {[string match {*gcc-4.[0123]} ${configure.compiler}]} {
-    # Remove pragmas incompatible with gcc < 4.4
-    patchfiles-append       patch-glib-gdate.c.diff
-}
-
 depends_build               bin:xmllint:libxml2
 
 depends_lib                 port:gettext \

Deleted: trunk/dports/devel/glib2-devel/files/patch-glib-gdate.c.diff
===================================================================
--- trunk/dports/devel/glib2-devel/files/patch-glib-gdate.c.diff	2016-03-22 03:55:48 UTC (rev 146954)
+++ trunk/dports/devel/glib2-devel/files/patch-glib-gdate.c.diff	2016-03-22 04:08:31 UTC (rev 146955)
@@ -1,15 +0,0 @@
-Fix "error: #pragma GCC diagnostic not allowed inside functions" with GCC < 4.4
-https://bugzilla.gnome.org/show_bug.cgi?id=762562
---- glib/gdate.c.orig	2016-02-16 05:10:31.000000000 -0600
-+++ glib/gdate.c	2016-02-23 13:43:39.000000000 -0600
-@@ -2494,10 +2494,7 @@
-        * recognize whether strftime actually failed or just returned "".
-        */
-       tmpbuf[0] = '\1';
--      #pragma GCC diagnostic push
--      #pragma GCC diagnostic ignored "-Wformat-nonliteral"
-       tmplen = strftime (tmpbuf, tmpbufsize, locale_format, &tm);
--      #pragma GCC diagnostic pop
- 
-       if (tmplen == 0 && tmpbuf[0] != '\0')
-         {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160321/d8d03532/attachment.html>


More information about the macports-changes mailing list