[137352] trunk/dports/x11
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jun 10 00:03:27 PDT 2015
Revision: 137352
https://trac.macports.org/changeset/137352
Author: jeremyhu at macports.org
Date: 2015-06-10 00:03:27 -0700 (Wed, 10 Jun 2015)
Log Message:
-----------
xorg-server*: Fix a build error with newer clang
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
trunk/dports/x11/xorg-server-devel/Portfile
Added Paths:
-----------
trunk/dports/x11/xorg-server/files/0001-XQuartz-Silence-Wpointer-bool-conversion.patch
trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Silence-Wpointer-bool-conversion.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2015-06-10 04:16:53 UTC (rev 137351)
+++ trunk/dports/x11/xorg-server/Portfile 2015-06-10 07:03:27 UTC (rev 137352)
@@ -88,6 +88,7 @@
RAWCPP=${configure.cpp}
patchfiles \
+ 0001-XQuartz-Silence-Wpointer-bool-conversion.patch \
5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
5002-Use-old-miTrapezoids-and-miTriangles-routines.patch \
Added: trunk/dports/x11/xorg-server/files/0001-XQuartz-Silence-Wpointer-bool-conversion.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-XQuartz-Silence-Wpointer-bool-conversion.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Silence-Wpointer-bool-conversion.patch 2015-06-10 07:03:27 UTC (rev 137352)
@@ -0,0 +1,53 @@
+From 21b171f8bbc9bdd5c54372c47e361bb5f11ba73c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 9 Jun 2015 23:29:40 -0700
+Subject: [PATCH 1/4] XQuartz: Silence -Wpointer-bool-conversion
+
+X11Controller.m:417:17: error: address of function 'asl_log_descriptor' will always evaluate to 'true'
+ [-Werror,-Wpointer-bool-conversion,Value Conversion Issue]
+ if (asl_log_descriptor) {
+ ~~ ^~~~~~~~~~~~~~~~~~
+X11Controller.m:417:17: note: prefix with the address-of operator to silence this warning [Semantic Issue]
+ if (asl_log_descriptor) {
+ ^
+ &
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ hw/xquartz/X11Controller.m | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
+index 022e832..c3c6976 100644
+--- a/hw/xquartz/X11Controller.m
++++ b/hw/xquartz/X11Controller.m
+@@ -364,7 +364,7 @@ extern char *bundle_id_prefix;
+ }
+
+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+- if (asl_log_descriptor) {
++ if (&asl_log_descriptor) {
+ char *asl_sender;
+ aslmsg amsg = asl_new(ASL_TYPE_MSG);
+ assert(amsg);
+@@ -414,7 +414,7 @@ extern char *bundle_id_prefix;
+
+ case 0: /* child2 */
+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+- if (asl_log_descriptor) {
++ if (&asl_log_descriptor) {
+ /* Replace our stdout/stderr */
+ dup2(stdout_pipe[1], STDOUT_FILENO);
+ dup2(stderr_pipe[1], STDERR_FILENO);
+@@ -443,7 +443,7 @@ extern char *bundle_id_prefix;
+ }
+
+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+- if (asl_log_descriptor) {
++ if (&asl_log_descriptor) {
+ /* Close the write ends of the pipe */
+ close(stdout_pipe[1]);
+ close(stderr_pipe[1]);
+--
+2.4.2
+
Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile 2015-06-10 04:16:53 UTC (rev 137351)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2015-06-10 07:03:27 UTC (rev 137352)
@@ -80,6 +80,7 @@
RAWCPP=${configure.cpp}
patchfiles \
+ 0001-XQuartz-Silence-Wpointer-bool-conversion.patch \
5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
5002-Use-old-miTrapezoids-and-miTriangles-routines.patch \
Added: trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Silence-Wpointer-bool-conversion.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Silence-Wpointer-bool-conversion.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Silence-Wpointer-bool-conversion.patch 2015-06-10 07:03:27 UTC (rev 137352)
@@ -0,0 +1,53 @@
+From 21b171f8bbc9bdd5c54372c47e361bb5f11ba73c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Tue, 9 Jun 2015 23:29:40 -0700
+Subject: [PATCH 1/4] XQuartz: Silence -Wpointer-bool-conversion
+
+X11Controller.m:417:17: error: address of function 'asl_log_descriptor' will always evaluate to 'true'
+ [-Werror,-Wpointer-bool-conversion,Value Conversion Issue]
+ if (asl_log_descriptor) {
+ ~~ ^~~~~~~~~~~~~~~~~~
+X11Controller.m:417:17: note: prefix with the address-of operator to silence this warning [Semantic Issue]
+ if (asl_log_descriptor) {
+ ^
+ &
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ hw/xquartz/X11Controller.m | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
+index 022e832..c3c6976 100644
+--- a/hw/xquartz/X11Controller.m
++++ b/hw/xquartz/X11Controller.m
+@@ -364,7 +364,7 @@ extern char *bundle_id_prefix;
+ }
+
+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+- if (asl_log_descriptor) {
++ if (&asl_log_descriptor) {
+ char *asl_sender;
+ aslmsg amsg = asl_new(ASL_TYPE_MSG);
+ assert(amsg);
+@@ -414,7 +414,7 @@ extern char *bundle_id_prefix;
+
+ case 0: /* child2 */
+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+- if (asl_log_descriptor) {
++ if (&asl_log_descriptor) {
+ /* Replace our stdout/stderr */
+ dup2(stdout_pipe[1], STDOUT_FILENO);
+ dup2(stderr_pipe[1], STDERR_FILENO);
+@@ -443,7 +443,7 @@ extern char *bundle_id_prefix;
+ }
+
+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
+- if (asl_log_descriptor) {
++ if (&asl_log_descriptor) {
+ /* Close the write ends of the pipe */
+ close(stdout_pipe[1]);
+ close(stderr_pipe[1]);
+--
+2.4.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150610/ea5ebfcf/attachment.html>
More information about the macports-changes
mailing list