SF.net SVN: gar:[22415] csw/mgar/pkg/pango/branches/pango-1.34

guengel at users.sourceforge.net guengel at users.sourceforge.net
Wed Nov 6 11:01:16 CET 2013 

Revision: 22415
          http://gar.svn.sourceforge.net/gar/?rev=22415&view=rev
Author:   guengel
Date:     2013-11-06 10:01:15 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
Shared libraries go now into separate packages. Renamed pangodoc and pangodevel.

Modified Paths:
--------------
    csw/mgar/pkg/pango/branches/pango-1.34/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/pango/branches/pango-1.34/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch
    csw/mgar/pkg/pango/branches/pango-1.34/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch

Modified: csw/mgar/pkg/pango/branches/pango-1.34/Makefile
===================================================================
--- csw/mgar/pkg/pango/branches/pango-1.34/Makefile	2013-11-05 21:55:04 UTC (rev 22414)
+++ csw/mgar/pkg/pango/branches/pango-1.34/Makefile	2013-11-06 10:01:15 UTC (rev 22415)
@@ -3,7 +3,7 @@
 GARTYPE = v2
 GARCOMPILER = SOS12U3
 
-DESCRIPTION = A framework for the layout and rendering of international text
+DESCRIPTION = Framework for the layout and rendering of international text
 define BLURB
   The goal of the Pango project is to provide an Open Source framework for the
   layout and rendering of internationalized text. It uses Unicode for all of its
@@ -20,9 +20,8 @@
 VENDOR_URL = http://www.pango.org/
 
 PACKAGES += CSWpango
-CATALOGNAME_CSWpango = libpango
-CHECKPKG_OVERRIDES_CSWpango += catalogname-does-not-match-pkgname|pkgname=CSWpango|catalogname=libpango|expected-catalogname=pango
-SPKG_DESC_CSWpango = Pango, a framework for the layout and rendering of international text
+SPKG_DESC_CSWpango = Pango, $(DESCRIPTION)
+# Catch all
 RUNTIME_DEP_PKGS_CSWpango += CSWlibxft2
 RUNTIME_DEP_PKGS_CSWpango += CSWlibxrender
 RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo2
@@ -32,89 +31,81 @@
 RUNTIME_DEP_PKGS_CSWpango += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWpango += CSWlibfontconfig1
 RUNTIME_DEP_PKGS_CSWpango += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWpango += CSWlibpango1-0-0
+RUNTIME_DEP_PKGS_CSWpango += CSWlibpangocairo1-0-0
+RUNTIME_DEP_PKGS_CSWpango += CSWlibpangoft21-0-0
+RUNTIME_DEP_PKGS_CSWpango += CSWlibpangoxft1-0-0
 
-# No split for now as it is unclear how the plugins depend on each one
-CHECKPKG_OVERRIDES_CSWpango += shared-lib-pkgname-mismatch
+PACKAGES += CSWlibpango1-0-0
+SPKG_DESC_CSWlibpango1-0-0 = $(DESCRIPTION), libpango-1.0.so.0
+PKGFILES_CSWlibpango1-0-0 = $(call pkgfiles_lib,libpango-1.0.so.0)
 
-#RUNTIME_DEP_PKGS_CSWpango += CSWlibpango1-0-0
-#RUNTIME_DEP_PKGS_CSWpango += CSWlibpangocairo-1-0-0
-#RUNTIME_DEP_PKGS_CSWpango += CSWlibpangoft2-1-0-0
-#RUNTIME_DEP_PKGS_CSWpango += CSWlibpangox1-0-0
-#RUNTIME_DEP_PKGS_CSWpango += CSWlibpangoxft1-0-0
+PACKAGES += CSWlibpangocairo1-0-0
+SPKG_DESC_CSWlibpangocairo1-0-0 = Cairo bindings for Pango, libpangocairo-1.0.so.0
+PKGFILES_CSWlibpangocairo1-0-0 = $(call pkgfiles_lib,libpangocairo-1.0.so.0)
 
