From 8491374c5cc4e039d46a8bd1ffa94322a18dad6e Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 27 Oct 2019 18:46:33 +0100 Subject: [PATCH] update: libssh, mpg123, poppler --- src/libssh-1-fixes.patch | 10 +++++----- src/libssh.mk | 4 ++-- src/mpg123.mk | 4 ++-- src/poppler-1-win32.patch | 2 +- src/poppler.mk | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libssh-1-fixes.patch b/src/libssh-1-fixes.patch index 911b1eea..dcaa4c05 100644 --- a/src/libssh-1-fixes.patch +++ b/src/libssh-1-fixes.patch @@ -26,7 +26,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1111111..2222222 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -285,6 +285,7 @@ include_directories( +@@ -303,6 +303,7 @@ include_directories( # Set the path to the default map file set(MAP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.map") @@ -34,10 +34,10 @@ index 1111111..2222222 100644 if (WITH_SYMBOL_VERSIONING AND HAVE_LD_VERSION_SCRIPT AND ABIMAP_FOUND) # Get the list of header files get_file_list(dev_header_list -@@ -362,6 +363,7 @@ install( - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - COMPONENT libraries - ) +@@ -382,6 +383,7 @@ install(TARGETS ${LIBSSH_SHARED_LIBRARY} + + install(EXPORT libssh-config + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) +endif (WITH_SHARED_LIB) if (BUILD_STATIC_LIB) diff --git a/src/libssh.mk b/src/libssh.mk index c9358bde..9c734504 100644 --- a/src/libssh.mk +++ b/src/libssh.mk @@ -4,8 +4,8 @@ PKG := libssh $(PKG)_WEBSITE := https://www.libssh.org $(PKG)_DESCR := SSHv2 and SSHv1 protocol on client and server side $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.0 -$(PKG)_CHECKSUM := 3ac02237947a18c0bf82f3678954f25d5f2338f0f1676bdc11a1b9eb1ce5fcf6 +$(PKG)_VERSION := 0.9.1 +$(PKG)_CHECKSUM := b5a703dd6b6941e1bcef45cedab1f34b3eac3ac5c19da1efb292f32b10f33c33 $(PKG)_SUBDIR := libssh-$($(PKG)_VERSION) $(PKG)_FILE := libssh-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://git.libssh.org/projects/libssh.git/snapshot/libssh-$($(PKG)_VERSION).tar.gz diff --git a/src/mpg123.mk b/src/mpg123.mk index df1e977a..3ce25afb 100644 --- a/src/mpg123.mk +++ b/src/mpg123.mk @@ -3,8 +3,8 @@ PKG := mpg123 $(PKG)_WEBSITE := https://www.mpg123.de/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.25.12 -$(PKG)_CHECKSUM := 1ffec7c9683dfb86ea9040d6a53d6ea819ecdda215df347f79def08f1fe731d1 +$(PKG)_VERSION := 1.25.13 +$(PKG)_CHECKSUM := 90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/mpg123/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/poppler-1-win32.patch b/src/poppler-1-win32.patch index cf133d27..97ecee48 100644 --- a/src/poppler-1-win32.patch +++ b/src/poppler-1-win32.patch @@ -128,7 +128,7 @@ index 1111111..2222222 100644 option(ENABLE_SPLASH "Build the Splash graphics backend." ON) option(ENABLE_UTILS "Compile poppler command line utils." ON) option(ENABLE_CPP "Compile poppler cpp wrapper." ON) -@@ -671,7 +672,9 @@ endif() +@@ -678,7 +679,9 @@ endif() if(ENABLE_GLIB) add_subdirectory(glib) endif() diff --git a/src/poppler.mk b/src/poppler.mk index ea704c25..129f3c2a 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -3,8 +3,8 @@ PKG := poppler $(PKG)_WEBSITE := https://poppler.freedesktop.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 0.81.0 -$(PKG)_CHECKSUM := 212d020b035b67b36c9666bd08ac778dff3222d85c01c338787d546f0f9bfe02 +$(PKG)_VERSION := 0.82.0 +$(PKG)_CHECKSUM := 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df $(PKG)_SUBDIR := poppler-$($(PKG)_VERSION) $(PKG)_FILE := poppler-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://poppler.freedesktop.org/$($(PKG)_FILE)