[xorg-x11-apps] luit 1.1.1

Peter Hutterer whot at fedoraproject.org
Mon Jan 14 22:48:29 UTC 2013


commit 7417fe1b8da5e4c371b9b55965e3e406ed0d8f04
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Jan 15 08:47:31 2013 +1000

    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

 .gitignore                                         |   12 +++++
 ...igure-define-XOPEN_SOURCE-to-600-on-linux.patch |   37 +++++++++++++++
 sources                                            |   21 +++++----
 xbiff-1.0.2-xmu-configure.patch                    |   32 -------------
 xorg-x11-apps.spec                                 |   47 ++++++++++++-------
 5 files changed, 90 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ca9b5c..defdbde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,15 @@ xeyes-1.1.1.tar.bz2
 /xmag-1.0.5.tar.bz2
 /xmessage-1.0.4.tar.bz2
 /xconsole-1.0.5.tar.bz2
+/luit-1.1.1.tar.bz2
+/oclock-1.0.3.tar.bz2
+/xbiff-1.0.3.tar.bz2
+/xclock-1.0.6.tar.gz
+/xclock-1.0.6.tar.bz2
+/xcursorgen-1.0.5.tar.bz2
+/xclipboard-1.1.2.tar.bz2
+/xpr-1.0.4.tar.bz2
+/xload-1.1.1.tar.bz2
+/xfd-1.1.1.tar.bz2
+/xlogo-1.0.4.tar.bz2
+/xvidtune-1.0.3.tar.bz2
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 <peter.hutterer at who-t.net>
+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 <peter.hutterer at who-t.net>
+---
+ 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
index b016b11..5224dbf 100644
--- a/sources
+++ b/sources
@@ -1,19 +1,20 @@
-1c2c540d240def3ea65ff2030f059f8a  xpr-1.0.3.tar.bz2
+6101f04731ffd40803df80eca274ec4b  xpr-1.0.4.tar.bz2
 ecd9167fbfdfc3cfef7e0bb089edd25b  xwd-1.0.4.tar.bz2
 a37020053e8ee32c6fd1145242d53ee3  xwud-1.0.3.tar.bz2
-1d4ad06725f9dc4b877ecd210b7b1607  xbiff-1.0.2.tar.bz2
-eaf124bbc9d13e1a12a29faaa2ed3612  xclock-1.0.5.tar.bz2
-cb9377b09e562e4084cc614a44df2641  luit-1.1.0.tar.bz2
-353d939113901ea3cdcf1c0369b522e4  oclock-1.0.2.tar.bz2
+f38a0c63c2a7ed6fb9d6f8884785b5c9  xbiff-1.0.3.tar.bz2
+773782f20d5fb3232384889deca00754  xclock-1.0.6.tar.bz2
+c4a3664e08e5a47c120ff9263ee2f20c  luit-1.1.1.tar.bz2
+f73ad0fa3fda1efe1036e1f48f8a3953  oclock-1.0.3.tar.bz2
 ba55aab63d056520fda1b7098c3929a1  xconsole-1.0.5.tar.bz2
-731c39ea88217c12ddd37f8627d97f3f  xcursorgen-1.0.4.tar.bz2
-17d8ef0d490301158f8abf7641cca243  xfd-1.1.0.tar.bz2
+09f56978a62854534deacc8aa8ff3031  xcursorgen-1.0.5.tar.bz2
+b3893e03a5288927781acd5d3c65ba19  xfd-1.1.1.tar.bz2
 299fabe7d7be92b6572d814895ce3bb1  xfontsel-1.0.3.tar.bz2
-5f6e8c54da51ad0e751abf54980b0ef1  xload-1.1.0.tar.bz2
+ccc788704d66fcbe4e3e8755a600264c  xload-1.1.1.tar.bz2
 8149f95f5a0f04f404549363557eef41  xlogo-1.0.3.tar.bz2
 280b81cb09d1903aa868a058d90128ad  xmag-1.0.5.tar.bz2
 2dd5ae46fa18abc9331bc26250a25005  xmessage-1.0.4.tar.bz2
