+++ /dev/null
-From 2bd7907aef02530680cfd795f3f757613777c064 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@gmail.com>
-Date: Sat, 10 Jul 2010 15:50:13 +0200
-Subject: [PATCH] Remove MacOS GUI references
-
----
- src/phex/gui/common/FileDialogHandler.java | 45 +--------------------------
- src/phex/gui/common/GUIRegistry.java | 5 ---
- 2 files changed, 2 insertions(+), 48 deletions(-)
-
-diff --git a/src/phex/gui/common/FileDialogHandler.java b/src/phex/gui/common/FileDialogHandler.java
-index a5ee4f7..530f374 100644
---- a/src/phex/gui/common/FileDialogHandler.java
-+++ b/src/phex/gui/common/FileDialogHandler.java
-@@ -34,7 +34,6 @@ import javax.swing.filechooser.FileFilter;
- \r
- import org.apache.commons.lang.SystemUtils;\r
- \r
--import phex.gui.macosx.MacOsxGUIUtils;\r
- import phex.utils.DirectoryOnlyFileFilter;\r
- \r
- public class FileDialogHandler\r
-@@ -45,7 +44,7 @@ public class FileDialogHandler
- {\r
- if ( SystemUtils.IS_OS_MAC_OSX )\r
- {\r
-- return openMacDirectoryChooser( title, null, null );\r
-+ return null;\r
- }\r
- else\r
- {\r
-@@ -71,10 +70,7 @@ public class FileDialogHandler
- {\r
- if ( SystemUtils.IS_OS_MAC_OSX )\r
- {\r
-- return new File[]\r
-- {\r
-- openMacDirectoryChooser( title, notifyPopupTitle, notifyPopupShortMessage )\r
-- };\r
-+ return null;\r
- }\r
- else\r
- {\r
-@@ -85,43 +81,6 @@ public class FileDialogHandler
- }\r
- }\r
- \r
-- private static File openMacDirectoryChooser( String title,\r
-- String notifyPopupTitle, String notifyPopupShortMessage )\r
-- {\r
-- // create folder dialog through other class this prevents \r
-- // NoClassDefFoundError on Windows systems since the import of the\r
-- // required OS X classes is elsewhere.\r
-- FileDialog dia = MacOsxGUIUtils.createFolderDialog(); \r
-- dia.setTitle(title);\r
-- \r
-- // unfortunatly its not possible to display notification popup\r
-- // besides heavy weight dialog.\r
-- //if ( notifyPopupTitle != null || notifyPopupShortMessage != null )\r
-- //{\r
-- //displayMacNotificationPopup( dia, notifyPopupTitle, \r
-- // notifyPopupShortMessage );\r
-- //}\r
-- \r
-- DirectoryOnlyFileFilter filter = new DirectoryOnlyFileFilter();\r
-- dia.setFilenameFilter( new FileFilterWrapper(\r
-- filter) );\r
-- dia.setVisible( true );\r
-- String dirStr = dia.getDirectory();\r
-- String fileStr = dia.getFile();\r
-- \r
-- if( dirStr == null || fileStr == null )\r
-- {\r
-- return null;\r
-- }\r
-- File file = new File(dirStr, fileStr);\r
-- // validate filter\r
-- if( !filter.accept(file) )\r
-- {\r
-- return null;\r
-- }\r
-- return file;\r
-- }\r
-- \r
- private static JFileChooser initDefaultChooser( String title,\r
- String approveBtnText, char approveBtnMnemonic, FileFilter filter,\r
- int mode, File currentDirectory, String notifyPopupTitle,\r
-diff --git a/src/phex/gui/common/GUIRegistry.java b/src/phex/gui/common/GUIRegistry.java
-index 852722e..3c28f2e 100644
---- a/src/phex/gui/common/GUIRegistry.java
-+++ b/src/phex/gui/common/GUIRegistry.java
-@@ -47,7 +47,6 @@ import phex.gui.actions.FWAction;
- import phex.gui.actions.NewDownloadAction;\r
- import phex.gui.actions.SwitchNetworkAction;\r
- import phex.gui.chat.ChatFrameManager;\r
--import phex.gui.macosx.MacOsxGUIUtils;\r
- import phex.gui.prefs.InterfacePrefs;\r
- import phex.update.UpdateCheckRunner;\r
- import phex.utils.Localizer;\r
-@@ -119,10 +118,6 @@ public final class GUIRegistry implements GUIRegistryConstants
- }\r
- }\r
- \r
-- if ( SystemUtils.IS_OS_MAC_OSX )\r
-- {\r
-- MacOsxGUIUtils.installEventHandlers();\r
-- }\r
- initializeGlobalActions();\r
- chatFrameManager = new ChatFrameManager();\r
- try \r
---
-1.7.1
-
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="java gnutella file-sharing application"
-HOMEPAGE="http://phex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.zip"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-COMMON_DEPEND="dev-java/commons-httpclient:3
- dev-java/commons-logging:0
- dev-java/jgoodies-forms:0
- dev-java/jgoodies-looks:2.0
- dev-java/log4j:0
- dev-java/l2fprod-common:0
- dev-java/commons-beanutils:1.7
- dev-java/commons-codec:0
- dev-java/commons-collections:0
- dev-java/commons-lang:2.1"
-
-DEPEND="app-arch/unzip
- >=virtual/jdk-1.5
- ${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_P}_src"
-
-JAVA_PKG_BSFIX="off"
-
-src_prepare() {
- # remove parts related to MacOS gui classes
- epatch "${FILESDIR}/0001-Remove-MacOS-GUI-references.patch"
- # remove unused class (make sure it's not compiled)
- rm -vf src/phex/gui/macosx/MacOsxGUIUtils.java
-
- rm -vf lib/*.jar || die
- # avoid patches like plague
- sed -i "s/createJar, copyThirdpartyJars/createJar/" build/buildJava.xml || die
- JAVA_ANT_REWRITE_CLASSPATH="true" java-ant_bsfix_files build/*.xml
- # remove bundled packages that we have - bug #176739
- rm -rf src/com/l2fprod src/org/apache || die
-}
-
-src_compile() {
- local gcp="$(java-pkg_getjars commons-httpclient-3,commons-logging,jgoodies-forms,jgoodies-looks-2.0,log4j,l2fprod-common,commons-beanutils-1.7,commons-codec,commons-collections,commons-lang-2.1)"
- cd build
- eant -Dgentoo.classpath="${gcp}:MRJAdapter.jar" -Dproject.buildtarget=build buildJava
-}
-
-src_install() {
- java-pkg_dojar build/lib/${PN}.jar
-
- java-pkg_dolauncher ${PN} --main phex.Main
-
- dohtml docs/readme/* || die
-}
projects / gentoo.git / commitdiff