Merge branch '2.6' into 2.7
Conflicts: ruby/.md5sum ruby/Pkgfile
This commit is contained in:
commit
bc9bd61665
@ -1 +1 @@
|
||||
86ea60ba2118a1b9deafe8257f6a6a1a dbus-glib-0.80.tar.gz
|
||||
cd0ab148fb0c786fc88be49d19971f50 dbus-glib-0.86.tar.gz
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: dbus, glib
|
||||
|
||||
name=dbus-glib
|
||||
version=0.80
|
||||
version=0.86
|
||||
release=1
|
||||
source=(http://dbus.freedesktop.org/releases/$name/$name-$version.tar.gz)
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
23bc5ff22fe4f9a208d65fbbfd489ad9 30-dbus.launch
|
||||
c7a47b851ebe02f6726b65b78d1b730b dbus-1.2.16.tar.gz
|
||||
565346cecd9cfecf1463540c6086cc2c dbus-1.2.24.tar.gz
|
||||
dd882e45b9397a5dbf8650057ee9a340 rc.dbus
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: expat
|
||||
|
||||
name=dbus
|
||||
version=1.2.16
|
||||
version=1.2.24
|
||||
release=1
|
||||
source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
|
||||
rc.dbus 30-dbus.launch)
|
||||
|
@ -1,2 +1,2 @@
|
||||
3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2
|
||||
50c3e1119a2197de208cbb69c7da0a50 git-manpages-1.7.1.tar.bz2
|
||||
1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2
|
||||
d56a2b79e76efa7b207335f562fbefbe git-manpages-1.7.1.1.tar.bz2
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Nice to have: tk
|
||||
|
||||
name=git
|
||||
version=1.7.1
|
||||
version=1.7.1.1
|
||||
release=1
|
||||
source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2)
|
||||
|
||||
|
@ -73,6 +73,7 @@ drwxr-xr-x root/root usr/include/ImageMagick/magick/
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/hashmap.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/histogram.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/identify.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/image-view.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/image.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/layer.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/magick/list.h
|
||||
@ -141,37 +142,37 @@ drwxr-xr-x root/root usr/include/ImageMagick/wand/
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/wand/mogrify.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/wand/montage.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/wand/pixel-iterator.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/wand/pixel-view.h
|
||||
-rw-r--r-- root/root usr/include/ImageMagick/wand/pixel-wand.h
|
||||
-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.6.1/
|
||||
drwxr-xr-x root/root usr/lib/ImageMagick-6.6.1/config/
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/configure.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/delegates.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/english.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/francais.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/locale.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/policy.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/type-dejavu.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/type-ghostscript.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/type-windows.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.1/config/type.xml
|
||||
drwxr-xr-x root/root usr/lib/ImageMagick-6.6.2/
|
||||
drwxr-xr-x root/root usr/lib/ImageMagick-6.6.2/config/
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/configure.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/delegates.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/english.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/francais.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/locale.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/policy.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/type-dejavu.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/type-ghostscript.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/type-windows.xml
|
||||
-rw-r--r-- root/root usr/lib/ImageMagick-6.6.2/config/type.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.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libMagick++.so.3 -> libMagick++.so.3.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libMagick++.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libMagick++.so -> libMagick++.so.4.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libMagick++.so.4 -> libMagick++.so.4.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libMagick++.so.4.0.0
|
||||
-rw-r--r-- root/root usr/lib/libMagickCore.a
|
||||
-rwxr-xr-x root/root usr/lib/libMagickCore.la
|
||||
lrwxrwxrwx root/root usr/lib/libMagickCore.so -> libMagickCore.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libMagickCore.so.3 -> libMagickCore.so.3.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libMagickCore.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libMagickCore.so -> libMagickCore.so.4.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libMagickCore.so.4 -> libMagickCore.so.4.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libMagickCore.so.4.0.0
|
||||
-rw-r--r-- root/root usr/lib/libMagickWand.a
|
||||
-rwxr-xr-x root/root usr/lib/libMagickWand.la
|
||||
lrwxrwxrwx root/root usr/lib/libMagickWand.so -> libMagickWand.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libMagickWand.so.3 -> libMagickWand.so.3.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libMagickWand.so.3.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libMagickWand.so -> libMagickWand.so.4.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libMagickWand.so.4 -> libMagickWand.so.4.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libMagickWand.so.4.0.0
|
||||
drwxr-xr-x root/root usr/lib/perl5/
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/
|
||||
drwxr-xr-x root/root usr/lib/perl5/site_perl/5.10.1/
|
||||
@ -212,12 +213,12 @@ 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.6.1/
|
||||
drwxr-xr-x root/root usr/share/ImageMagick-6.6.1/config/
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.1/config/coder.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.1/config/colors.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.1/config/log.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.1/config/magic.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.1/config/mime.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.1/config/sRGB.icm
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.1/config/thresholds.xml
|
||||
drwxr-xr-x root/root usr/share/ImageMagick-6.6.2/
|
||||
drwxr-xr-x root/root usr/share/ImageMagick-6.6.2/config/
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.2/config/coder.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.2/config/colors.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.2/config/log.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.2/config/magic.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.2/config/mime.xml
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.2/config/sRGB.icm
|
||||
-rw-r--r-- root/root usr/share/ImageMagick-6.6.2/config/thresholds.xml
|
||||
|
@ -1 +1 @@
|
||||
d82e1331362f99790548e3e94777eb81 ImageMagick-6.6.1-10.tar.xz
|
||||
5bb527f3f736d5a4a819d14b193ccb23 ImageMagick-6.6.2-10.tar.xz
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: libtool freetype ghostscript lcms libungif libxml2
|
||||
|
||||
name=imagemagick
|
||||
version=6.6.1-10
|
||||
version=6.6.2-10
|
||||
release=1
|
||||
source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-$version.tar.xz)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
9c30a47b1d48664e7afef68bb4834c53 subversion-1.6.9.tar.bz2
|
||||
a4b1d0d7f3a4587c59da9c1acf9dedd0 subversion-1.6.12.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: subversion apache
|
||||
|
||||
name=mod_svn
|
||||
version=1.6.9
|
||||
version=1.6.12
|
||||
release=1
|
||||
source=(http://subversion.tigris.org/downloads/subversion-$version.tar.bz2)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
065042eaaee40c2779cf0bcfffe72aae msmtp-1.4.20.tar.bz2
|
||||
9d764cd9036168f49bc9d6531a7f3dba msmtp-1.4.21.tar.bz2
|
||||
|
@ -5,9 +5,9 @@
|
||||
# Depends on: openssl
|
||||
|
||||
name=msmtp
|
||||
version=1.4.20
|
||||
version=1.4.21
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
|
||||
source=(http://downloads.sourceforge.net/project/msmtp/msmtp/$version/$name-$version.tar.bz2)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
@ -5176,6 +5176,7 @@ drwxr-xr-x root/root usr/share/ri/1.9/system/Prime/EratosthenesGenerator/
|
||||
drwxr-xr-x root/root usr/share/ri/1.9/system/Prime/EratosthenesSieve/
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Prime/EratosthenesSieve/cdesc-EratosthenesSieve.yaml
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Prime/EratosthenesSieve/extend_table-i.yaml
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Prime/EratosthenesSieve/indices-i.yaml
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Prime/EratosthenesSieve/next_to-i.yaml
|
||||
drwxr-xr-x root/root usr/share/ri/1.9/system/Prime/Generator23/
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Prime/Generator23/cdesc-Generator23.yaml
|
||||
@ -9158,6 +9159,7 @@ drwxr-xr-x root/root usr/share/ri/1.9/system/Ripper/TokenPattern/MatchError/
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Ripper/compile_error-i.yaml
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Ripper/encoding-i.yaml
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Ripper/end_seen%3f-i.yaml
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Ripper/filename-i.yaml
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Ripper/lex-c.yaml
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Ripper/lineno-i.yaml
|
||||
-rw-r--r-- root/root usr/share/ri/1.9/system/Ripper/new-c.yaml
|
||||
|
@ -1 +1 @@
|
||||
5922459622a23612eb9b68a3586cb5f8 ruby-1.9.1-p378.tar.bz2
|
||||
09df32ae51b6337f7a2e3b1909b26213 ruby-1.9.1-p429.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: ruby
|
||||
|
||||
name=ruby-doc
|
||||
version=1.9.1-p378
|
||||
version=1.9.1-p429
|
||||
release=1
|
||||
source=(ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-$version.tar.bz2)
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
5922459622a23612eb9b68a3586cb5f8 ruby-1.9.1-p378.tar.bz2
|
||||
47d04c87886689f454361249d255d823 ruby-arch.patch
|
||||
09df32ae51b6337f7a2e3b1909b26213 ruby-1.9.1-p429.tar.bz2
|
||||
d3e02c8f15bd0000af7c5854b897b220 ruby-arch.patch
|
||||
6067be7da0c6eb770e196a63b4ce9f26 ruby-openssl-1.0.patch
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: db, gdbm, ncurses, openssl, readline, zlib
|
||||
|
||||
name=ruby
|
||||
version=1.9.1-p378
|
||||
version=1.9.1-p429
|
||||
release=2
|
||||
source=(ftp://ftp.ruby-lang.org/pub/$name/1.9/$name-$version.tar.bz2 \
|
||||
$name-arch.patch $name-openssl-1.0.patch)
|
||||
@ -13,13 +13,13 @@ build () {
|
||||
cd $name-$version
|
||||
|
||||
patch -p1 -i $SRC/$name-openssl-1.0.patch
|
||||
patch -p1 -i $SRC/$name-arch.patch
|
||||
|
||||
patch -p0 -i $SRC/$name-arch.patch
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--enable-shared \
|
||||
--disable-install-doc \
|
||||
--with-ruby-version=minor
|
||||
--with-ruby-version=minor \
|
||||
|
||||
make -j1
|
||||
make DESTDIR=$PKG install
|
||||
|
@ -1,7 +1,6 @@
|
||||
diff -Nru ruby-1.9.1-p129.orig/configure ruby-1.9.1-p129/configure
|
||||
--- ruby-1.9.1-p129.orig/configure 2009-06-11 16:48:17.886630091 +0200
|
||||
+++ ruby-1.9.1-p129/configure 2009-06-11 16:48:39.136631089 +0200
|
||||
@@ -22515,7 +22515,7 @@
|
||||
--- configure.orig 2010-07-04 12:04:10.423030773 +0200
|
||||
+++ configure 2010-07-04 12:04:22.913029424 +0200
|
||||
@@ -11813,7 +11813,7 @@
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
|
@ -1 +1 @@
|
||||
75419159b50661092c4137449940b5cc subversion-1.6.11.tar.bz2
|
||||
a4b1d0d7f3a4587c59da9c1acf9dedd0 subversion-1.6.12.tar.bz2
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: apr neon expat sqlite3
|
||||
|
||||
name=subversion
|
||||
version=1.6.11
|
||||
version=1.6.12
|
||||
release=1
|
||||
source=(http://subversion.tigris.org/downloads/$name-$version.tar.bz2)
|
||||
|
||||
|
@ -45,13 +45,13 @@ drwxr-xr-x root/root usr/include/sylpheed/sylph/
|
||||
-rw-r--r-- root/root usr/include/sylpheed/sylph/xml.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rwxr-xr-x root/root usr/lib/libsylph-0.la
|
||||
lrwxrwxrwx root/root usr/lib/libsylph-0.so -> libsylph-0.so.1.0.2
|
||||
lrwxrwxrwx root/root usr/lib/libsylph-0.so.1 -> libsylph-0.so.1.0.2
|
||||
-rwxr-xr-x root/root usr/lib/libsylph-0.so.1.0.2
|
||||
lrwxrwxrwx root/root usr/lib/libsylph-0.so -> libsylph-0.so.1.0.3
|
||||
lrwxrwxrwx root/root usr/lib/libsylph-0.so.1 -> libsylph-0.so.1.0.3
|
||||
-rwxr-xr-x root/root usr/lib/libsylph-0.so.1.0.3
|
||||
-rwxr-xr-x root/root usr/lib/libsylpheed-plugin-0.la
|
||||
lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so -> libsylpheed-plugin-0.so.1.0.2
|
||||
lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so.1 -> libsylpheed-plugin-0.so.1.0.2
|
||||
-rwxr-xr-x root/root usr/lib/libsylpheed-plugin-0.so.1.0.2
|
||||
lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so -> libsylpheed-plugin-0.so.1.0.3
|
||||
lrwxrwxrwx root/root usr/lib/libsylpheed-plugin-0.so.1 -> libsylpheed-plugin-0.so.1.0.3
|
||||
-rwxr-xr-x root/root usr/lib/libsylpheed-plugin-0.so.1.0.3
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/applications/
|
||||
-rw-r--r-- root/root usr/share/applications/sylpheed.desktop
|
||||
|
@ -1 +1 @@
|
||||
2ee330c737b02418d8692bd193f8b176 sylpheed-3.0.2.tar.bz2
|
||||
c69e5787868c7a8b5fe74cc24ffca189 sylpheed-3.0.3.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: gtk, openssl
|
||||
|
||||
name=sylpheed
|
||||
version=3.0.2
|
||||
version=3.0.3
|
||||
release=1
|
||||
source=(http://sylpheed.sraoss.jp/sylpheed/v3.0/$name-$version.tar.bz2)
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
2bc971a1753fe57aca05fde7c005a16c configure.diff
|
||||
1db28bd91f66278b836162e960ad4e22 xterm-260.tgz
|
||||
10d211f6986c4b279cfa9530b2361457 xterm-261.tgz
|
||||
|
@ -5,7 +5,7 @@
|
||||
# Depends on: xorg-libxaw xorg-font-alias xorg-font-misc-misc
|
||||
|
||||
name=xterm
|
||||
version=260
|
||||
version=261
|
||||
release=1
|
||||
source=(ftp://invisible-island.net/$name/$name-$version.tgz \
|
||||
configure.diff)
|
||||
|
Loading…
x
Reference in New Issue
Block a user