Accepting request 577100 from LibreOffice:Factory
OBS-URL: https://build.opensuse.org/request/show/577100 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphite2?expand=0&rev=24
This commit is contained in:
commit
a2ae111027
13
gcc8.patch
Normal file
13
gcc8.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: graphite-1.3.10/tests/bittwiddling/bits.cpp
|
||||
===================================================================
|
||||
--- graphite-1.3.10.orig/tests/bittwiddling/bits.cpp
|
||||
+++ graphite-1.3.10/tests/bittwiddling/bits.cpp
|
||||
@@ -81,7 +81,7 @@ namespace
|
||||
{
|
||||
if (!std::numeric_limits<T>::is_signed) o.put('u');
|
||||
o << "int" << std::dec << sizeof(T)*8;
|
||||
- return 0;
|
||||
+ return o;
|
||||
}
|
||||
|
||||
template<typename T>
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 15 11:02:52 UTC 2018 - schwab@suse.de
|
||||
|
||||
- gcc8.patch: return correct value from stream operator
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 18 13:58:56 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
|
@ -21,7 +21,7 @@ Name: graphite2
|
||||
Version: 1.3.10
|
||||
Release: 0
|
||||
Summary: Font rendering capabilities for complex non-Roman writing systems
|
||||
License: LGPL-2.1+ OR MPL-2.0+
|
||||
License: LGPL-2.1-or-later OR MPL-2.0+
|
||||
Group: Productivity/Publishing/Word
|
||||
Url: http://graphite.sil.org/
|
||||
Source0: https://github.com/silnrsi/graphite/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
@ -31,6 +31,7 @@ Patch1: graphite-nonvoid-return.patch
|
||||
Patch2: link-gcc-shared.diff
|
||||
Patch3: graphite2-python3_tests.patch
|
||||
Patch4: graphite2-python3_tests_cornercases.patch
|
||||
Patch5: gcc8.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: fontconfig-devel
|
||||
# Required for tests
|
||||
@ -88,6 +89,7 @@ This package contains the %{name} development files.
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
# Make sure to use python3 everywhere
|
||||
|
Loading…
x
Reference in New Issue
Block a user