Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=adcd9c23b74cfc02edee6bf2bdd3b4d26c15a739

commit adcd9c23b74cfc02edee6bf2bdd3b4d26c15a739
Author: Priyank <priy...@frugalware.org>
Date:   Wed Jun 24 01:06:19 2009 +0530

gkrellm-2.3.2-3-i686

* Rebuild with gtk+2-2.16.2-2
* Added a patch to fix compilation errors
* Closes #3827

diff --git a/source/xapps-extra/gkrellm/FrugalBuild 
b/source/xapps-extra/gkrellm/FrugalBuild
index e111418..3d3ae35 100644
--- a/source/xapps-extra/gkrellm/FrugalBuild
+++ b/source/xapps-extra/gkrellm/FrugalBuild
@@ -4,20 +4,23 @@

pkgname=gkrellm
pkgver=2.3.2
-pkgrel=2
+pkgrel=3
pkgdesc="GKrellM is a single process stack of system monitors"
url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html";
-depends=('gtk+2' 'openssl')
+depends=('gtk+2>=2.16.2-2' 'openssl')
groups=('xapps-extra')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump 
'http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html'|grep 
.tar.bz2$|sed -n 's/.*lm-\(.*\).t.*/\1/;1 p'"
-source=(http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0')
+source=(http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2
 \
+       compilation_fix.diff)
+sha1sums=('fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0' \
+          'b119701bf211a5495c030e9509716beb93210f0f')

build()
{
-        Fmake
-        make INSTALLROOT=$Fdestdir/$Fprefix install || Fdie
+       Fpatchall
+       Fmake
+       make INSTALLROOT=$Fdestdir/$Fprefix install || Fdie
}

# optimization OK
diff --git a/source/xapps-extra/gkrellm/compilation_fix.diff 
b/source/xapps-extra/gkrellm/compilation_fix.diff
new file mode 100644
index 0000000..62c5ba5
--- /dev/null
+++ b/source/xapps-extra/gkrellm/compilation_fix.diff
@@ -0,0 +1,30 @@
+diff -Naur gkrellm-2.3.2/src/client.c gkrellm-2.3.2.new/src/client.c
+--- gkrellm-2.3.2/src/client.c 2008-10-04 06:03:37.000000000 +0530
++++ gkrellm-2.3.2.new/src/client.c     2009-06-24 01:02:02.000000000 +0530
+@@ -1620,7 +1620,7 @@
+
+
+ static gint
+-getline(gint fd, gchar *buf, gint len)
++_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=_getline(fd, buf, sizeof(buf));
+         if(rs<0)
+             return FALSE;
+               if (!strcmp(buf, "</gkrellmd_setup>"))
+@@ -1732,7 +1732,7 @@
+       table_size = sizeof(update_table) / sizeof(KeyTable);
+       while (1)
+               {
+-              rs=getline(fd, buf, sizeof(buf));
++              rs=_getline(fd, buf, sizeof(buf));
+         if(rs<0)
+             return FALSE;
+               if (!strcmp(buf, "</initial_update>"))
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to