Your message dated Sat, 14 Sep 2013 17:48:05 +0000
with message-id <e1vktwz-0007bi...@franck.debian.org>
and subject line Bug#722493: fixed in jugglemaster 0.4-6.2
has caused the Debian Bug report #722493,
regarding jugglemaster: FTBFS on kfreebsd-*: error: redefinition of 'struct
loadavg'
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
722493: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722493
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: jugglemaster
Version: 0.4-6.1
Severity: serious
Justification: FTBFS but built successfuly in the past
Tags: sid jessie patch
Control: block 706798 by -1
jugglemaster fails to build on kfreebsd-*:
| g++ -Wall -pedantic -fsigned-char `aalib-config --cflags` -c -o aajm.o
aajm.cpp
| In file included from aajm.cpp:16:0:
| ./aajm.h:43:8: error: redefinition of 'struct loadavg'
| struct loadavg {
| ^
| In file included from /usr/include/x86_64-kfreebsd-gnu/sys/resource.h:25:0,
| from ./aajm.h:25,
| from aajm.cpp:16:
| /usr/include/x86_64-kfreebsd-gnu/bits/resource.h:127:8: error: previous
definition of 'struct loadavg'
| struct loadavg {
Full build log:
https://buildd.debian.org/status/fetch.php?pkg=jugglemaster&arch=kfreebsd-amd64&ver=0.4-6.1&stamp=1378348475
The attached patch fixes this issue by renaming aajm's loadavg.
Regards
--
Sebastian Ramacher
diff -Nru jugglemaster-0.4/debian/changelog jugglemaster-0.4/debian/changelog
--- jugglemaster-0.4/debian/changelog 2013-09-03 01:13:53.000000000 +0200
+++ jugglemaster-0.4/debian/changelog 2013-09-11 17:57:34.000000000 +0200
@@ -1,3 +1,11 @@
+jugglemaster (0.4-6.2) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/loadavg.patch: kfreebsd-* defines struct loadavg in some
+ system header. Rename aajm's loadavg to resolve this conflict.
+
+ -- Sebastian Ramacher <sramac...@debian.org> Wed, 11 Sep 2013 17:49:47 +0200
+
jugglemaster (0.4-6.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru jugglemaster-0.4/debian/patches/loadavg.patch jugglemaster-0.4/debian/patches/loadavg.patch
--- jugglemaster-0.4/debian/patches/loadavg.patch 1970-01-01 01:00:00.000000000 +0100
+++ jugglemaster-0.4/debian/patches/loadavg.patch 2013-09-11 17:54:57.000000000 +0200
@@ -0,0 +1,55 @@
+Description: Rename loadavg to aajm_loadavg
+ On kfreebsd-*, there is a struct loadavg in some system header. Rename aajm's
+ loadavg to no conflict with the definition in the system header.
+Author: Sebastian Ramacher <sramac...@debian.org>
+Last-Update: 2013-09-11
+
+--- jugglemaster-0.4.orig/src/aajm/aajm.cpp
++++ jugglemaster-0.4/src/aajm/aajm.cpp
+@@ -24,7 +24,7 @@ void errorCB(char* msg) {
+ void draw_juggler(int show_loadavg) {
+ int color;
+ int i;
+- struct loadavg load;
++ struct aajm_loadavg load;
+
+ arm* ap = &(jmlib->ap);
+ ball* rhand = &(jmlib->rhand);
+@@ -101,7 +101,7 @@ void draw_juggler(int show_loadavg) {
+ runnable number of process at any given moment in time.
+ If load average is greater than your number of processors, then your
+ system has more work to do than it's capable of doing. */
+-void loadaverage(struct loadavg *load) {
++void loadaverage(struct aajm_loadavg *load) {
+ FILE *loadf;
+
+ loadf = fopen("/proc/loadavg", "r");
+@@ -156,7 +156,7 @@ void resizehandler(aa_context *resized_c
+ void main_loop(int max_iterations, int delay,
+ int loadavg_flag, int normal_load, int socket_fd) {
+ struct timeval starttime, endtime, selecttime;
+- struct loadavg load;
++ struct aajm_loadavg load;
+ long speed = DEFSPEED; /* microseconds between frames */
+ long load_speed = 0; /* Speed adjustment, based on load */
+ int loop_forever = 0;
+--- jugglemaster-0.4.orig/src/aajm/aajm.h
++++ jugglemaster-0.4/src/aajm/aajm.h
+@@ -40,7 +40,7 @@ aa_context *context;
+ aa_renderparams *params;
+ JMLib* jmlib;
+
+-struct loadavg {
++struct aajm_loadavg {
+ float one, five, fifteen;
+ };
+
+@@ -51,7 +51,7 @@ struct loadavg {
+
+ void errorCB(char* msg);
+ void draw_juggler(int show_loadavg);
+-void loadaverage(struct loadavg *load);
++void loadaverage(struct aajm_loadavg *load);
+ int startlistening(int port);
+ void stoplistening(int fd);
+ void resizehandler(aa_context *resized_context);
diff -Nru jugglemaster-0.4/debian/patches/series jugglemaster-0.4/debian/patches/series
--- jugglemaster-0.4/debian/patches/series 2013-09-03 01:07:49.000000000 +0200
+++ jugglemaster-0.4/debian/patches/series 2013-09-11 17:53:22.000000000 +0200
@@ -10,3 +10,4 @@
wx28-compatibility.patch
ld-as-needed.patch
libav9.patch
+loadavg.patch
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: jugglemaster
Source-Version: 0.4-6.2
We believe that the bug you reported is fixed in the latest version of
jugglemaster, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 722...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Sebastian Ramacher <sramac...@debian.org> (supplier of updated jugglemaster
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sat, 14 Sep 2013 18:58:28 +0200
Source: jugglemaster
Binary: aajm jmdlx
Architecture: source amd64
Version: 0.4-6.2
Distribution: unstable
Urgency: low
Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org>
Changed-By: Sebastian Ramacher <sramac...@debian.org>
Description:
aajm - ASCII art version of jugglemaster
jmdlx - jugglemaster deluxe using wxWidgets
Closes: 722493
Changes:
jugglemaster (0.4-6.2) unstable; urgency=low
.
* Non-maintainer upload.
* debian/patches/loadavg.patch: kfreebsd-* defines struct loadavg in some
system header. Rename aajm's loadavg to resolve this conflict. (Closes:
#722493)
Checksums-Sha1:
a5d3a9090d41ec13960cab8f02e7d67e75884f83 2028 jugglemaster_0.4-6.2.dsc
9f3c59c72cbc74b05f20ff542d3457615c6be072 20322
jugglemaster_0.4-6.2.debian.tar.gz
e44fe8f5b656ffd34e83446ca5f4bdafc5450ebf 22718 aajm_0.4-6.2_amd64.deb
23a6626875eb84ac4925aea54eb12fdaa4b5816b 69904 jmdlx_0.4-6.2_amd64.deb
Checksums-Sha256:
a394f94f9f6dc512fcd5416fb6ad21f8057977390ca3e09b19b5febbf04cb426 2028
jugglemaster_0.4-6.2.dsc
b7056d142f7e41faa13f90a11980b3b7879057b992262a90b4c834162a498c42 20322
jugglemaster_0.4-6.2.debian.tar.gz
6b3140453e1c16f01955b25b3700f3bb76aa1247188d92ecba81f889a354ce65 22718
aajm_0.4-6.2_amd64.deb
85d91da2eeb33206471b55f2c67e685f52b7258399d6792d66e8e2e075dc3a8a 69904
jmdlx_0.4-6.2_amd64.deb
Files:
ae59403e574b2b62a9c378340031188c 2028 games extra jugglemaster_0.4-6.2.dsc
923178b6f42d6937234407cf1c77a30a 20322 games extra
jugglemaster_0.4-6.2.debian.tar.gz
4b67a84a224bfbf860e6ca840c4de18e 22718 games extra aajm_0.4-6.2_amd64.deb
399626210903bc1baf6e300773c16eab 69904 games extra jmdlx_0.4-6.2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)
iQIcBAEBCAAGBQJSNJ4TAAoJEGny/FFupxmTeyAP/1OE6y4g7v01bEyj1+TDOO59
Q6Ib69GdWBMV4ZDLX1J5vnVCMEWq3zFB7QdO9rYKTRHDiU2R/S3DnKCFuykMl2Re
SxsY+Nao67wQidhgwFGTPBW/JhlGs9Smc02UmpYT+wr9n0Duv2lWFLpDxDYmcSgQ
8L8cgpV2HIAhf+shGw5gUTp3w+TXHseZABYotvML8W8gTeb/bTltzFBobE/qxb0S
cp8u7iNGgHSp/EbsCHUhJEdHGxglxbmCrwANHRtiDRb4ujKxz/FktEAZzBsbeotg
6QBbhtolnOy22jFf/jaBUvyVCQdWbsb38rgIivdg9TOONLbQ8Nh27evedeDalKx2
cr/0YxjNz7qkiQjG4s4jZD2j5w7FmPILqw90w9xb3zC5s2m+NtCHFglxuZnGbuOg
X2w1Pc+uUIRKqJfmbO2wFe0gI4N2MCPqp/0MgHEfjsEPph+D4iik6iOtxoTCnufw
63Hdsy4ZTZqpKfrS0m1ci2sfWkiHopJ5IfmgFWvVcuJQWiAVncJw9O5GbDlkfO7e
gxpazRbwthOzpCsPdtmE9wJUR2SDTWQGq7l0EvY1Kr52t5Myw0R9mNQSxjr9B4Bb
ZiEncfCqvC/l69BrRmwVcQueWDXtABiw721O7t5NAWa1Jet2CkMeYiSz8xON3U/z
Ttg8p4pqLlbcVkqRXNHn
=H+bw
-----END PGP SIGNATURE-----
--- End Message ---
