[SCM] Debian packaging of libglib-perl branch, master, updated. debian/3%1.242-2-7-gf4e94c9
intrigeri
intrigeri at boum.org
Thu May 24 07:10:47 UTC 2012
The following commit has been merged in the master branch:
commit 9bb46d31fea7570e2328c9709ae0069a37cea114
Merge: 291e7cb5e20145b49a1eb27d79ad0f00a6ed6b89 620d622bcd137801279253dfc0df96a59d4e8c9b
Author: intrigeri <intrigeri at boum.org>
Date: Tue May 22 14:31:23 2012 +0200
Merge tag 'upstream/1.260'
Upstream version 1.260
Conflicts:
GClosure.xs
META.yml
NEWS
README
lib/Glib.pm
diff --combined GSignal.xs
index ee7e7b9,c3ed3aa..3fd8376
--- a/GSignal.xs
+++ b/GSignal.xs
@@@ -1,6 -1,6 +1,6 @@@
/*
- * Copyright (C) 2003-2004, 2009, 2012 by the gtk2-perl team (see the file
- * AUTHORS for the full list)
+ * Copyright (C) 2003-2004, 2009 by the gtk2-perl team (see the file AUTHORS
+ * for the full list)
*
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU Library General Public License as published by
@@@ -54,7 -54,7 +54,7 @@@ this by hand. watch for fallen cruft
*/
static GType
- g_signal_flags_get_type (void)
+ gperl_signal_flags_get_type (void)
{
static GType etype = 0;
if ( etype == 0 ) {
@@@ -76,13 -76,30 +76,30 @@@
SV *
newSVGSignalFlags (GSignalFlags flags)
{
- return gperl_convert_back_flags (g_signal_flags_get_type (), flags);
+ return gperl_convert_back_flags (gperl_signal_flags_get_type (), flags);
}
GSignalFlags
SvGSignalFlags (SV * sv)
{
- return gperl_convert_flags (g_signal_flags_get_type (), sv);
+ return gperl_convert_flags (gperl_signal_flags_get_type (), sv);
+ }
+
+ /* GConnectFlags doesn't come with a GType either. We don't use it in Glib
+ * directly, but other bindings might need it. */
+ static GType
+ gperl_connect_flags_get_type (void)
+ {
+ static GType etype = 0;
+ if ( etype == 0 ) {
+ static const GFlagsValue values[] = {
+ { G_CONNECT_AFTER, "G_CONNECT_AFTER", "after" },
+ { G_CONNECT_SWAPPED, "G_CONNECT_SWAPPED", "swapped" },
+ { 0, NULL, NULL }
+ };
+ etype = g_flags_register_static ("GConnectFlags", values);
+ }
+ return etype;
}
SV *
@@@ -505,16 -522,50 +522,18 @@@ gperl_signal_emission_hook (GSignalInvo
=cut
-MODULE = Glib::Signal PACKAGE = Glib::Signal
-
-=for position DESCRIPTION
-
-=head1 DESCRIPTION
-
-This page describes some functions related to signals in Glib. Since most
-things you can do with signals are tied to L<Glib::Object> instances, the
-majority of the signal functions are documented there.
-
-=head2 Thread safety
-
-Some libraries, most notably GStreamer, sometimes invoke signal handlers from a
-foreign thread that has no Perl interpreter associated with it. When this
-happens, we have no choice but to hand the marshalling over to the main loop
-which in turn later wakes up the main thread and lets it handle the request.
-We cannot invoke the signal handler from the foreign thread since the Perl
-interpreter may not be used concurrently.
-
-The downside to this approach is that the foreign thread is blocked until the
-main thread has finished executing the signal handler. This might lead to
-deadlocks. It might help in this case to wrap the crucial parts of the signal
-handler inside a L<Glib::Idle> callback so that the signal handler can return
-directly.
-
-=cut
-
-=for see_also Glib::Object
-
-=cut
+MODULE = Glib::Signal PACKAGE = Glib::Object PREFIX = g_
BOOT:
- gperl_register_fundamental (g_signal_flags_get_type (),
+ gperl_register_fundamental (gperl_signal_flags_get_type (),
"Glib::SignalFlags");
+ gperl_register_fundamental (gperl_connect_flags_get_type (),
+ "Glib::ConnectFlags");
=for flags Glib::SignalFlags
=cut
-
-MODULE = Glib::Signal PACKAGE = Glib::Object PREFIX = g_
-
##
##/* --- typedefs --- */
##typedef struct _GSignalQuery GSignalQuery;
diff --combined Makefile.PL
index 8c2bb1d,553bc1a..2bbf4b5
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -1,5 -1,5 +1,5 @@@
- # Copyright (C) 2003-2009 by the gtk2-perl team (see the file AUTHORS for the
- # full list)
+ # Copyright (C) 2003-2009, 2012 by the gtk2-perl team (see the file AUTHORS
+ # for the full list)
#
# This library is free software; you can redistribute it and/or modify it under
# the terms of the GNU Library General Public License as published by the Free
@@@ -170,7 -170,7 +170,7 @@@ WriteMakefile
META_MERGE => {
configure_requires => \%PREREQ_PM,
no_index => {
- file => [@xs_files, qw/xsapi.pod.head xsapi.pod.foot/],
+ file => [@xs_files, qw/Makefile.PL xsapi.pod.head xsapi.pod.foot/],
package => 'MY',
},
},
@@@ -191,7 -191,6 +191,7 @@@ WARNING WARNING WARNING WARNING WARNIN
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
__EOW__
+=cut
=frozen
--
Debian packaging of libglib-perl
More information about the Pkg-perl-cvs-commits
mailing list