summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-msys2' into 'main'HEADmainMarge Bot2023-05-103-10/+7
|\ | | | | | | | | | | | | (#963): test_utils: do not compile the fontconfig stuff on Windows Closes #963 See merge request GNOME/librsvg!830
| * ci/test-msys2.sh - Don't run 'make check' as the test suite fails due to ↵Federico Mena Quintero2023-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | text rendering differences All the reference tests that use a PNG reference and that have text in them fail on Windows, because it doesn't set up the same font map as in rsvg/src/test_utils/mod.rs. For now I'll disable 'make check'. It would be good to identify or isolate those particular tests and not run them on Windows, but run the rest of the test suite; or actually try setting up an equivalent font map there. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/830>
| * Move some imports to where they are actually usedFederico Mena Quintero2023-05-091-3/+3
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/830>
| * (#963): test_utils: do not compile the fontconfig stuff on WindowsFederico Mena Quintero2023-05-091-3/+3
| | | | | | | | | | | | | | | | Fontconfig is not available there. Fixes https://gitlab.gnome.org/GNOME/librsvg/-/issues/963 Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/830>
| * CI: do run the msys2-mingw64 job every timeFederico Mena Quintero2023-05-091-3/+0
|/ | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/830>
* Merge branch 'fix-rsvg-convert-paths' into 'main'Marge Bot2023-05-0934-71/+70
|\ | | | | | | | | | | | | (#956): Rename rsvg-convert directory to rsvg_convert to avoid clashing with... Closes #956 See merge request GNOME/librsvg!829
| * Makefile.am: cp the Rust artifacts, don't just mv them from the build directoryFederico Mena Quintero2023-05-081-2/+2
| | | | | | | | | | | | I wonder if this is confusing "make install"; it's rebuilding rsvg-convert. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/829>
| * (#956): Rename rsvg-convert directory to rsvg_convert to avoid clashing with ↵Federico Mena Quintero2023-05-0834-69/+68
|/ | | | | | | | | | | | | | | | | | | | | | | the rsvg-convert binary When building with autotools and srcdir==builddir, ./target/.../rsvg-convert gets moved into ./rsvg-convert. But since ./rsvg-convert is already a directory, we get an ./rsvg-convert/rsvg-convert binary. Later, "make install" finds that ./rsvg-convert is a directory, not a file, and fails to install the binary. This renames the rsvg-convert directory to rsvg_convert, but makes Cargo keep the name of the binary as rsvg-convert. Another option would be to let Cargo use rsvg_convert per the package/directory name, and rename the resulting binary. Thanks to Abderrahim Kitouni for figuring this out! Fixes https://gitlab.gnome.org/GNOME/librsvg/-/issues/956 Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/829>
* Merge branch 'lopdf-0-30' into 'main'Marge Bot2023-05-043-216/+37
|\ | | | | | | | | | | | | Update lopdf to 0.30 Closes #959 See merge request GNOME/librsvg!828
| * Update lopdf to 0.30Lukáš Tyrychtr2023-05-043-216/+37
|/ | | | | | Fixes #959 Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/828>
* Merge branch 'predicates-3-0-3' into 'main'Marge Bot2023-05-043-20/+9
|\ | | | | | | | | | | | | Update the predicates create to the, as of the commit time, latest version Closes #960 See merge request GNOME/librsvg!827
| * Update the predicates create to the, as of the commit time, latest versionLukáš Tyrychtr2023-05-043-20/+9
|/ | | | | | Fixes #960 Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/827>
* Merge branch 'msvc-ci' into 'main'Marge Bot2023-05-042-0/+116
|\ | | | | | | | | Add CI for Visual Studio See merge request GNOME/librsvg!826
| * Add CI for Visual StudioChun-wei Fan2023-05-032-0/+116
|/ | | | | | | | | | | | | | | | This is an initial stab at getting CI to work for Visual Studio builds, where currently we attempt to build Pango and Gdk-Pixbuf first, with pkg-config and libxml2 and FreeType standalone. Pango builds do not currently work with subprojects building with FreeType, due to [1] as FontConfig will be built anyways, so we build and install FreeType before we build Pango. After these, we will install Rust via rustup-init, and carry out the builds for librsvg. [1]: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/469 Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/826>
* Merge branch 'msvc-followup' into 'main'Marge Bot2023-05-036-19/+24
|\ | | | | | | | | | | | | Some updates to the NMake Makefiles Closes #954 See merge request GNOME/librsvg!824
| * win32/MSVC-Builds.md: Fix TypoChun-wei Fan2023-05-031-1/+1
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/824>
| * config-msvc.mak.in: Add CFLAG for CairoChun-wei Fan2023-05-031-0/+1
| | | | | | | | | | | | | | | | | | The Cairo headers may be in $(INCLUDEDIR) or $(INCLUDEDIR)\cairo, so look into $(INCLUDEDIR)\cairo also. Fixes issue #954. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/824>
| * generate-msvc.mak: Have a default value for $(PYTHON)Chun-wei Fan2023-05-031-2/+8
| | | | | | | | | | | | | | | | | | ...when generating the full NMake Makefiles and auxiliary build files from a GIT checkout, so that one can just use the Python executable that is found in %PATH%. Add a message to tell people to check whether they need to pass in PYTHON=... when things fail. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/824>
| * Visual Studio: Fix running Rust testsChun-wei Fan2023-05-031-7/+5
| | | | | | | | | | | | | | | | We did not update the NMake Makefiles for running the Rust tests previously, so update things here so that things will run. Make sure the Rust tests can find the dependent DLLs (GIO, GObject, libxml2 and so on) by including $(BINDIR). Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/824>
| * Visual Studio: Fix building/running C testsChun-wei Fan2023-05-032-2/+2
| | | | | | | | | | | | | | Update the test source directories in the rules and the envvar that we set so that the C tests will build and run properly Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/824>
| * Visual Studio: Further updates after separating cratesChun-wei Fan2023-05-033-7/+7
|/ | | | | | | | | | | | | | Make sure that we are building the correct target with Cargo when building the internal Rust library for librsvg-c and update the intermediate target as appropriate, so that we can properly link to it when building the final librsvg DLL. Also, reduce repetition in the NMake Makefiles by using Makefile variables more. Follow-up commit after changes in MR !822. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/824>
* Merge branch 'windows-no-fontconfig' into 'main'Marge Bot2023-05-035-5/+7
|\ | | | | | | | | | | | | (#958): Do not include yeslogic-config-sys on Windows Closes #958 See merge request GNOME/librsvg!825
| * Bump the minimum Rust version to 1.65.0Federico Mena Quintero2023-05-034-5/+5
| | | | | | | | | | | | Sigh, assert_cmd requires this now. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/825>
| * (#958): Do not include yeslogic-fontconfig-sys on WindowsFederico Mena Quintero2023-04-291-0/+2
|/ | | | | | | | Hopefully the test suite will do the right thing? Fixes https://gitlab.gnome.org/GNOME/librsvg/-/issues/958 Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/825>
* rsvg-convert/Cargo.toml: oops, add glib back - it's needed for WindowsFederico Mena Quintero2023-04-253-175/+374
|
* Merge branch 'wip/sophie-h/workspace' into 'main'Marge Bot2023-04-251797-2824/+1021
|\ | | | | | | | | | | | | meta: Move lib and bins into separate crates Closes #950 See merge request GNOME/librsvg!822
| * Add Makefile.in files to .gitignorewip/sophie-h/workspaceFederico Mena Quintero2023-04-251-0/+5
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * Copy a utility function to the librsvg-c tests to avoid having a test-utils ↵Federico Mena Quintero2023-04-252-3/+9
| | | | | | | | | | | | | | | | | | | | | | feature The only thing that librsvg-c's tests use from rsvg::test_utils is the load_svg() function. That function is trivial enough that we can just copy it to librsvg-c's tests, and thus avoid having a whole feature specification just for that. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * c-api: Move test utils dep to dev-dependenciesSophie Herold2023-04-251-0/+2
| | | | | | | | | | | | It was (probably by accident) under build-dependencies before Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * ci/gen-coverage.sh: Remove the --prefix-dir option for grcovFederico Mena Quintero2023-04-241-2/+0
| | | | | | | | | | | | | | Now that C files are scattered around, we'll just let grcov warn about their paths which contain "../". Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * gen-coverage.sh: No need to ignore build.rs anymoreFederico Mena Quintero2023-04-241-2/+0
| | | | | | | | | | | | | | Now that https://github.com/mozilla/grcov/issues/845 is fixed, we can remove the workaround. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * CI: don't use after_script for the coverage job; put everything in the same ↵Federico Mena Quintero2023-04-241-2/+0
| | | | | | | | | | | | script Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * ci/build-with-coverage.sh: Adjust for clang 16Federico Mena Quintero2023-04-241-3/+12
| | | | | | | | | | | | | | | | | | With clang 15.0.7, its utility libraries were in /usr/lib64/clang/15.0.7/lib/linux. However, with clang 16, they are now in /usr/lib64/clang/16/lib/linux (e.g. without minor/micro version numbers). Extract just the major version from `clang --version`. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * CI: use the latest version of python3-docutils, not specificially 3.8Federico Mena Quintero2023-04-211-1/+1
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * CI: use the correct path for the coverage profilesFederico Mena Quintero2023-04-211-1/+1
| | | | | | | | | | | | | | They were being written to ./rsvg/coverage-profiles instead of ./coverage-profiles, which is what the gen-coverage.sh script expects. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * Use helper functions and call them from the macros for test referencesFederico Mena Quintero2023-04-213-75/+94
| | | | | | | | | | | | Avoids generating lots of duplicated code in tests. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * CI: install diffutils and findutilsFederico Mena Quintero2023-04-211-1/+3
| | | | | | | | | | | | autotools requires them, it seems, but it has worked so far...? Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * devel-docs/architecture.rst: Fix the paths for the C APIFederico Mena Quintero2023-04-211-7/+8
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * CI: Generate internals docs for the whole workspaceFederico Mena Quintero2023-04-211-2/+2
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * Fix warnings from "cargo doc"Federico Mena Quintero2023-04-219-25/+25
| | | | | | | | | | | | A bunch of unquoted http links and XML element names, mostly. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * docs: fix item nameFederico Mena Quintero2023-04-211-1/+1
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * cargo fmtFederico Mena Quintero2023-04-211-6/+3
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * rsvg-convert/tests/fixtures - Copy the few fixtures we need hereFederico Mena Quintero2023-04-2125-99/+158
| | | | | | | | | | | | | | | | | | | | Do not use a symlink; automake doesn't understand them for distcheck. The fixtures that are duplicated from rsvg/tests/fixtures are just a few, and they are small. I prefer having rsvg-convert's fixtures in a single place instead of referencing something like ../../blahblah. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * Makefile.am: fix paths for the sources in the rsvg crate testsFederico Mena Quintero2023-04-211-13/+13
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * test-utils.c: Fix path to fixturesFederico Mena Quintero2023-04-211-1/+1
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * Fix documentation exampleFederico Mena Quintero2023-04-211-1/+2
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * CI: remove the test_rust_gdk_pixbuf_loader job, it's implied by --workspace nowFederico Mena Quintero2023-04-211-18/+0
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * CI: use "cargo test --workspace" everywhere to test all the projectsFederico Mena Quintero2023-04-211-3/+3
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * Move rsvg/tests/src/*.rs to rsvg/tests/*.rsFederico Mena Quintero2023-04-2113-0/+0
| | | | | | | | | | | | Otherwise cargo doesn't pick them up as tests. Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>
| * gdk-pixbuf-loader: fix module pathFederico Mena Quintero2023-04-211-1/+1
| | | | | | | | Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/822>