[csw-devel] SF.net SVN: gar:[17154] csw/mgar/pkg/gobject-introspection/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Feb 23 16:50:44 CET 2012
Revision: 17154
http://gar.svn.sourceforge.net/gar/?rev=17154&view=rev
Author: dmichelsen
Date: 2012-02-23 15:50:44 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
gobject-introspection/trunk: Update to 0.10.8, rework packages, still does not compile
Modified Paths:
--------------
csw/mgar/pkg/gobject-introspection/trunk/Makefile
csw/mgar/pkg/gobject-introspection/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/gobject-introspection/trunk/files/0001-Use-named-union.patch
Modified: csw/mgar/pkg/gobject-introspection/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-02-23 15:18:05 UTC (rev 17153)
+++ csw/mgar/pkg/gobject-introspection/trunk/Makefile 2012-02-23 15:50:44 UTC (rev 17154)
@@ -1,5 +1,5 @@
NAME = gobject-introspection
-VERSION = 0.6.7
+VERSION = 0.10.8
CATEGORIES = gnome
GARTYPE = v2
@@ -13,111 +13,40 @@
MASTER_SITES = $(GNOME_MIRROR)
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-PACKAGES = CSWgobjintrospect CSWgobjintrospectdev
-CATALOGNAME_CSWgobjintrospect = gobj_introspect
-CATALOGNAME_CSWgobjintrospectdev = gobj_introspect_dev
+PATCHFILES += 0001-Use-named-union.patch
-SPKG_DESC_CSWgobjintrospect = $(DESCRIPTION)
-SPKG_DESC_CSWgobjintrospectdev = $(DESCRIPTION) - developer package
+VENDOR_URL = http://live.gnome.org/GObjectIntrospection
-PKGFILES_CSWgobjintrospectdev = $(PKGFILES_DEVEL)
+PACKAGING_PLATFORMS = solaris10-sparc soalris10-i386
-ARCHALL_CSWgobjintrospectdoc = 1
+BUILD_DEP_PKGS += CSWbison
+BUILD_DEP_PKGS += CSWlibffi-dev
+BUILD_DEP_PKGS += CSWgtk-doc
-BUILD_DEP_PKGS += CSWbison CSWlibffi
+# PACKAGES = CSWgobjintrospect
+# CATALOGNAME_CSWgobjintrospect = gobj_introspect
+# SPKG_DESC_CSWgobjintrospect = $(DESCRIPTION)
+# RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWggettextrt
+# RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWglib2
+# RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWlibffi
+# RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWpython
-RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWglib2
-RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWlibffi
-RUNTIME_DEP_PKGS_CSWgobjintrospect += CSWpython
-RUNTIME_DEP_PKGS_CSWgobjintrospectdev += CSWgobjintrospect
+# PACKAGES += CSWgobjintrospectdev
+# CATALOGNAME_CSWgobjintrospectdev = gobj_introspect_dev
+# SPKG_DESC_CSWgobjintrospectdev = $(DESCRIPTION) - developer package
+# PKGFILES_CSWgobjintrospectdev = $(PKGFILES_DEVEL)
+# RUNTIME_DEP_PKGS_CSWgobjintrospectdev += CSWgobjintrospect
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/__init__.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/annotationparser.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/ast.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/cachestore.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/config.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/dumper.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girparser.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/girwriter.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibast.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibast.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibtransformer.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/glibtransformer.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/libtoolimporter.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/minixpath.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/minixpath.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/odict.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/scannermain.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/shlibs.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/sourcescanner.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/transformer.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/utils.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyc
-CHECKPKG_OVERRIDES_CSWgobjintrospect += discouraged-path-in-pkgmap|/opt/csw/lib/gobject-introspection/giscanner/xmlwriter.pyo
-CHECKPKG_OVERRIDES_CSWgobjintrospectdev += surplus-dependency|CSWgobjintrospect
-
-PATCHFILES += gobject-introspection-01-ginvoke.diff
-PATCHFILES += gobject-introspection-02-glib-compilation.diff
-PATCHFILES += gobject-introspection-03-ginfo.diff
-PATCHFILES += gobject-introspection-04-big-ending.diff
-PATCHFILES += sunstudio.patch
-
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
-
-SPKG_SOURCEURL = http://live.gnome.org/GObjectIntrospection
-
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-
-#NOISAEXEC = 1
# Python isn't 64-bit yet
#BUILD64 = 1
+PYCOMPILE = 1
+
BUILD_OVERRIDE_VARS = V
BUILD_OVERRIDE_VARS_V = 1
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
CONFIGURE_ARGS += --disable-silent-rules
CONFIGURE_ARGS += --enable-gtk-doc
-#SHELL = /opt/csw/bin/bash
-
-CONFIGURE_ARGS = $(DIRPATHS)
-
-TEST_TARGET = check
-
include gar/category.mk
-
-pre-configure-modulated:
- ( cd $(WORKSRC); \
- rm -f m4/lt~obsolete.m4 ; \
- rm -f m4/ltoptions.m4 ; \
- rm -f m4/libtool.m4 ; \
- rm -f m4/ltsugar.m4 ; \
- rm -f m4/ltversion.m4 ; \
- libtoolize --copy --force ; \
- aclocal -I m4 ; \
- autoheader ; \
- automake -a -c -f ; \
- autoconf ; \
- )
- $(MAKECOOKIE)
Modified: csw/mgar/pkg/gobject-introspection/trunk/checksums
===================================================================
--- csw/mgar/pkg/gobject-introspection/trunk/checksums 2012-02-23 15:18:05 UTC (rev 17153)
+++ csw/mgar/pkg/gobject-introspection/trunk/checksums 2012-02-23 15:50:44 UTC (rev 17154)
@@ -1,6 +1 @@
-41205c14cbd86632806578448e29bd30 gobject-introspection-0.6.7.tar.bz2
-948f52dc7a6649f6e83a7b5bb4f905e8 gobject-introspection-01-ginvoke.diff
-e09b30913029fffced1d9dc6f96e6a2e gobject-introspection-02-glib-compilation.diff
-aa7aa32091d3c7a4cddbf78abe20d5d1 gobject-introspection-03-ginfo.diff
-ab2070d09322745c666f303da35c837f gobject-introspection-04-big-ending.diff
-924f1a75b7190abbf49183b1081448cd sunstudio.patch
+b5da58a5327d13b4d1e08b8e42b2456d gobject-introspection-0.10.8.tar.bz2
Added: csw/mgar/pkg/gobject-introspection/trunk/files/0001-Use-named-union.patch
===================================================================
--- csw/mgar/pkg/gobject-introspection/trunk/files/0001-Use-named-union.patch (rev 0)
+++ csw/mgar/pkg/gobject-introspection/trunk/files/0001-Use-named-union.patch 2012-02-23 15:50:44 UTC (rev 17154)
@@ -0,0 +1,159 @@
+From 166f665729d0fd3c13bd8527822e5e829c15995d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 23 Feb 2012 16:27:32 +0100
+Subject: [PATCH] Use named union
+
+---
+ girepository/cmph/chd.c | 2 +-
+ girepository/cmph/chd_ph.c | 38 +++++++++++++++++++-------------------
+ 2 files changed, 20 insertions(+), 20 deletions(-)
+
+diff --git a/girepository/cmph/chd.c b/girepository/cmph/chd.c
+index 7fb3b8b..70ce8d8 100644
+--- a/girepository/cmph/chd.c
++++ b/girepository/cmph/chd.c
+@@ -203,7 +203,7 @@ int chd_dump(cmph_t *mphf, FILE *fd)
+ nbytes = fwrite(&data->packed_chd_phf_size, sizeof(cmph_uint32), (size_t)1, fd);
+ nbytes = fwrite(data->packed_chd_phf, data->packed_chd_phf_size, (size_t)1, fd);
+
+- DEBUGP("Dumping compressed rank structure with %u bytes to disk\n", buflen);
++ DEBUGP("Dumping compressed rank structure with %u bytes to disk\n", data->packed_cr_size);
+ nbytes = fwrite(&data->packed_cr_size, sizeof(cmph_uint32), (size_t)1, fd);
+ nbytes = fwrite(data->packed_cr, data->packed_cr_size, (size_t)1, fd);
+
+diff --git a/girepository/cmph/chd_ph.c b/girepository/cmph/chd_ph.c
+index 71f83fb..5b7ab1d 100644
+--- a/girepository/cmph/chd_ph.c
++++ b/girepository/cmph/chd_ph.c
+@@ -46,7 +46,7 @@ struct _chd_ph_bucket_t
+ {
+ cmph_uint32 size;
+ cmph_uint32 bucket_id;
+- };
++ } u;
+ };
+
+ typedef struct _chd_ph_bucket_t chd_ph_bucket_t;
+@@ -75,9 +75,9 @@ void chd_ph_bucket_clean(chd_ph_bucket_t * buckets, cmph_uint32 nbuckets)
+ register cmph_uint32 i = 0;
+ assert(buckets);
+ for(i = 0; i < nbuckets; i++)
+- buckets[i].size = 0;
++ buckets[i].u.size = 0;
+ }
+-static cmph_uint8 chd_ph_bucket_insert(chd_ph_bucket_t * buckets,chd_ph_map_item_t * map_items, chd_ph_item_t * items,
++cmph_uint8 chd_ph_bucket_insert(chd_ph_bucket_t * buckets,chd_ph_map_item_t * map_items, chd_ph_item_t * items,
+ cmph_uint32 nbuckets,cmph_uint32 item_idx)
+ {
+ register cmph_uint32 i = 0;
+@@ -86,7 +86,7 @@ static cmph_uint8 chd_ph_bucket_insert(chd_ph_bucket_t * buckets,chd_ph_map_item
+ register chd_ph_bucket_t * bucket = buckets + tmp_map_item->bucket_num;
+ tmp_item = items + bucket->items_list;
+
+- for(i = 0; i < bucket->size; i++)
++ for(i = 0; i < bucket->u.size; i++)
+ {
+ if(tmp_item->f == tmp_map_item->f && tmp_item->h == tmp_map_item->h)
+ {
+@@ -97,7 +97,7 @@ static cmph_uint8 chd_ph_bucket_insert(chd_ph_bucket_t * buckets,chd_ph_map_item
+ };
+ tmp_item->f = tmp_map_item->f;
+ tmp_item->h = tmp_map_item->h;
+- bucket->size++;
++ bucket->u.size++;
+ return 1;
+ };
+ void chd_ph_bucket_destroy(chd_ph_bucket_t * buckets)
+@@ -251,19 +251,19 @@ cmph_uint8 chd_ph_mapping(cmph_config_t *mph, chd_ph_bucket_t * buckets, chd_ph_
+ // DEBUGP("BUCKET = %u -- SIZE = %u -- MAXIMUM SIZE = %u\n", g, buckets[g].size, (chd_ph->keys_per_bucket << 2));
+ // goto error;
+ // }
+- buckets[g].size++;
+- if(buckets[g].size > *max_bucket_size)
++ buckets[g].u.size++;
++ if(buckets[g].u.size > *max_bucket_size)
+ {
+- *max_bucket_size = buckets[g].size;
++ *max_bucket_size = buckets[g].u.size;
+ }
+ }
+ buckets[0].items_list = 0;
+ for(i = 1; i < chd_ph->nbuckets; i++)
+ {
+- buckets[i].items_list = buckets[i-1].items_list + buckets[i - 1].size;
+- buckets[i - 1].size = 0;
++ buckets[i].items_list = buckets[i-1].items_list + buckets[i - 1].u.size;
++ buckets[i - 1].u.size = 0;
+ };
+- buckets[i - 1].size = 0;
++ buckets[i - 1].u.size = 0;
+ for(i = 0; i < chd_ph->m; i++)
+ {
+ map_item = (map_items + i);
+@@ -303,7 +303,7 @@ chd_ph_sorted_list_t * chd_ph_ordering(chd_ph_bucket_t ** _buckets, chd_ph_item_
+ // Determine size of each list of buckets
+ for(i = 0; i < nbuckets; i++)
+ {
+- bucket_size = input_buckets[i].size;
++ bucket_size = input_buckets[i].u.size;
+ if(bucket_size == 0)
+ continue;
+ sorted_lists[bucket_size].size++;
+@@ -322,14 +322,14 @@ chd_ph_sorted_list_t * chd_ph_ordering(chd_ph_bucket_t ** _buckets, chd_ph_item_
+
+ for(i = 0; i < nbuckets; i++)
+ {
+- bucket_size = input_buckets[i].size;
++ bucket_size = input_buckets[i].u.size;
+ if(bucket_size == 0)
+ {
+ // non_empty_buckets--;
+ continue;
+ };
+ position = sorted_lists[bucket_size].buckets_list + sorted_lists[bucket_size].size;
+- output_buckets[position].bucket_id = i;
++ output_buckets[position].u.bucket_id = i;
+ output_buckets[position].items_list = input_buckets[i].items_list;
+ sorted_lists[bucket_size].size++;
+ };
+@@ -450,7 +450,7 @@ static inline cmph_uint8 place_bucket(chd_ph_config_data_t *chd_ph, chd_ph_bucke
+ {
+ if(place_bucket_probe(chd_ph, buckets, items, probe0_num, probe1_num, bucket_num,size))
+ {
+- disp_table[buckets[bucket_num].bucket_id] = probe0_num + probe1_num * chd_ph->n;
++ disp_table[buckets[bucket_num].u.bucket_id] = probe0_num + probe1_num * chd_ph->n;
+ return 1;
+ }
+ probe0_num++;
+@@ -517,7 +517,7 @@ static inline cmph_uint8 place_buckets2(chd_ph_config_data_t *chd_ph, chd_ph_buc
+ // if bucket is successfully placed remove it from list
+ if(place_bucket_probe(chd_ph, buckets, items, probe0_num, probe1_num, curr_bucket, i))
+ {
+- disp_table[buckets[curr_bucket].bucket_id] = probe0_num + probe1_num * chd_ph->n;
++ disp_table[buckets[curr_bucket].u.bucket_id] = probe0_num + probe1_num * chd_ph->n;
+ // DEBUGP("BUCKET %u PLACED --- DISPLACEMENT = %u\n", curr_bucket, disp_table[curr_bucket]);
+ }
+ else
+@@ -528,7 +528,7 @@ static inline cmph_uint8 place_buckets2(chd_ph_config_data_t *chd_ph, chd_ph_buc
+ bucket_id = buckets[non_placed_bucket + sorted_lists[i].buckets_list].bucket_id;
+ #endif
+ buckets[non_placed_bucket + sorted_lists[i].buckets_list].items_list = buckets[curr_bucket].items_list;
+- buckets[non_placed_bucket + sorted_lists[i].buckets_list].bucket_id = buckets[curr_bucket].bucket_id;
++ buckets[non_placed_bucket + sorted_lists[i].buckets_list].u.bucket_id = buckets[curr_bucket].u.bucket_id;
+ #ifdef DEBUG
+ buckets[curr_bucket].items_list=items_list;
+ buckets[curr_bucket].bucket_id=bucket_id;
+@@ -589,8 +589,8 @@ static inline cmph_uint8 chd_ph_check_bin_hashing(chd_ph_config_data_t *chd_ph,
+ {
+ j = bucket_size;
+ item = items + buckets[i].items_list;
+- probe0_num = disp_table[buckets[i].bucket_id] % chd_ph->n;
+- probe1_num = disp_table[buckets[i].bucket_id] / chd_ph->n;
++ probe0_num = disp_table[buckets[i].u.bucket_id] % chd_ph->n;
++ probe1_num = disp_table[buckets[i].u.bucket_id] / chd_ph->n;
+ for(; j > 0; j--)
+ {
+ m++;
+--
+1.7.9
+
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