[SCM] Debian packaging of libglib-perl branch, master, updated. debian/1.251-1-5-g291e7cb
intrigeri
intrigeri at boum.org
Sun Apr 29 15:17:11 UTC 2012
The following commit has been merged in the master branch:
commit f2c7a3a262a3c221e64472d2911ee5a5a8385d3d
Author: intrigeri <intrigeri at boum.org>
Date: Sun Apr 29 16:21:49 2012 +0200
Checkout upstream 1.242.
diff --git a/ChangeLog.pre-git b/ChangeLog.pre-git
index deae8f1..7011c14 100644
--- a/ChangeLog.pre-git
+++ b/ChangeLog.pre-git
@@ -1,8 +1,7 @@
=== ChangeLog discontinued ===
With the move to git, we stop maintaining a separate ChangeLog and
- rely on proper commit messages instead. Web view of changes:
- <http://git.gnome.org/browse/perl-Glib/>.
+ rely on proper commit messages instead.
2009-03-31 Torsten Schoenfeld <kaffeetisch at gmx.de>
diff --git a/GBookmarkFile.xs b/GBookmarkFile.xs
index 2662b98..0e74b88 100644
--- a/GBookmarkFile.xs
+++ b/GBookmarkFile.xs
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006,2012 by the gtk2-perl team (see the file AUTHORS for
+ * Copyright (C) 2006 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
@@ -565,8 +565,8 @@ g_bookmark_file_set_app_info (bookmark_file, uri, name, exec, count, stamp)
=for apidoc __gerror__
=signature ($exec, $count, $stamp) = $bookmark_file->get_app_info ($uri, $name)
-Gets the registration information of $name for the bookmark for
-$uri. See Glib::BookmarkFile::set_app_info() for more information about
+Gets the registration informations of $name for the bookmark for
+$uri. See Glib::BookmarkFile::set_app_info() for more informations about
the returned data.
=cut
void
diff --git a/GClosure.xs b/GClosure.xs
index 883902d..ef0fd76 100644
--- a/GClosure.xs
+++ b/GClosure.xs
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2003-2009, 2012 by the gtk2-perl team (see the file AUTHORS
- * for the full list)
+ * Copyright (C) 2003-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
@@ -61,13 +61,6 @@ gperl_closure_invalidate (gpointer data,
}
}
-static void _closure_hand_to_main (GClosure * closure,
- GValue * return_value,
- guint n_param_values,
- const GValue * param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
static void
gperl_closure_marshal (GClosure * closure,
GValue * return_value,
@@ -81,23 +74,6 @@ gperl_closure_marshal (GClosure * closure,
guint i;
dGPERL_CLOSURE_MARSHAL_ARGS;
- /* If the current thread doesn't have a Perl context associated with
- * it, then we have no choice but to hand over everything to the main
- * thread and let it handle marshalling.
- *
- * We cannot simply use the main thread's Perl context here because the
- * Perl interpreter is not thread-safe. For the same reason, we cannot
- * use perl_clone to create a new Perl interpreter from the main one.
- */
- if (!PERL_GET_CONTEXT) {
- g_printerr ("*** GPerl asked to invoke callback from a foreign thread; "
- "handing it over to the main loop\n");
- _closure_hand_to_main (closure, return_value,
- n_param_values, param_values,
- invocation_hint, marshal_data);
- return;
- }
-
GPERL_CLOSURE_MARSHAL_INIT (closure, marshal_data);
PERL_UNUSED_VAR (invocation_hint);
@@ -144,62 +120,6 @@ gperl_closure_marshal (GClosure * closure,
LEAVE;
}
-typedef struct {
- GClosure * closure;
- GValue * return_value;
- guint n_param_values;
- const GValue * param_values;
- gpointer invocation_hint;
- gpointer marshal_data;
- GCond * done_cond;
- GMutex * done_mutex;
-} MarshallerArgs;
-
-static gboolean
-_closure_remarshal (gpointer data)
-{
- MarshallerArgs *args = data;
- g_mutex_lock (args->done_mutex);
- gperl_closure_marshal (args->closure,
- args->return_value,
- args->n_param_values,
- args->param_values,
- args->invocation_hint,
- args->marshal_data);
- g_cond_signal (args->done_cond);
- g_mutex_unlock (args->done_mutex);
- return FALSE;
-}
-
-static void
-_closure_hand_to_main (GClosure * closure,
- GValue * return_value,
- guint n_param_values,
- const GValue * param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
-{
- MarshallerArgs args;
- args.closure = closure;
- args.return_value = return_value;
- args.n_param_values = n_param_values;
- args.param_values = param_values;
- args.invocation_hint = invocation_hint;
- args.marshal_data = marshal_data;
-
- /* We need to wait for the other thread to finish marshalling to avoid
- * gperl_closure_marshal returning prematurely. */
- args.done_cond = g_cond_new ();
- args.done_mutex = g_mutex_new ();
- g_mutex_lock (args.done_mutex);
- /* FIXME: Should we use a higher priority? */
- g_idle_add (_closure_remarshal, &args);
- g_cond_wait (args.done_cond, args.done_mutex);
- g_mutex_unlock (args.done_mutex);
-
- g_cond_free (args.done_cond);
- g_mutex_free (args.done_mutex);
-}
=item GClosure * gperl_closure_new (SV * callback, SV * data, gboolean swap)
diff --git a/GKeyFile.xs b/GKeyFile.xs
index a881b0a..967aad8 100644
--- a/GKeyFile.xs
+++ b/GKeyFile.xs
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005,2012 by the gtk2-perl team (see the file AUTHORS for
+ * Copyright (C) 2005 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
@@ -412,7 +412,7 @@ If $key is not found, it is created.
=for apidoc Glib::KeyFile::set_string
=arg value (gchar*)
Sets a string value to $key inside $group_name. The string will be escaped if
-it contains special characters.
+it containes special characters.
If $key is not found, it is created.
=cut
diff --git a/GObject.xs b/GObject.xs
index adcdafe..7f3233a 100644
--- a/GObject.xs
+++ b/GObject.xs
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2003-2006, 2010, 2012 by the gtk2-perl team (see the file
- * AUTHORS for the full list)
+ * Copyright (C) 2003-2006, 2010 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
@@ -135,13 +135,6 @@ _gperl_find_mg (SV * sv)
return NULL;
}
-/* copied from ppport.h, needed for older perls (< 5.8.8?) */
-#ifndef SvMAGIC_set
-# define SvMAGIC_set(sv, val) \
- STMT_START { assert(SvTYPE(sv) >= SVt_PVMG); \
- (((XPVMG*) SvANY(sv))->xmg_magic = (val)); } STMT_END
-#endif
-
/*
* Remove the association between a pointer attached to C<sv> using
* C<_gperl_attach_mg> and the C<sv>.
@@ -783,11 +776,8 @@ gobject_destroy_wrapper (SV *obj)
{
GPERL_SET_CONTEXT;
- /* As of perl 5.16, this function needs to run even during global
- * destruction (i.e. when PL_in_clean_objs is true) since we might
- * otherwise end up with undead HVs hanging on to garbage. Prior to
- * 5.16, this did not matter, but recent versions of perl will find
- * these HVs and call DESTROY on them. */
+ if (PL_in_clean_objs)
+ return;
#ifdef NOISY
warn ("gobject_destroy_wrapper (%p)[%d]\n", obj,
@@ -1216,12 +1206,10 @@ BOOT:
void
DESTROY (SV *sv)
- PREINIT:
- GObject *object;
- gboolean was_undead;
CODE:
- object = gperl_get_object (sv);
- if (!object) /* Happens on GObject destruction. */
+ GObject *object = gperl_get_object (sv);
+
+ if (!object) /* Happens on object destruction. */
return;
#ifdef NOISY
warn ("DESTROY< (%p)[%d] => %s (%p)[%d]\n",
@@ -1229,13 +1217,14 @@ DESTROY (SV *sv)
gperl_object_package_from_type (G_OBJECT_TYPE (object)),
sv, SvREFCNT (SvRV(sv)));
#endif
- was_undead = IS_UNDEAD (g_object_get_qdata (object, wrapper_quark));
/* gobject object still exists, so take back the refcount we lend it. */
/* this operation does NOT change the refcount of the combined object. */
+
if (PL_in_clean_objs) {
/* be careful during global destruction. basically,
* don't bother, since refcounting is no longer meaningful. */
_gperl_remove_mg (SvRV (sv));
+
g_object_steal_qdata (object, wrapper_quark);
} else {
SvREFCNT_inc (SvRV (sv));
@@ -1267,17 +1256,7 @@ DESTROY (SV *sv)
G_UNLOCK (perl_gobjects);
}
#endif
- /* As of perl 5.16, even HVs that are not referenced by any SV will get
- * their DESTROY called during global destruction. Such HVs can occur
- * when the GObject outlives the HV, as for GtkWindow or GdkScreen.
- * Here in DESTROY such an HV will be in the "undead" state and will
- * not own a reference to the GObject anymore. Thus we need to avoid
- * calling unref in this case. See
- * <https://rt.perl.org/rt3//Public/Bug/Display.html?id=36347> for the
- * perl change. */
- if (!was_undead) {
- g_object_unref (object);
- }
+ g_object_unref (object);
#ifdef NOISY
warn ("DESTROY> (%p) done\n", object);
/*
@@ -1720,7 +1699,7 @@ get_pointer (object)
=for apidoc
=for arg all if FALSE (or omitted) tie only properties for this object's class, if TRUE tie the properties of this and all parent classes.
-A special method available to Glib::Object derivatives, it uses perl's tie
+A special method avaiable to Glib::Object derivatives, it uses perl's tie
facilities to associate hash keys with the properties of the object. For
example:
diff --git a/GSignal.xs b/GSignal.xs
index a82321c..ee7e7b9 100644
--- a/GSignal.xs
+++ b/GSignal.xs
@@ -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
@@ -505,36 +505,7 @@ gperl_signal_emission_hook (GSignalInvocationHint * ihint,
=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 (),
@@ -544,9 +515,6 @@ BOOT:
=cut
-
-MODULE = Glib::Signal PACKAGE = Glib::Object PREFIX = g_
-
##
##/* --- typedefs --- */
##typedef struct _GSignalQuery GSignalQuery;
diff --git a/MANIFEST b/MANIFEST
index 7925b62..9cd70ba 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -72,5 +72,4 @@ TODO
typemap
xsapi.pod.foot
xsapi.pod.head
-META.yml Module YAML meta-data (added by MakeMaker)
-META.json Module JSON meta-data (added by MakeMaker)
+META.yml Module meta-data (added by MakeMaker)
diff --git a/META.json b/META.json
deleted file mode 100644
index 4e48bcf..0000000
--- a/META.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "abstract" : "Perl wrappers for the GLib utility and Object libraries",
- "author" : [
- "unknown"
- ],
- "dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.113640",
- "license" : [
- "unknown"
- ],
- "meta-spec" : {
- "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
- "version" : "2"
- },
- "name" : "Glib",
- "no_index" : {
- "directory" : [
- "t",
- "inc"
- ],
- "file" : [
- "Glib.xs",
- "GError.xs",
- "GUtils.xs",
- "GLog.xs",
- "GType.xs",
- "GBoxed.xs",
- "GObject.xs",
- "GValue.xs",
- "GClosure.xs",
- "GSignal.xs",
- "GMainLoop.xs",
- "GIOChannel.xs",
- "GParamSpec.xs",
- "GKeyFile.xs",
- "GOption.xs",
- "GBookmarkFile.xs",
- "xsapi.pod.head",
- "xsapi.pod.foot"
- ],
- "package" : [
- "MY"
- ]
- },
- "prereqs" : {
- "build" : {
- "requires" : {
- "ExtUtils::MakeMaker" : 0
- }
- },
- "configure" : {
- "requires" : {
- "ExtUtils::Depends" : "0.300",
- "ExtUtils::MakeMaker" : 0,
- "ExtUtils::PkgConfig" : "1.00"
- }
- },
- "runtime" : {
- "requires" : {
- "ExtUtils::Depends" : "0.300",
- "ExtUtils::PkgConfig" : "1.00"
- }
- }
- },
- "release_status" : "stable",
- "version" : "1.251"
-}
diff --git a/META.yml b/META.yml
index f11736b..599e5b5 100644
--- a/META.yml
+++ b/META.yml
@@ -1,46 +1,44 @@
----
-abstract: 'Perl wrappers for the GLib utility and Object libraries'
-author:
- - unknown
-build_requires:
- ExtUtils::MakeMaker: 0
+--- #YAML:1.0
+name: Glib
+version: 1.242
+abstract: Perl wrappers for the GLib utility and Object libraries
+author: []
+license: unknown
+distribution_type: module
configure_requires:
- ExtUtils::Depends: 0.300
- ExtUtils::MakeMaker: 0
- ExtUtils::PkgConfig: 1.00
-dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.113640'
-license: unknown
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
-name: Glib
-no_index:
- directory:
- - t
- - inc
- file:
- - Glib.xs
- - GError.xs
- - GUtils.xs
- - GLog.xs
- - GType.xs
- - GBoxed.xs
- - GObject.xs
- - GValue.xs
- - GClosure.xs
- - GSignal.xs
- - GMainLoop.xs
- - GIOChannel.xs
- - GParamSpec.xs
- - GKeyFile.xs
- - GOption.xs
- - GBookmarkFile.xs
- - xsapi.pod.head
- - xsapi.pod.foot
- package:
- - MY
+ ExtUtils::Depends: 0.300
+ ExtUtils::MakeMaker: 0
+ ExtUtils::PkgConfig: 1.00
+build_requires:
+ ExtUtils::MakeMaker: 0
requires:
- ExtUtils::Depends: 0.300
- ExtUtils::PkgConfig: 1.00
-version: 1.251
+ ExtUtils::Depends: 0.300
+ ExtUtils::PkgConfig: 1.00
+no_index:
+ directory:
+ - t
+ - inc
+ file:
+ - Glib.xs
+ - GError.xs
+ - GUtils.xs
+ - GLog.xs
+ - GType.xs
+ - GBoxed.xs
+ - GObject.xs
+ - GValue.xs
+ - GClosure.xs
+ - GSignal.xs
+ - GMainLoop.xs
+ - GIOChannel.xs
+ - GParamSpec.xs
+ - GKeyFile.xs
+ - GOption.xs
+ - GBookmarkFile.xs
+ - xsapi.pod.head
+ - xsapi.pod.foot
+ package: MY
+generated_by: ExtUtils::MakeMaker version 6.57_05
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
diff --git a/Makefile.PL b/Makefile.PL
index 9121a4d..8c2bb1d 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -178,6 +178,7 @@ WriteMakefile(
$glib ? $glib->get_makefile_vars : (),
);
+=unstable
print <<__EOW__;
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
@@ -190,6 +191,7 @@ WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
__EOW__
+=cut
=frozen
diff --git a/NEWS b/NEWS
index 3853177..3f95b18 100644
--- a/NEWS
+++ b/NEWS
@@ -1,22 +1,3 @@
-Overview of changes in Glib 1.251
-=================================
-
-* Make signal marshalling more thread-safe. When a signal handler is invoked
- from a foreign thread without associated Perl interpreter, hand the
- marshalling over to the main loop which in turn later wakes up the main
- thread and lets it handle the request. Since this approach is experimental,
- there is debug print for now whenever it is used:
- *** GPerl asked to invoke callback from a foreign thread;
- handing it over to the main loop
-
-Overview of changes in Glib 1.250
-=================================
-
-* Add a fallback implementation of SvMAGIC_set; Bugzilla bug #665266
-* Avoid a syntax error on older perls
-* Glib::Object: make ref-counting compatible with perl >= 5.16 (RT#73650)
-* Fix some typos in POD (RT#73616)
-
Overview of changes in Glib 1.242
=================================
diff --git a/README b/README
index 7ac1fba..ad67a46 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Glib version 1.251
+Glib version 1.242
==================
This module provides perl access to Glib and GLib's GObject libraries.
@@ -85,7 +85,7 @@ Please report bugs to the gnome-perl product in GNOME's Bugzilla:
COPYRIGHT AND LICENSE
---------------------
-Copyright (C) 2003-2012 by the gtk2-perl team (see the file AUTHORS for the
+Copyright (C) 2003-2011 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
diff --git a/gperl_marshal.h b/gperl_marshal.h
index 23af292..a82b2a3 100644
--- a/gperl_marshal.h
+++ b/gperl_marshal.h
@@ -70,7 +70,7 @@ A typical marshaller skeleton will look like this:
=item dGPERL_CLOSURE_MARSHAL_ARGS
Declare several stack variables that the various GPERL_CLOSURE_MARSHAL macros
-will need. Declares C<SV ** sp> for you. This must go near the top of your C
+will need. Does C<dSP> for you. This must go near the top of your C
function, before any code statements.
=cut
@@ -80,7 +80,7 @@ function, before any code statements.
int count; \
SV * data; \
SV * instance; \
- SV ** sp;
+ dSP;
/*
=item GPERL_CLOSURE_MARSHAL_INIT (closure, marshal_data)
@@ -106,7 +106,6 @@ statement also initalizes C<pc> (the perl closure object) on the stack.
# define GPERL_CLOSURE_MARSHAL_INIT(closure, marshal_data) \
PERL_UNUSED_VAR (marshal_data); \
- SPAGAIN; \
pc = (GPerlClosure *) closure;
#endif
diff --git a/lib/Glib.pm b/lib/Glib.pm
index 1b60832..f717e82 100644
--- a/lib/Glib.pm
+++ b/lib/Glib.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2012 by the gtk2-perl team (see the file AUTHORS for
+# Copyright (C) 2003-2010 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
@@ -66,7 +66,7 @@ our %EXPORT_TAGS = (
our @EXPORT_OK = map { @$_ } values %EXPORT_TAGS;
$EXPORT_TAGS{all} = \@EXPORT_OK;
-our $VERSION = '1.251';
+our $VERSION = '1.242';
sub dl_load_flags { $^O eq 'darwin' ? 0x00 : 0x01 }
diff --git a/lib/Glib/GenPod.pm b/lib/Glib/GenPod.pm
index 0fd7cf7..f5f8110 100644
--- a/lib/Glib/GenPod.pm
+++ b/lib/Glib/GenPod.pm
@@ -1216,7 +1216,7 @@ sub convert_type {
\s*$/x; # trailing space
my $ctype = $1 || '!!';
if ($ctype eq '!!') {
- warn "Glib::GenPod: Unable to parse type '$typestr'";
+ warn "Glib::GenPod: Unable to parse type `$typestr´";
}
# variant type
@@ -1539,10 +1539,10 @@ mcfarland hacked this module together via irc and email over the next few days.
=head1 COPYRIGHT AND LICENSE
-Copyright (C) 2003-2004, 2010-2012 by the gtk2-perl team
+Copyright (C) 2003-2004, 2010, 2011 by the gtk2-perl team
This library is free software; you can redistribute it and/or modify
-it under the terms of the Lesser General Public License (LGPL). For
+it under the terms of the Lesser General Public License (LGPL). For
more information, see http://www.fsf.org/licenses/lgpl.txt
=cut
diff --git a/lib/Glib/MakeHelper.pm b/lib/Glib/MakeHelper.pm
index f6d7f44..3e91a56 100644
--- a/lib/Glib/MakeHelper.pm
+++ b/lib/Glib/MakeHelper.pm
@@ -228,7 +228,7 @@ There is a special Makefile variable POD_DEPENDS that should be set to the
list of files that need to be created before the doc.pl step is run, include
files.
-There is also a variable BLIB_DONE which should be used as a dependency
+There is also a variable BLIB_DONE which should be used as a dependancy
anywhere a rule needs to be sure that a loadable and working module resides in
the blib directory before running.
@@ -610,7 +610,7 @@ hacked up and documented by muppet.
=head1 COPYRIGHT AND LICENSE
-Copyright 2003-2004, 2012 by the gtk2-perl team
+Copyright 2003-2004 by the gtk2-perl team
This library is free software; you can redistribute it and/or modify
it under the terms of the Lesser General Public License (LGPL). For
--
Debian packaging of libglib-perl
More information about the Pkg-perl-cvs-commits
mailing list