From 61256674be798f85782dfa554949a6d29f09c68e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 9 Aug 2012 09:19:02 +0200 Subject: [PATCH] gkrellm: update to 2.3.5. --- srcpkgs/gkrellm/gkrellm.rshlibs | 8 ----- .../patches/fix_getline_glibc_conflict.diff | 29 ------------------- srcpkgs/gkrellm/template | 17 ++++++----- 3 files changed, 10 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/gkrellm/patches/fix_getline_glibc_conflict.diff diff --git a/srcpkgs/gkrellm/gkrellm.rshlibs b/srcpkgs/gkrellm/gkrellm.rshlibs index a9e538b56f1..5ff58e88bba 100644 --- a/srcpkgs/gkrellm/gkrellm.rshlibs +++ b/srcpkgs/gkrellm/gkrellm.rshlibs @@ -1,18 +1,10 @@ libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 -libatk-1.0.so.0 -libgio-2.0.so.0 -libpangoft2-1.0.so.0 -libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 -libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 -librt.so.1 libglib-2.0.so.0 libSM.so.6 libICE.so.6 diff --git a/srcpkgs/gkrellm/patches/fix_getline_glibc_conflict.diff b/srcpkgs/gkrellm/patches/fix_getline_glibc_conflict.diff deleted file mode 100644 index 4fda0f52c12..00000000000 --- a/srcpkgs/gkrellm/patches/fix_getline_glibc_conflict.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- src/client.c.orig 2009-11-24 05:12:11.957336471 +0000 -+++ src/client.c 2009-11-24 05:12:29.289887242 +0000 -@@ -1620,7 +1620,7 @@ KeyTable update_table[] = - - - static gint --getline(gint fd, gchar *buf, gint len) -+get_line(gint fd, gchar *buf, gint len) - { - fd_set read_fds; - struct timeval tv; -@@ -1714,7 +1714,7 @@ read_server_setup(gint fd) - - while (1) - { -- rs=getline(fd, buf, sizeof(buf)); -+ rs=get_line(fd, buf, sizeof(buf)); - if(rs<0) - return FALSE; - if (!strcmp(buf, "")) -@@ -1732,7 +1732,7 @@ read_server_setup(gint fd) - table_size = sizeof(update_table) / sizeof(KeyTable); - while (1) - { -- rs=getline(fd, buf, sizeof(buf)); -+ rs=get_line(fd, buf, sizeof(buf)); - if(rs<0) - return FALSE; - if (!strcmp(buf, "")) diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template index 47ef6e387c2..5f593e427b3 100644 --- a/srcpkgs/gkrellm/template +++ b/srcpkgs/gkrellm/template @@ -1,15 +1,17 @@ # Template build file for 'gkrellm'. pkgname=gkrellm -version=2.3.2 -revision=3 -distfiles="http://members.dslextreme.com/users/billw/gkrellm/$pkgname-$version.tar.bz2" +version=2.3.5 +revision=1 build_style=gnu-makefile -make_install_args="INSTALLROOT=$XBPS_DESTDIR/$pkgname-$version/usr - MANDIR=$XBPS_DESTDIR/$pkgname-$version/usr/share/man/man1" -makedepends="pkg-config atk-devel glib-devel pango-devel gdk-pixbuf-devel cairo-devel libpng-devel freetype-devel fontconfig-devel libSM-devel libICE-devel openssl-devel libX11-devel gtk+-devel libsensors-devel" +make_build_args="PREFIX=/usr" +make_install_args="PREFIX=/usr" +makedepends="pkg-config openssl-devel gtk+-devel libsensors-devel" short_desc="GTK2 based system monitor" maintainer="Juan RP " -checksum=a102e681cbcc45f8cb225ca0a321b62772106d6f0bb372eaa026b5a2da840873 +homepage="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html" +license="GPL-2" +distfiles="http://members.dslextreme.com/users/billw/gkrellm/$pkgname-$version.tar.bz2" +checksum=702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b long_desc=" With a single process, GKrellM manages multiple stacked monitors and supports applying themes to match the monitors appearance to your window manager, @@ -33,3 +35,4 @@ long_desc=" * A different theme can be created with the GIMP. * And a lot more..." +LDFLAGS="-lgmodule-2.0"