Skip to Content.
Sympa Menu

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

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 (7799d66561d93ac0f09d0fd0ba3d5460b99504ea)
  • Date: Sat, 6 Jan 2007 03:14:10 -0600

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

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

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

kipi-plugins-0.1.3-rc1

diff --git a/kde-apps/kipi-plugins/DETAILS b/kde-apps/kipi-plugins/DETAILS
index 4ab285e..56929e2 100755
--- a/kde-apps/kipi-plugins/DETAILS
+++ b/kde-apps/kipi-plugins/DETAILS
@@ -1,6 +1,6 @@
SPELL=kipi-plugins
- VERSION=0.1.3-beta1
-
SOURCE_HASH=sha512:284ff23224f8575a777b7df8e56aa1fe9dcf626d371c60db45c36113ec073418545e796ec0dd1095e0c782a4f0359c2284b37969ec5f4f1e093294cc4f049f18
+ VERSION=0.1.3-rc1
+
SOURCE_HASH=sha512:8a030a22be6c046bceb79eb5048431ed0b8ad4480bb4e8130e1cf9ab595d5e258f8d91e44f3751e5d9e7ba769c43071b90d03bf517a19a0c388e4416752109f5
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 036133a..70e10ba 100644
--- a/kde-apps/kipi-plugins/HISTORY
+++ b/kde-apps/kipi-plugins/HISTORY
@@ -1,3 +1,7 @@
+2007-01-06Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 0.1.3-rc1
+ * PRE_BUILD, gphoto.diff: deleted, already fixed
+
2005-12-06 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 0.1.3-beta1
* DEPENDS: add exiv2, tiff, imlib2, libxslt, libgphoto2
diff --git a/kde-apps/kipi-plugins/PRE_BUILD b/kde-apps/kipi-plugins/PRE_BUILD
deleted file mode 100755
index 447cbc3..0000000
--- a/kde-apps/kipi-plugins/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 4a8b514..0000000
--- a/kde-apps/kipi-plugins/gphoto.diff
+++ /dev/null
@@ -1,135 +0,0 @@
---- /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 (7799d66561d93ac0f09d0fd0ba3d5460b99504ea), Treeve Jelbert, 01/06/2007

Archive powered by MHonArc 2.6.24.

Top of Page