--- bmpx-0.40.13/src/sanity.cc.constcastfix	2007-10-18 19:17:08.000000000 +0200
+++ bmpx-0.40.13/src/sanity.cc	2007-11-29 16:05:38.000000000 +0100
@@ -72,9 +72,9 @@ C_FUNCTION
 gchar *
 sanity_check_gtk (void)
 {
-  return gtk_check_version (GTK_REQUIRED_MAJOR_VER,
-                            GTK_REQUIRED_MINOR_VER,
-                            GTK_REQUIRED_MICRO_VER);
+  return const_cast<gchar *>(gtk_check_version (GTK_REQUIRED_MAJOR_VER,
+						GTK_REQUIRED_MINOR_VER,
+						GTK_REQUIRED_MICRO_VER));
 }
 
 static gchar *
--- bmpx-0.40.14/src/ui-part-library.cc.orig	2008-03-05 22:31:06.000000000 +0100
+++ bmpx-0.40.14/src/ui-part-library.cc	2009-08-29 09:56:40.906222237 +0200
@@ -509,8 +509,8 @@
       if( node != NODE_BRANCH )
       {
         // Clone this node as one child row
-        UID uid (Bmp::AlbumArtist ((*i_toplevel)[mStoreArtistCR.artist]).bmpx_album_artist_id);
         Bmp::AlbumArtist aa ((*i_toplevel)[mStoreArtistCR.artist]);
+        UID uid (aa.bmpx_album_artist_id);
 
         UidIterMapIter uid_i = mUidIterMap.find (uid);
         if( uid_i != mUidIterMap.end() )
--- bmpx-0.40.14/src/ui-part-library.hh.orig	2008-03-05 22:31:06.000000000 +0100
+++ bmpx-0.40.14/src/ui-part-library.hh	2009-08-29 09:47:47.032596592 +0200
@@ -464,7 +464,7 @@
           void
           print (const char* func)
           {
-            printf ("Func: %s\nSize: %llu\n", func, guint64 (mQueue.size()));
+            printf ("Func: %s\nSize: %Zd\n", func, guint64 (mQueue.size()));
             for (Queue::const_iterator i = mQueue.begin(); i != mQueue.end(); ++i)
             {
               if (i == mPosition)
--- bmpx-0.40.14/src/ui-part-playlist.hh.orig	2008-03-05 22:31:06.000000000 +0100
+++ bmpx-0.40.14/src/ui-part-playlist.hh	2009-08-29 09:49:56.605846457 +0200
@@ -256,7 +256,7 @@
           void
           print (const char* func)
           {
-            printf ("Func: %s\nSize: %llu\n", func, guint64 (mQueue.size()));
+            printf ("Func: %s\nSize: %Zd\n", func, guint64 (mQueue.size()));
             for (Queue::const_iterator i = mQueue.begin(); i != mQueue.end(); ++i)
             {
               if (i == mPosition)
--- bmpx-0.40.14/src/uri.cc.orig	2008-04-06 01:49:24.000000000 +0200
+++ bmpx-0.40.14/src/uri.cc	2009-08-29 09:45:15.116765917 +0200
@@ -40,6 +40,7 @@
 #include <glibmm.h>
 #include <iostream>
 #include <cstring>
+#include <cstdio>
 
 #include "debug.hh"
 #include "uri.hh"
--- bmpx-0.40.14/widgets/popup.cc.orig	2008-03-05 22:31:12.000000000 +0100
+++ bmpx-0.40.14/widgets/popup.cc	2009-08-29 09:40:10.893479372 +0200
@@ -308,7 +308,7 @@
 
 		if (m_location == ARROW_TOP)
 		{
-			Cairo::Matrix matrix = { 1, 0, 0, -1, 0, h };
+			Cairo::Matrix matrix( 1, 0, 0, -1, 0, h );
 			cr->set_matrix (matrix);
 		}