Hello community, here is the log from the commit of package freetype2 for openSUSE:Factory checked in at 2015-05-22 09:46:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freetype2 (Old) and /work/SRC/openSUSE:Factory/.freetype2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freetype2" Changes: -------- --- /work/SRC/openSUSE:Factory/freetype2/freetype2.changes 2015-04-25 16:45:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.freetype2.new/freetype2.changes 2015-05-22 09:46:57.000000000 +0200 @@ -2,13 +1,0 @@ -Wed Apr 22 08:15:19 UTC 2015 - [email protected] - -- Enable harfbuzz for only suse_version > 1320. Dependency is - not available on older releases. - -------------------------------------------------------------------- -Fri Apr 10 09:43:06 UTC 2015 - [email protected] - -- Build freetype2 against harfbuzz library - * Using the harfbuzz-bootstrap-devel in order to avoid cyclic - dependencies - -------------------------------------------------------------------- ft2demos.changes: same change New: ---- pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetype2.spec ++++++ --- /var/tmp/diff_new_pack.YVO4xl/_old 2015-05-22 09:46:58.000000000 +0200 +++ /var/tmp/diff_new_pack.YVO4xl/_new 2015-05-22 09:46:58.000000000 +0200 @@ -34,10 +34,6 @@ 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 @@ 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 ++++++ ft2demos.spec ++++++ --- /var/tmp/diff_new_pack.YVO4xl/_old 2015-05-22 09:46:58.000000000 +0200 +++ /var/tmp/diff_new_pack.YVO4xl/_new 2015-05-22 09:46:58.000000000 +0200 @@ -47,16 +47,17 @@ 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)"
