Created attachment 153596 [details] Proposed patch (since 370129 revision) Patch to update graphics/djvulibre port from 3.5.25.3 to 3.5.27 version. Look following link for changes: http://sourceforge.net/p/djvu/djvulibre-git/ci/487ed1/tree/NEWS?diff=aa7ad2 - Adapt MASTER_SITES - Add LICENSE_FILE - Add build dependency from graphics/librsvg2 for icon generation - Use install-strip for INSTALL_TARGET to strip files - Add "gmake" and "shared-mime-info" to USES - Change docs installation method to use COPYTREE_SHARE - Convert some static patches to sed patches - Adapt pkg-plist file
Auto-assigned to maintainer bf@FreeBSD.org
Created attachment 153598 [details] The poudriere testport log (FreeBSD 10 amd64)
Hello, Brendan Fabeny. Thanks for your attention. Actually, there is some complex situation with other PRs. There is still no attention to bug 196409, which improves 4.9 version of graphics/djview4 and depends on previous version of graphics/djvulibre to work. But also, with new graphics/djvulibre version, there is updated graphics/djview4 version in bug 198088. I think, that bug 196409 should be resolved first. Then current bug 198087 and bug 198088. Could you process mentioned graphics/djview4 PRs, where there is no maintainer/committer?
Yes, I'll try to fix the dependent port at the same time.
Created attachment 156753 [details] Proposed patch (since 386200 revision) Updated patch after ports r386200 changes.
Created attachment 161464 [details] Proposed patch (since 390310 revision) Updated patch after ports r390310 changes.
Created attachment 161465 [details] The poudriere testport log (FreeBSD 10.2 amd64)
The bug 196409 was resolved. Thanks to Ruslan Makhmatkhanov. There is a new update for graphics/djview4 port to v4.10.3, which I plan to upload for bug 198088, after some fix for previous version and available poudriere testport logs.
(In reply to comment #8) > There is a new update for graphics/djview4 port to v4.10.3, > which I plan to upload for bug 198088, after some fix for > previous version and available poudriere testport logs. Done, for djvulibre 3.5.25.3 and 3.5.27.
Created attachment 168917 [details] Proposed patch (since 412346 revision) Patch updated after removal of "${PORTSDIR}/" from dependencies in ports r412346.
testbuilds@work
testbuilds are fine. Testbuilds for depends are needed: converters/pdf2djvu deskutils/recoll graphics/zathura-djvu graphics/djview4 graphics/evince graphics/apvlv graphics/okular graphics/gscan2pdf graphics/llpp/pkg-message graphics/djvulibre graphics/ImageMagick graphics/atril graphics/ImageMagick7 print/qpdfview x11/leechcraft
Created attachment 171343 [details] The poudriere testport log (FreeBSD 10.2 amd64): converters/pdf2djvu (In reply to comment #12) > Testbuilds for depends are needed The converters/pdf2djvu builds fine (while ignoring other errors of new stage-qa).
Created attachment 171345 [details] The poudriere testport log (FreeBSD 10.2 amd64): graphics/zathura-djvu The graphics/zathura-djvu builds fine.
Created attachment 171348 [details] The poudriere testport log (FreeBSD 10.2 amd64): graphics/djview4 The graphics/djview4 builds fine (while ignoring other errors of new stage-qa). This PR was a companion update for graphics/djview4 v4.10.3 (bug 198088 through bug 196409).
Created attachment 171378 [details] Proposed patch (since 412346 revision) - Use new options helpers - Remove bsd.port.options.mk include. The new portlint suggests to use INSTALLS_ICONS=yes, but this is not a GTK+ application (with gtk-update-icon-cache dependency). It uses shared-mime-info.
Created attachment 171379 [details] The poudriere testport log (FreeBSD 10.2 amd64)
Created attachment 171380 [details] Proposed patch (since 412346 revision) Added .SILENT.
Created attachment 171381 [details] The poudriere testport log (FreeBSD 10.2 amd64)
Created attachment 171390 [details] The poudriere testport log (FreeBSD 10.2 amd64, with DJVU=on): print/qpdfview The print/qpdfview builds fine (while ignoring other errors of new stage-qa: USE_QT4+=corelib may be needed).
Created attachment 171393 [details] The poudriere testport log (FreeBSD 10.2 amd64): graphics/atril-lite The graphics/atril-lite builds fine (while ignoring other errors of new stage-qa).
Created attachment 171397 [details] Proposed patch (since 412346 revision) Moved installation of docs to post-install-DOCS-on stage. Used previous approach to silence patching. Added INSTALLS_ICONS=yes, because of following message after installation: -8<-- *** You must still update various caches with: *** # update-mime-database /usr/local/share/mime *** # update-icon-caches /usr/local/share/icons/hicolor -->8- Looks like, the gtk-update-icon-cache is alternative to update-icon-caches: http://manpages.ubuntu.com/manpages/precise/man8/update-icon-caches.8.html http://manpages.ubuntu.com/manpages/precise/man1/gtk-update-icon-cache.1.html
Testbuilds for depends all done, look fine.
A commit references this bug: Author: pi Date: Mon Jun 13 19:19:05 UTC 2016 New revision: 416860 URL: https://svnweb.freebsd.org/changeset/ports/416860 Log: graphics/djvulibre: 3.5.25.3 -> 3.5.27 - simplified configuration scripts - deadlock fixes - Thread safe miniexp - Now using the standard autotools approach (thanks to Vincent Torri). - New windows installer (thanks to Konstantin Kravtsov). - General speedup thanks to lock-free smart pointers. - ddjvu can produce one file per page. - djvused can now set the default page orientation. - Bug fixes all around. PR: 198087 Submitted by: lightside@gmx.com Approved by: bf (maintainer timeout) Changes: head/graphics/djvulibre/Makefile head/graphics/djvulibre/distinfo head/graphics/djvulibre/files/ head/graphics/djvulibre/pkg-plist
Committed, thanks to the submitter for the patience and eye for detail!
(In reply to comment #22) > Added INSTALLS_ICONS=yes Still not sure if this is needed, because of following description in ports: INSTALLS_ICONS - If a GTK+ port installs Freedesktop-style icons to ${LOCALBASE}/share/icons, then you should use this macro. Using this macro ensures that icons are cached and will display correctly. This macro isn't needed for QT based applications, which use a different method. For example, the graphics/djview4 is QT application and INSTALLS_ICONS=yes not needed (according to description), while graphics/zathura-djvu is GTK+ related and may benefit from this. Still, the developer suggested to use update-icon-caches after installation, which is not available in FreeBSD ports (or I just didn't find it). (In reply to Kurt Jaeger from comment #25) Thanks for your attention, commit and testbuilds.
I spotted, that currently generated icons are wrong in scale, because of some differences in a new graphics/librsvg2 (2.40.13), while it was ok for previous version (2.40.6,1), when I submitted this PR. The same for icons in graphics/djview4 port.
Created attachment 171407 [details] Proposed patch (since 416860 revision) I decided to propose following changes, which allow to choose which icons and mime types to install: none, prebuilt, generated. - Bump PORTREVISION - Add single options for installation of desktop files: NONE, PREBUILT, GENERATED - Set PREBUILT option by default - Add commands for PREBUILT option in post-build and post-install stages - Adapt pkg-plist
Created attachment 171409 [details] Generated and prebuilt icons in archive for comparison Added archive with generated and prebuilt icons for comparison. In "generated" directory you can see, that icons are wrong in scale, while in "prebuilt" directory they are ok.
Created attachment 171422 [details] Proposed patch (since 416860 revision) As I understand, there are facilities in the build scripts to use prebuilt icons, instead of generation of them with using conversion tool. Therefore, I propose different approach: - Bump PORTREVISION - Remove graphics/librsvg2 from build dependency - Add DESKTOPFILES option for installation of icons and mime types - Use prebuilt icons instead of conversion tool to generate them - Adapt pkg-plist Overall, this may fix issue, which I found, while gives the possibility to not install icons and mime types at all (without INSTALLS_ICONS dependency), if needed.
Created attachment 171423 [details] Proposed patch (since 416860 revision) Clarified patch for conversion_tool=no.
Created attachment 171425 [details] Proposed patch (since 412346 revision): graphics/djview4 The same possible to do for graphics/djview4 port, without DESKTOPFILES option, because there is a need to install icons for desktop entry: - Bump PORTREVISION - Remove graphics/librsvg2 from build dependency - Add gettext-runtime to USES and glib20 to USE_GNOME, because webplugin depends from them - Add xext to USE_XORG - Remove CPPFLAGS and LDFLAGS; add localbase to USES - Remove verbose flag from MAKE_ENV - Add corelib to USE_QT4 - Add x11 to USE_XORG in case of QT4 usage - Add core to USE_QT5 - Add sed patch to use prebuilt icons instead of conversion tool to generate them
A commit references this bug: Author: pi Date: Tue Jun 14 17:41:06 UTC 2016 New revision: 416902 URL: https://svnweb.freebsd.org/changeset/ports/416902 Log: graphics/djvulibre: some fixes for the icons - Remove graphics/librsvg2 from build dependency - Add DESKTOPFILES option for installation of icons and mime types - Use prebuilt icons instead of conversion tool to generate them - Adapt pkg-plist PR: 198087 Submitted by: lightside@gmx.com Changes: head/graphics/djvulibre/Makefile head/graphics/djvulibre/pkg-plist
A commit references this bug: Author: pi Date: Tue Jun 14 18:03:22 UTC 2016 New revision: 416903 URL: https://svnweb.freebsd.org/changeset/ports/416903 Log: graphics/djview4: fix icons and some other stuff - Remove graphics/librsvg2 from build dependency - Add gettext-runtime to USES and glib20 to USE_GNOME, because webplugin depends from them - Add xext to USE_XORG - Remove CPPFLAGS and LDFLAGS; add localbase to USES - Remove verbose flag from MAKE_ENV - Add corelib to USE_QT4 - Add x11 to USE_XORG in case of QT4 usage - Add core to USE_QT5 - use prebuilt icons instead of conversion tool to generate them PR: 198087 Submitted by: lightside@gmx.com Changes: head/graphics/djview4/Makefile
Committed, thanks!