summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-libs/libkvkontakte/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-libs/libkvkontakte/files')
-rw-r--r--net-libs/libkvkontakte/files/libkvkontakte-2.2.0-libdir.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/net-libs/libkvkontakte/files/libkvkontakte-2.2.0-libdir.patch b/net-libs/libkvkontakte/files/libkvkontakte-2.2.0-libdir.patch
new file mode 100644
index 000000000000..9cde6a0b8ec8
--- /dev/null
+++ b/net-libs/libkvkontakte/files/libkvkontakte-2.2.0-libdir.patch
@@ -0,0 +1,24 @@
+diff -ruN digikam-2.2.0.orig/extra/libkvkontakte/CMakeLists.txt digikam-2.2.0/extra/libkvkontakte/CMakeLists.txt
+--- digikam-2.2.0.orig/extra/libkvkontakte/CMakeLists.txt 2011-10-03 12:34:05.000000000 +0200
++++ digikam-2.2.0/extra/libkvkontakte/CMakeLists.txt 2011-10-03 20:01:54.082572683 +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}")
+
+-if(NOT LIB_INSTALL_DIR)
+- set(LIB_INSTALL_DIR lib${LIB_SUFFIX})
+-endif(NOT LIB_INSTALL_DIR)
+-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 )
+
+@@ -26,6 +21,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)