rpms/pinot/devel dbusxapianindex_reload03.patch, NONE, 1.1 pinot.spec, 1.10, 1.11
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Wed Sep 5 16:20:18 UTC 2007
- Previous message (by thread): rpms/kernel/F-7 kernel-2.6.spec, 1.3337, 1.3338 linux-2.6-utrace-core.patch, 1.3, 1.4 linux-2.6-utrace-ptrace-compat.patch, 1.3, 1.4 linux-2.6-utrace-regset.patch, 1.3, 1.4
- Next message (by thread): rpms/hardinfo/devel hardinfo.spec,1.18,1.19 libzfix.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: drago01
Update of /cvs/pkgs/rpms/pinot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15807
Modified Files:
pinot.spec
Added Files:
dbusxapianindex_reload03.patch
Log Message:
fix preferences segfault
dbusxapianindex_reload03.patch:
--- NEW FILE dbusxapianindex_reload03.patch ---
--- pinot-0.76_bak/Index/DBusXapianIndex.cpp 2007-08-22 21:58:20.000000000 +0800
+++ pinot-0.76/Index/DBusXapianIndex.cpp 2007-09-01 11:23:26.000000000 +0800
@@ -17,15 +17,6 @@
*/
#include <iostream>
-extern "C"
-{
-#if DBUS_VERSION < 1000000
-#define DBUS_API_SUBJECT_TO_CHANGE
-#endif
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-}
#include "Languages.h"
#include "XapianDatabaseFactory.h"
@@ -302,7 +293,7 @@
/// Asks the D-Bus service to reload its configuration.
bool DBusXapianIndex::reload(void)
{
- bool reloading = false;
+ gboolean reloading = FALSE;
DBusGConnection *pBus = getBusConnection();
if (pBus == NULL)
@@ -333,7 +324,12 @@
g_object_unref(pBusProxy);
// FIXME: don't we have to call dbus_g_connection_unref(pBus); ?
- return reloading;
+ if (reloading == TRUE)
+ {
+ return true;
+ }
+
+ return false;
}
--- pinot-0.76_bak/Index/DBusXapianIndex.h 2007-08-22 21:54:40.000000000 +0800
+++ pinot-0.76/Index/DBusXapianIndex.h 2007-09-01 11:23:37.000000000 +0800
@@ -21,12 +21,15 @@
#include <string>
#include <set>
+#include "config.h"
extern "C"
{
#if DBUS_VERSION < 1000000
#define DBUS_API_SUBJECT_TO_CHANGE
#endif
#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
}
#include "XapianIndex.h"
--- pinot-0.76_bak/UI/GTK2/src/pinot.cc 2007-08-22 22:01:28.000000000 +0800
+++ pinot-0.76/UI/GTK2/src/pinot.cc 2007-09-01 10:55:10.000000000 +0800
@@ -29,6 +29,7 @@
#include <glibmm/ustring.h>
#include <glibmm/miscutils.h>
#include <glibmm/convert.h>
+#include "config.h"
extern "C"
{
#if DBUS_VERSION < 1000000
@@ -50,7 +51,6 @@
#include "ViewHistory.h"
#include "DownloaderInterface.h"
#include "XapianIndex.h"
-#include "config.h"
#include "NLS.h"
#include "PinotSettings.h"
#include "mainWindow.hh"
Index: pinot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinot/devel/pinot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pinot.spec 23 Aug 2007 15:38:33 -0000 1.10
+++ pinot.spec 5 Sep 2007 16:19:46 -0000 1.11
@@ -1,6 +1,6 @@
Name: pinot
Version: 0.76
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Personal search and metasearch for the Desktop
Group: User Interface/Desktops
@@ -8,6 +8,7 @@
URL: http://pinot.berlios.de/
Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz
Patch0: fix_lang_detect.patch
+Patch1: dbusxapianindex_reload03.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sqlite-devel >= 3.3.1
@@ -50,7 +51,7 @@
%prep
%setup -q
%patch0 -p1 -b .lang_detect
-
+%patch1 -p1 -b .dbus_reload
%build
%configure
@@ -113,6 +114,9 @@
%{_libdir}/deskbar-applet/handlers/pinot-*
%changelog
+* Wed Sep 05 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.76-2
+- Add upstream patch to fix preferences segfault
+
* Thu Aug 23 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.76-1
- Update to final 0.76
- Previous message (by thread): rpms/kernel/F-7 kernel-2.6.spec, 1.3337, 1.3338 linux-2.6-utrace-core.patch, 1.3, 1.4 linux-2.6-utrace-ptrace-compat.patch, 1.3, 1.4 linux-2.6-utrace-regset.patch, 1.3, 1.4
- Next message (by thread): rpms/hardinfo/devel hardinfo.spec,1.18,1.19 libzfix.patch,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list