summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel at free dot fr>2010-07-30 15:22:34 +0200
committersibel <lesibel at free dot fr>2010-07-30 15:22:34 +0200
commit79a5e969e7a1e8758ef6aa2daef673ccff32a7ba (patch)
tree90be5b7b516283ebaba4801415ca210864fa6422
parent7e04694f502fd3dd73277c99a91963ff96c193b8 (diff)
downloadnutyx-extra-79a5e969e7a1e8758ef6aa2daef673ccff32a7ba.tar.gz
nutyx-extra-79a5e969e7a1e8758ef6aa2daef673ccff32a7ba.tar.bz2
nutyx-extra-79a5e969e7a1e8758ef6aa2daef673ccff32a7ba.tar.xz
nutyx-extra-79a5e969e7a1e8758ef6aa2daef673ccff32a7ba.zip
maj de kipi-plugins#1.3.0-2 (avec support iPod)
-rw-r--r--kde/kipi-plugins/.footprint14
-rw-r--r--kde/kipi-plugins/.md5sum1
-rwxr-xr-xkde/kipi-plugins/Pkgfile10
-rw-r--r--kde/kipi-plugins/ipodexport_no_keywords.patch55
4 files changed, 75 insertions, 5 deletions
diff --git a/kde/kipi-plugins/.footprint b/kde/kipi-plugins/.footprint
index b777367de..cd20b365d 100644
--- a/kde/kipi-plugins/.footprint
+++ b/kde/kipi-plugins/.footprint
@@ -6,6 +6,7 @@ drwxr-xr-x root/root usr/bin/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/kde4/
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_acquireimages.so
+-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_advancedslideshow.so
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_batchprocessimages.so
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_calendar.so
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_dngconverter.so
@@ -16,6 +17,8 @@ drwxr-xr-x root/root usr/lib/kde4/
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_galleryexport.so
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_gpssync.so
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_htmlexport.so
+-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_imageviewer.so
+-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_ipodexport.so
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_jpeglossless.so
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_kioexportimport.so
-rwxr-xr-x root/root usr/lib/kde4/kipiplugin_metadataedit.so
@@ -136,6 +139,11 @@ drwxr-xr-x root/root usr/share/apps/kipiplugin_htmlexport/themes/snow/
-rw-r--r-- root/root usr/share/apps/kipiplugin_htmlexport/themes/snow/snow.desktop
-rw-r--r-- root/root usr/share/apps/kipiplugin_htmlexport/themes/snow/style.css
-rw-r--r-- root/root usr/share/apps/kipiplugin_htmlexport/themes/snow/template.xsl
+drwxr-xr-x root/root usr/share/apps/kipiplugin_imageviewer/
+drwxr-xr-x root/root usr/share/apps/kipiplugin_imageviewer/pics/
+-rw-r--r-- root/root usr/share/apps/kipiplugin_imageviewer/pics/hand.png
+-rw-r--r-- root/root usr/share/apps/kipiplugin_imageviewer/pics/nullImage.png
+-rw-r--r-- root/root usr/share/apps/kipiplugin_imageviewer/pics/zoom.png
drwxr-xr-x root/root usr/share/apps/kipiplugin_piwigoexport/
drwxr-xr-x root/root usr/share/apps/kipiplugin_piwigoexport/pics/
-rw-r--r-- root/root usr/share/apps/kipiplugin_piwigoexport/pics/piwigo_logo.png
@@ -181,6 +189,7 @@ drwxr-xr-x root/root usr/share/icons/hicolor/16x16/actions/
-rw-r--r-- root/root usr/share/icons/hicolor/16x16/actions/gallery.png
-rw-r--r-- root/root usr/share/icons/hicolor/16x16/actions/gpsimagetag.png
-rw-r--r-- root/root usr/share/icons/hicolor/16x16/actions/hq.png
+-rw-r--r-- root/root usr/share/icons/hicolor/16x16/actions/ogl.png
-rw-r--r-- root/root usr/share/icons/hicolor/16x16/actions/picasa.png
-rw-r--r-- root/root usr/share/icons/hicolor/16x16/actions/piwigo.png
-rw-r--r-- root/root usr/share/icons/hicolor/16x16/actions/shwup.png
@@ -197,6 +206,7 @@ drwxr-xr-x root/root usr/share/icons/hicolor/22x22/actions/
-rw-r--r-- root/root usr/share/icons/hicolor/22x22/actions/picasa.png
-rw-r--r-- root/root usr/share/icons/hicolor/22x22/actions/piwigo.png
-rw-r--r-- root/root usr/share/icons/hicolor/22x22/actions/shwup.png
+-rw-r--r-- root/root usr/share/icons/hicolor/22x22/actions/slideshow.png
-rw-r--r-- root/root usr/share/icons/hicolor/22x22/actions/smugmug.png
-rw-r--r-- root/root usr/share/icons/hicolor/22x22/actions/zooomr.png
drwxr-xr-x root/root usr/share/icons/hicolor/32x32/
@@ -215,6 +225,7 @@ drwxr-xr-x root/root usr/share/icons/hicolor/32x32/actions/
-rw-r--r-- root/root usr/share/icons/hicolor/32x32/actions/gpsimagetag.png
-rw-r--r-- root/root usr/share/icons/hicolor/32x32/actions/grayscaleconvert.png
-rw-r--r-- root/root usr/share/icons/hicolor/32x32/actions/hq.png
+-rw-r--r-- root/root usr/share/icons/hicolor/32x32/actions/ogl.png
-rw-r--r-- root/root usr/share/icons/hicolor/32x32/actions/picasa.png
-rw-r--r-- root/root usr/share/icons/hicolor/32x32/actions/piwigo.png
-rw-r--r-- root/root usr/share/icons/hicolor/32x32/actions/recompressimages.png
@@ -283,6 +294,7 @@ drwxr-xr-x root/root usr/share/icons/oxygen/scalable/apps/
drwxr-xr-x root/root usr/share/kde4/
drwxr-xr-x root/root usr/share/kde4/services/
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_acquireimages.desktop
+-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_advancedslideshow.desktop
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_batchprocessimages.desktop
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_calendar.desktop
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_dngconverter.desktop
@@ -293,6 +305,8 @@ drwxr-xr-x root/root usr/share/kde4/services/
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_galleryexport.desktop
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_gpssync.desktop
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_htmlexport.desktop
+-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_imageviewer.desktop
+-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_ipodexport.desktop
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_jpeglossless.desktop
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_kioexportimport.desktop
-rw-r--r-- root/root usr/share/kde4/services/kipiplugin_metadataedit.desktop
diff --git a/kde/kipi-plugins/.md5sum b/kde/kipi-plugins/.md5sum
index a7b29d569..9028c96aa 100644
--- a/kde/kipi-plugins/.md5sum
+++ b/kde/kipi-plugins/.md5sum
@@ -1 +1,2 @@
+77387cb264aa9eb926a854e6d1cf8db1 ipodexport_no_keywords.patch
01095ed3d523fbc5e27dc9ba3ee47240 kipi-plugins-1.3.0.tar.bz2
diff --git a/kde/kipi-plugins/Pkgfile b/kde/kipi-plugins/Pkgfile
index f3fc1cf84..7c239c950 100755
--- a/kde/kipi-plugins/Pkgfile
+++ b/kde/kipi-plugins/Pkgfile
@@ -1,17 +1,17 @@
# Description: Gestionnaire de photos pour KDE 4
# URL: http://www.digikam.org
# Packager: lesibel at free dot fr
-# Depends on: kdegraphics, kdepimlibs, opencv, imagemagick, qca
-
-#### libgpod sera a ajouter dans les deps
+# Depends on: kdegraphics, kdepimlibs, opencv, imagemagick, qca, libgpod
name=kipi-plugins
version=1.3.0
-release=1
-source=(http://downloads.sourceforge.net/kipi/$name-$version.tar.bz2)
+release=2
+source=(http://downloads.sourceforge.net/kipi/$name-$version.tar.bz2
+ ipodexport_no_keywords.patch)
build() {
cd $name-$version
+ patch -p0 -i $SRC/ipodexport_no_keywords.patch
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=/usr
diff --git a/kde/kipi-plugins/ipodexport_no_keywords.patch b/kde/kipi-plugins/ipodexport_no_keywords.patch
new file mode 100644
index 000000000..1ae92747d
--- /dev/null
+++ b/kde/kipi-plugins/ipodexport_no_keywords.patch
@@ -0,0 +1,55 @@
+Index: ipodexport/IpodExportDialog.cpp
+===================================================================
+--- ipodexport/IpodExportDialog.cpp (revision 1138808)
++++ ipodexport/IpodExportDialog.cpp (working copy)
+@@ -694,7 +694,7 @@
+ {
+ QList<QTreeWidgetItem*> selected = m_ipodAlbumList->selectedItems();
+
+- foreach( QTreeWidgetItem *item, selected )
++ Q_FOREACH( QTreeWidgetItem *item, selected )
+ {
+ IpodAlbumItem *album = dynamic_cast<IpodAlbumItem*>( item );
+ if( album )
+@@ -721,7 +721,7 @@
+ {
+ if( filesPath.isEmpty() ) return;
+
+- foreach( const QString &dropFile, filesPath )
++ Q_FOREACH( const QString &dropFile, filesPath )
+ {
+ // TODO: Check if the new item already exist in the list.
+ addUrlToList( dropFile );
+Index: ipodexport/ImageList.cpp
+===================================================================
+--- ipodexport/ImageList.cpp (revision 1138808)
++++ ipodexport/ImageList.cpp (working copy)
+@@ -65,14 +65,14 @@
+ {
+ QStringList filesPath;
+
+- foreach( const QUrl &u, urls )
++ Q_FOREACH( const QUrl &u, urls )
+ {
+ filesPath << u.path();
+ }
+
+ if( !filesPath.isEmpty() )
+ {
+- emit signalAddedDropItems( filesPath );
++ Q_EMIT signalAddedDropItems( filesPath );
+ }
+ }
+
+Index: ipodexport/CMakeLists.txt
+===================================================================
+--- ipodexport/CMakeLists.txt (revision 1138808)
++++ ipodexport/CMakeLists.txt (working copy)
+@@ -10,6 +10,7 @@
+ )
+
+ KDE4_ADD_PLUGIN(kipiplugin_ipodexport ${kipiplugin_ipodexport_PART_SRCS})
++ADD_DEFINITIONS(-DQT_NO_KEYWORDS)
+
+ TARGET_LINK_LIBRARIES(kipiplugin_ipodexport
+ ${GOBJECT_LIBRARIES}