Merge branch '3.0' into 3.1

This commit is contained in:
Danny Rawlins 2014-05-22 19:23:33 +10:00
commit c0dddc8f24
15 changed files with 62 additions and 44 deletions

View File

@ -1 +1 @@
aefbec27b96dd404d9ac9811e17d58ce gutenprint-5.2.9.tar.bz2
9ff027103bafac419c37e19da75163ae gutenprint-5.2.10.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: gimp gutenprint
name=gutenprint-gimp
version=5.2.9
version=5.2.10
release=1
source=(http://downloads.sourceforge.net/project/gimp-print/gutenprint-5.2/$version/gutenprint-$version.tar.bz2)
@ -22,6 +22,6 @@ build () {
rm $PKG/usr/lib/libgutenprint.*
rm $PKG/usr/lib/pkgconfig/gutenprint.pc
rm -r $PKG/usr/{include,lib}/gutenprint
rm -r $PKG/usr/{bin,sbin,man,share}
rm -r $PKG/usr/include/gutenprint
rm -r $PKG/usr/{bin,share}
}

View File

@ -32,23 +32,21 @@ drwxr-xr-x root/root usr/include/gutenprint/
-rw-r--r-- root/root usr/include/gutenprint/vars.h
-rw-r--r-- root/root usr/include/gutenprint/weave.h
-rw-r--r-- root/root usr/include/gutenprint/xml.h
drwxr-xr-x root/root usr/include/gutenprintui2/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/cups/
drwxr-xr-x root/root usr/lib/cups/backend/
-rwx------ root/root usr/lib/cups/backend/gutenprint52+usb
drwxr-xr-x root/root usr/lib/cups/driver/
-rwxr-xr-x root/root usr/lib/cups/driver/gutenprint.5.2
drwxr-xr-x root/root usr/lib/cups/filter/
-rwxr-xr-x root/root usr/lib/cups/filter/commandtocanon
-rwxr-xr-x root/root usr/lib/cups/filter/commandtoepson
-rwxr-xr-x root/root usr/lib/cups/filter/rastertogutenprint.5.2
drwxr-xr-x root/root usr/lib/gutenprint/
drwxr-xr-x root/root usr/lib/gutenprint/5.2/
drwxr-xr-x root/root usr/lib/gutenprint/5.2/modules/
-rw-r--r-- root/root usr/lib/libgutenprint.a
-rwxr-xr-x root/root usr/lib/libgutenprint.la
lrwxrwxrwx root/root usr/lib/libgutenprint.so -> libgutenprint.so.2.1.0
lrwxrwxrwx root/root usr/lib/libgutenprint.so.2 -> libgutenprint.so.2.1.0
-rwxr-xr-x root/root usr/lib/libgutenprint.so.2.1.0
lrwxrwxrwx root/root usr/lib/libgutenprint.so -> libgutenprint.so.2.3.0
lrwxrwxrwx root/root usr/lib/libgutenprint.so.2 -> libgutenprint.so.2.3.0
-rwxr-xr-x root/root usr/lib/libgutenprint.so.2.3.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gutenprint.pc
drwxr-xr-x root/root usr/man/
@ -65,6 +63,8 @@ drwxr-xr-x root/root usr/sbin/
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/cups/
-rw-r--r-- root/root usr/share/cups/calibrate.ppm
drwxr-xr-x root/root usr/share/cups/usb/
-rw-r--r-- root/root usr/share/cups/usb/net.sf.gimp-print.usb-quirks
drwxr-xr-x root/root usr/share/gutenprint/
drwxr-xr-x root/root usr/share/gutenprint/5.2/
drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/
@ -109,9 +109,11 @@ drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/inks/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k34.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v10.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3v4.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/standard.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/standard_gen0.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/sx445.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/ultrachrome.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/wf40.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inks/wf500.xml
@ -123,6 +125,7 @@ drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_roll_feed.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/default-duplex.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/default.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/pro3880.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/pro_cutter_roll_feed.xml
@ -134,6 +137,7 @@ drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/rx700.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/spro5000.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/standard_roll_feed.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/inputslots/wf7000.xml
drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/media/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/artisan.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/b500.xml
@ -170,6 +174,7 @@ drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/media/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3v.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3v10.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/r800.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/standard.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/media/standard_gen0.xml
@ -201,7 +206,11 @@ drwxr-xr-x root/root usr/share/gutenprint/5.2/xml/escp2/model/
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_115.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_116.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_117.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_118.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_119.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_12.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_120.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_121.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_13.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_14.xml
-rw-r--r-- root/root usr/share/gutenprint/5.2/xml/escp2/model/model_15.xml

View File

@ -1 +1 @@
aefbec27b96dd404d9ac9811e17d58ce gutenprint-5.2.9.tar.bz2
9ff027103bafac419c37e19da75163ae gutenprint-5.2.10.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: ghostscript, ncurses, readline
name=gutenprint
version=5.2.9
version=5.2.10
release=2
source=(http://downloads.sourceforge.net/project/gimp-print/$name-5.2/$version/$name-$version.tar.bz2)
@ -20,6 +20,6 @@ build () {
make
make DESTDIR=$PKG install
rm -r $PKG/usr/share/gutenprint/{doc,samples}
rm -r $PKG/usr/share/gutenprint/doc
rm -r $PKG/usr/share/locale
}

View File

@ -15,36 +15,36 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/nvidia-smi
-rwxr-xr-x root/root usr/bin/nvidia-xconfig
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libGL.so.331.67
lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.331.67
-rwxr-xr-x root/root usr/lib/libGL.so.331.79
lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.331.79
-rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0
-rwxr-xr-x root/root usr/lib/libcuda.so.331.67
lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.331.67
lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.331.67
-rwxr-xr-x root/root usr/lib/libnvcuvid.so.331.67
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.331.67
-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.331.67
-rwxr-xr-x root/root usr/lib/libnvidia-encode.so.331.67
-rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.331.67
-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.331.67
-rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.331.67
-rwxr-xr-x root/root usr/lib/libnvidia-ml.so.331.67
-rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.331.67
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.331.67
-rwxr-xr-x root/root usr/lib/libcuda.so.331.79
lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.331.79
lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.331.79
-rwxr-xr-x root/root usr/lib/libnvcuvid.so.331.79
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.331.79
-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.331.79
-rwxr-xr-x root/root usr/lib/libnvidia-encode.so.331.79
-rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.331.79
-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.331.79
-rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.331.79
-rwxr-xr-x root/root usr/lib/libnvidia-ml.so.331.79
-rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.331.79
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.331.79
drwxr-xr-x root/root usr/lib/tls/
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.331.67
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.331.79
drwxr-xr-x root/root usr/lib/vdpau/
lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.331.67
lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.331.67
-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.331.67
lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.331.79
lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.331.79
-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.331.79
drwxr-xr-x root/root usr/lib/xorg/
drwxr-xr-x root/root usr/lib/xorg/modules/
drwxr-xr-x root/root usr/lib/xorg/modules/drivers/
-rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so
drwxr-xr-x root/root usr/lib/xorg/modules/extensions/
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.331.67
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.331.67
-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.331.67
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.331.79
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.331.79
-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.331.79
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/nvidia-persistenced.1.gz

View File

@ -1 +1 @@
5354ea041b6b49fb31dcf1f5694ad5ea NVIDIA-Linux-x86_64-331.67-no-compat32.run
1f0708b913403b4f5b494b0daf0415eb NVIDIA-Linux-x86_64-331.79-no-compat32.run

View File

@ -4,7 +4,7 @@
# Depends on: gtk gl-select
name=nvidia
version=331.67
version=331.79
release=1
source=(ftp://download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-Linux-x86_64-$version-no-compat32.run)

View File

@ -1 +1 @@
a5ef870c0410b12d10449c2d36fa4661 transmission-2.82.tar.xz
4620cfbfefee2ce55a6fa12c3ec330a7 transmission-2.83.tar.xz

View File

@ -4,7 +4,7 @@
# Depends on: curl intltool gtk3 libevent
name=transmission-gtk
version=2.82
version=2.83
release=1
source=(http://download.m0k.org/transmission/files/transmission-$version.tar.xz)

View File

@ -1 +1 @@
a5ef870c0410b12d10449c2d36fa4661 transmission-2.82.tar.xz
4620cfbfefee2ce55a6fa12c3ec330a7 transmission-2.83.tar.xz

View File

@ -4,7 +4,7 @@
# Depends on: curl libevent
name=transmission
version=2.82
version=2.83
release=1
source=(http://download.m0k.org/$name/files/$name-$version.tar.xz)

View File

@ -103,6 +103,7 @@ drwxr-xr-x root/root usr/include/wine/windows/
-rw-r--r-- root/root usr/include/wine/windows/asynot.idl
-rw-r--r-- root/root usr/include/wine/windows/asysta.idl
-rw-r--r-- root/root usr/include/wine/windows/atlbase.h
-rw-r--r-- root/root usr/include/wine/windows/atlcom.h
-rw-r--r-- root/root usr/include/wine/windows/atliface.h
-rw-r--r-- root/root usr/include/wine/windows/atliface.idl
-rw-r--r-- root/root usr/include/wine/windows/atlwin.h
@ -299,6 +300,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/dsound.h
-rw-r--r-- root/root usr/include/wine/windows/dsrole.h
-rw-r--r-- root/root usr/include/wine/windows/dvdmedia.h
-rw-r--r-- root/root usr/include/wine/windows/dvoice.h
-rw-r--r-- root/root usr/include/wine/windows/dwmapi.h
-rw-r--r-- root/root usr/include/wine/windows/dwrite.h
-rw-r--r-- root/root usr/include/wine/windows/dwrite.idl
@ -402,6 +404,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/
-rw-r--r-- root/root usr/include/wine/windows/ks.h
-rw-r--r-- root/root usr/include/wine/windows/ksguid.h
-rw-r--r-- root/root usr/include/wine/windows/ksmedia.h
-rw-r--r-- root/root usr/include/wine/windows/ksuuids.h
-rw-r--r-- root/root usr/include/wine/windows/lm.h
-rw-r--r-- root/root usr/include/wine/windows/lmaccess.h
-rw-r--r-- root/root usr/include/wine/windows/lmapibuf.h
@ -1240,6 +1243,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rw-r--r-- root/root usr/lib/wine/fakedlls/itss.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/joy.cpl
-rw-r--r-- root/root usr/lib/wine/fakedlls/jscript.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/jsproxy.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/kernel32.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/ktmw32.dll
-rw-r--r-- root/root usr/lib/wine/fakedlls/loadperf.dll
@ -1564,6 +1568,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rwxr-xr-x root/root usr/lib/wine/itss.dll.so
-rwxr-xr-x root/root usr/lib/wine/joy.cpl.so
-rwxr-xr-x root/root usr/lib/wine/jscript.dll.so
-rwxr-xr-x root/root usr/lib/wine/jsproxy.dll.so
-rwxr-xr-x root/root usr/lib/wine/kernel32.dll.so
-rwxr-xr-x root/root usr/lib/wine/ktmw32.dll.so
-rw-r--r-- root/root usr/lib/wine/libaclui.def
@ -1635,6 +1640,7 @@ drwxr-xr-x root/root usr/lib/wine/fakedlls/
-rw-r--r-- root/root usr/lib/wine/libimm32.def
-rw-r--r-- root/root usr/lib/wine/libinetcomm.def
-rw-r--r-- root/root usr/lib/wine/libiphlpapi.def
-rw-r--r-- root/root usr/lib/wine/libjsproxy.def
-rw-r--r-- root/root usr/lib/wine/libkernel32.def
-rw-r--r-- root/root usr/lib/wine/libloadperf.def
-rw-r--r-- root/root usr/lib/wine/liblz32.def
@ -2487,6 +2493,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rw-r--r-- root/root usr/lib32/wine/fakedlls/itss.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/joy.cpl
-rw-r--r-- root/root usr/lib32/wine/fakedlls/jscript.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/jsproxy.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/kernel32.dll
-rw-r--r-- root/root usr/lib32/wine/fakedlls/keyboard.drv16
-rw-r--r-- root/root usr/lib32/wine/fakedlls/krnl386.exe16
@ -2865,6 +2872,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rwxr-xr-x root/root usr/lib32/wine/itss.dll.so
-rwxr-xr-x root/root usr/lib32/wine/joy.cpl.so
-rwxr-xr-x root/root usr/lib32/wine/jscript.dll.so
-rwxr-xr-x root/root usr/lib32/wine/jsproxy.dll.so
-rwxr-xr-x root/root usr/lib32/wine/kernel32.dll.so
-rwxr-xr-x root/root usr/lib32/wine/keyboard.drv16.so
-rwxr-xr-x root/root usr/lib32/wine/krnl386.exe16.so
@ -2938,6 +2946,7 @@ drwxr-xr-x root/root usr/lib32/wine/fakedlls/
-rw-r--r-- root/root usr/lib32/wine/libimm32.def
-rw-r--r-- root/root usr/lib32/wine/libinetcomm.def
-rw-r--r-- root/root usr/lib32/wine/libiphlpapi.def
-rw-r--r-- root/root usr/lib32/wine/libjsproxy.def
-rw-r--r-- root/root usr/lib32/wine/libkernel.def
-rw-r--r-- root/root usr/lib32/wine/libkernel32.def
-rw-r--r-- root/root usr/lib32/wine/libloadperf.def

View File

@ -1,4 +1,4 @@
f672039ddf29838be2ac38832da40d6d wine-1.7.17.tar.bz2
31bec293e8c87ce3696f1e78730f5d4d wine-1.7.19.tar.bz2
582a32cde40c165c20d1b4790abab4cd wine-mono-4.5.2.msi
766bb034172f7f0a97443951a02a0df8 wine_gecko-2.24-x86.msi
1912fd191872c72d5f562283e44e8ab4 wine_gecko-2.24-x86_64.msi

View File

@ -5,7 +5,7 @@
# Depends on: fontconfig-32 freeglut-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32 xorg-libxxf86dga-32 alsa-lib-32 libpng-32 libjpeg-32 prelink gnutls-32
name=wine
version=1.7.17
version=1.7.19
release=1
source=(http://downloads.sourceforge.net/wine/$name-$version.tar.bz2
http://downloads.sourceforge.net/wine/wine_gecko-2.24-x86.msi