Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (ef82ec60eb8bb184607f1062dba92912483327c6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (ef82ec60eb8bb184607f1062dba92912483327c6)
  • Date: Sun, 17 Feb 2013 18:07:39 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

telephony/telepathy-farstream/DEPENDS | 10 ++++++++++
telephony/telepathy-farstream/DETAILS | 6 +++---
telephony/telepathy-farstream/HISTORY | 4 ++++
x11/gkrellm2/HISTORY | 3 +++
x11/gkrellm2/PRE_BUILD | 6 ++++++
x11/gkrellm2/gkrellm-2.3.5-autofs.patch | 10 ++++++++++
x11/gkrellm2/gkrellm-2.3.5-cifs.patch | 24 ++++++++++++++++++++++++
x11/gkrellm2/gkrellm-2.3.5-dso.patch | 32
++++++++++++++++++++++++++++++++
8 files changed, 92 insertions(+), 3 deletions(-)

New commits:
commit ef82ec60eb8bb184607f1062dba92912483327c6
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

gkrellm2: apply gentoo patches to build with newer glib2

commit 675bdc050661de4401a08a8784bb7e4bc0ae0ff1
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

telepathy-farstream: update to 0.6.0

diff --git a/telephony/telepathy-farstream/DEPENDS
b/telephony/telepathy-farstream/DEPENDS
index f44f854..2c10f68 100755
--- a/telephony/telepathy-farstream/DEPENDS
+++ b/telephony/telepathy-farstream/DEPENDS
@@ -1 +1,11 @@
depends farstream
+
+optional_depends gobject-introspection \
+ "--enable-introspection" \
+ "--disable-introspection" \
+ "Enable introspection for this build?" &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "Use gtk-doc to build documentation?"
diff --git a/telephony/telepathy-farstream/DETAILS
b/telephony/telepathy-farstream/DETAILS
index a374733..78beb1a 100755
--- a/telephony/telepathy-farstream/DETAILS
+++ b/telephony/telepathy-farstream/DETAILS
@@ -1,13 +1,13 @@
SPELL=telepathy-farstream
- VERSION=0.4.0
+ VERSION=0.6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
- WEB_SITE=http://telepathy.freedesktop.org
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$WEB_SITE/releases/$SPELL/$SOURCE
+ SOURCE_URL[0]=http://telepathy.freedesktop.org/releases/$SPELL/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
SOURCE_GPG=telepathy.gpg:$SOURCE.asc:UPSTREAM_KEY
SOURCE2_IGNORE=signature
+ WEB_SITE=http://telepathy.freedesktop.org
LICENSE[0]=GPL
ENTERED=20120405
SHORT="telepathy client library that uses farstream"
diff --git a/telephony/telepathy-farstream/HISTORY
b/telephony/telepathy-farstream/HISTORY
index d4242ed..b23abc5 100644
--- a/telephony/telepathy-farstream/HISTORY
+++ b/telephony/telepathy-farstream/HISTORY
@@ -1,3 +1,7 @@
+2013-02-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.6.0
+ * DEPENDS: added new optional depends
+
2012-04-05 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS, DEPENDS: spell created, version 0.4.0

diff --git a/x11/gkrellm2/HISTORY b/x11/gkrellm2/HISTORY
index 540c672..10b224b 100644
--- a/x11/gkrellm2/HISTORY
+++ b/x11/gkrellm2/HISTORY
@@ -1,3 +1,6 @@
+2013-02-17 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: apply gentoo patches to build with newer glib2
+
2010-10-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.3.5

diff --git a/x11/gkrellm2/PRE_BUILD b/x11/gkrellm2/PRE_BUILD
new file mode 100755
index 0000000..1195b2c
--- /dev/null
+++ b/x11/gkrellm2/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/gkrellm-2.3.5-autofs.patch &&
+patch -p1 < $SPELL_DIRECTORY/gkrellm-2.3.5-cifs.patch &&
+patch -p1 < $SPELL_DIRECTORY/gkrellm-2.3.5-dso.patch
diff --git a/x11/gkrellm2/gkrellm-2.3.5-autofs.patch
b/x11/gkrellm2/gkrellm-2.3.5-autofs.patch
new file mode 100644
index 0000000..cf36a98
--- /dev/null
+++ b/x11/gkrellm2/gkrellm-2.3.5-autofs.patch
@@ -0,0 +1,10 @@
+--- gkrellm-2.3.5.old/src/sysdeps/linux.c 2010-10-06 03:27:33.000000000
+1100
++++ gkrellm-2.3.5/src/sysdeps/linux.c 2011-11-24 02:07:30.926450485 +1100
+@@ -1439,6 +1439,7 @@
+ || !strcmp(type, "usbdevfs")
+ || !strcmp(type, "usbfs")
+ || !strcmp(type, "sysfs")
++ || !strcmp(type, "autofs")
+ )
+ continue;
+ /* Strip trailing / from the directory.
diff --git a/x11/gkrellm2/gkrellm-2.3.5-cifs.patch
b/x11/gkrellm2/gkrellm-2.3.5-cifs.patch
new file mode 100644
index 0000000..fa35ef6
--- /dev/null
+++ b/x11/gkrellm2/gkrellm-2.3.5-cifs.patch
@@ -0,0 +1,24 @@
+--- gkrellm-2.3.5.old/server/monitor.c 2010-10-06 03:46:59.000000000 +1100
++++ gkrellm-2.3.5/server/monitor.c 2011-11-24 02:01:30.871402778 +1100
+@@ -1329,7 +1329,8 @@
+ static gchar *remote_fs_types[] =
+ {
+ "nfs",
+- "smbfs"
++ "smbfs",
++ "cifs"
+ };
+
+ void
+--- gkrellm-2.3.5.old/src/fs.c 2010-09-15 02:25:51.000000000 +1000
++++ gkrellm-2.3.5/src/fs.c 2011-11-24 02:00:17.347088370 +1100
+@@ -163,7 +163,8 @@
+ static gchar *remote_fs_types[] =
+ {
+ "nfs",
+- "smbfs"
++ "smbfs",
++ "cifs"
+ };
+
+
diff --git a/x11/gkrellm2/gkrellm-2.3.5-dso.patch
b/x11/gkrellm2/gkrellm-2.3.5-dso.patch
new file mode 100644
index 0000000..3a24baa
--- /dev/null
+++ b/x11/gkrellm2/gkrellm-2.3.5-dso.patch
@@ -0,0 +1,32 @@
+From 2c839bf2703e99c3851b58695545fed90b6226fc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino AT gentoo.org>
+Date: Wed, 29 Aug 2012 22:28:47 -0400
+Subject: [PATCH] Explicitly link to libgmodule-2.0
+
+With >=gdk-pixbuf-2.24 and >=pango-1.30, libgmodule-2.0 is no longer
+provided by "pkg-config --libs gtk+-2.0 gthread-2.0", so link to it
+explicitly (as is already done in server/).
+
+Fixes build failure with gnu ld.gold in gkrellm-2.3.5.
+
+https://bugs.gentoo.org/show_bug.cgi?id=428532
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 6d482a7..19b0c29 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -69,7 +69,7 @@ STRIP ?= -s
+ GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h $(SHARED_PATH)/log.h
+
+ PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0`
+-PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
++PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gmodule-2.0 gthread-2.0`
+
+ FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE)
$(PTHREAD_INC)\
+ ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT
+--
+1.7.12
+



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (ef82ec60eb8bb184607f1062dba92912483327c6), Robin Cook, 02/17/2013

Archive powered by MHonArc 2.6.24.

Top of Page