Skip to content

Commit 1aa128e

Browse files
committed
network-manager-sstp: adjust for release-1.3.2-1 tag
sstp-client: fix dependencies ordering.
1 parent 1f448e8 commit 1aa128e

3 files changed

Lines changed: 17 additions & 27 deletions

File tree

srcpkgs/network-manager-sstp/template

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,21 @@
22
pkgname=network-manager-sstp
33
version=1.3.2
44
revision=1
5+
_extraver=-1
56
build_style=gnu-configure
6-
7-
configure_args="--prefix=/usr
8-
--libdir=/usr/lib
9-
--with-pppd-plugin-dir=/usr/lib/pppd/2.5.0
10-
--with-gnome
11-
--with-gtk4
12-
--disable-gtk-doc
13-
--disable-static"
14-
15-
hostmakedepends="automake gettext-devel libtool intltool pkg-config"
16-
7+
configure_args="--with-pppd-plugin-dir=/usr/lib/pppd/2.5.0
8+
--with-gnome
9+
--with-gtk4
10+
--disable-gtk-doc
11+
--disable-static"
12+
hostmakedepends="pkg-config intltool autoconf automake libtool gettext-devel-tools glib-devel gtk4-devel"
1713
makedepends="NetworkManager-devel glib-devel gnutls-devel gtk+3-devel gtk4-devel libnma-devel libsecret-devel ppp-devel sstp-client-devel"
18-
1914
depends="NetworkManager sstp-client"
20-
2115
short_desc="NetworkManager VPN plugin for SSTP"
2216
maintainer="kalelidev <gxiime@gmail.com>"
2317
license="GPL-2.0-or-later"
2418
homepage="https://gitlab.gnome.org/GNOME/network-manager-sstp"
25-
distfiles="${homepage}/-/archive/release-${version}-1/network-manager-sstp-release-${version}-1.tar.bz2"
19+
distfiles="${homepage}/-/archive/release-${version}${_extraver}/network-manager-sstp-release-${version}${_extraver}.tar.bz2"
2620
checksum="2c7b7914224b827add0312551c575540497920f2ca3ea01c11787d38f0ae4c62"
2721

2822
pre_configure() {
@@ -31,8 +25,7 @@ pre_configure() {
3125

3226
do_install() {
3327
make DESTDIR="${DESTDIR}" install
34-
find "${DESTDIR}" -name '*.la' -delete
35-
find "${DESTDIR}" -name '*.a' -delete
28+
find "${DESTDIR}" \( -name '*.la' -o -name '*.a' \) -delete
3629
}
3730

3831
network-manager-sstp-gnome_package() {
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
site="https://gitlab.gnome.org/GNOME/network-manager-sstp/-/tags"
2+
pattern="release-\K[\d.]+(-\d+)?"

srcpkgs/sstp-client/template

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,17 @@ pkgname=sstp-client
33
version=1.0.20
44
revision=1
55
build_style=gnu-configure
6+
configure_args="--with-runtime-dir=/var/run/sstpc
7+
--with-pppd-plugin-dir=/usr/lib/pppd/2.5.0"
8+
hostmakedepends="pkg-config libtool"
9+
makedepends="ppp-devel libevent-devel openssl-devel"
10+
depends="ppp ca-certificates"
611
short_desc="Secure Socket Tunneling Protocol (SSTP) client"
712
maintainer="kalelidev <gxiime@gmail.com>"
813
license="GPL-2.0-or-later"
914
homepage="https://gitlab.com/sstp-project/sstp-client"
1015
distfiles="https://gitlab.com/sstp-project/sstp-client/-/releases/${version}/downloads/dist-gzip/sstp-client-${version}.tar.gz"
1116
checksum="6c84b6cdcc21ebea6daeb8c5356dcdfd8681f4981a734f8485ed0b31fc30aadd"
12-
13-
_pppver=2.5.0
14-
15-
configure_args="--prefix=/usr
16-
--with-runtime-dir=/var/run/sstpc
17-
--with-pppd-plugin-dir=/usr/lib/pppd/${_pppver}"
18-
19-
hostmakedepends="pkg-config libtool"
20-
makedepends="ppp-devel libevent-devel openssl-devel"
21-
depends="ppp ca-certificates"
2217
make_dirs="/var/run/sstpc 0755 root root"
2318
# No useful testsuite upstream
2419
make_check="no"
@@ -31,6 +26,6 @@ sstp-client-devel_package() {
3126
vmove usr/lib/pkgconfig
3227
vmove usr/lib/libsstp_api.so
3328
vmove "usr/lib/*.a" 2>/dev/null || :
34-
vmove "usr/lib/pppd/${_pppver}/*.a"
29+
vmove "usr/lib/pppd/2.5.0/*.a"
3530
}
3631
}

0 commit comments

Comments
 (0)