-
Notifications
You must be signed in to change notification settings - Fork 4
/
folks-0.10.x.patch
213 lines (188 loc) · 6 KB
/
folks-0.10.x.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
--- backends/bluez/Makefile.in Fri Sep 12 23:21:35 2014
+++ backends/bluez/Makefile.in Sun Sep 14 20:55:41 2014
@@ -466,6 +466,7 @@
-fPIC \
-module \
-avoid-version \
+ -no-undefined \
$(NULL)
BACKEND_NAME = "bluez"
--- backends/dummy/lib/Makefile.in Fri Sep 12 23:21:35 2014
+++ backends/dummy/lib/Makefile.in Sun Sep 14 20:55:20 2014
@@ -539,7 +539,7 @@
backend_library_ldflags = \
$(backend_library_ldflags_generic) \
- -version-info $(BACKEND_LT_VERSION) \
+ -no-undefined -version-info $(BACKEND_LT_VERSION) \
-export-symbols-regex $(BACKEND_SYMBOLS_REGEX) \
$(NULL)
--- backends/dummy/Makefile.in Fri Sep 12 23:21:35 2014
+++ backends/dummy/Makefile.in Sun Sep 14 20:55:34 2014
@@ -444,7 +444,7 @@
$(NULL)
dummy_la_LDFLAGS = \
- -module -avoid-version \
+ -no-undefined -module -avoid-version \
$(backend_ldflags) \
$(NULL)
--- backends/eds/lib/edsf-persona-store.c Fri Sep 12 18:58:58 2014
+++ backends/eds/lib/edsf-persona-store.c Sun Sep 14 22:29:17 2014
@@ -10968,7 +10968,8 @@
_edsf_persona_store_notify_if_default (self);
}
-
+void folks_persona_store_set_is_user_set_default (FolksPersonaStore* self,
+ gboolean value);
static void _edsf_persona_store_notify_if_default (EdsfPersonaStore* self) {
gboolean is_default = FALSE;
ESourceRegistry* _tmp0_ = NULL;
--- backends/eds/lib/Makefile.in Fri Sep 12 23:21:35 2014
+++ backends/eds/lib/Makefile.in Sun Sep 14 20:55:53 2014
@@ -541,7 +541,7 @@
backend_library_ldflags = \
$(backend_library_ldflags_generic) \
- -version-info $(BACKEND_LT_VERSION) \
+ -no-undefined -version-info $(BACKEND_LT_VERSION) \
-export-symbols-regex $(BACKEND_SYMBOLS_REGEX) \
$(NULL)
--- backends/eds/Makefile.in Fri Sep 12 23:21:35 2014
+++ backends/eds/Makefile.in Sun Sep 14 20:57:40 2014
@@ -546,7 +546,7 @@
$(NULL)
eds_la_LDFLAGS = \
- -module -avoid-version \
+ -no-undefined -module -avoid-version \
$(backend_ldflags) \
$(NULL)
--- backends/key-file/Makefile.in Fri Sep 12 23:21:35 2014
+++ backends/key-file/Makefile.in Sun Sep 14 20:56:00 2014
@@ -496,6 +496,7 @@
$(NULL)
key_file_la_LDFLAGS = \
+ -no-undefined \
-module -avoid-version \
$(backend_ldflags) \
$(NULL)
--- backends/libsocialweb/lib/Makefile.in Fri Sep 12 23:21:35 2014
+++ backends/libsocialweb/lib/Makefile.in Sun Sep 14 22:14:58 2014
@@ -537,7 +537,7 @@
backend_library_ldflags = \
$(backend_library_ldflags_generic) \
- -version-info $(BACKEND_LT_VERSION) \
+ -no-undefined -version-info $(BACKEND_LT_VERSION) \
-export-symbols-regex $(BACKEND_SYMBOLS_REGEX) \
$(NULL)
@@ -610,7 +610,7 @@
$(NULL)
libfolks_libsocialweb_la_LIBADD = \
- $(backend_library_LIBADD) \
+ $(backend_library_libadd) \
$(SW_CLIENT_LIBS) \
$(NULL)
--- backends/libsocialweb/Makefile.in Fri Sep 12 23:21:35 2014
+++ backends/libsocialweb/Makefile.in Sun Sep 14 20:56:09 2014
@@ -542,6 +542,7 @@
$(NULL)
libsocialweb_la_LDFLAGS = \
+ -no-undefined \
-module -avoid-version \
$(backend_ldflags) \
$(NULL)
--- backends/ofono/Makefile.in Fri Sep 12 23:21:35 2014
+++ backends/ofono/Makefile.in Sun Sep 14 20:56:44 2014
@@ -505,6 +505,7 @@
$(NULL)
ofono_la_LDFLAGS = \
+ -no-undefined \
-module -avoid-version \
$(backend_ldflags) \
$(NULL)
--- backends/telepathy/lib/Makefile.in Fri Sep 12 23:21:36 2014
+++ backends/telepathy/lib/Makefile.in Sun Sep 14 20:57:13 2014
@@ -600,7 +600,7 @@
backend_library_ldflags = \
$(backend_library_ldflags_generic) \
- -version-info $(BACKEND_LT_VERSION) \
+ -no-undefined -version-info $(BACKEND_LT_VERSION) \
-export-symbols-regex $(BACKEND_SYMBOLS_REGEX) \
$(NULL)
@@ -687,6 +687,7 @@
-shared \
-rpath $(libdir) \
-avoid-version \
+ -no-undefined \
$(GIO_LIBS) \
$(GLIB_LIBS) \
$(TP_GLIB_LIBS) \
--- backends/telepathy/Makefile.in Fri Sep 12 23:21:36 2014
+++ backends/telepathy/Makefile.in Sun Sep 14 20:56:52 2014
@@ -541,6 +541,7 @@
$(NULL)
telepathy_la_LDFLAGS = \
+ -no-undefined \
-module -avoid-version \
$(backend_ldflags) \
$(NULL)
--- folks/backend-store.c Fri Sep 12 18:58:38 2014
+++ folks/backend-store.c Sun Sep 14 20:51:06 2014
@@ -37,6 +37,20 @@
#include <config.h>
#include <glib/gi18n-lib.h>
+#ifdef G_OS_WIN32
+#include <shlobj.h>
+HMODULE folks_dll = NULL;
+BOOL WINAPI
+DllMain (HINSTANCE hinstDLL,
+ DWORD fdwReason,
+ LPVOID lpvReserved)
+{
+ if (fdwReason == DLL_PROCESS_ATTACH)
+ folks_dll = hinstDLL;
+
+ return TRUE;
+}
+#endif
#define FOLKS_TYPE_BACKEND_STORE (folks_backend_store_get_type ())
#define FOLKS_BACKEND_STORE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOLKS_TYPE_BACKEND_STORE, FolksBackendStore))
@@ -1624,7 +1638,13 @@
_data_->_tmp14_ = _data_->_path;
if (_data_->_tmp14_ == NULL) {
_data_->_tmp15_ = NULL;
+#ifdef G_OS_WIN32
+ _data_->_tmp15_ = g_build_filename \
+ (g_win32_get_package_installation_directory_of_module (folks_dll), \
+ "lib","folks","42","backends", NULL);
+#else
_data_->_tmp15_ = g_strdup (BACKEND_DIR);
+#endif
_g_free0 (_data_->path);
_data_->path = _data_->_tmp15_;
_data_->_tmp16_ = NULL;
@@ -1648,7 +1668,7 @@
_data_->_tmp21_ = _data_->path;
_data_->_tmp22_ = NULL;
_data_->_tmp23_ = NULL;
- _data_->_tmp23_ = _data_->_tmp22_ = g_strsplit (_data_->_tmp21_, ":", 0);
+ _data_->_tmp23_ = _data_->_tmp22_ = g_strsplit (_data_->_tmp21_, G_SEARCHPATH_SEPARATOR_S, 0);
_data_->path_split_length1 = 0;
_data_->_path_split_size_ = 0;
_data_->path_split = _data_->_tmp23_;
--- folks/Makefile.in Fri Sep 12 23:21:36 2014
+++ folks/Makefile.in Sun Sep 14 20:45:50 2014
@@ -576,7 +576,7 @@
libfolks_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(CODE_COVERAGE_LDFLAGS) \
- -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"
+ -no-undefined -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)"
folksdir = $(includedir)/folks
folks_HEADERS = folks.h
--- configure Fri Sep 12 23:21:34 2014
+++ configure Sun Sep 14 21:01:24 2014
@@ -14793,7 +14793,7 @@
! -e ${sd}folks/libfolks_la_vala.stamp \
; then :
- enable_vala=yes
+ enable_vala=no
echo "Vala source needs to be re-compiled; requiring Vala..."
fi