mirror of
https://git.freebsd.org/ports.git
synced 2025-07-09 21:39:17 -04:00
c2dd4d2e2d
The area51 repository features commits by Alonso Schaich, avilla, fluffy, jhale, makc and rakuco. Common changes: - Trim Makefile header - Convert to new option framework - Add/improve desktop entries - Remove upstreamed patches Mk/bsd.qt.mk: - Set QMAKESPEC at late stage (to fix potential problem if USE_GCC is used) [1] devel/qmake: - Fix crash due to off-by one error [2] multimedia/qt4-phonon*: - Deprecate in favour of multimedia/phonon* www/qt4-webkit: - Make dependence on GStreamer optional [3] devel/qtcreator: - Enable qml-designer in devel/qtcreator (requires privite Qt headers) [4] Reported by: avg via irc [1] Submitted by: avg via maillist [2] PR: ports/175644 [3] Submitted by: danfe [3] PR: ports/169809 [4] Reported by: tcb <tcberner at gmail.com> [4]
11 lines
520 B
C++
11 lines
520 B
C++
--- ./option.cpp.orig 2012-09-11 01:36:36.000000000 +0000
|
|
+++ ./option.cpp 2012-10-27 21:51:28.131151563 +0000
|
|
@@ -482,7 +482,7 @@
|
|
env_argc++;
|
|
}
|
|
} else {
|
|
- if(!env_argv || env_argc > env_size) {
|
|
+ if(!env_argv || env_argc >= env_size) {
|
|
env_argv = (char **)realloc(env_argv, sizeof(char *)*(env_size+=10));
|
|
for(int i2 = env_argc; i2 < env_size; i2++)
|
|
env_argv[i2] = NULL;
|