[csw-devel] SF.net SVN: gar:[5359] csw/mgar/pkg
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Jun 25 15:19:46 CEST 2009
Revision: 5359
http://gar.svn.sourceforge.net/gar/?rev=5359&view=rev
Author: dmichelsen
Date: 2009-06-25 13:19:45 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
glibmm: First commit, still compile error
Modified Paths:
--------------
csw/mgar/pkg/glibmm/trunk/Makefile
csw/mgar/pkg/glibmm/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/glibmm/
Removed Paths:
-------------
csw/mgar/pkg/glibmm/trunk/files/checksum-test.patch
csw/mgar/pkg/glibmm/trunk/files/glib-typedetect.patch
csw/mgar/pkg/glibmm/trunk/files/gsize.patch
Modified: csw/mgar/pkg/glibmm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib/trunk/Makefile 2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/glibmm/trunk/Makefile 2009-06-25 13:19:45 UTC (rev 5359)
@@ -1,39 +1,29 @@
-GARNAME = glib
-# Most applications bind to libglib-1.2.so.0, so stick to 1.2.x for the moment
-GARVERSION = 1.2.10
-#GARVERSION = 1.3.15
+GARNAME = glibmm
+GARVERSION = 2.20.0
CATEGORIES = lib
-DESCRIPTION = The GLib library of C routines
+DESCRIPTION = C++ interface to glib2
define BLURB
- GLib is a library containing many useful C routines for things such as trees,
- hashes, and lists.
endef
-SPKG_DESC_CSWglib2 = Utility library commonly associated with GNOME programs
+SPKG_DESC_CSWglibmm_rt = C++ interface to glib2 runtime libs
+SPKG_DESC_CSWglibmm_devel = C++ interface to glib2 development files
-REQUIRED_PKGS = CSWggettextrt CSWiconv
+#REQUIRED_PKGS = CSWggettextrt CSWiconv
MASTER_SITES = $(GNOME_MIRROR)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-# glib 1.x doesn't seem to be 64 bit clean
-#BUILD64 = 1
-#NO_ISAEXEC = 1
+BUILD64 = 1
+NO_ISAEXEC = 1
-# Only needed for 1.3.x
-#EXTRA_BUILD_EXPORTS = SGML_CATALOG_FILES
-#SGML_CATALOG_FILES = $(sysconfdir)/sgml/catalog
-
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-libiconv
+MAKE = gmake
+EXTRA_CONFIGURE_EXPORTS = MAKE
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
TEST_TARGET = check
-#provided by iconv
-MERGE_EXCLUDE_FILES = .*/charset.alias
-
include gar/category.mk
Modified: csw/mgar/pkg/glibmm/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib/trunk/checksums 2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/glibmm/trunk/checksums 2009-06-25 13:19:45 UTC (rev 5359)
@@ -1 +1 @@
-6fe30dad87c77b91b632def29dd69ef9 download/glib-1.2.10.tar.gz
+3ef10f8ecf265965cb28fa9b5a1b8212 download/glibmm-2.20.0.tar.gz
Deleted: csw/mgar/pkg/glibmm/trunk/files/checksum-test.patch
===================================================================
--- csw/mgar/pkg/glib/trunk/files/checksum-test.patch 2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/glibmm/trunk/files/checksum-test.patch 2009-06-25 13:19:45 UTC (rev 5359)
@@ -1,11 +0,0 @@
---- glib-2.18.4/tests/checksum-test.c.o 2009-02-04 19:53:27.782844898 -0600
-+++ glib-2.18.4/tests/checksum-test.c 2009-02-04 21:22:05.475677071 -0600
-@@ -18,7 +18,7 @@
- * string is intentionally more than twice that length.
- */
-
--#define FIXED_STR "The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"
-+const char FIXED_STR[] = {"The quick brown fox jumps over the lazy dog. Jackdaws love my big sphinx of quartz. Pack my box with five dozen liquor jugs. How razorback-jumping frogs can level six piqued gymnasts!"};
- #define FIXED_LEN (strlen (FIXED_STR))
-
- const char *MD5_sums[] = {
Deleted: csw/mgar/pkg/glibmm/trunk/files/glib-typedetect.patch
===================================================================
--- csw/mgar/pkg/glib/trunk/files/glib-typedetect.patch 2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/glibmm/trunk/files/glib-typedetect.patch 2009-06-25 13:19:45 UTC (rev 5359)
@@ -1,11 +0,0 @@
---- glib-2.17.6/gobject/gtype.c.origi 2008-08-05 01:21:30.000000000 +0800
-+++ glib-2.17.6/gobject/gtype.c 2008-09-12 16:20:23.731146000 +0800
-@@ -589,7 +589,7 @@
- {
- TypeNode *node = lookup_type_node_I (type);
-
-- return node ? NODE_NAME (node) : "<unknown>";
-+ return node ? (NODE_NAME (node) == NULL ? "<unknown>" : NODE_NAME (node)) : "<unknown>";
- }
- else
- return "<invalid>";
Deleted: csw/mgar/pkg/glibmm/trunk/files/gsize.patch
===================================================================
--- csw/mgar/pkg/glib/trunk/files/gsize.patch 2009-05-27 21:50:22 UTC (rev 5079)
+++ csw/mgar/pkg/glibmm/trunk/files/gsize.patch 2009-06-25 13:19:45 UTC (rev 5359)
@@ -1,27 +0,0 @@
---- glib-2.20.0/configure.in.o 2009-03-30 15:38:19.204628321 -0500
-+++ glib-2.20.0/configure.in 2009-03-30 15:39:07.658123519 -0500
-@@ -2758,11 +2758,19 @@
- _______EOF
-
- cat >>$outfile <<_______EOF
--typedef signed $glib_size_type_define gssize;
--typedef unsigned $glib_size_type_define gsize;
--#define G_GSIZE_MODIFIER $gsize_modifier
--#define G_GSSIZE_FORMAT $gssize_format
--#define G_GSIZE_FORMAT $gsize_format
-+#if (defined (__amd64) || defined(__sparcv9))
-+typedef signed long gssize;
-+typedef unsigned long gsize;
-+#define G_GSIZE_MODIFIER "l"
-+#define G_GSSIZE_FORMAT "li"
-+#define G_GSIZE_FORMAT "lu"
-+#else
-+typedef signed int gssize;
-+typedef unsigned int gsize;
-+#define G_GSIZE_MODIFIER ""
-+#define G_GSSIZE_FORMAT "i"
-+#define G_GSIZE_FORMAT "u"
-+#endif
-
- #define G_MAXSIZE G_MAXU$glib_msize_type
- #define G_MINSSIZE G_MIN$glib_msize_type
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