[csw-devel] SF.net SVN: gar:[14775] csw/mgar/pkg/gnome-base/orbit2/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14775
          http://gar.svn.sourceforge.net/gar/?rev=14775&view=rev
Author:   dmichelsen
Date:     2011-06-10 10:14:00 +0000 (Fri, 10 Jun 2011)

Log Message:
-----------
gnome-base/orbit2: Update to 2.14.19, enable tests, update to new defaults

Modified Paths:
--------------
    csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile
    csw/mgar/pkg/gnome-base/orbit2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gnome-base/orbit2/trunk/files/0001-Make-test-non-interactive-on-Solaris.patch

Modified: csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile	2011-06-10 09:29:52 UTC (rev 14774)
+++ csw/mgar/pkg/gnome-base/orbit2/trunk/Makefile	2011-06-10 10:14:00 UTC (rev 14775)
@@ -1,5 +1,5 @@
 NAME = ORBit2
-VERSION = 2.14.18
+VERSION = 2.14.19
 CATEGORIES = lib
 
 DESCRIPTION = ORBit 2.x CORBA tools and libs
@@ -9,33 +9,31 @@
 endef
 
 MASTER_SITES = $(GNOME_MIRROR)
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
+DISTFILES = $(DISTNAME).tar.bz2
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+PATCHFILES += 0001-Make-test-non-interactive-on-Solaris.patch
 
 PACKAGES = CSWorbit2
 CATALOGNAME = orbit2
 
-RUNTIME_DEP_PKGS = CSWggettextrt CSWglib2 CSWlibidl
+RUNTIME_DEP_PKGS += CSWlibintl8
+RUNTIME_DEP_PKGS += CSWglib2
+RUNTIME_DEP_PKGS += CSWlibidl
 
-SPKG_SOURCEURL = http://projects.gnome.org/ORBit2/
+# No package split yet
+CHECKPKG_OVERRIDES_CSWorbit2 += shared-lib-pkgname-mismatch
+CHECKPKG_OVERRIDES_CSWorbit2 += shared-lib-package-contains-so-symlink
 
+VENDOR_URL = http://projects.gnome.org/ORBit2/
+
 CPP = /usr/lib/cpp
 CXXCPP = /usr/lib/cpp
 EXTRA_COMMON_EXPORTS = CPP CXXCPP
 
-CONFIGURE_ARGS  = $(DIRPATHS)
 STRIP_LIBTOOL = 1
 
 BUILD64 = 1
-NOISAEXEC = 1
 
-# The test involves one manual step, skip for automatic building
-SKIPTEST ?= 1
-TEST_TARGET = check
-
 EXTRA_MERGE_INCLUDE_FILES  = $(libdir)/libname-server-2.a
 
-CHECKPKG_OVERRIDES_CSWorbit2 += soname-not-found|libm.so.2
-
 include gar/category.mk

Modified: csw/mgar/pkg/gnome-base/orbit2/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnome-base/orbit2/trunk/checksums	2011-06-10 09:29:52 UTC (rev 14774)
+++ csw/mgar/pkg/gnome-base/orbit2/trunk/checksums	2011-06-10 10:14:00 UTC (rev 14775)
@@ -1 +1 @@
-3e80596171b1ea652707219c7144ff53  ORBit2-2.14.18.tar.bz2
+7082d317a9573ab338302243082d10d1  ORBit2-2.14.19.tar.bz2

Added: csw/mgar/pkg/gnome-base/orbit2/trunk/files/0001-Make-test-non-interactive-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/gnome-base/orbit2/trunk/files/0001-Make-test-non-interactive-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/gnome-base/orbit2/trunk/files/0001-Make-test-non-interactive-on-Solaris.patch	2011-06-10 10:14:00 UTC (rev 14775)
@@ -0,0 +1,25 @@
+From eaf8384d63f9ed26ba2accc35748af9438ae8237 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 10 Jun 2011 11:41:51 +0200
+Subject: [PATCH] Make test non-interactive on Solaris
+
+---
+ test/timeout.sh |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/test/timeout.sh b/test/timeout.sh
+index 4f262e1..3856de8 100755
+--- a/test/timeout.sh
++++ b/test/timeout.sh
+@@ -24,6 +24,8 @@ MINGW*)
+ *)
+     echo Please kill timeout-server and/or lt-timeout-server from another window,
+     echo then type something here.
++    pkill -9 timeout-server
++    pkill -9 lt-timeout-server
+     wait $server
+     ;;
+ esac
+-- 
+1.7.5.4
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.