From b304b3ee5b19debd1d0a4b29b506a60aa41d02ed Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Sat, 2 Oct 2004 15:44:15 +0000
Subject: Update to 1.04:

- Some memory leaks were nailed (thanks to kmaraas and valgrind).
- Default ruleset for partially non-compliant servers introduced
  (though it still long way to go for AccelleratedX support).
- A couple of small tests introduced.
- Hopefully the last release in 1.0x series.
---
 x11/libxklavier/Makefile         |  4 ++--
 x11/libxklavier/distinfo         |  8 ++++----
 x11/libxklavier/patches/patch-aa | 11 +++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'x11/libxklavier')

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index e414815f589..52f32f87629 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/06/27 06:47:07 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/02 15:44:15 jmmv Exp $
 #
 
-DISTNAME=	libxklavier-1.03
+DISTNAME=	libxklavier-1.04
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gswitchit/}
 
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index ed6d549bc99..10532474570 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/06/27 21:01:58 kristerw Exp $
+$NetBSD: distinfo,v 1.7 2004/10/02 15:44:15 jmmv Exp $
 
-SHA1 (libxklavier-1.03.tar.gz) = 8d281daabfa783a3ed09a5220b910307d47c3850
-Size (libxklavier-1.03.tar.gz) = 415013 bytes
-SHA1 (patch-aa) = ee0e16d20359676c1f08b9932d15768b4e16eb26
+SHA1 (libxklavier-1.04.tar.gz) = 6b909ef1320255144034a8bcdbb7cdaa15db156e
+Size (libxklavier-1.04.tar.gz) = 422337 bytes
+SHA1 (patch-aa) = 7746a3876cde51cfb08c58bd173a18520eb62d77
diff --git a/x11/libxklavier/patches/patch-aa b/x11/libxklavier/patches/patch-aa
index 3af9ce0221d..08aa5f4bf72 100644
--- a/x11/libxklavier/patches/patch-aa
+++ b/x11/libxklavier/patches/patch-aa
@@ -1,14 +1,17 @@
-$NetBSD: patch-aa,v 1.1 2004/06/27 21:01:58 kristerw Exp $
+$NetBSD: patch-aa,v 1.2 2004/10/02 15:44:15 jmmv Exp $
 
---- libxklavier/xklavier_config_xkb.c.orig	Sun Jun 27 22:57:28 2004
-+++ libxklavier/xklavier_config_xkb.c	Sun Jun 27 22:58:08 2004
-@@ -173,9 +173,10 @@
+--- libxklavier/xklavier_config_xkb.c.orig	2004-10-02 16:45:49.000000000 +0200
++++ libxklavier/xklavier_config_xkb.c
+@@ -184,10 +184,13 @@ Bool XklMultipleLayoutsSupported( void )
  
    if ( supportState == UNCHECKED )
    {
++#ifdef XKB_HEADERS_PRESENT
 +    XkbRF_RulesPtr rulesPtr;
++#endif
      XklDebug( 100, "!!! Checking multiple layouts support\n" );
      supportState = NON_SUPPORTED;
+ #ifdef XKB_HEADERS_PRESENT
 -    XkbRF_RulesPtr rulesPtr = _XklLoadRulesSet();
 +    rulesPtr = _XklLoadRulesSet();
      if ( rulesPtr )
-- 
cgit v1.2.3