From 70f5b89cea329c1756f561152fa55f8d9cf46cf988c09c11d2bc037ea636b429 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 May 2015 06:58:18 +0000 Subject: [PATCH 1/3] Accepting request 305514 from home:fstrba:freetype2 Build cairo against freetype2-bootstrap (needs freetype2 from M17N) OBS-URL: https://build.opensuse.org/request/show/305514 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=93 --- cairo.changes | 5 +++++ cairo.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cairo.changes b/cairo.changes index 07fc72c..3a7ab63 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 5 08:39:26 UTC 2015 - fstrba@suse.com + +- Build cairo against the freetype2-bootstrap-devel package + ------------------------------------------------------------------- Sat Mar 14 12:30:22 UTC 2015 - opensuse@mirell.de diff --git a/cairo.spec b/cairo.spec index c3e3b5b..86c2d1f 100644 --- a/cairo.spec +++ b/cairo.spec @@ -37,10 +37,10 @@ Patch2: cairo-render-thin-lines.patch Patch3: cairo-xlib-endianness.patch BuildRequires: gtk-doc # Needed by patch0 +BuildRequires: freetype2-bootstrap-devel BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) >= 0.30.0 @@ -58,6 +58,8 @@ BuildRequires: Mesa-devel BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-shm) %endif +#!BuildIgnore: libfreetype6 +#!BuildIgnore: freetype2-devel %description Cairo is a vector graphics library with cross-device output support. From f07f2cedf24d8f3a80be28c84a7578af6e09143f8e4fde1be9be470186129013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 18 May 2015 09:25:57 +0000 Subject: [PATCH 2/3] Accepting request 307439 from home:oertel:branches:GNOME:Factory - drop cairo-disable-lto.patch: lto was dropped upstream OBS-URL: https://build.opensuse.org/request/show/307439 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=94 --- cairo-disable-lto.patch | 21 --------------------- cairo.changes | 5 +++++ cairo.spec | 11 +++-------- 3 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 cairo-disable-lto.patch diff --git a/cairo-disable-lto.patch b/cairo-disable-lto.patch deleted file mode 100644 index 29c1baf..0000000 --- a/cairo-disable-lto.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: cairo-1.12.16/build/configure.ac.warnings -=================================================================== ---- cairo-1.12.16.orig/build/configure.ac.warnings -+++ cairo-1.12.16/build/configure.ac.warnings -@@ -36,16 +36,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_T - dnl We also abuse the warning-flag facility to enable other compiler - dnl options. Namely, the following: - --dnl -flto working really needs a test link, not just a compile -- --safe_MAYBE_WARN="$MAYBE_WARN" --MAYBE_WARN="$MAYBE_WARN -flto" --AC_TRY_LINK([],[ -- int main(int argc, char **argv) { return 0; } --],[],[ -- MAYBE_WARN="$safe_MAYBE_WARN" --]) -- - MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" - - dnl Also to turn various gcc/glibc-specific preprocessor checks diff --git a/cairo.changes b/cairo.changes index 3a7ab63..eaa1c7c 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 16 10:42:31 CEST 2015 - ro@suse.de + +- drop cairo-disable-lto.patch: lto was dropped upstream + ------------------------------------------------------------------- Tue May 5 08:39:26 UTC 2015 - fstrba@suse.com diff --git a/cairo.spec b/cairo.spec index 86c2d1f..b4fb708 100644 --- a/cairo.spec +++ b/cairo.spec @@ -29,12 +29,10 @@ Source: http://cairographics.org/releases/%{name}-%{version}.tar.xz Source99: baselibs.conf # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 dimstar@opensuse.org -- Build modules with -module -avoid-version. Patch0: cairo-modules-no-version.patch -# PATCH-FIX-OPENSUSE cairo-disable-lto.patch idoenmez@suse.de -- Disable -flto on s390{x} -Patch1: cairo-disable-lto.patch # PATCH-FIX-UPSTREAM cairo-render-thin-lines.patch fdo#77298 jw@suse.com -- Fix rendering of thin lines -Patch2: cairo-render-thin-lines.patch +Patch1: cairo-render-thin-lines.patch # PATCH-FIX-UPSTREAM cairo-xlib-endianness.patch fdo#63461 bnc#882951 fcrozat@suse.com -- Fix crash when client and server have different endianness -Patch3: cairo-xlib-endianness.patch +Patch2: cairo-xlib-endianness.patch BuildRequires: gtk-doc # Needed by patch0 BuildRequires: freetype2-bootstrap-devel @@ -145,12 +143,9 @@ cairo. %prep %setup -q %patch0 -p1 -%ifarch s390 s390x -%patch1 -p1 -%endif # fix_for_fdo77298.patch +%patch1 -p1 %patch2 -p1 -%patch3 -p1 %build # Needed by patch0 and patch1 From 97465aefe88e7106246d5ccbda8079a345476e1b87bba1ad593c33f943e48066 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 18 May 2015 09:36:25 +0000 Subject: [PATCH 3/3] Revert freetype/harfbuzz cycle atempts OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=95 --- cairo.changes | 5 ----- cairo.spec | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cairo.changes b/cairo.changes index eaa1c7c..a27fe54 100644 --- a/cairo.changes +++ b/cairo.changes @@ -3,11 +3,6 @@ Sat May 16 10:42:31 CEST 2015 - ro@suse.de - drop cairo-disable-lto.patch: lto was dropped upstream -------------------------------------------------------------------- -Tue May 5 08:39:26 UTC 2015 - fstrba@suse.com - -- Build cairo against the freetype2-bootstrap-devel package - ------------------------------------------------------------------- Sat Mar 14 12:30:22 UTC 2015 - opensuse@mirell.de diff --git a/cairo.spec b/cairo.spec index b4fb708..3c704cd 100644 --- a/cairo.spec +++ b/cairo.spec @@ -35,10 +35,10 @@ Patch1: cairo-render-thin-lines.patch Patch2: cairo-xlib-endianness.patch BuildRequires: gtk-doc # Needed by patch0 -BuildRequires: freetype2-bootstrap-devel BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(pixman-1) >= 0.30.0 @@ -56,8 +56,6 @@ BuildRequires: Mesa-devel BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-shm) %endif -#!BuildIgnore: libfreetype6 -#!BuildIgnore: freetype2-devel %description Cairo is a vector graphics library with cross-device output support.