Sun Mar 17 20:40:15 UTC 201920190317204015

Saint Patrick was a gentleman
Who through strategy and stealth
Drove all the snakes from Ireland
Here's toasting to his health -
But not too many toastings
Lest you lose yourself, and then,
Forget the good Saint Patrick
And see all those snakes again.
a/eudev-3.2.7-x86_64-3.txz:  Rebuilt.
  Added tqmx86_wdt to watchdog.conf. Thanks to Robby Workman.
d/vala-0.44.1-x86_64-1.txz:  Upgraded.
kde/ktorrent-4.3.1-x86_64-4.txz:  Rebuilt.
  Embed a copy of the GeoIP database since the download link no longer works.
l/glibmm-2.58.1-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.43-x86_64-1.txz:  Upgraded.
x/imake-1.0.8-x86_64-1.txz:  Upgraded.
x/libXdmcp-1.1.3-x86_64-1.txz:  Upgraded.
x/libXext-1.3.4-x86_64-1.txz:  Upgraded.
x/libXft-2.3.3-x86_64-1.txz:  Upgraded.
x/libXmu-1.1.3-x86_64-1.txz:  Upgraded.
x/libXrandr-1.5.2-x86_64-1.txz:  Upgraded.
x/libXvMC-1.0.11-x86_64-1.txz:  Upgraded.
x/libXxf86dga-1.1.5-x86_64-1.txz:  Upgraded.
x/libxkbfile-1.1.0-x86_64-1.txz:  Upgraded.
x/makedepend-1.0.6-x86_64-1.txz:  Upgraded.
x/x11perf-1.6.1-x86_64-1.txz:  Upgraded.
x/xf86-video-intel-20190301_6afed33b-x86_64-1.txz:  Upgraded.
x/xf86-video-savage-20190128_8579718-x86_64-1.txz:  Upgraded.
x/xf86-video-sis-20181217_22d3c79-x86_64-1.txz:  Upgraded.
x/xtrans-1.4.0-noarch-1.txz:  Upgraded.

17 files changed, 12 insertions, 222 deletions

diff --git a/source/x/x11/build/imake b/source/x/x11/build/imake
index 00750edc..d00491fd 100644
--- a/source/x/x11/build/imake
+++ b/source/x/x11/build/imake
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXdmcp b/source/x/x11/build/libXdmcp
index 00750edc..d00491fd 100644
--- a/source/x/x11/build/libXdmcp
+++ b/source/x/x11/build/libXdmcp
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXext b/source/x/x11/build/libXext
index 00750edc..d00491fd 100644
--- a/source/x/x11/build/libXext
+++ b/source/x/x11/build/libXext
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXft b/source/x/x11/build/libXft
index b8626c4c..d00491fd 100644
--- a/source/x/x11/build/libXft
+++ b/source/x/x11/build/libXft
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/libXmu b/source/x/x11/build/libXmu
index 00750edc..d00491fd 100644
--- a/source/x/x11/build/libXmu
+++ b/source/x/x11/build/libXmu
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libXrandr b/source/x/x11/build/libXrandr
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/libXrandr
+++ b/source/x/x11/build/libXrandr
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/libXvMC b/source/x/x11/build/libXvMC
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/libXvMC
+++ b/source/x/x11/build/libXvMC
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/libXxf86dga b/source/x/x11/build/libXxf86dga
index 00750edc..d00491fd 100644
--- a/source/x/x11/build/libXxf86dga
+++ b/source/x/x11/build/libXxf86dga
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/libxkbfile b/source/x/x11/build/libxkbfile
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/libxkbfile
+++ b/source/x/x11/build/libxkbfile
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/makedepend b/source/x/x11/build/makedepend
index 00750edc..d00491fd 100644
--- a/source/x/x11/build/makedepend
+++ b/source/x/x11/build/makedepend
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/x11perf b/source/x/x11/build/x11perf
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/x11perf
+++ b/source/x/x11/build/x11perf
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/xtrans b/source/x/x11/build/xtrans
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/xtrans
+++ b/source/x/x11/build/xtrans
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/patch/xf86-video-intel.patch b/source/x/x11/patch/xf86-video-intel.patch
index 30c63796..27dc7f4b 100644
--- a/source/x/x11/patch/xf86-video-intel.patch
+++ b/source/x/x11/patch/xf86-video-intel.patch
@@ -1,9 +1,2 @@
-# Disable this patch.  Latest git should support gen9 properly.
-#zcat $CWD/patch/xf86-video-intel/0001-sna-Let-modestting-glamor-handle-gen9.patch.gz \
-#  | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
 # Some patches from Fedora's SRPM:
