SF.net SVN: gar:[22357] csw/mgar/pkg/libatk/trunk

[guengel at users.sourceforge.net]

Revision: 22357
          http://gar.svn.sourceforge.net/gar/?rev=22357&view=rev
Author:   guengel
Date:     2013-11-03 10:41:14 +0000 (Sun, 03 Nov 2013)
Log Message:
-----------
libatk/trunk: Merged branch libatk-2.8.0 after ok from dago.

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

Removed Paths:
-------------
    csw/mgar/pkg/libatk/trunk/files/0001-Comment-out-problematic-definition-of-AtkTextRange.patch

Property Changed:
----------------
    csw/mgar/pkg/libatk/trunk/


Property changes on: csw/mgar/pkg/libatk/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/libatk/branches/libatk-2.8.0:22355-22356

Modified: csw/mgar/pkg/libatk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libatk/trunk/Makefile	2013-11-03 10:36:32 UTC (rev 22356)
+++ csw/mgar/pkg/libatk/trunk/Makefile	2013-11-03 10:41:14 UTC (rev 22357)
@@ -1,7 +1,10 @@
 NAME = atk
-VERSION = 2.2.0
+VERSION = 2.8.0
 GARTYPE = v2
 
+GARCOMPILER = SOS12U3
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 DESCRIPTION = An accessibility toolkit for GNOME
 define BLURB
   Accessibility is enabling people with disabilities to participate in
@@ -14,27 +17,27 @@
 MASTER_SITES = $(GNOME_MIRROR)
 DISTFILES = $(DISTNAME).tar.xz
 
-PATCHFILES += 0001-Comment-out-problematic-definition-of-AtkTextRange.patch
-
 PACKAGES += CSWlibatk1-0-0
 SPKG_DESC_CSWlibatk1-0-0 = An accessibility toolkit for GNOME, libatk-1.0.so.0
 PKGFILES_CSWlibatk1-0-0 += $(call pkgfiles_lib,libatk-1.0.so.0)
 PKGFILES_CSWlibatk1-0-0 += $(sharedstatedir)/locale/.*
 RUNTIME_DEP_PKGS_CSWlibatk1-0-0 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibatk1-0-0 += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibatk1-0-0 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibatk1-0-0 += CSWlibglib2-0-0
 OBSOLETED_BY_CSWlibatk1-0-0 += CSWlibatk
 
 PACKAGES += CSWlibatk-dev
 SPKG_DESC_CSWlibatk-dev = Development files for libatk-1.0.so.0
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_CSWlibatk-dev += CSWlibatk1-0-0
-RUNTIME_DEP_PKGS_CSWlibatk-dev += CSWglib2devel
+RUNTIME_DEP_PKGS_CSWlibatk-dev += CSWlibglib2-dev
 OBSOLETED_BY_CSWlibatk-dev = CSWlibatkdevel
 CATALOGNAME_CSWlibatkdevel = libatk_devel_stub
 
 BUILD64_LIBS_ONLY = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --enable-debug=yes
+# Build fails when using introspection and SOS12U3 (not sure if it would succeed with gcc)
+CONFIGURE_ARGS += --enable-introspection=no
 
 include gar/category.mk

Modified: csw/mgar/pkg/libatk/trunk/checksums
===================================================================
--- csw/mgar/pkg/libatk/trunk/checksums	2013-11-03 10:36:32 UTC (rev 22356)
+++ csw/mgar/pkg/libatk/trunk/checksums	2013-11-03 10:41:14 UTC (rev 22357)
@@ -1 +1 @@
-377ab03f5a1c32141fd9dfa86c6a714a  atk-2.2.0.tar.xz
+c652bd25530825d604dae1c1ebd2da02  atk-2.8.0.tar.xz

Deleted: csw/mgar/pkg/libatk/trunk/files/0001-Comment-out-problematic-definition-of-AtkTextRange.patch
===================================================================
--- csw/mgar/pkg/libatk/trunk/files/0001-Comment-out-problematic-definition-of-AtkTextRange.patch	2013-11-03 10:36:32 UTC (rev 22356)
+++ csw/mgar/pkg/libatk/trunk/files/0001-Comment-out-problematic-definition-of-AtkTextRange.patch	2013-11-03 10:41:14 UTC (rev 22357)
@@ -1,25 +0,0 @@
-From f039874b42e63d070dc3e4f45b31aee7a9e013a4 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sun, 27 Nov 2011 13:59:33 +0100
-Subject: [PATCH] Comment out problematic definition of AtkTextRange
-
----
- atk/atktext.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/atk/atktext.c b/atk/atktext.c
-index a1e90de..638f4e6 100755
---- a/atk/atktext.c
-+++ b/atk/atktext.c
-@@ -1429,6 +1429,7 @@ atk_text_range_free (AtkTextRange *range)
-   g_free (range->content);
-   g_free (range);
- }
--
-+/*
- G_DEFINE_BOXED_TYPE (AtkTextRange, atk_text_range, atk_text_range_copy,
-                      atk_text_range_free)
-+*/
--- 
-1.7.6.1
-

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