Merge branch '3.2' into 3.3

This commit is contained in:
Juergen Daubert 2017-01-08 14:26:00 +01:00
commit 12edb8db48
16 changed files with 721 additions and 491 deletions

View File

@ -32,71 +32,71 @@ lrwxrwxrwx root/root usr/lib/libgphoto2.so -> libgphoto2.so.6.0.0
lrwxrwxrwx root/root usr/lib/libgphoto2.so.6 -> libgphoto2.so.6.0.0
-rwxr-xr-x root/root usr/lib/libgphoto2.so.6.0.0
drwxr-xr-x root/root usr/lib/libgphoto2/
drwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/adc65.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/agfa_cl20.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/aox.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ax203.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/barbie.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/canon.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/casio_qv.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/clicksmart310.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/digigr8.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/digita.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/dimagev.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/dimera3500.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/directory.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/enigma13.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/fuji.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/gsmart300.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/hp215.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/iclick.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jamcam.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jd11.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jl2005a.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jl2005c.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc120.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc210.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc240.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc3200.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_ez200.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/konica.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/konica_qm150.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/largan.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/lg_gsm.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/mars.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/mustek.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_coolshot.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_dc1000.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_dc1580.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_l859.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pccam300.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pccam600.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pentax.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc320.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc640.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc700.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ptp2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ricoh.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ricoh_g3.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/samsung.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sierra.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sipix_blink2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sipix_web2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/smal.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sonix.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sony_dscf1.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sony_dscf55.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/soundvision.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/spca50x.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sq905.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/st2205.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/stv0674.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/stv0680.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sx330z.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/topfield.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/toshiba_pdrm11.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/tp6801.so
drwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/adc65.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/agfa_cl20.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/aox.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/ax203.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/barbie.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/canon.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/casio_qv.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/clicksmart310.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/digigr8.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/digita.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/dimagev.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/dimera3500.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/directory.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/enigma13.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/fuji.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/gsmart300.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/hp215.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/iclick.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/jamcam.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/jd11.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/jl2005a.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/jl2005c.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/kodak_dc120.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/kodak_dc210.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/kodak_dc240.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/kodak_dc3200.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/kodak_ez200.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/konica.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/konica_qm150.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/largan.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/lg_gsm.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/mars.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/mustek.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/panasonic_coolshot.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/panasonic_dc1000.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/panasonic_dc1580.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/panasonic_l859.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/pccam300.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/pccam600.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/pentax.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/polaroid_pdc320.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/polaroid_pdc640.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/polaroid_pdc700.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/ptp2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/ricoh.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/ricoh_g3.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/samsung.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/sierra.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/sipix_blink2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/sipix_web2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/smal.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/sonix.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/sony_dscf1.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/sony_dscf55.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/soundvision.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/spca50x.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/sq905.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/st2205.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/stv0674.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/stv0680.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/sx330z.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/topfield.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/toshiba_pdrm11.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.12/tp6801.so
-rwxr-xr-x root/root usr/lib/libgphoto2/print-camera-list
-rwxr-xr-x root/root usr/lib/libgphoto2_port.la
lrwxrwxrwx root/root usr/lib/libgphoto2_port.so -> libgphoto2_port.so.12.0.0
@ -116,14 +116,14 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libgphoto2_port.pc
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/libgphoto2/
drwxr-xr-x root/root usr/share/libgphoto2/2.5.11/
drwxr-xr-x root/root usr/share/libgphoto2/2.5.11/konica/
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/english
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/french
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/german
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/japanese
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/korean
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/spanish
drwxr-xr-x root/root usr/share/libgphoto2/2.5.12/
drwxr-xr-x root/root usr/share/libgphoto2/2.5.12/konica/
-rw-r--r-- root/root usr/share/libgphoto2/2.5.12/konica/english
-rw-r--r-- root/root usr/share/libgphoto2/2.5.12/konica/french
-rw-r--r-- root/root usr/share/libgphoto2/2.5.12/konica/german
-rw-r--r-- root/root usr/share/libgphoto2/2.5.12/konica/japanese
-rw-r--r-- root/root usr/share/libgphoto2/2.5.12/konica/korean
-rw-r--r-- root/root usr/share/libgphoto2/2.5.12/konica/spanish
drwxr-xr-x root/root usr/share/libgphoto2_port/
drwxr-xr-x root/root usr/share/libgphoto2_port/0.12.0/
drwxr-xr-x root/root usr/share/libgphoto2_port/0.12.0/vcamera/

View File

