Merge branch '2.8' into 3.0

Conflicts:
	flash-player-plugin/.md5sum
This commit is contained in:
Juergen Daubert 2013-01-10 11:13:17 +01:00
commit 9c10877084
17 changed files with 30 additions and 42 deletions

View File

@ -1,2 +1 @@
e753016e8f11cdeaabcc576a7a320af3 AdbeRdr9.5.1-1_i486linux_enu.tar.bz2
c74a98fdca45e1d17b5fd44a94194fcf acroread.diff
aeb7cdb8b675b3e01e32233d167fb1eb AdbeRdr9.5.3-1_i486linux_enu.tar.bz2

View File

@ -5,10 +5,9 @@
# Depends on: gtk libstdc++-compat
name=adobereader
version=9.5.1
version=9.5.3
release=1
source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/$version/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2 \
acroread.diff)
source=(ftp://ftp.adobe.com/pub/adobe/reader/unix/9.x/$version/enu/AdbeRdr${version}-1_i486linux_enu.tar.bz2)
PKGMK_NO_STRIP="yes"
@ -22,6 +21,5 @@ build() {
$(find $PKG/usr/lib -name PPKLite.api) \
$PKG/usr/lib/Adobe/Reader9/Reader/intellinux/lib/libauthplay*
patch $PKG/usr/lib/Adobe/Reader9/bin/acroread $SRC/acroread.diff
ln -sf /usr/lib/Adobe/Reader9/bin/acroread $PKG/usr/bin/acroread
}

View File

@ -1,11 +0,0 @@
--- acroread.orig 2011-11-18 11:39:00.303834998 +0100
+++ acroread 2011-11-18 11:30:59.000000000 +0100
@@ -526,7 +526,7 @@ fi
if [ -z "$mozillaPath" ]; then
MozPath="`gconftool-2 -g /desktop/gnome/url-handlers/http/command 2>/dev/null | cut -d ' ' -f1 2>/dev/null`"
[ -x "${MozPath}" ] || MozPath="`Which "$MozPath"`"
- mozillaPath="`readlink "$MozPath" | xargs dirname`"
+ [ -n $MozPath ] || mozillaPath="`readlink "$MozPath" | xargs dirname`"
if [ -n "$mozillaPath" ] && $TestCmd $TestCmdOption "$mozillaPath/libgtkembedmoz.so" || $TestCmd $TestCmdOption "$mozillaPath/libxul.so" ; then
MOZILLA_COMP_PATH="$mozillaPath"
export MOZILLA_COMP_PATH

View File

@ -1 +1 @@
2e538305977178eb085a9859511c299d dialog-1.1-20120706.tgz
4ba1e07b44cd767c3b33039771a76c74 dialog-1.2-20121230.tar.xz

View File

@ -5,14 +5,15 @@
# Depends on: ncurses
name=dialog
version=1.1-20120706
version=1.2-20121230
release=1
source=(ftp://dickey.his.com/$name/$name-$version.tgz)
source=(http://fossies.org/linux/misc/$name-$version.tar.xz)
build () {
cd $name-$version
./configure --prefix=/usr \
--mandir=/usr/man \
--with-ncursesw
make

View File

@ -1 +1 @@
999fec504e6d85b1b995264d796d49bf install_flash_player_11_linux.x86_64.tar.gz
e4948cfd8a7687fc0d4dd3e6e81777b8 install_flash_player_11_linux.x86_64.tar.gz

View File

@ -5,7 +5,7 @@
# Depends on:
name=flash-player-plugin
version=11.2.202.258
version=11.2.202.261
release=1
source=(http://fpdownload.macromedia.com/get/flashplayer/pdc/$version/install_flash_player_11_linux.x86_64.tar.gz)

View File

@ -11,9 +11,9 @@ drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/tld.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libidn.la
lrwxrwxrwx root/root usr/lib/libidn.so -> libidn.so.11.6.8
lrwxrwxrwx root/root usr/lib/libidn.so.11 -> libidn.so.11.6.8
-rwxr-xr-x root/root usr/lib/libidn.so.11.6.8
lrwxrwxrwx root/root usr/lib/libidn.so -> libidn.so.11.6.9
lrwxrwxrwx root/root usr/lib/libidn.so.11 -> libidn.so.11.6.9
-rwxr-xr-x root/root usr/lib/libidn.so.11.6.9
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libidn.pc
drwxr-xr-x root/root usr/man/

View File

@ -1 +1 @@
45ffabce4b8ca87fe98fe4542668d33d libidn-1.25.tar.gz
7533d14fbbb6c026a1a9eaa2179ccb69 libidn-1.26.tar.gz

View File

@ -4,7 +4,7 @@
# Packager: Daniel Mueller, daniel at danm dot de
name=libidn
version=1.25
version=1.26
release=1
source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)

View File

@ -1 +1 @@
15571c615d8f75f5f6d294272f80c7fa mtools-4.0.17.tar.bz2
a23646617546bf6ad56f061d8b283c85 mtools-4.0.18.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on:
name=mtools
version=4.0.17
version=4.0.18
release=1
source=(ftp://ftp.gnu.org/gnu/mtools/$name-$version.tar.bz2)

View File

@ -1 +1 @@
52dd02b6f5e0a148ba871234ae29bba2 sharutils-4.11.1.tar.bz2
ac996dbe2dfc74647b500506af56779b sharutils-4.13.3.tar.xz

View File

@ -5,16 +5,13 @@
# Depends on:
name=sharutils
version=4.11.1
release=2
source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2)
version=4.13.3
release=1
source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.xz)
build(){
cd $name-$version
# fix for glibc 'gets' removal
sed -i -e '/gets is a/d' lib/stdio.in.h
./configure --prefix=/usr \
--mandir=/usr/man \
--disable-nls

View File

@ -48,6 +48,7 @@ drwxr-xr-x root/root usr/share/syslinux/com32/include/bitsize/
-rw-r--r-- root/root usr/share/syslinux/com32/include/cpufeature.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/ctype.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/dev.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/dhcp.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/dirent.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/dprintf.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/elf.h
@ -154,6 +155,7 @@ drwxr-xr-x root/root usr/share/syslinux/com32/include/syslinux/
-rw-r--r-- root/root usr/share/syslinux/com32/include/syslinux/bootpm.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/syslinux/bootrm.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/syslinux/config.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/syslinux/disk.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/syslinux/features.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/syslinux/idle.h
-rw-r--r-- root/root usr/share/syslinux/com32/include/syslinux/io.h
@ -206,6 +208,7 @@ drwxr-xr-x root/root usr/share/syslinux/dosutil/
-rw-r--r-- root/root usr/share/syslinux/host.c32
-rw-r--r-- root/root usr/share/syslinux/ifcpu.c32
-rw-r--r-- root/root usr/share/syslinux/ifcpu64.c32
-rw-r--r-- root/root usr/share/syslinux/ifmemdsk.c32
-rw-r--r-- root/root usr/share/syslinux/ifplop.c32
-rw-r--r-- root/root usr/share/syslinux/int18.com
-rw-r--r-- root/root usr/share/syslinux/isohdpfx.bin
@ -217,6 +220,7 @@ drwxr-xr-x root/root usr/share/syslinux/dosutil/
-rw-r--r-- root/root usr/share/syslinux/isolinux-debug.bin
-rw-r--r-- root/root usr/share/syslinux/isolinux.bin
-rw-r--r-- root/root usr/share/syslinux/kbdmap.c32
-rw-r--r-- root/root usr/share/syslinux/kontron_wdt.c32
-rw-r--r-- root/root usr/share/syslinux/linux.c32
-rw-r--r-- root/root usr/share/syslinux/ls.c32
-rw-r--r-- root/root usr/share/syslinux/lua.c32
@ -231,8 +235,10 @@ drwxr-xr-x root/root usr/share/syslinux/dosutil/
-rw-r--r-- root/root usr/share/syslinux/pcitest.c32
-rw-r--r-- root/root usr/share/syslinux/pmload.c32
-rw-r--r-- root/root usr/share/syslinux/poweroff.com
-rw-r--r-- root/root usr/share/syslinux/prdhcp.c32
-rw-r--r-- root/root usr/share/syslinux/pwd.c32
-rw-r--r-- root/root usr/share/syslinux/pxechain.com
-rw-r--r-- root/root usr/share/syslinux/pxechn.c32
-rw-r--r-- root/root usr/share/syslinux/pxelinux.0
-rw-r--r-- root/root usr/share/syslinux/reboot.c32
-rw-r--r-- root/root usr/share/syslinux/rosh.c32

View File

@ -1,2 +1,2 @@
270a533a91d5f72579c3efa93dfdc222 avoid-ext2_fs.patch
82299242418385da1274c9479a778cb2 syslinux-4.05.tar.bz2
77d33140860621cd850c3a7ab0ebb7d6 syslinux-4.06.tar.xz

View File

@ -5,16 +5,14 @@
# Depends on: mtools perl
name=syslinux
version=4.05
release=2
source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.bz2 \
version=4.06
release=1
source=(http://www.kernel.org/pub/linux/utils/boot/$name/$name-$version.tar.xz \
avoid-ext2_fs.patch)
build() {
cd $name-$version
patch -p1 -i $SRC/avoid-ext2_fs.patch
# compilation will fail with LDFLAGS
unset LDFLAGS