rpms/kipi-plugins/devel kipi-plugins-0.2.0-rc2-qt45.patch, NONE, 1.1 kipi-plugins-use-libgpod-0.6.0.patch, NONE, 1.1 kipi-plugins.spec, 1.88, 1.89
Rex Dieter
rdieter at fedoraproject.org
Mon Feb 23 14:41:28 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20553
Modified Files:
kipi-plugins.spec
Added Files:
kipi-plugins-0.2.0-rc2-qt45.patch
kipi-plugins-use-libgpod-0.6.0.patch
Log Message:
* Mon Feb 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.17.rc2
- qt45 patch
- libgpod06 patch f-10 only
kipi-plugins-0.2.0-rc2-qt45.patch:
--- NEW FILE kipi-plugins-0.2.0-rc2-qt45.patch ---
diff -up kipi-plugins-0.2.0-rc2/advancedslideshow/playbackwidget.ui.qt45 kipi-plugins-0.2.0-rc2/advancedslideshow/playbackwidget.ui
--- kipi-plugins-0.2.0-rc2/advancedslideshow/playbackwidget.ui.qt45 2009-02-14 01:53:52.000000000 -0600
+++ kipi-plugins-0.2.0-rc2/advancedslideshow/playbackwidget.ui 2009-02-20 14:14:48.000000000 -0600
@@ -107,7 +107,7 @@
</layout>
</item>
<item>
- <widget class="Phonon::VolumeSlider" native="1" name="m_volumeSlider" >
+ <widget class="VolSlider" native="1" name="m_volumeSlider" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
@@ -132,9 +132,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>Phonon::VolumeSlider</class>
+ <class>VolSlider</class>
<extends>QWidget</extends>
- <header location="global" >Phonon/VolumeSlider</header>
+ <header>volslider.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff -up kipi-plugins-0.2.0-rc2/advancedslideshow/volslider.h.qt45 kipi-plugins-0.2.0-rc2/advancedslideshow/volslider.h
--- kipi-plugins-0.2.0-rc2/advancedslideshow/volslider.h.qt45 2009-02-20 14:15:15.000000000 -0600
+++ kipi-plugins-0.2.0-rc2/advancedslideshow/volslider.h 2009-02-20 14:14:48.000000000 -0600
@@ -0,0 +1,3 @@
+#include <Phonon/VolumeSlider>
+
+typedef class Phonon::VolumeSlider VolSlider;
kipi-plugins-use-libgpod-0.6.0.patch:
--- NEW FILE kipi-plugins-use-libgpod-0.6.0.patch ---
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>
-}
-
// 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
@@ -23,32 +23,25 @@
pkg_check_modules(PC_GPOD libgpod-1.0)
set(GPOD_DEFINITIONS ${PC_GPOD_CFLAGS_OTHER})
-
- exec_program(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.7.0 libgpod-1.0 OUTPUT_VARIABLE _pkgconfigDevNull RETURN_VALUE GPOD_VERSION_OKAY)
endif( NOT WIN32 )
-if (GPOD_VERSION_OKAY STREQUAL "0")
+FIND_PATH(GPOD_INCLUDE_DIR NAMES gpod/itdb.h
+ PATHS
+ ${PC_GPOD_INCLUDEDIR}
+ ${PC_GPOD_INCLUDE_DIRS}
+ PATH_SUFFIXES gpod-1.0
+)
+
+FIND_LIBRARY(GPOD_LIBRARIES NAMES gpod
+ PATHS
+ ${PC_GPOD_LIBDIR}
+ ${PC_GPOD_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gpod DEFAULT_MSG GPOD_INCLUDE_DIR GPOD_LIBRARIES )
+
+# show the GPOD_INCLUDE_DIR and GPOD_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(GPOD_INCLUDE_DIR GPOD_LIBRARIES )
- FIND_PATH(GPOD_INCLUDE_DIR NAMES gpod/itdb.h
- PATHS
- ${PC_GPOD_INCLUDEDIR}
- ${PC_GPOD_INCLUDE_DIRS}
- PATH_SUFFIXES gpod-1.0
- )
-
- FIND_LIBRARY(GPOD_LIBRARIES NAMES gpod
- PATHS
- ${PC_GPOD_LIBDIR}
- ${PC_GPOD_LIBRARY_DIRS}
- )
-
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gpod DEFAULT_MSG GPOD_INCLUDE_DIR GPOD_LIBRARIES )
-
- # show the GPOD_INCLUDE_DIR and GPOD_LIBRARIES variables only in the advanced view
- MARK_AS_ADVANCED(GPOD_INCLUDE_DIR GPOD_LIBRARIES )
-
-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
@@ -52,7 +52,6 @@
MACRO_OPTIONAL_FIND_PACKAGE(OpenGL) # For AdvancedSlideshow and ImageViewer.
MACRO_OPTIONAL_FIND_PACKAGE(OpenCV) # For RemoveRedEyes.
MACRO_OPTIONAL_FIND_PACKAGE(Gpod) # For ipodexport.
-MACRO_OPTIONAL_FIND_PACKAGE(Gdk) # For ipodexport.
MACRO_OPTIONAL_FIND_PACKAGE(GLIB2) # For ipodexport.
MACRO_OPTIONAL_FIND_PACKAGE(GObject) # For ipodexport.
MACRO_OPTIONAL_FIND_PACKAGE(KdepimLibs) # For Calendar (libkcal).
@@ -202,12 +201,6 @@
MESSAGE(STATUS " libgpod library found............... NO (optional)")
ENDIF(GPOD_FOUND)
-IF(GDK_FOUND)
- MESSAGE(STATUS " Gdk library found................... YES (optional)")
-ELSE(GDK_FOUND)
- MESSAGE(STATUS " Gdk library found................... NO (optional)")
-ENDIF(GDK_FOUND)
-
IF(KDEPIMLIBS_FOUND)
MESSAGE(STATUS " libkdepim library found............. YES (optional)")
ELSE(KDEPIMLIBS_FOUND)
@@ -287,11 +280,11 @@
MESSAGE(STATUS " RemoveRedEyes will be compiled...... NO (optional - Look README file for more details about dependencies)")
ENDIF(OPENCV_FOUND)
-IF(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND GDK_FOUND)
+IF(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND)
MESSAGE(STATUS " IpodExport will be compiled......... YES (optional)")
-ELSE(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND GDK_FOUND)
+ELSE(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND)
MESSAGE(STATUS " IpodExport will be compiled......... NO (optional - Look README file for more details about dependencies)")
-ENDIF(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND GDK_FOUND)
+ENDIF(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND)
IF(KDEPIMLIBS_FOUND)
MESSAGE(STATUS " Calendar will be compiled........... YES (optional)")
@@ -366,9 +359,9 @@
ADD_SUBDIRECTORY(calendar)
ENDIF(KDEPIMLIBS_FOUND)
- IF(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND GDK_FOUND)
+ IF(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND)
ADD_SUBDIRECTORY(ipodexport)
- ENDIF(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND GDK_FOUND)
+ ENDIF(GPOD_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND)
IF(OPENCV_FOUND)
ADD_SUBDIRECTORY(removeredeyes)
Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- kipi-plugins.spec 20 Feb 2009 16:15:56 -0000 1.88
+++ kipi-plugins.spec 23 Feb 2009 14:40:58 -0000 1.89
@@ -5,7 +5,7 @@
Name: kipi-plugins
Summary: Plugins to use with Kipi
Version: 0.2.0
-Release: 0.16.%{beta}%{?dist}
+Release: 0.17.%{beta}%{?dist}
License: GPLv2+ and Adobe
Group: Applications/Multimedia
@@ -13,7 +13,16 @@
Source0: http://downloads.sourceforge.net/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} > 10
+%define libgpod_ver 0.7.0
+%else
+%define libgpod_ver 0.6.0
+%endif
+# temporary, until f10 is up'd to libgpod-0.7.0 too
+Patch1: kipi-plugins-use-libgpod-0.6.0.patch
+
Patch50: kipi-plugins-0.2.0-rc2-gcc44.patch
+Patch52: kipi-plugins-0.2.0-rc2-qt45.patch
BuildRequires: exiv2-devel
## DNG converter
@@ -26,7 +35,7 @@
%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
Requires: kdelibs4 >= %{kdelibs4_version}
BuildRequires: kdepimlibs-devel
-BuildRequires: libgpod-devel >= 0.7
+BuildRequires: libgpod-devel >= %{libgpod_ver}
BuildRequires: libkipi-devel >= 0.3.0
BuildRequires: libkdcraw-devel >= 0.4.0-2
BuildRequires: libkexiv2-devel >= 0.5.0
@@ -73,7 +82,11 @@
%prep
%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+%if "%{?libgpod_ver}" == "0.6.0"
+%patch1 -p1 -b .libgpod-0.6.0
+%endif
%patch50 -p1 -b .gcc44
+%patch52 -p1 -b .qt45
%build
@@ -82,8 +95,7 @@
%{cmake_kde4} ..
popd
-make %{?_smp_mflags} -C %{_target_platform} \
- || cat %{_target_platform}/advancedslideshow/ui_playbackwidget.h
+make %{?_smp_mflags} -C %{_target_platform}
%install
@@ -139,9 +151,7 @@
%{_kde4_libdir}/kde4/kipiplugin_gpssync.so
%{_kde4_libdir}/kde4/kipiplugin_htmlexport.so
%{_kde4_libdir}/kde4/kipiplugin_imageviewer.so
-%if 0%{?gpod}
%{_kde4_libdir}/kde4/kipiplugin_ipodexport.so
-%endif
%{_kde4_libdir}/kde4/kipiplugin_jpeglossless.so
%{_kde4_libdir}/kde4/kipiplugin_metadataedit.so
%{_kde4_libdir}/kde4/kipiplugin_picasawebexport.so
@@ -164,8 +174,12 @@
%changelog
+* Mon Feb 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.17.rc2
+- qt45 patch
+- libgpod06 patch f-10 only
+
* Fri Feb 20 2009 Todd Zullinger <tmz at pobox.com> - 0.2.0-0.16.rc2
-- Rebuild against libgpod-0.7.0
+- Revert upstream patch requiring libgpod-0.7.0
* Sat Feb 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-0.15.rc2
- kipi-plugins-0.2.0-rc2
More information about the fedora-extras-commits
mailing list