pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21 from primeos/replace-old-sway-references

Browse Source 
Replace old Sway references with swaylock
This commit is contained in:
Drew DeVault 2019-01-17 11:27:58 -05:00 committed by GitHub
commit af03502384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -13,20 +13,18 @@ See the man page, `swaylock(1)`, for instructions on using swaylock.
## Release Signatures ## Release Signatures
Releases are signed with [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A) Releases are signed with [B22DA89A](http://pgp.mit.edu/pks/lookup?op=vindex&search=0x52CB6609B22DA89A)
and published [on GitHub](https://github.com/swaywm/sway/releases). swaylock and published [on GitHub](https://github.com/swaywm/swaylock/releases). swaylock
releases are managed independently of sway releases. releases are managed independently of sway releases.
## Installation ## Installation
### From Packages ### From Packages
Sway is available in many distributions. Try installing the "swaylock" package Swaylock is available in many distributions. Try installing the "swaylock"
for yours. If it's not available, check out [this wiki package for yours.
page](https://github.com/swaywm/sway/wiki/Unsupported-packages) for information
on installation for your distributions.
If you're interested in packaging sway for your distribution, stop by the IRC If you're interested in packaging swaylock for your distribution, stop by the
channel or shoot an email to sir@cmpwn.com for advice. IRC channel or shoot an email to sir@cmpwn.com for advice.
### Compiling from Source ### Compiling from Source

2
main.c
View File

@ -718,7 +718,7 @@ static int parse_options(int argc, char **argv, struct swaylock_state *state,
} }
break; break;
case 'v': case 'v':
fprintf(stdout, "swaylock version " SWAY_VERSION "\n"); fprintf(stdout, "swaylock version " SWAYLOCK_VERSION "\n");
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case LO_BS_HL_COLOR: case LO_BS_HL_COLOR:

4
meson.build
View File

@ -47,7 +47,7 @@ git = find_program('git', required: false)
scdoc = find_program('scdoc', required: false) scdoc = find_program('scdoc', required: false)
wayland_scanner = find_program('wayland-scanner') wayland_scanner = find_program('wayland-scanner')
version = get_option('sway-version') version = get_option('swaylock-version')
if version != '' if version != ''
version = '"@0@"'.format(version) version = '"@0@"'.format(version)
else else
@ -59,7 +59,7 @@ else
git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip() git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip()
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch) version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch)
endif endif
add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') add_project_arguments('-DSWAYLOCK_VERSION=@0@'.format(version), language: 'c')
wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir') wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')

2
meson_options.txt
View File

@ -1,4 +1,4 @@
option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.') option('swaylock-version', type : 'string', description: 'The version string reported in `swaylock --version`.')
option( option(
'pam', 'pam',
type: 'combo', type: 'combo',

4
swaylock.1.scd
View File

@ -167,5 +167,5 @@ Locks your Wayland session.
# AUTHORS # AUTHORS
Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open Maintained by Drew DeVault <sir@cmpwn.com>, who is assisted by other open
source contributors. For more information about sway development, see source contributors. For more information about swaylock development, see
https://github.com/swaywm/sway. https://github.com/swaywm/swaylock.