Date: Sat, 09 Feb 2013 14:17:27 +0100 From: Barbara Guida <barbara.freebsd@gmail.com> To: Martin Wilke <miwi@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r311909 - in head/sysutils/conky: . files Message-ID: <51164C67.3070506@gmail.com> In-Reply-To: <201302080711.r187B6b1088743@svn.freebsd.org> References: <201302080711.r187B6b1088743@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------040601090305030009050501 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Martin Wilke wrote: > Author: miwi Date: Fri Feb 8 07:11:05 2013 New Revision: 311909 > URL: http://svnweb.freebsd.org/changeset/ports/311909 > > Log: - Update to 1.9.0 > > PR: 168161 Submitted by: lbartoletti <coder@tuxfamily.org> Lars > Engels <lars.engels@0x20.net> Approved by: maintainer > > Modified: head/sysutils/conky/Makefile > head/sysutils/conky/distinfo > head/sysutils/conky/files/patch-configure > head/sysutils/conky/files/patch-src-ccurl_thread.c > head/sysutils/conky/files/patch-src-conky.c > head/sysutils/conky/files/patch-src-core.c > head/sysutils/conky/files/patch-src-exec.c > head/sysutils/conky/files/patch-src-freebsd.c > head/sysutils/conky/files/patch-src-freebsd.h > head/sysutils/conky/files/patch-src-xmms2.c > Hi, can you please consider the attached diff to fix the build on i386? The following is the error I'm getting: cc -DHAVE_CONFIG_H -I. - -DSYSTEM_CONFIG_FILE=\"/usr/local/etc/conky/conky.conf\" - -DPACKAGE_LIBDIR=\"/usr/local/lib/conky\" -I/usr/local/include - -D_THREAD_SAFE -I/usr/local/include -I/usr/local/include/freetype2 - -I/usr/local/include -I/usr/local/include/lua51 -D_THREAD_SAFE - -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include - -D_THREAD_SAFE -I/usr/local/include/freetype2 -I/usr/local/include - -I/usr/local/include/glib-2.0 -I/usr/local/include - -I/usr/local/include/libxml2 -I/usr/local/include -Wall -W -O2 -pipe - -fno-strict-aliasing -march=prescott -MT conky-fs.o -MD -MP -MF .deps/conky-fs.Tpo -c -o conky-fs.o `test -f 'fs.c' || echo './'`fs.c fs.c: In function 'update_fs_stat': fs.c:121: error: storage size of 's' isn't known fs.c:123: warning: implicit declaration of function 'statfs64' fs.c:121: warning: unused variable 's' gmake[2]: *** [conky-fs.o] Error 1 gmake[2]: Leaving directory `/usr/ports/sysutils/conky/work/conky-1.9.0/src' gmake[1]: *** [all] Error 2 gmake[1]: Leaving directory `/usr/ports/sysutils/conky/work/conky-1.9.0/src' gmake: *** [all-recursive] Error 1 *** [do-build] Error code 1 Cheers Barbara -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iQEcBAEBAgAGBQJRFkxjAAoJECfdb9Y99fdQBhUIAJYJd7D+lPO1xPFNkPeLJyyh kmfaVDXQKd72pVm1rRlq6t7yMc8B29e/A3iMK4ecs88og5xuysGT4bYboqVz4/h4 jAQlAkp3yNIJd/xpFluFfVlNHm8eo9tokcKoHrOIbFLwlq+4S4y0yBm2OxeneN0V 4qjtIG1ugZ0GdS5gS+Kjc5eWjY/jq3T8mVDbvU7swCFhIHQeCYf0CwB3zfHNpf12 QoR5ur9oS5HQ4XAY8V9VpAEZx8c9MI1lgKLJqgiJSXK+EfdXodMeAv84zMmO/+g/ p0fc3hIht6Jo1Nd4/mBCNCFNeHf2NU0gjuGVx/ZBSoFh5D52JhI/EEP289QFdVk= =czKg -----END PGP SIGNATURE----- --------------040601090305030009050501 Content-Type: text/x-patch; name="sysutils_conky.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="sysutils_conky.diff" Index: sysutils/conky/files/patch-src-fs.c =================================================================== --- sysutils/conky/files/patch-src-fs.c (revision 0) +++ sysutils/conky/files/patch-src-fs.c (working copy) @@ -0,0 +1,20 @@ +--- src/fs.c.orig 2012-05-03 23:08:27.000000000 +0200 ++++ src/fs.c 2013-02-09 14:10:03.000000000 +0100 +@@ -118,9 +118,17 @@ + + static void update_fs_stat(struct fs_stat *fs) + { ++#if defined(i386) || defined(__i386__) ++ struct statfs s; ++#else + struct statfs64 s; ++#endif + ++#if defined(i386) || defined(__i386__) ++ if (statfs(fs->path, &s) == 0) { ++#else + if (statfs64(fs->path, &s) == 0) { ++#endif + fs->size = (long long)s.f_blocks * s.f_bsize; + /* bfree (root) or bavail (non-roots) ? */ + fs->avail = (long long)s.f_bavail * s.f_bsize; Property changes on: sysutils/conky/files/patch-src-fs.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property --------------040601090305030009050501 Content-Type: application/octet-stream; name="sysutils_conky.diff.sig" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="sysutils_conky.diff.sig" iQEcBAABAgAGBQJRFkxnAAoJECfdb9Y99fdQykkIAOUiFDnZzlf7r9gzeYtZ5MoWDUMFJCN5 TYGoHDqcejo1p4km9772P78H9ZRmCMVdo529RKHFGTAGtej2cp0wZxX39Q2UDdt5Ny81EEdR LduqUhrdkgMF/iCnb2yEw8ClHBB+oSY3lkDe71g+H9g4leDutGlVAitx5H6inuAlxdNbfDAh PeipxN6/lxZ9nbEJMJqaKUjr8nQimKNpDHo7UDmyYts48T2TpfSwguPU2DFiKpF6uVbBarDo gTcBg+g7TN8AsWcI1pL9GK5WLXSGcNerAD5JAi0vs2gvEtyB/PVsTN+MzEQgEXqVDUKT6CXG 1NL4ZBmWJgGVjDisjjIb9n4= --------------040601090305030009050501--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51164C67.3070506>