1 |
tomjbe 12/06/21 06:11:00 |
2 |
|
3 |
Added: unixcw-3.0.2-config.patch |
4 |
unixcw-3.0.2-parallel-make.patch |
5 |
unixcw-3.0.2-destdir.patch unixcw-3.0.2-qt4.patch |
6 |
Log: |
7 |
Version bump |
8 |
|
9 |
(Portage version: 2.1.10.65/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 media-radio/unixcw/files/unixcw-3.0.2-config.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/unixcw/files/unixcw-3.0.2-config.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/unixcw/files/unixcw-3.0.2-config.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: unixcw-3.0.2-config.patch |
18 |
=================================================================== |
19 |
--- configure.ac.orig 2012-06-21 07:34:18.000000000 +0200 |
20 |
+++ configure.ac 2012-06-21 07:34:42.000000000 +0200 |
21 |
@@ -45,8 +45,24 @@ |
22 |
AC_SUBST(GZIP) |
23 |
AC_SUBST(LDCONFIG) |
24 |
|
25 |
+AC_MSG_CHECKING(--enable-ncurses argument) |
26 |
+AC_ARG_ENABLE(ncurses, |
27 |
+ [ --enable-ncurses Include curses based Morse code Tutor], |
28 |
+ [enable_ncurses=$enableval], |
29 |
+ [enable_ncurses="no"]) |
30 |
+AC_MSG_RESULT($enable_ncurses) |
31 |
+ |
32 |
+AC_MSG_CHECKING(--enable-qt4 argument) |
33 |
+AC_ARG_ENABLE(qt4, |
34 |
+ [ --enable-qt4 Include QT based Morse code Tutor], |
35 |
+ [enable_qt=$enableval], |
36 |
+ [enable_qt="no"]) |
37 |
+AC_MSG_RESULT($enable_qt) |
38 |
+ |
39 |
+if test "$enable_ncurses" = 'yes'; then |
40 |
# Checks for libraries. |
41 |
AC_CHECK_LIB(curses, initscr) |
42 |
+fi |
43 |
AC_CHECK_LIB(asound, snd_pcm_open) |
44 |
AC_CHECK_LIB(pthread, pthread_create) |
45 |
AC_CHECK_LIB(m, floor) |
46 |
@@ -102,121 +118,40 @@ |
47 |
# Decide on which subdirectories to build; substitute into SUBDIRS. Build |
48 |
# cwcp if curses is available, and xcwcp if Qt is available. |
49 |
SUBDIRS="libcw cwutils cw cwgen" |
50 |
+ |
51 |
+if test "$enable_ncurses" = 'yes'; then |
52 |
# Simple test for curses based on prior library check. |
53 |
if test $ac_cv_lib_curses_initscr = 'yes' ; then |
54 |
SUBDIRS="$SUBDIRS cwcp" |
55 |
else |
56 |
AC_MSG_WARN([Cannot find libcurses - unable to build cwcp]) |
57 |
fi |
58 |
+fi |
59 |
|
60 |
- |
61 |
- |
62 |
- |
63 |
-# autodetection of QT4 dependencies |
64 |
- |
65 |
-MOC_MAJOR_EARLIEST=4 |
66 |
- |
67 |
-# possible locations of Qt4 headers |
68 |
-QT4HEADER_DIRS="/usr/include/qt4 \ # Debian |
69 |
- /usr/include" # Arch (?) |
70 |
- |
71 |
-# possible locations of Qt4 moc (a.k.a. moc-qt4) |
72 |
-QT4BIN_DIRS=$PATH # pretty standard |
73 |
- |
74 |
-# QT4DIR="" # for testing purposes |
75 |
-QT4INC="" # full path to directory with QT4 QtCore + QtGui subdirs and include files, e.g. /usr/include/qt4/ |
76 |
-QT4MOC="" # full path to QT4 moc executable |
77 |
- |
78 |
-if [[[ $QT4DIR = "" ]]] ; then |
79 |
- |
80 |
- # look for QT4 include directories |
81 |
- for dir in $QT4HEADER_DIRS; do |
82 |
- if test -d "$dir/QtGui" && test -d "$dir/QtCore" ; then |
83 |
- QT4INC=$dir; |
84 |
- fi |
85 |
- done |
86 |
- |
87 |
- # look for QT4 moc binary |
88 |
- AC_PATH_PROG(QT4MOC, moc-qt4, , $PATH) |
89 |
- if test -n "$QT4MOC" ; then |
90 |
- MOC_MAJOR="`$QT4MOC -v 2>&1 | sed -e 's;.\+ (Qt \([[0-9]]\).\+;\1;g'`" |
91 |
- if [[[ $MOC_MAJOR != $MOC_MAJOR_EARLIEST ]]] ; then |
92 |
- QT4MOC="" |
93 |
- fi |
94 |
- fi |
95 |
- |
96 |
- if [[[ "$QT4MOC" = "" ]]] ; then |
97 |
- QT4MOC_2="" |
98 |
- AC_PATH_PROG(QT4MOC_2, moc, , $PATH) |
99 |
- if test -n "$QT4MOC_2" ; then |
100 |
- MOC_MAJOR="`$QT4MOC_2 -v 2>&1 | sed -e 's;.\+ (Qt \([[0-9]]\).\+;\1;g'`" |
101 |
- if [[[ $MOC_MAJOR = $MOC_MAJOR_EARLIEST ]]] ; then |
102 |
- QT4MOC=$QT4MOC_2 |
103 |
- fi |
104 |
- fi |
105 |
- fi |
106 |
- |
107 |
- |
108 |
- if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then |
109 |
- |
110 |
- # we have moc4 and path to QT4 include files, |
111 |
- # so we can build xcwcp |
112 |
- SUBDIRS="$SUBDIRS xcwcp" |
113 |
- |
114 |
- AC_SUBST(QT4INC) |
115 |
- AC_SUBST(QT4MOC) |
116 |
- else |
117 |
- if [[[ $QT4INC = "" ]]] ; then |
118 |
- AC_MSG_WARN([Can't find directory with QT4 header files - unable to build xcwcp]) |
119 |
- fi |
120 |
- |
121 |
- if [[[ $QT4MOC = "" ]]] ; then |
122 |
- AC_MSG_WARN([Can't find QT moc version == $MOC_MAJOR_EARLIEST - unable to build xcwcp]) |
123 |
+if test "$enable_qt4" = 'yes'; then |
124 |
+ dnl Look for Qt4 libs |
125 |
+ PKG_CHECK_MODULES([QT4], ["QtCore QtGui Qt3Support"], [ |
126 |
+ AC_SUBST(QT4INC,$QT4_CFLAGS) |
127 |
+ AC_SUBST(QT4LIBS) |
128 |
+ ], [ |
129 |
+ AC_MSG_ERROR([Qt4 libs not found]) |
130 |
+ ]) |
131 |
+ dnl Look for moc, either on $PATH or in $QTDIR/bin |
132 |
+ AC_PATH_PROG(QT4MOC, moc, , $PATH:$QTDIR/bin) |
133 |
+ if test -n "$QT4MOC" ; then |
134 |
+ dnl if libs and moc found |
135 |
+ SUBDIRS="$SUBDIRS xcwcp" |
136 |
+ AC_DEFINE([WANT_QT4], 1, [Want Qt4]) |
137 |
+ echo "enabling Qt4 support" |
138 |
+ else |
139 |
+ AC_MSG_ERROR([Cannot find 'moc']) |
140 |
+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) |
141 |
fi |
142 |
- |
143 |
- AC_MSG_WARN([Hint: try setting QT4DIR env variable per instructions in unixcw/INSTALLATION]) |
144 |
- |
145 |
- QT4INC="" |
146 |
- QT4MOC="" |
147 |
- fi |
148 |
- |
149 |
- |
150 |
else |
151 |
- |
152 |
- |
153 |
-# Look for $QT4DIR. If found, then look for moc, either on $PATH, or |
154 |
-# in $QT4DIR/bin. |
155 |
- |
156 |
- AC_PATH_PROG(QT4MOC, moc, , $QT4DIR/bin:$PATH) |
157 |
- if test -n "$QT4MOC" ; then |
158 |
- MOC_VERSION="`$QT4MOC -v 2>&1 | sed -e 's;.*(Qt ;;' -e 's;).*;;'`" |
159 |
- if test -n "$MOC_VERSION" ; then |
160 |
- MOC_MAJOR="`echo $MOC_VERSION | sed -e 's;\..*;;'`" |
161 |
- expr "$MOC_MAJOR" + 0 >/dev/null 2>/dev/null |
162 |
- status=$? |
163 |
- if test -n "$MOC_MAJOR" -a $status -eq 0 ; then |
164 |
- if test "$MOC_MAJOR" -ge $MOC_MAJOR_EARLIEST ; then |
165 |
- SUBDIRS="$SUBDIRS xcwcp" |
166 |
- QT4INC="$QT4DIR/include" |
167 |
- AC_SUBST(QT4INC) |
168 |
- AC_SUBST(QT4MOC) |
169 |
- else |
170 |
- AC_MSG_WARN([Found 'moc' $MOC_VERSION - unable to build xcwcp]) |
171 |
- AC_MSG_WARN([Hint: xcwcp requires 'moc' version >= $MOC_MAJOR_EARLIEST]) |
172 |
- fi |
173 |
- else |
174 |
- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) |
175 |
- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) |
176 |
- fi |
177 |
- else |
178 |
- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) |
179 |
- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) |
180 |
- fi |
181 |
- else |
182 |
- AC_MSG_WARN([Cannot find 'moc' - unable to build xcwcp]) |
183 |
- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) |
184 |
- fi |
185 |
+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) |
186 |
+ echo "disabling Qt4 support" |
187 |
fi |
188 |
+ |
189 |
AC_SUBST(SUBDIRS) |
190 |
|
191 |
if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then |
192 |
--- Makefile.inc.in.orig 2012-06-21 07:59:31.000000000 +0200 |
193 |
+++ Makefile.inc.in 2012-06-21 08:00:01.000000000 +0200 |
194 |
@@ -31,6 +31,7 @@ |
195 |
# AC_QTMOC = @QTMOC@ |
196 |
AC_QT4INC = @QT4INC@ |
197 |
AC_QT4MOC = @QT4MOC@ |
198 |
+AC_QT4LIBS = @QT4_LIBS@ |
199 |
AC_CFLAG_PIC = @CFLAG_PIC@ |
200 |
AC_SUBDIRS = @SUBDIRS@ |
201 |
AC_CC_LINKS_SO = @CC_LINKS_SO@ |
202 |
|
203 |
|
204 |
|
205 |
1.1 media-radio/unixcw/files/unixcw-3.0.2-parallel-make.patch |
206 |
|
207 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/unixcw/files/unixcw-3.0.2-parallel-make.patch?rev=1.1&view=markup |
208 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/unixcw/files/unixcw-3.0.2-parallel-make.patch?rev=1.1&content-type=text/plain |
209 |
|
210 |
Index: unixcw-3.0.2-parallel-make.patch |
211 |
=================================================================== |
212 |
--- Makefile.orig 2012-06-20 09:32:17.000000000 +0200 |
213 |
+++ Makefile 2012-06-20 09:32:32.000000000 +0200 |
214 |
@@ -34,15 +34,15 @@ |
215 |
|
216 |
# Targets that do nothing other than descend. |
217 |
all install install-strip uninstall TAGS info dvi check: |
218 |
- $(DESCEND) |
219 |
+ +$(DESCEND) |
220 |
|
221 |
clean: |
222 |
- $(DESCEND) |
223 |
+ +$(DESCEND) |
224 |
rm -f Makefile.inc |
225 |
|
226 |
# Targets that do just a little more than this. |
227 |
distclean mostlyclean: |
228 |
- $(DESCEND) |
229 |
+ +$(DESCEND) |
230 |
rm -f $(DIST).tar $(DIST).tar.gz $(DIST).tgz |
231 |
rm -f Makefile.inc src/config.h src/config.h.in~ |
232 |
rm -f config.status config.cache config.log |
233 |
--- src/Makefile.orig 2012-06-20 09:32:49.000000000 +0200 |
234 |
+++ src/Makefile 2012-06-20 09:33:17.000000000 +0200 |
235 |
@@ -31,7 +31,7 @@ |
236 |
|
237 |
# All targets do nothing other than descend. |
238 |
all install install-strip uninstall clean TAGS info dvi check: |
239 |
- $(DESCEND) |
240 |
+ +$(DESCEND) |
241 |
|
242 |
distclean mostlyclean maintainer-clean: |
243 |
- $(DESCEND) |
244 |
+ +$(DESCEND) |
245 |
--- src/libcw/Makefile.orig 2012-06-20 09:33:30.000000000 +0200 |
246 |
+++ src/libcw/Makefile 2012-06-20 09:34:24.000000000 +0200 |
247 |
@@ -62,11 +62,11 @@ |
248 |
libcw.3: libcw.3.m4 libcw.c |
249 |
$(AWK) -f libdoc.awk <libcw.c | $(AWK) -f libsigs.awk >signatures |
250 |
$(AWK) -f libdoc.awk <libcw.c | $(AWK) -f libfuncs.awk >functions |
251 |
- $(AWK) -f include.awk <libcw.3.m4 >libcw.3 |
252 |
+ $(AWK) -f include.awk <libcw.3.m4 >libcw.3 |
253 |
rm -f signatures functions |
254 |
|
255 |
# Build the unit test. |
256 |
-libcwtest: libcwtest.o |
257 |
+libcwtest: libcwtest.o libcw.a libcw.so.3.0.1 |
258 |
$(CC) -o libcwtest libcwtest.o -L. -lcw |
259 |
|
260 |
# Build the pkgconfig metadata file. |
261 |
|
262 |
|
263 |
|
264 |
1.1 media-radio/unixcw/files/unixcw-3.0.2-destdir.patch |
265 |
|
266 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/unixcw/files/unixcw-3.0.2-destdir.patch?rev=1.1&view=markup |
267 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/unixcw/files/unixcw-3.0.2-destdir.patch?rev=1.1&content-type=text/plain |
268 |
|
269 |
Index: unixcw-3.0.2-destdir.patch |
270 |
=================================================================== |
271 |
--- Makefile.inc.in.orig 2012-06-20 09:08:48.000000000 +0200 |
272 |
+++ Makefile.inc.in 2012-06-20 09:10:23.000000000 +0200 |
273 |
@@ -42,12 +42,12 @@ |
274 |
INSTALL = @INSTALL@ |
275 |
INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
276 |
INSTALL_DATA = @INSTALL_DATA@ |
277 |
-prefix = @prefix@ |
278 |
+prefix = $(DESTDIR)@prefix@ |
279 |
exec_prefix = @exec_prefix@ |
280 |
includedir = @includedir@ |
281 |
bindir = @bindir@ |
282 |
-mandir = @mandir@ |
283 |
-libdir = @libdir@ |
284 |
+mandir = $(DESTDIR)@mandir@ |
285 |
+libdir = $(DESTDIR)@libdir@ |
286 |
|
287 |
# http://www.gnu.org/s/hello/manual/autoconf/Changed-Directory-Variables.html |
288 |
datarootdir = @datarootdir@ |
289 |
|
290 |
|
291 |
|
292 |
1.1 media-radio/unixcw/files/unixcw-3.0.2-qt4.patch |
293 |
|
294 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/unixcw/files/unixcw-3.0.2-qt4.patch?rev=1.1&view=markup |
295 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/unixcw/files/unixcw-3.0.2-qt4.patch?rev=1.1&content-type=text/plain |
296 |
|
297 |
Index: unixcw-3.0.2-qt4.patch |
298 |
=================================================================== |
299 |
--- src/xcwcp/Makefile.orig 2012-06-21 07:49:59.000000000 +0200 |
300 |
+++ src/xcwcp/Makefile 2012-06-21 07:56:51.000000000 +0200 |
301 |
@@ -18,7 +18,7 @@ |
302 |
|
303 |
include ../../Makefile.inc |
304 |
CXX = $(AC_CXX) |
305 |
-CXXFLAGS= $(AC_CXXFLAGS) $(AC_DEFS) -I../libcw -I../cwutils -I$(AC_QT4INC) -I$(AC_QT4INC)/QtCore -I$(AC_QT4INC)/QtGui |
306 |
+CXXFLAGS= $(AC_CXXFLAGS) $(AC_DEFS) -I../libcw -I../cwutils -I$(AC_QT4INC) |
307 |
GZIP = $(AC_GZIP) |
308 |
|
309 |
SHELL = /bin/sh |
310 |
@@ -28,7 +28,7 @@ |
311 |
moc_application.o |
312 |
|
313 |
# Link to the shared libcw. |
314 |
-LIBS = -L../libcw -lcw -lQtGui -lQtCore |
315 |
+LIBS = $(AC_QT4LIBS) -L../libcw -lcw -lQtGui -lQtCore |
316 |
|
317 |
default: all |