[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2022-01-23 Thread Sam James 
commit: 9a34b1f2c4a50fb1734c9f5a303e87d82ff031c4
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 24 03:39:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 24 03:39:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a34b1f2

media-video/subtitleeditor: Stabilize 0.54.0_p5 amd64, #831048

Signed-off-by: Sam James  gentoo.org>

 media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
index 95055ac63639..21f2d7e2a70d 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P/_p*}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug nls"
 # opengl would mix gtk+:2 and :3 which is not possible

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2022-01-20 Thread Jakov Smolić 
commit: 51d9d04a866966fb704f486c7192e1aeec513166
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jan 20 09:58:06 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jan 20 10:02:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d9d04a

media-video/subtitleeditor: Stabilize 0.54.0_p5 x86, #831048

Signed-off-by: Jakov Smolić  gentoo.org>

 media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
index 5929fb7bc8c0..95055ac63639 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P/_p*}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="debug nls"
 # opengl would mix gtk+:2 and :3 which is not possible

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2021-09-19 Thread Pacho Ramos 
commit: 277a6184e0be9aeb291c3359ce4fdb78ef1bb6c6
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Sep 19 12:30:50 2021 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Sep 19 12:31:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=277a6184

media-video/subtitleeditor: Apply Debian patchset

This fixes some bugs like metainfo location and porting to enchant-2

Closes: https://bugs.gentoo.org/782103
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 media-video/subtitleeditor/Manifest|  1 +
 .../subtitleeditor/subtitleeditor-0.54.0_p5.ebuild | 73 ++
 2 files changed, 74 insertions(+)

diff --git a/media-video/subtitleeditor/Manifest 
b/media-video/subtitleeditor/Manifest
index d46ccd4e8c4..e7cb37193d2 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1 +1,2 @@
 DIST subtitleeditor-0.54.0.tar.gz 1783077 BLAKE2B 
a802124c9b81ad5fecc4914b6231e7efaf3326f231115f334fd53b79d8a851bf2f09fdccdee85c53b0cc828fe67c72e9924f47f0881d0438e563b18b1f77f00b
 SHA512 
4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c
+DIST subtitleeditor_0.54.0-5.debian.tar.xz 9100 BLAKE2B 
249048228aab601524bb1f6e222863d1d3f96e3be4a05e08196a164d0e4ed3ff4b662fbac5a468a546f871e314a99f68ed9132692a5be8997d8338810ab91808
 SHA512 
9e15c0f6d4ddc88650f6f7962b09175fddbae1c1ac295a83c33e29e1212f09a1d88711a4e1250c5f125d72ea02f4b77c3ca9f62594ee0010f0cf8d383fbe0832

diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
new file mode 100644
index 000..5929fb7bc8c
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="GTK+3 subtitle editing tool"
+HOMEPAGE="https://kitone.github.io/subtitleeditor;
+SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P/_p*}.tar.gz
+   
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+# opengl would mix gtk+:2 and :3 which is not possible
+
+RDEPEND="
+   >=app-text/enchant-2.2.0:2
+   app-text/iso-codes
+   >=dev-cpp/cairomm-1.12:0
+   >=dev-cpp/glibmm-2.46:2
+   >=dev-cpp/gtkmm-3.18:3.0
+   >=dev-cpp/gstreamermm-1.0:1.0=
+   >=dev-cpp/libxmlpp-2.40:2.6
+   dev-libs/glib:2
+   >=dev-libs/libsigc++-2.6:2
+   media-libs/gst-plugins-base:1.0[X,pango]
+   media-libs/gst-plugins-good:1.0
+   media-libs/gstreamer:1.0
+   media-plugins/gst-plugins-meta:1.0
+   x11-libs/gtk+:3
+   nls? ( virtual/libintl )
+"
+#  opengl? (
+#  >=dev-cpp/gtkglextmm-1.2.0-r2:1.0
+#  virtual/opengl )
+# X needed for video output and pango needed for text overlay
+DEPEND="${RDEPEND}"
+BDEPEND="
+   >=dev-util/intltool-0.40
+   virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P/_p*}"
+
+PATCHES=(
+   # https://github.com/kitone/subtitleeditor/issues/49
+   "${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch
+)
+
+src_prepare() {
+   # Debian patches
+   for p in $(<"${WORKDIR}"/debian/patches/series) ; do
+   eapply -p1 "${WORKDIR}/debian/patches/${p}"
+   done
+
+   gnome2_src_prepare
+}
+
+src_configure() {
+   # Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
+   use debug && append-cxxflags -DDEBUG
+
+   gnome2_src_configure \
+   --disable-debug \
+   --disable-gl \
+   $(use_enable nls)
+#  $(use_enable opengl gl)
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2021-02-15 Thread Matt Turner 
commit: 387251e41b9680553783ede8d331849ed3034c30
Author: David Michael  gmail  com>
AuthorDate: Sat Feb  6 22:30:01 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Feb 16 01:25:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=387251e4

media-video/subtitleeditor: Specify the cairomm slot

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Michael  gmail.com>
Signed-off-by: Matt Turner  gentoo.org>

 .../{subtitleeditor-0.54.0.ebuild => subtitleeditor-0.54.0-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild
similarity index 95%
rename from media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
rename to media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild
index 80b462e5b9b..83ce58f4ad7 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ IUSE="debug nls"
 RDEPEND="
>=app-text/enchant-1.4:0
app-text/iso-codes
-   >=dev-cpp/cairomm-1.12
+   >=dev-cpp/cairomm-1.12:0
>=dev-cpp/glibmm-2.46:2
>=dev-cpp/gtkmm-3.18:3.0
>=dev-cpp/gstreamermm-1.0:1.0=

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2020-02-02 Thread Mart Raudsepp 
commit: 89e9fb3fee3d3abc694ba84d9a9f32bda74b3983
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Feb  2 17:48:52 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Feb  2 19:34:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e9fb3f

media-video/subtitleeditor: lock enchant dep to SLOT=0

configure checks only for enchant.pc, not enchant-2.pc

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
index 7fd3898e88d..80b462e5b9b 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="debug nls"
 # opengl would mix gtk+:2 and :3 which is not possible
 
 RDEPEND="
-   >=app-text/enchant-1.4
+   >=app-text/enchant-1.4:0
app-text/iso-codes
>=dev-cpp/cairomm-1.12
>=dev-cpp/glibmm-2.46:2

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2017-12-20 Thread Mart Raudsepp 
commit: c866b65f52d539d28ab51fc52283b8422713c06f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Dec 20 19:47:31 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Dec 20 20:22:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c866b65f

media-video/subtitleeditor: remove old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-video/subtitleeditor/Manifest|  1 -
 .../subtitleeditor/subtitleeditor-0.53.0.ebuild| 58 --
 2 files changed, 59 deletions(-)

diff --git a/media-video/subtitleeditor/Manifest 
b/media-video/subtitleeditor/Manifest
index 7acb69faaaf..d46ccd4e8c4 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,2 +1 @@
-DIST subtitleeditor-0.53.0.tar.gz 1778388 BLAKE2B 
cfa8d6a824bb1559a9024950f0cd89cb4381b6e5bf7b558e95a3236286c4bd27d13ac19d6f0e4ce0576bb82d1203d1c65e2c34f372b4d70f5708f2cb4fbd02f6
 SHA512 
8787831947785885befb50221869169eda73489851389e72f34edac7a9c2c59d05ba69e86d4d2d5b3a13b2678377ee2520c110ffa472b718884dd2e711603b8b
 DIST subtitleeditor-0.54.0.tar.gz 1783077 BLAKE2B 
a802124c9b81ad5fecc4914b6231e7efaf3326f231115f334fd53b79d8a851bf2f09fdccdee85c53b0cc828fe67c72e9924f47f0881d0438e563b18b1f77f00b
 SHA512 
4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c

diff --git a/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
deleted file mode 100644
index 9e2c3569de3..000
--- a/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2 versionator
-
-DESCRIPTION="GTK+3 subtitle editing tool"
-HOMEPAGE="http://home.gna.org/subtitleeditor/;
-SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 
1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug nls"
-# opengl would mix gtk+:2 and :3 which is not possible
-
-RDEPEND="
-   >=app-text/enchant-1.4
-   app-text/iso-codes
-   >=dev-cpp/cairomm-1.12
-   >=dev-cpp/glibmm-2.46:2
-   >=dev-cpp/gtkmm-3.18:3.0
-   >=dev-cpp/gstreamermm-1.0:1.0=
-   >=dev-cpp/libxmlpp-2.40:2.6
-   dev-libs/glib:2
-   >=dev-libs/libsigc++-2.6:2
-   media-libs/gst-plugins-base:1.0[X,pango]
-   media-libs/gst-plugins-good:1.0
-   media-libs/gstreamer:1.0
-   media-plugins/gst-plugins-meta:1.0
-   x11-libs/gtk+:3
-   nls? ( virtual/libintl )
-"
-#  opengl? (
-#  >=dev-cpp/gtkglextmm-1.2.0-r2:1.0
-#  virtual/opengl )
-# X needed for video output and pango needed for text overlay
-DEPEND="${RDEPEND}
-   >=dev-util/intltool-0.40
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch
-)
-
-src_configure() {
-   # Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
-   use debug && append-cxxflags -DDEBUG
-
-   gnome2_src_configure \
-   --disable-debug \
-   --disable-gl \
-   $(use_enable nls)
-#  $(use_enable opengl gl)
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2017-12-16 Thread Tobias Klausmann 
commit: bd2cd0bcbe37aa9b6b257ae7f9ba8266f74b7806
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Dec 16 14:02:39 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Dec 16 14:03:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2cd0bc

media-video/subtitleeditor-0.54.0-r0: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/635938

 media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
index 97646f9df60..8122f98f2e1 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P}.tar.gz;
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug nls"
 # opengl would mix gtk+:2 and :3 which is not possible

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2017-11-01 Thread Mart Raudsepp 
commit: fd577206d5264491f4a325a84585b6a299633737
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Nov  1 15:36:13 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Nov  1 15:40:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd577206

media-video/subtitleeditor: Needs rebuild on gstreamermm subslot change

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild | 4 ++--
 media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
index d0934d7c5c9..9e2c3569de3 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ RDEPEND="
>=dev-cpp/cairomm-1.12
>=dev-cpp/glibmm-2.46:2
>=dev-cpp/gtkmm-3.18:3.0
-   >=dev-cpp/gstreamermm-1.0:1.0
+   >=dev-cpp/gstreamermm-1.0:1.0=
>=dev-cpp/libxmlpp-2.40:2.6
dev-libs/glib:2
>=dev-libs/libsigc++-2.6:2

diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
index 5c53d4f63b0..97646f9df60 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
>=dev-cpp/cairomm-1.12
>=dev-cpp/glibmm-2.46:2
>=dev-cpp/gtkmm-3.18:3.0
-   >=dev-cpp/gstreamermm-1.0:1.0
+   >=dev-cpp/gstreamermm-1.0:1.0=
>=dev-cpp/libxmlpp-2.40:2.6
dev-libs/glib:2
>=dev-libs/libsigc++-2.6:2

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/files/

2017-10-30 Thread Mart Raudsepp 
commit: 691677db602dc4cb73f98c6f803a56b6fc15aecf
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Oct  1 13:35:14 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Oct 30 22:34:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691677db

media-video/subtitleeditor: remove unused patch

 .../files/subtitleeditor-0.52.1-build-fix.patch| 55 --
 1 file changed, 55 deletions(-)

diff --git 
a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch 
b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
deleted file mode 100644
index 9cce5d2d98f..000
--- a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fix build errors with gcc-4.9.3 -std=c++11 (after disabling -ansi)
-
-https://gna.org/bugs/?23714
-
-https://bugs.gentoo.org/show_bug.cgi?id=550764
-https://bugs.gentoo.org/show_bug.cgi?id=566328
-
 a/src/subtitleview.cc  2015-12-24 01:52:29.322622155 +0100
-+++ b/src/subtitleview.cc  2015-12-24 01:52:44.210491213 +0100
-@@ -1363,7 +1363,7 @@
-   {
-   int num;
-   std::istringstream ss(event->string);
--  bool is_num = ss >> num != 0; 
-+  bool is_num = static_cast(ss >> num) != 0; 
-   // Update only if it's different
-   if(is_num != get_enable_search())
-   set_enable_search(is_num);
 a/src/utility.h2015-12-24 01:49:42.205104858 +0100
-+++ b/src/utility.h2015-12-24 01:50:23.387737071 +0100
-@@ -91,7 +91,7 @@
-   std::istringstream s(src);
-   // return s >> dest != 0;
- 
--  bool state = s >> dest != 0;
-+  bool state = static_cast(s >> dest) != 0;
- 
-   if(!state)
-   se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", 
src.c_str());
 a/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:24.125428454 
+0100
-+++ b/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:42.630277006 
+0100
-@@ -23,7 +23,7 @@
-  *along with this program. If not, see .
-  */
-  
--#include 
-+#include 
- #include "extension/action.h"
- #include "i18n.h"
- #include "debug.h"
 a/plugins/actions/documentmanagement/documentmanagement.old
2015-12-24 01:17:13.914730337 +0100
-+++ b/plugins/actions/documentmanagement/documentmanagement.cc 2015-12-24 
01:17:23.339640430 +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");

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/files/

2017-10-30 Thread Patrice Clement 
commit: 8041b1831b5b858344b513ab4d0863f911a48c28
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Oct  1 13:35:14 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Oct 30 21:26:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8041b183

media-video/subtitleeditor: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/5828

 .../files/subtitleeditor-0.52.1-build-fix.patch| 55 --
 1 file changed, 55 deletions(-)

diff --git 
a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch 
b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
deleted file mode 100644
index 9cce5d2d98f..000
--- a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fix build errors with gcc-4.9.3 -std=c++11 (after disabling -ansi)
-
-https://gna.org/bugs/?23714
-
-https://bugs.gentoo.org/show_bug.cgi?id=550764
-https://bugs.gentoo.org/show_bug.cgi?id=566328
-
 a/src/subtitleview.cc  2015-12-24 01:52:29.322622155 +0100
-+++ b/src/subtitleview.cc  2015-12-24 01:52:44.210491213 +0100
-@@ -1363,7 +1363,7 @@
-   {
-   int num;
-   std::istringstream ss(event->string);
--  bool is_num = ss >> num != 0; 
-+  bool is_num = static_cast(ss >> num) != 0; 
-   // Update only if it's different
-   if(is_num != get_enable_search())
-   set_enable_search(is_num);
 a/src/utility.h2015-12-24 01:49:42.205104858 +0100
-+++ b/src/utility.h2015-12-24 01:50:23.387737071 +0100
-@@ -91,7 +91,7 @@
-   std::istringstream s(src);
-   // return s >> dest != 0;
- 
--  bool state = s >> dest != 0;
-+  bool state = static_cast(s >> dest) != 0;
- 
-   if(!state)
-   se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", 
src.c_str());
 a/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:24.125428454 
+0100
-+++ b/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:42.630277006 
+0100
-@@ -23,7 +23,7 @@
-  *along with this program. If not, see .
-  */
-  
--#include 
-+#include 
- #include "extension/action.h"
- #include "i18n.h"
- #include "debug.h"
 a/plugins/actions/documentmanagement/documentmanagement.old
2015-12-24 01:17:13.914730337 +0100
-+++ b/plugins/actions/documentmanagement/documentmanagement.cc 2015-12-24 
01:17:23.339640430 +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");

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2017-08-26 Thread Gilles Dartiguelongue 
commit: fc57f944406b660c7c9cb5934ab8ae3f03c54918
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sat Aug 26 10:06:17 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Aug 26 10:07:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc57f944

media-video/subtitleeditor: cleanup old revision

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 media-video/subtitleeditor/Manifest|  1 -
 .../subtitleeditor/subtitleeditor-0.52.1.ebuild| 68 --
 2 files changed, 69 deletions(-)

diff --git a/media-video/subtitleeditor/Manifest 
b/media-video/subtitleeditor/Manifest
index abf02b57af6..e72294d9387 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,3 +1,2 @@
-DIST subtitleeditor-0.52.1.tar.gz 1680875 SHA256 
5b3e5fc1f12bcf0d4bcf5014249b6832181bd3b513ac04ee665ec979441412d5 SHA512 
a9a7ee78abadf660fe645e36ed69b87131320e04373554adb48dc33df8f36605ed74da3822fe0281b2b75d6f82daddd062b2ae9a12aed44673195fba43adfd4f
 WHIRLPOOL 
def330a098b9227cf6db8a74c67d2cd7db724b65f586e22ebf1b08de6de6321849fdeecfe5fd6c0132a814d45d84087b406a05aec7463c04a4355530c3d09c44
 DIST subtitleeditor-0.53.0.tar.gz 1778388 SHA256 
8fac7430fb552438d075ef3809d4a0f04a764d4dd0723a3ef18b2b695fecf920 SHA512 
8787831947785885befb50221869169eda73489851389e72f34edac7a9c2c59d05ba69e86d4d2d5b3a13b2678377ee2520c110ffa472b718884dd2e711603b8b
 WHIRLPOOL 
cfd7bfd2324fe10dadd6e8c7c60487072d15dee3c6f0a57358abee4e5f92c945ba95efb036516ecadc0beebf52380b835cb35ae8af389110597ab5305a979639
 DIST subtitleeditor-0.54.0.tar.gz 1783077 SHA256 
aa9c539f3a0984deef257339e2b9f5c8728b8245113695cf6d42459f011aa2ab SHA512 
4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c
 WHIRLPOOL 
e67f2d94ec004e40855b440af3eafc7d78c859326b46a69c11fb633e650fdb3c0f44da9a9e3dadcf0a87ff598984d7cc1eabdf6fecb625b6357f4ec2dae4fb6d

diff --git a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
deleted file mode 100644
index 8ac62e9d2bd..000
--- a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2 versionator
-
-DESCRIPTION="GTK+3 subtitle editing tool"
-HOMEPAGE="http://home.gna.org/subtitleeditor/;
-SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 
1-2)/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug nls"
-# opengl would mix gtk+:2 and :3 which is not possible
-
-RDEPEND="
-   >=app-text/enchant-1.4
-   app-text/iso-codes
-   >=dev-cpp/cairomm-1.12
-   >=dev-cpp/glibmm-2.46:2
-   >=dev-cpp/gtkmm-3.18:3.0
-   >=dev-cpp/gstreamermm-1.0:1.0
-   >=dev-cpp/libxmlpp-2.40:2.6
-   dev-libs/glib:2
-   >=dev-libs/libsigc++-2.6:2
-   media-libs/gst-plugins-base:1.0[X,pango]
-   media-libs/gst-plugins-good:1.0
-   media-libs/gstreamer:1.0
-   media-plugins/gst-plugins-meta:1.0
-   x11-libs/gtk+:3
-   virtual/libintl
-"
-#  opengl? (
-#  >=dev-cpp/gtkglextmm-1.2.0-r2:1.0
-#  virtual/opengl )
-# X needed for video output and pango needed for text overlay
-DEPEND="${RDEPEND}
-   >=dev-util/intltool-0.40
-   virtual/pkgconfig
-"
-
-src_prepare() {
-   # ansi overrides -std, see src_configure
-   sed 's/\(CXXFLAGS\) -ansi/\1/' -i configure.ac configure || die
-
-   # fix build issues
-   epatch "${FILESDIR}"/${PN}-0.52.1-build-fix.patch
-
-   gnome2_src_prepare
-}
-
-src_configure() {
-   # Needed with newer gnome mm bindings
-   append-cxxflags -std=c++11
-
-   # Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
-   use debug && append-cxxflags -DDEBUG
-
-   gnome2_src_configure \
-   --disable-debug \
-   --disable-gl \
-   $(use_enable nls)
-#  $(use_enable opengl gl)
-}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2017-08-20 Thread Gilles Dartiguelongue 
commit: 3253373af040002b29f2610f746bd4f6e0e1d03b
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Aug 20 16:39:15 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Aug 20 18:18:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3253373a

