[SCM] qt-gstreamer packaging branch, kubuntu_unstable, updated. debian/1.2.0-3-12-g28b0a15

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qt-gstreamer.git;a=commitdiff;h=28b0a15

The following commit has been merged in the kubuntu_unstable branch:
commit 28b0a154fbd5e19b3a31a31b65311c1ea26a95d3
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Oct 5 09:28:15 2015 +0200

    remove upstreamed patch
---
 debian/patches/find_gstconfig_properly.diff | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/debian/patches/find_gstconfig_properly.diff b/debian/patches/find_gstconfig_properly.diff
deleted file mode 100644
index 7371a93..0000000
--- a/debian/patches/find_gstconfig_properly.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: apply gstreamer pkg-config definitions
- To ensure gstreamer builds correctly, pick up its cflags in FindGstreamer
- and apply them to the build as definitions
-Author: José Manuel Santamaría <panfaust at gmail.com>
-Origin: vendor, https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
-Forwarded: https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html
-Reviewed-by: Harald Sitter <sitter at kde.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cmake/modules/FindGStreamer.cmake
-+++ b/cmake/modules/FindGStreamer.cmake
-@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND)
-     exec_program(${PKG_CONFIG_EXECUTABLE}
-                  ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION}
-                  OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR)
-+    set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
- endif()
- 
- find_library(GSTREAMER_LIBRARY
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,6 +106,7 @@ find_package(GObject)
- macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE)
- 
- set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES})
-+add_definitions(${GSTREAMER_DEFINITIONS})
- include(CheckCXXSourceCompiles)
- check_cxx_source_compiles("
- #include <QtCore/QtGlobal>

-- 
qt-gstreamer packaging