[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1e4a7af5c4c264381a5131f42c2c2c4a52960476)

Treeve Jelbert treeve at scarlet.be
Sun Jun 25 13:07:59 EDT 2006


On Sunday 25 June 2006 18:42, Arwed von Merkatz wrote:
> On Sun, Jun 25, 2006 at 11:23:01AM -0500, Treeve Jelbert wrote:
> [...]
>
> > commit 748057d650b89af2fd9a5c1935104d9b001b8c64
> > Author: Treeve Jelbert <treeve at scarlet.be>
> > Commit: Treeve Jelbert <treeve at scarlet.be>
> >
> >     libexif - fix pkgconfig file
>
> [...]
>
> > diff --git a/libs/libexif/HISTORY b/libs/libexif/HISTORY
> > index 46aef70..336a5b5 100644
> > --- a/libs/libexif/HISTORY
> > +++ b/libs/libexif/HISTORY
> > @@ -1,3 +1,6 @@
> > +2006-06-25 Treeve Jelbert <treeve01 at pi.be>
> > +	* PRE_BUILD, pkg.diff: fix pkgconfig file, as it broke gwenview
> > +
> >  2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
> >  	* DETAILS: (automated) Add KEYWORDS
> >
> > diff --git a/libs/libexif/PRE_BUILD b/libs/libexif/PRE_BUILD
> > index 99b81b5..efa596b 100755
> > --- a/libs/libexif/PRE_BUILD
> > +++ b/libs/libexif/PRE_BUILD
> > @@ -6,4 +6,5 @@ if [ "$LIBEXIF_CVS" == "y" ]; then
> >  elif ! spell_ok doxygen; then
> >    sedit "s/install-apidocs install-apidocs-internals//"  doc/Makefile.in
> >  fi  &&
> > +patch -p1 <$SCRIPT_DIRECTORY/pkg.diff             &&
> >  patch -p0 <$SCRIPT_DIRECTORY/exif-utils.h.patch
> > diff --git a/libs/libexif/pkg.diff b/libs/libexif/pkg.diff
> > new file mode 100644
> > index 0000000..c2c747a
> > --- /dev/null
> > +++ b/libs/libexif/pkg.diff
> > @@ -0,0 +1,9 @@
> > +diff -uNr libexif-0.6.13/libexif/libexif.pc.in
> > libexif-0.6.13.orig/libexif/libexif.pc.in +---
> > libexif-0.6.13/libexif/libexif.pc.in	2005-03-17 16:58:18.000000000 +0100
> > ++++ libexif-0.6.13.orig/libexif/libexif.pc.in	2006-06-25
> > 15:12:26.000000000 +0200 +@@ -8,4 +8,4 @@
> > + Requires:
> > + Version: @VERSION@
> > + Libs: -L${libdir} -lexif -lm
> > +-Cflags: -I${includedir}
> > ++Cflags: -I${includedir}/libexif
>
> This change is wrong, the correct CFLAGS for libexif are
> -I${includedir}, since the correct way to use it is to #include
> <libexif/whatever.h>, every spell depending on it on my system uses it
> like that.


I did think of that but it means passing LIBEXIF_CFLAGS to make, not CFLAGS.

I built libgphoto2 against the modified libexif, but I will revert the change 
and patch the other spell

-- 
Regards, Treeve
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.ibiblio.org/pipermail/sm-commit/attachments/20060625/e56a787f/attachment.bin 


More information about the SM-Commit mailing list