Accepting request 544431 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/544431
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libXt?expand=0&rev=10

U_libXt_code-cleanup.patch

@@ -0,0 +1,53 @@
+From e8e2560e3391fa9c240235207a909855bfa7c73f Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun, 27 Sep 2015 18:54:57 -0700
+Subject: Get rid of some extraneous ; at the end of C source lines
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+diff --git a/src/Geometry.c b/src/Geometry.c
+index d64c8e2..66571be 100644
+--- a/src/Geometry.c
++++ b/src/Geometry.c
+@@ -456,7 +456,7 @@ _XtMakeGeometryRequest (
+ 
+ 	ClearRectObjAreas((RectObj)widget, &req.changes);
+     }
+-    hookobj = XtHooksOfDisplay(XtDisplayOfObject(widget));;
++    hookobj = XtHooksOfDisplay(XtDisplayOfObject(widget));
+     if (XtHasCallbacks(hookobj, XtNconfigureHook) == XtCallbackHasSome) {
+ 	req.type = XtHconfigure;
+ 	req.widget = widget;
+@@ -573,7 +573,7 @@ void XtResizeWindow(
+ 	req.changeMask = CWWidth | CWHeight | CWBorderWidth;
+ 	XConfigureWindow(XtDisplay(w), XtWindow(w),
+ 	    (unsigned) req.changeMask, &req.changes);
+-	hookobj = XtHooksOfDisplay(XtDisplayOfObject(w));;
++	hookobj = XtHooksOfDisplay(XtDisplayOfObject(w));
+ 	if (XtHasCallbacks(hookobj, XtNconfigureHook) == XtCallbackHasSome) {
+ 	    req.type = XtHconfigure;
+ 	    req.widget = w;
+@@ -661,7 +661,7 @@ void XtConfigureWidget(
+ 		ClearRectObjAreas((RectObj)w, &old);
+ 	    }
+ 	}
+-	hookobj = XtHooksOfDisplay(XtDisplayOfObject(w));;
++	hookobj = XtHooksOfDisplay(XtDisplayOfObject(w));
+ 	if (XtHasCallbacks(hookobj, XtNconfigureHook) == XtCallbackHasSome) {
+ 	    req.type = XtHconfigure;
+ 	    req.widget = w;
+diff --git a/src/TMstate.c b/src/TMstate.c
+index 4a634b4..3d51a1a 100644
+--- a/src/TMstate.c
++++ b/src/TMstate.c
+@@ -382,7 +382,7 @@ TMShortCard _XtGetModifierIndex(
+ 	j = 0;
+     }
+     modMatch = &segment[j];
+-    modMatch->modifiers = event->modifiers;;
++    modMatch->modifiers = event->modifiers;
+     modMatch->modifierMask = event->modifierMask;
+     modMatch->standard = event->standard;
+     /*
+-- 
+cgit v0.10.2

libXt.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 22 09:56:21 UTC 2017 - zaitor@opensuse.org
+
+- Add U_libXt_code-cleanup.patch: Get rid of some extraneous ; at
+  the end of C source lines.
+- Drop unneeded autoconf, automake and libtool BuildRequires.
+
 -------------------------------------------------------------------
 Mon May  4 14:27:10 UTC 2015 - sndirsch@suse.com
 

libXt.spec

@@ -29,12 +29,11 @@ Url:            http://xorg.freedesktop.org/
 #Git-Web:	http://cgit.freedesktop.org/xorg/lib/libXt/
 Source:         http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
+Patch:          U_libXt_code-cleanup.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  autoconf >= 2.60
+#git#BuildRequires:	autoconf >= 2.60, automake, libtool
-BuildRequires:  automake
 BuildRequires:  fdupes
-BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(kbproto)
@@ -87,6 +86,7 @@ in %lname.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure --docdir=%_docdir/%name --disable-static