[PATCH] Proposed patch for XKeycodeToKeysym deprecated

[julien2412]

Hello,

In vcl, compilation of master failed with these messages :
/home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx: In function ‘KeySym sal_XModifier2Keysym(Display*, XModifierKeymap*, int)’:
/home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx:785:12: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations]
/home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx:787:32: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations]
/home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx: In member function ‘KeySym SalDisplay::GetKeySym(XKeyEvent*, unsigned char*, int*, KeySym*, int*, XIC) const’:
/home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx:1486:26: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations]
/home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx:1486:76: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations]
cc1plus: all warnings being treated as errors
make[1]: *** [/home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/vcl/unx/generic/app/saldisp.o] Erreur 1
make[1]: *** Attente des tâches non terminées....
/home/julien/compile-libreoffice/libo/vcl/unx/generic/dtrans/X11_selection.cxx: In member function ‘bool x11::SelectionManager::handleDragEvent(XEvent&)’:
/home/julien/compile-libreoffice/libo/vcl/unx/generic/dtrans/X11_selection.cxx:2734:23: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations]
/home/julien/compile-libreoffice/libo/vcl/unx/generic/dtrans/X11_selection.cxx:2734:78: error: ‘KeySym XKeycodeToKeysym(Display*, XLIB_KeyCode, int)’ is deprecated (declared at /usr/include/X11/Xlib.h:1695) [-Werror=deprecated-declarations]
cc1plus: all warnings being treated as errors
make[1]: *** [/home/julien/compile-libreoffice/libo/workdir/unxlngx6/CxxObject/vcl/unx/generic/dtrans/X11_selection.o] Erreur 1

Since /home/julien/compile-libreoffice/libo/vcl/unx/generic/app/saldisp.cxx hasn't changed recently and that compilation was OK yesterday, it must be due to my last update of Debian today (x86-64).

Xlib.h is from the package libx11-dev
The version is : 2:1.4.99.901-2

So I propose this patch : proposed_patch_vcl.txt

Any idea about this ?

Julien.

[Caolán McNamara]

On Thu, 2012-05-10 at 13:31 -0700, julien2412 wrote:
> So I propose this patch :
> http://nabble.documentfoundation.org/file/n3978158/proposed_patch_vcl.txt
> proposed_patch_vcl.txt

Looks good I think, you should push it

C.

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[julien2412]

Thank you Caolán, I pushed the patch on master (cf http://cgit.freedesktop.org/libreoffice/core/commit/?id=18e6e7d929c2be209407ed2e56b8ec4d5e6c4900)

Julien.