[packages/xorg-proto-xorgproto] - updated to 2018.3 (randrproto 1.6.0 + bugfixes); release 5 - updated missing patch (headers alread
qboosh
qboosh at pld-linux.org
Wed Feb 28 17:17:04 CET 2018
commit 50a50f133acdb69dd939fd30ae54097d242b4b67
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Feb 28 17:19:22 2018 +0100
- updated to 2018.3 (randrproto 1.6.0 + bugfixes); release 5
- updated missing patch (headers already in upstream tarball)
- removed obsolete make patch
xorg-proto-xorgproto.spec | 14 ++--
xorgproto-make.patch | 11 ---
xorgproto-missing.patch | 170 ----------------------------------------------
3 files changed, 6 insertions(+), 189 deletions(-)
---
diff --git a/xorg-proto-xorgproto.spec b/xorg-proto-xorgproto.spec
index 3250172..14acc05 100644
--- a/xorg-proto-xorgproto.spec
+++ b/xorg-proto-xorgproto.spec
@@ -3,7 +3,7 @@
# and bump release (unless all versions are increased)
# whole package version
-%define ver 2018.2
+%define ver 2018.3
# subpackage versions (see .pc files) # last standalone spec EVR as comment
%define applewm_ver 1.4.2 # 1.2.0-1
%define bigreqs_ver 1.1.2 # 1.1.2-2
@@ -22,7 +22,7 @@
%define lg3d_ver 5.0 # (none)
%define present_ver 1.1 # 1.1-1
%define print_ver 1.0.5 # 1.0.5-2
-%define randr_ver 1.5.0 # 1.5.0-1
+%define randr_ver 1.6.0 # 1.5.0-1
%define record_ver 1.14.2 # 1.14.2-2
%define render_ver 0.11.1 # 0.11.1-2
%define resource_ver 1.2.0 # 1.2.0-2
@@ -50,17 +50,16 @@
Summary: Header files of X Window System Unified Protocol
Summary(pl.UTF-8): Pliki nagłówkowe zunifikowanego protokołu systemu X Window
Name: xorg-proto-xorgproto
-Version: 2018.2
+Version: %{ver}
# bump release on updates unless ALL subpackage versions are increased!
-Release: 4
+Release: 5
License: MIT
Group: X11/Development/Libraries
Source0: https://xorg.freedesktop.org/releases/individual/proto/xorgproto-%{ver}.tar.bz2
-# Source0-md5: 490677ddbc649b177eda7ddb8d3e2074
-# from git://anongit.freedesktop.org/xorg/proto/xorgproto, missing man/ and include/X11/extensions/ files
+# Source0-md5: 102f1c9f1dc43b713539018af067ae6c
+# from git://anongit.freedesktop.org/xorg/proto/xorgproto, missing man/ files
# TODO: specs/ dir, but there are no build rules for processing XML
Patch0: xorgproto-missing.patch
-Patch1: xorgproto-make.patch
URL: https://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -667,7 +666,6 @@ usługi proxy.
%prep
%setup -q -n xorgproto-%{ver}
%patch0 -p1
-%patch1 -p1
%build
%{__aclocal}
diff --git a/xorgproto-make.patch b/xorgproto-make.patch
deleted file mode 100644
index aa7ded2..0000000
--- a/xorgproto-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorgproto-2018.2/Makefile.am.orig 2018-02-12 17:18:57.000000000 +0100
-+++ xorgproto-2018.2/Makefile.am 2018-02-20 16:07:57.395032824 +0100
-@@ -16,7 +16,7 @@
-
- if LEGACY
- XCalibrateincludedir = $(includedir)/X11/extensions
--XCalibrateinclude_HEADERS =
-+XCalibrateinclude_HEADERS = \
- include/X11/extensions/xcalibrateproto.h \
- include/X11/extensions/xcalibratewire.h
-
diff --git a/xorgproto-missing.patch b/xorgproto-missing.patch
index e76b3cb..f3a081b 100644
--- a/xorgproto-missing.patch
+++ b/xorgproto-missing.patch
@@ -1054,173 +1054,3 @@ diff -Nur xorgproto/man.orig/Xprint.sgml xorgproto/man/Xprint.sgml
+ </refsect1>
+</refentry>
+
---- xorgproto.orig/include/X11/extensions/xcalibrateproto.h 1970-01-01 01:00:00.000000000 +0100
-+++ xorgproto/include/X11/extensions/xcalibrateproto.h 2018-02-20 15:29:03.198392810 +0100
-@@ -0,0 +1,120 @@
-+/*
-+ * $Id: xcalibrateproto.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $
-+ *
-+ * Copyright © 2003 Philip Blundell
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Philip Blundell not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Philip Blundell makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef XCALIBRATEPROTO_H
-+#define XCALIBRATEPROTO_H
-+
-+/*
-+ * requests and replies
-+ */
-+typedef struct {
-+ CARD8 reqType;
-+ CARD8 xCalibrateReqType;
-+ CARD16 length B16;
-+ CARD32 majorVersion B32;
-+ CARD32 minorVersion B32;
-+} xXCalibrateQueryVersionReq;
-+
-+#define sz_xXCalibrateQueryVersionReq 12
-+
-+typedef struct {
-+ BYTE type; /* X_Reply */
-+ BYTE pad1;
-+ CARD16 sequenceNumber B16;
-+ CARD32 length B32;
-+ CARD32 majorVersion B32;
-+ CARD32 minorVersion B32;
-+ CARD32 pad2 B32;
-+ CARD32 pad3 B32;
-+ CARD32 pad4 B32;
-+ CARD32 pad5 B32;
-+} xXCalibrateQueryVersionReply;
-+
-+#define sz_xXCalibrateQueryVersionReply 32
-+
-+typedef struct {
-+ CARD8 reqType;
-+ CARD8 xCalibrateReqType;
-+ CARD16 length B16;
-+ CARD16 on B16;
-+ CARD16 pad B16;
-+} xXCalibrateRawModeReq;
-+
-+#define sz_xXCalibrateRawModeReq 8
-+
-+typedef struct {
-+ BYTE type; /* X_Reply */
-+ BYTE pad1;
-+ CARD16 sequenceNumber B16;
-+ CARD32 status;
-+ CARD32 pad2 B32;
-+ CARD32 pad3 B32;
-+ CARD32 pad4 B32;
-+ CARD32 pad5 B32;
-+ CARD32 pad6 B32;
-+ CARD32 pad7 B32;
-+} xXCalibrateRawModeReply;
-+
-+#define sz_xXCalibrateRawModeReply 32
-+
-+typedef struct {
-+ CARD8 reqType;
-+ CARD8 xCalibrateReqType;
-+ CARD16 length B16;
-+ CARD32 x B32;
-+ CARD32 y B32;
-+} xXCalibrateScreenToCoordReq;
-+
-+#define sz_xXCalibrateScreenToCoordReq 12
-+
-+typedef struct {
-+ BYTE type; /* X_Reply */
-+ BYTE pad1;
-+ CARD16 sequenceNumber B16;
-+ CARD32 x;
-+ CARD32 y;
-+ CARD32 pad2 B32;
-+ CARD32 pad3 B32;
-+ CARD32 pad4 B32;
-+ CARD32 pad5 B32;
-+ CARD32 pad6 B32;
-+} xXCalibrateScreenToCoordReply;
-+
-+#define sz_xXCalibrateScreenToCoordReply 32
-+
-+/* Events */
-+
-+typedef struct {
-+ CARD8 type;
-+ CARD8 pad1;
-+ CARD16 sequenceNumber B16;
-+ CARD16 x;
-+ CARD16 y;
-+ CARD16 pressure;
-+ CARD16 pad2;
-+} xXCalibrateRawTouchscreenEvent;
-+
-+#define sz_xXCalibrateRawTouchscreenEvent 12
-+
-+#endif
---- xorgproto.orig/include/X11/extensions/xcalibratewire.h 1970-01-01 01:00:00.000000000 +0100
-+++ xorgproto/include/X11/extensions/xcalibratewire.h 2018-02-20 15:29:03.198392810 +0100
-@@ -0,0 +1,44 @@
-+/*
-+ * $Id: xcalibratewire.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $
-+ *
-+ * Copyright © 2003 Philip Blundell
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Philip Blundell not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Philip Blundell makes no
-+ * representations about the suitability of this software for any purpose. It
-+ * is provided "as is" without express or implied warranty.
-+ *
-+ * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+ * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+ * PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#ifndef XCALIBRATEWIRE_H
-+#define XCALIBRATEWIRE_H
-+
-+#define XCALIBRATE_MAJOR_VERSION 0
-+#define XCALIBRATE_MINOR_VERSION 1
-+#define XCALIBRATE_NAME "XCALIBRATE"
-+
-+#define X_XCalibrateQueryVersion 0
-+#define X_XCalibrateRawMode 1
-+#define X_XCalibrateScreenToCoord 2
-+
-+#define XCalibrateNumberRequests (X_XCalibrateScreenToCoord + 1)
-+
-+#define X_XCalibrateRawTouchscreen 0
-+
-+#define XCalibrateNumberEvents (X_XCalibrateRawTouchscreen + 1)
-+
-+#define XCalibrateNumberErrors 0
-+
-+#endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-proto-xorgproto.git/commitdiff/50a50f133acdb69dd939fd30ae54097d242b4b67
More information about the pld-cvs-commit
mailing list