- update to i3lock-2.14.1
- adapt for switch to meson ok aja@
This commit is contained in:
parent
2a83757cc3
commit
dd0a9e65b1
@ -2,7 +2,7 @@ COMMENT = improved screen locker
|
||||
|
||||
GH_ACCOUNT = i3
|
||||
GH_PROJECT = i3lock
|
||||
GH_TAGNAME = 2.13
|
||||
GH_TAGNAME = 2.14.1
|
||||
|
||||
CATEGORIES = x11
|
||||
|
||||
@ -14,20 +14,18 @@ MAINTAINER = Jasper Lievisse Adriaanse <jasper@openbsd.org>
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
MASTER_SITES = https://i3wm.org/i3lock/
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
EXTRACT_SUFX = .tar.xz
|
||||
|
||||
WANTLIB += c cairo ev m xcb xcb-image xcb-shm xcb-randr iconv xcb-xrm
|
||||
WANTLIB += c cairo ev m xcb xcb-image xcb-randr xcb-xrm
|
||||
WANTLIB += xcb-util xcb-xinerama xcb-xkb xkbcommon xkbcommon-x11
|
||||
|
||||
MODULES = devel/meson
|
||||
|
||||
LIB_DEPENDS = devel/libev \
|
||||
graphics/cairo \
|
||||
x11/xkbcommon
|
||||
|
||||
AUTOCONF_VERSION = 2.69
|
||||
CONFIGURE_STYLE = autoconf
|
||||
CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
CPPFLAGS="-I${LOCALBASE}/include"
|
||||
|
||||
USE_GMAKE = Yes
|
||||
CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
CPPFLAGS="-I${LOCALBASE}/include"
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (i3lock-2.13.tar.bz2) = Y3/omKyzJDN9PrxPzbLjkLCCFH/cigzabBnn85WWXws=
|
||||
SIZE (i3lock-2.13.tar.bz2) = 149332
|
||||
SHA256 (i3lock-2.14.1.tar.xz) = Bi7yfroLxaDHrpH3t8u/A7MW1qSf6ApY/J8gwYpOaEM=
|
||||
SIZE (i3lock-2.14.1.tar.xz) = 28756
|
||||
|
@ -1,12 +0,0 @@
|
||||
Index: Makefile.in
|
||||
--- Makefile.in.orig
|
||||
+++ Makefile.in
|
||||
@@ -988,7 +988,7 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
-install-data-am: install-man install-pamdDATA
|
||||
+install-data-am: install-man
|
||||
|
||||
install-dvi: install-dvi-am
|
||||
|
@ -1,14 +0,0 @@
|
||||
GNU libiconv provides libiconv_open() which is mapped to iconv_open()
|
||||
|
||||
Index: configure.ac
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
@@ -87,7 +87,7 @@ case "$host" in
|
||||
;;
|
||||
esac
|
||||
|
||||
-AC_SEARCH_LIBS([iconv_open], [iconv], , [AC_MSG_FAILURE([cannot find the required iconv_open() function despite trying to link with -liconv])])
|
||||
+AC_SEARCH_LIBS([libiconv_open], [iconv], , [AC_MSG_FAILURE([cannot find the required iconv_open() function despite trying to link with -liconv])])
|
||||
|
||||
dnl Each prefix corresponds to a source tarball which users might have
|
||||
dnl downloaded in a newer version and would like to overwrite.
|
25
x11/i3lock/patches/patch-meson_build
Normal file
25
x11/i3lock/patches/patch-meson_build
Normal file
@ -0,0 +1,25 @@
|
||||
Index: meson.build
|
||||
--- meson.build.orig
|
||||
+++ meson.build
|
||||
@@ -118,6 +118,12 @@ host_os = host_machine.system()
|
||||
if host_os != 'openbsd'
|
||||
pam_dep = cc.find_library('pam', required: true)
|
||||
i3lock_deps += [pam_dep]
|
||||
+
|
||||
+ install_subdir(
|
||||
+ 'pam',
|
||||
+ strip_directory: true,
|
||||
+ install_dir: join_paths(get_option('sysconfdir'), 'pam.d'),
|
||||
+ )
|
||||
endif
|
||||
|
||||
inc = include_directories('include')
|
||||
@@ -130,8 +136,3 @@ executable(
|
||||
dependencies: i3lock_deps,
|
||||
)
|
||||
|
||||
-install_subdir(
|
||||
- 'pam',
|
||||
- strip_directory: true,
|
||||
- install_dir: join_paths(get_option('sysconfdir'), 'pam.d'),
|
||||
-)
|
Loading…
x
Reference in New Issue
Block a user