5 files changed, 21 insertions, 122 deletions

diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins-flickrexport-flickrtalker.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins-flickrexport-flickrtalker.cpp
deleted file mode 100644
index ae61eb046d7c..000000000000
--- a/graphics/kipi-plugins/files/patch-kipi-plugins-flickrexport-flickrtalker.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- kipi-plugins/flickrexport/flickrtalker.cpp.orig	Tue Oct 24 18:07:24 2006
-+++ kipi-plugins/flickrexport/flickrtalker.cpp	Tue Oct 24 18:09:52 2006
-@@ -277,7 +277,7 @@
- 
- 		QString isfriend=(info.is_friend==1)?"1":"0";
- 		form.addPair("is_friend",isfriend);
--		headers.append("api_key="+ isfriend);
-+		headers.append("is_friend="+ isfriend);
- 
- 		QString tags=info.tags.join(" ");
- 		if(tags.length()>0){	
-@@ -297,6 +297,7 @@
- 		}
- 
- 		QString md5=getApiSig(m_secret,headers);
-+		form.addPair("api_sig", md5);
- 		headers.append("api_sig="+ md5);
- 		QString queryStr=headers.join("&");
- 		QString postUrl=url+queryStr;
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_Makefile.in b/graphics/kipi-plugins/files/patch-kipi-plugins_Makefile.in
index c734c35dd301..94d4c81d95b6 100644
--- a/graphics/kipi-plugins/files/patch-kipi-plugins_Makefile.in
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins_Makefile.in
@@ -1,15 +1,15 @@
---- kipi-plugins/Makefile.in.orig	Sun Jul  9 01:51:46 2006
-+++ kipi-plugins/Makefile.in	Sat Dec 16 13:42:56 2006
-@@ -385,11 +385,7 @@
- @compile_LIBKEXIF_TRUE@TIMEADJUSTDIR = $(timeadjustdir)
+--- kipi-plugins/Makefile.in.orig	Wed Jan 24 22:04:37 2007
++++ kipi-plugins/Makefile.in	Fri Jan 26 08:31:57 2007
+@@ -377,11 +377,7 @@
  @compile_ACQUIREIMAGES_TRUE@ACQUIREIMAGESDIR = acquireimages
  @compile_RAWCONVERTER_TRUE@RAWCONVERTERDIR = rawconverter
