diff options
author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-03-06 03:01:24 +0800 |
---|---|---|
committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-03-06 03:01:24 +0800 |
commit | c7ebce51d5af5c64f38694445aae3e2c132a26c5 (patch) | |
tree | d99415376bb5e3dfbec79c9c9de089553aead6e6 /x11-servers | |
parent | 2e638ba5fe23bc48670aee7dd9c5078f8f46b030 (diff) | |
download | xorg-devel-ports-c7ebce51d5af5c64f38694445aae3e2c132a26c5.tar xorg-devel-ports-c7ebce51d5af5c64f38694445aae3e2c132a26c5.tar.gz xorg-devel-ports-c7ebce51d5af5c64f38694445aae3e2c132a26c5.tar.bz2 xorg-devel-ports-c7ebce51d5af5c64f38694445aae3e2c132a26c5.tar.lz xorg-devel-ports-c7ebce51d5af5c64f38694445aae3e2c132a26c5.tar.xz xorg-devel-ports-c7ebce51d5af5c64f38694445aae3e2c132a26c5.tar.zst xorg-devel-ports-c7ebce51d5af5c64f38694445aae3e2c132a26c5.zip |
Add a patch to initialize variables, this fixes run time with clang.
Submitted by: Niclas Zeising
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@447 058c260c-8361-11dd-a0ac-aa2bafec7d09
Diffstat (limited to 'x11-servers')
-rw-r--r-- | x11-servers/xorg-server/Makefile | 1 | ||||
-rw-r--r-- | x11-servers/xorg-server/files/extra-clang | 75 |
2 files changed, 76 insertions, 0 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 9fc57c1..8989300 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -26,6 +26,7 @@ XORG_CAT= xserver XORG_VERSION= 1.12.0 XORG_REVISION= 0 PLIST_SUB+= OLD="@comment " NEW="" +EXTRA_PATCHES+= ${FILESDIR}/extra-clang .else XORG_VERSION= 1.7.7 XORG_REVISION= 4 diff --git a/x11-servers/xorg-server/files/extra-clang b/x11-servers/xorg-server/files/extra-clang new file mode 100644 index 0000000..3d560c0 --- /dev/null +++ b/x11-servers/xorg-server/files/extra-clang @@ -0,0 +1,75 @@ +--- dix/events.c.orig 2012-02-17 21:43:30.000000000 +0100 ++++ dix/events.c 2012-02-17 21:43:54.000000000 +0100 +@@ -5375,7 +5375,8 @@ + InitEvents(void) + { + int i; +- QdEventPtr qe, tmp; ++ QdEventPtr qe = NULL; ++ QdEventPtr tmp; + + inputInfo.numDevices = 0; + inputInfo.devices = (DeviceIntPtr)NULL; +--- hw/xfree86/common/xf86Xinput.c.orig 2012-02-17 21:40:24.000000000 +0100 ++++ hw/xfree86/common/xf86Xinput.c 2012-02-17 21:40:48.000000000 +0100 +@@ -519,7 +519,7 @@ + MatchAttrToken(const char *attr, struct xorg_list *patterns, + int (*compare)(const char *attr, const char *pattern)) + { +- const xf86MatchGroup *group; ++ const xf86MatchGroup *group = NULL; + + /* If there are no patterns, accept the match */ + if (xorg_list_is_empty(patterns)) +--- hw/xfree86/dri2/dri2.c.orig 2012-02-17 21:36:17.000000000 +0100 ++++ hw/xfree86/dri2/dri2.c 2012-02-17 21:37:37.000000000 +0100 +@@ -235,7 +235,7 @@ + static DRI2DrawableRefPtr + DRI2LookupDrawableRef(DRI2DrawablePtr pPriv, XID id) + { +- DRI2DrawableRefPtr ref; ++ DRI2DrawableRefPtr ref = NULL; + + xorg_list_for_each_entry(ref, &pPriv->reference_list, link) { + if (ref->id == id) +@@ -301,7 +301,8 @@ + { + DRI2DrawablePtr pPriv = p; + DRI2ScreenPtr ds = pPriv->dri2_screen; +- DRI2DrawableRefPtr ref, next; ++ DRI2DrawableRefPtr ref = NULL; ++ DRI2DrawableRefPtr next; + WindowPtr pWin; + PixmapPtr pPixmap; + DrawablePtr pDraw; +@@ -579,7 +580,7 @@ + DRI2InvalidateDrawable(DrawablePtr pDraw) + { + DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); +- DRI2DrawableRefPtr ref; ++ DRI2DrawableRefPtr ref = NULL; + + if (!pPriv || !pPriv->needInvalidate) + return; +--- test/list.c.orig 2012-02-17 21:38:40.000000000 +0100 ++++ test/list.c 2012-02-17 21:39:14.000000000 +0100 +@@ -175,7 +175,7 @@ + { + struct parent parent = {0}; + struct child child[3]; +- struct child *c; ++ struct child *c = NULL; + int i = 0; + + xorg_list_init(&parent.children); +--- xfixes/cursor.c.orig 2012-02-17 21:42:30.000000000 +0100 ++++ xfixes/cursor.c 2012-02-17 21:42:43.000000000 +0100 +@@ -1168,7 +1168,7 @@ + barrier_find_nearest(CursorScreenPtr cs, int dir, + int x1, int y1, int x2, int y2) + { +- struct PointerBarrierClient *c; ++ struct PointerBarrierClient *c = NULL; + struct PointerBarrier *nearest = NULL; + double min_distance = INT_MAX; /* can't get higher than that in X anyway */ + |