diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:41:31 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-19 11:41:31 -0300 |
commit | 8a79dffbc1b5f55765698c420217bb06f67bb684 (patch) | |
tree | 8f8b0ee50fcd68c6572d7e7f8ce26150ac1dd430 /extra/fbida/libpng-1.4.patch | |
parent | 35d3377392b5d0678453096f87df70faf87f72c6 (diff) | |
parent | 5457eacc747fc3f91e10a1f452230b1feac39eff (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5-transitional/PKGBUILD
community/camlp5/PKGBUILD
community/compizconfig-backend-kconfig/PKGBUILD
community/libtrash/PKGBUILD
community/mediastreamer/PKGBUILD
community/python-pycurl/PKGBUILD
extra/alpine/PKGBUILD
extra/anjuta-extras/PKGBUILD
extra/aufs2-util/PKGBUILD
extra/bitlbee/PKGBUILD
extra/cups/PKGBUILD
extra/dotconf/PKGBUILD
extra/fbida/PKGBUILD
extra/fvwm-devel/PKGBUILD
extra/libdmtx/PKGBUILD
extra/libindi/PKGBUILD
extra/mousepad/PKGBUILD
extra/pysmbc/PKGBUILD
extra/rcs/PKGBUILD
extra/xfprint/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/cindexer-clang-path.patch
multilib/lib32-llvm/clang-plugin-loader-registry.patch
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/clang-toolchains-gcc-versions.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
testing/perl/ChangeLog
testing/perl/PKGBUILD
Diffstat (limited to 'extra/fbida/libpng-1.4.patch')
-rw-r--r-- | extra/fbida/libpng-1.4.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/extra/fbida/libpng-1.4.patch b/extra/fbida/libpng-1.4.patch deleted file mode 100644 index f8a80d4b2..000000000 --- a/extra/fbida/libpng-1.4.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur fbida-2.07-orig/rd/read-png.c fbida-2.07/rd/read-png.c ---- fbida-2.07-orig/rd/read-png.c 2010-01-18 00:02:02.000000000 -0500 -+++ fbida-2.07/rd/read-png.c 2010-01-18 00:06:09.000000000 -0500 -@@ -69,8 +69,11 @@ - if (h->color_type == PNG_COLOR_TYPE_PALETTE) - png_set_palette_to_rgb(h->png); - if (h->color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) -- png_set_gray_1_2_4_to_8(h->png); -- -+#if PNG_LIBPNG_VER < 10400 -+ png_set_gray_1_2_4_to_8(h->png); -+#else -+ png_set_expand_gray_1_2_4_to_8(h->png); -+#endif - if (png_get_bKGD(h->png, h->info, &file_bg)) { - png_set_background(h->png,file_bg,PNG_BACKGROUND_GAMMA_FILE,1,1.0); - } else { |