Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-telegram/, x11-plugins/pidgin-telegram/files/
Date: Wed, 16 Sep 2020 21:21:00
Message-Id: 1600291089.6ec68de4d1843117f17a96bccb281a3f21947345.conikost@gentoo
1 commit: 6ec68de4d1843117f17a96bccb281a3f21947345
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 16 21:18:09 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 16 21:18:09 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec68de4
7
8 x11-plugins/pidgin-telegram: fix compilation with clang
9
10 Closes: https://bugs.gentoo.org/742944
11 Package-Manager: Portage-3.0.6, Repoman-3.0.1
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 .../files/pidgin-telegram-1.4.3-clang.patch | 101 +++++++++++++++++++++
15 .../pidgin-telegram/pidgin-telegram-1.4.3.ebuild | 5 +-
16 2 files changed, 105 insertions(+), 1 deletion(-)
17
18 diff --git a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-clang.patch b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-clang.patch
19 new file mode 100644
20 index 00000000000..d7d00d6234e
21 --- /dev/null
22 +++ b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-clang.patch
23 @@ -0,0 +1,101 @@
24 +From b196e11eabb14d11e5a6b4c3cd65bf115a71f0d9 Mon Sep 17 00:00:00 2001
25 +From: Conrad Kostecki <conrad@××××××××.com>
26 +Date: Wed, 16 Sep 2020 20:55:21 +0200
27 +Subject: [PATCH] configure: fix compilation with clang
28 +
29 +If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
30 +
31 +Signed-off-by: Conrad Kostecki <conrad@××××××××.com>
32 +---
33 + configure | 11 ++++-------
34 + 1 file changed, 4 insertions(+), 7 deletions(-)
35 +
36 +diff --git a/configure b/configure
37 +index 5142055..aed9234 100755
38 +--- a/configure
39 ++++ b/configure
40 +@@ -2283,11 +2283,10 @@ ac_config_headers="$ac_config_headers config.h"
41 + #
42 + # If both header file and library are found, shell commands
43 + # 'action-if-found' is run. If 'action-if-found' is not specified, the
44 +-# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
45 +-# '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
46 +-# AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
47 +-# for this symbol in a config.h file. Sample usage in a C/C++ source is as
48 +-# follows:
49 ++# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS,prepends '-lz'
50 ++# to LIBS, and calls AC_DEFINE(HAVE_LIBZ). You should use autoheader to
51 ++# include a definition for this symbol in a config.h file.
52 ++# Sample usage in a C/C++ source is as follows:
53 + #
54 + # #ifdef HAVE_LIBZ
55 + # #include <zlib.h>
56 +@@ -4079,7 +4078,6 @@ then
57 + ZLIB_OLD_LDFLAGS=$LDFLAGS
58 + ZLIB_OLD_CPPFLAGS=$CPPFLAGS
59 + if test -n "${ZLIB_HOME}"; then
60 +- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
61 + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
62 + fi
63 +
64 +@@ -4152,7 +4150,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
65 + #
66 +
67 + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
68 +- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
69 + LIBS="-lz $LIBS"
70 +
71 + $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
72 +--
73 +2.28.0
74 +
75 +From b7d92ac6c01f006dde8d317a4311497c6eda0bd7 Mon Sep 17 00:00:00 2001
76 +From: Conrad Kostecki <conrad@××××××××.com>
77 +Date: Wed, 16 Sep 2020 21:02:07 +0200
78 +Subject: [PATCH] configure: fix compilation with clang
79 +
80 +If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
81 +
82 +Signed-off-by: Conrad Kostecki <conrad@××××××××.com>
83 +---
84 + configure | 11 ++++-------
85 + 1 file changed, 4 insertions(+), 7 deletions(-)
86 +
87 +diff --git a/tgl/configure b/tgl/configure
88 +index 701a5d6..7ff1dac 100755
89 +--- a/tgl/configure
90 ++++ b/tgl/configure
91 +@@ -2245,11 +2245,10 @@
92 + #
93 + # If both header file and library are found, shell commands
94 + # 'action-if-found' is run. If 'action-if-found' is not specified, the
95 +-# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
96 +-# '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
97 +-# AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
98 +-# for this symbol in a config.h file. Sample usage in a C/C++ source is as
99 +-# follows:
100 ++# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, prepends '-lz'
101 ++# to LIBS, and calls AC_DEFINE(HAVE_LIBZ). You should use autoheader to
102 ++# include a definition for this symbol in a config.h file. Sample usage
103 ++# in a C/C++ source is as follows:
104 + #
105 + # #ifdef HAVE_LIBZ
106 + # #include <zlib.h>
107 +@@ -4072,7 +4071,6 @@
108 + ZLIB_OLD_LDFLAGS=$LDFLAGS
109 + ZLIB_OLD_CPPFLAGS=$CPPFLAGS
110 + if test -n "${ZLIB_HOME}"; then
111 +- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
112 + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
113 + fi
114 +
115 +@@ -4145,7 +4143,6 @@
116 + #
117 +
118 + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
119 +- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
120 + LIBS="-lz $LIBS"
121 +
122 + $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
123 +--
124 +2.28.0
125
126 diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
127 index 605769b6233..2683ce2015f 100644
128 --- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
129 +++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
130 @@ -35,7 +35,10 @@ S="${WORKDIR}/telegram-purple"
131
132 DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
133
134 -PATCHES="${FILESDIR}/${P}-change-metadata-location.patch"
135 +PATCHES=(
136 + "${FILESDIR}/${P}-change-metadata-location.patch"
137 + "${FILESDIR}/${P}-clang.patch"
138 +)
139
140 src_prepare() {
141 default