[DRE-commits] [ruby-psych] 15/18: Add patch to disable ruby-maven usage

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository ruby-psych.

commit 2fc9abef2df554a33a42701ee458e26b46c9dd2e
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Wed Mar 15 20:54:54 2017 +0000

    Add patch to disable ruby-maven usage
---
 debian/patches/03-Disable-ruby-maven.patch | 30 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/03-Disable-ruby-maven.patch b/debian/patches/03-Disable-ruby-maven.patch
new file mode 100644
index 0000000..501574c
--- /dev/null
+++ b/debian/patches/03-Disable-ruby-maven.patch
@@ -0,0 +1,30 @@
+Description: Disable ruby-maven usage
+Author: Miguel Landaeta <nomadium at debian.org>
+Forwarded: no
+Last-Update: 2017-03-15
+
+--- ruby-psych-2.2.4.orig/Rakefile
++++ ruby-psych-2.2.4/Rakefile
+@@ -12,12 +12,20 @@ end
+ if RUBY_PLATFORM =~ /java/
+   require 'rake/javaextensiontask'
+   Rake::JavaExtensionTask.new("psych") do |ext|
+-    require 'maven/ruby/maven'
++    require 'fileutils'
++    # require 'maven/ruby/maven'
+     # uses Mavenfile to write classpath into pkg/classpath
+     # and tell maven via system properties the snakeyaml version
+     # this is basically the same as running from the commandline:
+     # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
+-    Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.18", '-Dverbose=true')
++    # Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.18", '-Dverbose=true')
++    # ruby-maven is currently disabled since is not working as expected with the Debian maven repo and current
++    # versions of maven itself and polyglot-maven. 
++    # ruby-maven is packaged but not uploaded to the archive yet for this reason, for more information:
++    # https://bugs.debian.org/789877
++    # https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-psych.git
++    FileUtils.mkdir_p 'pkg'
++    IO.write('pkg/classpath', '/usr/share/maven-repo/org/yaml/snakeyaml/1.x/snakeyaml-1.x.jar')
+     ext.source_version = '1.7'
+     ext.target_version = '1.7'
+     ext.classpath = File.read('pkg/classpath')
diff --git a/debian/patches/series b/debian/patches/series
index 43bd3cb..6a10650 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-Remove-snakeyaml-hardcoded-versions.patch 
 02-Disable-rubygems-and-bundler-usage.patch
+03-Disable-ruby-maven.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-psych.git