Bug 270525 - [PATCH] x11/wdisplays: failed to find its icon during package target
Summary: [PATCH] x11/wdisplays: failed to find its icon during package target
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: amd64 Any
: --- Affects Only Me
Assignee: Jan Beich
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-03-29 15:01 UTC by Chad Jacob Milios
Modified: 2023-03-29 16:51 UTC (History)
0 users

See Also:
jbeich: maintainer-feedback+
jbeich: merge-quarterly+


Attachments
git diff (533 bytes, patch)
2023-03-29 15:01 UTC, Chad Jacob Milios
no flags Details | Diff
git diff (460 bytes, patch)
2023-03-29 15:09 UTC, Chad Jacob Milios
jbeich: maintainer-approval-
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Chad Jacob Milios 2023-03-29 15:01:58 UTC
Created attachment 241183 [details]
git diff

===>  Cleaning for wdisplays-1.1_1
===>  License CC-BY-SA-4.0 CC0-1.0 GPLv3+ MIT accepted by the user
===> Fetching all distfiles required by wdisplays-1.1_1 for building
===>  Extracting for wdisplays-1.1_1
=> SHA256 Checksum OK for artizirk-wdisplays-1.1_GH0.tar.gz.
===>  Patching for wdisplays-1.1_1
===>  Configuring for wdisplays-1.1_1
The Meson build system
Version: 1.0.1
Source dir: /usr/ports/x11/wdisplays/work/wdisplays-1.1
Build dir: /usr/ports/x11/wdisplays/work/wdisplays-1.1/_build
Build type: native build
Project name: network.cycles.wdisplays
Project version: 1.0
C compiler for the host machine: cc (clang 14.0.5 "FreeBSD clang version 14.0.5 (https://github.com/llvm/llvm-project.git llvmorg-14.0.5-0-gc12386ae247c)")
C linker for the host machine: cc ld.lld 14.0.5
Host machine cpu family: x86_64
Host machine cpu: x86_64
Program wayland-scanner found: YES (/usr/local/bin/wayland-scanner)
Found pkg-config: /usr/local/bin/pkgconf (1.8.1)
Run-time dependency wayland-client found: YES 1.21.0
Run-time dependency wayland-protocols found: YES 1.31
Configuring resources.xml using configuration
Found pkg-config: /usr/local/bin/pkgconf (1.8.1)
Program glib-compile-resources found: YES (/usr/local/bin/glib-compile-resources)
Program scour found: YES (/usr/local/bin/scour)
Configuring network.cycles.wdisplays.desktop using configuration
Library m found: YES
Library rt found: YES
Run-time dependency gdk-3.0 found: YES 3.24.34
Run-time dependency gtk+-3.0 found: YES 3.24.34
Run-time dependency epoxy found: YES 1.5.9
Configuring config.h using configuration
Build targets in project: 5

network.cycles.wdisplays 1.0

  User defined options
    buildtype : release
    infodir   : share/info
    mandir    : man
    prefix    : /usr/local
    strip     : True
    b_colorout: never

Found ninja-1.11.1 at /usr/local/bin/ninja
WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated.
===>  Building for wdisplays-1.1_1

..........<snip>..........

[100% 32/32] cc  -o src/wdisplays src/wdisplays.p/meson-generated_.._.._resources_wdisplays-resources.c.o src/wdisplays.p/main.c.o src/wdisplays.p/glviewport.c.o src/wdisplays.p/headform.c.o src/wdisplays.p/outputs.c.o src/wdisplays.p/overlay.c.o src/wdisplays.p/render.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -fstack-protector-strong -O2 -pipe -march=opteron-sse3 -fstack-protector-strong -fno-strict-aliasing -Wl,-rpath,/usr/local/lib -Wl,-rpath-link,/usr/local/lib -Wl,--start-group protocol/libclient_protos.a -lm -lrt /usr/local/lib/libwayland-client.so /usr/local/lib/libepoxy.so /usr/local/lib/libgtk-3.so /usr/local/lib/libgdk-3.so /usr/local/lib/libpangocairo-1.0.so /usr/local/lib/libpango-1.0.so /usr/local/lib/libharfbuzz.so /usr/local/lib/libatk-1.0.so /usr/local/lib/libcairo-gobject.so /usr/local/lib/libcairo.so /usr/local/lib/libgdk_pixbuf-2.0.so /usr/local/lib/libgio-2.0.so /usr/local/lib/libgobject-2.0.so /usr/local/lib/libglib-2.0.so /usr/local/lib/libintl.so -Wl,--end-group
===>  Staging for wdisplays-1.1_1
===>   Generating temporary packing list
[  0% 1/1] /usr/local/bin/meson install --no-rebuild
Installing resources/network.cycles.wdisplays.svg to /usr/ports/x11/wdisplays/work/stage/usr/local/share/icons/hicolor/scalable/apps
Installing src/wdisplays to /usr/ports/x11/wdisplays/work/stage/usr/local/bin
Stripping target 'src/wdisplays'.
Installing /usr/ports/x11/wdisplays/work/wdisplays-1.1/_build/resources/network.cycles.wdisplays.desktop to /usr/ports/x11/wdisplays/work/stage/usr/local/share/applications
====> Compressing man pages (compress-man)
===>  Building package for wdisplays-1.1_1
pkg-static: Unable to access file /usr/ports/x11/wdisplays/work/stage/usr/local/share/icons/hicolor/scalable/apps/wdisplays.svg:No such file or directory
*** Error code 1

Stop.
make: stopped in /usr/ports/x11/wdisplays

