rpms/kipi-plugins/F-10 kipi-plugins-use-libgpod-0.6.0.patch, 1.1, 1.2

Lukas Tinkl ltinkl at fedoraproject.org
Tue May 12 13:03:03 UTC 2009 

Author: ltinkl

Update of /cvs/extras/rpms/kipi-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20001/F-10

Modified Files:
	kipi-plugins-use-libgpod-0.6.0.patch 
Log Message:
rebase the patch


kipi-plugins-use-libgpod-0.6.0.patch:

Index: kipi-plugins-use-libgpod-0.6.0.patch
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/F-10/kipi-plugins-use-libgpod-0.6.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kipi-plugins-use-libgpod-0.6.0.patch	20 Feb 2009 16:25:59 -0000	1.1
+++ kipi-plugins-use-libgpod-0.6.0.patch	12 May 2009 13:02:32 -0000	1.2
@@ -1,66 +1,58 @@
-This is a revert of upstream svn rev 918089.  It restores support for
-libgpod < 0.7.0.
-
---- kipi-plugins-0.2.0-rc2/ipodexport/CMakeLists.txt.libgpod-0.6.0	2009-02-14 02:54:10.000000000 -0500
-+++ kipi-plugins-0.2.0-rc2/ipodexport/CMakeLists.txt	2009-02-19 14:27:55.000000000 -0500
-@@ -1,6 +1,6 @@
- ADD_DEFINITIONS(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
- 
--INCLUDE_DIRECTORIES(${GPOD_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GDK_INCLUDE_DIR})
-+INCLUDE_DIRECTORIES(${GPOD_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR})
- 
- SET(kipiplugin_ipodexport_PART_SRCS
-     plugin_ipodexport.cpp
-@@ -18,7 +18,6 @@
-                       ${KDE4_KDE3SUPPORT_LIBS}
-                       ${KDE4_KDEUI_LIBS}
-                       ${GPOD_LIBRARIES}
--                      ${GDK_LIBRARIES}
-                       kipiplugins
-                       kipi
-                       kio
---- kipi-plugins-0.2.0-rc2/ipodexport/IpodExportDialog.cpp.libgpod-0.6.0	2009-02-14 02:54:10.000000000 -0500
-+++ kipi-plugins-0.2.0-rc2/ipodexport/IpodExportDialog.cpp	2009-02-19 14:27:55.000000000 -0500
-@@ -20,11 +20,6 @@
-  *
-  * ============================================================ */
- 
--// System Includes
--extern "C" {
--#include <gdk-pixbuf/gdk-pixbuf.h>
--}
+diff -ur kipi-plugins-orig/cmake/modules/FindGdk.cmake kipi-plugins-0.3.0/cmake/modules/FindGdk.cmake
+--- kipi-plugins-orig/cmake/modules/FindGdk.cmake	2009-05-11 09:03:42.000000000 +0200
++++ kipi-plugins-0.3.0/cmake/modules/FindGdk.cmake	2009-05-12 15:00:22.000000000 +0200
+@@ -1,48 +0,0 @@
+-# - Try to find the GDK library
+-# Once done this will define
+-#
+-#  GDK_FOUND - system has GDK
+-#  GDK_INCLUDE_DIR - the GDK include directory
+-#  GDK_LIBRARIES - Link these to use GDK
+-#  GDK_DEFINITIONS - Compiler switches required for using GDK
+-#
 -
- // Local includes.
- 
- #include "IpodHeader.h"
-@@ -427,13 +422,9 @@
-         return;
- 
-     Itdb_Artwork *artwork = item->artwork();
--    GdkPixbuf *gpixbuf = NULL;
--    
--    // First arg in itdb_artwork_get_pixbuf(...) is pointer to Itdb_Device struct,
--    // in kipiplugin-ipodexport it is m_itdb->device. i hope it _is_ initialiezed
--    gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_itdb->device, artwork, -1, -1 );
-+    Itdb_Thumb *thumb = itdb_artwork_get_thumb_by_type( artwork, ITDB_THUMB_PHOTO_SMALL );
- 
--    if( !gpixbuf )
-+    if( !thumb )
-     {
-         kDebug(51000) << "no thumb was found" << endl;
-         return;
-@@ -448,9 +439,6 @@
- //     QPixmap pix;
- //     pix.convertFromImage( image );
- //     m_ipodPreview->setPixmap( pix );
--    
--    // memory release
--    gdk_pixbuf_unref ( gpixbuf );
- }
- 
- void UploadDialog::imageSelected( QTreeWidgetItem *item )
---- kipi-plugins-0.2.0-rc2/cmake/modules/FindGpod.cmake.libgpod-0.6.0	2009-02-14 02:53:31.000000000 -0500
-+++ kipi-plugins-0.2.0-rc2/cmake/modules/FindGpod.cmake	2009-02-19 14:27:55.000000000 -0500
+-if (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
+-
+-  # in cache already
+-  SET(GDK_FOUND TRUE)
+-
+-else (GDK_INCLUDE_DIR AND GDK_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(gdk-pixbuf-2.0 _GDKIncDir _GDKLinkDir _GDKLinkFlags _GDKCflags)
+-  
+-    set(GDK_DEFINITIONS ${_GDKCflags})
+-  endif(NOT WIN32)
+-
+-  FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0
+-    ${_GDKIncDir}
+-  )
+-  
+-  FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0
+-    PATHS
+-    ${_GDKLinkDir}
+-  )
+-
+-  if (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
+-    SET(GDK_FOUND TRUE)
+-  else (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
+-    SET(GDK_FOUND FALSE)
+-  endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
+-
+-  include(FindPackageHandleStandardArgs)
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gdk DEFAULT_MSG GDK_INCLUDE_DIR GDK_LIBRARIES )
+- 
+-  MARK_AS_ADVANCED(GDK_INCLUDE_DIR GDK_LIBRARIES)
+-  
+-endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
+-
+-macro_bool_to_01(GDK_FOUND GDK_FOUND)
+diff -ur kipi-plugins-orig/cmake/modules/FindGpod.cmake kipi-plugins-0.3.0/cmake/modules/FindGpod.cmake
+--- kipi-plugins-orig/cmake/modules/FindGpod.cmake	2009-05-11 09:03:42.000000000 +0200
++++ kipi-plugins-0.3.0/cmake/modules/FindGpod.cmake	2009-05-12 15:00:22.000000000 +0200
 @@ -23,32 +23,25 @@
    pkg_check_modules(PC_GPOD libgpod-1.0)
  
@@ -112,59 +104,9 @@ libgpod < 0.7.0.
 -else (GPOD_VERSION_OKAY STREQUAL "0")
 -    set(GPOD_FOUND FALSE)
 -endif (GPOD_VERSION_OKAY STREQUAL "0")
---- kipi-plugins-0.2.0-rc2/cmake/modules/FindGdk.cmake.libgpod-0.6.0	2009-02-14 02:53:31.000000000 -0500
-+++ kipi-plugins-0.2.0-rc2/cmake/modules/FindGdk.cmake	2009-02-19 14:27:55.000000000 -0500
-@@ -1,48 +0,0 @@
--# - Try to find the GDK library
--# Once done this will define
--#
--#  GDK_FOUND - system has GDK
--#  GDK_INCLUDE_DIR - the GDK include directory
--#  GDK_LIBRARIES - Link these to use GDK
--#  GDK_DEFINITIONS - Compiler switches required for using GDK
--#
--
--if (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
--
--  # in cache already
--  SET(GDK_FOUND TRUE)
--
--else (GDK_INCLUDE_DIR AND GDK_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(gdk-pixbuf-2.0 _GDKIncDir _GDKLinkDir _GDKLinkFlags _GDKCflags)
--  
--    set(GDK_DEFINITIONS ${_GDKCflags})
--  endif(NOT WIN32)
--
--  FIND_PATH(GDK_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h /usr/include/gtk-2.0
--    ${_GDKIncDir}
--  )
--  
--  FIND_LIBRARY(GDK_LIBRARIES NAMES gdk_pixbuf-2.0
--    PATHS
--    ${_GDKLinkDir}
--  )
--
--  if (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
--    SET(GDK_FOUND TRUE)
--  else (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
--    SET(GDK_FOUND FALSE)
--  endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
--
--  include(FindPackageHandleStandardArgs)
--  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gdk DEFAULT_MSG GDK_INCLUDE_DIR GDK_LIBRARIES )
-- 
--  MARK_AS_ADVANCED(GDK_INCLUDE_DIR GDK_LIBRARIES)
--  
--endif (GDK_INCLUDE_DIR AND GDK_LIBRARIES)
--
--macro_bool_to_01(GDK_FOUND GDK_FOUND)
---- kipi-plugins-0.2.0-rc2/CMakeLists.txt.libgpod-0.6.0	2009-02-14 03:03:18.000000000 -0500
-+++ kipi-plugins-0.2.0-rc2/CMakeLists.txt	2009-02-19 14:27:55.000000000 -0500
+diff -ur kipi-plugins-orig/CMakeLists.txt kipi-plugins-0.3.0/CMakeLists.txt
+--- kipi-plugins-orig/CMakeLists.txt	2009-05-11 09:11:44.000000000 +0200
++++ kipi-plugins-0.3.0/CMakeLists.txt	2009-05-12 15:00:22.000000000 +0200
 @@ -52,7 +52,6 @@
  MACRO_OPTIONAL_FIND_PACKAGE(OpenGL)     # For AdvancedSlideshow and ImageViewer.
  MACRO_OPTIONAL_FIND_PACKAGE(OpenCV)     # For RemoveRedEyes.
@@ -213,3 +155,63 @@ libgpod < 0.7.0.
  
      IF(OPENCV_FOUND)
          ADD_SUBDIRECTORY(removeredeyes)
+diff -ur kipi-plugins-orig/ipodexport/CMakeLists.txt kipi-plugins-0.3.0/ipodexport/CMakeLists.txt
+--- kipi-plugins-orig/ipodexport/CMakeLists.txt	2009-05-11 09:03:54.000000000 +0200
++++ kipi-plugins-0.3.0/ipodexport/CMakeLists.txt	2009-05-12 15:00:22.000000000 +0200
+@@ -1,6 +1,6 @@
+ ADD_DEFINITIONS(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+ 
+-INCLUDE_DIRECTORIES(${GPOD_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GDK_INCLUDE_DIR})
++INCLUDE_DIRECTORIES(${GPOD_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR})
+ 
+ SET(kipiplugin_ipodexport_PART_SRCS
+     plugin_ipodexport.cpp
+@@ -18,7 +18,6 @@
+                       ${KDE4_KDE3SUPPORT_LIBS}
+                       ${KDE4_KDEUI_LIBS}
+                       ${GPOD_LIBRARIES}
+-                      ${GDK_LIBRARIES}
+                       kipiplugins
+                       kipi
+                       kio
+diff -ur kipi-plugins-orig/ipodexport/IpodExportDialog.cpp kipi-plugins-0.3.0/ipodexport/IpodExportDialog.cpp
+--- kipi-plugins-orig/ipodexport/IpodExportDialog.cpp	2009-05-11 09:03:54.000000000 +0200
++++ kipi-plugins-0.3.0/ipodexport/IpodExportDialog.cpp	2009-05-12 15:00:42.000000000 +0200
+@@ -20,11 +20,6 @@
+  *
+  * ============================================================ */
+ 
+-// System Includes
+-extern "C" {
+-#include <gdk-pixbuf/gdk-pixbuf.h>
+-}
+-
+ // Local includes
+ 
+ #include "IpodHeader.h"
+@@ -427,13 +422,9 @@
+         return;
+ 
+     Itdb_Artwork *artwork = item->artwork();
+-    GdkPixbuf *gpixbuf = NULL;
+-    
+-    // First arg in itdb_artwork_get_pixbuf(...) is pointer to Itdb_Device struct,
+-    // in kipiplugin-ipodexport it is m_itdb->device. i hope it _is_ initialiezed
+-    gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_itdb->device, artwork, -1, -1 );
++    Itdb_Thumb *thumb = itdb_artwork_get_thumb_by_type( artwork, ITDB_THUMB_PHOTO_SMALL );
+ 
+-    if( !gpixbuf )
++    if( !thumb )
+     {
+         kDebug(51000) << "no thumb was found" << endl;
+         return;
+@@ -448,9 +439,6 @@
+ //     QPixmap pix;
+ //     pix.convertFromImage( image );
+ //     m_ipodPreview->setPixmap( pix );
+-    
+-    // memory release
+-    gdk_pixbuf_unref ( gpixbuf );
+ }
+ 
+ void UploadDialog::imageSelected( QTreeWidgetItem *item )

More information about the scm-commits mailing list