summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2007-08-04 18:51:09 +0000
committerMiroslav Šulc <fordfrog@gentoo.org>2007-08-04 18:51:09 +0000
commit26af840a35973e86ad1bd46dbc82fc7b9a6149d3 (patch)
treef36f1f2af0998c2f34a425cb970465dc7fce408d /media-video/jubler
parentSparc stable --- part of Bug #178690 (diff)
downloadgentoo-2-26af840a35973e86ad1bd46dbc82fc7b9a6149d3.tar.gz
gentoo-2-26af840a35973e86ad1bd46dbc82fc7b9a6149d3.tar.bz2
gentoo-2-26af840a35973e86ad1bd46dbc82fc7b9a6149d3.zip
Updated to the latest files from svn.
(Portage version: 2.1.3.3)
Diffstat (limited to 'media-video/jubler')
-rw-r--r--media-video/jubler/ChangeLog6
-rw-r--r--media-video/jubler/files/jubler-3.3.0.patch27
-rw-r--r--media-video/jubler/jubler-3.3.0.ebuild6
3 files changed, 30 insertions, 9 deletions
diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index 0ce0d1f21610..3e1b3976b9bb 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/jubler
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.1 2007/08/04 18:45:49 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.2 2007/08/04 18:51:09 fordfrog Exp $
+
+ 04 Aug 2007; Miroslav Šulc <fordfrog@gentoo.org>
+ files/jubler-3.3.0.patch, jubler-3.3.0.ebuild:
+ Updated to the latest files from svn.
*jubler-3.3.0 (04 Aug 2007)
diff --git a/media-video/jubler/files/jubler-3.3.0.patch b/media-video/jubler/files/jubler-3.3.0.patch
index f14189beb618..86d681d02c88 100644
--- a/media-video/jubler/files/jubler-3.3.0.patch
+++ b/media-video/jubler/files/jubler-3.3.0.patch
@@ -1,6 +1,6 @@
diff -Nur Jubler-3.3.0/build.xml Jubler-3.3.0_patched/build.xml
--- Jubler-3.3.0/build.xml 2007-07-21 19:32:19.000000000 +0300
-+++ Jubler-3.3.0_patched/build.xml 2007-08-04 03:00:30.000000000 +0300
++++ Jubler-3.3.0_patched/build.xml 2007-08-04 19:30:49.000000000 +0300
@@ -69,22 +69,6 @@
@@ -36,7 +36,7 @@ diff -Nur Jubler-3.3.0/build.xml Jubler-3.3.0_patched/build.xml
<target name="MacSystem" depends="findsystem" if="isMac">
diff -Nur Jubler-3.3.0/resources/ffdecode/Makefile Jubler-3.3.0_patched/resources/ffdecode/Makefile
--- Jubler-3.3.0/resources/ffdecode/Makefile 2007-07-19 01:30:08.000000000 +0300
-+++ Jubler-3.3.0_patched/resources/ffdecode/Makefile 2007-08-04 05:13:00.000000000 +0300
++++ Jubler-3.3.0_patched/resources/ffdecode/Makefile 2007-08-04 19:30:49.000000000 +0300
@@ -12,9 +12,6 @@
# Name of the produced library
PROJ=ffdecode
@@ -80,7 +80,7 @@ diff -Nur Jubler-3.3.0/resources/ffdecode/Makefile Jubler-3.3.0_patched/resource
clean:
diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-3.3.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java
--- Jubler-3.3.0/src/com/panayotis/jubler/information/HelpBrowser.java 2007-07-19 01:30:05.000000000 +0300
-+++ Jubler-3.3.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java 2007-08-04 03:18:39.000000000 +0300
++++ Jubler-3.3.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java 2007-08-04 19:30:49.000000000 +0300
@@ -31,7 +31,7 @@
history = new ArrayList<String>();
@@ -90,9 +90,26 @@ diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/information/HelpBrowser.java Jub
setPage(initpage);
history.add(initpage);
+diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/Main.java Jubler-3.3.0_patched/src/com/panayotis/jubler/Main.java
+--- Jubler-3.3.0/src/com/panayotis/jubler/Main.java 2007-07-19 01:30:07.000000000 +0300
++++ Jubler-3.3.0_patched/src/com/panayotis/jubler/Main.java 2007-08-04 19:35:01.000000000 +0300
+@@ -97,13 +97,6 @@
+ }
+ splash.dispose();
+ loader.start();
+-
+- Thread t = new Thread() {
+- public void run() {
+- StaticJubler.initVersion();
+- }
+- };
+- t.start();
+ }
+
+
diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemDependent.java
--- Jubler-3.3.0/src/com/panayotis/jubler/os/SystemDependent.java 2007-07-21 19:23:13.000000000 +0300
-+++ Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemDependent.java 2007-08-04 03:39:16.000000000 +0300
++++ Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemDependent.java 2007-08-04 19:30:49.000000000 +0300
@@ -25,10 +25,6 @@
import static com.panayotis.jubler.i18n.I18N._;
@@ -326,7 +343,7 @@ diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3
-}
diff -Nur Jubler-3.3.0/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java
--- Jubler-3.3.0/src/com/panayotis/jubler/os/SystemFileFinder.java 2007-07-19 01:30:05.000000000 +0300
-+++ Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java 2007-08-04 03:34:35.000000000 +0300
++++ Jubler-3.3.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java 2007-08-04 19:30:49.000000000 +0300
@@ -58,15 +58,12 @@
}
diff --git a/media-video/jubler/jubler-3.3.0.ebuild b/media-video/jubler/jubler-3.3.0.ebuild
index 03734f08c50a..bfa09916aaab 100644
--- a/media-video/jubler/jubler-3.3.0.ebuild
+++ b/media-video/jubler/jubler-3.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-3.3.0.ebuild,v 1.1 2007/08/04 18:45:49 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-3.3.0.ebuild,v 1.2 2007/08/04 18:51:09 fordfrog Exp $
inherit eutils java-pkg-2 java-utils-2 java-ant-2 toolchain-funcs flag-o-matic
@@ -48,8 +48,8 @@ src_compile() {
use nls && anttasks_opt="i18n"
eant ${anttasks_opt} jar faq || die "eant failed"
cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
- cd resources/ffdecode
- CC=$(tc-getCC) emake linuxdyn
+ cd resources/ffdecode || die
+ CC=$(tc-getCC) emake linuxdyn || "make failed"
}
src_install() {