Fix FTBFS
This commit is contained in:
parent
72224ac94b
commit
ebaf4c4b6e
2 changed files with 38 additions and 1 deletions
29
admeshgui-qt571.patch
Normal file
29
admeshgui-qt571.patch
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
From 1732bc83cb2c949089d98cd9be0e922ac4af4a28 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||
Date: Tue, 4 Apr 2017 20:25:58 +0200
|
||||
Subject: [PATCH] Handle 2 argument translation calls generated by Qt 5.7.1
|
||||
|
||||
This fixes a FTBFS error described in https://github.com/openscad/openscad/issues/1872
|
||||
|
||||
Fix from https://github.com/openscad/openscad/commit/4fa5f0340a2b7b031a0b39f7de0ca795d52bb68b
|
||||
---
|
||||
data.h | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/data.h b/data.h
|
||||
index 83fc9ff..e5404f0 100644
|
||||
--- a/data.h
|
||||
+++ b/data.h
|
||||
@@ -23,6 +23,12 @@ inline QString _( const char *msgid, int category )
|
||||
Q_UNUSED( category );
|
||||
return QString::fromUtf8( _( msgid ) );
|
||||
}
|
||||
+inline QString _( const char *msgid, const char *disambiguation )
|
||||
+{
|
||||
+ Q_UNUSED(disambiguation);
|
||||
+ return QString::fromUtf8(_(msgid));
|
||||
+}
|
||||
+
|
||||
/** END TAG */
|
||||
|
||||
|
||||
|
|
@ -1,13 +1,16 @@
|
|||
Name: admeshgui
|
||||
%global camelname ADMeshGUI
|
||||
Version: 1.0.1
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
Summary: STL viewer and manipulation tool
|
||||
# Code is AGPLv3 logo/license is LGPLv3 or CC-BY-SA
|
||||
License: AGPLv3 and (LGPLv3 or CC-BY-SA)
|
||||
URL: https://github.com/vyvledav/%{camelname}
|
||||
Source0: https://github.com/vyvledav/%{camelname}/archive/v%{version}.tar.gz
|
||||
|
||||
# https://github.com/admesh/ADMeshGUI/commit/1732bc83cb2c949089d98cd9be0e922ac4af4a28
|
||||
Patch0: %{name}-qt571.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: pkgconfig(libadmesh) >= 0.98.2
|
||||
|
|
@ -32,6 +35,8 @@ selected actions and to get visual feedback of those.
|
|||
|
||||
%prep
|
||||
%setup -qn %{camelname}-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
|
||||
%build
|
||||
%{qmake_qt5} PREFIX=%{buildroot}/usr
|
||||
|
|
@ -71,6 +76,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 07 2017 Miro Hrončok <mhroncok@redhat.com> - 1.0.1-7
|
||||
- Fix FTBFS
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue