changed debian/source/format to native
This commit is contained in:
parent
395aeaf1e0
commit
53fa688269
|
@ -1,69 +0,0 @@
|
|||
From: Debian X Strike Force <debian-x@lists.debian.org>
|
||||
Date: Sat, 14 May 2022 03:19:12 +0800
|
||||
Subject: editres-format-strings
|
||||
|
||||
Fix build error with -Werror=format-security
|
||||
|
||||
geometry.c: In function '_FindWidget':
|
||||
geometry.c:66:5: error: format not a string literal and no format arguments [-Werror=format-security]
|
||||
sprintf(msg, res_labels[14]);
|
||||
^
|
||||
geometry.c: In function 'DisplayChild':
|
||||
geometry.c:106:2: error: format not a string literal and no format arguments [-Werror=format-security]
|
||||
sprintf(msg, res_labels[13]);
|
||||
^
|
||||
cc1: some warnings being treated as errors
|
||||
---
|
||||
editres/geometry.c | 4 ++--
|
||||
editres/svpopup.c | 2 +-
|
||||
editres/utils.c | 2 +-
|
||||
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/editres/geometry.c b/editres/geometry.c
|
||||
index 50dd286..77f0474 100644
|
||||
--- a/editres/geometry.c
|
||||
+++ b/editres/geometry.c
|
||||
@@ -63,7 +63,7 @@ _FindWidget(Widget w)
|
||||
Window win;
|
||||
int x, y; /* location of event in root coordinates. */
|
||||
|
||||
- snprintf(msg, sizeof(msg), res_labels[14]);
|
||||
+ snprintf(msg, sizeof(msg), "%s", res_labels[14]);
|
||||
|
||||
SetMessage(global_screen_data.info_label, msg);
|
||||
|
||||
@@ -103,7 +103,7 @@ DisplayChild(Event *event)
|
||||
find_event->widgets.num_widgets);
|
||||
|
||||
if (node == NULL) {
|
||||
- snprintf(msg, sizeof(msg), res_labels[13]);
|
||||
+ snprintf(msg, sizeof(msg), "%s", res_labels[13]);
|
||||
SetMessage(global_screen_data.info_label, msg);
|
||||
return;
|
||||
}
|
||||
diff --git a/editres/svpopup.c b/editres/svpopup.c
|
||||
index 384eb70..169064a 100644
|
||||
--- a/editres/svpopup.c
|
||||
+++ b/editres/svpopup.c
|
||||
@@ -127,7 +127,7 @@ ModifySVEntry(Widget w, XEvent *event, String *params, Cardinal *num_params)
|
||||
old = global_screen_data.res_text;
|
||||
break;
|
||||
default:
|
||||
- snprintf(msg, sizeof(msg), res_labels[22]);
|
||||
+ snprintf(msg, sizeof(msg), "%s", res_labels[22]);
|
||||
SetMessage(global_screen_data.info_label, msg);
|
||||
return;
|
||||
}
|
||||
diff --git a/editres/utils.c b/editres/utils.c
|
||||
index de046d2..993f675 100644
|
||||
--- a/editres/utils.c
|
||||
+++ b/editres/utils.c
|
||||
@@ -518,7 +518,7 @@ HandleGetResources(Event *event)
|
||||
get_event->info[i].widgets.num_widgets);
|
||||
|
||||
if (node == NULL) {
|
||||
- snprintf(buf, sizeof(buf), res_labels[16]);
|
||||
+ snprintf(buf, sizeof(buf), "%s", res_labels[16]);
|
||||
AddString(&errors, buf);
|
||||
continue;
|
||||
}
|
|
@ -1,28 +0,0 @@
|
|||
From: Julien Cristau <jcristau@debian.org>
|
||||
Date: Sat, 14 May 2022 03:19:12 +0800
|
||||
Subject: configure: use AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
On glibc, posix_openpt requires _XOPEN_SOURCE >= 600
|
||||
---
|
||||
luit/configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/luit/configure.ac b/luit/configure.ac
|
||||
index c214d85..3adc3ea 100644
|
||||
--- a/luit/configure.ac
|
||||
+++ b/luit/configure.ac
|
||||
@@ -30,13 +30,13 @@ AM_MAINTAINER_MODE
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.8)
|
||||
+AC_USE_SYSTEM_EXTENSIONS
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
-
|
||||
AC_CHECK_HEADERS([pty.h stropts.h sys/param.h sys/select.h])
|
||||
AC_CHECK_FUNCS([select grantpt posix_openpt])
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
editres-format-strings.diff
|
||||
luit-system-extensions.diff
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
Loading…
Reference in New Issue