summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <en.ABCD@gmail.com>2009-06-30 18:04:31 -0400
committerJonathan Callen <en.ABCD@gmail.com>2009-06-30 18:04:31 -0400
commit8d24829a7daebbf4a0c956eed68e5777ecfd707f (patch)
treefdc4ad53c41135d0d81c9e0638460d019150db9b
parente6b0372a89064e2f88f1989463343fe08077922f (diff)
downloadkde-8d24829a7daebbf4a0c956eed68e5777ecfd707f.tar.gz
kde-8d24829a7daebbf4a0c956eed68e5777ecfd707f.tar.bz2
kde-8d24829a7daebbf4a0c956eed68e5777ecfd707f.zip
[media-sound/amarok, x11-themes/gtk-engines-qt] Remove unneeded patches
-rw-r--r--media-sound/amarok/Manifest1
-rw-r--r--media-sound/amarok/files/amarok-ipod.patch159
-rw-r--r--x11-themes/gtk-engines-qt/Manifest1
-rw-r--r--x11-themes/gtk-engines-qt/files/1.1-stdlib.patch10
4 files changed, 0 insertions, 171 deletions
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 833df2d2626..7428c99930a 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,4 +1,3 @@
-AUX amarok-ipod.patch 5230 RMD160 d147223985dc8c45d0aaaad5008a4b2024159051 SHA1 d94aa98a17229b2ddbae4128021bdb727fb38202 SHA256 b119ba280bba29276ece49b3d80d8770aee831e9afcb1d8795811130b734994a
AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6
EBUILD amarok-9999.ebuild 2103 RMD160 3b9951ef1b14d1bdaa64917701bfb82139068305 SHA1 74e4c41587f622b9c42e7100198e26ecfaa18370 SHA256 856e97051b7e0759c779398eba34170d6c5e25123c3ba4e4b97c0817d5e1eada
MISC metadata.xml 1999 RMD160 63f7987491620b67603d2c53e673c49c55937d62 SHA1 9c8ca66b5d1f1804ec8087cf2a05d07a2aacee25 SHA256 1b1484b185d63cd03c8bbc85c797447b5249d12b7e04db0fa64efecf89cd28f8
diff --git a/media-sound/amarok/files/amarok-ipod.patch b/media-sound/amarok/files/amarok-ipod.patch
deleted file mode 100644
index d4621d1d09d..00000000000
--- a/media-sound/amarok/files/amarok-ipod.patch
+++ /dev/null
@@ -1,159 +0,0 @@
---- cmake/modules/FindIpod.cmake 2009-01-06 13:48:28.000000000 +0100
-+++ cmake/modules/FindIpod.cmake 2009-02-10 18:18:23.000000000 +0100
-@@ -2,45 +2,35 @@
- # Once done this will define
- #
- # IPOD_FOUND - system has libgpod
--# IPOD_INCLUDE_DIR - the libgpod include directory
-+# IPOD_INCLUDE_DIRS - the libgpod include directory
- # IPOD_LIBRARIES - Link these to use libgpod
--# IPOD_DEFINITIONS - Compiler switches required for using libgpod
-+# IPOD_CFLAGS - Compiler switches required for using libgpod
-+# IPOD_VERSION - Version number of libgpod
- #
-
--if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-+if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
-
- # in cache already
- SET(IPOD_FOUND TRUE)
-
--else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-+else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
- if(NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
-- INCLUDE(UsePkgConfig)
--
-- PKGCONFIG(libgpod-1.0 _IPODIncDir _IPODLinkDir _IPODLinkFlags _IPODCflags)
--
-- set(IPOD_DEFINITIONS ${_IPODCflags})
-+ find_package(PkgConfig)
-+ PKG_SEARCH_MODULE(IPOD libgpod-1.0)
-+
- endif(NOT WIN32)
-+ IF (IPOD_FOUND)
-+ IF (NOT IPOD_FIND_QUIETLY)
-+ MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}")
-+ ENDIF (NOT IPOD_FIND_QUIETLY)
-+ ELSE (IPOD_FOUND)
-+ IF (IPOD_FIND_REQUIRED)
-+ MESSAGE(FATAL_ERROR "Could NOT find libgpod-1, check FindPkgConfig output above!")
-+ ENDIF (IPOD_FIND_REQUIRED)
-+ ENDIF (IPOD_FOUND)
-+
-+ MARK_AS_ADVANCED(IPOD_INCLUDE_DIRS)
-
-- FIND_PATH(IPOD_INCLUDE_DIR gpod/itdb.h /usr/include/gpod-1.0
-- ${_IPODIncDir}
-- )
--
-- FIND_LIBRARY(IPOD_LIBRARIES NAMES gpod
-- PATHS
-- ${_IPODLinkDir}
-- )
--
-- if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-- SET(IPOD_FOUND TRUE)
-- else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-- SET(IPOD_FOUND_FALSE)
-- endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
--
-- include(FindPackageHandleStandardArgs)
-- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ipod DEFAULT_MSG IPOD_INCLUDE_DIR IPOD_LIBRARIES )
--
-- MARK_AS_ADVANCED(IPOD_INCLUDE_DIR IPOD_LIBRARIES)
--
--endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-+endif (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
-
---- src/collection/ipodcollection/CMakeLists.txt 2009-01-06 13:49:32.000000000 +0100
-+++ src/collection/ipodcollection/CMakeLists.txt 2009-02-10 22:22:01.000000000 +0100
-@@ -17,7 +17,7 @@
- handler
- ${GLIB2_INCLUDE_DIR}
- ${GDK_INCLUDE_DIR}
-- ${IPOD_INCLUDE_DIR}
-+ ${IPOD_INCLUDE_DIRS}
- ${CMAKE_CURRENT_BINARY_DIR}/../..
- ${AMAROK_COLLECTION_SUPPORT_DIR}
- ${KDE4_INCLUDE_DIR}
-
---- src/collection/ipodcollection/handler/IpodHandler.cpp 2009-01-06 13:49:32.000000000 +0100
-+++ src/collection/ipodcollection/handler/IpodHandler.cpp 2009-02-10 18:00:09.000000000 +0100
-@@ -1339,73 +1339,12 @@
- QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
- QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
-
-- Itdb_Thumb *thumb = NULL;
- GdkPixbuf *gpixbuf = NULL;
-- QString thumbPath;
-
- // pull image out of ipod
-
-- if( ipodtrack->has_artwork == 0x01 )
-- {
-- // try small first
--
-- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_SMALL );
--
-- // then large if needed
-- if( thumb == NULL)
-- {
-- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_LARGE );
-- }
--
-- if( thumb != NULL)
-- {
-- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
-- }
-- else
-- {
-- GList *thumbs = ipodtrack->artwork->thumbnails;
--
-- for(; thumbs; thumbs = thumbs->next)
-- {
-- Itdb_Thumb *curThumb = ( Itdb_Thumb * )thumbs->data;
-- if( curThumb == NULL)
-- continue;
--
-- switch( curThumb->type )
-- {
-- case ITDB_THUMB_PHOTO_SMALL:
-- break;
-- case ITDB_THUMB_PHOTO_LARGE:
-- break;
-- case ITDB_THUMB_PHOTO_FULL_SCREEN:
-- break;
-- case ITDB_THUMB_PHOTO_TV_SCREEN:
-- break;
-- case ITDB_THUMB_COVER_XLARGE:
-- break;
-- case ITDB_THUMB_COVER_MEDIUM:
-- break;
-- case ITDB_THUMB_COVER_SMEDIUM:
-- break;
-- case ITDB_THUMB_COVER_XSMALL:
-- break;
--
-- default:
-- break;
-- }
--
-- thumb = curThumb;
-- break;
--
-- }
--
-- if( thumb != NULL)
-- {
-- thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) );
-- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
-- }
-- }
-- }
-+ if( ipodtrack->has_artwork == 0x01 ) // 0x01 = true ; 0x02 = false
-+ gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_device, ipodtrack->artwork, 50, 50 );
-
- if(gpixbuf != NULL)
- {
diff --git a/x11-themes/gtk-engines-qt/Manifest b/x11-themes/gtk-engines-qt/Manifest
index 04e36f2d335..316a1f0c8f8 100644
--- a/x11-themes/gtk-engines-qt/Manifest
+++ b/x11-themes/gtk-engines-qt/Manifest
@@ -1,3 +1,2 @@
-AUX 1.1-stdlib.patch 340 RMD160 c9cccc1716fcf52369c3da8a5760723afa57cae8 SHA1 07210aabdbdb6b2ff7d8fa216e68a856410f2d89 SHA256 ffc45b4c00e9a62c13130a6a84f45ae4bdd40b46fb959a7d9d9b23714382f398
EBUILD gtk-engines-qt-9999.ebuild 814 RMD160 41ae5a77b9d35540d6dfeaaa7cc3a583100c2ddb SHA1 672cdf20ba909071a4dd94f1ab93ae3c5ac80daa SHA256 ae2641b6728299ac3e6a9d7a892666be816671c3a4807591b963fa7c891b310f
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/x11-themes/gtk-engines-qt/files/1.1-stdlib.patch b/x11-themes/gtk-engines-qt/files/1.1-stdlib.patch
deleted file mode 100644
index 5ef68605017..00000000000
--- a/x11-themes/gtk-engines-qt/files/1.1-stdlib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/qt_theme_draw.c.orig 2008-03-16 16:40:55.000000000 +0000
-+++ src/qt_theme_draw.c 2008-03-16 16:41:15.000000000 +0000
-@@ -19,6 +19,7 @@
- ***************************************************************************/
-
- #include <math.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <gtk/gtkprogressbar.h>
- #include <gdk/gdk.h>