<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[122559] trunk/dports/x11</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/122559">122559</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-07-23 18:59:49 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-xcb-util-cursor: New port</pre>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/x11/xorg-xcb-util-cursor/</li>
<li><a href="#trunkdportsx11xorgxcbutilcursorPortfile">trunk/dports/x11/xorg-xcb-util-cursor/Portfile</a></li>
<li>trunk/dports/x11/xorg-xcb-util-cursor/files/</li>
<li><a href="#trunkdportsx11xorgxcbutilcursorfiles0001UseCFSwapInt32LittleToHostfromCoreFoundationhonpatch">trunk/dports/x11/xorg-xcb-util-cursor/files/0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch</a></li>
<li><a href="#trunkdportsx11xorgxcbutilcursorfiles0002Checksubmodulesbeforerunningautoconfpatch">trunk/dports/x11/xorg-xcb-util-cursor/files/0002-Check-submodules-before-running-autoconf.patch</a></li>
<li><a href="#trunkdportsx11xorgxcbutilcursorfiles0003darwinUseOSByteOrderhratherthanCFpatch">trunk/dports/x11/xorg-xcb-util-cursor/files/0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorgxcbutilcursorPortfile"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-xcb-util-cursor/Portfile (0 => 122559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-xcb-util-cursor/Portfile (rev 0)
+++ trunk/dports/x11/xorg-xcb-util-cursor/Portfile 2014-07-24 01:59:49 UTC (rev 122559)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+# $Id$
+
+PortSystem 1.0
+
+name xorg-xcb-util-cursor
+version 0.1.1
+categories x11 devel
+license X11
+maintainers jeremyhu openmaintainer
+description X.org xcb-util-cursor
+homepage http://xcb.freedesktop.org/
+platforms darwin macosx
+long_description Utility libraries for XCB
+master_sites ${homepage}/dist/
+
+distname xcb-util-cursor-${version}
+checksums sha1 75ea5d4dc5f185151f171e525023cb76f3b72128 \
+ rmd160 3dafa5d3ba7d284c2cdd4c8f57d648dfb595fb46 \
+ sha256 517a1febcede3bc994e356c4c066e297a12ca219063b7d39047e29c7a8860652
+use_bzip2 yes
+use_parallel_build yes
+
+depends_build port:pkgconfig \
+ port:xorg-util-macros
+depends_lib port:xorg-xcb-util \
+ port:xorg-xcb-util-image \
+ port:xorg-xproto
+
+patchfiles \
+ 0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch \
+ 0002-Check-submodules-before-running-autoconf.patch \
+ 0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch
+
+patch.pre_args -p1
+
+use_autoreconf yes
+autoreconf.args -fvi
+
+livecheck.type regex
+livecheck.url ${master_sites}?C=M&O=D
+livecheck.regex xcb-util-image-(\\d+(?:\\.\\d+)*)
</ins><span class="cx">Property changes on: trunk/dports/x11/xorg-xcb-util-cursor/Portfile
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkdportsx11xorgxcbutilcursorfiles0001UseCFSwapInt32LittleToHostfromCoreFoundationhonpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-xcb-util-cursor/files/0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch (0 => 122559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-xcb-util-cursor/files/0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch (rev 0)
+++ trunk/dports/x11/xorg-xcb-util-cursor/files/0001-Use-CFSwapInt32LittleToHost-from-CoreFoundation.h-on.patch 2014-07-24 01:59:49 UTC (rev 122559)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+From d25806902ee6050ec3d52480d0bc8f4889942350 Mon Sep 17 00:00:00 2001
+From: Marcus Crestani <crestani@informatik.uni-tuebingen.de>
+Date: Mon, 23 Dec 2013 23:30:04 +0100
+Subject: [PATCH 1/3] Use CFSwapInt32LittleToHost from CoreFoundation.h on Mac
+ OS X to implement le32toh.
+
+---
+ configure.ac | 2 +-
+ cursor/parse_cursor_file.c | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4baa90a..7b45299 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,7 @@ XCB_UTIL_COMMON([1.4], [1.6])
+
+ AM_MISSING_PROG([GPERF], [gperf])
+
+-AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h], [break])
++AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h CoreFoundation/CoreFoundation.h], [break])
+ AC_CHECK_FUNCS([le32toh])
+
+ PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
+diff --git a/cursor/parse_cursor_file.c b/cursor/parse_cursor_file.c
+index 30c6a58..0226b01 100644
+--- a/cursor/parse_cursor_file.c
++++ b/cursor/parse_cursor_file.c
+@@ -48,6 +48,9 @@
+ # ifndef HAVE_LE32TOH
+ # define le32toh(x) LE_32(x)
+ # endif
++#elif defined(HAVE_COREFOUNDATION_COREFOUNDATION_H)
++#include <CoreFoundation/CoreFoundation.h>
++#define le32toh(x) CFSwapInt32LittleToHost(x)
+ #endif
+
+ #include <xcb/xcb.h>
+--
+1.9.1
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgxcbutilcursorfiles0002Checksubmodulesbeforerunningautoconfpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-xcb-util-cursor/files/0002-Check-submodules-before-running-autoconf.patch (0 => 122559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-xcb-util-cursor/files/0002-Check-submodules-before-running-autoconf.patch (rev 0)
+++ trunk/dports/x11/xorg-xcb-util-cursor/files/0002-Check-submodules-before-running-autoconf.patch 2014-07-24 01:59:49 UTC (rev 122559)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+From a08bbf0e20995d29cbf890957c898059d4a9ece2 Mon Sep 17 00:00:00 2001
+From: Niclas Zeising <zeising@daemonic.se>
+Date: Mon, 12 Aug 2013 13:53:10 +0200
+Subject: [PATCH 2/3] Check submodules before running autoconf.
+
+Exit early with an informative message if the submodules are missing,
+since they are needed. Without this autoconf throws a bunch of
+uninformative errors which does not point to the actual problem.
+This was taken from util-keysyms.
+
+Signed-off-by: Niclas Zeising <zeising@daemonic.se>
+Reviewed-By: Arnaud Fontaine <arnau@debian.org>
+---
+ autogen.sh | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/autogen.sh b/autogen.sh
+index 904cd67..afe5299 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -6,6 +6,21 @@ test -z "$srcdir" && srcdir=.
+ ORIGDIR=`pwd`
+ cd $srcdir
+
++# If this is a git checkout, verify that the submodules are initialized,
++# otherwise autotools will just fail with an unhelpful error message.
++if [ -d ".git" ] && [ -r ".gitmodules" ]
++then
++ # If git is not in PATH, this will not return 0, thus not keeping us
++ # from building. Since the message is worthless when git is not
++ # installed, this is what we want.
++ if git submodule status 2>/dev/null | grep -q '^-'
++ then
++ echo "You have uninitialized git submodules." >&2
++ echo "Please run: git submodule update --init" >&2
++ exit 1
++ fi
++fi
++
+ autoreconf -v --install || exit 1
+ cd $ORIGDIR || exit $?
+
+--
+1.9.1
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgxcbutilcursorfiles0003darwinUseOSByteOrderhratherthanCFpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-xcb-util-cursor/files/0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch (0 => 122559)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-xcb-util-cursor/files/0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch (rev 0)
+++ trunk/dports/x11/xorg-xcb-util-cursor/files/0003-darwin-Use-OSByteOrder.h-rather-than-CF.patch 2014-07-24 01:59:49 UTC (rev 122559)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+From f03cc278c6cce0cf721adf9c3764d3c5fba63392 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 5 Apr 2014 15:50:28 -0700
+Subject: [PATCH 3/3] darwin: Use OSByteOrder.h rather than CF.
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ configure.ac | 2 +-
+ cursor/parse_cursor_file.c | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7b45299..94798d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,7 +19,7 @@ XCB_UTIL_COMMON([1.4], [1.6])
+
+ AM_MISSING_PROG([GPERF], [gperf])
+
+-AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h CoreFoundation/CoreFoundation.h], [break])
++AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h libkern/OSByteOrder.h], [break])
+ AC_CHECK_FUNCS([le32toh])
+
+ PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
+diff --git a/cursor/parse_cursor_file.c b/cursor/parse_cursor_file.c
+index 0226b01..21f72bf 100644
+--- a/cursor/parse_cursor_file.c
++++ b/cursor/parse_cursor_file.c
+@@ -48,9 +48,9 @@
+ # ifndef HAVE_LE32TOH
+ # define le32toh(x) LE_32(x)
+ # endif
+-#elif defined(HAVE_COREFOUNDATION_COREFOUNDATION_H)
+-#include <CoreFoundation/CoreFoundation.h>
+-#define le32toh(x) CFSwapInt32LittleToHost(x)
++#elif defined(HAVE_LIBKERN_OSBYTEORDER_H)
++#include <libkern/OSByteOrder.h>
++#define le32toh(x) OSSwapLittleToHostInt32(x)
+ #endif
+
+ #include <xcb/xcb.h>
+--
+1.9.1
+
</ins></span></pre>
</div>
</div>
</body>
</html>