[maemo-commits] [maemo-commits] r19561 - in projects/haf/trunk/totem-pl-parser/debian: . patches
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Dec 9 16:55:22 EET 2009
- Previous message: [maemo-commits] r19560 - projects/haf/tags/gtk+
- Next message: [maemo-commits] r19562 - projects/haf/tags/totem-pl-parser
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: ifrade Date: 2009-12-09 16:55:04 +0200 (Wed, 09 Dec 2009) New Revision: 19561 Added: projects/haf/trunk/totem-pl-parser/debian/patches/02-remove-gtk-dep.diff Modified: projects/haf/trunk/totem-pl-parser/debian/changelog projects/haf/trunk/totem-pl-parser/debian/control projects/haf/trunk/totem-pl-parser/debian/rules Log: Removed gtk dependency on totem-plparser Modified: projects/haf/trunk/totem-pl-parser/debian/changelog =================================================================== --- projects/haf/trunk/totem-pl-parser/debian/changelog 2009-12-09 10:21:33 UTC (rev 19560) +++ projects/haf/trunk/totem-pl-parser/debian/changelog 2009-12-09 14:55:04 UTC (rev 19561) @@ -1,3 +1,10 @@ +totem-pl-parser (2.27.2-1maemo2) maemo; urgency=low + + * Removed dependency on gtk + * Fixes: NB#113075, totem-pl-parser depends on libgtk + + -- Ivan Frade <ivan.frade at nokia.com> Tue, 9 Dec 2009 15:40:00 +0200 + totem-pl-parser (2.27.2-1maemo1) maemo; urgency=low * Sync with upstream 2.27.2 (updated patches) Modified: projects/haf/trunk/totem-pl-parser/debian/control =================================================================== --- projects/haf/trunk/totem-pl-parser/debian/control 2009-12-09 10:21:33 UTC (rev 19560) +++ projects/haf/trunk/totem-pl-parser/debian/control 2009-12-09 14:55:04 UTC (rev 19561) @@ -6,7 +6,6 @@ cdbs, libxml-parser-perl, libglib2.0-dev (>= 2.16.3), - libgtk2.0-dev (>= 2.11.6), libxml2-dev, libdbus-1-dev (>= 0.61), libhal-dev (>= 0.5), @@ -19,8 +18,7 @@ Section: libdevel Architecture: any Depends: libtotem-plparser12 (= ${binary:Version}), - libglib2.0-dev (>= 2.16.3), - libgtk2.0-dev (>= 2.11.6) + libglib2.0-dev (>= 2.16.3) Replaces: libtotem-plparser10 Description: Totem Playlist Parser library - development version A library to parse playlists. Added: projects/haf/trunk/totem-pl-parser/debian/patches/02-remove-gtk-dep.diff =================================================================== --- projects/haf/trunk/totem-pl-parser/debian/patches/02-remove-gtk-dep.diff 2009-12-09 10:21:33 UTC (rev 19560) +++ projects/haf/trunk/totem-pl-parser/debian/patches/02-remove-gtk-dep.diff 2009-12-09 14:55:04 UTC (rev 19561) @@ -0,0 +1,504 @@ +diff --git a/configure.in b/configure.in +index e735978..c9e8031 100644 +--- a/configure.in ++++ b/configure.in +@@ -56,7 +56,34 @@ AC_SUBST(TOTEM_PL_PARSER_VERSION_MAJOR) + AC_SUBST(TOTEM_PL_PARSER_VERSION_MINOR) + AC_SUBST(TOTEM_PL_PARSER_VERSION_MICRO) + +-pkg_modules="glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0 >= $GIO_REQS" ++pkg_modules="glib-2.0 >= $GLIB_REQS libxml-2.0 gthread-2.0 gio-2.0 >= $GIO_REQS" ++ ++################################## ++# Checking gtk+ dependency ++################################## ++ ++AC_ARG_ENABLE(gtk, ++ AS_HELP_STRING([--enable-gtk], ++ [enable GTK+ support [[default=auto]]]),, ++ [enable_gtk=auto]) ++ ++if test "x$enable_gtk" != "xno" ; then ++ PKG_CHECK_MODULES(GTK, ++ gtk+-2.0, ++ [have_gtk=yes], ++ [have_gtk=no]) ++ ++ if test "x$have_gtk" = "xyes" ; then ++ GTK_CFLAGS="$GTK_CFLAGS -DTOTEM_PL_PARSER_HAVE_GTK" ++ ++ AC_SUBST(GTK_CFLAGS) ++ AC_SUBST(GTK_LIBS) ++ AC_SUBST(GTK_COMPILE_FLAGS, -DTOTEM_PL_PARSER_HAVE_GTK) ++ AC_DEFINE(HAVE_GTK, 1, [GTK+ available in the system]) ++ else ++ AC_MSG_ERROR([Couldn't find GTK+.]) ++ fi ++fi + + ################################## + # Checking libcamel dependency +diff --git a/plparse/Makefile.am b/plparse/Makefile.am +index 0b4b212..db94e66 100644 +--- a/plparse/Makefile.am ++++ b/plparse/Makefile.am +@@ -64,6 +64,7 @@ libtotem_plparser_la_CPPFLAGS = \ + + libtotem_plparser_la_CFLAGS = \ + $(TOTEM_PLPARSER_CFLAGS) \ ++ $(GTK_CFLAGS) \ + $(HAL_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(WARN_CFLAGS) \ +@@ -75,6 +76,7 @@ libtotem_plparser_la_CFLAGS = \ + + libtotem_plparser_la_LIBADD = \ + $(TOTEM_PLPARSER_LIBS) \ ++ $(GTK_LIBS) \ + $(top_builddir)/lib/libtotem_glibc.la \ + $(HAL_LIBS) + +diff --git a/plparse/totem-pl-parser-lines.c b/plparse/totem-pl-parser-lines.c +index 96e7074..0073754 100644 +--- a/plparse/totem-pl-parser-lines.c ++++ b/plparse/totem-pl-parser-lines.c +@@ -27,7 +27,11 @@ + + #ifndef TOTEM_PL_PARSER_MINI + #include <glib/gi18n-lib.h> ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include <gio/gio.h> + + #include "totem-pl-parser.h" +@@ -77,6 +81,8 @@ totem_pl_parser_uri_to_dos (const char *uri, GFile *output) + return retval; + } + ++#ifdef HAVE_GTK ++ + gboolean + totem_pl_parser_write_m3u (TotemPlParser *parser, GtkTreeModel *model, + TotemPlParserIterFunc func, GFile *output, +@@ -165,6 +171,8 @@ totem_pl_parser_write_m3u (TotemPlParser *parser, GtkTreeModel *model, + return TRUE; + } + ++#endif ++ + static void + totem_pl_parser_parse_ram_uri (TotemPlParser *parser, const char *uri) + { +diff --git a/plparse/totem-pl-parser-lines.h b/plparse/totem-pl-parser-lines.h +index 9130871..90e57c9 100644 +--- a/plparse/totem-pl-parser-lines.h ++++ b/plparse/totem-pl-parser-lines.h +@@ -35,6 +35,7 @@ G_BEGIN_DECLS + const char * totem_pl_parser_is_uri_list (const char *data, gsize len); + + #ifndef TOTEM_PL_PARSER_MINI ++#ifdef HAVE_GTK + gboolean totem_pl_parser_write_m3u (TotemPlParser *parser, + GtkTreeModel *model, + TotemPlParserIterFunc func, +@@ -42,6 +43,8 @@ gboolean totem_pl_parser_write_m3u (TotemPlParser *parser, + gboolean dos_compatible, + gpointer user_data, + GError **error); ++#endif /* HAVE_GTK */ ++ + TotemPlParserResult totem_pl_parser_add_ram (TotemPlParser *parser, + GFile *file, + gpointer data); +diff --git a/plparse/totem-pl-parser-media.c b/plparse/totem-pl-parser-media.c +index 00cfe0a..ab5e21c 100644 +--- a/plparse/totem-pl-parser-media.c ++++ b/plparse/totem-pl-parser-media.c +@@ -25,7 +25,12 @@ + #ifndef TOTEM_PL_PARSER_MINI + #include <string.h> + #include <glib.h> ++#include <stdio.h> ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include "totem-pl-parser.h" + #include "totemplparser-marshal.h" + #include "totem-disc.h" +diff --git a/plparse/totem-pl-parser-misc.c b/plparse/totem-pl-parser-misc.c +index 36ec824..9c55b96 100644 +--- a/plparse/totem-pl-parser-misc.c ++++ b/plparse/totem-pl-parser-misc.c +@@ -26,7 +26,11 @@ + #include <glib.h> + + #ifndef TOTEM_PL_PARSER_MINI ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include "totem-pl-parser.h" + #include "totemplparser-marshal.h" + #include "totem-disc.h" +diff --git a/plparse/totem-pl-parser-pla.c b/plparse/totem-pl-parser-pla.c +index 9c4d709..451dcb2 100644 +--- a/plparse/totem-pl-parser-pla.c ++++ b/plparse/totem-pl-parser-pla.c +@@ -25,7 +25,11 @@ + #include <string.h> + #include <glib.h> + #include <glib/gi18n-lib.h> ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include "totem-pl-parser.h" + #include "totemplparser-marshal.h" + #endif /* !TOTEM_PL_PARSER_MINI */ +@@ -44,6 +48,7 @@ + #define TITLE_SIZE 64 + + #ifndef TOTEM_PL_PARSER_MINI ++#ifdef HAVE_GTK + gboolean + totem_pl_parser_write_pla (TotemPlParser *parser, GtkTreeModel *model, + TotemPlParserIterFunc func, +@@ -155,6 +160,8 @@ totem_pl_parser_write_pla (TotemPlParser *parser, GtkTreeModel *model, + return ret; + } + ++#endif /* HAVE_GTK */ ++ + TotemPlParserResult + totem_pl_parser_add_pla (TotemPlParser *parser, + GFile *file, +diff --git a/plparse/totem-pl-parser-pla.h b/plparse/totem-pl-parser-pla.h +index 00b75f3..b4239e8 100644 +--- a/plparse/totem-pl-parser-pla.h ++++ b/plparse/totem-pl-parser-pla.h +@@ -31,6 +31,8 @@ G_BEGIN_DECLS + #endif /* !TOTEM_PL_PARSER_MINI */ + + #ifndef TOTEM_PL_PARSER_MINI ++ ++#ifdef HAVE_GTK + gboolean totem_pl_parser_write_pla (TotemPlParser *parser, + GtkTreeModel *model, + TotemPlParserIterFunc func, +@@ -38,6 +40,8 @@ gboolean totem_pl_parser_write_pla (TotemPlParser *parser, + const char *title, + gpointer user_data, + GError **error); ++#endif /* HAVE_GTK */ ++ + TotemPlParserResult totem_pl_parser_add_pla (TotemPlParser *parser, + GFile *file, + GFile *base_file, +diff --git a/plparse/totem-pl-parser-pls.c b/plparse/totem-pl-parser-pls.c +index 0755ed3..94f2780 100644 +--- a/plparse/totem-pl-parser-pls.c ++++ b/plparse/totem-pl-parser-pls.c +@@ -26,7 +26,11 @@ + #include <string.h> + #include <glib.h> + #include <glib/gi18n-lib.h> ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include "totem-pl-parser.h" + #include "totemplparser-marshal.h" + #endif /* !TOTEM_PL_PARSER_MINI */ +@@ -36,6 +40,7 @@ + #include "totem-pl-parser-private.h" + + #ifndef TOTEM_PL_PARSER_MINI ++#ifdef HAVE_GTK + gboolean + totem_pl_parser_write_pls (TotemPlParser *parser, GtkTreeModel *model, + TotemPlParserIterFunc func, +@@ -122,6 +127,8 @@ totem_pl_parser_write_pls (TotemPlParser *parser, GtkTreeModel *model, + return TRUE; + } + ++#endif /* HAVE_GTK */ ++ + static char * + ensure_utf8_valid (char *input) + { +diff --git a/plparse/totem-pl-parser-pls.h b/plparse/totem-pl-parser-pls.h +index 17bc230..d5d89fe 100644 +--- a/plparse/totem-pl-parser-pls.h ++++ b/plparse/totem-pl-parser-pls.h +@@ -31,6 +31,7 @@ G_BEGIN_DECLS + #endif /* !TOTEM_PL_PARSER_MINI */ + + #ifndef TOTEM_PL_PARSER_MINI ++#ifdef HAVE_GTK + gboolean totem_pl_parser_write_pls (TotemPlParser *parser, + GtkTreeModel *model, + TotemPlParserIterFunc func, +@@ -38,6 +39,7 @@ gboolean totem_pl_parser_write_pls (TotemPlParser *parser, + const char *title, + gpointer user_data, + GError **error); ++#endif + TotemPlParserResult totem_pl_parser_add_pls_with_contents (TotemPlParser *parser, + GFile *file, + GFile *base_file, +diff --git a/plparse/totem-pl-parser-podcast.c b/plparse/totem-pl-parser-podcast.c +index 2071155..f2ee478 100644 +--- a/plparse/totem-pl-parser-podcast.c ++++ b/plparse/totem-pl-parser-podcast.c +@@ -26,7 +26,11 @@ + + #ifndef TOTEM_PL_PARSER_MINI + #include <zlib.h> ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include "xmlparser.h" + #include "totem-pl-parser.h" + #include "totemplparser-marshal.h" +diff --git a/plparse/totem-pl-parser-private.h b/plparse/totem-pl-parser-private.h +index 422385b..86a132d 100644 +--- a/plparse/totem-pl-parser-private.h ++++ b/plparse/totem-pl-parser-private.h +@@ -94,10 +94,14 @@ char *totem_pl_parser_read_ini_line_string_with_sep (char **lines, const char *k + char *totem_pl_parser_base_uri (GFile *file); + void totem_pl_parser_playlist_end (TotemPlParser *parser, + const char *playlist_title); ++ ++#ifdef TOTEM_PL_PARSER_HAVE_GTK + int totem_pl_parser_num_entries (TotemPlParser *parser, + GtkTreeModel *model, + TotemPlParserIterFunc func, + gpointer user_data); ++#endif /* TOTEM_PL_PARSER_HAVE_GTK */ ++ + gboolean totem_pl_parser_scheme_is_ignored (TotemPlParser *parser, + GFile *file); + gboolean totem_pl_parser_line_is_empty (const char *line); +diff --git a/plparse/totem-pl-parser-qt.c b/plparse/totem-pl-parser-qt.c +index e52ea51..7085558 100644 +--- a/plparse/totem-pl-parser-qt.c ++++ b/plparse/totem-pl-parser-qt.c +@@ -27,7 +27,11 @@ + + #ifndef TOTEM_PL_PARSER_MINI + #include "xmlparser.h" ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include "totem-pl-parser.h" + #include "totemplparser-marshal.h" + #endif /* !TOTEM_PL_PARSER_MINI */ +diff --git a/plparse/totem-pl-parser-smil.c b/plparse/totem-pl-parser-smil.c +index e2992ee..fc35494 100644 +--- a/plparse/totem-pl-parser-smil.c ++++ b/plparse/totem-pl-parser-smil.c +@@ -24,7 +24,11 @@ + + #ifndef TOTEM_PL_PARSER_MINI + #include <glib.h> ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include <gio/gio.h> + #include "xmlparser.h" + #include "totem-pl-parser.h" +diff --git a/plparse/totem-pl-parser-wm.c b/plparse/totem-pl-parser-wm.c +index 94d48e6..ed72743 100644 +--- a/plparse/totem-pl-parser-wm.c ++++ b/plparse/totem-pl-parser-wm.c +@@ -27,7 +27,11 @@ + + #ifndef TOTEM_PL_PARSER_MINI + #include "xmlparser.h" ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include "totem-pl-parser.h" + #include "totemplparser-marshal.h" + #include "totem-disc.h" +diff --git a/plparse/totem-pl-parser-xspf.c b/plparse/totem-pl-parser-xspf.c +index 434b095..6974e83 100644 +--- a/plparse/totem-pl-parser-xspf.c ++++ b/plparse/totem-pl-parser-xspf.c +@@ -28,7 +28,11 @@ + #include <glib/gi18n-lib.h> + #include <libxml/tree.h> + #include <libxml/parser.h> ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include "totem-pl-parser.h" + #include "totemplparser-marshal.h" + #endif /* !TOTEM_PL_PARSER_MINI */ +@@ -73,6 +77,8 @@ totem_pl_parser_parse_xml_file (GFile *file) + return doc; + } + ++#ifdef HAVE_GTK ++ + gboolean + totem_pl_parser_write_xspf (TotemPlParser *parser, GtkTreeModel *model, + TotemPlParserIterFunc func, +@@ -156,6 +162,8 @@ totem_pl_parser_write_xspf (TotemPlParser *parser, GtkTreeModel *model, + return success; + } + ++#endif /* HAVE_GTK */ ++ + static gboolean + parse_xspf_track (TotemPlParser *parser, GFile *base_file, xmlDocPtr doc, + xmlNodePtr parent) +diff --git a/plparse/totem-pl-parser-xspf.h b/plparse/totem-pl-parser-xspf.h +index 85e4c5f..da38a86 100644 +--- a/plparse/totem-pl-parser-xspf.h ++++ b/plparse/totem-pl-parser-xspf.h +@@ -31,6 +31,8 @@ G_BEGIN_DECLS + #endif /* !TOTEM_PL_PARSER_MINI */ + + #ifndef TOTEM_PL_PARSER_MINI ++ ++#ifdef HAVE_GTK + gboolean totem_pl_parser_write_xspf (TotemPlParser *parser, + GtkTreeModel *model, + TotemPlParserIterFunc func, +@@ -38,6 +40,9 @@ gboolean totem_pl_parser_write_xspf (TotemPlParser *parser, + const char *title, + gpointer user_data, + GError **error); ++#endif /* HAVE_GTK */ ++ ++ + TotemPlParserResult totem_pl_parser_add_xspf (TotemPlParser *parser, + GFile *file, + GFile *base_file, +diff --git a/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c +index bbb5cf6..00f5fea 100644 +--- a/plparse/totem-pl-parser.c ++++ b/plparse/totem-pl-parser.c +@@ -107,7 +107,10 @@ + + #ifndef TOTEM_PL_PARSER_MINI + #include <gobject/gvaluecollector.h> ++ ++#ifdef HAVE_GTK + #include <gtk/gtk.h> ++#endif + + #ifdef HAVE_CAMEL + #include <camel/camel-mime-utils.h> +@@ -797,6 +800,8 @@ totem_pl_parser_write_buffer (GOutputStream *stream, const char *buf, guint len, + return TRUE; + } + ++#ifdef HAVE_GTK ++ + /** + * totem_pl_parser_num_entries: + * @parser: a #TotemPlParser +@@ -841,6 +846,8 @@ totem_pl_parser_num_entries (TotemPlParser *parser, GtkTreeModel *model, + return num_entries - ignored; + } + ++#endif /* HAVE_GTK */ ++ + char * + totem_pl_parser_relative (GFile *output, const char *filepath) + { +@@ -995,6 +1002,7 @@ totem_pl_parser_resolve_uri (GFile *base_gfile, + } + } + ++#ifdef HAVE_GTK + #ifndef TOTEM_PL_PARSER_MINI + /** + * totem_pl_parser_write_with_title: +@@ -1101,6 +1109,7 @@ totem_pl_parser_write (TotemPlParser *parser, GtkTreeModel *model, + } + + #endif /* TOTEM_PL_PARSER_MINI */ ++#endif /* HAVE_GTK */ + + /** + * totem_pl_parser_read_ini_line_int: +diff --git a/plparse/totem-pl-parser.h b/plparse/totem-pl-parser.h +index a01d83c..842199c 100644 +--- a/plparse/totem-pl-parser.h ++++ b/plparse/totem-pl-parser.h +@@ -25,7 +25,10 @@ + + #include <glib.h> + ++#ifdef TOTEM_PL_PARSER_HAVE_GTK + #include <gtk/gtk.h> ++#endif ++ + #include "totem-pl-parser-features.h" + #include "totem-pl-parser-builtins.h" + +@@ -305,6 +308,8 @@ typedef enum { + + GQuark totem_pl_parser_error_quark (void); + ++#ifdef TOTEM_PL_PARSER_HAVE_GTK ++ + /** + * TotemPlParserIterFunc: + * @model: a #GtkTreeModel containing the playlist entries +@@ -325,11 +330,14 @@ typedef void (*TotemPlParserIterFunc) (GtkTreeModel *model, GtkTreeIter *iter, + gboolean *custom_title, + gpointer user_data); + ++#endif /* TOTEM_PL_PARSER_HAVE_GTK */ ++ + GType totem_pl_parser_get_type (void); + + gint64 totem_pl_parser_parse_duration (const char *duration, gboolean debug); + guint64 totem_pl_parser_parse_date (const char *date_str, gboolean debug); + ++#ifdef TOTEM_PL_PARSER_HAVE_GTK + gboolean totem_pl_parser_write (TotemPlParser *parser, GtkTreeModel *model, + TotemPlParserIterFunc func, + const char *output, TotemPlParserType type, +@@ -345,6 +353,8 @@ gboolean totem_pl_parser_write_with_title (TotemPlParser *parser, + gpointer user_data, + GError **error); + ++#endif /* TOTEM_PL_PARSER_HAVE_GTK */ ++ + void totem_pl_parser_add_ignored_scheme (TotemPlParser *parser, + const char *scheme); + void totem_pl_parser_add_ignored_mimetype (TotemPlParser *parser, +diff --git a/totem-plparser.pc.in b/totem-plparser.pc.in +index 7b186ad..de0c3f3 100644 +--- a/totem-plparser.pc.in ++++ b/totem-plparser.pc.in +@@ -11,5 +11,5 @@ Version: @VERSION@ + Requires: gtk+-2.0 + Requires.private: libxml-2.0 @LIBCAMEL@ + Libs: -L${libdir} -ltotem-plparser +-Cflags: -I${includedir}/totem-pl-parser/1/plparser ++Cflags: -I${includedir}/totem-pl-parser/1/plparser @GTK_COMPILE_FLAGS@ + uselibcamel=@USELIBCAMEL@ Modified: projects/haf/trunk/totem-pl-parser/debian/rules =================================================================== --- projects/haf/trunk/totem-pl-parser/debian/rules 2009-12-09 10:21:33 UTC (rev 19560) +++ projects/haf/trunk/totem-pl-parser/debian/rules 2009-12-09 14:55:04 UTC (rev 19561) @@ -7,7 +7,8 @@ #-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk DEB_CONFIGURE_EXTRA_FLAGS := \ - --disable-camel-i-know-what-im-doing + --disable-camel-i-know-what-im-doing \ + --disable-gtk SOURCE_DIR=$(CURDIR)
- Previous message: [maemo-commits] r19560 - projects/haf/tags/gtk+
- Next message: [maemo-commits] r19562 - projects/haf/tags/totem-pl-parser
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]