Hi. I am glad to see that you were able to merge the patch for the autoconf options into tracker 0.5.3 :-). Attached is another set of patches (yes, autotools patches again :-().
tracker-0.5.3-disable-debug.patch: The current debug option can not actually be disabled. This patches fixes it so that you can disable it. tracker-0.5.3-disable-tests.patch: As with the debug code paths, this fixes the test issue. tracker-0.5.3-trackerd-test-compile-fix.patch: This patch fixes the test compile. I ported it to the current svn revision. There were a couple of files missing from the sources list, and a few libraries from the linking and thus caused undefined symbols. tracker-0.5.3-requires-libpng.patch: This is most likely the most questionable patch. It seems that with revision 312 (which was free-desktop.org standards compliance commit by jamiemcc for the thumbnailing), libpng was a required dependency. This patch therefore, removes the option from the configuration for the tracker. If libpng is already there, I think that just building the backend support is a good idea. Furthermore, png support is needed for GKT+ to behave properly in general, therefore, it shouldnt concern people that its forcing a new dependency. Hope to see more great improvements in this project. Thanks. Saleem Abdulrasool compnerd (at) gentoo (dot) org
Index: configure.in
===================================================================
--- configure.in (revision 373)
+++ configure.in (working copy)
@@ -89,10 +89,9 @@
####################################################################
-AC_ARG_ENABLE(debug_code,
- AC_HELP_STRING(
- [--enable-debug-code],
- [build with debug
symbols]),[enable_debug_code=yes],[enable_debug_code=no])
+AC_ARG_ENABLE([debug_code],
+ AC_HELP_STRING([--enable-debug-code], [build with debug
symbols]),,
+ [enable_debug_code=yes])
if test "x$enable_debug_code" = "xyes"; then
CFLAGS="-g $CFLAGS"
Index: configure.in
===================================================================
--- configure.in (revision 373)
+++ configure.in (working copy)
@@ -214,13 +213,13 @@
AM_CONDITIONAL(USING_GSTREAMER, false)
fi
-AM_CONDITIONAL(BUILD_TEST, false)
-AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],[build test suite]),
- [
- AM_CONDITIONAL(BUILD_TEST, true)
- AC_DEFINE(BUILD_TEST, [], [Define if we are
building test stuff])
- ]
- )
+###################################################################
+# Tests
+###################################################################
+AC_ARG_ENABLE([test],
+ AC_HELP_STRING([--enable-test], [build test suite]),,
+ [enable_test=false])
+AM_CONDITIONAL(BUILD_TEST, test "x$enable_test" != "xfalse")
####################################################################
# Optional database/indexer component checks
Index: configure.in
===================================================================
--- configure.in (revision 373)
+++ configure.in (working copy)
@@ -63,7 +63,7 @@
AC_SUBST(DBUS_LIBS)
# Check for libpng 1.2 or higher
-PKG_CHECK_MODULES(LIBPNG, [libpng >= 1.2])
+PKG_CHECK_MODULES(LIBPNG, [ libpng >= 1.2 ])
AC_SUBST(LIBPNG_CFLAGS)
AC_SUBST(LIBPNG_LIBS)
@@ -435,28 +434,7 @@
AM_CONDITIONAL(HAVE_POPPLER_GLIB, test "$have_poppler" = "yes")
test "$have_poppler" = "yes" && AC_DEFINE(HAVE_POPPLER, [], [Define if we have
poppler])
-
##################################################################
-# check for libpng
-##################################################################
-
-LIBPNG_REQUIRED=1.2
-
-AC_ARG_ENABLE(png, AC_HELP_STRING([--disable-png],[Disable PNG data
extractor]),,[enable_png=yes])
-if test "x$enable_png" = "xyes"; then
- PKG_CHECK_MODULES(LIBPNG, [
- libpng >= $LIBPNG_REQUIRED],
- [have_libpng=yes] , [have_libpng=no])
- AC_SUBST(LIBPNG_CFLAGS)
- AC_SUBST(LIBPNG_LIBS)
-else
- have_libpng="no (disabled)"
-fi
-AM_CONDITIONAL(HAVE_LIBPNG, test "$have_libpng" = "yes")
-test "$have_libpng" = "yes" && AC_DEFINE(HAVE_LIBPNG, [], [Define if we have
libpng])
-
-
-##################################################################
# check for libexif
##################################################################
@@ -562,7 +540,7 @@
Metadata extractors:
pdf: $have_poppler
- png: $have_libpng
+ png: yes
exif (jpeg): $have_libexif
gsf: $have_libgsf
video files: $videos_are_handled
($videos_handler)
Index: src/tracker-extract/tracker-extract.c
===================================================================
--- src/tracker-extract/tracker-extract.c (revision 373)
+++ src/tracker-extract/tracker-extract.c (working copy)
@@ -61,9 +61,7 @@
#ifdef HAVE_VORBIS
void tracker_extract_vorbis (gchar *, GHashTable *);
#endif
-#ifdef HAVE_LIBPNG
void tracker_extract_png (gchar *, GHashTable *);
-#endif
#ifdef HAVE_LIBEXIF
void tracker_extract_exif (gchar *, GHashTable *);
#endif
@@ -123,9 +121,7 @@
#endif
/* Image extractors */
-#ifdef HAVE_LIBPNG
{ "image/png", tracker_extract_png
},
-#endif
#ifdef HAVE_LIBEXIF
{ "image/jpeg", tracker_extract_exif
},
#endif
Index: src/tracker-extract/tracker-extract-png.c
===================================================================
--- src/tracker-extract/tracker-extract-png.c (revision 373)
+++ src/tracker-extract/tracker-extract-png.c (working copy)
@@ -20,8 +20,6 @@
#include "config.h"
-#ifdef HAVE_LIBPNG
-
#include <stdio.h>
#include <glib.h>
#include <png.h>
@@ -32,13 +30,13 @@
} tagmap[] = {
{ "Author" , "Image:Creator"},
{ "Creator" , "Image:Creator"},
- { "Description" , "Image:Description"},
- { "Comment", "Image:Comments"},
- { "Copyright", "File:Copyright"},
- { "Creation Time", "Image:Date"},
- { "Title", "Image:Title"},
- { "Software", "Image:Software"},
- { "Disclaimer", "File:License"},
+ { "Description" , "Image:Description"},
+ { "Comment", "Image:Comments"},
+ { "Copyright", "File:Copyright"},
+ { "Creation Time", "Image:Date"},
+ { "Title", "Image:Title"},
+ { "Software", "Image:Software"},
+ { "Disclaimer", "File:License"},
{ NULL, NULL},
};
@@ -93,14 +91,10 @@
}
}
}
- }
+ }
png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
fclose (png);
}
}
-
-#else
-#warning "Not building PNG metadata extractor."
-#endif /* HAVE_LIBPNG */
Index: src/trackerd/Makefile.am
===================================================================
--- src/trackerd/Makefile.am (revision 373)
+++ src/trackerd/Makefile.am (working copy)
@@ -56,6 +56,10 @@
if BUILD_TEST
bin_PROGRAMS = trackerd test-tracker-indexer
test_tracker_indexer_SOURCES = \
+ depot.c \
+ depot.h \
+ curia.c \
+ curia.h \
tracker-indexer.c \
test-tracker-indexer.c \
tracker-utils.c \
@@ -74,7 +78,11 @@
xdgmimemagic.h \
xdgmimeparent.c \
xdgmimeparent.h
-test_tracker_indexer_LDADD = $(GLIB2_LIBS)
+test_tracker_indexer_LDADD = \
+ $(GLIB2_LIBS) \
+ $(GTHREAD_LIBS) \
+ -lz \
+ $(top_builddir)/src/libstemmer/libstemmer-private.la
else
bin_PROGRAMS = trackerd
endif
pgpkUfJnUs8Ii.pgp
Description: PGP signature
_______________________________________________ tracker-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/tracker-list
