diff options
| author | abs <abs@pkgsrc.org> | 2007-03-20 10:22:31 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2007-03-20 10:22:31 +0000 |
| commit | c37241df3d9fa1a30bae25c55c55caea15bb34f8 (patch) | |
| tree | a9fedbaee1d15d8966d7f603adf9ea28428ec405 /devel | |
| parent | 64a6696667a0d2cc36295f925c722748639d459c (diff) | |
| download | pkgsrc-c37241df3d9fa1a30bae25c55c55caea15bb34f8.tar.gz | |
update libgphoto2 to 2.3.1nb2 - fix typo in patch-aa
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libgphoto2/Makefile | 4 | ||||
| -rw-r--r-- | devel/libgphoto2/patches/patch-aa | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index 61e441a5b34..160fa4e85a0 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2007/03/19 08:42:04 sborrill Exp $ +# $NetBSD: Makefile,v 1.36 2007/03/20 10:22:31 abs Exp $ DISTNAME= libgphoto2-2.3.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/libgphoto2/patches/patch-aa b/devel/libgphoto2/patches/patch-aa index 74c76d5e4f1..aa1a7b80c2c 100644 --- a/devel/libgphoto2/patches/patch-aa +++ b/devel/libgphoto2/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2007/03/19 08:42:04 sborrill Exp $ +$NetBSD: patch-aa,v 1.6 2007/03/20 10:22:31 abs Exp $ ---- camlibs/ptp2/library.c.orig 2007-03-16 13:18:01.000000000 +0000 -+++ camlibs/ptp2/library.c 2007-03-16 13:18:01.000000000 +0000 +--- camlibs/ptp2/library.c.orig 2006-12-24 15:16:20.000000000 +0000 ++++ camlibs/ptp2/library.c @@ -58,6 +58,7 @@ * is always bigendian though, we would need to work around that * too... @@ -19,17 +19,17 @@ $NetBSD: patch-aa,v 1.5 2007/03/19 08:42:04 sborrill Exp $ #include "ptp.h" #include "ptp-bugs.h" #include "ptp-private.h" -@@ -3696,8 +3697,12 @@ +@@ -3696,8 +3697,12 @@ camera_init (Camera *camera, GPContext * curloc = nl_langinfo (CODESET); if (!curloc) curloc="UTF-8"; - camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, UCS_2_INTERNAL); - camera->pl->params.cd_locale_to_ucs2 = iconv_open(UCS_2_INTERNAL, curloc); + camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, "UCS-2-INTERNAL"); -+ if(camera->pl->params.cd_ucs2_to_locale == (iconv_t) -1)) ++ if(camera->pl->params.cd_ucs2_to_locale == (iconv_t) -1) + camera->pl->params.cd_ucs2_to_locale = iconv_open(curloc, "UCS-2"); + camera->pl->params.cd_locale_to_ucs2 = iconv_open("UCS-2-INTERNAL", curloc); -+ if(camera->pl->params.cd_locale_to_ucs2 == (iconv_t) -1)) ++ if(camera->pl->params.cd_locale_to_ucs2 == (iconv_t) -1) + camera->pl->params.cd_locale_to_ucs2 = iconv_open("UCS-2", curloc); if ((camera->pl->params.cd_ucs2_to_locale == (iconv_t) -1) || (camera->pl->params.cd_locale_to_ucs2 == (iconv_t) -1)) { |