Accepting request 322381 from GNOME:Factory

- drop cairo-disable-lto.patch: lto was dropped upstream

OBS-URL: https://build.opensuse.org/request/show/322381
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger 2015-08-17 13:34:40 +00:00 committed by Git OBS Bridge
commit 436c669ea9
3 changed files with 8 additions and 29 deletions

View File

@ -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

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat May 16 10:42:31 CEST 2015 - ro@suse.de
- drop cairo-disable-lto.patch: lto was dropped upstream
-------------------------------------------------------------------
Sat Mar 14 12:30:22 UTC 2015 - opensuse@mirell.de

View File

@ -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: libtool
@ -143,12 +141,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