From e877b0d7b5fef37124665950fea43c4b0f80184e Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Thu, 8 Oct 2015 13:40:40 +0000 Subject: community/telegram-cli: upgrade to 1.3.1 --- community/telegram-cli/APKBUILD | 57 +++++++++++++++------- .../telegram-cli/makefile-remove-werror.patch | 11 +++++ .../telegram-cli/makefile-tl-parser-nocrc32.patch | 16 ++++++ community/telegram-cli/musl-include-fix.patch | 14 ++++++ community/telegram-cli/musl-no-execinfo.patch | 31 ------------ 5 files changed, 81 insertions(+), 48 deletions(-) create mode 100644 community/telegram-cli/makefile-remove-werror.patch create mode 100644 community/telegram-cli/makefile-tl-parser-nocrc32.patch create mode 100644 community/telegram-cli/musl-include-fix.patch delete mode 100644 community/telegram-cli/musl-no-execinfo.patch diff --git a/community/telegram-cli/APKBUILD b/community/telegram-cli/APKBUILD index 00ce72aa72..248ce8a558 100644 --- a/community/telegram-cli/APKBUILD +++ b/community/telegram-cli/APKBUILD @@ -1,27 +1,38 @@ # Contributor: Carlo Landmeter # Maintainer: Leonardo Arena -pkgname=telegram-cli -pkgver=1.0.5.1 +pkgname=tg +pkgver=1.3.1 pkgrel=0 -pkgdesc="Command line telegram client" +tglver=2.0.1 +tlparserver=master +pkgdesc="Command line Telegram client" url="https://github.com/vysheng/tg" arch="all" license="GPL3" depends="" -depends_dev="readline-dev openssl-dev libconfig-dev libevent-dev" -makedepends="$depends_dev" +depends_dev="readline-dev openssl-dev libconfig-dev libevent-dev jansson-dev" +makedepends="$depends_dev zlib-dev" subpackages="" -source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz - 0001-uclibc-does-not-provide-aio.h.patch - 0001-change-public-key-location.patch" -source="$pkgname-$pkgver.tar.gz::https://github.com/vysheng/tg/archive/1.0.5.1.tar.gz - musl-no-execinfo.patch" +provides="telegram-cli" +source="$pkgname-$pkgver.tar.gz::https://github.com/vysheng/tg/archive/$pkgver.tar.gz + tgl-$tglver.tar.gz::https://github.com/vysheng/tgl/archive/$tglver.tar.gz + tl-parser.zip::https://github.com/vysheng/tl-parser/archive/$tlparserver.zip + + makefile-tl-parser-nocrc32.patch + musl-include-fix.patch + makefile-remove-werror.patch + " +pkgusers="telegram" +pkggroups="telegram" _builddir="$srcdir/tg-$pkgver" prepare() { - local i cd "$_builddir" + mv "$srcdir"/tl-parser-$tlparserver/* "$srcdir/tgl-$tglver/tl-parser" || return 1 + mv "$srcdir"/tgl-$tglver/* "$srcdir/tg-$pkgver/tgl" || return 1 + + local i for i in $source; do case $i in *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; @@ -52,9 +63,21 @@ package() { "$pkgdir"/etc/telegram-cli/tg.pub || return 1 } -md5sums="0a9ba9b2461c9898a88a4c0957be39c3 telegram-cli-1.0.5.1.tar.gz -55c83ab374b22146b95ad0e22a25ecc1 musl-no-execinfo.patch" -sha256sums="5a78fd46e978ff450eda6f4664499042dddf053f4fe233fe3157499869646fb8 telegram-cli-1.0.5.1.tar.gz -3ca117bc4ee7ce3e7ef161b56b0d833756ed4c60583f3fe420e50d7e8c5a0de4 musl-no-execinfo.patch" -sha512sums="2d3f9e246b3caf60348cd2d02c16e2f45ac127f2d28d58f77ae890214354bc9ed16229a43d6d335fdbce2ce4ac339da9fb3beecda5143c13d5a5cfae66578621 telegram-cli-1.0.5.1.tar.gz -50bf535dc420e53b20d385625247ea9d5df58c93b3d25cbd7757486df428f59831e71a9a377c71745c9332c5e30c49a85012520a9fabe3c06786aa41400c24ad musl-no-execinfo.patch" +md5sums="42ce2a35dd124102885c81d70528ee0b tg-1.3.1.tar.gz +50c87ee147041ed51685965ab0affeb0 tgl-2.0.1.tar.gz +0277d192fd8261f1c286fdb41e052ef5 tl-parser.zip +a2408b394eac8b62e0720bce4eb43135 makefile-tl-parser-nocrc32.patch +d9c455bc5c5fad592484154b2029a326 musl-include-fix.patch +8139da32fa804ccb067f28e00daee6ca makefile-remove-werror.patch" +sha256sums="b70b1d8b97b44086b64e467f81c6aceb8263092c26a8cf1a7d717eb1b5360415 tg-1.3.1.tar.gz +549bbfc46715bae31b50a54cc21eefd61109cd28dcdddbe4e53726aec3d924f1 tgl-2.0.1.tar.gz +25dbd43c6f8e3ad5380cfbd90e12240ab0e116b620769a3845694451bafbd4f7 tl-parser.zip +8aa3dea75834261a64604d0937ecd40afa9ddc6f69a2f07a0311123abbf34534 makefile-tl-parser-nocrc32.patch +8bcb0b1ca402f7b456022ac1a94e78f3bbc3fd7678a23c09d18eacbdf7338557 musl-include-fix.patch +0023266966b1d4de099ec1d91b06dcb9aeb578ed6db894dca06bb0880af78e5e makefile-remove-werror.patch" +sha512sums="ac8341e8f951922fa78a1db74d9b1a87b03c3339307bd9c46da71656d8d6e55bf0b546abba1638ae01843341a4d2134b6ab244e15547e8806d74b21ac1306114 tg-1.3.1.tar.gz +5d16a0e9c6e63ce91238501520e7699164298d9e6e275d8b90da675cca6d0b09944888d95320482e8e232d1bd540dbe80cfe58ac7d70f3157a4372c7fd550366 tgl-2.0.1.tar.gz +396b8bf55b517c9c051a83f8812c4c245f30de506ab1381f36a6c353f229681297d9ad1983f89fa15f1f92e4f5413d78d45b12602c8425447c6ef1c9cc43d060 tl-parser.zip +b61e5907c6cf035ce067cfbc19995a04afa1f04cef00be52a02943e850d4a2754dba67732fa6ca958f2e48a741b2048fb38652c17b73e46359c550257e563f42 makefile-tl-parser-nocrc32.patch +4e26e7421db48b7074197e4cea1c6a6fce33a2b259f0da0e378f9a83f115e961016586b63d960d491cb5c4866fffbf454a5e0eda47ad16b3b77d117c8508f1f2 musl-include-fix.patch +1f8fab90948079abc94169751851347a6753dc13cf19973ba05a6f533ac173ba6ce70863988f2b167c27a347f4aeaa710c70cc960c0ba4090c43461386f8b217 makefile-remove-werror.patch" diff --git a/community/telegram-cli/makefile-remove-werror.patch b/community/telegram-cli/makefile-remove-werror.patch new file mode 100644 index 0000000000..19359d567d --- /dev/null +++ b/community/telegram-cli/makefile-remove-werror.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -4,7 +4,7 @@ + LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@ + CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@ + DEFS=@DEFS@ +-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Werror -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC ++COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC + + EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@ + LOCAL_LDFLAGS=-rdynamic -ggdb -levent ${EXTRA_LIBS} diff --git a/community/telegram-cli/makefile-tl-parser-nocrc32.patch b/community/telegram-cli/makefile-tl-parser-nocrc32.patch new file mode 100644 index 0000000000..7e16ef61de --- /dev/null +++ b/community/telegram-cli/makefile-tl-parser-nocrc32.patch @@ -0,0 +1,16 @@ +--- a/tgl/Makefile.tl-parser ++++ b/tgl/Makefile.tl-parser +@@ -1,4 +1,4 @@ +-TL_PARSER_OBJECTS=${OBJ}/tl-parser.o ${OBJ}/tlc.o ${OBJ}/crc32.o ++TL_PARSER_OBJECTS=${OBJ}/tl-parser.o ${OBJ}/tlc.o + + ${TL_PARSER_OBJECTS}: ${OBJ}/%.o: ${srcdir}/tl-parser/%.c | create_dirs + ${CC} ${INCLUDE} ${COMPILE_FLAGS} -iquote ${srcdir}/tl-parser -c -MP -MD -MF ${DEP}/$*.d -MQ ${OBJ}/$*.o -o $@ $< +--- a/Makefile.tl-parser ++++ b/Makefile.tl-parser +@@ -1,4 +1,4 @@ +-TL_PARSER_OBJECTS=${OBJ}/tl-parser.o ${OBJ}/tlc.o ${OBJ}/crc32.o ++TL_PARSER_OBJECTS=${OBJ}/tl-parser.o ${OBJ}/tlc.o + + ${TL_PARSER_OBJECTS}: ${OBJ}/%.o: ${srcdir}/tgl/tl-parser/%.c | create_dirs + ${CC} ${INCLUDE} ${COMPILE_FLAGS} -iquote ${srcdir}/tgl/tl-parser -c -MP -MD -MF ${DEP}/$*.d -MQ ${OBJ}/$*.o -o $@ $< diff --git a/community/telegram-cli/musl-include-fix.patch b/community/telegram-cli/musl-include-fix.patch new file mode 100644 index 0000000000..a6cb63f2c7 --- /dev/null +++ b/community/telegram-cli/musl-include-fix.patch @@ -0,0 +1,14 @@ +--- a/tgl/generate.c ++++ b/tgl/generate.c +@@ -25,7 +25,11 @@ + + #include + #include ++ ++#ifdef HAVE_EXECINFO_H + #include ++#endif ++ + #include + #include + #include diff --git a/community/telegram-cli/musl-no-execinfo.patch b/community/telegram-cli/musl-no-execinfo.patch deleted file mode 100644 index bf63892a2b..0000000000 --- a/community/telegram-cli/musl-no-execinfo.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/generate.c.orig -+++ b/generate.c -@@ -25,7 +25,6 @@ - - #include - #include --#include - #include - #include - #include ---- a/tlc.c.orig -+++ b/tlc.c -@@ -35,7 +35,6 @@ - - #include - #include "config.h" --#include - #include - - int verbosity; ---- a/net.c.orig -+++ b/net.c -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -- cgit v1.2.3