Accepting request 215627 from system:install:head

- fix compiler warning
- hrvoje.senjan: use FT_SYNTHESIS_H macro
- set min video mode to 1024x576
- remove use-recommended-freetype-include.patch

OBS-URL: https://build.opensuse.org/request/show/215627
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gfxboot?expand=0&rev=113
This commit is contained in:
Stephan Kulow 2014-01-31 10:50:36 +00:00 committed by Git OBS Bridge
commit 1fd3275895
11 changed files with 26 additions and 34 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2338fb456bf3fc624ef3629da0aa1fc44b651c71ced183af734d023d4c92df7a
size 83146
oid sha256:e992bbe34ecc59339f3f4ded1ac787155187243823acad80c157cb9909aae314
size 83500

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fdab8d60a08d439f951ab34f2607ba363ae87dba1e9adbed7a0d385c33ffd126
size 130683
oid sha256:b4e6b07a8ccbbc87a2866709ceba81be33ea90645d417180d5c3d468325bd4ab
size 131284

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f279f02eaab181772cd8f57a22475f2e429a84856730d1d423cd5bcc887ec490
size 130371
oid sha256:821e7fad4a0f25e065489c04e3a0bf3635bd939b01ff29e41de20bc22bfe2408
size 130879

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff56dc793442fb1d73145c16b4773f3e6a5361cec78614851aeb1061d7c66337
size 184803
oid sha256:848e5cc636aebe7b51e72fbf03b0bb3d985f45c0a15fc98908069380756601aa
size 185486

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0fe87affc7457ad27956b7b89254a217e139b3c33b51f0082373300f5fb7734
size 164393

3
gfxboot-4.5.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c693616ae31ee8093ae598913ca39a1bcb78a2ba6972a37a9f7fe19773e22573
size 162960

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jan 24 15:37:57 CET 2014 - snwint@suse.de
- fix compiler warning
- hrvoje.senjan: use FT_SYNTHESIS_H macro
- set min video mode to 1024x576
- remove use-recommended-freetype-include.patch
-------------------------------------------------------------------
Wed Dec 11 21:01:43 UTC 2013 - hrvoje.senjan@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gfxboot
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -17,22 +17,19 @@
Name: gfxboot
Version: 4.5.1
Version: 4.5.2
Release: 0
Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX
License: GPL-2.0+
Group: System/Boot
Url: http://en.opensuse.org/SDB:Gfxboot
Source: gfxboot-4.5.1.tar.bz2
Source: gfxboot-4.5.2.tar.bz2
Source1: KDE.tar.bz2
Source2: openSUSE.tar.bz2
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
@ -120,7 +117,6 @@ 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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa9e6e65b65f0e39343d1752ae915eaab3007a2f614bf5419e6f587b832ae66b
size 5227139
oid sha256:6d9bdf302f68c29768d3bbc4054aba4c2c67b55d152818ed14267474c5aca89f
size 5215220

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a9d28fff7ae9fc4507460a1334af9c2697d6bb80beb9680e9c9405bba61cdade
size 49776
oid sha256:9e5825ddae8291bbd8df765f3f8e9b0eaf0d9f4992265a444a81472aa7aaa7a0
size 50375

View File

@ -1,12 +0,0 @@
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