<!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>[152487] trunk/dports/x11/xorg-server-devel</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/152487">152487</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2016-09-11 00:03:35 -0700 (Sun, 11 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server-devel: Bump to current master</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverdevelPortfile">trunk/dports/x11/xorg-server-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverdevelfiles0001XQuartzFixtheissuewherethehkeycouldbecomepatch">trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles0002XQuartzCleanupCPPFLAGSthatarenolongernecessarpatch">trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles0003osconnectionImproveabstractionforlaunchdsecurepatch">trunk/dports/x11/xorg-server-devel/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch</a></li>
<li><a href="#trunkdportsx11xorgserverdevelfiles0004xquartzUpdateforremovalofAddEnabledDeviceandRpatch">trunk/dports/x11/xorg-server-devel/files/0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverdevelfiles1000XQuartzFixdefaultCFBundleVersionpatch">trunk/dports/x11/xorg-server-devel/files/1000-XQuartz-Fix-default-CFBundleVersion.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorgserverdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server-devel/Portfile (152486 => 152487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/Portfile 2016-09-11 06:21:25 UTC (rev 152486)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2016-09-11 07:03:35 UTC (rev 152487)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> conflicts xorg-server
</span><span class="cx"> set my_name xorg-server
</span><span class="cx"> version 1.18.99.1
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">
</span><span class="cx"> fetch.type git
</span><span class="cx"> git.url git://anongit.freedesktop.org/xorg/xserver
</span><del>-git.branch 66fdeb880aac0966be9aa41219047ade0148c35f
</del><ins>+git.branch 527c6baa294d17c5eca1d87ac941844872e90dac
</ins><span class="cx"> #git.branch xorg-server-${version}
</span><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="lines">@@ -56,13 +56,14 @@
</span><span class="cx"> depends_lib \
</span><span class="cx"> path:lib/pkgconfig/pixman-1.pc:libpixman \
</span><span class="cx"> port:xorg-libxkbfile \
</span><del>- port:xorg-libXfont \
</del><ins>+ port:xorg-libXfont2 \
</ins><span class="cx"> port:xorg-libXt \
</span><span class="cx"> port:xorg-libAppleWM \
</span><span class="cx"> port:xorg-libXfixes
</span><span class="cx">
</span><span class="cx"> # https://trac.macports.org/ticket/36055
</span><del>-compiler.blacklist gcc-4.0
</del><ins>+# https://llvm.org/bugs/show_bug.cgi?id=30346
+compiler.blacklist gcc-4.0 macports-clang-3.8 macports-clang-3.9 macports-clang-devel
</ins><span class="cx">
</span><span class="cx"> configure.args --with-apple-applications-dir=${applications_dir} \
</span><span class="cx"> --with-bundle-id-prefix=org.macports \
</span><span class="lines">@@ -82,7 +83,10 @@
</span><span class="cx"> RAWCPP=${configure.cpp}
</span><span class="cx">
</span><span class="cx"> patchfiles \
</span><del>- 1000-XQuartz-Fix-default-CFBundleVersion.patch \
</del><ins>+ 0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch \
+ 0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch \
+ 0003-os-connection-Improve-abstraction-for-launchd-secure.patch \
+ 0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch \
</ins><span class="cx"> 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span class="cx"> 5001-Revert-dix-Restore-PaintWindow-screen-hook.patch \
</span><span class="cx"> 5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles0001XQuartzFixtheissuewherethehkeycouldbecomepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch (0 => 152487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0001-XQuartz-Fix-the-issue-where-the-h-key-could-be-come-.patch 2016-09-11 07:03:35 UTC (rev 152487)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+From b1ee5cc0015e702c8e13c3895f4b2344ab2aeacb Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sun, 29 May 2016 14:01:38 -0700
+Subject: [PATCH 1/4] XQuartz: Fix the issue where the h key could be come
+ "stuck" after hiding XQuartz with cmd-h
+
+The issue was that we set a flag to ignore the k key's up event when sent
+the cmd-h down event, but because the cmd-h keycode hides XQuartz, we
+became !_x_active by the time the event is delivered which caused us to
+go down a differnet codepath rather than getting a chance to ignore it.
+We then incorrectly ignored the next h up key.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=92648
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ hw/xquartz/X11Application.m | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
+index d2c5d30..9a22909 100644
+--- a/hw/xquartz/X11Application.m
++++ b/hw/xquartz/X11Application.m
+@@ -366,6 +366,15 @@ message_kit_thread(SEL selector, NSObject *arg)
+ else {
+ /* No kit window is focused, so send it to X. */
+ for_appkit = NO;
++
++ /* Reset our swallow state if we're seeing the same keyCode again.
++ * This can happen if we become !_x_active when the keyCode we
++ * intended to swallow is delivered. See:
++ * https://bugs.freedesktop.org/show_bug.cgi?id=92648
++ */
++ if ([e keyCode] == swallow_keycode) {
++ do_swallow = NO;
++ }
+ }
+ }
+ else { /* KeyUp */
+--
+2.9.3
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles0002XQuartzCleanupCPPFLAGSthatarenolongernecessarpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch (0 => 152487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0002-XQuartz-Cleanup-CPPFLAGS-that-are-no-longer-necessar.patch 2016-09-11 07:03:35 UTC (rev 152487)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+From b863c6cc90f9e0d3db361fbc3210c34ed5298203 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 10 Sep 2016 22:16:11 -0700
+Subject: [PATCH 2/4] XQuartz: Cleanup CPPFLAGS that are no longer necessary on
+ darwin
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ hw/xquartz/pbproxy/Makefile.am | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am
+index 1b14dff..9429ea2 100644
+--- a/hw/xquartz/pbproxy/Makefile.am
++++ b/hw/xquartz/pbproxy/Makefile.am
+@@ -1,7 +1,6 @@
+-AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks \
+- -DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\"
++AM_CPPFLAGS=-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\"
+
+-AM_CFLAGS=$(XPBPROXY_CFLAGS)
++AM_CFLAGS=$(XPBPROXY_CFLAGS)
+ AM_OBJCFLAGS=$(XPBPROXY_CFLAGS)
+
+ noinst_LTLIBRARIES = libxpbproxy.la
+--
+2.9.3
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles0003osconnectionImproveabstractionforlaunchdsecurepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server-devel/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch (0 => 152487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0003-os-connection-Improve-abstraction-for-launchd-secure.patch 2016-09-11 07:03:35 UTC (rev 152487)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+From 455d862774b791f4ca93f9885e1e899208a5080c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 10 Sep 2016 22:32:56 -0700
+Subject: [PATCH 3/4] os/connection: Improve abstraction for launchd secure
+ sockets
+
+This changes away from hard-coding the /tmp/launch-* path to now
+supporting a generic <path to unix socket>[.<screen>] format for
+$DISPLAY.
+
+cf-libxcb: d978a4f69b30b630f28d07f1003cf290284d24d8
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ os/connection.c | 31 ++++++++++++++++++++++++++-----
+ 1 file changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/os/connection.c b/os/connection.c
+index a901ebf..ac7d12b 100644
+--- a/os/connection.c
++++ b/os/connection.c
+@@ -79,6 +79,8 @@ SOFTWARE.
+ #include <stdio.h>
+ #include <stdlib.h>
+
++#include <sys/stat.h>
++
+ #ifndef WIN32
+ #include <sys/socket.h>
+
+@@ -1112,15 +1114,34 @@ MakeClientGrabPervious(ClientPtr client)
+ void
+ ListenOnOpenFD(int fd, int noxauth)
+ {
+- char port[256];
++ char port[PATH_MAX];
+ XtransConnInfo ciptr;
+ const char *display_env = getenv("DISPLAY");
+
+- if (display_env && (strncmp(display_env, "/tmp/launch", 11) == 0)) {
+- /* Make the path the launchd socket if our DISPLAY is set right */
+- strcpy(port, display_env);
++ /* First check if display_env matches a <path to unix socket>[.<screen number>] scheme (eg: launchd) */
++ if (display_env) {
++ struct stat sbuf;
++
++ strlcpy(port, display_env, sizeof(port));
++
++ /* If the path exists, we don't have do do anything else.
++ * If it doesn't, we need to check for a .<screen number> to strip off and recheck.
++ */
++ if (0 != stat(port, &sbuf)) {
++ char *dot = strrchr(port, '.');
++ if (dot) {
++ *dot = '\0';
++
++ if (0 != stat(port, &sbuf)) {
++ display_env = NULL;
++ }
++ } else {
++ display_env = NULL;
++ }
++ }
+ }
+- else {
++
++ if (!display_env) {
+ /* Just some default so things don't break and die. */
+ snprintf(port, sizeof(port), ":%d", atoi(display));
+ }
+--
+2.9.3
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles0004xquartzUpdateforremovalofAddEnabledDeviceandRpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/x11/xorg-server-devel/files/0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch (0 => 152487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch (rev 0)
+++ trunk/dports/x11/xorg-server-devel/files/0004-xquartz-Update-for-removal-of-AddEnabledDevice-and-R.patch 2016-09-11 07:03:35 UTC (rev 152487)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+From dd85834e3995671da908e825eaa7a228d11f0b3d Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Sat, 10 Sep 2016 23:37:46 -0700
+Subject: [PATCH 4/4] xquartz: Update for removal of AddEnabledDevice and
+ RemoveEnabledDevice
+
+Regressed-in: be5a513fee6cbf29ef7570e57eb0436d70fbd88c
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+---
+ hw/xquartz/darwin.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
+index 3403436..c0d0b8a 100644
+--- a/hw/xquartz/darwin.c
++++ b/hw/xquartz/darwin.c
+@@ -303,6 +303,11 @@ DarwinScreenInit(ScreenPtr pScreen, int argc, char **argv)
+ =============================================================================
+ */
+
++static void
++DarwinInputHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
++{
++}
++
+ /*
+ * DarwinMouseProc: Handle the initialization, etc. of a mouse
+ */
+@@ -362,13 +367,13 @@ DarwinMouseProc(DeviceIntPtr pPointer, int what)
+
+ case DEVICE_ON:
+ pPointer->public.on = TRUE;
+- AddEnabledDevice(darwinEventReadFD);
++ SetNotifyFd(darwinEventReadFD, DarwinInputHandlerNotify, X_NOTIFY_READ, NULL);
+ return Success;
+
+ case DEVICE_CLOSE:
+ case DEVICE_OFF:
+ pPointer->public.on = FALSE;
+- RemoveEnabledDevice(darwinEventReadFD);
++ RemoveNotifyFd(darwinEventReadFD);
+ return Success;
+ }
+
+@@ -431,13 +436,13 @@ DarwinTabletProc(DeviceIntPtr pPointer, int what)
+
+ case DEVICE_ON:
+ pPointer->public.on = TRUE;
+- AddEnabledDevice(darwinEventReadFD);
++ SetNotifyFd(darwinEventReadFD, DarwinInputHandlerNotify, X_NOTIFY_READ, NULL);
+ return Success;
+
+ case DEVICE_CLOSE:
+ case DEVICE_OFF:
+ pPointer->public.on = FALSE;
+- RemoveEnabledDevice(darwinEventReadFD);
++ RemoveNotifyFd(darwinEventReadFD);
+ return Success;
+ }
+ return Success;
+@@ -459,12 +464,12 @@ DarwinKeybdProc(DeviceIntPtr pDev, int onoff)
+
+ case DEVICE_ON:
+ pDev->public.on = TRUE;
+- AddEnabledDevice(darwinEventReadFD);
++ SetNotifyFd(darwinEventReadFD, DarwinInputHandlerNotify, X_NOTIFY_READ, NULL);
+ break;
+
+ case DEVICE_OFF:
+ pDev->public.on = FALSE;
+- RemoveEnabledDevice(darwinEventReadFD);
++ RemoveNotifyFd(darwinEventReadFD);
+ break;
+
+ case DEVICE_CLOSE:
+--
+2.9.3
+
</ins></span></pre></div>
<a id="trunkdportsx11xorgserverdevelfiles1000XQuartzFixdefaultCFBundleVersionpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server-devel/files/1000-XQuartz-Fix-default-CFBundleVersion.patch (152486 => 152487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server-devel/files/1000-XQuartz-Fix-default-CFBundleVersion.patch 2016-09-11 06:21:25 UTC (rev 152486)
+++ trunk/dports/x11/xorg-server-devel/files/1000-XQuartz-Fix-default-CFBundleVersion.patch 2016-09-11 07:03:35 UTC (rev 152487)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-From eb7c1e7fb16338d8fc03a0bb0f9bb53eb99ee139 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 7 May 2016 00:43:33 -0700
-Subject: [PATCH] XQuartz: Fix default CFBundleVersion
-
-m4/shell variable name collision broke the case when the configure option was not used
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- configure.ac | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2633f4e..cf13123 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -559,11 +559,10 @@ AC_ARG_WITH(bundle-id-prefix, AS_HELP_STRING([--with-bundle-id-prefix=RDNS_PREF
- [ BUNDLE_ID_PREFIX="${withval}" ])
- AC_SUBST([BUNDLE_ID_PREFIX])
- AC_DEFINE_UNQUOTED(BUNDLE_ID_PREFIX, "$BUNDLE_ID_PREFIX", [Prefix to use for bundle identifiers])
--DEFAULT_BUNDLE_VERSION=`echo ${PACKAGE_VERSION} | cut -f1-3 -d.`
--m4_define(DEFAULT_BUNDLE_VERSION, m4_esyscmd([echo ]AC_PACKAGE_VERSION[ | cut -f1-3 -d.]))
-+m4_define(DEFAULT_BUNDLE_VERSION, m4_esyscmd([echo ]AC_PACKAGE_VERSION[ | cut -f1-3 -d. | tr -d '\n']))
- AC_ARG_WITH(bundle-version, AS_HELP_STRING([--with-bundle-version=VERSION], [Version to use for X11.app's CFBundleVersion (default: ]DEFAULT_BUNDLE_VERSION[)]),
- [ BUNDLE_VERSION="${withval}" ],
-- [ BUNDLE_VERSION="${DEFAULT_BUNDLE_VERSION}" ])
-+ [ BUNDLE_VERSION="DEFAULT_BUNDLE_VERSION" ])
- AC_SUBST([BUNDLE_VERSION])
- AC_ARG_WITH(bundle-version-string, AS_HELP_STRING([--with-bundle-version-string=VERSION], [Version to use for X11.app's CFBundleShortVersionString (default: ]AC_PACKAGE_VERSION[)]),
- [ BUNDLE_VERSION_STRING="${withval}" ],
---
-2.8.2
-
</del></span></pre>
</div>
</div>
</body>
</html>