Package: libxklavier
Severity: normal
Version: 2.0-0.3
I've attached the patch for the 2.0-0.3 libxklavier NMU I'm uploading
soon.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
diff -urN libxklavier-2.0.old/debian/changelog libxklavier-2.0/debian/changelog
--- libxklavier-2.0.old/debian/changelog 2006-01-06 16:58:22.000000000 +0100
+++ libxklavier-2.0/debian/changelog 2006-01-06 16:50:25.000000000 +0100
@@ -1,3 +1,12 @@
+libxklavier (2.0-0.3) unstable; urgency=low
+
+ * NMU.
+ * Apply patch from Andreas Jochens to fix failure to build with gcc-4.0.
+ Closes: #314271.
+ * Drop bogus Build-Depends on xlibs.
+
+ -- Daniel Schepler <[EMAIL PROTECTED]> Fri, 6 Jan 2006 16:50:25 +0100
+
libxklavier (2.0-0.2) unstable; urgency=low
* Non-maintainer upload.
diff -urN libxklavier-2.0.old/debian/control libxklavier-2.0/debian/control
--- libxklavier-2.0.old/debian/control 2006-01-06 16:58:22.000000000 +0100
+++ libxklavier-2.0/debian/control 2006-01-06 16:49:11.000000000 +0100
@@ -2,7 +2,7 @@
Priority: optional
Section: libs
Maintainer: Filip Van Raemdonck <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>> 4), doxygen, libxml2-dev, pkg-config, xlibs, xlibs-static-dev | xlibs-dev (<< 4.3.0), libxt-dev | xlibs-dev (<< 4.3.0)
+Build-Depends: cdbs, debhelper (>> 4), doxygen, libxml2-dev, pkg-config, xlibs-static-dev | xlibs-dev (<< 4.3.0), libxt-dev | xlibs-dev (<< 4.3.0)
Standards-Version: 3.6.1.0
Package: libxklavier10
diff -urN libxklavier-2.0.old/libxklavier/xklavier_config.c libxklavier-2.0/libxklavier/xklavier_config.c
--- libxklavier-2.0.old/libxklavier/xklavier_config.c 2004-11-20 00:42:44.000000000 +0100
+++ libxklavier-2.0/libxklavier/xklavier_config.c 2006-01-06 16:51:16.000000000 +0100
@@ -29,9 +29,9 @@
static xmlChar *_XklNodeGetXmlLangAttr( xmlNodePtr nptr )
{
if( nptr->properties != NULL &&
- !strcmp( "lang", nptr->properties[0].name ) &&
+ !strcmp( "lang", (char*)nptr->properties[0].name ) &&
nptr->properties[0].ns != NULL &&
- !strcmp( "xml", nptr->properties[0].ns->prefix ) &&
+ !strcmp( "xml", (char*)nptr->properties[0].ns->prefix ) &&
nptr->properties[0].children != NULL )
return nptr->properties[0].children->content;
else
@@ -56,7 +56,7 @@
switch ( ptr->type )
{
case XML_ELEMENT_NODE:
- if( !strcmp( ptr->name, "configItem" ) )
+ if( !strcmp( (char*)ptr->name, "configItem" ) )
break;
return False;
case XML_TEXT_NODE:
@@ -85,21 +85,21 @@
if( lang != NULL )
{
- int priority = _XklGetLanguagePriority( lang );
- if( !strcmp( nptr->name, "description" ) && ( priority > maxDescPriority ) ) /* higher priority */
+ int priority = _XklGetLanguagePriority( (char*)lang );
+ if( !strcmp( (char*)nptr->name, "description" ) && ( priority > maxDescPriority ) ) /* higher priority */
{
descElement = nptr;
maxDescPriority = priority;
- } else if( !strcmp( nptr->name, "shortDescription" ) && ( priority > maxShortDescPriority ) ) /* higher priority */
+ } else if( !strcmp( (char*)nptr->name, "shortDescription" ) && ( priority > maxShortDescPriority ) ) /* higher priority */
{
shortDescElement = nptr;
maxShortDescPriority = priority;
}
} else
{
- if( !strcmp( nptr->name, "description" ) )
+ if( !strcmp( (char*)nptr->name, "description" ) )
ntDescElement = nptr;
- else if( !strcmp( nptr->name, "shortDescription" ) )
+ else if( !strcmp( (char*)nptr->name, "shortDescription" ) )
ntShortDescElement = nptr;
}
}
@@ -118,12 +118,12 @@
*/
if( nameElement != NULL && nameElement->children != NULL )
- strncat( pci->name, nameElement->children->content,
+ strncat( pci->name, (char*)nameElement->children->content,
XKL_MAX_CI_NAME_LENGTH - 1 );
if( shortDescElement != NULL && shortDescElement->children != NULL )
{
- char * lsd = _XklLocaleFromUtf8( shortDescElement->children->content );
+ char * lsd = _XklLocaleFromUtf8( (char*)shortDescElement->children->content );
strncat( pci->shortDescription,
lsd,
XKL_MAX_CI_SHORT_DESC_LENGTH - 1 );
@@ -132,7 +132,7 @@
if( descElement != NULL && descElement->children != NULL )
{
- char * ld = _XklLocaleFromUtf8( descElement->children->content );
+ char * ld = _XklLocaleFromUtf8( (char*)descElement->children->content );
strncat( pci->description,
ld,
XKL_MAX_CI_DESC_LENGTH - 1 );
@@ -185,7 +185,7 @@
if( !_XklConfigRegistryIsInitialized( ) )
return;
snprintf( xpathExpr, sizeof xpathExpr, format, value );
- xpathObj = xmlXPathEval( xpathExpr, theRegistry.xpathContext );
+ xpathObj = xmlXPathEval( (unsigned char*)xpathExpr, theRegistry.xpathContext );
if( xpathObj != NULL )
{
_XklConfigEnumFromNodeSet( xpathObj->nodesetval, func, userData );
@@ -207,7 +207,7 @@
return False;
snprintf( xpathExpr, sizeof xpathExpr, format, arg1, ptr->name );
- xpathObj = xmlXPathEval( xpathExpr, theRegistry.xpathContext );
+ xpathObj = xmlXPathEval( (unsigned char*)xpathExpr, theRegistry.xpathContext );
if( xpathObj == NULL )
return False;
@@ -364,10 +364,10 @@
void XklConfigInit( void )
{
xmlXPathInit( );
- modelsXPath = xmlXPathCompile( "/xkbConfigRegistry/modelList/model" );
- layoutsXPath = xmlXPathCompile( "/xkbConfigRegistry/layoutList/layout" );
+ modelsXPath = xmlXPathCompile( (unsigned char*)"/xkbConfigRegistry/modelList/model" );
+ layoutsXPath = xmlXPathCompile( (unsigned char*)"/xkbConfigRegistry/layoutList/layout" );
optionGroupsXPath =
- xmlXPathCompile( "/xkbConfigRegistry/optionList/group" );
+ xmlXPathCompile( (unsigned char*)"/xkbConfigRegistry/optionList/group" );
_XklI18NInit( );
_XklEnsureVTableInited();
@@ -455,10 +455,10 @@
{
Bool allowMC = True;
xmlChar *allowMCS =
- xmlGetProp( *theNodePtr, "allowMultipleSelection" );
+ xmlGetProp( *theNodePtr, (unsigned char*)"allowMultipleSelection" );
if( allowMCS != NULL )
{
- allowMC = strcmp( "false", allowMCS );
+ allowMC = strcmp( "false", (char*)allowMCS );
xmlFree( allowMCS );
}
@@ -516,11 +516,11 @@
if( rv && allowMultipleSelection != NULL )
{
- xmlChar *val = xmlGetProp( node, "allowMultipleSelection" );
+ xmlChar *val = xmlGetProp( node, (unsigned char*)"allowMultipleSelection" );
*allowMultipleSelection = False;
if( val != NULL )
{
- *allowMultipleSelection = !strcmp( val, "true" );
+ *allowMultipleSelection = !strcmp( (char*)val, "true" );
xmlFree( val );
}
}
diff -urN libxklavier-2.0.old/libxklavier/xklavier_private_xmm.h libxklavier-2.0/libxklavier/xklavier_private_xmm.h
--- libxklavier-2.0.old/libxklavier/xklavier_private_xmm.h 2005-01-07 15:17:33.000000000 +0100
+++ libxklavier-2.0/libxklavier/xklavier_private_xmm.h 2006-01-06 16:51:16.000000000 +0100
@@ -35,11 +35,11 @@
extern const char* _XklXmmGetCurrentShortcutOptionName( void );
-extern const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut( void );
+extern XmmSwitchOptionPtr _XklXmmGetCurrentShortcut( void );
extern void _XklXmmActualizeGroup( int group );
-extern const XmmSwitchOptionPtr _XklXmmFindSwitchOption( unsigned keycode,
+extern XmmSwitchOptionPtr _XklXmmFindSwitchOption( unsigned keycode,
unsigned state,
int * currentShortcut_rv );
diff -urN libxklavier-2.0.old/libxklavier/xklavier_util.c libxklavier-2.0/libxklavier/xklavier_util.c
--- libxklavier-2.0.old/libxklavier/xklavier_util.c 2004-12-09 00:33:45.000000000 +0100
+++ libxklavier-2.0/libxklavier/xklavier_util.c 2006-01-06 16:51:16.000000000 +0100
@@ -27,7 +27,7 @@
if( Success == XGetWindowProperty( _xklDpy, w, _xklAtoms[WM_NAME], 0L,
-1L, False, XA_STRING, &type_ret,
&format_ret, &nitems, &rest, &prop ) )
- return prop;
+ return (char*)prop;
else
return NULL;
}
@@ -178,7 +178,7 @@
Window _XklGetRegisteredParent( Window win )
{
Window parent = ( Window ) NULL, rw = ( Window ) NULL, *children = NULL;
- unsigned nchildren = 0;
+ int nchildren = 0;
_xklLastErrorCode =
_XklStatusQueryTree( _xklDpy, win, &rw, &parent, &children, &nchildren );
@@ -205,7 +205,7 @@
w,
root_return,
parent_return,
- children_return, nchildren_return );
+ children_return, (unsigned*)nchildren_return );
if( !result )
{
XklDebug( 160,
diff -urN libxklavier-2.0.old/libxklavier/xklavier_xmm.c libxklavier-2.0/libxklavier/xklavier_xmm.c
--- libxklavier-2.0.old/libxklavier/xklavier_xmm.c 2005-01-07 15:20:23.000000000 +0100
+++ libxklavier-2.0/libxklavier/xklavier_xmm.c 2006-01-06 16:51:16.000000000 +0100
@@ -63,7 +63,7 @@
}
}
-const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
+XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
{
const char* optionName = _XklXmmGetCurrentShortcutOptionName();
XklDebug( 150, "Configured switch option: [%s]\n", optionName );
@@ -94,7 +94,7 @@
return NULL;
}
-const XmmSwitchOptionPtr _XklXmmFindSwitchOption( unsigned keycode,
+XmmSwitchOptionPtr _XklXmmFindSwitchOption( unsigned keycode,
unsigned state,
int* currentShortcut_rv )
{
