[csw-devel] SF.net SVN: gar:[11067] csw/mgar/pkg/transmission/trunk
janholzh at users.sourceforge.net
janholzh at users.sourceforge.net
Tue Sep 28 15:04:40 CEST 2010
Revision: 11067
http://gar.svn.sourceforge.net/gar/?rev=11067&view=rev
Author: janholzh
Date: 2010-09-28 13:04:39 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
transmission: Update to 2.0.4 remove ccsw x11 stuff fix build
Modified Paths:
--------------
csw/mgar/pkg/transmission/trunk/Makefile
csw/mgar/pkg/transmission/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/transmission/trunk/files/0002-add-setenv-patch.patch
Removed Paths:
-------------
csw/mgar/pkg/transmission/trunk/files/linker-include.patch
Modified: csw/mgar/pkg/transmission/trunk/Makefile
===================================================================
--- csw/mgar/pkg/transmission/trunk/Makefile 2010-09-28 12:26:03 UTC (rev 11066)
+++ csw/mgar/pkg/transmission/trunk/Makefile 2010-09-28 13:04:39 UTC (rev 11067)
@@ -1,5 +1,5 @@
GARNAME = transmission
-GARVERSION = 1.93
+GARVERSION = 2.04
CATEGORIES = net
DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client
@@ -8,7 +8,7 @@
MASTER_SITES = http://mirrors.m0k.org/transmission/files/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
PATCHFILES = icons-makefile.patch
-#PATCHFILES += linker-include.patch
+PATCHFILES += 0002-add-setenv-patch.patch
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2
@@ -29,21 +29,24 @@
RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibcairo
RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibdbus
RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibevent
-#RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibxext
RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWosslrt
RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWpango
RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWzlib
RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWdbus
RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWgconf2
+RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWiconv
+
RUNTIME_DEP_PKGS_CSWtransmission = CSWcurlrt
RUNTIME_DEP_PKGS_CSWtransmission += CSWlibevent
RUNTIME_DEP_PKGS_CSWtransmission += CSWggettextrt
RUNTIME_DEP_PKGS_CSWtransmission += CSWosslrt
RUNTIME_DEP_PKGS_CSWtransmission += CSWzlib
+RUNTIME_DEP_PKGS_CSWtransmission += CSWiconv
+
RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWtransmission
PKGFILES_CSWtransmission = /opt/csw/bin/transmissioncli
@@ -56,14 +59,16 @@
CATALOGNAME_CSWtransmissiongtk2 = transmission_gtk2
-EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv
+#EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv
+EXTRA_CFLAGS = -DNO_SYS_QUEUE_H
+EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv
-EXTRA_INC = /opt/csw/X11/include
-EXTRA_LIB = /opt/csw/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+#EXTRA_INC = /opt/csw/X11/include
+#EXTRA_LIB = /opt/csw/X11/lib
+#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk --disable-silent-rules
-STRIP_LIBTOOL = 1
+#STRIP_LIBTOOL = 1
TEST_TARGET = check
CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += surplus-dependency|CSWtransmission
Modified: csw/mgar/pkg/transmission/trunk/checksums
===================================================================
--- csw/mgar/pkg/transmission/trunk/checksums 2010-09-28 12:26:03 UTC (rev 11066)
+++ csw/mgar/pkg/transmission/trunk/checksums 2010-09-28 13:04:39 UTC (rev 11067)
@@ -1,2 +1 @@
-cbdb5cfaf24b68727042c3828b252534 icons-makefile.patch
-f68358d03e46bec5704bbaa894990152 transmission-1.93.tar.bz2
+84fe15eb7e000fdc369def513299358b transmission-2.04.tar.bz2
Added: csw/mgar/pkg/transmission/trunk/files/0002-add-setenv-patch.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/0002-add-setenv-patch.patch (rev 0)
+++ csw/mgar/pkg/transmission/trunk/files/0002-add-setenv-patch.patch 2010-09-28 13:04:39 UTC (rev 11067)
@@ -0,0 +1,42 @@
+From 4164824ced3e17247d15bfeca890d127fc313d24 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Tue, 28 Sep 2010 13:57:15 +0200
+Subject: [PATCH] add setenv patch
+
+---
+ libtransmission/torrent.c | 18 ++++++++++++++++++
+ ltmain.sh | 2 +-
+ 2 files changed, 19 insertions(+), 1 deletions(-)
+
+diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
+index ba9fc83..f6d45de 100644
+--- a/libtransmission/torrent.c
++++ b/libtransmission/torrent.c
+@@ -47,6 +47,24 @@
+ #include "verify.h"
+ #include "version.h"
+
++#ifdef __sun
++void setenv(char *n, char *v, int x) {
++ char buf[256];
++ snprintf(buf,sizeof(buf),"%s=%s",n,v);
++ putenv(buf);
++}
++
++void unsetenv(char *env_name) {
++ extern char **environ;
++ char **cc;
++ int l;
++ l=strlen(env_name);
++ for (cc=environ;*cc!=NULL;cc++) {
++ if (strncmp(env_name,*cc,l)==0 && ((*cc)[l]=='='||(*cc)[l]=='\0')) break;
++ } for (; *cc != NULL; cc++) *cc=cc[1];
++}
++#endif
++
+ /***
+ ****
+ ***/
+--
+1.7.3
+
Deleted: csw/mgar/pkg/transmission/trunk/files/linker-include.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/linker-include.patch 2010-09-28 12:26:03 UTC (rev 11066)
+++ csw/mgar/pkg/transmission/trunk/files/linker-include.patch 2010-09-28 13:04:39 UTC (rev 11067)
@@ -1,25 +0,0 @@
-From 84469352eccf90852d7d58241516619ad1545272 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at build8s.(none)>
-Date: Wed, 6 Jan 2010 15:28:43 +0100
-Subject: [PATCH] describe your change
-
----
- gtk/Makefile.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gtk/Makefile.in b/gtk/Makefile.in
-index 81b4e46..0c145b8 100644
---- a/gtk/Makefile.in
-+++ b/gtk/Makefile.in
-@@ -88,7 +88,7 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
- am__v_lt_0 = --silent
- transmission_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(transmission_LDFLAGS) $(LDFLAGS) -o $@
-+ $(transmission_LDFLAGS) $(LDFLAGS) /usr/openwin/lib/libXext.so -o $@
- DEFAULT_INCLUDES = -I. at am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
---
-1.6.6
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list