Skip to content

Fix build on NetBSD.#1557

Merged
phoerious merged 2 commits intokeepassxreboot:developfrom
0-wiz-0:develop
Feb 28, 2018
Merged

Fix build on NetBSD.#1557
phoerious merged 2 commits intokeepassxreboot:developfrom
0-wiz-0:develop

Conversation

@0-wiz-0
Copy link
Copy Markdown
Contributor

@0-wiz-0 0-wiz-0 commented Feb 28, 2018

Without this patch I see:

[ 74%] Linking CXX executable keepassxc
../libkeepassx_core.a(ScreenLockListenerPrivate.cpp.o): In function `ScreenLockListenerPrivate::instance(QWidget*)':
/scratch/security/keepassxc/work/keepassxc-2.3.0/src/core/ScreenLockListenerPrivate.cpp:38: undefined reference to `ScreenLockListenerDBus::ScreenLockListenerDBus(QWidget*)'
[ 74%] Building CXX object src/autotype/xcb/CMakeFiles/keepassx-autotype-xcb.dir/keepassx-autotype-xcb_autogen/mocs_compilation.cpp.o
../libkeepassx_core.a(MainWindow.cpp.o): In function `MainWindow::MainWindow()':
/scratch/security/keepassxc/work/keepassxc-2.3.0/src/gui/MainWindow.cpp:174: undefined reference to `MainWindowAdaptor::MainWindowAdaptor(QObject*)'
--- src/cli/keepassxc-cli ---
...
libkeepassx_core.a(MainWindow.cpp.o): In function `MainWindow::MainWindow()':
/scratch/security/keepassxc/work/keepassxc-2.3.0/src/gui/MainWindow.cpp:174: undefined reference to `MainWindowAdaptor::MainWindowAdaptor(QObject*)'
libkeepassx_core.a(ScreenLockListenerPrivate.cpp.o): In function `ScreenLockListenerPrivate::instance(QWidget*)':
/scratch/security/keepassxc/work/keepassxc-2.3.0/src/core/ScreenLockListenerPrivate.cpp:38: undefined reference to `ScreenLockListenerDBus::ScreenLockListenerDBus(QWidget*)'
--- src/keepassxc ---
*** [src/keepassxc] Error code 1

You should consider making this a UNIX check instead, but the patch fixes the immediate problem on NetBSD.

@TheZ3ro
Copy link
Copy Markdown
Contributor

TheZ3ro commented Feb 28, 2018

Apparently I missed in #283

Adding the need-work tag since I think it's better to perform a UNIX check, Target release 2.3.1

The check should be if (UNIX AND NOT APPLE), can you change it?

@TheZ3ro TheZ3ro added this to the 2.3.1 milestone Feb 28, 2018
@0-wiz-0
Copy link
Copy Markdown
Contributor Author

0-wiz-0 commented Feb 28, 2018

Thanks for looking at this so quickly. I've added a second patch per your request (tested, works for me).

Copy link
Copy Markdown
Contributor

@TheZ3ro TheZ3ro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks fine for me

@phoerious phoerious merged commit 3f7f1aa into keepassxreboot:develop Feb 28, 2018
phoerious pushed a commit that referenced this pull request Feb 28, 2018
* Fix build on NetBSD.
@phoerious phoerious added pr: bugfix Pull request fixes a bug and removed bug labels Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build system pr: bugfix Pull request fixes a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants