Attachment #2976 for bug #3135

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 3135
Collapse All | Expand All

Lines 49-54 Link Here

(-)tdelibs-trinity-14.0.8-3133-orig/kdoctools/CMakeLists.txt (+1 lines)
49	# done ;\	49	# done ;\
50	# done )	50	# done )
51	install( DIRECTORY customization docbook DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2 PATTERN ".svn" EXCLUDE )	51	install( DIRECTORY customization docbook DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2 PATTERN ".svn" EXCLUDE )
		52	install( FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/entities/general.entities DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization/entities )
52	install( FILES man-template.docbook template.docbook DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2 )	53	install( FILES man-template.docbook template.docbook DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2 )
53		54
54	##### kbzipfilter_dummy ##############################	55	##### kbzipfilter_dummy ##############################




if( NOT TDE_RELEASE_ENTITIES )

  set( TDEVERSION_FILE "${CMAKE_SOURCE_DIR}/tdecore/tdeversion.h" )
  set( ENTITIES_FILE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/customization/entities/general.entities" )
  set( ENTITIES_FILE "${CMAKE_CURRENT_BINARY_DIR}/customization/entities/general.entities" )

  if( NOT EXISTS ${TDEVERSION_FILE} )
    tde_message_fatal( "${TDEVERSION_FILE} not found! Check your sources." )
  endif( )
  if( NOT EXISTS ${ENTITIES_FILE_SRC} )
    tde_message_fatal( "${ENTITIES_FILE_SRC} not found! Check your sources." )
  endif( )

  # read source metadata

          TDE_RELEASE_DATE  "${TDE_RELEASE_DATE}" )

  # update entities
  message( STATUS "Updating ${ENTITIES_FILE_SRC}
    TDE Release Version: ${TDE_VERSION_STRING}
    TDE Release Date: ${TDE_RELEASE_DATE}
    TDE Release Copyright: ${TDE_RELEASE_COPYRIGHT}"
  )
  file( READ ${ENTITIES_FILE_SRC} ENTITIES_DATA )
  if( "${ENTITIES_DATA}" MATCHES "ENTITY tde-release-version" )
    string( REGEX REPLACE "(ENTITY tde-release-version) \"[^\"]*\""
            "\\1 \"${TDE_VERSION_STRING}\"" ENTITIES_DATA "${ENTITIES_DATA}" )

Lines 94-99 Link Here

(-)tdelibs-trinity-14.0.8-3133-orig/tdeio/CMakeLists.txt (-1 / +2 lines)
94	SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp	94	SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
95	VERSION 14.0.0	95	VERSION 14.0.0
96	EMBED kssl-static tdeiocore-static tdesycoca-static kbookmarks-static tdefile-static ${ELFICON_STATIC_LIB}	96	EMBED kssl-static tdeiocore-static tdesycoca-static kbookmarks-static tdefile-static ${ELFICON_STATIC_LIB}
97	LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${LIBR_LIBRARIES} ${ACL_LIBRARIES}	97	LINK ltdlc-static tdeui-shared tdesu-shared tdewalletclient-shared ${ACL_LIBRARIES}
		98	LINK_PRIVATE ${LIBR_LIBRARIES}
98	DESTINATION ${LIB_INSTALL_DIR}	99	DESTINATION ${LIB_INSTALL_DIR}
99	)	100	)

Lines 16-21 Link Here

(-)tdelibs-trinity-14.0.8-3133-orig/kglib/CMakeLists.txt (-1 / +4 lines)
16		16
17	link_directories(	17	link_directories(
18	${TQT_LIBRARY_DIRS}	18	${TQT_LIBRARY_DIRS}
		19	${GLIB2_LIBRARY_DIRS}
		20	${GOBJECT2_LIBRARY_DIRS}
19	)	21	)
20		22
21		23
Lines 32-37 Link Here
32	tde_add_library( kglib SHARED	34	tde_add_library( kglib SHARED
33	SOURCES TGlibEventLoop.cpp	35	SOURCES TGlibEventLoop.cpp
34	VERSION 0.0.0	36	VERSION 0.0.0
35	LINK ${TQT_LIBRARIES} ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}	37	LINK ${TQT_LIBRARIES}
		38	LINK_PRIVATE ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}
36	DESTINATION ${LIB_INSTALL_DIR}	39	DESTINATION ${LIB_INSTALL_DIR}
37	)	40	)

Lines 146-151 Link Here

(-)tdelibs-trinity-14.0.8-3133-orig/tdecore/CMakeLists.txt (+1 lines)
146	${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}	146	${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}
147	${LIBBFD_LIBRARIES} ${LIB_UTIL}	147	${LIBBFD_LIBRARIES} ${LIB_UTIL}
148	DESTINATION ${LIB_INSTALL_DIR}	148	DESTINATION ${LIB_INSTALL_DIR}
		149	DEPENDENCIES dcopidl2cpp
149	)	150	)
150		151
151		152

Lines 11-16 Link Here

