From 73b54b7c984b8884735d7b11620a3a57b60ddd6d Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 17 Nov 2006 09:56:20 +0000 Subject: [PATCH] Stefan Fiedler: anjuta: fix build [2006102418344739380] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8047 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/gnome2/anjuta/anjuta.conf | 3 ++ package/gnome2/anjuta/fix-linkage.patch | 67 +++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 package/gnome2/anjuta/fix-linkage.patch diff --git a/package/gnome2/anjuta/anjuta.conf b/package/gnome2/anjuta/anjuta.conf index 0de0e1264..668aea4c2 100644 --- a/package/gnome2/anjuta/anjuta.conf +++ b/package/gnome2/anjuta/anjuta.conf @@ -21,3 +21,6 @@ # --- ROCK-COPYRIGHT-NOTE-END --- . $base/package/gnome2/gnome-2.conf + +pkginstalled openldap && \ + var_append configprefix " " "LDFLAGS=\"-L$pkg_openldap_prefix/lib\"" diff --git a/package/gnome2/anjuta/fix-linkage.patch b/package/gnome2/anjuta/fix-linkage.patch new file mode 100644 index 000000000..0842a8a9a --- /dev/null +++ b/package/gnome2/anjuta/fix-linkage.patch @@ -0,0 +1,67 @@ +--- anjuta-2.0.2/libegg/Makefile.in 2006-05-15 21:44:32.000000000 +0200 ++++ src.anjuta.1161700020.22489.2346648788/anjuta-2.0.2/libegg/Makefile.in 2006-10-24 16:45:08.000000000 +0200 +@@ -428,16 +428,16 @@ + $(GCONF_LIBS) + + test_tree_utils_SOURCES = test-tree-utils.c +-test_tree_utils_LDADD = libanjuta-egg.la ++test_tree_utils_LDADD = libanjuta-egg.la $(libanjuta_egg_la_LIBADD) + test_tree_utils_DEPENDENCIES = libanjuta-egg.la + test_multi_drag_SOURCES = test-multi-drag.c +-test_multi_drag_LDADD = libanjuta-egg.la ++test_multi_drag_LDADD = libanjuta-egg.la $(libanjuta_egg_la_LIBADD) + test_multi_drag_DEPENDENCIES = libanjuta-egg.la + test_union_SOURCES = test-union.c +-test_union_LDADD = libanjuta-egg.la ++test_union_LDADD = libanjuta-egg.la $(libanjuta_egg_la_LIBADD) + test_union_DEPENDENCIES = libanjuta-egg.la + test_actions_SOURCES = test-actions.c +-test_actions_LDADD = libanjuta-egg.la ++test_actions_LDADD = libanjuta-egg.la $(libanjuta_egg_la_LIBADD) + test_actions_DEPENDENCIES = libanjuta-egg.la + EXTRA_DIST = \ + eggmarshalers.list \ +--- anjuta-2.0.2/manuals/reference/libanjuta/Makefile.in 2006-05-15 21:44:33.000000000 +0200 ++++ src.anjuta.1161700020.22489.2346648788/anjuta-2.0.2/manuals/reference/libanjuta/Makefile.in 2006-10-24 17:57:49.000000000 +0200 +@@ -399,13 +399,17 @@ + @HAVE_PLUGIN_SCINTILLA_TRUE@ -I$(top_builddir) \ + @HAVE_PLUGIN_SCINTILLA_TRUE@ -I$(top_builddir)/libanjuta \ + @HAVE_PLUGIN_SCINTILLA_TRUE@ -I$(top_builddir)/scintilla/include \ +-@HAVE_PLUGIN_SCINTILLA_TRUE@ $(LIBANJUTA_CFLAGS) ++@HAVE_PLUGIN_SCINTILLA_TRUE@ $(LIBANJUTA_LIBS) \ ++@HAVE_PLUGIN_SCINTILLA_TRUE@ $(GNOME_UI_LIBS) \ ++@HAVE_PLUGIN_SCINTILLA_TRUE@ $(GLADE_LIBS) + + @HAVE_PLUGIN_SCINTILLA_FALSE@GTKDOC_LIBS = \ + @HAVE_PLUGIN_SCINTILLA_FALSE@ -lutil \ + @HAVE_PLUGIN_SCINTILLA_FALSE@ $(top_builddir)/libanjuta/libanjuta.la \ + @HAVE_PLUGIN_SCINTILLA_FALSE@ $(top_builddir)/libanjuta/interfaces/libanjuta-interfaces.la \ +-@HAVE_PLUGIN_SCINTILLA_FALSE@ $(LIBANJUTA_LIBS) ++@HAVE_PLUGIN_SCINTILLA_FALSE@ $(LIBANJUTA_LIBS) \ ++@HAVE_PLUGIN_SCINTILLA_FALSE@ $(GNOME_UI_LIBS) \ ++@HAVE_PLUGIN_SCINTILLA_FALSE@ $(GLADE_LIBS) + + @HAVE_PLUGIN_SCINTILLA_TRUE@GTKDOC_LIBS = \ + @HAVE_PLUGIN_SCINTILLA_TRUE@ -lutil \ +--- anjuta-2.0.2/plugins/gdb/Makefile.in 2006-05-15 21:44:37.000000000 +0200 ++++ src.anjuta.1161700020.22489.2346648788/anjuta-2.0.2/plugins/gdb/Makefile.in 2006-10-24 17:26:54.000000000 +0200 +@@ -38,7 +38,7 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-noinst_PROGRAMS = gdbmi-test$(EXEEXT) ++noinst_PROGRAMS = + subdir = plugins/gdb + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +--- anjuta-2.0.2/src/Makefile.in 2006-05-15 21:44:49.000000000 +0200 ++++ src.anjuta.1161700020.22489.2346648788/anjuta-2.0.2/src/Makefile.in 2006-10-24 17:45:06.000000000 +0200 +@@ -518,6 +518,8 @@ + + anjuta_shell_SOURCES = shell.c shell.h + anjuta_shell_LDADD = \ ++ $(GNOME_UI_LIBS) \ ++ $(GDL_LIBS) \ + $(top_builddir)/libanjuta/libanjuta.la + + EXTRA_DIST = \