1 |
commit: c3efa5cd6704e8599850512aa2d5df28c3693e2b |
2 |
Author: Stefan Strogin <stefan.strogin <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Dec 6 10:19:17 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 04:50:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3efa5cd |
7 |
|
8 |
x11-plugins/purple-hangouts: compile units separately |
9 |
|
10 |
Closes: https://bugs.gentoo.org/672538 |
11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
12 |
Signed-off-by: Stefan Strogin <stefan.strogin <AT> gmail.com> |
13 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
14 |
|
15 |
.../purple-hangouts-0_p20181202-makefile.patch | 65 ++++++++++++++++++++++ |
16 |
.../purple-hangouts-0_p20181202.ebuild | 2 + |
17 |
.../purple-hangouts/purple-hangouts-9999.ebuild | 4 +- |
18 |
3 files changed, 70 insertions(+), 1 deletion(-) |
19 |
|
20 |
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 |
21 |
new file mode 100644 |
22 |
index 00000000000..a575a449c2a |
23 |
--- /dev/null |
24 |
+++ b/x11-plugins/purple-hangouts/files/purple-hangouts-0_p20181202-makefile.patch |
25 |
@@ -0,0 +1,65 @@ |
26 |
+# HG changeset patch |
27 |
+# User Stefan Strogin <stefan.strogin@×××××.com> |
28 |
+# Date 1544083567 -7200 |
29 |
+# Thu Dec 06 10:06:07 2018 +0200 |
30 |
+# Branch make |
31 |
+# Node ID 938b9b0dc4fb7b22f8d110e9259899602fe7c1ba |
32 |
+# Parent cccf2f62d439fc3dd6248014d171efc811f89f2b |
33 |
+Compile source files separately. Fixes issue #192 |
34 |
+ |
35 |
+diff -r cccf2f62d439 -r 938b9b0dc4fb Makefile |
36 |
+--- a/Makefile Sun Dec 02 22:34:01 2018 +1300 |
37 |
++++ b/Makefile Thu Dec 06 10:06:07 2018 +0200 |
38 |
+@@ -57,11 +57,13 @@ |
39 |
+ HANGOUTS_DEST = |
40 |
+ HANGOUTS_ICONS_DEST = |
41 |
+ else |
42 |
++ CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) -Ipurple2compat $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple glib-2.0 json-glib-1.0 zlib --libs --cflags` |
43 |
+ HANGOUTS_TARGET = libhangouts.so |
44 |
+ HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple` |
45 |
+ HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple`/pixmaps/pidgin/protocols |
46 |
+ endif |
47 |
+ else |
48 |
++ CFLAGS := $(CFLAGS) -fPIC $(INCLUDES) $(PROTOBUF_OPTS) `$(PKG_CONFIG) purple-3 glib-2.0 json-glib-1.0 zlib --libs --cflags` |
49 |
+ HANGOUTS_TARGET = libhangouts3.so |
50 |
+ HANGOUTS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=plugindir purple-3` |
51 |
+ HANGOUTS_ICONS_DEST = $(DESTDIR)`$(PKG_CONFIG) --variable=datadir purple-3`/pixmaps/pidgin/protocols |
52 |
+@@ -75,12 +77,10 @@ |
53 |
+ WIN32_PIDGIN2_LDFLAGS = -L$(PIDGIN_TREE_TOP)/libpurple $(WIN32_LDFLAGS) |
54 |
+ WIN32_PIDGIN3_LDFLAGS = -L$(PIDGIN3_TREE_TOP)/libpurple -L$(WIN32_DEV_TOP)/gplugin-dev/gplugin $(WIN32_LDFLAGS) -lgplugin |
55 |
+ |
56 |
+-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 |
57 |
+-PURPLE_COMPAT_FILES := purple2compat/http.c purple2compat/purple-socket.c |
58 |
+-PURPLE_C_FILES := libhangouts.c $(C_FILES) |
59 |
+-TEST_C_FILES := hangouts_test.c $(C_FILES) |
60 |
+- |
61 |
+- |
62 |
++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 |
63 |
++PURPLE_COMPAT_FILES := purple2compat/http.o purple2compat/purple-socket.o |
64 |
++PURPLE_C_FILES := libhangouts.c $(OBJ) |
65 |
++TEST_C_FILES := hangouts_test.c $(OBJ) |
66 |
+ |
67 |
+ .PHONY: all install FAILNOPURPLE clean |
68 |
+ |
69 |
+@@ -96,10 +96,10 @@ |
70 |
+ $(PROTOC_C) --c_out=. gmail.proto |
71 |
+ |
72 |
+ libhangouts.so: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES) |
73 |
+- $(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 |
74 |
++ $(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl |
75 |
+ |
76 |
+ libhangouts3.so: $(PURPLE_C_FILES) |
77 |
+- $(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 |
78 |
++ $(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -ggdb -ldl |
79 |
+ |
80 |
+ libhangouts.dll: $(PURPLE_C_FILES) $(PURPLE_COMPAT_FILES) |
81 |
+ $(WIN32_CC) -shared -o $@ $^ $(WIN32_PIDGIN2_CFLAGS) $(WIN32_PIDGIN2_LDFLAGS) -Ipurple2compat |
82 |
+@@ -126,7 +126,7 @@ |
83 |
+ echo "You need libpurple development headers installed to be able to compile this plugin" |
84 |
+ |
85 |
+ clean: |
86 |
+- rm -f $(HANGOUTS_TARGET) hangouts.pb-c.h hangouts.pb-c.c hangout_media.pb-c.h hangout_media.pb-c.c |
87 |
++ 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 |
88 |
+ |
89 |
+ |
90 |
+ installer: purple-hangouts.nsi libhangouts.dll |
91 |
|
92 |
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild |
93 |
index 4be4edc6875..9b57ae98908 100644 |
94 |
--- a/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild |
95 |
+++ b/x11-plugins/purple-hangouts/purple-hangouts-0_p20181202.ebuild |
96 |
@@ -26,6 +26,8 @@ RDEPEND=" |
97 |
DEPEND="${RDEPEND}" |
98 |
BDEPEND="virtual/pkgconfig" |
99 |
|
100 |
+PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" ) |
101 |
+ |
102 |
src_prepare() { |
103 |
default |
104 |
|
105 |
|
106 |
diff --git a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild |
107 |
index fa9a49d18ae..df8116adca8 100644 |
108 |
--- a/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild |
109 |
+++ b/x11-plugins/purple-hangouts/purple-hangouts-9999.ebuild |
110 |
@@ -1,4 +1,4 @@ |
111 |
-# Copyright 1999-2018 Gentoo Authors |
112 |
+# Copyright 1999-2019 Gentoo Authors |
113 |
# Distributed under the terms of the GNU General Public License v2 |
114 |
|
115 |
EAPI=7 |
116 |
@@ -22,6 +22,8 @@ RDEPEND=" |
117 |
DEPEND="${RDEPEND}" |
118 |
BDEPEND="virtual/pkgconfig" |
119 |
|
120 |
+PATCHES=( "${FILESDIR}/${PN}-0_p20181202-makefile.patch" ) |
121 |
+ |
122 |
src_prepare() { |
123 |
default |