SF.net SVN: gar:[22509] csw/mgar/pkg/transmission/trunk

guengel at users.sourceforge.net guengel at users.sourceforge.net
Fri Nov 15 12:47:34 CET 2013


Revision: 22509
          http://gar.svn.sourceforge.net/gar/?rev=22509&view=rev
Author:   guengel
Date:     2013-11-15 11:47:34 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
transmission/trunk: Bumped to version 2.52; anything newer requires gtk3.

Modified Paths:
--------------
    csw/mgar/pkg/transmission/trunk/Makefile
    csw/mgar/pkg/transmission/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/transmission/trunk/files/0001-minupnpc.c-add-missing-preproc-test.patch
    csw/mgar/pkg/transmission/trunk/files/0002-utils-test.c-fix-test.patch
    csw/mgar/pkg/transmission/trunk/files/0003-platform.c-remove-usr-local-share-and-add-opt-csw-sh.patch

Removed Paths:
-------------
    csw/mgar/pkg/transmission/trunk/files/0001-fix-include-and-test.patch
    csw/mgar/pkg/transmission/trunk/files/0003-fix-usr-share.patch
    csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch

Modified: csw/mgar/pkg/transmission/trunk/Makefile
===================================================================
--- csw/mgar/pkg/transmission/trunk/Makefile	2013-11-14 17:26:31 UTC (rev 22508)
+++ csw/mgar/pkg/transmission/trunk/Makefile	2013-11-15 11:47:34 UTC (rev 22509)
@@ -1,19 +1,23 @@
 NAME = transmission
-VERSION = 2.20
+# Can't get newer version, as long as we lack GTK3+
+VERSION = 2.52
 GARTYPE = v2
 
+GARCOMPILER = GNU
+
 DESCRIPTION = Fast, easy, and free multi-platform BitTorrent client
 define BLURB
 endef
 MASTER_SITES = http://download.transmissionbt.com/files/
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
-PATCHFILES = icons-makefile.patch
-PATCHFILES += 0001-fix-include-and-test.patch
-PATCHFILES += 0003-fix-usr-share.patch
+DISTFILES  = $(NAME)-$(VERSION).tar.xz
 
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = -(\d+(?:\.\d+)*).tar.bz2
+UFILES_REGEX = -(\d+(?:\.\d+)*).tar.xz
 
+PATCHFILES += 0001-minupnpc.c-add-missing-preproc-test.patch
+PATCHFILES += 0002-utils-test.c-fix-test.patch
+PATCHFILES += 0003-platform.c-remove-usr-local-share-and-add-opt-csw-sh.patch
+
 PACKAGES  = CSWtransmission
 PACKAGES += CSWtransmissiongtk2
 SPKG_DESC_CSWtransmission = Fast, easy, and free multi-platform BitTorrent client
@@ -44,10 +48,6 @@
 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/transmission-cli
@@ -60,25 +60,24 @@
 PKGFILES_CSWtransmission  += /opt/csw/share/man/.*
 PKGFILES_CSWtransmission  += /opt/csw/share/transmission/.*
 
+BUILD_DEP_PKGS += CSWlibcurl-dev
+BUILD_DEP_PKGS += CSWlibgtk2-dev
+BUILD_DEP_PKGS += CSWlibssl-dev
+BUILD_DEP_PKGS += CSWlibevent-dev
+BUILD_DEP_PKGS += CSWintltool
+
 CATALOGNAME_CSWtransmission = transmission
 CATALOGNAME_CSWtransmissiongtk2 = transmission_gtk2
 
+EXTRA_LINKER_FLAGS = -lintl -liconv
 
-#EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lresolv 
-EXTRA_CFLAGS = -DNO_SYS_QUEUE_H -lintl
-EXTRA_LD_OPTIONS = -L/opt/csw/lib -liconv -lrt
 
-#EXTRA_INC = /opt/csw/X11/include
-#EXTRA_LIB = /opt/csw/X11/lib 
-#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-gtk
+CONFIGURE_ARGS += --disable-silent-rules
+CONFIGURE_ARGS += --disable-static
+CONFIGURE_ARGS += --enable-cli
+CONFIGURE_ARGS += --enable-daemon
 
-CONFIGURE_ARGS = $(DIRPATHS) --enable-gtk --disable-silent-rules
-STRIP_LIBTOOL = 1
-
-CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += surplus-dependency|CSWtransmission
-CHECKPKG_OVERRIDES_CSWtransmissiongtk2 += surplus-dependency|CSWdbus
-
-
-
 include gar/category.mk
 PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/transmission/trunk/checksums
