[subtitleeditor] Update to latest upstream (0.39.0).
Martin Sourada
mso at fedoraproject.org
Mon Jul 18 11:46:41 UTC 2011
commit 93243164d7622fcfe9819175e261137a0f53b0be
Author: Martin Sourada <mso at fedoraproject.org>
Date: Mon Jul 18 13:23:18 2011 +0200
Update to latest upstream (0.39.0).
.gitignore | 1 +
sources | 2 +-
subtitleeditor-0.39.0-temp-addr.patch | 66 +++++++++++++++++++++++++++++++++
subtitleeditor.spec | 34 ++++++++++++-----
4 files changed, 92 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea6cff1..c026369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
subtitleeditor-0.37.1.tar.gz
+/subtitleeditor-0.39.0.tar.gz
diff --git a/sources b/sources
index 45d4fc1..a9827c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc44f2cb46164e0b61c38fe3d1bef2b3 subtitleeditor-0.37.1.tar.gz
+17666e652edd27abfd3104a82385f6a8 subtitleeditor-0.39.0.tar.gz
diff --git a/subtitleeditor-0.39.0-temp-addr.patch b/subtitleeditor-0.39.0-temp-addr.patch
new file mode 100644
index 0000000..a0699ab
--- /dev/null
+++ b/subtitleeditor-0.39.0-temp-addr.patch
@@ -0,0 +1,66 @@
+diff -up subtitleeditor-0.39.0/plugins/subtitleformats/sami/sami.cc.temp-addr subtitleeditor-0.39.0/plugins/subtitleformats/sami/sami.cc
+--- subtitleeditor-0.39.0/plugins/subtitleformats/sami/sami.cc.temp-addr 2011-06-18 10:05:15.000000000 +0200
++++ subtitleeditor-0.39.0/plugins/subtitleformats/sami/sami.cc 2011-07-18 12:26:38.510180079 +0200
+@@ -155,7 +155,7 @@ public:
+ int state = 0;
+ Glib::ustring line;
+ Glib::ustring text;
+- Subtitle* curSt;
++ Subtitle curSt;
+ char tmptext[MAXBUF+1] = "";
+ char *p = NULL, *q = NULL;
+ if (!file.getline(line))
+@@ -174,8 +174,8 @@ public:
+ start_sync = utility::string_to_int(inptr + 6);
+
+ // Get a line from the current subtitle on memory
+- curSt = &subtitles.append();
+- curSt->set_start(start_sync);
++ curSt = subtitles.append();
++ curSt.set_start(start_sync);
+
+ state = SAMI_STATE_SYNC_START;
+ continue;
+@@ -239,14 +239,14 @@ public:
+ // Now we are sure that this line is the end sync.
+
+ end_sync = utility::string_to_int(q + 6);
+- curSt->set_end(end_sync);
++ curSt.set_end(end_sync);
+
+ *p = '\0';
+ trail_space(tmptext);
+
+ // finalize the end sync of current line
+ if (tmptext[0] != '\0')
+- curSt->set_text(tmptext);
++ curSt.set_text(tmptext);
+
+ // an important check if this is end sync.
+ // Is there any delimiter " " in this line?
+@@ -276,14 +276,14 @@ public:
+ else
+ {
+ end_sync = SAMISYNC_MAXVAL;
+- curSt->set_end(end_sync);
++ curSt.set_end(end_sync);
+
+ *p = '\0';
+ trail_space(tmptext);
+
+ // finalize the end sync of current line
+ if (tmptext[0] != '\0')
+- curSt->set_text(tmptext);
++ curSt.set_text(tmptext);
+
+ state = SAMI_STATE_FORCE_QUIT;
+ break;
+@@ -347,7 +347,7 @@ public:
+ info.name = "Sami";
+ info.extension = "smi";
+ info.pattern = "^<SAMI>";
+-
++
+ return info;
+ }
+
diff --git a/subtitleeditor.spec b/subtitleeditor.spec
index ac5f2b2..3197204 100644
--- a/subtitleeditor.spec
+++ b/subtitleeditor.spec
@@ -1,12 +1,19 @@
+%define major 0
+%define minor 39
+%define maintenance 0
+%define branch_ver %{major}.%{minor}
+
Name: subtitleeditor
-Version: 0.37.1
-Release: 2%{?dist}
+Version: %{major}.%{minor}.%{maintenance}
+Release: 1%{?dist}
Summary: GTK+2 tool to edit subtitles for GNU/Linux/*BSD
Group: Applications/Multimedia
License: GPLv3+
URL: http://home.gna.org/subtitleeditor/
-Source0: http://download.gna.org/subtitleeditor/0.37/%{name}-%{version}.tar.gz
+Source0: http://download.gna.org/subtitleeditor/%{branch_ver}/%{name}-%{version}.tar.gz
+# Fix for build with GCC 4.6 (taking address of temporary)
+Patch0: %{name}-0.39.0-temp-addr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -30,20 +37,21 @@ Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%description
-Subtitle Editor is a GTK+2 tool to edit subtitles for GNU/Linux/*BSD. It can be
-used for new subtitles or as a tool to transform, edit, correct and refine
-existing subtitle. This program also shows sound waves, which makes it easier
+Subtitle Editor is a GTK+2 tool to edit subtitles for GNU/Linux/*BSD. It can be
+used for new subtitles or as a tool to transform, edit, correct and refine
+existing subtitle. This program also shows sound waves, which makes it easier
to synchronize subtitles to voices.
%prep
%setup -q
+%patch0 -p1 -b .temp-addr
%build
%configure \
--disable-debug \
--disable-static \
--disable-gl \
- --enable-ccache
+ --enable-ccache
make %{?_smp_mflags}
@@ -66,7 +74,7 @@ desktop-file-install --vendor="fedora" --delete-original \
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
@@ -96,6 +104,12 @@ fi
%{_libdir}/%{name}
%changelog
+* Mon Jul 18 2011 Martin Sourada <mso at fedoraproject.org> - 0.39.0-1
+- New upstream release 0.39.0
+- adds support for SAMI subtitle format
+- detects movie fps
+- various fixes and improvements
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.37.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -170,8 +184,8 @@ fi
- New options to set default document values.
- Add "Edit Cell" and "Edit Next Cell".
- Another characters coding can be selected if it fails.
- - Waveform Renderer use now Pango to draw subtitle text.
-
+ - Waveform Renderer use now Pango to draw subtitle text.
+
* Mon Aug 25 2008 Martin Sourada <martin.sourada at gmail.com> - 0.22.3-1
- New upstream release
- Don't build with cppunit testing (rhbz #458607)
More information about the scm-commits
mailing list