Volker Braun wrote:
The issue is that libpng was updated, not libm4ri

There is still something wonky because the two libpng versions ought to
be compatible. There is something wrong in how m4ri links to libpng on
OSX, causing it to depend on the version patchlevel.

On Tuesday, April 29, 2014 4:47:37 PM UTC+1, kcrisman wrote:

    By the way, it's really annoying that the "Merged in:" field is no
    longer used.


Not needed:

$ git log --oneline  build/pkgs/libpng
b42c581 Update libpng to version 1.2.51.
f570a62 Fixed patching of libpng.
de6e2ee Patching libpng to allow compilation of libfreetype-2.5.2
19382e1 Add missing tarballs, use VERSION in tarball path.
8a79b12 Store actual tarball name in package metadata.
...

Or look at:

http://git.sagemath.org/sage.git/log/build/pkgs/libpng?h=develop&id=9d7c869f4040ede16f1c8f2079508a78d9dfa247

(Navigating in the tree to build/pkgs/, then clicking "log" next to "libpng".)

But while from there you can figure out which release the branch / commit was /based on/, you can't immediately tell into which release it finally got merged.


$ git trac find b42c581
Commit has been merged by the release manager into your current branch.
commit e2ff979af93ea5f118e46621768efd923deaf2e5
Merge: bf56254 b42c581
Author: Release Manager <rele...@sagemath.org>
Date:   Mon Apr 14 00:00:20 2014 +0200

     Trac #16099: Update libpng to 1.2.51
     Straightforward update.
     Works on Cygwin64.
     Use tarball at:
     *
http://boxen.math.washington.edu/home/jpflori/upstream/libpng-1.2.51.t
     ar.gz
     URL: http://trac.sagemath.org/16099
     Reported by: jpflori
     Ticket author(s): Jean-Pierre Flori
     Reviewer(s): Volker Braun



But that's certainly not the same as having the (IMHO useful) "Merged:" field filled.

Similar for the changelog entries in SPKG.txt files; they provide[d] different (namely usually higher-level), and easier to access information than commit logs (and diffs) do.


-leif

--
() The ASCII Ribbon Campaign
/\   Help Cure HTML E-Mail

--
You received this message because you are subscribed to the Google Groups 
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.

Reply via email to