[csw-devel] SF.net SVN: gar:[14772] csw/mgar/pkg/pango/branches

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Jun 9 21:07:57 CEST 2011


Revision: 14772
          http://gar.svn.sourceforge.net/gar/?rev=14772&view=rev
Author:   dmichelsen
Date:     2011-06-09 19:07:57 +0000 (Thu, 09 Jun 2011)

Log Message:
-----------
pango: Add old branch pango-x11-reloaded for reference

Modified Paths:
--------------
    csw/mgar/pkg/pango/branches/pango-x11-reloaded/Makefile
    csw/mgar/pkg/pango/branches/pango-x11-reloaded/checksums

Added Paths:
-----------
    csw/mgar/pkg/pango/branches/pango-x11-reloaded/
    csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0001-Do-not-use-fno.-options.patch
    csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0002-Use-inttypes.h-instead-of-stdint.h.patch

Modified: csw/mgar/pkg/pango/branches/pango-x11-reloaded/Makefile
===================================================================
--- csw/mgar/pkg/pango/trunk/Makefile	2010-05-06 02:02:22 UTC (rev 9822)
+++ csw/mgar/pkg/pango/branches/pango-x11-reloaded/Makefile	2011-06-09 19:07:57 UTC (rev 14772)
@@ -1,5 +1,5 @@
 GARNAME = libpango
-GARVERSION = 1.24.5
+GARVERSION = 1.28.0
 CATEGORIES = lib
 
 DESCRIPTION = A framework for the layout and rendering of international text
@@ -10,24 +10,41 @@
   languages.
 endef
 
-MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/1.24/
+GNOME_PROJ = pango
+MASTER_SITES = $(GNOME_MIRROR)
 DISTNAME = pango-$(GARVERSION)
 DISTFILES = $(DISTNAME).tar.bz2
 DISTFILES += CSWpango.postinstall
 
+PATCHFILES  = 0001-Do-not-use-fno.-options.patch
+PATCHFILES += 0002-Use-inttypes.h-instead-of-stdint.h.patch
+
+# 1.26.0:
+# pango/opentype/hb-common.h includes stdint.h (missing on Solaris 8,
+# correctly detected during autoconf, instead of sys/int_types.h)
+
 PACKAGES = CSWpango CSWpangodevel CSWpangodoc
-CATALOGNAME_CSWpango      = libpango
-CATALOGNAME_CSWpangodevel = libpango_devel
-CATALOGNAME_CSWpangodoc   = libpango_doc
+# PACKAGES += CSWcxpango CSWcxpangodevel
 
-BUILD_DEP_PKGS = CSWgtk-doc CSWlibxslt CSWglib2devel CSWlibxft2devel
+CATALOGNAME_CSWpango        = libpango
+CATALOGNAME_CSWpangodevel   = libpango_devel
+CATALOGNAME_CSWpangodoc     = libpango_doc
+CATALOGNAME_CSWcxpango      = cx_libpango
+CATALOGNAME_CSWcxpangodevel = cx_libpango_devel
+
+BUILD_DEP_PKGS = CSWgtk-doc CSWlibxslt CSWglib2devel
 RUNTIME_DEP_PKGS_CSWpango  = CSWggettextrt CSWglib2 CSWfconfig CSWftype2
-RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender CSWlibx11
+RUNTIME_DEP_PKGS_CSWpango += CSWlibcairo CSWlibxft2 CSWlibxrender
 RUNTIME_DEP_PKGS_CSWpangodevel = CSWpango
+RUNTIME_DEP_PKGS_CSWcxpango  = CSWggettextrt CSWglib2 CSWfconfig CSWftype2
+RUNTIME_DEP_PKGS_CSWcxpango += CSWcxlibcairo CSWlibxft2 CSWlibxrender CSWlibx11
+RUNTIME_DEP_PKGS_CSWcxpangodevel = CSWcxpango
 
 SPKG_DESC_CSWpango = Pango, a framework for the layout and rendering of international text
 SPKG_DESC_CSWpangodevel = Pango Developer Files
 SPKG_DESC_CSWpangodoc = Pango Documentation
+SPKG_DESC_CSWcxpango = Pango, a framework for the layout and rendering of international text (bound against OpenCSW X11)
+SPKG_DESC_CSWcxpangodevel = Pango Developer Files (bound against OpenCSW X11)
 
 SPKG_SOURCEURL = http://www.pango.org/
 
@@ -35,26 +52,55 @@
 UPSTREAM_MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/pango/
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
-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))
-EXTRA_SOS_LD_OPTIONS = -R$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+EXTRA_MODULATORS = X11
+MODULATIONS_X11 = sunwx11 cswx11
 
+# We need xrenderproto only
+EXTRA_INC_sunwx11 = $(prefix)/X11/include
+
+EXTRA_INC_cswx11 = $(prefix)/X11/include $(prefix)/include
+EXTRA_LIB_cswx11 = $(prefix)/lib
+EXTRA_PKG_CONFIG_DIRS_cswx11 = $(prefix)/lib
+
+EXTRA_INC = $(EXTRA_INC_$(X11))
+EXTRA_LIB = $(EXTRA_LIB_$(X11))
+PKG_CONFIG_DIRS = $(PKG_CONFIG_DIRS_$(X11))
+
+prefix_cswx11 = $(BUILD_PREFIX)/X11
+prefix = $(or $(prefix_$(X11)),$(BUILD_PREFIX))
+
+sysconfdir = $(abspath $(prefix)/etc/$(MM_LIBDIR))
+
+STRIP_LIBTOOL = 1
+
 BUILD64 = 1
 NOISALIST = 1
 ISAEXEC_EXCLUDE_FILES = $(bindir)/pango-querymodules
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-x --enable-gtk-doc
-CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+
+CONFIGURE_ARGS_sunwx11  = --x-include=/usr/openwin/include
+CONFIGURE_ARGS_sunwx11 += --x-libraries=$(abspath /usr/openwin/lib/$(MM_LIBDIR))
+CONFIGURE_ARGS_cswx11  = --x-include=$(prefix)/X11/include
+CONFIGURE_ARGS_cswx11 += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(X11))
+
 # CONFIGURE_ARGS += --with-included-modules 
 
-STRIP_LIBTOOL = 1
+MERGE_SCRIPTS_isa-default-x11-sunwx11 = copy-all
+MERGE_SCRIPTS_isa-default64-x11-sunwx11 = copy-relocated-only
+MERGE_DIRS_isa-default64-x11-sunwx11 = $(libdir)
+MERGE_SCRIPTS_isa-default-x11-cswx11 = copy-only
+MERGE_DIRS_isa-default-x11-cswx11 = $(libdir) $(includedir)
+MERGE_SCRIPTS_isa-default64-x11-cswx11 = copy-relocated-only
+MERGE_DIRS_isa-default64-x11-cswx11 = $(libdir)
 
 # Dynamic prototype
 PKGFILES_CSWpangodevel  = $(PKGFILES_DEVEL)
 PKGFILES_CSWpangodoc    = $(sharedstatedir)/gtk-doc/.*
+PKGFILES_CSWcxlibpango     = $(call baseisadirs,/opt/csw/X11/lib,[^/]*\.so(\.\d+)*)
+PKGFILES_CSWcxlibpangodevel = $(call baseisadirs,/opt/csw/X11/lib,pkgconfig(/.*)?)
+PKGFILES_CSWcxlibpangodevel += /opt/csw/X11/include/.*
 
 ARCHALL_CSWpangodoc = 1
 
@@ -63,15 +109,4 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = .*/preload\.1\.gz
 
-sysconfdir_isa-sparcv9 = $(prefix)/etc/64
-sysconfdir_isa-sparcv8 = $(prefix)/etc
-sysconfdir_isa-i386    = $(prefix)/etc
-sysconfdir_global      = $(prefix)/etc
-sysconfdir_isa-amd64   = $(prefix)/etc/64
-sysconfdir         = $(sysconfdir_$(MODULATION))
-
 include gar/category.mk
-
-post-merge:
-	mkdir -p $(PKGROOT)$(sysconfdir)/64/pango
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/pango/branches/pango-x11-reloaded/checksums
===================================================================
--- csw/mgar/pkg/pango/trunk/checksums	2010-05-06 02:02:22 UTC (rev 9822)
+++ csw/mgar/pkg/pango/branches/pango-x11-reloaded/checksums	2011-06-09 19:07:57 UTC (rev 14772)
@@ -1,2 +1,4 @@
-236547eb782b42500d0d743f25340599  download/CSWpango.postinstall
-815416a452e9cccc172fed9862401f37  download/pango-1.24.5.tar.bz2
+0d271c3e260126c315003d6019734736  0001-Do-not-use-fno.-options.patch
+8e1db1634a431b0b2dd1657b46b7e8de  0002-Use-inttypes.h-instead-of-stdint.h.patch
+236547eb782b42500d0d743f25340599  CSWpango.postinstall
+545ae8becf7ed74008120f96f4b095f4  pango-1.28.0.tar.bz2

Added: csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0001-Do-not-use-fno.-options.patch
===================================================================
--- csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0001-Do-not-use-fno.-options.patch	                        (rev 0)
+++ csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0001-Do-not-use-fno.-options.patch	2011-06-09 19:07:57 UTC (rev 14772)
@@ -0,0 +1,25 @@
+From 3ca0493a5604435a8eabb6bd3c655fd7f4181f12 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 6 May 2010 14:35:40 +0200
+Subject: [PATCH 1/2] Do not use -fno... options
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 22cef9c..47664d6 100755
+--- a/configure
++++ b/configure
+@@ -6115,7 +6115,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.0
+

Added: csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0002-Use-inttypes.h-instead-of-stdint.h.patch
===================================================================
--- csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0002-Use-inttypes.h-instead-of-stdint.h.patch	                        (rev 0)
+++ csw/mgar/pkg/pango/branches/pango-x11-reloaded/files/0002-Use-inttypes.h-instead-of-stdint.h.patch	2011-06-09 19:07:57 UTC (rev 14772)
@@ -0,0 +1,25 @@
+From 0f13862a85468b38292c93eb3ecd4c840318d7c4 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 6 May 2010 14:36:00 +0200
+Subject: [PATCH 2/2] Use inttypes.h instead of stdint.h
+
+---
+ pango/opentype/hb-common.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/pango/opentype/hb-common.h b/pango/opentype/hb-common.h
+index 11f64ed..cfee546 100644
+--- a/pango/opentype/hb-common.h
++++ b/pango/opentype/hb-common.h
+@@ -27,7 +27,7 @@
+ #ifndef HB_COMMON_H
+ #define HB_COMMON_H
+ 
+-#include <stdint.h>
++#include <inttypes.h>
+ 
+ # ifdef __cplusplus
+ #  define HB_BEGIN_DECLS	extern "C" {
+-- 
+1.7.0
+


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