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

Accepting request 307893 from M17N

Browse Source 
Reverting the harfbuzz-related changes since they create a huge mess

OBS-URL: https://build.opensuse.org/request/show/307893
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2015-05-22 07:46:56 +00:00 committed by Git OBS Bridge
commit 2c5a6f2ce4
5 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
freetype2.changes
View File

@ -1,16 +1,3 @@
-------------------------------------------------------------------
Wed Apr 22 08:15:19 UTC 2015 - idonmez@suse.com
- Enable harfbuzz for only suse_version > 1320. Dependency is
not available on older releases.
-------------------------------------------------------------------
Fri Apr 10 09:43:06 UTC 2015 - fstrba@suse.com
- Build freetype2 against harfbuzz library
* Using the harfbuzz-bootstrap-devel in order to avoid cyclic
dependencies
-------------------------------------------------------------------
Fri Apr 10 07:34:20 UTC 2015 - fstrba@suse.com

10
freetype2.spec
View File

@ -34,10 +34,6 @@ Patch200: freetype2-subpixel.patch
Patch202: don-t-mark-libpng-as-required-library.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
BuildRequires: gawk
%if 0%{?suse_version} > 1330
# We build against a minimal bootstrap package in order to avoid a circular dependency
BuildRequires: harfbuzz-bootstrap-devel
%endif
BuildRequires: libbz2-devel
BuildRequires: libpng-devel
BuildRequires: pkg-config
@ -84,22 +80,20 @@ TrueType font library.
It also contains a small tutorial for using that library.
%prep
%define enable_subpixel_rendering 0
%setup -q -n freetype-%{version} -a 1
%patch1 -p1
%patch308961 -p 1
%patch202 -p1
%if %{enable_subpixel_rendering}
%patch200 -p1
%endif
%patch202 -p1
%build
export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
%configure \
--with-bzip2 \
%if 0%{?suse_version} > 1330
--with-harfbuzz \
%endif
--with-png \
--with-zlib \
--disable-static

7
ft2demos.changes
View File

@ -1,10 +1,3 @@
-------------------------------------------------------------------
Fri Apr 10 09:43:06 UTC 2015 - fstrba@suse.com
- Build freetype2 against harfbuzz library
* Using the harfbuzz-bootstrap-devel in order to avoid cyclic
dependencies
-------------------------------------------------------------------
Fri Apr 10 07:34:20 UTC 2015 - fstrba@suse.com

7
ft2demos.spec
View File

@ -47,16 +47,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Freetype2 utilities and demo programs.
%prep
%define enable_subpixel_rendering 0%{?opensuse_bs}
%setup -q -n freetype-%{freetype_version} -b 1
%patch308961 -p 1
%if %{enable_subpixel_rendering}
%patch200 -p 1 -b .subpixel
%endif
pushd ../ft2demos-%{version}
%patch201 -p1
popd
%patch202 -p1
%if %{enable_subpixel_rendering}
%patch200 -p 1 -b .subpixel
%endif
%build
export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"

0
pre_checkin.sh Normal file
View File