- updated to 2.48.1

- dropped external gobject.stp.in (already in tarball)

diff --git a/glib2.spec b/glib2.spec
index 3cb61b458500136f8e722656681dd592a25652d9..7f4fb7b0504562e6b40300e29e2a7b0e1dd8a8e3 100644 (file)
--- a/glib2.spec
+++ b/glib2.spec
@@ -19,15 +19,13 @@ Summary(pt_BR.UTF-8):       Conjunto de funções gráficas utilitárias
 Summary(tr.UTF-8):     Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):  实用工具函数库
 Name:          glib2
-Version:       2.48.0
+Version:       2.48.1
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.48/glib-%{version}.tar.xz
-# Source0-md5: 093a586f37d2853bdb129231e1b350e0
-# https://bugzilla.gnome.org/show_bug.cgi?id=763821
-Source1:       gobject.stp.in
+# Source0-md5: 67bd3b75c9f6d5587b457dc01cdcd5bb
 Patch0:                %{name}-makefile.patch
 URL:           http://www.gtk.org/
 BuildRequires: autoconf >= 2.62
@@ -234,8 +232,6 @@ Sondy systemtap/dtrace dla GLib 2.
 %setup -q -n glib-%{version}
 %patch0 -p1
 
-cp %{SOURCE1} gobject/
-
 %if %{without apidocs}
 %{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am
 %{__sed} -e '/^docs.*Makefile$/d' -i configure.ac

diff --git a/gobject.stp.in b/gobject.stp.in
deleted file mode 100644 (file)
index edcdb50..0000000
--- a/gobject.stp.in
+++ /dev/null
@@ -1,199 +0,0 @@
-global gtypes
-global gtypenames
-global gsignalnames
-
-/* These are needed to keep track of gtype and signal names for the below
- * probes.
- */
-probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("type__new")
-{
-  gtypes[pid(),user_string($arg1)] = $arg3;
-  gtypenames[pid(),$arg3] = user_string($arg1);
-}
-probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("signal__new")
-{
-  gsignalnames[pid(),$arg1] = user_string($arg2);
-}
-
-/**
- * probe gobject.type_new - Called when any entity registered with the #GType system is created
- * @name: String name of type
- * @parent_gtype: The parent #GType of this type
- * @gtype: The #GType for this type
- */
-probe gobject.type_new = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("type__new")
-{
-  name = user_string($arg1); 
-  parent_gtype = $arg2; 
-  gtype = $arg3; 
-  probestr = sprintf("gobject.type_new(%s, %d) -> %d", name, parent_gtype, gtype);
-}
-
-/**
- * probe gobject.object_new - Called when a #GObject is created
- * @object: Raw pointer to object
- * @gtype: #GType for this object
- * @type: String name of object type
- */
-probe gobject.object_new = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("object__new")
-{
-  object = $arg1; 
-  gtype = $arg2; 
-  type = gtypenames[pid(),$arg2]; 
-  probestr = sprintf("gobject.object_new(%s) -> %p", type, object);
-}
-
-/**
- * probe gobject.object_ref - Called when a new reference is added to a #GObject
- * @object: Raw pointer to object
- * @gtype: #GType for this object
- * @type: String name of object type
- * @old_refcount: Original value of the reference count
- * @refcount: New value of the reference count
- */
-probe gobject.object_ref = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("object__ref")
-{
-  object = $arg1; 
-  gtype = $arg2; 
-  type = gtypenames[pid(),gtype]; 
-  old_refcount = $arg3; 
-  refcount = old_refcount+1; 
-  probestr = sprintf("gobject.object_ref(%p[%s]) -> %d", object, type, refcount);
-}
-
-/**
- * probe gobject.object_unref - Called when a reference is removed from a #GObject
- * @object: Raw pointer to object
- * @gtype: #GType for this object
- * @type: String name of object type
- * @old_refcount: Original value of the reference count
- */
-probe gobject.object_unref = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("object__unref")
-{
-  object = $arg1; 
-  gtype = $arg2; 
-  type = gtypenames[pid(),gtype]; 
-  old_refcount = $arg3; 
-  refcount = old_refcount-1; 
-  probestr = sprintf("gobject.object_unref(%p [%s]) -> %d", object, type, refcount);
-}
-
-/**
- * probe gobject.object_dispose - Called when a g_object_dispose() run for a #GObject is initiated
- * @object: Raw pointer to object
- * @gtype: #GType for this object
- * @type: String name of object type
- * @last_unref: FIXME
- */
-probe gobject.object_dispose = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("object__dispose")
-{
-  object = $arg1; 
-  gtype = $arg2; 
-  type = gtypenames[pid(),$arg2]; 
-  last_unref = $arg3; 
-  probestr = sprintf("gobject.object_dispose(%p[%s])", object, type);
-}
-
-/**
- * probe gobject.object_dispose_end - Called when a g_object_dispose() run for a #GObject is completed
- * @object: Raw pointer to object
- * @gtype: #GType for this object
- * @type: String name of object type
- * @last_unref: FIXME
- */
-probe gobject.object_dispose_end = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("object__dispose__end")
-{
-  object = $arg1; 
-  gtype = $arg2; 
-  type = gtypenames[pid(),$arg2]; 
-  last_unref = $arg3; 
-  probestr = sprintf("gobject.object_dispose_end(%p[%s])", object, type);
-}
-
-/**
- * probe gobject.object_finalize - Called when finalization for a #GObject is started
- * @object: Raw pointer to object
- * @gtype: #GType for this object
- * @type: String name of object type
- */
-probe gobject.object_finalize = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("object__finalize")
-{
-  object = $arg1; 
-  gtype = $arg2; 
-  type = gtypenames[pid(),$arg2]; 
-  probestr = sprintf("gobject.object_finalize(%p[%s])", object, type);
-}
-
-/**
- * probe gobject.object_finalize - Called when finalization for a #GObject is completed
- * @object: Raw pointer to object
- * @gtype: #GType for this object
- * @type: String name of object type
- */
-probe gobject.object_finalize_end = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("object__finalize__end")
-{
-  object = $arg1; 
-  gtype = $arg2; 
-  type = gtypenames[pid(),$arg2]; 
-  probestr = sprintf("gobject.object_finalize_end(%p[%s])", object, type);
-}
-
-/**
- * probe gobject.signal_new - Called when a new signal is registered for a #GObject
- * @gsignal: Integer value for this signal
- * @name: String name for this signal
- * @gtype: #GType for the type which will gain the new signal
- * @type: String name of the type which will gain the new signal
- */
-probe gobject.signal_new = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("signal__new")
-{
-  gsignal = $arg1; 
-  name = user_string($arg2); 
-  gtype = $arg3; 
-  type = gtypenames[pid(),$arg3]; 
-  probestr = sprintf("gobject.signal_new(%s, %s) -> %d", name, type, gsignal);
-}
-
-/**
- * probe gobject.signal_emit - Called when a signal emission for a #GObject is started
- * @gsignal: Integer value for this signal
- * @detail: String containing signal "detail"
- * @signal: String name of the signal
- * @object: Raw pointer for object emitting signal
- * @gtype: #GType for the type emitting the signal
- * @type: String name of the type emitting the signal
- */
-probe gobject.signal_emit = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("signal__emit")
-{
-  gsignal = $arg1; 
-  detail = $arg2; 
-  signal = gsignalnames[pid(),$arg1]; 
-  if (detail != 0)
-    signal = signal . "::" . gquarks[pid(), detail]
-  object = $arg3; 
-  gtype = $arg4; 
-  type = gtypenames[pid(),$arg4]; 
-  probestr = sprintf("gobject.signal_emit(%p[%s], %s)", object, type, signal);
-}
-
-/**
- * probe gobject.signal_emit_end - Called when a signal emission for a #GObject is completed
- * @gsignal: Integer value for this signal
- * @detail: String containing signal "detail"
- * @signal: String name of the signal
- * @object: Raw pointer for object emitting signal
- * @gtype: #GType for the type emitting the signal
- * @type: String name of the type emitting the signal
- */
-probe gobject.signal_emit_end = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("signal__emit__end")
-{
-  gsignal = $arg1; 
-  detail = $arg2; 
-  signal = gsignalnames[pid(),$arg1]; 
-  if (detail != 0)
-    signal = signal . "::" . gquarks[pid(), detail]
-  object = $arg3; 
-  gtype = $arg4; 
-  type = gtypenames[pid(),$arg4]; 
-  probestr = sprintf("gobject.signal_emit_end(%p[%s], %s)", object, type, signal);
-}