| 1 |
axs 14/01/27 19:20:25 |
| 2 |
|
| 3 |
Added: iscan-2.29.1-png-libs.patch |
| 4 |
iscan-2.26.2-png-libs.patch |
| 5 |
Log: |
| 6 |
fixed build failures against libpng-1.6, bug 486382 |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-gfx/iscan/files/iscan-2.29.1-png-libs.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/iscan/files/iscan-2.29.1-png-libs.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/iscan/files/iscan-2.29.1-png-libs.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: iscan-2.29.1-png-libs.patch |
| 17 |
=================================================================== |
| 18 |
diff -ur iscan-2.29.1/configure.ac iscan-2.29.1.new/configure.ac |
| 19 |
--- iscan-2.29.1/configure.ac 2014-01-27 14:15:28.139043864 -0500 |
| 20 |
+++ iscan-2.29.1.new/configure.ac 2014-01-27 14:17:10.608044736 -0500 |
| 21 |
@@ -279,6 +279,9 @@ |
| 22 |
AC_HELP_STRING([--enable-$1], |
| 23 |
[ensure support for the $3 file format]), |
| 24 |
[if test "x$enable_$1" != xno; then |
| 25 |
+ if test "x$4" != xno; then |
| 26 |
+ PKG_CHECK_MODULES($3,[$4]) |
| 27 |
+ fi |
| 28 |
iff_header="`echo $2 | $as_tr_sh`" |
| 29 |
AC_CHECK_HEADERS([$2]) |
| 30 |
if test `eval echo '$ac_cv_header_'$iff_header` \ |
| 31 |
@@ -289,9 +292,9 @@ |
| 32 |
[AC_CHECK_HEADERS([$2])]) |
| 33 |
]) |
| 34 |
|
| 35 |
-ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG) |
| 36 |
-ISCAN_FILE_FORMAT(png,png.h,PNG) |
| 37 |
-ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF) |
| 38 |
+ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG,no) |
| 39 |
+ISCAN_FILE_FORMAT(png,png.h,PNG,libpng) |
| 40 |
+ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF,no) |
| 41 |
|
| 42 |
|
| 43 |
dnl Support for performance measurements. |
| 44 |
diff -ur iscan-2.29.1/frontend/Makefile.am iscan-2.29.1.new/frontend/Makefile.am |
| 45 |
--- iscan-2.29.1/frontend/Makefile.am 2014-01-27 14:15:28.123043864 -0500 |
| 46 |
+++ iscan-2.29.1.new/frontend/Makefile.am 2014-01-27 14:17:43.628045017 -0500 |
| 47 |
@@ -37,6 +37,7 @@ |
| 48 |
-lltdl \ |
| 49 |
@GTK_LIBS@ \ |
| 50 |
@GDK_IMLIB_LIBS@ \ |
| 51 |
+ @PNG_LIBS@ \ |
| 52 |
$(top_builddir)/non-free/libesmod.so |
| 53 |
iscan_SOURCES = \ |
| 54 |
$(iscan_source_files) |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 media-gfx/iscan/files/iscan-2.26.2-png-libs.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/iscan/files/iscan-2.26.2-png-libs.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: iscan-2.26.2-png-libs.patch |
| 64 |
=================================================================== |
| 65 |
diff -ur iscan-2.26.2/configure.ac iscan-2.26.2.new/configure.ac |
| 66 |
--- iscan-2.26.2/configure.ac 2014-01-27 13:37:26.782024452 -0500 |
| 67 |
+++ iscan-2.26.2.new/configure.ac 2014-01-27 13:36:47.738024120 -0500 |
| 68 |
@@ -274,6 +274,9 @@ |
| 69 |
AC_HELP_STRING([--enable-$1], |
| 70 |
[ensure support for the $3 file format]), |
| 71 |
[if test "x$enable_$1" != xno; then |
| 72 |
+ if test "x$4" != xno; then |
| 73 |
+ PKG_CHECK_MODULES($3,[$4]) |
| 74 |
+ fi |
| 75 |
iff_header="`echo $2 | $as_tr_sh`" |
| 76 |
AC_CHECK_HEADERS([$2]) |
| 77 |
if test `eval echo '$ac_cv_header_'$iff_header` \ |
| 78 |
@@ -284,9 +287,9 @@ |
| 79 |
[AC_CHECK_HEADERS([$2])]) |
| 80 |
]) |
| 81 |
|
| 82 |
-ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG) |
| 83 |
-ISCAN_FILE_FORMAT(png,png.h,PNG) |
| 84 |
-ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF) |
| 85 |
+ISCAN_FILE_FORMAT(jpeg,jpeglib.h,JPEG,no) |
| 86 |
+ISCAN_FILE_FORMAT(png,png.h,PNG,libpng) |
| 87 |
+ISCAN_FILE_FORMAT(tiff,tiffio.h,TIFF,no) |
| 88 |
|
| 89 |
|
| 90 |
dnl Support for performance measurements. |
| 91 |
diff -ur iscan-2.26.2/frontend/Makefile.am iscan-2.26.2.new/frontend/Makefile.am |
| 92 |
--- iscan-2.26.2/frontend/Makefile.am 2014-01-27 13:31:09.488021241 -0500 |
| 93 |
+++ iscan-2.26.2.new/frontend/Makefile.am 2014-01-27 13:37:50.065024650 -0500 |
| 94 |
@@ -37,6 +37,7 @@ |
| 95 |
-lltdl \ |
| 96 |
@GTK_LIBS@ \ |
| 97 |
@GDK_IMLIB_LIBS@ \ |
| 98 |
+ @PNG_LIBS@ \ |
| 99 |
$(top_builddir)/non-free/libesmod.so |
| 100 |
iscan_SOURCES = \ |
| 101 |
$(iscan_source_files) |
Archives