rpm/graphite2
SHA256
1
0
Fork 0
forked from pool/graphite2
Code Pull Requests Activity

Accepting request 826185 from LibreOffice:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/826185
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphite2?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger 2020-08-15 19:17:52 +00:00 committed by Git OBS Bridge
commit 0f11351628
6 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphite2-1.2.0-cmakepath.patch
View File

@ -1,8 +1,7 @@
Index: graphite-1.3.10/src/CMakeLists.txt
===================================================================
--- graphite-1.3.10.orig/src/CMakeLists.txt
+++ graphite-1.3.10/src/CMakeLists.txt
@@ -155,4 +155,4 @@ endif (${CMAKE_SYSTEM_NAME} STREQUAL "Wi
diff -Naur graphite-1.3.14.orig/src/CMakeLists.txt graphite-1.3.14/src/CMakeLists.txt
--- graphite-1.3.14.orig/src/CMakeLists.txt 2020-08-10 10:08:58.963417496 +0200
+++ graphite-1.3.14/src/CMakeLists.txt 2020-08-10 10:13:14.909357757 +0200
@@ -156,4 +156,4 @@
install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)

3
graphite2-1.3.12.tar.gz
View File

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

BIN
graphite2-1.3.14.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

25
graphite2.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Wed Aug 12 09:16:40 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
- Update to 1.3.14:
* Bug fixes
* Allow features to be hidden (for aliases)
* Move to python3
* Rename doc files from .txt to .asc
- Run spec-cleaner
* Remove rpm groups
* Use make macros
* Use license macro
- Refresh patches:
* link-gcc-shared.diff
* graphite2-1.2.0-cmakepath.patch
-------------------------------------------------------------------
Wed Aug 12 09:15:09 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
- Update to 1.3.13:
* Resolve minor spacing issue in rtl non-overlap kerning
* python3 for graphite.py
* Better fuzzing
* Better building on windows
-------------------------------------------------------------------
Sun Dec 15 20:09:52 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

21
graphite2.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package graphite2
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,12 +18,11 @@
%define libname libgraphite2-3
Name: graphite2
Version: 1.3.12
Version: 1.3.14
Release: 0
Summary: Font rendering capabilities for complex non-Roman writing systems
License: LGPL-2.1-or-later OR MPL-2.0+
Group: Productivity/Publishing/Word
Url: http://graphite.sil.org/
URL: http://graphite.sil.org/
Source0: https://github.com/silnrsi/graphite/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf
Patch0: graphite2-1.2.0-cmakepath.patch
@ -32,11 +31,11 @@ BuildRequires: cmake
BuildRequires: fontconfig-devel
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
# libglib-2_0-0 pulls in shared-mime-info for mime detection in gvfs
#!BuildIgnore: shared-mime-info
BuildRequires: glib2-devel
BuildRequires: pkgconfig
BuildRequires: python3-base
# libglib-2_0-0 pulls in shared-mime-info for mime detection in gvfs
#!BuildIgnore: shared-mime-info
%description
Graphite2 is a project within SIL's Non-Roman Script Initiative and Language
@ -48,7 +47,6 @@ system implementation.
%package -n %{libname}
Summary: Text categorization library
Group: System/Libraries
%description -n %{libname}
Graphite2 is a project within SIL's Non-Roman Script Initiative and Language
@ -60,7 +58,6 @@ system implementation.
%package devel
Summary: Files for Developing with %{name}
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
Requires: glibc-devel
@ -75,9 +72,7 @@ system implementation.
This package contains the %{name} development files.
%prep
%setup -q -n graphite-%{version}
%patch0 -p1
%patch2 -p1
%autosetup -p1 -n graphite-%{version}
# Make sure to use python3 everywhere
find tests -type f -exec sed -i "s|python|python3|g" {} +
@ -92,7 +87,7 @@ find . -name *.cmake -exec sed -i "s|python|python3|g" {} +
find . -type f \
-exec sed -i -e 's/\-O3//g' {} \;
make %{?_smp_mflags}
%make_build
%install
%cmake_install
@ -108,7 +103,7 @@ ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} \
%postun -n %{libname} -p /sbin/ldconfig
%files
%doc LICENSE COPYING
%license LICENSE COPYING
%{_bindir}/gr2fonttest
%files -n %{libname}

11
link-gcc-shared.diff
View File

@ -1,13 +1,12 @@
Index: graphite-1.3.12/src/CMakeLists.txt
===================================================================
--- graphite-1.3.12.orig/src/CMakeLists.txt 2018-10-25 10:06:19.438425490 +0200
+++ graphite-1.3.12/src/CMakeLists.txt 2018-10-25 10:07:57.506879853 +0200
@@ -123,7 +123,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
diff -Naur graphite-1.3.14.orig/src/CMakeLists.txt graphite-1.3.14/src/CMakeLists.txt
--- graphite-1.3.14.orig/src/CMakeLists.txt 2020-08-10 10:08:58.963417496 +0200
+++ graphite-1.3.14/src/CMakeLists.txt 2020-08-10 10:16:19.239886692 +0200
@@ -123,7 +123,7 @@
if (GRAPHITE2_SANITIZERS)
target_link_libraries(graphite2 c gcc_s)
else ()
- target_link_libraries(graphite2 c gcc)
+ target_link_libraries(graphite2 c gcc_s)
endif ()
endif (${CMAKE_CXX_COMPILER} MATCHES ".*mingw.*")
endif()
include(Graphite)