summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/subtitleeditor')
-rw-r--r--media-video/subtitleeditor/ChangeLog7
-rw-r--r--media-video/subtitleeditor/Manifest17
-rw-r--r--media-video/subtitleeditor/files/subtitleeditor-0.40.0-glib-2.31.patch15
-rw-r--r--media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild7
4 files changed, 38 insertions, 8 deletions
diff --git a/media-video/subtitleeditor/ChangeLog b/media-video/subtitleeditor/ChangeLog
index 341dbf1b51a2..c7b712c17853 100644
--- a/media-video/subtitleeditor/ChangeLog
+++ b/media-video/subtitleeditor/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/subtitleeditor
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.17 2012/04/29 16:04:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.18 2012/05/04 00:19:07 tetromino Exp $
+
+ 04 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ subtitleeditor-0.40.0.ebuild, +files/subtitleeditor-0.40.0-glib-2.31.patch:
+ Fix build failure with >=glib-2.31 (bug #413843, thanks to Piotr Mitas and
+ Andre Reinke).
29 Apr 2012; Markus Meier <maekke@gentoo.org> subtitleeditor-0.40.0.ebuild:
x86 stable, bug #410611
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index d8ad4a6f9201..64ab1acde83b 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,16 +1,21 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX subtitleeditor-0.40.0-glib-2.31.patch 374 RMD160 db30c83c803676167e1e2a4d361556e09871eb7a SHA1 7eaaa6d7a8864a7d38cdf4b48f07053eae775e2b SHA256 8f32496eb6b7e1504bbc93f89194b217232498b9912bc4eac52d66ed66311861
DIST subtitleeditor-0.37.1.tar.gz 1325186 RMD160 7f439c237535fef0857cb5180ceb84421322f279 SHA1 36b839942c52a67f14bbb1fd5d698db2645543ca SHA256 2601750fe33529e4fec85f422165c7f34e7b87f619725c11a1a2135b14306ddf
DIST subtitleeditor-0.40.0.tar.gz 1421300 RMD160 be8862d2a5f06440b40c5f9af8412101281a999a SHA1 e905373ab7ec5076c3c548b0d445e7520f0aec8b SHA256 b8d948f3e770524bf63fe632600aa94fcbd4edba772cad2aec4fdb3b3335b02d
EBUILD subtitleeditor-0.37.1.ebuild 1763 RMD160 861c323006b48f07554743e8f1c19423a3389d61 SHA1 f6f91db88d914096732a5338e4a02574e5dc4162 SHA256 a7790a02de566859c9cf3eebffe9f1630e5e2bada37c4d42708a3e80446226e8
-EBUILD subtitleeditor-0.40.0.ebuild 1688 RMD160 4422f48146e62ceee763cdb57f2e66ca1d57d57c SHA1 aedc4775acb3c94fd617a4b03221545f6fad433b SHA256 b3f52a9850ab5ea9bb119687681b1b085bdc7dd266bc81d9eb82c42603590837
-MISC ChangeLog 3450 RMD160 0966b8006476a154ce9e58f3e5f93d1c824efdf7 SHA1 d6ebfe223efe5804769076218e8ac0c6a3d340d5 SHA256 184569ea472d8b64daae225e2b11147f0eee183c0154bd9a8a0f22ffb416f978
+EBUILD subtitleeditor-0.40.0.ebuild 1806 RMD160 fc03aabe15ec66b7a46a6f4d641588aaafb2705b SHA1 ef84475bb378825c685788f23a744d9727966366 SHA256 63fc1aaac3eb24612c132340335e6410fe09b40d309a9e5d1229d4efa2ea2281
+MISC ChangeLog 3685 RMD160 3c897e2426d6902aa6326862d2d905931b3b80eb SHA1 1673b978982f68df99ff1d9e44d749f02b5db1f6 SHA256 918dffa6696ea74f7d9efe342a5f20b5d1097cd1295b6d4ec37265b587368b68
MISC metadata.xml 633 RMD160 7e00fdae57f03f5272fad843f52f46379fbaf503 SHA1 c06f3018039b1997ea0eaff59db634736686b93c SHA256 b0e1e281ff7cd751f87ec7c7897a850f55f62589bda8efd1d107bd8dbcb09e77
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk+dZz0ACgkQkKaRLQcq0GIZMACfZH99pIscJOMGkbAtIhUZ17FI
-pJYAn0dYd19Z6sW+3Ybf2R8r2Z9mReMD
-=f7EU
+iQEcBAEBAgAGBQJPoyCAAAoJEJ0WA1zPCt1hzzQH/3Ykfvrm1jW3Oekx7mmNNdoW
+lIEc1cEA3xxxsL5WzPzZBMSxLlXJfu8C7wAmqkqyO+/m9UMRGb6yM4zkvFe3w1Mn
+oQWnFWUSr/oCNcNQSkGNiZT44uRfkvvlwwlGc57HUwHqCK/YAkgaqoC6+FzAAkZR
+BcYBzb1PSV7cmkBKX8rBo1MBvLjt9ITv4mzV5Ggd9V/ac6joukA60jWai0Upbl/8
+LYoFoMtRzeVlX4NFfeD3vqcELIvTqdCHx+wnD8zr1uzDJjmBDdyaKH62l8cNiO2M
+RsW6mDwKk1mQlRQvaXyraF6HOCREDT1M9d7ccy9hWuKbmExgGumzTyk/YfSVSaw=
+=Vnqa
-----END PGP SIGNATURE-----
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.40.0-glib-2.31.patch b/media-video/subtitleeditor/files/subtitleeditor-0.40.0-glib-2.31.patch
new file mode 100644
index 000000000000..7ac0bd365159
--- /dev/null
+++ b/media-video/subtitleeditor/files/subtitleeditor-0.40.0-glib-2.31.patch
@@ -0,0 +1,15 @@
+From: Andre Reinke <andre.reinke@googlemail.com>
+
+https://gna.org/bugs/index.php?19709
+
+--- a/plugins/actions/findandreplace/findandreplace.cc
++++ b/plugins/actions/findandreplace/findandreplace.cc
+@@ -26,7 +26,7 @@
+ #include <gui/dialogutility.h>
+ #include <gtkmm_utility.h>
+ #include <widget_config_utility.h>
+-#include <glib/gregex.h>
++#include <glib.h>
+
+ /*
+ * FIXME:
diff --git a/media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild b/media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild
index 17acbe8be4eb..c04d9822fa4b 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild,v 1.3 2012/04/29 16:04:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.40.0.ebuild,v 1.4 2012/05/04 00:19:07 tetromino Exp $
EAPI="4"
@@ -37,6 +37,11 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog NEWS README TODO"
+src_prepare() {
+ # bug #413843, https://gna.org/bugs/index.php?19709
+ epatch "${FILESDIR}/${P}-glib-2.31.patch"
+}
+
src_configure() {
export GST_REGISTRY="${T}/home/registry.cache.xml"