summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorAlexander Nedotsukov <bland@FreeBSD.org>2012-04-07 15:39:05 +0000
committerAlexander Nedotsukov <bland@FreeBSD.org>2012-04-07 15:39:05 +0000
commitc9c8d7627f86b100b5e3405018052a615cdc8d3a (patch)
tree55da7a22697e90a1896f9c20968f7d8d48fc8f56 /x11
parentReplace USE_GCC=4.5+ by USE_GCC=4.6+ which has been transparently (diff)
Let users to recover from the situation when the display was used is
removed. PR: 166647 Feature safe: yes
Notes
Notes: svn path=/head/; revision=294333
Diffstat (limited to 'x11')
-rw-r--r--x11/nvidia-settings/Makefile1
-rw-r--r--x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c11
2 files changed, 12 insertions, 0 deletions
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index 67bbb7ed57ef..3dc6f3fcadcd 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nvidia-settings
PORTVERSION= 285.05.09
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://download.nvidia.com/XFree86/nvidia-settings/ \
ftp://download1.nvidia.com/XFree86/nvidia-settings/
diff --git a/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c b/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c
new file mode 100644
index 000000000000..e67907b2a0cf
--- /dev/null
+++ b/x11/nvidia-settings/files/patch-src__gtk+-2.x__ctkdisplayconfig-utils.c
@@ -0,0 +1,11 @@
+--- src/gtk+-2.x/ctkdisplayconfig-utils.c.orig 2011-09-24 11:57:57.000000000 +0900
++++ src/gtk+-2.x/ctkdisplayconfig-utils.c 2012-04-08 00:33:01.000000000 +0900
+@@ -1391,7 +1391,7 @@
+ NvCtrlGetTargetId(screen->gpu->handle),
+ orig_mode_str);
+ nv_error_msg(*err_str);
+- goto fail;
++ continue;
+ }
+
+