rpms/kdesvn/devel kdesvn-0.14.1-asneeded.patch, NONE, 1.1 kdesvn-0.14.1-png.patch, NONE, 1.1
Orion Poplawski (orion)
fedora-extras-commits at redhat.com
Tue Nov 20 22:51:01 UTC 2007
Author: orion
Update of /cvs/pkgs/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1314
Added Files:
kdesvn-0.14.1-asneeded.patch kdesvn-0.14.1-png.patch
Log Message:
Add the patches
kdesvn-0.14.1-asneeded.patch:
--- NEW FILE kdesvn-0.14.1-asneeded.patch ---
--- kdesvn-0.14.1/src/svnqt/cmakemodules/FindSubversion.cmake.asneeded 2007-06-11 05:43:33.000000000 -0600
+++ kdesvn-0.14.1/src/svnqt/cmakemodules/FindSubversion.cmake 2007-11-20 15:05:27.000000000 -0700
@@ -55,14 +55,29 @@
MESSAGE(SEND_ERROR "Error: no apu-config found")
endif(NOT APU_CONFIG)
- EXEC_PROGRAM(${APR_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR)
- EXEC_PROGRAM(${APU_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR)
+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--includedir" OUTPUT_VARIABLE APR_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE(STATUS "Found apr include: ${APR_INCLUDE_DIR}")
+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--includedir" OUTPUT_VARIABLE APU_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE(STATUS "Found apu include: ${APU_INCLUDE_DIR}")
+
+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE(STATUS "Found apr cppflags: ${APR_CPP_FLAGS}")
+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE(STATUS "Found apu cppflags: ${APU_CPP_FLAGS}")
+
+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APR_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE(STATUS "Found apr libs: ${APR_LIBS}")
+ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIBS})
+
+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--ldflags" OUTPUT_VARIABLE APR_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE(STATUS "Found apr extra ldflags: ${APR_EXTRA_LDFLAGS}")
+
+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APU_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE(STATUS "Found apu libs: ${APU_LIBS}")
+ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIBS})
- EXEC_PROGRAM(${APR_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APR_CPP_FLAGS)
- EXEC_PROGRAM(${APU_CONFIG} ARGS "--cppflags" OUTPUT_VARIABLE APU_CPP_FLAGS)
-
- EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS)
- EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS)
+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--ldflags" OUTPUT_VARIABLE APU_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ MESSAGE(STATUS "Found apu extra ldflags: ${APU_EXTRA_LIBS}")
ENDIF (UNIX)
@@ -171,8 +186,10 @@
"$ENV{ProgramFiles}/Subversion/lib"
)
- SET(APR_EXTRA_LIBFLAGS )
- SET(APU_EXTRA_LIBFLAGS )
+ SET(APR_EXTRA_LIBS )
+ SET(APR_EXTRA_LDFLAGS )
+ SET(APU_EXTRA_LIBS )
+ SET(APU_EXTRA_LDFLAGS )
# check found libraries
@@ -180,7 +197,7 @@
MESSAGE(SEND_ERROR "No apr lib found!")
ELSE (NOT APR_LIB)
MESSAGE(STATUS "Found apr lib: ${APR_LIB}")
- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB})
+ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIB} ${APR_EXTRA_LIBS})
endif(NOT APR_LIB)
if (NOT APRICONV_LIB)
@@ -194,7 +211,7 @@
MESSAGE(SEND_ERROR "No aprutil lib found!")
ELSE (NOT APU_LIB)
MESSAGE(STATUS "Found aprutil lib: ${APU_LIB}")
- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB})
+ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIB} ${APU_EXTRA_LIBS})
endif(NOT APU_LIB)
if (NOT APU_XMLLIB)
--- kdesvn-0.14.1/src/svnqt/CMakeLists.txt.asneeded 2007-08-31 08:24:28.000000000 -0600
+++ kdesvn-0.14.1/src/svnqt/CMakeLists.txt 2007-11-20 15:03:44.000000000 -0700
@@ -129,9 +129,8 @@
SOVERSION ${LIB_MAJOR}
VERSION ${_soversion})
-SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
-SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
-SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
+SET(ALL_LINKFLAGS "${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS}")
+SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "-Wl,--as-needed ${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS})
IF (WIN32)
--- kdesvn-0.14.1/src/kdesvnd/CMakeLists.txt.asneeded 2007-06-10 15:23:29.000000000 -0600
+++ kdesvn-0.14.1/src/kdesvnd/CMakeLists.txt 2007-11-20 15:03:44.000000000 -0700
@@ -23,7 +23,7 @@
SET_TARGET_PROPERTIES(kded_kdesvnd
PROPERTIES
- LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -avoid-version -module")
+ LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} -avoid-version -module")
INSTALL(TARGETS kded_kdesvnd
RUNTIME DESTINATION ${BIN_INSTALL_DIR}
--- kdesvn-0.14.1/src/CMakeLists.txt.asneeded 2007-07-08 11:46:16.000000000 -0600
+++ kdesvn-0.14.1/src/CMakeLists.txt 2007-11-20 15:03:44.000000000 -0700
@@ -34,7 +34,7 @@
${QT_AND_KDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_UI_LIBRARY} ${KDE3_WALLET_LIBRARY} )
SET_TARGET_PROPERTIES(kdesvnpart
PROPERTIES
- LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}")
+ LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LDFLAGS} ${APU_EXTRA_LDFLAGS} ${LINK_NO_UNDEFINED}")
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/svnqt)
kdesvn-0.14.1-png.patch:
--- NEW FILE kdesvn-0.14.1-png.patch ---
--- kdesvn-0.14.1/doc/CMakeLists.txt.png 2007-11-19 11:51:57.000000000 -0700
+++ kdesvn-0.14.1/doc/CMakeLists.txt 2007-11-19 11:51:50.000000000 -0700
@@ -1,6 +1,6 @@
#first straigth forward until we have a doc translation
IF (KDE3_MEINPROC_EXECUTABLE)
- FILE(GLOB docimages en/*.png)
+ FILE(GLOB docimages ../src/pics/hi128-filesys-kdesvn*.png)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/en_index.cache.bz2
COMMAND
More information about the fedora-extras-commits
mailing list