root@yoda:~ # more /etc/make.conf 
CPUTYPE?=opteron-sse3
DEFAULT_VERSIONS= bdb=18 gcc=12 java=19 llvm=15 lua=5.4 mysql=8.0 nodejs=19 perl5=5.36 pgsql=15 php=8.2 python=3.11 python3=3.11 ruby=3.1 samba=4.16 ssl=openssl

root@yoda:~ # uname -a
FreeBSD yoda.ccsys.com 13.2-RC5 FreeBSD 13.2-RC5 releng/13.2-n254613-0386b9bd6cda NUOS amd64


root@yoda:/usr/ports/x11/wdisplays # find work -type f -name '*.svg'
work/wdisplays-1.1/_build/resources/network.cycles.wdisplays.svg
work/wdisplays-1.1/resources/wdisplays.svg
work/stage/usr/local/share/icons/hicolor/scalable/apps/network.cycles.wdisplays.svg
Comment 1 Chad Jacob Milios 2023-03-29 15:09:02 UTC
Created attachment 241184 [details]
git diff

after inspecting network.cycles.wdisplays.desktop i realized this is probably the better way to handle this
Comment 2 Jan Beich freebsd_committer freebsd_triage 2023-03-29 16:11:51 UTC
Builds fine on the package cluster:

https://pkg-status.freebsd.org/beefy18/data/main-amd64-default/p7589f82bff48_s700acdc7b5/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/ampere2/data/main-arm64-default/pd55ec1db8ffa_s9b20ab1e1e/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/ampere2/data/main-armv7-default/pb73012d372f5_s91b2da1370/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/beefy17/data/main-i386-default/p7589f82bff48_s700acdc7b5/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/foul2/data/main-powerpc64le-default/p8466d9c11ecd_sb754d7faaf/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/foul1/data/main-powerpc64-default/p09c207a3eecc_s191115cfb6/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/beefy16/data/131amd64-default/d55ec1db8ffa/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/ampere3/data/131arm64-default/1f6505161e34/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/ampere3/data/131releng-armv7-default/0762117e7f99/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/beefy15/data/131i386-default/d55ec1db8ffa/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/beefy6/data/123amd64-default/d55ec1db8ffa/logs/wdisplays-1.1_1.log
https://pkg-status.freebsd.org/beefy5/data/123i386-default/d55ec1db8ffa/logs/wdisplays-1.1_1.log

> Program scour found: YES (/usr/local/bin/scour)

$ pkg provides bin/scour\$
Name    : py39-scour-0.38.2
Comment : Scour SVG Optimizer
Repo    : FreeBSD
Filename: usr/local/bin/scour-3.9
          usr/local/bin/scour

Looks like textproc/py-scour triggers the rename.

meson.build:
  project('network.cycles.wdisplays', 'c', license: 'MIT', version: '1.0')

resources/meson.build
    if scour.found()
      custom_target('optimize-icon',
  	input: icon,
  	output: '@0@.svg'.format(meson.project_name()),
Comment 3 Jan Beich freebsd_committer freebsd_triage 2023-03-29 16:13:23 UTC
Comment on attachment 241184 [details]
git diff

This breaks build in a clean environment e.g.,

$ poudriere testport -j 131amd64 x11/wdisplays
[...]
===========================================================================
====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: share/icons/hicolor/scalable/apps/wdisplays.svg
===> Checking for items in pkg-plist which are not in STAGEDIR
Error: Missing: share/icons/hicolor/scalable/apps/network.cycles.wdisplays.svg
===> Error: Plist issues found.
*** Error code 1
Comment 4 commit-hook freebsd_committer freebsd_triage 2023-03-29 16:50:18 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fdf37ec6360d430f2a71f85f85cc2e70ae7fc60f

commit fdf37ec6360d430f2a71f85f85cc2e70ae7fc60f
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-03-29 16:39:22 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-03-29 16:49:08 +0000

    x11/wdisplays: unbreak build with textproc/py-scour

    ====> Checking for pkg-plist issues (check-plist)
    ===> Parsing plist
    ===> Checking for items in STAGEDIR missing from pkg-plist
    Error: Orphaned: share/icons/hicolor/scalable/apps/network.cycles.wdisplays.svg
    ===> Checking for items in pkg-plist which are not in STAGEDIR
    Error: Missing: share/icons/hicolor/scalable/apps/wdisplays.svg
    ===> Error: Plist issues found.
    *** Error code 1

    PR:             270525
    Reported by:    Chad Jacob Milios

 x11/wdisplays/Makefile                                |  4 ++--
 x11/wdisplays/files/patch-resources_meson.build (new) | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-03-29 16:51:19 UTC
A commit in branch 2023Q1 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=07ec86e98cf66240590ca94f13243a4738c42c81

commit 07ec86e98cf66240590ca94f13243a4738c42c81
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-03-29 16:39:22 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-03-29 16:50:33 +0000

    x11/wdisplays: unbreak build with textproc/py-scour

    ====> Checking for pkg-plist issues (check-plist)
    ===> Parsing plist
    ===> Checking for items in STAGEDIR missing from pkg-plist
    Error: Orphaned: share/icons/hicolor/scalable/apps/network.cycles.wdisplays.svg
    ===> Checking for items in pkg-plist which are not in STAGEDIR
    Error: Missing: share/icons/hicolor/scalable/apps/wdisplays.svg
    ===> Error: Plist issues found.
    *** Error code 1

    PR:             270525
    Reported by:    Chad Jacob Milios

    (cherry picked from commit fdf37ec6360d430f2a71f85f85cc2e70ae7fc60f)

 x11/wdisplays/Makefile                                |  3 ++-
 x11/wdisplays/files/patch-resources_meson.build (new) | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)