Merge branch '2.6' into 2.7

This commit is contained in:
Fredrik Rinnestam 2010-06-22 23:54:29 +02:00
commit 1529ae4226
17 changed files with 3334 additions and 3319 deletions

View File

@ -147,6 +147,7 @@ drwxr-xr-x root/root usr/lib/firefox/xulrunner/components/
-rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsFormAutoComplete.js -rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsFormAutoComplete.js
-rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsHandlerService.js -rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsHandlerService.js
-rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsHelperAppDlg.js -rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsHelperAppDlg.js
-rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsINIProcessor.js
-rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsLivemarkService.js -rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsLivemarkService.js
-rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsLoginInfo.js -rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsLoginInfo.js
-rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsLoginManager.js -rw-r--r-- root/root usr/lib/firefox/xulrunner/components/nsLoginManager.js
@ -217,6 +218,7 @@ drwxr-xr-x root/root usr/lib/firefox/xulrunner/modules/
-rw-r--r-- root/root usr/lib/firefox/xulrunner/modules/utils.js -rw-r--r-- root/root usr/lib/firefox/xulrunner/modules/utils.js
-rwxr-xr-x root/root usr/lib/firefox/xulrunner/mozilla-xremote-client -rwxr-xr-x root/root usr/lib/firefox/xulrunner/mozilla-xremote-client
-rw-r--r-- root/root usr/lib/firefox/xulrunner/platform.ini -rw-r--r-- root/root usr/lib/firefox/xulrunner/platform.ini
-rwxr-xr-x root/root usr/lib/firefox/xulrunner/plugin-container
drwxr-xr-x root/root usr/lib/firefox/xulrunner/plugins/ drwxr-xr-x root/root usr/lib/firefox/xulrunner/plugins/
-rwxr-xr-x root/root usr/lib/firefox/xulrunner/plugins/libnullplugin.so -rwxr-xr-x root/root usr/lib/firefox/xulrunner/plugins/libnullplugin.so
-rwxr-xr-x root/root usr/lib/firefox/xulrunner/plugins/libunixprintplugin.so -rwxr-xr-x root/root usr/lib/firefox/xulrunner/plugins/libunixprintplugin.so

View File

@ -1,2 +1,2 @@
5e4541ab23084b7b14ba228291ce2688 firefox-3.6.3.source.tar.bz2 66b1610362ed6009d66fe762645679a0 firefox-3.6.4.source.tar.bz2
34017b42dd0e5d2b3759646ebdce35fc mozconfig b7a91ebb68e13ea0fb718e4efbfaffc3 mozconfig

View File

@ -1,11 +1,11 @@
# Description: Mozilla Web Browser Component # Description: Mozilla Web Browser Component
# URL: http://www.mozilla.com/firefox/ # URL: http://www.mozilla.com/firefox/
# Maintainer: Fredrik Rinnestam, fredrik at rinnestam dot se # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
# Depends on: xulrunner # Depends on: xulrunner
name=firefox name=firefox
version=3.6.3 version=3.6.4
release=2 release=1
source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2 source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2
mozconfig) mozconfig)

View File

@ -16,7 +16,7 @@ ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib ac_add_options --with-system-zlib
ac_add_options --with-system-mng ac_add_options --with-system-mng
ac_add_options --with-pthreads ac_add_options --with-pthreads
ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.2.3 ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.2.4
ac_add_options --enable-system-cairo ac_add_options --enable-system-cairo
ac_add_options --enable-optimize="#CFLAGS#" ac_add_options --enable-optimize="#CFLAGS#"
ac_add_options --enable-official-branding ac_add_options --enable-official-branding
@ -35,6 +35,7 @@ ac_add_options --disable-gnomeui
ac_add_options --disable-mailnews ac_add_options --disable-mailnews
ac_add_options --disable-crashreporter ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi ac_add_options --disable-necko-wifi
ac_add_options --disable-libnotify
ac_add_options --enable-svg ac_add_options --enable-svg
ac_add_options --enable-canvas ac_add_options --enable-canvas
ac_add_options --enable-crypto ac_add_options --enable-crypto

View File

