Accepting request 44078 from M17N

Copy from M17N/freetype2 based on submit request 44078 from user tiwai

OBS-URL: https://build.opensuse.org/request/show/44078
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=27
This commit is contained in:
OBS User autobuild 2010-07-30 10:36:15 +00:00 committed by Git OBS Bridge
commit 9d83bf2af5
13 changed files with 31 additions and 88 deletions

View File

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

3
freetype-2.4.1.tar.bz2 Normal file
View File

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

View File

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

View File

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

View File

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

View File

@ -1,13 +0,0 @@
Index: freetype-2.3.12/include/freetype/config/ftoption.h
===================================================================
--- freetype-2.3.12.orig/include/freetype/config/ftoption.h 2010-02-09 15:40:56.000000000 +0100
+++ freetype-2.3.12/include/freetype/config/ftoption.h 2010-03-31 16:23:42.000000000 +0200
@@ -497,7 +497,7 @@ FT_BEGIN_HEADER
/* Do not #undef this macro here, since the build system might */
/* define it for certain configurations only. */
/* */
-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
/*************************************************************************/

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 20 17:50:44 CEST 2010 - tiwai@suse.de
- updated to version 2.4.1:
* major version up
* bytecode interpreter is enabled as default in the upstream
* doc-reference is redundant, removed
-------------------------------------------------------------------
Fri Jun 4 11:09:21 UTC 2010 - coolo@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package freetype2 (Version 2.3.12)
# spec file for package freetype2 (Version 2.4.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -28,8 +28,8 @@ AutoReqProv: on
Obsoletes: freetype2-64bit
%endif
#
Version: 2.3.12
Release: 6
Version: 2.4.1
Release: 1
Url: http://www.freetype.org
Summary: A TrueType Font Library
# CVS repository:
@ -38,14 +38,11 @@ Summary: A TrueType Font Library
# cvs -d :pserver:anonymous@cvs.savannah.nongnu.org:/sources/freetype co ft2demos
Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
# pregenerated to avoid build-dependence on python:
Source2: freetype-doc-reference.tar.bz2
Source3: baselibs.conf
Patch3: freetype2-bitmap-foundry.patch
Patch4: ft2-stream-compat.diff
Patch9: fix-build.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
Patch100: freetype2-bc.patch
Patch200: freetype2-subpixel.patch
Patch201: use_unix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -84,15 +81,6 @@ TrueType font library.
It also contains a small tutorial for using that library.
%prep
# The byte code interpreter is compiled in by default
# because of the following option.
# For most fonts it is disabled again by default in the
# fontconfig setup in /etc/fonts. But if it is already
# enabled at compilation time, it can be easily enabled
# at runtime. See also the variable BYTECODE_BW_MAX_PIXEL
# in /etc/sysconfig/fonts-config.
#
%define enable_bytecode_interpreter 1
%define enable_subpixel_rendering 0
%setup -q -n freetype-%{version} -a 1
%patch3 -p 1 -b .bitmap-foundry
@ -100,16 +88,10 @@ It also contains a small tutorial for using that library.
#%patch8 -p 1
%patch9 -p 1
%patch308961 -p 1
%if %{enable_bytecode_interpreter}
%patch100 -p 1 -b .bytecode
%endif
%if %{enable_subpixel_rendering}
%patch200 -p 1 -b .subpixel
%endif
%patch201 -p1
pushd docs
tar xf $RPM_SOURCE_DIR/freetype-doc-reference.tar.bz2
popd
find . -name CVS -type d | xargs rm -rf
find . -name ".cvsignore" | xargs rm -f
cp /usr/share/automake*/config.{guess,sub} builds/unix

View File

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

3
ft2demos-2.4.1.tar.bz2 Normal file
View File

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

View File

@ -1,17 +0,0 @@
diff -ru ft2demos-2.2.1.orig/Makefile ft2demos-2.2.1/Makefile
--- ft2demos-2.2.1.orig/Makefile 2006-05-10 18:20:49.000000000 +0200
+++ ft2demos-2.2.1/Makefile 2006-06-21 12:03:53.000000000 +0200
@@ -262,9 +262,9 @@
# Only uncomment the following lines if the truetype driver was
# compiled with TT_CONFIG_OPTION_BYTECODE_INTERPRETER defined.
#
- # ifneq ($(findstring $(PLATFORM),os2 unix win32),)
- # EXES += ttdebug
- # endif
+ ifneq ($(findstring $(PLATFORM),os2 unix win32),)
+ EXES += ttdebug
+ endif
exes: $(EXES:%=$(BIN_DIR_2)/%$E)

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 20 17:50:44 CEST 2010 - tiwai@suse.de
- updated to version 2.4.1:
* major version up
* bytecode interpreter is enabled as default in the upstream
* doc-reference is redundant, removed
-------------------------------------------------------------------
Wed Mar 31 15:08:24 UTC 2010 - coolo@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package ft2demos (Version 2.3.12)
# spec file for package ft2demos (Version 2.4.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -24,8 +24,8 @@ License: GPLv2+
Group: Productivity/Publishing/Other
AutoReqProv: on
Supplements: fonts-config
Version: 2.3.12
Release: 6
Version: 2.4.1
Release: 1
%define freetype_version %{version}
Url: http://www.freetype.org
Summary: Freetype2 Utilities and Demo Programs
@ -37,14 +37,10 @@ Source0: http://savannah.nongnu.org/download/freetype/freetype-%{version}
# Uncomment to save space:
#NoSource: 0
Source1: http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2
# pregenerated to avoid build-dependence on python:
Source2: freetype-doc-reference.tar.bz2
Patch4: ft2-stream-compat.diff
Patch9: fix-build.patch
Patch308961: bugzilla-308961-cmex-workaround.patch
Patch50: ft2demos-build-testname.patch
Patch100: freetype2-bc.patch
Patch101: ft2demos-bc.patch
Patch200: freetype2-subpixel.patch
Patch201: use_unix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -53,15 +49,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Freetype2 utilities and demo programs.
%prep
# The byte code interpreter is compiled in by default
# because of the following option.
# For most fonts it is disabled again by default in the
# fontconfig setup in /etc/fonts. But if it is already
# enabled at compilation time, it can be easily enabled
# at runtime. See also the variable BYTECODE_BW_MAX_PIXEL
# in /etc/sysconfig/fonts-config.
#
%define enable_bytecode_interpreter 1
%define enable_subpixel_rendering 0%{?opensuse_bs}
%setup -n freetype-%{freetype_version} -b 1
%patch4 -p 1 -b .ft2-stream-compat
@ -72,19 +59,10 @@ Freetype2 utilities and demo programs.
pushd ../ft2demos-%{version}
%patch50 -p 1
popd
%if %{enable_bytecode_interpreter}
%patch100 -p 1 -b .bytecode
%endif
# pushd ../ft2demos-%{version}
# %patch101 -p 1
# popd
%if %{enable_subpixel_rendering}
%patch200 -p 1 -b .subpixel
%endif
%patch201 -p1
pushd docs
tar xf $RPM_SOURCE_DIR/freetype-doc-reference.tar.bz2
popd
find . -name CVS -type d | xargs rm -rf
find . -name ".cvsignore" | xargs rm -f
cp /usr/share/automake*/config.{guess,sub} builds/unix