X Strike Force X.Org X11 SVN commit: r277 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-06-26 15:12:53 -0500 (Sun, 26 Jun 2005)
New Revision: 277
Modified:
trunk/debian/TODO
trunk/debian/patches/055_lnx_evdev_keyboard.diff
Log:
- Patch audit.
- 055_lnx_evdev_keyboard.diff present, ported, and updated. I've re-added
a status message in the patch that was removed.
- 057_X11.tmpl_warning_fix.diff present, ported, and updated.
- 058_external_XrenderXftXcursor_X11.tmpl.diff present, ported, and
massively updated. Cursory glance appears fine.
- 062_make_libGL_PIC_compliant.diff present, ported, and updated.
- 065_Xft1_manpage_conflict.diff present, ported, and updated.
- 068_fix_InstallAppDefFiles_screwage.diff present, ported, and updated.
- 070_fbdevhw_device_node_warnings.diff present and ported.
- 073_xev_flush_standard_output.diff present and ported.
- 075_elographics_improve_manpage.diff present and ported.
- 076_xfree86_server_fix_aout_loader_include.diff present and ported.
- 078_xdm_log_sourcing_better.diff present and ported. Some minor changes
not worth reverting.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-06-26 19:31:02 UTC (rev 276)
+++ trunk/debian/TODO 2005-06-26 20:12:53 UTC (rev 277)
@@ -57,26 +57,16 @@
049_Xserver_recognize_Linux_2.6_proc_bus_pci.diff
050_fix_lnx_io_kbd_rate_fix.diff
052_glint_fix_unresolved_symbols.diff
-055_lnx_evdev_keyboard.diff
056_xdmcp_Wrap.h_fixes.diff
-057_X11.tmpl_warning_fix.diff
061_savage_driver_1.1.27t.diff
-062_make_libGL_PIC_compliant.diff
063_fix_weak_deps.diff
064_remove_duplicate_XShm_prototype.diff
-065_Xft1_manpage_conflict.diff
066_XKB_recognize_keypad_period_on_ABNT2_keyboards.diff
067_fix_X11_and_xdm_build_problems.diff
-068_fix_InstallAppDefFiles_screwage.diff
-070_fbdevhw_device_node_warnings.diff
071_nonexecutable_malloced_mem.diff
072_Xserver_fb_convert_RGB_to_BGR.diff
-073_xev_flush_standard_output.diff
074_freetype_fix_underlining.diff
-075_elographics_improve_manpage.diff
-076_xfree86_server_fix_aout_loader_include.diff
077_xdm_honor_request_port_zero.diff
-078_xdm_log_sourcing_better.diff
079_ati_radeon_fix_power_resume.diff
080_pci_isolate_device_feature.diff
081_xkb_fix_AB10_minus_underscore_on_hr.diff
Modified: trunk/debian/patches/055_lnx_evdev_keyboard.diff
===================================================================
--- trunk/debian/patches/055_lnx_evdev_keyboard.diff 2005-06-26 19:31:02 UTC (rev 276)
+++ trunk/debian/patches/055_lnx_evdev_keyboard.diff 2005-06-26 20:12:53 UTC (rev 277)
@@ -7,7 +7,7 @@
Copyright 2003 Zephaniah E. Hull.
Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
+ copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
@@ -33,8 +33,8 @@
diff -ruN xc-old/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c
---- xc-old/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-11-12 12:37:42.000000000 +0100
-+++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2004-11-12 12:46:15.515453024 +0100
+--- xc-old/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2005-06-26 15:35:18.000000000 -0400
++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2005-06-26 15:46:20.000000000 -0400
@@ -22,6 +22,7 @@
#include "xf86OSKbd.h"
#include "atKeynames.h"
@@ -54,7 +54,7 @@
{
KbdDevPtr pKbd = pInfo->private;
-@@ -543,3 +544,380 @@
+@@ -543,3 +544,382 @@
#endif
return TRUE;
}
@@ -375,6 +375,8 @@
+
+ pKbd->private = evdevKbd = xcalloc(sizeof(evdevKbdRec), 1);
+
++ xf86Msg(X_ERROR, "%s: pInfo->dev: %p\n", pInfo->name, pInfo->dev);
++
+ if (pKbd->private == NULL) {
+ xf86Msg(X_ERROR, "%s: cannot allocate buffer\n", pInfo->name);
+ return FALSE;
Reply to: