Accepting request 113632 from home:dimstar:branches:X11:XOrg

Update to 1.0.6

OBS-URL: https://build.opensuse.org/request/show/113632
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xmodmap?expand=0&rev=2
This commit is contained in:
Stefan Dirsch 2012-04-15 10:51:40 +00:00 committed by Git OBS Bridge
parent 6100ce34bf
commit c773d0dc89
5 changed files with 37 additions and 5 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:421ee7a17b0cf559c4901225f70c497e3c5ca205ec7dcc84712055818d2f3402
size 124742

3
xmodmap-1.0.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c58bfc948b11877c399b03240a83571ae574779b9c531f258a17acadaa9f3a5d
size 133170

12
xmodmap-includes.patch Normal file
View File

@ -0,0 +1,12 @@
Index: xmodmap-1.0.6/xmodmap.c
===================================================================
--- xmodmap-1.0.6.orig/xmodmap.c
+++ xmodmap-1.0.6/xmodmap.c
@@ -26,6 +26,7 @@ from The Open Group.
*/
+#define _GNU_SOURCE
#include <X11/Xos.h>
#include <X11/Xlib.h>
#include <stdio.h>

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sat Apr 14 20:30:52 UTC 2012 - dimstar@opensuse.org
- Update to version 1.0.6:
+ Replace chk_malloc + sprintf with asprintf.
+ Free copy of input line at end of process_line instead of
leaking it.
+ Fix gcc -Wwrite-strings warnings.
+ Add missing _X_NORETURN to functions that need it.
+ Include strings.h for strcasecmp.
+ Improve error handling in copy_to_scratch.
+ Build system fixes.
- Add pkgconfig(xproto) BuildRequires: new dependency.
- Add xmodmap-includes.patch: Fix build: as asprintf is only
defined when building as _GNU_SOURCE.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 13 08:46:08 UTC 2012 - vuntz@opensuse.org Fri Apr 13 08:46:08 UTC 2012 - vuntz@opensuse.org

View File

@ -16,8 +16,8 @@
# #
Name: xmodmap Name: xmodmap
Version: 1.0.5 Version: 1.0.6
Release: 0 Release: 1
License: MIT License: MIT
Summary: Utility to modify keymaps and pointer button mappings in X Summary: Utility to modify keymaps and pointer button mappings in X
Url: http://xorg.freedesktop.org/ Url: http://xorg.freedesktop.org/
@ -25,9 +25,12 @@ Group: System/X11/Utilities
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
Source1: Xmodmap.template Source1: Xmodmap.template
Source2: Xmodmap.remote.template Source2: Xmodmap.remote.template
# PATCH-FIX-UPSTREAM xmodmap-includes.patch fdo#48696 dimstar@opensuse.org -- asprintf is only defined with _GNU_SOURCE.
Patch0: xmodmap-includes.patch
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xproto) >= 7.0.17
# This was part of the xorg-x11 package up to version 7.6 # This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6 Conflicts: xorg-x11 <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -41,6 +44,7 @@ tastes.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%configure %configure