diff options
| -rw-r--r-- | media-tv/tvbrowser/ChangeLog | 11 | ||||
| -rw-r--r-- | media-tv/tvbrowser/files/3.4.1.0-build.xml.patch | 109 | ||||
| -rw-r--r-- | media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch | 150 | ||||
| -rw-r--r-- | media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild | 99 | ||||
| -rw-r--r-- | media-tv/tvbrowser/tvbrowser-3.4.ebuild | 4 |
6 files changed, 371 insertions, 6 deletions
diff --git a/media-tv/tvbrowser/ChangeLog b/media-tv/tvbrowser/ChangeLog index b8d05d91ed0f..facdc88fa8c4 100644 --- a/media-tv/tvbrowser/ChangeLog +++ b/media-tv/tvbrowser/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-tv/tvbrowser -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.42 2014/08/10 21:03:19 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/ChangeLog,v 1.43 2015/03/24 18:27:47 monsieurp Exp $ + +*tvbrowser-3.4.1.0 (24 Mar 2015) + + 24 Mar 2015; Patrice Clement <monsieurp@gentoo.org> + +files/3.4.1.0-build.xml.patch, +files/3.4.1.0-remove-registrykey.patch, + +tvbrowser-3.4.1.0.ebuild, tvbrowser-3.2.1-r1.ebuild, tvbrowser-3.4.ebuild: + Version bump. Fix bug 543272. 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> tvbrowser-3.2.1-r1.ebuild, tvbrowser-3.4.ebuild: diff --git a/media-tv/tvbrowser/files/3.4.1.0-build.xml.patch b/media-tv/tvbrowser/files/3.4.1.0-build.xml.patch new file mode 100644 index 000000000000..570bff32db76 --- /dev/null +++ b/media-tv/tvbrowser/files/3.4.1.0-build.xml.patch @@ -0,0 +1,109 @@ +--- build.xml.orig 2015-03-24 17:34:18.753531031 +0000 ++++ build.xml 2015-03-24 17:38:48.013509290 +0000 +@@ -105,32 +105,6 @@ + | Task definitions
+ |
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+-
+- <!-- Creates an .app file for Mac OS X (http://informagen.com/JarBundler/) -->
+- <taskdef name="jarbundler"
+- classpath="deployment/macosx/jarbundler-2.0.0.jar"
+- classname="net.sourceforge.jarbundler.JarBundler" />
+-
+- <!-- Creates a Windows Executable using launch4j (http://launch4j.sf.net) -->
+- <taskdef name="launch4j"
+- classname="net.sf.launch4j.ant.Launch4jTask"
+- classpath="${deployment.dir}/win/launch4j/launch4j.jar:${deployment.dir}/win/launch4j/lib/xstream.jar" />
+-
+- <!-- Creates a linux desktopEntry-->
+- <taskdef name="desktopEntry"
+- classname="com.googlecode.ant_deb_task.DesktopEntry"
+- classpathref="ant-deb.classpath"/>
+-
+- <!-- Creates an Ubuntu package-->
+- <taskdef name="deb"
+- classname="com.googlecode.ant_deb_task.Deb"
+- classpathref="ant-deb.classpath"/>
+-
+- <!-- Creates a RedHad package-->
+- <taskdef name="rrpm"
+- classname="org.redline_rpm.RedlineTask"
+- classpathref="ant-rpm.classpath"/>
+-
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ |
+ | Display all targets
+@@ -329,6 +303,7 @@ + <echo message="Creating the jars ..."/>
+
+ <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
++ <!--
+ <unjar src="${lib.dir}/${lib.skinlf.name}-${lib.skinlf.version}.jar" dest="${unpacked.dir}/${lib.skinlf.name}.jar"/>
+ <unjar src="${lib.dir}/${lib.bsh.name}-${lib.bsh.version}.jar" dest="${unpacked.dir}/${lib.bsh.name}.jar"/>
+ <unjar src="${lib.dir}/${lib.jgoodies-common.name}-${lib.jgoodies-common.version}.jar" dest="${unpacked.dir}/${lib.jgoodies-common.name}.jar"/>
+@@ -343,6 +318,7 @@ + <unjar src="${lib.dir}/${lib.texhyphj.name}-${lib.texhyphj.version}.jar" dest="${unpacked.dir}/${lib.texhyphj.name}.jar" />
+ <unjar src="${lib.dir}/${lib.substance.name}-${lib.substance.version}.jar" dest="${unpacked.dir}/${lib.substance.name}.jar" />
+ <unjar src="${lib.dir}/${lib.trident.name}-${lib.trident.version}.jar" dest="${unpacked.dir}/${lib.trident.name}.jar" />
++ -->
+
+ <!-- Pack the tvbrowser.jar -->
+ <jar jarfile="${tvbrowser-default.runtime.dir}/tvbrowser.jar"
+@@ -357,6 +333,7 @@ + <fileset dir="${classes.dir}" includes="tvdataservice/**"/>
+ <fileset dir="${classes.dir}" includes="util/**"/>
+ <fileset dir="${classes.dir}" includes="com/**"/>
++ <!--
+ <fileset dir="${classes.dir}/imgs" includes="splash.png"/>
+ <fileset dir="${unpacked.dir}/${lib.skinlf.name}.jar" includes="com/**"/>
+ <fileset dir="${unpacked.dir}/${lib.skinlf.name}.jar" includes="org/**"/>
+@@ -373,6 +350,7 @@ + <fileset dir="${unpacked.dir}/${lib.texhyphj.name}.jar" includes="net/**"/>
+ <fileset dir="${unpacked.dir}/${lib.substance.name}.jar" includes="org/**"/>
+ <fileset dir="${unpacked.dir}/${lib.trident.name}.jar" includes="org/**"/>
++ -->
+ </jar>
+
+ <!-- Copy the other stuff -->
+@@ -431,7 +409,9 @@ +
+ <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
+ <mkdir dir="${unpacked.dir}/${lib.commons.net.name}.jar"/>
++ <!--
+ <unjar src="${lib.dir}/${lib.commons.net.name}-${lib.commons.net.version}.jar" dest="${unpacked.dir}/${lib.commons.net.name}.jar"/>
++ -->
+
+ </target>
+
+@@ -555,6 +535,7 @@ +
+ <!-- Creates the desktop entry file for Linux platforms -->
+ <target name="tvbrowser-desktop-entry">
++ <!--
+ <desktopEntry
+ toFile="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop"
+ name="TV-Browser"
+@@ -571,6 +552,7 @@ + <comment lang="de" value="Anpassbare und einfach zu benutzende TV-Zeitschrift - geschrieben in Java"/>
+ </desktopEntry>
+ <echo file="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop" append="true">StartupWMClass=tvbrowser-TVBrowser</echo>
++ -->
+ </target>
+
+ <!-- Creates the desktop entry file for Ubuntu platform -->
+@@ -752,6 +734,7 @@ +
+ <!-- Creates the windows exe file -->
+ <target name="exe" depends="runtime-win">
++ <!--
+ <launch4j configFile="${deployment.dir}/win/launch4j/tvbrowser.xml"
+ fileversion="${tvbrowser.version.file}"
+ productversion="${tvbrowser.version.file}"
+@@ -762,6 +745,7 @@ + productversion="${tvbrowser.version.file}"
+ txtfileversion="${tvbrowser.version}"
+ txtproductversion="${tvbrowser.version}"/>
++ -->
+ </target>
+
+ <!-- Creates the windows transportable exe file -->
diff --git a/media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch b/media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch new file mode 100644 index 000000000000..2c52ddada29a --- /dev/null +++ b/media-tv/tvbrowser/files/3.4.1.0-remove-registrykey.patch @@ -0,0 +1,150 @@ +--- src/tvbrowser/TVBrowser.java.orig 2015-03-24 17:41:56.811494046 +0000 ++++ src/tvbrowser/TVBrowser.java 2015-03-24 17:43:30.625486471 +0000 +@@ -113,9 +113,6 @@ + import util.ui.UIThreadRunner;
+ import util.ui.UiUtilities;
+ import util.ui.textcomponentpopup.TextComponentPopupEventQueue;
+-import ca.beq.util.win32.registry.RegistryKey;
+-import ca.beq.util.win32.registry.RegistryValue;
+-import ca.beq.util.win32.registry.RootKey;
+
+ import com.jgoodies.looks.LookUtils;
+ import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
+@@ -567,77 +564,6 @@ + public void run() {
+ ChannelList.completeChannelLoading();
+ initializeAutomaticDownload();
+- if (Launch.isOsWindowsNtBranch()) {
+- try {
+- RegistryKey desktopSettings = new RegistryKey(
+- RootKey.HKEY_CURRENT_USER, "Control Panel\\Desktop");
+- RegistryValue autoEnd = desktopSettings
+- .getValue("AutoEndTasks");
+-
+- if (autoEnd.getData().equals("1")) {
+- RegistryValue killWait = desktopSettings
+- .getValue("WaitToKillAppTimeout");
+-
+- int i = Integer.parseInt(killWait.getData().toString());
+-
+- if (i < 5000) {
+- JOptionPane pane = new JOptionPane();
+-
+- String cancel = mLocalizer.msg("registryCancel",
+- "Close TV-Browser");
+- String dontDoIt = mLocalizer.msg("registryJumpOver",
+- "Not this time");
+-
+- pane.setOptions(new String[] {
+- Localizer.getLocalization(Localizer.I18N_OK), dontDoIt,
+- cancel });
+- pane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);
+- pane.setMessageType(JOptionPane.WARNING_MESSAGE);
+- pane
+- .setMessage(mLocalizer
+- .msg(
+- "registryWarning",
+- "The fast shutdown of Windows is activated.\nThe timeout to wait for before Windows is closing an application is too short,\nto give TV-Browser enough time to save all settings.\n\nThe setting hasn't the default value. It was changed by a tool or by you.\nTV-Browser will now try to change the timeout.\n\nIf you don't want to change this timeout select 'Not this time' or 'Close TV-Browser'."));
+-
+- pane.setInitialValue(mLocalizer.msg("registryCancel",
+- "Close TV-Browser"));
+-
+- JDialog d = pane.createDialog(UiUtilities
+- .getLastModalChildOf(mainFrame), UIManager
+- .getString("OptionPane.messageDialogTitle"));
+- d.setModal(true);
+- UiUtilities.centerAndShow(d);
+-
+- if (pane.getValue() == null
+- || pane.getValue().equals(cancel)) {
+- mainFrame.quit();
+- } else if (!pane.getValue().equals(dontDoIt)) {
+- try {
+- killWait.setData("5000");
+- desktopSettings.setValue(killWait);
+- JOptionPane
+- .showMessageDialog(
+- UiUtilities.getLastModalChildOf(mainFrame),
+- mLocalizer
+- .msg("registryChanged",
+- "The timeout was changed successfully.\nPlease reboot Windows!"));
+- } catch (Exception registySetting) {
+- JOptionPane
+- .showMessageDialog(
+- UiUtilities.getLastModalChildOf(mainFrame),
+- mLocalizer
+- .msg(
+- "registryNotChanged",
+- "<html>The Registry value couldn't be changed. Maybe you haven't the right to do it.<br>If it is so contact you Administrator and let him do it for you.<br><br><b><Attention:/b> The following description is for experts. If you change or delete the wrong value in the Registry you could destroy your Windows installation.<br><br>To get no warning on TV-Browser start the Registry value <b>WaitToKillAppTimeout</b> in the Registry path<br><b>HKEY_CURRENT_USER\\Control Panel\\Desktop</b> have to be at least <b>5000</b> or the value for <b>AutoEndTasks</b> in the same path have to be <b>0</b>.</html>"),
+- Localizer.getLocalization(Localizer.I18N_ERROR),
+- JOptionPane.ERROR_MESSAGE);
+- }
+- }
+- }
+- }
+- } catch (Throwable registry) {
+- }
+- }
+
+ if (currentVersion != null
+ && currentVersion.compareTo(new Version(2, 71, false)) < 0) {
+--- src/tvbrowser/ui/settings/StartupSettingsTab.java.orig 2015-03-24 17:51:54.418445794 +0000 ++++ src/tvbrowser/ui/settings/StartupSettingsTab.java 2015-03-24 17:52:23.370443456 +0000 +@@ -50,8 +50,6 @@ + import tvbrowser.ui.mainframe.PeriodItem;
+ import util.ui.Localizer;
+ import util.ui.UiUtilities;
+-import ca.beq.util.win32.registry.RegistryKey;
+-import ca.beq.util.win32.registry.RootKey;
+
+ import com.jgoodies.forms.builder.PanelBuilder;
+ import com.jgoodies.forms.factories.Borders;
+@@ -163,41 +161,6 @@ + .getBoolean());
+ mSettingsPn.add(mShowStartScreenChB, cc.xy(2, ++y));
+
+- if (System.getProperty("os.name").toLowerCase().startsWith("windows") && !TVBrowser.isTransportable()) {
+- layout.insertRow(++y, RowSpec.decode("1dlu"));
+- layout.insertRow(++y, RowSpec.decode("pref"));
+-
+- try {
+- RegistryKey shellFolders = new RegistryKey(RootKey.HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders");
+- String path = shellFolders.getValue("Startup").getData().toString();
+-
+- if(path == null || path.length() < 1 || !(new File(path)).isDirectory()) {
+- throw new Exception();
+- }
+-
+- mLinkFileFile = new File(path,"TV-Browser.url");
+-
+- try {
+- mLinkFile = new LinkFile(mLinkFileFile);
+-
+- if(mLinkFileFile.isFile()) {
+- try {
+- if (!mLinkFile.hasTarget((new File("tvbrowser.exe")).getAbsoluteFile())) {
+- createLink(mLinkFile);
+- }
+- }catch(Exception linkException) {
+- mLinkFileFile.delete();
+- }
+- }
+- }catch(FileNotFoundException fe) {}
+-
+- mAutostartWithWindows = new JCheckBox(mLocalizer.msg("autostart","Start TV-Browser with Windows"),
+- mLinkFileFile.isFile());
+-
+- mSettingsPn.add(mAutostartWithWindows, cc.xy(2, y));
+- } catch (Throwable e) {e.printStackTrace();}
+- }
+-
+ y++;
+
+ mSettingsPn.add(createRefreshPanel(), cc.xyw(1,++y,5));
+@@ -513,4 +476,4 @@ + return new File(mTarget).equals(file);
+ }
+ }
+-} +\ No newline at end of file ++}
diff --git a/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild b/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild index f266216ac4b2..eb6e1c8b14f5 100644 --- a/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild +++ b/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild,v 1.2 2014/08/10 21:03:19 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.2.1-r1.ebuild,v 1.3 2015/03/24 18:27:47 monsieurp Exp $ EAPI="5" diff --git a/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild b/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild new file mode 100644 index 000000000000..4a4b5dfcd0b5 --- /dev/null +++ b/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.4.1.0.ebuild,v 1.1 2015/03/24 18:27:47 monsieurp Exp $ + +EAPI="5" + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Themeable and easy to use TV Guide - written in Java" +HOMEPAGE="http://www.tvbrowser.org/" +SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.zip" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +LICENSE="GPL-3" +IUSE="" + +COMMON_DEP="dev-java/bsh:0 + dev-java/commons-codec:0 + dev-java/commons-lang:3.1 + dev-java/commons-net:0 + dev-java/jakarta-oro:2.0 + dev-java/jgoodies-common:1.8 + dev-java/jgoodies-forms:1.8 + dev-java/jgoodies-looks:2.6 + dev-java/l2fprod-common:0 + dev-java/htmlparser-org:0 + dev-java/log4j:0 + dev-java/skinlf:0 + dev-java/stax:0 + dev-java/xalan:0 + dev-java/opencsv:0 + dev-java/texhyphj:0 + dev-java/trident:0 + x11-libs/libXt + x11-libs/libSM + x11-libs/libICE + x11-libs/libXext + x11-libs/libXtst + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp" + +DEPEND="${COMMON_DEP} + app-arch/unzip + >=virtual/jdk-1.6" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.6" + +java_prepare() { + epatch "${FILESDIR}"/${PV}-*.patch + #epatch "${FILESDIR}"/${PV}-build.xml.patch + + rm -v lib/{bsh-,commons,jgoodies,l2fprod-common-tasks,skinlf,stax,htmlparser,opencsv,trident,texhyphj,jRegistryKey}*.jar + + find deployment -name '*.jar' -delete || die + find . -name '*.class' -delete || die +} + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="bsh + commons-codec + commons-lang-3.1 + jgoodies-common-1.8 + jgoodies-forms-1.8 + jgoodies-looks-2.6 + l2fprod-common + skinlf + htmlparser-org + opencsv + texhyphj" +EANT_BUILD_TARGET="runtime-linux" +EANT_DOC_TARGET="public-doc" + +src_install() { + java-pkg_dojar runtime/${PN}_linux/${PN}.jar + java-pkg_dojar lib/substance-6.1.jar + java-pkg_register-dependency trident,opencsv + + insinto /usr/share/${PN} + doins -r runtime/${PN}_linux/{imgs,icons,plugins,infothemes} + doins runtime/${PN}_linux/linux.properties + + insinto /usr/share/${PN}/themepacks + doins themepacks/themepack.zip + + java-pkg_dolauncher "tvbrowser" \ + --main tvbrowser.TVBrowser \ + --pwd /usr/share/${PN} \ + --java_args " -Dpropertiesfile=/usr/share/${PN}/linux.properties" + + make_desktop_entry ${PN} "TV-Browser" \ + /usr/share/tvbrowser/imgs/tvbrowser128.png "AudioVideo;TV;Video" + + use source && java-pkg_dosrc src/* + use doc && java-pkg_dojavadoc doc +} diff --git a/media-tv/tvbrowser/tvbrowser-3.4.ebuild b/media-tv/tvbrowser/tvbrowser-3.4.ebuild index bb0ee87993ed..56ab3197c0ad 100644 --- a/media-tv/tvbrowser/tvbrowser-3.4.ebuild +++ b/media-tv/tvbrowser/tvbrowser-3.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.4.ebuild,v 1.2 2014/08/10 21:03:19 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/tvbrowser/tvbrowser-3.4.ebuild,v 1.3 2015/03/24 18:27:47 monsieurp Exp $ EAPI="5" |