pool/gfxboot
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 210614 from openSUSE:Factory:Staging:freetype2

Browse Source 
Added use-recommended-freetype-include.patch -- needed for freetype2 2.5.1

OBS-URL: https://build.opensuse.org/request/show/210614
OBS-URL: https://build.opensuse.org/package/show/system:install:head/gfxboot?expand=0&rev=90
This commit is contained in:
Stephan Kulow 2013-12-19 06:21:36 +00:00 committed by Git OBS Bridge
parent 06e5d7d229
commit 6fc3102e4d
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfxboot.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Dec 11 21:01:43 UTC 2013 - hrvoje.senjan@gmail.com
- Added use-recommended-freetype-include.patch -- Freetype upstream
recommends using their macros together with ft2build include.
Positive sideeffect is that this patch makes it build with both
freetype2 2.5.1, and older version
-------------------------------------------------------------------
Mon Oct 1 10:53:34 CEST 2012 - snwint@suse.de

14
gfxboot.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gfxboot
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -30,6 +30,9 @@ Source3: SLED.tar.bz2
Source4: SLES.tar.bz2
Source5: upstream.tar.bz2
Source6: examples.tar.bz2
# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with
# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions
Patch0: use-recommended-freetype-include.patch
BuildRequires: fdupes
BuildRequires: freetype2-devel
BuildRequires: fribidi
@ -68,8 +71,8 @@ Summary: Graphical bootloader upstream theme
Group: System/Boot
PreReq: %{name} >= 4
Supplements: packageand(%{name}:branding-upstream)
Provides: %{name}-theme = %{version}
Provides: %{name}-branding = %{version}
Provides: %{name}-theme = %{version}
Conflicts: otherproviders(%{name}-branding)
%description branding-upstream
@ -80,8 +83,8 @@ Summary: Graphical bootloader SLES theme
Group: System/Boot
PreReq: %{name} >= 4
Supplements: packageand(%{name}:branding-SLES)
Provides: %{name}-theme = %{version}
Provides: %{name}-branding = %{version}
Provides: %{name}-theme = %{version}
Obsoletes: bootloader-theme-SLES < %{version}
Provides: bootloader-theme-SLES = %{version}
Conflicts: otherproviders(%{name}-branding)
@ -94,8 +97,8 @@ Summary: Graphical bootloader SLED theme
Group: System/Boot
PreReq: %{name} >= 4
Supplements: packageand(%{name}:branding-SLED)
Provides: %{name}-theme = %{version}
Provides: %{name}-branding = %{version}
Provides: %{name}-theme = %{version}
Obsoletes: bootloader-theme-NLD < %{version}
Provides: bootloader-theme-NLD = %{version}
Conflicts: otherproviders(%{name}-branding)
@ -108,8 +111,8 @@ Summary: Graphical bootloader KDE theme
Group: System/Boot
PreReq: %{name} >= 4
Supplements: packageand(%{name}:branding-KDE)
Provides: %{name}-theme = %{version}
Provides: %{name}-branding = %{version}
Provides: %{name}-theme = %{version}
Conflicts: otherproviders(%{name}-branding)
%description branding-KDE
@ -117,6 +120,7 @@ KDE theme for gfxboot (bootloader graphics).
%prep
%setup
%patch0 -p1
%setup -T -D -a 1
%setup -T -D -a 2
%setup -T -D -a 3

12
use-recommended-freetype-include.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Naur gfxboot-4.5.1/gfxboot-font.c gfxboot-4.5.1.new/gfxboot-font.c
--- gfxboot-4.5.1/gfxboot-font.c 2012-09-06 12:07:10.000000000 +0200
+++ gfxboot-4.5.1.new/gfxboot-font.c 2013-12-11 21:57:16.983783036 +0100
@@ -13,7 +13,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#include <freetype/ftsynth.h>
+#include FT_SYNTHESIS_H
#define MAGIC 0xd2828e06