Merge branch '3.1' into 3.2

This commit is contained in:
Matt Housh 2015-08-06 12:15:50 -05:00
commit 39a0ec04d0
6 changed files with 11 additions and 11 deletions

View File

@ -2,8 +2,8 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib32/ drwxr-xr-x root/root usr/lib32/
-rw-r--r-- root/root usr/lib32/libidn.a -rw-r--r-- root/root usr/lib32/libidn.a
-rwxr-xr-x root/root usr/lib32/libidn.la -rwxr-xr-x root/root usr/lib32/libidn.la
lrwxrwxrwx root/root usr/lib32/libidn.so -> libidn.so.11.6.12 lrwxrwxrwx root/root usr/lib32/libidn.so -> libidn.so.11.6.15
lrwxrwxrwx root/root usr/lib32/libidn.so.11 -> libidn.so.11.6.12 lrwxrwxrwx root/root usr/lib32/libidn.so.11 -> libidn.so.11.6.15
-rwxr-xr-x root/root usr/lib32/libidn.so.11.6.12 -rwxr-xr-x root/root usr/lib32/libidn.so.11.6.15
drwxr-xr-x root/root usr/lib32/pkgconfig/ drwxr-xr-x root/root usr/lib32/pkgconfig/
-rw-r--r-- root/root usr/lib32/pkgconfig/libidn.pc -rw-r--r-- root/root usr/lib32/pkgconfig/libidn.pc

View File

@ -1 +1 @@
2b67bb507207af379f9461e1307dc84b libidn-1.29.tar.gz 4dd8356ba577287ea7076bfa1554b534 libidn-1.32.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: libidn # Depends on: libidn
name=libidn-32 name=libidn-32
version=1.29 version=1.32
release=1 release=1
source=(http://ftp.gnu.org/gnu/libidn/libidn-$version.tar.gz) source=(http://ftp.gnu.org/gnu/libidn/libidn-$version.tar.gz)

View File

@ -5,9 +5,9 @@ lrwxrwxrwx root/root usr/lib32/libpng.la -> libpng16.la
lrwxrwxrwx root/root usr/lib32/libpng.so -> libpng16.so lrwxrwxrwx root/root usr/lib32/libpng.so -> libpng16.so
-rw-r--r-- root/root usr/lib32/libpng16.a -rw-r--r-- root/root usr/lib32/libpng16.a
-rwxr-xr-x root/root usr/lib32/libpng16.la -rwxr-xr-x root/root usr/lib32/libpng16.la
lrwxrwxrwx root/root usr/lib32/libpng16.so -> libpng16.so.16.17.0 lrwxrwxrwx root/root usr/lib32/libpng16.so -> libpng16.so.16.18.0
lrwxrwxrwx root/root usr/lib32/libpng16.so.16 -> libpng16.so.16.17.0 lrwxrwxrwx root/root usr/lib32/libpng16.so.16 -> libpng16.so.16.18.0
-rwxr-xr-x root/root usr/lib32/libpng16.so.16.17.0 -rwxr-xr-x root/root usr/lib32/libpng16.so.16.18.0
drwxr-xr-x root/root usr/lib32/pkgconfig/ drwxr-xr-x root/root usr/lib32/pkgconfig/
lrwxrwxrwx root/root usr/lib32/pkgconfig/libpng.pc -> libpng16.pc lrwxrwxrwx root/root usr/lib32/pkgconfig/libpng.pc -> libpng16.pc
-rw-r--r-- root/root usr/lib32/pkgconfig/libpng16.pc -rw-r--r-- root/root usr/lib32/pkgconfig/libpng16.pc

View File

@ -1,2 +1,2 @@
f68d34f10bcc7f43b8c3dce5708e1933 libpng-1.6.17-apng.patch.gz a9c85fe3cf0347ea94356f1e70d07973 libpng-1.6.18-apng.patch.gz
430a9b76b78533235cd4b9b26ce75c7e libpng-1.6.17.tar.xz 6a57c8e0f5469b9c9949a4b43d57b3a1 libpng-1.6.18.tar.xz

View File

@ -4,7 +4,7 @@
# Depends on: zlib-32 libpng # Depends on: zlib-32 libpng
name=libpng-32 name=libpng-32
version=1.6.17 version=1.6.18
release=1 release=1
source=(http://download.sourceforge.net/libpng/libpng-$version.tar.xz source=(http://download.sourceforge.net/libpng/libpng-$version.tar.xz
http://downloads.sourceforge.net/project/libpng-apng/libpng16/$version/libpng-$version-apng.patch.gz) http://downloads.sourceforge.net/project/libpng-apng/libpng16/$version/libpng-$version-apng.patch.gz)