Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01fedbba0ec5b44dd4e6a5870977a46a8e513307
commit 01fedbba0ec5b44dd4e6a5870977a46a8e513307 Author: crazy <[EMAIL PROTECTED]> Date: Thu Sep 6 23:34:53 2007 +0200 pinot-0.76-1-i686 * Version bump ( finally ) * added 3 patches to fix some issues I've found * patches and workaround from FB already commited in upstream svn ;) * note there are still problems with dbus in some cases but I work * with upstream to solve these too diff --git a/source/xapps-extra/pinot/FrugalBuild b/source/xapps-extra/pinot/FrugalBuild index 7c85c3b..dd78027 100644 --- a/source/xapps-extra/pinot/FrugalBuild +++ b/source/xapps-extra/pinot/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: crazy <[EMAIL PROTECTED]> pkgname=pinot -pkgver=0.75 +pkgver=0.76 pkgrel=1 pkgdesc="Personal search and metasearch for the Free Desktop" url="http://pinot.berlios.de/"; @@ -16,6 +16,24 @@ options=('scriptlet') groups=('xapps-extra') archs=('i686' 'x86_64') Finclude berlios -unset MAKEFLAGS -sha1sums=('7e4c7316af01eb5e514bee013646ce03f6f74617') +source=($source \ + fix_SMP_build.patch \ + dbusxapianindex_reload03.patch \ + desktop.patch) +sha1sums=('e76b717636589bb31dda43dd489de5b851add080' \ + 'a347515f4be9566218c7232e6cb73ae3257999f4' \ + '20261834a958955918e7e3eca9b9d498f6acfaa7' \ + 'a0e47dc21fa7073357b5c5729d3ad22c1f2df43d') + +build() +{ + Fcd + Fpatchall + touch INSTALL ChangeLog || Fdie + mkdir m4 || Fdie + Fautoreconf + Fmake + Fmakeinstall +} + # optimization OK diff --git a/source/xapps-extra/pinot/dbusxapianindex_reload03.patch b/source/xapps-extra/pinot/dbusxapianindex_reload03.patch new file mode 100644 index 0000000..d33097d --- /dev/null +++ b/source/xapps-extra/pinot/dbusxapianindex_reload03.patch @@ -0,0 +1,77 @@ +--- 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" diff --git a/source/xapps-extra/pinot/desktop.patch b/source/xapps-extra/pinot/desktop.patch new file mode 100644 index 0000000..67ee343 --- /dev/null +++ b/source/xapps-extra/pinot/desktop.patch @@ -0,0 +1,22 @@ +--- pinot-0.76/pinot.desktop 2007-03-28 11:52:34.000000000 +0200 ++++ pinot-0.76-p/pinot.desktop 2007-09-06 23:05:06.000000000 +0200 +@@ -16,7 +16,7 @@ + Comment[sv]=Sök på webben och i dina dokument + Exec=pinot + StartupNotify=true +-Icon=pinot.png ++Icon=pinot + Terminal=false + Type=Application + Categories=GTK;Core;Network;Filesystem; +--- pinot-0.76/pinot-dbus-daemon.desktop 2006-11-12 03:50:07.000000000 +0100 ++++ pinot-0.76-p/pinot-dbus-daemon.desktop 2007-09-06 23:04:55.000000000 +0200 +@@ -2,7 +2,7 @@ + Name=Pinot + Comment=Search the Web and your documents + Exec=pinot-dbus-daemon +-Icon=pinot.png ++Icon=pinot + Terminal=false + Type=Application + Categories= diff --git a/source/xapps-extra/pinot/fix_SMP_build.patch b/source/xapps-extra/pinot/fix_SMP_build.patch new file mode 100644 index 0000000..3a5d28f --- /dev/null +++ b/source/xapps-extra/pinot/fix_SMP_build.patch @@ -0,0 +1,73 @@ +Index: Search/Makefile.am +=================================================================== +--- Search/Makefile.am (Revision 954) ++++ Search/Makefile.am (Arbeitskopie) +@@ -28,7 +28,6 @@ + noinst_LTLIBRARIES = libSearch.la + endif + +-bin_PROGRAMS = pinot-search + + libSearch_la_SOURCES = \ + AbstractGenerator.cpp \ +@@ -55,16 +54,25 @@ + SOAPEnvNS.cpp + endif + +-pinot_search_SOURCES = \ +- pinot-search.cpp ++bin_PROGRAMS = pinot-search + + pinot_search_LDADD = -L../Utils -L../Tokenize -L../Collect -L../Index -LGoogle -Lxesam \ + @SEARCH_LIBS@ -lIndex -lCollect -lTokenize -lUtils -lBasicUtils \ + @GLIBMM_LIBS@ @INDEX_LIBS@ @SOAP_LIBS@ @XML_LIBS@ @GMIME_LIBS@ @HTTP_LIBS@ @MISC_LIBS@ + ++pinot_search_SOURCES = \ ++ pinot-search.cpp ++ ++if HAVE_SOAP ++pinot_search_DEPENDENCIES = libSearch.la libSearchSOAP.la ++else ++pinot_search_DEPENDENCIES = libSearch.la ++endif ++ + SOAPEnvC.cpp : SOAPEnv.h + soapcpp2 -pSOAPEnv SOAPEnv.h + ++ + AM_CXXFLAGS = -I$(srcdir)/../Utils -I$(srcdir)/../Tokenize -I$(srcdir)/../Tokenize/filters \ + -I$(srcdir)/../Collect -I$(srcdir)/../Index -IGoogle -Ixesam \ + @HTTP_CFLAGS@ @XML_CFLAGS@ @INDEX_CFLAGS@ @SOAP_CFLAGS@ @GMIME_CFLAGS@ @GLIBMM_CFLAGS@ +Index: Index/Makefile.am +=================================================================== +--- Index/Makefile.am (Revision 954) ++++ Index/Makefile.am (Arbeitskopie) +@@ -12,8 +12,6 @@ + + noinst_LTLIBRARIES = libIndex.la + +-bin_PROGRAMS = pinot-index +- + libIndex_la_SOURCES = \ + DBusXapianIndex.cpp \ + FilterWrapper.cpp \ +@@ -23,13 +21,17 @@ + XapianDatabaseFactory.cpp \ + XapianIndex.cpp + +-pinot_index_SOURCES = \ +- pinot-index.cpp ++bin_PROGRAMS = pinot-index + + pinot_index_LDADD = -L../Utils -L../Tokenize -L../Collect \ + -lIndex -lCollect -lTokenize -lBasicUtils -lUtils \ + @GLIBMM_LIBS@ @INDEX_LIBS@ @DBUS_LIBS@ @XML_LIBS@ @GMIME_LIBS@ @HTTP_LIBS@ @MISC_LIBS@ + ++pinot_index_SOURCES = \ ++ pinot-index.cpp ++ ++pinot_index_DEPENDENCIES = libIndex.la ++ + AM_CXXFLAGS = -I$(srcdir)/../Utils -I$(srcdir)/../Tokenize -I$(srcdir)/../Tokenize/filters \ + -I$(srcdir)/../Collect @HTTP_CFLAGS@ @GMIME_CFLAGS@ @XML_CFLAGS@ @DBUS_CFLAGS@ @INDEX_CFLAGS@ + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
