Created attachment 222977 [details] patch to add missing dependencies and reorder some Makefile vars Thanks for the ports update. Really appreciated. While building your updated port v2.0, some errors occur in the Q/A tests, if DEVELOPERS=yes is set in /etc/make.conf: ====> Running Q/A tests (stage-qa) Error: /usr/local/bin/rawstudio is linked to /usr/local/lib/libcairo.so.2 from graphics/cairo but it is not declared as a dependency Warning: you need USE_GNOME+=cairo Error: /usr/local/bin/rawstudio is linked to /usr/local/lib/libgdk_pixbuf-2.0.so.0 from graphics/gdk-pixbuf2 but it is not declared as a dependency Warning: you need USE_GNOME+=gdkpixbuf2 Error: /usr/local/bin/rawstudio is linked to /usr/local/lib/libfontconfig.so.1 from x11-fonts/fontconfig but it is not declared as a dependency Warning: you need LIB_DEPENDS+=libfontconfig.so:x11-fonts/fontconfig Error: /usr/local/bin/rawstudio is linked to /usr/local/lib/libfreetype.so.6 from print/freetype2 but it is not declared as a dependency Warning: you need LIB_DEPENDS+=libfreetype.so:print/freetype2 Error: /usr/local/bin/rawstudio is linked to /usr/local/lib/libcurl.so.4 from ftp/curl but it is not declared as a dependency Warning: you need LIB_DEPENDS+=libcurl.so:ftp/curl Error: /usr/local/bin/rawstudio is linked to /usr/local/lib/libraptor2.so.0 from textproc/raptor2 but it is not declared as a dependency Warning: you need LIB_DEPENDS+=libraptor2.so:textproc/raptor2 Error: /usr/local/bin/rawstudio is linked to /usr/local/lib/libX11.so.6 from x11/libX11 but it is not declared as a dependency Warning: you need USE_XORG+=x11 Error: /usr/local/bin/rawstudio is linked to /usr/local/lib/libtiff.so.5 from graphics/tiff but it is not declared as a dependency Warning: you need LIB_DEPENDS+=libtiff.so:graphics/tiff Warning: /usr/ports/graphics/rawstudio/work/stage/usr/local/lib/librawstudio-2.0.so.0.0.0 doesn't have a SONAME. Warning: pkg(8) will not register it as being provided by the port. Warning: If another port depend on it, pkg will not be able to know where it comes from. Warning: It is directly in /usr/local/lib, it is probably used by other ports. ===> Installing for rawstudio-2.0_19 ===> Checking if rawstudio is already installed ===> Registering installation for rawstudio-2.0_19 Installing rawstudio-2.0_19... Attached you will find a patch, which adds the dependencies in question. It builds and installs fine with them. While here, I also ordered some Makefile vars, like suggested by portclippy. If you agree, I would like to commit this patch :)
Maintainer informed via mail
Thank you for handling that, looks good :) If it is passing poudriere - lgtm.
Created attachment 223032 [details] patch with added NLS option and renewed patch files Hi Oleksii, When retesting before committing, I stumbled across two more issues that I had previously overlooked and tried to solve now: (1) 'portlint -AC' warns: Makefile: Consider adding support for a NLS knob to conditionally disable gettext support. I added NLS option, enabled by default. (2) More warnings from 'portlint -AC': WARN: /usr/home/rhurlin/svn/ports_rawstudio/graphics/rawstudio/files/patch-exiv2: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. WARN: /usr/home/rhurlin/svn/ports_rawstudio/graphics/rawstudio/files/patch-libpng15: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. WARN: /usr/home/rhurlin/svn/ports_rawstudio/graphics/rawstudio/files/patch-rs-macros.h: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. WARN: /usr/home/rhurlin/svn/ports_rawstudio/graphics/rawstudio/files/patch-rs-tag-gui.c: patch was not generated using ``make makepatch''. It is recommended to use ``make makepatch'' when you need to [re-]generate a patch to ensure proper patch format. WARN: /usr/home/rhurlin/svn/ports_rawstudio/graphics/rawstudio/files/patch-libpng15: plugins/load-gdk/exiv2-colorspace.cpp patched multiple times 0 fatal errors and 7 warnings found. For this I renewed and rearranged all patches under files. It would probably also make sense to change the two REINPLACE_CMDs in the post-patch target to patchfiles. However, I have not done that. I tested these changes on Poudriere and all build and install fine. If you agree with the new patch, could you please check, if it runs as expected and do some tests before I commit?
(In reply to Rainer Hurling from comment #3) Hi Oleksii, Just to be sure: Do you agree with my updated patch, as mentioned in comment #3? If yes, I would like to commit it.
Yes, i am okay with it.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ed648eda7a8261167ea38c4e2e5326f35c7301f commit 1ed648eda7a8261167ea38c4e2e5326f35c7301f Author: Rainer Hurling <rhurlin@FreeBSD.org> AuthorDate: 2021-11-27 20:45:41 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2021-11-27 20:45:41 +0000 graphics/rawstudio: Add missing dependencies and renew patches - Add dependencies found via DEVELOPERS=yes set in /etc/make.conf - Reorder some Makefile vars, suggested by portclippy - Add NLS option to conditionally disable gettext support - Renew and rearrange all patches under files PR: 254011 Approved by: Oleksii Samorukov <samm@FreeBSD.org> (maintainer) graphics/rawstudio/Makefile | 33 +++++++++++++------- graphics/rawstudio/files/patch-exiv2 (gone) | 33 -------------------- graphics/rawstudio/files/patch-libpng15 (gone) | 35 ---------------------- .../files/patch-librawstudio_rs-exif.cc (new) | 11 +++++++ ...-rs-macros.h => patch-librawstudio_rs-macros.h} | 5 ++-- ...tch-plugins_load-gdk_exiv2-colorspace.cpp (new) | 25 ++++++++++++++++ ...tch-plugins_meta-exiv2_exiv2-metadata.cpp (new) | 11 +++++++ ...h-plugins_output-pngfile_output-pngfile.c (new) | 19 ++++++++++++ .../{patch-rs-tag-gui.c => patch-src_rs-tag-gui.c} | 14 ++++----- 9 files changed, 99 insertions(+), 87 deletions(-)
Committed! Please try again if RawStudio still works as usual after the changes. There should be no functional changes ;)