diff options
author | Przemyslaw Maciag <troll@gentoo.org> | 2007-02-12 00:41:26 +0000 |
---|---|---|
committer | Przemyslaw Maciag <troll@gentoo.org> | 2007-02-12 00:41:26 +0000 |
commit | d2085a38d8f479e0560fefa5d2890bf5ee13a46b (patch) | |
tree | 0b3f2ba1b7eae18e37b0c5b86ec0882e14e98102 /x11-misc/basket | |
parent | Version bump (1.0). Deleted older versions (diff) | |
download | gentoo-2-d2085a38d8f479e0560fefa5d2890bf5ee13a46b.tar.gz gentoo-2-d2085a38d8f479e0560fefa5d2890bf5ee13a46b.tar.bz2 gentoo-2-d2085a38d8f479e0560fefa5d2890bf5ee13a46b.zip |
Removed unneded patches
(Portage version: 2.1.2-r9)
Diffstat (limited to 'x11-misc/basket')
-rw-r--r-- | x11-misc/basket/ChangeLog | 6 | ||||
-rw-r--r-- | x11-misc/basket/files/basket-0.5.0-amd64-gcc4.1.patch | 14 | ||||
-rw-r--r-- | x11-misc/basket/files/basket-0.5.0-noarts.patch | 98 |
3 files changed, 5 insertions, 113 deletions
diff --git a/x11-misc/basket/ChangeLog b/x11-misc/basket/ChangeLog index 1787d44e01e0..51bee994105d 100644 --- a/x11-misc/basket/ChangeLog +++ b/x11-misc/basket/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/basket # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/basket/ChangeLog,v 1.28 2007/02/12 00:38:59 troll Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/basket/ChangeLog,v 1.29 2007/02/12 00:41:26 troll Exp $ + + 12 Feb 2007; Przemysław Maciąg <troll@gentoo.org> + -files/basket-0.5.0-amd64-gcc4.1.patch, -files/basket-0.5.0-noarts.patch: + Removed unneeded patches *basket-1.0 (12 Feb 2007) diff --git a/x11-misc/basket/files/basket-0.5.0-amd64-gcc4.1.patch b/x11-misc/basket/files/basket-0.5.0-amd64-gcc4.1.patch deleted file mode 100644 index 8ae8f6ae78e2..000000000000 --- a/x11-misc/basket/files/basket-0.5.0-amd64-gcc4.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur basket-0.5.0.orig/src/item.cpp basket-0.5.0/src/item.cpp ---- basket-0.5.0.orig/src/item.cpp 2006-05-12 12:05:34.000000000 +0200 -+++ basket-0.5.0/src/item.cpp 2006-05-12 12:05:55.000000000 +0200 -@@ -422,8 +422,8 @@ - if (selected == m_isSelected) - return; - -- DEBUG_WIN << QString(selected ? "Add" : "Remove") + " selected item " + QString::number((int)this) + -- "; b.lastIn=" + QString::number((int)(parentBasket()->lastInsertedItem())); -+ DEBUG_WIN << QString(selected ? "Add" : "Remove") + " selected item " + QString::number((long int)this) + -+ "; b.lastIn=" + QString::number((long int)(parentBasket()->lastInsertedItem())); - - m_isSelected = selected; - if (selected) { diff --git a/x11-misc/basket/files/basket-0.5.0-noarts.patch b/x11-misc/basket/files/basket-0.5.0-noarts.patch deleted file mode 100644 index b071fadcbd6d..000000000000 --- a/x11-misc/basket/files/basket-0.5.0-noarts.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff -Naur basket-0.5.0-orig/src/item.cpp basket-0.5.0/src/item.cpp ---- basket-0.5.0-orig/src/item.cpp 2005-03-09 17:38:27.000000000 +0000 -+++ basket-0.5.0/src/item.cpp 2005-03-31 22:59:11.000000000 +0000 -@@ -46,9 +46,6 @@ - #include <kfiledialog.h> - #include <qfile.h> - #include <kurifilter.h> --#include <arts/kartsdispatcher.h> --//#include <arts/kplayobjectfactory.h> --//#include <arts/kartsserver.h> - - #include <kaction.h> - #include <kglobalsettings.h> -@@ -219,8 +216,6 @@ - connect( m_check->checkBox(), SIGNAL(clicked()), this, SLOT(slotChecked()) ); - connect( &m_selectTimer, SIGNAL(timeout()), this, SLOT(select()) ); - -- m_playObj = 0L; -- m_playServer = 0L; - m_previous = 0L; - m_next = 0L; - m_isSelected = false; -@@ -598,15 +593,6 @@ - if ( Settings::singleClick() && kapp->activePopupWidget() == 0L ) - m_selectTimer.start(KGlobalSettings::autoSelectDelay(), true); - } -- if (m_type == Sound) { -- KArtsDispatcher *dispatcher = new KArtsDispatcher(); // Needed for m_playObj -- dispatcher = dispatcher; // To avoid "warning: unused variable `KArtsDispatcher*dispatcher'" warning -- if (!m_playServer) -- m_playServer = new KArtsServer(); -- m_playFactory = new KDE::PlayObjectFactory(m_playServer); -- m_playObj = m_playFactory->createPlayObject(fullPath(), true); -- m_playObj->play(); -- } - } - - void Item::leaveEvent(QEvent*) -@@ -614,12 +600,6 @@ - m_selectTimer.stop(); - OnClickAction::stopHoverFeedback(); - -- if (m_playObj) { -- m_playObj->halt(); -- delete m_playObj; -- delete m_playFactory; -- m_playObj = 0L; -- } - } - - void Item::mousePressEvent(QMouseEvent *event) -diff -Naur basket-0.5.0-orig/src/item.h basket-0.5.0/src/item.h ---- basket-0.5.0-orig/src/item.h 2005-01-14 01:04:37.000000000 +0000 -+++ basket-0.5.0/src/item.h 2005-03-31 22:59:11.000000000 +0000 -@@ -32,9 +32,6 @@ - #include <qcolor.h> - #include <kurl.h> - #include <kio/jobclasses.h> --#include <arts/kplayobject.h> --#include <arts/kplayobjectfactory.h> --#include <arts/kartsserver.h> - - #include "onclickaction.h" - -@@ -254,9 +251,6 @@ - bool m_canDrag; - QPoint m_pressPos; - bool m_wasPressed; -- KArtsServer *m_playServer; -- KDE::PlayObject *m_playObj; -- KDE::PlayObjectFactory *m_playFactory; - - int m_x; - int m_y; -diff -Naur basket-0.5.0-orig/src/Makefile.am basket-0.5.0/src/Makefile.am ---- basket-0.5.0-orig/src/Makefile.am 2005-03-08 12:05:12.000000000 +0000 -+++ basket-0.5.0/src/Makefile.am 2005-03-31 23:02:23.000000000 +0000 -@@ -22,7 +22,7 @@ - # the application source, library search path, and link libraries - - basket_LDFLAGS = $(KDE_RPATH) $(all_libraries) --basket_LDADD = -lartskde -lkio $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -+basket_LDADD = -lkio $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) - - # this is where the desktop file will go - shelldesktopdir = $(kde_appsdir)/Utilities -diff -Naur basket-0.5.0-orig/src/Makefile.in basket-0.5.0/src/Makefile.in ---- basket-0.5.0-orig/src/Makefile.in 2005-03-09 20:27:29.000000000 +0000 -+++ basket-0.5.0/src/Makefile.in 2005-03-31 23:02:43.000000000 +0000 -@@ -264,7 +264,7 @@ - - # the application source, library search path, and link libraries - basket_LDFLAGS = $(KDE_RPATH) $(all_libraries) --basket_LDADD = -lartskde -lkio $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -+basket_LDADD = -lkio $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) - - # this is where the desktop file will go - shelldesktopdir = $(kde_appsdir)/Utilities |