diff options
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/pmount/pmount-0.9.19/gettext.patch | 197 | ||||
| -rw-r--r-- | recipes/pmount/pmount-0.9.19/install.patch | 15 | ||||
| -rw-r--r-- | recipes/pmount/pmount_0.9.19.bb | 22 |
3 files changed, 234 insertions, 0 deletions
diff --git a/recipes/pmount/pmount-0.9.19/gettext.patch b/recipes/pmount/pmount-0.9.19/gettext.patch new file mode 100644 index 0000000000..a784e32440 --- /dev/null +++ b/recipes/pmount/pmount-0.9.19/gettext.patch @@ -0,0 +1,197 @@ +Index: pmount-0.9.18/src/pmount-hal.c +=================================================================== +--- pmount-0.9.18.orig/src/pmount-hal.c 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/pmount-hal.c 2009-07-12 17:16:00.719122863 +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" +@@ -25,9 +24,6 @@ + + #include "realpath.h" + +-/* gettext abbreviation */ +-#define _(String) gettext(String) +- + void help() { + puts( _( + "pmount-hal - execute pmount with additional information from hal\n\n" +@@ -198,8 +194,8 @@ + + /* initialize locale */ + setlocale( LC_ALL, "" ); +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); + + if( argc < 2 ) { + help(); +Index: pmount-0.9.18/src/utils.h +=================================================================== +--- pmount-0.9.18.orig/src/utils.h 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/utils.h 2009-07-12 17:23:01.384780369 +0200 +@@ -12,8 +12,31 @@ + #define __utils_h + + /* gettext abbreviation */ ++#ifdef ENABLE_NLS ++ ++#include <libintl.h> ++ + #define _(String) gettext(String) + ++#ifdef gettext_noop ++#define N_(String) gettext_noop(String) ++#else ++#define N_(String) (String) ++#endif ++ ++#else /* NLS is disabled */ ++ ++#define _(String) (String) ++#define N_(String) (String) ++#define textdomain(String) (String) ++#define gettext(String) (String) ++#define dgettext(Domain,String) (String) ++#define dcgettext(Domain,String,Type) (String) ++#define bindtextdomain(Domain,Directory) (Domain) ++#define bind_textdomain_codeset(Domain,Codeset) (Codeset) ++ ++#endif /* ENABLE_NLS */ ++ + /* global flag whether to print debug messages (false by default) */ + extern int enable_debug; + +Index: pmount-0.9.18/configure.ac +=================================================================== +--- pmount-0.9.18.orig/configure.ac 2008-10-18 21:02:18.000000000 +0200 ++++ pmount-0.9.18/configure.ac 2009-07-12 17:16:00.719122863 +0200 +@@ -5,8 +5,6 @@ + AC_CONFIG_SRCDIR(src) + AM_INIT_AUTOMAKE(pmount, 0.9.18) + +-AC_PROG_INTLTOOL([0.21]) +- + AM_MAINTAINER_MODE + AC_ISC_POSIX + AC_HEADER_STDC +@@ -77,10 +75,13 @@ + 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 ++ ++IT_PROG_INTLTOOL([0.21]) ++GETTEXT_PACKAGE=$PACKAGE ++AC_SUBST([GETTEXT_PACKAGE]) ++AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.17]) + + AC_OUTPUT([ + Makefile +Index: pmount-0.9.18/src/pmount.c +=================================================================== +--- pmount-0.9.18.orig/src/pmount.c 2008-10-18 20:49:54.000000000 +0200 ++++ pmount-0.9.18/src/pmount.c 2009-07-12 17:16:00.722456315 +0200 +@@ -21,7 +21,6 @@ + #include <errno.h> + #include <locale.h> + #include <langinfo.h> +-#include <libintl.h> + #include <sys/stat.h> + + #include "fs.h" +@@ -652,8 +651,8 @@ + + /* initialize locale */ + setlocale( LC_ALL, "" ); +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); + + /* 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.18/src/pumount.c +=================================================================== +--- pmount-0.9.18.orig/src/pumount.c 2008-10-09 23:19:46.000000000 +0200 ++++ pmount-0.9.18/src/pumount.c 2009-07-12 17:16:00.722456315 +0200 +@@ -16,9 +16,9 @@ + #include <sys/wait.h> + #include <limits.h> + #include <getopt.h> +-#include <libintl.h> + #include <locale.h> + ++ + #include "policy.h" + #include "utils.h" + #include "luks.h" +@@ -174,8 +174,8 @@ + + /* initialize locale */ + setlocale( LC_ALL, "" ); +- bindtextdomain( "pmount", NULL ); +- textdomain( "pmount" ); ++ bindtextdomain(PACKAGE, NULL ); ++ textdomain(PACKAGE); + + /* are we root? */ + if( geteuid() ) { +Index: pmount-0.9.18/src/luks.c +=================================================================== +--- pmount-0.9.18.orig/src/luks.c 2009-07-12 17:17:45.278704656 +0200 ++++ pmount-0.9.18/src/luks.c 2009-07-12 17:17:49.627119155 +0200 +@@ -14,7 +14,6 @@ + #include <stdio.h> + #include <limits.h> + #include <sys/stat.h> +-#include <libintl.h> + + enum decrypt_status + luks_decrypt( const char* device, char* decrypted, int decrypted_size, +Index: pmount-0.9.18/src/policy.c +=================================================================== +--- pmount-0.9.18.orig/src/policy.c 2009-07-12 17:17:55.502449663 +0200 ++++ pmount-0.9.18/src/policy.c 2009-07-12 17:18:03.200672861 +0200 +@@ -18,7 +18,6 @@ + #include <stdlib.h> + #include <errno.h> + #include <dirent.h> +-#include <libintl.h> + #include <sys/stat.h> + #include <sysfs/libsysfs.h> + #include <regex.h> +Index: pmount-0.9.18/src/realpath.c +=================================================================== +--- pmount-0.9.18.orig/src/realpath.c 2009-07-12 17:18:27.354526224 +0200 ++++ pmount-0.9.18/src/realpath.c 2009-07-12 17:18:32.256256916 +0200 +@@ -31,7 +31,6 @@ + #include <errno.h> + #include <stdio.h> + #include "realpath.h" +-#include <libintl.h> + #include "utils.h" + + #define MAX_READLINKS 32 +Index: pmount-0.9.18/src/utils.c +=================================================================== +--- pmount-0.9.18.orig/src/utils.c 2009-07-12 17:18:09.718277410 +0200 ++++ pmount-0.9.18/src/utils.c 2009-07-12 17:18:13.935179014 +0200 +@@ -21,7 +21,6 @@ + #include <unistd.h> + #include <fcntl.h> + #include <signal.h> +-#include <libintl.h> + + /* File name used to tag directories created by pmount */ + #define CREATED_DIR_STAMP ".created_by_pmount" diff --git a/recipes/pmount/pmount-0.9.19/install.patch b/recipes/pmount/pmount-0.9.19/install.patch new file mode 100644 index 0000000000..b02942a591 --- /dev/null +++ b/recipes/pmount/pmount-0.9.19/install.patch @@ -0,0 +1,15 @@ +Index: pmount-0.9.17/src/Makefile.am +=================================================================== +--- pmount-0.9.17.orig/src/Makefile.am 2008-10-09 01:22:41.668067209 +0200 ++++ pmount-0.9.17/src/Makefile.am 2008-10-09 01:23:22.144725902 +0200 +@@ -36,8 +36,8 @@ + + install-data-hook: + test -z $(INSTALL_DIR) || mkdir -p -- $(INSTALL_DIR) +- $(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount +- $(INSTALL_DATA) -o root -g root -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount ++ $(INSTALL_DATA) -m 4755 -D $(INSTALL_SRC)/pmount $(INSTALL_DIR)/pmount ++ $(INSTALL_DATA) -m 4755 -D $(INSTALL_SRC)/pumount $(INSTALL_DIR)/pumount + + uninstall-hook: + rm -f $(INSTALL_DIR)/pmount diff --git a/recipes/pmount/pmount_0.9.19.bb b/recipes/pmount/pmount_0.9.19.bb new file mode 100644 index 0000000000..2bab217a29 --- /dev/null +++ b/recipes/pmount/pmount_0.9.19.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Policy based mounter that gives the ability to mount removable devices as a user" +HOMEPAGE = "http://pmount.alioth.debian.org/" +LICENSE = "GPLv2" +PR = "r0" + +DEPENDS = "hal e2fsprogs-libs" +RDEPENDS_${PN}-hal = "${PN}" +RRECOMMENDS_${PN}-hal = "hal" + +SRC_URI = "https://alioth.debian.org/frs/download.php/2867/pmount-0.9.19.tar.gz \ + file://gettext.patch;patch=1 \ + file://install.patch;patch=1 \ + " + +inherit autotools gettext + +EXTRA_OECONF = "--enable-hal" + +PACKAGES =+ "${PN}-hal" + +FILES_${PN}-hal = "${bindir}/pmount-hal" + |