This reverts commit a7db92d9b3, this time with
the more careful command, to avoid a world rebuild:
grep -rl --exclude-dir=build --exclude-dir=patches --exclude=ld-wrapper.in \
--exclude=sitecustomize.py --exclude=guix-emacs.el maxim.cournoyer@gmail.com |
xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'
Change-Id: I0871f5cf9ace79e34e78e24154d0da6ea95a3a91
The change was automated via:
git grep -l maxim.cournoyer@gmail.com |
xargs sed -i 's/maxim.cournoyer@gmail.com/maxim@guixotic.coop/g'
* .mailmap: New entry.
Change-Id: Iaa88b1e51c94159c49138fb43910badb990eb169
* gnu/packages/inkscape.scm (inkscape/pinned)[arguments]<#:phases>:
Fix argument to test command in 'check.
Change-Id: Ie89a7026f63256afabba038e0fc30e6ab0d8f3a6
* gnu/packages/inkscape.scm (inkscape/pinned)[arguments]<#:phases>
{check}: Skip one more test on i686.
Co-authored-by: Dariqq <dariqq@posteo.net>
Change-Id: If4bb258171b4a77f7fc327308f59b30c8e848831
This is to match recently established conventions. Add a deprecated public
alias to avoid breaking channels using inkscape/stable.
Automated via:
git grep -l inkscape/stable |
xargs sed -i 's,inkscape/stable,inkscape/pinned,'
Change-Id: If74bf91b1da0d2ca8cf25c6038b4c2100262873e
* gnu/packages/inkscape.scm (inkscape/stable)[arguments]: Add the custom
'fix-32bit-size_t-format phase when building for armhf-linux.
Change-Id: I45f371babd2afc6d6f63d30e5f909b702410833e
* gnu/packages/inkscape.scm (inkscape/stable)[arguments]: Add
‘fix-32bit-size_t-format’ phase on i686. In ‘check’ phase, list
additional failing tests on i686.
(inkscape)[arguments]: Do not restore ‘check’ phase on i686.
Change-Id: Id4b11ac7aa725a8a55d04bca221319201e488940
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
* gnu/packages/inkscape.scm (inkscape/stable)[arguments]: Disable tests on
aarch64, ppc64le, and riscv64 that fail due to precision errors.
Change-Id: Ie40100ed4adc4d007211c695b34eb4d648345304
* gnu/packages/inkscape.scm (inkscape/stable): Update to 1.3.2. Remove
patches.
[configure-flags]: Add CMAKE_CXX_FLAGS flag.
[phases] Remove obsolete patch-icon-cache-generator,
disable-latex-export-tests and disable-vertical-glyph-tests phases. Add
disable-problematic-tests phase. Override check phase to disable a few test
failures caused by the lack of imagemagick.
[inputs]: Add gspell and readline. Remove aspell and gtkspell3.
(inkscape): Update to 1.3.2.
[phases]: Reset the check phase to the original.
* gnu/packages/patches/inkscape-poppler-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
Change-Id: I391fb42db8d93a9cdc83e6fd62ca90f7458b5c49
This was commented out for testing and erroneously committed in commit
b4a6b1ba93 ("gnu: inkscape/stable: Build stable
variant without imagemagick support.").
* gnu/packages/inkscape.scm (inkscape)
[configure-flags]: Delete inherited "-DWITH_IMAGE_MAGICK=OFF" flag.
Change-Id: I6d616a5bfc40c9ebef65aceb711c6541a523bad8
This is done to allow imagemagick (not /stable variant) to be updated more
freely.
* gnu/packages/inkscape.scm (inkscape/stable)
[arguments]: Use gexps. Add #:disallowed-references argument to guard against
referring to imagemagick/stable. Add #:configure-flags argument.
[inputs]: Remove imagemagick.
[native-inputs]: Relpace imagemagick with imagemagick/stable.
* gnu/packages/inkscape.scm (inkscape): Use gexps. Clear WITH_IMAGE_MAGICK
configure flag.
[inputs]: Add imagemagick.
Fixes: https://issues.guix.gnu.org/47479
Change-Id: Ifc812d2fc1eba5d2b45c3d7519ae38ac0294bd0a
Reported-by: Maxime Devos <maximedevos@telenet.be>
This fixes a regression introduced in c37a31e9ab.
* gnu/packages/patches/inkscape-poppler-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/inkscape.scm (inkscape/stable)[source](patches): New field.
* gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1.
[arguments, inputs]: Take the changes from ...
(inkscape): ... this variable, and adjust this one accordingly.
This will allow introducing a new 'inkscape' package that can be more freely
upgraded on the main branch.
* gnu/packages/inkscape.scm (inkscape): Rename to...
(inkscape/stable): ... this, and make it a hidden package.
* gnu/packages/admin.scm (wpa-supplicant-gui)[native-inputs]: Rename inkscape
input accordingly.
* gnu/packages/docbook.scm (dblatex): Likewise.
* gnu/packages/gnome-xyz.scm (arc-theme): Likewise.
* gnu/packages/python-xyz.scm (python-matplotlib-documentation): Likewise.
(python-nbconvert): Likewise.
* gnu/packages/xfce.scm (xfdesktop): Likewise.
* gnu/packages/xorg.scm (hackneyed-x11-cursors): Likewise.
The older 0.92 Inkscape package was previously kept because of problems
building lib2geom on the ARM architectures. As this no longer appears to be a
problem (tested on the overdrive1 machine), finally replace the older Inkscape
by the newer 1.1 release.
* gnu/packages/inkscape.scm (inkscape-1.1): Delete variable, moving the
package definition to...
(inkscape): ... the now single inkscape variable. Remove trailing #t.
[tests?]: Remove.
[phases]{generate-gdk-pixbuf-loaders-cache-file}: Add phase.
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a277 and
12964df69a respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
* gnu/packages/inkscape.scm (inkscape-1.0)[arguments]: Add wrap-program phase.
[inputs]: Move python-wrapper to inputs, and add several python libraries.
[native-inputs]: Remove python-wrapper, as it has moved to inputs.
Signed-off-by: Christopher Baines <mail@cbaines.net>
