Update to glib2mm-2.39.92.1 (git checkout from today with a couple of local

patches to unbreak "mm" applications).
This commit is contained in:
ajacoutot 2014-04-03 17:36:18 +00:00
parent 657667b8fe
commit 27dfaefa68
5 changed files with 60 additions and 1194 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.70 2014/03/26 08:31:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.71 2014/04/03 17:36:18 ajacoutot Exp $
COMMENT= C++ interface for glib2
GNOME_PROJECT= glibmm
GNOME_VERSION= 2.39.92
GNOME_VERSION= 2.39.92.1
PKGNAME= glib2mm-${GNOME_VERSION}
V= 2.4
@ -34,4 +34,9 @@ CONFIGURE_ENV= M4='m4 -g' \
ac_cv_path_DOXYGEN=""
CONFIGURE_ARGS= --enable-static
# XXX rm at next release
# git checkout (2014-04-03 09:40:54) + and togen.sh run
MASTER_SITES= https://distfiles.bsdfrog.org/
CONFIGURE_ARGS += --disable-documentation
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (glibmm-2.39.92.tar.xz) = NMFlF61OAO3fJ+usht8ntNOEc1k6suzff1UAppk+NxA=
SIZE (glibmm-2.39.92.tar.xz) = 5629844
SHA256 (glibmm-2.39.92.1.tar.xz) = IZewb0VoGv7Km/c7Ij3IIHQumC+TGbMKQwTakVskbnI=
SIZE (glibmm-2.39.92.1.tar.xz) = 1604900

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-glib_glibmm_variant_cc,v 1.1 2014/04/03 17:36:18 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=727554
--- glib/glibmm/variant.cc.orig Thu Apr 3 19:14:51 2014
+++ glib/glibmm/variant.cc Thu Apr 3 19:15:05 2014
@@ -29,19 +29,6 @@
#include <glib.h>
#include <iostream>
-extern "C"
-{
-
-//This is hack to workaround this problem in glib:
-// https://bugzilla.gnome.org/show_bug.cgi?id=708212
-//We really should not define a g_* symbol outside of glib:
-GQuark g_variant_parse_error_quark()
-{
- return g_variant_parser_get_error_quark();
-}
-
-} //extern C
-
namespace Glib
{

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-glib_glibmm_wrap_init_cc,v 1.1 2014/04/03 17:36:18 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=727554
--- glib/glibmm/wrap_init.cc.orig Thu Apr 3 19:14:54 2014
+++ glib/glibmm/wrap_init.cc Thu Apr 3 19:15:01 2014
@@ -64,7 +64,6 @@ GQuark g_spawn_error_quark(void);
GQuark g_thread_error_quark(void);
#endif // *_DISABLE_DEPRECATED
GQuark g_thread_error_quark(void);
-GQuark g_variant_parse_error_quark(void);
} // extern "C"
namespace Glib {
@@ -99,7 +98,6 @@ void wrap_init()
#ifndef GLIBMM_DISABLE_DEPRECATED
Glib::Error::register_domain(g_thread_error_quark(), &ThreadError::throw_func);
#endif // *_DISABLE_DEPRECATED
- Glib::Error::register_domain(g_variant_parse_error_quark(), &VariantParseError::throw_func);
// Call the wrap_init() functions in sub-namespaces:
Threads::wrap_init();

File diff suppressed because it is too large Load Diff