diff options
author | novel <novel@FreeBSD.org> | 2011-12-15 03:00:08 +0800 |
---|---|---|
committer | novel <novel@FreeBSD.org> | 2011-12-15 03:00:08 +0800 |
commit | 5f8de6428ec8bf4f2569b636c473a4b46b6ca742 (patch) | |
tree | e864b885ab62751706a31ce6e4fb5362d283701a /x11-wm | |
parent | e612701e6fb245c060260e1cf2406c029aeb4369 (diff) | |
download | freebsd-ports-gnome-5f8de6428ec8bf4f2569b636c473a4b46b6ca742.tar.gz freebsd-ports-gnome-5f8de6428ec8bf4f2569b636c473a4b46b6ca742.tar.zst freebsd-ports-gnome-5f8de6428ec8bf4f2569b636c473a4b46b6ca742.zip |
Fix build with clang.
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/obconf/files/patch-src-appearance.c | 11 | ||||
-rw-r--r-- | x11-wm/obconf/files/patch-src-main.c | 15 |
2 files changed, 23 insertions, 3 deletions
diff --git a/x11-wm/obconf/files/patch-src-appearance.c b/x11-wm/obconf/files/patch-src-appearance.c new file mode 100644 index 000000000000..be9d4dde7c0a --- /dev/null +++ b/x11-wm/obconf/files/patch-src-appearance.c @@ -0,0 +1,11 @@ +--- src/appearance.c.orig 2008-01-11 21:22:11.000000000 +0300 ++++ src/appearance.c 2011-12-14 22:55:38.000000000 +0400 +@@ -266,7 +287,7 @@ + RrFontWeight weight = RR_FONTWEIGHT_NORMAL; + RrFontSlant slant = RR_FONTSLANT_NORMAL; + +- if (mapping) return; ++ if (mapping) return NULL; + + font = g_strdup(gtk_font_button_get_font_name(w)); + while ((c = strrchr(font, ' '))) { diff --git a/x11-wm/obconf/files/patch-src-main.c b/x11-wm/obconf/files/patch-src-main.c index 5c07a63f3f4b..372f715baa52 100644 --- a/x11-wm/obconf/files/patch-src-main.c +++ b/x11-wm/obconf/files/patch-src-main.c @@ -1,6 +1,15 @@ ---- src/main.c.orig -+++ src/main.c -@@ -233,11 +233,10 @@ int main(int argc, char **argv) +--- src/main.c.orig 2011-12-14 22:49:17.000000000 +0400 ++++ src/main.c 2011-12-14 22:54:19.000000000 +0400 +@@ -204,7 +204,7 @@ + + if (obc_theme_archive) { + archive_create(obc_theme_archive); +- return; ++ return 0; + } + + p = g_build_filename(GLADEDIR, "obconf.glade", NULL); +@@ -233,11 +233,10 @@ } xmlIndentTreeOutput = 1; |