Merge branch '2.8' into 3.0

Conflicts:
	jdk/.footprint
	jdk/.md5sum
	jdk/Pkgfile
This commit is contained in:
Juergen Daubert 2013-01-17 21:14:57 +01:00
commit 995164b925
26 changed files with 1385 additions and 1379 deletions

View File

@ -5,6 +5,7 @@ drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/chromium/
-rw-r--r-- root/root usr/lib/chromium/chrome.pak
-rw-r--r-- root/root usr/lib/chromium/chrome_100_percent.pak
-rw-r--r-- root/root usr/lib/chromium/chrome_remote_desktop.pak
-rwxr-xr-x root/root usr/lib/chromium/chromium
-r-sr-xr-x root/root usr/lib/chromium/chromium-sandbox
-rw-r--r-- root/root usr/lib/chromium/content_resources.pak
@ -174,6 +175,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/TimelinePanel.js
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/auditsPanel.css
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/breadcrumbList.css
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/canvasProfiler.css
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cmdevtools.css
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/codemirror.css
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cssNamedFlows.css
@ -202,7 +204,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/textEditor.css
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/textPrompt.css
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/timelinePanel.css
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/webGLProfiler.css
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/chromium.1.gz

View File

@ -1,3 +1,3 @@
595a39542de132a1132ac5a716d01f03 chromium-23.0.1271.97.tar.bz2
ed027b16b20e673af6dcf1831a6d8652 chromium-24.0.1312.52.tar.bz2
64968626706b07721983ac59fb3babbf chromium.sh
d1a2b0663cbf38ebc71cc75073a39b43 use-siginfo_t.patch

View File

@ -5,7 +5,7 @@
# Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt alsa-lib krb5
name=chromium
version=23.0.1271.97
version=24.0.1312.52
release=1
source=(http://commondatastorage.googleapis.com/chromium-browser-official/$name-$version.tar.bz2 \
$name.sh use-siginfo_t.patch)
@ -30,6 +30,7 @@ build() {
-Dlinux_strip_binary=1 \
-Drelease_extra_cflags="$CFLAGS" \
-Dproprietary_codecs=1 \
-Dffmpeg_branding=Chrome \
-Duse_system_libjpeg=1 \
-Duse_system_libxslt=1 \
-Duse_system_libxml=1 \

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
2a75b5510bdb7360b9279a6f659d054a jdk-7u10-linux-x64.tar.gz
d8f65419fa65f179382ae310237fd1f4 jdk-7u11-linux-x64.tar.gz

View File

@ -5,9 +5,9 @@
# Packager: Simone Rota, sip at crux dot nu
name=jdk
version=1.7.0_10
version=1.7.0_11
release=1
source=(file:///$name-7u10-linux-x64.tar.gz)
source=(file:///$name-7u11-linux-x64.tar.gz)
build(){
rm -rf $SRC/jdk*/{man/ja,jre/lib/{locale,deploy/messages_},db/lib/derbyLocale*}*

View File

@ -1,2 +1,2 @@
3896ef4334df08563b05d0848ba80582 clang-3.2.src.tar.gz
3242192df982dfb0725c4a0ff27d6366 llvm-3.2.src.tar.gz
71610289bbc819e3e15fdd562809a2d7 llvm-3.2.src.tar.gz

View File

@ -1 +1 @@
cb716b657a30570b9b468b9e7bc551a1 php-5.4.10.tar.bz2
9975e68c22b86b013b934743ad2d2276 php-5.4.11.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: apache libxml2
name=mod_php
version=5.4.10
version=5.4.11
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2)

View File

@ -1,2 +1,2 @@
cb716b657a30570b9b468b9e7bc551a1 php-5.4.10.tar.bz2
9975e68c22b86b013b934743ad2d2276 php-5.4.11.tar.bz2
6297748058441ee6c6b88e429ee54ba1 php-fcgi

View File

@ -4,7 +4,7 @@
# Depends on: libpcre libxml2
name=php-fcgi
version=5.4.10
version=5.4.11
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2
php-fcgi)

View File

@ -1,2 +1,2 @@
cb716b657a30570b9b468b9e7bc551a1 php-5.4.10.tar.bz2
9975e68c22b86b013b934743ad2d2276 php-5.4.11.tar.bz2
93be638b655e225b198d2a2ae69ca2fb php-fpm

View File

@ -4,7 +4,7 @@
# Depends on: libpcre libxml2
name=php-fpm
version=5.4.10
version=5.4.11
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2
php-fpm)

View File

@ -1 +1 @@
cb716b657a30570b9b468b9e7bc551a1 php-5.4.10.tar.bz2
9975e68c22b86b013b934743ad2d2276 php-5.4.11.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: mysql
name=php-mysql
version=5.4.10
version=5.4.11
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2)

