From fc299e727a5d92e945e17e446df77499291f7740 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Jan 08 2019 14:35:23 +0000 Subject: Update to upstream release 7.0.3 --- diff --git a/better-pip-integration.patch b/better-pip-integration.patch index 96ea880..8225029 100644 --- a/better-pip-integration.patch +++ b/better-pip-integration.patch @@ -1,6 +1,6 @@ --- plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/package_manager/PipPackageManager.java.orig 2018-09-13 11:01:08.963587023 +0100 +++ plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/package_manager/PipPackageManager.java 2018-09-13 11:02:59.763444681 +0100 -@@ -70,10 +70,6 @@ +@@ -71,10 +71,6 @@ } if (output.o2.toLowerCase().contains("no module named pip")) { listed.add(new String[] { "pip not installed (or not found) in interpreter", "", "" }); @@ -11,8 +11,8 @@ } return listed; } -@@ -96,14 +92,14 @@ - public void manage() { +@@ -101,14 +97,14 @@ + public void manage(final String[] initialCommand, final boolean autoRun) { File pipExecutable; String[] availableCommands = new String[] { - "install ", diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec index b39932d..142b684 100644 --- a/eclipse-pydev.spec +++ b/eclipse-pydev.spec @@ -1,12 +1,12 @@ # Turn off the brp-python-bytecompile script %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%global git_tag pydev_6_5_0 +%global git_tag pydev_7_0_3 Epoch: 1 Summary: Eclipse Python development plug-in Name: eclipse-pydev -Version: 6.5.0 -Release: 2%{?dist} +Version: 7.0.3 +Release: 1%{?dist} License: EPL-1.0 URL: http://pydev.org @@ -34,11 +34,8 @@ Patch5: lucene-71.patch # Improvements for pip integration Patch6: better-pip-integration.patch -# Fix an NPE when launching Java projects -Patch7: fix-pythonrunnerconfig-npe.patch - # Don't attempt update of outline if already disposed -Patch8: prevent_update_outline_when_disposed.patch +Patch7: prevent_update_outline_when_disposed.patch Requires: eclipse-platform Requires: python3 @@ -106,7 +103,6 @@ Mylyn Task-Focused UI extensions for Pydev. %patch5 -p1 %patch6 %patch7 -%patch8 %mvn_package "::pom:" __noinstall %mvn_package ":::sources{,-feature}:" __noinstall @@ -257,6 +253,9 @@ sed -i -e '/.*\.py$/s/0644/0755/' .mfiles* %license LICENSE.txt %changelog +* Tue Jan 08 2019 Mat Booth - 1:7.0.3-1 +- Update to upstream release 7.0.3 + * Thu Sep 13 2018 Mat Booth - 1:6.5.0-2 - Patch for NPE/dispose errors diff --git a/fix-process-killing.patch b/fix-process-killing.patch index 24e2c3e..ad189f2 100644 --- a/fix-process-killing.patch +++ b/fix-process-killing.patch @@ -159,7 +159,7 @@ index e4ea072..12fd1ce 100644 @@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Pydev debug Bundle-SymbolicName: org.python.pydev.debug; singleton:=true - Bundle-Version: 6.5.0.qualifier + Bundle-Version: 7.0.3.qualifier -Bundle-ClassPath: pydev-debug.jar, - libs/winp-1.26.0.7.jar +Bundle-ClassPath: pydev-debug.jar diff --git a/fix-pythonrunnerconfig-npe.patch b/fix-pythonrunnerconfig-npe.patch deleted file mode 100644 index 508e6aa..0000000 --- a/fix-pythonrunnerconfig-npe.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/org.python.pydev.debug/src/org/python/pydev/debug/ui/PythonConsoleLineTracker.java.orig 2018-06-25 10:15:44.816065992 +0100 -+++ plugins/org.python.pydev.debug/src/org/python/pydev/debug/ui/PythonConsoleLineTracker.java 2018-06-25 10:17:58.101557206 +0100 -@@ -161,8 +161,10 @@ - mappedResources = launchConfiguration.getMappedResources(); - if (mappedResources != null && mappedResources.length > 0) { - this.project = mappedResources[0].getProject(); -- this.workingDirectory = PythonRunnerConfig.getWorkingDirectory(launchConfiguration, -- PythonNature.getPythonNature(project)); -+ org.python.pydev.core.IPythonNature nature = PythonNature.getPythonNature(project); -+ if (nature != null) { -+ this.workingDirectory = PythonRunnerConfig.getWorkingDirectory(launchConfiguration, nature); -+ } - } - } catch (Exception e) { - Log.log(e); diff --git a/lucene-71.patch b/lucene-71.patch index a476786..b8eb648 100644 --- a/lucene-71.patch +++ b/lucene-71.patch @@ -19,7 +19,7 @@ index 9b3da3551..7555a8e4d 100644 --- a/plugins/org.python.pydev.shared_core/META-INF/MANIFEST.MF +++ b/plugins/org.python.pydev.shared_core/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.python.pydev.shared_core;singleton:=true - Bundle-Version: 6.5.0.qualifier + Bundle-Version: 7.0.3.qualifier Bundle-ClassPath: shared_core.jar, libs/snakeyaml-1.11.jar, - libs/lucene-analyzers-common-6.1.0.jar, diff --git a/remove-winregistry.patch b/remove-winregistry.patch index c308009..510cb94 100644 --- a/remove-winregistry.patch +++ b/remove-winregistry.patch @@ -1,7 +1,7 @@ --- plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java.orig 2017-11-05 19:12:46.000000000 +0000 +++ plugins/org.python.pydev/src/org/python/pydev/ui/pythonpathconf/PythonInterpreterProviderFactory.java 2017-11-22 14:38:25.372593021 +0000 -@@ -27,9 +27,6 @@ - import org.python.pydev.shared_core.string.StringUtils; +@@ -24,9 +24,6 @@ + import org.python.pydev.plugin.nature.PythonNature; import org.python.pydev.shared_core.utils.PlatformUtils; -import at.jta.Key; @@ -10,7 +10,7 @@ public class PythonInterpreterProviderFactory extends AbstractInterpreterProviderFactory { @Override -@@ -51,50 +48,6 @@ +@@ -48,52 +45,6 @@ final String[] ret = searchPaths(pathsToSearch, searchPatterns, false); foundVersions.addAll(Arrays.asList(ret)); @@ -27,23 +27,25 @@ - try { - @SuppressWarnings("rawtypes") - List l = regor.listKeys(key); -- for (Object o : l) { -- Key openKey = regor.openKey(key, (String) o + "\\InstallPath", Regor.KEY_READ); -- if (openKey != null) { -- try { -- byte buf[] = regor.readValue(openKey, ""); -- if (buf != null) { -- String parseValue = Regor.parseValue(buf); -- // Ok, this should be the directory -- // where it's installed, try to find -- // a 'python.exe' there... -- File file = new File(parseValue, "python.exe"); -- if (file.isFile()) { -- foundVersions.add(file.toString()); +- if (l != null) { +- for (Object o : l) { +- Key openKey = regor.openKey(key, (String) o + "\\InstallPath", Regor.KEY_READ); +- if (openKey != null) { +- try { +- byte buf[] = regor.readValue(openKey, ""); +- if (buf != null) { +- String parseValue = Regor.parseValue(buf); +- // Ok, this should be the directory +- // where it's installed, try to find +- // a 'python.exe' there... +- File file = new File(parseValue, "python.exe"); +- if (file.isFile()) { +- foundVersions.add(file.toString()); +- } - } +- } finally { +- regor.closeKey(openKey); - } -- } finally { -- regor.closeKey(openKey); - } - } - } diff --git a/sources b/sources index 8ad10ec..102f3e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pydev_6_5_0.tar.gz) = 4266692a818d7696d6df6877d315afaf91d4fd3043ce399c989f2891ca1856932a1a044216c59d9a09b4c57dab43b0e1fd3e20e90f4d654bb3bb9cfa81d02f9c +SHA512 (pydev_7_0_3.tar.gz) = 6707d53707955abd20a679a096af7b0dd3bc59bf8c79f6335963327d97279dabcc49aac9c343ab02d83a1743353a96e620628d0bcdf94fd64e268d2c270f47d8 diff --git a/system-jython-interpreter.patch b/system-jython-interpreter.patch index 91f0459..f6a6182 100644 --- a/system-jython-interpreter.patch +++ b/system-jython-interpreter.patch @@ -177,7 +177,7 @@ index 17145cf46..c8c051bb9 100644 import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -@@ -1476,10 +1477,8 @@ public class InterpreterInfo implements IInterpreterInfo { +@@ -1494,10 +1495,8 @@ public class InterpreterInfo implements IInterpreterInfo { * @return if the executable is the jython jar. */ public static boolean isJythonExecutable(String executable) {