Attachment #1088 for bug #1393

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1393
Collapse All | Expand All

Lines 22-27 set( VERSION "R14" ) Link Here

(-)a/CMakeLists.txt (+2 lines)
22		22
23	include( FindPkgConfig )	23	include( FindPkgConfig )
24	include( CheckIncludeFile )	24	include( CheckIncludeFile )
		25	include( CheckIncludeFiles )
25	include( CheckCSourceRuns )	26	include( CheckCSourceRuns )
26	include( CheckCXXSourceRuns )	27	include( CheckCXXSourceRuns )
27	include( CheckCXXSourceCompiles )	28	include( CheckCXXSourceCompiles )
Lines 84-89 option( WITH_HAL "Enable HAL support" ${WITH_ALL_OPTIONS} ) Link Here
84	option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )	85	option( WITH_TDEHWLIB "Enable TDE hardware library support" OFF )
85	option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )	86	option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
86	option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )	87	option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
		88	option( WITH_KDESKTOP_LOCK_BACKTRACE "Enable backtrace in kdesktop_lock exception handler" ${WITH_ALL_OPTIONS} )
87		89
88	##### options comments ##########################	90	##### options comments ##########################
89		91

Lines 121-126 Link Here

(-)a/config.h.cmake (+1 lines)
121		121
122	// kdesktop	122	// kdesktop
123	#cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"	123	#cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"
		124	#cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1
124		125
125	// tdm	126	// tdm
126	#cmakedefine XBINDIR "@XBINDIR@"	127	#cmakedefine XBINDIR "@XBINDIR@"

Lines 14-16 Link Here

(-)a/kdesktop/ConfigureChecks.cmake (+7 lines)
14	if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) )	14	if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) )
15	set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )	15	set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
16	endif( )	16	endif( )
		17
		18	if( WITH_KDESKTOP_LOCK_BACKTRACE )
		19	check_include_files( "bfd.h;demangle.h;libiberty.h" HAVE_BINUTILS_DEV )
		20	if( NOT HAVE_BINUTILS_DEV )
		21	tde_message_fatal( "backtrace in kdesktop_lock exception handler require binutils-dev, but not found on your system" )
		22	endif( )
		23	endif( )

Lines 35-42 set( ${target}_SRCS Link Here

(-)a/kdesktop/lock/CMakeLists.txt (-1 / +5 lines)
35	securedlg.cc autologout.cc main.cc backtrace_symbols.c	35	securedlg.cc autologout.cc main.cc backtrace_symbols.c
36	)	36	)
37		37
		38	if( WITH_KDESKTOP_LOCK_BACKTRACE )
		39	set( BACKTRACE_LIBRARY bfd )
		40	endif( )
		41
38	tde_add_executable( ${target} AUTOMOC	42	tde_add_executable( ${target} AUTOMOC
39	SOURCES ${${target}_SRCS}	43	SOURCES ${${target}_SRCS}
40	LINK kdesktopsettings-static dmctl-static kio-shared Xext bfd ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"	44	LINK kdesktopsettings-static dmctl-static kio-shared Xext ${BACKTRACE_LIBRARY} ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
41	DESTINATION ${BIN_INSTALL_DIR}	45	DESTINATION ${BIN_INSTALL_DIR}
42	)	46	)

Lines 35-40 Link Here

(-)a/kdesktop/lock/backtrace_symbols.c (+5 lines)
35	along with this program; if not, write to the Free Software	35	along with this program; if not, write to the Free Software
36	Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */	36	Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
37		37
		38	#include <config.h>
		39
		40	#ifdef WITH_KDESKTOP_LOCK_BACKTRACE
		41
38	#define fatal(a, b) exit(1)	42	#define fatal(a, b) exit(1)
39	#define bfd_fatal(a) exit(1)	43	#define bfd_fatal(a) exit(1)
40	#define bfd_nonfatal(a) exit(1)	44	#define bfd_nonfatal(a) exit(1)
Lines 323-325 backtrace_symbols_fd(void const buffer, int size, int fd) Link Here
323	free(strings);	327	free(strings);
324	}	328	}
325		329
		330	#endif /* WITH_KDESKTOP_LOCK_BACKTRACE */

Lines 137-142 static Atom gXA_SCREENSAVER_VERSION; Link Here

(-)a/kdesktop/lock/lockprocess.cc (+2 lines)
137		137
138	void print_trace()	138	void print_trace()
139	{	139	{
		140	#ifdef WITH_KDESKTOP_LOCK_BACKTRACE
140	void *array[10];	141	void *array[10];
141	size_t size;	142	size_t size;
142	char **strings;	143	char **strings;
Lines 152-157 void print_trace() Link Here
152	}	153	}
153		154
154	free (strings);	155	free (strings);
		156	#endif
155	}	157	}
156		158
157	static void segv_handler(int)	159	static void segv_handler(int)

Return to bug 1393