View File

@ -1,2 +1,2 @@
683de3db60200bc38aa6e154aa925fa6 extensions.ini
cb716b657a30570b9b468b9e7bc551a1 php-5.4.10.tar.bz2
9975e68c22b86b013b934743ad2d2276 php-5.4.11.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: ncurses readline libpcre libxml2 curl db gdbm zip
name=php
version=5.4.10
version=5.4.11
release=1
source=(http://www.php.net/distributions/php-$version.tar.bz2
extensions.ini)

View File

@ -1 +1 @@
189bc5b87281a72f8c72a0f7ebaa6d00 qemu-1.2.1.tar.bz2
ea9f290266ef26b48bf4d68f810fd4ec qemu-1.2.2.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: libsdl
name=qemu
version=1.2.1
version=1.2.2
release=1
source=(http://wiki.qemu.org/download/qemu-$version.tar.bz2)

View File

@ -6224,6 +6224,7 @@ drwxr-xr-x root/root usr/share/ri/1.9/system/Object/TimeoutError/
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/kind_of%3f-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/ln-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/method-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/methods-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/mkdir-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/mkmf-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/mv-i.ri
@ -6231,8 +6232,11 @@ drwxr-xr-x root/root usr/share/ri/1.9/system/Object/TimeoutError/
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/object_id-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/pretty_print-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/pretty_print_cycle-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/private_methods-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/protected_methods-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/psych_to_yaml-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/public_method-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/public_methods-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/public_send-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/remove_instance_variable-i.ri
-rw-r--r-- root/root usr/share/ri/1.9/system/Object/respond_to%3f-i.ri

View File

@ -1 +1 @@
13c26ea368d88a560f07cc8c5eb4fa05 ruby-1.9.3-p362.tar.bz2
944e73eba9ee9e1f2647ff32ec0b14b2 ruby-1.9.3-p374.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: ruby
name=ruby-doc
version=1.9.3-p362
version=1.9.3-p374
release=1
source=(ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-$version.tar.bz2)

View File

@ -1,2 +1,2 @@
13c26ea368d88a560f07cc8c5eb4fa05 ruby-1.9.3-p362.tar.bz2
944e73eba9ee9e1f2647ff32ec0b14b2 ruby-1.9.3-p374.tar.bz2
ce941d90c1361ce6ab6561bbe3f990fe ruby-arch.patch

View File

@ -4,7 +4,7 @@
# Depends on: db, gdbm, ncurses, openssl, readline, zlib, libffi
name=ruby
version=1.9.3-p362
version=1.9.3-p374
release=1
source=(ftp://ftp.ruby-lang.org/pub/$name/1.9/$name-$version.tar.bz2 \
$name-arch.patch)

View File

@ -1 +1 @@
1d02734ea2fcc3551ac62c5ae6a274b2 scite323.tgz
e27332abd4a6b5b551b1bc0f21b73667 scite324.tgz

View File

@ -4,7 +4,7 @@
# Depends on: gtk
name=scite
version=3.2.3
version=3.2.4
release=1
source=(http://downloads.sourceforge.net/project/scintilla/SciTE/$version/$name${version//./}.tgz)