Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21222
Modified Files: libopenraw1-shlibs.info libopenraw1-shlibs.patch Log Message: lots of dep fixes (including libjpeg9...thanks jhowarth!) Index: libopenraw1-shlibs.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/libopenraw1-shlibs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- libopenraw1-shlibs.patch 19 Apr 2013 13:27:58 -0000 1.3 +++ libopenraw1-shlibs.patch 28 Jul 2013 18:38:02 -0000 1.4 @@ -18,6 +18,27 @@ +diff -Nurd -x'*~' libopenraw-0.0.9.orig/lib/jfifcontainer.cpp libopenraw-0.0.9/lib/jfifcontainer.cpp +--- libopenraw-0.0.9.orig/lib/jfifcontainer.cpp 2013-07-28 12:13:49.000000000 -0400 ++++ libopenraw-0.0.9/lib/jfifcontainer.cpp 2013-07-28 12:15:56.000000000 -0400 +@@ -145,7 +145,7 @@ + { + int ret = 0; + if (::setjmp(m_jpegjmp) == 0) { +- ret = JPEG::jpeg_read_header(&m_cinfo, TRUE); ++ ret = JPEG::jpeg_read_header(&m_cinfo, JPEG::TRUE); + //Trace(DEBUG1) << "jpeg_read_header " << ret << "\n"; + + JPEG::jpeg_calc_output_dimensions(&m_cinfo); +@@ -181,7 +181,7 @@ + src->pub.next_input_byte = NULL; + src->pub.bytes_in_buffer = 0; + } +- return TRUE; ++ return JPEG::TRUE; + } + + diff -Nurd -x'*~' libopenraw-0.0.9.orig/test/Makefile.in libopenraw-0.0.9/test/Makefile.in --- libopenraw-0.0.9.orig/test/Makefile.in 2011-11-13 16:04:00.000000000 -0500 +++ libopenraw-0.0.9/test/Makefile.in 2012-01-27 14:45:26.000000000 -0500 Index: libopenraw1-shlibs.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/libopenraw1-shlibs.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- libopenraw1-shlibs.info 19 Apr 2013 13:27:58 -0000 1.4 +++ libopenraw1-shlibs.info 28 Jul 2013 18:38:02 -0000 1.5 @@ -1,49 +1,51 @@ Package: libopenraw1-shlibs Version: 0.0.9 -Revision: 2 +Revision: 3 Source: http://libopenraw.freedesktop.org/download/libopenraw-%v.tar.bz2 Source-MD5: 3611d8aea870d25314665ef53093288e BuildDepends: << - boost1.46.1.cmake, + boost1.52.0.cmake, fink-package-precedence, glib2-dev (>= 2.22.0-1), gtk+2-dev (>= 2.18.0-1), - libiconv-dev, - libjpeg8, - libxml2 (>= 2.8.0-1), + libjpeg9, pkgconfig (>= 0.23) << Depends: << glib2-shlibs (>= 2.22.0-1), gtk+2-shlibs (>= 2.18.0-1), - libjpeg8-shlibs + libjpeg9-shlibs << GCC: 4.0 PatchFile: %n.patch -PatchFile-MD5: 12ffde2a8b58130f6639cd604b8586e1 +PatchFile-MD5: 166c90971608653bd7e757803c926c0b PatchScript: << %{default_script} find . -name Makefile.in | xargs perl -pi -e 's/-L\S+//g' find . -name Makefile.in | xargs perl -pi -e 's/-static//g' perl -pi -e 's/-version-info/-no-undefined -version-info/' */Makefile.in + + # curl only used for test-suite, and does network access + perl -pi -e 's/libcurl/libcurl >= 99999.FORCE.NONDETECT/' configure << ConfigureParams: --disable-static --enable-dependency-tracking --with-boost=%p PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH" CompileScript: << ./configure %c - make V=1 -# make + make fink-package-precedence --prohibit-bdep libopenraw1-dev . << InfoTest: << + TestDepends: << + libiconv-dev, + libxml2 (>= 2.9.1-1) + << TestScript: << make check V=1 || exit 2 fink-package-precedence --prohibit-bdep libopenraw1-dev . << << -#InfoTest: TestScript: make check || exit 2 InstallScript: << - make install DESTDIR=%d V=1 -# make install DESTDIR=%d + make install DESTDIR=%d << DocFiles: AUTHORS COPYING* ChangeLog NEWS README TODO Shlibs: << ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs