wayland/hikari/patches/no-locker.patch

   1 --- a/Makefile
   2 +++ b/Makefile
   3 @@ -177,7 +177,7 @@
   4  PROTOCOL_HEADERS += wlr-layer-shell-unstable-v1-protocol.h
   5  .endif
   6
   7 -all: hikari hikari-unlocker
   8 +all: hikari
   9
  10  version.h:
  11         echo "#define HIKARI_VERSION \"${VERSION}\"" >> version.h
  12 @@ -191,9 +191,6 @@
  13  wlr-layer-shell-unstable-v1-protocol.h:
  14         wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
  15
  16 -hikari-unlocker: hikari_unlocker.c
  17 -       ${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
  18 -
  19  clean-doc:
  20         @test -e _darcs && echo "cleaning manpage" ||:
  21         @test -e _darcs && rm share/man/man1/hikari.1 2> /dev/null ||:
  22 @@ -206,7 +203,6 @@
  23         @rm ${OBJS} 2> /dev/null ||:
  24         @echo "cleaning executables"
  25         @rm hikari 2> /dev/null ||:
  26 -       @rm hikari-unlocker 2> /dev/null ||:
  27
  28  share/man/man1/hikari.1:
  29         pandoc -M title:"HIKARI(1) ${VERSION} | hikari - Wayland Compositor" -s \
  30 @@ -219,7 +215,6 @@
  31         @tar -s "#^#hikari-${VERSION}/#" -czf hikari-${VERSION}.tar.gz \
  32                 version.h \
  33                 main.c \
  34 -               hikari_unlocker.c \
  35                 include/hikari/*.h \
  36                 src/*.c \
  37                 protocol/*.xml \
  38 @@ -232,8 +227,7 @@
  39                 share/man/man1/hikari.1 \
  40                 share/backgrounds/hikari/hikari_wallpaper.png \
  41                 share/wayland-sessions/hikari.desktop \
  42 -               etc/hikari/hikari.conf \
  43 -               etc/pam.d/hikari-unlocker.*
  44 +               etc/hikari/hikari.conf
  45
  46  distclean: clean-doc
  47         @test -e _darcs && echo "cleaning version.h" ||:
  48 @@ -241,29 +235,24 @@
  49
  50  dist: distclean hikari-${VERSION}.tar.gz
  51
  52 -install: hikari hikari-unlocker share/man/man1/hikari.1
  53 +install: hikari share/man/man1/hikari.1
  54         mkdir -p ${DESTDIR}/${PREFIX}/bin
  55         mkdir -p ${DESTDIR}/${PREFIX}/share/man/man1
  56         mkdir -p ${DESTDIR}/${PREFIX}/share/backgrounds/hikari
  57         mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
  58         mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
  59 -       mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
  60         sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
  61         chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
  62         install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
  63 -       install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
  64         install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
  65         install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
  66         install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
  67 -       install -m 644 etc/pam.d/hikari-unlocker.${OS} ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
  68
  69  uninstall:
  70         -rm ${DESTDIR}/${PREFIX}/bin/hikari
  71 -       -rm ${DESTDIR}/${PREFIX}/bin/hikari-unlocker
  72         -rm ${DESTDIR}/${PREFIX}/share/man/man1/hikari.1
  73         -rm ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
  74         -rm ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
  75 -       -rm ${DESTDIR}/${ETC_PREFIX}/etc/pam.d/hikari-unlocker
  76         -rm ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
  77         -rmdir ${DESTDIR}/${ETC_PREFIX}/etc/hikari
  78         -rmdir ${DESTDIR}/${PREFIX}/share/backgrounds/hikari