xserver: Branch 'master'

[GitLab Mirror]

 fix-miregion         |   29 -----------------------------
 fix-miregion-private |   14 --------------
 fix-patch-whitespace |    4 ----
 fix-region           |   38 --------------------------------------
 4 files changed, 85 deletions(-)

New commits:
commit fc855216028e6a34b667c11e198aea405fb4bc00
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Aug 9 09:55:23 2018 -0400

    Remove old region API conversion scripts
    
    This was eight years ago, if you still need these you're in a bad place.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/fix-miregion b/fix-miregion
deleted file mode 100755
index fc502bbfd..000000000
--- a/fix-miregion
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-sed -i \
--e 's/miRegionCreate\b/RegionCreate/g' \
--e 's/miRegionInit\b/RegionInit/g' \
--e 's/miRegionDestroy\b/RegionDestroy/g' \
--e 's/miRegionUninit\b/RegionUninit/g' \
--e 's/miRegionCopy\b/RegionCopy/g' \
--e 's/miIntersect\b/RegionIntersect/g' \
--e 's/miUnion\b/RegionUnion/g' \
--e 's/miRegionAppend\b/RegionAppend/g' \
--e 's/miRegionValidate\b/RegionValidate/g' \
--e 's/miRectsToRegion\b/RegionFromRects/g' \
--e 's/miSubtract\b/RegionSubtract/g' \
--e 's/miInverse\b/RegionInverse/g' \
--e 's/miRectIn\b/RegionContainsRect/g' \
--e 's/miTranslateRegion\b/RegionTranslate/g' \
--e 's/miRegionReset\b/RegionReset/g' \
--e 's/miRegionBreak\b/RegionBreak/g' \
--e 's/miPointInRegion\b/RegionContainsPoint/g' \
--e 's/miRegionEqual\b/RegionEqual/g' \
--e 's/miRegionNotEmpty\b/RegionNotEmpty/g' \
--e 's/miRegionEmpty\b/RegionEmpty/g' \
--e 's/miRegionExtents\b/RegionExtents/g' \
--e 's/miPrintRegion\b/RegionPrint/g' \
--e 's/miRectAlloc\b/RegionRectAlloc/g' \
--e 's/miValidRegion\b/RegionIsValid/g' \
--e 's/miRegionBroken\b/RegionBroken/g' \
--e 's/miClipSpans\b/RegionClipSpans/g' \
-"$@"
diff --git a/fix-miregion-private b/fix-miregion-private
deleted file mode 100755
index ebc24fac0..000000000
--- a/fix-miregion-private
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-sed -i \
--e 's/miEmptyBox\b/RegionEmptyBox/g' \
--e 's/miEmptyData\b/RegionEmptyData/g' \
--e 's/miBrokenData\b/RegionBrokenData/g' \
--e 's/miBrokenRegion\b/RegionBrokenRegion/g' \
--e 's/miCoalesce\b/RegionCoalesce/g' \
--e 's/miAppendNonO\b/RegionAppendNonO/g' \
--e 's/miRegionOp\b/RegionOp/g' \
--e 's/miSetExtents\b/RegionSetExtents/g' \
--e 's/miIntersectO\b/RegionIntersectO/g' \
--e 's/miUnionO\b/RegionUnionO/g' \
--e 's/miSubtractO\b/RegionSubtractO/g' \
-"$@"
diff --git a/fix-patch-whitespace b/fix-patch-whitespace
deleted file mode 100755
index 2d06d8ea8..000000000
--- a/fix-patch-whitespace
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-git diff --check |
-sed -n 's!^\([^:]*\):\([^:]*\):.*!sed -i "\2 s/[ \t]*$//; \2 s/ *\t/\t/g" \1!p' |
-sh
diff --git a/fix-region b/fix-region
deleted file mode 100755
index ef8eb4218..000000000
--- a/fix-region
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-sed -i \
-    -e 's/REGION_NIL\b/RegionNil/g' \
-    -e 's/REGION_NAR\b/RegionNar/g' \
-    -e 's/REGION_NUM_RECTS\b/RegionNumRects/g' \
-    -e 's/REGION_SIZE\b/RegionSize/g' \
-    -e 's/REGION_RECTS\b/RegionRects/g' \
-    -e 's/REGION_BOXPTR\b/RegionBoxptr/g' \
-    -e 's/REGION_BOX\b/RegionBox/g' \
-    -e 's/REGION_TOP\b/RegionTop/g' \
-    -e 's/REGION_END\b/RegionEnd/g' \
-    -e 's/REGION_SZOF\b/RegionSizeof/g' \
-    -e 's/REGION_CREATE *([^,]*, */RegionCreate(/g' \
-    -e 's/REGION_COPY *([^,]*, */RegionCopy(/g' \
-    -e 's/REGION_DESTROY *([^,]*, */RegionDestroy(/g' \
-    -e 's/REGION_INTERSECT *([^,]*, */RegionIntersect(/g' \
-    -e 's/REGION_UNION *([^,]*, */RegionUnion(/g' \
-    -e 's/REGION_SUBTRACT *([^,]*, */RegionSubtract(/g' \
-    -e 's/REGION_INVERSE *([^,]*, */RegionInverse(/g' \
-    -e 's/REGION_TRANSLATE *([^,]*, */RegionTranslate(/g' \
-    -e 's/RECT_IN_REGION *([^,]*, */RegionContainsRect(/g' \
-    -e 's/POINT_IN_REGION *([^,]*, */RegionContainsPoint(/g' \
-    -e 's/REGION_EQUAL *([^,]*, */RegionEqual(/g' \
-    -e 's/REGION_APPEND *([^,]*, */RegionAppend(/g' \
-    -e 's/REGION_VALIDATE *([^,]*, */RegionValidate(/g' \
-    -e 's/BITMAP_TO_REGION\b/BitmapToRegion/g' \
-    -e 's/RECTS_TO_REGION *([^,]*, */RegionFromRects(/g' \
-    -e 's/REGION_BREAK *([^,]*, */RegionBreak(/g' \
-    -e 's/REGION_INIT *([^,]*, */RegionInit(/g' \
-    -e 's/REGION_UNINIT *([^,]*, */RegionUninit(/g' \
-    -e 's/REGION_RESET *([^,]*, */RegionReset(/g' \
-    -e 's/REGION_NOTEMPTY *([^,]*, */RegionNotEmpty(/g' \
-    -e 's/REGION_BROKEN *([^,]*, */RegionBroken(/g' \
-    -e 's/REGION_EMPTY *([^,]*, */RegionEmpty(/g' \
-    -e 's/REGION_EXTENTS *([^,]*, */RegionExtents(/g' \
-    -e 's/REGION_NULL *([^,]*, */RegionNull(/g' \
-    -e 's/REGION_NULL$/RegionNull/g' \
-    "$@"