summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/libxklavier/Makefile9
-rw-r--r--x11/libxklavier/PLIST25
-rw-r--r--x11/libxklavier/buildlink3.mk5
-rw-r--r--x11/libxklavier/distinfo15
-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
8 files changed, 73 insertions, 71 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index b69f6eedf6f..72c550d0696 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2006/03/12 11:18:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2006/09/15 15:11:52 jmmv Exp $
#
-DISTNAME= libxklavier-2.2
+DISTNAME= libxklavier-3.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gswitchit/}
MAINTAINER= jmmv@NetBSD.org
-HOMEPAGE= http://pdx.freedesktop.org/Software/LibXklavier
+HOMEPAGE= http://freedesktop.org/Software/LibXklavier
COMMENT= High-level API for the X Keyboard Extension (XKB)
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -22,6 +22,9 @@ CONFIGURE_ARGS+= --enable-xmm-support
BUILDLINK_TRANSFORM+= rm:-Werror
+BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
+
+.include "../../devel/glib2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxklavier/PLIST b/x11/libxklavier/PLIST
index 2b4e26c7b9e..ec82bb4119b 100644
--- a/x11/libxklavier/PLIST
+++ b/x11/libxklavier/PLIST
@@ -1,8 +1,29 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:10:05 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/09/15 15:11:52 jmmv Exp $
+include/libxklavier/xkl_config_item.h
+include/libxklavier/xkl_config_rec.h
+include/libxklavier/xkl_config_registry.h
+include/libxklavier/xkl_engine.h
+include/libxklavier/xkl_engine_marshal.h
include/libxklavier/xklavier.h
-include/libxklavier/xklavier_config.h
lib/libxklavier.la
lib/pkgconfig/libxklavier.pc
+share/gtk-doc/html/libxklavier/ch01.html
+share/gtk-doc/html/libxklavier/ch02.html
+share/gtk-doc/html/libxklavier/home.png
+share/gtk-doc/html/libxklavier/index.html
+share/gtk-doc/html/libxklavier/index.sgml
+share/gtk-doc/html/libxklavier/left.png
+share/gtk-doc/html/libxklavier/libxklavier-XklConfigItem.html
+share/gtk-doc/html/libxklavier/libxklavier-XklConfigRec.html
+share/gtk-doc/html/libxklavier/libxklavier-XklConfigRegistry.html
+share/gtk-doc/html/libxklavier/libxklavier-XklEngine.html
+share/gtk-doc/html/libxklavier/libxklavier-xklavier.html
+share/gtk-doc/html/libxklavier/libxklavier.devhelp
+share/gtk-doc/html/libxklavier/libxklavier.devhelp2
+share/gtk-doc/html/libxklavier/right.png
+share/gtk-doc/html/libxklavier/style.css
+share/gtk-doc/html/libxklavier/up.png
share/libxklavier/xfree86.xml
@dirrm share/libxklavier
+@dirrm share/gtk-doc/html/libxklavier
@dirrm include/libxklavier
diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk
index fdcfb5ceef4..9ec7a611a22 100644
--- a/x11/libxklavier/buildlink3.mk
+++ b/x11/libxklavier/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/09/15 15:11:52 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBXKLAVIER_BUILDLINK3_MK:= ${LIBXKLAVIER_BUILDLINK3_MK}+
@@ -12,8 +12,7 @@ BUILDLINK_PACKAGES+= libxklavier
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libxklavier
.if !empty(LIBXKLAVIER_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=2.0
-BUILDLINK_ABI_DEPENDS.libxklavier?= libxklavier>=2.0nb1
+BUILDLINK_API_DEPENDS.libxklavier+= libxklavier>=3.0
BUILDLINK_PKGSRCDIR.libxklavier?= ../../x11/libxklavier
.endif # LIBXKLAVIER_BUILDLINK3_MK
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index f4a5d242e6b..5e5ade0e0f3 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.13 2006/03/12 11:18:11 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2006/09/15 15:11:52 jmmv Exp $
-SHA1 (libxklavier-2.2.tar.gz) = f4f125ac71b734369b1e1cc843a357005c57355d
-RMD160 (libxklavier-2.2.tar.gz) = 875a14ee466133f033266924de4d95749d1a434f
-Size (libxklavier-2.2.tar.gz) = 467577 bytes
-SHA1 (patch-aa) = bbb3a2d342e434eb06890ed5a3f26b3b753cc46b
-SHA1 (patch-ab) = e548e2117cad11e8171a0bd9c490d11a326e43a3
-SHA1 (patch-ac) = 4b7cdba5dbd93d8342b96865f7f046b579677a80
-SHA1 (patch-ad) = 7cb35743da121ebed70bf4c488a61c2016c3b352
+SHA1 (libxklavier-3.0.tar.gz) = 22e4499d86abc4afc9fe1d6a07b29fafa782cc78
+RMD160 (libxklavier-3.0.tar.gz) = 7835f0a4369198a9fc91077687917c2b29b05d80
+Size (libxklavier-3.0.tar.gz) = 460992 bytes
+SHA1 (patch-aa) = 83ae57cc299371f67a93a74e728443343e03a8b4
+SHA1 (patch-ab) = c517c6d4f8a2ff92d49f58104fcb80de26cbf242
+SHA1 (patch-ac) = 220d519659bf40305093b52617ccaab905f1341d
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 2024-12-29 15:28:54 +0000