![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package gkrellm for openSUSE:Factory checked in at Mon Jun 8 11:52:04 CEST 2009. -------- --- gkrellm/gkrellm.changes 2009-01-19 10:12:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/gkrellm/gkrellm.changes 2009-06-07 11:57:16.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jun 7 11:56:27 CEST 2009 - ro@suse.de + +- rename getline to my_getline to avoid conflict with function + from glibc + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gkrellm-getline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gkrellm.spec ++++++ --- /var/tmp/diff_new_pack.K14350/_old 2009-06-08 11:51:56.000000000 +0200 +++ /var/tmp/diff_new_pack.K14350/_new 2009-06-08 11:51:56.000000000 +0200 @@ -24,12 +24,13 @@ Group: System/Monitoring AutoReqProv: on Version: 2.3.2 -Release: 1 +Release: 2 Url: http://www.gkrellm.net Summary: Manages Multiple Stacked Monitors Source: %{name}-%{version}.tar.bz2 Source1: %name.desktop Patch0: %{name}-libsensors.patch +Patch1: gkrellm-getline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -80,6 +81,7 @@ %prep %setup -q %patch0 +%patch1 %build echo '#define HAVE_SSL 1' >> src/configure.h @@ -111,6 +113,9 @@ %doc /usr/share/man/man1/* %changelog +* Sun Jun 07 2009 ro@suse.de +- rename getline to my_getline to avoid conflict with function + from glibc * Mon Jan 19 2009 pgajdos@suse.cz - updated to 2.3.2: * Patch from Stefan Gehn: ++++++ gkrellm-getline.patch ++++++ --- server/main.c +++ server/main.c @@ -249,7 +249,7 @@ #if 0 static gint -getline(gint fd, gchar *buf, gint len) +my_getline(gint fd, gchar *buf, gint len) { fd_set read_fds; struct timeval tv; @@ -523,7 +523,7 @@ buf[err] = '\0'; else buf[0] = '\0'; - //getline(fd, buf, sizeof(buf)); + //my_getline(fd, buf, sizeof(buf)); if (_GK.verbose) g_print(_("connect string from client: %s\n"), buf); --- src/client.c +++ src/client.c @@ -1620,7 +1620,7 @@ static gint -getline(gint fd, gchar *buf, gint len) +my_getline(gint fd, gchar *buf, gint len) { fd_set read_fds; struct timeval tv; @@ -1714,7 +1714,7 @@ while (1) { - rs=getline(fd, buf, sizeof(buf)); + rs=my_getline(fd, buf, sizeof(buf)); if(rs<0) return FALSE; if (!strcmp(buf, "")) @@ -1732,7 +1732,7 @@ table_size = sizeof(update_table) / sizeof(KeyTable); while (1) { - rs=getline(fd, buf, sizeof(buf)); + rs=my_getline(fd, buf, sizeof(buf)); if(rs<0) return FALSE; if (!strcmp(buf, "")) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de