commit f9513a8c5edb33785dff4ea246d5bb0d77aaa265
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sun Feb 4 15:10:53 2024 +0100
- updated to 1.8.4
xosview-ac.patch | 22 ----------------------
xosview-c++.patch | 40 ++++++++++++++++++++++++++++++++++++++++
xosview.spec | 36 +++++++++++++++++-------------------
3 files changed, 57 insertions(+), 41 deletions(-)
---
diff --git a/xosview.spec b/xosview.spec
index 1c80b8a..8b943fe 100644
--- a/xosview.spec
+++ b/xosview.spec
@@ -7,19 +7,20 @@ Summary(pt_BR.UTF-8): Utilitário X11 para visualizar os
recursos do sistema
Summary(tr.UTF-8): Sistem kaynaklarını denetleyen X11 yardımcı programı
Summary(zh_CN.UTF-8): 系统资源的图形监视工具
Name: xosview
-Version: 1.8.3
-Release: 2
-License: GPL
+Version: 1.8.4
+Release: 1
+License: GPL v2
Group: X11/Applications
-Source0: http://dl.sourceforge.net/xosview/%{name}-%{version}.tar.gz
-# Source0-md5: 88cf9fecfcc27a42d132d1f983c1f091
+Source0:
https://downloads.sourceforge.net/xosview/%{name}-%{version}.tar.gz
+# Source0-md5: 173b9f8b7a41c3212ad5b48ac7f4c76b
Source1: %{name}.desktop
Source2: %{name}.png
-Patch0: %{name}-ac.patch
-URL: http://xosview.sourceforge.net/
+Patch0: %{name}-c++.patch
+URL: https://xosview.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libstdc++-devel
+BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXpm-devel
Requires: xorg-lib-libXt >= 1.0.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,22 +65,19 @@ kullanımı) küçük bir pencerede grafik ortamda sunar.
%prep
%setup -q
+%patch0 -p1
# --- XXX Cruft Alert!
ln -sf config/configure.in .
-sed -e 's/ -O4//' config/aclocal.m4 > acinclude.m4
-
-%patch0 -p1
+sed -e '/EXTRA_CXXFLAGS/ s/ -O3/ %{rpmcxxflags} %{rpmcppflags}/'
config/aclocal.m4 > acinclude.m4
%build
%{__aclocal}
%{__autoconf}
cp -f %{_datadir}/automake/config.sub config
-%configure \
- --disable-linux-memstat
+%configure
-%{__make} all \
- CFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
@@ -99,9 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc CHANGES TODO
-%attr(755,root,root) %{_bindir}/*
+%doc CHANGES COPYING COPYING.BSD README README.linux TODO
+%attr(755,root,root) %{_bindir}/xosview
%{_desktopdir}/xosview.desktop
-%{_pixmapsdir}/*
-%{_appdefsdir}/*
-%{_mandir}/man1/*
+%{_pixmapsdir}/xosview.png
+%{_appdefsdir}/XOsview
+%{_mandir}/man1/xosview.1*
diff --git a/xosview-ac.patch b/xosview-ac.patch
deleted file mode 100644
index 29cb7f2..0000000
--- a/xosview-ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xosview-1.8.3/acinclude.m4.orig 2006-10-26 22:38:46.756988000 +0200
-+++ xosview-1.8.3/acinclude.m4 2006-10-26 22:46:48.847117000 +0200
-@@ -137,7 +137,8 @@
- #ifdef CONFIG_MODVERSIONS
- yes
- #endif
--], [USE_MOD_VERSIONS=-DMODVERSIONS] AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-+], [USE_MOD_VERSIONS=-DMODVERSIONS
-+AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
- SMP_LINUX
- INSTALL_ARGS='-m 755'
- fi
-@@ -158,7 +159,8 @@
- #ifdef CONFIG_MODVERSIONS
- yes
- #endif
--], [USE_MOD_VERSIONS=-DMODVERSIONS] AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-+], [USE_MOD_VERSIONS=-DMODVERSIONS
-+AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
- SMP_LINUX
- else
- MEMSTAT=
diff --git a/xosview-c++.patch b/xosview-c++.patch
new file mode 100644
index 0000000..0f030c6
--- /dev/null
+++ b/xosview-c++.patch
@@ -0,0 +1,40 @@
+--- xosview-1.8.4/xwin.cc.orig 2015-06-04 16:49:00.000000000 +0200
++++ xosview-1.8.4/xwin.cc 2024-02-04 12:46:57.721543774 +0100
+@@ -418,8 +418,6 @@ const char *XWin::getResource( const cha
+ {
+ std::cerr << "Error: Couldn't find '" << name << "' resource in the
resource database!\n";
+ exit (-1);
+- /* Some compilers aren't smart enough to know that exit() exits. */
+- return '\0';
+ }
+ }
+
+--- xosview-1.8.4/linux/lmstemp.cc.orig 2015-06-04 18:10:58.000000000
+0200
++++ xosview-1.8.4/linux/lmstemp.cc 2024-02-04 12:53:45.486001390 +0100
+@@ -154,7 +154,7 @@ void LmsTemp::getlmstemp( void ){
+ std::ifstream file( _filename );
+
+ if ( !file ){
+- std::cerr <<"Can not open file : " <<file << std::endl;
++ std::cerr <<"Can not open file : " <<_filename << std::endl;
+ parent_->done(1);
+ return;
+ }
+@@ -169,7 +169,7 @@ void LmsTemp::getlmstemp( void ){
+ strcpy(p, "_input");
+ std::ifstream file1(f);
+ if ( !file1 ){
+- std::cerr <<"Can not open file : " <<file1 << std::endl;
++ std::cerr <<"Can not open file : " <<f << std::endl;
+ parent_->done(1);
+ return;
+ }
+@@ -178,7 +178,7 @@ void LmsTemp::getlmstemp( void ){
+ strcpy(p, "_max");
+ std::ifstream file2(f);
+ if ( !file2 ){
+- std::cerr <<"Can not open file : " <<file2 << std::endl;
++ std::cerr <<"Can not open file : " <<f << std::endl;
+ parent_->done(1);
+ return;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xosview.git/commitdiff/f9513a8c5edb33785dff4ea246d5bb0d77aaa265
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
