[SCM] xbmc/master: Use groovy.jar instead of groovy-all-1.8.6.jar to work around FTBFS

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Sun May 4 21:16:36 UTC 2014


The following commit has been merged in the master branch:
commit 68019007ad91e343687fdd13942ce80c2210cff1
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Apr 28 12:28:03 2014 +0200

    Use groovy.jar instead of groovy-all-1.8.6.jar to work around FTBFS
    
    Closes: #744330

diff --git a/debian/patches/07-use-system-groovy.patch b/debian/patches/07-use-system-groovy.patch
index 016e6c1..1c1de64 100644
--- a/debian/patches/07-use-system-groovy.patch
+++ b/debian/patches/07-use-system-groovy.patch
@@ -15,8 +15,8 @@ index 6689777..6afaa7d 100644
 -          org.codehaus.groovy.tools.FileSystemCompiler -d $(TOPDIR)/tools/codegenerator $(TOPDIR)/tools/codegenerator/Helper.groovy  $(TOPDIR)/tools/codegenerator/SwigTypeParser.groovy $(INTERFACES_DIR)/python/MethodType.groovy $(INTERFACES_DIR)/python/PythonTools.groovy
 -	$(JAVA) -cp "$(GROOVY_DIR)/groovy-all-2.1.7.jar:$(GROOVY_DIR)/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \
 -          groovy.ui.GroovyMain $(TOPDIR)/tools/codegenerator/Generator.groovy $< $(INTERFACES_DIR)/python/PythonSwig.cpp.template $@ $(DOXY_XML_PATH)
-+	groovyc -cp "/usr/share/java/groovy-all-1.8.6.jar:/usr/share/java/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" -d tools/codegenerator tools/codegenerator/Helper.groovy  tools/codegenerator/SwigTypeParser.groovy $(INTERFACES_DIR)/python/MethodType.groovy $(INTERFACES_DIR)/python/PythonTools.groovy
-+	groovy -cp "/usr/share/java/groovy-all-1.8.6.jar:/usr/share/java/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \
++	groovyc -cp "/usr/share/java/groovy.jar:/usr/share/java/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" -d tools/codegenerator tools/codegenerator/Helper.groovy  tools/codegenerator/SwigTypeParser.groovy $(INTERFACES_DIR)/python/MethodType.groovy $(INTERFACES_DIR)/python/PythonTools.groovy
++	groovy -cp "/usr/share/java/groovy.jar:/usr/share/java/commons-lang-2.6.jar:$(TOPDIR)/tools/codegenerator:$(INTERFACES_DIR)/python" \
 +		$(TOPDIR)/tools/codegenerator/Generator.groovy $< $(INTERFACES_DIR)/python/PythonSwig.cpp.template $@ $(DOXY_XML_PATH)
  	rm $<
  

-- 
xbmc packaging



More information about the pkg-multimedia-commits mailing list