Attachment 145850 Details for Bug 192696 – Port patch

[patch] Port patch

e4322-patch.txt (text/plain), 3.61 KB, created by Jimmy Kelley on 2014-08-16 00:30:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jimmy Kelley

Created: 2014-08-16 00:30:42 UTC

Size: 3.61 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 364879)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	eclipse
> PORTVERSION=	4.3.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	java devel
> MASTER_SITES=	https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
> DISTFILES=	eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
>Index: files/patch-submodules
>===================================================================
>--- files/patch-submodules	(revision 364879)
>+++ files/patch-submodules	(working copy)
>@@ -2457,3 +2457,63 @@
>      </plugins>
>    </build>
>  
>+--- a/eclipse.platform/platform/org.eclipse.platform/plugin.xml.orig	2014-06-05 16:12:04.000000000 -0500
>++++ b/eclipse.platform/platform/org.eclipse.platform/plugin.xml	2014-08-01 17:23:26.000000000 -0500
>+@@ -141,6 +141,12 @@
>+             basestylesheeturi="css/e4_default_gtk.css"
>+             id="org.eclipse.e4.ui.css.theme.e4_default"
>+             label="%theme.gtk"
>++            os="freebsd">
>++      </theme>
>++      <theme
>++            basestylesheeturi="css/e4_default_gtk.css"
>++            id="org.eclipse.e4.ui.css.theme.e4_default"
>++            label="%theme.gtk"
>+             os="linux">
>+       </theme>
>+       <theme
>+--- a/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml.orig	2014-06-05 17:05:18.000000000 -0500
>++++ b/eclipse.platform.ua/org.eclipse.ui.intro.universal/plugin.xml	2014-08-01 19:39:25.000000000 -0500
>+@@ -46,7 +46,7 @@
>+             <implementation
>+                   style="themes/shared/html/shared.css,$theme$/html/shared.css,$theme$/html/font-$fontStyle$.css,$theme$/html/$direction$.css"
>+                   kind="html"
>+-                  os="win32,linux,macosx,solaris">
>++                  os="win32,freebsd,linux,macosx,solaris">
>+             </implementation>
>+             <implementation
>+                   kind="swt">
>+--- a/eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml.orig	2014-06-05 17:09:12.000000000 -0500
>++++ b/eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml	2014-08-01 19:58:51.000000000 -0500
>+@@ -83,6 +83,17 @@
>+ 
>+    
>+    <extension point="org.eclipse.ui.browser.browsers">
>++      
>++      <browser
>++         id="org.eclipse.ui.browser.firefox"
>++         name="%browserFirefox"
>++         os="freebsd"
>++         executable="firefox"
>++         factoryclass="org.eclipse.ui.internal.browser.browsers.MozillaFactory">
>++         <location>
>++            usr/local/bin/firefox
>++         </location>
>++      </browser>
>+       
>+       <browser
>+          id="org.eclipse.ui.browser.firefox"
>+--- a/eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml.orig	2014-06-05 17:04:42.000000000 -0500
>++++ b/eclipse.platform.text/org.eclipse.ui.workbench.texteditor/plugin.xml	2014-08-01 20:03:04.000000000 -0500
>+@@ -1184,6 +1184,11 @@
>+             %blockSelectionModeFont.description
>+          </description>
>+          <fontValue
>++               os="freebsd"
>++               value="Monospace-regular-10"
>++               ws="gtk">
>++         </fontValue>
>++         <fontValue
>+                os="linux"
>+                value="Monospace-regular-10"
>+                ws="gtk">
>Index: scripts/pre-patch
>===================================================================
>--- scripts/pre-patch	(revision 364879)
>+++ scripts/pre-patch	(working copy)
>@@ -1,7 +1,5 @@
> #!/bin/sh
> 
>-set -x
>-
> # Copy the Linux 'native' code for the FreeBSD versions
> # At this point, just make sure the directory and file names are "freebsd"
> # These files will be patched in the do-patch step.

Actions: View | Diff

Attachments on bug 192696: 145850