From a7f4ec58ad64e20c058faf9f4643d94225b52609 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Sun, 1 Feb 2015 14:06:02 +0900 Subject: [PATCH] tizen 2.3 release --- packaging/libX11.spec | 7 ++----- src/xlibi18n/lcGeneric.c | 7 ++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packaging/libX11.spec b/packaging/libX11.spec index 8bb03d2..d8fd47e 100644 --- a/packaging/libX11.spec +++ b/packaging/libX11.spec @@ -4,8 +4,7 @@ Summary: Core X11 protocol client library Name: libX11 Version: 1.5.0 -Release: 3 -VCS: framework/uifw/xorg/lib/libx11#REBASE-7-g234d56c50c5d38bc7d55b573fb94ec4d84ed4b3d +Release: 5 License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -56,7 +55,7 @@ autoreconf -v --install --force --enable-specs \ --enable-man-pages=3 \ --with-xcb=yes \ - CFLAGS="${CFLAGS} -D_F_REDUCE_SYSCALL " \ + CFLAGS="${CFLAGS} -D_F_REDUCE_SYSCALL -D_FIX_MEM_LEAK_" \ LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed" make %{?jobs:-j%jobs} @@ -66,7 +65,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p %{buildroot}/usr/share/license cp -af COPYING %{buildroot}/usr/share/license/%{name} cp -af COPYING %{buildroot}/usr/share/license/%{name}-common -cp -af COPYING %{buildroot}/usr/share/license/%{name}-devel make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # We intentionally don't ship *.la files @@ -121,4 +119,3 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/x11-xcb.pc #%{_mandir}/man3/*.3* #%{_mandir}/man5/*.5* -/usr/share/license/%{name}-devel diff --git a/src/xlibi18n/lcGeneric.c b/src/xlibi18n/lcGeneric.c index 619cb47..72d53b0 100644 --- a/src/xlibi18n/lcGeneric.c +++ b/src/xlibi18n/lcGeneric.c @@ -1000,8 +1000,13 @@ initialize(XLCd lcd) XLC_PUBLIC_METHODS(lcd)->superclass = superclass; +#ifdef _FIX_MEM_LEAK_ + //BUGFIX: Memory leak + lcd->methods->close = destroy; +#endif + if (superclass->pub.initialize) { - if ((*superclass->pub.initialize)(lcd) == False) + if ((*superclass->pub.initialize)(lcd) == False) return False; } -- 2.7.4