Downgrade to 2.12.8. The 2.13.x version is a development version. The update

of gtkmm to 2.10.9 doesn't build with glibmm 2.13.x. Bump the PORTEPOCH.

GNOME Bugzilla:	http://bugzilla.gnome.org/show_bug.cgi?id=430782
Discussed with:	marcus
This commit is contained in:
Jeremy Messenger 2007-04-22 19:03:12 +00:00
parent a4a320ce6d
commit 1ca97d5562
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=190647
5 changed files with 26 additions and 22 deletions

View File

@ -7,8 +7,9 @@
#
PORTNAME= glibmm
PORTVERSION= 2.13.3
PORTVERSION= 2.12.8
PORTREVISION?= 0
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

View File

@ -1,3 +1,3 @@
MD5 (gnome2/glibmm-2.13.3.tar.bz2) = c4606b5e3d960d64c34580ca5119aec3
SHA256 (gnome2/glibmm-2.13.3.tar.bz2) = bb2a621b92f4f0c1b1d314174a596e001e63694d71d154a00e1dfa6bd770f14d
SIZE (gnome2/glibmm-2.13.3.tar.bz2) = 3980993
MD5 (gnome2/glibmm-2.12.8.tar.bz2) = e2a596f484cd5e328e568f6035efb8d2
SHA256 (gnome2/glibmm-2.12.8.tar.bz2) = 9fcedb9318749815053d6e06a0c12bc554ea8b02c2c48feb1c4a1193fdde6922
SIZE (gnome2/glibmm-2.12.8.tar.bz2) = 2535582

View File

@ -1,16 +1,19 @@
--- glib/glibmm/date.cc.orig Mon Feb 6 00:50:58 2006
+++ glib/glibmm/date.cc Mon Feb 6 00:51:32 2006
@@ -72,12 +72,14 @@ void Date::set_parse(const Glib::ustring
}
--- glib/glibmm/date.cc.orig Sun Apr 22 12:28:36 2007
+++ glib/glibmm/date.cc Sun Apr 22 12:28:48 2007
@@ -73,7 +73,7 @@
#ifndef GLIBMM_DISABLE_DEPRECATED
-
+#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
void Date::set_time(GTime time)
{
//This method, and the C function that it wraps, are deprecated.
//Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32)
//That would make the set_time() method overload impossible.
@@ -84,7 +84,7 @@
g_date_set_time(&gobject_, time);
}
#endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
-
+#endif
#endif // GLIBMM_DISABLE_DEPRECATED

View File

@ -1,17 +1,19 @@
--- glib/glibmm/date.h.orig Mon Feb 6 00:51:03 2006
+++ glib/glibmm/date.h Mon Feb 6 00:52:08 2006
@@ -120,6 +120,7 @@ enum DMY
void set_parse (const Glib::ustring& str);
--- glib/glibmm/date.h.orig Sun Apr 22 12:29:49 2007
+++ glib/glibmm/date.h Sun Apr 22 12:30:39 2007
@@ -121,7 +121,7 @@
#ifndef GLIBMM_DISABLE_DEPRECATED
-
+#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
/** Sets the value of a date from a GTime (time_t) value.
*
@@ -128,6 +129,7 @@ enum DMY
* @deprecated Please use set_time(time_t) or set_time(const GTimeVal&).
//Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32)
//That would make the set_time() method overload impossible.
@@ -134,7 +134,7 @@
*/
void set_time(GTime time);
#endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
-
+#endif
#endif // GLIBMM_DISABLE_DEPRECATED

View File

@ -16,7 +16,6 @@ include/glibmm-%%API_VERSION%%/glibmm/i18n.h
include/glibmm-%%API_VERSION%%/glibmm/init.h
include/glibmm-%%API_VERSION%%/glibmm/interface.h
include/glibmm-%%API_VERSION%%/glibmm/iochannel.h
include/glibmm-%%API_VERSION%%/glibmm/keyfile.h
include/glibmm-%%API_VERSION%%/glibmm/listhandle.h
include/glibmm-%%API_VERSION%%/glibmm/main.h
include/glibmm-%%API_VERSION%%/glibmm/markup.h
@ -33,7 +32,6 @@ include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h
include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h