From a52a4b6578d76c20ab87b7ef396057cc87b3bbeb Mon Sep 17 00:00:00 2001 From: James Antill Date: Thu, 26 May 2022 16:19:12 -0400 Subject: [PATCH] Auto sync2gitlab import of xorg-x11-apps-7.7-21.el8.src.rpm --- .gitignore | 19 ++ EMPTY | 1 - ...-define-XOPEN_SOURCE-to-600-on-linux.patch | 37 +++ sources | 19 ++ x11perf-1.6.0-x11perf-datadir-cleanups.patch | 12 + xorg-x11-apps.spec | 306 ++++++++++++++++++ 6 files changed, 393 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 EMPTY create mode 100644 luit-1.1.1-configure-define-XOPEN_SOURCE-to-600-on-linux.patch create mode 100644 sources create mode 100644 x11perf-1.6.0-x11perf-datadir-cleanups.patch create mode 100644 xorg-x11-apps.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..50943fc --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +/luit-1.1.1.tar.bz2 +/oclock-1.0.4.tar.bz2 +/x11perf-1.6.0.tar.bz2 +/xbiff-1.0.3.tar.bz2 +/xclipboard-1.1.3.tar.bz2 +/xclock-1.0.7.tar.bz2 +/xconsole-1.0.6.tar.bz2 +/xcursorgen-1.0.6.tar.bz2 +/xeyes-1.1.2.tar.bz2 +/xfd-1.1.2.tar.bz2 +/xfontsel-1.0.6.tar.bz2 +/xload-1.1.3.tar.bz2 +/xlogo-1.0.4.tar.bz2 +/xmag-1.0.6.tar.bz2 +/xmessage-1.0.5.tar.bz2 +/xpr-1.0.5.tar.bz2 +/xvidtune-1.0.3.tar.bz2 +/xwd-1.0.7.tar.bz2 +/xwud-1.0.5.tar.bz2 diff --git a/EMPTY b/EMPTY deleted file mode 100644 index 0519ecb..0000000 --- a/EMPTY +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/luit-1.1.1-configure-define-XOPEN_SOURCE-to-600-on-linux.patch b/luit-1.1.1-configure-define-XOPEN_SOURCE-to-600-on-linux.patch new file mode 100644 index 0000000..4fa2c6a --- /dev/null +++ b/luit-1.1.1-configure-define-XOPEN_SOURCE-to-600-on-linux.patch @@ -0,0 +1,37 @@ +From c0b9f12ebb0a640e931e54c1f049016bdfdb9a07 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 14 Jan 2013 09:42:00 +1000 +Subject: [PATCH] configure: define XOPEN_SOURCE to 600 on linux +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +posix_openpt() is only defined for 600 and higher. + +sys.c: In function ‘allocatePty’: +sys.c:339:5: error: implicit declaration of function ‘posix_openpt’ +[-Werror=implicit-function-declaration] +sys.c:339:5: warning: nested extern declaration of ‘posix_openpt’ +[-Wnested-externs] + +Signed-off-by: Peter Hutterer +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git luit-1.1.1/configure.ac b/configure.ac +index c214d85..67ef2c4 100644 +--- luit-1.1.1/configure.ac ++++ luit-1.1.1/configure.ac +@@ -62,7 +62,7 @@ case $host_os in + linux*) + AC_CHECK_HEADERS([poll.h]) + AC_CHECK_FUNCS([poll]) +- OS_CFLAGS="-D_XOPEN_SOURCE=500" ++ OS_CFLAGS="-D_XOPEN_SOURCE=600" + ;; + *) + AC_CHECK_HEADERS([poll.h]) +-- +1.8.1 + diff --git a/sources b/sources new file mode 100644 index 0000000..c79c1c2 --- /dev/null +++ b/sources @@ -0,0 +1,19 @@ +SHA512 (luit-1.1.1.tar.bz2) = e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6 +SHA512 (oclock-1.0.4.tar.bz2) = 6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7 +SHA512 (x11perf-1.6.0.tar.bz2) = a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623 +SHA512 (xbiff-1.0.3.tar.bz2) = e9fa72817cae5fd6c052a4a59fcd6c696ae9d3f5fd8eecb0e9b0d8994258201cf5f4ae99845dd03e3da56e378eb214658e4450c9291a29399d9ece8af3b9f9e9 +SHA512 (xclipboard-1.1.3.tar.bz2) = 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e +SHA512 (xclock-1.0.7.tar.bz2) = 56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607 +SHA512 (xconsole-1.0.6.tar.bz2) = 115b3a03098ae3e06ba16af67afcd11c5a7906980ca04e8ec8ddd2c1dd4d02aab7a8952fd7f428861ad158052b9da8de11eab193de73e1f7264aca424e7cc620 +SHA512 (xcursorgen-1.0.6.tar.bz2) = 3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4 +SHA512 (xeyes-1.1.2.tar.bz2) = 008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0 +SHA512 (xfd-1.1.2.tar.bz2) = 3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745 +SHA512 (xfontsel-1.0.6.tar.bz2) = 2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099 +SHA512 (xload-1.1.3.tar.bz2) = 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5 +SHA512 (xlogo-1.0.4.tar.bz2) = cbfcd48425e697950907ddeaec2f06e0607ebf2e93e6799bd263230f036b3021279c2f379de55fae15b403af5f18292caa79159ed544a4a3314b90c85ac9804d +SHA512 (xmag-1.0.6.tar.bz2) = 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de +SHA512 (xmessage-1.0.5.tar.bz2) = a8423c3986b1576fa67800c315a605a527bb9a8f594ac269a736ae7b91eed0d4d83deb89148197dc3cd3f0e51894146958ce2979f78e97dcdb99c5326e34dabe +SHA512 (xpr-1.0.5.tar.bz2) = d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967 +SHA512 (xvidtune-1.0.3.tar.bz2) = 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352 +SHA512 (xwd-1.0.7.tar.bz2) = 6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e +SHA512 (xwud-1.0.5.tar.bz2) = 27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184 diff --git a/x11perf-1.6.0-x11perf-datadir-cleanups.patch b/x11perf-1.6.0-x11perf-datadir-cleanups.patch new file mode 100644 index 0000000..68791fd --- /dev/null +++ b/x11perf-1.6.0-x11perf-datadir-cleanups.patch @@ -0,0 +1,12 @@ +diff -Naur x11perf-1.6.0.old/configure.ac x11perf-1.6.0/configure.ac +--- x11perf-1.6.0.old/configure.ac 2015-04-30 15:03:46.668372759 +0200 ++++ x11perf-1.6.0/configure.ac 2015-04-30 15:03:56.617354502 +0200 +@@ -39,7 +39,7 @@ + XORG_DEFAULT_OPTIONS + + # Define the installation directory for the x11 performance compare scripts +-AC_SUBST([x11perfcompdir], [$libdir/X11/x11perfcomp]) ++AC_SUBST([x11perfcompdir], [$datadir/X11/x11perfcomp]) + + # Checks for programs run by the scripts we install + AC_PATH_PROG(MKTEMP, mktemp) diff --git a/xorg-x11-apps.spec b/xorg-x11-apps.spec new file mode 100644 index 0000000..4f4fd45 --- /dev/null +++ b/xorg-x11-apps.spec @@ -0,0 +1,306 @@ +# Component versions +%global luit 1.1.1 +%global oclock 1.0.4 +%global x11perf 1.6.0 +%global xbiff 1.0.3 +%global xclipboard 1.1.3 +%global xclock 1.0.7 +%global xconsole 1.0.6 +%global xcursorgen 1.0.6 +%global xeyes 1.1.2 +%global xfd 1.1.2 +%global xfontsel 1.0.6 +%global xload 1.1.3 +%global xlogo 1.0.4 +%global xmag 1.0.6 +%global xmessage 1.0.5 +%global xpr 1.0.5 +%global xvidtune 1.0.3 +%global xwd 1.0.7 +%global xwud 1.0.5 + +Summary: X.Org X11 applications +Name: xorg-x11-apps +Version: 7.7 +Release: 21%{?dist} +License: MIT +URL: https://www.x.org + +Source0: https://www.x.org/pub/individual/app/luit-%{luit}.tar.bz2 +Source1: https://www.x.org/pub/individual/app/oclock-%{oclock}.tar.bz2 +Source2: https://www.x.org/pub/individual/app/x11perf-%{x11perf}.tar.bz2 +Source3: https://www.x.org/pub/individual/app/xbiff-%{xbiff}.tar.bz2 +Source4: https://www.x.org/pub/individual/app/xclipboard-%{xclipboard}.tar.bz2 +Source5: https://www.x.org/pub/individual/app/xclock-%{xclock}.tar.bz2 +Source6: https://www.x.org/pub/individual/app/xconsole-%{xconsole}.tar.bz2 +Source7: https://www.x.org/pub/individual/app/xcursorgen-%{xcursorgen}.tar.bz2 +Source8: https://www.x.org/pub/individual/app/xeyes-%{xeyes}.tar.bz2 +Source9: https://www.x.org/pub/individual/app/xfd-%{xfd}.tar.bz2 +Source10: https://www.x.org/pub/individual/app/xfontsel-%{xfontsel}.tar.bz2 +Source11: https://www.x.org/pub/individual/app/xload-%{xload}.tar.bz2 +Source12: https://www.x.org/pub/individual/app/xlogo-%{xlogo}.tar.bz2 +Source13: https://www.x.org/pub/individual/app/xmag-%{xmag}.tar.bz2 +Source14: https://www.x.org/pub/individual/app/xmessage-%{xmessage}.tar.bz2 +Source15: https://www.x.org/pub/individual/app/xpr-%{xpr}.tar.bz2 +Source16: https://www.x.org/pub/individual/app/xvidtune-%{xvidtune}.tar.bz2 +Source17: https://www.x.org/pub/individual/app/xwd-%{xwd}.tar.bz2 +Source18: https://www.x.org/pub/individual/app/xwud-%{xwud}.tar.bz2 + +Patch0: x11perf-1.6.0-x11perf-datadir-cleanups.patch +Patch1: luit-1.1.1-configure-define-XOPEN_SOURCE-to-600-on-linux.patch + +BuildRequires: gettext-devel +BuildRequires: libtool +BuildRequires: pkgconfig(fontenc) +BuildRequires: pkgconfig(libpng) >= 1.2 +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xbitmaps) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xft) +BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xrender) >= 0.4 +BuildRequires: pkgconfig(xt) >= 1.1 +BuildRequires: pkgconfig(xxf86vm) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 + +# xbiff requires xbitmaps (#474258) +Requires: xorg-x11-xbitmaps + +# luit requires the encodings from xorg-x11-fonts-misc (rhbz#1046341) +Requires: xorg-x11-fonts-misc + +Provides: luit = %{luit} +Provides: oclock = %{oclock} +Provides: x11perf = %{x11perf} +Provides: xbiff = %{xbiff} +Provides: xclipboard = %{xclipboard} +Provides: xclock = %{xclock} +Provides: xconsole = %{xconsole} +Provides: xcursorgen = %{xcursorgen} +Provides: xeyes = %{xeyes} +Provides: xfd = %{xfd} +Provides: xfontsel = %{xfontsel} +Provides: xload = %{xload} +Provides: xlogo = %{xlogo} +Provides: xmag = %{xmag} +Provides: xmessage = %{xmessage} +Provides: xpr = %{xpr} +Provides: xvidtune = %{xvidtune} +Provides: xwd = %{xwd} +Provides: xwud = %{xwud} + +%description +A collection of common X Window System applications. + +%prep +%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 +%patch0 -p0 -b .x11perf-datadir-cleanup +%patch1 -p0 -b .luit-xopen_source + +%build +# Build all apps +{ +for app in * ; do + pushd $app + autoreconf -v --install + %configure + make %{?_smp_mflags} + popd +done +} + +%install +# Install all apps +{ + for app in * ; do + pushd $app + %make_install + popd + done +} + +%files +%{_bindir}/luit +%{_bindir}/oclock +%{_bindir}/x11perf +%{_bindir}/x11perfcomp +%{_bindir}/xbiff +%{_bindir}/xclipboard +%{_bindir}/xclock +%{_bindir}/xconsole +%{_bindir}/xcursorgen +%{_bindir}/xcutsel +%{_bindir}/xdpr +%{_bindir}/xeyes +%{_bindir}/xfd +%{_bindir}/xfontsel +%{_bindir}/xload +%{_bindir}/xlogo +%{_bindir}/xmag +%{_bindir}/xmessage +%{_bindir}/xpr +%{_bindir}/xvidtune +%{_bindir}/xwd +%{_bindir}/xwud +%{_datadir}/X11/app-defaults/Clock-color +%{_datadir}/X11/app-defaults/XClipboard +%{_datadir}/X11/app-defaults/XClock +%{_datadir}/X11/app-defaults/XClock-color +%{_datadir}/X11/app-defaults/XConsole +%{_datadir}/X11/app-defaults/Xfd +%{_datadir}/X11/app-defaults/XFontSel +%{_datadir}/X11/app-defaults/XLoad +%{_datadir}/X11/app-defaults/XLogo +%{_datadir}/X11/app-defaults/XLogo-color +%{_datadir}/X11/app-defaults/Xmag +%{_datadir}/X11/app-defaults/Xmessage +%{_datadir}/X11/app-defaults/Xmessage-color +%{_datadir}/X11/app-defaults/Xvidtune +%{_datadir}/X11/x11perfcomp +%{_mandir}/man1/luit.1* +%{_mandir}/man1/oclock.1* +%{_mandir}/man1/x11perf.1* +%{_mandir}/man1/x11perfcomp.1* +%{_mandir}/man1/xbiff.1* +%{_mandir}/man1/xclipboard.1* +%{_mandir}/man1/xclock.1* +%{_mandir}/man1/xconsole.1* +%{_mandir}/man1/xcursorgen.1* +%{_mandir}/man1/xcutsel.1* +%{_mandir}/man1/xdpr.1* +%{_mandir}/man1/xeyes.1* +%{_mandir}/man1/xfd.1* +%{_mandir}/man1/xfontsel.1* +%{_mandir}/man1/xload.1* +%{_mandir}/man1/xlogo.1* +%{_mandir}/man1/xmag.1* +%{_mandir}/man1/Xmark.1* +%{_mandir}/man1/xmessage.1* +%{_mandir}/man1/xpr.1* +%{_mandir}/man1/xvidtune.1* +%{_mandir}/man1/xwd.1* +%{_mandir}/man1/xwud.1* + +%changelog +* Mon Mar 12 2018 Adam Jackson - 7.7-21 +- oclock 1.0.4 +- xeyes 1.1.2 +- xfontsel 1.0.6 +- xload 1.1.3 +- xmessage 1.0.5 +- xpr 1.0.5 +- xwd 1.0.7 +- xwud 1.0.5 + +* Thu Mar 01 2018 Adam Jackson - 7.7-20 +- Change URLs to https + +* Fri Feb 09 2018 Fedora Release Engineering - 7.7-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 7.7-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 7.7-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 7.7-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 7.7-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jan 20 2016 Peter Hutterer +- s/define/global/ + +* Fri Jun 19 2015 Fedora Release Engineering - 7.7-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Apr 30 2015 Simone Caronni - 7.7-13 +- x11perf 1.6.0 +- xmag 1.0.6 + +* Tue Nov 04 2014 Simone Caronni - 7.7-12 +- Clean up SPEC file, fix rpmlint warnings. +- Simplify build requirements. +- Xprint has been removed everywhere. +- xclipboard 1.1.3 +- xclock 1.0.7 +- xconsole 1.0.6 +- xfd 1.1.2 +- xfontsel 1.0.5 +- xload 1.1.2 +- xwd 1.0.6 +- xwud 1.0.4 + +* Mon Aug 18 2014 Fedora Release Engineering - 7.7-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jul 19 2014 Hans de Goede - 7.7-10 +- Add Requires: xorg-x11-fonts-misc (rhbz#1046341) + +* Wed Jul 9 2014 Hans de Goede - 7.7-9 +- xcursorgen 1.0.6 + +* Sun Jun 08 2014 Fedora Release Engineering - 7.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 7.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jul 19 2013 Peter Hutterer 7.7-6 +- Require xorg-x11-xbitmaps for xbiff (#474258) +- fix rpmlint complaints +- update sources to http sources, ftp fails too often + +* Fri Feb 15 2013 Fedora Release Engineering - 7.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Jan 15 2013 Peter Hutterer 7.7-4 +- upload xfontsel tarball, drop duplicate xlogo sources + +* Mon Jan 14 2013 Peter Hutterer 7.7-3 +- luit 1.1.1 +- oclock 1.0.3 +- xclock 1.0.6 +- xbiff 1.0.3 +- xpr 1.0.4 +- xcursorgen 1.0.5 +- xclipboard 1.1.2 +- xfontsel 1.0.4 +- xfd 1.1.1 +- xlogo 1.0.4 +- xvidtune 1.0.3 + +* Mon Jan 14 2013 Peter Hutterer 7.7-2 +- xconsole 1.0.5 +- xmessage 1.0.4 +- xmag 1.0.5 + +* Thu Jan 03 2013 Adam Jackson 7.7-1 +- Superstition bump to 7.7 +- Drop old streams patch + +* Wed Sep 12 2012 Dave Airlie 7.6-7 +- x11perf 1.5.4 - fixes CVE-2011-2504 + +* Sun Jul 22 2012 Fedora Release Engineering - 7.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 7.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Nov 10 2011 Adam Jackson 7.6-4 +- Move xinput and xkill to xorg-x11-server-utils + +* Mon Nov 07 2011 Adam Jackson 7.6-3 +- Rebuild for libpng 1.5 + +* Mon Feb 07 2011 Fedora Release Engineering - 7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Jan 06 2011 Adam Jackson 7.6-1 +- x11perf 1.5.3