-e40eeb4454f2a7cdde3a14f5dfd3aadd  xvidtune-1.0.2.tar.bz2
-b9102fe787eda2a1c9578079d8f55eed  xclipboard-1.1.1.tar.bz2
+8676c9bb1658fe91de244e850f6c3ca8  xvidtune-1.0.3.tar.bz2
+f53f9276c0d009b539d7f64c6db9f0ff  xclipboard-1.1.2.tar.bz2
 a3035dcecdbdb89e864177c080924981  xeyes-1.1.1.tar.bz2
 5c3c7431a38775caaea6051312a49bc9  x11perf-1.5.4.tar.bz2
+4ce21861f7b9398805beba8b62d8ff8e  xlogo-1.0.4.tar.bz2
diff --git a/xorg-x11-apps.spec b/xorg-x11-apps.spec
index 4fe9c43..50e1d66 100644
--- a/xorg-x11-apps.spec
+++ b/xorg-x11-apps.spec
@@ -5,42 +5,42 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 
 # Clock apps
-Source0:  ftp://ftp.x.org/pub/individual/app/oclock-1.0.2.tar.bz2
-Source1:  ftp://ftp.x.org/pub/individual/app/xclock-1.0.5.tar.bz2
+Source0:  ftp://ftp.x.org/pub/individual/app/oclock-1.0.3.tar.bz2
+Source1:  ftp://ftp.x.org/pub/individual/app/xclock-1.0.6.tar.bz2
 # X Window Dump (xwd) utilities
 Source2:  ftp://ftp.x.org/pub/individual/app/xwd-1.0.4.tar.bz2
 Source3:  ftp://ftp.x.org/pub/individual/app/xwud-1.0.3.tar.bz2
-Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.3.tar.bz2
+Source4:  ftp://ftp.x.org/pub/individual/app/xpr-1.0.4.tar.bz2
 # Miscellaneous other applications
-Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.1.0.tar.bz2
+Source5:  ftp://ftp.x.org/pub/individual/app/luit-1.1.1.tar.bz2
 Source6:  ftp://ftp.x.org/pub/individual/app/x11perf-1.5.4.tar.bz2
-Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.2.tar.bz2
-Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.1.1.tar.bz2
+Source7:  ftp://ftp.x.org/pub/individual/app/xbiff-1.0.3.tar.bz2
+Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.1.2.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.5.tar.bz2
-Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.4.tar.bz2
+Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.5.tar.bz2
 Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.1.1.tar.bz2
-Source13: ftp://ftp.x.org/pub/individual/app/xload-1.1.0.tar.bz2
-Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.3.tar.bz2
+Source13: ftp://ftp.x.org/pub/individual/app/xload-1.1.1.tar.bz2
+Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.4.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.5.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.4.tar.bz2
-Source18: ftp://ftp.x.org/pub/individual/app/xfd-1.1.0.tar.bz2
-Source19: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.3.tar.bz2
-Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.2.tar.bz2
+Source18: ftp://ftp.x.org/pub/individual/app/xfd-1.1.1.tar.bz2
+Source19: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.4.tar.bz2
+Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.3.tar.bz2
 
 Patch0: x11perf-1.5.4-x11perf-datadir-cleanups.patch
-Patch6: xbiff-1.0.2-xmu-configure.patch
+Patch7: luit-1.1.1-configure-define-XOPEN_SOURCE-to-600-on-linux.patch
 
 BuildRequires: autoconf automake
 
 BuildRequires: xorg-x11-util-macros
-# xfd needs gettext
-BuildRequires: gettext
+# xfd/xclock need gettext
+BuildRequires: gettext gettext-devel
 BuildRequires: zlib-devel
 BuildRequires: libfontenc-devel
 BuildRequires: libX11-devel
@@ -77,7 +77,7 @@ 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 -a13 -a14 -a15 -a16 -a18 -a19 -a20
 %patch0 -p0 -b .x11perf-datadir-cleanup
-%patch6 -p1 -b .xmu-configure
+%patch7 -p0 -b .luit-xopen_source
 
 %build
 # Build all apps
@@ -176,6 +176,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Mon Jan 14 2013 Peter Hutterer <peter.hutterer at redhat.com> 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 <peter.hutterer at redhat.com> 7.7-2
 - xconsole 1.0.5
 - xmessage 1.0.4


More information about the scm-commits mailing list