On 12/12/13 11:07, Michael Schwendt wrote: > On Thu, 12 Dec 2013 06:34:54 +0200, Niko Sauer wrote: > >>>>> Which line have you deleted? There's a bug in the patch, because HAVE_LCMS >>>>> is undefined, and that leads to some files (such as exif_common.c) not >>>>> including lcms2.h and breaking compilation. >>>>> >>>>> >>>> It is line 296 which reads as follows: >>>> >>>> 296 AC_DEFINE(HAVE_LCMS, 1, [define to enable use of color profiles >>>> with lcms]) >>> >>> Yes, that line must be present, or else Geeqie does not compile. Why? >>> See e.g. beginning of src/exif_common.c, where both HAVE_LCMS and HAVE_LCMS2 >>> must be defined for LCMS2 headers to be included. >>> >>> #ifdef HAVE_LCMS >>> /*** color support enabled ***/ >>> >>> #ifdef HAVE_LCMS2 >>> #include <lcms2.h> >>> #else >>> #include <lcms.h> >>> #endif >>> #endif >>> >>> […] >>> >> I'm not sure that I understand your comment. > > Let me try to explain. In the code snippet above, the two conditionals > build a logical AND, so that in order to build with LCMS2, both > HAVE_LCMS and HAVE_LCMS2 must be defined. If HAVE_LCMS were undefined, > the HAVE_LCMS2 condition would not be reached. Then lcms2.h could > not be included, and the source code would not compile. > > exif-common.c: In function ‘exif_build_formatted_ColorProfile’: > exif-common.c:417:2: error: unknown type name ‘cmsUInt8Number’ > cmsUInt8Number profileID[17]; > ^ > exif-common.c:417:17: warning: unused variable ‘profileID’ [-Wunused-variable] > cmsUInt8Number profileID[17]; > ^ > make[1]: *** [exif-common.o] Error 1 > This is quite strange. Are we talking about the same patch? The one I refer to is
https://gitorious.org/geeqie/emikulic-geeqie/commit/1548a68d26046b6aa467e56ca2c8f5444b95a23b.patch If I don't erase that (infernal) line, the compiler looks at lcms.h instead of lcms2.h. If you erase that line, precisely the opposite happens. The type cmsUInt8 is defined in lcms2.h. Perhaps the patch does not cover both lcms1 and lcms2 as claimed. > ------------------------------------------------------------------------------ > Rapidly troubleshoot problems before they affect your business. Most IT > organizations don't have a clear picture of how application performance > affects their revenue. With AppDynamics, you get 100% visibility into your > Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! > http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk > _______________________________________________ > Geeqie-devel mailing list > Geeqie-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/geeqie-devel > ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
