commit dced09bb9414ea7bc4884c74f8f8e560a6d8a974
Author: Jakub Bogusz <[email protected]>
Date: Sat Feb 20 08:52:24 2016 +0100
- updated to 0.52.1
- added flags patch (remove -ansi), add -std= for C++ 11 required by
libxml++ 2.40+
- added format patch (fix build with -Werror=format-security, C++ 11
compatibility fixes)
- added gcc patch (backward-compatibility <auto_ptr.h> requires <memory>)
subtitleeditor-flags.patch | 27 +++++++++++++++++++++
subtitleeditor-format.patch | 44 ++++++++++++++++++++++++++++++++++
subtitleeditor-gcc.patch | 10 ++++++++
subtitleeditor.spec | 58 +++++++++++++++++++++++++++++----------------
4 files changed, 118 insertions(+), 21 deletions(-)
---
diff --git a/subtitleeditor.spec b/subtitleeditor.spec
index 895549d..c84f6f4 100644
--- a/subtitleeditor.spec
+++ b/subtitleeditor.spec
@@ -1,44 +1,48 @@
#
-# TODO: doesn't build with gl enabled
+# Conditional build:
+%bcond_with opengl # OpenGL waveform renderer [not ported to gtkmm 3]
#
Summary: GTK+ tool to edit subtitles
Summary(pl.UTF-8): Narzędzie napisane w GTK+ do edycji napisów
Name: subtitleeditor
-Version: 0.41.0
+Version: 0.52.1
Release: 1
License: GPL v3+
Group: X11/Applications
-Source0:
http://download.gna.org/subtitleeditor/0.41/%{name}-%{version}.tar.gz
-# Source0-md5: 3c21ccd8296001dcb1a02c62396db1b6
+Source0:
http://download.gna.org/subtitleeditor/0.52/%{name}-%{version}.tar.gz
+# Source0-md5: d25a3f6966f4d6355485d3dfbcfb437a
+Patch0: %{name}-flags.patch
+Patch1: %{name}-format.patch
+Patch2: %{name}-gcc.patch
URL: http://home.gna.org/subtitleeditor/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
-BuildRequires: enchant-devel >= 1.1.0
+BuildRequires: enchant-devel >= 1.4.0
BuildRequires: gettext-tools
BuildRequires: glibmm-devel >= 2.16.3
-BuildRequires: gstreamer0.10-audio-effects-good >= 0.10.5
-BuildRequires: gstreamer0.10-devel >= 0.10
-BuildRequires: gstreamer0.10-plugins-base-devel >= 0.10
-BuildRequires: gstreamer0.10-plugins-base-devel >= 0.10
-BuildRequires: gstreamermm-devel >= 0.10.6
-BuildRequires: gtkglextmm-devel >= 1.2.0
-BuildRequires: gtkmm-devel >= 2.12.0
+BuildRequires: gstreamer-devel >= 1.0
+BuildRequires: gstreamer-plugins-base-devel >= 1.0
+BuildRequires: gstreamermm-devel >= 1.0
+%{?with_opengl:BuildRequires: gtkglextmm-devel >= 1.2.0}
+BuildRequires: gtkmm3-devel >= 3.0
BuildRequires: intltool >= 0.35.0
BuildRequires: iso-codes
-BuildRequires: libglademm-devel >= 2.4
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.3
BuildRequires: libtool
-BuildRequires: libxml++-devel >= 2.20.0
+BuildRequires: libxml++2-devel >= 2.20.0
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.311
Requires(post,postun): desktop-file-utils
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
+Requires: enchant >= 1.4.0
+Requires: glibmm >= 2.16.3
+Requires: libxml++2 >= 2.20.0
Suggests: gstreamer-aac
Suggests: gstreamer-audio-effects-base
Suggests: gstreamer-dts
-Suggests: gstreamer-ffmpeg
Suggests: gstreamer-imagesink-xv
+Suggests: gstreamer-libav
Suggests: gstreamer-pango
Suggests: gstreamer-plugins-good
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,6 +55,9 @@ Subtitle Editor jest narzędziem napisanym w GTK+ do edycji
napisów.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
%{__intltoolize}
@@ -59,7 +66,10 @@ Subtitle Editor jest narzędziem napisanym w GTK+ do edycji
napisów.
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+CXXFLAGS="%{rpmcxxflags} -std=c++0x"
+%configure \
+ --disable-debug \
+ %{?with_opengl:--enable-gl}
%{__make}
@@ -69,11 +79,13 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# API not exported
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsubtitleeditor.{so,la}
+# dlopened plugins
+%{__rm}
$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/{actions,subtitleformats}/*.la
# remove pt_PT as there is already pt locale
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/pt_PT
-%{__rm}
$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/{actions,subtitleformats}/*.la
-
%find_lang %{name}
%clean
@@ -93,7 +105,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/subtitleeditor
-%attr(755,root,root) %{_libdir}/libsubtitleeditor.so*
+%attr(755,root,root) %{_libdir}/libsubtitleeditor.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsubtitleeditor.so.0
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
%dir %{_libdir}/%{name}/plugins/actions
@@ -131,6 +144,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libsplitdocument.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libsplitsubtitle.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libstyleeditor.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libstylize.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libtextcorrection.so
%attr(755,root,root)
%{_libdir}/%{name}/plugins/actions/libtimemodemanagement.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/actions/libtimingfromplayer.so
@@ -146,6 +160,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root)
%{_libdir}/%{name}/plugins/subtitleformats/libadobeencoredvdntsc.so
%attr(755,root,root)
%{_libdir}/%{name}/plugins/subtitleformats/libadobeencoredvdpal.so
%attr(755,root,root)
%{_libdir}/%{name}/plugins/subtitleformats/libadvancedsubstationalpha.so
+%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libavidds.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libbitc.so
%attr(755,root,root)
%{_libdir}/%{name}/plugins/subtitleformats/libdcsubtitle.so
%attr(755,root,root) %{_libdir}/%{name}/plugins/subtitleformats/libmicrodvd.so
@@ -161,7 +176,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root)
%{_libdir}/%{name}/plugins/subtitleformats/libsubviewer2.so
%attr(755,root,root)
%{_libdir}/%{name}/plugins/subtitleformats/libtimedtextauthoringformat1.so
%{_datadir}/%{name}
+%{_datadir}/appdata/subtitleeditor.appdata.xml
%{_desktopdir}/%{name}.desktop
%{_iconsdir}/hicolor/*/apps/subtitleeditor.*
-%{_pixmapsdir}/*.svg
+%{_pixmapsdir}/subtitleeditor.svg
%{_mandir}/man1/subtitleeditor.1*
diff --git a/subtitleeditor-flags.patch b/subtitleeditor-flags.patch
new file mode 100644
index 0000000..fcec0d4
--- /dev/null
+++ b/subtitleeditor-flags.patch
@@ -0,0 +1,27 @@
+--- subtitleeditor-0.52.1/configure.ac.orig 2015-06-25 23:05:40.000000000
+0200
++++ subtitleeditor-0.52.1/configure.ac 2016-02-19 21:25:10.363815003 +0100
+@@ -253,7 +253,7 @@
+
+ if test "$enable_debug" = "yes"; then
+ CXXFLAGS="$CXXFLAGS -DDEBUG -g"
+- LDFLAGS="$LDFLAGS -g -ansi -Wall"
++ LDFLAGS="$LDFLAGS -g -Wall"
+ fi
+
+ # =========================================================================
+@@ -265,13 +265,13 @@
+
+ if test "$enable_profile" = "yes"; then
+ CXXFLAGS="$CXXFLAGS -pg"
+- LDFLAGS="$LDFLAGS -pg -ansi -Wall"
++ LDFLAGS="$LDFLAGS -pg -Wall"
+ fi
+
+ # =========================================================================
+ # gcc flags
+
+-CXXFLAGS="$CXXFLAGS -ansi -Wall -Wextra -Wconversion" #-Werror
++CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wconversion" #-Werror
+
+ # =========================================================================
+ # make use of ccache
diff --git a/subtitleeditor-format.patch b/subtitleeditor-format.patch
new file mode 100644
index 0000000..1fb1fb6
--- /dev/null
+++ b/subtitleeditor-format.patch
@@ -0,0 +1,44 @@
+--- subtitleeditor-0.52.1/src/vp/gstplayer.cc.orig 2015-06-21
23:09:29.000000000 +0200
++++ subtitleeditor-0.52.1/src/vp/gstplayer.cc 2016-02-19 21:56:40.933735723
+0100
+@@ -257,7 +257,7 @@
+ gint64 gend = end * Gst::MILLI_SECOND;
+
+ se_debug_message(SE_DEBUG_VIDEO_PLAYER,
+- "pipeline->seek(%" GST_TIME_FORMAT",
%"GST_TIME_FORMAT")",
++ "pipeline->seek(%" GST_TIME_FORMAT ", %"
GST_TIME_FORMAT ")",
+ GST_TIME_ARGS(gstart), GST_TIME_ARGS(gend));
+
+ bool ret = m_pipeline->seek(
+@@ -418,7 +418,7 @@
+ catch(std::runtime_error &ex)
+ {
+ se_debug_message(SE_DEBUG_VIDEO_PLAYER, "failed to
gen_audio_element '%s'", ex.what());
+- GST_ELEMENT_WARNING(m_pipeline->gobj(), RESOURCE, NOT_FOUND,
(ex.what()), (NULL));
++ GST_ELEMENT_WARNING(m_pipeline->gobj(), RESOURCE, NOT_FOUND,
("%s", ex.what()), (NULL));
+ }
+ // Return an NULL ptr
+ return Glib::RefPtr<Gst::Element>();
+@@ -508,7 +508,7 @@
+ catch(std::runtime_error &ex)
+ {
+ se_debug_message(SE_DEBUG_VIDEO_PLAYER, "failed to
gen_video_element '%s'", ex.what());
+- GST_ELEMENT_ERROR(m_pipeline->gobj(), RESOURCE, NOT_FOUND,
(ex.what()), (NULL));
++ GST_ELEMENT_ERROR(m_pipeline->gobj(), RESOURCE, NOT_FOUND,
("%s", ex.what()), (NULL));
+ }
+ // Return an NULL ptr
+ return Glib::RefPtr<Gst::Element>();
+---
subtitleeditor-0.52.1/plugins/actions/documentmanagement/documentmanagement.cc.orig
2015-06-21 23:09:31.000000000 +0200
++++
subtitleeditor-0.52.1/plugins/actions/documentmanagement/documentmanagement.cc
2016-02-19 22:31:33.540314480 +0100
+@@ -178,9 +178,9 @@
+
+ ui_id = ui->new_merge_id();
+
+- #define ADD_UI(name) ui->add_ui(ui_id,
"/menubar/menu-file/"name, name, name);
+- #define ADD_OPEN_UI(name) ui->add_ui(ui_id,
"/menubar/menu-file/menu-open/"name, name, name);
+- #define ADD_SAVE_UI(name) ui->add_ui(ui_id,
"/menubar/menu-file/menu-save/"name, name, name);
++ #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"
name, name, name);
++ #define ADD_OPEN_UI(name) ui->add_ui(ui_id,
"/menubar/menu-file/menu-open/" name, name, name);
++ #define ADD_SAVE_UI(name) ui->add_ui(ui_id,
"/menubar/menu-file/menu-save/" name, name, name);
+
+ ADD_UI("new-document");
+ ADD_OPEN_UI("open-document");
diff --git a/subtitleeditor-gcc.patch b/subtitleeditor-gcc.patch
new file mode 100644
index 0000000..b92fc9d
--- /dev/null
+++ b/subtitleeditor-gcc.patch
@@ -0,0 +1,10 @@
+--- subtitleeditor-0.52.1/plugins/actions/dialoguize/dialoguize.cc.orig
2015-06-21 23:09:31.000000000 +0200
++++ subtitleeditor-0.52.1/plugins/actions/dialoguize/dialoguize.cc
2016-02-19 22:27:48.430323938 +0100
+@@ -23,6 +23,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include <memory>
+ #include <auto_ptr.h>
+ #include "extension/action.h"
+ #include "i18n.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/subtitleeditor.git/commitdiff/dced09bb9414ea7bc4884c74f8f8e560a6d8a974
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