media-video/subtitleeditor: version bump 0.53.0 → 0.54.0

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 media-video/subtitleeditor/Manifest|  1 +
 .../subtitleeditor/subtitleeditor-0.54.0.ebuild| 58 ++
 2 files changed, 59 insertions(+)

diff --git a/media-video/subtitleeditor/Manifest 
b/media-video/subtitleeditor/Manifest
index 11acc1a6819..abf02b57af6 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,2 +1,3 @@
 DIST subtitleeditor-0.52.1.tar.gz 1680875 SHA256 
5b3e5fc1f12bcf0d4bcf5014249b6832181bd3b513ac04ee665ec979441412d5 SHA512 
a9a7ee78abadf660fe645e36ed69b87131320e04373554adb48dc33df8f36605ed74da3822fe0281b2b75d6f82daddd062b2ae9a12aed44673195fba43adfd4f
 WHIRLPOOL 
def330a098b9227cf6db8a74c67d2cd7db724b65f586e22ebf1b08de6de6321849fdeecfe5fd6c0132a814d45d84087b406a05aec7463c04a4355530c3d09c44
 DIST subtitleeditor-0.53.0.tar.gz 1778388 SHA256 
8fac7430fb552438d075ef3809d4a0f04a764d4dd0723a3ef18b2b695fecf920 SHA512 
8787831947785885befb50221869169eda73489851389e72f34edac7a9c2c59d05ba69e86d4d2d5b3a13b2678377ee2520c110ffa472b718884dd2e711603b8b
 WHIRLPOOL 
