Compare commits
No commits in common. "f35" and "master" have entirely different histories.
20
fix_gcc8.patch
Normal file
20
fix_gcc8.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- a/src/YDialog.cc
|
||||||
|
+++ b/src/YDialog.cc
|
||||||
|
@@ -687,7 +687,7 @@ YDialog::showText( const std::string & text, bool useRichText )
|
||||||
|
dialog->waitForEvent();
|
||||||
|
dialog->destroy();
|
||||||
|
}
|
||||||
|
- catch ( YUIException exception )
|
||||||
|
+ catch ( const YUIException & exception )
|
||||||
|
{
|
||||||
|
// Don't let the application die just because help couldn't be displayed.
|
||||||
|
|
||||||
|
@@ -811,7 +811,7 @@ YDialog::showRelNotesText()
|
||||||
|
}
|
||||||
|
dialog->destroy();
|
||||||
|
}
|
||||||
|
- catch ( YUIException exception )
|
||||||
|
+ catch ( const YUIException & exception )
|
||||||
|
{
|
||||||
|
// Don't let the application die just because RN couldn't be displayed.
|
||||||
|
|
@ -1,17 +0,0 @@
|
|||||||
diff --git a/examples/ManyWidgets.cc b/examples/ManyWidgets.cc
|
|
||||||
index b26856d..dd4fdb1 100644
|
|
||||||
--- a/examples/ManyWidgets.cc
|
|
||||||
+++ b/examples/ManyWidgets.cc
|
|
||||||
@@ -130,10 +130,10 @@ std::string debugEvent( YBusyIndicator * busy, YEvent * event )
|
|
||||||
switch ( event->eventType() )
|
|
||||||
{
|
|
||||||
case YEvent::WidgetEvent:
|
|
||||||
- ev << "\n- " << YEvent::toString( dynamic_cast<YWidgetEvent*>(event)->reason() );
|
|
||||||
+ ev << "\n- " << YEvent::toString( dynamic_cast<YWidgetEvent&>(*event).reason() );
|
|
||||||
break;
|
|
||||||
case YEvent::KeyEvent:
|
|
||||||
- ev << "\n- " << dynamic_cast<YKeyEvent*>(event)->keySymbol();
|
|
||||||
+ ev << "\n- " << dynamic_cast<YKeyEvent&>(*event).keySymbol();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
70
libyui.spec
70
libyui.spec
@ -1,6 +1,4 @@
|
|||||||
%undefine __cmake_in_source_build
|
%global major_so_ver 8
|
||||||
|
|
||||||
%global major_so_ver 12
|
|
||||||
|
|
||||||
# Place rpm-macros into proper location.
|
# Place rpm-macros into proper location.
|
||||||
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||||
@ -11,16 +9,20 @@
|
|||||||
# Define libsuffix.
|
# Define libsuffix.
|
||||||
%global libsuffix yui
|
%global libsuffix yui
|
||||||
|
|
||||||
|
# CMake-builds go out-of-tree.
|
||||||
|
%global _cmake_build_subdir build-%{_target_platform}
|
||||||
|
|
||||||
|
|
||||||
Name: lib%{libsuffix}
|
Name: lib%{libsuffix}
|
||||||
Version: 3.10.0
|
Version: 3.3.3
|
||||||
Release: 4%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: GUI-abstraction library
|
Summary: GUI-abstraction library
|
||||||
|
|
||||||
License: (LGPLv2 or LGPLv3) and MIT
|
License: (LGPLv2 or LGPLv3) and MIT
|
||||||
URL: https://github.com/%{name}/%{name}
|
URL: https://github.com/%{name}/%{name}
|
||||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
Patch0: libyui-gcc11.patch
|
# Based on https://github.com/libyui/libyui/commit/b1f593cd99fd33cc3f0cf9b4f5151f672b68d96e
|
||||||
|
Patch0: fix_gcc8.patch
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
@ -67,27 +69,31 @@ brief examples how to build a UI using %{name}.
|
|||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%{__mkdir} -p %{_cmake_build_subdir}
|
||||||
|
pushd %{_cmake_build_subdir}
|
||||||
%cmake \
|
%cmake \
|
||||||
-DYPREFIX=%{_prefix} \
|
-DYPREFIX=%{_prefix} \
|
||||||
-DLIB_DIR=%{_libdir} \
|
-DLIB_DIR=%{_libdir} \
|
||||||
-DCMAKE_BUILD_TYPE=RELEASE \
|
-DCMAKE_BUILD_TYPE=RELEASE \
|
||||||
-DRESPECT_FLAGS=ON \
|
-DRESPECT_FLAGS=ON \
|
||||||
-DSKIP_LATEX=ON \
|
-DSKIP_LATEX=ON \
|
||||||
%{nil}
|
..
|
||||||
|
|
||||||
%cmake_build
|
%make_build
|
||||||
%cmake_build --target docs
|
%make_build docs
|
||||||
|
popd
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}%{_libdir}/%{libsuffix} \
|
pushd %{_cmake_build_subdir}
|
||||||
|
%{__mkdir} -p %{buildroot}%{_libdir}/%{libsuffix} \
|
||||||
%{buildroot}%{_datadir}/%{name}/theme
|
%{buildroot}%{_datadir}/%{name}/theme
|
||||||
|
|
||||||
%cmake_install
|
%make_install
|
||||||
|
|
||||||
# Create a macro for use in other spec-files.
|
# Create a macro for use in other spec-files.
|
||||||
mkdir -p %{buildroot}/%{macrosdir}
|
%{__mkdir} -p %{buildroot}/%{macrosdir}
|
||||||
cat << EOF > %{buildroot}/%{macrosdir}/macros.%{name}
|
%{__cat} << EOF > %{buildroot}/%{macrosdir}/macros.%{name}
|
||||||
%_%{name}_major_so_ver %{major_so_ver}
|
%_%{name}_major_so_ver %{major_so_ver}
|
||||||
%_%{name}_datadir %%{_datadir}/%{name}
|
%_%{name}_datadir %%{_datadir}/%{name}
|
||||||
%_%{name}_includedir %%{_includedir}/%{libsuffix}
|
%_%{name}_includedir %%{_includedir}/%{libsuffix}
|
||||||
@ -96,18 +102,19 @@ cat << EOF > %{buildroot}/%{macrosdir}/macros.%{name}
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Delete obsolete files.
|
# Delete obsolete files.
|
||||||
rm -rf %{buildroot}%{_defaultdocdir} \
|
%{__rm} -rf %{buildroot}%{_defaultdocdir} \
|
||||||
examples/{CMake*,.gitignore} \
|
../examples/{CMake*,.gitignore} \
|
||||||
%{_vpath_builddir}/doc/html/*.m*
|
doc/html/*.m*
|
||||||
|
|
||||||
# Install documentation.
|
# Install documentation.
|
||||||
mkdir -p %{buildroot}%{?_pkgdocdir}
|
%{__mkdir} -p %{buildroot}%{?_pkgdocdir}
|
||||||
cp -a README.md package/libyui.changes \
|
%{__cp} -a ../README.md ../package/libyui.changes \
|
||||||
examples/ %{_vpath_builddir}/doc/html/ \
|
../examples/ doc/html/ \
|
||||||
%{buildroot}%{?_pkgdocdir}
|
%{buildroot}%{?_pkgdocdir}
|
||||||
|
|
||||||
# Hard-link documentation.
|
# Hard-link documentation.
|
||||||
%{_bindir}/hardlink -cv %{buildroot}%{?_pkgdocdir}/html
|
%{_sbindir}/hardlink -cv %{buildroot}%{?_pkgdocdir}/html
|
||||||
|
popd
|
||||||
|
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
@ -142,27 +149,6 @@ cp -a README.md package/libyui.changes \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Sep 14 2020 Jeff Law <law@redhat.com> - 3.10.0-2
|
|
||||||
- Fix dynamic casts to avoid gcc-11 diagnostics
|
|
||||||
|
|
||||||
* Sat Aug 01 2020 Neal Gompa <ngompa13@gmail.com> - 3.10.0-1
|
|
||||||
- Rebase to 3.10.0 (#1669818)
|
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-9
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Aug 14 2019 Jitka Plesnikova <jplesnik@redhat.com> - 3.3.3-7
|
|
||||||
- Fix FTBFS - updated path of hardlink
|
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-6
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (libyui-3.10.0.tar.gz) = 8c3186fdff7b3f6f49b25dcb7085f3906a2fa59b7e951b52a9c3aef62eb2b4941cfcfa59da334d4cc9445152130afe3214bd70b9e2efef67dbb9186a439b0d85
|
SHA512 (libyui-3.3.3.tar.gz) = 1db31218703c90e7b8b877b613997e0984275a0923c7837c6e813626c0037d56d524168e0f56e8ca36561c1af5480a0f379e8f87fbc4a380570a6d9ab336977f
|
||||||
|
Loading…
Reference in New Issue
Block a user