cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to telegram-purple-1.4.6, from Stefan Hagen, Stefan's version was

Browse Source 
ok giovanni@, I made a few tweaks on top:

- don't @sample old directory that is now empty/unused
- patch away -q on internal configure script run to avoid hiding
output
- move sed-"patch"ing from post-patch to pre-configure, so that the usual
"make patch, edit files, make update-patches" workflow works as expected
- simpler comment relating to ONLY_FOR_ARCHS
This commit is contained in:
sthen 2021-01-04 11:56:28 +00:00
parent 114bf52bc2
commit 56d5e69b17
6 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/telegram-purple/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2020/03/25 15:03:07 tb Exp $
# $OpenBSD: Makefile,v 1.8 2021/01/04 11:56:28 sthen Exp $
# assertion "get_int () == TLS_SCHEMA_V2" failed: file "generate.c", line 2831, function "parse_tlo_file"
# endianness issues in tgl/generate.c
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 +12,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 \
@ -32,6 +32,10 @@ LDFLAGS = -L${LOCALBASE}/lib
WRKDIST = ${WRKDIR}/telegram-purple
pre-configure:
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

4
net/telegram-purple/distinfo
View File

@ -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

28
net/telegram-purple/patches/patch-Makefile_in
View File

@ -1,25 +1,29 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2017/06/24 00:20:17 czarkoff Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2021/01/04 11:56:28 sthen Exp $
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_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}
-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
@@ -81,7 +81,7 @@ tgl/Makefile.in:
@@ -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
- cd tgl && ./configure -q ${CRYPTO_FLAG} --disable-extf CFLAGS="@CFLAGS@" LDFLAGS="@LDFLAGS@"
+ cd tgl && ./configure -q ${CRYPTO_FLAG} --disable-extf CFLAGS="@CFLAGS@" LDFLAGS="@LDFLAGS@" CC="@CC@"
+ cd tgl && ./configure ${CRYPTO_FLAG} --disable-extf CFLAGS="@CFLAGS@" LDFLAGS="@LDFLAGS@" CC="@CC@"
tgl/libs/libtgl.a: tgl/Makefile
+${MAKE} -C tgl libs/libtgl.a

6
net/telegram-purple/patches/patch-tgl_Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-tgl_Makefile_in,v 1.1.1.1 2017/06/24 00:20:17 czarkoff Exp $
$OpenBSD: patch-tgl_Makefile_in,v 1.2 2021/01/04 11:56:28 sthen Exp $
Index: tgl/Makefile.in
--- tgl/Makefile.in.orig
@ -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

8
net/telegram-purple/patches/patch-tgl_configure
View File

@ -1,14 +1,13 @@
$OpenBSD: patch-tgl_configure,v 1.1 2018/09/04 10:01:05 espie Exp $
$OpenBSD: patch-tgl_configure,v 1.2 2021/01/04 11:56:28 sthen Exp $
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

31
net/telegram-purple/pkg/PLIST
View File

@ -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
@comment $OpenBSD: PLIST,v 1.2 2021/01/04 11:56:28 sthen Exp $
@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,3 @@ 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