<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d2dce119dde68c65119e9271677cb4855909c6a2">https://github.com/macports/macports-ports/commit/d2dce119dde68c65119e9271677cb4855909c6a2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d2dce119dde68c65119e9271677cb4855909c6a2
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Apr 30 15:59:06 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> xorg-server: clean up current patches to apply cleanly
</span>---
...nnection-Improve-abstraction-for-launchd-secure.patch | 2 +-
...-Initialize-RandR-even-if-there-are-currently-n.patch | 2 +-
.../files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch | 4 ++--
...5001-Revert-dix-Restore-PaintWindow-screen-hook.patch | 6 +++---
...3-Use-old-miTrapezoids-and-miTriangles-routines.patch | 2 +-
.../5004-fb-Revert-fb-changes-that-broke-XQuartz.patch | 16 ++++++++--------
.../5005-fb-Revert-fb-changes-that-broke-XQuartz.patch | 6 +++---
7 files changed, 19 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/0001-os-connection-Improve-abstraction-for-launchd-secure.patch b/x11/xorg-server/files/0001-os-connection-Improve-abstraction-for-launchd-secure.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index cd3a253..13f1488 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/0001-os-connection-Improve-abstraction-for-launchd-secure.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/0001-os-connection-Improve-abstraction-for-launchd-secure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ index a901ebf..0d42184 100644
</span> #ifndef WIN32
#include <sys/socket.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1112,15 +1114,34 @@ MakeClientGrabPervious(ClientPtr client)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -992,15 +994,34 @@
</span> void
ListenOnOpenFD(int fd, int noxauth)
{
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch b/x11/xorg-server/files/0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 184e311..460ea64 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ diff --git a/randr/randr.c b/randr/randr.c
</span> index 0138dc1..efd3859 100644
--- a/randr/randr.c
+++ b/randr/randr.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -387,9 +387,6 @@ RRExtensionInit(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -414,9 +414,6 @@
</span> {
ExtensionEntry *extEntry;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch b/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d8bf8b..1c9bf78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
</span> index 85bd0be..6de7c10 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,8 +52,7 @@
</span> bin_PROGRAMS = Xorg
nodist_Xorg_SOURCES = sdksyms.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ index 85bd0be..6de7c10 100644
</span> -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,7 +136,7 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +141,7 @@
</span> EXTRA_DIST += sdksyms.sh
sdksyms.dep sdksyms.c: sdksyms.sh
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch b/x11/xorg-server/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f944366..d08d2d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/5001-Revert-dix-Restore-PaintWindow-screen-hook.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ diff --git a/composite/compwindow.c b/composite/compwindow.c
</span> index 344138a..77bdfa2 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,7 @@ compRepaintBorder(ClientPtr pClient, void *closure)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,7 @@
</span>
RegionNull(&exposed);
RegionSubtract(&exposed, &pWindow->borderClip, &pWindow->winSize);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@ diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
</span> index c8b6f96..2def8e3 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -300,8 +300,8 @@ QuartzUpdateScreens(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,8 +280,8 @@
</span>
quartzProcs->UpdateScreen(pScreen);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +98,7 @@ index 2e617c4..a627fe7 100644
</span> typedef void (*CopyWindowProcPtr) (WindowPtr /*pWindow */ ,
DDXPointRec /*ptOldOrg */ ,
RegionPtr /*prgnSrc */ );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -502,7 +498,6 @@ typedef struct _Screen {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -544,7 +540,6 @@
</span> ClearToBackgroundProcPtr ClearToBackground;
ClipNotifyProcPtr ClipNotify;
RestackWindowProcPtr RestackWindow;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch b/x11/xorg-server/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8423ce12..d355e00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/5003-Use-old-miTrapezoids-and-miTriangles-routines.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ diff --git a/fb/fbpict.c b/fb/fbpict.c
</span> index 7ea0b66..434d890 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -508,10 +508,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -498,10 +498,8 @@
</span> ps->UnrealizeGlyph = fbUnrealizeGlyph;
ps->CompositeRects = miCompositeRects;
ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch b/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ed90d8..811e234 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ diff --git a/fb/fb.h b/fb/fb.h
</span> index c687aa7..256a1ee 100644
--- a/fb/fb.h
+++ b/fb/fb.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1321,8 +1321,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1149,8 +1149,7 @@
</span> RegionPtr pRegion, FbBits and, FbBits xor);
extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ index 434d890..be8274b 100644
</span> }
free_pixman_pict(pSrc, src);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -279,20 +274,22 @@
</span> }
static pixman_image_t *
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +97,7 @@ index 434d890..be8274b 100644
</span> stride * sizeof(FbStride));
if (!image)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -321,28 +318,21 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,28 +308,21 @@
</span> if (pict->clientClip)
pixman_image_set_has_client_clip(image, TRUE);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,7 @@ index 434d890..be8274b 100644
</span> Bool is_alpha_map);
static void image_destroy(pixman_image_t *image, void *data)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -351,32 +341,13 @@ static void image_destroy(pixman_image_t *image, void *data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -341,32 +331,13 @@
</span> }
static void
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,7 +163,7 @@ index 434d890..be8274b 100644
</span> }
switch (pict->repeatType) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -404,10 +375,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -394,10 +365,8 @@
</span> * as the alpha map for this operation
*/
if (pict->alphaMap && !is_alpha_map) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,7 +175,7 @@ index 434d890..be8274b 100644
</span>
pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x,
pict->alphaOrigin.y);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -445,8 +414,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -435,8 +404,7 @@
</span> }
static pixman_image_t *
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -185,7 +185,7 @@ index 434d890..be8274b 100644
</span> {
pixman_image_t *image = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -454,7 +422,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -444,7 +412,7 @@
</span> return NULL;
if (pict->pDrawable) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,7 +194,7 @@ index 434d890..be8274b 100644
</span> }
else if (pict->pSourcePict) {
SourcePict *sp = pict->pSourcePict;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -472,19 +440,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -462,19 +430,17 @@
</span> else if (sp->type == SourcePictTypeConical)
image = create_conical_gradient_image(gradient);
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch b/x11/xorg-server/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b88f8a..9b2ab6a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/files/5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ diff --git a/fb/fb.h b/fb/fb.h
</span> index 256a1ee..8e87498 100644
--- a/fb/fb.h
+++ b/fb/fb.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1111,9 +1111,6 @@ extern _X_EXPORT void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -952,9 +952,6 @@
</span> extern _X_EXPORT Bool
fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,7 +190,7 @@ index be8274b..66dd633 100644
</span> static pixman_image_t *
create_solid_fill_image(PicturePtr pict)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -470,8 +324,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -460,8 +314,7 @@
</span> return FALSE;
ps = GetPictureScreen(pScreen);
ps->Composite = fbComposite;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +204,7 @@ diff --git a/fb/fbpict.h b/fb/fbpict.h
</span> index 5cb8663..110f32d 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,20 +65,11 @@ fbTrapezoids(CARD8 op,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,20 +60,11 @@
</span> INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps);
extern _X_EXPORT void
</pre><pre style='margin:0'>
</pre>