Fix build error on armv7fl about missing vtable

i9cf
Mamoru TASAKA 11 years ago
parent 0a94c42ab9
commit b42e2db5b8

@ -0,0 +1,20 @@
--- gnome-commander-1.4.0/src/gnome-cmd-plain-path.cc.vtable 2014-03-14 06:13:20.000000000 +0900
+++ gnome-commander-1.4.0/src/gnome-cmd-plain-path.cc 2014-03-19 15:30:07.049438210 +0900
@@ -27,7 +27,7 @@
using namespace std;
-inline GnomeCmdPath *GnomeCmdPlainPath::get_parent()
+GnomeCmdPath *GnomeCmdPlainPath::get_parent()
{
GnomeVFSURI *t = gnome_vfs_uri_new (G_DIR_SEPARATOR_S);
GnomeVFSURI *u1 = gnome_vfs_uri_append_path (t, path);
@@ -48,7 +48,7 @@ inline GnomeCmdPath *GnomeCmdPlainPath::
}
-inline GnomeCmdPath *GnomeCmdPlainPath::get_child(const gchar *child)
+GnomeCmdPath *GnomeCmdPlainPath::get_child(const gchar *child)
{
GnomeVFSURI *t = gnome_vfs_uri_new (G_DIR_SEPARATOR_S);
GnomeVFSURI *u1 = gnome_vfs_uri_append_path (t, path);

@ -26,7 +26,7 @@
%global use_autotool 0 %global use_autotool 0
%global update_po 0 %global update_po 0
%global if_pre 0 %global if_pre 0
%global main_release 1 %global main_release 2
%global extratag git_%{git_pull_JST} %global extratag git_%{git_pull_JST}
%undefine extratag %undefine extratag
%global mimeedit_rev 1958 %global mimeedit_rev 1958
@ -63,6 +63,9 @@ Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{versi
Source1: gnome-commander.sh Source1: gnome-commander.sh
Source10: mimeedit-svn%{mimeedit_rev}.sh Source10: mimeedit-svn%{mimeedit_rev}.sh
Patch10: mimeedit-svn1958.diff Patch10: mimeedit-svn1958.diff
# Fix build failure on armv7hl
# src/gnome-cmd-con-device.cc:293: undefined reference to `vtable for GnomeCmdPlainPath'
Patch100: gnome-commander-1.4.0-vtable.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -137,6 +140,7 @@ ansluta till FTP-servrar och SMB-nätverk.
%{__cp} -p %SOURCE10 mimeedit.sh %{__cp} -p %SOURCE10 mimeedit.sh
%patch10 -p0 %patch10 -p0
%patch100 -p1 -b .vtable
%{__sed} -i.pylib \ %{__sed} -i.pylib \
-e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \ -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
@ -244,6 +248,9 @@ desktop-file-install \
%{_datadir}/pixmaps/%{name}/ %{_datadir}/pixmaps/%{name}/
%changelog %changelog
* Wed Mar 19 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.4.0-2
- Fix build error on armv7fl about missing vtable
* Tue Mar 18 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.4.0-1 * Tue Mar 18 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.4.0-1
- Update to 1.4.0 - Update to 1.4.0

Loading…
Cancel
Save