* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-telegram/, x11-plugins/pidgin-telegram/files/
@ 2019-04-09 22:21 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2019-04-09 22:21 UTC (permalink / raw
To: gentoo-commits
commit: c593d682c444b5d5f1681cbabf26c46f560c358a
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Fri Mar 8 19:35:19 2019 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 22:21:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c593d682
x11-plugins/pidgin-telegram: drop old version.
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
x11-plugins/pidgin-telegram/Manifest | 1 -
.../files/pidgin-telegram-1.3.1-libressl.patch | 25 -----------
.../pidgin-telegram-1.3.1-r1.ebuild | 48 ---------------------
.../pidgin-telegram-1.3.1-r2.ebuild | 49 ----------------------
4 files changed, 123 deletions(-)
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index ea3c35b307a..bac3780166b 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,2 +1 @@
-DIST telegram-purple_1.3.1.orig.tar.gz 509083 BLAKE2B 5842fac81fa1cd9d2681fe5ac790f0be227dadc49d2031a1682da74f62ae163c7ee9d7bb8f421a974bb0d3ea135b1d44983c976b1afbb81758a3953e89f9c68a SHA512 3d088ea8b77aeba1d7f26dcd3223420bcd50372d610368b8786eca0cbdb0a11bcc2d93f7948348c5e0305479703f74e5b5ad8e06e782e2df119cfd73a4e4a63e
DIST telegram-purple_1.4.1.orig.tar.gz 482389 BLAKE2B 84c753c5dcdb8e66d1ec56d5307d3489780e932032f382e2d026ad4b6529d4c161e677483a794e56e6388cd76164d9b93955828f5cfc7b199ff8fa8314ad8951 SHA512 335da688021d2401122065f9089b86b6ccba6e812b06d8d8bc96e0defbbe693b35c1f981f5bf772ebc2577ab60ac7e97ce08d72361bcd17b27fc11740084ff1a
diff --git a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.3.1-libressl.patch b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.3.1-libressl.patch
deleted file mode 100644
index ca1ffee7cc4..00000000000
--- a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.3.1-libressl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6ab594162a228bb5d79ba274859d4d2ab0eb7041 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Sat, 10 Nov 2018 10:15:19 +0200
-Subject: [PATCH] Fix LibreSSL <2.7.0 support
-
----
- tgl/crypto/rsa_pem_openssl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tgl/crypto/rsa_pem_openssl.c b/tgl/crypto/rsa_pem_openssl.c
-index fe5cd9c..be657b3 100644
---- a/tgl/crypto/rsa_pem_openssl.c
-+++ b/tgl/crypto/rsa_pem_openssl.c
-@@ -31,7 +31,7 @@
- #include "meta.h"
- #include "rsa_pem.h"
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000fL))
-
- int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
---
-2.19.1
-
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild
deleted file mode 100644
index ca6954389b7..00000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
-HOMEPAGE="https://github.com/majn/telegram-purple"
-SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="gcrypt +nls +webp"
-
-RDEPEND="
- net-im/pidgin
- sys-libs/zlib:=
- gcrypt? ( dev-libs/libgcrypt:0= )
- !gcrypt? ( dev-libs/openssl:0= )
- nls? ( sys-devel/gettext )
- webp? ( media-libs/libwebp:= )
-"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/telegram-purple"
-
-DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
-
-src_prepare() {
- default
-
- # Remove '-Werror' to make it compile
- find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable gcrypt)
- $(use_enable nls translation)
- $(use_enable webp libwebp)
- )
-
- econf "${myeconfargs[@]}"
-}
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r2.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r2.ebuild
deleted file mode 100644
index 07eb0e85f55..00000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
-HOMEPAGE="https://github.com/majn/telegram-purple"
-SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="gcrypt libressl +nls +webp"
-
-RDEPEND="net-im/pidgin
- sys-libs/zlib:=
- gcrypt? ( dev-libs/libgcrypt:0= )
- !gcrypt? (
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- )
- nls? ( sys-devel/gettext )
- webp? ( media-libs/libwebp:= )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-libressl.patch" )
-
-S="${WORKDIR}/telegram-purple"
-
-DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
-
-src_prepare() {
- default
-
- # Remove '-Werror' to make it compile
- find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable gcrypt)
- $(use_enable nls translation)
- $(use_enable webp libwebp)
- )
-
- econf "${myeconfargs[@]}"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-telegram/, x11-plugins/pidgin-telegram/files/
@ 2020-05-03 19:23 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2020-05-03 19:23 UTC (permalink / raw
To: gentoo-commits
commit: 4550530aae0b821499f72fb8d7cf3430b52c734d
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 19:23:00 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun May 3 19:23:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4550530a
x11-plugins/pidgin-telegram: bump to version 1.4.3
Closes: https://bugs.gentoo.org/720816
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
x11-plugins/pidgin-telegram/Manifest | 1 +
...n-telegram-1.4.3-change-metadata-location.patch | 33 +++++++++++++
.../pidgin-telegram/pidgin-telegram-1.4.3.ebuild | 54 ++++++++++++++++++++++
3 files changed, 88 insertions(+)
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index aab75ef96c3..6e29d4800e5 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1 +1,2 @@
DIST telegram-purple_1.4.2.orig.tar.gz 484790 BLAKE2B d198ce3d1a5f4d226d48b6ff1cdf6f0899a5a1b79ef74c8ac77afa613aae5ec1cf53c8de69cfbab6b2f70df896be0315a90470f2b0da34d1644103be8e7d96ad SHA512 f2f88de8dd4038adaa1a63f2fa3678dd45ddda051be700d6eca563f4bd5b7c8dcb61fdf60bffb01b3fce0ffd01f7b2524686d997bfe4ca8b191cc7b6ce7375a1
+DIST telegram-purple_1.4.3.orig.tar.gz 491997 BLAKE2B 30d42b34525c6553498c67f8a28cfe789442555a3a135a116195edc982611b8ccae6d7c53006358ebdca679258ae6a40b29a1d2ebb764e082bc2ee77d39584db SHA512 697d070da5c6671dd54a1709b37153d4b569ae1cd19d574a2d92a777a89ebd7884596b35829564a7f6fd49104f5d26e35cbe9634f64c678b5f061af8197fba16
diff --git a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch
new file mode 100644
index 00000000000..6971fb8d507
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-change-metadata-location.patch
@@ -0,0 +1,33 @@
+From d18d4c7a46539c37eec30fdbdbb7b56b08469f12 Mon Sep 17 00:00:00 2001
+From: mirabilos <tg@debian.org>
+Date: Sat, 25 Apr 2020 19:29:28 +0200
+Subject: [PATCH] Use newer AppStream metadata location
+
+---
+ Makefile.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 48bfae92..bbaed9df 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -216,15 +216,16 @@ install: noicon_install
+ install -m $(FILE_PERM) imgs/telegram22.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png
+ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48
+ install -m $(FILE_PERM) imgs/telegram48.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png
+- mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/appdata
+- install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml
++ mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/metainfo
++ install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml
+
+ .PHONY: uninstall
+ uninstall: noicon_uninstall
+ rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/telegram.png
+ rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png
+ rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png
+- rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml
++ rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml # old location
++ rm -f $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml # new location
+
+
+ ### == The local_{,un}install targets, in case you're not root. == ###
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
new file mode 100644
index 00000000000..dbf8c2bf6f0
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
+HOMEPAGE="https://github.com/majn/telegram-purple"
+SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="gcrypt libressl +nls +webp"
+
+RDEPEND="
+ net-im/pidgin
+ sys-libs/zlib:=
+ gcrypt? ( dev-libs/libgcrypt:0= )
+ !gcrypt? (
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ )
+ webp? ( media-libs/libwebp:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/telegram-purple"
+
+DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
+
+PATCHES="${FILESDIR}/${P}-change-metadata-location.patch"
+
+src_prepare() {
+ default
+
+ # Remove '-Werror' to make it compile
+ find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable gcrypt)
+ $(use_enable nls translation)
+ $(use_enable webp libwebp)
+ )
+
+ econf "${myeconfargs[@]}"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-telegram/, x11-plugins/pidgin-telegram/files/
@ 2020-09-16 21:20 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2020-09-16 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 6ec68de4d1843117f17a96bccb281a3f21947345
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 21:18:09 2020 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 21:18:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ec68de4
x11-plugins/pidgin-telegram: fix compilation with clang
Closes: https://bugs.gentoo.org/742944
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/pidgin-telegram-1.4.3-clang.patch | 101 +++++++++++++++++++++
.../pidgin-telegram/pidgin-telegram-1.4.3.ebuild | 5 +-
2 files changed, 105 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..d7d00d6234e
--- /dev/null
+++ b/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-clang.patch
@@ -0,0 +1,101 @@
+From b196e11eabb14d11e5a6b4c3cd65bf115a71f0d9 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Wed, 16 Sep 2020 20:55:21 +0200
+Subject: [PATCH] configure: fix compilation with clang
+
+If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ configure | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index 5142055..aed9234 100755
+--- a/configure
++++ b/configure
+@@ -2283,11 +2283,10 @@ ac_config_headers="$ac_config_headers config.h"
+ #
+ # If both header file and library are found, shell commands
+ # 'action-if-found' is run. If 'action-if-found' is not specified, the
+-# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
+-# '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
+-# AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
+-# for this symbol in a config.h file. Sample usage in a C/C++ source is as
+-# follows:
++# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS,prepends '-lz'
++# to LIBS, and calls AC_DEFINE(HAVE_LIBZ). You should use autoheader to
++# include a definition for this symbol in a config.h file.
++# Sample usage in a C/C++ source is as follows:
+ #
+ # #ifdef HAVE_LIBZ
+ # #include <zlib.h>
+@@ -4079,7 +4078,6 @@ then
+ ZLIB_OLD_LDFLAGS=$LDFLAGS
+ ZLIB_OLD_CPPFLAGS=$CPPFLAGS
+ if test -n "${ZLIB_HOME}"; then
+- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+ fi
+
+@@ -4152,7 +4150,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ #
+
+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+ LIBS="-lz $LIBS"
+
+ $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+--
+2.28.0
+
+From b7d92ac6c01f006dde8d317a4311497c6eda0bd7 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Wed, 16 Sep 2020 21:02:07 +0200
+Subject: [PATCH] configure: fix compilation with clang
+
+If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ configure | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/tgl/configure b/tgl/configure
+index 701a5d6..7ff1dac 100755
+--- a/tgl/configure
++++ b/tgl/configure
+@@ -2245,11 +2245,10 @@
+ #
+ # If both header file and library are found, shell commands
+ # 'action-if-found' is run. If 'action-if-found' is not specified, the
+-# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
+-# '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
+-# AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
+-# for this symbol in a config.h file. Sample usage in a C/C++ source is as
+-# follows:
++# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, prepends '-lz'
++# to LIBS, and calls AC_DEFINE(HAVE_LIBZ). You should use autoheader to
++# include a definition for this symbol in a config.h file. Sample usage
++# in a C/C++ source is as follows:
+ #
+ # #ifdef HAVE_LIBZ
+ # #include <zlib.h>
+@@ -4072,7 +4071,6 @@
+ ZLIB_OLD_LDFLAGS=$LDFLAGS
+ ZLIB_OLD_CPPFLAGS=$CPPFLAGS
+ if test -n "${ZLIB_HOME}"; then
+- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+ fi
+
+@@ -4145,7 +4143,6 @@
+ #
+
+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
+- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
+ LIBS="-lz $LIBS"
+
+ $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+--
+2.28.0
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
index 605769b6233..2683ce2015f 100644
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
+++ b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.3.ebuild
@@ -35,7 +35,10 @@ S="${WORKDIR}/telegram-purple"
DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
-PATCHES="${FILESDIR}/${P}-change-metadata-location.patch"
+PATCHES=(
+ "${FILESDIR}/${P}-change-metadata-location.patch"
+ "${FILESDIR}/${P}-clang.patch"
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-telegram/, x11-plugins/pidgin-telegram/files/
@ 2021-02-08 9:58 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2021-02-08 9:58 UTC (permalink / raw
To: gentoo-commits
commit: 9520892a3a96f921215e524912005a1e8c0be4cb
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 8 09:51:36 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Feb 8 09:58:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9520892a
x11-plugins/pidgin-telegram: drop old version
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
x11-plugins/pidgin-telegram/Manifest | 1 -
.../files/pidgin-telegram-1.4.3-clang.patch | 101 ---------------------
.../pidgin-telegram/pidgin-telegram-1.4.4.ebuild | 56 ------------
3 files changed, 158 deletions(-)
diff --git a/x11-plugins/pidgin-telegram/Manifest b/x11-plugins/pidgin-telegram/Manifest
index a00c5606393..7f44531286f 100644
--- a/x11-plugins/pidgin-telegram/Manifest
+++ b/x11-plugins/pidgin-telegram/Manifest
@@ -1,2 +1 @@
-DIST telegram-purple_1.4.4.orig.tar.gz 495386 BLAKE2B 7ecac3a334f88f3d9c0367c5910d3de03b1e6749f18628a58f90c0ae3602dd04d0a1bec79b1016af236375bfe3eb7d4c40437c31fbbee0e9648e5425e40bb43d SHA512 9907da48b978294749f0697313cc7dbf26358535d6528190d8b61cdce5e478af8e756528a212af806025eb75b7f7ec90054ee763eea327f101ef469d0f4fd43e
DIST telegram-purple_1.4.6.orig.tar.gz 497757 BLAKE2B 1f666aaf4ef1913420cf735e3d85e1d91be8a2f07932785d55bc0be37e2cd8cabaf6b0be2b520afafc6636a692086be180d3bd4438215f8b14ae867da9891e18 SHA512 bf3e14a2d1dec7382833011ea891ba5bce81820766b3d6adee582bf0257baadeb7aa7eab7aa6e20adf8dd7728eb653db35b1d8f56bfffe7a92f9bf7506401e6e
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
deleted file mode 100644
index d7d00d6234e..00000000000
--- a/x11-plugins/pidgin-telegram/files/pidgin-telegram-1.4.3-clang.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From b196e11eabb14d11e5a6b4c3cd65bf115a71f0d9 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Wed, 16 Sep 2020 20:55:21 +0200
-Subject: [PATCH] configure: fix compilation with clang
-
-If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- configure | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/configure b/configure
-index 5142055..aed9234 100755
---- a/configure
-+++ b/configure
-@@ -2283,11 +2283,10 @@ ac_config_headers="$ac_config_headers config.h"
- #
- # If both header file and library are found, shell commands
- # 'action-if-found' is run. If 'action-if-found' is not specified, the
--# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
--# '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
--# AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
--# for this symbol in a config.h file. Sample usage in a C/C++ source is as
--# follows:
-+# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS,prepends '-lz'
-+# to LIBS, and calls AC_DEFINE(HAVE_LIBZ). You should use autoheader to
-+# include a definition for this symbol in a config.h file.
-+# Sample usage in a C/C++ source is as follows:
- #
- # #ifdef HAVE_LIBZ
- # #include <zlib.h>
-@@ -4079,7 +4078,6 @@ then
- ZLIB_OLD_LDFLAGS=$LDFLAGS
- ZLIB_OLD_CPPFLAGS=$CPPFLAGS
- if test -n "${ZLIB_HOME}"; then
-- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
- CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
- fi
-
-@@ -4152,7 +4150,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- #
-
- CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
- LIBS="-lz $LIBS"
-
- $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
---
-2.28.0
-
-From b7d92ac6c01f006dde8d317a4311497c6eda0bd7 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Wed, 16 Sep 2020 21:02:07 +0200
-Subject: [PATCH] configure: fix compilation with clang
-
-If -L/usr/lib is being included, this will break compiling on 64-bit with clang.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- configure | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/tgl/configure b/tgl/configure
-index 701a5d6..7ff1dac 100755
---- a/tgl/configure
-+++ b/tgl/configure
-@@ -2245,11 +2245,10 @@
- #
- # If both header file and library are found, shell commands
- # 'action-if-found' is run. If 'action-if-found' is not specified, the
--# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
--# '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
--# AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
--# for this symbol in a config.h file. Sample usage in a C/C++ source is as
--# follows:
-+# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, prepends '-lz'
-+# to LIBS, and calls AC_DEFINE(HAVE_LIBZ). You should use autoheader to
-+# include a definition for this symbol in a config.h file. Sample usage
-+# in a C/C++ source is as follows:
- #
- # #ifdef HAVE_LIBZ
- # #include <zlib.h>
-@@ -4072,7 +4071,6 @@
- ZLIB_OLD_LDFLAGS=$LDFLAGS
- ZLIB_OLD_CPPFLAGS=$CPPFLAGS
- if test -n "${ZLIB_HOME}"; then
-- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
- CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
- fi
-
-@@ -4145,7 +4143,6 @@
- #
-
- CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
- LIBS="-lz $LIBS"
-
- $as_echo "#define HAVE_LIBZ 1" >>confdefs.h
---
-2.28.0
diff --git a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild b/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild
deleted file mode 100644
index 3687b6477ca..00000000000
--- a/x11-plugins/pidgin-telegram/pidgin-telegram-1.4.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A libpurple protocol plugin that adds support for the Telegram messenger"
-HOMEPAGE="https://github.com/majn/telegram-purple"
-SRC_URI="https://github.com/majn/telegram-purple/releases/download/v${PV}/telegram-purple_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="gcrypt libressl +nls +png +webp"
-
-RDEPEND="
- net-im/pidgin
- sys-libs/zlib:=
- gcrypt? ( dev-libs/libgcrypt:0= )
- !gcrypt? (
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- )
- png? ( media-libs/libpng:0= )
- webp? ( media-libs/libwebp:= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/telegram-purple"
-
-DOCS=( "AUTHORS" "CHANGELOG.md" "HACKING.md" "HACKING.BUILD.md" "README.md" )
-
-PATCHES=( "${FILESDIR}/${PN}-1.4.3-clang.patch" )
-
-src_prepare() {
- default
-
- # Remove '-Werror' to make it compile
- find -name 'Makefile*' -exec sed -i -e 's/-Werror //' {} + || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable gcrypt)
- $(use_enable nls translation)
- $(use_enable png libpng)
- $(use_enable webp libwebp)
- )
-
- econf "${myeconfargs[@]}"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-08 9:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-03 19:23 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-telegram/, x11-plugins/pidgin-telegram/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2021-02-08 9:58 Conrad Kostecki
2020-09-16 21:20 Conrad Kostecki
2019-04-09 22:21 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox