[SCM] qtbase packaging branch, experimental, updated. debian/5.2.1+dfsg-3-13-g06c8a6e

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Sat May 17 23:56:51 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=e8783eb

The following commit has been merged in the experimental branch:
commit e8783eba34bed4bb0c6a3ee2a2b63f94420ae93f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Apr 25 12:07:04 2014 +0400

    Link with libxkbcommon-x11 as well (thanks Timo Jyrinki).
---
 debian/patches/Add_better_support_for_keymap_update_handling.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/Add_better_support_for_keymap_update_handling.patch b/debian/patches/Add_better_support_for_keymap_update_handling.patch
index 4a23dc2..66ce355 100644
--- a/debian/patches/Add_better_support_for_keymap_update_handling.patch
+++ b/debian/patches/Add_better_support_for_keymap_update_handling.patch
@@ -659,7 +659,7 @@ Change-Id: I4d402668cda2126ef180b27022154f96b1874b1d
 -    } else {
 -        LIBS += -lxcb-xkb
 -    }
-+    !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb
++    !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb -lxkbcommon-x11
  }
  
  # libxkbcommon

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list