Page MenuHomeSolus
Files F10987338

D526.id1125.diff
No OneTemporary
Actions

D526.id1125.diff
View Options

diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -44,3 +44,49 @@
libsnappy.so.1:snappy_uncompress
libsnappy.so.1:snappy_uncompressed_length
libsnappy.so.1:snappy_validate_compressed_buffer
+libsnappy.so.1.1.5:_ZN6snappy10UncompressEPKcmPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
+libsnappy.so.1.1.5:_ZN6snappy10UncompressEPNS_6SourceEPNS_4SinkE
+libsnappy.so.1.1.5:_ZN6snappy11RawCompressEPKcmPcPm
+libsnappy.so.1.1.5:_ZN6snappy13RawUncompressEPKcmPc
+libsnappy.so.1.1.5:_ZN6snappy13RawUncompressEPNS_6SourceEPc
+libsnappy.so.1.1.5:_ZN6snappy15ByteArraySource4PeekEPm
+libsnappy.so.1.1.5:_ZN6snappy15ByteArraySource4SkipEm
+libsnappy.so.1.1.5:_ZN6snappy15ByteArraySourceD0Ev
+libsnappy.so.1.1.5:_ZN6snappy15ByteArraySourceD1Ev
+libsnappy.so.1.1.5:_ZN6snappy15ByteArraySourceD2Ev
+libsnappy.so.1.1.5:_ZN6snappy17IsValidCompressedEPNS_6SourceE
+libsnappy.so.1.1.5:_ZN6snappy18SnappyDecompressor9RefillTagEv
+libsnappy.so.1.1.5:_ZN6snappy19MaxCompressedLengthEm
+libsnappy.so.1.1.5:_ZN6snappy20RawUncompressToIOVecEPKcmPK5iovecm
+libsnappy.so.1.1.5:_ZN6snappy20RawUncompressToIOVecEPNS_6SourceEPK5iovecm
+libsnappy.so.1.1.5:_ZN6snappy21GetUncompressedLengthEPKcmPm
+libsnappy.so.1.1.5:_ZN6snappy21GetUncompressedLengthEPNS_6SourceEPj
+libsnappy.so.1.1.5:_ZN6snappy22UncheckedByteArraySink15GetAppendBufferEmPc
+libsnappy.so.1.1.5:_ZN6snappy22UncheckedByteArraySink22AppendAndTakeOwnershipEPcmPFvPvPKcmES2_
+libsnappy.so.1.1.5:_ZN6snappy22UncheckedByteArraySink23GetAppendBufferVariableEmmPcmPm
+libsnappy.so.1.1.5:_ZN6snappy22UncheckedByteArraySink6AppendEPKcm
+libsnappy.so.1.1.5:_ZN6snappy22UncheckedByteArraySinkD0Ev
+libsnappy.so.1.1.5:_ZN6snappy22UncheckedByteArraySinkD1Ev
+libsnappy.so.1.1.5:_ZN6snappy22UncheckedByteArraySinkD2Ev
+libsnappy.so.1.1.5:_ZN6snappy23IsValidCompressedBufferEPKcm
+libsnappy.so.1.1.5:_ZN6snappy26UncompressAsMuchAsPossibleEPNS_6SourceEPNS_4SinkE
+libsnappy.so.1.1.5:_ZN6snappy4Sink15GetAppendBufferEmPc
+libsnappy.so.1.1.5:_ZN6snappy4Sink22AppendAndTakeOwnershipEPcmPFvPvPKcmES2_
+libsnappy.so.1.1.5:_ZN6snappy4Sink23GetAppendBufferVariableEmmPcmPm
+libsnappy.so.1.1.5:_ZN6snappy4SinkD0Ev
+libsnappy.so.1.1.5:_ZN6snappy4SinkD1Ev
+libsnappy.so.1.1.5:_ZN6snappy4SinkD2Ev
+libsnappy.so.1.1.5:_ZN6snappy6SourceD0Ev
+libsnappy.so.1.1.5:_ZN6snappy6SourceD1Ev
+libsnappy.so.1.1.5:_ZN6snappy6SourceD2Ev
+libsnappy.so.1.1.5:_ZN6snappy6Varint8Append32EPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj
+libsnappy.so.1.1.5:_ZN6snappy8CompressEPKcmPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE
+libsnappy.so.1.1.5:_ZN6snappy8CompressEPNS_6SourceEPNS_4SinkE
+libsnappy.so.1.1.5:_ZN6snappy8internal13WorkingMemory12GetHashTableEmPi
+libsnappy.so.1.1.5:_ZN6snappy8internal16CompressFragmentEPKcmPcPti
+libsnappy.so.1.1.5:_ZNK6snappy15ByteArraySource9AvailableEv
+libsnappy.so.1.1.5:snappy_compress
+libsnappy.so.1.1.5:snappy_max_compressed_length
+libsnappy.so.1.1.5:snappy_uncompress
+libsnappy.so.1.1.5:snappy_uncompressed_length
+libsnappy.so.1.1.5:snappy_validate_compressed_buffer
diff --git a/files/0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch b/files/0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
@@ -0,0 +1,90 @@
+From a35f15515db7cdfdee2b7fd04624d1b6c9a8a6bc 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 &
+ correct install dirs
+
+Use the GNUInstallDirs CMake module to provide a standard set of
+variables to control install paths. Otherwise, the package is
+incorrectly installed into 'lib' (instead of 'lib64') on 64-bit systems.
+While this could be solved via providing custom variables for each
+directory, it is simpler to reuse what's already in CMake.
+---
+ CMakeLists.txt | 21 +++++++++------------
+ cmake/SnappyConfig.cmake.in | 8 ++++----
+ 2 files changed, 13 insertions(+), 16 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c79e46..adda7fa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,6 +8,7 @@ INCLUDE(CheckLibraryExists)
+ INCLUDE(CheckCXXSourceCompiles)
+ INCLUDE(TestBigEndian)
+ INCLUDE(CMakePackageConfigHelpers)
++INCLUDE(GNUInstallDirs)
+
+ TEST_BIG_ENDIAN(WORDS_BIG_ENDIAN)
+ IF (WORDS_BIG_ENDIAN)
+@@ -98,32 +99,28 @@ INSTALL(FILES snappy.h
+ snappy-c.h
+ snappy-sinksource.h
+ ${Snappy_BINARY_DIR}/snappy-stubs-public.h
+- DESTINATION include)
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ INSTALL(TARGETS snappy
+ EXPORT SnappyTargets
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib)
+-INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION lib/cmake/Snappy)
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ 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(INCLUDE_INSTALL_DIR include)
+-SET(LIBRARY_INSTALL_DIR lib)
+-SET(BINARY_INSTALL_DIR bin)
+-
+ CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
+ ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+- INSTALL_DESTINATION lib/Snappy/cmake
+- PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR BINARY_INSTALL_DIR
++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
+ )
+
+ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+ COMPATIBILITY SameMajorVersion)
+ INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+ ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+- DESTINATION lib/cmake)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+
+ ENABLE_TESTING()
+
+diff --git a/cmake/SnappyConfig.cmake.in b/cmake/SnappyConfig.cmake.in
+index 5e604fe..d47656b 100644
+--- a/cmake/SnappyConfig.cmake.in
++++ b/cmake/SnappyConfig.cmake.in
+@@ -2,8 +2,8 @@ set(SNAPPY_VERSION @SNAPPY_MAJOR@.@SNAPPY_MINOR@.@SNAPPY_PATCHLEVEL@)
+
+ @PACKAGE_INIT@
+
+-set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+-set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_LIBRARY_INSTALL_DIR@")
+-set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_BINARY_INSTALL_DIR@")
++set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
++set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_CMAKE_INSTALL_BINDIR@")
+
+-check_required_components(SNAPPY)
+\ No newline at end of file
++check_required_components(SNAPPY)
+--
+2.13.2
+
diff --git a/files/0002-cmake-Correct-unify-CMake-install-path.patch b/files/0002-cmake-Correct-unify-CMake-install-path.patch
new file mode 100644
--- /dev/null
+++ b/files/0002-cmake-Correct-unify-CMake-install-path.patch
@@ -0,0 +1,37 @@
+From 0f0ff7be9bd4d2ad2cd7e5c6092b1d0261c09335 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
+
+The CMake file is using 'lib/cmake/Snappy', 'lib/Snappy/cmake'
+and 'lib/cmake' inconsistently. Replace all of them with a single
+'lib/cmake/Snappy' that matches most of standard CMake packages.
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index adda7fa..b88cb20 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,7 +112,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+ CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
+ ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake
++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy
+ 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
+ COMPATIBILITY SameMajorVersion)
+ INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
+ ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
+
+ ENABLE_TESTING()
+
+--
+2.13.2
+
diff --git a/files/0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/files/0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
new file mode 100644
--- /dev/null
+++ b/files/0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
@@ -0,0 +1,28 @@
+From 57b13b68466e2ac81d8faa2c92f55e629a3184f8 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
+
+Since the snappy_unittest target uses gtest routines (when available),
+it needs to link to gtest explicitly. Otherwise, the build fails due
+to unavailable gtest symbols.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b88cb20..bbe4d38 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -143,7 +143,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}
+- ${GFLAGS_LIBRARIES})
++ ${GFLAGS_LIBRARIES} ${GTEST_LIBRARIES})
+ TARGET_INCLUDE_DIRECTORIES(snappy-unittest BEFORE PRIVATE ${Snappy_SOURCE_DIR}
+ ${GTEST_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS})
+
+--
+2.13.2
+
diff --git a/files/series b/files/series
new file mode 100644
--- /dev/null
+++ b/files/series
@@ -0,0 +1,3 @@
+0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
+0002-cmake-Correct-unify-CMake-install-path.patch
+0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : snappy
-version : 1.1.4
-release : 2
+version : 1.1.5
+release : 3
source :
- - https://github.com/google/snappy/releases/download/1.1.4/snappy-1.1.4.tar.gz : 134bfe122fd25599bb807bb8130e7ba6d9bdb851e0b16efcb83ac4f5d0b70057
+ - https://github.com/google/snappy/archive/1.1.5.tar.gz : c67d8d23387b1902ceff134af26e401d5412c510adeeabe6bb6b47c106b08e45
license : BSD-3
component : programming
summary : Snappy is a compression/decompression library.
@@ -10,9 +10,9 @@
Snappy is a compression/decompression library. It does not aim for maximum compression, or compatibility with any other compression library; instead, it aims for very high speeds and reasonable compression.
libsplit : no
setup : |
- %configure --disable-static
+ %apply_patches
+ %cmake .
build : |
%make
install : |
%make_install
- rm -rf $installdir/usr/share/doc/snappy/{C*,INSTALL,NEWS,README}
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>snappy</Name>
<Packager>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>BSD-3</License>
<PartOf>programming</PartOf>
@@ -21,7 +21,6 @@
<Files>
<Path fileType="library">/usr/lib64/lib*.so</Path>
<Path fileType="library">/usr/lib64/lib*.so.*</Path>
- <Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
@@ -31,20 +30,20 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="2">snappy</Dependency>
+ <Dependency release="3">snappy</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
- <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
+ <Path fileType="library">/usr/lib64/cmake/</Path>
</Files>
</Package>
<History>
- <Update release="2">
- <Date>2015-11-13</Date>
- <Version>1.1.4</Version>
+ <Update release="3">
+ <Date>2017-06-29</Date>
+ <Version>1.1.5</Version>
<Comment>Packaging update</Comment>
- <Name>Joshua Strobl</Name>
- <Email>joshua@stroblindustries.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 25, 5:18 AM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5805552
Default Alt Text
D526.id1125.diff (12 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.