Author: baggins Date: Wed Feb 23 18:20:09 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 6 - port to exo-1
---- Files affected: packages/xfmedia: xfmedia.spec (1.26 -> 1.27) , xfmedia-exo-1.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xfmedia/xfmedia.spec diff -u packages/xfmedia/xfmedia.spec:1.26 packages/xfmedia/xfmedia.spec:1.27 --- packages/xfmedia/xfmedia.spec:1.26 Sun Feb 20 08:21:03 2011 +++ packages/xfmedia/xfmedia.spec Wed Feb 23 19:20:04 2011 @@ -7,17 +7,18 @@ Summary(pl.UTF-8): Xfmedia - lekki odtwarzacz multimedialny oparty na silniku xine Name: xfmedia Version: 0.9.2 -Release: 5 +Release: 6 License: GPL v2 Group: X11/Applications/Multimedia Source0: http://spuriousinterrupt.org/projects/xfmedia/files/%{name}-%{version}.tar.bz2 # Source0-md5: 6eb8bd1f67201f829e0f45e733c02bd5 Patch0: %{name}-desktop.patch +Patch1: %{name}-exo-1.patch URL: http://spuriousinterrupt.org/projects/xfmedia/index.php BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1:1.8 %{?with_dbus:BuildRequires: dbus-glib-devel >= 0.31} -BuildRequires: exo-devel >= 0.3.0 +BuildRequires: exo-devel >= 0.6.0 BuildRequires: gtk+2-devel >= 2:2.6.0 BuildRequires: intltool BuildRequires: libtool @@ -31,7 +32,7 @@ BuildRequires: xorg-lib-libXScrnSaver-devel Requires(post,postun): gtk-update-icon-cache Requires(post,postun): hicolor-icon-theme -Requires: exo >= 0.3.0 +Requires: exo >= 0.6.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -73,6 +74,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %{__intltoolize} @@ -142,6 +144,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.27 2011/02/23 18:20:04 baggins +- rel 6 +- port to exo-1 + Revision 1.26 2011/02/20 07:21:03 arekm - release 5 ================================================================ Index: packages/xfmedia/xfmedia-exo-1.patch diff -u /dev/null packages/xfmedia/xfmedia-exo-1.patch:1.1 --- /dev/null Wed Feb 23 19:20:09 2011 +++ packages/xfmedia/xfmedia-exo-1.patch Wed Feb 23 19:20:04 2011 @@ -0,0 +1,120 @@ +--- xfmedia-0.9.2/configure.ac~ 2006-11-27 21:20:19.000000000 +0100 ++++ xfmedia-0.9.2/configure.ac 2011-02-23 14:37:22.012384549 +0100 +@@ -127,12 +127,9 @@ + AC_MSG_RESULT([not found]) + fi + +-dnl depend on libexo-0.3, with 0.2 as a fallback +-XDT_CHECK_OPTIONAL_PACKAGE([EXO], [exo-0.3], [0.3.0], [exo], ++dnl depend on libexo-1 ++XDT_CHECK_OPTIONAL_PACKAGE([EXO], [exo-1], [0.6.0], [exo], + [libexo extension library support (required)], [yes]) +-if test "x$EXO_FOUND" != "xyes"; then +- XDT_CHECK_PACKAGE([EXO], [exo-0.2], [0.2.0]) +-fi + + dnl optional + XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION], +diff -ur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2-exo-1/src/mediamarks.c +--- xfmedia-0.9.2/src/mediamarks.c 2006-11-27 08:21:23.000000000 +0100 ++++ xfmedia-0.9.2-exo-1/src/mediamarks.c 2011-02-23 19:12:53.542911757 +0100 +@@ -682,11 +682,11 @@ + gtk_tree_view_column_pack_start(col, render, FALSE); + gtk_tree_view_column_set_attributes(col, render, "pixbuf", MMADD_COL_ICON, NULL); + +- render = exo_cell_renderer_ellipsized_text_new(); ++ render = gtk_cell_renderer_text_new(); + if(gtk_major_version == 2 && gtk_minor_version >= 6) +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + else { +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + } + gtk_tree_view_column_pack_start(col, render, TRUE); +@@ -1691,11 +1691,11 @@ + gtk_tree_view_column_pack_start(col, render, FALSE); + gtk_tree_view_column_set_attributes(col, render, "pixbuf", MMEDIT_COL_ICON, NULL); + +- render = exo_cell_renderer_ellipsized_text_new(); ++ render = gtk_cell_renderer_text_new(); + if(gtk_major_version == 2 && gtk_minor_version >= 6) +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + else { +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + } + gtk_tree_view_column_pack_start(col, render, TRUE); +@@ -1703,11 +1703,11 @@ + + gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col); + +- render = exo_cell_renderer_ellipsized_text_new(); ++ render = gtk_cell_renderer_text_new(); + if(gtk_major_version == 2 && gtk_minor_version >= 6) +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + else { +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + } + col = gtk_tree_view_column_new_with_attributes(_("Location"), render, +diff -ur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2-exo-1/src/playlist.c +--- xfmedia-0.9.2/src/playlist.c 2006-11-27 08:21:22.000000000 +0100 ++++ xfmedia-0.9.2-exo-1/src/playlist.c 2011-02-23 19:13:37.703911724 +0100 +@@ -1407,11 +1407,11 @@ + xfmedia_playlist_cell_render_title, plist, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col); + +- render = exo_cell_renderer_ellipsized_text_new(); ++ render = gtk_cell_renderer_text_new(); + if(gtk_major_version == 2 && gtk_minor_version >= 6) +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + else { +- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, ++ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, + "ellipsize-set", TRUE, NULL); + } + col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text", +diff -ur xfmedia-0.9.2/src/playlist-files.c xfmedia-0.9.2-exo-1/src/playlist-files.c +--- xfmedia-0.9.2/src/playlist-files.c 2006-11-27 08:21:23.000000000 +0100 ++++ xfmedia-0.9.2-exo-1/src/playlist-files.c 2011-02-23 19:15:58.357911723 +0100 +@@ -813,7 +813,7 @@ + + g_return_val_if_fail(original_uri && *original_uri, NULL); + +- md5sum = exo_str_get_md5_str(original_uri); ++ md5sum = g_compute_checksum_for_string (G_CHECKSUM_MD5, original_uri, -1); + + for(i = 0; cache_extensions[i]; i++) { + g_snprintf(buf, sizeof(buf), "xfmedia/cached-playlists/%s.%s", md5sum, +@@ -841,7 +841,7 @@ + + g_return_val_if_fail(original_uri && *original_uri && data && *data, NULL); + +- md5sum = exo_str_get_md5_str(original_uri); ++ md5sum = g_compute_checksum_for_string (G_CHECKSUM_MD5, original_uri, -1); + + g_snprintf(buf, sizeof(buf), "xfmedia/cached-playlists/%s.%s", md5sum, + extension); +diff -ur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2-exo-1/src/xfmedia-playlist-queue.c +--- xfmedia-0.9.2/src/xfmedia-playlist-queue.c 2006-11-27 08:21:22.000000000 +0100 ++++ xfmedia-0.9.2-exo-1/src/xfmedia-playlist-queue.c 2011-02-23 19:14:33.025911717 +0100 +@@ -169,10 +169,9 @@ + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(playlist_q->priv->treeview), FALSE); + gtk_tree_view_set_enable_search(GTK_TREE_VIEW(playlist_q->priv->treeview), FALSE); + +- render = exo_cell_renderer_ellipsized_text_new(); ++ render = gtk_cell_renderer_text_new(); + g_object_set(G_OBJECT(render), +- "ellipsize", EXO_PANGO_ELLIPSIZE_END, +- "ellipsize-set", TRUE, ++ "ellipsize", PANGO_ELLIPSIZE_END, + NULL); + col = gtk_tree_view_column_new_with_attributes("display-name", render, + "text", COL_DISPLAY_NAME, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfmedia/xfmedia.spec?r1=1.26&r2=1.27&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
