sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

From: Julien ROZO <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (e36a12af1e400de395516bd86af4cb000d676e9d)
Date: Tue, 2 Jun 2009 15:23:02 -0500

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

kde4-apps/ktorrent4/DETAILS | 4 ++--
kde4-apps/ktorrent4/HISTORY | 3 +++
x11/gkrellm2/DEPENDS | 7 +------
x11/gkrellm2/HISTORY | 4 ++++
x11/gkrellm2/PRE_BUILD | 3 +++
x11/gkrellm2/glibc-2.10.1.patch | 30 ++++++++++++++++++++++++++++++
6 files changed, 43 insertions(+), 8 deletions(-)

New commits:
commit e36a12af1e400de395516bd86af4cb000d676e9d
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

gkrellm2: added PRE_BUILD and glibc-2.10.1.patch to fix compilation issue
with glibc 2.10.1
removed nvidia-settings from DEPENDS, it has been deprecated

commit b782e6ab352c33f6a44520c4e6556c010efa9991
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

ktorrent4: updated version to 3.2.2

diff --git a/kde4-apps/ktorrent4/DETAILS b/kde4-apps/ktorrent4/DETAILS
index a12f91e..886ea5d 100755
--- a/kde4-apps/ktorrent4/DETAILS
+++ b/kde4-apps/ktorrent4/DETAILS
@@ -1,6 +1,6 @@
SPELL=ktorrent4
- VERSION=3.2.1
-
SOURCE_HASH=sha512:0bbf2bc3bb1e2f7bd8a961a6d35fb0e596e933b219af6a31863cbcfaed9faf254062c688896a5e528e104a1f86896cf9f55275dfba8205f6c5f53487ad53dc5d
+ VERSION=3.2.2
+
SOURCE_HASH=sha512:1c8fe2b907c7ccc2903f0782cb59cf4fd19c7bbb13394b663d6fb5836fa60b6168aeaca312a31c57ef9d20c8f00b805e382c05775036ee61ef801902bb58527f
SOURCE=${SPELL//4}-${VERSION}.tar.bz2
# SOURCE_URL=$KDE_URL/stable/${VERSION}/src/extragear/$SOURCE
SOURCE_URL=http://ktorrent.org/downloads/$VERSION/$SOURCE
diff --git a/kde4-apps/ktorrent4/HISTORY b/kde4-apps/ktorrent4/HISTORY
index 1c18d5e..088aded 100644
--- a/kde4-apps/ktorrent4/HISTORY
+++ b/kde4-apps/ktorrent4/HISTORY
@@ -1,3 +1,6 @@
+2009-06-02 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 3.2.2
+
2009-04-06 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 3.2.1

diff --git a/x11/gkrellm2/DEPENDS b/x11/gkrellm2/DEPENDS
index bbe23c8..0d2a421 100755
--- a/x11/gkrellm2/DEPENDS
+++ b/x11/gkrellm2/DEPENDS
@@ -6,9 +6,4 @@ if [ "$DAEMON_ONLY" = "n" ] ; then
"without-ssl=yes" \
"for SSL support in the mail checker"
fi &&
-depends glib2 &&
-
-optional_depends nvidia-settings \
- "" \
- "" \
- "to monitor temperature for nvidia graphics cards"
+depends glib2
diff --git a/x11/gkrellm2/HISTORY b/x11/gkrellm2/HISTORY
index 2e1f2ac..9f0995b 100644
--- a/x11/gkrellm2/HISTORY
+++ b/x11/gkrellm2/HISTORY
@@ -1,3 +1,7 @@
+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
+
2009-05-16 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3.2

diff --git a/x11/gkrellm2/PRE_BUILD b/x11/gkrellm2/PRE_BUILD
new file mode 100755
index 0000000..16fab83
--- /dev/null
+++ b/x11/gkrellm2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/glibc-2.10.1.patch
diff --git a/x11/gkrellm2/glibc-2.10.1.patch b/x11/gkrellm2/glibc-2.10.1.patch
new file mode 100644
index 0000000..a6c8f19
--- /dev/null
+++ b/x11/gkrellm2/glibc-2.10.1.patch
@@ -0,0 +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
+@@ -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>"))

[SM-Commit] GIT changes to master grimoire by Julien ROZO (e36a12af1e400de395516bd86af4cb000d676e9d), Julien ROZO, 06/02/2009