Date: Fri, 16 Mar 2007 01:00:21 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/110342: Update port: deskutils/ksmoothdock to 4.3 Message-ID: <20070316010021.d516f317.tkato432@yahoo.com> Resent-Message-ID: <200703151610.l2FGA7cx067983@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 110342
>Category: ports
>Synopsis: Update port: deskutils/ksmoothdock to 4.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 15 16:10:07 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.11-RELEASE-p26 i386
>Organization:
>Environment:
>Description:
- Update to version 4.3
New file:
files/patch-src__buttonisedstate.h
files/patch-src__desktopselector.cpp
files/patch-src__iconbaseddockitem.cpp
files/patch-src__ksmoothdock.cpp
files/patch-src__ksmoothdock.h
files/patch-src__normalzoomstate.cpp
files/patch-src__normalzoomstate.h
files/patch-src__paraboliczoomstate.cpp
files/patch-src__paraboliczoomstate.h
files/patch-src__task.cpp
Remove file:
files/patch-src::Makefile.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/deskutils/ksmoothdock/Makefile deskutils/ksmoothdock/Makefile
--- /usr/ports/deskutils/ksmoothdock/Makefile Tue Sep 5 02:38:47 2006
+++ deskutils/ksmoothdock/Makefile Thu Mar 15 17:20:38 2007
@@ -6,18 +6,22 @@
#
PORTNAME= ksmoothdock
-PORTVERSION= 3.6.1
+PORTVERSION= 4.3
CATEGORIES= deskutils kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
+DISTNAME= ${PORTNAME}-${PORTVERSION}_automake1.9
MAINTAINER= ports@FreeBSD.org
COMMENT= A dock program for KDE with smooth zooming
-USE_AUTOTOOLS= libtool:15
+USE_KDELIBS_VER= 3
USE_GMAKE= yes
-USE_KDELIBS_VER=3
+USE_AUTOTOOLS= autoconf:259:env automake:19:env libtool:15:env
+GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}
+pre-configure:
+ @cd ${WRKSRC}/admin && ${RM} -f ltmain.sh && ${CP} -f ${LTMAIN} .
+ @cd ${WRKSRC} && ${GMAKE} -f admin/Makefile.common
.include <bsd.port.mk>
diff -urN /usr/ports/deskutils/ksmoothdock/distinfo deskutils/ksmoothdock/distinfo
--- /usr/ports/deskutils/ksmoothdock/distinfo Thu Jun 8 00:30:26 2006
+++ deskutils/ksmoothdock/distinfo Thu Mar 15 13:14:05 2007
@@ -1,3 +1,3 @@
-MD5 (ksmoothdock-3.6.1.tar.gz) = f6d69c5d74de55f86bdc92e835df6cb8
-SHA256 (ksmoothdock-3.6.1.tar.gz) = 751ba7da13aed4780bc7f4e7d0f6b4d5c9f5029bb025976487a2d833b00849bb
-SIZE (ksmoothdock-3.6.1.tar.gz) = 800535
+MD5 (ksmoothdock-4.3_automake1.9.tar.gz) = fa75237f0b1102d31dc2b60304ab59fc
+SHA256 (ksmoothdock-4.3_automake1.9.tar.gz) = 3ec73d65107a03228a10afafac20e6ad9a0d7e16d469975dc14e2dd027718f27
+SIZE (ksmoothdock-4.3_automake1.9.tar.gz) = 606767
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src::Makefile.in deskutils/ksmoothdock/files/patch-src::Makefile.in
--- /usr/ports/deskutils/ksmoothdock/files/patch-src::Makefile.in Tue Jan 31 23:25:51 2006
+++ deskutils/ksmoothdock/files/patch-src::Makefile.in Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig Tue Jan 24 00:48:28 2006
-+++ src/Makefile.in Tue Jan 24 00:48:32 2006
-@@ -448,7 +448,7 @@
- done
- ksmoothdock$(EXEEXT): $(ksmoothdock_OBJECTS) $(ksmoothdock_DEPENDENCIES)
- @rm -f ksmoothdock$(EXEEXT)
-- $(CXXLINK) $(ksmoothdock_LDFLAGS) $(ksmoothdock_OBJECTS) $(ksmoothdock_LDADD) $(LIBS)
-+ $(CXXLINK) $(ksmoothdock_LDFLAGS) $(ksmoothdock_OBJECTS) $(ksmoothdock_LDADD) $(LIBS) $(KDE_MT_LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__buttonisedstate.h deskutils/ksmoothdock/files/patch-src__buttonisedstate.h
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__buttonisedstate.h Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__buttonisedstate.h Thu Mar 15 17:24:38 2007
@@ -0,0 +1,11 @@
+--- src/buttonisedstate.h.orig Sat Sep 16 05:10:50 2006
++++ src/buttonisedstate.h Thu Mar 15 17:24:14 2007
+@@ -20,6 +20,8 @@
+ #ifndef BUTTONISEDSTATE_H
+ #define BUTTONISEDSTATE_H
+
++#include <memory>
++
+ #include <qobject.h>
+ #include "dockstate.h"
+
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__desktopselector.cpp deskutils/ksmoothdock/files/patch-src__desktopselector.cpp
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__desktopselector.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__desktopselector.cpp Thu Mar 15 17:24:49 2007
@@ -0,0 +1,11 @@
+--- src/desktopselector.cpp.orig Thu Nov 16 05:33:29 2006
++++ src/desktopselector.cpp Thu Mar 15 17:24:14 2007
+@@ -45,7 +45,7 @@
+
+ void DesktopSelector::draw(QPixmap& buffer, int x, int y, int size) {
+ if (size >= m_minSize && size <= m_maxSize) {
+- bitBlt(&buffer, x, y, &m_icons.at(size - m_minSize));
++ bitBlt(&buffer, x, y, &m_icons[size - m_minSize]);
+
+ QPainter p(&buffer);
+ if (KWin::currentDesktop() == m_targetDesktop)
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__iconbaseddockitem.cpp deskutils/ksmoothdock/files/patch-src__iconbaseddockitem.cpp
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__iconbaseddockitem.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__iconbaseddockitem.cpp Thu Mar 15 17:25:02 2007
@@ -0,0 +1,20 @@
+--- src/iconbaseddockitem.cpp.orig Thu Jun 8 09:25:54 2006
++++ src/iconbaseddockitem.cpp Thu Mar 15 17:24:14 2007
+@@ -86,7 +86,7 @@
+ s = m_maxSize;
+ }
+
+- return m_icons.at(s - m_minSize);
++ return m_icons[s - m_minSize];
+ }
+
+ /**
+@@ -109,7 +109,7 @@
+
+ void IconBasedDockItem::draw(QPixmap& buffer, int x, int y, int size) {
+ if (size >= m_minSize && size <= m_maxSize)
+- bitBlt(&buffer, x, y, &m_icons.at(size - m_minSize));
++ bitBlt(&buffer, x, y, &m_icons[size - m_minSize]);
+ }
+
+ /**
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__ksmoothdock.cpp deskutils/ksmoothdock/files/patch-src__ksmoothdock.cpp
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__ksmoothdock.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__ksmoothdock.cpp Thu Mar 15 17:25:16 2007
@@ -0,0 +1,10 @@
+--- src/ksmoothdock.cpp.orig Thu Nov 16 06:00:33 2006
++++ src/ksmoothdock.cpp Thu Mar 15 17:24:14 2007
+@@ -24,6 +24,7 @@
+
+ #include <iostream>
+ #include <iterator>
++#include <typeinfo>
+
+ #include <qdir.h>
+
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__ksmoothdock.h deskutils/ksmoothdock/files/patch-src__ksmoothdock.h
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__ksmoothdock.h Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__ksmoothdock.h Thu Mar 15 17:25:25 2007
@@ -0,0 +1,10 @@
+--- src/ksmoothdock.h.orig Thu Nov 16 06:02:06 2006
++++ src/ksmoothdock.h Thu Mar 15 17:24:14 2007
+@@ -26,6 +26,7 @@
+ #include <config.h>
+ #endif
+
++#include <memory>
+ #include <vector>
+
+ #include <qwidget.h>
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__normalzoomstate.cpp deskutils/ksmoothdock/files/patch-src__normalzoomstate.cpp
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__normalzoomstate.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__normalzoomstate.cpp Thu Mar 15 17:25:46 2007
@@ -0,0 +1,10 @@
+--- src/normalzoomstate.cpp.orig Fri Nov 17 20:07:22 2006
++++ src/normalzoomstate.cpp Thu Mar 15 17:24:14 2007
+@@ -20,6 +20,7 @@
+ #include "normalzoomstate.h"
+
+ #include <iostream>
++#include <typeinfo>
+ #include <unistd.h>
+
+ #include <qapplication.h>
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__normalzoomstate.h deskutils/ksmoothdock/files/patch-src__normalzoomstate.h
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__normalzoomstate.h Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__normalzoomstate.h Thu Mar 15 17:25:54 2007
@@ -0,0 +1,10 @@
+--- src/normalzoomstate.h.orig Wed Nov 15 21:01:02 2006
++++ src/normalzoomstate.h Thu Mar 15 17:24:14 2007
+@@ -28,6 +28,7 @@
+ * @author the KSmoothDock team <dangvd@yahoo.com>
+ */
+
++#include <memory>
+ #include <vector>
+
+ #include <qtimer.h>
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__paraboliczoomstate.cpp deskutils/ksmoothdock/files/patch-src__paraboliczoomstate.cpp
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__paraboliczoomstate.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__paraboliczoomstate.cpp Thu Mar 15 17:26:06 2007
@@ -0,0 +1,10 @@
+--- src/paraboliczoomstate.cpp.orig Fri Nov 17 20:10:57 2006
++++ src/paraboliczoomstate.cpp Thu Mar 15 17:24:14 2007
+@@ -20,6 +20,7 @@
+ #include "paraboliczoomstate.h"
+
+ #include <iostream>
++#include <typeinfo>
+ #include <unistd.h>
+
+ #include <qapplication.h>
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__paraboliczoomstate.h deskutils/ksmoothdock/files/patch-src__paraboliczoomstate.h
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__paraboliczoomstate.h Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__paraboliczoomstate.h Thu Mar 15 17:26:18 2007
@@ -0,0 +1,10 @@
+--- src/paraboliczoomstate.h.orig Wed Nov 15 23:33:25 2006
++++ src/paraboliczoomstate.h Thu Mar 15 17:24:14 2007
+@@ -28,6 +28,7 @@
+ * @author the KSmoothDock team <dangvd@yahoo.com>
+ */
+
++#include <memory>
+ #include <vector>
+
+ #include <qtimer.h>
diff -urN /usr/ports/deskutils/ksmoothdock/files/patch-src__task.cpp deskutils/ksmoothdock/files/patch-src__task.cpp
--- /usr/ports/deskutils/ksmoothdock/files/patch-src__task.cpp Thu Jan 1 09:00:00 1970
+++ deskutils/ksmoothdock/files/patch-src__task.cpp Thu Mar 15 17:26:29 2007
@@ -0,0 +1,16 @@
+--- src/task.cpp.orig Tue Nov 7 03:17:19 2006
++++ src/task.cpp Thu Mar 15 17:24:14 2007
+@@ -46,11 +46,11 @@
+ void Task::draw(QPixmap& buffer, int x, int y, int size) {
+ if (size >= m_minSize && size <= m_maxSize) {
+ if (m_demandsAttention && (m_timerCount == 1)) {
+- KPixmap pix(m_icons.at(size - m_minSize));
++ KPixmap pix(m_icons[size - m_minSize]);
+ KPixmapEffect::fade(pix, 0.5, QColor("#ffffff"));
+ bitBlt(&buffer, x, y, &pix);
+ } else {
+- bitBlt(&buffer, x, y, &m_icons.at(size - m_minSize));
++ bitBlt(&buffer, x, y, &m_icons[size - m_minSize]);
+ }
+ }
+ }
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070316010021.d516f317.tkato432>