@ -1 +1 @@
2426511143e6f2fae4f3744e91acfbc3 libgphoto2-2.5.11.tar.bz2
a5999acc204c31515a6ec8e517d2cd91 libgphoto2-2.5.12.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: libtool libusb-compat libjpeg-turbo libexif
name=libgphoto2
version=2.5.11
version=2.5.12
release=1
source=(http://downloads.sourceforge.net/project/gphoto/libgphoto/$version/$name-$version.tar.bz2)

View File

@ -5,16 +5,17 @@
name=mupdf
version=1.10a
release=1
release=2
source=(http://mupdf.com/downloads/$name-$version-source.tar.gz)
build() {
cd $name-$version-source
rm -r thirdparty/{freetype*,jpeg*,zlib,curl}
make build=release
make XCFLAGS="-fpic" build=release
make prefix=$PKG/usr mandir=$PKG/usr/share/man install
ln -s mupdf-x11-curl $PKG/usr/bin/mupdf
rm -r $PKG/usr/share/doc
}

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
9e00fa0df8f5ca5c5f5975b40e0ed354 scons-2.5.0.tar.gz
aaaf09e1351a598f98d17b0cf1103e7a scons-2.5.1.tar.gz

View File

@ -5,12 +5,13 @@
# Depends on: python
name=scons
version=2.5.0
version=2.5.1
release=1
source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
build() {
cd $name-$version
/usr/bin/python setup.py install --prefix=/usr --root=$PKG
/usr/bin/python setup.py build
/usr/bin/python setup.py install --root=$PKG --optimize=1
}

View File

@ -1 +1 @@
2e4efe57ff28cb3202a112e90f0c2889 serf-1.3.8.tar.bz2
370a6340ff20366ab088012cd13f2b57 serf-1.3.9.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: apr scons
name=serf
version=1.3.8
version=1.3.9
release=1
source=(https://archive.apache.org/dist/$name/$name-$version.tar.bz2)
@ -20,4 +20,7 @@ build() {
scons PREFIX=/usr LIBDIR=/usr/lib
scons install --install-sandbox=$PKG
# serf-1.3.9 do not install world writable files
chmod -cR go-w $PKG/usr/include/serf-1
}

View File

@ -1 +1 @@
f02c51136a98bf211a9e27081294ac6d sqlite-autoconf-3160100.tar.gz
5a153ef1fd2fa5845ada74deabc68e32 sqlite-autoconf-3160200.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: ncurses, readline
name=sqlite3
version=3.16.1
version=3.16.2
release=1
_version=$(printf "%i%.2i%.2i%.2i" ${version//./ })

View File

@ -1 +1 @@
29121a038f87641055a8183f49e9739f subversion-1.9.4.tar.bz2
9fcbae352a5efe73d46a88c97c6bba14 subversion-1.9.5.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: apr serf expat sqlite3
name=subversion
version=1.9.4
version=1.9.5
release=1
source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2)

View File

@ -2,3 +2,4 @@
b0760cf51527b70435c3e4d0361a129a wine-mono-4.6.4.msi
5ebc4ec71c92b3db3d84b334a1db385d wine_gecko-2.47-x86.msi
d93ac0d2e6aceafe9113a9918916df45 wine_gecko-2.47-x86_64.msi
c14769c348a31678f30965f38e5e5a95 winhlp32-macro-flex-2.6.3-flex.patch

View File

@ -6,17 +6,22 @@
name=wine
version=2.0-rc3
release=1
release=2
source=(http://dl.winehq.org/wine/source/2.0/$name-$version.tar.bz2
http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86.msi
http://dl.winehq.org/wine/wine-gecko/2.47/wine_gecko-2.47-x86_64.msi
http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi)
http://dl.winehq.org/wine/wine-mono/4.6.4/wine-mono-4.6.4.msi
winhlp32-macro-flex-2.6.3-flex.patch)
build() {
install -d wine32 wine64
export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0"
# undefined reference yywrap in winhlp32/macro.lex.yy.c
# when building with flex-2.6.3
patch -d $name-$version -p1 -i $SRC/winhlp32-macro-flex-2.6.3-flex.patch
cd wine64
../$name-$version/configure \

View File

@ -0,0 +1,25 @@
https://bugs.winehq.org/show_bug.cgi?id=42132
Bug 42132 - undefined reference yywrap in winhlp32/macro.lex.yy.c when building with flex-2.6.3
$ git diff
diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l
index 8f6945ca98..ff8a4832d3 100644
--- a/programs/winhlp32/macro.lex.l
+++ b/programs/winhlp32/macro.lex.l
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
%}
-%option noinput nounput never-interactive 8bit
+%option noinput nounput noyywrap never-interactive 8bit
%x quote
%{
#include "config.h"
@@ -367,7 +367,3 @@ WINHELP_WINDOW* MACRO_CurrentWindow(void)
{
return lex_data ? lex_data->window : Globals.active_win;
}
-
-#ifndef yywrap
-int yywrap(void) { return 1; }
-#endif