[packages/xorg-lib-libXgesture] - added dead-invalid-code,includes patches - drop .la file - release 2
qboosh
qboosh at pld-linux.org
Fri Aug 28 21:23:13 CEST 2020
commit 44d853303af0466062b67ec818d0d8e2604c5daf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Aug 28 21:25:36 2020 +0200
- added dead-invalid-code,includes patches
- drop .la file
- release 2
xorg-lib-libXgesture-dead-invalid-code.patch | 18 ++++++++++++++++++
xorg-lib-libXgesture-includes.patch | 12 ++++++++++++
xorg-lib-libXgesture.spec | 11 ++++++++---
3 files changed, 38 insertions(+), 3 deletions(-)
---
diff --git a/xorg-lib-libXgesture.spec b/xorg-lib-libXgesture.spec
index 2e40c45..438eefe 100644
--- a/xorg-lib-libXgesture.spec
+++ b/xorg-lib-libXgesture.spec
@@ -2,12 +2,14 @@ Summary: Xgesture extension library
Summary(pl.UTF-8): Biblioteka rozszerzenia Xgesture
Name: xorg-lib-libXgesture
Version: 0.1.1
-Release: 1
+Release: 2
License: MIT
Group: X11/Libraries
Source0: http://download.tizen.org/releases/2.2.1/latest/repos/tizen-main/source/libXgesture-%{version}-3.3.src.rpm
# Source0-md5: 95e27d4041313b8a24746c5655282b39
-URL: http://xorg.freedesktop.org/
+Patch0: %{name}-dead-invalid-code.patch
+Patch1: %{name}-includes.patch
+URL: https://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: libtool
@@ -68,6 +70,8 @@ Pakiet zawiera statyczną bibliotekę libXgesture.
%setup -q -c -T -n libXgesture-%{version}
rpm2cpio %{SOURCE0} | cpio -i libXgesture-%{version}.tar.gz
tar xf libXgesture-%{version}.tar.gz -C ..
+%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
@@ -84,6 +88,8 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXgesture.la
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -99,7 +105,6 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libXgesture.so
-%{_libdir}/libXgesture.la
%{_includedir}/X11/extensions/gesture.h
%{_pkgconfigdir}/xgesture.pc
diff --git a/xorg-lib-libXgesture-dead-invalid-code.patch b/xorg-lib-libXgesture-dead-invalid-code.patch
new file mode 100644
index 0000000..ab9ec62
--- /dev/null
+++ b/xorg-lib-libXgesture-dead-invalid-code.patch
@@ -0,0 +1,18 @@
+GetVersionInfo() is not defined.
+However, find_display_create_optional is always called with create=False.
+
+--- libXgesture-0.1.1/src/gesture.c.orig 2013-05-07 03:10:03.000000000 +0200
++++ libXgesture-0.1.1/src/gesture.c 2020-08-28 17:50:35.806416204 +0200
+@@ -106,11 +106,7 @@
+ }
+
+ if (!(dpyinfo = XextFindDisplay (gesture_info, dpy)) && create) {
+- dpyinfo = XextAddDisplay(gesture_info, dpy,
+- GESTURE_EXT_NAME,
+- &gesture_extension_hooks,
+- GestureNumberErrors,
+- (XPointer)GetVersionInfo(dpy));
++ return NULL; // never called
+ }
+
+ return dpyinfo;
diff --git a/xorg-lib-libXgesture-includes.patch b/xorg-lib-libXgesture-includes.patch
new file mode 100644
index 0000000..f6f8b0f
--- /dev/null
+++ b/xorg-lib-libXgesture-includes.patch
@@ -0,0 +1,12 @@
+--- libXgesture-0.1.1/src/gesture.c.orig 2020-08-28 17:52:03.599273923 +0200
++++ libXgesture-0.1.1/src/gesture.c 2020-08-28 17:53:05.705604131 +0200
+@@ -39,8 +39,8 @@
+ #include <X11/extensions/gesture.h>
+ #include <X11/extensions/gestureproto.h>
+
+-#ifdef __XGESTURE_LIB_DEBUG__
+ #include <stdio.h>
++#ifdef __XGESTURE_LIB_DEBUG__
+ #define TRACE(msg) fprintf(stderr, "[X11][GestureExt] %s\n", msg);
+ #else
+ #define TRACE(msg)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-lib-libXgesture.git/commitdiff/44d853303af0466062b67ec818d0d8e2604c5daf
More information about the pld-cvs-commit
mailing list