Attachment 128222 Details for Bug 172100 – clang-cpp.diff

[patch] clang-cpp.diff

clang-cpp.diff (text/x-patch), 1.88 KB, created by Jan Beich on 2012-09-27 04:41:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2012-09-27 04:41:16 UTC

Size: 1.88 KB

patch

obsolete

>Index: x11/xdm/Makefile
>===================================================================
>--- x11/xdm/Makefile	(revision 304222)
>+++ x11/xdm/Makefile	(working copy)
>@@ -38,6 +39,8 @@ PLIST_SUB+=	XDMSHELL="@comment "
> .endif
> 
> post-patch:
>+	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
>+		${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \
> 		-e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \
> 			${WRKSRC}/config/xdm-config.cpp \
>Index: x11/xdm/files/patch-config-Makefile.in
>===================================================================
>--- x11/xdm/files/patch-config-Makefile.in	(revision 0)
>+++ x11/xdm/files/patch-config-Makefile.in	(working copy)
>@@ -0,0 +1,10 @@
>+--- config/Makefile.in~
>++++ config/Makefile.in
>+@@ -297,6 +297,7 @@ WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
>+ # Allow XHASH to always be substituted, even in cases where XCOMM isn't.
>+ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
>+                        -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
>++                       -e '/^$$/d' \
>+                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
>+                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
>+                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
>Index: x11/xdm/files/patch-config-Xresources.cpp
>===================================================================
>--- x11/xdm/files/patch-config-Xresources.cpp	(revision 0)
>+++ x11/xdm/files/patch-config-Xresources.cpp	(working copy)
>@@ -0,0 +1,14 @@
>+--- config/Xresources.cpp~
>++++ config/Xresources.cpp
>+@@ -60,9 +60,9 @@ xlogin*hiColor: black
>+ XHASHendif
>+ #ifdef XPM
>+ XHASHif PLANES >= 8
>+-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
>++xlogin*logoFileName: BITMAPDIR/XDM_PIXMAP
>+ XHASHelse
>+-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
>++xlogin*logoFileName: BITMAPDIR/XDM_BWPIXMAP
>+ XHASHendif
>+ xlogin*useShape: true
>+ xlogin*logoPadding: 10

Actions: View | Diff

Attachments on bug 172100: 128219 | 128220 | 128221 | 128222