(-)tdelibs-trinity-14.0.8-3133-orig/dnssd/CMakeLists.txt (-2 / +7 lines)
11		11
12	include_directories(	12	include_directories(
13	${TQT_INCLUDE_DIRS}	13	${TQT_INCLUDE_DIRS}
		14	${AVAHI_TQT_INCLUDE_DIRS}
		15	${AVAHI_CLIENT_INCLUDE_DIRS}
14	${CMAKE_CURRENT_BINARY_DIR}	16	${CMAKE_CURRENT_BINARY_DIR}
15	${CMAKE_BINARY_DIR}	17	${CMAKE_BINARY_DIR}
16	${CMAKE_BINARY_DIR}/tdecore	18	${CMAKE_BINARY_DIR}/tdecore
Lines 20-25 Link Here
20		22
21	link_directories(	23	link_directories(
22	${TDECORE_LIBRARY_DIRS}	24	${TDECORE_LIBRARY_DIRS}
		25	${AVAHI_TQT_LIBRARY_DIRS}
		26	${AVAHI_CLIENT_LIBRARY_DIRS}
23	)	27	)
24		28
25	##### headers ###################################	29	##### headers ###################################
Lines 44-50 Link Here
44	tde_add_library( ${target} SHARED AUTOMOC	48	tde_add_library( ${target} SHARED AUTOMOC
45	SOURCES ${${target}_SRCS}	49	SOURCES ${${target}_SRCS}
46	VERSION 1.0.0	50	VERSION 1.0.0
47	LINK tdecore-shared ${AVAHI_TQT_LIBRARIES} ${AVAHI_CLIENT_LIBRARIES}	51	LINK tdecore-shared
48	DEPENDENCIES tdeconfig_compiler	52	LINK_PRIVATE ${AVAHI_TQT_LIBRARIES} ${AVAHI_CLIENT_LIBRARIES}
		53	DEPENDENCIES tdeconfig_compiler DCOP-shared
49	DESTINATION ${LIB_INSTALL_DIR}	54	DESTINATION ${LIB_INSTALL_DIR}
50	)	55	)

Return to bug 3135

Lines 11-23 Link Here

(-)tdelibs-trinity-14.0.8-3133-orig/kdoctools/ConfigureChecks.cmake (-5 / +6 lines)
11	if( NOT TDE_RELEASE_ENTITIES )	11	if( NOT TDE_RELEASE_ENTITIES )
12		12
13	set( TDEVERSION_FILE "${CMAKE_SOURCE_DIR}/tdecore/tdeversion.h" )	13	set( TDEVERSION_FILE "${CMAKE_SOURCE_DIR}/tdecore/tdeversion.h" )
14	set( ENTITIES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/customization/entities/general.entities" )	14	set( ENTITIES_FILE_SRC "${CMAKE_CURRENT_SOURCE_DIR}/customization/entities/general.entities" )
		15	set( ENTITIES_FILE "${CMAKE_CURRENT_BINARY_DIR}/customization/entities/general.entities" )
15		16
16	if( NOT EXISTS ${TDEVERSION_FILE} )	17	if( NOT EXISTS ${TDEVERSION_FILE} )
17	tde_message_fatal( "${TDEVERSION_FILE} not found! Check your sources." )	18	tde_message_fatal( "${TDEVERSION_FILE} not found! Check your sources." )
18	endif( )	19	endif( )
19	if( NOT EXISTS ${ENTITIES_FILE} )	20	if( NOT EXISTS ${ENTITIES_FILE_SRC} )
20	tde_message_fatal( "${ENTITIES_FILE} not found! Check your sources." )	21	tde_message_fatal( "${ENTITIES_FILE_SRC} not found! Check your sources." )
21	endif( )	22	endif( )
22		23
23	# read source metadata	24	# read source metadata
Lines 65-76 Link Here
65	TDE_RELEASE_DATE "${TDE_RELEASE_DATE}" )	66	TDE_RELEASE_DATE "${TDE_RELEASE_DATE}" )
66		67
67	# update entities	68	# update entities
68	message( STATUS "Updating ${ENTITIES_FILE}	69	message( STATUS "Updating ${ENTITIES_FILE_SRC}
69	TDE Release Version: ${TDE_VERSION_STRING}	70	TDE Release Version: ${TDE_VERSION_STRING}
70	TDE Release Date: ${TDE_RELEASE_DATE}	71	TDE Release Date: ${TDE_RELEASE_DATE}
71	TDE Release Copyright: ${TDE_RELEASE_COPYRIGHT}"	72	TDE Release Copyright: ${TDE_RELEASE_COPYRIGHT}"
72	)	73	)
73	file( READ ${ENTITIES_FILE} ENTITIES_DATA )	74	file( READ ${ENTITIES_FILE_SRC} ENTITIES_DATA )
74	if( "${ENTITIES_DATA}" MATCHES "ENTITY tde-release-version" )	75	if( "${ENTITIES_DATA}" MATCHES "ENTITY tde-release-version" )
75	string( REGEX REPLACE "(ENTITY tde-release-version) \"[^\"]*\""	76	string( REGEX REPLACE "(ENTITY tde-release-version) \"[^\"]*\""
76	"\\1 \"${TDE_VERSION_STRING}\"" ENTITIES_DATA "${ENTITIES_DATA}" )	77	"\\1 \"${TDE_VERSION_STRING}\"" ENTITIES_DATA "${ENTITIES_DATA}" )