diff options
author | joerg <joerg> | 2015-09-14 13:31:54 +0000 |
---|---|---|
committer | joerg <joerg> | 2015-09-14 13:31:54 +0000 |
commit | 3380646bebff72f5da2a2332caefd53c0fa00165 (patch) | |
tree | 65e82cf36706c45020178eceeec7fbcbd4524a3e /graphics/kipi-plugins-kde3 | |
parent | ab6d1496377f9bd5ed387ff22f25170053ae8803 (diff) | |
download | pkgsrc-3380646bebff72f5da2a2332caefd53c0fa00165.tar.gz |
Allow building kdegraphics3 and kipi-plugins-kde3 against newer
libgphoto2.
Diffstat (limited to 'graphics/kipi-plugins-kde3')
5 files changed, 116 insertions, 1 deletions
diff --git a/graphics/kipi-plugins-kde3/distinfo b/graphics/kipi-plugins-kde3/distinfo index 47d13c23a46..ec6bf95a232 100644 --- a/graphics/kipi-plugins-kde3/distinfo +++ b/graphics/kipi-plugins-kde3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2013/03/28 21:43:07 joerg Exp $ +$NetBSD: distinfo,v 1.8 2015/09/14 13:31:54 joerg Exp $ SHA1 (kipi-plugins-0.1.7.tar.bz2) = 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216 RMD160 (kipi-plugins-0.1.7.tar.bz2) = f66473c11e66f9e06aa6772c7952b640b565def9 @@ -11,6 +11,10 @@ SHA1 (patch-ae) = 6e12d87f6169d3ba1687eaa202c2edb1ac5ec7a4 SHA1 (patch-kipi-plugins_batchprocessimages_plugin__batchprocessimages.h) = 699e11538538ae06232ecdd495cce0ce59240dd1 SHA1 (patch-kipi-plugins_flickrexport_imageslist.cpp) = 43b3a56f1b686253e94eab921670447822c1695b SHA1 (patch-kipi-plugins_imageviewer_viewerwidget.cpp) = 173a70306d89fec21e27bb3cf6a14198b4eeffca +SHA1 (patch-kipi-plugins_kameraklient_gpcamera.cpp) = 7f18f3e7505640a65d16ef0a00c7759f4af76582 +SHA1 (patch-kipi-plugins_kameraklient_gpiface.cpp) = 93acd947c9b830d87bb9e12e1f1b3302e6a86e37 +SHA1 (patch-kipi-plugins_kameraklient_gpstatus.cpp) = b8c890898b5a6d63a5033223238cab675396bd0f +SHA1 (patch-kipi-plugins_kameraklient_gpstatus.h) = e6a23b4ff32411812981ba6c7844e14c1755beec SHA1 (patch-kipi-plugins_mpegencoder_kimg2mpg.h) = 8a594ee6610e2cb3726dd4179505c0450c1443ef SHA1 (patch-kipi-plugins_printwizard_cropframe.cpp) = 308813ad515ef0f9e9d7f863c456dd968ca78d39 SHA1 (patch-kipi-plugins_rawconverter_rawdecodingiface.cpp) = 2105ef9bee4f4c64f1205ff40431fec2ef1517a5 diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpcamera.cpp b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpcamera.cpp new file mode 100644 index 00000000000..059f91496d2 --- /dev/null +++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpcamera.cpp @@ -0,0 +1,29 @@ +$NetBSD: patch-kipi-plugins_kameraklient_gpcamera.cpp,v 1.1 2015/09/14 13:31:54 joerg Exp $ + +--- kipi-plugins/kameraklient/gpcamera.cpp.orig 2015-09-13 15:58:37.000000000 +0000 ++++ kipi-plugins/kameraklient/gpcamera.cpp +@@ -436,7 +436,12 @@ int GPCamera::uploadItem(const QString& + status = 0; + } + status = new GPStatus; +- if (gp_camera_folder_put_file(d->camera, folder.latin1(), cfile, status->context) != GP_OK) { ++ if (gp_camera_folder_put_file(d->camera, ++ QFile::encodeName(folder), ++ QFile::encodeName(itemName), ++ GP_FILE_TYPE_NORMAL, ++ cfile, ++ status->context) != GP_OK) { + gp_file_unref(cfile); + delete status; + status = 0; +@@ -530,7 +535,9 @@ void GPCamera::getSupportedPorts(QString + int numPorts = gp_port_info_list_count( list ); + for (int i = 0; i < numPorts; i++) { + gp_port_info_list_get_info( list, i, &info ); +- plist.append(info.path); ++ char *path; ++ gp_port_info_get_path(info, &path); ++ plist.append(path); + } + gp_port_info_list_free( list ); + } diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpiface.cpp b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpiface.cpp new file mode 100644 index 00000000000..6c5e4d9d6ea --- /dev/null +++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpiface.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-kipi-plugins_kameraklient_gpiface.cpp,v 1.1 2015/09/14 13:31:54 joerg Exp $ + +--- kipi-plugins/kameraklient/gpiface.cpp.orig 2015-09-13 16:08:06.000000000 +0000 ++++ kipi-plugins/kameraklient/gpiface.cpp +@@ -114,7 +114,9 @@ void GPIface::getSupportedPorts(QStringL + int numPorts = gp_port_info_list_count( list ); + for (int i = 0; i < numPorts; i++) { + gp_port_info_list_get_info( list, i, &info ); +- plist.append( info.path ); ++ char *path; ++ gp_port_info_get_path(info, &path); ++ plist.append( path ); + } + gp_port_info_list_free( list ); + } diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpstatus.cpp b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpstatus.cpp new file mode 100644 index 00000000000..cb7399134d4 --- /dev/null +++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpstatus.cpp @@ -0,0 +1,50 @@ +$NetBSD: patch-kipi-plugins_kameraklient_gpstatus.cpp,v 1.1 2015/09/14 13:31:54 joerg Exp $ + +--- kipi-plugins/kameraklient/gpstatus.cpp.orig 2015-09-13 16:09:58.000000000 +0000 ++++ kipi-plugins/kameraklient/gpstatus.cpp +@@ -52,39 +52,21 @@ GPContextFeedback GPStatus::cancel_func( + return (cancel ? GP_CONTEXT_FEEDBACK_CANCEL : GP_CONTEXT_FEEDBACK_OK); + } + +-void GPStatus::error_func(GPContext *, const char *format, va_list args, void *) { +- char buf[4096] = ""; +- int nSize = vsnprintf( buf, 4096, format, args ); +- if(nSize > 4094) { +- nSize = 4094; +- } +- buf[nSize] = '\0'; ++void GPStatus::error_func(GPContext *, const char *text, void *) { + QString error; +- error = error.fromLocal8Bit(buf); ++ error = error.fromLocal8Bit(text); + GPMessages::gpMessagesWrapper()->emit errorMessage(error); + } + +-void GPStatus::status_func (GPContext *, const char *format, va_list args, void *) { +- char buf[4096] = ""; +- int nSize = vsnprintf( buf, 4096, format, args ); +- if(nSize > 4094) { +- nSize = 4094; +- } +- buf[nSize] = '\0'; ++void GPStatus::status_func (GPContext *, const char *text, void *) { + QString status; +- status = status.fromLocal8Bit(buf); ++ status = status.fromLocal8Bit(text); + GPMessages::gpMessagesWrapper()->emit statusChanged(status); + } + +-unsigned int GPStatus::progress_start_func(GPContext *, float _target, const char *format, va_list args, void *) { +- char buf[4096] = ""; +- int nSize = vsnprintf( buf, 4096, format, args ); +- if(nSize > 4094) { +- nSize = 4094; +- } +- buf[nSize] = '\0'; ++unsigned int GPStatus::progress_start_func(GPContext *, float _target, const char *text, void *) { + QString prog; +- prog = prog.fromLocal8Bit(buf); ++ prog = prog.fromLocal8Bit(text); + target = _target; + return GP_OK; + } diff --git a/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpstatus.h b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpstatus.h new file mode 100644 index 00000000000..4f5beddeccb --- /dev/null +++ b/graphics/kipi-plugins-kde3/patches/patch-kipi-plugins_kameraklient_gpstatus.h @@ -0,0 +1,17 @@ +$NetBSD: patch-kipi-plugins_kameraklient_gpstatus.h,v 1.1 2015/09/14 13:31:54 joerg Exp $ + +--- kipi-plugins/kameraklient/gpstatus.h.orig 2015-09-13 16:11:11.000000000 +0000 ++++ kipi-plugins/kameraklient/gpstatus.h +@@ -48,9 +48,9 @@ class GPStatus : public QObject { + + private: + static GPContextFeedback cancel_func(GPContext *context, void *data); +- static void error_func(GPContext *context, const char *format, va_list args, void *data); +- static void status_func(GPContext *context, const char *format, va_list args, void *data); +- static unsigned int progress_start_func (GPContext *context, float target, const char *format, va_list args, void *data); ++ static void error_func(GPContext *context, const char *text, void *data); ++ static void status_func(GPContext *context, const char *text, void *data); ++ static unsigned int progress_start_func (GPContext *context, float target, const char *text, void *data); + static void progress_update_func (GPContext *context, unsigned int id, float current, void *data); + static void progress_stop_func(GPContext *context, unsigned int id, void *data); + static float target; |