From 6f87f404780ccba49bbca405916dde1721f62de07e851f8a73db90278dbc509d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 4 Jan 2018 08:02:03 +0000 Subject: [PATCH 1/2] Accepting request 561450 from home:StefanBruens:branches:Publishing - Disable crash handler on aarch64/armv6l/armv7l, aarch64 is not implemented and armv6l/armv7l is broken - use %qmake5 macro to supply CXXFLAGS and also CFLAGS OBS-URL: https://build.opensuse.org/request/show/561450 OBS-URL: https://build.opensuse.org/package/show/Publishing/texstudio?expand=0&rev=28 --- texstudio.changes | 7 +++++++ texstudio.spec | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/texstudio.changes b/texstudio.changes index 9e2550b..dcde1f8 100644 --- a/texstudio.changes +++ b/texstudio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 3 13:37:25 UTC 2018 - stefan.bruens@rwth-aachen.de + +- Disable crash handler on aarch64/armv6l/armv7l, aarch64 is + not implemented and armv6l/armv7l is broken +- use %qmake5 macro to supply CXXFLAGS and also CFLAGS + ------------------------------------------------------------------- Tue Aug 22 19:25:53 UTC 2017 - dmitry_r@opensuse.org diff --git a/texstudio.spec b/texstudio.spec index e9327bb..c68c2b7 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -1,7 +1,7 @@ # # spec file for package texstudio # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -53,13 +53,19 @@ syntax highlighting, automatically code completion and more. %setup -q -n %{name}%{version} %build -%if 0%{?suse_version} <= 1320 -qmake QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" CONFIG-=debug texstudio.pro -%else -qmake-qt5 QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" CONFIG-=debug texstudio.pro +%ifarch aarch64 %{arm} +%define crashhandler NO_CRASH_HANDLER=true %endif -make %{?_smp_mflags} +%if 0%{?suse_version} <= 1320 +qmake QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" \ + QMAKE_CFLAGS="%optflags -fno-strict-aliasing" \ + CONFIG-=debug texstudio.pro +%else +%{qmake5} CONFIG-=debug %{?crashhandler} texstudio.pro +%endif + +%{make_jobs} %install make INSTALL_ROOT=%{buildroot} install From 9f1da489356e2810622200c009d15e34385adde361df263f6a2b7da8b69090d5 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 4 Jan 2018 19:31:30 +0000 Subject: [PATCH 2/2] Accepting request 561704 from home:StefanBruens:branches:Publishing Submitted an outdated revision breaking Leap, sorry for the mess ... - Unbreak build on Leap 42.x, make_jobs is only provided by macros.qt5 OBS-URL: https://build.opensuse.org/request/show/561704 OBS-URL: https://build.opensuse.org/package/show/Publishing/texstudio?expand=0&rev=29 --- texstudio.changes | 5 +++++ texstudio.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/texstudio.changes b/texstudio.changes index dcde1f8..7eb8714 100644 --- a/texstudio.changes +++ b/texstudio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 4 15:35:35 UTC 2018 - stefan.bruens@rwth-aachen.de + +- Unbreak build on Leap 42.x, make_jobs is only provided by macros.qt5 + ------------------------------------------------------------------- Wed Jan 3 13:37:25 UTC 2018 - stefan.bruens@rwth-aachen.de diff --git a/texstudio.spec b/texstudio.spec index c68c2b7..7deda7f 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -65,7 +65,11 @@ qmake QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" \ %{qmake5} CONFIG-=debug %{?crashhandler} texstudio.pro %endif +%if 0%{?suse_version} <= 1320 +make %{?_smp_mflags} VERBOSE=1 +%else %{make_jobs} +%endif %install make INSTALL_ROOT=%{buildroot} install