Version bump. Freedesktop patch committed upstream. Fixes bug #200235.

(Portage version: 2.1.4_rc2)

4 files changed, 270 insertions, 1 deletions

diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index b4b427371eab..2a7a6cb4a3de 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2007/11/21 21:11:22 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.6 2007/11/24 23:43:12 betelgeuse Exp $
+
+*jubler-3.4.1 (24 Nov 2007)
+
+  24 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/jubler-3.4.1.patch, +jubler-3.4.1.ebuild:
+  Version bump. Freedesktop patch committed upstream. Fixes bug #200235.
 
 *jubler-3.4.0 (21 Nov 2007)
 
diff --git a/media-video/jubler/files/digest-jubler-3.4.1 b/media-video/jubler/files/digest-jubler-3.4.1
new file mode 100644
index 000000000000..5d389adeeb9c
--- /dev/null
+++ b/media-video/jubler/files/digest-jubler-3.4.1
@@ -0,0 +1,3 @@
+MD5 187da5a82389415b0c5c956d9d790d58 Jubler-src-3.4.1.tar.bz2 1711351
+RMD160 ed5bb1c3c11406349f7a4473a91185e0326ed662 Jubler-src-3.4.1.tar.bz2 1711351
+SHA256 257b4362f8b22d8f45f52a1c90f89af7670c31fa125c9afecaa48b68028afcec Jubler-src-3.4.1.tar.bz2 1711351
diff --git a/media-video/jubler/files/jubler-3.4.1.patch b/media-video/jubler/files/jubler-3.4.1.patch
new file mode 100644
index 000000000000..35b6ec8c06a6
--- /dev/null
+++ b/media-video/jubler/files/jubler-3.4.1.patch
@@ -0,0 +1,190 @@
+diff -Nur Jubler-3.4.1/build.xml Jubler-3.4.1_patched/build.xml
+--- Jubler-3.4.1/build.xml	2007-11-22 16:20:30.000000000 +0200
++++ Jubler-3.4.1_patched/build.xml	2007-11-24 22:46:46.000000000 +0200
+@@ -69,22 +69,6 @@
+ 
+ 
+ 
+-	<!-- Define new ant tasks -->
+-
+-	<taskdef name="izpack"
+-		onerror="report"
+-		classpath="../TOOLS/IzPack/standalone-compiler.jar"
+-		classname="com.izforge.izpack.ant.IzPackTask"/>
+-
+-	<taskdef name="launch4j"
+-		onerror="report"
+-		classpath="../TOOLS/launch4j/launch4j.jar:../TOOLS/launch4j/lib/xstream.jar" 
+-		classname="net.sf.launch4j.ant.Launch4jTask"/>
+-	
+-	<taskdef name="jarbundler"
+-		onerror="report"
+-		classpath="../TOOLS/jarbundler/jarbundler-1.9.jar"
+-		classname="net.sourceforge.jarbundler.JarBundler" />
+ 
+ 
+ 
+@@ -396,9 +380,6 @@
+ 	
+ 
+ 	
+-	<target name="-pre-compile">
+-		<copy todir="src/com"> <fileset dir="resources/system/no_mac"/> </copy>
+-	</target>
+ 	<target name="-post-compile">
+ 		<delete dir="build/classes/com/apple" failonerror="false"/>
+ 		<delete dir="src/com/apple" failonerror="false"/>
+diff -Nur Jubler-3.4.1/resources/ffdecode/Makefile Jubler-3.4.1_patched/resources/ffdecode/Makefile
+--- Jubler-3.4.1/resources/ffdecode/Makefile	2007-11-24 20:59:29.000000000 +0200
++++ Jubler-3.4.1_patched/resources/ffdecode/Makefile	2007-11-24 22:47:54.000000000 +0200
+@@ -12,9 +12,6 @@
+ # Name of the produced library
+ PROJ=ffdecode
+ 
+-# Paths of include files
+-JAVA_HOME=${shell /bin/sh ../system/findjava.sh -j}
+-
+ # Path of the local ffmpeg source structure (already inside the source version of Jubler)
+ FFMPEG=../ffmpeg-svn
+ 
+@@ -40,7 +37,7 @@
+ SRCS=${shell ls 2>/dev/null *.c}
+ OBJS=${SRCS:.c=.o}
+ 
+-COMPFLAGS=${CFLAGS} -std=c99 -pedantic -O3 -Wall -fPIC
++COMPFLAGS=${CFLAGS} -std=c99 -pedantic -Wall -fPIC
+ 
+ ifeq (${STATIC},no)
+ 	FFMPEGREQ=
+@@ -98,7 +95,6 @@
+ 
+ FCONFCOMMON=--disable-debug --enable-gpl --disable-ffmpeg --disable-ffserver --disable-ffplay --disable-encoders --disable-muxers --enable-muxer=wav --disable-vhook --disable-ipv6 --disable-network --disable-libdc1394
+ 
+-CC=${PREF}gcc ${GCCOPTS}
+ RANLIB=${PREF}ranlib
+ 
+ 
+@@ -153,8 +149,6 @@
+ 
+ ${LIBNAME}:${FFMPEGREQ} ${OBJS} ${RANLIBREQ}
+ 	${LD} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
+-	${STRIP} ${LIBNAME}
+-
+ 
+ clean:
+ 	rm -f *.o
+diff -Nur Jubler-3.4.1/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-3.4.1_patched/src/com/panayotis/jubler/information/HelpBrowser.java
+--- Jubler-3.4.1/src/com/panayotis/jubler/information/HelpBrowser.java	2007-11-15 01:00:52.000000000 +0200
++++ Jubler-3.4.1_patched/src/com/panayotis/jubler/information/HelpBrowser.java	2007-11-24 22:48:42.000000000 +0200
+@@ -47,7 +47,7 @@
+         
+         history = new ArrayList<String>();
+         
+-        String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/help/jubler-faq.html";
++        String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/../help/jubler-faq.html";
+         setPage(initpage);
+         history.add(initpage);
+         
+diff -Nur Jubler-3.4.1/src/com/panayotis/jubler/Main.java Jubler-3.4.1_patched/src/com/panayotis/jubler/Main.java
+--- Jubler-3.4.1/src/com/panayotis/jubler/Main.java	2007-11-22 16:53:44.000000000 +0200
++++ Jubler-3.4.1_patched/src/com/panayotis/jubler/Main.java	2007-11-24 22:49:14.000000000 +0200
+@@ -84,17 +84,9 @@
+         /* Load arguments, in a mac way */
+         SystemDependent.initApplication();
+ 
+-        /* Check current version in a new thread */
+-        Thread versioncheck = new Thread() {
+-            public void run() {
+-                StaticJubler.initVersion();
+-            }
+-        };
+-
+         new Jubler();   // Display initial Jubler window
+         splash.dispose();   // Hide splash screen
+         loader.start();     // initialize loader
+-        versioncheck.start();
+                 
+     }
+         
+diff -Nur Jubler-3.4.1/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3.4.1_patched/src/com/panayotis/jubler/os/SystemDependent.java
+--- Jubler-3.4.1/src/com/panayotis/jubler/os/SystemDependent.java	2007-11-18 14:10:12.000000000 +0200
++++ Jubler-3.4.1_patched/src/com/panayotis/jubler/os/SystemDependent.java	2007-11-24 22:50:54.000000000 +0200
+@@ -25,10 +25,6 @@
+ 
+ import static com.panayotis.jubler.i18n.I18N._;
+ 
+-import com.apple.eawt.Application;
+-import com.apple.eawt.ApplicationAdapter;
+-import com.apple.eawt.ApplicationEvent;
+-
+ import com.panayotis.jubler.Jubler;
+ import com.panayotis.jubler.Main;
+ import com.panayotis.jubler.StaticJubler;
+@@ -104,10 +100,6 @@
+     
+     
+     public static void initApplication() {
+-        /* In Linux this is a dummy function */
+-        if (isMacOSX()) {
+-            JublerApp japp = new JublerApp();
+-        }
+     }
+     
+     
+@@ -322,36 +314,3 @@
+         return home+".jubler/output.log";
+     }
+ }
+-
+-
+-
+-class JublerApp extends Application {
+-    public JublerApp() {
+-        setEnabledPreferencesMenu(true);
+-        addApplicationListener(new ApplicationHandler());
+-    }
+-}
+-
+-class ApplicationHandler extends ApplicationAdapter {
+-    
+-    public ApplicationHandler() {}
+-    
+-    public void handleAbout(ApplicationEvent event) {
+-        StaticJubler.showAbout();
+-        event.setHandled(true);
+-    }
+-    
+-    public void handlePreferences(ApplicationEvent event) {
+-        Jubler.prefs.showPreferencesDialog();
+-        event.setHandled(true);
+-    }
+-    
+-    public void handleQuit(ApplicationEvent event) {
+-        StaticJubler.quitAll();
+-        event.setHandled(false);
+-    }
+-    
+-    public void handleOpenFile(ApplicationEvent event) {
+-        Main.asyncAddSubtitle(event.getFilename());
+-    }
+-}
+diff -Nur Jubler-3.4.1/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-3.4.1_patched/src/com/panayotis/jubler/os/SystemFileFinder.java
+--- Jubler-3.4.1/src/com/panayotis/jubler/os/SystemFileFinder.java	2007-11-15 00:52:55.000000000 +0200
++++ Jubler-3.4.1_patched/src/com/panayotis/jubler/os/SystemFileFinder.java	2007-11-24 22:51:52.000000000 +0200
+@@ -58,15 +58,12 @@
+     }
+     
+     public static boolean loadLibrary(String name) {
+-        File libfile = findFile("lib"+pathseparator+System.mapLibraryName(name));
+-        if (libfile!=null) {
+             try {
+-                System.load(libfile.getAbsolutePath());
++                System.loadLibrary(name);
+                 return true;
+             } catch (UnsatisfiedLinkError e) {
+                 e.printStackTrace();
+             }
+-        }
+         return false;
+     }
+     
diff --git a/media-video/jubler/jubler-3.4.1.ebuild b/media-video/jubler/jubler-3.4.1.ebuild
new file mode 100644
index 000000000000..17a8232f465c
--- /dev/null
+++ b/media-video/jubler/jubler-3.4.1.ebuild
@@ -0,0 +1,70 @@
+# 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.4.1.ebuild,v 1.1 2007/11/24 23:43:12 betelgeuse Exp $
+
+inherit gnome2 eutils java-pkg-2 java-utils-2 java-ant-2 toolchain-funcs
+
+MY_PN=${PN/#j/J}
+DESCRIPTION="Java subtitle editor"
+HOMEPAGE="http://www.jubler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="mplayer nls spell"
+
+RDEPEND=">=virtual/jre-1.5
+	media-video/ffmpeg
+	mplayer? ( media-video/mplayer )
+	spell?
+	(
+		app-text/aspell
+		>=dev-java/zemberek-2.0
+	)"
+
+DEPEND=">=virtual/jdk-1.5
+	media-video/ffmpeg
+	app-text/docbook-sgml-utils
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+pkg_setup() {
+	if use spell && ! built_with_use dev-java/zemberek linguas_tr; then
+		die "Zemberek should be built with Turkish language support"
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-3.4.1.patch"
+	chmod +x resources/installers/linux/iconinstall
+}
+
+src_compile() {
+	eant $(use nls && echo i18n) jar faq || die "eant failed"
+	cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed"
+	cd resources/ffdecode || die
+	CC=$(tc-getCC) emake linuxdyn || die "make failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/Jubler.jar
+	use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar
+	use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar
+	java-pkg_doso resources/ffdecode/libffdecode.so
+	doicon resources/installers/linux/jubler.png
+	domenu resources/installers/linux/jubler.desktop
+
+	DESTDIR="${D}" eant linuxdesktopintegration
+	rm -vr "${D}/usr/share/menu" || die
+
+	java-pkg_dolauncher jubler --main com.panayotis.jubler.Main
+	doman resources/installers/linux/jubler.1
+	insinto /usr/share/jubler/help
+	doins dist/help/*
+}