diff --git a/.checkpackageignore b/.checkpackageignore index df1a9258f3..5d3d63d71f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -445,7 +445,6 @@ package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream package/gobject-introspection/0001-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream -package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream package/grpc/0003-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream diff --git a/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch b/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch deleted file mode 100644 index ac150622d5..0000000000 --- a/package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3edb88b55c0870989778c670d555aa159a2c3abc Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 31 Aug 2020 20:56:43 +0200 -Subject: [PATCH] don't install a libtool file with static library - -Static library is supported since version 1.3.11 and -https://github.com/silnrsi/graphite/commit/2f143c04da5caa43ddf4dba437b2f2bc26bf4238 - -However, graphite2 is still installing libgraphite2.la which contains -incorrect information (i.e. dlname set to libgraphite2.so and -old_library set to ''): - -dlname='libgraphite2.so' - -library_names='libgraphite2.so.3.2.1 libgraphite2.so.3 libgraphite2.so' - -old_library='' - -dependency_libs='' - -This will result in the following build failure with any applications -using this file such as harfbuzz: - -arm-linux-g++.br_real: error: /home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgraphite2.so: No such file or directory -make[5]: *** [main] Error 1 - -Instead of trying to fix this libtool file, just disable it when -building a static library as it is not needed - -Fixes: - - http://autobuild.buildroot.org/results/9ebe1d11e80755d59190ef2aae82bbba5cc45e44 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/silnrsi/graphite/pull/65] ---- - src/CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b6ac26bf..a7ace040 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -131,7 +131,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - nolib_test(stdc++ $) - endif () - set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") -- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") -+ if (BUILD_SHARED_LIBS) -+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") -+ endif() - endif() - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") -@@ -146,7 +148,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - include(Graphite) - nolib_test(stdc++ $) - set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "") -- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") -+ if (BUILD_SHARED_LIBS) -+ CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}") -+ endif() - endif() - - if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") --- -2.28.0 - diff --git a/package/graphite2/graphite2.hash b/package/graphite2/graphite2.hash index e005375f8a..b788112b5d 100644 --- a/package/graphite2/graphite2.hash +++ b/package/graphite2/graphite2.hash @@ -1,4 +1,3 @@ -# From https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.sha256sum -sha256 f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d graphite2-1.3.14.tgz # Locally computed -sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE +sha256 b5e919f4b5788f8ed5a2d9d0ce17a23d1c0f625979e53c5e7336fc2ba0b7a7d6 graphite2-1.3.14-121-g142e1bda3439d2bd376bcac9c2b247c9532bacde.tar.gz +sha256 cab46cd45adbfea4b1d0f14b033c70062c73074fa0b56532c2f351576ddf455e LICENSE diff --git a/package/graphite2/graphite2.mk b/package/graphite2/graphite2.mk index 7f9e3c516e..9686492c20 100644 --- a/package/graphite2/graphite2.mk +++ b/package/graphite2/graphite2.mk @@ -4,10 +4,8 @@ # ################################################################################ -GRAPHITE2_VERSION = 1.3.14 -GRAPHITE2_SOURCE = graphite2-$(GRAPHITE2_VERSION).tgz -GRAPHITE2_SITE = \ - https://github.com/silnrsi/graphite/releases/download/$(GRAPHITE2_VERSION) +GRAPHITE2_VERSION = 1.3.14-121-g142e1bda3439d2bd376bcac9c2b247c9532bacde +GRAPHITE2_SITE = $(call github,silnrsi,graphite,$(GRAPHITE2_VERSION)) GRAPHITE2_INSTALL_STAGING = YES GRAPHITE2_LICENSE = LGPL-2.1+ GRAPHITE2_LICENSE_FILES = LICENSE