reassign 309955 kdelibs
tags 309955 patch
thanks
On Sun, May 22, 2005 at 03:16:42AM +0200, Frank Lichtenheld wrote:
> With kdelibs 3.3.2-1 this builds fine. The newly introduced patch
> 22_kaccel2 in kdelibs probably causes this. Maybe it is incomplete?
> (However, I couldn't find anything particular wrong with it yet...)
>
> It was suggested to add the last part (kkeyserver_x11.h) from
> http://lists.kde.org/?l=kde-cvs&m=111210638304088&w=2 since it
> isn't included in the current patch, but that doesn't seem to
> change anything.
Argh, I should have checked for more omissions from the patch.
The attached one produces a kdelibs kdebindings can build against
again.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -Naur kdelibs-3.3.2.bak/debian/changelog kdelibs-3.3.2.nmu/debian/changelog
--- kdelibs-3.3.2.bak/debian/changelog 2005-05-21 17:36:49.000000000 +0200
+++ kdelibs-3.3.2.nmu/debian/changelog 2005-05-21 22:06:32.000000000 +0200
@@ -1,3 +1,10 @@
+kdelibs (4:3.3.2-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Export modXModeSwitch. Patch by Mattia Dongili (Closes: #309955)
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Sat, 21 May 2005 22:02:29 +0200
+
kdelibs (4:3.3.2-6) unstable; urgency=high
+++ Changes by Christopher Martin:
diff -Naur kdelibs-3.3.2.bak/debian/patches/22_kaccel2.diff
kdelibs-3.3.2.nmu/debian/patches/22_kaccel2.diff
--- kdelibs-3.3.2.bak/debian/patches/22_kaccel2.diff 2005-05-21
17:36:49.000000000 +0200
+++ kdelibs-3.3.2.nmu/debian/patches/22_kaccel2.diff 2005-05-22
22:55:51.000000000 +0200
@@ -60,3 +60,29 @@
uint accelModMaskX()
{
+--- kdelibs.orig/kdecore/kkeyserver_x11.h 2003-08-18 10:45:04.000000000
+0200
++++ kdelibs.patched/kdecore/kkeyserver_x11.h 2005-05-21 21:59:58.125989608
+0200
+@@ -303,6 +303,14 @@
+ uint modXScrollLock();
+
+ /**
++ * Returns the X11 Mode_switch modifier mask/flag.
++ * @return the X11 Mode_switch modifier mask/flag.
++ * @see accelModMaskX()
++ * @since 3.5
++ */
++ uint modXModeSwitch();
++
++ /**
+ * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and
+ * Win (if available).
+ * @see modXShift()
+--- kdelibs.orig/kdecore/kkeynative_x11.cpp 2003-06-02 09:04:39.000000000
+0200
++++ kdelibs.patched/kdecore/kkeynative_x11.cpp 2005-05-22
22:54:08.191019328 +0200
+@@ -169,5 +169,6 @@
+ uint KKeyNative::modXNumLock() { return
KKeyServer::modXNumLock(); }
+ uint KKeyNative::modXLock() { return
KKeyServer::modXLock(); }
+ uint KKeyNative::modXScrollLock() { return
KKeyServer::modXScrollLock(); }
++uint KKeyNative::modXModeSwitch() { return
KKeyServer::modXModeSwitch(); }
+
+ #endif // Q_WS_X11
