wok-current diff xfmedia/stuff/xfmedia-exo-0.6.patch @ rev 12899

Up: audiofile to 0.3.4.
author Christopher Rogers <slaxemulator@gmail.com>
date Mon May 28 06:03:28 2012 +0000 (2012-05-28)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/xfmedia/stuff/xfmedia-exo-0.6.patch	Mon May 28 06:03:28 2012 +0000
     1.3 @@ -0,0 +1,196 @@
     1.4 +diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure
     1.5 +--- xfmedia-0.9.2/configure	2006-11-27 20:20:59.000000000 +0000
     1.6 ++++ xfmedia-0.9.2.my/configure	2011-01-31 17:15:58.000000000 +0000
     1.7 +@@ -27417,7 +27417,7 @@
     1.8 + 
     1.9 + 
    1.10 +   if test x"$xdt_cv_EXO_check" = x"yes"; then
    1.11 +-    if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then
    1.12 ++    if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then
    1.13 + 
    1.14 + 
    1.15 +   # minimum supported version of pkg-config
    1.16 +@@ -27501,22 +27501,22 @@
    1.17 +   fi
    1.18 + 
    1.19 + 
    1.20 +-  { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5
    1.21 +-echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
    1.22 +-  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
    1.23 +-    EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
    1.24 ++  { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5
    1.25 ++echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; }
    1.26 ++  if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then
    1.27 ++    EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
    1.28 +     { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5
    1.29 + echo "${ECHO_T}$EXO_VERSION" >&6; }
    1.30 + 
    1.31 +     { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5
    1.32 + echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; }
    1.33 +-    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
    1.34 ++    EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
    1.35 +     { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5
    1.36 + echo "${ECHO_T}$EXO_CFLAGS" >&6; }
    1.37 + 
    1.38 +     { echo "$as_me:$LINENO: checking EXO_LIBS" >&5
    1.39 + echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; }
    1.40 +-    EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
    1.41 ++    EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
    1.42 +     { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5
    1.43 + echo "${ECHO_T}$EXO_LIBS" >&6; }
    1.44 + 
    1.45 +@@ -27535,15 +27535,15 @@
    1.46 + 
    1.47 +         EXO_FOUND="yes"
    1.48 + 
    1.49 +-  elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
    1.50 +-    xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
    1.51 ++  elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
    1.52 ++    xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
    1.53 +     { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
    1.54 + echo "${ECHO_T}found, but $xdt_cv_version" >&6; }
    1.55 + 
    1.56 + 
    1.57 +-      echo "*** The required package exo-0.3 was found on your system,"
    1.58 ++      echo "*** The required package exo-1 was found on your system,"
    1.59 +       echo "*** but the installed version ($xdt_cv_version) is too old."
    1.60 +-      echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
    1.61 ++      echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust"
    1.62 +       echo "*** the PKG_CONFIG_PATH environment variable if you installed"
    1.63 +       echo "*** the new version of the package in a nonstandard prefix so"
    1.64 +       echo "*** pkg-config is able to find it."
    1.65 +@@ -27554,8 +27554,8 @@
    1.66 + echo "${ECHO_T}not found" >&6; }
    1.67 + 
    1.68 + 
    1.69 +-      echo "*** The required package exo-0.3 was not found on your system."
    1.70 +-      echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
    1.71 ++      echo "*** The required package exo-1 was not found on your system."
    1.72 ++      echo "*** Please install exo-1 (atleast version 0.3.0) or adjust"
    1.73 +       echo "*** the PKG_CONFIG_PATH environment variable if you"
    1.74 +       echo "*** installed the package in a nonstandard prefix so that"
    1.75 +       echo "*** pkg-config is able to find it."
    1.76 +@@ -27564,14 +27564,14 @@
    1.77 +   fi
    1.78 + 
    1.79 +     else
    1.80 +-      { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5
    1.81 +-echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
    1.82 ++      { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5
    1.83 ++echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; }
    1.84 +       { echo "$as_me:$LINENO: result: not found" >&5
    1.85 + echo "${ECHO_T}not found" >&6; }
    1.86 +     fi
    1.87 +   else
    1.88 +-    { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5
    1.89 +-echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; }
    1.90 ++    { echo "$as_me:$LINENO: checking for optional package exo-1" >&5
    1.91 ++echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; }
    1.92 +     { echo "$as_me:$LINENO: result: disabled" >&5
    1.93 + echo "${ECHO_T}disabled" >&6; }
    1.94 +   fi
    1.95 +diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c
    1.96 +--- xfmedia-0.9.2/src/main.c	2006-11-27 07:21:23.000000000 +0000
    1.97 ++++ xfmedia-0.9.2.my/src/main.c	2011-02-01 11:08:02.000000000 +0000
    1.98 +@@ -388,6 +388,23 @@
    1.99 +     return optind;
   1.100 + }
   1.101 + 
   1.102 ++/**
   1.103 ++ * exo_str_get_md5_str:
   1.104 ++ * @contents : The string to create a digest of.
   1.105 ++ *
   1.106 ++ * Creates a character array MD5 digestof the string
   1.107 ++ * @contents.
   1.108 ++ *
   1.109 ++ * Return value: A newly-allocated character array which
   1.110 ++ *               should be free with g_free() when no
   1.111 ++ *               longer needed.
   1.112 ++ **/
   1.113 ++gchar*
   1.114 ++exo_str_get_md5_str (const gchar *contents)
   1.115 ++{
   1.116 ++  return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1);
   1.117 ++}
   1.118 ++
   1.119 + int
   1.120 + main(int argc, char **argv)
   1.121 + {
   1.122 +diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c
   1.123 +--- xfmedia-0.9.2/src/mediamarks.c	2006-11-27 07:21:23.000000000 +0000
   1.124 ++++ xfmedia-0.9.2.my/src/mediamarks.c	2011-02-01 11:04:42.000000000 +0000
   1.125 +@@ -684,9 +684,9 @@
   1.126 +     
   1.127 +     render = exo_cell_renderer_ellipsized_text_new();
   1.128 +     if(gtk_major_version == 2 && gtk_minor_version >= 6)
   1.129 +-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
   1.130 ++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
   1.131 + 	else {
   1.132 +-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
   1.133 ++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
   1.134 + 				"ellipsize-set", TRUE, NULL);
   1.135 + 	}
   1.136 +     gtk_tree_view_column_pack_start(col, render, TRUE);
   1.137 +@@ -1693,9 +1693,9 @@
   1.138 +     
   1.139 +     render = exo_cell_renderer_ellipsized_text_new();
   1.140 +     if(gtk_major_version == 2 && gtk_minor_version >= 6)
   1.141 +-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
   1.142 ++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
   1.143 + 	else {
   1.144 +-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
   1.145 ++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
   1.146 + 				"ellipsize-set", TRUE, NULL);
   1.147 + 	}
   1.148 +     gtk_tree_view_column_pack_start(col, render, TRUE);
   1.149 +@@ -1705,9 +1705,9 @@
   1.150 +     
   1.151 +     render = exo_cell_renderer_ellipsized_text_new();
   1.152 +     if(gtk_major_version == 2 && gtk_minor_version >= 6)
   1.153 +-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
   1.154 ++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
   1.155 + 	else {
   1.156 +-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
   1.157 ++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
   1.158 + 				"ellipsize-set", TRUE, NULL);
   1.159 + 	}
   1.160 +     col = gtk_tree_view_column_new_with_attributes(_("Location"), render,
   1.161 +diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c
   1.162 +--- xfmedia-0.9.2/src/playlist.c	2006-11-27 07:21:22.000000000 +0000
   1.163 ++++ xfmedia-0.9.2.my/src/playlist.c	2011-02-01 11:04:47.000000000 +0000
   1.164 +@@ -1409,9 +1409,9 @@
   1.165 +     
   1.166 +     render = exo_cell_renderer_ellipsized_text_new();
   1.167 + 	if(gtk_major_version == 2 && gtk_minor_version >= 6)
   1.168 +-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
   1.169 ++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
   1.170 + 	else {
   1.171 +-		g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
   1.172 ++		g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
   1.173 + 				"ellipsize-set", TRUE, NULL);
   1.174 + 	}
   1.175 +     col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text",
   1.176 +diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c
   1.177 +--- xfmedia-0.9.2/src/settings-dialog.c	2006-11-27 07:21:23.000000000 +0000
   1.178 ++++ xfmedia-0.9.2.my/src/settings-dialog.c	2011-02-01 11:04:53.000000000 +0000
   1.179 +@@ -552,7 +552,7 @@
   1.180 +     render = exo_cell_renderer_ellipsized_text_new();
   1.181 +     col = gtk_tree_view_column_new_with_attributes("name", render,
   1.182 +             "text", PLUGINS_NAME, NULL);
   1.183 +-    g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
   1.184 ++    g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
   1.185 +             "ellipsize-set", TRUE, NULL);
   1.186 +     gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
   1.187 +     
   1.188 +diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c
   1.189 +--- xfmedia-0.9.2/src/xfmedia-playlist-queue.c	2006-11-27 07:21:22.000000000 +0000
   1.190 ++++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c	2011-02-01 11:04:57.000000000 +0000
   1.191 +@@ -171,7 +171,7 @@
   1.192 +     
   1.193 +     render = exo_cell_renderer_ellipsized_text_new();
   1.194 +     g_object_set(G_OBJECT(render),
   1.195 +-                 "ellipsize", EXO_PANGO_ELLIPSIZE_END,
   1.196 ++                 "ellipsize", PANGO_ELLIPSIZE_END,
   1.197 +                  "ellipsize-set", TRUE,
   1.198 +                  NULL);
   1.199 +     col = gtk_tree_view_column_new_with_attributes("display-name", render,