-#PACKAGES += CSWlibpango1-0-0
-#SPKG_DESC_CSWlibpango1-0-0 = Pango, a framework for the layout and rendering of international text, libpango-1.0.so.0
-#PKGFILES_CSWlibpango1-0-0 = $(call pkgfiles_lib,libpango-1.0.so.0)
-#
-#PACKAGES += CSWlibpangocairo-1-0-0
-#SPKG_DESC_CSWlibpangocairo-1-0-0 = Cairo bindings for Pango, libpangocairo-1.0.so.0
-#PKGFILES_CSWlibpangocairo1-0-0 = $(call pkgfiles_lib,libpangocairo-1.0.so.0)
-#
-#PACKAGES += CSWlibpangoft2-1-0-0
-#SPKG_DESC_CSWlibpangoft2-1-0-0 = Freetype bindings for Pango, libpangoft2-1.0.so.0
-#PKGFILES_CSWlibpangoft2-1-0-0 = $(call pkgfiles_lib,libpangoft2-1.0.so.0)
-#
+PACKAGES += CSWlibpangoft21-0-0
+SPKG_DESC_CSWlibpangoft21-0-0 = Freetype bindings for Pango, libpangoft2-1.0.so.0
+PKGFILES_CSWlibpangoft21-0-0 = $(call pkgfiles_lib,libpangoft2-1.0.so.0)
+
+# I wonder where this has gone...
 #PACKAGES += CSWlibpangox1-0-0
 #SPKG_DESC_CSWlibpangox1-0-0 = X11 bindings for Pango, libpangox-1.0.so.0
 #PKGFILES_CSWlibpangox1-0-0 = $(call pkgfiles_lib,libpangox-1.0.so.0)
-#
-#PACKAGES += CSWlibpangoxft1-0-0
-#SPKG_DESC_CSWlibpangoxft1-0-0 = XFT bindings for Pango, libpangoxft-1.0.so.0
-#PKGFILES_CSWlibpangoxft1-0-0 = $(call pkgfiles_lib,libpangoxft-1.0.so.0)
 
-PACKAGES += CSWpangodevel
-CATALOGNAME_CSWpangodevel = libpango_devel
-CHECKPKG_OVERRIDES_CSWpangodevel += catalogname-does-not-match-pkgname|pkgname=CSWpangodevel|catalogname=libpango_devel|expected-catalogname=pangodevel
-SPKG_DESC_CSWpangodevel = Developer files for libpango-1.0.so.0 and assorted libs
-PKGFILES_CSWpangodevel = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWpangodevel += CSWpango
-RUNTIME_DEP_PKGS_CSWpangodevel += CSWlibcairo-dev
-#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpango1-0-0
-#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangocairo-1-0-0
-#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangoft2-1-0-0
-#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangox1-0-0
-#RUNTIME_DEP_PKGS_CSWpango-dev += CSWlibpangoxft1-0-0
+PACKAGES += CSWlibpangoxft1-0-0
+SPKG_DESC_CSWlibpangoxft1-0-0 = XFT bindings for Pango, libpangoxft-1.0.so.0
+PKGFILES_CSWlibpangoxft1-0-0 = $(call pkgfiles_lib,libpangoxft-1.0.so.0)
 
-PACKAGES += CSWpangodoc
-# This is a legacy name
-CATALOGNAME_CSWpangodoc = libpango_doc
-CHECKPKG_OVERRIDES_CSWpangodoc += catalogname-does-not-match-pkgname|pkgname=CSWpangodoc|catalogname=libpango_doc|expected-catalogname=pangodoc
-SPKG_DESC_CSWpangodoc = Documentation for Pango
-PKGFILES_CSWpangodoc = $(sharedstatedir)/gtk-doc/.*
-ARCHALL_CSWpangodoc = 1
+PACKAGES += CSWlibpango-dev
+OBSOLETED_BY_CSWlibpango-dev += CSWpangodevel
+CATALOGNAME_CSWpangodevel = libpangodevel_stub
+SPKG_DESC_CSWlibpango-dev = Developer files for libpango-1.0.so.0 and assorted libs
+PKGFILES_CSWlibpango-dev = $(PKGFILES_DEVEL)
+# CSWpango pulls in all libraries
+RUNTIME_DEP_PKGS_CSWlibpango-dev += CSWpango
+RUNTIME_DEP_PKGS_CSWlibpango-dev += CSWlibcairo-dev
 
+PACKAGES += CSWpango-doc
+ARCHALL_CSWpango-doc = 1
+OBSOLETED_BY_CSWpango-doc += CSWpangodoc
+CATALOGNAME_CSWpangodoc += libpango_doc_stub
+SPKG_DESC_CSWpango-doc = Documentation for Pango
+PKGFILES_CSWpango-doc = $(sharedstatedir)/gtk-doc/.*
+
+
 BUILD_DEP_PKGS += CSWggettext-dev
 BUILD_DEP_PKGS += CSWgtk-doc
 BUILD_DEP_PKGS += CSWlibxslt
 BUILD_DEP_PKGS += CSWglib2devel
