[SCM] subtitlecomposer packaging branch, master, updated. debian/0.5.7-1-14-g6239f83
Pino Toscano
pino at moszumanska.debian.org
Sun Mar 27 08:21:12 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/subtitlecomposer.git;a=commitdiff;h=cfbcc20
The following commit has been merged in the master branch:
commit cfbcc204f502889451a5bc831f3b1397e46b3e3c
Author: Pino Toscano <pino at debian.org>
Date: Sun Mar 27 10:16:40 2016 +0200
update the patches
- 0001-Link-phonon.patch: drop, fixed upstream
- 0002-Link-against-X11.patch: drop, reworking it in a new
link-x11.diff
- 0003-Find-platform-dependant-include-files-of-GStreamer.patch: drop,
fixed upstream
- 0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch: drop,
obsolete
---
debian/changelog | 7 +++
debian/patches/0001-Link-phonon.patch | 24 ---------
debian/patches/0002-Link-against-X11.patch | 27 ----------
...form-dependant-include-files-of-GStreamer.patch | 63 ----------------------
...Sonnet-Dialog-cannot-handle-empty-buffers.patch | 59 --------------------
debian/patches/link-x11.diff | 40 ++++++++++++++
debian/patches/series | 5 +-
7 files changed, 48 insertions(+), 177 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3bacd8d..36c437a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,13 @@ subtitlecomposer (0.6.2-0r1) UNRELEASED; urgency=medium
- remove unused libxml2-dev
- make pkg-config explicit
* Update the Vcs-* fields.
+ * Update the patches:
+ - 0001-Link-phonon.patch: drop, fixed upstream
+ - 0002-Link-against-X11.patch: drop, reworking it in a new link-x11.diff
+ - 0003-Find-platform-dependant-include-files-of-GStreamer.patch: drop,
+ fixed upstream
+ - 0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch: drop,
+ obsolete
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sun, 27 Mar 2016 08:57:39 +0200
diff --git a/debian/patches/0001-Link-phonon.patch b/debian/patches/0001-Link-phonon.patch
deleted file mode 100644
index 0e39077..0000000
--- a/debian/patches/0001-Link-phonon.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: =?utf-8?q?Jos=C3=A9_Manuel_Santamar=C3=ADa_Lema?= <panfaust at gmail.com>
-Date: Fri, 13 Nov 2009 18:36:09 +0000
-Subject: Link phonon
-
-This patch adds a missing link against Phonon.
-Without this patch the package will FTBFS with binutils-gold.
-
-Forwarded: not-needed
----
- src/services/phonon/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/services/phonon/CMakeLists.txt b/src/services/phonon/CMakeLists.txt
-index 96a3951..ee0d22a 100644
---- a/src/services/phonon/CMakeLists.txt
-+++ b/src/services/phonon/CMakeLists.txt
-@@ -4,3 +4,7 @@ SET( services_phonon_SRCS
- CACHE INTERNAL EXPORTEDVARIABLE
- )
-
-+SET( players_phonon_LIBS
-+ ${KDE4_PHONON_LIBS}
-+ CACHE INTERNAL EXPORTEDVARIABLE
-+)
diff --git a/debian/patches/0002-Link-against-X11.patch b/debian/patches/0002-Link-against-X11.patch
deleted file mode 100644
index f241172..0000000
--- a/debian/patches/0002-Link-against-X11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: =?utf-8?q?Jos=C3=A9_Manuel_Santamar=C3=ADa_Lema?= <panfaust at gmail.com>
-Date: Mon, 14 Oct 2013 15:29:39 +0200
-Subject: Link against X11
-
----
- src/services/xine/CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/services/xine/CMakeLists.txt b/src/services/xine/CMakeLists.txt
-index fc873eb..504cd77 100644
---- a/src/services/xine/CMakeLists.txt
-+++ b/src/services/xine/CMakeLists.txt
-@@ -1,3 +1,5 @@
-+find_package(X11)
-+
- SET( services_xine_INCLUDE_DIR
- ${XINE_INCLUDE_DIR}
- CACHE INTERNAL EXPORTEDVARIABLE
-@@ -10,7 +12,7 @@ SET( services_xine_DEFS
-
- SET( services_xine_LIBS
- ${XINE_LIBRARY}
-- -lX11
-+ ${X11_LIBRARIES}
- CACHE INTERNAL EXPORTEDVARIABLE
- )
-
diff --git a/debian/patches/0003-Find-platform-dependant-include-files-of-GStreamer.patch b/debian/patches/0003-Find-platform-dependant-include-files-of-GStreamer.patch
deleted file mode 100644
index 0c33726..0000000
--- a/debian/patches/0003-Find-platform-dependant-include-files-of-GStreamer.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin at steghoefer.eu>
-Date: Sun, 4 Oct 2015 19:02:50 +0200
-Subject: Find platform-dependant include files of GStreamer
-
-In the current -dev packages of GStreamer 1.x in Debian, the file
-"gst/gstconfig.h" is not in the same directory as the rest of the
-includes, but in a subdirectory of the library directory. However,
-the FindGStreamer.cmake file of Subtitlecomposer is only looking
-for a single include directory per component, based on the location
-of a single reference file. This patch adds the subdirectory
-"gstreamer-1.0/include" of the library dir of a component to the
-include dirs variable of the same component. This way, platform-
-dependant files like "gst/gstconfig.h" will be found, too.
-
-Forwarding is not needed, because upstream has moved on from using
-the FindGStreamer.cmake.
-
-Forwarded: not-needed
----
- src/services/FindGStreamer.cmake | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/services/FindGStreamer.cmake b/src/services/FindGStreamer.cmake
-index bf25d30..0dcc473 100644
---- a/src/services/FindGStreamer.cmake
-+++ b/src/services/FindGStreamer.cmake
-@@ -67,6 +67,14 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _librar
- NAMES ${_library}
- HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
- )
-+
-+ # Add the "gstreamer-1.0/include" sub directory of the lib path to the list of include folders
-+ # (in order to be able to resolve "gst/gstconfig.h")
-+ if(${_component_prefix}_LIBRARIES)
-+ list(GET ${_component_prefix}_LIBRARIES 0 FIRST_LIBRARY)
-+ get_filename_component(${_component_prefix}_LIBRARY_DIR ${FIRST_LIBRARY} DIRECTORY)
-+ list(APPEND ${_component_prefix}_INCLUDE_DIRS "${${_component_prefix}_LIBRARY_DIR}/gstreamer-1.0/include")
-+ endif()
- endmacro()
-
- # ------------------------
-@@ -79,8 +87,9 @@ FIND_GSTREAMER_COMPONENT(GSTREAMER_BASE gstreamer-base-1.0 gst/base/gstadapter.h
-
- # 1.2. Check GStreamer version
- if (GSTREAMER_INCLUDE_DIRS)
-- if (EXISTS "${GSTREAMER_INCLUDE_DIRS}/gst/gstversion.h")
-- file(READ "${GSTREAMER_INCLUDE_DIRS}/gst/gstversion.h" GSTREAMER_VERSION_CONTENTS)
-+ foreach (GS_INCLUDE_DIR IN LISTS GSTREAMER_INCLUDE_DIRS)
-+ if (EXISTS "${GS_INCLUDE_DIR}/gst/gstversion.h")
-+ file(READ "${GS_INCLUDE_DIR}/gst/gstversion.h" GSTREAMER_VERSION_CONTENTS)
-
- string(REGEX MATCH "#define +GST_VERSION_MAJOR +\(([0-9]+)\)" _dummy "${GSTREAMER_VERSION_CONTENTS}")
- set(GSTREAMER_VERSION_MAJOR "${CMAKE_MATCH_1}")
-@@ -92,7 +101,8 @@ if (GSTREAMER_INCLUDE_DIRS)
- set(GSTREAMER_VERSION_MICRO "${CMAKE_MATCH_1}")
-
- set(GSTREAMER_VERSION "${GSTREAMER_VERSION_MAJOR}.${GSTREAMER_VERSION_MINOR}.${GSTREAMER_VERSION_MICRO}")
-- endif ()
-+ endif ()
-+ endforeach (GS_INCLUDE_DIR)
- endif ()
-
- if ("${GStreamer_FIND_VERSION}" VERSION_GREATER "${GSTREAMER_VERSION}")
diff --git a/debian/patches/0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch b/debian/patches/0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch
deleted file mode 100644
index 1281de3..0000000
--- a/debian/patches/0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin at steghoefer.eu>
-Date: Mon, 5 Oct 2015 21:19:14 +0200
-Subject: Fix crash: Sonnet::Dialog cannot handle empty buffers.
-
-Subtitle Composer crashes on spell checking an empty subtitle.
-
-Apparently this is a general problem of Sonnet::Dialog, which cannot handle
-empty buffers. I was able to reproduce the crash outside of Subtitle Composer
-in an isolated example by passing an empty buffer to Sonnet::Dialog.
-
-Sonnet::Dialog's specification doesn't exclude empty buffers, so I consider
-this a bug in Sonnet. But even so, it might be good to work around this problem
-in Subtitle Composer, too. Even the KDE people themselves (the creators of
-Sonnet) apply that kind of workaround in their applications
-(e.g. in Kate [1] [2]).
-
-The workaround simply skips empty entries because they don't have to be
-checked anyway.
-
-Forwarding of the patch is not needed because upstream has ported the
-application to KF5, which doesn't show the problem any more.
-
-[1] https://bugs.kde.org/show_bug.cgi?id=228789
-[2] https://websvn.kde.org/trunk/KDE/kdelibs/kate/spellcheck/spellcheckdialog.cpp?r1=1103086&r2=1103085&pathrev=1103086
-
-Bug-Debian: https://bugs.debian.org/694812
-Forwarded: not-needed
----
- src/main/utils/speller.cpp | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/main/utils/speller.cpp b/src/main/utils/speller.cpp
-index 38bf100..e849541 100644
---- a/src/main/utils/speller.cpp
-+++ b/src/main/utils/speller.cpp
-@@ -110,14 +110,18 @@ Speller::onBufferDone()
- {
- // NOTE: not setting the buffer in this slots closes the dialog
-
-- if(advance()) {
-+ QString newBuffer;
-+ while(newBuffer.isEmpty() && advance()) {
- if(m_translationMode) {
- m_feedPrimaryNext = !m_feedPrimaryNext;
-- m_sonnetDialog->setBuffer(m_feedPrimaryNext ? m_iterator->current()->secondaryText().string() : m_iterator->current()->primaryText().string()
-- );
-- } else
-- m_sonnetDialog->setBuffer(m_iterator->current()->primaryText().string());
-+ newBuffer = m_feedPrimaryNext ? m_iterator->current()->secondaryText().string() : m_iterator->current()->primaryText().string();
-+ } else {
-+ newBuffer = m_iterator->current()->primaryText().string();
-+ }
- }
-+
-+ if(!newBuffer.isEmpty())
-+ m_sonnetDialog->setBuffer(newBuffer);
- }
-
- bool
diff --git a/debian/patches/link-x11.diff b/debian/patches/link-x11.diff
new file mode 100644
index 0000000..130b3c7
--- /dev/null
+++ b/debian/patches/link-x11.diff
@@ -0,0 +1,40 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix linking to X11
+ Use the FindX11.cmake module to find X11, and use the variables it provides
+ (instead of hardcoding -lX11).
+Forwarded: no
+Last-Update: 2016-03-27
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -27,6 +27,8 @@ set_package_properties(Phonon4Qt5 PROPER
+ DESCRIPTION "Qt-based audio library"
+ TYPE REQUIRED)
+
++find_package(X11 REQUIRED)
++
+ # the subdirs must be added in a specific order
+ # if one dir uses code from another, its CMakeLists.txt will reference variables
+ # defined in the dependency directory that must be created before the former
+--- a/src/main/CMakeLists.txt
++++ b/src/main/CMakeLists.txt
+@@ -50,7 +50,7 @@ target_link_libraries(subtitlecomposer
+ ${videoplayer_LIBS}
+ ${streamprocessor_LIBS}
+ ${widgets_LIBS}
+- -lX11 # xine needs XInitThreads() call in main
++ ${X11_LIBRARIES} # xine needs XInitThreads() call in main
+ )
+
+ add_definitions(
+--- a/src/videoplayerplugins/xine/CMakeLists.txt
++++ b/src/videoplayerplugins/xine/CMakeLists.txt
+@@ -8,7 +8,7 @@ set(videoplayer_xine_DEFS
+ )
+ set(videoplayer_xine_LIBS
+ ${XINE_LIBRARY}
+- -lX11
++ ${X11_LIBRARIES}
+ CACHE INTERNAL EXPORTEDVARIABLE
+ )
+ set(videoplayer_xine_SRCS
diff --git a/debian/patches/series b/debian/patches/series
index 0d23dc2..d2b8c9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-0001-Link-phonon.patch
-0002-Link-against-X11.patch
-0003-Find-platform-dependant-include-files-of-GStreamer.patch
-0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch
+link-x11.diff
--
subtitlecomposer packaging
More information about the pkg-kde-commits
mailing list