pool/openscad
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 450437 from home:hgraeber:Qt5

Browse Source 
- Add patch openscad-git4fa5f0340a.patch from upstream, to fix
  build with newer Qt5 and gcc versions

- Switch to Qt5

OBS-URL: https://build.opensuse.org/request/show/450437
OBS-URL: https://build.opensuse.org/package/show/graphics/openscad?expand=0&rev=18
This commit is contained in:
OBS User mrdocs 2017-01-15 23:16:54 +00:00 committed by Git OBS Bridge
parent 524dfe30b9
commit 4f765c563c
3 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
openscad-git4fa5f0340a.patch Normal file
View File

@ -0,0 +1,30 @@
commit 4fa5f0340a2b7b031a0b39f7de0ca795d52bb68b
Author: Torsten Paul <Torsten.Paul@gmx.de>
Date: Sun Nov 27 19:29:04 2016 +0100
Handle 2 argument translation calls generated by Qt 5.7.1 (fixes #1872).
diff --git a/src/qtgettext.h b/src/qtgettext.h
index 6e667163..dbc4f174 100644
--- a/src/qtgettext.h
+++ b/src/qtgettext.h
@@ -16,10 +16,16 @@
#define N_(String) String
-inline QString _( const char *msgid, int category )
+inline QString _(const char *msgid, int category)
{
- Q_UNUSED( category );
- return QString::fromUtf8( _( msgid ) );
+ Q_UNUSED(category);
+ return QString::fromUtf8(_(msgid));
+}
+
+inline QString _(const char *msgid, const char *disambiguation)
+{
+ Q_UNUSED(disambiguation);
+ return QString::fromUtf8(_(msgid));
}
#endif

11
openscad.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Jan 15 15:02:33 UTC 2017 - herbert@graeber-clan.de
- Add patch openscad-git4fa5f0340a.patch from upstream, to fix
build with newer Qt5 and gcc versions
-------------------------------------------------------------------
Thu Dec 22 23:39:01 UTC 2016 - herbert@graeber-clan.de
- Switch to Qt5
-------------------------------------------------------------------
Thu Nov 19 13:31:52 UTC 2015 - prusnak@opensuse.org

16
openscad.spec
View File

@ -24,6 +24,8 @@ License: GPL-2.0+
Group: Productivity/Graphics/CAD
Url: http://openscad.org/
Source: http://files.openscad.org/%{name}-%{version}-2.src.tar.gz
#PATCH-FIX-UPSTREAM openscad-git4fa5f0340a.patch -- Fix Build with Qt 5.7.1
Patch0: openscad-git4fa5f0340a.patch
BuildRequires: flex
BuildRequires: gcc-c++
BuildRequires: glew-devel
@ -34,8 +36,12 @@ BuildRequires: harfbuzz-devel
BuildRequires: Mesa-devel
BuildRequires: bison
BuildRequires: libeigen3-devel
BuildRequires: libqt4-devel
BuildRequires: libqscintilla-devel
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: libqscintilla-qt5-devel
%endif
%if 0%{?fedora_version}
BuildRequires: byacc
@ -59,10 +65,11 @@ movies.
%prep
%setup -q -n %{name}-%{version}-2
%patch0 -p1
%build
%if 0%{?suse_version}
qmake PREFIX=%{_prefix} QMAKE_CXXFLAGS="%{optflags}"
qmake-qt5 PREFIX=%{_prefix} QMAKE_CXXFLAGS="%{optflags}" CONFIG+=qopenglwidget
%endif
%if 0%{?fedora_version}
qmake-qt4 PREFIX=%{_prefix}
@ -72,11 +79,12 @@ make # %{?_smp_mflags} # don't use parallel build
%install
make INSTALL_ROOT=%{buildroot} install
install -D -m 0644 doc/openscad.1 %{buildroot}%{_mandir}/man1/openscad.1
%find_lang %{name}
%clean
rm -rf %{buildroot}
%files
%files -f %{name}.lang
%defattr(-,root,root)
%doc COPYING README.md RELEASE_NOTES doc/*.pdf
%{_bindir}/openscad