Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kikadftesting.git;a=commitdiff;h=022376c29b26e9da984e396aecd9ed774d0ebcbc
commit 022376c29b26e9da984e396aecd9ed774d0ebcbc Author: kikadf <[email protected]> Date: Tue Aug 12 08:55:26 2014 +0200 acoc-0.7.1-4-x86_64 * Fix build diff --git a/source/apps-extra/acoc/FrugalBuild b/source/apps-extra/acoc/FrugalBuild index 55a4e9c..d613599 100644 --- a/source/apps-extra/acoc/FrugalBuild +++ b/source/apps-extra/acoc/FrugalBuild @@ -5,21 +5,24 @@ pkgname=acoc pkgver=0.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="acoc is a regular expression based colour formatter for programs that display output on the command-line." url="http://www.caliban.org/ruby/acoc.shtml"; depends=('ruby>=2.1.2' 'term-ansicolor') groups=('apps-extra') archs=('i686' 'x86_64') -source=(http://www.caliban.org/files/ruby/$pkgname-$pkgver.tar.gz $pkgname.diff README.Frugalware) +source=(http://www.caliban.org/files/ruby/$pkgname-$pkgver.tar.gz + $pkgname.diff README.Frugalware + fix_class_clash.patch) up2date="lynx -dump http://www.caliban.org/files/ruby | grep $pkgname | Flasttar" sha1sums=('3027c39f54201e53cbc5d9c7e2fe2e97a7a8e6df' \ '44bea14648ea305768a11e64ffa1c1d720a4b16f' \ - 'cd7242d70113f788c7e0235d7e52ef20847490f2') + 'cd7242d70113f788c7e0235d7e52ef20847490f2' \ + 'a56246969a1ffdf75b34be3405bf23f304d76e62') build() { - Fcd + Fpatchall Fmkdir usr ROOT=$startdir/pkg/usr Fmakeinstall Fmv usr/etc ./ diff --git a/source/apps-extra/acoc/fix_class_clash.patch b/source/apps-extra/acoc/fix_class_clash.patch new file mode 100644 index 0000000..5a12dfe --- /dev/null +++ b/source/apps-extra/acoc/fix_class_clash.patch @@ -0,0 +1,87 @@ +--- acoc_ori 2010-10-07 16:03:29.089119182 -0300 ++++ acoc 2010-10-07 16:05:52.657578887 -0300 +@@ -83,24 +83,26 @@ + + include Term::ANSIColor + +-class Config < Hash; end ++module Acoc ++ class Config < Hash; end + +-class Program +- attr_accessor :flags, :specs ++ class Program ++ attr_accessor :flags, :specs + +- def initialize(flags) +- @flags = flags || "" +- @specs = Array.new ++ def initialize(flags) ++ @flags = flags || "" ++ @specs = Array.new ++ end + end +-end + +-class Rule +- attr_reader :regex, :flags, :colours ++ class Rule ++ attr_reader :regex, :flags, :colours + +- def initialize(regex, flags, colours) +- @regex = regex +- @flags = flags +- @colours = colours ++ def initialize(regex, flags, colours) ++ @regex = regex ++ @flags = flags ++ @colours = colours ++ end + end + end + +@@ -153,7 +155,7 @@ + # get configuration data + # + def parse_config(*files) +- @cmd = Config.new ++ @cmd = Acoc::Config.new + parsed = 0 + + files.each do |file| +@@ -161,7 +163,7 @@ + next unless file && FileTest::file?(file) && FileTest::readable?(file) + + begin +- f = File.open(file) do |f| ++ fo = File.open(file) do |f| + while line = f.gets do + next if line =~ /^(#|$)/ # skip blank lines and comments + +@@ -184,7 +186,7 @@ + if @cmd.has_key?(invocation) + @cmd[invocation].flags += flags unless flags.nil? + else +- @cmd[invocation] = Program.new(flags) ++ @cmd[invocation] = Acoc::Program.new(flags) + end + prog.sub!(%r(/\w+), '') + end +@@ -205,7 +207,7 @@ + end + + progs.each do |prog| +- @cmd[prog].specs << Rule.new(Regexp.new(regex), flags, colours) ++ @cmd[prog].specs << Acoc::Rule.new(Regexp.new(regex), flags, colours) + end + end + end +@@ -264,7 +266,7 @@ + matched = false + + # act on only the first match unless the /a flag was given +- break if matched && ! @cmd[prog].flags.include?('a') ++ return if matched && ! @cmd[prog].flags.include?('a') + + # get a pattern and attribute set pairing for this command + @cmd[prog].specs.each do |spec| _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
