Accepting request 687690 from X11:XOrg

- n_unifdef-LBXPROXY_t-and-TEST_t.patch
  * reverse apply in order to fix build of lbxproxy again ...

- Update to version 1.4.0
  * This release drops a bunch of dead code, including support
    only used by lbxproxy and pre-1.4.0 versions of libX11, as
    well as support for obsolete SysV x86 platforms. It also
    provides some bug fixes & other maintenance work.

OBS-URL: https://build.opensuse.org/request/show/687690
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xtrans?expand=0&rev=14

n_unifdef-LBXPROXY_t-and-TEST_t.patch

@@ -0,0 +1,62 @@
+From 0794b1b712a90b40e2b019c9edc6f96874493c52 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 18 May 2016 12:41:41 -0400
+Subject: [PATCH] unifdef LBXPROXY_t and TEST_t
+
+LBX is dead, and TEST_t is unused.
+
+Reviewed-by: Keith Packard <keithp@keithp.com>
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ Xtrans.h     | 15 ---------------
+ Xtranssock.c |  8 --------
+ 2 files changed, 23 deletions(-)
+
+diff --git a/Xtrans.h b/Xtrans.h
+index 3fd73b8..7ed033b 100644
+--- a/Xtrans.h
++++ b/Xtrans.h
+@@ -111,21 +111,6 @@ static const char *__xtransname = "_IceTrans";
+ #endif
+ #endif /* ICE_t */
+ 
+-#ifdef TEST_t
+-#define TRANS(func) _TESTTrans##func
+-#ifdef XTRANSDEBUG
+-static const char *__xtransname = "_TESTTrans";
+-#endif
+-#endif /* TEST_t */
+-
+-#ifdef LBXPROXY_t
+-#define TRANS(func) _LBXPROXYTrans##func
+-#define X11_t		/* The server defines this - so should the LBX proxy */
+-#ifdef XTRANSDEBUG
+-static const char *__xtransname = "_LBXPROXYTrans";
+-#endif
+-#endif /* LBXPROXY_t */
+-
+ #if !defined(TRANS)
+ #define TRANS(func) _XTrans##func
+ #ifdef XTRANSDEBUG
+diff --git a/Xtranssock.c b/Xtranssock.c
+index 2cda9bb..866f4ab 100644
+--- a/Xtranssock.c
++++ b/Xtranssock.c
+@@ -215,14 +215,6 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
+ #define UNIX_PATH "/tmp/.ICE-unix/"
+ #define UNIX_DIR "/tmp/.ICE-unix"
+ #endif /* ICE_t */
+-#if defined(TEST_t)
+-#define UNIX_PATH "/tmp/.Test-unix/test"
+-#define UNIX_DIR "/tmp/.Test-unix"
+-#endif
+-#if defined(LBXPROXY_t)
+-#define UNIX_PATH "/tmp/.X11-unix/X"
+-#define UNIX_DIR  "/tmp/.X11-unix"
+-#endif
+ 
+ 
+ #endif /* UNIXCONN */
+-- 
+2.16.4
+

xtrans-1.3.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301
-size 186833

xtrans.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Mar 22 13:38:03 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
+
+- n_unifdef-LBXPROXY_t-and-TEST_t.patch
+  * reverse apply in order to fix build of lbxproxy again ...
+
+-------------------------------------------------------------------
+Fri Mar 22 11:11:11 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to version 1.4.0
+  * This release drops a bunch of dead code, including support
+    only used by lbxproxy and pre-1.4.0 versions of libX11, as
+    well as support for obsolete SysV x86 platforms. It also
+    provides some bug fixes & other maintenance work.
+
 -------------------------------------------------------------------
 Tue May 30 09:43:50 UTC 2017 - sndirsch@suse.com
 

xtrans.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xtrans
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           xtrans
-Version:        1.3.5
+Version:        1.4.0
 Release:        0
 Summary:        Library to handle network protocol transport in X
 License:        MIT
@@ -25,6 +25,7 @@ Group:          Development/Libraries/X11
 Url:            http://xorg.freedesktop.org/
 Source:         http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Patch0:         p_xauth.diff
+Patch1:         n_unifdef-LBXPROXY_t-and-TEST_t.patch
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(xorg-macros) >= 1.12
 BuildRequires:  pkgconfig(xshmfence)
@@ -45,6 +46,7 @@ libX11, libICE, the X font server, and related components.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1 -R
 
 %build
 %configure --docdir=%{_docdir}/xtrans
@@ -59,7 +61,7 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING README
+%doc AUTHORS ChangeLog COPYING README.md
 %doc doc/xtrans.xml
 %{_includedir}/X11/Xtrans/
 %{_datadir}/aclocal/xtrans.m4