pool/aisleriot
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 767860 from GNOME:Factory

Browse Source 
As it builds now - let's forward it

OBS-URL: https://build.opensuse.org/request/show/767860
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aisleriot?expand=0&rev=56
This commit is contained in:
Dominique Leuenberger
2020-01-29 20:40:26 +00:00
committed by Git OBS Bridge
parent 122dce587d f25fdad25a
commit 9b40c5f900
5 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
add-guile-3.0-support.patch Normal file
View File

@@ -0,0 +1,42 @@
commit 4c79d5b039cc24066ed12d6b04b43954d29e9434 (origin/master, origin/HEAD)
Author: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Date: Wed Jan 15 21:04:20 2020 +0100
build: Allow build with Guile 3.0.
https://gitlab.gnome.org/GNOME/aisleriot/issues/26
diff --git a/meson.build b/meson.build
index e9807e22..3bbab5ec 100644
--- a/meson.build
+++ b/meson.build
@@ -46,6 +46,7 @@ glib_req_version = '2.32.0'
gtk_req_version = '3.18.0'
guile_2_0_req_version = '2.0.0'
guile_2_2_req_version = '2.2.0'
+guile_3_0_req_version = '3.0.0'
libcanberra_gtk_req_version = '0.26'
qt5svg_req_version = '5.0.0'
rsvg_req_version = '2.32.0'
@@ -315,7 +316,9 @@ config_h.set_quoted('PYSOL_CARD_THEME_PATH', theme_pysol_path,)
# Guile
if get_option('guile') == 'auto'
- if dependency('guile-2.2', required: false,).found()
+ if dependency('guile-3.0', required: false,).found()
+ guile_version = '3.0'
+ elif dependency('guile-2.2', required: false,).found()
guile_version = '2.2'
elif dependency('guile-2.0', required: false,).found()
guile_version = '2.0'
@@ -328,7 +331,9 @@ endif
guile_req = 'guile-' + guile_version
-if guile_version == '2.2'
+if guile_version == '3.0'
+ guile_req_version = guile_3_0_req_version
+elif guile_version == '2.2'
guile_req_version = guile_2_2_req_version
elif guile_version == '2.0'
guile_req_version = guile_2_0_req_version

3
aisleriot-3.22.10.tar.gz Normal file
View File

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

3
aisleriot-3.22.9.tar.xz
View File

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

20
aisleriot.changes
View File

@@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Jan 16 14:09:03 UTC 2020 - Jonathan Brielmaier <jbrielmaier@suse.de>
- Update to version 3.22.10:
* Switch to the meson build system.
* remove intltool marks from AppData file.
* Update translations.
* Fix reshuffling.
* Some fixes and cleanups.
- Add patch:
* add-guile-3.0-support.patch: Allows building with Guile 3.0.
- Switch download link, as release is not on download.gnome.org
- New build requires: gcc-c++, meson and pkgconfig(libxml-2.0)
- Remove no longer needed dependencies: intltool
- Switch to meson build system, build with the defaults and remove
hack for configure script
- Install README.md
- Don't install ChangeLog anymore, as it got removed
- sol.appdata.xml was renamed to sol.metainfo.xml
-------------------------------------------------------------------
Wed Sep 11 07:27:14 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

32
aisleriot.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package aisleriot
#
# 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
@@ -17,19 +17,21 @@
Name: aisleriot
Version: 3.22.9
Version: 3.22.10
Release: 0
Summary: Solitaire Card Games for GNOME
License: GPL-3.0-or-later
Group: Amusements/Games/Board/Card
URL: https://wiki.gnome.org/Apps/Aisleriot
Source0: https://download.gnome.org/sources/aisleriot/3.22/%{name}-%{version}.tar.xz
Source0: https://gitlab.gnome.org/GNOME/aisleriot/-/archive/%{version}/aisleriot-%{version}.tar.gz
# PATCH-FEATURE-UPSTREAM allow buidl with Guile 3.0 -- 4c79d5b0
Patch0: add-guile-3.0-support.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: guile-devel
BuildRequires: intltool
# Needed to get lsb data
BuildRequires: lsb-release
BuildRequires: meson >= 0.49
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: yelp-tools
@@ -38,6 +40,7 @@ BuildRequires: pkgconfig(gobject-2.0) >= 2.32.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.18.0
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(librsvg-2.0)
BuildRequires: pkgconfig(libxml-2.0)
Requires: guile
%description
@@ -61,27 +64,20 @@ This package provides extra themes for Aisleriot.
%autosetup -p1
%build
# Hack up configure. This allows us not having to rely on openSUSE-release, which is a daily changing package
sed -i 's:DISTRO="unknown":DISTRO="opensuse":' configure
%configure \
--disable-schemas-install \
--disable-static \
--enable-sound \
--with-guile=auto \
--with-platform=gtk-only \
--with-gtk=3.0 \
%meson \
-Dtheme_kde=false \
%{nil}
%make_build
%meson_build
%install
%make_install
%meson_install
%fdupes -s %{buildroot}%{_datadir}/help
%suse_update_desktop_file -N "AisleRiot" -G "Solitaire" sol
%find_lang %{name} %{?no_lang_C}
%files
%license COPYING.GFDL
%doc AUTHORS ChangeLog
%doc AUTHORS README.md
%if 0%{?suse_version} <= 1140
%doc %dir %{_datadir}/help
%doc %dir %{_datadir}/help/C
@@ -89,7 +85,7 @@ sed -i 's:DISTRO="unknown":DISTRO="opensuse":' configure
%doc %{_datadir}/help/C/aisleriot/
%{_bindir}/sol
%dir %{_datadir}/metainfo
%{_datadir}/metainfo/sol.appdata.xml
%{_datadir}/metainfo/sol.metainfo.xml
%{_datadir}/applications/sol.desktop
%{_datadir}/aisleriot/
%dir %{_libdir}/aisleriot