[SCM] libqaccessibilityclient packaging branch, master, updated. debian/0.1.1-2-4-g9b4b009

Pino Toscano pino at moszumanska.debian.org
Tue May 31 05:39:36 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libqaccessibilityclient.git;a=commitdiff;h=bc3527a

The following commit has been merged in the master branch:
commit bc3527ad1dc7d70e3e7a128bf1f563be4ed94a72
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 31 07:37:05 2016 +0200

    link to QtGui
    
    backport upstream commit 1e1c469597e0e692caea11c89f6da831ad2410b3
---
 debian/changelog                                |  2 ++
 debian/patches/series                           |  1 +
 debian/patches/upstream_qt4-link-to-QtGui.patch | 26 +++++++++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index db882b7..5933287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libqaccessibilityclient (0.1.1-3) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Update symbols file.
+  * Backport upstream commit 1e1c469597e0e692caea11c89f6da831ad2410b3 to
+    add missing linking to QtGui; patch upstream_qt4-link-to-QtGui.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 31 May 2016 07:07:27 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index b7e163a..bc496ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 libdir.diff
+upstream_qt4-link-to-QtGui.patch
diff --git a/debian/patches/upstream_qt4-link-to-QtGui.patch b/debian/patches/upstream_qt4-link-to-QtGui.patch
new file mode 100644
index 0000000..71bc9a8
--- /dev/null
+++ b/debian/patches/upstream_qt4-link-to-QtGui.patch
@@ -0,0 +1,26 @@
+From 1e1c469597e0e692caea11c89f6da831ad2410b3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Tue, 31 May 2016 07:34:05 +0200
+Subject: [PATCH] qt4: link to QtGui
+
+QAction and QKeySequence are used, and they are in QtGui
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ed8452a..ade53e0 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -24,7 +24,7 @@ add_library(qaccessibilityclient SHARED ${QAccessibilityClient_SRCS} ${QAccessib
+ if (QT5_BUILD)
+     target_link_libraries(qaccessibilityclient ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5DBus_LIBRARIES})
+ else (QT5_BUILD)
+-    target_link_libraries(qaccessibilityclient ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY})
++    target_link_libraries(qaccessibilityclient ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY})
+ endif(QT5_BUILD)
+ 
+ set(QACCESSIBILITYCLIENT_SOVERSION ${QACCESSIBILITYCLIENT_VERSION_MAJOR})
+-- 
+2.8.1
+

-- 
libqaccessibilityclient packaging



More information about the pkg-kde-commits mailing list