From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 16 10:20:13 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82B811065679 for ; Mon, 16 Jul 2012 10:20:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 55AE58FC18 for ; Mon, 16 Jul 2012 10:20:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6GAKDD6086874 for ; Mon, 16 Jul 2012 10:20:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6GAKDSE086873; Mon, 16 Jul 2012 10:20:13 GMT (envelope-from gnats) Resent-Date: Mon, 16 Jul 2012 10:20:13 GMT Resent-Message-Id: <201207161020.q6GAKDSE086873@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Jason E. Hale" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F724106566C for ; Mon, 16 Jul 2012 10:14:16 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-qc0-f182.google.com (mail-qc0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id 3C76B8FC12 for ; Mon, 16 Jul 2012 10:14:16 +0000 (UTC) Received: by qcsg15 with SMTP id g15so3700873qcs.13 for ; Mon, 16 Jul 2012 03:14:15 -0700 (PDT) Received: by 10.224.184.204 with SMTP id cl12mr19853250qab.55.1342433655560; Mon, 16 Jul 2012 03:14:15 -0700 (PDT) Received: from mocha.verizon.net (c-71-61-40-68.hsd1.oh.comcast.net. [71.61.40.68]) by mx.google.com with ESMTPS id bo5sm22235601qab.1.2012.07.16.03.14.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 Jul 2012 03:14:15 -0700 (PDT) Message-Id: <1342433654.977569.10763@mocha.verizon.net> Date: Mon, 16 Jul 2012 06:14:14 -0400 From: "Jason E. Hale" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/169905: [MAINTAINER] deskutils/plasma-applet-daisy: Update to 0.0.4.26 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Jason E. Hale" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2012 10:20:13 -0000 >Number: 169905 >Category: ports >Synopsis: [MAINTAINER] deskutils/plasma-applet-daisy: Update to 0.0.4.26 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 16 10:20:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 9.0-RELEASE i386 >Organization: none >Environment: System: FreeBSD mocha.verizon.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Thu Jan 19 11:42:41 EST 2012 Jason@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA9 i386 >Description: - Update deskutils/plasma-applet-daisy to 0.0.4.26 >How-To-Repeat: - Use attached diff - Remove all patches in files directory (applied upstream) - Remove files directory >Fix: --- 2012-07-16-plasma-applet-daisy.diff begins here --- diff -ruN plasma-applet-daisy.orig/Makefile plasma-applet-daisy/Makefile --- plasma-applet-daisy.orig/Makefile 2012-07-16 05:44:36.000000000 -0400 +++ plasma-applet-daisy/Makefile 2012-07-16 05:44:56.000000000 -0400 @@ -6,8 +6,7 @@ # PORTNAME= daisy -PORTVERSION= 0.0.4.25 -PORTREVISION= 5 +PORTVERSION= 0.0.4.26 CATEGORIES= deskutils kde MASTER_SITES= http://cdlszm.org/downloads/ PKGNAMEPREFIX= plasma-applet- diff -ruN plasma-applet-daisy.orig/distinfo plasma-applet-daisy/distinfo --- plasma-applet-daisy.orig/distinfo 2012-07-16 05:44:36.000000000 -0400 +++ plasma-applet-daisy/distinfo 2012-07-16 05:45:32.000000000 -0400 @@ -1,2 +1,2 @@ -SHA256 (plasma-applet-daisy-0.0.4.25.tar.gz) = 159a66dc870481694a36a008cf8947d9a835acc171ba1d33fbc3aeb34773fec1 -SIZE (plasma-applet-daisy-0.0.4.25.tar.gz) = 259724 +SHA256 (plasma-applet-daisy-0.0.4.26.tar.gz) = fcac965ab6bf7d2639efae5fc0e9de2e9cff5028d6d0240c88e6cd3d3b98daed +SIZE (plasma-applet-daisy-0.0.4.26.tar.gz) = 261536 diff -ruN plasma-applet-daisy.orig/files/patch-applet__src__daisy.h plasma-applet-daisy/files/patch-applet__src__daisy.h --- plasma-applet-daisy.orig/files/patch-applet__src__daisy.h 2012-07-16 05:44:36.000000000 -0400 +++ plasma-applet-daisy/files/patch-applet__src__daisy.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,42 +0,0 @@ ---- ./applet/src/daisy.h.orig 2010-06-29 09:11:50.000000000 -0400 -+++ ./applet/src/daisy.h 2012-05-24 02:54:47.000000000 -0400 -@@ -102,8 +102,8 @@ - #include - #include - #include --using TaskManager::TaskPtr; --using TaskManager::StartupPtr; -+using TaskManager::Task; -+using TaskManager::Startup; - using TaskManager::GroupManager; - - -@@ -337,7 +337,7 @@ - bool checkLock(); - - void checkAttention( KWindowInfo taskInfo, QString widclass_tmp ); -- void createTaskThumbnail( TaskPtr task_tmp, int j ); -+ void createTaskThumbnail( Task* task_tmp, int j ); - void scrollTasks(int delta); - - -@@ -418,7 +418,7 @@ - QSizeF m_hoversz; - - -- TaskPtr m_task; -+ Task* m_task; - GroupManager *m_groupManager; - - -@@ -512,8 +512,8 @@ - private slots: - - -- void startupAdded(StartupPtr startupItem); -- void startupRemoved(StartupPtr startupItem); -+ void startupAdded(Startup* startupItem); -+ void startupRemoved(Startup* startupItem); - - - void windowAdded(WId id); diff -ruN plasma-applet-daisy.orig/files/patch-applet__src__daisyTasks.cpp plasma-applet-daisy/files/patch-applet__src__daisyTasks.cpp --- plasma-applet-daisy.orig/files/patch-applet__src__daisyTasks.cpp 2012-07-16 05:44:36.000000000 -0400 +++ plasma-applet-daisy/files/patch-applet__src__daisyTasks.cpp 1969-12-31 19:00:00.000000000 -0500 @@ -1,65 +0,0 @@ ---- ./applet/src/daisyTasks.cpp.orig 2010-11-09 19:29:47.000000000 -0500 -+++ ./applet/src/daisyTasks.cpp 2012-05-24 02:56:20.000000000 -0400 -@@ -159,7 +159,7 @@ - //----------------------------------------------------------------------------- - // Startup added - //FIXME --void daisy::startupAdded(StartupPtr startupItem) -+void daisy::startupAdded(Startup* startupItem) - { - - m_startingwindow = -1; -@@ -195,7 +195,7 @@ - //----------------------------------------------------------------------------- - // Startup removed - //FIXME --void daisy::startupRemoved(StartupPtr startupItem) -+void daisy::startupRemoved(Startup* startupItem) - { - - Q_UNUSED(startupItem); -@@ -218,7 +218,7 @@ - - KWindowInfo taskInfo = KWindowSystem::windowInfo( id, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop, NET::WM2WindowClass ); - -- TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( id ); -+ Task* task_tmp = TaskManager::TaskManager::self()->findTask( id ); - - - if ( m_alias.indexOf( taskInfo.windowClassName() ) != -1 || m_alias.indexOf( QString(taskInfo.windowClassClass().toLower()) ) != -1 ) -@@ -372,7 +372,7 @@ - KWindowInfo taskInfo = KWindowSystem::windowInfo( *it, NET::WMName | NET::WMVisibleName | NET::WMVisibleIconName | NET::WMState | NET::XAWMState | NET::WMDesktop | NET::WMWindowType, NET::WM2WindowClass ); - - -- TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it ); -+ Task* task_tmp = TaskManager::TaskManager::self()->findTask( *it ); - if ( task_tmp && *it == KWindowSystem::activeWindow() ) - {m_focusedWindow = *it;} - -@@ -478,7 +478,7 @@ - //----------------------------------------------------------------------------- - // Create task thumbnail - //FIXME --void daisy::createTaskThumbnail( TaskPtr task_tmp, int j ) -+void daisy::createTaskThumbnail( Task* task_tmp, int j ) - { - QIcon thumbnail; - //thumbnail = QIcon( QPixmap::grabWindow ( task_tmp->win(), 0, 0, -1, -1 ) );//This would suck -@@ -714,7 +714,7 @@ - KWindowInfo taskInfo = KWindowSystem::windowInfo( m_focusedWindow, NET::WMState, NET::WM2WindowClass ); - for (it = taskDict.begin(); it != taskDict.end(); ++it ) - { -- TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( *it ); -+ Task* task_tmp = TaskManager::TaskManager::self()->findTask( *it ); - if ( task_tmp ){real_taskDict << *it;} - } - if (real_taskDict.size() > 0) -@@ -768,7 +768,7 @@ - void daisy::delayTaskIcoChange(void) - { - m_uti_tmr->stop(); -- TaskPtr task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid ); -+ Task* task_tmp = TaskManager::TaskManager::self()->findTask( m_toupwid ); - if ( task_tmp ) - { - // QIcon thumbnail; --- 2012-07-16-plasma-applet-daisy.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: