2130694a59
- Add new NLS dependency as well as a patch to fix a build failure
without it
- Drop host-gettext (not needed since autoreconf was dropped with
8729c4ef88)
- Update indentation in hash file (two spaces)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From a133aea7880bbb56d75535e534716d0e16a3b61a Mon Sep 17 00:00:00 2001
|
|
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
|
Date: Tue, 28 Jul 2020 09:47:03 +0200
|
|
Subject: [PATCH] zbarcam, zbarimg: get rid of gettext.h
|
|
|
|
This doesn't seem to be needed at all for translations to
|
|
work. Also, gettext.h uses a different license. So, let's get
|
|
rid of it.
|
|
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
|
[Retrieved (and updated to remove gettext.h which is not in the
|
|
tarball):
|
|
https://github.com/mchehab/zbar/commit/a133aea7880bbb56d75535e534716d0e16a3b61a]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
zbar/gettext.h | 294 ----------------------------------------------
|
|
zbarcam/zbarcam.c | 1 -
|
|
zbarimg/zbarimg.c | 1 -
|
|
3 files changed, 296 deletions(-)
|
|
delete mode 100644 zbar/gettext.h
|
|
|
|
diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c
|
|
index f7ea281..ad30101 100644
|
|
--- a/zbarcam/zbarcam.c
|
|
+++ b/zbarcam/zbarcam.c
|
|
@@ -35,7 +35,6 @@
|
|
#include <zbar.h>
|
|
|
|
#ifdef ENABLE_NLS
|
|
-#include "../zbar/gettext.h"
|
|
# include <libintl.h>
|
|
# define _(string) gettext(string)
|
|
#else
|
|
diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
|
|
index 0796fd8..d05d832 100644
|
|
--- a/zbarimg/zbarimg.c
|
|
+++ b/zbarimg/zbarimg.c
|
|
@@ -40,7 +40,6 @@
|
|
#include <zbar.h>
|
|
|
|
#ifdef ENABLE_NLS
|
|
-#include "../zbar/gettext.h"
|
|
# include <libintl.h>
|
|
# define _(string) gettext(string)
|
|
#else
|