rev 8988 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Thu Jan 17 19:07:26 UTC 2008
Author: fabo
Date: 2008-01-17 19:07:25 +0000 (Thu, 17 Jan 2008)
New Revision: 8988
Added:
trunk/packages/qt4-x11/debian/patches/0206-fix-meta-modifier.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/patches/series
Log:
* 0206-fix-meta-modifier
Fix handling of the Meta modifier
* Add ${shlibs:Depends} to libqt4-dev. See missing shared library
dependencies thread on debian-devel mailing list.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2008-01-17 18:45:56 UTC (rev 8987)
+++ trunk/packages/qt4-x11/debian/changelog 2008-01-17 19:07:25 UTC (rev 8988)
@@ -1,8 +1,13 @@
qt4-x11 (4.3.3-3) UNRELEASED; urgency=low
- * Add 0205-fast-qpixmap-fill qt-copy patch:
- Fix a performance issue in QPixmap::fill()
+ * Add qt-copy patches:
+ * 0205-fast-qpixmap-fill
+ Fix a performance issue in QPixmap::fill()
+ * 0206-fix-meta-modifier
+ Fix handling of the Meta modifier
* Refresh and enable 0172-prefer-xrandr-over-xinerama patch.
+ * Add ${shlibs:Depends} to libqt4-dev. See missing shared library
+ dependencies thread on debian-devel mailing list.
-- Fathi Boudra <fabo at debian.org> Wed, 02 Jan 2008 09:45:31 +0100
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2008-01-17 18:45:56 UTC (rev 8987)
+++ trunk/packages/qt4-x11/debian/control 2008-01-17 19:07:25 UTC (rev 8988)
@@ -10,7 +10,7 @@
Package: libqt4-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, libqt4-core (= ${binary:Version}), libqt4-gui (= ${binary:Version}), libqt4-sql (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, libpq-dev, libglib2.0-dev, libsqlite0-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${binary:Version}), libqt4-gui (= ${binary:Version}), libqt4-sql (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, libpq-dev, libglib2.0-dev, libsqlite0-dev
Conflicts: qt3-dev-tools (<= 3:3.3.4-7)
Suggests: qt4-dev-tools, qt4-doc
Description: Qt 4 development files
Added: trunk/packages/qt4-x11/debian/patches/0206-fix-meta-modifier.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0206-fix-meta-modifier.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0206-fix-meta-modifier.diff 2008-01-17 19:07:25 UTC (rev 8988)
@@ -0,0 +1,37 @@
+qt-bugs@ issue : 194970
+Trolltech task ID : 195021
+bugs.kde.org number : 155033
+applied: no
+author: Lubos Lunak <l.lunak at kde.org>
+os: unix
+
+Fix detecting Meta key when Meta_L or Meta_R is the same modifier like Alt_L/Alt_R
+and the physical keys actually report Super_L/Super_R.
+
+--- a/src/gui/kernel/qkeymapper_x11.cpp
++++ b/src/gui/kernel/qkeymapper_x11.cpp
+@@ -534,9 +534,8 @@
+ keyboardInputDirection = Qt::LeftToRight;
+ }
+
+- // set default modifier masks
+- qt_alt_mask = Mod1Mask;
+- qt_meta_mask = Mod4Mask;
++ qt_alt_mask = 0;
++ qt_meta_mask = 0;
+ qt_super_mask = 0;
+ qt_hyper_mask = 0;
+ qt_mode_switch_mask = 0;
+@@ -611,6 +610,12 @@
+ #endif
+ }
+
++ // set default modifier masks if needed
++ if( qt_alt_mask == 0 )
++ qt_alt_mask = Mod1Mask;
++ if( qt_meta_mask == 0 )
++ qt_meta_mask = Mod4Mask;
++
+ // if we don't have a meta key (or it's hidden behind alt), use super or hyper to generate
+ // Qt::Key_Meta and Qt::MetaModifier, since most newer XFree86/Xorg installations map the Windows
+ // key to Super
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2008-01-17 18:45:56 UTC (rev 8987)
+++ trunk/packages/qt4-x11/debian/patches/series 2008-01-17 19:07:25 UTC (rev 8988)
@@ -15,6 +15,7 @@
0203-qtexthtmlparser-link-color.diff
0204-fix-tulip-aliasing.diff
0205-fast-qpixmap-fill.diff
+0206-fix-meta-modifier.diff
# debian patches
01_qmake_for_debian.diff
More information about the pkg-kde-commits
mailing list