On Sat, Jan 13, 2007, Goswin von Brederlow wrote: > The patch had a minor bug for /etc/pango32. It tested for /etc/pango32 > but then overwrote the reult with /etc/pango anyway. Which is ok as > there seems to be no architecture specific file left in /etc/pango, > only the font aliases.
It's not only that, we don't use pango.modules under Debian anymore, but /usr/lib/pango/1.5.0/module-files.d/*.modules. This is why the Ubuntu patch wont work as is. > I fixed that and also made the patch less conditional. The test for > uname is not needed and actualy breaks stuff. You might want to have > an uname of "i686" for your www-browser so some flash or java plugin > works. But you still want to be able to read pdf links too. 'linux32 > www-browser' would result in acroread being started with uname 'i686' > and then pango fails. On the other hand, doesn't that save a stat() when the kernel is detected to not be 64 bits? This is in the startup of all libpango using apps. > I also added a g_getenv("PANGO32_SYSCONFDIR"); for symetry. > Are you sure the SYSCONFDIR part is still needed? The modules conffile > used to be there iirc but no more. I can't think of a reason why 32bit > and 64bit would need different fonts: No, it's not; the sysconfdir parts of pangohack and of the patch are irrelevant for the current layout of the *pango* package. The Gtk package is not at this level in unstable though. > +#if defined(__linux__) && defined (__i386__) > + if (!access("/usr/lib32/pango", R_OK|X_OK)) > + return "/usr/lib32/pango"; > +#endif > return LIBDIR "/pango"; > #endif > } I don't think this is the place to patch. IMO, we should not touch "libdir", only prepend /usr/lib32/pango/1.5.0/module-files.d to the search path on i386. The biggest question I have is whether we should check the kernel at runtime or not and include this path conditionally; pros for using uname(): might save a stat(); cons: not clear what values the kernel may return. Goswin, as ia32-libs-gtk is supposed to work on ia64, could you tell me whether "defined (__ia64__)" the correct test for this platform? Are there other 64-bits platforms to be supported? Do you intend to conflict with other packages providing pango module files? In the initial bug report, you requested support for /usr/lib64 in the 64-bits pango; first, I don't see an ia32-libs-gtk for 32-bits arches, and second, could you give me a list or arches and "defined()" tests for these arches? -- Loïc Minier <[EMAIL PROTECTED]>