On Sun Apr 14, 2024 at 12:16:23PM +0000, Klemens Nanni wrote:
> ShareExport.cpp no longer needs fixing and git gets picked up during
> configure (despite no observed build-change). Fix COMMENT while here.
Could you add CONFIGURE_ARGS += -DDISABLE_FIND_PACKAGE_Git=ON in a extra
line without mixing it with keepassxc options, please.
>
> Testing for UNIX instead of LINUX in browser/BrowserSettingsWidget.cpp has
> the opposite effect as it is an #ifndef, so remove that.
>
> As for gui/Icons.cpp it is non-trivial for me to verify what this does, so
> I noted that down.
ACK
>
> Eventually, it'd be nice to either drop those hacks or turn them into proper
> reasoned patches.
Fine with me.
>
> Feedback? OK?
OK rsadowski
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/keepassxc/Makefile,v
> diff -u -p -r1.60 Makefile
> --- Makefile 23 Mar 2024 06:51:45 -0000 1.60
> +++ Makefile 3 Apr 2024 19:16:20 -0000
> @@ -1,7 +1,8 @@
> -COMMENT = management tool for password and sensitive data
> +COMMENT = management tool for passwords and sensitive data
>
> V = 2.7.7
> DISTNAME = keepassxc-${V}
> +REVISION = 0
>
> CATEGORIES = security
>
> @@ -36,6 +37,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
> BUILD_DEPENDS = textproc/asciidoctor
>
> CONFIGURE_ARGS= -DCMAKE_INSTALL_MANDIR="man" \
> + -DDISABLE_FIND_PACKAGE_Git=ON \
> -DWITH_GUI_TESTS=ON \
> -DWITH_XC_AUTOTYPE=ON \
> -DWITH_XC_SSHAGENT=ON \
> @@ -70,19 +72,15 @@ CONFIGURE_ARGS += -DWITH_XC_BROWSER=ON \
> ALL_TARGET += keepassxc-proxy
> .endif
>
> -FIX_CRLF_FILES = src/keeshare/ShareExport.cpp
> -
> MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
>
> # - MainWindow.cpp has one minor key binding behind Q_OS_* no other BSD seems
> # to patch... drop or upstream? rest got fixed 2018.
> -# - browser/BrowserSettingsWidget.cpp has a visibility fix no other BSD seems
> -# to patch... drop or upstream?
> +# - Icons.cpp has a Qt theme/icon issue fix... untested if this effects us.
> post-patch:
> cd ${WRKSRC}/src/; sed -i -e 's/Q_OS_LINUX/Q_OS_UNIX/g' \
> gui/MainWindow.cpp \
> - gui/Icons.cpp \
> - browser/BrowserSettingsWidget.cpp
> + gui/Icons.cpp
>
> # build whatever is left (ca. 200 GUI test files)
> pre-test:
>
