commit e086886dcf2adfd51223ff424ef0d06de484ddf1 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Tue Mar 10 11:23:13 2020 +0000 Patch for pango-1.44.7 pango-1.44.7_buildfix.patch | 86 +++++++++++++++++++++++++++++++++++++++++++++ performous.spec | 11 +++--- 2 files changed, 93 insertions(+), 4 deletions(-) --- diff --git a/pango-1.44.7_buildfix.patch b/pango-1.44.7_buildfix.patch new file mode 100644 index 0000000..ea35a06 --- /dev/null +++ b/pango-1.44.7_buildfix.patch @@ -0,0 +1,86 @@ +From e1491671a00428be107f9d9616534b8166c1adbc Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov <xnox(a)ubuntu.com&gt; +Date: Fri, 14 Feb 2020 09:25:45 +0100 +Subject: [PATCH] Fix build and harfbuzz detection with newer pango > 1.44.7 + +Example error log in Ubuntu: +cd /build/performous-1.1+git20181118/obj-x86_64-linux-gnu/game && /usr/bin/c++ -DBOOST_ALL_NO_LIB -DBOOST_ATOMIC_DYN_LINK -DBOOST_CHRONO_DYN_LINK -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_IOSTREAMS_DYN_LINK -DBOOST_LOCALE_DYN_LINK -DBOOST_PROGRAM_OPTIONS_DYN_LINK -DBOOST_SYSTEM_DYN_LINK -DBOOST_THREAD_DYN_LINK -DUSE_PORTMIDI -DUSE_WEBSERVER -I/build/performous-1.1+git20181118/ced -I/usr/include/x86_64-linux-gnu/SDL2 -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/librsvg-2.0 -I/usr/include/gdk-pixbuf-2.0 -I/usr/lib/x86_64-linux-gnu/libxml++-2.6/include -I/usr/include/libxml++-2.6 -I/usr/include/libxml2 -I/usr/lib/x86_64-linux-gnu/glibmm-2.4/include -I/usr/include/glibmm-2.4 -I/usr/include/sigc++-2.0 -I/usr/lib/x86_64-linux-gnu/sigc++-2.0/include -I/usr/include/cpprest -I/build/performous-1.1+git20181118/obj-x86_64-linux-gnu/game -DBOOST_NO_CXX11_SCOPED_ENUMS -std=c++14 -Wall -Wextr a -fcx-limited-range -g -O2 -fdebug-prefix-map=/build/performous-1.1+git20181118=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -pthread -o CMakeFiles/performous.dir/configuration.cc.o -c /build/performous-1.1+git20181118/game/configuration.cc +In file included from /usr/include/pango-1.0/pango/pango-font.h:25, + from /usr/include/pango-1.0/pango/pango-attributes.h:25, + from /usr/include/pango-1.0/pango/pango.h:25, + from /usr/include/pango-1.0/pango/pangocairo.h:25, + from /build/performous-1.1+git20181118/game/opengl_text.hh:6, + from /build/performous-1.1+git20181118/game/menu.hh:3, + from /build/performous-1.1+git20181118/game/screen_intro.hh:4, + from /build/performous-1.1+git20181118/game/configuration.cc:8: +/usr/include/pango-1.0/pango/pango-coverage.h:28:10: fatal error: hb.h: No such file or directory + 28 | #include <hb.h> + | ^~~~~~ +compilation terminated. +make[3]: *** [game/CMakeFiles/performous.dir/build.make:131: game/CMakeFiles/performous.dir/configuration.cc.o] Error 1 +make[3]: *** Waiting for unfinished jobs.... +[ 52%] Linking CXX executable ss_extract +--- + cmake/Modules/FindHarfbuzz.cmake | 27 +++++++++++++++++++++++++++ + cmake/Modules/FindPango.cmake | 1 + + game/CMakeLists.txt | 1 + + 3 files changed, 29 insertions(+) + create mode 100644 cmake/Modules/FindHarfbuzz.cmake + +diff --git a/cmake/Modules/FindHarfbuzz.cmake b/cmake/Modules/FindHarfbuzz.cmake +new file mode 100644 +index 000000000..39551fe2d +--- /dev/null ++++ b/cmake/Modules/FindHarfbuzz.cmake +@@ -0,0 +1,27 @@ ++# - Try to find Harfbuzz ++# Once done, this will define ++# ++# Harfbuzz_FOUND - system has Harfbuzz ++# Harfbuzz_INCLUDE_DIRS - the Harfbuzz include directories ++# Harfbuzz_LIBRARIES - link these to use Harfbuzz ++ ++include(LibFindMacros) ++ ++# Use pkg-config to get hints about paths ++libfind_pkg_check_modules(Harfbuzz_PKGCONF harfbuzz) ++ ++# Include dir ++find_path(Harfbuzz_INCLUDE_DIR ++ NAMES harfbuzz/hb.h ++ HINTS ${Harfbuzz_PKGCONF_INCLUDE_DIRS} ++ PATH_SUFFIXES harfbuzz ++) ++ ++# Finally the library itself ++find_library(Harfbuzz_LIBRARY ++ NAMES harfbuzz ++ HINTS ${Harfbuzz_PKGCONF_LIBRARY_DIRS} ++) ++ ++libfind_process(Harfbuzz) ++ +diff --git a/cmake/Modules/FindPango.cmake b/cmake/Modules/FindPango.cmake +index bdddb9e03..dc3ebd390 100644 +--- a/cmake/Modules/FindPango.cmake ++++ b/cmake/Modules/FindPango.cmake +@@ -8,6 +8,7 @@ + include(LibFindMacros) + + # Dependencies ++libfind_package(Pango Harfbuzz) + libfind_package(Pango Freetype) + libfind_package(Pango Glib) + libfind_package(Pango GObject) +diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt +index de33f2c23..9cea8712d 100644 +--- a/game/CMakeLists.txt ++++ b/game/CMakeLists.txt +@@ -86,6 +86,7 @@ foreach(lib ${OUR_LIBS} SDL2 PangoCairo LibRSVG LibXML++ AVFormat SWResample SWS + find_package(${lib} REQUIRED) + message(STATUS "${lib} includes: ${${lib}_INCLUDE_DIRS}") + include_directories(${${lib}_INCLUDE_DIRS}) ++ include_directories(${${lib}_PKGCONF_INCLUDE_DIRS}) + list(APPEND LIBS ${${lib}_LIBRARIES}) + add_definitions(${${lib}_DEFINITIONS}) + endforeach(lib) diff --git a/performous.spec b/performous.spec index f2b66b8..7401ef8 100644 --- a/performous.spec +++ b/performous.spec @@ -4,7 +4,7 @@ Name: performous Version: 1.2 -Release: 0.4.%{gitdate}git%{shortcommit0}%{?dist} +Release: 0.5.%{gitdate}git%{shortcommit0}%{?dist} Summary: Free cross-platform music and rhythm / party game # The main code is GPLv2+, and there are fonts under ASL 2.0 and SIL licenses @@ -14,6 +14,7 @@ Source0: https://github.com/performous/performous/archive/%{commit0}/%{na Source1: https://github.com/performous/compact_enc_det/archive/9d2d658/ced-9d2d658... Source2: https://raw.githubusercontent.com/performous/performous/master/licence.txt Source3: performous.appdata.xml +Patch0: https://patch-diff.githubusercontent.com/raw/performous/performous/pull/4... BuildRequires: alsa-lib-devel BuildRequires: boost-devel @@ -69,7 +70,7 @@ package. %prep -%autosetup -n %{name}-%{commit0} +%autosetup -p1 -n %{name}-%{commit0} tar -xf %{SOURCE1} -C ced/ --strip 1 cp -p %{SOURCE2} . cp -p "docs/license/SIL OFL Font License New Rocker.txt" SIL-OFL.txt @@ -88,8 +89,7 @@ cd build %install -cd build -%make_install +%make_install -C build ## Menu mkdir -p %buildroot%{_datadir}/applications @@ -124,6 +124,9 @@ rm -rf %buildroot%{_libdir}/*.{a,la} %changelog +* Tue Mar 10 2020 leigh123linux <leigh123linux(a)googlemail.com&gt; - 1.2-0.5.20190419git4ed8ec7 +- Patch for pango-1.44.7 + * Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.2-0.4.20190419git4ed8ec7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild