[brasero] Remove beagle from Brasero. Fixes bgo #657313 and #639257.
- From: Luis Medinas <lmedinas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [brasero] Remove beagle from Brasero. Fixes bgo #657313 and #639257.
- Date: Sun, 28 Aug 2011 14:05:59 +0000 (UTC)
commit ac0a1196126f3ee1b494a3e505294e761faa0559
Author: Luis Medinas <lmedinas gnome org>
Date: Sun Aug 28 15:03:39 2011 +0100
Remove beagle from Brasero. Fixes bgo #657313 and #639257.
Beagle is dead upstream and people should use tracker instead. Long live Beagle.
README | 11 +-
configure.in | 26 ---
src/Makefile.am | 7 -
src/brasero-search-beagle.c | 453 -------------------------------------------
src/brasero-search-beagle.h | 54 -----
src/brasero-search-engine.c | 12 --
6 files changed, 4 insertions(+), 559 deletions(-)
---
diff --git a/README b/README
index e8e5ec8..d34d20d 100644
--- a/README
+++ b/README
@@ -62,19 +62,16 @@ As examples, from my experience:
Requirements:
-- gtk+ >= 2.12.0
-- gnome 2.22.x (libgnome, gio)
+- gtk+ >= 3.x
+- gnome 3.x (gio)
- gstreamer (>=0.10.0)
-- Hal (>= 0.50)
-- DBus (>=1.x)
- libxml2
- cdrtools or cdrkit
- growisofs
- a fairly new kernel (>= 2.6.13 because of inotify) (optional)
- cairo
- libcanberra
-- totem (>= 2.20) (optional)
-- beagle (>= 0.3.0) (optional)
-- tracker (>= 0.7.0) (optional)
+- totem (>= 3.0) (optional)
+- tracker (>= 0.10.0) (optional)
- libburn (>=0.4.0) (optional)
- libisofs (>=0.6.2) (optional)
diff --git a/configure.in b/configure.in
index f3e9e81..0019df0 100644
--- a/configure.in
+++ b/configure.in
@@ -372,7 +372,6 @@ else
fi
AM_CONDITIONAL(BUILD_GROWISOFS, test x"$build_growisofs" = "xyes")
-BEAGLE_REQUIRED=0.3.0
TRACKER_REQUIRED=0.10.0
AC_ARG_ENABLE(search,
@@ -382,7 +381,6 @@ AC_ARG_ENABLE(search,
"yes") enable_search="yes" ;;
"no") enable_search="no" ;;
"tracker") enable_search="tracker" ;;
- "beagle") enable_search="beagle" ;;
*) echo "Unknown option"; exit 2 ;;
esac],
[enable_search="yes"])
@@ -393,18 +391,8 @@ if test x"$enable_search" = "xtracker"; then
AC_DEFINE(BUILD_TRACKER, 1, [define if you want to use search pane])
AC_SUBST(BRASERO_SEARCH_CFLAGS)
AC_SUBST(BRASERO_SEARCH_LIBS)
- build_beagle="no"
build_tracker="yes"
build_search="yes"
-elif test x"$enable_search" = "xbeagle"; then
- PKG_CHECK_MODULES(BRASERO_SEARCH, libbeagle-1.0 >= $BEAGLE_REQUIRED)
- AC_DEFINE(BUILD_SEARCH, 1, [define if you want to use search pane])
- AC_DEFINE(BUILD_BEAGLE, 1, [define if you want to use search pane])
- AC_SUBST(BRASERO_SEARCH_CFLAGS)
- AC_SUBST(BRASERO_SEARCH_LIBS)
- build_beagle="yes"
- build_tracker="no"
- build_search="yes"
elif test x"$enable_search" = "xyes"; then
PKG_CHECK_MODULES(BRASERO_SEARCH, tracker-client-0.10 >= $TRACKER_REQUIRED, build_search=yes, build_search=no)
if test x"$build_search" = "xyes"; then
@@ -414,27 +402,13 @@ elif test x"$enable_search" = "xyes"; then
AC_SUBST(BRASERO_SEARCH_CFLAGS)
AC_SUBST(BRASERO_SEARCH_LIBS)
- build_beagle="no"
build_tracker="yes"
- else
- PKG_CHECK_MODULES(BRASERO_SEARCH, libbeagle-1.0 >= $BEAGLE_REQUIRED, build_search=yes, build_search=no)
- if test x"$build_search" = "xyes"; then
- AC_DEFINE(BUILD_SEARCH, 1, [define if you want to use search pane])
- AC_DEFINE(BUILD_BEAGLE, 1, [define if you want to use search pane])
-
- AC_SUBST(BRASERO_SEARCH_CFLAGS)
- AC_SUBST(BRASERO_SEARCH_LIBS)
-
- build_beagle="yes"
- build_tracker="no"
- fi
fi
else
build_search="no"
fi
AM_CONDITIONAL(BUILD_SEARCH, test x"$build_search" = "xyes")
-AM_CONDITIONAL(BUILD_BEAGLE, test x"$build_beagle" = "xyes")
AM_CONDITIONAL(BUILD_TRACKER, test x"$build_tracker" = "xyes")
dnl ****************check for playlist (optional)**************
diff --git a/src/Makefile.am b/src/Makefile.am
index f3b1b1f..aa3388e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -137,12 +137,6 @@ brasero_SOURCES += \
brasero-search-tracker.c
endif
-if BUILD_BEAGLE
-brasero_SOURCES += \
- brasero-search-beagle.h \
- brasero-search-beagle.c
-endif
-
brasero_LDADD = \
$(top_builddir)/libbrasero-media/libbrasero-media3.la \
$(top_builddir)/libbrasero-burn/libbrasero-burn3.la \
@@ -165,6 +159,5 @@ EXTRA_DIST = \
CLEANFILES = \
$(RECMARSHALFILES)
-
-include $(top_srcdir)/git.mk
diff --git a/src/brasero-search-engine.c b/src/brasero-search-engine.c
index dd6e5e2..39ffcea 100644
--- a/src/brasero-search-engine.c
+++ b/src/brasero-search-engine.c
@@ -334,18 +334,6 @@ brasero_search_engine_new_default (void)
#endif
-#ifdef BUILD_BEAGLE
-
-#include "brasero-search-beagle.h"
-
-BraseroSearchEngine *
-brasero_search_engine_new_default (void)
-{
- return g_object_new (BRASERO_TYPE_SEARCH_BEAGLE, NULL);
-}
-
-#endif
-
#else
BraseroSearchEngine *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]