--SUBDIRS = printwizard calendar mpegencoder cdarchiving simpleviewerexport\
--	sendimages batchprocessimages wallpaper findimages galleryexport flickrexport\
--	$(SLIDESHOWDIR) $(KAMERAKLIENTDIR) $(JPEGLOSSLESSDIR) \
--	$(TIMEADJUSTDIR) $(ACQUIREIMAGESDIR) $(RAWCONVERTERDIR) \
--	$(HTMLEXPORTDIR)
-+SUBDIRS = %%SUBDIRS%%
+ @compile_IPODEXPORT_TRUE@IPODEXPORTDIR = ipodexport
+-SUBDIRS = common printwizard calendar mpegencoder cdarchiving simpleviewerexport \
+-	      sendimages batchprocessimages wallpaper findimages galleryexport flickrexport \
+-	      jpeglossless timeadjust gpssync metadataedit \
+-	      $(SLIDESHOWDIR) $(KAMERAKLIENTDIR) $(ACQUIREIMAGESDIR) $(RAWCONVERTERDIR) \
+-	      $(HTMLEXPORTDIR) $(IPODEXPORTDIR) 
++SUBDIRS = common %%SUBDIRS%%
  
  rcdir = $(kde_datadir)/kipi
  rc_DATA = tips
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_acquireimages_acquireimagedialog.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_acquireimages_acquireimagedialog.cpp
new file mode 100644
index 000000000000..821a78ee9681
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins_acquireimages_acquireimagedialog.cpp
@@ -0,0 +1,11 @@
+--- kipi-plugins/acquireimages/acquireimagedialog.cpp.orig	Fri Jan 26 09:24:31 2007
++++ kipi-plugins/acquireimages/acquireimagedialog.cpp	Fri Jan 26 09:25:12 2007
+@@ -120,7 +120,7 @@
+     // About data and help button.
+ 
+     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Acquire images"),
+-                                           NULL,
++                                           (char*) NULL,
+                                            KAboutData::License_GPL,
+                                            I18N_NOOP("A Kipi plugin to acquire images"),
+                                            "(c) 2003-2004, Gilles Caulier");
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_kameraklient_gpcamera.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_kameraklient_gpcamera.cpp
deleted file mode 100644
index ff0c07867a2c..000000000000
--- a/graphics/kipi-plugins/files/patch-kipi-plugins_kameraklient_gpcamera.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
---- kipi-plugins/kameraklient/gpcamera.cpp.orig	Sat Dec 16 15:12:23 2006
-+++ kipi-plugins/kameraklient/gpcamera.cpp	Sat Dec 16 15:16:23 2006
-@@ -561,7 +561,7 @@
- }
- 
- int GPCamera::autoDetect(QString& model, QString& port) {
--    ::CameraList camList;
-+    ::CameraList *camList;
-     CameraAbilitiesList *abilList;
-     GPPortInfoList *infoList;
-     const char *camModel_, *camPort_;
-@@ -569,27 +569,29 @@
- 
-     context = gp_context_new ();
- 
-+    gp_list_new (&camList);
-     gp_abilities_list_new (&abilList);
-     gp_abilities_list_load (abilList, context);
-     gp_port_info_list_new (&infoList);
-     gp_port_info_list_load (infoList);
--    gp_abilities_list_detect (abilList, infoList, &camList, context);
-+    gp_abilities_list_detect (abilList, infoList, camList, context);
-     gp_abilities_list_free (abilList);
-     gp_port_info_list_free (infoList);
- 
-     gp_context_unref( context );
- 
--    int count = gp_list_count (&camList);
-+    int count = gp_list_count (camList);
- 
-     if (count<=0) {
-         return -1;
-     }
-     for (int i = 0; i < count; i++) {
--        gp_list_get_name  (&camList, i, &camModel_);
--        gp_list_get_value (&camList, i, &camPort_);
-+        gp_list_get_name  (camList, i, &camModel_);
-+        gp_list_get_value (camList, i, &camPort_);
-     }
-     model = camModel_;
-     port  = camPort_;
-+    gp_list_unref (camList);
-     return 0;
- }
- 
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins_kameraklient_gpiface.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins_kameraklient_gpiface.cpp
deleted file mode 100644
index 4aa32a0b4cd3..000000000000
--- a/graphics/kipi-plugins/files/patch-kipi-plugins_kameraklient_gpiface.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- kipi-plugins/kameraklient/gpiface.cpp.orig	Sat Dec 16 15:42:30 2006
-+++ kipi-plugins/kameraklient/gpiface.cpp	Sat Dec 16 15:43:57 2006
-@@ -33,7 +33,7 @@
- {
- 
- int GPIface::autoDetect(QString& model, QString& port) {
--    ::CameraList camList;
-+    ::CameraList *camList;
-     CameraAbilitiesList *abilList;
-     GPPortInfoList *infoList;
-     const char *camModel_, *camPort_;
-@@ -41,30 +41,31 @@
- 
-     context = gp_context_new ();
- 
-+    gp_list_new (&camList);
-     gp_abilities_list_new (&abilList);
-     gp_abilities_list_load (abilList, context);
-     gp_port_info_list_new (&infoList);
-     gp_port_info_list_load (infoList);
--    gp_abilities_list_detect (abilList, infoList, &camList, context);
-+    gp_abilities_list_detect (abilList, infoList, camList, context);
-     gp_abilities_list_free (abilList);
-     gp_port_info_list_free (infoList);
- 
-     gp_context_unref( context );
- 
--    int count = gp_list_count (&camList);
-+    int count = gp_list_count (camList);
- 
-     if (count<=0) {
-         return -1;
-     }
- 
-     for (int i = 0; i < count; i++) {
--        gp_list_get_name  (&camList, i, &camModel_);
--        gp_list_get_value (&camList, i, &camPort_);
-+        gp_list_get_name  (camList, i, &camModel_);
-+        gp_list_get_value (camList, i, &camPort_);
-     }
- 
-     model = camModel_;
-     port  = camPort_;
--
-+    gp_list_unref (camList);
-     return 0;
- }
-