From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9872058973 for ; Sat, 23 Jan 2016 18:22:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B6DD21C017; Sat, 23 Jan 2016 18:22:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF37021C017 for ; Sat, 23 Jan 2016 18:22:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F1B4340ABC for ; Sat, 23 Jan 2016 18:21:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8535FFB for ; Sat, 23 Jan 2016 18:21:54 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1453573228.d7013f0934a1b90e86635724d41f1404c0a6c928.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/tvbrowser/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/tvbrowser/files/3.4.3-build.xml.patch media-tv/tvbrowser/files/3.4.3-remove-registrykey.patch X-VCS-Directories: media-tv/tvbrowser/files/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: d7013f0934a1b90e86635724d41f1404c0a6c928 X-VCS-Branch: master Date: Sat, 23 Jan 2016 18:21:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 342aba39-21d9-4d10-b079-df6fbc909c80 X-Archives-Hash: d90835b1da61b537d161fefa01d26e18 commit: d7013f0934a1b90e86635724d41f1404c0a6c928 Author: Patrice Clement gentoo org> AuthorDate: Sat Jan 23 18:18:52 2016 +0000 Commit: Patrice Clement gentoo 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 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 + | + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + ++ + + + + + ++ + + + +@@ -431,7 +409,9 @@ + + + ++ + + + +@@ -555,6 +535,7 @@ + + + ++ + + + +@@ -752,6 +734,7 @@ + + + ++ + + + 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", +- "The Registry value couldn't be changed. Maybe you haven't the right to do it.
If it is so contact you Administrator and let him do it for you.

The following description is for experts. If you change or delete the wrong value in the Registry you could destroy your Windows installation.

To get no warning on TV-Browser start the Registry value WaitToKillAppTimeout in the Registry path
HKEY_CURRENT_USER\\Control Panel\\Desktop have to be at least 5000 or the value for AutoEndTasks in the same path have to be 0."), +- 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 ++}