-# BUILD_DEP_PKGS += CSWlibxft2devel
+BUILD_DEP_PKGS += CSWlibharfbuzz-dev
+BUILD_DEP_PKGS += CSWlibxft2devel
 BUILD_DEP_PKGS += CSWvim # for generating docs
 
 BUILD64 = 1
 
+# check.defs fails, and I'dont care too much about it.
+#
+# So, employing a custom test script only performing tests in tests
+TEST_SCRIPTS = custom
+
 sysconfdir-suffix-64 = /64
 sysconfdir = /etc/opt/csw$(sysconfdir-suffix-$(MEMORYMODEL))
 
 # EXTRA_ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --with-x --enable-gtk-doc
-# CONFIGURE_ARGS += --with-included-modules 
+CONFIGURE_ARGS += --enable-gtk-doc
+CONFIGURE_ARGS += --with-xft
+CONFIGURE_ARGS += --disable-static
 
 STRIP_LIBTOOL = 1
 
-# Lots of compiler-specific tests failing (Sun Studio?)
-SKIPTEST ?= 1
-
-EXTRA_MERGE_EXCLUDE_FILES = .*/preload\.1\.gz
-
 include gar/category.mk
 
-post-extract-modulated:
-	-perl -pi \
-		-e 's,#!/bin/sh,#!/bin/bash,' \
-		$(WORKSRC)/pango/check.defs
+test-custom:
+	cd $(WORKSRC)/tests && env $(BUILD_ENV) $(MAKE) check
 	@$(MAKECOOKIE)
 
 post-merge:
-	mkdir -p $(PKGROOT)$(sysconfdir)/64/pango
+	[ -d $(PKGROOT)$(sysconfdir)/pango ] || mkdir -p $(PKGROOT)$(sysconfdir)/pango
 	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/pango/branches/pango-1.34/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch
===================================================================
--- csw/mgar/pkg/pango/branches/pango-1.34/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch	2013-11-05 21:55:04 UTC (rev 22414)
+++ csw/mgar/pkg/pango/branches/pango-1.34/files/0001-Do-not-use-gcc-specific-flags-unconditionally.patch	2013-11-06 10:01:15 UTC (rev 22415)
@@ -1,25 +0,0 @@
-From 8ef6a7aa023c4be33134fc8f022b3e82b3af5ef5 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 9 Jun 2011 20:30:13 +0200
-Subject: [PATCH 1/2] Do not use gcc-specific flags unconditionally
-
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index d3e10de..4504459 100755
---- a/configure
-+++ b/configure
-@@ -5627,7 +5627,7 @@ done
- 
- 
- # Make sure we don't link to libstdc++ (needs de-gcc-fication)
--CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
-+#CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
- 
- 
- #
--- 
-1.7.5.4
-

Deleted: csw/mgar/pkg/pango/branches/pango-1.34/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch
===================================================================
--- csw/mgar/pkg/pango/branches/pango-1.34/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch	2013-11-05 21:55:04 UTC (rev 22414)
+++ csw/mgar/pkg/pango/branches/pango-1.34/files/0002-Use-inttypes.h-when-stdint.h-is-not-available.patch	2013-11-06 10:01:15 UTC (rev 22415)
@@ -1,29 +0,0 @@
-From 24496b0da2cd09bc62723e33231cad80105e3a0c Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 9 Jun 2011 20:30:55 +0200
-Subject: [PATCH 2/2] Use inttypes.h when stdint.h is not available
-
----
- pango/opentype/hb-common.h |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/pango/opentype/hb-common.h b/pango/opentype/hb-common.h
-index 11f64ed..a6be6ba 100644
---- a/pango/opentype/hb-common.h
-+++ b/pango/opentype/hb-common.h
-@@ -27,7 +27,11 @@
- #ifndef HB_COMMON_H
- #define HB_COMMON_H
- 
--#include <stdint.h>
-+# ifdef HAVE_STDINT_H
-+#  include <stdint.h>
-+# else ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+# endif
- 
- # ifdef __cplusplus
- #  define HB_BEGIN_DECLS	extern "C" {
--- 
-1.7.5.4
-

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