Skip to content

Commit

Permalink
graphics/inkscape: partially pull in two upstream changes
Browse files Browse the repository at this point in the history
Both changes are for removing std::unary_function and std::binary_function,
which are deprecated in C++17 and error in clang 16:
- https://gitlab.com/inkscape/inkscape/-/merge_requests/4463 (partial)
- https://gitlab.com/inkscape/inkscape/-/merge_requests/4483 (full)
These involve code refactorings where functional changes can exist
so bump PORTREVISION.

Event: ARRL/RAC Field Day 2023
  • Loading branch information
vishwin committed Jun 25, 2023
1 parent 62bfc7f commit fe6320a
Show file tree
Hide file tree
Showing 3 changed files with 1,472 additions and 2 deletions.
8 changes: 7 additions & 1 deletion graphics/inkscape/Makefile
@@ -1,10 +1,16 @@
PORTNAME= inkscape
DISTVERSION= 1.2.2
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= graphics gnome
MASTER_SITES= https://media.inkscape.org/dl/resources/file/

PATCH_SITES= https://gitlab.com/${PORTNAME}/${PORTNAME}/-/commit/
# https://gitlab.com/inkscape/inkscape/-/merge_requests/4463
PATCHFILES+= c5fc06a7c29d6be9e2fb18b841e973a193428332.patch:-p1 \
40c4147ec66319f42129ab253d0483f91329419c.patch:-p1 \
57c85eec491e07949497fa67edc7c76eafde7471.patch:-p1
# 362f987096833dd1dfa223be82fc6a97c3795f6c.patch:-p1
PATCHFILES+= fdc7329ba5036ef5cde7bb5e61ed52a69850f5d8.patch:-p1 # https://gitlab.com/inkscape/inkscape/-/merge_requests/4483
PATCHFILES+= 781e29cd3538.patch:-p1 # https://gitlab.com/inkscape/inkscape/-/merge_requests/5111

MAINTAINER= gnome@FreeBSD.org
Expand Down
10 changes: 9 additions & 1 deletion graphics/inkscape/distinfo
@@ -1,5 +1,13 @@
TIMESTAMP = 1670503504
TIMESTAMP = 1687584227
SHA256 (inkscape-1.2.2.tar.xz) = a0c7fd0d03c0a21535e648ef301dcf80dd7cfc1f3545e51065fbf1ba3ee8a5c4
SIZE (inkscape-1.2.2.tar.xz) = 39392040
SHA256 (c5fc06a7c29d6be9e2fb18b841e973a193428332.patch) = 08ca608bc5509e2398d23ef67202f7155296c36e329d1d2a3b00b37d8fd08214
SIZE (c5fc06a7c29d6be9e2fb18b841e973a193428332.patch) = 22563
SHA256 (40c4147ec66319f42129ab253d0483f91329419c.patch) = 05e670f7d768cfbbc5aacf233fe5c169402611b4f2949a491beb45150b95b14b
SIZE (40c4147ec66319f42129ab253d0483f91329419c.patch) = 24153
SHA256 (57c85eec491e07949497fa67edc7c76eafde7471.patch) = e3119ce429fb60f554b42b4507becd9bee47c3cb6f71fe1fbfc46331b2bf0574
SIZE (57c85eec491e07949497fa67edc7c76eafde7471.patch) = 26184
SHA256 (fdc7329ba5036ef5cde7bb5e61ed52a69850f5d8.patch) = 064f76e8691b0975b6a82a21923c562d9bb9855aa08d99ece9af9da877b544d6
SIZE (fdc7329ba5036ef5cde7bb5e61ed52a69850f5d8.patch) = 5483
SHA256 (781e29cd3538.patch) = 0dda9fb22107b81768e41c38adacf4920c9ecd2ca6ca47efa90693481b72e1b8
SIZE (781e29cd3538.patch) = 9262

0 comments on commit fe6320a

Please sign in to comment.