@ -310,6 +310,7 @@ drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/edge-sobel -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/edge-sobel
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/emboss -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/emboss
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/engrave -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/engrave
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-aa
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-bmp -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-bmp
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-cel -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-cel
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-compressor -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-compressor
@ -331,6 +332,7 @@ drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-mng -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-mng
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pat -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pat
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pcx -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pcx
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pdf
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pix -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pix
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-png -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-png
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pnm -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/file-pnm
@ -433,41 +435,41 @@ drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/whirl-pinch -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/whirl-pinch
-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/wind -rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/wind
-rwxr-xr-x root/root usr/lib/libgimp-2.0.la -rwxr-xr-x root/root usr/lib/libgimp-2.0.la
lrwxrwxrwx root/root usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimp-2.0.so -> libgimp-2.0.so.0.600.9
lrwxrwxrwx root/root usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimp-2.0.so.0 -> libgimp-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimp-2.0.so.0.600.8 -rwxr-xr-x root/root usr/lib/libgimp-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpbase-2.0.la -rwxr-xr-x root/root usr/lib/libgimpbase-2.0.la
lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so -> libgimpbase-2.0.so.0.600.9
lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpbase-2.0.so.0 -> libgimpbase-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpbase-2.0.so.0.600.8 -rwxr-xr-x root/root usr/lib/libgimpbase-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.la -rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.la
lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so -> libgimpcolor-2.0.so.0.600.9
lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpcolor-2.0.so.0 -> libgimpcolor-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.so.0.600.8 -rwxr-xr-x root/root usr/lib/libgimpcolor-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpconfig-2.0.la -rwxr-xr-x root/root usr/lib/libgimpconfig-2.0.la
lrwxrwxrwx root/root usr/lib/libgimpconfig-2.0.so -> libgimpconfig-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpconfig-2.0.so -> libgimpconfig-2.0.so.0.600.9
lrwxrwxrwx root/root usr/lib/libgimpconfig-2.0.so.0 -> libgimpconfig-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpconfig-2.0.so.0 -> libgimpconfig-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpconfig-2.0.so.0.600.8 -rwxr-xr-x root/root usr/lib/libgimpconfig-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpmath-2.0.la -rwxr-xr-x root/root usr/lib/libgimpmath-2.0.la
lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so -> libgimpmath-2.0.so.0.600.9
lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpmath-2.0.so.0 -> libgimpmath-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpmath-2.0.so.0.600.8 -rwxr-xr-x root/root usr/lib/libgimpmath-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.la -rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.la
lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so -> libgimpmodule-2.0.so.0.600.9
lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpmodule-2.0.so.0 -> libgimpmodule-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.so.0.600.8 -rwxr-xr-x root/root usr/lib/libgimpmodule-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.la -rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.la
lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so -> libgimpthumb-2.0.so.0.600.9
lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpthumb-2.0.so.0 -> libgimpthumb-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.so.0.600.8 -rwxr-xr-x root/root usr/lib/libgimpthumb-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpui-2.0.la -rwxr-xr-x root/root usr/lib/libgimpui-2.0.la
lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so -> libgimpui-2.0.so.0.600.9
lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpui-2.0.so.0 -> libgimpui-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpui-2.0.so.0.600.8 -rwxr-xr-x root/root usr/lib/libgimpui-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.la -rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.la
lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so -> libgimpwidgets-2.0.so.0.600.9
lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.600.8 lrwxrwxrwx root/root usr/lib/libgimpwidgets-2.0.so.0 -> libgimpwidgets-2.0.so.0.600.9
-rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.so.0.600.8 -rwxr-xr-x root/root usr/lib/libgimpwidgets-2.0.so.0.600.9
drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gimp-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gimp-2.0.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gimpthumb-2.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/gimpthumb-2.0.pc

View File

@ -1 +1 @@
a4d9462c9420954824a80c9b1963f9d9 gimp-2.6.8.tar.bz2 e5d0cc6f3ce127e51d7f3d3124b16a99 gimp-2.6.9.tar.bz2

View File

@ -6,7 +6,7 @@
# Nice to have: gimp-print # Nice to have: gimp-print
name=gimp name=gimp
version=2.6.8 version=2.6.9
release=2 release=2
source=(ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-$version.tar.bz2) source=(ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-$version.tar.bz2)

View File

