Giovanni Bechis wrote:
> On Sat, Jan 25, 2020 at 09:26:53PM +0100, Stefan Hagen wrote:
>> Giovanni Bechis wrote:
>>> On Sat, Jan 25, 2020 at 09:38:23AM +0100, Stefan Hagen wrote:
>>>> The BROKEN condition still applies. The code parse_tlo_file has not
>>>> changed.
>>>>
>>> afaik this is BROKEN-sparc64 as well, otherwise ok giovanni@
>>
>> Correct, it hits the same assertion on sparc64.
>> http://build-failures.rhaalovely.net/sparc64/2020-01-23/net/telegram-purple.log
>>
>> Updated patch below.
>>
> ok giovanni@ on this version as well.
> Giovanni
Hello,
This is yet another update to telegram-purple. This time to version
1.4.6. I'm using it with pidgin right now. My tests:
- Text messages work fine
- File attachments are working
- Images work when sent as attachments
- Images show "loading document or picture failed" if sent as image
(silently discarded in previous version)
- Static stickers are working (animates ones are silently discarded)
- "Saved Messages" are now supported
Changes:
https://github.com/majn/telegram-purple/releases
Port Changes:
* coreutils as build dependency (gsha256sum)
* post-patch sed sha256sum ->gsha256sum
* png wantlib
* updated patches
I did not add BROKEN-sparc64 anymore as this is covered by
NOT_FOR_ARCHS = ${BE_ARCHS}, which got added meanwhile.
portcheck, port-lib-depends-check: ok on amd64
make test: ok
The port tree still has version 1.3.1 from Apr 10, 2017.
This version is not working reliable anymore. So I'd really
like to see this one to go in... pretty please? :-)
OK?
Best Regards,
Stefan
Index: net/telegram-purple/Makefile
===================================================================
RCS file: /cvs/ports/net/telegram-purple/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- net/telegram-purple/Makefile 25 Mar 2020 15:03:07 -0000 1.7
+++ net/telegram-purple/Makefile 4 Jan 2021 09:34:39 -0000
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2020/03/25 15:03:07 tb Exp $
-# assertion "get_int () == TLS_SCHEMA_V2" failed: file "generate.c", line 2831, function "parse_tlo_file"
+# assertion "get_int () == TLS_SCHEMA_V2" failed: file "generate.c",
+# line 2831, function "parse_tlo_file"
NOT_FOR_ARCHS = ${BE_ARCHS}
-V = 1.3.1
-REVISION = 2
+V = 1.4.6
COMMENT = Telegram support for Pidgin
DISTNAME = telegram-purple_$V.orig
PKGNAME = telegram-purple-$V
@@ -13,11 +13,12 @@ CATEGORIES = net
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += gcrypt glib-2.0 intl purple webp z
+WANTLIB += gcrypt glib-2.0 intl png purple webp z
MASTER_SITES = https://github.com/majn/telegram-purple/releases/download/v$V/
-BUILD_DEPENDS = devel/gettext,-tools
+BUILD_DEPENDS = devel/gettext,-tools \
+ sysutils/coreutils
LIB_DEPENDS = devel/gettext,-runtime \
graphics/libwebp \
net/pidgin,-libpurple \
@@ -31,6 +32,10 @@ CFLAGS += -I${LOCALBASE}/include
LDFLAGS = -L${LOCALBASE}/lib
WRKDIST = ${WRKDIR}/telegram-purple
+
+post-patch:
+ sed -i 's|sha256sum|gsha256sum|g' ${WRKDIST}/Makefile.in \
+ ${WRKDIST}/mkwindows.sh ${WRKDIST}/tgl/Makefile.in
post-install:
mv ${DESTDIR}/etc/telegram-purple ${PREFIX}/share/purple
Index: net/telegram-purple/distinfo
===================================================================
RCS file: /cvs/ports/net/telegram-purple/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- net/telegram-purple/distinfo 24 Jun 2017 00:20:17 -0000 1.1.1.1
+++ net/telegram-purple/distinfo 4 Jan 2021 09:34:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (telegram-purple_1.3.1.orig.tar.gz) = hpYnwitP1WyH1V0FQ1NTnzi4rhaSoBEebmaCr+ZUd9c=
-SIZE (telegram-purple_1.3.1.orig.tar.gz) = 509083
+SHA256 (telegram-purple_1.4.6.orig.tar.gz) = aPl6FwYR8AMLQm+XcsOC60zuk4HSTKMqslTv0LeXDRs=
+SIZE (telegram-purple_1.4.6.orig.tar.gz) = 497757
Index: net/telegram-purple/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/telegram-purple/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile_in
--- net/telegram-purple/patches/patch-Makefile_in 24 Jun 2017 00:20:17 -0000 1.1.1.1
+++ net/telegram-purple/patches/patch-Makefile_in 4 Jan 2021 09:34:39 -0000
@@ -3,18 +3,22 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -22,8 +22,8 @@ datarootdir=@datarootdir@
- localedir=@localedir@
- gettext_package=@GETTEXT_PACKAGE@
+@@ -52,11 +52,10 @@ WIN32_INC=-I${WIN32_PIDGIN_SRC_DIR}/pidgin \
+ WIN32_CONTRIB_FILES=contrib/libgcrypt-20.dll contrib/libgpg-error-0.dll contrib/libgcc_s_dw2-1.dll
--CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS -DLOCALEDIR='"$(localedir)"' -Wall -Wextra -Wno-deprecated-declarations -Wno-unused-parameter -I${srcdir} -I. -fno-strict-aliasing -fPIC -D_FORTIFY_SOURCE=2
--LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic -ggdb
-+CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS -DLOCALEDIR='"$(localedir)"' -I${srcdir} -I. -fno-strict-aliasing -fPIC
-+LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic
- DIR_PERM=0755
- FILE_PERM=0644
+ CFLAGS_INTL=-DENABLE_NLS -DLOCALEDIR='"$(localedir)"'
+-CFLAGS_WARN=-Wall -Wextra -Wno-deprecated-declarations -Wno-unused-parameter
+-CFLAGS_EXTRA=-I${srcdir} -I. -fno-strict-aliasing -fPIC -D_FORTIFY_SOURCE=2
+-CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} ${CFLAGS_WARN} ${CFLAGS_EXTRA}
++CFLAGS_EXTRA=-I${srcdir} -I. -fno-strict-aliasing -fPIC
++CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} ${CFLAGS_EXTRA}
+
+-LDFLAGS_EXTRA=-rdynamic -ggdb
++LDFLAGS_EXTRA=-rdynamic
+ LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ ${LDFLAGS_EXTRA}
-@@ -81,7 +81,7 @@ tgl/Makefile.in:
+ DIR_PERM=0755
+@@ -127,7 +126,7 @@ tgl/Makefile.in:
@echo "tgl/Makefile.in not found. Maybe you need to 'git submodule update --init --recursive' ?" && exit 1
tgl/Makefile: tgl/Makefile.in Makefile
Index: net/telegram-purple/patches/patch-tgl_Makefile_in
===================================================================
RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-tgl_Makefile_in
--- net/telegram-purple/patches/patch-tgl_Makefile_in 24 Jun 2017 00:20:17 -0000 1.1.1.1
+++ net/telegram-purple/patches/patch-tgl_Makefile_in 4 Jan 2021 09:34:39 -0000
@@ -7,12 +7,12 @@ Index: tgl/Makefile.in
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 -D_FORTIFY_SOURCE=2
+-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2
+COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -fno-strict-aliasing -fno-omit-frame-pointer -fPIC
EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@
-LOCAL_LDFLAGS=-rdynamic -ggdb ${EXTRA_LIBS}
+LOCAL_LDFLAGS=-rdynamic ${EXTRA_LIBS}
- LINK_FLAGS=${LDFLAGS} ${LOCAL_LDFLAGS}
+ LINK_FLAGS=${CFLAGS} ${LDFLAGS} ${LOCAL_LDFLAGS}
DEP=dep
Index: net/telegram-purple/patches/patch-tgl_configure
===================================================================
RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_configure,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-tgl_configure
--- net/telegram-purple/patches/patch-tgl_configure 4 Sep 2018 10:01:05 -0000 1.1
+++ net/telegram-purple/patches/patch-tgl_configure 4 Jan 2021 09:34:39 -0000
@@ -3,12 +3,11 @@ $OpenBSD: patch-tgl_configure,v 1.1 2018
Index: tgl/configure
--- tgl/configure.orig
+++ tgl/configure
-@@ -4188,19 +4188,8 @@ fi
+@@ -4296,19 +4296,7 @@ fi
done
-+tgl_found_execinfo_header=no
-
+-
-# FreeBSD needs -lexecinfo
-for ac_header in execinfo.h
-do :
@@ -21,6 +20,7 @@ Index: tgl/configure
-fi
-
-done
++tgl_found_execinfo_header=no;
if test "x$tgl_found_execinfo_header" = "xyes"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace_symbols_fd" >&5
Index: net/telegram-purple/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/telegram-purple/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- net/telegram-purple/pkg/PLIST 24 Jun 2017 00:20:17 -0000 1.1.1.1
+++ net/telegram-purple/pkg/PLIST 4 Jan 2021 09:34:39 -0000
@@ -1,30 +1,26 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/06/24 00:20:17 czarkoff Exp $
-lib/purple-2/telegram-purple.so
-share/appdata/
-share/appdata/telegram-purple.metainfo.xml
+@so lib/purple-2/telegram-purple.so
share/locale/bg/LC_MESSAGES/telegram-purple.mo
share/locale/cs_CZ/
share/locale/cs_CZ/LC_MESSAGES/
share/locale/cs_CZ/LC_MESSAGES/telegram-purple.mo
-share/locale/de_DE/
-share/locale/de_DE/LC_MESSAGES/
-share/locale/de_DE/LC_MESSAGES/telegram-purple.mo
+share/locale/de/LC_MESSAGES/telegram-purple.mo
+share/locale/es/LC_MESSAGES/telegram-purple.mo
share/locale/es_AR/
share/locale/es_AR/LC_MESSAGES/
share/locale/es_AR/LC_MESSAGES/telegram-purple.mo
share/locale/fr/LC_MESSAGES/telegram-purple.mo
-share/locale/it_IT/
-share/locale/it_IT/LC_MESSAGES/
-share/locale/it_IT/LC_MESSAGES/telegram-purple.mo
+share/locale/fur/LC_MESSAGES/telegram-purple.mo
+share/locale/it/LC_MESSAGES/telegram-purple.mo
share/locale/nl/LC_MESSAGES/telegram-purple.mo
-share/locale/pl_PL/
-share/locale/pl_PL/LC_MESSAGES/
-share/locale/pl_PL/LC_MESSAGES/telegram-purple.mo
-share/locale/ru_RU/
-share/locale/ru_RU/LC_MESSAGES/
-share/locale/ru_RU/LC_MESSAGES/telegram-purple.mo
+share/locale/nn/LC_MESSAGES/telegram-purple.mo
+share/locale/pl/LC_MESSAGES/telegram-purple.mo
+share/locale/pt_BR/LC_MESSAGES/telegram-purple.mo
+share/locale/ru/LC_MESSAGES/telegram-purple.mo
share/locale/sq/LC_MESSAGES/telegram-purple.mo
share/locale/uk/LC_MESSAGES/telegram-purple.mo
+share/metainfo/
+share/metainfo/telegram-purple.metainfo.xml
share/pixmaps/
share/pixmaps/pidgin/
share/pixmaps/pidgin/protocols/
@@ -34,6 +30,4 @@ share/pixmaps/pidgin/protocols/22/
share/pixmaps/pidgin/protocols/22/telegram.png
share/pixmaps/pidgin/protocols/48/
share/pixmaps/pidgin/protocols/48/telegram.png
-share/purple/server.tglpub
@sample ${SYSCONFDIR}/telegram-purple/
-@sample ${SYSCONFDIR}/telegram-purple/server.tglpub
No comments:
Post a Comment