Hello community,
here is the log from the commit of package solarus-quest-editor for
openSUSE:Factory checked in at 2020-03-24 22:37:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/solarus-quest-editor (Old)
and /work/SRC/openSUSE:Factory/.solarus-quest-editor.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solarus-quest-editor"
Tue Mar 24 22:37:48 2020 rev:8 rq:787922 version:1.6.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/solarus-quest-editor/solarus-quest-editor.changes
2019-08-19 21:39:59.724306867 +0200
+++
/work/SRC/openSUSE:Factory/.solarus-quest-editor.new.3160/solarus-quest-editor.changes
2020-03-24 22:39:13.853290277 +0100
@@ -1,0 +2,6 @@
+Tue Mar 24 19:42:56 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-quest-editor.spec ++++++
--- /var/tmp/diff_new_pack.CB4aTF/_old 2020-03-24 22:39:15.345291001 +0100
+++ /var/tmp/diff_new_pack.CB4aTF/_new 2020-03-24 22:39:15.349291003 +0100
@@ -1,7 +1,7 @@
#
# spec file for package solarus-quest-editor
#
-# 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
@@ -24,6 +24,8 @@
Group: Productivity/Graphics/Other
URL: https://www.solarus-games.org/
Source:
https://gitlab.com/solarus-games/solarus-quest-editor/-/archive/v%{version}/%{name}-v%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM
+Patch0: 0001-Use-pkg-config-to-get-more-search-paths.patch
BuildRequires: cmake >= 2.8.11
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -61,6 +63,7 @@
%prep
%setup -q -n %{name}-v%{version}
+%patch0 -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 206bfec..91f5f2d 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
HINTS
$ENV{LUA_DIR}
+ ${PKG_LUAJIT_LIBRARY_DIRS}
PATH_SUFFIXES lib64 lib
PATHS
~/Library/Frameworks
--
2.25.1
