rpms/libnotifymm/F-10 libnotifymm-0.6.1-closesig.patch, NONE, 1.1 libnotifymm-0.6.1-pkgconfig.patch, NONE, 1.1 libnotifymm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Denis Leroy
denis at fedoraproject.org
Fri Dec 26 08:02:38 UTC 2008
Author: denis
Update of /cvs/pkgs/rpms/libnotifymm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12035
Modified Files:
.cvsignore sources
Added Files:
libnotifymm-0.6.1-closesig.patch
libnotifymm-0.6.1-pkgconfig.patch libnotifymm.spec
Log Message:
Initial checkin
libnotifymm-0.6.1-closesig.patch:
--- NEW FILE libnotifymm-0.6.1-closesig.patch ---
diff -ru --exclude 'Makefile*' libnotifymm-0.6.1/libnotify/libnotifymm/notification.cc libnotifymm-0.6.1/libnotify/libnotifymm/notification.cc
--- libnotifymm-0.6.1/libnotify/libnotifymm/notification.cc 2008-03-26 11:47:06.000000000 +0100
+++ libnotifymm-0.6.1/libnotify/libnotifymm/notification.cc 2008-09-05 10:53:29.000000000 +0200
@@ -100,11 +100,35 @@
{
+static void Notification_signal_closed_callback(NotifyNotification* self, gint p0,void* data)
+{
+ using namespace Notify;
+ typedef sigc::slot< void,gint > SlotType;
+
+ // Do not try to call a signal on a disassociated wrapper.
+ if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
+ {
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
+ (*static_cast<SlotType*>(slot))(p0);
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ }
+}
+
static const Glib::SignalProxyInfo Notification_signal_closed_info =
{
"closed",
- (GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
- (GCallback) &Glib::SignalProxyNormal::slot0_void_callback
+ (GCallback) &Notification_signal_closed_callback,
+ (GCallback) &Notification_signal_closed_callback
};
@@ -173,7 +197,7 @@
#endif //GLIBMM_VFUNCS_ENABLED
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
-void Notification_Class::closed_callback(NotifyNotification* self)
+void Notification_Class::closed_callback(NotifyNotification* self, gint p0)
{
Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
@@ -193,7 +217,7 @@
{
#endif //GLIBMM_EXCEPTIONS_ENABLED
// Call the virtual member method, which derived classes might override.
- obj->on_closed();
+ obj->on_closed(p0);
return;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
}
@@ -211,7 +235,7 @@
// Call the original underlying C function:
if(base && base->closed)
- (*base->closed)(self);
+ (*base->closed)(self, p0);
}
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
@@ -389,9 +413,9 @@
}
-Glib::SignalProxy0< void > Notification::signal_closed()
+Glib::SignalProxy1< void,gint > Notification::signal_closed()
{
- return Glib::SignalProxy0< void >(this, &Notification_signal_closed_info);
+ return Glib::SignalProxy1< void,gint >(this, &Notification_signal_closed_info);
}
@@ -467,14 +491,14 @@
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
-void Notify::Notification::on_closed()
+void Notify::Notification::on_closed(gint reason)
{
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
);
if(base && base->closed)
- (*base->closed)(gobj());
+ (*base->closed)(gobj(),reason);
}
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
diff -ru --exclude 'Makefile*' libnotifymm-0.6.1/libnotify/libnotifymm/notification.h libnotifymm-0.6.1/libnotify/libnotifymm/notification.h
--- libnotifymm-0.6.1/libnotify/libnotifymm/notification.h 2008-03-26 11:47:06.000000000 +0100
+++ libnotifymm-0.6.1/libnotify/libnotifymm/notification.h 2008-09-05 10:52:55.000000000 +0200
@@ -329,10 +329,10 @@
/**
* @par Prototype:
- * <tt>void on_my_%closed()</tt>
+ * <tt>void on_my_%closed(gint reason)</tt>
*/
- Glib::SignalProxy0< void > signal_closed();
+ Glib::SignalProxy1< void,gint > signal_closed();
;
//gtkmmproc error: id : property defs lookup failed.
@@ -451,7 +451,7 @@
//Default Signal Handlers::
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
- virtual void on_closed();
+ virtual void on_closed(gint reason);
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
diff -ru --exclude 'Makefile*' libnotifymm-0.6.1/libnotify/libnotifymm/private/notification_p.h libnotifymm-0.6.1/libnotify/libnotifymm/private/notification_p.h
--- libnotifymm-0.6.1/libnotify/libnotifymm/private/notification_p.h 2007-09-25 12:02:03.000000000 +0200
+++ libnotifymm-0.6.1/libnotify/libnotifymm/private/notification_p.h 2008-09-05 10:53:29.000000000 +0200
@@ -36,7 +36,7 @@
//Callbacks (default signal handlers):
//These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
//You could prevent the original default signal handlers being called by overriding the *_impl method.
- static void closed_callback(NotifyNotification* self);
+ static void closed_callback(NotifyNotification* self, gint p0);
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
//Callbacks (virtual functions):
libnotifymm-0.6.1-pkgconfig.patch:
--- NEW FILE libnotifymm-0.6.1-pkgconfig.patch ---
--- libnotifymm-0.6.1/libnotify/libnotifymm-1.0.pc.in.orig 2008-09-05 11:27:22.000000000 +0200
+++ libnotifymm-0.6.1/libnotify/libnotifymm-1.0.pc.in 2008-09-05 11:27:35.000000000 +0200
@@ -5,7 +5,7 @@
Name: libnotifymm
Description: C++ wrapper for libnotify
-Requires: glibmm-2.4 libnotify
+Requires: gtkmm-2.4 libnotify
Version: @VERSION@
Libs: -L${libdir} -lnotifymm-1.0
Cflags: -I${includedir}/libnotifymm-1.0 -I${libdir}/libnotifymm-1.0/include
--- NEW FILE libnotifymm.spec ---
%define apiver 1.0
%define docdeveldir %{_docdir}/%{name}-devel-%{version}
Name: libnotifymm
Version: 0.6.1
Release: 3%{?dist}
Summary: C++ interface for libnotify
Group: System Environment/Libraries
License: LGPLv2+
URL: http://gtkmm.sourceforge.net/
Source0: http://ftp.gnome.org/pub/GNOME/sources/libnotifymm/0.6/%{name}-%{version}.tar.bz2
Patch0: libnotifymm-0.6.1-closesig.patch
Patch1: libnotifymm-0.6.1-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glibmm24-devel >= 2.12.8
BuildRequires: gtkmm24-devel >= 2.10
BuildRequires: libnotify-devel >= 0.4.3
BuildRequires: doxygen graphviz
%description
libnotifymm provides a C++ interface to the libnotify
library. Highlights include typesafe callbacks, widgets extensible via
inheritance and a comprehensive set of widget classes that can be
freely combined to quickly create complex user interfaces.
%package devel
Summary: Headers for developing programs that will use %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: gtkmm24-devel
Requires: libnotify-devel
Requires: pkgconfig
%description devel
This package contains the libraries and header files needed for
developing %{name} applications.
%prep
%setup -q
%patch0 -p1 -b .signalsig
%patch1 -p1 -b .pkgconfig
%build
%configure --disable-static --enable-reference --disable-dependency-tracking
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" \
referencedir=%{docdeveldir}/html
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
# Remove code-generation related files
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{apiver}
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root, -)
%doc %{docdeveldir}/html
%{_includedir}/%{name}-%{apiver}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%changelog
* Fri Dec 26 2008 Denis Leroy <denis at poolshark.org> - 0.6.1-3
- Added sed line to quiet rpmlint
* Fri Sep 5 2008 Denis Leroy <denis at poolshark.org> - 0.6.1-2
- Added patch to address libnotify rawhide API breakage
* Thu Sep 4 2008 Denis Leroy <denis at poolshark.org> - 0.6.1-1
- Initial version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Dec 2008 00:38:00 -0000 1.1
+++ .cvsignore 26 Dec 2008 08:02:07 -0000 1.2
@@ -0,0 +1 @@
+libnotifymm-0.6.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libnotifymm/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Dec 2008 00:38:00 -0000 1.1
+++ sources 26 Dec 2008 08:02:07 -0000 1.2
@@ -0,0 +1 @@
+e7943688768aed3c695b1643448274c5 libnotifymm-0.6.1.tar.bz2
More information about the fedora-extras-commits
mailing list