Attachment 135216 Details for Bug 103157 – Add soversion suffix to dlls (V2)

[patch] Add soversion suffix to dlls (V2)

poppler_so-suffix.patch (text/plain), 5.29 KB, created by Sandro Mani on 2017-11-02 22:32:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sandro Mani

Created: 2017-11-02 22:32:33 UTC

Size: 5.29 KB

patch

obsolete

>diff -rupN poppler-0.60.1/CMakeLists.txt poppler-0.60.1-new/CMakeLists.txt
>--- poppler-0.60.1/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/CMakeLists.txt	2017-11-02 23:07:11.786997600 +0100
>@@ -26,6 +26,9 @@ set(POPPLER_MINOR_VERSION "60")
> set(POPPLER_MICRO_VERSION "1")
> set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
> 
>+set(LIBPOPPLER_MAJOR 71)
>+set(LIBPOPPLER_MINOR 0)
>+
> set (CMAKE_CXX_STANDARD 11)
> set (CMAKE_CXX_EXTENSIONS OFF)
> 
>@@ -550,7 +553,10 @@ add_library(poppler STATIC ${poppler_SRC
> else()
> add_library(poppler ${poppler_SRCS})
> endif()
>-set_target_properties(poppler PROPERTIES VERSION 71.0.0 SOVERSION 71)
>+set_target_properties(poppler PROPERTIES VERSION ${LIBPOPPLER_MAJOR}.${LIBPOPPLER_MINOR}.0 SOVERSION ${LIBPOPPLER_MAJOR})
>+if(MINGW)
>+    set_target_properties(poppler PROPERTIES SUFFIX "-${LIBPOPPLER_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS})
> install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
> 
>diff -rupN poppler-0.60.1/cpp/CMakeLists.txt poppler-0.60.1-new/cpp/CMakeLists.txt
>--- poppler-0.60.1/cpp/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/cpp/CMakeLists.txt	2017-11-02 23:07:26.642957060 +0100
>@@ -1,3 +1,6 @@
>+set(LIBPOPPLER_CPP_MAJOR 0)
>+set(LIBPOPPLER_CPP_MINOR 3)
>+
> include_directories(
>   ${CMAKE_CURRENT_SOURCE_DIR}
>   ${CMAKE_CURRENT_BINARY_DIR}
>@@ -23,7 +26,10 @@ set(poppler_cpp_SRCS
> )
> 
> add_library(poppler-cpp SHARED ${poppler_cpp_SRCS})
>-set_target_properties(poppler-cpp PROPERTIES VERSION 0.3.0 SOVERSION 0)
>+set_target_properties(poppler-cpp PROPERTIES VERSION ${LIBPOPPLER_CPP_MAJOR}.${LIBPOPPLER_CPP_MINOR}.0 SOVERSION ${LIBPOPPLER_CPP_MAJOR})
>+if(MINGW)
>+    set_target_properties(poppler-cpp PROPERTIES SUFFIX "-${LIBPOPPLER_CPP_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES})
> install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
> 
>diff -rupN poppler-0.60.1/glib/CMakeLists.txt poppler-0.60.1-new/glib/CMakeLists.txt
>--- poppler-0.60.1/glib/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/glib/CMakeLists.txt	2017-11-02 23:07:39.552921856 +0100
>@@ -1,3 +1,6 @@
>+set(LIBPOPPLER_GLIB_MAJOR 8)
>+set(LIBPOPPLER_GLIB_MINOR 9)
>+
> include_directories(
>   ${CMAKE_CURRENT_SOURCE_DIR}
>   ${CMAKE_CURRENT_BINARY_DIR}
>@@ -81,7 +84,10 @@ set(poppler_glib_generated_SRCS
>   ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
> )
> add_library(poppler-glib SHARED ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
>-set_target_properties(poppler-glib PROPERTIES VERSION 8.9.0 SOVERSION 8)
>+set_target_properties(poppler-glib PROPERTIES VERSION ${LIBPOPPLER_GLIB_MAJOR}.${LIBPOPPLER_GLIB_MINOR}.0 SOVERSION ${LIBPOPPLER_GLIB_MAJOR})
>+if(MINGW)
>+    set_target_properties(poppler-glib PROPERTIES SUFFIX "-${LIBPOPPLER_GLIB_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler-glib poppler ${GLIB2_LIBRARIES} ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES})
> if(HAVE_PTHREAD)
>    target_link_libraries(poppler-glib -lpthread)
>diff -rupN poppler-0.60.1/qt4/src/CMakeLists.txt poppler-0.60.1-new/qt4/src/CMakeLists.txt
>--- poppler-0.60.1/qt4/src/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/qt4/src/CMakeLists.txt	2017-11-02 23:07:49.349895155 +0100
>@@ -1,3 +1,6 @@
>+set(LIBPOPPLER_QT4_MAJOR 4)
>+set(LIBPOPPLER_QT4_MINOR 11)
>+
> add_definitions(${QT4_DEFINITIONS})
> 
> include_directories(
>@@ -30,7 +33,10 @@ set(poppler_qt4_SRCS
> )
> qt4_automoc(${poppler_qt4_SRCS})
> add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
>-set_target_properties(poppler-qt4 PROPERTIES VERSION 4.11.0 SOVERSION 4)
>+set_target_properties(poppler-qt4 PROPERTIES VERSION ${LIBPOPPLER_QT4_MAJOR}.${LIBPOPPLER_QT4_MINOR}.0 SOVERSION ${LIBPOPPLER_QT4_MAJOR})
>+if(MINGW)
>+    set_target_properties(poppler-qt4 PROPERTIES SUFFIX "-${LIBPOPPLER_QT4_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
> if(MSVC)
> target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
>diff -rupN poppler-0.60.1/qt5/src/CMakeLists.txt poppler-0.60.1-new/qt5/src/CMakeLists.txt
>--- poppler-0.60.1/qt5/src/CMakeLists.txt	2017-10-05 19:15:44.000000000 +0200
>+++ poppler-0.60.1-new/qt5/src/CMakeLists.txt	2017-11-02 23:08:00.200865597 +0100
>@@ -1,3 +1,6 @@
>+set(LIBPOPPLER_QT5_MAJOR 1)
>+set(LIBPOPPLER_QT5_MINOR 11)
>+
> add_definitions(${QT5_DEFINITIONS})
> add_definitions(${Qt5Core_DEFINITIONS})
> 
>@@ -30,7 +33,10 @@ set(poppler_qt5_SRCS
>   ArthurOutputDev.cc
> )
> add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS})
>-set_target_properties(poppler-qt5 PROPERTIES VERSION 1.11.0 SOVERSION 1)
>+set_target_properties(poppler-qt5 PROPERTIES VERSION ${LIBPOPPLER_QT5_MAJOR}.${LIBPOPPLER_QT5_MINOR}.0 SOVERSION ${LIBPOPPLER_QT5_MAJOR})
>+if(MINGW)
>+    set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${LIBPOPPLER_QT5_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
>+endif(MINGW)
> target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES})
> if(MSVC)
> target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})

Actions: View | Splinter Review

Attachments on bug 103157: 134761 | 134762 | 135216 | 135217

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.