1 |
pacho 11/09/25 16:25:55 |
2 |
|
3 |
Added: libgamin-0.1.10-crosscompile-fix.patch |
4 |
libgamin-0.1.10-armel-features.patch |
5 |
libgamin-0.1.10-G_CONST_RETURN-removal.patch |
6 |
Log: |
7 |
Fix compilation with latest glib, bug #382783 by Maciej Piechotka; fix crosscompilation issues, bug #267604 by Andrei Slavoiu; enable linux specific features on armel, upstream bug #588338; drop DG_DISABLE_DEPRECATED; don't try to even check for python, simplifying ebuild for people running python3 as main interpreter; use gnome.org eclass to set SRC_URI and use bz2 tarball instead of gz. |
8 |
|
9 |
(Portage version: 2.1.10.19/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: libgamin-0.1.10-crosscompile-fix.patch |
18 |
=================================================================== |
19 |
--- configure.in.orig 2009-04-26 23:00:43.445135823 +0300 |
20 |
+++ configure.in 2009-04-26 23:25:04.042489243 +0300 |
21 |
@@ -389,8 +389,7 @@ |
22 |
|
23 |
AC_MSG_CHECKING(abstract socket namespace) |
24 |
AC_LANG_PUSH(C) |
25 |
-AC_RUN_IFELSE([AC_LANG_PROGRAM( |
26 |
-[[ |
27 |
+AC_TRY_RUN([ |
28 |
#include <sys/types.h> |
29 |
#include <stdlib.h> |
30 |
#include <string.h> |
31 |
@@ -398,8 +397,8 @@ |
32 |
#include <sys/socket.h> |
33 |
#include <sys/un.h> |
34 |
#include <errno.h> |
35 |
-]], |
36 |
-[[ |
37 |
+ |
38 |
+int main() { |
39 |
int listen_fd; |
40 |
struct sockaddr_un addr; |
41 |
|
42 |
@@ -424,9 +423,11 @@ |
43 |
} |
44 |
else |
45 |
exit (0); |
46 |
-]])], |
47 |
- [have_abstract_sockets=yes], |
48 |
- [have_abstract_sockets=no]) |
49 |
+} |
50 |
+], |
51 |
+have_abstract_sockets=yes, |
52 |
+have_abstract_sockets=no, |
53 |
+have_abstract_sockets=no) |
54 |
AC_LANG_POP(C) |
55 |
AC_MSG_RESULT($have_abstract_sockets) |
56 |
|
57 |
|
58 |
|
59 |
|
60 |
1.1 dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch |
61 |
|
62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch?rev=1.1&view=markup |
63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch?rev=1.1&content-type=text/plain |
64 |
|
65 |
Index: libgamin-0.1.10-armel-features.patch |
66 |
=================================================================== |
67 |
From 05dcfcd69848e119c6a30d363bc41e896029f8af Mon Sep 17 00:00:00 2001 |
68 |
From: Sebastian Dröge <slomo@××××××.org> |
69 |
Date: Tue, 15 Dec 2009 12:24:25 +0000 |
70 |
Subject: Bug 588338 - Enable linux specific features on armel |
71 |
|
72 |
--- |
73 |
diff --git a/configure.in b/configure.in |
74 |
index b0bbaec..e4b684e 100644 |
75 |
--- a/configure.in |
76 |
+++ b/configure.in |
77 |
@@ -176,7 +176,7 @@ fi |
78 |
|
79 |
dnl check what OS we're on |
80 |
#AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnu) |
81 |
-if test x$target_os = xlinux-gnu; then |
82 |
+if test x$target_os = xlinux-gnu -o x$target_os = xlinux-gnueabi; then |
83 |
AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not]) |
84 |
fi |
85 |
|
86 |
@@ -223,7 +223,7 @@ fi |
87 |
dnl check if inotify backend is enabled |
88 |
AM_CONDITIONAL(ENABLE_INOTIFY, test x$inotify = xtrue) |
89 |
|
90 |
-if test x$os = xlinux-gnu; then |
91 |
+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi; then |
92 |
AC_ARG_ENABLE(dnotify, |
93 |
AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]), |
94 |
[dnotify="${enableval}"], [dnotify=true]) |
95 |
@@ -297,10 +297,12 @@ else |
96 |
fi |
97 |
|
98 |
dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps |
99 |
-if test x$os = xlinux-gnu -a x$WITH_THREADS = x1 ; then |
100 |
- if test "${CC}" = "gcc" ; then |
101 |
- echo Use weak symbols ! |
102 |
- THREAD_LIBS= |
103 |
+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi ; then |
104 |
+ if test x$WITH_THREADS = x1 ; then |
105 |
+ if test "${CC}" = "gcc" ; then |
106 |
+ echo Use weak symbols ! |
107 |
+ THREAD_LIBS= |
108 |
+ fi |
109 |
fi |
110 |
fi |
111 |
AC_SUBST(THREAD_LIBS) |
112 |
-- |
113 |
cgit v0.9.0.2 |
114 |
|
115 |
|
116 |
|
117 |
1.1 dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch |
118 |
|
119 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch?rev=1.1&view=markup |
120 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch?rev=1.1&content-type=text/plain |
121 |
|
122 |
Index: libgamin-0.1.10-G_CONST_RETURN-removal.patch |
123 |
=================================================================== |
124 |
From 2a9d32734a2e5125ae77de6c75789e1c6ee24dbe Mon Sep 17 00:00:00 2001 |
125 |
From: Maciej Piechotka <uzytkownik2@×××××.com> |
126 |
Date: Tue, 13 Sep 2011 09:47:05 +0200 |
127 |
Subject: [PATCH] Fix compilation of recent glib removing G_CONST_RETURN |
128 |
|
129 |
--- |
130 |
server/gam_node.c | 2 +- |
131 |
server/gam_node.h | 2 +- |
132 |
server/gam_subscription.c | 2 +- |
133 |
server/gam_subscription.h | 2 +- |
134 |
4 files changed, 4 insertions(+), 4 deletions(-) |
135 |
|
136 |
diff --git a/server/gam_node.c b/server/gam_node.c |
137 |
index 02358ba..d0302d2 100644 |
138 |
--- a/server/gam_node.c |
139 |
+++ b/server/gam_node.c |
140 |
@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir) |
141 |
* it has finished with the string. If it must keep it longer, it |
142 |
* should makes its own copy. The returned string must not be freed. |
143 |
*/ |
144 |
-G_CONST_RETURN char * |
145 |
+const char * |
146 |
gam_node_get_path(GamNode * node) |
147 |
{ |
148 |
g_assert(node); |
149 |
diff --git a/server/gam_node.h b/server/gam_node.h |
150 |
index 02c8692..83349a8 100644 |
151 |
--- a/server/gam_node.h |
152 |
+++ b/server/gam_node.h |
153 |
@@ -58,7 +58,7 @@ gboolean gam_node_is_dir (GamNode *node); |
154 |
void gam_node_set_is_dir (GamNode *node, |
155 |
gboolean is_dir); |
156 |
|
157 |
-G_CONST_RETURN char *gam_node_get_path (GamNode *node); |
158 |
+const char *gam_node_get_path (GamNode *node); |
159 |
|
160 |
GList *gam_node_get_subscriptions (GamNode *node); |
161 |
|
162 |
diff --git a/server/gam_subscription.c b/server/gam_subscription.c |
163 |
index dfa3273..4675b34 100644 |
164 |
--- a/server/gam_subscription.c |
165 |
+++ b/server/gam_subscription.c |
166 |
@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub) |
167 |
* @param sub the GamSubscription |
168 |
* @returns The path being monitored. It should not be freed. |
169 |
*/ |
170 |
-G_CONST_RETURN char * |
171 |
+const char * |
172 |
gam_subscription_get_path(GamSubscription * sub) |
173 |
{ |
174 |
if (sub == NULL) |
175 |
diff --git a/server/gam_subscription.h b/server/gam_subscription.h |
176 |
index d894fbe..e6b4e15 100644 |
177 |
--- a/server/gam_subscription.h |
178 |
+++ b/server/gam_subscription.h |
179 |
@@ -21,7 +21,7 @@ int gam_subscription_pathlen (GamSubscription *sub); |
180 |
|
181 |
int gam_subscription_get_reqno (GamSubscription *sub); |
182 |
|
183 |
-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); |
184 |
+const char *gam_subscription_get_path (GamSubscription *sub); |
185 |
|
186 |
GamListener *gam_subscription_get_listener (GamSubscription *sub); |
187 |
|
188 |
-- |
189 |
1.7.6.1 |