Accepting request 321035 from LibreOffice:Factory

- Version bump to 1.3.0:
  * Various tweaks for the arabic fonts
- Added patches:
  * graphite-nonvoid-return.patch
  * graphite2-1.2.0-cmakepath.patch
- Removed patches:
  * no-specific-nunit-version.diff
  * soname.diff

OBS-URL: https://build.opensuse.org/request/show/321035
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphite2?expand=0&rev=10

graphite-nonvoid-return.patch

@@ -0,0 +1,12 @@
+Index: graphite2-1.3.0/tests/bittwiddling/bits.cpp
+===================================================================
+--- graphite2-1.3.0.orig/tests/bittwiddling/bits.cpp
++++ graphite2-1.3.0/tests/bittwiddling/bits.cpp
+@@ -81,6 +81,7 @@ namespace
+     {
+         if (!std::numeric_limits<T>::is_signed) o.put('u');
+         o << "int" << std::dec << sizeof(T)*8;
++        return 0;
+     }
+     
+ 	template<typename T>

graphite2-1.2.0-cmakepath.patch

@@ -0,0 +1,9 @@
+diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt
+--- graphite2-1.2.0.orig/src/CMakeLists.txt	2013-01-29 15:47:32.465841769 +0530
++++ graphite2-1.2.0/src/CMakeLists.txt	2013-01-29 15:48:24.056843352 +0530
+@@ -136,4 +136,4 @@
+ 
+ 
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
+-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_)

graphite2-1.2.4.tgz

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

graphite2-1.3.0.tgz

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

graphite2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Aug  7 08:24:54 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 1.3.0:
+  * Various tweaks for the arabic fonts
+- Added patches:
+  * graphite-nonvoid-return.patch
+  * graphite2-1.2.0-cmakepath.patch
+- Removed patches:
+  * no-specific-nunit-version.diff
+  * soname.diff
+
 -------------------------------------------------------------------
 Tue May 19 07:30:18 UTC 2015 - fstrba@suse.com
 

graphite2.spec

@@ -18,7 +18,7 @@
 
 %define libname libgraphite2-3
 Name:           graphite2
-Version:        1.2.4
+Version:        1.3.0
 Release:        0
 Summary:        Font rendering capabilities for complex non-Roman writing systems
 License:        LGPL-2.1+ or GPL-2.0+ or MPL-1.1
@@ -26,12 +26,14 @@ Group:          Productivity/Publishing/Word
 Url:            http://sourceforge.net/projects/silgraphite/
 Source0:        http://downloads.sourceforge.net/silgraphite/graphite2-%{version}.tgz
 Source1:        baselibs.conf
-Patch0:         no-specific-nunit-version.diff
+Patch0:         graphite2-1.2.0-cmakepath.patch
-Patch1:         soname.diff
+Patch1:         graphite-nonvoid-return.patch
 Patch2:         link-gcc-shared.diff
 BuildRequires:  asciidoc
 BuildRequires:  cmake
 BuildRequires:  fontconfig-devel
+# Required for tests
+BuildRequires:  fonttools
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel
@@ -98,7 +100,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
 cd build
-ctest --extra-verbose --output-on-failure
+ctest --output-on-failure
 
 %post -n %{libname} -p /sbin/ldconfig
 
@@ -118,6 +120,6 @@ ctest --extra-verbose --output-on-failure
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}*.pc
 %{_includedir}/%{name}*
-%{_datadir}/%{name}*
+%{_libdir}/%{name}*
 
 %changelog

no-specific-nunit-version.diff

@@ -1,15 +0,0 @@
---- graphite2-1.2.0.orig/contrib/C#/NGraphiteTests/NGraphiteTests.csproj
-+++ graphite2-1.2.0/contrib/C#/NGraphiteTests/NGraphiteTests.csproj
-@@ -30,10 +30,10 @@
-   </PropertyGroup>
-   <ItemGroup>
-     <Reference Include="System" />
--    <Reference Include="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-+    <Reference Include="nunit.core">
-       <Package>mono-nunit</Package>
-     </Reference>
--    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
-+    <Reference Include="nunit.framework">
-       <Package>mono-nunit</Package>
-     </Reference>
-   </ItemGroup>

soname.diff

@@ -1,7 +0,0 @@
---- graphite2-1.2.0.orig/contrib/C#/NGraphite/NGraphite.dll.config
-+++ graphite2-1.2.0/contrib/C#/NGraphite/NGraphite.dll.config
-@@ -1,3 +1,3 @@
- <configuration>
--  <dllmap dll="graphite2.dll" target="libgraphite2.so.2.0.0" os="!windows"/>  
-+  <dllmap dll="graphite2.dll" target="libgraphite2.so.3" os="!windows"/>  
- </configuration>