qt5 incorrect sed for xkb

[ken@…]

In both qt5 and qt5alternate we have the following sed to fix unused definitions which were eventually removed in xkb-1.6.0:

sed -i '276,279d' qtbase/src/platformsupport/input/xkbcommon/qxkbcommon.cpp

That results in the following diff:

@@ -273,10 +273,6 @@
         Xkb2Qt<XKB_KEY_dead_U,                  Qt::Key_Dead_U>,
         Xkb2Qt<XKB_KEY_dead_small_schwa,        Qt::Key_Dead_Small_Schwa>,
         Xkb2Qt<XKB_KEY_dead_capital_schwa,      Qt::Key_Dead_Capital_Schwa>,
-        Xkb2Qt<XKB_KEY_dead_greek,              Qt::Key_Dead_Greek>,
-        Xkb2Qt<XKB_KEY_dead_lowline,            Qt::Key_Dead_Lowline>,
-        Xkb2Qt<XKB_KEY_dead_aboveverticalline,  Qt::Key_Dead_Aboveverticalline>,
-        Xkb2Qt<XKB_KEY_dead_belowverticalline,  Qt::Key_Dead_Belowverticalline>,
         Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>,
 
         // Special keys from X.org - This include multimedia keys,

The dead greek key is still present in xkb, but dead longsolidusoverlay is not.

Looks to me like an off-by-one in the sed which should delete lines 277 to 280.

This broke my build of qt5, but the change to the book was made just over 2 months ago so I don't understand why nobody else has hit this ?

[Douglas R. Reno]

Hi Ken,

Can you make sure that you're applying that sed before the KF5 patch? The KF5 patch adds a line, which would make it off-by-one

[ken@…]

Replying to Douglas R. Reno:

Hi Ken,

Can you make sure that you're applying that sed before the KF5 patch? The KF5 patch adds a line, which would make it off-by-one

Thanks, that explains it.