summaryrefslogtreecommitdiff
path: root/x11/libxklavier/patches
diff options
context:
space:
mode:
Diffstat (limited to 'x11/libxklavier/patches')
-rw-r--r--x11/libxklavier/patches/patch-aa36
-rw-r--r--x11/libxklavier/patches/patch-ab8
-rw-r--r--x11/libxklavier/patches/patch-ac22
-rw-r--r--x11/libxklavier/patches/patch-ad24
4 files changed, 35 insertions, 55 deletions
diff --git a/x11/libxklavier/patches/patch-aa b/x11/libxklavier/patches/patch-aa
index 84b7d5e94ac..be0fae7b446 100644
--- a/x11/libxklavier/patches/patch-aa
+++ b/x11/libxklavier/patches/patch-aa
@@ -1,35 +1,37 @@
-$NetBSD: patch-aa,v 1.4 2005/03/24 09:34:24 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2006/09/15 15:11:53 jmmv Exp $
---- configure.orig 2005-02-26 00:02:18.000000000 +0100
+--- configure.orig 2006-08-30 15:57:39.000000000 +0200
+++ configure
-@@ -20135,9 +20135,9 @@ fi
+@@ -21651,9 +21651,9 @@ fi
echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6
-if test \( "$enable_xkb_support" == "yes" -a \
-- "$xkb_headers_present" == "yes" \) -o \
-- "$enable_xmm_support" == "yes" ; then
+- "$libxkbfile_present" == "yes" \) -o \
+- "$enable_xmodmap_support" == "yes" ; then
+if test \( "$enable_xkb_support" = "yes" -a \
-+ "$xkb_headers_present" = "yes" \) -o \
-+ "$enable_xmm_support" = "yes" ; then
++ "$libxkbfile_present" = "yes" \) -o \
++ "$enable_xmodmap_support" = "yes" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
-@@ -21744,14 +21744,14 @@ fi
+@@ -23531,8 +23531,8 @@ fi
echo '**********************************************************'
echo ' Libxklavier is configured with the following backends:'
-if test "$enable_xkb_support" == "yes" ; then
-- if test "$xkb_headers_present" == "yes" ; then
+- if test "$libxkbfile_present" == "yes" ; then
+if test "$enable_xkb_support" = "yes" ; then
-+ if test "$xkb_headers_present" = "yes" ; then
- echo ' XKB (libxkbfile headers are present)'
- else
- echo ' XKB (but libxkbfile headers are NOT present)'
++ if test "$libxkbfile_present" = "yes" ; then
+ echo " XKB, libxkbfile is present"
+ echo " default ruleset: $xkb_default_ruleset"
+ echo " base: $xkb_base"
+@@ -23540,7 +23540,7 @@ if test "$enable_xkb_support" == "yes" ;
+ echo " XKB, libxkbfile is NOT present"
fi
fi
--if test "$enable_xmm_support" == "yes" ; then
-+if test "$enable_xmm_support" = "yes" ; then
- echo ' xmodmap'
+-if test "$enable_xmodmap_support" == "yes" ; then
++if test "$enable_xmodmap_support" = "yes" ; then
+ echo " xmodmap, default ruleset: $xmodmap_default_ruleset"
+ echo " base: $xmodmap_base"
fi
- echo '**********************************************************'
diff --git a/x11/libxklavier/patches/patch-ab b/x11/libxklavier/patches/patch-ab
index c91e828babc..4732f2ac955 100644
--- a/x11/libxklavier/patches/patch-ab
+++ b/x11/libxklavier/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2005/03/24 09:34:24 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2006/09/15 15:11:53 jmmv Exp $
---- Makefile.in.orig 2005-02-26 00:02:55.000000000 +0100
+--- Makefile.in.orig 2006-08-30 15:59:01.000000000 +0200
+++ Makefile.in
-@@ -200,7 +200,7 @@ target_alias = @target_alias@
+@@ -213,7 +213,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
x_includes = @x_includes@
x_libraries = @x_libraries@
- xkbheaders_present = @xkbheaders_present@
-SUBDIRS = libxklavier doc tests
+SUBDIRS = libxklavier doc
config_xml_DATA = xfree86.xml
diff --git a/x11/libxklavier/patches/patch-ac b/x11/libxklavier/patches/patch-ac
index e7eae047320..baa33d8a326 100644
--- a/x11/libxklavier/patches/patch-ac
+++ b/x11/libxklavier/patches/patch-ac
@@ -1,18 +1,20 @@
-$NetBSD: patch-ac,v 1.4 2006/03/12 11:18:11 jmmv Exp $
+$NetBSD: patch-ac,v 1.5 2006/09/15 15:11:53 jmmv Exp $
---- libxklavier/xklavier.c.orig 2006-02-14 01:59:22.000000000 +0100
+--- libxklavier/xklavier.c.orig 2006-06-30 02:37:24.000000000 +0200
+++ libxklavier/xklavier.c
-@@ -1,3 +1,4 @@
+@@ -1,4 +1,5 @@
+ #include <string.h>
+#include <stdlib.h>
#include <time.h>
#include <X11/Xatom.h>
-@@ -773,7 +774,7 @@ void _XklEnsureVTableInited( void )
- {
- XklDebug( 0, "ERROR: XKL VTable is NOT initialized.\n" );
- /* force the crash! */
-- p = NULL; *p = '\0';
-+ abort();
- }
+@@ -473,8 +474,7 @@ xkl_engine_ensure_vtable_inited(XklEngin
+ if (xkl_engine_priv(engine, backend_id) == NULL) {
+ xkl_debug(0, "ERROR: XKL VTable is NOT initialized.\n");
+ /* force the crash! */
+- p = NULL;
+- *p = '\0';
++ abort();
+ }
}
diff --git a/x11/libxklavier/patches/patch-ad b/x11/libxklavier/patches/patch-ad
deleted file mode 100644
index 317fd482c43..00000000000
--- a/x11/libxklavier/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/04/07 09:33:55 rillig Exp $
-
---- libxklavier/xklavier_evt_xmm.c.orig Fri Jan 7 03:58:03 2005
-+++ libxklavier/xklavier_evt_xmm.c Sun Apr 3 17:44:48 2005
-@@ -13,15 +13,16 @@ static int _XklXmmKeypressEventHandler(
- {
- if( _xklListenerType & XKLL_MANAGE_LAYOUTS )
- {
-- XklDebug( 200, "Processing the KeyPress event\n" );
- int currentShortcut = 0;
-- const XmmSwitchOptionPtr sop = _XklXmmFindSwitchOption( kpe->keycode,
-+ XmmSwitchOptionPtr sop;
-+ XklDebug( 200, "Processing the KeyPress event\n" );
-+ sop = _XklXmmFindSwitchOption( kpe->keycode,
- kpe->state,
- &currentShortcut );
- if( sop != NULL )
- {
-- XklDebug( 150, "It is THE shortcut\n" );
- XklState state;
-+ XklDebug( 150, "It is THE shortcut\n" );
- _XklXmmGetRealState( &state );
- if( state.group != -1 )
- {
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 04:33:48 +0000