This commit is contained in:
parent
655c4c74aa
commit
d2a0cf2a87
14
mc-X11.patch
Normal file
14
mc-X11.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
--- src/x11conn.c
|
||||||
|
+++ src/x11conn.c
|
||||||
|
@@ -135,6 +135,11 @@
|
||||||
|
x11_module = g_module_open (x11_module_fname, G_MODULE_BIND_LAZY);
|
||||||
|
g_free (x11_module_fname);
|
||||||
|
|
||||||
|
+ /* loading libX11 via g_module seems to be a bad idea,
|
||||||
|
+ this hack fixes it at least for openSUSE */
|
||||||
|
+ if (x11_module == NULL)
|
||||||
|
+ x11_module = g_module_open ("libX11.so.6", G_MODULE_BIND_LAZY);
|
||||||
|
+
|
||||||
|
if (x11_module == NULL)
|
||||||
|
return FALSE;
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 9 11:57:28 CEST 2008 - nadvornik@suse.cz
|
||||||
|
|
||||||
|
- fixed dynamic loading of X11 library
|
||||||
|
[http://savannah.gnu.org/bugs/index.php?24505]
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Sep 9 18:05:39 CEST 2008 - nadvornik@suse.cz
|
Tue Sep 9 18:05:39 CEST 2008 - nadvornik@suse.cz
|
||||||
|
|
||||||
|
8
mc.spec
8
mc.spec
@ -26,7 +26,7 @@ Group: Productivity/File utilities
|
|||||||
PreReq: permissions
|
PreReq: permissions
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 4.6.2.pre1
|
Version: 4.6.2.pre1
|
||||||
Release: 116
|
Release: 120
|
||||||
Summary: Midnight Commander
|
Summary: Midnight Commander
|
||||||
Source: mc-4.6.2-pre1.tar.bz2
|
Source: mc-4.6.2-pre1.tar.bz2
|
||||||
Source1: x11_browser
|
Source1: x11_browser
|
||||||
@ -71,6 +71,8 @@ Patch38: 99b_fix-regex-pattern-lengths.patch
|
|||||||
Patch39: 99c_fix-regex-newline-match.patch
|
Patch39: 99c_fix-regex-newline-match.patch
|
||||||
Patch40: 99_regexp-replace-fixed.patch
|
Patch40: 99_regexp-replace-fixed.patch
|
||||||
Patch41: 100_fix_bashisms.patch
|
Patch41: 100_fix_bashisms.patch
|
||||||
|
#
|
||||||
|
Patch42: mc-X11.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Url: http://www.ibiblio.org/mc/
|
Url: http://www.ibiblio.org/mc/
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
@ -173,6 +175,7 @@ Authors:
|
|||||||
%patch39 -p1
|
%patch39 -p1
|
||||||
%patch40 -p1
|
%patch40 -p1
|
||||||
%patch41 -p1
|
%patch41 -p1
|
||||||
|
%patch42
|
||||||
|
|
||||||
%build
|
%build
|
||||||
pushd po
|
pushd po
|
||||||
@ -268,6 +271,9 @@ rm -rf %{buildroot}
|
|||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 09 2008 nadvornik@suse.cz
|
||||||
|
- fixed dynamic loading of X11 library
|
||||||
|
[http://savannah.gnu.org/bugs/index.php?24505]
|
||||||
* Tue Sep 09 2008 nadvornik@suse.cz
|
* Tue Sep 09 2008 nadvornik@suse.cz
|
||||||
- added bugfixes from upstream cvs and from debian package for
|
- added bugfixes from upstream cvs and from debian package for
|
||||||
* preserve Attributes checkbox [bnc#419832]
|
* preserve Attributes checkbox [bnc#419832]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user