diff options
author | TBK <tbk@jjtc.eu> | 2019-02-11 15:29:11 +0100 |
---|---|---|
committer | Andy Postnikov <apostnikov@gmail.com> | 2019-04-05 01:20:09 +0300 |
commit | 104351b970d01c7fc030f994865f4cf3019b5521 (patch) | |
tree | 3065caae0d34717554f6c0430dcbd811bcfd5843 | |
parent | 9ab658975164fba3a87c84f81da05828ac2815f4 (diff) | |
download | aports-104351b970d01c7fc030f994865f4cf3019b5521.tar.bz2 aports-104351b970d01c7fc030f994865f4cf3019b5521.tar.xz |
community/gammu: upgrade to 1.40.0
-rw-r--r-- | community/gammu/APKBUILD | 25 | ||||
-rw-r--r-- | community/gammu/disable-at-charset-test.patch | 23 |
2 files changed, 11 insertions, 37 deletions
diff --git a/community/gammu/APKBUILD b/community/gammu/APKBUILD index df41458520..3b4d0c4b42 100644 --- a/community/gammu/APKBUILD +++ b/community/gammu/APKBUILD @@ -2,39 +2,37 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to> pkgname=gammu -pkgver=1.39.0 -pkgrel=2 +pkgver=1.40.0 +pkgrel=0 pkgdesc="Gammu provides an abstraction layer for cell phones access" url="https://wammu.eu/" arch="all" license="GPL-2.0-or-later" -depends="dialog bluez" -makedepends="unixodbc-dev libdbi-dev postgresql-dev - bluez-dev mysql-dev libusb-dev curl-dev cmake doxygen linux-headers" -subpackages="$pkgname-smsd:_smsd $pkgname-doc $pkgname-dev $pkgname-libs" +depends="bluez dialog" +makedepends="bluez-dev cmake curl-dev doxygen gettext-dev libdbi-dev libintl + libusb-dev linux-headers mysql-dev postgresql-dev unixodbc-dev" +subpackages="$pkgname-smsd:_smsd $pkgname-doc $pkgname-dev + $pkgname-libs $pkgname-lang" source="https://dl.cihar.com/$pkgname/releases/${pkgname}-${pkgver}.tar.bz2 - disable-at-charset-test.patch include-sys-select-h.patch " -builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" cmake . -DBUILD_SHARED_LIBS=ON \ -DCMAKE_INSTALL_PREFIX="/usr" \ -DWITH_NOKIA_SUPPORT=ON \ -DWITH_BLUETOOTH=ON \ - -DWITH_IRDA=ON + -DWITH_IRDA=ON \ + -DLIBINTL_INCLUDE_DIRS:PATH=$(INTL_PREFIX)/include \ + -DLIBINTL_LIBRARIES:STRING=intl make } check() { - cd "$builddir" make test } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -48,6 +46,5 @@ _smsd() { "$pkgdir"/usr/bin/gammu-smsd-inject "$subpkgdir"/usr/bin } -sha512sums="ed8994f6ec25d8ddbed23680e8a02db05c8e7f85aa6b8c0d409b5e8377e7c9e07fc61e62d80f6741d648709fb58a10ec631155d8b1ffc1c7d3b6e425cf53c797 gammu-1.39.0.tar.bz2 -3963da83e7bf9138f676242d0b7fe8ce3c8da7fe34d7ac12b6d439c48d2754e55c2b5442b7773f58fdcf16aa23872c58426fbb079cecc59ba143055cda543fa4 disable-at-charset-test.patch +sha512sums="6dbab68f30567a501487cf4edf19e23b7b23b7b78e3dfff69fc8d3c95b62f74ee14fe25ca380eac071e67f1a523dfd69cb9137fe049bf6477dfcc94930b71ce9 gammu-1.40.0.tar.bz2 bcdbfa620dff24a01033bb670ec4dabae4c691224693d21105c6ca3cd30022b5825ad0669fd6325553b084d90bbde164113b08de7d102c7401d84076b9a59083 include-sys-select-h.patch" diff --git a/community/gammu/disable-at-charset-test.patch b/community/gammu/disable-at-charset-test.patch deleted file mode 100644 index 1ab18c89b8..0000000000 --- a/community/gammu/disable-at-charset-test.patch +++ /dev/null @@ -1,23 +0,0 @@ -Workaround for flaw in musl 1.1.8's CP437 char mapping - -FIXME: Remove this patch after musl upgrade. - -See: http://www.openwall.com/lists/musl/2017/11/22/2 ---- a/tests/at-charset.c -+++ b/tests/at-charset.c -@@ -93,15 +93,6 @@ - test_result(mywstrncmp(ubuffer, latin1text, sizeof(latin1text) / 2) == TRUE); - - #ifdef ICONV_FOUND -- Priv->Charset = AT_CHARSET_PCCP437; -- error = ATGEN_EncodeText(s, latin1text, sizeof(latin1text) / 2, buffer, sizeof(buffer), &result); -- gammu_test_result(error, "Encode - 3"); -- strconv_test_result(latin1cp437, buffer, result); -- -- error = ATGEN_DecodeText(s, buffer, result, ubuffer, sizeof(ubuffer), FALSE, FALSE); -- gammu_test_result(error, "Decode - 3"); -- test_result(mywstrncmp(ubuffer, latin1text, sizeof(latin1text) / 2) == TRUE); -- - Priv->Charset = AT_CHARSET_ISO88591; - error = ATGEN_EncodeText(s, latin1text, sizeof(latin1text) / 2, buffer, sizeof(buffer), &result); - gammu_test_result(error, "Encode - 4"); |