Re: travails of the pixman upgrade [Was: Is pango still broken? (vim-gtk2 won't build)]

[Robert Elz <kre%munnari.OZ.AU@localhost>]

I have found a patch to x11/gtk2 (included below) that seems to work
around the problem.   Ugly for sure, but I can't see how it should cause
anyone any problems.

And definitely *work around* - not fix - someone who understands what's
happening still really needs to figure out why it happens the way it does,
and from that, come up with a clean fix.

In any case, I discovered that explicitly sticking -lpixman-1 on the
cc line in gtk2's configure script when it tests for pango causes cc
to find the "right" (new, or pkgsrc) version of libpixman-1 and that
test then passes successfully.

After that gtk2 builds OK (whether the -lpixman I added gets used for
any more than the configure test I have no idea, nor do I much care,
it worked!)

That gtk2 (and the cairo. pango, and pixman that it references) then
managed to successfully build editors/vim-gtk2 (the original subject of
this thread) as well as x11/devipspie time/gdeskcal graphics/xzgv and
print/epdfview - all packages that had failed because there was no gtk2
available to link them against.

You might note that those were not quite a random selection of packages
that were revbumped because of the pango update - I picked ones I thought
were fairly small (quick to build) so I could report that everything looked
to be working in this message, without delaying it too long - I'll be
building all the others (that I need) - xulrunner, seamonkey xfce4 
thunderbird sylpheed eog (etc) in the near future, but they'll take
hours (if not days) to complete...

In any case, the patch is below for anyone who cares to use it (if you're
updating pkgsrc you can probably forget the distinfo change, it won't be
correct after the patch is checked in and out again anyway).  The patch adds
one stanza to patches/patch-af - the patch for configure.  That stanza adds
one line to configure (in addition to what it already added), which adds an
explicit reference to -lpixman-1 to PANGO_LIBS (before the existing libraries).
That's all I needed to do to work around this problem.

No revbump should be needed - anyone who could build gtk2 before this
patch is added should be unaffected by it.  Anyone this patch changes
anything for would have been unable to build gtk2 (easily anyway).

kre

Index: distinfo
===================================================================
RCS file: /cvsroot/NetBSD/pkgsrc/x11/gtk2/distinfo,v
retrieving revision 1.129
diff -u -r1.129 distinfo
--- distinfo    13 Jun 2010 22:45:39 -0000      1.129
+++ distinfo    20 Sep 2010 04:05:13 -0000
@@ -5,5 +5,5 @@
 Size (gtk+-2.20.1.tar.bz2) = 19089076 bytes
 SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
-SHA1 (patch-af) = eb3eb3033d7fb3b8fba92a965072786da2f18e19
+SHA1 (patch-af) = d3c3cdee79d396c8f706d4b6b038078bd17bf08d
 SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/NetBSD/pkgsrc/x11/gtk2/patches/patch-af,v
retrieving revision 1.18
diff -u -r1.18 patch-af
--- patches/patch-af    13 Jun 2010 22:45:39 -0000      1.18
+++ patches/patch-af    20 Sep 2010 04:05:03 -0000
@@ -1,8 +1,8 @@
 $NetBSD: patch-af,v 1.18 2010/06/13 22:45:39 wiz Exp $
 
 --- configure.orig     2010-05-02 23:55:05.000000000 +0000
-+++ configure
-@@ -21748,14 +21748,14 @@ $as_echo "$as_me: WARNING: *** JPEG load
++++ configure  2010-09-20 03:59:40.000000000 +0000
+@@ -21748,14 +21748,14 @@
  fi
  
    if test x$with_libpng != xno && test -z "$LIBPNG"; then
@@ -22,7 +22,7 @@
      else
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-@@ -23098,7 +23098,7 @@ _ACEOF
+@@ -23098,7 +23098,7 @@
  if ac_fn_c_try_link "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
@@ -31,3 +31,11 @@
  else
    LIBS="$ac_xsave_LIBS -R $x_libraries"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -24290,6 +24290,7 @@
+ if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
+         PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
+         PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
++      PANGO_LIBS="-lpixman-1 ${PANGO_LIBS}"
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS 
$PANGO_LIBS" >&5
+ $as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; }