0001-zbarcam-zbarimg-get-rid-of-gettext-h.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From a133aea7880bbb56d75535e534716d0e16a3b61a Mon Sep 17 00:00:00 2001
  2. From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  3. Date: Tue, 28 Jul 2020 09:47:03 +0200
  4. Subject: [PATCH] zbarcam, zbarimg: get rid of gettext.h
  5. This doesn't seem to be needed at all for translations to
  6. work. Also, gettext.h uses a different license. So, let's get
  7. rid of it.
  8. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  9. [Retrieved (and updated to remove gettext.h which is not in the
  10. tarball):
  11. https://github.com/mchehab/zbar/commit/a133aea7880bbb56d75535e534716d0e16a3b61a]
  12. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  13. ---
  14. zbar/gettext.h | 294 ----------------------------------------------
  15. zbarcam/zbarcam.c | 1 -
  16. zbarimg/zbarimg.c | 1 -
  17. 3 files changed, 296 deletions(-)
  18. delete mode 100644 zbar/gettext.h
  19. diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c
  20. index f7ea281..ad30101 100644
  21. --- a/zbarcam/zbarcam.c
  22. +++ b/zbarcam/zbarcam.c
  23. @@ -35,7 +35,6 @@
  24. #include <zbar.h>
  25. #ifdef ENABLE_NLS
  26. -#include "../zbar/gettext.h"
  27. # include <libintl.h>
  28. # define _(string) gettext(string)
  29. #else
  30. diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
  31. index 0796fd8..d05d832 100644
  32. --- a/zbarimg/zbarimg.c
  33. +++ b/zbarimg/zbarimg.c
  34. @@ -40,7 +40,6 @@
  35. #include <zbar.h>
  36. #ifdef ENABLE_NLS
  37. -#include "../zbar/gettext.h"
  38. # include <libintl.h>
  39. # define _(string) gettext(string)
  40. #else