* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/purple-hangouts/files/, x11-plugins/purple-hangouts/
@ 2019-02-27 4:50 Aaron Bauman
0 siblings, 0 replies; 2+ messages in thread
From: Aaron Bauman @ 2019-02-27 4:50 UTC (permalink / raw
To: gentoo-commits
commit: c3efa5cd6704e8599850512aa2d5df28c3693e2b
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com>
AuthorDate: Thu Dec 6 10:19:17 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Feb 27 04:50:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3efa5cd
x11-plugins/purple-hangouts: compile units separately
Closes: https://bugs.gentoo.org/672538
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../purple-hangouts-0_p20181202-makefile.patch | 65 ++++++++++++++++++++++
.../purple-hangouts-0_p20181202.ebuild | 2 +
.../purple-hangouts/purple-hangouts-9999.ebuild | 4 +-
3 files changed, 70 insertions(+), 1 deletion(-)
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
new file mode 100644
index 00000000000..a575a449c2a
--- /dev/null
+++ b/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch
@@ -0,0 +1,65 @@
+# HG changeset patch
+# User Stefan Strogin <stefan.strogin@gmail.com>
+# 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
index 4be4edc6875..9b57ae98908 100644
--- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
+++ b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild
@@ -26,6 +26,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" )
+
src_prepare() {
default
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
index fa9a49d18ae..df8116adca8 100644
--- a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
+++ b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,6 +22,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-plugins/purple-hangouts/files/, x11-plugins/purple-hangouts/
@ 2022-04-17 19:17 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-04-17 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 7f97ebf6fd034b790446bc159fc54f9793badc4d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 19:15:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <stefan.strogin@gmail.com>
-# 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-17 19:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-17 19:17 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/purple-hangouts/files/, x11-plugins/purple-hangouts/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2019-02-27 4:50 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox