Attachment 214055 Details for Bug 243985 – net-im/telegram-purple: update to 1.4.3

[patch] net-im/telegram-purple: update to 1.4.3

telegram-purple.patch (text/plain), 7.04 KB, created by Jose G. Juanino on 2020-05-03 11:37:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose G. Juanino

Created: 2020-05-03 11:37:37 UTC

Size: 7.04 KB

patch

obsolete

>From 7640f84395d40e1434ad0a2f17f3e123e48f2c02 Mon Sep 17 00:00:00 2001
>From: "Jose G. Juanino" <jjuanino@gmail.com>
>Date: Sat, 2 May 2020 11:52:31 +0200
>Subject: [PATCH] net-im/telegram-purple: update to 1.4.3
>
>Changes from 1.4.1 version:
>
>* Add localbase:ldflags to USES
>* Redefine gettext uses. The configure phase of this project does not
>  support the standard --disable-nls in configure, but
>  --disable-translation. Therefore, I have had to tweak a bit the code
>  in Makefile port to support properly NLS setting.
>* Update tgl subproject commit git to cd7e3d7
>* Substitute command sha256sum by sha256 in Makefile.in files.
>---
> net-im/telegram-purple/Makefile               | 20 +++++++++++++------
> net-im/telegram-purple/distinfo               | 10 +++++-----
> .../telegram-purple/files/patch-Makefile.in   | 11 ++++++++++
> .../telegram-purple/files/patch-commit.h.gen  |  4 ++--
> .../files/patch-tgl-Makefile.in               | 11 ++++++++++
> .../patch-tgl_tl-parser_portable__endian.h    |  4 ++--
> net-im/telegram-purple/pkg-plist              |  3 ++-
> 7 files changed, 47 insertions(+), 16 deletions(-)
> create mode 100644 net-im/telegram-purple/files/patch-Makefile.in
> create mode 100644 net-im/telegram-purple/files/patch-tgl-Makefile.in
>
>diff --git a/net-im/telegram-purple/Makefile b/net-im/telegram-purple/Makefile
>index 27c1ffdb77e6..ddc2d0178d08 100644
>--- a/net-im/telegram-purple/Makefile
>+++ b/net-im/telegram-purple/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	telegram-purple
>-PORTVERSION=	1.4.1
>+PORTVERSION=	1.4.3
> DISTVERSIONPREFIX=	v
> CATEGORIES=	net-im
> 
>@@ -21,19 +21,27 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
> 		libpurple.so:net-im/libpurple \
> 		libpng.so:graphics/png
> 
>-USES=		gettext gmake gnome pkgconfig
>+USES=		gmake gnome pkgconfig localbase:ldflags
> USE_GNOME=	glib20
> 
>+GNU_CONFIGURE=	yes
>+
> OPTIONS_DEFINE=	NLS
>-OPTIONS_SUB=	yes
> 
>-GNU_CONFIGURE=	yes
>-LDFLAGS+=	-L${LOCALBASE}/lib
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MNLS}
>+USES+=		gettext
>+PLIST_SUB+=	NLS=""
>+.else
>+CONFIGURE_ARGS+=	--disable-translation
>+PLIST_SUB+=		NLS="@comment "
>+.endif
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	majn
> GH_PROJECT=	tgl:tgl
>-GH_TAGNAME?=	bec2e6d:tgl
>+GH_TAGNAME?=	cd7e3d7:tgl
> GH_SUBDIR=	tgl:tgl
> 
> post-install:
>diff --git a/net-im/telegram-purple/distinfo b/net-im/telegram-purple/distinfo
>index a75a5dc2ebe7..ae7883b409d1 100644
>--- a/net-im/telegram-purple/distinfo
>+++ b/net-im/telegram-purple/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1558825174
>-SHA256 (majn-telegram-purple-v1.4.1_GH0.tar.gz) = 2f5238f119bda71be2413854cd1f0242377d029b94a34456427a1cb7b37c6d24
>-SIZE (majn-telegram-purple-v1.4.1_GH0.tar.gz) = 213171
>-SHA256 (majn-tgl-bec2e6d_GH0.tar.gz) = 490559e80a6299b2ffc3da190e5af1cbcf08824c68e26c18f349654f04727d95
>-SIZE (majn-tgl-bec2e6d_GH0.tar.gz) = 270087
>+TIMESTAMP = 1588410566
>+SHA256 (majn-telegram-purple-v1.4.3_GH0.tar.gz) = 1aa80620b3f76ccafae78b292ad8234ff7cc474474a9cb2c09e64e0c3c914995
>+SIZE (majn-telegram-purple-v1.4.3_GH0.tar.gz) = 221455
>+SHA256 (majn-tgl-cd7e3d7_GH0.tar.gz) = 5f37c090ca0dc74049d0fd81214a62ea580f1b8cc1e75ec9eb70d2f5b3cc582e
>+SIZE (majn-tgl-cd7e3d7_GH0.tar.gz) = 271635
>diff --git a/net-im/telegram-purple/files/patch-Makefile.in b/net-im/telegram-purple/files/patch-Makefile.in
>new file mode 100644
>index 000000000000..97764fd1df2e
>--- /dev/null
>+++ b/net-im/telegram-purple/files/patch-Makefile.in
>@@ -0,0 +1,11 @@
>+--- Makefile.in.orig	2020-05-02 09:45:59 UTC
>++++ Makefile.in
>+@@ -74,7 +74,7 @@ endif
>+ # Check if -frandom-seed is supported before enabling it
>+ RANDOM_SEED_UNSUPPORTED = $(shell $(CC) -frandom-seed=77e0418a98676b76729b50fe91cc1f250c14fd8f664f8430649487a6f918926d 2>&1 | grep -c 'random-seed')
>+ ifeq "$(RANDOM_SEED_UNSUPPORTED)" "0"
>+-	CFLAGS += -frandom-seed=0x$$(sha256sum $< | cut -f1 -d" ")
>++	CFLAGS += -frandom-seed=0x$$(sha256 $< | cut -f1 -d" ")
>+ endif
>+ # Check if -ffile-prefix-map is supported before enabling it
>+ FILE_PREFIX_MAP_UNSUPPORTED = $(shell $(CC) -ffile-prefix-map=/foo/bar/baz=/quux 2>&1 | grep -c 'file-prefix-map')
>diff --git a/net-im/telegram-purple/files/patch-commit.h.gen b/net-im/telegram-purple/files/patch-commit.h.gen
>index 42cb92d1a734..988149c97624 100644
>--- a/net-im/telegram-purple/files/patch-commit.h.gen
>+++ b/net-im/telegram-purple/files/patch-commit.h.gen
>@@ -1,4 +1,4 @@
>---- commit.h.gen.orig	2016-08-08 08:53:04 UTC
>+--- commit.h.gen.orig	2020-03-25 20:48:01 UTC
> +++ commit.h.gen
> @@ -20,19 +20,7 @@
>  
>@@ -17,7 +17,7 @@
> -fi
> -
> -GIT_COMMIT=`git rev-parse HEAD | cut -c1-10`
>-+GIT_COMMIT="d3d090917d"
>++GIT_COMMIT="ca42dcf0e6"
>  
>  if grep -scq "${GIT_COMMIT}" commit.h
>  then
>diff --git a/net-im/telegram-purple/files/patch-tgl-Makefile.in b/net-im/telegram-purple/files/patch-tgl-Makefile.in
>new file mode 100644
>index 000000000000..c354f888c0e0
>--- /dev/null
>+++ b/net-im/telegram-purple/files/patch-tgl-Makefile.in
>@@ -0,0 +1,11 @@
>+--- tgl/Makefile.in.orig	2020-04-27 11:49:17 UTC
>++++ tgl/Makefile.in
>+@@ -41,7 +41,7 @@ endif
>+ # Check if -frandom-seed is supported before enabling it
>+ RANDOM_SEED_UNSUPPORTED = $(shell $(CC) -frandom-seed=77e0418a98676b76729b50fe91cc1f250c14fd8f664f8430649487a6f918926d 2>&1 | grep -c 'random-seed')
>+ ifeq "$(RANDOM_SEED_UNSUPPORTED)" "0"
>+-	CFLAGS += -frandom-seed=0x$$(sha256sum $< | cut -f1 -d" ")
>++	CFLAGS += -frandom-seed=0x$$(sha256 $< | cut -f1 -d" ")
>+ endif
>+ # Check if -ffile-prefix-map is supported before enabling it
>+ FILE_PREFIX_MAP_UNSUPPORTED = $(shell $(CC) -ffile-prefix-map=/foo/bar/baz=/quux 2>&1 | grep -c 'file-prefix-map')
>diff --git a/net-im/telegram-purple/files/patch-tgl_tl-parser_portable__endian.h b/net-im/telegram-purple/files/patch-tgl_tl-parser_portable__endian.h
>index 9e44279db312..58ca5c105af3 100644
>--- a/net-im/telegram-purple/files/patch-tgl_tl-parser_portable__endian.h
>+++ b/net-im/telegram-purple/files/patch-tgl_tl-parser_portable__endian.h
>@@ -1,6 +1,6 @@
>---- tgl/tl-parser/portable_endian.h.orig	2019-02-22 22:36:12 UTC
>+--- tgl/tl-parser/portable_endian.h.orig	2020-04-27 11:49:17 UTC
> +++ tgl/tl-parser/portable_endian.h
>-@@ -71,15 +71,6 @@
>+@@ -72,15 +72,6 @@
>  
>  #	include <sys/endian.h>
>  
>diff --git a/net-im/telegram-purple/pkg-plist b/net-im/telegram-purple/pkg-plist
>index 6df3488fe6a4..399bf168e6e1 100644
>--- a/net-im/telegram-purple/pkg-plist
>+++ b/net-im/telegram-purple/pkg-plist
>@@ -1,4 +1,3 @@
>-@dir /%%ETCDIR%%
> lib/purple-2/telegram-purple.so
> share/appdata/telegram-purple.metainfo.xml
> %%NLS%%share/locale/bg/LC_MESSAGES/telegram-purple.mo
>@@ -9,6 +8,7 @@ share/appdata/telegram-purple.metainfo.xml
> %%NLS%%share/locale/fr/LC_MESSAGES/telegram-purple.mo
> %%NLS%%share/locale/it/LC_MESSAGES/telegram-purple.mo
> %%NLS%%share/locale/nl/LC_MESSAGES/telegram-purple.mo
>+%%NLS%%share/locale/nn/LC_MESSAGES/telegram-purple.mo
> %%NLS%%share/locale/pl/LC_MESSAGES/telegram-purple.mo
> %%NLS%%share/locale/pt_BR/LC_MESSAGES/telegram-purple.mo
> %%NLS%%share/locale/ru/LC_MESSAGES/telegram-purple.mo
>@@ -17,3 +17,4 @@ share/appdata/telegram-purple.metainfo.xml
> share/pixmaps/pidgin/protocols/16/telegram.png
> share/pixmaps/pidgin/protocols/22/telegram.png
> share/pixmaps/pidgin/protocols/48/telegram.png
>+@dir /%%ETCDIR%%
>-- 
>2.24.1
>

Flags:

jjuanino: maintainer-approval+

Actions: View | Diff

Attachments on bug 243985: 211478 | 211479 | 214023 | 214050 | 214055 | 214152