Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 741164 - =gui-wm/hikari-2.2.1 version bump
Summary: =gui-wm/hikari-2.2.1 version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Aisha Tammy
URL:
Whiteboard:
Keywords: EBUILD, PATCH, PullRequest
Depends on:
Blocks:
 
Reported: 2020-09-08 09:48 UTC by Gabriel
Modified: 2020-10-16 06:04 UTC (History)
3 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
hikari 2.2.0 ebuild (hikari-2.2.0.ebuild,1.48 KB, text/plain)
2020-09-08 09:48 UTC, Gabriel
Details
Makefile patch (hikari-2.2.0-gnu-make.patch,10.27 KB, patch)
2020-09-08 09:49 UTC, Gabriel
Details | Diff
hikari 2.2.0 ebuild (hikari-2.2.0.ebuild,1.16 KB, text/plain)
2020-09-08 09:55 UTC, Gabriel
Details
Proposed ebuild using BSD make (hikari-2.2.1.ebuild,1.09 KB, text/plain)
2020-09-29 17:02 UTC, Gabriel
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Gabriel 2020-09-08 09:48:47 UTC
Created attachment 659130 [details]
hikari 2.2.0 ebuild

Suggested ebuild attached
Comment 1 Gabriel 2020-09-08 09:49:17 UTC
Created attachment 659132 [details, diff]
Makefile patch

Suggested Makefile patch attached
Comment 2 Gabriel 2020-09-08 09:55:33 UTC
Created attachment 659134 [details]
hikari 2.2.0 ebuild

Previous ebuild contains some hackery, apologies.
Comment 3 Jonas Stein gentoo-dev 2020-09-08 17:37:16 UTC
Thank you.

Whoever wrote it: What does 
# keep this as others OS's are using this as reference
mean here? Please improve the comment.
Comment 4 Arnaud Vallette d'Osia 2020-09-12 18:03:30 UTC
Thank you for the ebuild
tried to build with USE="-X", got :

compilation terminated.
make: *** [Makefile:188: renderer.o] Error 1
make: *** Waiting for unfinished jobs....
src/server.c:38:10: fatal error: wlr/xwayland.h: No such file or directory
   38 | #include <wlr/xwayland.h>

I can provide environment, build.log and all if needed.
Comment 5 Aisha Tammy 2020-09-12 18:59:04 UTC
(In reply to Arnaud Vallette d'Osia from comment #4)
> Thank you for the ebuild
> tried to build with USE="-X", got :
> 
> compilation terminated.
> make: *** [Makefile:188: renderer.o] Error 1
> make: *** Waiting for unfinished jobs....
> src/server.c:38:10: fatal error: wlr/xwayland.h: No such file or directory
>    38 | #include <wlr/xwayland.h>
> 
> I can provide environment, build.log and all if needed.

Being fixed here-
https://github.com/gentoo/gentoo/pull/17262
Comment 6 Aisha Tammy 2020-09-12 18:59:35 UTC
(In reply to Jonas Stein from comment #3)
> Thank you.
> 
> Whoever wrote it: What does 
> # keep this as others OS's are using this as reference
> mean here? Please improve the comment.

@jstein
am removing that patch in next bump
will no longer be maintained here
Comment 7 Gabriel 2020-09-13 08:40:02 UTC
(In reply to Aisha Tammy from comment #6)
> am removing that patch in next bump

This makes me happy :) Thanks, Aisha, it will be much easier to test hikari patches without the GNU patch!
Comment 8 Gabriel 2020-09-29 17:02:33 UTC
Created attachment 663184 [details]
Proposed ebuild using BSD make

Updated bug to bump to 2.2.1, which has some minor bugfixes, especially relevant for multiple displays.
I am also attaching a proposed ebuild, and took the liberty to modify it to use BSD make, thus ditching the patch to make it GNU compatible.
As always, I'm still inexperienced with ebuilds, so it just works on my machines (tm) :)
Comment 9 Aisha Tammy 2020-09-30 13:06:37 UTC
@gabriel

I've created a PR which should do the bump.
I couldn't use your attached ebuild, because gentoo internals need a few more exports and esoterics, but I'd love if you could check if it works for you.

Thanks :D
Comment 10 Gabriel 2020-09-30 13:29:47 UTC
Aisha,

Just tested quickly with `ebuild manifest install` - all seems good.
Saw your comments upstream about PKG_CONFIG, which I now know is due to cross compiling :)

Thanks!
Comment 11 Larry the Git Cow gentoo-dev 2020-10-16 06:04:05 UTC
The bug has been closed via the following commit(s):

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

commit 0427a37465ea8f29385a91233ba53772303e3fef
Author:     Aisha Tammy <gentoo@aisha.cc>
AuthorDate: 2020-09-30 12:57:42 +0000
Commit:     Joonas Niilola <juippis@gentoo.org>
CommitDate: 2020-10-16 06:03:57 +0000

    gui-wm/hikari: version bump to 2.2.1
    
    and pkg-config calling as well
    
    Closes: https://bugs.gentoo.org/741164
    Package-Manager: Portage-3.0.8, Repoman-3.0.1
    Signed-off-by: Aisha Tammy <gentoo@aisha.cc>
    Signed-off-by: Joonas Niilola <juippis@gentoo.org>

 gui-wm/hikari/Manifest                           |  1 +
 gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch | 78 ++++++++++++++++++++++++
 gui-wm/hikari/hikari-2.2.1.ebuild                | 64 +++++++++++++++++++
 3 files changed, 143 insertions(+)