diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/pmount/pmount-0.9.18/gettext.patch | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/pmount/pmount-0.9.18/gettext.patch')
-rw-r--r-- | packages/pmount/pmount-0.9.18/gettext.patch | 133 |
1 files changed, 0 insertions, 133 deletions
diff --git a/packages/pmount/pmount-0.9.18/gettext.patch b/packages/pmount/pmount-0.9.18/gettext.patch deleted file mode 100644 index dbac93f6ba..0000000000 --- a/packages/pmount/pmount-0.9.18/gettext.patch +++ /dev/null @@ -1,133 +0,0 @@ -Index: pmount-0.9.17/src/pmount-hal.c -=================================================================== ---- pmount-0.9.17.orig/src/pmount-hal.c 2007-07-01 13:58:49.000000000 +0200 -+++ pmount-0.9.17/src/pmount-hal.c 2008-10-08 23:39:20.970178412 +0200 -@@ -16,7 +16,6 @@ - #include <dirent.h> - #include <sys/stat.h> - #include <locale.h> --#include <libintl.h> - #include <libhal-storage.h> - - #include "policy.h" -@@ -26,7 +25,12 @@ - #include "realpath.h" - - /* gettext abbreviation */ -+#ifdef ENABLE_NLS -+#include <libintl.h> - #define _(String) gettext(String) -+#else -+#define _(String) (String) -+#endif - - void help() { - puts( _( -@@ -196,10 +200,12 @@ - char *dmask = NULL; - char *iocharset = NULL; - -+#ifdef ENABLE_NLS - /* initialize locale */ - setlocale( LC_ALL, "" ); - bindtextdomain( "pmount", NULL ); - textdomain( "pmount" ); -+#endif - - if( argc < 2 ) { - help(); -Index: pmount-0.9.17/src/utils.h -=================================================================== ---- pmount-0.9.17.orig/src/utils.h 2007-07-07 09:05:06.000000000 +0200 -+++ pmount-0.9.17/src/utils.h 2008-10-08 23:19:09.515475595 +0200 -@@ -12,7 +12,12 @@ - #define __utils_h - - /* gettext abbreviation */ -+#ifdef ENABLE_NLS -+#include <libintl.h> - #define _(String) gettext(String) -+#else -+#define _(String) (String) -+#endif - - /* global flag whether to print debug messages (false by default) */ - extern int enable_debug; -Index: pmount-0.9.17/configure.ac -=================================================================== ---- pmount-0.9.17.orig/configure.ac 2007-12-14 20:27:23.000000000 +0100 -+++ pmount-0.9.17/configure.ac 2008-10-08 23:19:09.598820915 +0200 -@@ -77,10 +77,7 @@ - fi - AM_CONDITIONAL(PMOUNT_HAL, test -n "$BUILD_HAL") - --GETTEXT_PACKAGE="pmount" --AC_SUBST(GETTEXT_PACKAGE) --AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) --AM_GLIB_GNU_GETTEXT -+AM_GNU_GETTEXT([external]) - - AC_OUTPUT([ - Makefile -Index: pmount-0.9.17/src/pmount.c -=================================================================== ---- pmount-0.9.17.orig/src/pmount.c 2008-10-08 23:36:44.452037557 +0200 -+++ pmount-0.9.17/src/pmount.c 2008-10-08 23:37:38.778816969 +0200 -@@ -21,9 +21,12 @@ - #include <errno.h> - #include <locale.h> - #include <langinfo.h> --#include <libintl.h> - #include <sys/stat.h> - -+#ifdef ENABLE_NLS -+#include <libintl.h> -+#endif -+ - #include "fs.h" - #include "policy.h" - #include "utils.h" -@@ -619,10 +622,12 @@ - { NULL, 0, NULL, 0} - }; - -+#ifdef ENABLE_NLS - /* initialize locale */ - setlocale( LC_ALL, "" ); - bindtextdomain( "pmount", NULL ); - textdomain( "pmount" ); -+#endif - - /* If pmount is run without a single argument, print out the list - of removable devices. Does not require root privileges, just read access -Index: pmount-0.9.17/src/pumount.c -=================================================================== ---- pmount-0.9.17.orig/src/pumount.c 2008-10-08 23:38:21.122028300 +0200 -+++ pmount-0.9.17/src/pumount.c 2008-10-08 23:38:47.972023678 +0200 -@@ -16,9 +16,12 @@ - #include <sys/wait.h> - #include <limits.h> - #include <getopt.h> --#include <libintl.h> - #include <locale.h> - -+#ifdef ENABLE_NLS -+#include <libintl.h> -+#endif -+ - #include "policy.h" - #include "utils.h" - #include "luks.h" -@@ -172,10 +175,12 @@ - { NULL, 0, NULL, 0} - }; - -+#ifdef ENABLE_NLS - /* initialize locale */ - setlocale( LC_ALL, "" ); - bindtextdomain( "pmount", NULL ); - textdomain( "pmount" ); -+#endif - - /* are we root? */ - if( geteuid() ) { |