commit: d7013f0934a1b90e86635724d41f1404c0a6c928 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Sat Jan 23 18:18:52 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sat Jan 23 18:20:28 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7013f09
media-tv/tvbrowser: Add missing patches. Fixes bug 572714. Package-Manager: portage-2.2.26 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> media-tv/tvbrowser/files/3.4.3-build.xml.patch | 109 +++++++++++++++ .../tvbrowser/files/3.4.3-remove-registrykey.patch | 150 +++++++++++++++++++++ 2 files changed, 259 insertions(+) diff --git a/media-tv/tvbrowser/files/3.4.3-build.xml.patch b/media-tv/tvbrowser/files/3.4.3-build.xml.patch new file mode 100644 index 0000000..570bff3 --- /dev/null +++ b/media-tv/tvbrowser/files/3.4.3-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.3-remove-registrykey.patch b/media-tv/tvbrowser/files/3.4.3-remove-registrykey.patch new file mode 100644 index 0000000..2c52dda --- /dev/null +++ b/media-tv/tvbrowser/files/3.4.3-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 ++}