===================================================================
--- csw/mgar/pkg/transmission/trunk/checksums	2013-11-14 17:26:31 UTC (rev 22508)
+++ csw/mgar/pkg/transmission/trunk/checksums	2013-11-15 11:47:34 UTC (rev 22509)
@@ -1 +1 @@
-5d847ed43c551d81d24e07a3516342af  transmission-2.20.tar.bz2
+2ed5b7815ebda65223bac6bdb09dec42  transmission-2.61.tar.xz

Deleted: csw/mgar/pkg/transmission/trunk/files/0001-fix-include-and-test.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/0001-fix-include-and-test.patch	2013-11-14 17:26:31 UTC (rev 22508)
+++ csw/mgar/pkg/transmission/trunk/files/0001-fix-include-and-test.patch	2013-11-15 11:47:34 UTC (rev 22509)
@@ -1,40 +0,0 @@
-From 5d84f8d5861bfa677b24d154b089765ecef0a1d6 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at opencsw.org>
-Date: Fri, 28 Jan 2011 12:37:47 +0100
-Subject: [PATCH] fix-include-and-test
-
----
- libtransmission/torrent.c    |    1 +
- libtransmission/utils-test.c |    4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
-index 9cef3c5..516a64f 100644
---- a/libtransmission/torrent.c
-+++ b/libtransmission/torrent.c
-@@ -21,6 +21,7 @@
- #include <math.h>
- #include <stdarg.h>
- #include <string.h> /* memcmp */
-+#include <signal.h> 
- #include <stdlib.h> /* qsort */
- 
- #include <event2/util.h> /* evutil_vsnprintf() */
-diff --git a/libtransmission/utils-test.c b/libtransmission/utils-test.c
-index 34bc1cf..59467ea 100644
---- a/libtransmission/utils-test.c
-+++ b/libtransmission/utils-test.c
-@@ -400,8 +400,8 @@ test_truncd( void )
-     tr_snprintf( buf, sizeof( buf ), "%.0f", tr_truncd( 3.3333, 0 ) );
-     check( !strcmp( buf, "3" ) );
- 
--    tr_snprintf( buf, sizeof( buf ), "%.2f", tr_truncd( nan, 2 ) );
--    check( strstr( buf, "nan" ) != NULL );
-+    /*tr_snprintf( buf, sizeof( buf ), "%.2f", tr_truncd( nan, 2 ) );*/
-+    /* check( strstr( buf, "nan" ) != NULL ); */
- 
-     return 0;
- }
--- 
-1.7.3.2
-

Added: csw/mgar/pkg/transmission/trunk/files/0001-minupnpc.c-add-missing-preproc-test.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/0001-minupnpc.c-add-missing-preproc-test.patch	                        (rev 0)
+++ csw/mgar/pkg/transmission/trunk/files/0001-minupnpc.c-add-missing-preproc-test.patch	2013-11-15 11:47:34 UTC (rev 22509)
@@ -0,0 +1,25 @@
+From f4f66f9f5ed8f2cd6c0f7a8ac11f1d29834ea2c5 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 15 Nov 2013 12:12:14 +0100
+Subject: [PATCH] minupnpc.c: add missing preproc test
+
+---
+ third-party/miniupnp/miniupnpc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third-party/miniupnp/miniupnpc.c b/third-party/miniupnp/miniupnpc.c
+index e56790a..1585ab9 100644
+--- a/third-party/miniupnp/miniupnpc.c
++++ b/third-party/miniupnp/miniupnpc.c
+@@ -17,7 +17,7 @@
+ #endif
+ #endif
+ 
+-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32)
++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__sun)
+ #define HAS_IP_MREQN
+ #endif
+ 
+-- 
+1.8.4.1
+

Added: csw/mgar/pkg/transmission/trunk/files/0002-utils-test.c-fix-test.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/0002-utils-test.c-fix-test.patch	                        (rev 0)
+++ csw/mgar/pkg/transmission/trunk/files/0002-utils-test.c-fix-test.patch	2013-11-15 11:47:34 UTC (rev 22509)
@@ -0,0 +1,25 @@
+From 4cb6186435e2c207e02f84c52f3dc82c60de3fc9 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 15 Nov 2013 12:27:53 +0100
+Subject: [PATCH] utils-test.c: fix test
+
+---
+ libtransmission/utils-test.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtransmission/utils-test.c b/libtransmission/utils-test.c
+index f163ce2..9248560 100644
+--- a/libtransmission/utils-test.c
++++ b/libtransmission/utils-test.c
+@@ -451,7 +451,7 @@ test_truncd( void )
+     check( !strcmp( buf, "3" ) );
+ 
+     tr_snprintf( buf, sizeof( buf ), "%.2f", tr_truncd( nan, 2 ) );
+-    check( strstr( buf, "nan" ) != NULL );
++    check( strstr( buf, "-NaN" ) != NULL );
+ 
+     return 0;
+ }
+-- 
+1.8.4.1
+

