Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 763558

Summary: x11-wm/windowmaker-0.95.9-r1: fix cross-compiling, NLS, libs
Product: Gentoo Linux Reporter: David Michael <fedora.dm0>
Component: Current packagesAssignee: Gentoo Gnustep project <gnustep>
Status: RESOLVED FIXED    
Severity: normal CC: ionen, sam
Priority: Normal Keywords: PATCH
Version: unspecified   
Hardware: All   
OS: Linux   
See Also: https://bugs.gentoo.org/show_bug.cgi?id=746017
Whiteboard:
Package list:
Runtime testing required: ---
Attachments: fix.patch

Description David Michael 2021-01-04 17:44:13 UTC
I poked around the WindowMaker package and adjusted some things in the non-stable ebuilds:

First, I added the --with-incs-from= and --with-libs-from= options that are supported in the backported patch.  Emptying these options is required to cross-compile, because their default values point to /usr/include and /usr/lib* which contains incompatible CBUILD files.  (It should make no difference when not cross-compiling because compilers use these paths by default.)

There is no configure option --disable-locale, instead translations are enabled when the LINGUAS variable is not empty.

I didn't see where gettext is required at runtime, but it does call msgfmt during the build, so I moved it to BDEPEND.  It does check for libintl, so I added that to DEPEND+RDEPEND.

It looks like the autotools INSTALL file is not usually in DOCS, so I dropped it.  It broke the live ebuild because it didn't exist there.

It built and installed static libraries unconditionally.  I disabled this since Gentoo seems to be moving away from static-libs, and I am unaware of any users of static WindowMaker libraries.  Also, I think the static libraries were invalid because WindowMaker would have had to depend on static versions of its dependencies, e.g. this is in wrlib.pc:
Libs.private: -lXpm -lpng -ljpeg -lgif -ltiff -lwebp -lMagickWand-7.Q16 -lMagickCore-7.Q16  -lX11  -lXext -lm

Since static libraries are gone, I also dropped the .la files.  They probably could have been dropped anyway since the static libraries were covered by the pkg-config files.
Comment 1 David Michael 2021-01-04 17:46:38 UTC
Created attachment 681046 [details, diff]
fix.patch
Comment 2 Bernard Cafarelli gentoo-dev 2021-01-08 15:08:01 UTC
Thanks for the patch, that looks nice at first glance! I will take a closer look and commit this soon
Comment 3 Bernard Cafarelli gentoo-dev 2021-01-23 09:05:11 UTC
Applied most of it in -9999 and revbump for last version, thanks!

I left out the cat <<EOF for session script, as it triggers repoman warning (and adding quotes to silence it leaves quotes in generated script so not pretty either).
Comment 4 Larry the Git Cow gentoo-dev 2021-01-23 09:29:26 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94965fb1e536dc6203b3cb5e2ec7eee91da6b98

commit d94965fb1e536dc6203b3cb5e2ec7eee91da6b98
Author:     Bernard Cafarelli <voyageur@gentoo.org>
AuthorDate: 2021-01-23 09:06:10 +0000
Commit:     Bernard Cafarelli <voyageur@gentoo.org>
CommitDate: 2021-01-23 09:16:23 +0000

    x11-wm/windowmaker: fix cross-compiling, NLS, static libs
    
    Thanks David Michael <fedora.dm0@gmail.com> for the changes
    
    Closes: https://bugs.gentoo.org/746017
    Closes: https://bugs.gentoo.org/763558
    Package-Manager: Portage-3.0.14, Repoman-3.0.2
    Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>

 x11-wm/windowmaker/windowmaker-0.95.9-r2.ebuild | 118 ++++++++++++++++++++++++
 x11-wm/windowmaker/windowmaker-9999.ebuild      |  66 +++++++------
 2 files changed, 156 insertions(+), 28 deletions(-)