diff options
| author | tron <tron@pkgsrc.org> | 2009-11-13 10:51:17 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2009-11-13 10:51:17 +0000 |
| commit | 0c787cbac104d59ac68571d3f332a6ee886a05d3 (patch) | |
| tree | 81370bec6a262df0c200ffa205cded4a0977954b | |
| parent | b9320bef14e104b22fdd0c0efba8506fe0b1c9df (diff) | |
| download | pkgsrc-0c787cbac104d59ac68571d3f332a6ee886a05d3.tar.gz | |
Pullup ticket #2932 - requested by obache
selectwm: portability fix
Revisions pulled up:
- wm/selectwm/distinfo 1.4
- wm/selectwm/patches/patch-ad 1.1
---
Committed By: obache
Date: Thu Nov 12 04:34:45 UTC 2009
Modified Files:
pkgsrc/wm/selectwm: distinfo
Added Files:
pkgsrc/wm/selectwm/patches: patch-ad
Log Message:
Add a patch-ad to avoid conflict with getline(3) in IEEE Std 1003.1-2008.
PR 42292.
| -rw-r--r-- | wm/selectwm/distinfo | 3 | ||||
| -rw-r--r-- | wm/selectwm/patches/patch-ad | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/wm/selectwm/distinfo b/wm/selectwm/distinfo index 7916e3086dd..a8490dade7e 100644 --- a/wm/selectwm/distinfo +++ b/wm/selectwm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2007/10/06 00:05:32 joerg Exp $ +$NetBSD: distinfo,v 1.3.22.1 2009/11/13 10:51:17 tron Exp $ SHA1 (selectwm-0.4.1.tar.gz) = a4688afb9a286dae4794f297b97891008afcdeab RMD160 (selectwm-0.4.1.tar.gz) = d16a8497f39b12e8578b0d28f64cc8f7b1031958 @@ -6,3 +6,4 @@ Size (selectwm-0.4.1.tar.gz) = 209754 bytes SHA1 (patch-aa) = 2e3806e5c408bbc6891acc42399d24abc3a01f8b SHA1 (patch-ab) = a6441f722158685d78e6bffafd182ed9bff04091 SHA1 (patch-ac) = 1a7b16c532d83d9b74811bb039743aba0988e60d +SHA1 (patch-ad) = 477b9f21331cf1940b67847917bed20109b9c624 diff --git a/wm/selectwm/patches/patch-ad b/wm/selectwm/patches/patch-ad new file mode 100644 index 00000000000..102352fc2d3 --- /dev/null +++ b/wm/selectwm/patches/patch-ad @@ -0,0 +1,24 @@ +$NetBSD: patch-ad,v 1.1.2.2 2009/11/13 10:51:17 tron Exp $ + +Avoid to conflict with getline(3) defined in IEEE Std 1003.1-2008. + +--- src/options.c.orig 2002-05-22 17:39:27.000000000 +0000 ++++ src/options.c +@@ -32,7 +32,7 @@ + #include "miscui.h" + #include "modify.h" + +-static GString *getline (FILE *fichier) { ++static GString *get_line (FILE *fichier) { + GString *temp; + gchar buf[128]; + +@@ -64,7 +64,7 @@ static gint read_config_file (config *se + } + buf = g_string_new (""); + while (!feof (config)) { +- buf = getline (config); ++ buf = get_line (config); + + if (buf->len > 0 && buf->str[0] != '#') { + if (g_strrstr (buf->str, ":")) { |