From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CEC9915808B for ; Sun, 17 Apr 2022 19:17:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0852EE0B92; Sun, 17 Apr 2022 19:17:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE9C8E0B92 for ; Sun, 17 Apr 2022 19:17:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47EA7341890 for ; Sun, 17 Apr 2022 19:17:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C962543B for ; Sun, 17 Apr 2022 19:17:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650223048.7f97ebf6fd034b790446bc159fc54f9793badc4d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/purple-hangouts/files/, x11-plugins/purple-hangouts/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/purple-hangouts/Manifest x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild X-VCS-Directories: x11-plugins/purple-hangouts/ x11-plugins/purple-hangouts/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7f97ebf6fd034b790446bc159fc54f9793badc4d X-VCS-Branch: master Date: Sun, 17 Apr 2022 19:17:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6d4e939d-4cd7-4bee-a659-7f2acd1284bb X-Archives-Hash: 793093187f1630f5ca6ac9e3723ddf99 commit: 7f97ebf6fd034b790446bc159fc54f9793badc4d Author: Sam James gentoo org> AuthorDate: Sun Apr 17 19:15:47 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 17 19:17:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f97ebf6 x11-plugins/purple-hangouts: drop 0_p20181202 Signed-off-by: Sam James gentoo.org> x11-plugins/purple-hangouts/Manifest | 1 - .../purple-hangouts-0_p20181202-makefile.patch | 65 ---------------------- .../purple-hangouts-0_p20181202.ebuild | 51 ----------------- 3 files changed, 117 deletions(-) diff --git a/x11-plugins/purple-hangouts/Manifest b/x11-plugins/purple-hangouts/Manifest index 767bcc111ea1..d0248dc056ef 100644 --- a/x11-plugins/purple-hangouts/Manifest +++ b/x11-plugins/purple-hangouts/Manifest @@ -1,2 +1 @@ -DIST purple-hangouts-0_p20181202.tar.gz 151968 BLAKE2B ae487b77e2322fb2e02ceeb5c1cd5eb9eed1aaa71ea47d9f6e032802e2d17da1bf3160a11f4aaa64bd5a95aa67936b867e5a31958efdbdcc80736a96335f3b24 SHA512 4b7ec1b26040f706d2d7badeb667967ac7da1bbabab259c630cec0460ed275ae20e1c4d8303205c757bade38cd23f57d6f7d6f61735a5d189f69f423ed972227 DIST purple-hangouts-0_p20200710.tar.gz 153541 BLAKE2B 7a71cb5fdb7ca0636b4eb3d4245347e057e879a6b855451b9330f33cec6ba1a15da071e916a3e3d38094700cd61178947e5aa749e6182d3d0488e01c673568f5 SHA512 ce650c1ee1052803576e163905e906bb6202ce04ea380b52ae7524ec896ad785c1a89a5bc713242e3ad5df2d3ae677e0bd5323c7533daedaf6ac333d8e2f5b34 diff --git a/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch b/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch deleted file mode 100644 index a575a449c2aa..000000000000 --- a/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch +++ /dev/null @@ -1,65 +0,0 @@ -# HG changeset patch -# User Stefan Strogin -# Date 1544083567 -7200 -# Thu Dec 06 10:06:07 2018 +0200 -# Branch make -# Node ID 938b9b0dc4fb7b22f8d110e9259899602fe7c1ba -# Parent cccf2f62d439fc3dd6248014d171efc811f89f2b -Compile source files separately. Fixes issue #192 - -diff -r cccf2f62d439 -r 938b9b0dc4fb Makefile ---- a/Makefile Sun Dec 02 22:34:01 2018 +1300 -+++ b/Makefile Thu Dec 06 10:06:07 2018 +0200 -@@ -57,11 +57,13 @@ - HANGOUTS_DEST = - HANGOUTS_ICONS_DEST = - else -+ CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) -Ipurple2compat $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags` - HANGOUTS_TARGET = libhangouts.so - HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple` - HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple`/pixmaps/pidgin/protocols - endif - else -+ CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags` - HANGOUTS_TARGET = libhangouts3.so - HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple-3` - HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple-3`/pixmaps/pidgin/protocols -@@ -75,12 +77,10 @@ - WIN32_PIDGIN2_LDFLAGS = -L$(PIDGIN_TREE_TOP)/libpurple $(WIN32_LDFLAGS) - WIN32_PIDGIN3_LDFLAGS = -L$(PIDGIN3_TREE_TOP)/libpurple -L$(WIN32_DEV_TOP)/gplugin-dev/gplugin $(WIN32_LDFLAGS) -lgplugin - --C_FILES := hangouts.pb-c.c hangout_media.pb-c.c gmail.pb-c.c hangouts_json.c hangouts_pblite.c hangouts_connection.c hangouts_auth.c hangouts_events.c hangouts_conversation.c hangouts_media.c --PURPLE_COMPAT_FILES := purple2compat/http.c purple2compat/purple-socket.c --PURPLE_C_FILES := libhangouts.c $(C_FILES) --TEST_C_FILES := hangouts_test.c $(C_FILES) -- -- -+OBJ := hangouts.pb-c.o hangout_media.pb-c.o gmail.pb-c.o hangouts_json.o hangouts_pblite.o hangouts_connection.o hangouts_auth.o hangouts_events.o hangouts_conversation.o hangouts_media.o -+PURPLE_COMPAT_FILES := purple2compat/http.o purple2compat/purple-socket.o -+PURPLE_C_FILES := libhangouts.c $(OBJ) -+TEST_C_FILES := hangouts_test.c $(OBJ) - - .PHONY: all install FAILNOPURPLE clean - -@@ -96,10 +96,10 @@ - $(PROTOC_C) --c_out=. gmail.proto - - libhangouts.so: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES) -- $(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -Ipurple2compat -g -ggdb -+ $(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl - - libhangouts3.so: $(PURPLE_C_FILES) -- $(CC) -fPIC $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags` -ldl $(INCLUDES) -g -ggdb -+ $(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl - - libhangouts.dll: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES) - $(WIN32_CC) -shared -o $@ $^ $(WIN32_PIDGIN2_CFLAGS) $(WIN32_PIDGIN2_LDFLAGS) -Ipurple2compat -@@ -126,7 +126,7 @@ - echo "You need libpurple development headers installed to be able to compile this plugin" - - clean: -- rm -f $(HANGOUTS_TARGET) hangouts.pb-c.h hangouts.pb-c.c hangout_media.pb-c.h hangout_media.pb-c.c -+ rm -f $(HANGOUTS_TARGET) $(OBJ) $(PURPLE_COMPAT_FILES) hangouts.pb-c.h hangouts.pb-c.c hangout_media.pb-c.h hangout_media.pb-c.c - - - installer: purple-hangouts.nsi libhangouts.dll diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild deleted file mode 100644 index 9b57ae98908d..000000000000 --- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Hangouts Plugin for libpurple" -HOMEPAGE="https://bitbucket.org/EionRobb/purple-hangouts" - -COMMIT_ID="cccf2f62d439" -SRC_URI="https://bitbucket.org/EionRobb/purple-hangouts/get/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64" -S="${WORKDIR}/EionRobb-${PN}-${COMMIT_ID}" - -LICENSE="GPL-3+" -SLOT="0" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/json-glib - dev-libs/protobuf-c:= - net-im/pidgin - sys-libs/zlib" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" ) - -src_prepare() { - default - - # Does not respect CFLAGS - sed -i Makefile -e 's/-g -ggdb//g' || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - emake \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - DESTDIR="${ED}" \ - install - - einstalldocs -}