diff --git a/dev-libs/libutf8proc/libutf8proc2-2.5.0.recipe b/dev-libs/libutf8proc/libutf8proc-2.11.3.recipe similarity index 64% rename from dev-libs/libutf8proc/libutf8proc2-2.5.0.recipe rename to dev-libs/libutf8proc/libutf8proc-2.11.3.recipe index a532cf1a8..39b69bf73 100644 --- a/dev-libs/libutf8proc/libutf8proc2-2.5.0.recipe +++ b/dev-libs/libutf8proc/libutf8proc-2.11.3.recipe @@ -3,37 +3,40 @@ DESCRIPTION="utf8proc is a small, clean C library that provides Unicode \ normalization, case-folding, and other operations for data in the UTF-8 \ encoding, supporting Unicode version 13." HOMEPAGE="https://julialang.org/utf8proc/" -COPYRIGHT="2006-2020 Public Software Group - 2014-2020 Steven G. Johnson, Jiahao Chen, Tony Kelman, Jonas Fonseca, \ - and other contributors listed in the git history" +COPYRIGHT="2009-2013 Public Software Group e. V., Berlin, Germany + 2014-2021 Steven G. Johnson, Jiahao Chen, Tony Kelman, Jonas Fonseca, \ + and other contributors listed in the git history + 1991-2007 Unicode" LICENSE="MIT" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/JuliaStrings/utf8proc/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="d4e8dfc898cfd062493cb7f42d95d70ccdd3a4cd4d90bec0c71b47cca688f1be" +CHECKSUM_SHA256="abfed50b6d4da51345713661370290f4f4747263ee73dc90356299dfc7990c78" SOURCE_FILENAME="utf8proc-$portVersion.tar.gz" SOURCE_DIR="utf8proc-$portVersion" -PATCHES="libutf8proc2-2.4.0.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="2.3.2" +libVersion="3.2.3" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" - libutf8proc2$secondaryArchSuffix = $portVersion + libutf8proc$secondaryArchSuffix = $portVersion lib:libutf8proc$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix " +REPLACES=" + libutf8proc2$secondaryArchSuffix + " PROVIDES_devel=" - libutf8proc2${secondaryArchSuffix}_devel = $portVersion + libutf8proc${secondaryArchSuffix}_devel = $portVersion devel:libutf8proc$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" - libutf8proc2$secondaryArchSuffix == $portVersion base + libutf8proc$secondaryArchSuffix == $portVersion base " CONFLICTS_devel=" libutf8proc${secondaryArchSuffix}_devel @@ -48,22 +51,27 @@ BUILD_PREREQUIRES=" cmd:make " -defineDebugInfoPackage libutf8proc2$secondaryArchSuffix \ +defineDebugInfoPackage libutf8proc$secondaryArchSuffix \ $libDir/libutf8proc.so.$libVersion BUILD() { - cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $cmakeDirArgs \ -DBUILD_SHARED_LIBS=ON \ - $cmakeDirArgs + -DUTF8PROC_ENABLE_TESTING=OFF + make -C build $jobArgs } INSTALL() { make -C build install - prepareInstalledDevelLib libutf8proc + prepareInstalledDevelLib \ + libutf8proc + + # create pkgconfig file mkdir -p $developLibDir/pkgconfig cat > $developLibDir/pkgconfig/libutf8proc.pc << EOF prefix=${prefix} @@ -78,11 +86,11 @@ Libs: -L${developLibDir} -lutf8proc Cflags: -I${includeDir} -DUTF8PROC_EXPORTS EOF - packageEntries devel $developDir + packageEntries devel \ + $developDir } TEST() { - cd build_haiku - make check # test cases not supported yet with cmake + ctest --test-dir build --output-on-failure } diff --git a/dev-libs/libutf8proc/patches/libutf8proc2-2.4.0.patchset b/dev-libs/libutf8proc/patches/libutf8proc2-2.4.0.patchset deleted file mode 100644 index 5fc90f480..000000000 --- a/dev-libs/libutf8proc/patches/libutf8proc2-2.4.0.patchset +++ /dev/null @@ -1,33 +0,0 @@ -From 3aea3cc3481576f4505462a1da6329d7c5750b81 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sun, 9 Jun 2019 12:58:26 +0200 -Subject: Implement GNUInstallDirs - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7e8be20..a548d10 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,13 +49,15 @@ set_target_properties (utf8proc PROPERTIES - ) - - if (UTF8PROC_INSTALL) -+ include(GNUInstallDirs) -+ mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR) - install(TARGETS utf8proc -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${INSTALL_SUFFIX}) - - install( - FILES - "${PROJECT_SOURCE_DIR}/utf8proc.h" -- DESTINATION include) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX}) - endif() --- -2.21.0 -