23480d6238168d488253be4038c7ab6181d65de6
[openwrt/svn-archive/archive.git] / libs / libgphoto2 / patches / 010-no_nls_bug.patch
1 --- libgphoto2-2.2.1-old/camlibs/sonix/library.c 2006-04-18 18:54:18.000000000 -0700
2 +++ libgphoto2-2.2.1/camlibs/sonix/library.c 2006-07-31 09:02:45.000000000 -0700
3 @@ -41,7 +41,7 @@
4 #else
5 # define _(String) (String)
6 # define N_(String) (String)
7 -# define ngettext(String1,String2,Count) ((Count==1)?String1:String)
8 +# define ngettext(String1,String2,Count) ((Count==1)?String1:String2)
9 #endif
10
11 #include <gphoto2-port.h>
12
13 --- libgphoto2-2.2.1-old/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c 2006-06-03 08:38:12.000000000 -0700
14 +++ libgphoto2-2.2.1/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c 2006-07-31 09:04:36.000000000 -0700
15 @@ -51,6 +51,7 @@
16 # define dgettext(Domain,Message) (Message)
17 # define dcgettext(Domain,Message,Type) (Message)
18 # define bindtextdomain(Domain,Directory) (Domain)
19 +# define bind_textdomain_codeset(Domain,Codeset) (Codeset)
20 # define _(String) (String)
21 # define N_(String) (String)
22 #endif
23 @@ -79,7 +80,7 @@
24
25 const char*
26 gp_port_message_codeset (const char *codeset) {
27 - return bind_textdomain_codeset (GETTEXT_PACKAGE, codeset);
28 + return codeset;
29 }
30
31 /**
32
33 --- libgphoto2-2.2.1-old/packaging/generic/print-camera-list.c 2006-04-18 18:54:05.000000000 -0700
34 +++ libgphoto2-2.2.1/packaging/generic/print-camera-list.c 2006-07-31 09:02:45.000000000 -0700
35 @@ -48,8 +48,8 @@
36 #include <time.h>
37 #include <string.h>
38
39 -#include <gphoto2/gphoto2-camera.h>
40 -#include <gphoto2/gphoto2-port-log.h>
41 +#include <libgphoto2/gphoto2-camera.h>
42 +#include <libgphoto2_port/gphoto2-port-log.h>
43
44 #ifndef TRUE
45 #define TRUE (0==0)