pango: update to version 1.28.3

[dbevans (David B. Evans)]

Attached for your review is a proposed patch to upgrade pango to 1.28.3. GObject introspection is disabled for now since it causes the universal build to break. The problem appears to be due to improper handling of arch flags in the giscanner python tool provided by gobject-introspection. Introspection works fine in a non-universal build.

In addition to being the latest version, it also solves the problem stated in #20924.

Please advise if this is acceptable or if further changes need to be made.

[dbevans (David B. Evans)]

Proposed patch for Portfile

[dbevans (David B. Evans)]

Also attached is the log file for a universal build with introspection enabled. Platform is 10.6.4 x86_64.

[dbevans (David B. Evans)]

Debug log for universal build with introspection enabled

[sappharad@…]

The universal variant isn't working for me, but neither are your previous patches that are supposedly working for others.

--->  Staging pango into destroot
Error: Target org.macports.destroot returned: /opt/local/lib/libpangocairo-1.0.la differs in /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_x11_pango/work/destroot-i386 and /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_x11_pango/work/destroot-x86_64 and cannot be merged

If you'd like the log I can post it, but I hope I'm missing something simple? I did a port -f uninstall installed yesterday and started reinstalling all of my packages so it should be 'fresh'.

[sappharad@…]

Cc Me!

[sappharad@…]

I probably should have mentioned that +quartz +no_x11 does work for me, It just fails when I add +universal. I'm running 10.6.4.

[jmroot (Joshua Root)]

Differing .la files are usually caused by trying to build universal without all dependencies being universal.

[sappharad@…]

I'm going to post my log then, because all of my packages should be universal. I just did 'port -f uninstall installed' again, then cleared out the Portfile for pango, ran selfupdate so it would grab a new one, then re-applied devans' latest patch. After running 'port install pango +universal +no_x11 +quartz' and waiting about 30 minutes for all of the dependencies to rebuild, it took me all the way back to the same error. I had built things non-universal at one point, but since I've cleared everything out I'm not expecting this problem. Am I wrong to assume that forcing an uninstall installed is supposed to clear everything old away?

[sappharad@…]

Log where universal, no_x11, quartz variant fails from a completely empty install of port.

[ryandesign (Ryan Carsten Schmidt)]

Could you also attach the two libpangocairo-1.0.la files, from the two destroot directories, so we can see how they differ?

[asahiro.g@…]

Cc Me!

[sappharad@…]

My libpangocairo file, i386 edition

[sappharad@…]

My libpangocairofile, x64 edition

[cdavis@…]

From looking at your .la files, it looks like the only difference is that the 32-bit one is linked against Cocoa and CoreFoundation and the 64-bit one isn't. I wonder why that would be.

You could just modify the x86-64 .la to match the i386 one. Then it installs just fine. But of course, that's not really acceptable as a long-term solution. Maybe somebody should bring this up on the Pango mailing list or on GNOME bugzilla?

[sappharad@…]

I don't think I can just modify the .la files to match because when I run port install again it just goes and replaces them with new ones. (Not to mention the file already exists errors I get because it bailed partway. I need to clean before trying again, and that wipes them away. ) Is there an opportunity to replace the file that I'm overlooking?

[cdavis@…]

Replying to sappharad@…:

I don't think I can just modify the .la files to match because when I run port install again it just goes and replaces them with new ones. (Not to mention the file already exists errors I get because it bailed partway. I need to clean before trying again, and that wipes them away. ) Is there an opportunity to replace the file that I'm overlooking?

Yeah. All you have to do is:

port build pango

as root (or whoever owns the MacPorts files on your system), and then you can modify the .la file in-tree before finishing the install.

[sappharad@…]

Replying to cdavis@…:

Replying to sappharad@…:

I don't think I can just modify the .la files to match because when I run port install again it just goes and replaces them with new ones. (Not to mention the file already exists errors I get because it bailed partway. I need to clean before trying again, and that wipes them away. ) Is there an opportunity to replace the file that I'm overlooking?

Yeah. All you have to do is:

port build pango

as root (or whoever owns the MacPorts files on your system), and then you can modify the .la file in-tree before finishing the install.

For whatever reason, that doesn't work. I did a "cp /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_x11_pango/work/pango-1.28.3-i386/pango/libpangocairo-1.0.la /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_x11_pango/work/pango-1.28.3-x86_64/pango/libpangocairo-1.0.la" after building to copy the i386 version over the x64 version, but then when I execute install, I still get an error that they differ. How strange.

[elelay (Eric Le Lay)]

+1 on upgrading Pango ! it would also solve #21656.

[elelay (Eric Le Lay)]

Cc Me!

[jmroot (Joshua Root)]

r72474