Package: cdcd
Followup-For: Bug #646134
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Add 07-no-curses.patch to fix FTBFS. Since curses isn't used
anyway, don't test for or use it. (Closes: #646134)
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru cdcd-0.6.6/debian/patches/07-no-curses.patch cdcd-0.6.6/debian/patches/07-no-curses.patch
--- cdcd-0.6.6/debian/patches/07-no-curses.patch 1969-12-31 19:00:00.000000000 -0500
+++ cdcd-0.6.6/debian/patches/07-no-curses.patch 2011-10-25 19:56:06.000000000 -0400
@@ -0,0 +1,104 @@
+Index: cdcd-0.6.6/config.h.in
+===================================================================
+--- cdcd-0.6.6.orig/config.h.in 2011-10-25 19:56:03.000000000 -0400
++++ cdcd-0.6.6/config.h.in 2011-10-25 19:54:56.000000000 -0400
+@@ -33,9 +33,6 @@
+ /* True if we must provide -llibcdaudio (for IRIX). */
+ #undef HAVE_LIBCDAUDIO
+
+-/* Define to 1 if you have the `curses' library (-lcurses). */
+-#undef HAVE_LIBCURSES
+-
+ /* Define to 1 if you have the `readline' library (-lreadline). */
+ #undef HAVE_LIBREADLINE
+
+Index: cdcd-0.6.6/configure
+===================================================================
+--- cdcd-0.6.6.orig/configure 2011-10-25 19:56:03.000000000 -0400
++++ cdcd-0.6.6/configure 2011-10-25 19:56:03.000000000 -0400
+@@ -3677,85 +3677,6 @@
+
+
+
+-echo "$as_me:$LINENO: checking for tputs in -lcurses" >&5
+-echo $ECHO_N "checking for tputs in -lcurses... $ECHO_C" >&6
+-if test "${ac_cv_lib_curses_tputs+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcurses $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char tputs ();
+-int
+-main ()
+-{
+-tputs ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_curses_tputs=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_curses_tputs=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tputs" >&5
+-echo "${ECHO_T}$ac_cv_lib_curses_tputs" >&6
+-if test $ac_cv_lib_curses_tputs = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBCURSES 1
+-_ACEOF
+-
+- LIBS="-lcurses $LIBS"
+-
+-else
+- { { echo "$as_me:$LINENO: error: cannot find the curses library.
+-Check the INSTALL file, maybe you can find how to solve the problem." >&5
+-echo "$as_me: error: cannot find the curses library.
+-Check the INSTALL file, maybe you can find how to solve the problem." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+ echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
+ echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6
+ if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
diff -Nru cdcd-0.6.6/debian/patches/series cdcd-0.6.6/debian/patches/series
--- cdcd-0.6.6/debian/patches/series 2011-09-04 10:49:43.000000000 -0400
+++ cdcd-0.6.6/debian/patches/series 2011-10-25 19:54:39.000000000 -0400
@@ -4,3 +4,4 @@
04-freedb-url
05-fix-rndplay-segfault.patch
06-manpage-hyphen-fix.patch
+07-no-curses.patch
