Re: [cvs] dists/10.4/stable/main/finkinfo/graphics libemf.info, 1.4, 1.5 libemf.patch, 1.1, NONE

On 8/16/14, 10:16 AM, Hanspeter Niederstrasser wrote:
> On 8/16/2014 11:27 AM, Alexander Hansen wrote:
>> On 1/13/14, 7:23 AM, Hanspeter Niederstrasser wrote:
>>> Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
>>> In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1622
>>>
>>> Modified Files:
>>> 	libemf.info
>>> Removed Files:
>>> 	libemf.patch
>>> Log Message:
>>> libemf 1.0.7 from 10.7
>>> simplify build and patch no longer needed
>>>
>>> Index: libemf.info
>>> ===================================================================
>>> RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/libemf.info,v
>>> retrieving revision 1.4
>>> retrieving revision 1.5
>>> diff -u -d -r1.4 -r1.5
>>> --- libemf.info	9 Feb 2010 23:23:46 -0000	1.4
>>> +++ libemf.info	13 Jan 2014 15:23:10 -0000	1.5
>>> @@ -1,51 +1,45 @@
>>>     Package: libemf
>>> -Version: 1.0.4
>>> +Version: 1.0.7
>>>     Revision: 1
>>> -GCC: 4.0
>>> -Maintainer: None <[email protected]>
>>> -License: LGPL2+
>>>     Description: ECMA-234 library
>>> +License: LGPL2+
>>> +Maintainer: None <[email protected]>
>>>     Source: mirror:sourceforge:%n/libEMF-%v.tar.gz
>>> -Source-MD5: 23effe03c1b2eeb5229f14e461204198
>>> +Source-MD5: f1011f5cc254aa228be78704fe5f9960
>>>     BuildDependsOnly: true
>>>     Depends: %N-shlibs (= %v-%r)
>>> -BuildDepends: autoconf2.6, automake1.11, libtool2, fink (>= 0.24.12)
>>> -PatchFile: %n.patch
>>> -PatchFile-MD5: b62848824e66dcc0035535051698f349
>>>     ConfigureParams: --disable-dependency-tracking --disable-static
>>> -CompileScript: <<
>>> -  autoreconf -f -i
>>> -  ./configure %c
>>> -  make
>>> -<<
>>> +GCC: 4.0
>>>     InfoTest: TestScript: make check || exit 2
>>>     InstallScript: <<
>>>     make install DESTDIR=%d
>>>     <<
>>>     DocFiles: COPYING AUTHORS ChangeLog README NEWS
>>>     Splitoff: <<
>>> -Package: %N-shlibs
>>> -Files: lib/libEMF.1*.dylib
>>> -Description: Shared libraries for libemf
>>> -Shlibs: %p/lib/libEMF.1.dylib 2.0.0 %n (>= 1.0.2-11)
>>> -DocFiles: COPYING.LIB
>>> -License: LGPL2+
>>> +	Package: %N-shlibs
>>> +	Files: lib/libEMF.1*.dylib
>>> +	Description: Shared libraries for libemf
>>> +	Shlibs: %p/lib/libEMF.1.dylib 2.0.0 %n (>= 1.0.2-11)
>>> +	DocFiles: COPYING.LIB
>>> +	License: LGPL2+
>>>     <<
>>>     Splitoff2: <<
>>> -Package: %N-bin
>>> -Depends: %N-shlibs (= %v-%r)
>>> -Files: bin/*
>>> -Description: Binary utilities for libemf
>>> -DocFiles: COPYING
>>> -License: GPL2+
>>> +	Package: %N-bin
>>> +	Depends: %N-shlibs (= %v-%r)
>>> +	Files: bin/*
>>> +	Description: Binary utilities for libemf
>>> +	DocFiles: COPYING
>>> +	License: GPL2+
>>>     <<
>>> +Homepage: http://libemf.sourceforge.net
>>>     DescPackaging: <<
>>> - Originally packaged by Peter O'Gorman.
>>> +Originally packaged by Peter O'Gorman.
>>>     <<
>>>     DescPort: <<
>>> -  The token for PowerPC machines is __ppc__ not __PPC__
>>> -  Included patch from Fedora to build on x86_64 (and alpha, not that
>>> -  we care). --danielj
>>> +nieder:
>>> +* Versions to 1.0.4 included a patch to use the proper __ppc__ (vs __PPC__)
>>> +token but that's removed from 1.0.7 since PowerPC is no longer supported.
>>> +* Fedora x86_64 patch now included in official tarball.
>>>     <<
>>>     DescDetail: <<
>>>     libEMF is a library for generating Enhanced Metafiles on systems which
>>> @@ -54,4 +48,3 @@
>>>     graphics programs such as Grace or gnuplot. Therefore, it implements a
>>>     very limited subset of the GDI.
>>>     <<
>>> -Homepage: http://libemf.sourceforge.net
>>>
>>> --- libemf.patch DELETED ---
>>>
>>>
>>
>> Ever since this change the package appears to misbuild on 10.6,
>> resulting in the following error for the build of pstoedit:
>>
>> In file included from /sw/include/libEMF/wine/windef.h:16,
>>                     from /sw/include/libEMF/emf.h:27,
>>                     from drvwmf.h:41,
>>                     from drvwmf.cpp:25:
>> /sw/include/libEMF/wine/winnt.h:805: error: ISO C++ prohibits anonymous
>> structs
>> /sw/include/libEMF/wine/winnt.h:871: error: ISO C++ prohibits anonymous
>> structs
>> /sw/include/libEMF/wine/winnt.h:895: error: ISO C++ prohibits anonymous
>> structs
>> make[2]: *** [drvwmf.lo] Error 1
>>
>> I've gotten confirmation that reverting to the 1.0.4 packaging solves
>> this issue.
>
> OK.  This is a x86_64 problem only.  i386 setup had no problem building
> pstoedit.  pstoedit built with llmv32's clang/clang++ compilers (the
> only llvm3x version I have built right now).  Could use that as a
> BDep... I can try to see what changed in libEMF 1.0.4 vs 1.0.7, but I'm
> not sure I can conjure up a fix on the library side.
>
> Hanspeter
>
>

For now, how about I restore 1.0.4 as an additional option?

-- 
Alexander Hansen, Ph.D.
Fink User Liaison
My package updates: http://finkakh.wordpress.com/

------------------------------------------------------------------------------
_______________________________________________
Fink-devel mailing list
[email protected]
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel