Created attachment 196535 [details] Patch file generated with svn diff Hi, • Remove reference to former option GNOME • Mark option METACITY as broken * • Simplify option DBUS • Add missing dependencies • Add LICENSE • Add option NLS • Add libinotify to pkg-plist • Regenerate patch files • Bump PORTREVISION * Metacity migrated to Gtk+ 3 while Compiz still uses Gtk+ 2. This incompatibilty was left unseen at make time because of a reference to former option GNOME in an assertion which resulted in METACITY being always disabled.
I'll take it.
Thank you Mateusz.
(In reply to Samy Mahmoudi from comment #2) In the future you may want to run `portlint -AC` to test for common errors :)
I am now correcting this !
(In reply to Samy Mahmoudi from comment #4) Also, I'm getting errors when testing your submission with poudriere: ====> Checking for pkg-plist issues (check-plist) ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist ===> Checking for items in pkg-plist which are not in STAGEDIR Error: Missing: lib/compiz/libinotify.a Error: Missing: lib/compiz/libinotify.so It looks like those two files are not installed. Is there a reason why you added them to pkg-plist?
I may have done a "make check-orphans" which indicated me to include these two files.
[root@t520]/usr/ports/x11-wm/compiz#make check-orphans 17:55:19 [0] ====> Checking for pkg-plist issues (check-plist) ===> Parsing plist ===> Checking for items in STAGEDIR missing from pkg-plist Error: Orphaned: lib/compiz/libinotify.a Error: Orphaned: lib/compiz/libinotify.so ===> Checking for items in pkg-plist which are not in STAGEDIR ===> Error: Plist issues found. *** Error code 1 Stop. make: stopped in /usr/ports/x11-wm/compiz
I have also checked that the two libinotify files are indeed present in my work/stage directory.
Created attachment 198226 [details] Patch file generated with svn diff
(In reply to Samy Mahmoudi from comment #9) I have followed the guidelines generated by "portlint -AC". There is still one fatal error: FATAL: Makefile: license specified is GPLv2+ LGPL21+ MIT, but LICENSE_FILE specified is for GPLv2+. but I think portlint just misunderstands the spaces as literal spaces in "GPLv2+ LGPL21+ MIT". Besides, I have added USES=gl and USES=gnome as suggested with DEVELOPER=YES, and I reordered the variables to follow the FreeBSD porter's handbook, as much as possible. So here the new log: • Remove reference to former option GNOME • Mark option METACITY as broken * • Simplify option DBUS • Add missing dependencies • Add LICENSE • Add option NLS • Reorder the variables • Add libinotify to pkg-plist • Regenerate patch files • Bump PORTREVISION The libinotify problem persists.
(In reply to Samy Mahmoudi from comment #10) So here IS the new log...
Comment on attachment 198226 [details] Patch file generated with svn diff As you noticed, libinotify is not needed when building in a clean environment (I now use poudriere systematically). The reason I got libinotify installed while staging is not clear yet but I suspect a port dependent on compiz (if not compiz itself) to trigger libinotify installation when reconfiguring compiz with that port already installed. Anyway, in most scenarios compiz gets built first because of the dependency tree so we do not have to change pkg-plist.
- Add modesetting to the drivers whitelist - Use upstream name xfwm4 to properly fall back - Remove reference to former option GNOME - Mark option METACITY as broken * - Simplify option DBUS - Add missing dependencies - Add LICENSE - Reorder the variables to pet portlint - Regenerate patch files to pet portlint * Metacity migrated to Gtk+ 3 while Compiz still uses Gtk+ 2. This incompatibilty was left unseen at make time because of a reference to former option GNOME in an assertion which resulted in METACITY being always disabled.
Created attachment 202312 [details] Patch file generated with svn diff
- Add modesetting to the drivers whitelist - Use upstream name xfwm4 instead of xfwm to properly fall back - Remove reference to former option GNOME - Mark option METACITY as broken * - Simplify option DBUS - Add missing dependencies - Add LICENSE - Add USES=gnome, USES=gl and USE_GL=gl - Reorder the variables to pet portlint - Regenerate patch files to pet portlint * Metacity migrated to Gtk+ 3 while Compiz still uses Gtk+ 2. This incompatibilty was left unseen at make time because of a reference to former option GNOME in an assertion which resulted in METACITY being always disabled.
The patch is in review: https://reviews.freebsd.org/D19467
(In reply to Mateusz Piotrowski from comment #16) Thank you Mateusz!
(In reply to Samy Mahmoudi from comment #17) Sorry for the delay. Please, don't hesitate to ping in the future. ;)
(In reply to Mateusz Piotrowski from comment #16) I have commented the review some time ago (answering kwm) , but it is still "unsubmitted". Do I have the permission to comment inline?
(In reply to Samy Mahmoudi from comment #19) Of course! Please do comment, review and participate. :)
A commit references this bug: Author: 0mp Date: Thu May 2 15:37:52 UTC 2019 New revision: 500666 URL: https://svnweb.freebsd.org/changeset/ports/500666 Log: x11-wm/compiz: Clean up port's makefile - Add modesetting to the drivers whitelist - Use upstream name xfwm4 instead of xfwm to properly fall back - Remove reference to former option GNOME - Simplify option DBUS - Add missing dependencies - Add LICENSE - Add USES=gnome, USES=gl and USE_GL=gl - Reorder the variables to pet portlint - Regenerate patch files to pet portlint Metacity migrated to GTK+ 3 while Compiz still uses GTK+ 2. This incompatibility was left unseen at make time because of a reference to former option GNOME in an assertion which resulted in METACITY being always disabled. Committer's changes: - Remove broken option METACITY - Further lint the makefile PR: 230894 Submitted by: Samy Mahmoudi <samy.mahmoudi@gmail.com> Reviewed by: mat Approved by: portmgr (maintainer timeout: > 14 days) Differential Revision: https://reviews.freebsd.org/D19467 Changes: head/x11-wm/compiz/Makefile head/x11-wm/compiz/files/compiz-manager.in head/x11-wm/compiz/files/patch-plugins_fuse.c head/x11-wm/compiz/files/patch-src-Makefile.in
(In reply to Samy Mahmoudi from comment #19) Ok, we got it committed. Let me know if there's anything else you'd like to improve here. Thanks a lot for you contribution! :)
Thank you for your review and your commit. > Let me know if there's anything else you'd like to improve here. While reviewing, a user commented and suggested we might also add amdgpu to WHITELIST. This was perfectly relevant but I could not manage to update the diff myself because of a problem with the URI scheme editor://. So I answered in a subsequent comment which, after a while, got ignored. As soon as possible, I will attach a patch against the new revision.
Created attachment 204167 [details] Patch file generated with svn diff Done.
A commit references this bug: Author: 0mp Date: Thu May 2 18:52:05 UTC 2019 New revision: 500677 URL: https://svnweb.freebsd.org/changeset/ports/500677 Log: x11-wm/compiz: Add the amdgpu to driver whitelist The elements of the list are prefixes of display drivers located in /usr/local/lib/xorg/modules/drivers, so these refer to Xorg display drivers, not kernel modules. The "intel" driver covers i915 if and only if intel_drv.so is loaded. If modesetting_drv.so is loaded then "intel" does not cover i915 anymore. As xf86-video-amdgpu installs amdgpu_drv.so, "amdgpu" should also be added to the list. "ati" and "radeon" cover display drivers installed by both xf86-video-ati and xf86-video-ati-legacy. PR: 230894 Submitted by: Samy Mahmoudi <samy.mahmoudi@gmail.com> Approved by: portmgr (maintainer timeout, > 14 days) Changes: head/x11-wm/compiz/Makefile head/x11-wm/compiz/files/compiz-manager.in
(In reply to Samy Mahmoudi from comment #24) I've already patched that and committed. Thank you for going through the effort of submitting yet another patch.