From 7e3d22bcb2dd1a75f982ce23333f5762ad68d52a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:17:32 +0000 Subject: [PATCH 01/61] Initialize branch F-12 for libXt --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From ae06105d479f8eb1d6123a655f235929bbcea3ca Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 13 Oct 2009 15:51:13 +0000 Subject: [PATCH 02/61] - libXt 1.0.7 --- .cvsignore | 2 +- libXt.spec | 16 ++++++---------- sources | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8b6012a..17c6138 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libXt-1.0.6.tar.bz2 +libXt-1.0.7.tar.bz2 diff --git a/libXt.spec b/libXt.spec index 913749b..f340366 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.0.6 -Release: 3%{?dist} +Version: 1.0.7 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -11,9 +11,7 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 Patch0: libXt-1.0.2-libsm-fix.patch -BuildRequires: xorg-x11-proto-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel +BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) %description X.Org X11 libXt runtime library @@ -23,11 +21,6 @@ Summary: X.Org X11 libXt development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} -# needed by xt.pc -Requires: xorg-x11-proto-devel -Requires: libX11-devel -Requires: libSM-devel - %description devel X.Org X11 libXt development package @@ -106,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Oct 13 2009 Adam Jackson 1.0.7-1 +- libXt 1.0.7 + * Fri Jul 24 2009 Fedora Release Engineering - 1.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 105be0f..5337837 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -953930ddf9fdaa1405732c7f01e9e599 libXt-1.0.6.tar.bz2 +96f3c93434a93186d178b60d4a262496 libXt-1.0.7.tar.bz2 From d55bf93c1f6da93e8f7ba4b19cf5d1f0e7de6d16 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 13 Oct 2009 15:53:22 +0000 Subject: [PATCH 03/61] - libXt 1.0.7 --- libXt.spec | 16 ++++++---------- sources | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/libXt.spec b/libXt.spec index 913749b..f340366 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.0.6 -Release: 3%{?dist} +Version: 1.0.7 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -11,9 +11,7 @@ Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 Patch0: libXt-1.0.2-libsm-fix.patch -BuildRequires: xorg-x11-proto-devel -BuildRequires: libX11-devel -BuildRequires: libSM-devel +BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) %description X.Org X11 libXt runtime library @@ -23,11 +21,6 @@ Summary: X.Org X11 libXt development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} -# needed by xt.pc -Requires: xorg-x11-proto-devel -Requires: libX11-devel -Requires: libSM-devel - %description devel X.Org X11 libXt development package @@ -106,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Tue Oct 13 2009 Adam Jackson 1.0.7-1 +- libXt 1.0.7 + * Fri Jul 24 2009 Fedora Release Engineering - 1.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 105be0f..5337837 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -953930ddf9fdaa1405732c7f01e9e599 libXt-1.0.6.tar.bz2 +96f3c93434a93186d178b60d4a262496 libXt-1.0.7.tar.bz2 From 2426c70597b8137a48594aad46b5e7cd0e330f5f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:51:28 +0000 Subject: [PATCH 04/61] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 92f69a5..6a82ba5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libXt -# $Id: Makefile,v 1.1 2005/08/26 21:37:48 mharris Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:58:48 notting Exp $ NAME := libXt SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2810cef14aa60e645898f08f88ee75053a1fd878 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:56:23 +0000 Subject: [PATCH 05/61] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 92f69a5..6a82ba5 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libXt -# $Id: Makefile,v 1.1 2005/08/26 21:37:48 mharris Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:58:48 notting Exp $ NAME := libXt SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 64f89a9061e2e258446d9243aadae6ed1f4d9a6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:41:03 +0000 Subject: [PATCH 06/61] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6a82ba5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXt -# $Id: Makefile,v 1.2 2007/10/15 18:58:48 notting Exp $ -NAME := libXt -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 7de2afa..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libXt-1_0_5-1_fc10:HEAD:libXt-1.0.5-1.fc10.src.rpm:1220557784 From 94899a25e8d56fa38d4768f87dcc2d315331c5c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:41:07 +0000 Subject: [PATCH 07/61] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6a82ba5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXt -# $Id: Makefile,v 1.2 2007/10/15 18:58:48 notting Exp $ -NAME := libXt -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 7de2afa..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libXt-1_0_5-1_fc10:HEAD:libXt-1.0.5-1.fc10.src.rpm:1220557784 From 21ec35927b34b68e5066bbc1cb9ab8de881d9755 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 8 Nov 2010 15:36:19 -0500 Subject: [PATCH 08/61] libXt 1.0.9 --- .gitignore | 1 + libXt-1.0.2-libsm-fix.patch | 11 ----------- libXt.spec | 9 ++++----- sources | 1 + 4 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 libXt-1.0.2-libsm-fix.patch diff --git a/.gitignore b/.gitignore index 17c6138..5bc1e44 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ libXt-1.0.7.tar.bz2 +/libXt-1.0.9.tar.bz2 diff --git a/libXt-1.0.2-libsm-fix.patch b/libXt-1.0.2-libsm-fix.patch deleted file mode 100644 index 309aea8..0000000 --- a/libXt-1.0.2-libsm-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libXt-1.0.2/xt.pc.in.libsm-fix 2006-06-28 14:56:37.000000000 -0400 -+++ libXt-1.0.2/xt.pc.in 2006-06-28 14:56:51.000000000 -0400 -@@ -7,7 +7,7 @@ - Name: Xt - Description: X Toolkit Library - Version: @VERSION@ --Requires: xproto x11 sm -+Requires: xproto x11 - Requires.private: x11 sm - Cflags: -I${includedir} - Libs: -L${libdir} -lXt diff --git a/libXt.spec b/libXt.spec index f340366..a34b056 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,6 +1,6 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.0.7 +Version: 1.0.9 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -9,8 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -Patch0: libXt-1.0.2-libsm-fix.patch - BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) %description @@ -27,8 +25,6 @@ X.Org X11 libXt development package %prep %setup -q -%patch0 -p1 -b .libsm-fix - %build # FIXME: Work around pointer aliasing warnings from compiler for now export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -99,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Nov 08 2010 Adam Jackson 1.0.9-1 +- libXt 1.0.9 + * Tue Oct 13 2009 Adam Jackson 1.0.7-1 - libXt 1.0.7 diff --git a/sources b/sources index 5337837..ff59569 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 96f3c93434a93186d178b60d4a262496 libXt-1.0.7.tar.bz2 +8a414f8f2327aaa616ca2dcac1f5d8c3 libXt-1.0.9.tar.bz2 From 2c0a62c8eea48752c488241895d1b69ee2ef4f6f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 9 Nov 2010 11:28:24 -0500 Subject: [PATCH 09/61] death to makestrs --- libXt.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libXt.spec b/libXt.spec index a34b056..edd9071 100644 --- a/libXt.spec +++ b/libXt.spec @@ -55,7 +55,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%{_bindir}/makestrs %{_includedir}/X11/CallbackI.h %{_includedir}/X11/Composite.h %{_includedir}/X11/CompositeP.h @@ -91,7 +90,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/Xtos.h %{_libdir}/libXt.so %{_libdir}/pkgconfig/xt.pc -%{_mandir}/man1/makestrs.1* %{_mandir}/man3/*.3* %changelog From 808daf964df0eab9d386611385ae390f04bff011 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 22:30:47 -0600 Subject: [PATCH 10/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index edd9071..9ae6c8b 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Nov 08 2010 Adam Jackson 1.0.9-1 - libXt 1.0.9 From f445b46f8c6d866e81d11aeadaf6aceec62028c3 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 7 Mar 2011 09:18:13 -0500 Subject: [PATCH 11/61] libXt 1.1.0 --- .gitignore | 1 + libXt.spec | 8 +++++--- sources | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5bc1e44..6a156f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ libXt-1.0.7.tar.bz2 /libXt-1.0.9.tar.bz2 +/libXt-1.1.0.tar.bz2 diff --git a/libXt.spec b/libXt.spec index 9ae6c8b..4a5e044 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,11 +1,10 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.0.9 -Release: 2%{?dist} +Version: 1.1.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 @@ -93,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon Mar 07 2011 Adam Jackson 1.1.0-1 +- libXt 1.1.0 + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index ff59569..19e8753 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -96f3c93434a93186d178b60d4a262496 libXt-1.0.7.tar.bz2 -8a414f8f2327aaa616ca2dcac1f5d8c3 libXt-1.0.9.tar.bz2 +425423b2c6709c1b46465aada57f71e6 libXt-1.1.0.tar.bz2 From 0b8f0cbce72058949a665905e349b6f69dbf83c2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 10 Mar 2011 09:54:09 -0500 Subject: [PATCH 12/61] libXt 1.1.1 --- .gitignore | 1 + libXt.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a156f8..5729049 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.0.9.tar.bz2 /libXt-1.1.0.tar.bz2 +/libXt-1.1.1.tar.bz2 diff --git a/libXt.spec b/libXt.spec index 4a5e044..ab5bde8 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,6 +1,6 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.1.0 +Version: 1.1.1 Release: 1%{?dist} License: MIT Group: System Environment/Libraries @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Mar 10 2011 Adam Jackson 1.1.1-1 +- libXt 1.1.1 + * Mon Mar 07 2011 Adam Jackson 1.1.0-1 - libXt 1.1.0 diff --git a/sources b/sources index 19e8753..6dd36b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -425423b2c6709c1b46465aada57f71e6 libXt-1.1.0.tar.bz2 +eb22c0a1f172b06b97a3f5ae89768412 libXt-1.1.1.tar.bz2 From db0cc9674a6024ecbfcb3b15240f69592a6e7425 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 01:19:33 -0600 Subject: [PATCH 13/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index ab5bde8..5495ae2 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Mar 10 2011 Adam Jackson 1.1.1-1 - libXt 1.1.1 From f0a10a94a03d314d75b5a1dd824e4ece7b2c473f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 8 Mar 2012 09:25:02 -0500 Subject: [PATCH 14/61] libXt 1.1.2 --- .gitignore | 1 + libXt.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5729049..66b5e23 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.0.9.tar.bz2 /libXt-1.1.0.tar.bz2 /libXt-1.1.1.tar.bz2 +/libXt-1.1.2.tar.bz2 diff --git a/libXt.spec b/libXt.spec index 5495ae2..691a9f3 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.2 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -54,6 +54,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) +%{_datadir}/doc/%{name} %{_includedir}/X11/CallbackI.h %{_includedir}/X11/Composite.h %{_includedir}/X11/CompositeP.h @@ -92,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Mar 08 2012 Adam Jackson 1.1.2-1 +- libXt 1.1.2 + * Fri Jan 13 2012 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 6dd36b3..06f9d75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb22c0a1f172b06b97a3f5ae89768412 libXt-1.1.1.tar.bz2 +c4f7f149559320f378d93b835d38ad6f libXt-1.1.2.tar.bz2 From a8be3f05bdf67f9a62ba197cab6c2271c71493a0 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 15 Mar 2012 17:30:24 -0400 Subject: [PATCH 15/61] libXt-1.1.2-git.patch: Bugfix from git. --- libXt-1.1.2-git.patch | 40 ++++++++++++++++++++++++++++++++++++++++ libXt.spec | 7 ++++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 libXt-1.1.2-git.patch diff --git a/libXt-1.1.2-git.patch b/libXt-1.1.2-git.patch new file mode 100644 index 0000000..7ce4663 --- /dev/null +++ b/libXt-1.1.2-git.patch @@ -0,0 +1,40 @@ +From 75bef5b488245467b6638e25cd22006b306e8536 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston +Date: Tue, 13 Mar 2012 01:36:52 +0000 +Subject: Revert "Treat unexpected returned events from poll as errors" + +This commit caused regressions: +https://bugs.freedesktop.org/show_bug.cgi?id=47203 +https://bugs.freedesktop.org/show_bug.cgi?id=47216 + +This reverts commit 70bb9e28d37fff4ead4d0a2c672af77059765fa4. +--- +diff --git a/src/NextEvent.c b/src/NextEvent.c +index c8c9dd5..b1f7bc7 100644 +--- a/src/NextEvent.c ++++ b/src/NextEvent.c +@@ -356,21 +356,7 @@ static int IoWait ( + return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask, + wt->wait_time_ptr); + #else +- int ret = poll (wf->fdlist, wf->fdlistlen, wt->poll_wait); +- /* If poll() returns an event we didn't expect, such as POLLNVAL, treat +- * it as if it failed. */ +- if(ret >= 0) { +- nfds_t i; +- for (i=0; i < wf->fdlistlen; i++) { +- struct pollfd *fd = &wf->fdlist[i]; +- if (fd->revents & ~fd->events) { +- ret = -1; +- errno = EIO; +- break; +- } +- } +- } +- return ret; ++ return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait); + #endif + } + +-- +cgit v0.9.0.2-2-gbebe diff --git a/libXt.spec b/libXt.spec index 691a9f3..c917f80 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,12 +1,13 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Patch0: libXt-1.1.2-git.patch BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) @@ -23,6 +24,7 @@ X.Org X11 libXt development package %prep %setup -q +%patch0 -p1 -b .git %build # FIXME: Work around pointer aliasing warnings from compiler for now @@ -93,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Mar 15 2012 Adam Jackson 1.1.2-2 +- libXt-1.1.2-git.patch: Bugfix from git. + * Thu Mar 08 2012 Adam Jackson 1.1.2-1 - libXt 1.1.2 From 9ba2db4c0afa69649afe96a3c6715b91017c3a17 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 14:10:46 -0500 Subject: [PATCH 16/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index c917f80..f271ac8 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -95,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Mar 15 2012 Adam Jackson 1.1.2-2 - libXt-1.1.2-git.patch: Bugfix from git. From 81b59bf46fdc58f772abdb4163e10c3ca7d5b82d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 26 Jul 2012 15:58:22 -0400 Subject: [PATCH 17/61] libXt 1.1.3 --- .gitignore | 1 + libXt-1.1.2-git.patch | 40 ---------------------------------------- libXt.spec | 9 +++++---- sources | 2 +- 4 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 libXt-1.1.2-git.patch diff --git a/.gitignore b/.gitignore index 66b5e23..9572f00 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.1.0.tar.bz2 /libXt-1.1.1.tar.bz2 /libXt-1.1.2.tar.bz2 +/libXt-1.1.3.tar.bz2 diff --git a/libXt-1.1.2-git.patch b/libXt-1.1.2-git.patch deleted file mode 100644 index 7ce4663..0000000 --- a/libXt-1.1.2-git.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 75bef5b488245467b6638e25cd22006b306e8536 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston -Date: Tue, 13 Mar 2012 01:36:52 +0000 -Subject: Revert "Treat unexpected returned events from poll as errors" - -This commit caused regressions: -https://bugs.freedesktop.org/show_bug.cgi?id=47203 -https://bugs.freedesktop.org/show_bug.cgi?id=47216 - -This reverts commit 70bb9e28d37fff4ead4d0a2c672af77059765fa4. ---- -diff --git a/src/NextEvent.c b/src/NextEvent.c -index c8c9dd5..b1f7bc7 100644 ---- a/src/NextEvent.c -+++ b/src/NextEvent.c -@@ -356,21 +356,7 @@ static int IoWait ( - return Select (wf->nfds, &wf->rmask, &wf->wmask, &wf->emask, - wt->wait_time_ptr); - #else -- int ret = poll (wf->fdlist, wf->fdlistlen, wt->poll_wait); -- /* If poll() returns an event we didn't expect, such as POLLNVAL, treat -- * it as if it failed. */ -- if(ret >= 0) { -- nfds_t i; -- for (i=0; i < wf->fdlistlen; i++) { -- struct pollfd *fd = &wf->fdlist[i]; -- if (fd->revents & ~fd->events) { -- ret = -1; -- errno = EIO; -- break; -- } -- } -- } -- return ret; -+ return poll (wf->fdlist, wf->fdlistlen, wt->poll_wait); - #endif - } - --- -cgit v0.9.0.2-2-gbebe diff --git a/libXt.spec b/libXt.spec index f271ac8..e311bbb 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,13 +1,12 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.1.2 -Release: 3%{?dist} +Version: 1.1.3 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -Patch0: libXt-1.1.2-git.patch BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) @@ -24,7 +23,6 @@ X.Org X11 libXt development package %prep %setup -q -%patch0 -p1 -b .git %build # FIXME: Work around pointer aliasing warnings from compiler for now @@ -95,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jul 26 2012 Adam Jackson 1.1.3-1 +- libXt 1.1.3 + * Thu Jul 19 2012 Fedora Release Engineering - 1.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 06f9d75..aca00d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4f7f149559320f378d93b835d38ad6f libXt-1.1.2.tar.bz2 +a6f137ae100e74ebe3b71eb4a38c40b3 libXt-1.1.3.tar.bz2 From 7703e1b7c778272e60444cfc413cf5dc67c774b3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 21:58:53 -0600 Subject: [PATCH 18/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index e311bbb..3ade5ed 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 26 2012 Adam Jackson 1.1.3-1 - libXt 1.1.3 From ca282da45f1c6966e8f41b697b90286634541727 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 7 Mar 2013 15:03:13 +1000 Subject: [PATCH 19/61] autoreconf for aarch64 --- libXt.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 3ade5ed..3c6b4ba 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,13 +1,15 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +BuildRequires: xorg-x11-util-macros +BuildRequires: autoconf automake libtool BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) %description @@ -25,6 +27,7 @@ X.Org X11 libXt development package %setup -q %build +autoreconf -v --install --force # FIXME: Work around pointer aliasing warnings from compiler for now export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --disable-static \ @@ -93,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Mar 07 2013 Peter Hutterer - 1.1.3-3 +- autoreconf for aarch64 + * Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0f74982b966eda9474d45ff1a7e3b4ca7d6c1cce Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 24 May 2013 14:08:45 +1000 Subject: [PATCH 20/61] Update to git snapshot to fix CVEs listed below: - CVE-2013-2002 - CVE-2013-2005 --- .gitignore | 1 + commitid | 1 + libXt.spec | 23 +++++++++++++++++++---- make-git-snapshot.sh | 17 +++++++++++++++++ sources | 2 +- 5 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 commitid create mode 100755 make-git-snapshot.sh diff --git a/.gitignore b/.gitignore index 9572f00..7c4daf4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.1.1.tar.bz2 /libXt-1.1.2.tar.bz2 /libXt-1.1.3.tar.bz2 +/libXt-20130524.tar.bz2 diff --git a/commitid b/commitid new file mode 100644 index 0000000..ec43720 --- /dev/null +++ b/commitid @@ -0,0 +1 @@ +1f4802b745aa172d375cb79403cb1e013e6aa4c0 diff --git a/libXt.spec b/libXt.spec index 3c6b4ba..8ad91e8 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,12 +1,22 @@ +%global tarball libXt +%global gitdate 20130524 +%global gitversion 1f4802b74 + Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.3 -Release: 3%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org -Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +%if 0%{?gitdate} +Source0: %{tarball}-%{gitdate}.tar.bz2 +Source1: make-git-snapshot.sh +Source2: commitid +%else +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +%endif BuildRequires: xorg-x11-util-macros BuildRequires: autoconf automake libtool @@ -24,7 +34,7 @@ Requires: %{name} = %{version}-%{release} X.Org X11 libXt development package %prep -%setup -q +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build autoreconf -v --install --force @@ -50,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING ChangeLog +%doc COPYING %{_libdir}/libXt.so.6 %{_libdir}/libXt.so.6.0.0 %dir %{_datadir}/X11/app-defaults @@ -96,6 +106,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri May 24 2013 Peter Hutterer 1.1.3-4.20130524git1f4802b74 +- Update to git snapshot to fix CVEs listed below: +- CVE-2013-2002 +- CVE-2013-2005 + * Thu Mar 07 2013 Peter Hutterer - 1.1.3-3 - autoreconf for aarch64 diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..71d7f95 --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=libXt-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/xorg/lib/libXt $DIRNAME +cd $DIRNAME +if [ -z "$1" ]; then + git log | head -1 +else + git checkout $1 +fi +git log | head -1 | awk '{ print $2 }' > ../commitid +git repack -a -d +cd .. +tar jcf $DIRNAME.tar.bz2 $DIRNAME +rm -rf $DIRNAME diff --git a/sources b/sources index aca00d4..a0455aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6f137ae100e74ebe3b71eb4a38c40b3 libXt-1.1.3.tar.bz2 +ecb9fd78a4264e21b8433b2356ab5032 libXt-20130524.tar.bz2 From 1afd5abe66096b00225af357373a64426f041a7f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 27 May 2013 15:00:30 +1000 Subject: [PATCH 21/61] Require libX11 1.6RC2 for _XEatDataWords --- libXt.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 8ad91e8..674f785 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.3 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -18,9 +18,12 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 %endif +Requires: libX11 >= 1.5.99.902 + BuildRequires: xorg-x11-util-macros BuildRequires: autoconf automake libtool BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) +BUildRequires: libX11-devel >= 1.5.99.902 %description X.Org X11 libXt runtime library @@ -106,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Mon May 27 2013 Peter Hutterer - 1.1.3-5.20130524git1f4802b74 +- Require libX11 1.6RC2 for _XEatDataWords + * Fri May 24 2013 Peter Hutterer 1.1.3-4.20130524git1f4802b74 - Update to git snapshot to fix CVEs listed below: - CVE-2013-2002 From 325faec2fbf65efa0be1bf64a4c6db4b96d45b5b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 31 May 2013 16:40:54 +1000 Subject: [PATCH 22/61] libXt 1.1.4 --- .gitignore | 1 + libXt.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c4daf4..564a864 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.1.2.tar.bz2 /libXt-1.1.3.tar.bz2 /libXt-20130524.tar.bz2 +/libXt-1.1.4.tar.bz2 diff --git a/libXt.spec b/libXt.spec index 674f785..66c5844 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,10 +1,10 @@ %global tarball libXt -%global gitdate 20130524 +#global gitdate 20130524 %global gitversion 1f4802b74 Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.1.3 +Version: 1.1.4 Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri May 31 2013 Peter Hutterer 1.1.4-5 +- libXt 1.1.4 + * Mon May 27 2013 Peter Hutterer - 1.1.3-5.20130524git1f4802b74 - Require libX11 1.6RC2 for _XEatDataWords diff --git a/sources b/sources index a0455aa..9156f6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecb9fd78a4264e21b8433b2356ab5032 libXt-20130524.tar.bz2 +03149823ae57bb02d0cec90d5b97d56c libXt-1.1.4.tar.bz2 From f017c210df85c95d12c95eb4bbc625b8171d0d32 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 23:43:58 -0500 Subject: [PATCH 23/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 66c5844..918924e 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.4 -Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -109,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri May 31 2013 Peter Hutterer 1.1.4-5 - libXt 1.1.4 From 0d75adf7ab33af988dd072ba2733b4af75498a7c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 2 Oct 2013 16:45:09 -0400 Subject: [PATCH 24/61] Exclude docs from main package --- libXt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 918924e..4d354c6 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.4 -Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 7%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -64,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING +%exclude %{_datadir}/doc/%{name} %{_libdir}/libXt.so.6 %{_libdir}/libXt.so.6.0.0 %dir %{_datadir}/X11/app-defaults @@ -109,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Oct 02 2013 Adam Jackson 1.1.4-7 +- Exclude docs from main package + * Sat Aug 03 2013 Fedora Release Engineering - 1.1.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 9a624a253345aabeaaead0c8a7a54a03551cf101 Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 13 Dec 2013 21:29:58 +0100 Subject: [PATCH 25/61] Fix duplicate documentation (#1001246) by not using %doc - Turn on verbose build output via V=1 make - Remove %defattr - Use %?_isa in explicit package deps --- libXt.spec | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/libXt.spec b/libXt.spec index 4d354c6..1398f5a 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.4 -Release: 7%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -18,7 +18,7 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 %endif -Requires: libX11 >= 1.5.99.902 +Requires: libX11%{?_isa} >= 1.5.99.902 BuildRequires: xorg-x11-util-macros BuildRequires: autoconf automake libtool @@ -31,7 +31,7 @@ X.Org X11 libXt runtime library %package devel Summary: X.Org X11 libXt development package Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel X.Org X11 libXt development package @@ -46,7 +46,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --disable-static \ --with-xfile-search-path="%{_sysconfdir}/X11/%%L/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%l/%%T/\%%N%%C%%S:%{_sysconfdir}/X11/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%L/%%T/%%N%%S:%{_sysconfdir}/X\11/%%l/%%T/%%N%%S:%{_sysconfdir}/X11/%%T/%%N%%S:%{_datadir}/X11/%%L/%%T/%%N%%C%%S:%{_datadir}/X1\1/%%l/%%T/%%N%%C%%S:%{_datadir}/X11/%%T/%%N%%C%%S:%{_datadir}/X11/%%L/%%T/%%N%%S:%{_datadir}/X11/%%\l/%%T/%%N%%S:%{_datadir}/X11/%%T/%%N%%S" -make %{?_smp_mflags} +V=1 make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -55,6 +55,9 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# adding to installed docs in order to avoid using %%doc magic +cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING + %clean rm -rf $RPM_BUILD_ROOT @@ -62,16 +65,15 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc COPYING -%exclude %{_datadir}/doc/%{name} %{_libdir}/libXt.so.6 %{_libdir}/libXt.so.6.0.0 %dir %{_datadir}/X11/app-defaults +# not using %%doc because of side-effect (#1001246) +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/COPYING %files devel -%defattr(-,root,root,-) -%{_datadir}/doc/%{name} +%{_docdir}/%{name}/*.xml %{_includedir}/X11/CallbackI.h %{_includedir}/X11/Composite.h %{_includedir}/X11/CompositeP.h @@ -110,6 +112,12 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Dec 13 2013 Michael Schwendt - 1.1.4-8 +- Fix duplicate documentation (#1001246) by not using %%doc +- Turn on verbose build output via V=1 make +- Remove %%defattr +- Use %%?_isa in explicit package deps + * Wed Oct 02 2013 Adam Jackson 1.1.4-7 - Exclude docs from main package From 7a3eb14aed93d13a9df33bce40390b5b735a51ed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 21:31:34 -0500 Subject: [PATCH 26/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 1398f5a..e909cdf 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.4 -Release: 8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.1.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Dec 13 2013 Michael Schwendt - 1.1.4-8 - Fix duplicate documentation (#1001246) by not using %%doc - Turn on verbose build output via V=1 make From dfa335c5ce656e780408fdf95fb4ec5f40fee163 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 02:09:56 +0000 Subject: [PATCH 27/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index e909cdf..7fc8528 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.4 -Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 10%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.1.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.1.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 4b0401fa4e690a369d1ea8e1eadfeb06c84461d8 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 1 May 2015 10:13:04 -0400 Subject: [PATCH 28/61] libXt 1.1.5 --- .gitignore | 1 + libXt.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 564a864..e7b217b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.1.3.tar.bz2 /libXt-20130524.tar.bz2 /libXt-1.1.4.tar.bz2 +/libXt-1.1.5.tar.bz2 diff --git a/libXt.spec b/libXt.spec index 7fc8528..32cd931 100644 --- a/libXt.spec +++ b/libXt.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.1.4 -Release: 10%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.1.5 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri May 01 2015 Adam Jackson 1.1.5-1 +- libXt 1.1.5 + * Sun Aug 17 2014 Fedora Release Engineering - 1.1.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 9156f6b..faa635b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03149823ae57bb02d0cec90d5b97d56c libXt-1.1.4.tar.bz2 +8f5b5576fbabba29a05f3ca2226f74d3 libXt-1.1.5.tar.bz2 From 99ed20152f8cb7f4d5385cdc5764c22ee46862fa Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 14:11:39 +0000 Subject: [PATCH 29/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 32cd931..13d9a88 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri May 01 2015 Adam Jackson 1.1.5-1 - libXt 1.1.5 From 728f8d21d607efc58ea2151231ea95a0b142eba6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 02:51:53 +0000 Subject: [PATCH 30/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 13d9a88..fd3183a 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 08f8671f5925ecbd7c55d83e8368dd0be81ef8ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 18:20:24 +0000 Subject: [PATCH 31/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index fd3183a..1960410 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 1.1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From f3288a7d89bcef5a9650e3ea299cc68a0eba4fbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 18:29:19 +0000 Subject: [PATCH 32/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 1960410..bfc344b 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 47010fa9d287593f1cd2432026539cc0e35f772d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 01:08:53 +0000 Subject: [PATCH 33/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index bfc344b..8dea1a1 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.1.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 03666e438ff803fee3fc77bfbf39a428de7758b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 21:08:28 +0000 Subject: [PATCH 34/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 8dea1a1..bf88ef2 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 7%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.1.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 8dcbb35c572f5c717d9173fc8f672bd6238a4c91 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:19:00 +0100 Subject: [PATCH 35/61] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- libXt.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libXt.spec b/libXt.spec index bf88ef2..47066d4 100644 --- a/libXt.spec +++ b/libXt.spec @@ -58,9 +58,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # adding to installed docs in order to avoid using %%doc magic cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From e311c8c788148d4ede09def4b780a6a523c7d8cf Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 29 Jun 2018 17:29:45 -0400 Subject: [PATCH 36/61] Use ldconfig scriptlet macros --- libXt.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libXt.spec b/libXt.spec index 47066d4..99d2836 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 7%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -58,8 +58,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # adding to installed docs in order to avoid using %%doc magic cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_post +%ldconfig_postun %files %{_libdir}/libXt.so.6 @@ -109,6 +109,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Fri Jun 29 2018 Adam Jackson - 1.1.5-8 +- Use ldconfig scriptlet macros + * Wed Feb 07 2018 Fedora Release Engineering - 1.1.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9651b43147727418f9958b5f4d381b7400b8b2db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:46:43 +0000 Subject: [PATCH 37/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 99d2836..9de60b9 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -109,6 +109,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.1.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 29 2018 Adam Jackson - 1.1.5-8 - Use ldconfig scriptlet macros From 849a77086a9b7e00536bd6970a9d7104752bb4f5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:52 +0100 Subject: [PATCH 38/61] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- libXt.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/libXt.spec b/libXt.spec index 9de60b9..a9af1b2 100644 --- a/libXt.spec +++ b/libXt.spec @@ -7,7 +7,6 @@ Name: libXt Version: 1.1.5 Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT -Group: System Environment/Libraries URL: http://www.x.org %if 0%{?gitdate} @@ -30,7 +29,6 @@ X.Org X11 libXt runtime library %package devel Summary: X.Org X11 libXt development package -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel From db4cac2200f173dfd49e4a65c71c737376c12e80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 06:37:44 +0000 Subject: [PATCH 39/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index a9af1b2..5873d65 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 10%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -107,6 +107,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.1.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6a3e33fde837c78e8b32335a34c804761e03853b Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Wed, 24 Apr 2019 10:36:28 +0200 Subject: [PATCH 40/61] Update to git snapshot to fix some covscan issues --- .gitignore | 1 + commitid | 2 +- libXt.spec | 13 ++++++++----- sources | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e7b217b..7a05daa 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ libXt-1.0.7.tar.bz2 /libXt-20130524.tar.bz2 /libXt-1.1.4.tar.bz2 /libXt-1.1.5.tar.bz2 +/libXt-20190424.tar.bz2 diff --git a/commitid b/commitid index ec43720..6bff993 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -1f4802b745aa172d375cb79403cb1e013e6aa4c0 +ba4ec937680ee72f2fcd463752766340a4b3729d diff --git a/libXt.spec b/libXt.spec index 5873d65..a242331 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,11 +1,11 @@ %global tarball libXt -#global gitdate 20130524 -%global gitversion 1f4802b74 +%global gitdate 20190424 +%global gitversion ba4ec9376 Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 10%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 11%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -17,12 +17,12 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 %endif -Requires: libX11%{?_isa} >= 1.5.99.902 +Requires: libX11%{?_isa} >= 1.6 BuildRequires: xorg-x11-util-macros BuildRequires: autoconf automake libtool BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) -BUildRequires: libX11-devel >= 1.5.99.902 +BUildRequires: libX11-devel >= 1.6 %description X.Org X11 libXt runtime library @@ -107,6 +107,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Wed Apr 24 2019 Benjamin Tissoires 1.1.5-11.20190424gitba4ec9376 +- Update to git snapshot to fix some covscan issues + * Fri Feb 01 2019 Fedora Release Engineering - 1.1.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index faa635b..52c5894 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f5b5576fbabba29a05f3ca2226f74d3 libXt-1.1.5.tar.bz2 +SHA512 (libXt-20190424.tar.bz2) = 1a63d491b9bf0b2210a7b3207f731f70358321eceb6186bda44d61b3db0610c9bbc762d1d2a83b8813d32ef9decf0d96928af42b2b7869790d871cd2a2128691 From 1c62b1b349dbb36fbdb9f7491abd2d2317a039b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 12:44:36 +0000 Subject: [PATCH 41/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index a242331..231f55b 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 11%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 12%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -107,6 +107,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.1.5-12.20190424gitba4ec9376 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Apr 24 2019 Benjamin Tissoires 1.1.5-11.20190424gitba4ec9376 - Update to git snapshot to fix some covscan issues From 8d76d0c7a98e69b0a69cc5463ba3f57ecbebb191 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:30:29 +0000 Subject: [PATCH 42/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 231f55b..d717dd9 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.1.5 -Release: 12%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 13%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -107,6 +107,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.1.5-13.20190424gitba4ec9376 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1.1.5-12.20190424gitba4ec9376 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 142e3ac8b496b48906b572a9b3280e2cf8bf3804 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 6 Feb 2020 11:57:38 -0500 Subject: [PATCH 43/61] libXt 1.2.0 --- .gitignore | 1 + libXt.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7a05daa..f3d212c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.1.4.tar.bz2 /libXt-1.1.5.tar.bz2 /libXt-20190424.tar.bz2 +/libXt-1.2.0.tar.bz2 diff --git a/libXt.spec b/libXt.spec index d717dd9..65f6125 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,11 +1,11 @@ %global tarball libXt -%global gitdate 20190424 -%global gitversion ba4ec9376 +#global gitdate 20190424 +#global gitversion ba4ec9376 Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.1.5 -Release: 13%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.2.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -35,7 +35,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} X.Org X11 libXt development package %prep -%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%autosetup -p1 -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build autoreconf -v --install --force @@ -107,6 +107,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Feb 06 2020 Adam Jackson - 1.2.0-1 +- libXt 1.2.0 + * Wed Jan 29 2020 Fedora Release Engineering - 1.1.5-13.20190424gitba4ec9376 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 52c5894..bfd0e59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXt-20190424.tar.bz2) = 1a63d491b9bf0b2210a7b3207f731f70358321eceb6186bda44d61b3db0610c9bbc762d1d2a83b8813d32ef9decf0d96928af42b2b7869790d871cd2a2128691 +SHA512 (libXt-1.2.0.tar.bz2) = 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1 From 0fb0bec725f8bf17d15b35e5ea07f00b125a438e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 6 Feb 2020 16:00:32 -0500 Subject: [PATCH 44/61] Fix silly gcc10 thing --- ...-around-a-compiler-issue-with-gcc-10.patch | 100 ++++++++++++++++++ libXt.spec | 7 +- 2 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch diff --git a/0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch b/0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch new file mode 100644 index 0000000..ac9295d --- /dev/null +++ b/0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch @@ -0,0 +1,100 @@ +From f3079e509c5cf60042ae2261499ee13b6b02498a Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 6 Feb 2020 13:45:35 -0500 +Subject: [PATCH] xt: Work around a compiler issue with gcc 10 + +GRABEXT() is used to look up a pointer that sometimes lives just past +the end of an XtServerGrabRec. Whether it's really there or not depends +on XtServerGrabRec::hasExt. In a couple of places, we build those +structs on the stack and pass them to other functions; such structs +always have hasExt == 0, so GRABEXT would never get called in practice. +However, there exists a bug in gcc 10 - more or less difficult to hit, +depending on your compiler options and architecture - where it would not +notice that the dereference after GRABEXT is dead code, at which point +it looks like you're dereferencing one past the end of the array, which +is illegal, and you you get: + + PassivGrab.c:292:35: error: array subscript 0 is outside array bounds + of 'XtServerGrabRec[1]' {aka 'struct _XtServerGrabRec[1]'} + [-Werror=array-bounds] + +As a completely stupid workaround, build those on-stack structs as +arrays of two, so that the (dead) dereference looks like it's pointing +into the dummy member of the array. This is almost certainly a compiler +bug and I don't encourage merging this patch upstream, but if you need +to build libXt with gcc 10 absolutely right this second, here it is. + +For details on the gcc issue, see: + +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93582 +--- + src/PassivGrab.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/src/PassivGrab.c b/src/PassivGrab.c +index bece0d9..b174d40 100644 +--- a/src/PassivGrab.c ++++ b/src/PassivGrab.c +@@ -553,7 +553,7 @@ XtServerGrabPtr _XtCheckServerGrabsOnWidget ( + _XtBoolean isKeyboard) + { + register XtServerGrabPtr grab; +- XtServerGrabRec tempGrab; ++ XtServerGrabRec tempGrab[2]; + XtServerGrabPtr *passiveListPtr; + XtPerWidgetInput pwi; + +@@ -577,13 +577,13 @@ XtServerGrabPtr _XtCheckServerGrabsOnWidget ( + /* Take only the lower thirteen bits as modifier state. The X Keyboard + * Extension may be representing keyboard group state in two upper bits. + */ +- tempGrab.widget = widget; +- tempGrab.keybut = (KeyCode) event->xkey.keycode; /* also xbutton.button */ +- tempGrab.modifiers = event->xkey.state & 0x1FFF; /*also xbutton.state*/ +- tempGrab.hasExt = False; ++ tempGrab[0].widget = widget; ++ tempGrab[0].keybut = (KeyCode) event->xkey.keycode; /* also xbutton.button */ ++ tempGrab[0].modifiers = event->xkey.state & 0x1FFF; /*also xbutton.state*/ ++ tempGrab[0].hasExt = False; + + for (grab = *passiveListPtr; grab; grab = grab->next) { +- if (GrabMatchesSecond(&tempGrab, grab)) ++ if (GrabMatchesSecond(tempGrab, grab)) + return (grab); + } + return (XtServerGrabPtr)NULL; +@@ -775,17 +775,17 @@ void UngrabKeyOrButton ( + Modifiers modifiers, + Boolean isKeyboard) + { +- XtServerGrabRec tempGrab; ++ XtServerGrabRec tempGrab[2]; + XtPerWidgetInput pwi; + + XtCheckSubclass(widget, coreWidgetClass, + "in XtUngrabKey or XtUngrabButton"); + + /* Build a temporary grab list entry */ +- tempGrab.widget = widget; +- tempGrab.modifiers = (unsigned short) modifiers; +- tempGrab.keybut = (KeyCode) keyOrButton; +- tempGrab.hasExt = False; ++ tempGrab[0].widget = widget; ++ tempGrab[0].modifiers = (unsigned short) modifiers; ++ tempGrab[0].keybut = (KeyCode) keyOrButton; ++ tempGrab[0].hasExt = False; + + LOCK_PROCESS; + pwi = _XtGetPerWidgetInput(widget, FALSE); +@@ -817,7 +817,7 @@ void UngrabKeyOrButton ( + + /* Delete all entries which are encompassed by the specified grab. */ + DeleteServerGrabFromList(isKeyboard ? &pwi->keyList : &pwi->ptrList, +- &tempGrab); ++ tempGrab); + } + + void XtGrabKey ( +-- +2.23.0 + diff --git a/libXt.spec b/libXt.spec index 65f6125..0751e3b 100644 --- a/libXt.spec +++ b/libXt.spec @@ -7,16 +7,18 @@ Name: libXt Version: 1.2.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT -URL: http://www.x.org +URL: https://www.x.org %if 0%{?gitdate} Source0: %{tarball}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh Source2: commitid %else -Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 %endif +Patch0: 0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch + Requires: libX11%{?_isa} >= 1.6 BuildRequires: xorg-x11-util-macros @@ -109,6 +111,7 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %changelog * Thu Feb 06 2020 Adam Jackson - 1.2.0-1 - libXt 1.2.0 +- Work around a gcc10 issue * Wed Jan 29 2020 Fedora Release Engineering - 1.1.5-13.20190424gitba4ec9376 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 02339d9c5a8820b7370f87c56df1d512d847d475 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:11:20 +0000 Subject: [PATCH 45/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 0751e3b..765c994 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.2.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: https://www.x.org @@ -109,6 +109,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Feb 06 2020 Adam Jackson - 1.2.0-1 - libXt 1.2.0 - Work around a gcc10 issue From 35a9915dc33c0059b4bc0ecad0e4c956e861761d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 5 Nov 2020 12:26:41 +1000 Subject: [PATCH 46/61] Add BuildRequires for make --- libXt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 765c994..064b60d 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.2.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: https://www.x.org @@ -21,6 +21,7 @@ Patch0: 0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch Requires: libX11%{?_isa} >= 1.6 +BuildRequires: make BuildRequires: xorg-x11-util-macros BuildRequires: autoconf automake libtool BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) @@ -109,6 +110,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Nov 5 12:26:39 AEST 2020 Peter Hutterer - 1.2.0-3 +- Add BuildRequires for make + * Tue Jul 28 2020 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e100cda1d3130618221523e0753f3779bb5c686d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:36:38 +0000 Subject: [PATCH 47/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 064b60d..b373110 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.2.0 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: https://www.x.org @@ -110,6 +110,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Nov 5 12:26:39 AEST 2020 Peter Hutterer - 1.2.0-3 - Add BuildRequires for make From d02984fbedd68ac6feeb0dc62904c4626aa0d5fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 10:54:23 +0000 Subject: [PATCH 48/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index b373110..0ba3ff4 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.2.0 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: https://www.x.org @@ -110,6 +110,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From facc883af874c9c841432a4ea5f1eda884c20a38 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Tue, 21 Sep 2021 12:12:35 +0200 Subject: [PATCH 49/61] libXt 1.2.1 --- .gitignore | 1 + ...-around-a-compiler-issue-with-gcc-10.patch | 100 ------------------ libXt.spec | 9 +- sources | 2 +- 4 files changed, 7 insertions(+), 105 deletions(-) delete mode 100644 0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch diff --git a/.gitignore b/.gitignore index f3d212c..e0868f8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.1.5.tar.bz2 /libXt-20190424.tar.bz2 /libXt-1.2.0.tar.bz2 +/libXt-1.2.1.tar.bz2 diff --git a/0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch b/0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch deleted file mode 100644 index ac9295d..0000000 --- a/0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch +++ /dev/null @@ -1,100 +0,0 @@ -From f3079e509c5cf60042ae2261499ee13b6b02498a Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 6 Feb 2020 13:45:35 -0500 -Subject: [PATCH] xt: Work around a compiler issue with gcc 10 - -GRABEXT() is used to look up a pointer that sometimes lives just past -the end of an XtServerGrabRec. Whether it's really there or not depends -on XtServerGrabRec::hasExt. In a couple of places, we build those -structs on the stack and pass them to other functions; such structs -always have hasExt == 0, so GRABEXT would never get called in practice. -However, there exists a bug in gcc 10 - more or less difficult to hit, -depending on your compiler options and architecture - where it would not -notice that the dereference after GRABEXT is dead code, at which point -it looks like you're dereferencing one past the end of the array, which -is illegal, and you you get: - - PassivGrab.c:292:35: error: array subscript 0 is outside array bounds - of 'XtServerGrabRec[1]' {aka 'struct _XtServerGrabRec[1]'} - [-Werror=array-bounds] - -As a completely stupid workaround, build those on-stack structs as -arrays of two, so that the (dead) dereference looks like it's pointing -into the dummy member of the array. This is almost certainly a compiler -bug and I don't encourage merging this patch upstream, but if you need -to build libXt with gcc 10 absolutely right this second, here it is. - -For details on the gcc issue, see: - -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93582 ---- - src/PassivGrab.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/PassivGrab.c b/src/PassivGrab.c -index bece0d9..b174d40 100644 ---- a/src/PassivGrab.c -+++ b/src/PassivGrab.c -@@ -553,7 +553,7 @@ XtServerGrabPtr _XtCheckServerGrabsOnWidget ( - _XtBoolean isKeyboard) - { - register XtServerGrabPtr grab; -- XtServerGrabRec tempGrab; -+ XtServerGrabRec tempGrab[2]; - XtServerGrabPtr *passiveListPtr; - XtPerWidgetInput pwi; - -@@ -577,13 +577,13 @@ XtServerGrabPtr _XtCheckServerGrabsOnWidget ( - /* Take only the lower thirteen bits as modifier state. The X Keyboard - * Extension may be representing keyboard group state in two upper bits. - */ -- tempGrab.widget = widget; -- tempGrab.keybut = (KeyCode) event->xkey.keycode; /* also xbutton.button */ -- tempGrab.modifiers = event->xkey.state & 0x1FFF; /*also xbutton.state*/ -- tempGrab.hasExt = False; -+ tempGrab[0].widget = widget; -+ tempGrab[0].keybut = (KeyCode) event->xkey.keycode; /* also xbutton.button */ -+ tempGrab[0].modifiers = event->xkey.state & 0x1FFF; /*also xbutton.state*/ -+ tempGrab[0].hasExt = False; - - for (grab = *passiveListPtr; grab; grab = grab->next) { -- if (GrabMatchesSecond(&tempGrab, grab)) -+ if (GrabMatchesSecond(tempGrab, grab)) - return (grab); - } - return (XtServerGrabPtr)NULL; -@@ -775,17 +775,17 @@ void UngrabKeyOrButton ( - Modifiers modifiers, - Boolean isKeyboard) - { -- XtServerGrabRec tempGrab; -+ XtServerGrabRec tempGrab[2]; - XtPerWidgetInput pwi; - - XtCheckSubclass(widget, coreWidgetClass, - "in XtUngrabKey or XtUngrabButton"); - - /* Build a temporary grab list entry */ -- tempGrab.widget = widget; -- tempGrab.modifiers = (unsigned short) modifiers; -- tempGrab.keybut = (KeyCode) keyOrButton; -- tempGrab.hasExt = False; -+ tempGrab[0].widget = widget; -+ tempGrab[0].modifiers = (unsigned short) modifiers; -+ tempGrab[0].keybut = (KeyCode) keyOrButton; -+ tempGrab[0].hasExt = False; - - LOCK_PROCESS; - pwi = _XtGetPerWidgetInput(widget, FALSE); -@@ -817,7 +817,7 @@ void UngrabKeyOrButton ( - - /* Delete all entries which are encompassed by the specified grab. */ - DeleteServerGrabFromList(isKeyboard ? &pwi->keyList : &pwi->ptrList, -- &tempGrab); -+ tempGrab); - } - - void XtGrabKey ( --- -2.23.0 - diff --git a/libXt.spec b/libXt.spec index 0ba3ff4..e051fc2 100644 --- a/libXt.spec +++ b/libXt.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.2.0 -Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.2.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: https://www.x.org @@ -17,8 +17,6 @@ Source2: commitid Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 %endif -Patch0: 0001-xt-Work-around-a-compiler-issue-with-gcc-10.patch - Requires: libX11%{?_isa} >= 1.6 BuildRequires: make @@ -110,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Tue Sep 21 2021 Benjamin Tissoires 1.2.1-1 +- libXt 1.2.1 + * Thu Jul 22 2021 Fedora Release Engineering - 1.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index bfd0e59..14003d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXt-1.2.0.tar.bz2) = 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1 +SHA512 (libXt-1.2.1.tar.bz2) = 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c From f13acc0a0452bd763d31ed41a7b709d5d94b8141 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 15:42:22 +0000 Subject: [PATCH 50/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index e051fc2..994b36b 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.2.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 21 2021 Benjamin Tissoires 1.2.1-1 - libXt 1.2.1 From bdbad3fea369300ac3e98abe74dc4083a672e95b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:15:15 +0000 Subject: [PATCH 51/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 994b36b..df7e7e6 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.2.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From fa966a40bc1b4144ea976f2cb9b869e42f068193 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:46:32 +0000 Subject: [PATCH 52/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index df7e7e6..9e0c9d8 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.2.1 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c3e6028335c65a7c078d325e045666806f5912c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:13:08 +0000 Subject: [PATCH 53/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 9e0c9d8..0723d43 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.2.1 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 57ec0efc3dbd07fa0bffa88e9f5d327a6b2b43e7 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Wed, 6 Sep 2023 17:47:06 +0200 Subject: [PATCH 54/61] SPDX migration --- libXt.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libXt.spec b/libXt.spec index 0723d43..57f380e 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,8 +5,8 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.2.1 -Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: MIT +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: MIT AND HPND-sell-variant AND SMLNJ AND MIT-open-group AND X11 URL: https://www.x.org %if 0%{?gitdate} @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Wed Sep 06 2023 Benjamin Tissoires - 1.2.1-6 +- SPDX migration + * Thu Jul 20 2023 Fedora Release Engineering - 1.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 449f6d9f8ca7f4c3c2b47c0d073bf04ef7c79d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Thu, 5 Oct 2023 18:23:11 +0200 Subject: [PATCH 55/61] libXt 1.3.0 Update package to version 1.3.0. Since upstream commit ff361fe5ff0e ("Build xz tarballs instead of bzip2"), .tar.xz is used instead of .tar.bz2, update `Source0` accordingly. --- .gitignore | 1 + libXt.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e0868f8..17f2c11 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ libXt-1.0.7.tar.bz2 /libXt-20190424.tar.bz2 /libXt-1.2.0.tar.bz2 /libXt-1.2.1.tar.bz2 +/libXt-1.3.0.tar.xz diff --git a/libXt.spec b/libXt.spec index 57f380e..bd142c1 100644 --- a/libXt.spec +++ b/libXt.spec @@ -4,17 +4,17 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.2.1 -Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.3.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT AND HPND-sell-variant AND SMLNJ AND MIT-open-group AND X11 URL: https://www.x.org %if 0%{?gitdate} -Source0: %{tarball}-%{gitdate}.tar.bz2 +Source0: %{tarball}-%{gitdate}.tar.xz Source1: make-git-snapshot.sh Source2: commitid %else -Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz %endif Requires: libX11%{?_isa} >= 1.6 @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Oct 05 2023 José Expósito - 1.3.0-1 +- libXt 1.3.0 + * Wed Sep 06 2023 Benjamin Tissoires - 1.2.1-6 - SPDX migration diff --git a/sources b/sources index 14003d2..2ae0b29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXt-1.2.1.tar.bz2) = 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c +SHA512 (libXt-1.3.0.tar.xz) = 64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118 From 707cf397f1dc9e1fe9870703d9fae45ed224eec7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 03:31:51 +0000 Subject: [PATCH 56/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index bd142c1..392e861 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.3.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT AND HPND-sell-variant AND SMLNJ AND MIT-open-group AND X11 URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Oct 05 2023 José Expósito - 1.3.0-1 - libXt 1.3.0 From d8803a8fa5be95488a7b2c2fa4e1868a4b1332d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 01:29:17 +0000 Subject: [PATCH 57/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 392e861..ede3bd3 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.3.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT AND HPND-sell-variant AND SMLNJ AND MIT-open-group AND X11 URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ea1182a8db8334d065d903484cd34a87d12d5d23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:16:28 +0000 Subject: [PATCH 58/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index ede3bd3..56771b7 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.3.0 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT AND HPND-sell-variant AND SMLNJ AND MIT-open-group AND X11 URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 1.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From eb5df4e9bf2ad90ab392dc9190917c1eb71e8963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Mon, 18 Nov 2024 08:56:48 +0100 Subject: [PATCH 59/61] libXt 1.3.1 --- .gitignore | 1 + libXt.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 17f2c11..c54c4eb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ libXt-1.0.7.tar.bz2 /libXt-1.2.0.tar.bz2 /libXt-1.2.1.tar.bz2 /libXt-1.3.0.tar.xz +/libXt-1.3.1.tar.xz diff --git a/libXt.spec b/libXt.spec index 56771b7..a68c9ab 100644 --- a/libXt.spec +++ b/libXt.spec @@ -4,8 +4,8 @@ Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.3.0 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.3.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT AND HPND-sell-variant AND SMLNJ AND MIT-open-group AND X11 URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Mon Nov 18 2024 José Expósito - 1.3.1-1 +- libXt 1.3.1 + * Thu Jul 18 2024 Fedora Release Engineering - 1.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 2ae0b29..ca43748 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXt-1.3.0.tar.xz) = 64c5978655135b925c3aaad86b1aa6a3f3b57ad8b3592bf142be616b8aa339a02c2fc7badfab9564ea8076ea8f37acfe31709ed528f5a1d251f2d116aa074118 +SHA512 (libXt-1.3.1.tar.xz) = c220292f60b0f53134cf9364831a32bbaa9fa6bbb3a7143e917920957b7a48c616e946042747089f29ea9d8a18ecd64de620bcaf56d82462e7107de906f5db38 From 830e214a48759af72746de15335fb9165e3e686b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:32:05 +0000 Subject: [PATCH 60/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index a68c9ab..8811c55 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.3.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT AND HPND-sell-variant AND SMLNJ AND MIT-open-group AND X11 URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Nov 18 2024 José Expósito - 1.3.1-1 - libXt 1.3.1 From 35cf0285df9f4ad41ba788f2f6ddd31f190ea89b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:19:15 +0000 Subject: [PATCH 61/61] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libXt.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libXt.spec b/libXt.spec index 8811c55..f81988c 100644 --- a/libXt.spec +++ b/libXt.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXt runtime library Name: libXt Version: 1.3.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT AND HPND-sell-variant AND SMLNJ AND MIT-open-group AND X11 URL: https://www.x.org @@ -108,6 +108,9 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_mandir}/man3/*.3* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild