Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rawtherapee for openSUSE:Factory checked in at 2021-06-01 10:37:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rawtherapee (Old) and /work/SRC/openSUSE:Factory/.rawtherapee.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rawtherapee" Tue Jun 1 10:37:00 2021 rev:5 rq:895581 version:5.8 Changes: -------- --- /work/SRC/openSUSE:Factory/rawtherapee/rawtherapee.changes 2020-06-09 00:10:42.434540122 +0200 +++ /work/SRC/openSUSE:Factory/.rawtherapee.new.1898/rawtherapee.changes 2021-06-01 10:38:00.532868936 +0200 @@ -1,0 +2,6 @@ +Wed May 26 08:30:03 UTC 2021 - Marcin Bajor <[email protected]> + +- Fix sgfault on exit, add patch fix-segfault-on-exit.patch + boo#1186455 + +------------------------------------------------------------------- Old: ---- rawtherapee-5.8.tar.bz2 New: ---- fix-segfault-on-exit.patch rawtherapee-5.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rawtherapee.spec ++++++ --- /var/tmp/diff_new_pack.RZdUbK/_old 2021-06-01 10:38:01.388870394 +0200 +++ /var/tmp/diff_new_pack.RZdUbK/_new 2021-06-01 10:38:01.392870401 +0200 @@ -1,8 +1,8 @@ # # spec file for package rawtherapee # -# Copyright (c) 2020 SUSE LLC -# Copyright (c) 2020 Marcin Bajor +# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2021 Marcin Bajor # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,26 +17,45 @@ # -Name: rawtherapee -Version: 5.8 -Release: 1%{?dist} -Summary: Cross-platform raw image processing program -License: GPL-3.0-only -Group: Productivity/Graphics/Other -URL: http://rawtherapee.com - %define _name rawtherapee - %if (0%{?suse_version} || 0%{?sles_version}) %define liblcms2_name liblcms2-2 %else %define liblcms2_name lcms2 %endif - -Requires: %{liblcms2_name} >= 2.6 - +Name: rawtherapee +Version: 5.8 +Release: 2%{?dist} +Summary: Cross-platform raw image processing program +License: GPL-3.0-only +Group: Productivity/Graphics/Other +URL: https://rawtherapee.com +Source0: https://rawtherapee.com/shared/source/%{name}-%{version}.tar.xz +Patch0: fix-segfault-on-exit.patch BuildRequires: cmake - +BuildRequires: fftw3-devel +BuildRequires: glib2-devel +BuildRequires: gtk3-devel +BuildRequires: lensfun-devel +BuildRequires: libiptcdata-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: pkgconfig +BuildRequires: zlib-devel +BuildRequires: pkgconfig(glibmm-2.4) +BuildRequires: pkgconfig(gtkmm-2.4) +Requires: %{liblcms2_name} >= 2.6 +Conflicts: rawtherapee-gtk2 +Conflicts: rawtherapee-gtk2-nosse +Conflicts: rawtherapee-gtk2-nosse-unstable +Conflicts: rawtherapee-gtk2-unstable +Conflicts: rawtherapee-gtk3 +Conflicts: rawtherapee-gtk3-nosse +Conflicts: rawtherapee-nosse +Conflicts: rawtherapee-nosse-unstable +Conflicts: rawtherapee-stable-3.x +Conflicts: rawtherapee-unstable %if 0%{?suse_version} > 1320 BuildRequires: gcc-c++ %endif @@ -44,12 +63,10 @@ BuildRequires: gcc49-c++ #!BuildIgnore: libgcc_s1 %endif - %if 0%{?sle_version} == 120100 # Leap 42.1 / SLE12SP2 BuildRequires: gcc5-c++ %endif - %if 0%{?sle_version} == 120200 # Leap 42.2+ / SLE12SP2Backports %if 0%{?is_opensuse} @@ -59,7 +76,6 @@ BuildRequires: gcc5-c++ %endif %endif - %if 0%{?sle_version} == 120300 # Leap 42.3+ / SLE12SP2Backports %if 0%{?is_opensuse} @@ -68,20 +84,15 @@ BuildRequires: gcc5-c++ %endif %endif - %if 0%{?sle_version} == 120400 BuildRequires: gcc5-c++ %endif - + %if 0%{?sle_version} == 120400 && !0%{?is_opensuse} +BuildRequires: gcc8-c++ +%endif %if 0%{?suse_version} == 1315 -#!Buildignore: libgcc_s1 +#!BuildIgnore: libgcc_s1 %endif - -BuildRequires: libiptcdata-devel -BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: pkgconfig(glibmm-2.4) -BuildRequires: pkgconfig(gtkmm-2.4) %if 0%{?fedora_version} >= 24 BuildRequires: libsigc++20-devel %else @@ -91,10 +102,6 @@ BuildRequires: libsigc++2-devel %endif %endif -BuildRequires: glib2-devel -BuildRequires: gtk3-devel -BuildRequires: libtiff-devel -BuildRequires: zlib-devel %if (0%{?suse_version} || 0%{?sles_version}) BuildRequires: gtkmm3-devel %else @@ -104,59 +111,39 @@ BuildRequires: gtkmm30-devel %endif %endif -BuildRequires: fftw3-devel %if (0%{?suse_version} > 1320 || 0%{?sle_version} > 120100) || 0%{?mageia} BuildRequires: libcanberra-gtk3-devel %else BuildRequires: libcanberra-devel %endif - +%ifarch x86_64 %if 0%{?fedora_version} BuildRequires: libatomic %endif - +%endif %if 0%{?mageia} BuildRequires: libatomic-devel %endif - %if (0%{?suse_version} || 0%{?fedora_version}) BuildRequires: fdupes %endif - %if (0%{?suse_version} || 0%{?sles_version}) BuildRequires: libexpat-devel BuildRequires: liblcms2-devel >= 2.6 BuildRequires: update-desktop-files Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils +Requires(postun):desktop-file-utils %else BuildRequires: desktop-file-utils BuildRequires: expat-devel BuildRequires: lcms2-devel >= 2.6 %endif - -BuildRequires: lensfun-devel - %if 0%{?fedora_version} BuildRequires: librsvg2-devel %else BuildRequires: librsvg-devel %endif -Source0: %{name}-%{version}.tar.bz2 - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Conflicts: rawtherapee-stable-3.x -Conflicts: rawtherapee-nosse -Conflicts: rawtherapee-unstable -Conflicts: rawtherapee-nosse-unstable -Conflicts: rawtherapee-gtk3 -Conflicts: rawtherapee-gtk3-nosse -Conflicts: rawtherapee-gtk2 -Conflicts: rawtherapee-gtk2-nosse -Conflicts: rawtherapee-gtk2-unstable -Conflicts: rawtherapee-gtk2-nosse-unstable - %description RawTherapee is a cross platform image processing software equipped with the essential tools for high quality and efficient RAW photo development. %ifarch i386 i486 i586 i686 @@ -164,8 +151,10 @@ %else Latest stable build from "releases" branch. %endif + %prep %setup -q +%patch0 -p1 %build test -x "$(type -p gcc-4.9)" && export CC=gcc-4.9 @@ -197,18 +186,19 @@ #fix LICENSE.txt EOL sed -i 's/\r$//' LICENSE.txt +# FIXME: you should use the %%cmake macros cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIBDIR=%{_libdir} \ -DCMAKE_BUILD_TYPE=release \ - -DDOCDIR=%{_datadir}/doc/packages/%{_name} \ - -DCREDITSDIR=%{_datadir}/doc/packages/%{_name} \ - -DLICENCEDIR=%{_datadir}/doc/packages/%{_name} \ + -DDOCDIR=%{_docdir}/%{_name} \ + -DCREDITSDIR=%{_docdir}/%{_name} \ + -DLICENCEDIR=%{_docdir}/%{_name} \ -DCACHE_NAME_SUFFIX="" \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" . -%__make %{?_smp_mflags} +%make_build %install %make_install @@ -221,9 +211,9 @@ %if (0%{?suse_version} || 0%{?fedora_version}) # create symlinks for man pages -%fdupes -s %buildroot/%_mandir +%fdupes -s %{buildroot}/%{_mandir} # create hardlinks for the rest -%fdupes %buildroot/%_prefix +%fdupes %{buildroot}/%{_prefix} %endif %post @@ -232,7 +222,7 @@ %desktop_database_post %icon_theme_cache_post %else -/usr/bin/update-desktop-database &> /dev/null || : +%{_bindir}/update-desktop-database &> /dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %endif @@ -242,33 +232,30 @@ %desktop_database_postun %icon_theme_cache_postun %else -/usr/bin/update-desktop-database &> /dev/null || : +%{_bindir}/update-desktop-database &> /dev/null || : if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi %endif %posttrans %if !(0%{?suse_version} || 0%{?sles_version}) -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif -%clean - rm -rf %{buildroot} %files -%defattr(-,root,root,-) %{_bindir}/* %{_datadir}/applications/%{_name}.desktop %dir %{_datadir}/metainfo/ %{_datadir}/metainfo/com.rawtherapee.RawTherapee.appdata.xml %{_datadir}/%{_name}/ %{_datadir}/icons/hicolor/*/apps/* -%{_datadir}/doc/packages/%{_name} -%{_datadir}/man/*/%{_name}* +%{_docdir}/%{_name} +%{_mandir}/*/%{_name}* %changelog ++++++ fix-segfault-on-exit.patch ++++++ Author: Ingo Weyrich <[email protected]> Description Fix segfault on close when started with a filename as argument Source: https://github.com/Beep6581/RawTherapee/commit/e7a4ae3c9fa987d625b537573fd811a9cb5d2fb8.patch Last-update: 2020-05-30 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -99,6 +99,8 @@ RTWindow::RTWindow () , bpanel (nullptr) , splash (nullptr) , btn_fullscreen (nullptr) + , iFullscreen (nullptr) + , iFullscreen_exit (nullptr) , epanel (nullptr) , fpanel (nullptr) {
