Skip to content

Commit 8a62e95

Browse files
jslobodzianjslobodzian
committed
Merge branch '3.0-dev' into 3.0
2 parents 91b9b45 + 4287f5e commit 8a62e95

File tree

60 files changed

+909
-642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+909
-642
lines changed

‎LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LICENSES-AND-NOTICES/SPECS/data/licenses.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1773,7 +1773,6 @@
17731773
"python-pyproject-metadata",
17741774
"python-pyroute2",
17751775
"python-pyrsistent",
1776-
"python-pysocks",
17771776
"python-pytest-benchmark",
17781777
"python-pytest-cov",
17791778
"python-pytest-expect",

‎SPECS-EXTENDED/metis/metis-GKREGEX-GKRAND-LIBSUFFIX-fix.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- GKlib/Makefile.orig 2013-03-11 20:50:42.000000000 +0100
2-
+++ GKlib/Makefile 2013-03-17 14:26:23.632867727 +0100
1+
--- src/GKlib/Makefile.orig 2013-03-11 20:50:42.000000000 +0100
2+
+++ src/GKlib/Makefile 2013-03-17 14:26:23.632867727 +0100
33
@@ -41,10 +41,10 @@
44
CONFIG_FLAGS += -DPCRE=$(pcre)
55
endif
@@ -14,8 +14,8 @@
1414
ifneq ($(prefix), not-set)
1515
CONFIG_FLAGS += -DCMAKE_INSTALL_PREFIX=$(prefix)
1616

17-
--- Makefile.origin 2013-03-30 17:24:45.000000000 +0100
18-
+++ Makefile 2013-04-14 20:04:38.887674462 +0200
17+
--- src/Makefile.origin 2013-03-30 17:24:45.000000000 +0100
18+
+++ src/Makefile 2013-04-14 20:04:38.887674462 +0200
1919
@@ -9,6 +9,11 @@
2020
gklib_path = not-set
2121
shared = not-set

‎SPECS-EXTENDED/metis/metis-libmetis.patch

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
--- libmetis/CMakeLists.orig.txt 2011-06-22 19:47:13.000000000 +0200
2-
+++ libmetis/CMakeLists.txt 2013-03-15 17:13:19.948911972 +0100
3-
@@ -4,13 +4,14 @@
4-
file(GLOB metis_sources *.c)
5-
# Build libmetis.
6-
add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources})
1+
--- src/libmetis/CMakeLists.orig.txt 2011-06-22 19:47:13.000000000 +0200
2+
+++ src/libmetis/CMakeLists.txt 2013-03-15 17:13:19.948911972 +0100
3+
@@ -8,8 +8,9 @@
4+
PRIVATE ${PROJECT_SOURCE_DIR}/src/GKlib ${PROJECT_BINARY_DIR}/src/include
5+
)
6+
target_link_libraries(metis PRIVATE $<$<BOOL:${UNIX}>:m>)
77
+set_target_properties(metis PROPERTIES SOVERSION 0)
8-
if(UNIX)
9-
target_link_libraries(metis m)
10-
endif()
118

12-
if(METIS_INSTALL)
13-
install(TARGETS metis
9+
install(TARGETS metis
1410
- LIBRARY DESTINATION lib
1511
- RUNTIME DESTINATION lib
1612
- ARCHIVE DESTINATION lib)
1713
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
1814
+ RUNTIME DESTINATION lib${LIB_SUFFIX}
1915
+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
20-
endif()

‎SPECS-EXTENDED/metis/metis-pcre2.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- GKlib/GKlib.orig.h 2013-03-30 17:24:45.000000000 +0100
2-
+++ GKlib/GKlib.h 2019-02-05 14:45:44.051629682 +0100
1+
--- src/GKlib/GKlib.orig.h 2013-03-30 17:24:45.000000000 +0100
2+
+++ src/GKlib/GKlib.h 2019-02-05 14:45:44.051629682 +0100
33
@@ -43,7 +43,7 @@
44
#include <sys/stat.h>
55

@@ -9,8 +9,8 @@
99
#else
1010
#if defined(USE_GKREGEX)
1111
#include "gkregex.h"
12-
--- GKlib/test/Makefile.in.orig.old 2013-03-30 17:24:45.000000000 +0100
13-
+++ GKlib/test/Makefile.in.old 2019-02-05 15:04:35.009847901 +0100
12+
--- src/GKlib/test/Makefile.in.orig.old 2013-03-30 17:24:45.000000000 +0100
13+
+++ src/GKlib/test/Makefile.in.old 2019-02-05 15:04:35.009847901 +0100
1414
@@ -196,7 +196,7 @@
1515

1616
#Libraries needed for linking

‎SPECS-EXTENDED/metis/metis-shared-GKlib.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
--- GKlib/CMakeLists.orig.txt 2013-03-11 20:50:14.000000000 +0100
2-
+++ GKlib/CMakeLists.txt 2013-03-17 19:53:44.220827579 +0100
3-
@@ -7,7 +7,7 @@
1+
--- src/GKlib/CMakeLists.orig.txt 2013-03-11 20:50:14.000000000 +0100
2+
+++ src/GKlib/CMakeLists.txt 2013-03-17 19:53:44.220827579 +0100
3+
@@ -6,7 +6,7 @@
4+
unset(abs)
45
include(GKlibSystem.cmake)
56

6-
include_directories(".")
77
-add_library(GKlib STATIC ${GKlib_sources})
88
+add_library(GKlib SHARED ${GKlib_sources})
9-
if(UNIX)
10-
target_link_libraries(GKlib m)
11-
endif(UNIX)
12-
@@ -16,6 +16,6 @@
13-
add_subdirectory("test")
9+
target_link_libraries(GKlib PRIVATE $<$<BOOL:${UNIX}>:m>)
10+
target_include_directories(GKlib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
11+
12+
@@ -15,6 +15,6 @@
13+
endif()
1414

1515
install(TARGETS GKlib
1616
- ARCHIVE DESTINATION lib

‎SPECS-EXTENDED/metis/metis-width-datatype.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎SPECS-EXTENDED/metis/metis.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"metis-5.1.0.tar.gz": "76faebe03f6c963127dbb73c13eab58c9a3faeae48779f049066a21c087c5db2"
3+
"METIS-5.1.0.3.tar.gz": "c860b393f61ef017f288692b00fd26eec2d3fdbc7a2bb3bed8b0f01e836e53cf"
44
}
55
}

0 commit comments

Comments
 (0)