diff options
Diffstat (limited to 'media-radio/unixcw/files/unixcw-3.0.2-config.patch')
| -rw-r--r-- | media-radio/unixcw/files/unixcw-3.0.2-config.patch | 183 |
1 files changed, 0 insertions, 183 deletions
diff --git a/media-radio/unixcw/files/unixcw-3.0.2-config.patch b/media-radio/unixcw/files/unixcw-3.0.2-config.patch deleted file mode 100644 index 403b3d351299..000000000000 --- a/media-radio/unixcw/files/unixcw-3.0.2-config.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- configure.ac.orig 2012-06-21 07:34:18.000000000 +0200 -+++ configure.ac 2012-06-21 07:34:42.000000000 +0200 -@@ -45,8 +45,24 @@ - AC_SUBST(GZIP) - AC_SUBST(LDCONFIG) - -+AC_MSG_CHECKING(--enable-ncurses argument) -+AC_ARG_ENABLE(ncurses, -+ [ --enable-ncurses Include curses based Morse code Tutor], -+ [enable_ncurses=$enableval], -+ [enable_ncurses="no"]) -+AC_MSG_RESULT($enable_ncurses) -+ -+AC_MSG_CHECKING(--enable-qt4 argument) -+AC_ARG_ENABLE(qt4, -+ [ --enable-qt4 Include QT based Morse code Tutor], -+ [enable_qt=$enableval], -+ [enable_qt="no"]) -+AC_MSG_RESULT($enable_qt) -+ -+if test "$enable_ncurses" = 'yes'; then - # Checks for libraries. - AC_CHECK_LIB(curses, initscr) -+fi - AC_CHECK_LIB(asound, snd_pcm_open) - AC_CHECK_LIB(pthread, pthread_create) - AC_CHECK_LIB(m, floor) -@@ -102,121 +118,40 @@ - # Decide on which subdirectories to build; substitute into SUBDIRS. Build - # cwcp if curses is available, and xcwcp if Qt is available. - SUBDIRS="libcw cwutils cw cwgen" -+ -+if test "$enable_ncurses" = 'yes'; then - # Simple test for curses based on prior library check. - if test $ac_cv_lib_curses_initscr = 'yes' ; then - SUBDIRS="$SUBDIRS cwcp" - else - AC_MSG_WARN([Cannot find libcurses - unable to build cwcp]) - fi -+fi - -- -- -- --# autodetection of QT4 dependencies -- --MOC_MAJOR_EARLIEST=4 -- --# possible locations of Qt4 headers --QT4HEADER_DIRS="/usr/include/qt4 \ # Debian -- /usr/include" # Arch (?) -- --# possible locations of Qt4 moc (a.k.a. moc-qt4) --QT4BIN_DIRS=$PATH # pretty standard -- --# QT4DIR="" # for testing purposes --QT4INC="" # full path to directory with QT4 QtCore + QtGui subdirs and include files, e.g. /usr/include/qt4/ --QT4MOC="" # full path to QT4 moc executable -- --if [[[ $QT4DIR = "" ]]] ; then -- -- # look for QT4 include directories -- for dir in $QT4HEADER_DIRS; do -- if test -d "$dir/QtGui" && test -d "$dir/QtCore" ; then -- QT4INC=$dir; -- fi -- done -- -- # look for QT4 moc binary -- AC_PATH_PROG(QT4MOC, moc-qt4, , $PATH) -- if test -n "$QT4MOC" ; then -- MOC_MAJOR="`$QT4MOC -v 2>&1 | sed -e 's;.\+ (Qt \([[0-9]]\).\+;\1;g'`" -- if [[[ $MOC_MAJOR != $MOC_MAJOR_EARLIEST ]]] ; then -- QT4MOC="" -- fi -- fi -- -- if [[[ "$QT4MOC" = "" ]]] ; then -- QT4MOC_2="" -- AC_PATH_PROG(QT4MOC_2, moc, , $PATH) -- if test -n "$QT4MOC_2" ; then -- MOC_MAJOR="`$QT4MOC_2 -v 2>&1 | sed -e 's;.\+ (Qt \([[0-9]]\).\+;\1;g'`" -- if [[[ $MOC_MAJOR = $MOC_MAJOR_EARLIEST ]]] ; then -- QT4MOC=$QT4MOC_2 -- fi -- fi -- fi -- -- -- if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then -- -- # we have moc4 and path to QT4 include files, -- # so we can build xcwcp -- SUBDIRS="$SUBDIRS xcwcp" -- -- AC_SUBST(QT4INC) -- AC_SUBST(QT4MOC) -- else -- if [[[ $QT4INC = "" ]]] ; then -- AC_MSG_WARN([Can't find directory with QT4 header files - unable to build xcwcp]) -- fi -- -- if [[[ $QT4MOC = "" ]]] ; then -- AC_MSG_WARN([Can't find QT moc version == $MOC_MAJOR_EARLIEST - unable to build xcwcp]) -+if test "$enable_qt4" = 'yes'; then -+ dnl Look for Qt4 libs -+ PKG_CHECK_MODULES([QT4], ["QtCore QtGui Qt3Support"], [ -+ AC_SUBST(QT4INC,$QT4_CFLAGS) -+ AC_SUBST(QT4LIBS) -+ ], [ -+ AC_MSG_ERROR([Qt4 libs not found]) -+ ]) -+ dnl Look for moc, either on $PATH or in $QTDIR/bin -+ AC_PATH_PROG(QT4MOC, moc, , $PATH:$QTDIR/bin) -+ if test -n "$QT4MOC" ; then -+ dnl if libs and moc found -+ SUBDIRS="$SUBDIRS xcwcp" -+ AC_DEFINE([WANT_QT4], 1, [Want Qt4]) -+ echo "enabling Qt4 support" -+ else -+ AC_MSG_ERROR([Cannot find 'moc']) -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) - fi -- -- AC_MSG_WARN([Hint: try setting QT4DIR env variable per instructions in unixcw/INSTALLATION]) -- -- QT4INC="" -- QT4MOC="" -- fi -- -- - else -- -- --# Look for $QT4DIR. If found, then look for moc, either on $PATH, or --# in $QT4DIR/bin. -- -- AC_PATH_PROG(QT4MOC, moc, , $QT4DIR/bin:$PATH) -- if test -n "$QT4MOC" ; then -- MOC_VERSION="`$QT4MOC -v 2>&1 | sed -e 's;.*(Qt ;;' -e 's;).*;;'`" -- if test -n "$MOC_VERSION" ; then -- MOC_MAJOR="`echo $MOC_VERSION | sed -e 's;\..*;;'`" -- expr "$MOC_MAJOR" + 0 >/dev/null 2>/dev/null -- status=$? -- if test -n "$MOC_MAJOR" -a $status -eq 0 ; then -- if test "$MOC_MAJOR" -ge $MOC_MAJOR_EARLIEST ; then -- SUBDIRS="$SUBDIRS xcwcp" -- QT4INC="$QT4DIR/include" -- AC_SUBST(QT4INC) -- AC_SUBST(QT4MOC) -- else -- AC_MSG_WARN([Found 'moc' $MOC_VERSION - unable to build xcwcp]) -- AC_MSG_WARN([Hint: xcwcp requires 'moc' version >= $MOC_MAJOR_EARLIEST]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) -- fi -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) -+ echo "disabling Qt4 support" - fi -+ - AC_SUBST(SUBDIRS) - - if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then ---- Makefile.inc.in.orig 2012-06-21 07:59:31.000000000 +0200 -+++ Makefile.inc.in 2012-06-21 08:00:01.000000000 +0200 -@@ -31,6 +31,7 @@ - # AC_QTMOC = @QTMOC@ - AC_QT4INC = @QT4INC@ - AC_QT4MOC = @QT4MOC@ -+AC_QT4LIBS = @QT4_LIBS@ - AC_CFLAG_PIC = @CFLAG_PIC@ - AC_SUBDIRS = @SUBDIRS@ - AC_CC_LINKS_SO = @CC_LINKS_SO@ |