diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /gkdial/gkdial-1.8.1 | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'gkdial/gkdial-1.8.1')
| -rw-r--r-- | gkdial/gkdial-1.8.1/gkdial-arm.patch | 11 | ||||
| -rw-r--r-- | gkdial/gkdial-1.8.1/gkdial-gladedir.patch | 11 | ||||
| -rw-r--r-- | gkdial/gkdial-1.8.1/gkdial-gpe-su.patch | 22 |
3 files changed, 44 insertions, 0 deletions
diff --git a/gkdial/gkdial-1.8.1/gkdial-arm.patch b/gkdial/gkdial-1.8.1/gkdial-arm.patch index e69de29bb2..aa24977762 100644 --- a/gkdial/gkdial-1.8.1/gkdial-arm.patch +++ b/gkdial/gkdial-1.8.1/gkdial-arm.patch @@ -0,0 +1,11 @@ +--- gkdial-1.8.1.orig/src/main.c 2003-06-27 04:47:54.000000000 +0200 ++++ gkdial-1.8.1/src/main.c 2004-06-18 12:30:11.000000000 +0200 +@@ -416,7 +416,7 @@ + gkdial.add_only = FALSE; + gkdial.edit_only = FALSE; + gkdial.remove_only = FALSE; +- char c; ++ int c; + + /* + * it seems like poff kills gkdial together with it's children, so diff --git a/gkdial/gkdial-1.8.1/gkdial-gladedir.patch b/gkdial/gkdial-1.8.1/gkdial-gladedir.patch index e69de29bb2..64b7b15b62 100644 --- a/gkdial/gkdial-1.8.1/gkdial-gladedir.patch +++ b/gkdial/gkdial-1.8.1/gkdial-gladedir.patch @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2004-06-16 18:27:51.000000000 +0200 ++++ Makefile.am 2004-06-16 18:28:09.000000000 +0200 +@@ -7,7 +7,7 @@ + gkdial.glade \ + gkdial.gladep + +-gladedir = $(DESTDIR)/$(pkgdatadir)/glade ++gladedir = $(pkgdatadir)/glade + glade_DATA = gkdial.glade + + install-data-local: diff --git a/gkdial/gkdial-1.8.1/gkdial-gpe-su.patch b/gkdial/gkdial-1.8.1/gkdial-gpe-su.patch index e69de29bb2..0be396f389 100644 --- a/gkdial/gkdial-1.8.1/gkdial-gpe-su.patch +++ b/gkdial/gkdial-1.8.1/gkdial-gpe-su.patch @@ -0,0 +1,22 @@ +--- gkdial-1.8.1.orig/src/util.c 2003-06-27 22:30:29.000000000 +0200 ++++ gkdial-1.8.1/src/util.c 2004-06-18 16:57:43.000000000 +0200 +@@ -336,13 +336,13 @@ + gint a; + pid_t pid; + gchar **command; ++ gchar *fcmd = g_strdup_printf("%s > /dev/null 2>&1",cmd); + +- command = g_malloc (sizeof (gchar *) * 5); +- command[0] = g_strdup ("/usr/bin/gksu"); +- command[1] = g_strdup ("-m"); +- command[2] = g_strdup (msg); +- command[3] = g_strdup (cmd); +- command[4] = NULL; ++ command = g_malloc (sizeof (gchar *) * 4); ++ command[0] = g_strdup (PREFIX "/bin/gpe-su"); ++ command[1] = g_strdup ("-c"); ++ command[2] = fcmd; ++ command[3] = NULL; + + pid = fork (); + if (pid == 0) |