diff options
author | Michał Górny <mgorny@gentoo.org> | 2017-07-14 06:11:41 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2017-07-14 06:12:10 +0200 |
commit | ff285f3f5ff70506351158dbc5f64b7f951fb860 (patch) | |
tree | 0310b88d638e96a6243a0486e36e15e1d86639dd /app-arch/snappy/files | |
parent | gnome-base/gnome-control-center: bump to 3.24.2, make cups/smbclient optional... (diff) | |
download | gentoo-ff285f3f5ff70506351158dbc5f64b7f951fb860.tar.gz gentoo-ff285f3f5ff70506351158dbc5f64b7f951fb860.tar.bz2 gentoo-ff285f3f5ff70506351158dbc5f64b7f951fb860.zip |
app-arch/snappy: Bump to 1.1.6 that includes SONAME fix
Diffstat (limited to 'app-arch/snappy/files')
-rw-r--r-- | app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch (renamed from app-arch/snappy/files/snappy-1.1.5-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch) | 9 | ||||
-rw-r--r-- | app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch (renamed from app-arch/snappy/files/snappy-1.1.5-0002-cmake-Correct-unify-CMake-install-path.patch) | 8 | ||||
-rw-r--r-- | app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch (renamed from app-arch/snappy/files/snappy-1.1.5-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch) | 6 |
3 files changed, 12 insertions, 11 deletions
diff --git a/app-arch/snappy/files/snappy-1.1.5-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch index 468a11618c38..b83bc93465af 100644 --- a/app-arch/snappy/files/snappy-1.1.5-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch +++ b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch @@ -1,4 +1,4 @@ -From a35f15515db7cdfdee2b7fd04624d1b6c9a8a6bc Mon Sep 17 00:00:00 2001 +From 7507c5fcadc53894b128f3b9fc4b073d15564704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> Date: Thu, 29 Jun 2017 11:12:44 +0200 Subject: [PATCH 1/3] cmake: Use GNUInstallDirs to provide configurable & @@ -15,7 +15,7 @@ directory, it is simpler to reuse what's already in CMake. 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2c79e46..adda7fa 100644 +index de52666..1ca77c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ INCLUDE(CheckLibraryExists) @@ -26,7 +26,7 @@ index 2c79e46..adda7fa 100644 TEST_BIG_ENDIAN(WORDS_BIG_ENDIAN) IF (WORDS_BIG_ENDIAN) -@@ -98,32 +99,28 @@ INSTALL(FILES snappy.h +@@ -98,33 +99,29 @@ INSTALL(FILES snappy.h snappy-c.h snappy-sinksource.h ${Snappy_BINARY_DIR}/snappy-stubs-public.h @@ -44,7 +44,8 @@ index 2c79e46..adda7fa 100644 + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy) - SET_TARGET_PROPERTIES(snappy PROPERTIES SOVERSION ${PROJECT_VERSION}) + SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR}) -SET(INCLUDE_INSTALL_DIR include) -SET(LIBRARY_INSTALL_DIR lib) diff --git a/app-arch/snappy/files/snappy-1.1.5-0002-cmake-Correct-unify-CMake-install-path.patch b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch index ab2412757913..0b7faa08772b 100644 --- a/app-arch/snappy/files/snappy-1.1.5-0002-cmake-Correct-unify-CMake-install-path.patch +++ b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch @@ -1,4 +1,4 @@ -From 0f0ff7be9bd4d2ad2cd7e5c6092b1d0261c09335 Mon Sep 17 00:00:00 2001 +From e801bd3553dc4e49e19a031ce4007620c35764f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> Date: Thu, 29 Jun 2017 11:14:37 +0200 Subject: [PATCH 2/3] cmake: Correct & unify CMake install path @@ -11,10 +11,10 @@ and 'lib/cmake' inconsistently. Replace all of them with a single 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index adda7fa..b88cb20 100644 +index 1ca77c1..3d1a304 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -112,7 +112,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES SOVERSION ${PROJECT_VERSION}) +@@ -113,7 +113,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION} CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in ${Snappy_BINARY_DIR}/SnappyConfig.cmake @@ -23,7 +23,7 @@ index adda7fa..b88cb20 100644 PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR ) -@@ -120,7 +120,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake +@@ -121,7 +121,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake COMPATIBILITY SameMajorVersion) INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake diff --git a/app-arch/snappy/files/snappy-1.1.5-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch index 3d7d8fcb59d3..b1b8a2cd5e97 100644 --- a/app-arch/snappy/files/snappy-1.1.5-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch +++ b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch @@ -1,4 +1,4 @@ -From 57b13b68466e2ac81d8faa2c92f55e629a3184f8 Mon Sep 17 00:00:00 2001 +From 93d30c53e28759c9dbe82535821f3b1df29e5767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> Date: Thu, 29 Jun 2017 10:01:37 +0200 Subject: [PATCH 3/3] cmake: Add missing linking to GTEST_LIBRARIES @@ -11,10 +11,10 @@ to unavailable gtest symbols. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index b88cb20..bbe4d38 100644 +index 3d1a304..9f2cc23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -143,7 +143,7 @@ ENDIF (HAVE_LIBQUICKLZ) +@@ -144,7 +144,7 @@ ENDIF (HAVE_LIBQUICKLZ) ADD_EXECUTABLE(snappy-unittest snappy_unittest.cc snappy-test.cc) TARGET_COMPILE_DEFINITIONS(snappy-unittest PRIVATE -DHAVE_CONFIG_H) TARGET_LINK_LIBRARIES(snappy-unittest snappy ${COMPRESSION_LIBS} |