diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-09 14:43:12 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-09 14:43:12 +0000 |
commit | 0f1dd806169317605398fba5ef9a081776d5cab9 (patch) | |
tree | 5565761593e8cc6c9ebd809dee4f29edc137e274 /kde-misc/kerry | |
parent | Add ~x86-fbsd keyword. (diff) | |
download | gentoo-2-0f1dd806169317605398fba5ef9a081776d5cab9.tar.gz gentoo-2-0f1dd806169317605398fba5ef9a081776d5cab9.tar.bz2 gentoo-2-0f1dd806169317605398fba5ef9a081776d5cab9.zip |
Add newer patch to improve ebuilds filter, thanks to Pat Double in bug #129298.
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'kde-misc/kerry')
-rw-r--r-- | kde-misc/kerry/ChangeLog | 11 | ||||
-rw-r--r-- | kde-misc/kerry/Manifest | 46 | ||||
-rw-r--r-- | kde-misc/kerry/files/digest-kerry-0.09 | 3 | ||||
-rw-r--r-- | kde-misc/kerry/files/digest-kerry-0.1-r1 | 3 | ||||
-rw-r--r-- | kde-misc/kerry/files/digest-kerry-0.1-r2 (renamed from kde-misc/kerry/files/digest-kerry-0.1) | 0 | ||||
-rw-r--r-- | kde-misc/kerry/files/kerry-0.09-gentoo.patch | 86 | ||||
-rw-r--r-- | kde-misc/kerry/files/kerry-0.09-xdg-desktop.patch | 11 | ||||
-rw-r--r-- | kde-misc/kerry/files/kerry-0.1-ebuilds-2.patch | 205 | ||||
-rw-r--r-- | kde-misc/kerry/files/kerry-0.1-ebuilds.patch | 82 | ||||
-rw-r--r-- | kde-misc/kerry/kerry-0.09.ebuild | 27 | ||||
-rw-r--r-- | kde-misc/kerry/kerry-0.1-r2.ebuild (renamed from kde-misc/kerry/kerry-0.1-r1.ebuild) | 4 | ||||
-rw-r--r-- | kde-misc/kerry/kerry-0.1.ebuild | 25 |
12 files changed, 226 insertions, 277 deletions
diff --git a/kde-misc/kerry/ChangeLog b/kde-misc/kerry/ChangeLog index 22b007a83750..e63c1f9bf840 100644 --- a/kde-misc/kerry/ChangeLog +++ b/kde-misc/kerry/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for kde-misc/kerry # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/ChangeLog,v 1.4 2006/04/08 16:47:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/ChangeLog,v 1.5 2006/04/09 14:43:12 flameeyes Exp $ + +*kerry-0.1-r2 (09 Apr 2006) + + 09 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/kerry-0.1-ebuilds.patch, +files/kerry-0.1-ebuilds-2.patch, + -files/kerry-0.09-gentoo.patch, -files/kerry-0.09-xdg-desktop.patch, + -kerry-0.1.ebuild, -kerry-0.1-r1.ebuild, +kerry-0.1-r2.ebuild, + -kerry-0.09.ebuild: + Add newer patch to improve ebuilds filter, thanks to Pat Double in bug #129298. *kerry-0.1-r1 (08 Apr 2006) diff --git a/kde-misc/kerry/Manifest b/kde-misc/kerry/Manifest index ce8a61cdd979..72aac77e6120 100644 --- a/kde-misc/kerry/Manifest +++ b/kde-misc/kerry/Manifest @@ -1,46 +1,18 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 f7e937fae8c779bfd0fc3383bb65c6c5 ChangeLog 1065 RMD160 ab33b7666a32b91aa40bba101215cb07ee89c387 ChangeLog 1065 SHA256 e06a9f0dce765b60c09d07fa8990bc22f7c87e3b34565cdecdc04d33485bc388 ChangeLog 1065 -MD5 32bcd516d715b4421a047f816da2d33f files/digest-kerry-0.09 235 -RMD160 fcc8535c9f81a86a48107a24e12623dbf416714d files/digest-kerry-0.09 235 -SHA256 a1a03fc232a8376efedfd5466a04e7acd0a59ac7df10384a094eccdd98aa2565 files/digest-kerry-0.09 235 -MD5 e957fb9753ff8e4cb15d6a10a4d44d40 files/digest-kerry-0.1 232 -RMD160 b4c3d46edadf4079688c0d9f1196f8e58361e3b8 files/digest-kerry-0.1 232 -SHA256 677b0dc673b779dd975d196eea0c6d985f222b3ed65bd13b5ce35a6c93378b70 files/digest-kerry-0.1 232 -MD5 e957fb9753ff8e4cb15d6a10a4d44d40 files/digest-kerry-0.1-r1 232 -RMD160 b4c3d46edadf4079688c0d9f1196f8e58361e3b8 files/digest-kerry-0.1-r1 232 -SHA256 677b0dc673b779dd975d196eea0c6d985f222b3ed65bd13b5ce35a6c93378b70 files/digest-kerry-0.1-r1 232 +MD5 e957fb9753ff8e4cb15d6a10a4d44d40 files/digest-kerry-0.1-r2 232 +RMD160 b4c3d46edadf4079688c0d9f1196f8e58361e3b8 files/digest-kerry-0.1-r2 232 +SHA256 677b0dc673b779dd975d196eea0c6d985f222b3ed65bd13b5ce35a6c93378b70 files/digest-kerry-0.1-r2 232 MD5 ba908eb02cbf1346178f3a0b8c1f2235 files/kerry-0.09-del-shortcut.patch 802 RMD160 7af3f2b00893a849ac8df6cee1a9cefc8dd58c5d files/kerry-0.09-del-shortcut.patch 802 SHA256 23b5013c41ea0e3fe29c53c5e77348aedafec3f37307bba38e055ef09de9df1d files/kerry-0.09-del-shortcut.patch 802 -MD5 97c93802f42dc7b4568c0addf99f6f79 files/kerry-0.09-gentoo.patch 3796 -RMD160 a576335353ef8afe2e3d6d57c5320bec37c664a9 files/kerry-0.09-gentoo.patch 3796 -SHA256 323cee5374c7779e3ffbed381878014162ebd7db6883cb30e10f25878d721f29 files/kerry-0.09-gentoo.patch 3796 -MD5 2218fa5ad4bd26821c1cf21889ff18d4 files/kerry-0.09-xdg-desktop.patch 353 -RMD160 33c1ba86649c77fee895e022a5e95246b9504776 files/kerry-0.09-xdg-desktop.patch 353 -SHA256 fb5fa6ed55eb3f4bb3a36655e966071cdccf1a878cd966a1ebb900e63df9b84f files/kerry-0.09-xdg-desktop.patch 353 -MD5 84206944725b85d14b4dc2523df1db1b files/kerry-0.1-ebuilds.patch 3047 -RMD160 bda4cb13b82e064ffc1adbd6c814edc03e73c7a9 files/kerry-0.1-ebuilds.patch 3047 -SHA256 99aac0435fbf401a246e406e26c13a36c475fa6e1faca01685b83a5a2c427aea files/kerry-0.1-ebuilds.patch 3047 -MD5 70b051498210f67e20ebbd60b016767c kerry-0.09.ebuild 693 -RMD160 c252fe97663e15e97f09afd30a123e9ea1cffdfe kerry-0.09.ebuild 693 -SHA256 833b81342d90ae85172f731fac6361d2613bd6ae73cf632f60626f78789d5188 kerry-0.09.ebuild 693 -MD5 f3eb5ba689cf0ae358a16444070c951f kerry-0.1-r1.ebuild 667 -RMD160 3f0a991e3a9d7591c666aac26b28d8b2bf7a1ec1 kerry-0.1-r1.ebuild 667 -SHA256 b18dbea09772f22486a5e2b81471dd376fb37dceddd89c75dc7c5275aeba5a74 kerry-0.1-r1.ebuild 667 -MD5 6f5956a15ffe1b825de424771fafcb47 kerry-0.1.ebuild 632 -RMD160 a78f718bea52e1db4a5f42d431337ef8b6d8dbd2 kerry-0.1.ebuild 632 -SHA256 70cdc6b7cfce0dda195f1a01c85c6a0c66171791e9487550105f8afc751ba34f kerry-0.1.ebuild 632 +MD5 f808680cb6070b063b30f181a04745bb files/kerry-0.1-ebuilds-2.patch 101968 +RMD160 429b366dc63a0adf82b82c9ca752a434b999b7e3 files/kerry-0.1-ebuilds-2.patch 101968 +SHA256 f9469848963c5ba030a147643e5431c79f313962a759822c0649fa1188360899 files/kerry-0.1-ebuilds-2.patch 101968 +MD5 4ff814524c1c8e1e3c51abfddbbd0a22 kerry-0.1-r2.ebuild 669 +RMD160 aa8ce9aac01827eb9ae00b756e7b0e0e796195e0 kerry-0.1-r2.ebuild 669 +SHA256 cfaa0f6d5bec8d5ab25069f3f606a7ca0adb95e0327d495ffe8d27f56dd1aa1c kerry-0.1-r2.ebuild 669 MD5 9b3a540894ad552b2bdb7538bdd95dee metadata.xml 247 RMD160 cfbcab66aac2f2a6947df91e47d55b96d483f747 metadata.xml 247 SHA256 3dee667978321b1af7559d4e85f8492a58f5737c5e11ba339c4e6d460313adfe metadata.xml 247 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQFEN+kvAiZjviIA2XgRAmFoAJ9nMJ5nFlTTTetccMld+sOx2+po5wCfc/uZ -b8hqB+H93zzLqnswseDMFO0= -=MISa ------END PGP SIGNATURE----- diff --git a/kde-misc/kerry/files/digest-kerry-0.09 b/kde-misc/kerry/files/digest-kerry-0.09 deleted file mode 100644 index 3183e70551d2..000000000000 --- a/kde-misc/kerry/files/digest-kerry-0.09 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a5740a62194a10b8ee8c47acb5771820 kerry-0.09.tar.bz2 278768 -RMD160 a83b5e36d0c336899c7d6920747cd18987f505c9 kerry-0.09.tar.bz2 278768 -SHA256 421e8a9f8caac776f456039af512fdf92fc25ca3a040cad2c1fd7df513d17c81 kerry-0.09.tar.bz2 278768 diff --git a/kde-misc/kerry/files/digest-kerry-0.1-r1 b/kde-misc/kerry/files/digest-kerry-0.1-r1 deleted file mode 100644 index 87d5c4ed4038..000000000000 --- a/kde-misc/kerry/files/digest-kerry-0.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e42315ef9db6b1eee67df6d9ac712032 kerry-0.1.tar.bz2 491000 -RMD160 f8db683cdde09bb61732a5c45c461d68aeec63d0 kerry-0.1.tar.bz2 491000 -SHA256 e0fd3aa5743d19dde7785f2dda672c957c9cb50ec15da9a8e233adf549259182 kerry-0.1.tar.bz2 491000 diff --git a/kde-misc/kerry/files/digest-kerry-0.1 b/kde-misc/kerry/files/digest-kerry-0.1-r2 index 87d5c4ed4038..87d5c4ed4038 100644 --- a/kde-misc/kerry/files/digest-kerry-0.1 +++ b/kde-misc/kerry/files/digest-kerry-0.1-r2 diff --git a/kde-misc/kerry/files/kerry-0.09-gentoo.patch b/kde-misc/kerry/files/kerry-0.09-gentoo.patch deleted file mode 100644 index 2bbab21703b1..000000000000 --- a/kde-misc/kerry/files/kerry-0.09-gentoo.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -ru kerry-0.09/src/beaglesearch.cpp kerry-0.09-double/src/beaglesearch.cpp ---- kerry-0.09/src/beaglesearch.cpp 2006-02-14 05:07:44.000000000 -0600 -+++ kerry-0.09-double/src/beaglesearch.cpp 2006-03-25 14:41:41.000000000 -0600 -@@ -83,6 +83,11 @@ - { BeagleSearch::Website, "dc:title", 0 }, - { BeagleSearch::Website, "Title", 0 }, - { BeagleSearch::Note, "dc:title", 0 }, -+// Gentoo ebuilds -+ { BeagleSearch::Ebuilds, "dc:title", I18N_NOOP("Title: %1")"<br>" }, -+ { BeagleSearch::Ebuilds, "dc:description", I18N_NOOP("Description: %1")"<br>" }, -+ { BeagleSearch::Ebuilds, "fixme:version", I18N_NOOP("Version: %1")"<br>" }, -+ { BeagleSearch::Ebuilds, "dc:source", I18N_NOOP("Homepage: %1")"<br>" }, - { BeagleSearch::Unknown, "dc:author", I18N_NOOP("Author: %1")"<br>" }, - { BeagleSearch::Unknown, "dc:title", I18N_NOOP("Title: %1")"<br>" }, - // Calendar -@@ -148,6 +153,7 @@ - { BeagleSearch::Website, 0, "Google", 0 }, - { BeagleSearch::Website, 0, "WebHistory", 0 }, - { BeagleSearch::Website, 0, 0, "beagle/x-konq-cache" }, -+ { BeagleSearch::Ebuilds, "*.ebuild", 0, 0 }, - { BeagleSearch::Unknown, "file://", "File", 0 }, // mimetype wildcard must be last - { 0, 0, 0, 0} - }; -@@ -330,7 +336,7 @@ - #endif - - for( uint i = 0; hitflavorinfos[i].tilegroup!=0; i++ ) { -- if( (hitflavorinfos[i].uri == 0 || (*(result->uri)).startsWith(hitflavorinfos[i].uri)) && -+ if( (hitflavorinfos[i].uri == 0 || (*(result->uri)).startsWith(hitflavorinfos[i].uri) || (hitflavorinfos[i].uri[0]=='*' && (*(result->uri)).endsWith(hitflavorinfos[i].uri+1))) && - (hitflavorinfos[i].type == 0 || hitflavorinfos[i].type==result->hit_type) && - (hitflavorinfos[i].mimetype == 0 || (*(result->mime_type)).startsWith(hitflavorinfos[i].mimetype))) { - result->tilegroup = (TileGroup)hitflavorinfos[i].tilegroup; -diff -ru kerry-0.09/src/beaglesearch.h kerry-0.09-double/src/beaglesearch.h ---- kerry-0.09/src/beaglesearch.h 2006-02-14 05:07:44.000000000 -0600 -+++ kerry-0.09-double/src/beaglesearch.h 2006-03-25 14:41:41.000000000 -0600 -@@ -51,7 +51,8 @@ - Conversations, // in combo box - Website, // in combo box - Feed, -- Note -+ Note, -+ Ebuilds - }; - - typedef QValueList<QString> PropertyList; -diff -ru kerry-0.09/src/searchdlg.cpp kerry-0.09-double/src/searchdlg.cpp ---- kerry-0.09/src/searchdlg.cpp 2006-03-13 04:40:58.000000000 -0600 -+++ kerry-0.09-double/src/searchdlg.cpp 2006-03-25 14:54:21.000000000 -0600 -@@ -669,6 +669,9 @@ - case Website: - show = ( result->tilegroup == BeagleSearch::Website); - break; -+ case Ebuilds: -+ show = ( result->tilegroup == BeagleSearch::Ebuilds); -+ break; - default: - break; - } -diff -ru kerry-0.09/src/searchdlg.h kerry-0.09-double/src/searchdlg.h ---- kerry-0.09/src/searchdlg.h 2006-01-10 10:13:29.000000000 -0600 -+++ kerry-0.09-double/src/searchdlg.h 2006-03-25 14:53:41.000000000 -0600 -@@ -42,7 +42,8 @@ - Conversations, - Images, - Media, -- Website -+ Website, -+ Ebuilds - }; - - enum SortType { -diff -ru kerry-0.09/src/searchdlg_layout.ui kerry-0.09-double/src/searchdlg_layout.ui ---- kerry-0.09/src/searchdlg_layout.ui 2006-03-25 14:37:22.000000000 -0600 -+++ kerry-0.09-double/src/searchdlg_layout.ui 2006-03-25 14:54:05.000000000 -0600 -@@ -250,6 +250,11 @@ - <string>Web Pages</string> - </property> - </item> -+ <item> -+ <property name="text"> -+ <string>Ebuilds</string> -+ </property> -+ </item> - <property name="name"> - <cstring>comboShow</cstring> - </property> diff --git a/kde-misc/kerry/files/kerry-0.09-xdg-desktop.patch b/kde-misc/kerry/files/kerry-0.09-xdg-desktop.patch deleted file mode 100644 index cecea4c4a613..000000000000 --- a/kde-misc/kerry/files/kerry-0.09-xdg-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: kerry/src/Makefile.am -=================================================================== ---- kerry.orig/src/Makefile.am -+++ kerry/src/Makefile.am -@@ -38,5 +38,5 @@ autostart_DATA = kerry.autostart.desktop - shutdowndir = $(prefix)/shutdown - shutdown_SCRIPTS = beagled-shutdown.sh - --kde_apps_DATA = kerry.desktop -+xdg_apps_DATA = kerry.desktop - diff --git a/kde-misc/kerry/files/kerry-0.1-ebuilds-2.patch b/kde-misc/kerry/files/kerry-0.1-ebuilds-2.patch new file mode 100644 index 000000000000..e3bf056add04 --- /dev/null +++ b/kde-misc/kerry/files/kerry-0.1-ebuilds-2.patch @@ -0,0 +1,205 @@ +diff -ru kerry-0.1/src/beaglesearch.cpp kerry-0.1-double/src/beaglesearch.cpp +--- kerry-0.1/src/beaglesearch.cpp 2006-04-03 10:50:47.000000000 -0500 ++++ kerry-0.1-double/src/beaglesearch.cpp 2006-04-07 17:01:50.000000000 -0500 +@@ -83,6 +83,14 @@ + { BeagleSearch::Website, "dc:title", 0 }, + { BeagleSearch::Website, "Title", 0 }, + { BeagleSearch::Note, "dc:title", 0 }, ++// Gentoo ebuilds ++ { BeagleSearch::Ebuilds, "dc:title", I18N_NOOP("Title: %1")"<br>" }, ++ { BeagleSearch::Ebuilds, "dc:description", 0 }, ++ { BeagleSearch::Ebuilds, "fixme:version", I18N_NOOP("Version: %1")"<br>" }, ++ { BeagleSearch::Ebuilds, "dc:source", 0 }, ++ { BeagleSearch::Ebuilds, "fixme:download_size", 0 }, ++ { BeagleSearch::Ebuilds, "fixme:install_time", 0 }, ++ { BeagleSearch::Ebuilds, "fixme:contents_byte_count", 0 }, + { BeagleSearch::Unknown, "dc:author", I18N_NOOP("Author: %1")"<br>" }, + { BeagleSearch::Unknown, "dc:title", I18N_NOOP("Title: %1")"<br>" }, + // Calendar +@@ -148,6 +156,7 @@ + { BeagleSearch::Website, 0, "Google", 0 }, + { BeagleSearch::Website, 0, "WebHistory", 0 }, + { BeagleSearch::Website, 0, 0, "beagle/x-konq-cache" }, ++ { BeagleSearch::Ebuilds, "*.ebuild", 0, 0 }, + { BeagleSearch::Unknown, "file://", "File", 0 }, // mimetype wildcard must be last + { 0, 0, 0, 0} + }; +Only in kerry-0.1-double/src: beaglesearch.cpp.orig +diff -ru kerry-0.1/src/beaglesearch.h kerry-0.1-double/src/beaglesearch.h +--- kerry-0.1/src/beaglesearch.h 2006-02-14 05:07:44.000000000 -0600 ++++ kerry-0.1-double/src/beaglesearch.h 2006-04-07 16:59:14.000000000 -0500 +@@ -51,7 +51,8 @@ + Conversations, // in combo box + Website, // in combo box + Feed, +- Note ++ Note, ++ Ebuilds + }; + + typedef QValueList<QString> PropertyList; +diff -ru kerry-0.1/src/searchdlg.cpp kerry-0.1-double/src/searchdlg.cpp +--- kerry-0.1/src/searchdlg.cpp 2006-03-13 04:40:58.000000000 -0600 ++++ kerry-0.1-double/src/searchdlg.cpp 2006-04-08 19:52:37.000000000 -0500 +@@ -548,6 +548,82 @@ + item->insertHeaderWidget(0,headerFileLabel); + connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen())); + } ++ else if (result->tilegroup == BeagleSearch::Ebuilds) { ++ item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("kuroo", KIcon::NoGroup, KIcon::SizeLarge)); ++ ++ KerryLabel *headerFileLabel = new KerryLabel(item); ++ headerFileLabel->setText(url.fileName()); ++ headerFileLabel->setTipText(url.prettyURL()); ++ headerFileLabel->setUseTips(); ++ headerFileLabel->setURL(*(result->uri)); ++ item->insertHeaderWidget(0,headerFileLabel); ++ connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen())); ++ ++ QLabel *headerLabel = new QLabel(item); ++ headerLabel->setText(i18n(" from ")); ++ headerLabel->setAlignment(headerLabel->alignment() | Qt::SingleLine); ++ item->insertHeaderWidget(1,headerLabel); ++ ++ QStringList _properties(result->properties); ++ QString homepage = takeProperty("dc:source",_properties); ++ if (!homepage.isEmpty()) ++ { ++ KerryLabel *headerFileLabel = new KerryLabel(item); ++ headerFileLabel->setText(homepage); ++ headerFileLabel->setAlignment(headerFileLabel->alignment() | Qt::SingleLine); ++ headerFileLabel->setURL(homepage); ++ item->insertHeaderWidget(2,headerFileLabel); ++ connect(headerFileLabel, SIGNAL(leftClickedURL(const QString&)), SLOT(slotOpenURL(const QString&))); ++ } ++ ++ item->setDescriptionText(takeProperty("dc:description", _properties)); ++ ++ QString properties; ++ QString install_time_str = takeProperty("fixme:install_time", _properties); ++ if (!install_time_str.isEmpty()) ++ { ++ properties=properties+i18n("Installed On: %1").arg(KGlobal::locale()->formatDateTime(datetimeFromString(install_time_str),false))+"<br>"; ++ } ++ ++ QString install_size_str = takeProperty("fixme:contents_byte_count", _properties); ++ if (!install_size_str.isEmpty()) ++ { ++ properties=properties+i18n("Installed Size: %1").arg(formatBytes(install_size_str))+"<br>"; ++ } ++ ++ QString download_size_str = takeProperty("fixme:download_size", _properties); ++ if (!download_size_str.isEmpty()) ++ { ++ properties=properties+i18n("Download Size: %1").arg(formatBytes(download_size_str))+"<br>"; ++ } ++ ++ BeagleSearch::PropertyList::iterator it; ++ for ( it = _properties.begin(); it != _properties.end(); ++it ) ++ { ++ properties=properties+(*it); ++ } ++ ++ if (result->snippet) { ++ if (!properties.isEmpty()) ++ properties=properties+"<br>"; ++ properties=properties+*(result->snippet); ++ } ++ ++ if (!properties.isEmpty()) ++ item->setPropertiesText("<qt>"+properties+"</qt>"); ++ ++ ++ item->insertHitSpacing(2,10); ++ buttonGo = new KURLLabel(item); ++ buttonGo->setPixmap(SmallIcon("kfm")); ++ item->insertHitWidget(3,buttonGo); ++ connect(buttonGo, SIGNAL(leftClickedURL()), SLOT(slotOpenDir())); ++ ++ buttonGo = new KURLLabel(item); ++ buttonGo->setText(i18n("Reveal in File Manager")); ++ item->insertHitWidget(4,buttonGo); ++ connect(buttonGo, SIGNAL(leftClickedURL()), SLOT(slotOpenDir())); ++ } + else { + KFileItem *fileitem=new KFileItem(*(result->uri),*(result->mime_type),KFileItem::Unknown); + item->icon->setPixmap(fileitem->pixmap(KIcon::SizeHuge, KIcon::DefaultState)); +@@ -669,6 +745,9 @@ + case Website: + show = ( result->tilegroup == BeagleSearch::Website); + break; ++ case Ebuilds: ++ show = ( result->tilegroup == BeagleSearch::Ebuilds); ++ break; + default: + break; + } +@@ -780,6 +859,24 @@ + } + } + ++void SearchDlg::slotOpenURL(const QString& url) ++{ ++ KURL urlObj(url); ++ //KRun run(urlObj); ++ //run.setAutoDelete(false); ++ KRun::runURL(url, "text/html", false, true); ++} ++ ++QString SearchDlg::formatBytes(QString& bytesStr) const ++{ ++ static double kilobyte = 1024.0; ++ static double megabyte = 1024.0*1024.0; ++ double bytes = KGlobal::locale()->readNumber(bytesStr); ++ if (bytes < megabyte) ++ return KGlobal::locale()->formatNumber(bytes/kilobyte, 2) + "K"; ++ return KGlobal::locale()->formatNumber(bytes/megabyte, 2) + "M"; ++} ++ + void SearchDlg::slotStartBeagle() + { + if (cb_beagleStart->isChecked()) { +diff -ru kerry-0.1/src/searchdlg.h kerry-0.1-double/src/searchdlg.h +--- kerry-0.1/src/searchdlg.h 2006-01-10 10:13:29.000000000 -0600 ++++ kerry-0.1-double/src/searchdlg.h 2006-04-08 19:50:37.000000000 -0500 +@@ -42,7 +42,8 @@ + Conversations, + Images, + Media, +- Website ++ Website, ++ Ebuilds + }; + + enum SortType { +@@ -85,6 +86,7 @@ + void slotOpenDir(); + void slotMailTo(const QString&); + void slotOpenEvolution(const QString&); ++ void slotOpenURL(const QString&); + void slotContextMenu( int row, int col, const QPoint & pos ); + void slotPreview(const KFileItem *, const QPixmap &); + void slotPreviewResult(); +@@ -99,6 +101,7 @@ + void fillTableHits(); + void updateStatus(); + void showQuickTips(); ++ QString formatBytes(QString& bytesStr) const; + QCheckBox* cb_beagleStart; + + void displayResults(BeagleSearch::BeagleResultList &items); +diff -ru kerry-0.1/src/searchdlg_layout.ui kerry-0.1-double/src/searchdlg_layout.ui +--- kerry-0.1/src/searchdlg_layout.ui 2006-03-24 02:58:25.000000000 -0600 ++++ kerry-0.1-double/src/searchdlg_layout.ui 2006-04-07 16:59:14.000000000 -0500 +@@ -250,6 +250,11 @@ + <string>Web Pages</string> + </property> + </item> ++ <item> ++ <property name="text"> ++ <string>Ebuilds</string> ++ </property> ++ </item> + <property name="name"> + <cstring>comboShow</cstring> + </property> diff --git a/kde-misc/kerry/files/kerry-0.1-ebuilds.patch b/kde-misc/kerry/files/kerry-0.1-ebuilds.patch deleted file mode 100644 index 5e0de01e73e5..000000000000 --- a/kde-misc/kerry/files/kerry-0.1-ebuilds.patch +++ /dev/null @@ -1,82 +0,0 @@ -Index: kerry/src/beaglesearch.cpp -=================================================================== ---- kerry.orig/src/beaglesearch.cpp -+++ kerry/src/beaglesearch.cpp -@@ -83,6 +83,11 @@ static const PropertyInfo propertiesInfo - { BeagleSearch::Website, "dc:title", 0 }, - { BeagleSearch::Website, "Title", 0 }, - { BeagleSearch::Note, "dc:title", 0 }, -+// Gentoo ebuilds -+ { BeagleSearch::Ebuilds, "dc:title", I18N_NOOP("Title: %1")"<br>" }, -+ { BeagleSearch::Ebuilds, "dc:description", I18N_NOOP("Description: %1")"<br>" }, -+ { BeagleSearch::Ebuilds, "fixme:version", I18N_NOOP("Version: %1")"<br>" }, -+ { BeagleSearch::Ebuilds, "dc:source", I18N_NOOP("Homepage: %1")"<br>" }, - { BeagleSearch::Unknown, "dc:author", I18N_NOOP("Author: %1")"<br>" }, - { BeagleSearch::Unknown, "dc:title", I18N_NOOP("Title: %1")"<br>" }, - // Calendar -@@ -148,6 +153,7 @@ static const HitFlavorInfo hitflavorinfo - { BeagleSearch::Website, 0, "Google", 0 }, - { BeagleSearch::Website, 0, "WebHistory", 0 }, - { BeagleSearch::Website, 0, 0, "beagle/x-konq-cache" }, -+ { BeagleSearch::Ebuilds, "*.ebuild", 0, 0 }, - { BeagleSearch::Unknown, "file://", "File", 0 }, // mimetype wildcard must be last - { 0, 0, 0, 0} - }; -Index: kerry/src/beaglesearch.h -=================================================================== ---- kerry.orig/src/beaglesearch.h -+++ kerry/src/beaglesearch.h -@@ -51,7 +51,8 @@ enum TileGroup { - Conversations, // in combo box - Website, // in combo box - Feed, -- Note -+ Note, -+ Ebuilds - }; - - typedef QValueList<QString> PropertyList; -Index: kerry/src/searchdlg.cpp -=================================================================== ---- kerry.orig/src/searchdlg.cpp -+++ kerry/src/searchdlg.cpp -@@ -669,6 +669,9 @@ void SearchDlg::displayResults(BeagleSea - case Website: - show = ( result->tilegroup == BeagleSearch::Website); - break; -+ case Ebuilds: -+ show = ( result->tilegroup == BeagleSearch::Ebuilds); -+ break; - default: - break; - } -Index: kerry/src/searchdlg.h -=================================================================== ---- kerry.orig/src/searchdlg.h -+++ kerry/src/searchdlg.h -@@ -42,7 +42,8 @@ class SearchDlg : public HitsLayout, vir - Conversations, - Images, - Media, -- Website -+ Website, -+ Ebuilds - }; - - enum SortType { -Index: kerry/src/searchdlg_layout.ui -=================================================================== ---- kerry.orig/src/searchdlg_layout.ui -+++ kerry/src/searchdlg_layout.ui -@@ -250,6 +250,11 @@ - <string>Web Pages</string> - </property> - </item> -+ <item> -+ <property name="text"> -+ <string>Ebuilds</string> -+ </property> -+ </item> - <property name="name"> - <cstring>comboShow</cstring> - </property> diff --git a/kde-misc/kerry/kerry-0.09.ebuild b/kde-misc/kerry/kerry-0.09.ebuild deleted file mode 100644 index 2547e2210f9b..000000000000 --- a/kde-misc/kerry/kerry-0.09.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/kerry-0.09.ebuild,v 1.3 2006/04/06 19:50:53 swegener Exp $ - -inherit kde - -DESCRIPTION="Kerry Beagle is a KDE frontend for the Beagle desktop search daemon" -HOMEPAGE="http://en.opensuse.org/Kerry" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -SRC_URI="http://developer.kde.org/~binner/kerry/${P}.tar.bz2" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=app-misc/beagle-0.2" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/${PN} - -need-kde 3.4 - -PATCHES="${FILESDIR}/${P}-del-shortcut.patch - ${FILESDIR}/${P}-gentoo.patch - ${FILESDIR}/${P}-xdg-desktop.patch" - diff --git a/kde-misc/kerry/kerry-0.1-r1.ebuild b/kde-misc/kerry/kerry-0.1-r2.ebuild index 320bfdd64998..2a83f67fdb57 100644 --- a/kde-misc/kerry/kerry-0.1-r1.ebuild +++ b/kde-misc/kerry/kerry-0.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/kerry-0.1-r1.ebuild,v 1.1 2006/04/08 16:47:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/kerry-0.1-r2.ebuild,v 1.1 2006/04/09 14:43:12 flameeyes Exp $ inherit kde @@ -21,6 +21,6 @@ S=${WORKDIR}/${PN} need-kde 3.4 -PATCHES="${FILESDIR}/${P}-ebuilds.patch +PATCHES="${FILESDIR}/${P}-ebuilds-2.patch ${FILESDIR}/${PN}-0.09-del-shortcut.patch" diff --git a/kde-misc/kerry/kerry-0.1.ebuild b/kde-misc/kerry/kerry-0.1.ebuild deleted file mode 100644 index 37c8d6f705fc..000000000000 --- a/kde-misc/kerry/kerry-0.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/kerry-0.1.ebuild,v 1.1 2006/04/07 19:00:35 flameeyes Exp $ - -inherit kde - -DESCRIPTION="Kerry Beagle is a KDE frontend for the Beagle desktop search daemon" -HOMEPAGE="http://en.opensuse.org/Kerry" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -SRC_URI="http://developer.kde.org/~binner/kerry/${P}.tar.bz2" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=app-misc/beagle-0.2" -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -S=${WORKDIR}/${PN} - -need-kde 3.4 - -PATCHES="${FILESDIR}/${PN}-0.09-del-shortcut.patch" - |