cfd7bfd2324fe10dadd6e8c7c60487072d15dee3c6f0a57358abee4e5f92c945ba95efb036516ecadc0beebf52380b835cb35ae8af389110597ab5305a979639
+DIST subtitleeditor-0.54.0.tar.gz 1783077 SHA256 
aa9c539f3a0984deef257339e2b9f5c8728b8245113695cf6d42459f011aa2ab SHA512 
4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c
 WHIRLPOOL 
e67f2d94ec004e40855b440af3eafc7d78c859326b46a69c11fb633e650fdb3c0f44da9a9e3dadcf0a87ff598984d7cc1eabdf6fecb625b6357f4ec2dae4fb6d

diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
new file mode 100644
index 000..5c53d4f63b0
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.54.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="GTK+3 subtitle editing tool"
+HOMEPAGE="https://kitone.github.io/subtitleeditor;
+SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P}.tar.gz;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+# opengl would mix gtk+:2 and :3 which is not possible
+
+RDEPEND="
+   >=app-text/enchant-1.4
+   app-text/iso-codes
+   >=dev-cpp/cairomm-1.12
+   >=dev-cpp/glibmm-2.46:2
+   >=dev-cpp/gtkmm-3.18:3.0
+   >=dev-cpp/gstreamermm-1.0:1.0
+   >=dev-cpp/libxmlpp-2.40:2.6
+   dev-libs/glib:2
+   >=dev-libs/libsigc++-2.6:2
+   media-libs/gst-plugins-base:1.0[X,pango]
+   media-libs/gst-plugins-good:1.0
+   media-libs/gstreamer:1.0
+   media-plugins/gst-plugins-meta:1.0
+   x11-libs/gtk+:3
+   nls? ( virtual/libintl )
+"
+#  opengl? (
+#  >=dev-cpp/gtkglextmm-1.2.0-r2:1.0
+#  virtual/opengl )
+# X needed for video output and pango needed for text overlay
+DEPEND="${RDEPEND}
+   >=dev-util/intltool-0.40
+   virtual/pkgconfig
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch
+)
+
+src_configure() {
+   # Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
+   use debug && append-cxxflags -DDEBUG
+
+   gnome2_src_configure \
+   --disable-debug \
+   --disable-gl \
+   $(use_enable nls)
+#  $(use_enable opengl gl)
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2017-04-11 Thread Mart Raudsepp 
commit: 7209a44401ff23e71c7363a731bf8c60df90c36e
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Apr 12 00:41:50 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Apr 12 04:37:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7209a444

media-video/subtitleeditor: update metadata longdescription

It's GTK+3 now, not GTK+2. The same long description blurb on their homepage
has been changed from GTK+2 to GTK+3 as well.

 media-video/subtitleeditor/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitleeditor/metadata.xml 
b/media-video/subtitleeditor/metadata.xml
index 63a0a44bb13..51a0e86f0f0 100644
--- a/media-video/subtitleeditor/metadata.xml
+++ b/media-video/subtitleeditor/metadata.xml
@@ -10,6 +10,6 @@
Gentoo GNOME Desktop
 
 
-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 synchronise subtitles to voices.
+Subtitle Editor is a GTK+3 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 synchronise subtitles to voices.

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/, media-video/subtitleeditor/files/

2016-10-16 Thread Gilles Dartiguelongue 
commit: 752d12e78f044091a47d2c75927d2e4f8644a5de
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Oct 16 22:20:00 2016 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Oct 16 22:23:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=752d12e7

media-video/subtitleeditor: fix build with USE=-nls

Gentoo-bug: 589180

Package-Manager: portage-2.3.1

 .../subtitleeditor-0.52.1-disable-nls-fix.patch| 34 ++
 .../subtitleeditor/subtitleeditor-0.53.0.ebuild|  6 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git 
a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-disable-nls-fix.patch 
b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-disable-nls-fix.patch
new file mode 100644
index ..08e1558
--- /dev/null
+++ 
b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-disable-nls-fix.patch
@@ -0,0 +1,34 @@
+From 0f8700f022c9917336919b35a93883a660144516 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Mon, 17 Oct 2016 00:07:59 +0200
+Subject: [PATCH] Fix compilation with --disable-nls
+
+---
+ src/i18n.h | 11 +++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/i18n.h b/src/i18n.h
+index c8134a7..efce469 100644
+--- a/src/i18n.h
 b/src/i18n.h
+@@ -31,6 +31,17 @@
+   #include 
+   #include 
+ #else /* NLS is disabled */
++  // In certain environments, some standard headers like 
++  // and  include libintl.h. If libintl.h is included after
++  // gettext macros below are defined, it causes a syntax error
++  // at the declaration of the gettext function in libintl.h.
++  //
++  // Fix this by including such a header before defining the macro.
++  //
++  // Note that libintl.h cannot be included directly since in the
++  // ENABLE_NLS=0 case it cannot be assumed that gettext is installed.
++  #include 
++
+   #define _(String) (String)
+   #define N_(String) (String)
+   #define textdomain(String) (String)
+-- 
+2.10.0
+

diff --git a/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
index 2b1fe63..ac84b65 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
media-libs/gstreamer:1.0
media-plugins/gst-plugins-meta:1.0
x11-libs/gtk+:3
-   virtual/libintl
+   nls? ( virtual/libintl )
 "
 #  opengl? (
 #  >=dev-cpp/gtkglextmm-1.2.0-r2:1.0
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch
+)
+
 src_configure() {
# Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
use debug && append-cxxflags -DDEBUG

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/files/, media-video/subtitleeditor/

2016-09-17 Thread Pacho Ramos 
commit: 22b3282c07c8a96f3d796ad046c76f63e17d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 17 12:39:26 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 17 13:31:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b3

media-video/subtitleeditor: Drop old

Package-Manager: portage-2.3.0

 media-video/subtitleeditor/Manifest|  1 -
 ...subtitleeditor-0.41.0-keyframe-generation.patch | 30 -
 .../subtitleeditor-0.41.0-subtitle-edition.patch   | 27 
 .../files/subtitleeditor-0.41.0-textoverlay.patch  | 16 -
 .../subtitleeditor/subtitleeditor-0.41.1-r1.ebuild | 72 --
 5 files changed, 146 deletions(-)

diff --git a/media-video/subtitleeditor/Manifest 
b/media-video/subtitleeditor/Manifest
index 5b41626..c511af2 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,2 +1 @@
-DIST subtitleeditor-0.41.1.tar.gz 1637940 SHA256 
3183f2f9831359f2200194fcc2d360198094c494892ccacd08a28717bffac0d0 SHA512 
6e87df6bf1b97fc085387f331fa415be48086b9dabf445e6050ff3ab3c812c8fff72e613959308f07c2e849bf95064c5d288f44dbc266997e7143bbb46615c9d
 WHIRLPOOL 
63dde1cf17df34e0dfb0aeeb874a98095d6d338ca22138ff13747697d78a2d1be127f344c36286b79f828918ab1c615bccc7e04cc8586b12efe407c76f52
 DIST subtitleeditor-0.52.1.tar.gz 1680875 SHA256 
5b3e5fc1f12bcf0d4bcf5014249b6832181bd3b513ac04ee665ec979441412d5 SHA512 
a9a7ee78abadf660fe645e36ed69b87131320e04373554adb48dc33df8f36605ed74da3822fe0281b2b75d6f82daddd062b2ae9a12aed44673195fba43adfd4f
 WHIRLPOOL 
def330a098b9227cf6db8a74c67d2cd7db724b65f586e22ebf1b08de6de6321849fdeecfe5fd6c0132a814d45d84087b406a05aec7463c04a4355530c3d09c44

diff --git 
a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch
 
b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch
deleted file mode 100644
index b347d4c..
--- 
a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-keyframe-generation.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Philip Rinn 
-Description: Prevent crash when generating keyframes with gstreamermm 0.10.11
 a/plugins/actions/keyframesmanagement/keyframesgenerator.cc
-+++ b/plugins/actions/keyframesmanagement/keyframesgenerator.cc
-@@ -87,12 +87,20 @@
-   if(structure_name.find("video") == Glib::ustring::npos)
-   return Glib::RefPtr(NULL);
- 
--  Glib::RefPtr videobin = 
Glib::RefPtr::cast_dynamic(
--  Gst::Parse::create_bin(
--  "ffmpegcolorspace ! fakesink 
name=vsink", true));
-+  // ffmpegcolorspace
-+  Glib::RefPtr conv = 
Gst::ElementFactory::create_element("ffmpegcolorspace", "conv");
-+  // fakesink
-+  Glib::RefPtr vsink = 
Gst::FakeSink::create("vsink");
-+  // videobin
-+  Glib::RefPtr videobin = 
Gst::Bin::create("videobin");
- 
--  Glib::RefPtr vsink = 
Glib::RefPtr::cast_dynamic(
--  videobin->get_element("vsink"));
-+  // Add and link
-+  videobin->add(conv)->add(vsink);
-+  conv->link_pads("src", vsink, "sink");
-+
-+  // Add sink pad to bin element
-+  Glib::RefPtr pad = 
conv->get_static_pad("sink");
-+  videobin->add_pad(Gst::GhostPad::create(pad, "sink"));
- 
-   vsink->set_sync(false);
-   vsink->property_silent() = true;

diff --git 
a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-subtitle-edition.patch 
b/media-video/subtitleeditor/files/subtitleeditor-0.41.0-subtitle-edition.patch
deleted file mode 100644
index eff958f..
--- 
a/media-video/subtitleeditor/files/subtitleeditor-0.41.0-subtitle-edition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Philip Rinn 
-Description: With glib >= 2.42.0  you need to add interfaces before class_init
 a/src/gui/textviewcell.cc
-+++ b/src/gui/textviewcell.cc
-@@ -30,8 +30,8 @@
-  * Initialize the widget with the AutomaticSpellChecker.
-  */
- TextViewCell::TextViewCell()
-+: Gtk::CellEditable(), 
-+  Glib::ObjectBase(typeid(TextViewCell)),
--: Glib::ObjectBase(typeid(TextViewCell)),
--  Gtk::CellEditable(), 
-   m_editing_canceled(false), 
-   m_used_ctrl_enter_to_confirm_change(false)
- {
- 
 a/src/gui/textviewcell.h
-+++ b/src/gui/textviewcell.h
-@@ -29,7 +29,7 @@
- /*
-  * Cell text editable with multiline support.
-  */
--class TextViewCell : public Gtk::TextView, public Gtk::CellEditable
-+class TextViewCell : public Gtk::CellEditable, public Gtk::TextView
- {
- public:
- 

diff --git

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2016-09-17 Thread Pacho Ramos 
commit: e04335421b5c33d683efd019f3e28a1c94573dfa
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 17 12:44:53 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 17 13:31:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0433542

media-video/subtitleeditor: Version bump

Package-Manager: portage-2.3.0

 media-video/subtitleeditor/Manifest|  1 +
 .../subtitleeditor/subtitleeditor-0.53.0.ebuild| 55 ++
 2 files changed, 56 insertions(+)

diff --git a/media-video/subtitleeditor/Manifest 
b/media-video/subtitleeditor/Manifest
index c511af2..11acc1a 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1 +1,2 @@
 DIST subtitleeditor-0.52.1.tar.gz 1680875 SHA256 
5b3e5fc1f12bcf0d4bcf5014249b6832181bd3b513ac04ee665ec979441412d5 SHA512 
a9a7ee78abadf660fe645e36ed69b87131320e04373554adb48dc33df8f36605ed74da3822fe0281b2b75d6f82daddd062b2ae9a12aed44673195fba43adfd4f
 WHIRLPOOL 
def330a098b9227cf6db8a74c67d2cd7db724b65f586e22ebf1b08de6de6321849fdeecfe5fd6c0132a814d45d84087b406a05aec7463c04a4355530c3d09c44
+DIST subtitleeditor-0.53.0.tar.gz 1778388 SHA256 
8fac7430fb552438d075ef3809d4a0f04a764d4dd0723a3ef18b2b695fecf920 SHA512 
8787831947785885befb50221869169eda73489851389e72f34edac7a9c2c59d05ba69e86d4d2d5b3a13b2678377ee2520c110ffa472b718884dd2e711603b8b
 WHIRLPOOL 
cfd7bfd2324fe10dadd6e8c7c60487072d15dee3c6f0a57358abee4e5f92c945ba95efb036516ecadc0beebf52380b835cb35ae8af389110597ab5305a979639

diff --git a/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
new file mode 100644
index ..4e8c956
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.53.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2 versionator
+
+DESCRIPTION="GTK+3 subtitle editing tool"
+HOMEPAGE="http://home.gna.org/subtitleeditor/;
+SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 
1-2)/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug nls"
+# opengl would mix gtk+:2 and :3 which is not possible
+
+RDEPEND="
+   >=app-text/enchant-1.4
+   app-text/iso-codes
+   >=dev-cpp/cairomm-1.12
+   >=dev-cpp/glibmm-2.46:2
+   >=dev-cpp/gtkmm-3.18:3.0
+   >=dev-cpp/gstreamermm-1.0:1.0
+   >=dev-cpp/libxmlpp-2.40:2.6
+   dev-libs/glib:2
+   >=dev-libs/libsigc++-2.6:2
+   media-libs/gst-plugins-base:1.0[X,pango]
+   media-libs/gst-plugins-good:1.0
+   media-libs/gstreamer:1.0
+   media-plugins/gst-plugins-meta:1.0
+   x11-libs/gtk+:3
+   virtual/libintl
+"
+#  opengl? (
+#  >=dev-cpp/gtkglextmm-1.2.0-r2:1.0
+#  virtual/opengl )
+# X needed for video output and pango needed for text overlay
+DEPEND="${RDEPEND}
+   >=dev-util/intltool-0.40
+   virtual/pkgconfig
+"
+
+src_configure() {
+   # Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
+   use debug && append-cxxflags -DDEBUG
+
+   gnome2_src_configure \
+   --disable-debug \
+   --disable-gl \
+   $(use_enable nls)
+#  $(use_enable opengl gl)
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2016-03-06 Thread Mikle Kolyada 
commit: 2b0c0a9cd73be681a344798e014855884cb69810
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar  6 20:23:34 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar  6 20:33:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b0c0a9c

media-video/subtitleeditor: x86 stable wrt bug #566378

Package-Manager: portage-2.2.26

 media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
index 6cbf887..36df4d6 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.t
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug nls"
 # opengl would mix gtk+:2 and :3 which is not possible

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/files/, media-video/subtitleeditor/

2015-12-23 Thread Gilles Dartiguelongue 
commit: 8c595ef0ef77df069f42bd41a1171afdec579e41
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu Dec 24 01:10:49 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Dec 24 01:11:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c595ef0

media-video/subtitleeditor: version bump to 0.52.1, bug #550764

Drop USE=opengl due to mixing incompatible gtk+:2 and :3.
Raise dependency and apply fixes to build with C++11 enabled dependencies.

https://bugs.gentoo.org/show_bug.cgi?id=550764

Package-Manager: portage-2.2.26

 media-video/subtitleeditor/Manifest|  1 +
 .../files/subtitleeditor-0.52.1-build-fix.patch| 55 +
 .../subtitleeditor/subtitleeditor-0.52.1.ebuild| 69 ++
 3 files changed, 125 insertions(+)

diff --git a/media-video/subtitleeditor/Manifest 
b/media-video/subtitleeditor/Manifest
index 75a4bb2..5b41626 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1 +1,2 @@
 DIST subtitleeditor-0.41.1.tar.gz 1637940 SHA256 
3183f2f9831359f2200194fcc2d360198094c494892ccacd08a28717bffac0d0 SHA512 
6e87df6bf1b97fc085387f331fa415be48086b9dabf445e6050ff3ab3c812c8fff72e613959308f07c2e849bf95064c5d288f44dbc266997e7143bbb46615c9d
 WHIRLPOOL 
63dde1cf17df34e0dfb0aeeb874a98095d6d338ca22138ff13747697d78a2d1be127f344c36286b79f828918ab1c615bccc7e04cc8586b12efe407c76f52
+DIST subtitleeditor-0.52.1.tar.gz 1680875 SHA256 
5b3e5fc1f12bcf0d4bcf5014249b6832181bd3b513ac04ee665ec979441412d5 SHA512 
a9a7ee78abadf660fe645e36ed69b87131320e04373554adb48dc33df8f36605ed74da3822fe0281b2b75d6f82daddd062b2ae9a12aed44673195fba43adfd4f
 WHIRLPOOL 
def330a098b9227cf6db8a74c67d2cd7db724b65f586e22ebf1b08de6de6321849fdeecfe5fd6c0132a814d45d84087b406a05aec7463c04a4355530c3d09c44

diff --git 
a/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch 
b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
new file mode 100644
index 000..9cce5d2
--- /dev/null
+++ b/media-video/subtitleeditor/files/subtitleeditor-0.52.1-build-fix.patch
@@ -0,0 +1,55 @@
+Fix build errors with gcc-4.9.3 -std=c++11 (after disabling -ansi)
+
+https://gna.org/bugs/?23714
+
+https://bugs.gentoo.org/show_bug.cgi?id=550764
+https://bugs.gentoo.org/show_bug.cgi?id=566328
+
+--- a/src/subtitleview.cc  2015-12-24 01:52:29.322622155 +0100
 b/src/subtitleview.cc  2015-12-24 01:52:44.210491213 +0100
+@@ -1363,7 +1363,7 @@
+   {
+   int num;
+   std::istringstream ss(event->string);
+-  bool is_num = ss >> num != 0; 
++  bool is_num = static_cast(ss >> num) != 0; 
+   // Update only if it's different
+   if(is_num != get_enable_search())
+   set_enable_search(is_num);
+--- a/src/utility.h2015-12-24 01:49:42.205104858 +0100
 b/src/utility.h2015-12-24 01:50:23.387737071 +0100
+@@ -91,7 +91,7 @@
+   std::istringstream s(src);
+   // return s >> dest != 0;
+ 
+-  bool state = s >> dest != 0;
++  bool state = static_cast(s >> dest) != 0;
+ 
+   if(!state)
+   se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", 
src.c_str());
+--- a/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:24.125428454 
+0100
 b/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:42.630277006 
+0100
+@@ -23,7 +23,7 @@
+  *along with this program. If not, see .
+  */
+  
+-#include 
++#include 
+ #include "extension/action.h"
+ #include "i18n.h"
+ #include "debug.h"
+--- a/plugins/actions/documentmanagement/documentmanagement.old
2015-12-24 01:17:13.914730337 +0100
 b/plugins/actions/documentmanagement/documentmanagement.cc 2015-12-24 
01:17:23.339640430 +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/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
new file mode 100644
index 000..fa99db5
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2015-12-19 Thread Pacho Ramos 
commit: 834ff08c1322c8cec745b3847ccceeb1921e5569
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Dec 19 15:27:42 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Dec 19 16:16:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=834ff08c

media-video/subtitleeditor: Fix building with latest glibmm/libsigc++

Package-Manager: portage-2.2.26

 media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild
index 7b16161..8c53231 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild
@@ -65,6 +65,8 @@ src_configure() {
# Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
use debug && append-flags -DDEBUG
 
+   append-cxxflags -std=c++11
+
gnome2_src_configure \
--disable-debug \
$(use_enable nls) \

[gentoo-commits] repo/gentoo:master commit in: media-video/subtitleeditor/

2015-12-19 Thread Pacho Ramos 
commit: 96ed0cb7fcd219c58f0b912fb55b398d88c09696
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Dec 19 15:31:33 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Dec 19 16:16:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ed0cb7

Revert "media-video/subtitleeditor: Fix building with latest glibmm/libsigc++"

This reverts commit 48f818c8936130e926498dad44269609bc91b0ee.

 media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild 
b/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild
index 8c53231..7b16161 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.41.1-r1.ebuild
@@ -65,8 +65,6 @@ src_configure() {
# Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
use debug && append-flags -DDEBUG
 
-   append-cxxflags -std=c++11
-
gnome2_src_configure \
--disable-debug \
$(use_enable nls) \