Ticket #2770: libxklavier.diff

gnome/libxklavier/Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
 name                    libxklavier
-version                 1.04
+version                 1.14
 description             libxklavier - utility library to make XKB stuff easier
 long_description        ${description}
 maintainers             gnome-darwinports@opendarwin.org
@@ -10 +10 @@
 platforms               darwin 
 homepage                http://www.freedesktop.org/Software/LibXklavier
 master_sites            sourceforge:gswitchit
-checksums               md5 322078ad3681465f69a65c0758c74460
+checksums               md5 218728a9b14d865888305194b5d5214f
+patchfiles              xklavier-darwin.diff xklavier-no-Werror.diff
 depends_lib             lib:libgailutil:gail

gnome/libxklavier/files/xklavier-darwin.diff

@@ +1 @@
+--- libxklavier/xklavier_config_xkb.c.old       Thu Feb 10 16:18:31 2005
++++ libxklavier/xklavier_config_xkb.c   Thu Feb 10 16:21:15 2005
+@@ -362,6 +362,11 @@
+   }
+ #endif
+ 
++#ifdef __APPLE__
++  /* XKB does not work on Darwin, but we pretend it does */
++  return True;
++#endif
++
+ #ifdef XKB_HEADERS_PRESENT
+   XkbComponentNamesRec componentNames;
+   memset( &componentNames, 0, sizeof( componentNames ) );

gnome/libxklavier/files/xklavier-no-Werror.diff

@@ +1 @@
+diff -ru ./libxklavier/Makefile.in ../libxklavier-1.14.bak/libxklavier/Makefile.in
+--- ./libxklavier/Makefile.in   Fri Feb 11 15:55:44 2005
++++ ../libxklavier-1.14.bak/libxklavier/Makefile.in     Fri Feb 11 15:53:32 2005
+@@ -205,7 +205,7 @@
+ @ENABLE_XKB_SUPPORT_TRUE@ENABLE_XKB_SUPPORT_CFLAG = -DENABLE_XKB_SUPPORT=1
+ @ENABLE_XMM_SUPPORT_FALSE@ENABLE_XMM_SUPPORT_CFLAG = -DDISABLE_XMM_SUPPORT=1
+ @ENABLE_XMM_SUPPORT_TRUE@ENABLE_XMM_SUPPORT_CFLAG = -DENABLE_XMM_SUPPORT=1
+-AM_CFLAGS = -Wall -Werror -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
++AM_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+   -I. -I$(includedir) $(XML_CFLAGS) -I$(x_includes) -I$(top_srcdir) \
+   $(XKB_HEADERS_PRESENT_CFLAG) \
+   $(ENABLE_XKB_SUPPORT_CFLAG) \
+diff -ru ./tests/Makefile.in ../libxklavier-1.14.bak/tests/Makefile.in
+--- ./tests/Makefile.in Fri Feb 11 15:55:45 2005
++++ ../libxklavier-1.14.bak/tests/Makefile.in   Fri Feb 11 15:53:32 2005
+@@ -188,7 +188,7 @@
+ xkbheaders_present = @xkbheaders_present@
+ test_config_SOURCES = test_config.c
+ test_monitor_SOURCES = test_monitor.c
+-AM_CFLAGS = -Wall -Werror -I$(includedir) -I$(x_includes) -I$(top_srcdir)
++AM_CFLAGS = -Wall -I$(includedir) -I$(x_includes) -I$(top_srcdir)
+ AM_LDFLAGS = $(top_builddir)/libxklavier/libxklavier.la -L$(x_libraries) -lX11
+ all: all-am
+