rpms/mediatomb/devel mediatomb_fixcompile.sf2605394.patch, NONE, 1.1 mediatomb.spec, 1.9, 1.10

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/mediatomb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14608

Modified Files:
	mediatomb.spec 
Added Files:
	mediatomb_fixcompile.sf2605394.patch 
Log Message:
fix compile

mediatomb_fixcompile.sf2605394.patch:

--- NEW FILE mediatomb_fixcompile.sf2605394.patch ---
diff -ru mediatomb-0.11.0.orig/src/storage/mysql/mysql_storage.cc mediatomb-0.11.0/src/storage/mysql/mysql_storage.cc
--- mediatomb-0.11.0.orig/src/storage/mysql/mysql_storage.cc	2009-02-16 12:12:35.000000000 +0000
+++ mediatomb-0.11.0/src/storage/mysql/mysql_storage.cc	2009-02-16 12:12:44.000000000 +0000
@@ -48,6 +48,9 @@
     #include <zlib.h>
 #endif
 
+#include <my_global.h>
+#include <my_sys.h>
+
 // updates 1->2
 #define MYSQL_UPDATE_1_2_1 "ALTER TABLE `mt_cds_object` CHANGE `location` `location` BLOB NULL DEFAULT NULL"
 #define MYSQL_UPDATE_1_2_2 "ALTER TABLE `mt_cds_object` CHANGE `metadata` `metadata` BLOB NULL DEFAULT NULL"
diff -ru mediatomb-0.11.0.orig/src/tools.cc mediatomb-0.11.0/src/tools.cc
--- mediatomb-0.11.0.orig/src/tools.cc	2009-02-16 12:12:35.000000000 +0000
+++ mediatomb-0.11.0/src/tools.cc	2009-02-16 12:13:15.000000000 +0000
@@ -303,8 +303,8 @@
     Ref<StringBuffer> buf(new StringBuffer(len / 2));
     for (int i = 0; i < len; i += 2)
     {
-        char *chi = strchr(HEX_CHARS, ptr[i]);
-        char *clo = strchr(HEX_CHARS, ptr[i + 1]);
+        const char *chi = strchr(HEX_CHARS, ptr[i]);
+        const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
         int hi, lo;
         
         if (chi)
@@ -397,7 +397,7 @@
             char clo = data[i++];
             int hi, lo;
 
-            char *pos;
+            const char *pos;
 
             pos = strchr(hex, chi);
             if (!pos)


Index: mediatomb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mediatomb/devel/mediatomb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mediatomb.spec	24 Jan 2009 04:37:19 -0000	1.9
+++ mediatomb.spec	16 Feb 2009 12:32:52 -0000	1.10
@@ -1,13 +1,14 @@
 Version: 0.11.0
 Summary: UPnP AV MediaServer 
 Name: mediatomb
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: MediaTomb - UPnP AV Mediaserver for Linux
 License: GPLv2
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/mediatomb/%{name}-%{version}.tar.gz
 Patch0: mediatomb-service-disable.patch
 Patch1: mediatomb_curl.patch
+Patch2: mediatomb_fixcompile.sf2605394.patch
 URL: http://mediatomb.cc
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: sqlite-devel, mysql-devel, libexif-devel, id3lib-devel, file-devel, js-devel, zlib-devel, taglib-devel
@@ -34,10 +35,11 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %if 0%{?fedora} >= 9
-%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9/js/
+%configure --enable-inotify --enable-taglib --enable-libjs --with-js-h=%{_includedir}/xulrunner-sdk-1.9.1/js/
 %else
 %configure --enable-inotify --enable-taglib --enable-libjs
 %endif
@@ -99,6 +101,11 @@
 %{_initrddir}/mediatomb
 
 %changelog
+* Mon Feb 16 2009 Caolán McNamara <caolanm at redhat.com> 0.11.0-6
+- needs to point to xulrunner/js 1.9.1 now
+- include my_sys.h for my_init
+- fix some char* -> const char*
+
 * Sat Jan 24 2009 Marc Wiriadisastra <marc at mwiriadi.id.au> 0.11.0-5
 - Rebuild for mysql dependancy