| 1 |
haubi 14/07/08 07:16:16 |
| 2 |
|
| 3 |
Added: orbit-2.14.19-aix-func_data.patch |
| 4 |
orbit-2.14.19-parallel-build.patch |
| 5 |
Log: |
| 6 |
+orbit-2.14.19-r4: Support Prefix, fix ppc-aix, drop G2CONF (#515094). Build parallel (#273031). |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A630CCB8) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: orbit-2.14.19-aix-func_data.patch |
| 17 |
=================================================================== |
| 18 |
From c50f193f69f9b14dd26fafb7cb4c9514eaa6f15e Mon Sep 17 00:00:00 2001 |
| 19 |
From: Michael Haubenwallner <michael.haubenwallner@××××××××××××.com> |
| 20 |
Date: Thu, 26 Jun 2014 12:45:18 +0200 |
| 21 |
Subject: [PATCH 1/2] bug#732275: rename func_data to gfunc_data for AIX |
| 22 |
|
| 23 |
--- |
| 24 |
include/orbit/orb-core/allocators.h | 2 +- |
| 25 |
src/idl-compiler/orbit-idl-utils.c | 14 +++++++------- |
| 26 |
src/idl-compiler/orbit-idl2.h | 4 ++-- |
| 27 |
3 files changed, 10 insertions(+), 10 deletions(-) |
| 28 |
|
| 29 |
diff --git a/include/orbit/orb-core/allocators.h b/include/orbit/orb-core/allocators.h |
| 30 |
index 0401a15..1861ca1 100644 |
| 31 |
--- a/include/orbit/orb-core/allocators.h |
| 32 |
+++ b/include/orbit/orb-core/allocators.h |
| 33 |
@@ -41,7 +41,7 @@ gpointer ORBit_realloc_tcval (gpointer old, |
| 34 |
Below, some magic values of the fnc ptr are defined. |
| 35 |
**/ |
| 36 |
typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem, |
| 37 |
- gpointer func_data); |
| 38 |
+ gpointer gfunc_data); |
| 39 |
|
| 40 |
#define ORBIT_MEMHOW_HOW(how) ((how) & 0x3) |
| 41 |
#define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2) |
| 42 |
diff --git a/src/idl-compiler/orbit-idl-utils.c b/src/idl-compiler/orbit-idl-utils.c |
| 43 |
index 3bb0467..04fe4a2 100644 |
| 44 |
--- a/src/idl-compiler/orbit-idl-utils.c |
| 45 |
+++ b/src/idl-compiler/orbit-idl-utils.c |
| 46 |
@@ -362,7 +362,7 @@ orbit_idl_print_node(IDL_tree node, int indent_level) |
| 47 |
|
| 48 |
static void |
| 49 |
IDL_tree_traverse_helper(IDL_tree p, GFunc f, |
| 50 |
- gconstpointer func_data, |
| 51 |
+ gconstpointer gfunc_data, |
| 52 |
GHashTable *visited_nodes, |
| 53 |
gboolean include_self) |
| 54 |
{ |
| 55 |
@@ -376,17 +376,17 @@ IDL_tree_traverse_helper(IDL_tree p, GFunc f, |
| 56 |
for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem; |
| 57 |
curitem = IDL_LIST (curitem).next) { |
| 58 |
IDL_tree_traverse_helper (IDL_get_parent_node |
| 59 |
- (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, func_data, visited_nodes, TRUE); |
| 60 |
+ (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE); |
| 61 |
} |
| 62 |
|
| 63 |
if (include_self) |
| 64 |
- f(p, (gpointer)func_data); |
| 65 |
+ f(p, (gpointer)gfunc_data); |
| 66 |
} |
| 67 |
|
| 68 |
void |
| 69 |
IDL_tree_traverse_parents_full (IDL_tree p, |
| 70 |
GFunc f, |
| 71 |
- gconstpointer func_data, |
| 72 |
+ gconstpointer gfunc_data, |
| 73 |
gboolean include_self) |
| 74 |
{ |
| 75 |
GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal); |
| 76 |
@@ -400,7 +400,7 @@ IDL_tree_traverse_parents_full (IDL_tree p, |
| 77 |
if (!p) |
| 78 |
return; |
| 79 |
|
| 80 |
- IDL_tree_traverse_helper (p, f, func_data, visited_nodes, include_self); |
| 81 |
+ IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self); |
| 82 |
|
| 83 |
g_hash_table_destroy (visited_nodes); |
| 84 |
} |
| 85 |
@@ -408,9 +408,9 @@ IDL_tree_traverse_parents_full (IDL_tree p, |
| 86 |
void |
| 87 |
IDL_tree_traverse_parents (IDL_tree p, |
| 88 |
GFunc f, |
| 89 |
- gconstpointer func_data) |
| 90 |
+ gconstpointer gfunc_data) |
| 91 |
{ |
| 92 |
- IDL_tree_traverse_parents_full (p, f, func_data, TRUE); |
| 93 |
+ IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE); |
| 94 |
} |
| 95 |
|
| 96 |
/* For use by below function */ |
| 97 |
diff --git a/src/idl-compiler/orbit-idl2.h b/src/idl-compiler/orbit-idl2.h |
| 98 |
index b58f57f..670e072 100644 |
| 99 |
--- a/src/idl-compiler/orbit-idl2.h |
| 100 |
+++ b/src/idl-compiler/orbit-idl2.h |
| 101 |
@@ -16,10 +16,10 @@ void orbit_idl_print_node (IDL_tree node, |
| 102 |
int indent_level); |
| 103 |
void IDL_tree_traverse_parents (IDL_tree p, |
| 104 |
GFunc f, |
| 105 |
- gconstpointer func_data); |
| 106 |
+ gconstpointer gfunc_data); |
| 107 |
void IDL_tree_traverse_parents_full (IDL_tree p, |
| 108 |
GFunc f, |
| 109 |
- gconstpointer func_data, |
| 110 |
+ gconstpointer gfunc_data, |
| 111 |
gboolean include_self); |
| 112 |
gboolean orbit_cbe_type_contains_complex (IDL_tree ts); |
| 113 |
void orbit_idl_check_oneway_op (IDL_tree op); |
| 114 |
-- |
| 115 |
1.8.3.2 |
| 116 |
|
| 117 |
|
| 118 |
|
| 119 |
|
| 120 |
1.1 gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch |
| 121 |
|
| 122 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch?rev=1.1&view=markup |
| 123 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch?rev=1.1&content-type=text/plain |
| 124 |
|
| 125 |
Index: orbit-2.14.19-parallel-build.patch |
| 126 |
=================================================================== |
| 127 |
From c67303ecfdf80072a2852433c7f7818113e61c06 Mon Sep 17 00:00:00 2001 |
| 128 |
From: Michael Haubenwallner <michael.haubenwallner@××××××××××××.com> |
| 129 |
Date: Thu, 26 Jun 2014 12:37:59 +0200 |
| 130 |
Subject: [PATCH 2/2] bug#732274: fix parallel build failure |
| 131 |
|
| 132 |
--- |
| 133 |
src/services/name/Makefile.am | 2 +- |
| 134 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 135 |
|
| 136 |
diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am |
| 137 |
index deda1ed..8cf868e 100644 |
| 138 |
--- a/src/services/name/Makefile.am |
| 139 |
+++ b/src/services/name/Makefile.am |
| 140 |
@@ -68,7 +68,7 @@ libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h |
| 141 |
|
| 142 |
orbit_name_server_2_SOURCES = boot.c |
| 143 |
orbit_name_server_2_LDFLAGS = $(FLAGS) |
| 144 |
-orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h |
| 145 |
+orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h libname-server-2.a |
| 146 |
orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS) |
| 147 |
|
| 148 |
$(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h |
| 149 |
-- |
| 150 |
1.8.3.2 |
Archives