[oxygen-fonts] Don't build fonts with fontforge, install fonts from tarball directly
Daniel Vrátil
dvratil at fedoraproject.org
Mon Sep 29 09:40:16 UTC 2014
commit a73a600ea9ca10053e330e34d9750e40b603a721
Author: Dan Vrátil <dvratil at redhat.com>
Date: Mon Sep 29 11:39:47 2014 +0200
Don't build fonts with fontforge, install fonts from tarball directly
fontforge in Fedora Rawhide segfaults when building the Oxygen fonts,
so for now we workaround it by installing the .ttf files shipped in
the upstream tarball.
See https://bugzilla.redhat.com/show_bug.cgi?id=1147421 for details.
disable-broken-fontforge-in-rawhide.patch | 25 +++++++++++++++++++++++++
oxygen-fonts.spec | 4 ++++
2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/disable-broken-fontforge-in-rawhide.patch b/disable-broken-fontforge-in-rawhide.patch
new file mode 100644
index 0000000..2731b00
--- /dev/null
+++ b/disable-broken-fontforge-in-rawhide.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f8307a3..8e62905 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,6 +47,7 @@ else()
+ message(FATAL_ERROR "Could not find FontForge executable")
+ endif()
+
++if (DISABLE_BROKEN_FONTFORGE_IN_RAWHIDE)
+ add_custom_target(regular ALL fontforge ${CMAKE_CURRENT_SOURCE_DIR}/generate-ttf.pe
+ ${CMAKE_CURRENT_SOURCE_DIR}/oxygen-fonts/Regular-400/src/Oxygen-Sans.sfd
+ ${CMAKE_CURRENT_BINARY_DIR}/Oxygen-Sans.ttf
+@@ -66,4 +67,12 @@ set(fontFiles
+ ${CMAKE_CURRENT_BINARY_DIR}/Oxygen-Sans.ttf
+ )
+
++else()
++set(fontFiles
++ ${CMAKE_SOURCE_DIR}/oxygen-fonts/Bold-700/Oxygen-Sans-Bold.ttf
++ ${CMAKE_SOURCE_DIR}/oxygen-fonts/mono-400/OxygenMono-Regular.ttf
++ ${CMAKE_SOURCE_DIR}/oxygen-fonts/Regular-400/Oxygen-Sans.ttf
++)
++endif(DISABLE_BROKEN_FONTFORGE_IN_RAWHIDE)
++
+ install(FILES ${fontFiles} DESTINATION ${OXYGEN_FONT_INSTALL_DIR})
diff --git a/oxygen-fonts.spec b/oxygen-fonts.spec
index 9ee4be8..00faed6 100644
--- a/oxygen-fonts.spec
+++ b/oxygen-fonts.spec
@@ -15,6 +15,9 @@ Source0: http://download.kde.org/stable/plasma/%{plasma_version}/%{name}-
Source1: %{fontconf}-sans.conf
Source2: %{fontconf}-mono.conf
+#See https://bugzilla.redhat.com/show_bug.cgi?id=1147421
+Patch0: disable-broken-fontforge-in-rawhide.patch
+
BuildArch: noarch
BuildRequires: cmake
BuildRequires: extra-cmake-modules
@@ -60,6 +63,7 @@ developing applications that use %{name}.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .disablefontforge
%build
mkdir -p %{_target_platform}
More information about the scm-commits
mailing list