From e554eb4d12034696971958d79f20c7e5764137b1de75fda17c30d74f2ffb5df9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 22 Nov 2017 15:26:18 +0000 Subject: [PATCH] Accepting request 544363 from home:Zaitor:branches:X11:XOrg - 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. OBS-URL: https://build.opensuse.org/request/show/544363 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXt?expand=0&rev=14 --- U_libXt_code-cleanup.patch | 53 ++++++++++++++++++++++++++++++++++++++ libXt.changes | 7 +++++ libXt.spec | 6 ++--- 3 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 U_libXt_code-cleanup.patch diff --git a/U_libXt_code-cleanup.patch b/U_libXt_code-cleanup.patch new file mode 100644 index 0000000..c4aeabc --- /dev/null +++ b/U_libXt_code-cleanup.patch @@ -0,0 +1,53 @@ +From e8e2560e3391fa9c240235207a909855bfa7c73f Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +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 + +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 diff --git a/libXt.changes b/libXt.changes index 1f11418..2bfc164 100644 --- a/libXt.changes +++ b/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 diff --git a/libXt.spec b/libXt.spec index 5492b53..c9e9769 100644 --- a/libXt.spec +++ b/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 -BuildRequires: automake +#git#BuildRequires: autoconf >= 2.60, automake, libtool 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