-zcat $CWD/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xf86-video-intel/0001-Fix-build-on-i686.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 zcat $CWD/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xf86-video-intel/intel-gcc-pr65873.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch
deleted file mode 100644
index ca525ecc..00000000
--- a/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 9c1151b4d65c356f0d25d952fe1a10c89fdb834a Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 5 Mar 2018 11:03:18 -0500
-Subject: [PATCH] Fix build on F28 and later
-
-Newer gcc complains that it doesn't know how to always-inline memcpy():
-
-  /usr/include/bits/string_fortified.h:31:1: error: inlining failed in
-  call to always_inline 'memcpy': target specific option mismatch
-
-This is because we need to wrap our declaration of memcpy() in the
-options we're trying to push at the top of blt.c. So: include compiler.h
-to define sse2, then push options, then include everything else.
-
-However if you do that, the word 'nonnull' collides with the usage in
-<X11/Xfuncproto.h>. I'm too lazy to fix that properly, just expand it to
-the __attribute__ form in the few places we say it.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/sna/blt.c         | 6 ++++--
- src/sna/compiler.h    | 2 --
- src/sna/gen6_common.h | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/sna/blt.c b/src/sna/blt.c
-index cb90437a..fb357d35 100644
---- a/src/sna/blt.c
-+++ b/src/sna/blt.c
-@@ -29,13 +29,15 @@
- #include "config.h"
- #endif
- 
--#include "sna.h"
--#include <pixman.h>
-+#include "compiler.h"
- 
- #if defined(sse2)
- #pragma GCC push_options
- #pragma GCC target("sse2,inline-all-stringops,fpmath=sse")
- #pragma GCC optimize("Ofast")
-+
-+#include <pixman.h>
-+#include "sna.h"
- #include <xmmintrin.h>
- 
- #if __x86_64__
-diff --git a/src/sna/compiler.h b/src/sna/compiler.h
-index 0f3775ec..3c176a16 100644
---- a/src/sna/compiler.h
-+++ b/src/sna/compiler.h
-@@ -39,7 +39,6 @@
- #define pure __attribute__((pure))
- #define tightly_packed __attribute__((__packed__))
- #define flatten __attribute__((flatten))
--#define nonnull __attribute__((nonnull))
- #define page_aligned __attribute__((aligned(4096)))
- #else
- #define likely(expr) (expr)
-@@ -52,7 +51,6 @@
- #define pure
- #define tighly_packed
- #define flatten
--#define nonnull
- #define page_aligned
- #endif
- 
-diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
-index b53ec0c9..119a2d5d 100644
---- a/src/sna/gen6_common.h
-+++ b/src/sna/gen6_common.h
-@@ -133,7 +133,7 @@ inline static bool force_blt_ring(struct sna *sna, struct kgem_bo *bo)
- 	return false;
- }
- 
--nonnull inline static bool
-+__attribute__((nonnull)) inline static bool
- prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags)
- {
- 	if (PREFER_RENDER)
-@@ -148,7 +148,7 @@ prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags)
- 	return can_switch_to_blt(sna, bo, flags);
- }
- 
--nonnull inline static bool
-+__attribute__((nonnull)) inline static bool
- prefer_render_ring(struct sna *sna, struct kgem_bo *bo)
- {
- 	if (sna->kgem.ring == KGEM_RENDER)
-@@ -191,7 +191,7 @@ prefer_blt_composite(struct sna *sna, struct sna_composite_op *tmp)
- 	return prefer_blt_bo(sna, tmp->src.bo, tmp->dst.bo);
- }
- 
--nonnull static inline bool
-+__attribute__((nonnull)) static inline bool
- prefer_blt_fill(struct sna *sna, struct kgem_bo *bo, unsigned flags)
- {
- 	if (PREFER_RENDER)
--- 
-2.16.2
-
diff --git a/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch
deleted file mode 100644
index 0851fbe4..00000000
--- a/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 6 Mar 2018 12:07:46 -0500
-Subject: [PATCH] Fix build on i686
-
-Presumably this only matters for i686 because amd64 implies sse2, but:
-
-BUILDSTDERR: In file included from gen4_vertex.c:34:
-BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex':
-BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch
-BUILDSTDERR:  static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y)
-BUILDSTDERR:                           ^~~~~~~~~~~~~~
-BUILDSTDERR: gen4_vertex.c:308:25: note: called from here
-BUILDSTDERR:  #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */
-BUILDSTDERR:                          ^~~~~~~~~~~~~~~~~~~~~~~~
-BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX'
-BUILDSTDERR:   OUT_VERTEX(dstX, dstY);
-BUILDSTDERR:   ^~~~~~~~~~
-
-The bug here appears to be that emit_vertex() is declared 'sse2' but
-vertex_emit_2s is merely always_inline. gcc8 decides that since you said
-always_inline you need to have explicitly cloned it for every
-permutation of targets. Merely saying inline seems to do the job of
-cloning vertex_emit_2s as much as necessary.
-
-So to reiterate: if you say always-inline, it won't, but if you just say
-maybe inline, it will. Thanks gcc, that's helpful.
-
-- ajax
----
- src/sna/compiler.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sna/compiler.h b/src/sna/compiler.h
-index 3c176a16..bc447c7a 100644
---- a/src/sna/compiler.h
-+++ b/src/sna/compiler.h
-@@ -32,7 +32,7 @@
- #define likely(expr) (__builtin_expect (!!(expr), 1))
- #define unlikely(expr) (__builtin_expect (!!(expr), 0))
- #define noinline __attribute__((noinline))
--#define force_inline inline __attribute__((always_inline))
-+#define force_inline inline
- #define fastcall __attribute__((regparm(3)))
- #define must_check __attribute__((warn_unused_result))
- #define constant __attribute__((const))
--- 
-2.16.2
-
diff --git a/source/x/x11/patch/xf86-video-intel/0001-sna-Let-modestting-glamor-handle-gen9.patch b/source/x/x11/patch/xf86-video-intel/0001-sna-Let-modestting-glamor-handle-gen9.patch
deleted file mode 100644
index 75d71952..00000000
--- a/source/x/x11/patch/xf86-video-intel/0001-sna-Let-modestting-glamor-handle-gen9.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 442ac0a20132f49fbfb37f05db9d90f04b13698d Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Mon, 29 Feb 2016 14:43:35 +0100
-Subject: [RFC/PATCH xf86-video-intel] sna: Let modestting + glamor handle
- gen9+
-
-sna has no meaningfull accel for gen9+, this causes problems with i.e.
-apps using XVideo since the sprite XVideo support does not work well
-for many apps.
-
-Therefor it is better to just let the xserver fall back to modesetting +
-glamor. This is implemented by returning FALSE from the probe methods,
-just like how nouveau handles falling back to modesetting for newer cards.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1305369
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- src/intel_module.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/intel_module.c b/src/intel_module.c
-index 60835b9..5979cb9 100644
---- a/src/intel_module.c
-+++ b/src/intel_module.c
-@@ -571,6 +571,13 @@ intel_scrn_create(DriverPtr		driver,
- 			return FALSE;
- 	}
- 
-+	/*
-+	 * We've no accel support for these, so let modesetting + glamor
-+	 * handle them.
-+	 */
-+	if ((unsigned)((struct intel_device_info *)match_data)->gen >= 0110)
-+		return FALSE;
-+
- 	scrn = xf86AllocateScreen(driver, flags);
- 	if (scrn == NULL)
- 		return FALSE;
--- 
-2.7.2
-
diff --git a/source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch b/source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch
deleted file mode 100644
index ed05bce9..00000000
--- a/source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xf86-video-intel-20150520/src/sna/compiler.h.jx xf86-video-intel-20150520/src/sna/compiler.h
---- xf86-video-intel-20150520/src/sna/compiler.h.jx	2015-05-19 07:44:26.000000000 -0400
-+++ xf86-video-intel-20150520/src/sna/compiler.h	2015-05-20 12:53:54.797918726 -0400
-@@ -64,7 +64,7 @@
- #endif
- 
- #if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
--#define fast __attribute__((optimize("Ofast")))
-+#define fast __attribute__((optimize("O3")))
- #else
- #define fast
- #endif