Add qt4 patch, upstream warning, bug 322935

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 160543b2ce6b4651a80f72c46fae71d64b34535b..fb0b637b38c3f29e9032ac4005c5056d75ed5eb0 100644 (file)
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.128 2010/06/05 22:20:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.129 2010/06/08 13:20:21 beandog Exp $
+
+*mkvtoolnix-4.0.0-r1 (08 Jun 2010)
+
+  08 Jun 2010; Steve Dibb <beandog@gentoo.org> -mkvtoolnix-4.0.0.ebuild,
+  +mkvtoolnix-4.0.0-r1.ebuild, +files/mkvtoolnix-4.0.0-qt4.patch:
+  Add qt4 patch, upstream warning, bug 322935
 
 *mkvtoolnix-4.0.0 (05 Jun 2010)
 

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index a50b22e4959f32938fe01cc2a5e7bc2bb9c4d5b1..b2765fa2dfe09a0859a265457bdbce7dd22337ef 100644 (file)
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,4 @@
+AUX mkvtoolnix-4.0.0-qt4.patch 446 RMD160 3044bccd8c22cd607b43476c90a09cdf7730dbcd SHA1 a7b28c83bd4ae1d4509c502bed91a4f880b30c02 SHA256 fbbb6da36e5c35eac2ca5e1e87022eb02627a20178a123e26cc9bf14848f6ac3
 DIST mkvtoolnix-2.9.9.tar.bz2 1116610 RMD160 5bc4599d66c55298ca901b21fdcd0ef0bae88906 SHA1 3e41855c95dd30a22f353cebb0d8ae1d9ee2c138 SHA256 0df4ee19c7b4961af0ec027b54b31a84bffd8f7bae2f98145df48c4a520dbb7a
 DIST mkvtoolnix-3.2.0.tar.bz2 1384155 RMD160 d4dd843ddfbb741339080dbb729938eedf2505d8 SHA1 e5d2137402ef6731ee019a472527b77935d301b1 SHA256 2b247053f48ccb8f2ba3e165d3751c82f7ede4948224383ce9b62f2b7ba746aa
 DIST mkvtoolnix-3.3.0.tar.bz2 1369940 RMD160 8a3d9b0990815ce058ed9e1d317a01dcbeece091 SHA1 6e6cf694f6b887c6027ea2dcdd4aed704cdcab9f SHA256 a24fb6fbcd6779f02f8146ee448abfc6dab9ac23ed15b685b37e6a71e340a5f4
@@ -7,6 +8,6 @@ EBUILD mkvtoolnix-2.9.9.ebuild 1758 RMD160 401f97f9a5fe733c3ad75fe13e7d1f9e19c5d
 EBUILD mkvtoolnix-3.2.0.ebuild 1947 RMD160 03c311ffc41e58c535dbad8da52b7fd6888a2e52 SHA1 3a1e1d1cab19aa7eb9f9d7e9d5e607e9c7ea423f SHA256 4a3c7aff1082ba209463f393253205c80b3fd3671a7b3140df90e08546a428e2
 EBUILD mkvtoolnix-3.3.0.ebuild 1949 RMD160 cb1a28743ec759eaab9d415abec315ecdeb3f824 SHA1 615356a5c38c4cf6c72f15f27749495fe379cc9e SHA256 bfa8413ae1b62225bfabe2008300fe223730e0e21db89e0a4acb731650a1270a
 EBUILD mkvtoolnix-3.4.0.ebuild 1949 RMD160 1a91235c15eb9ebdbc97ec8d9ee0e5ce07d0810a SHA1 dfc292bd2280dfa5d4b01dd08fabae9624779380 SHA256 4a55ad825b599180361046c44466a05f8ac3f39da3f3367ffd87591814382646
-EBUILD mkvtoolnix-4.0.0.ebuild 1949 RMD160 526d911c38a87c12ec15b8e0570e1e48d48a7872 SHA1 4132536ca6a4dd08347777c64370f8f51c39ce3b SHA256 2a3876d10c24ae51dc208de7e7f93c477c24cd23884046c09cd6297dfcc5a997
-MISC ChangeLog 18866 RMD160 6bb5d5fee09e1d10be6bfbf9a74eb6c3eca75d6b SHA1 b2755d540e102c6b894669753dd7f33d27f84825 SHA256 a1bfd92690fbf1aedd4309659339aac553a7d8dbdb2fdcfaf7eb33a3c9d2e2cb
+EBUILD mkvtoolnix-4.0.0-r1.ebuild 2088 RMD160 f2a665bb3286e76ab876d29218ebccf616d3a715 SHA1 a287969a571fad38fb95eb9d0b5d15548fd7ffaa SHA256 86429ff485b612062d8f87016f0e6b142c81cee1931e02a0e01c87ce806b76c4
+MISC ChangeLog 19088 RMD160 219e2140dc7e46900387597b6a26066d929d5553 SHA1 fe8626b846228f37a35fa9b7ca29fde869231c97 SHA256 58019853380ffdfa887773b9ac0c5cabf8327533baf503b292c1286ffc90e2e3
 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-4.0.0-qt4.patch b/media-video/mkvtoolnix/files/mkvtoolnix-4.0.0-qt4.patch
new file mode 100644 (file)
index 0000000..b79f668
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-4.0.0-qt4.patch
@@ -0,0 +1,11 @@
+--- src/info/qt_ui.cpp.orig    2010-06-08 07:03:31.000000000 -0600
++++ src/info/qt_ui.cpp 2010-06-08 07:04:05.000000000 -0600
+@@ -260,7 +260,7 @@
+                 int64_t position,
+                 int64_t size) {
+   if (!g_use_gui)
+-    console_show_element(level, text, position);
++    console_show_element(level, text, position, size);
+ 
+   else if (0 <= position)
+     gui->add_item(level, Q(create_element_text(text, position, size).c_str()));

diff --git a/media-video/mkvtoolnix/mkvtoolnix-4.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-4.0.0-r1.ebuild
similarity index 90%
rename from media-video/mkvtoolnix/mkvtoolnix-4.0.0.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-4.0.0-r1.ebuild
index b4032ec8e2b8d78969b167c5678f6232ad644372..3fe2f78d1e77f0f047ff03d59ceb5ad5b2140b5f 100644 (file)
--- a/media-video/mkvtoolnix/mkvtoolnix-4.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-4.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.0.0.ebuild,v 1.1 2010/06/05 22:20:22 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-4.0.0-r1.ebuild,v 1.1 2010/06/08 13:20:21 beandog Exp $
 
 EAPI="1"
 inherit eutils wxwidgets flag-o-matic qt4 autotools
@@ -38,7 +38,7 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
-
+       epatch "${FILESDIR}"/${P}-qt4.patch
        eautoreconf
 }
 
@@ -73,3 +73,8 @@ src_install() {
                dodoc examples/* || die "dodoc failed"
        fi
 }
+
+pkg_postinst() {
+       use qt4 && elog "Qt GUI is unsupported by upstream, and may be removed
+       soon."
+}