[gentoo-commits] gentoo-x86 commit in net-libs/libkvkontakte/files: libkvkontakte-2.1.0-libsuffix.patch libkvkontakte-2.1.0-definstall.patch

[gentoo-commits] gentoo-x86 commit in net-libs/libkvkontakte/files: libkvkontakte-2.1.0-libsuffix.patch libkvkontakte-2.1.0-definstall.patch

[Andreas HAttel (dilfridge)]

dilfridge    11/09/09 19:22:28

  Added:                libkvkontakte-2.1.0-libsuffix.patch
                        libkvkontakte-2.1.0-definstall.patch
  Log:
  New library, dependency of media-plugins/kipi-plugins
  
  (Portage version: 2.1.10.14/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-libs/libkvkontakte/files/libkvkontakte-2.1.0-libsuffix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-libsuffix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-libsuffix.patch?rev=1.1&content-type=text/plain

Index: libkvkontakte-2.1.0-libsuffix.patch
===================================================================
diff -ruN digikam-2.1.0.orig/extra/libkvkontakte/CMakeLists.txt digikam-2.1.0/extra/libkvkontakte/CMakeLists.txt
--- digikam-2.1.0.orig/extra/libkvkontakte/CMakeLists.txt	2011-09-07 11:45:12.000000000 +0200
+++ digikam-2.1.0/extra/libkvkontakte/CMakeLists.txt	2011-09-09 21:19:34.114194182 +0200
@@ -11,11 +11,6 @@
 # TODO: calculate the version id properly (here is currently a hack that won't work for 1.10.0):
 set(LIBKVKONTAKTE_VERSION_ID "0x0${LIBKVKONTAKTE_VERSION_MAJOR}0${LIBKVKONTAKTE_VERSION_MINOR}0${LIBKVKONTAKTE_VERSION_PATCH}")
 
-# set up install directories. INCLUDE_INSTALL_DIR and LIB_INSTALL_DIR must not be absolute paths
-set(LIB_INSTALL_DIR_SUFFIX "" CACHE STRING "The directories where to install libraries to")
-set(LIB_INSTALL_DIR lib${LIB_INSTALL_DIR_SUFFIX} )
-set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKVkontakte )
-
 # Use a versioned install directory for the headers so multiple versions can be installed in parallel
 set(INCLUDE_INSTALL_DIR include )
 
@@ -29,6 +24,8 @@
 include(KDE4Defaults)
 include(MacroLibrary)
 
+set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/LibKVkontakte )
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 
 set(QJSON_VERSION_REQUIRED 0.7)



1.1                  net-libs/libkvkontakte/files/libkvkontakte-2.1.0-definstall.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-definstall.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libkvkontakte/files/libkvkontakte-2.1.0-definstall.patch?rev=1.1&content-type=text/plain

Index: libkvkontakte-2.1.0-definstall.patch
===================================================================
diff -ruN digikam-2.1.0.orig/extra/libkvkontakte/libkvkontakte/CMakeLists.txt digikam-2.1.0/extra/libkvkontakte/libkvkontakte/CMakeLists.txt
--- digikam-2.1.0.orig/extra/libkvkontakte/libkvkontakte/CMakeLists.txt	2011-09-07 11:45:12.000000000 +0200
+++ digikam-2.1.0/extra/libkvkontakte/libkvkontakte/CMakeLists.txt	2011-09-09 21:08:31.052194279 +0200
@@ -65,9 +65,7 @@
 
 install(TARGETS kvkontakte
 	EXPORT LibKVkontakteExport
-	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-	RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
+	${INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install(FILES
     ${CMAKE_CURRENT_BINARY_DIR}/version.h

[gentoo-commits] gentoo-x86 commit in net-libs/libkvkontakte/files: libkvkontakte-2.1.0-libsuffix.patch libkvkontakte-2.1.0-definstall.patch

[Andreas HAttel (dilfridge)]

dilfridge    11/11/09 02:49:25

  Removed:              libkvkontakte-2.1.0-libsuffix.patch
                        libkvkontakte-2.1.0-definstall.patch
  Log:
  Version bump; remove old
  
  (Portage version: 2.1.10.32/cvs/Linux x86_64)