gentoo auto-resync : 17:09:2022 - 05:16:32

3 files changed, 81 insertions, 38 deletions

diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 720ea7ddeefe..5bb002c394ae 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,10 +1,10 @@
 AUX graphite2-1.3.14-fix-cmake-files-libdir.patch 637 BLAKE2B 5bf2dfae7cf3af8a99a5095f618d3625d6f0f3b07f714c1101ac77058aa5ab969115cf2ce6a6164666488183fb5482d3f8b6fd8dea4df3ca1ecba9adb02788f2 SHA512 55805cecf9cde48079a81c8ffd93503dd9302f28140b640971ddee29e7a7da38840c826af072b5780372b56c0f0269cbda802e3e233139f086f5194cd8eb33a5
-AUX graphite2-1.3.14-fix-nodefaultlibs-deux.patch 3003 BLAKE2B cf30d38d53f1dbb4dd6bcc774ebb922356b52e727bed9bd8fff272a49148f13eb74bcadeabfd5aadce4e3b51dcd657d0b9e174955378bff4d10e32487eea0336 SHA512 31893edd6098ee59e313509c73583e48adf8423f7d1f046be6bcc8d10237aabbe10b8565da839350b04b2f3b92e16b1d6977cff70c7699fb07b7a9de6ef68068
+AUX graphite2-1.3.14-fix-nodefaultlibs-deux.patch 4840 BLAKE2B fc543571ccc0c14c241eb36662c8eea9f3f28b2979c9936a7af60920ff0d951bb8a36ef5075881a25e3ed8e73781b538df5b7da97344ba36229f2defa3d928cd SHA512 3a0215f484ca9341e81194c2f5f73c9eb64f1322de5c3bb0e3d8615e7b7f1e4c9044c2db3855f3a68c04db9f1476d3f0115545925cb3f5f8082e5189ee9c2b6c
 AUX graphite2-1.3.14-fix-nodefaultlibs.patch 2396 BLAKE2B 0f845e6556486cfe5320d51fd0f5338caa8a068e84b48f60d09291659e70520ae3303c0d06050c5ff2a3c713919d835a615d2c0ad79c11aad4504375d8e3eb63 SHA512 d7e1c97ef8b4bc871075e61d58934b612ae7330a34b26aee1c3701e90d0d46bafb431c32c740ae276e5c153e330d8e9c27d4df6e2fdeee61dd229e6b6655aebd
 AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3e62d264b26c4665383fbe564de7b3a0420b77fcf8ce90a65a650fc9e2144969a2f00abe7ff7c9ebe6f53c7b2fdc3271fbd55f6ce SHA512 3553e237808bf981cf35e9fa8de7b77fa1ce87c72733c806df8e523ea624a0e5e2ad87a0b4cfb9330e7cace0fb016c2c729085de2d21e959790955fd370f378e
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 AUX graphite2-1.35-fix-gcc-linking.patch 697 BLAKE2B 3f4f181477e5f2f5db85f0b5c76dfb2b471c41cb42bfce9a4663fc8aab7035371690077c45cff580c6a700a65466f866944e34127b307f6ef44035f47a65fabd SHA512 f8a8481f5e8e0178e38e8b8dff2e2b1d2f3143d1f1eca6b3b2ea15ea087651dff150fae8166ceaf18eb3995bb480f09e185ddf89b4ad6e352e1085d4655c71b7
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
 EBUILD graphite2-1.3.14_p20210810-r1.ebuild 3075 BLAKE2B 7ab6cf0bf0b47adcc07f5553328bbc69921e51d069161fe4e57b6054af25ffa9597e3e7b47dfcb5ab9cf46c94f7a55ab029fb1c067f1c9b61d8ebe684bbae581 SHA512 cbf4c9d901d6f796de0d13ad247029b7d6b80cb469ed147fb394f7abc2042351178b639f0214d1803ada5b5f696327525f27a33c7fcd54c53abd5e4adfd3d34c
-EBUILD graphite2-1.3.14_p20210810-r2.ebuild 3089 BLAKE2B e845ce2b9735633eea5e522d6e4f73bccf1b689b440953e920934b5685ec3122f69b2e06b37d17469a28c367defb3be9e72dcc7099e80a98dc690f4e174cd0c2 SHA512 4b8ef20d2935f7a916d66de9d357de403dbfd071cc7881319dac9dc184fe83ca8ff70e5505f318bf8aa9aead24d5f242c653a0b1f580ae94e9a5ef93300c1f68
+EBUILD graphite2-1.3.14_p20210810-r2.ebuild 3040 BLAKE2B e3333a2e940f0455e54d607465cf3a60e129eb9071d6a1a5ece3a618b528ade5e2326158295446d1b13824cd161a10d8c192c3716496c4dd5a31cbb29221c83c SHA512 109d7fe7880f88a8f63cd571e5fff2bc35cbc3a63f8e2524aedaae0aeaf60449ec8922a6888af0f82f2d9711eccb063851f0324ddde5281e57a6e2b3db185535
 MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
index 815301dd307b..64fcfd63beab 100644
--- a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
@@ -1,61 +1,105 @@
 https://bugs.gentoo.org/870034
 https://bugs.gentoo.org/829690
+https://github.com/silnrsi/graphite/pull/44.
 https://raw.githubusercontent.com/chimera-linux/cports/6d3cabd18bac6f4caaea08eaa928840552711c0c/main/graphite2/patches/clang.patch
 
-From chimera patch:
-"Clang has -nostdlib++, which can be used more effectively than disabling
-all and then hardcoding linking against libgcc (which we do not have)"
-
 Obsoletes graphite2-1.3.14-fix-nodefaultlibs.patch whose description was:
-```
-See https://github.com/silnrsi/graphite/pull/44.
-
+"""
 Drop -nodefaultlibs:
 - graphite is written in C++ which makes avoiding libstdc++ (or libc++) a dubious
   goal;
 - this ends up breaking e.g. x86/musl because we need to inject -lssp_nonshared,
   but it wouldn't be surprising if it broke other exotic targets too.
-```
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -47,12 +47,12 @@ else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-     set_target_properties(graphite2-base PROPERTIES
-         COMPILE_FLAGS       "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
-         COMPILE_DEFINITIONS "GRAPHITE2_NTRACING"
--        LINK_FLAGS          "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
-+        LINK_FLAGS          "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
-         LINKER_LANGUAGE     C)
-     set_target_properties(graphite2-file PROPERTIES
-         COMPILE_FLAGS       "-Wall -Wextra  -Wno-class-memaccess -fno-rtti -fno-exceptions"
-         COMPILE_DEFINITIONS "GRAPHITE2_NTRACING${TELEMETRY}"
--        LINK_FLAGS          "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
-+        LINK_FLAGS          "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
-         LINKER_LANGUAGE     C)
- endif()
+"""
+
+This patch is based on the linked one above from Chimera Linux. We have
+to adapt it a bit because GCC lacks -nostdlib++.
+
+Quoting it:
+"Clang has -nostdlib++, which can be used more effectively than disabling
+all and then hardcoding linking against libgcc (which we do not have)"
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -105,7 +105,7 @@ set_target_properties(graphite2 PROPERTIES  PUBLIC_HEADER "${GRAPHITE_HEADERS}"
+@@ -105,7 +105,6 @@ set_target_properties(graphite2 PROPERTIES  PUBLIC_HEADER "${GRAPHITE_HEADERS}"
  if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
      set_target_properties(graphite2 PROPERTIES
          COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden"
 -        LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
-+        LINK_FLAGS      "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
          LINKER_LANGUAGE C)
      if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
          add_definitions(-mfpmath=sse -msse2)
-@@ -117,15 +117,7 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-     if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-         add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32)
+@@ -114,22 +113,32 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+         add_definitions(-Wno-class-memaccess -Wdouble-promotion)
      endif()
--    if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
--        target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
--    else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
--	target_link_libraries(graphite2 c gcc_s)
+     message(STATUS "Compiler ID is: ${CMAKE_CXX_COMPILER_ID}")
+-    if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+-        add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32)
 -    endif()
-     include(Graphite)
++
++    include(Graphite)
++
+     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+         target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
+     else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+-        if (GRAPHITE2_SANITIZERS)
+-            target_link_libraries(graphite2 c gcc_s)
+-        else ()
+-            target_link_libraries(graphite2 c gcc)
+-        endif ()
++        if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
++            add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32)
++            set_target_properties(graphite2 PROPERTIES
++                LINK_FLAGS      "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
++        else()
++            set_target_properties(graphite2 PROPERTIES
++                LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++
++            if (GRAPHITE2_SANITIZERS)
++                target_link_libraries(graphite2 c gcc_s)
++            else()
++                target_link_libraries(graphite2 c gcc)
++            endif()
++
++            if (BUILD_SHARED_LIBS)
++                nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
++            endif ()
++        endif()
+     endif()
+-    include(Graphite)
 -    if (BUILD_SHARED_LIBS)
 -        nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
 -    endif ()
++
      set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
      if (0)
          CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -44,15 +44,25 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+                             COMPILE_DEFINITIONS "GRAPHITE2_STATIC;GRAPHITE2_NTRACING${TELEMETRY};_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE")
+ else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ # don't -D GRAPHITE2_STATIC so that tests can see the API symbols in the static library
++    if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
++        set_target_properties(graphite2-base PROPERTIES
++            LINK_FLAGS      "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
++        set_target_properties(graphite2-file PROPERTIES
++            LINK_FLAGS      "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
++    else()
++        set_target_properties(graphite2-base PROPERTIES
++            LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++        set_target_properties(graphite2-file PROPERTIES
++            LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++    endif()
++
+     set_target_properties(graphite2-base PROPERTIES
+         COMPILE_FLAGS       "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
+         COMPILE_DEFINITIONS "GRAPHITE2_NTRACING"
+-        LINK_FLAGS          "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
+         LINKER_LANGUAGE     C)
+     set_target_properties(graphite2-file PROPERTIES
+         COMPILE_FLAGS       "-Wall -Wextra  -Wno-class-memaccess -fno-rtti -fno-exceptions"
+         COMPILE_DEFINITIONS "GRAPHITE2_NTRACING${TELEMETRY}"
+-        LINK_FLAGS          "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
+         LINKER_LANGUAGE     C)
+ endif()
+ 
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
index 390f3b02fb00..bf4be48a0591 100644
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
@@ -39,10 +39,9 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
-	"${FILESDIR}/${PN}-1.35-fix-gcc-linking.patch"
 	"${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch"
 	"${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch"
-	#"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs-deux.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs-deux.patch"
 )
 
 pkg_setup() {