[Forward of my patch in LP #428904 ] As the homepage for djplay doesn't mention glib1.2 in the dependencies and as glib1.2 got removed from karmic, I tried building djplay without glib1.2. It turns out that it was only a configure check and one include which doesn't seem to be needed.
Michael
diff -u djplay-0.5.0/debian/changelog djplay-0.5.0/debian/changelog --- djplay-0.5.0/debian/changelog +++ djplay-0.5.0/debian/changelog @@ -1,3 +1,11 @@ +djplay (0.5.0-3ubuntu2) karmic; urgency=low + + * Fix FTBFS caused by "error: invalid conversion from 'const char*' to + 'char*'" + * Build without glib1.2 + + -- Michael Bienia <ge...@ubuntu.com> Sun, 13 Sep 2009 16:36:23 +0200 + djplay (0.5.0-3ubuntu1) intrepid; urgency=low * Merge from Debian unstable. Remaining Ubuntu changes: diff -u djplay-0.5.0/debian/control djplay-0.5.0/debian/control --- djplay-0.5.0/debian/control +++ djplay-0.5.0/debian/control @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Adrien Cunin <adri2...@ubuntu.com> -Build-Depends: debhelper (>= 7), autotools-dev, libglib1.2-dev, libqt3-mt-dev, libjack0.100.0-dev, libaudiofile-dev, libvorbis-dev, libsamplerate0-dev, libcdparanoia0-dev, libsoundtouch1-dev, libid3-3.8.3-dev, libmad0-dev, libmpeg3-dev, ladspa-sdk, swh-plugins, tap-plugins, libxml2-dev, libusb-dev, libdjconsole-dev +Build-Depends: debhelper (>= 7), autotools-dev, libqt3-mt-dev, libjack0.100.0-dev, libaudiofile-dev, libvorbis-dev, libsamplerate0-dev, libcdparanoia0-dev, libsoundtouch1-dev, libid3-3.8.3-dev, libmad0-dev, libmpeg3-dev, ladspa-sdk, swh-plugins, tap-plugins, libxml2-dev, libusb-dev, libdjconsole-dev Standards-Version: 3.7.3 Homepage: http://djplay.sourceforge.net/ only in patch2: unchanged: --- djplay-0.5.0.orig/jack.h +++ djplay-0.5.0/jack.h @@ -3,7 +3,6 @@ #include <qobject.h> #include <qfile.h> -#include <glib.h> #include <pthread.h> #include <samplerate.h> #include "wavelet.h" only in patch2: unchanged: --- djplay-0.5.0.orig/configure +++ djplay-0.5.0/configure @@ -470,7 +470,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE LEX LEXLIB LEX_OUTPUT_ROOT LN_S YACC CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO RANLIB ac_ct_RANLIB CXXCPP EGREP LIBTOOL MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB PLUGIN_QTDIR QT_LDFLAGS ac_qmake ac_moc ac_uic PKG_CONFIG JACK_CFLAGS JACK_LIBS GLIB_CFLAGS GLIB_LIBS XML2_CFLAGS XML2_LIBS LIBUSB_CFLAGS LIBUSB_LIBS LIBDJCONSOLE_CFLAGS LIBDJCONSOLE_LIBS target target_cpu target_vendor target_os SDL_CONFIG SDL_CFLAGS SDL_LIBS OGG_PREFIX OGG_CFLAGS OGG_LDFLAGS OGG_LIBS VORBIS_PREFIX VORBIS_CFLAGS VORBIS_LDFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS LIBOBJS dontbuild_moc LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE LEX LEXLIB LEX_OUTPUT_ROOT LN_S YACC CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os ECHO RANLIB ac_ct_RANLIB CXXCPP EGREP LIBTOOL MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB PLUGIN_QTDIR QT_LDFLAGS ac_qmake ac_moc ac_uic PKG_CONFIG JACK_CFLAGS JACK_LIBS XML2_CFLAGS XML2_LIBS LIBUSB_CFLAGS LIBUSB_LIBS LIBDJCONSOLE_CFLAGS LIBDJCONSOLE_LIBS target target_cpu target_vendor target_os SDL_CONFIG SDL_CFLAGS SDL_LIBS OGG_PREFIX OGG_CFLAGS OGG_LDFLAGS OGG_LIBS VORBIS_PREFIX VORBIS_CFLAGS VORBIS_LDFLAGS VORBIS_LIBS VORBISFILE_LIBS VORBISENC_LIBS LIBOBJS dontbuild_moc LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -11965,104 +11965,6 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for glib >= 1.2.0" >&5 -echo $ECHO_N "checking for glib >= 1.2.0... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "glib >= 1.2.0" ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking GLIB_CFLAGS" >&5 -echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6 - GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib >= 1.2.0"` - echo "$as_me:$LINENO: result: $GLIB_CFLAGS" >&5 -echo "${ECHO_T}$GLIB_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking GLIB_LIBS" >&5 -echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6 - GLIB_LIBS=`$PKG_CONFIG --libs "glib >= 1.2.0"` - echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5 -echo "${ECHO_T}$GLIB_LIBS" >&6 - else - GLIB_CFLAGS="" - GLIB_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib >= 1.2.0"` - echo $GLIB_PKG_ERRORS - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig"; - fi - fi - - if test $succeeded = yes; then - : - else - { { echo "$as_me:$LINENO: error: Library requirements (glib >= 1.2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (glib >= 1.2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} - { (exit 1); exit 1; }; } - fi - - - succeeded=no - - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG - -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo "$as_me:$LINENO: checking for libxml-2.0 >= 2-2.4.23" >&5 echo $ECHO_N "checking for libxml-2.0 >= 2-2.4.23... $ECHO_C" >&6 @@ -17132,8 +17034,8 @@ done -LIBS="-lqt-mt $JACK_LIBS $GLIB_LIBS $LIBS" -CXXFLAGS="-include djplay.h -DQT_THREAD_SUPPORT $JACK_CFLAGS $GLIB_CFLAGS $CXXFLAGS" +LIBS="-lqt-mt $JACK_LIBS $LIBS" +CXXFLAGS="-include djplay.h -DQT_THREAD_SUPPORT $JACK_CFLAGS $CXXFLAGS" CXXFLAGS="`echo $CXXFLAGS | sed -e \"s/-I\/usr\/include //\"`" @@ -17875,8 +17777,6 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@JACK_CFLAGS@,$JACK_CFLAGS,;t t s,@JACK_LIBS@,$JACK_LIBS,;t t -s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t -s,@GLIB_LIBS@,$GLIB_LIBS,;t t s,@XML2_CFLAGS@,$XML2_CFLAGS,;t t s,@XML2_LIBS@,$XML2_LIBS,;t t s,@LIBUSB_CFLAGS@,$LIBUSB_CFLAGS,;t t only in patch2: unchanged: --- djplay-0.5.0.orig/mainwnd.ui.h +++ djplay-0.5.0/mainwnd.ui.h @@ -975,7 +975,7 @@ pframe=0; warned=false; current_file=e->file(); - char *ext=strrchr(current_file, '.'); + const char *ext=strrchr(current_file, '.'); if(!ext) ext=""; current_file_name=info.fileName().left(info.fileName().length()-strlen(ext)); only in patch2: unchanged: --- djplay-0.5.0.orig/loader.cpp +++ djplay-0.5.0/loader.cpp @@ -82,7 +82,7 @@ if(!new_source) { - char *ext=strrchr(File, '.'); + const char *ext=strrchr(File, '.'); if(!ext) ext=""; only in patch2: unchanged: --- djplay-0.5.0.orig/configure.ac +++ djplay-0.5.0/configure.ac @@ -104,7 +104,6 @@ AC_CHECK_LIB(Xext, main) PKG_CHECK_MODULES(JACK, jack >= 0.80.0) -PKG_CHECK_MODULES(GLIB, glib >= 1.2.0) PKG_CHECK_MODULES(XML2, libxml-2.0 >= 2-2.4.23, [AC_DEFINE([HAVE_LIBXML2],[1],[Define if you have the xml2 library])],[echo "XML editing disabled"] ) @@ -242,8 +241,8 @@ AC_FUNC_STAT AC_CHECK_FUNCS([getcwd memmove memset pow sqrt strcasecmp strchr strrchr strstr]) -LIBS="-lqt-mt $JACK_LIBS $GLIB_LIBS $LIBS" -CXXFLAGS="-include djplay.h -DQT_THREAD_SUPPORT $JACK_CFLAGS $GLIB_CFLAGS $CXXFLAGS" +LIBS="-lqt-mt $JACK_LIBS $LIBS" +CXXFLAGS="-include djplay.h -DQT_THREAD_SUPPORT $JACK_CFLAGS $CXXFLAGS" CXXFLAGS="`echo $CXXFLAGS | sed -e \"s/-I\/usr\/include //\"`" AC_SUBST(dontbuild_moc)
