Skip to content

Patching graphviz dot to png error #5717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
osamaesmailmsft merged 7 commits into from
Jun 26, 2023
Merged

Patching graphviz dot to png error #5717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8808f77
updating release and adding changelog
osamaesmailmsft Jun 14, 2023
80b4b85
bumping release number & adding some changes
osamaesmailmsft Jun 14, 2023
7b89fc3
something
osamaesmailmsft Jun 19, 2023
48c0415
bumping freefont
osamaesmailmsft Jun 20, 2023
5b47313
linting and verifying license
osamaesmailmsft Jun 20, 2023
044ed1f
addressing comments and trying with no freefont
osamaesmailmsft Jun 21, 2023
3f41e7a
addressing comments
osamaesmailmsft Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions SPECS/freefont/freefont.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
Summary: GNU Free fonts
Name: freefont
Version: 20120503
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv3
URL: https://ftp.gnu.org/pub/gnu/freefont/
Group: System Environment/Base
Vendor: Microsoft Corporation
Distribution: Mariner
Source0: https://ftp.gnu.org/pub/gnu/%{name}/%{name}-ttf-%{version}.zip

# BUG in Mariner RPMbuilder not providing zip
BuildRequires: unzip

%description
Expand All @@ -31,6 +30,10 @@ mv *.ttf %{buildroot}%{_fontdir}/
%{_fontdir}/*.ttf

%changelog
* Tue Jun 20 2023 Osama Esmail <osamaesmail@microsoft.com> - 20120503-3
- License verified
- Removed irrelevant comment

* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> - 20120503-2
- Added %%license line automatically

Expand Down
12 changes: 10 additions & 2 deletions SPECS/graphviz/graphviz.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
Summary: Graph Visualization Tools
Name: graphviz
Version: 2.42.4
Release: 7%{?dist}
Release: 8%{?dist}
License: EPL-1.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -77,6 +77,7 @@ BuildRequires: pango-devel
BuildRequires: perl
# Temporary workaound for perl(Carp) not pulled
BuildRequires: perl-Carp
BuildRequires: perl-ExtUtils-Embed
BuildRequires: perl-devel
BuildRequires: pkg-config
BuildRequires: python3-devel
Expand Down Expand Up @@ -147,6 +148,7 @@ Provides some additional PDF and HTML documentation for graphviz.
%package gd
Summary: Graphviz plugin for renderers based on gd
Requires: %{name} = %{version}-%{release}
Requires: freefont
Requires(post): %{_bindir}/dot
Requires(post): /sbin/ldconfig
Requires(postun): %{_bindir}/dot
Expand Down Expand Up @@ -266,7 +268,8 @@ sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linu
%configure --with-x --disable-static --disable-dependency-tracking \
--without-mylibgd --with-ipsepcola --with-pangocairo \
--without-gdk-pixbuf --with-visio --disable-silent-rules \
--without-ruby --without-python2 \
--without-ruby --without-python2 \
--with-freetypeincludedir=%{_includedir}/freetype2 --with-freetypelibdir=%{_libdir}/lib \
%if ! %{LASI}
--without-lasi \
%endif
Expand Down Expand Up @@ -515,6 +518,11 @@ php --no-php-ini \
%{_mandir}/man3/*.3tcl*

%changelog
* Thu Jun 22 2023 Osama Esmail <osamaesmail@microsoft.com> - 2.42.4-8
- Trying some more `freefont` fixes (added Requires to gd)
- Added freetype option to build
- `dot` complains about not having URW1 fonts, but works anyway

* Wed Mar 08 2023 Osama Esmail <osamaesmail@microsoft.com> - 2.42.4-7
- Add `freefont` to BuildRequires to provide default font for graphviz

Expand Down