Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lxqt-panel: fix for explicit (a C++11 keyword) being used as variable #24362

Merged
merged 1 commit into from Mar 28, 2017
Merged

lxqt-panel: fix for explicit (a C++11 keyword) being used as variable #24362

merged 1 commit into from Mar 28, 2017

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Mar 26, 2017

It is needed to override "explicit" as this is a C++ keyword. But it
is used as variable name in xkb.h. This is causing a failure in C++
compile time. Similar bug here:
https://bugs.freedesktop.org/show_bug.cgi?id=74080

Workaround from
lxqt/lxqt-panel@ec62109.

Motivation for this change
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

It is needed to override "explicit" as this is a C++ keyword. But it
is used as variable name in xkb.h. This is causing a failure in C++
compile time.  Similar bug here:
https://bugs.freedesktop.org/show_bug.cgi?id=74080

Workaround from
lxqt/lxqt-panel@ec62109.
@mention-bot
Copy link

@romildo, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ttuegel to be a potential reviewer.

@romildo
Copy link
Contributor Author

romildo commented Mar 26, 2017

Fixes #24337.

/cc @zetok

@pSub pSub self-assigned this Mar 28, 2017
@pSub
Copy link
Member

pSub commented Mar 28, 2017

Works fine for me.

@pSub pSub merged commit f870fbc into NixOS:master Mar 28, 2017
@romildo romildo deleted the fix.lxqt branch March 28, 2017 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants