Dominique Leuenberger 2018-02-13 09:32:20 +00:00 committed by Git OBS Bridge
commit 5ba065ea42
5 changed files with 55 additions and 52 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:26503c5f7ede37f482bd2da6b4acc8df83c0e5c18f38df011ce0f567a1422563
size 1682373

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6cd1d74f7934cdaa5d492f47da4143bd096a6196f2afcb2827cada9a3cdb2ea4
size 1637272

View File

@ -1,24 +0,0 @@
From 2e4c066b4571960cc42d25fed4a01fbfa73b5142 Mon Sep 17 00:00:00 2001
From: Mladen Milinkovic <max@scarlettvisionmedia.com>
Date: Mon, 30 Oct 2017 22:02:01 +0100
Subject: [PATCH] Fixed compilation with Qt 5.6
---
src/core/sstring.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/core/sstring.cpp b/src/core/sstring.cpp
index 5529302..e40bd86 100644
--- a/src/core/sstring.cpp
+++ b/src/core/sstring.cpp
@@ -28,6 +28,10 @@
#include <QColor>
+#if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0))
+ #define qAsConst
+#endif
+
using namespace SubtitleComposer;
void *

View File

@ -1,3 +1,33 @@
-------------------------------------------------------------------
Sun Feb 11 09:30:06 UTC 2018 - aloisio@gmx.com
- Update to version 0.6.6
* Fixed open video dialog filters
* Fixed "Insert Line" on waveform adding at the wrong index -
thanks @qsniyg
* Added MMB seeking on waveform - thanks @qsniyg
* Fixed some compilation issues
* Updated translations - thanks @gogogogi, @muzena
* Fixed vobsub when opening from video file and symbol cache
filename
* Fixed subtitle loading times of huge files
* Improved vobsub text detection
* Fixed ASS rich text parsing on import subtitle stream action
* Replaced buggy mplayer vobsub import code with ffmpeg
* Fixed memory leaks/usage of WaveformWidget's scroll animation
* Optimized import subtitle stream from video action
* Replaced gstreamer with ffmpeg libraries in application core
usage
* Added abort button to speech recognition
* Waveform smooth scrolling
* Added join/split lines actions to waveform context menu
* Fixed some crashes, memory leaks and overall code cleanups
* Cleaned up settings widget and texts
- Dropped subtitlecomposer-Qt56.patch (merged upstream)
- Spec cleanup
-------------------------------------------------------------------
Fri Nov 3 08:36:25 UTC 2017 - aloisio@gmx.com

View File

@ -1,7 +1,7 @@
#
# spec file for package subtitlecomposer
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 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
@ -17,17 +17,15 @@
Name: subtitlecomposer
Version: 0.6.5
Version: 0.6.6
Release: 0
Summary: A text-based subtitle editor
License: GPL-2.0+
Group: Productivity/Multimedia/Video/Editors and Convertors
Url: https://github.com/maxrd2/subtitlecomposer/
URL: https://github.com/maxrd2/subtitlecomposer/
Source0: https://github.com/maxrd2/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM subtitlecomposer-Qt56.patch -- backport commit #2e4c066
Patch0: subtitlecomposer-Qt56.patch
BuildRequires: cmake >= 3.10
BuildRequires: extra-cmake-modules
BuildRequires: gstreamer-plugins-base-devel
BuildRequires: kauth-devel
BuildRequires: kcodecs-devel
BuildRequires: kconfig-devel
@ -39,26 +37,29 @@ BuildRequires: kross-devel
BuildRequires: ktextwidgets-devel
BuildRequires: kwidgetsaddons-devel
BuildRequires: kxmlgui-devel
BuildRequires: libicu-devel
BuildRequires: libxine-devel
BuildRequires: mpv-devel
BuildRequires: phonon4qt5-devel
BuildRequires: pkgconfig
BuildRequires: sonnet-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Core) >= 5.6
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libxine)
BuildRequires: pkgconfig(libxml-2.0)
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
BuildRequires: pkgconfig(mpv)
BuildRequires: pkgconfig(phonon4qt5)
Recommends: %{name}-lang = %{version}
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} < 1500
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A text-based subtitles editor that supports basic operations. It supports
@ -69,16 +70,15 @@ has speech Recognition using PocketSphinx.
%prep
%setup -q
%patch0 -p1
# Fix permissions
chmod 644 ChangeLog
# Fix shebang
sed -i '1s|/usr/bin/env python|%{__python}|' \
src/main/scripting/examples/*.py
src/scripting/examples/*.py
sed -i '1s|/usr/bin/env ruby|%{_bindir}/ruby|' \
src/main/scripting/examples/*.rb
src/scripting/examples/*.rb
%build
%cmake_kf5 -d build
@ -97,15 +97,13 @@ rm -rf %{buildroot}%{_kf5_appsdir}/%{name}/scripts/api/
# Point to the correct path of the header files directory (doc)
perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroot}%{_kf5_appsdir}/%{name}/scripts/README
%if 0%{?suse_version}
%suse_update_desktop_file -r %{name} Qt KDE AudioVideo AudioVideoEditing
%endif
%find_lang %{name}
%kf5_post_install
%{kf5_post_install}
%if 0%{?suse_version} <= 1320
%if 0%{?suse_version} < 1500
%post
%mime_database_post
@ -114,8 +112,8 @@ perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroo
%endif
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README.md TODO files_for_doc/api
%doc AUTHORS ChangeLog README.md TODO files_for_doc/api
%license COPYING
%{_kf5_applicationsdir}/%{name}.desktop
%{_kf5_appsdir}/%{name}/
%{_kf5_bindir}/%{name}
@ -128,6 +126,5 @@ perl -pi -e "s|'api'|'/usr/share/doc/packages/subtitlecomposer/api'|" %{buildroo
%{_datadir}/mime/packages/%{name}.xml
%files lang -f %{name}.lang
%defattr(-,root,root,-)
%changelog