[SM-Commit] GIT changes to master grimoire by Julien ROZO (e3153c9bcea06700d845fe75e99b427a3d1052d3)

Julien ROZO scm at sourcemage.org
Tue Jul 21 06:46:33 EDT 2009


GIT changes to master grimoire by Julien ROZO <julien at rozo.org>:

 x11/gkrellm2/HISTORY            |    4 ++++
 x11/gkrellm2/PRE_BUILD          |    4 +++-
 x11/gkrellm2/glibc-2.10.1.patch |   40 ++++++++++++++++++++--------------------
 3 files changed, 27 insertions(+), 21 deletions(-)

New commits:
commit e3153c9bcea06700d845fe75e99b427a3d1052d3
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    gkrellm2: patch is only applied via PRE_BUILD if client is requested
    fixed tabs in glibc-2.10.1.patch, don't know why it was no longer applying

diff --git a/x11/gkrellm2/HISTORY b/x11/gkrellm2/HISTORY
index 9f0995b..a8235a7 100644
--- a/x11/gkrellm2/HISTORY
+++ b/x11/gkrellm2/HISTORY
@@ -1,3 +1,7 @@
+2009-07-21 Julien "_kaze_" ROZO <julien at rozo.org>
+	* PRE_BUILD: patch is only applied if client is requested
+	* glibc-2.10.1.patch: fixed tabs, don't know why it was no longer applying
+
 2009-06-02 Julien "_kaze_" ROZO <julien at rozo.org>
 	* PRE_BUILD, glibc-2.10.1.patch: added, fix compilation issue with glibc 2.10.1
 	* DEPENDS: removed nvidia-settings, it has been deprecated
diff --git a/x11/gkrellm2/PRE_BUILD b/x11/gkrellm2/PRE_BUILD
index 16fab83..13acbd2 100755
--- a/x11/gkrellm2/PRE_BUILD
+++ b/x11/gkrellm2/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
+if [ "$DAEMON_ONLY" = "n" ] ; then
+    patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
+fi
diff --git a/x11/gkrellm2/glibc-2.10.1.patch b/x11/gkrellm2/glibc-2.10.1.patch
index a6c8f19..b86a094 100644
--- a/x11/gkrellm2/glibc-2.10.1.patch
+++ b/x11/gkrellm2/glibc-2.10.1.patch
@@ -1,30 +1,30 @@
-diff -Naur gkrellm-2.3.2.orig/src/client.c gkrellm-2.3.2/src/client.c  
---- gkrellm-2.3.2.orig/src/client.c     2008-10-04 02:33:37.000000000 +0200
-+++ gkrellm-2.3.2/src/client.c  2009-06-02 22:02:47.000000000 +0200
+diff -Naur gkrellm-2.3.2.orig/src/client.c gkrellm-2.3.2/src/client.c
+--- gkrellm-2.3.2.orig/src/client.c	2008-10-04 02:33:37.000000000 +0200
++++ gkrellm-2.3.2/src/client.c	2009-07-21 10:03:07.000000000 +0200
 @@ -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;
+ 	{
+ 	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));
+ 
+ 	while (1)
+ 		{
+-		rs=getline(fd, buf, sizeof(buf));
++		rs=getline_(fd, buf, sizeof(buf));
          if(rs<0)
              return FALSE;
-                if (!strcmp(buf, "</gkrellmd_setup>"))
+ 		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));
+ 	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>"))
+ 		if (!strcmp(buf, "</initial_update>"))



More information about the SM-Commit mailing list