Deleted: csw/mgar/pkg/transmission/trunk/files/0003-fix-usr-share.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/0003-fix-usr-share.patch	2013-11-14 17:26:31 UTC (rev 22508)
+++ csw/mgar/pkg/transmission/trunk/files/0003-fix-usr-share.patch	2013-11-15 11:47:34 UTC (rev 22509)
@@ -1,25 +0,0 @@
-From dd67c49e650fa2ba33eb8e168a3be51d662c53a9 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at opencsw.org>
-Date: Mon, 7 Feb 2011 16:05:00 +0100
-Subject: [PATCH] fix-usr-share
-
----
- libtransmission/platform.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libtransmission/platform.c b/libtransmission/platform.c
-index fb3a7fd..1073936 100644
---- a/libtransmission/platform.c
-+++ b/libtransmission/platform.c
-@@ -650,7 +650,7 @@ tr_getWebClientDir( const tr_session * session UNUSED )
-             {
-                 const char * pkg = PACKAGE_DATA_DIR;
-                 const char * xdg = getenv( "XDG_DATA_DIRS" );
--                const char * fallback = "/usr/local/share:/usr/share";
-+                const char * fallback = "/opt/csw/share";
-                 char * buf = tr_strdup_printf( "%s:%s:%s", (pkg?pkg:""), (xdg?xdg:""), fallback );
-                 tmp = buf;
-                 while( tmp && *tmp ) {
--- 
-1.7.3.2
-

Added: csw/mgar/pkg/transmission/trunk/files/0003-platform.c-remove-usr-local-share-and-add-opt-csw-sh.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/0003-platform.c-remove-usr-local-share-and-add-opt-csw-sh.patch	                        (rev 0)
+++ csw/mgar/pkg/transmission/trunk/files/0003-platform.c-remove-usr-local-share-and-add-opt-csw-sh.patch	2013-11-15 11:47:34 UTC (rev 22509)
@@ -0,0 +1,25 @@
+From f410b1e71286a8d26b96d29739f25790b4e93146 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <rafi at guengel.ch>
+Date: Fri, 15 Nov 2013 12:34:18 +0100
+Subject: [PATCH] platform.c: remove /usr/local/share and add /opt/csw/share
+
+---
+ libtransmission/platform.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtransmission/platform.c b/libtransmission/platform.c
+index b5101f3..8a0aae6 100644
+--- a/libtransmission/platform.c
++++ b/libtransmission/platform.c
+@@ -646,7 +646,7 @@ tr_getWebClientDir( const tr_session * session UNUSED )
+             {
+                 const char * pkg = PACKAGE_DATA_DIR;
+                 const char * xdg = getenv( "XDG_DATA_DIRS" );
+-                const char * fallback = "/usr/local/share:/usr/share";
++                const char * fallback = "/opt/csw/share:/usr/share";
+                 char * buf = tr_strdup_printf( "%s:%s:%s", (pkg?pkg:""), (xdg?xdg:""), fallback );
+                 tmp = buf;
+                 while( tmp && *tmp ) {
+-- 
+1.8.4.1
+

Deleted: csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch	2013-11-14 17:26:31 UTC (rev 22508)
+++ csw/mgar/pkg/transmission/trunk/files/icons-makefile.patch	2013-11-15 11:47:34 UTC (rev 22509)
@@ -1,39 +0,0 @@
-From 450c6c8c49e7992fbca39d4cf5f3920b62540e75 Mon Sep 17 00:00:00 2001
-From: Jan Holzhueter <jh at build8s.(none)>
-Date: Wed, 6 Jan 2010 14:26:25 +0100
-Subject: [PATCH] describe your change
-
----
- gtk/icons/Makefile.in |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/gtk/icons/Makefile.in b/gtk/icons/Makefile.in
-index 879e4e3..3c7c529 100644
---- a/gtk/icons/Makefile.in
-+++ b/gtk/icons/Makefile.in
-@@ -474,14 +474,14 @@ install-icons:
- 		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
- 		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
- 	done; \
--	for icon in $(private_icons); do \
--		THEME=`echo $$icon | cut -d_ -f1`; \
--		CONTEXT=`echo $$icon | cut -d_ -f2`; \
--		SIZE=`echo $$icon | cut -d_ -f3`; \
--		ICONFILE=`echo $$icon | cut -d_ -f4`; \
--		mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
--		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
--	done
-+#	for icon in $(private_icons); do \
-+#		THEME=`echo $$icon | cut -d_ -f1`; \
-+#		CONTEXT=`echo $$icon | cut -d_ -f2`; \
-+#		SIZE=`echo $$icon | cut -d_ -f3`; \
-+#		ICONFILE=`echo $$icon | cut -d_ -f4`; \
-+#		mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
-+#		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
-+#	done
- 
- uninstall-icons:
- 	-for icon in $(public_icons); do \
--- 
-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