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

[dmichelsen at users.sourceforge.net]

Revision: 16426
          http://gar.svn.sourceforge.net/gar/?rev=16426&view=rev
Author:   dmichelsen
Date:     2011-12-09 08:21:56 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
gnome-base/libbonobo2/trunk: Update to 2.32.1, complete rework

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

Added Paths:
-----------
    csw/mgar/pkg/gnome-base/libbonobo2/trunk/files/0001-Use-bash-on-test.patch

Modified: csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile	2011-12-09 08:21:47 UTC (rev 16425)
+++ csw/mgar/pkg/gnome-base/libbonobo2/trunk/Makefile	2011-12-09 08:21:56 UTC (rev 16426)
@@ -1,5 +1,5 @@
 NAME = libbonobo
-VERSION = 2.24.2
+VERSION = 2.32.1
 CATEGORIES = gnome
 
 DESCRIPTION = GNOME component and compound document system
@@ -8,45 +8,25 @@
 
 VENDOR_URL = http://live.gnome.org/Bonobo
 MASTER_SITES = $(GNOME_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.bz2
+DISTFILES  = $(DISTNAME).tar.bz2
 
-PACKAGES = CSWlibbonobo CSWlibbonobo2
-CATALOGNAME_CSWlibbonobo = libbonobo
-CATALOGNAME_CSWlibbonobo2 = libbonobo2
-SPKG_DESC_CSWlibbonobo = $(DESCRIPTION)
-SPKG_DESC_CSWlibbonobo2 = $(DESCRIPTION) - stub package for legacy
+PATCHFILES += 0001-Use-bash-on-test.patch
 
-RUNTIME_DEP_PKGS_CSWlibbonobo += CSWdbusglib
-RUNTIME_DEP_PKGS_CSWlibbonobo += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWlibbonobo += CSWglib2
-RUNTIME_DEP_PKGS_CSWlibbonobo += CSWlibdbus
-RUNTIME_DEP_PKGS_CSWlibbonobo += CSWlibxml2
-RUNTIME_DEP_PKGS_CSWlibbonobo += CSWorbit2
+# New glib2 is only available on Solaris 10
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
+PACKAGES += CSWlibbonobo2
+SPKG_DESC_CSWlibbonobo2 = GNOME component and compound document system
+RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibgio2-0-0
 
-# Create a empty libbonobo2 packaage just for legacy purpose
-RUNTIME_DEP_PKGS_CSWlibbonobo2 += CSWlibbonobo
-PKGFILES_CSWlibbonobo2 = no files
-ARCHALL_CSWlibbonobo2 = 1
-CHECKPKG_OVERRIDES_CSWlibbonobo2 += surplus-dependency|CSWlibbonobo
+BUILD64 = 1
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-#BUILD64 = 1
-
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-
-CONFIGURE_ARGS = $(DIRPATHS)
-
-# Tests fail for som unknown reason
-#TEST_TARGET = check
-TEST_TARGET =
-
-
 CPP = /usr/lib/cpp
 EXTRA_COMMON_EXPORTS += CPP
 CXXCPP = /usr/lib/cpp

Modified: csw/mgar/pkg/gnome-base/libbonobo2/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnome-base/libbonobo2/trunk/checksums	2011-12-09 08:21:47 UTC (rev 16425)
+++ csw/mgar/pkg/gnome-base/libbonobo2/trunk/checksums	2011-12-09 08:21:56 UTC (rev 16426)
@@ -1 +1 @@
-5c7c5ea9c2f78a3c1e9ff2f1e27ad751  libbonobo-2.24.2.tar.bz2
+27fa902d4fdf6762ee010e7053aaf77b  libbonobo-2.32.1.tar.bz2

Added: csw/mgar/pkg/gnome-base/libbonobo2/trunk/files/0001-Use-bash-on-test.patch
===================================================================
--- csw/mgar/pkg/gnome-base/libbonobo2/trunk/files/0001-Use-bash-on-test.patch	                        (rev 0)
+++ csw/mgar/pkg/gnome-base/libbonobo2/trunk/files/0001-Use-bash-on-test.patch	2011-12-09 08:21:56 UTC (rev 16426)
@@ -0,0 +1,22 @@
+From b151728acbb4c8eb10e6158554da5448b49817e5 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 8 Dec 2011 18:49:10 +0100
+Subject: [PATCH] Use bash on test
+
+---
+ tests/test-activation/test.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tests/test-activation/test.sh b/tests/test-activation/test.sh
+index 4d1cb45..8d91086 100755
+--- a/tests/test-activation/test.sh
++++ b/tests/test-activation/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # This is a generic script for firing up a server, waiting for it to write
+ # its stringified IOR to a file, then firing up a server
+-- 
+1.7.6.1
+

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