[packages/performous] - release 2, rebuild against boost-1.71, fix build against pango-1.44+

adamg adamg at pld-linux.org
Fri Oct 11 20:43:17 CEST 2019


commit 857e246fad1272161c3d79924ae58b558805af95
Author: Adam Gołębiowski <adamg at pld-linux.org>
Date:   Fri Oct 11 20:43:09 2019 +0200

    - release 2, rebuild against boost-1.71, fix build against pango-1.44+

 performous-pango1.44.patch | 27 +++++++++++++++++++++++++++
 performous.spec            |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/performous.spec b/performous.spec
index 65d921d..9d04b5c 100644
--- a/performous.spec
+++ b/performous.spec
@@ -2,13 +2,14 @@ Summary:	Performous - The All-in-One Music Game
 Summary(pl.UTF-8):	Performous - wiele gier muzycznych w jednej
 Name:		performous
 Version:	1.1
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/Sound
 #Source0Download: https://github.com/performous/performous/releases
 Source0:	https://github.com/performous/performous/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	cf31d0973cd88b3cd626d312d6d3f5b2
 Patch0:		%{name}-boost.patch
+Patch1:		%{name}-pango1.44.patch
 URL:		http://performous.org/
 BuildRequires:	ImageMagick-c++-devel
 BuildRequires:	SDL2-devel >= 2
@@ -66,6 +67,7 @@ Zestaw narzędzi do konwersji danych dla programu Performous.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
diff --git a/performous-pango1.44.patch b/performous-pango1.44.patch
new file mode 100644
index 0000000..4b4c8ea
--- /dev/null
+++ b/performous-pango1.44.patch
@@ -0,0 +1,27 @@
+--- performous-1.1/game/CMakeLists.txt.orig	2016-01-23 11:40:01.000000000 +0100
++++ performous-1.1/game/CMakeLists.txt	2019-10-11 20:39:21.212719974 +0200
+@@ -79,6 +79,24 @@
+ 	add_definitions(${${lib}_DEFINITIONS})
+ endforeach(lib)
+ 
++#
++# harfbuzz
++#
++PKG_CHECK_MODULES(PC_HARFBUZZ REQUIRED harfbuzz)
++SET(HARFBUZZ_DEFINITIONS ${PC_HARFBUZZ_CXXFLAGS_OTHER})
++FIND_PATH(
++        HARFBUZZ_INCLUDE_DIR hb.h
++        HINTS ${PC_HARFBUZZ_INCLUDEDIR} ${PC_HARFBUZZ_INCLUDE_DIRS}
++        PATH_SUFFIXES harfbuzz)
++
++FIND_LIBRARY(
++        HARFBUZZ_LIBRARY NAMES harfbuzz
++        HINTS ${PC_HARFBUZZ_LIBDIR} ${PC_HARFBUZZ_LIBRARY_DIRS})
++
++include_directories(${HARFBUZZ_INCLUDE_DIR})
++list(APPEND LIBS ${HARFBUZZ_LIBRARY})
++
++
+ find_package(Gettext)
+ if(Gettext_FOUND)
+ 	include_directories(${Gettext_INCLUDE_DIRS})
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/performous.git/commitdiff/857e246fad1272161c3d79924ae58b558805af95



More information about the pld-cvs-commit mailing list