@ -1,16 +0,0 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/notify-send
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/libnotify/
-rw-r--r-- root/root usr/include/libnotify/notification.h
-rw-r--r-- root/root usr/include/libnotify/notify-enum-types.h
-rw-r--r-- root/root usr/include/libnotify/notify.h
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libnotify.a
-rwxr-xr-x root/root usr/lib/libnotify.la
lrwxrwxrwx root/root usr/lib/libnotify.so -> libnotify.so.1.1.3
lrwxrwxrwx root/root usr/lib/libnotify.so.1 -> libnotify.so.1.1.3
-rwxr-xr-x root/root usr/lib/libnotify.so.1.1.3
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libnotify.pc

View File

@ -1 +0,0 @@
472e2c1f808848365572a9b024d9e8f5 libnotify-0.4.5.tar.gz

View File

@ -1,18 +0,0 @@
# Description: Notification library from the Galago project
# URL: http://www.galago-project.org/news/index.php
# Packager: Matt Housh, jaeger at morpheus dot net
# Maintainer: Fredrik Rinnestam, fredrik at rinnestam dot se
# Depends on: dbus, gtk
name=libnotify
version=0.4.5
release=1
source=(http://www.galago-project.org/files/releases/source/$name/$name-$version.tar.gz)
build() {
cd $name-$version
./configure --prefix=/usr
make
make DESTDIR=$PKG install
rm -rf $PKG/usr/share
}

View File

@ -1,6 +1,6 @@
# Description: Netscape Portable Runtime library # Description: Netscape Portable Runtime library
# URL: http://www.mozilla.org/projects/nspr/ # URL: http://www.mozilla.org/projects/nspr/
# Maintainer: Fredrik Rinnestam, fredrik at rinnestam dot se # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
name=nspr name=nspr
version=4.8.4 version=4.8.4

View File

@ -1,6 +1,6 @@
# Description: Mozilla Network Security Services (NSS) # Description: Mozilla Network Security Services (NSS)
# URL: http://www.mozilla.org/projects/security/pki/nss/ # URL: http://www.mozilla.org/projects/security/pki/nss/
# Maintainer: Fredrk Rinnestam, fredrik at rinnestam dot se # Maintainer: Fredrk Rinnestam, fredrik at crux dot nu
# Depends on: nspr sqlite3 # Depends on: nspr sqlite3
name=nss name=nss

View File

@ -1,6 +1,6 @@
# Description: Needed userspace firmware for radeon r6xx and r7xx. # Description: Needed userspace firmware for radeon r6xx and r7xx.
# URL: http://people.freedesktop.org/~agd5f/radeon_ucode/. # URL: http://people.freedesktop.org/~agd5f/radeon_ucode/.
# Maintainer: Fredrik Rinnestam, fredrik at rinnestam dot se # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
# Depends on: # Depends on:
name=radeon-ucode name=radeon-ucode

File diff suppressed because it is too large Load Diff

View File

@ -1,2 +1,2 @@
5e4541ab23084b7b14ba228291ce2688 firefox-3.6.3.source.tar.bz2 66b1610362ed6009d66fe762645679a0 firefox-3.6.4.source.tar.bz2
7456e211e085c64d0a7dabccc9044a22 mozconfig ce6affb339831b2466213b34d02fa4d8 mozconfig

View File

@ -1,12 +1,12 @@
# Description: Mozilla Web Browser Component # Description: Mozilla Web Browser Component
# URL: http://www.mozilla.com/firefox/ # URL: http://www.mozilla.com/firefox/
# Maintainer: Fredrik Rinnestam, fredrik at rinnestam dot se # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu
# Depends on: libidl, libnotify, nss, gtk, perl, python, dbus-glib, alsa-lib # Depends on: libidl, nss, gtk, perl, python, dbus-glib, alsa-lib
name=xulrunner name=xulrunner
version=1.9.2.3 version=1.9.2.4
release=2 release=1
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/source/firefox-3.6.3.source.tar.bz2 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.4/source/firefox-3.6.4.source.tar.bz2
mozconfig) mozconfig)
build() { build() {

View File

@ -28,5 +28,6 @@ ac_add_options --disable-mailnews
ac_add_options --disable-crashreporter ac_add_options --disable-crashreporter
ac_add_options --disable-javaxpcom ac_add_options --disable-javaxpcom
ac_add_options --disable-necko-wifi ac_add_options --disable-necko-wifi
ac_add_options --disable-libnotify
ac_add_options --enable-optimize="#CFLAGS#" ac_add_options --enable-optimize="#CFLAGS#"
ac_add_options --enable-shared ac_add_options --enable-shared