diff options
| author | Stuart Cardall <developer@it-offshore.co.uk> | 2016-09-05 13:58:07 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-09-15 21:24:02 +0200 |
| commit | d21d4905463308399a98f32fb7d78d584d3ce92c (patch) | |
| tree | 66c540b0285f7b0c5349187eda84020d086f53c5 /community/modemmanager | |
| parent | d4f73849851bf9411b3f89499fda35dc1bc7a132 (diff) | |
| download | aports-d21d4905463308399a98f32fb7d78d584d3ce92c.tar.bz2 aports-d21d4905463308399a98f32fb7d78d584d3ce92c.tar.xz | |
community/modemmanager: update to 1.6.0
Diffstat (limited to 'community/modemmanager')
| -rw-r--r-- | community/modemmanager/APKBUILD | 33 | ||||
| -rw-r--r-- | community/modemmanager/no-XCASE.patch | 35 |
2 files changed, 10 insertions, 58 deletions
diff --git a/community/modemmanager/APKBUILD b/community/modemmanager/APKBUILD index 065afac57c..0587758b90 100644 --- a/community/modemmanager/APKBUILD +++ b/community/modemmanager/APKBUILD @@ -1,34 +1,22 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=modemmanager -pkgver=1.4.14 +pkgver=1.6.0 pkgrel=0 pkgdesc="ModemManager library" url="http://www.freedesktop.org/wiki/Software/ModemManager" arch="all" license="GPL2, LGPL2.1" -depends_dev="" makedepends="$depends_dev gobject-introspection-dev gtk-doc intltool vala libgudev-dev polkit-dev libmbim-dev libqmi-dev linux-headers" subpackages="$pkgname-dev $pkgname-lang $pkgname-doc libmm-glib:libmm libmm-glib-dev:libmmdev" source="http://www.freedesktop.org/software/ModemManager/ModemManager-$pkgver.tar.xz - no-XCASE.patch $pkgname.rules " - -_builddir="$srcdir"/ModemManager-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +builddir="$srcdir"/ModemManager-$pkgver build() { - cd "$_builddir" + cd "$builddir" export CFLAGS="$CFLAGS -Wno-error" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -42,6 +30,8 @@ build() { --with-newest-qmi-commands \ --with-dbus-sys-dir=/etc/dbus-1 \ --enable-vala=yes \ + --without-mbim \ + --without-qmi \ || return 1 # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool @@ -49,7 +39,7 @@ build() { } libmm() { - cd "$_builddir" + cd "$builddir" mkdir -p "$subpkgdir" make DESTDIR="$subpkgdir" -C libmm-glib install || return 1 make DESTDIR="$subpkgdir" -C vapi install || return 1 @@ -64,7 +54,7 @@ libmmdev() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" -C libmm-glib uninstall || return 1 make DESTDIR="$pkgdir" -C vapi uninstall || return 1 @@ -83,12 +73,9 @@ To control your modem without the root password: add your user account to the 'p EOF } -md5sums="cabb72e7c2ddf6af96eca2c9f3d168a3 ModemManager-1.4.14.tar.xz -63288189ea454e9712dc26d76d75277d no-XCASE.patch +md5sums="d9d93d2961ee35b4cd8a75a6a8631cb4 ModemManager-1.6.0.tar.xz 735e155a785554349906c09dd36d3866 modemmanager.rules" -sha256sums="abe6cdd515a774bcba3afdcdb1e504569801e79282ccdf26099f33cbb8731ba2 ModemManager-1.4.14.tar.xz -5e5b87b580faf14e4c56ccc7f9f189522742a64ab365b26751dcc86e68dedb87 no-XCASE.patch +sha256sums="a94f4657a8fa6835e2734fcc6edf20aa8c8d452f62299d7748541021c3eb2445 ModemManager-1.6.0.tar.xz 577807e59b1e95757a4d94922c66f7f36487922c5092a6c148e7db6a4dc6afe8 modemmanager.rules" -sha512sums="2fb5517cd3fbd98cf4048cec326fabf18fb26d88b75e56208d1ed64d70d72d6e826ef30391c86fbcfe4d69661194bcfbb55d545db10ebe8baf8ef16a3c580446 ModemManager-1.4.14.tar.xz -5c537e4a86212339d0c41ae3e1055513051a0d6e51bdf2547a38054fbe802feeac2ff46c863ab69423a6693ac33ebacec7a771d4b270aeb5fe6e6bb601361f23 no-XCASE.patch +sha512sums="66f1ff1c872e360a56b5b6c6d4071544b6c6e0423f3c825d3ea8383898e80a177eb9efdf82538ca6fa02ae8db464d3aa8bbe226f195e7065f074b75c115a5182 ModemManager-1.6.0.tar.xz 3c76ee577334e25c836857f8e7fef6a249cdd9fcd8f889cb64d9c1667bc6a95c087267a153bddd1a13256c59f8cd578ccb448e6b9cb54b73bb74acb8a0ca1e3f modemmanager.rules" diff --git a/community/modemmanager/no-XCASE.patch b/community/modemmanager/no-XCASE.patch deleted file mode 100644 index 1de41f753d..0000000000 --- a/community/modemmanager/no-XCASE.patch +++ /dev/null @@ -1,35 +0,0 @@ -## http://man7.org/linux/man-pages/man3/termios.3.html -## XCASE (not in POSIX; not supported under Linux) ---- ModemManager-1.4.6/libqcdm/src/com.c -+++ ModemManager-1.4.6.new/libqcdm/src/com.c -@@ -39,7 +39,7 @@ - stbuf.c_iflag &= ~(HUPCL | IUTF8 | IUCLC | ISTRIP | IXON | IXOFF | IXANY | ICRNL); - stbuf.c_oflag &= ~(OPOST | OCRNL | ONLCR | OLCUC | ONLRET); - stbuf.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO | ECHOE | ECHOK | ECHONL); -- stbuf.c_lflag &= ~(NOFLSH | XCASE | TOSTOP | ECHOPRT | ECHOCTL | ECHOKE); -+ stbuf.c_lflag &= ~(NOFLSH | TOSTOP | ECHOPRT | ECHOCTL | ECHOKE); - stbuf.c_cc[VMIN] = 1; - stbuf.c_cc[VTIME] = 0; - stbuf.c_cc[VEOF] = 1; ---- ModemManager-1.4.6/libwmc/src/com.c -+++ ModemManager-1.4.6.new/libwmc/src/com.c -@@ -39,7 +39,7 @@ - stbuf.c_iflag &= ~(HUPCL | IUTF8 | IUCLC | ISTRIP | IXON | IXOFF | IXANY | ICRNL); - stbuf.c_oflag &= ~(OPOST | OCRNL | ONLCR | OLCUC | ONLRET); - stbuf.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO | ECHOE | ECHOK | ECHONL); -- stbuf.c_lflag &= ~(NOFLSH | XCASE | TOSTOP | ECHOPRT | ECHOCTL | ECHOKE); -+ stbuf.c_lflag &= ~(NOFLSH | TOSTOP | ECHOPRT | ECHOCTL | ECHOKE); - stbuf.c_cc[VMIN] = 1; - stbuf.c_cc[VTIME] = 0; - stbuf.c_cc[VEOF] = 1; ---- ModemManager-1.4.6/src/mm-port-serial.c -+++ ModemManager-1.4.6.new/src/mm-port-serial.c -@@ -455,7 +455,7 @@ - - stbuf.c_iflag &= ~(IGNCR | ICRNL | IUCLC | INPCK | IXON | IXANY ); - stbuf.c_oflag &= ~(OPOST | OLCUC | OCRNL | ONLCR | ONLRET); -- stbuf.c_lflag &= ~(ICANON | XCASE | ECHO | ECHOE | ECHONL); -+ stbuf.c_lflag &= ~(ICANON | ECHO | ECHOE | ECHONL); - stbuf.c_lflag &= ~(ECHO | ECHOE); - stbuf.c_cc[VMIN] = 1; - stbuf.c_cc[VTIME] = 0; |