diff options
| -rw-r--r-- | deskutils/metabar/Makefile | 4 | ||||
| -rw-r--r-- | deskutils/metabar/distinfo | 4 | ||||
| -rw-r--r-- | deskutils/metabar/files/patch-defaultplugin.cpp | 29 | ||||
| -rw-r--r-- | deskutils/metabar/files/patch-metabar_widget.cpp | 12 | ||||
| -rw-r--r-- | deskutils/metabar/files/patch-metabarwidget.cpp | 11 | ||||
| -rw-r--r-- | deskutils/metabar/files/patch-metascrollview.cpp | 11 | ||||
| -rw-r--r-- | deskutils/metabar/files/patch-serviceloader.cpp | 20 | ||||
| -rw-r--r-- | deskutils/metabar/pkg-plist | 27 |
8 files changed, 76 insertions, 42 deletions
diff --git a/deskutils/metabar/Makefile b/deskutils/metabar/Makefile index fe8063ed79c3..76170230a54a 100644 --- a/deskutils/metabar/Makefile +++ b/deskutils/metabar/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= metabar -PORTVERSION= 0.6 +PORTVERSION= 0.8 CATEGORIES= deskutils kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= markus@FreeBSD.org COMMENT= Sidebar plugin for Konqueror -EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure - WRKSRC= ${WRKDIR}/${PORTNAME} USE_KDEBASE_VER=3 USE_GMAKE= yes diff --git a/deskutils/metabar/distinfo b/deskutils/metabar/distinfo index c0ccdab7c21f..f315cb74bfe0 100644 --- a/deskutils/metabar/distinfo +++ b/deskutils/metabar/distinfo @@ -1,2 +1,2 @@ -MD5 (metabar-0.6.tar.gz) = ff1ecd70c7c6f2384c4007d2e03fbe1c -SIZE (metabar-0.6.tar.gz) = 637221 +MD5 (metabar-0.8.tar.gz) = 8ddbc76b4ab70eeab37cfb414cc3465b +SIZE (metabar-0.8.tar.gz) = 899870 diff --git a/deskutils/metabar/files/patch-defaultplugin.cpp b/deskutils/metabar/files/patch-defaultplugin.cpp new file mode 100644 index 000000000000..9bf1a02f6144 --- /dev/null +++ b/deskutils/metabar/files/patch-defaultplugin.cpp @@ -0,0 +1,29 @@ +--- src/defaultplugin.cpp.orig Wed Jul 13 20:33:54 2005 ++++ src/defaultplugin.cpp Wed Jul 13 20:34:49 2005 +@@ -99,7 +99,7 @@ + for(QStringList::Iterator it = actions.begin(); it != actions.end(); ++it){ + if((*it).startsWith("metabar/")){ + if((*it).right((*it).length() - 8) == "share"){ +- MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", QString::null, actionCount < maxActions ? QString::null : "hiddenaction", actionCount >= maxActions); ++ MetabarWidget::addEntry(innerHTML, i18n("Share"), "action://" + *it, "network", QString::null, actionCount < maxActions ? QString::null : QString("hiddenaction"), actionCount >= maxActions); + actionCount++; + } + } +@@ -111,7 +111,7 @@ + QString text = action.call("plainText()"); + QString icon = iconConfig.readEntry(*it, action.call("icon()")); + +- MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, QString::null, actionCount < maxActions ? QString::null : "hiddenaction", actionCount >= maxActions); ++ MetabarWidget::addEntry(innerHTML, text, "action://" + *it, icon, QString::null, actionCount < maxActions ? QString::null : QString("hiddenaction"), actionCount >= maxActions); + actionCount++; + } + } +@@ -184,7 +184,7 @@ + nam.setNum(id); + + bool hide = id >= max; +- MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), QString::null, hide ? "hiddenapp" : QString::null, hide); ++ MetabarWidget::addEntry(innerHTML, (*it)->name(), "exec://" + nam, (*it)->icon(), QString::null, hide ? QString("hiddenapp") : QString::null, hide); + + runMap.insert(id, *it); + id++; diff --git a/deskutils/metabar/files/patch-metabar_widget.cpp b/deskutils/metabar/files/patch-metabar_widget.cpp deleted file mode 100644 index afbe6e74004e..000000000000 --- a/deskutils/metabar/files/patch-metabar_widget.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/metabar_widget.cpp.orig Sun Apr 3 22:35:03 2005 -+++ src/metabar_widget.cpp Sun Apr 3 22:40:09 2005 -@@ -763,7 +763,8 @@ - void MetabarWidget::slotRunDesktopFile(const QString &url) - { - KURL::List list; -- KRun::run(KService(new KDesktopFile(url)), list); -+ KService service(new KDesktopFile(url)); -+ KRun::run(service, list); - } - - void MetabarWidget::slotShowMore() diff --git a/deskutils/metabar/files/patch-metabarwidget.cpp b/deskutils/metabar/files/patch-metabarwidget.cpp new file mode 100644 index 000000000000..a1e142e06589 --- /dev/null +++ b/deskutils/metabar/files/patch-metabarwidget.cpp @@ -0,0 +1,11 @@ +--- src/metabarwidget.cpp.orig Wed Jul 13 20:30:46 2005 ++++ src/metabarwidget.cpp Wed Jul 13 20:31:20 2005 +@@ -369,7 +369,7 @@ + + DOM::DOMString innerHTML; + innerHTML += QString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height()); +- innerHTML += "<object class=\preview\" type=\""; ++ innerHTML += "<object class=\"preview\" type=\""; + innerHTML += item->mimetype(); + innerHTML += "\" data=\""; + innerHTML += item->url().url(); diff --git a/deskutils/metabar/files/patch-metascrollview.cpp b/deskutils/metabar/files/patch-metascrollview.cpp deleted file mode 100644 index e195598a65a5..000000000000 --- a/deskutils/metabar/files/patch-metascrollview.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/metascrollview.cpp.orig Sun Apr 3 23:03:42 2005 -+++ src/metascrollview.cpp Sun Apr 3 23:06:18 2005 -@@ -43,7 +43,7 @@ - bool visible = verticalScrollBar()->isVisible(); - - int w = width() - (visible ? verticalScrollBar()->width() : 0); -- int h = (int)fmax(height(), metabarWidget->sizeHint().height()); -+ int h = (height() > metabarWidget->sizeHint().height() ? height() : metabarWidget->sizeHint().height()); - - QScrollView::resizeContents(w, h); - diff --git a/deskutils/metabar/files/patch-serviceloader.cpp b/deskutils/metabar/files/patch-serviceloader.cpp new file mode 100644 index 000000000000..18697fced921 --- /dev/null +++ b/deskutils/metabar/files/patch-serviceloader.cpp @@ -0,0 +1,20 @@ +--- src/serviceloader.cpp.orig Wed Jul 13 20:31:36 2005 ++++ src/serviceloader.cpp Wed Jul 13 20:32:30 2005 +@@ -154,7 +154,7 @@ + popup = popups[submenuName]; + } + else{ +- MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? QString::null : "hiddenaction", count >= maxActions); ++ MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? QString::null : QString("hiddenaction"), count >= maxActions); + + popup = new KPopupMenu(); + popups.insert(idString, popup); +@@ -172,7 +172,7 @@ + action->plug(popup); + } + else{ +- MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, QString::null, count < maxActions ? QString::null : "hiddenaction", count >= maxActions); ++ MetabarWidget::addEntry(html, (*it).m_strName, "service://" + idString, (*it).m_strIcon, QString::null, count < maxActions ? QString::null : QString("hiddenaction"), count >= maxActions); + count++; + } + diff --git a/deskutils/metabar/pkg-plist b/deskutils/metabar/pkg-plist index 7a38140ec702..ee9a515b635e 100644 --- a/deskutils/metabar/pkg-plist +++ b/deskutils/metabar/pkg-plist @@ -2,21 +2,20 @@ lib/kde3/konqsidebar_metabar.la lib/kde3/konqsidebar_metabar.so share/apps/konqsidebartng/add/metabar_add.desktop share/apps/konqsidebartng/entries/metabar.desktop +share/apps/metabar/html/default.css +share/apps/metabar/html/layout.html share/apps/metabar/iconsrc -share/doc/HTML/en/sidebar/common -share/doc/HTML/en/sidebar/index.cache.bz2 -share/doc/HTML/en/sidebar/index.docbook -share/icons/crystalsvg/16x16/actions/metabardown.png -share/icons/crystalsvg/16x16/actions/metabarup.png -@unexec rmdir %D/share/icons/crystalsvg/16x16/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true +share/icons/hicolor/16x16/apps/metabar.png +share/icons/hicolor/32x32/apps/metabar.png +@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true +@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true +@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true +@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true +@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true @unexec rmdir %D/share/icons 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/en/sidebar 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true +@dirrm share/apps/metabar/html @dirrm share/apps/metabar -@dirrm share/apps/konqsidebartng/entries -@dirrm share/apps/konqsidebartng/add -@dirrm share/apps/konqsidebartng +@unexec rmdir %D/share/apps/konqsidebartng/entries 2>/dev/null || true +@unexec rmdir %D/share/apps/konqsidebartng/add 2>/dev/null || true +@unexec rmdir %D/share/apps/konqsidebartng 2>/dev/null || true @unexec rmdir %D/share/apps 2>/dev/null || true |