1 |
eva 09/06/01 21:03:22 |
2 |
|
3 |
Added: anjuta-2.26.0.0-symbol-db-optional.patch |
4 |
Log: |
5 |
New version for GNOME 2.26. Drop libgnomeprint and gnome-vfs dependency. Merge gnome-build into anjuta. Still bundle scintilla at version 1.77. |
6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-util/anjuta/files/anjuta-2.26.0.0-symbol-db-optional.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/anjuta/files/anjuta-2.26.0.0-symbol-db-optional.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/anjuta/files/anjuta-2.26.0.0-symbol-db-optional.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: anjuta-2.26.0.0-symbol-db-optional.patch |
15 |
=================================================================== |
16 |
diff -Naur anjuta-2.25.903.0.orig/configure.in anjuta-2.25.903.0/configure.in |
17 |
--- anjuta-2.25.903.0.orig/configure.in 2009-03-03 00:22:52.000000000 +0530 |
18 |
+++ anjuta-2.25.903.0/configure.in 2009-03-14 20:36:35.677136513 +0530 |
19 |
@@ -312,6 +312,29 @@ |
20 |
AC_DEFINE(HAVE_GRAPHVIZ, [], [Define if we have GraphViz >= 2.6.0]) |
21 |
fi |
22 |
|
23 |
+dnl Plugin Symbol DB |
24 |
+dnl ------------------------------------------------------------- |
25 |
+ |
26 |
+AC_ARG_ENABLE(plugin-symbol-db, |
27 |
+ AC_HELP_STRING([--disable-plugin-symbol-db],[libgda-4 based symbol DB]), |
28 |
+ [ if test "$enableval" = "yes"; then |
29 |
+ user_disabled_symbol_db=1 |
30 |
+ fi ], |
31 |
+ [ user_disabled_symbol_db=0 ]) |
32 |
+ |
33 |
+AC_MSG_CHECKING(if symbol db plugin is disabled) |
34 |
+if test "$user_disabled_symbol_db" = 1; then |
35 |
+ AC_MSG_RESULT(no) |
36 |
+ symbol_db="yes" |
37 |
+ |
38 |
+ PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB, |
39 |
+ [libgda-4.0 >= $GDA_REQUIRED]) |
40 |
+else |
41 |
+ AC_MSG_RESULT(yes) |
42 |
+ symbol_db="no" |
43 |
+fi |
44 |
+AM_CONDITIONAL(HAVE_PLUGIN_SYMBOL_DB, [test x$symbol_db = xyes]) |
45 |
+ |
46 |
dnl Build gtksourceview plugin only on gnome 2.14 and gtk 2.10 |
47 |
dnl ------------------------------------------------------------- |
48 |
|
49 |
@@ -357,9 +380,6 @@ |
50 |
fi |
51 |
AM_CONDITIONAL(HAVE_PLUGIN_SCINTILLA, [test x$scintilla = xyes]) |
52 |
|
53 |
-PKG_CHECK_MODULES(PLUGIN_SYMBOL_DB, |
54 |
- [libgda-4.0 >= $GDA_REQUIRED]) |
55 |
- |
56 |
dnl Valgrind plugin |
57 |
dnl check for libbfd |
58 |
dnl ------------------------------------------------------------- |
59 |
@@ -1071,6 +1091,13 @@ |
60 |
echo " Requires graphviz (>= 2.6.0); http://graphviz.org" |
61 |
fi |
62 |
|
63 |
+if [ test x$symbol_db = xyes ]; then |
64 |
+ echo "Building Symbol DB plugin: .............................YES" |
65 |
+else |
66 |
+ echo "Building Symbol DB plugin: .............................NO" |
67 |
+ echo " Requires libgda-4" |
68 |
+fi |
69 |
+ |
70 |
if [ test x$valgrind = xyes ]; then |
71 |
echo "Building Valgrind debugger plugin: .....................YES" |
72 |
else |
73 |
diff -Naur anjuta-2.25.903.0.orig/plugins/symbol-db/Makefile.am anjuta-2.25.903.0/plugins/symbol-db/Makefile.am |
74 |
--- anjuta-2.25.903.0.orig/plugins/symbol-db/Makefile.am 2009-02-17 02:28:39.000000000 +0530 |
75 |
+++ anjuta-2.25.903.0/plugins/symbol-db/Makefile.am 2009-03-14 20:33:18.573135840 +0530 |
76 |
@@ -1,3 +1,5 @@ |
77 |
+if HAVE_PLUGIN_SYMBOL_DB |
78 |
+ |
79 |
SUBDIRS = images test |
80 |
|
81 |
symbol_db_datadir = $(anjuta_data_dir) |
82 |
@@ -77,6 +79,8 @@ |
83 |
prefs_glade_files = anjuta-symbol-db.glade |
84 |
include $(top_srcdir)/scripts/build-schemas.mk |
85 |
|
86 |
+endif |
87 |
+ |
88 |
EXTRA_DIST = \ |
89 |
$(plugin_in_files) \ |
90 |
$(symbol_db_plugin_DATA) \ |