Skip to content

Commit

Permalink
x11/slick-greeter: Fix dependencies and prefix issues
Browse files Browse the repository at this point in the history
Summary:
- Add dependencies harfbuzz, numlockx, python, dconf, pygobject3
- Fix slick-greeter-check-hidpi and slick-greeter-set-keyboard-layout
  commands by adding python dependency, fixing shebang paths, and
  installing under correct ${PREFIX} location
- Patch numerous other /usr and /etc prefix issues
- Add more detail to pkg-descr to support users choosing a greeter

Differential Revision: https://reviews.freebsd.org/D31631
  • Loading branch information
woodsb02 committed Aug 25, 2021
1 parent e1b1dfd commit 5673aff
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 24 deletions.
35 changes: 24 additions & 11 deletions x11/slick-greeter/Makefile
Expand Up @@ -3,21 +3,24 @@
PORTNAME= slick-greeter
PORTVERSION= 1.5.3
CATEGORIES= x11
PORTREVISION= 1

MAINTAINER= ericbsd@FreeBSD.org
COMMENT= Slick-looking LightDM greeter

LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= liblightdm-gobject-1.so:x11/lightdm \
libcanberra-gtk3.so:audio/libcanberra-gtk3 \
LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \
libcanberra.so:audio/libcanberra \
libfreetype.so:print/freetype2
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
liblightdm-gobject-1.so:x11/lightdm
BUILD_DEPENDS= valac:lang/vala
RUN_DEPENDS= numlockx>=0:x11/numlockx

USES= autoreconf gettext gmake gnome localbase pkgconfig xorg
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USES= autoreconf gettext gmake gnome localbase pkgconfig python:run shebangfix xorg
USE_GNOME= cairo dconf gdkpixbuf2 gtk30 intltool pygobject3

USE_XORG= pixman x11 xext

Expand All @@ -26,15 +29,25 @@ GH_ACCOUNT= linuxmint

GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
SHEBANG_FILES= files/usr/bin/slick-greeter-check-hidpi \
files/usr/bin/slick-greeter-set-keyboard-layout \
makepot
bash_OLD_CMD= /usr/bin/bash
bash_CMD= /bin/sh

GLIB_SCHEMAS= x.dm.slick-greeter.gschema.xml

post-patch:
@${REINPLACE_CMD} -e "s#/usr/share#${PREFIX}/share#g" \
${WRKSRC}/src/session-list.vala

post-install:
@${MV} ${STAGEDIR}/usr/share/${PORTNAME}/badges ${STAGEDIR}${DATADIR}
@${RMDIR} ${STAGEDIR}/usr/share/${PORTNAME}/
@${REINPLACE_CMD} -e 's|"/usr|"${PREFIX}|g' \
-e 's|"/etc|"${PREFIX}/etc|g' \
${WRKSRC}/files/usr/bin/slick-greeter-set-keyboard-layout \
${WRKSRC}/src/session-list.vala \
${WRKSRC}/src/settings.vala \
${WRKSRC}/src/slick-greeter.vala \
${WRKSRC}/src/user-list.vala
@${RM} ${WRKSRC}/files/usr/bin/slick-greeter-set-keyboard-layout.bak
@${MKDIR} ${WRKSRC}/files/${PREFIX}
@${MV} ${WRKSRC}/files/usr/bin ${WRKSRC}/files/${PREFIX}/bin
@${MV} ${WRKSRC}/files/usr/share ${WRKSRC}/files/${PREFIX}/share

.include <bsd.port.mk>
11 changes: 0 additions & 11 deletions x11/slick-greeter/files/patch-src_settings.vala

This file was deleted.

16 changes: 16 additions & 0 deletions x11/slick-greeter/pkg-descr
@@ -1,3 +1,19 @@
A slick-looking LightDM greeter.

Features:
- Slick-Greeter is cross-distribution and should work pretty much anywhere.
- All panel applets are embedded. No external indicators are launched or loaded
by the greeter.
- No settings daemon are launched or loaded by the greeter.
- This greeter supports HiDPI.
- Sessions are validated. If a default/chosen session isn't present on the
system, the greeter scans for known sessions in /usr/share/xsessions and
replaces the invalid session choice with a valid session.
- You can take a screenshot by pressing PrintScrn. The screenshot is saved in
/var/lib/lightdm/Screenshot.png.
- The default configuration is stored in dconf under the schema
x.dm.slick-greeter.
- Users can create and modify /etc/lightdm/slick-greeter.conf, settings in this
files take priority and overwrite dconf settings.

WWW: https://github.com/linuxmint/slick-greeter
4 changes: 2 additions & 2 deletions x11/slick-greeter/pkg-plist
@@ -1,5 +1,5 @@
/usr/bin/slick-greeter-check-hidpi
/usr/bin/slick-greeter-set-keyboard-layout
bin/slick-greeter-check-hidpi
bin/slick-greeter-set-keyboard-layout
man/man1/slick-greeter-check-hidpi.1.gz
man/man1/slick-greeter-set-keyboard-layout.1.gz
man/man8/slick-greeter.8.gz
Expand Down

0 comments on commit 5673aff

Please sign in to comment.