1 |
eva 09/10/29 23:38:21 |
2 |
|
3 |
Added: anjuta-2.28.1.0-symbol-db-optional.patch |
4 |
anjuta-2.28.1.0-debug-mode.patch |
5 |
Log: |
6 |
New version for GNOME 2.28. |
7 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 dev-util/anjuta/files/anjuta-2.28.1.0-symbol-db-optional.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/anjuta/files/anjuta-2.28.1.0-symbol-db-optional.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/anjuta/files/anjuta-2.28.1.0-symbol-db-optional.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: anjuta-2.28.1.0-symbol-db-optional.patch |
16 |
=================================================================== |
17 |
From 62ed030d66574884c7d716c436e9e20ce6da829b Mon Sep 17 00:00:00 2001 |
18 |
From: Gilles Dartiguelongue <eva@g.o> |
19 |
Date: Sun, 25 Oct 2009 20:58:15 +0100 |
20 |
Subject: [PATCH] Allow disabling symbol-db plugin |
21 |
|
22 |
--- |
23 |
configure.in | 32 ++++++++++++++++++++++++++++++-- |
24 |
plugins/symbol-db/Makefile.am | 4 ++++ |
25 |
2 files changed, 34 insertions(+), 2 deletions(-) |
26 |
|
27 |
diff --git a/configure.in b/configure.in |
28 |
index 197cafd..e7c5445 100644 |
29 |
--- a/configure.in |
30 |
+++ b/configure.in |
31 |
@@ -230,6 +230,29 @@ fi |
32 |
|
33 |
AM_CONDITIONAL(HAVE_PLUGIN_GLADE, [test x$gladeui_found = xyes]) |
34 |
|
35 |
+dnl Plugin Symbol DB |
36 |
+dnl ------------------------------------------------------------- |
37 |
+ |
38 |
+AC_ARG_ENABLE(plugin-symbol-db, |
39 |
+ AC_HELP_STRING([--disable-plugin-symbol-db],[libgda-4 based symbol DB]), |
40 |
+ [ if test "$enableval" = "yes"; then |
41 |
+ user_disabled_symbol_db=1 |
42 |
+ fi ], |
43 |
+ [ user_disabled_symbol_db=0 ]) |
44 |
+ |
45 |
+AC_MSG_CHECKING(if symbol db plugin is disabled) |
46 |
+if test "$user_disabled_symbol_db" = 1; then |
47 |
+ AC_MSG_RESULT(no) |
48 |
+ symbol_db="yes" |
49 |
+ |
50 |
+ PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB, |
51 |
+ [libgda-4.0 >= $GDA_REQUIRED]) |
52 |
+else |
53 |
+ AC_MSG_RESULT(yes) |
54 |
+ symbol_db="no" |
55 |
+fi |
56 |
+AM_CONDITIONAL(HAVE_PLUGIN_SYMBOL_DB, [test x$symbol_db = xyes]) |
57 |
+ |
58 |
dnl Build gtksourceview plugin only on gnome 2.14 and gtk 2.10 |
59 |
dnl ------------------------------------------------------------- |
60 |
|
61 |
@@ -255,8 +278,6 @@ fi |
62 |
|
63 |
AM_CONDITIONAL(HAVE_PLUGIN_SOURCEVIEW, [test x$sourceview = xyes]) |
64 |
|
65 |
-PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB, |
66 |
- [libgda-4.0 >= $GDA_REQUIRED]) |
67 |
|
68 |
dnl Setup Anjuta Library flags |
69 |
dnl -------------------------- |
70 |
@@ -862,6 +883,13 @@ else |
71 |
echo " Requires devhelp >= 0.22" |
72 |
fi |
73 |
|
74 |
+if [ test x$symbol_db = xyes ]; then |
75 |
+ echo "Building Symbol DB plugin: .............................YES" |
76 |
+else |
77 |
+ echo "Building Symbol DB plugin: .............................NO" |
78 |
+ echo " Requires libgda-4" |
79 |
+fi |
80 |
+ |
81 |
if [ test x$sourceview = xyes ]; then |
82 |
echo "Building GtkSourceView based editor: ...................YES" |
83 |
else |
84 |
diff --git a/plugins/symbol-db/Makefile.am b/plugins/symbol-db/Makefile.am |
85 |
index 9b94b6d..07aad96 100644 |
86 |
--- a/plugins/symbol-db/Makefile.am |
87 |
+++ b/plugins/symbol-db/Makefile.am |
88 |
@@ -1,3 +1,5 @@ |
89 |
+if HAVE_PLUGIN_SYMBOL_DB |
90 |
+ |
91 |
SUBDIRS = images benchmark anjuta-tags test-queries |
92 |
|
93 |
symbol_db_datadir = $(anjuta_data_dir) |
94 |
@@ -82,6 +84,8 @@ libanjuta_symbol_db_la_LIBADD = \ |
95 |
prefs_ui_files = anjuta-symbol-db.ui |
96 |
include $(top_srcdir)/scripts/build-schemas.mk |
97 |
|
98 |
+endif |
99 |
+ |
100 |
EXTRA_DIST = \ |
101 |
$(plugin_in_files) \ |
102 |
$(symbol_db_plugin_DATA) \ |
103 |
-- |
104 |
1.6.5.rc1 |
105 |
|
106 |
|
107 |
|
108 |
|
109 |
1.1 dev-util/anjuta/files/anjuta-2.28.1.0-debug-mode.patch |
110 |
|
111 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/anjuta/files/anjuta-2.28.1.0-debug-mode.patch?rev=1.1&view=markup |
112 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/anjuta/files/anjuta-2.28.1.0-debug-mode.patch?rev=1.1&content-type=text/plain |
113 |
|
114 |
Index: anjuta-2.28.1.0-debug-mode.patch |
115 |
=================================================================== |
116 |
From: Romain Perier <mrpouet@g.o> |
117 |
Date: Mon, 26 Oct 2009 11:12:22 +0100 |
118 |
Subject: [PATCH] Fix the forced debugging mode even if --disable-debug is given on the command line |
119 |
|
120 |
--- |
121 |
configure.in | 4 +++- |
122 |
1 files changed, 3 insertions(+), 1 deletions(-) |
123 |
|
124 |
diff --git a/configure.in b/configure.in |
125 |
index 5f4c4bc..611faaa 100644 |
126 |
--- a/configure.in |
127 |
+++ b/configure.in |
128 |
@@ -80,7 +80,9 @@ AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS" |
129 |
dnl Enable debugging mode |
130 |
AC_ARG_ENABLE(debug, |
131 |
AC_HELP_STRING([--enable-debug],[Enable debug messages]), |
132 |
- AM_CFLAGS="$AM_CFLAGS -DDEBUG") |
133 |
+ [if test "x$enableval" = "xyes"; then |
134 |
+ AM_CFLAGS="$AM_CFLAGS -DDEBUG" |
135 |
+ fi]) |
136 |
AC_SUBST(AM_CFLAGS) |
137 |
|
138 |
ANJUTA_LDFLAGS="-no-undefined" |
139 |
-- |
140 |
1.6.5.1 |