Hello community, here is the log from the commit of package solarus for openSUSE:Factory checked in at 2020-03-24 22:37:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solarus (Old) and /work/SRC/openSUSE:Factory/.solarus.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solarus" Tue Mar 24 22:37:45 2020 rev:7 rq:787919 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/solarus/solarus.changes 2019-09-02 13:26:45.465296527 +0200 +++ /work/SRC/openSUSE:Factory/.solarus.new.3160/solarus.changes 2020-03-24 22:39:12.613289674 +0100 @@ -1,0 +2,6 @@ +Tue Mar 24 18:38:22 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add patch to find moonjit: + * 0001-Use-pkg-config-to-get-more-search-paths.patch + +------------------------------------------------------------------- New: ---- 0001-Use-pkg-config-to-get-more-search-paths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solarus.spec ++++++ --- /var/tmp/diff_new_pack.3NTtNL/_old 2020-03-24 22:39:13.533290121 +0100 +++ /var/tmp/diff_new_pack.3NTtNL/_new 2020-03-24 22:39:13.537290122 +0100 @@ -1,7 +1,7 @@ # # spec file for package solarus # -# Copyright (c) 2019 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 @@ -26,6 +26,8 @@ Source0: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-UPSTREAM -- https://gitlab.com/solarus-games/solarus/merge_requests/1311 Patch0: solarus-1.6.2-install-gui-translations.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Use-pkg-config-to-get-more-search-paths.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme @@ -92,8 +94,7 @@ %lang_package -n solarus-gui %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %cmake ++++++ 0001-Use-pkg-config-to-get-more-search-paths.patch ++++++ >From c50c1938588b6f11e081744a8658135141c41948 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Tue, 24 Mar 2020 19:37:32 +0100 Subject: [PATCH] Use pkg-config to get more search paths. Solarus can be built using moonjit. If a pkgconfig file is available, we'll use the known include and library dirs. --- cmake/modules/FindLuaJit.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/modules/FindLuaJit.cmake b/cmake/modules/FindLuaJit.cmake index 4edb6e3..25712d0 100644 --- a/cmake/modules/FindLuaJit.cmake +++ b/cmake/modules/FindLuaJit.cmake @@ -7,9 +7,14 @@ # # This module is similar to FindLua51.cmake except that it finds LuaJit instead. +FIND_PACKAGE(PkgConfig QUIET) + +PKG_CHECK_MODULES(PKG_LUAJIT QUIET luajit) + FIND_PATH(LUA_INCLUDE_DIR luajit.h HINTS $ENV{LUA_DIR} + ${PKG_LUAJIT_INCLUDE_DIRS} PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.0 include/luajit-5_1-2.1 include PATHS ~/Library/Frameworks @@ -24,6 +29,7 @@ FIND_LIBRARY(LUA_LIBRARY NAMES luajit-5.1 luajit-2.0 luajit-2.1 HINTS $ENV{LUA_DIR} + ${PKG_LUAJIT_LIBRARY_DIRS} PATH_SUFFIXES lib64 lib PATHS ~/Library/Frameworks -- 2.25.1
