Commit 0cff76d3 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

xapp_xmodmap: Bump version to 1.0.8 



- removed xapp_xmodmap-asprintf.patch, patch was applied upstream

Signed-off-by: default avatarBernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 2acf80c3

package/x11r7/xapp_xmodmap/xapp_xmodmap-asprintf.patch

deleted100644 → 0
+0 −69
Original line number Diff line number Diff line 
Fixes build problems due to missing asprintf() definition



Upstream bug: https://bugs.freedesktop.org/show_bug.cgi?id=48696



Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>



From dab3ce5b4b9d7078cd55515441b2ba244a32516a Mon Sep 17 00:00:00 2001

From: Alan Coopersmith <alan.coopersmith@oracle.com>

Date: Mon, 23 Apr 2012 07:28:39 -0700

Subject: [PATCH:xmodmap] include config.h before stdio.h & other system

 headers



Ensures definitions like _GNU_SOURCE are visible when needed.



Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

---

 exec.c    |    4 ++++

 pf.c      |    4 ++++

 xmodmap.c |    4 ++++

 3 files changed, 12 insertions(+)



diff --git a/exec.c b/exec.c

index dbcb669..419b10e 100644

--- a/exec.c

+++ b/exec.c

@@ -54,6 +54,10 @@ from The Open Group.

  * original xmodmap, written by David Rosenthal, of Sun Microsystems.

  */

 

+#ifdef HAVE_CONFIG_H

+# include "config.h"

+#endif

+

 #include <X11/Xos.h>

 #include <X11/Xlib.h>

 #include <stdio.h>

diff --git a/pf.c b/pf.c

index 0eb0f55..3f0c3f4 100644

--- a/pf.c

+++ b/pf.c

@@ -26,6 +26,10 @@ from The Open Group.

 

 */

 

+#ifdef HAVE_CONFIG_H

+# include "config.h"

+#endif

+

 #include <X11/Xos.h>

 #include <X11/Xlib.h>

 #include <stdio.h>

diff --git a/xmodmap.c b/xmodmap.c

index 58a8e70..0f89629 100644

--- a/xmodmap.c

+++ b/xmodmap.c

@@ -26,6 +26,10 @@ from The Open Group.

 

 */

 

+#ifdef HAVE_CONFIG_H

+# include "config.h"

+#endif

+

 #include <X11/Xos.h>

 #include <X11/Xlib.h>

 #include <stdio.h>

-- 

1.7.9.2

package/x11r7/xapp_xmodmap/xapp_xmodmap.mk

+2 −2
Original line number Diff line number Diff line 
################################################################################

1################################################################################

#

# xapp_xmodmap

#

################################################################################



XAPP_XMODMAP_VERSION = 1.0.7

XAPP_XMODMAP_VERSION = 1.0.8

XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2

XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app

XAPP_XMODMAP_LICENSE = MIT