Hi,
I made some progress with the glib 2.10 issue in Sardine. I'd now say
that we should go forward with glib 2.10 and simply make pango 1.8.1
work with it. Here is what I did:
- I made a new version of pango 1.8.1 that hopefully works with glib
2.10. I think Tapani has done similar stuff and then took it back
but I didn't investigate. The new branch is here:
https://stage.maemo.org/svn/maemo/projects/haf/branches/pango1.0/pango1.0-1.8.1.sardine/
This is the patch:
*** pango-1.8.1-shared/pango/break.c 2006-10-18 19:29:39.000000000 +0300
--- pango-1.8.1/pango/break.c 2006-10-18 19:38:48.000000000 +0300
***************
*** 776,781 ****
--- 776,787 ----
break;
default:
+ /* Try to cope gracefully with unknown break types.
+ This makes old versions of Pango work with glib 2.10.
+ */
+ if (!IN_BREAK_TABLE (break_type))
+ break_type = G_UNICODE_BREAK_ALPHABETIC;
+
g_assert (IN_BREAK_TABLE (prev_break_type));
g_assert (IN_BREAK_TABLE (break_type));
break_op = BREAK_OP (prev_break_type, break_type);
- I reverted sardine.packages to include the latest glib 2.10. tag.
- I fixed Xft a bit and made a new release from stage trunk:
https://stage.maemo.org/svn/maemo/projects/haf/tags/xft/2.1.6-1osso12/
This fixed two issues: a missing Build-Dependency on
libfreetype6-dev and the need to recompile because of the bleeding
.la thing.
We had two packages with identical version numbers but differen
contents; compare usr/lib/libXft.la from
http://repository.maemo.org/pool/sardine/main/x/xft/libxft-dev_2.1.6-1osso10_i386.deb
with the same file from
http://repository.maemo.org/pool/maemo2.0/free/x/xft/libxft-dev_2.1.6-1osso10_i386.deb
Arghh! This whole .la issue seems to show that we operate slightly
beyond the limits of our competencies... :-/
Now the packages compile in the hafbuildbot, but I haven't really
tested what hapens with them on the device etc.
I leave herring to you, Carlos, should there be similar issues in
it... ;)
Sounds great, Marius. I'll try this out on the device.
Herring is still in preparation ;-). I believe it will not be affected
since it never had the recent glib.
_______________________________________________
maemo-developers mailing list
[email protected]
https://maemo.org/mailman/listinfo/maemo-developers
