Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6273ad87aba5e819da0da33528dc065037134e9e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6273ad87aba5e819da0da33528dc065037134e9e)
  • Date: Thu, 14 Dec 2006 15:02:18 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

kde-apps/kipi-plugins/DEPENDS | 7 +
kde-apps/kipi-plugins/DETAILS | 4 -
kde-apps/kipi-plugins/HISTORY | 6 +
kde-apps/kipi-plugins/PRE_BUILD | 3
kde-apps/kipi-plugins/gphoto.diff | 135
++++++++++++++++++++++++++++++++++++++
5 files changed, 152 insertions(+), 3 deletions(-)

New commits:
commit 6273ad87aba5e819da0da33528dc065037134e9e
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

kipi-plugins-0.1.3-beta1

diff --git a/kde-apps/kipi-plugins/DEPENDS b/kde-apps/kipi-plugins/DEPENDS
index 69e7591..b84e7cb 100755
--- a/kde-apps/kipi-plugins/DEPENDS
+++ b/kde-apps/kipi-plugins/DEPENDS
@@ -1,2 +1,7 @@
-depends libkipi
+depends exiv2 &&
+depends libkipi &&
+optional_depends libxslt "" "" "for HtmlExport plugin" &&
+optional_depends imlib2 "" "" "for SlideShow plugin" &&
+optional_depends libgphoto2 "" "" "for kameraklient plugin" &&
+optional_depends tiff "" "" "for
AcquireImages/JpegLossless/RawConverter plugins"

diff --git a/kde-apps/kipi-plugins/DETAILS b/kde-apps/kipi-plugins/DETAILS
index 8e97ed2..4ab285e 100755
--- a/kde-apps/kipi-plugins/DETAILS
+++ b/kde-apps/kipi-plugins/DETAILS
@@ -1,6 +1,6 @@
SPELL=kipi-plugins
- VERSION=0.1.2
-
SOURCE_HASH=sha512:dc19f642a445a25ad323797cdf266139932841ec0c9c4fa9c27af42eaf239da78968d684755e56b86619c84b7f09fdfdf12f76b08ddb7a3dbab39945921a3155
+ VERSION=0.1.3-beta1
+
SOURCE_HASH=sha512:284ff23224f8575a777b7df8e56aa1fe9dcf626d371c60db45c36113ec073418545e796ec0dd1095e0c782a4f0359c2284b37969ec5f4f1e093294cc4f049f18
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/kipi/$SOURCE
diff --git a/kde-apps/kipi-plugins/HISTORY b/kde-apps/kipi-plugins/HISTORY
index 5bcb65a..036133a 100644
--- a/kde-apps/kipi-plugins/HISTORY
+++ b/kde-apps/kipi-plugins/HISTORY
@@ -1,3 +1,9 @@
+2005-12-06 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 0.1.3-beta1
+ * DEPENDS: add exiv2, tiff, imlib2, libxslt, libgphoto2
+ * PRE_BUILD, gphoto.diff: add
+ fix compile of gphoto related stuff (patch from upstream)
+
2005-07-10 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.1.2
change SOURCE_URL
diff --git a/kde-apps/kipi-plugins/PRE_BUILD b/kde-apps/kipi-plugins/PRE_BUILD
new file mode 100755
index 0000000..447cbc3
--- /dev/null
+++ b/kde-apps/kipi-plugins/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p4 < $SPELL_DIRECTORY/gphoto.diff
diff --git a/kde-apps/kipi-plugins/gphoto.diff
b/kde-apps/kipi-plugins/gphoto.diff
new file mode 100644
index 0000000..4a8b514
--- /dev/null
+++ b/kde-apps/kipi-plugins/gphoto.diff
@@ -0,0 +1,135 @@
+--- /usr/src/kipi-plugins-0.1.3-beta1/kipi-plugins/kameraklient/gpcamera.cpp
2006-12-06 21:06:53.000000000 +0100
++++ gpcamera.cpp 2006-12-14 20:59:59.000000000 +0100
+@@ -202,7 +202,7 @@
+ }
+
+ int GPCamera::getSubFolders(const QString& folder, QValueList<QString>&
subFolderList) {
+- ::CameraList *clist;
++ CameraList *clist;
+ gp_list_new(&clist);
+ if (status) {
+ delete status;
+@@ -250,7 +250,7 @@
+ }
+
+ int GPCamera::getItemsInfo(const QString& folder, GPFileItemInfoList&
infoList) {
+- ::CameraList *clist;
++ CameraList *clist;
+ const char *cname;
+ if (status) {
+ delete status;
+@@ -561,35 +561,39 @@
+ }
+
+ int GPCamera::autoDetect(QString& model, QString& port) {
+- ::CameraList camList;
++ CameraList *pCamList;
+ CameraAbilitiesList *abilList;
+ GPPortInfoList *infoList;
+ const char *camModel_, *camPort_;
+ GPContext *context;
+
+ context = gp_context_new ();
++ gp_list_new(&pCamList);
+
+ 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, pCamList, 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 (pCamList);
+
+ if (count<=0) {
++ gp_list_free(pCamList);
+ 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 (pCamList, i, &camModel_);
++ gp_list_get_value (pCamList, i, &camPort_);
+ }
+ model = camModel_;
+ port = camPort_;
++ gp_list_free(pCamList);
++
+ return 0;
+ }
+
+--- /usr/src/kipi-plugins-0.1.3-beta1/kipi-plugins/kameraklient/gpiface.cpp
2006-11-30 00:08:00.000000000 +0100
++++ gpiface.cpp 2006-12-14 21:30:06.000000000 +0100
+@@ -19,13 +19,17 @@
+ *
+ * ============================================================ */
+
+-// Qt
+-#include <qstring.h>
+-#include <qstringlist.h>
+ // GPhoto2
+-extern "C" {
++
++extern "C"
++{
+ #include <gphoto2.h>
+ }
++
++// Qt
++#include <qstring.h>
++#include <qstringlist.h>
++
+ // Local
+ #include "gpiface.h"
+
+@@ -33,37 +37,40 @@
+ {
+
+ int GPIface::autoDetect(QString& model, QString& port) {
+- ::CameraList camList;
++ CameraList *pCamList;
+ CameraAbilitiesList *abilList;
+ GPPortInfoList *infoList;
+ const char *camModel_, *camPort_;
+ GPContext *context;
+
+ context = gp_context_new ();
++ gp_list_new(&pCamList);
+
+ 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, pCamList, 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 (pCamList);
+
+ if (count<=0) {
++ gp_list_free(pCamList);
+ 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 (pCamList, i, &camModel_);
++ gp_list_get_value (pCamList, i, &camPort_);
+ }
+
+ model = camModel_;
+ port = camPort_;
++ gp_list_free(pCamList);
+
+ return 0;
+ }



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (6273ad87aba5e819da0da33528dc065037134e9e), Treeve Jelbert, 12/14/2006

Archive powered by MHonArc 2.6.24.

Top of Page