Merge branch '2.7' into 2.8
This commit is contained in:
commit
f0f33ab9e1
@ -110,6 +110,7 @@ drwxr-xr-x root/root usr/include/ImageMagick/magick/
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/morphology.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/option.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/paint.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/pixel-accessor.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/pixel.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/policy.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/prepress.h
|
||||
@ -164,9 +165,9 @@ drwxr-xr-x root/root usr/include/ImageMagick/wand/
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/wand/stream.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/wand/wand-view.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/ImageMagick-6.7.8/
|
||||
drwxr-xr-x root/root usr/lib/ImageMagick-6.7.8/config/
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.7.8/config/configure.xml
|
||||
drwxr-xr-x root/root usr/lib/ImageMagick-6.7.9/
|
||||
drwxr-xr-x root/root usr/lib/ImageMagick-6.7.9/config/
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.7.9/config/configure.xml
|
||||
-rw-r--r-- root/root usr/lib/libMagick++.a
|
||||
-rwxr-xr-x root/root usr/lib/libMagick++.la
|
||||
lrwxrwxrwx root/root usr/lib/libMagick++.so -> libMagick++.so.5.0.0
|
||||
@ -222,7 +223,7 @@ drwxr-xr-x root/root usr/man/man1/
|
||||
drwxr-xr-x root/root usr/man/man3/
|
||||
-r--r--r-- root/root usr/man/man3/Image::Magick.3pm.gz
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/ImageMagick-6.7.8/
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.7.8/english.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.7.8/francais.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.7.8/locale.xml
|
||||
drwxr-xr-x root/root usr/share/ImageMagick-6.7.9/
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.7.9/english.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.7.9/francais.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.7.9/locale.xml
|
||||
|
||||
@ -1 +1 @@
|
||||
1e245fe1b1561c046af02d3d112ba702 ImageMagick-6.7.8-10.tar.xz
|
||||
e6c4da963f7651674dca48f2b9f575bb ImageMagick-6.7.9-10.tar.xz
|
||||
|
||||
@ -5,9 +5,9 @@
|
||||
# Depends on: libtool freetype ghostscript lcms libungif libxml2
|
||||
|
||||
name=imagemagick
|
||||
version=6.7.8-10
|
||||
version=6.7.9-10
|
||||
release=1
|
||||
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/legacy/ImageMagick-$version.tar.xz)
|
||||
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-$version.tar.xz)
|
||||
|
||||
build () {
|
||||
cd ImageMagick-$version
|
||||
|
||||
@ -104,6 +104,10 @@ drwxr-xr-x root/root usr/lib/ruby/1.9/drb/
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/e2mmap.rb
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/erb.rb
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/expect.rb
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/fiddle.rb
|
||||
drwxr-xr-x root/root usr/lib/ruby/1.9/fiddle/
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/fiddle/closure.rb
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/fiddle/function.rb
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/fileutils.rb
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/find.rb
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/forwardable.rb
|
||||
@ -244,6 +248,7 @@ drwxr-xr-x root/root usr/lib/ruby/1.9/linux/enc/trans/
|
||||
-rwxr-xr-x root/root usr/lib/ruby/1.9/linux/etc.so
|
||||
-rwxr-xr-x root/root usr/lib/ruby/1.9/linux/fcntl.so
|
||||
-rwxr-xr-x root/root usr/lib/ruby/1.9/linux/fiber.so
|
||||
-rwxr-xr-x root/root usr/lib/ruby/1.9/linux/fiddle.so
|
||||
-rwxr-xr-x root/root usr/lib/ruby/1.9/linux/gdbm.so
|
||||
-rwxr-xr-x root/root usr/lib/ruby/1.9/linux/iconv.so
|
||||
drwxr-xr-x root/root usr/lib/ruby/1.9/linux/io/
|
||||
@ -701,9 +706,6 @@ drwxr-xr-x root/root usr/lib/ruby/1.9/rubygems/package/tar_reader/
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/rubygems/spec_fetcher.rb
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/rubygems/specification.rb
|
||||
drwxr-xr-x root/root usr/lib/ruby/1.9/rubygems/ssl_certs/
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/rubygems/ssl_certs/AddTrustExternalCARoot.pem
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/rubygems/ssl_certs/ca-bundle.pem
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/rubygems/syck_hack.rb
|
||||
-rw-r--r-- root/root usr/lib/ruby/1.9/rubygems/test_case.rb
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
2278eff4cfed3cbc0653bc73085caa34 ruby-1.9.3-p194.tar.bz2
|
||||
e76848a86606a4fd5dcf14fc4b4e755e ruby-1.9.3-p286.tar.bz2
|
||||
ce941d90c1361ce6ab6561bbe3f990fe ruby-arch.patch
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# Maintainer: Juergen Daubert, jue at crux dot nu
|
||||
# Description: Ruby interpreter
|
||||
# URL: http://www.ruby-lang.org
|
||||
# Depends on: db, gdbm, ncurses, openssl, readline, zlib
|
||||
# Depends on: db, gdbm, ncurses, openssl, readline, zlib, libffi
|
||||
|
||||
name=ruby
|
||||
version=1.9.3-p194
|
||||
version=1.9.3-p286
|
||||
release=1
|
||||
source=(ftp://ftp.ruby-lang.org/pub/$name/1.9/$name-$version.tar.bz2 \
|
||||
$name-arch.patch)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user