Accepting request 712547 from KDE:Extra
OBS-URL: https://build.opensuse.org/request/show/712547 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subtitlecomposer?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
62909ba901
@ -1,155 +0,0 @@
|
||||
From cca0ff13c5bab516c073f9457277bdbf5fe1fd9a Mon Sep 17 00:00:00 2001
|
||||
From: Martchus <martchus@gmx.net>
|
||||
Date: Sun, 10 Jun 2018 21:34:29 +0200
|
||||
Subject: [PATCH] Use target_link_libraries instead of qt5_use_modules
|
||||
|
||||
The qt5_use_modules macro is deprecated and even no longer
|
||||
available in Qt 5.11.0.
|
||||
---
|
||||
src/CMakeLists.txt | 4 ++--
|
||||
src/core/tests/CMakeLists.txt | 12 ++++--------
|
||||
src/speechplugins/pocketsphinx/CMakeLists.txt | 3 +--
|
||||
src/videoplayerplugins/gstreamer/CMakeLists.txt | 3 +--
|
||||
src/videoplayerplugins/mplayer/CMakeLists.txt | 4 +---
|
||||
src/videoplayerplugins/mpv/CMakeLists.txt | 3 +--
|
||||
src/videoplayerplugins/phonon/CMakeLists.txt | 3 +--
|
||||
src/videoplayerplugins/xine/CMakeLists.txt | 3 +--
|
||||
8 files changed, 12 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index aac9147..4f8223a 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -100,8 +100,6 @@ ki18n_wrap_ui(subtitlecomposer_SRCS
|
||||
|
||||
add_executable(subtitlecomposer ${subtitlecomposer_SRCS})
|
||||
|
||||
-qt5_use_modules(subtitlecomposer Core Widgets)
|
||||
-
|
||||
# Xine videoplayer plugin needs XInitThreads() call in main
|
||||
# optional since Xine will not be built without X11
|
||||
find_package(X11 QUIET)
|
||||
@@ -117,6 +115,8 @@ target_link_libraries(subtitlecomposer
|
||||
${widgets_LIBS}
|
||||
${X11_LIBRARIES}
|
||||
${FFMPEG_LIBRARIES}
|
||||
+ Qt5::Core
|
||||
+ Qt5::Widgets
|
||||
)
|
||||
|
||||
add_definitions(
|
||||
diff --git a/src/core/tests/CMakeLists.txt b/src/core/tests/CMakeLists.txt
|
||||
index 1ef64c0..71c3c99 100644
|
||||
--- a/src/core/tests/CMakeLists.txt
|
||||
+++ b/src/core/tests/CMakeLists.txt
|
||||
@@ -10,26 +10,22 @@ set(rangelisttest_SRCS rangelisttest.cpp)
|
||||
add_executable(core-rangelisttest ${rangelisttest_SRCS})
|
||||
add_test(subtitlecomposer core-rangelisttest)
|
||||
ecm_mark_as_test(core-rangelisttest)
|
||||
-target_link_libraries(core-rangelisttest ${subtitlecomposer_LIBS})
|
||||
-qt5_use_modules(core-rangelisttest Core Test)
|
||||
+target_link_libraries(core-rangelisttest ${subtitlecomposer_LIBS} Qt5::Core Qt5::Test)
|
||||
|
||||
set(rangetest_SRCS rangetest.cpp)
|
||||
add_executable(core-rangetest ${rangetest_SRCS})
|
||||
add_test(subtitlecomposer core-rangetest)
|
||||
ecm_mark_as_test(core-rangetest)
|
||||
-target_link_libraries(core-rangetest ${subtitlecomposer_LIBS})
|
||||
-qt5_use_modules(core-rangetest Core Test)
|
||||
+target_link_libraries(core-rangetest ${subtitlecomposer_LIBS} Qt5::Core Qt5::Test)
|
||||
|
||||
set(timetest_SRCS ../time.cpp timetest.cpp)
|
||||
add_executable(core-timetest ${timetest_SRCS})
|
||||
add_test(subtitlecomposer core-timetest)
|
||||
ecm_mark_as_test(core-timetest)
|
||||
-target_link_libraries(core-timetest ${subtitlecomposer_LIBS})
|
||||
-qt5_use_modules(core-timetest Core Test)
|
||||
+target_link_libraries(core-timetest ${subtitlecomposer_LIBS} Qt5::Core Qt5::Test)
|
||||
|
||||
set(sstringtest_SRCS ../sstring.cpp sstringtest.cpp)
|
||||
add_executable(core-sstringtest ${sstringtest_SRCS})
|
||||
add_test(subtitlecomposer core-sstringtest)
|
||||
ecm_mark_as_test(core-sstringtest)
|
||||
-target_link_libraries(core-sstringtest ${subtitlecomposer_LIBS})
|
||||
-qt5_use_modules(core-sstringtest Core Test)
|
||||
+target_link_libraries(core-sstringtest ${subtitlecomposer_LIBS} Qt5::Core Qt5::Test)
|
||||
diff --git a/src/speechplugins/pocketsphinx/CMakeLists.txt b/src/speechplugins/pocketsphinx/CMakeLists.txt
|
||||
index 2420c5c..bad266f 100644
|
||||
--- a/src/speechplugins/pocketsphinx/CMakeLists.txt
|
||||
+++ b/src/speechplugins/pocketsphinx/CMakeLists.txt
|
||||
@@ -29,8 +29,7 @@ install(TARGETS pocketsphinxasr DESTINATION ${SC_PLUGIN_INSTALL_DIR})
|
||||
|
||||
target_include_directories(pocketsphinxasr SYSTEM PRIVATE ${speech_pocketsphinx_INCLUDE_DIRS})
|
||||
set_target_properties(pocketsphinxasr PROPERTIES COMPILE_FLAGS "${speech_pocketsphinx_DEFS}")
|
||||
-target_link_libraries(pocketsphinxasr ${subtitlecomposer_LIBS} ${speech_pocketsphinx_LIBS})
|
||||
-qt5_use_modules(pocketsphinxasr Core)
|
||||
+target_link_libraries(pocketsphinxasr ${subtitlecomposer_LIBS} ${speech_pocketsphinx_LIBS} Qt5::Core)
|
||||
|
||||
add_dependencies(pocketsphinxasr subtitlecomposer)
|
||||
|
||||
diff --git a/src/videoplayerplugins/gstreamer/CMakeLists.txt b/src/videoplayerplugins/gstreamer/CMakeLists.txt
|
||||
index 90de462..3f61dde 100644
|
||||
--- a/src/videoplayerplugins/gstreamer/CMakeLists.txt
|
||||
+++ b/src/videoplayerplugins/gstreamer/CMakeLists.txt
|
||||
@@ -45,7 +45,6 @@ install(TARGETS gstplayer DESTINATION ${SC_PLUGIN_INSTALL_DIR})
|
||||
|
||||
target_include_directories(gstplayer SYSTEM PRIVATE ${videoplayer_gstreamer_INCLUDE_DIR})
|
||||
set_target_properties(gstplayer PROPERTIES COMPILE_FLAGS "${videoplayer_gstreamer_DEFS}")
|
||||
-target_link_libraries(gstplayer ${subtitlecomposer_LIBS} ${videoplayer_gstreamer_LIBS})
|
||||
-qt5_use_modules(gstplayer Core)
|
||||
+target_link_libraries(gstplayer ${subtitlecomposer_LIBS} ${videoplayer_gstreamer_LIBS} Qt5::Core)
|
||||
|
||||
add_dependencies(gstplayer subtitlecomposer)
|
||||
diff --git a/src/videoplayerplugins/mplayer/CMakeLists.txt b/src/videoplayerplugins/mplayer/CMakeLists.txt
|
||||
index 0f51011..44945f8 100644
|
||||
--- a/src/videoplayerplugins/mplayer/CMakeLists.txt
|
||||
+++ b/src/videoplayerplugins/mplayer/CMakeLists.txt
|
||||
@@ -17,8 +17,6 @@ install(TARGETS mplayer DESTINATION ${SC_PLUGIN_INSTALL_DIR})
|
||||
|
||||
target_include_directories(mplayer SYSTEM PRIVATE ${videoplayer_mplayer_INCLUDE_DIR})
|
||||
set_target_properties(mplayer PROPERTIES COMPILE_FLAGS "${videoplayer_mplayer_DEFS}")
|
||||
-target_link_libraries(mplayer ${subtitlecomposer_LIBS} ${videoplayer_mplayer_LIBS})
|
||||
-
|
||||
-qt5_use_modules(mplayer Core)
|
||||
+target_link_libraries(mplayer ${subtitlecomposer_LIBS} ${videoplayer_mplayer_LIBS} Qt5::Core)
|
||||
|
||||
add_dependencies(mplayer subtitlecomposer)
|
||||
diff --git a/src/videoplayerplugins/mpv/CMakeLists.txt b/src/videoplayerplugins/mpv/CMakeLists.txt
|
||||
index 1eccba3..9b3ba80 100644
|
||||
--- a/src/videoplayerplugins/mpv/CMakeLists.txt
|
||||
+++ b/src/videoplayerplugins/mpv/CMakeLists.txt
|
||||
@@ -35,7 +35,6 @@ install(TARGETS mpvplayer DESTINATION ${SC_PLUGIN_INSTALL_DIR})
|
||||
|
||||
target_include_directories(mpvplayer SYSTEM PRIVATE ${videoplayer_mpv_INCLUDE_DIR})
|
||||
set_target_properties(mpvplayer PROPERTIES COMPILE_FLAGS "${videoplayer_mpv_DEFS}")
|
||||
-target_link_libraries(mpvplayer ${subtitlecomposer_LIBS} ${videoplayer_mpv_LIBS})
|
||||
-qt5_use_modules(mpvplayer Core)
|
||||
+target_link_libraries(mpvplayer ${subtitlecomposer_LIBS} ${videoplayer_mpv_LIBS} Qt5::Core)
|
||||
|
||||
add_dependencies(mpvplayer subtitlecomposer)
|
||||
diff --git a/src/videoplayerplugins/phonon/CMakeLists.txt b/src/videoplayerplugins/phonon/CMakeLists.txt
|
||||
index 8dc4ecf..4aaceda 100644
|
||||
--- a/src/videoplayerplugins/phonon/CMakeLists.txt
|
||||
+++ b/src/videoplayerplugins/phonon/CMakeLists.txt
|
||||
@@ -24,7 +24,6 @@ install(TARGETS phononplayer DESTINATION ${SC_PLUGIN_INSTALL_DIR})
|
||||
|
||||
target_include_directories(phononplayer SYSTEM PRIVATE ${videoplayer_phonon_INCLUDE_DIR})
|
||||
set_target_properties(phononplayer PROPERTIES COMPILE_FLAGS "${videoplayer_phonon_DEFS}")
|
||||
-target_link_libraries(phononplayer ${subtitlecomposer_LIBS} ${videoplayer_phonon_LIBS})
|
||||
-qt5_use_modules(phononplayer Core)
|
||||
+target_link_libraries(phononplayer ${subtitlecomposer_LIBS} ${videoplayer_phonon_LIBS} Qt5::Core)
|
||||
|
||||
add_dependencies(phononplayer subtitlecomposer)
|
||||
diff --git a/src/videoplayerplugins/xine/CMakeLists.txt b/src/videoplayerplugins/xine/CMakeLists.txt
|
||||
index 7d0f61a..09003f5 100644
|
||||
--- a/src/videoplayerplugins/xine/CMakeLists.txt
|
||||
+++ b/src/videoplayerplugins/xine/CMakeLists.txt
|
||||
@@ -59,7 +59,6 @@ install(TARGETS xineplayer DESTINATION ${SC_PLUGIN_INSTALL_DIR})
|
||||
|
||||
target_include_directories(xineplayer SYSTEM PRIVATE ${videoplayer_xine_INCLUDE_DIR})
|
||||
set_target_properties(xineplayer PROPERTIES COMPILE_FLAGS "${videoplayer_xine_DEFS}")
|
||||
-target_link_libraries(xineplayer ${subtitlecomposer_LIBS} ${videoplayer_xine_LIBS})
|
||||
-qt5_use_modules(xineplayer Core)
|
||||
+target_link_libraries(xineplayer ${subtitlecomposer_LIBS} ${videoplayer_xine_LIBS} Qt5::Core)
|
||||
|
||||
add_dependencies(xineplayer subtitlecomposer)
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6cd1d74f7934cdaa5d492f47da4143bd096a6196f2afcb2827cada9a3cdb2ea4
|
||||
size 1637272
|
||||
3
subtitlecomposer-0.7.0.tar.gz
Normal file
3
subtitlecomposer-0.7.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:90dee806df0ee57f4098d417f62014b4533dbf5598d5535c9da1066536c1ed41
|
||||
size 1649840
|
||||
@ -1,3 +1,33 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 27 19:10:58 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
|
||||
|
||||
- Update to version 0.7.0
|
||||
* Fixed parsing of absolute paths containing '#' character
|
||||
* Fixed open dialogs not showing all supported files
|
||||
* Fixed subtitle text not respecting system font configuration
|
||||
* Fixed waveform not rendering correctly/completely on some
|
||||
formats
|
||||
* Fixed waveform displaying subtitles at wrong times
|
||||
* Fixed waveform not working with some
|
||||
* Fixes to MPV, GStreamer and Xine video player backends
|
||||
* Waveform scrolling is configurable
|
||||
* PocketSphinx language models and VAD are configurable
|
||||
* Added show status bar action to main window popup menu
|
||||
* Improved (scripting) performance
|
||||
* Spell checker will use translation text when it is selected
|
||||
* Waveform and video docks can be hidden
|
||||
* Split lines won't split text on spaces while there are
|
||||
multiple lines
|
||||
* Subtitle lines will always stay sorted by their time
|
||||
* Improved fullscreen video player
|
||||
* Added ability to step by frame
|
||||
* Added play rate controls to video menu
|
||||
* Updated Croatian translation
|
||||
* Updated Italian translation
|
||||
* Updated Russian translation
|
||||
|
||||
- Dropped fix_build_with_qt5.11.patch (merged upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 12 17:58:02 UTC 2018 - asterios.dramis@gmail.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package subtitlecomposer
|
||||
#
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,20 +12,18 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: subtitlecomposer
|
||||
Version: 0.6.6
|
||||
Version: 0.7.0
|
||||
Release: 0
|
||||
Summary: A text-based subtitle editor
|
||||
License: GPL-2.0-or-later
|
||||
Group: Productivity/Multimedia/Video/Editors and Convertors
|
||||
URL: https://github.com/maxrd2/subtitlecomposer/
|
||||
Source0: https://github.com/maxrd2/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM fix_build_with_qt5.11.patch asterios.dramis@gmail.com -- Fix build failure with Qt 5.11
|
||||
Patch0: fix_build_with_qt5.11.patch
|
||||
BuildRequires: cmake >= 3.10
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: kauth-devel
|
||||
@ -71,8 +69,7 @@ has speech Recognition using PocketSphinx.
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%setup -q -n SubtitleComposer-%{version}
|
||||
|
||||
# Fix permissions
|
||||
chmod 644 ChangeLog
|
||||
@ -115,14 +112,15 @@ perl -pi -e "s|'api'|'%{_docdir}/subtitlecomposer/api'|" %{buildroot}%{_kf5_apps
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc AUTHORS ChangeLog README.md TODO files_for_doc/api
|
||||
%license COPYING
|
||||
%doc ChangeLog README.md files_for_doc/api
|
||||
%license LICENSE
|
||||
%{_kf5_applicationsdir}/%{name}.desktop
|
||||
%{_kf5_appsdir}/%{name}/
|
||||
%{_kf5_bindir}/%{name}
|
||||
%config(noreplace) %{_kf5_configdir}/%{name}rc
|
||||
%dir %{_kf5_iconsdir}/hicolor/256x256
|
||||
%dir %{_kf5_iconsdir}/hicolor/256x256/apps
|
||||
%{_kf5_appstreamdir}/%{name}.desktop.appdata.xml
|
||||
%{_kf5_iconsdir}/hicolor/*/*/*
|
||||
%{_kf5_kxmlguidir}/%{name}/
|
||||
%{_kf5_libdir}/%{name}/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user