SF.net SVN: gar:[22510] csw/mgar/pkg/transmission/trunk
guengel at users.sourceforge.net
guengel at users.sourceforge.net
Fri Nov 15 14:02:01 CET 2013
Revision: 22510
http://gar.svn.sourceforge.net/gar/?rev=22510&view=rev
Author: guengel
Date: 2013-11-15 13:02:00 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
transmission/trunk: Finishing touches.
Modified Paths:
--------------
csw/mgar/pkg/transmission/trunk/Makefile
csw/mgar/pkg/transmission/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/transmission/trunk/files/0003-utils-test.c-fix-test.patch
csw/mgar/pkg/transmission/trunk/files/CSWtransmission-gtk2.postinstall
csw/mgar/pkg/transmission/trunk/files/changelog.CSW
Removed Paths:
-------------
csw/mgar/pkg/transmission/trunk/files/0002-utils-test.c-fix-test.patch
Modified: csw/mgar/pkg/transmission/trunk/Makefile
===================================================================
--- csw/mgar/pkg/transmission/trunk/Makefile 2013-11-15 11:47:34 UTC (rev 22509)
+++ csw/mgar/pkg/transmission/trunk/Makefile 2013-11-15 13:02:00 UTC (rev 22510)
@@ -10,45 +10,60 @@
endef
MASTER_SITES = http://download.transmissionbt.com/files/
DISTFILES = $(NAME)-$(VERSION).tar.xz
+DISTFILES += CSWtransmission-gtk2.postinstall
+DISTFILES += changelog.CSW
+EXPANDVARS = CSWtransmission-gtk2.postinstall
+
+
# We define upstream file regex so we can be notifed of new upstream software release
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-utils-test.c-fix-test.patch
PATCHFILES += 0003-platform.c-remove-usr-local-share-and-add-opt-csw-sh.patch
PACKAGES = CSWtransmission
-PACKAGES += CSWtransmissiongtk2
+PACKAGES += CSWtransmission-gtk2
SPKG_DESC_CSWtransmission = Fast, easy, and free multi-platform BitTorrent client
-SPKG_DESC_CSWtransmissiongtk2 = Transmission BitTorrent client , gtk2 Interface
+SPKG_DESC_CSWtransmission-gtk2 = Transmission BitTorrent client , gtk2 Interface
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 = CSWcurlrt
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWdbusglib
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWfconfig
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWftype2
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWgtk2
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWglib2
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibatk
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibcairo
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibdbus
-RUNTIME_DEP_PKGS_CSWtransmissiongtk2 += CSWlibevent2-0-5
-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 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWtransmission += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWtransmission += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWtransmission += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWtransmission += CSWlibz1
+RUNTIME_DEP_PKGS_CSWtransmission += CSWlibevent2-0-5
+# I'm pulling CSWgtk2 in order to execute CSWgtk2.postinstall
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 = CSWgtk2
+CHECKPKG_OVERRIDES_CSWtransmission-gtk2 += surplus-dependency|CSWgtk2
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibgdk-pixbuf2-0-0
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibgdk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibgio2-0-0
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibgtk-x11-2-0-0
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibevent2-0-5
+# This is due to the `ld -z ignore' issue on sparc, remove once fixed
+RUNTIME_DEP_PKGS_CSWtransmission-gtk2 += CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWtransmission-gtk2 += surplus-dependency|CSWlibfreetype6
+# These are ok, /opt/csw/share has been added in front the list.
+CHECKPKG_OVERRIDES_CSWtransmission += file-with-bad-content|/usr/share|root/opt/csw/bin/transmission-cli
+CHECKPKG_OVERRIDES_CSWtransmission += file-with-bad-content|/usr/share|root/opt/csw/bin/transmission-remote
+CHECKPKG_OVERRIDES_CSWtransmission += file-with-bad-content|/usr/share|root/opt/csw/bin/transmission-edit
+CHECKPKG_OVERRIDES_CSWtransmission += file-with-bad-content|/usr/share|root/opt/csw/bin/transmission-create
+CHECKPKG_OVERRIDES_CSWtransmission += file-with-bad-content|/usr/share|root/opt/csw/bin/transmission-daemon
+CHECKPKG_OVERRIDES_CSWtransmission += file-with-bad-content|/usr/share|root/opt/csw/bin/transmission-show
+CHECKPKG_OVERRIDES_CSWtransmission-gtk2 += file-with-bad-content|/usr/share|root/opt/csw/bin/transmission-gtk
-RUNTIME_DEP_PKGS_CSWtransmission = CSWcurlrt
-RUNTIME_DEP_PKGS_CSWtransmission += CSWlibevent2-0-5
-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/transmission-cli
PKGFILES_CSWtransmission += /opt/csw/bin/transmission-create
@@ -59,6 +74,7 @@
PKGFILES_CSWtransmission += /opt/csw/share/locale/.*
PKGFILES_CSWtransmission += /opt/csw/share/man/.*
PKGFILES_CSWtransmission += /opt/csw/share/transmission/.*
+PKGFILES_CSWtransmission += $(docdir)/transmission/changelog.CSW
BUILD_DEP_PKGS += CSWlibcurl-dev
BUILD_DEP_PKGS += CSWlibgtk2-dev
@@ -66,12 +82,8 @@
BUILD_DEP_PKGS += CSWlibevent-dev
BUILD_DEP_PKGS += CSWintltool
-CATALOGNAME_CSWtransmission = transmission
-CATALOGNAME_CSWtransmissiongtk2 = transmission_gtk2
-
EXTRA_LINKER_FLAGS = -lintl -liconv
-
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-gtk
CONFIGURE_ARGS += --disable-silent-rules
Modified: csw/mgar/pkg/transmission/trunk/checksums
===================================================================
--- csw/mgar/pkg/transmission/trunk/checksums 2013-11-15 11:47:34 UTC (rev 22509)
+++ csw/mgar/pkg/transmission/trunk/checksums 2013-11-15 13:02:00 UTC (rev 22510)
@@ -1 +1 @@
-2ed5b7815ebda65223bac6bdb09dec42 transmission-2.61.tar.xz
+b50cc87b4cd77ba0cbda98b5568a4d07 transmission-2.52.tar.xz
Deleted: 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 2013-11-15 11:47:34 UTC (rev 22509)
+++ csw/mgar/pkg/transmission/trunk/files/0002-utils-test.c-fix-test.patch 2013-11-15 13:02:00 UTC (rev 22510)
@@ -1,25 +0,0 @@
-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
-
Added: csw/mgar/pkg/transmission/trunk/files/0003-utils-test.c-fix-test.patch
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/0003-utils-test.c-fix-test.patch (rev 0)
+++ csw/mgar/pkg/transmission/trunk/files/0003-utils-test.c-fix-test.patch 2013-11-15 13:02:00 UTC (rev 22510)
@@ -0,0 +1,29 @@
+From a5c877eb668a0b0334b535bcfacb59ec1075d698 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Fri, 15 Nov 2013 13:52:12 +0100
+Subject: [PATCH] utils-test.c: fix test
+
+---
+ libtransmission/utils-test.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libtransmission/utils-test.c b/libtransmission/utils-test.c
+index f163ce2..28be91f 100644
+--- a/libtransmission/utils-test.c
++++ b/libtransmission/utils-test.c
+@@ -451,7 +451,11 @@ test_truncd( void )
+ check( !strcmp( buf, "3" ) );
+
+ tr_snprintf( buf, sizeof( buf ), "%.2f", tr_truncd( nan, 2 ) );
+- check( strstr( buf, "nan" ) != NULL );
++#if defined(__sparc)
++ check( strstr( buf, "NaN" ) != NULL );
++#else
++ check( strstr( buf, "-NaN" ) != NULL );
++#endif
+
+ return 0;
+ }
+--
+1.8.4.1
+
Added: csw/mgar/pkg/transmission/trunk/files/CSWtransmission-gtk2.postinstall
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/CSWtransmission-gtk2.postinstall (rev 0)
+++ csw/mgar/pkg/transmission/trunk/files/CSWtransmission-gtk2.postinstall 2013-11-15 13:02:00 UTC (rev 22510)
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+umask 0022
+
+BIN=gtk-update-icon-cache
+
+if [ "${PKG_ROOT_DIR}" = "" ]
+then
+ PKG_ROOT_DIR=/
+fi
+
+if [ -z "${PKGINST}" ]
+then
+ PKGINST=CSWtransmission-gtk2
+fi
+
+echo "** Updating Icon cache"
+
+for i in ${PKG_ROOT_DIR}@datadir@/icons/*
+do
+ if [ -d "${i}" ]
+ then
+ /usr/bin/printf "- ${i}... "
+ /usr/sbin/chroot "${PKG_ROOT_DIR}" @bindir@/${BIN} ${i} >/dev/null 2>&1
+ if [ $? -ne 0 ]
+ then
+ echo "Error"
+ else
+ # Directories with no icons in them do not raise an error,
+ # so we have to check whether the file has been actually
+ # created.
+ if [ -f "${i}/icon-theme.cache" ]
+ then
+ /usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf ${PKGINST} ${i}/icon-theme.cache f 0644 root bin
+ fi
+ echo "OK"
+ fi
+ fi
+done
+
+/usr/sbin/chroot "${PKG_ROOT_DIR}" /usr/sbin/installf -f ${PKGINST}
+
+echo "** Done Updating Icon cache"
Added: csw/mgar/pkg/transmission/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/transmission/trunk/files/changelog.CSW (rev 0)
+++ csw/mgar/pkg/transmission/trunk/files/changelog.CSW 2013-11-15 13:02:00 UTC (rev 22510)
@@ -0,0 +1,5 @@
+transmission (2.52,REV=2013.11.15)
+
+ * Initial release.
+
+ -- Rafael Ostertag <raos at opencsw.org> Fri, 15 Nov 2013 13:28:23 +0100
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