rpms/malaga/devel malaga-rename-map_file.diff, NONE, 1.1 malaga.spec, 1.6, 1.7

Ville-Pekka Vainio vpv at fedoraproject.org
Sun Jun 14 19:45:04 UTC 2009


Author: vpv

Update of /cvs/pkgs/rpms/malaga/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25682

Modified Files:
	malaga.spec 
Added Files:
	malaga-rename-map_file.diff 
Log Message:
* Sun Jun 14 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 7.12-4
- Add patch to change the (un)map_file functions to malaga_(un)map_file,
  there was a symbol conflict with the samba libraries causing a segfault
  if enchant-voikko and evolution-mapi were both installed when using
  Evolution. Bugs rhbz #502546 and sourceforge #2802548, patch by Harri
  Pitkänen.
- Add defattr to the libmalaga subpackage


malaga-rename-map_file.diff:

--- NEW FILE malaga-rename-map_file.diff ---
diff -Nru malaga-7.12-orig/files.c malaga-7.12/files.c
--- malaga-7.12-orig/files.c	2009-06-10 18:02:28.000000000 +0300
+++ malaga-7.12/files.c	2009-06-10 18:04:38.000000000 +0300
@@ -131,10 +131,10 @@
 /*---------------------------------------------------------------------------*/
 
 void 
-map_file( string_t file_name, void **address, int_t *length )
+malaga_map_file( string_t file_name, void **address, int_t *length )
 /* Map file "file_name" into the memory. It will be available in the 
  * memory region starting at *ADDRESS and will occupy LENGTH bytes.
- * After usage, return the memory region via "unmap_file". */
+ * After usage, return the memory region via "malaga_unmap_file". */
 { 
 #ifdef POSIX
   int file_descriptor;
@@ -186,8 +186,8 @@
 /*---------------------------------------------------------------------------*/
 
 void 
-unmap_file( void **address, int_t length )
-/* Return the memory region that has been allocated by "map_file".
+malaga_unmap_file( void **address, int_t length )
+/* Return the memory region that has been allocated by "malaga_map_file".
  * The region starts at *ADDRESS and occupies LENGTH bytes. */
 { 
 #ifdef POSIX
diff -Nru malaga-7.12-orig/files.h malaga-7.12/files.h
--- malaga-7.12-orig/files.h	2009-06-10 18:02:28.000000000 +0300
+++ malaga-7.12/files.h	2009-06-10 18:05:19.000000000 +0300
@@ -45,13 +45,13 @@
  * which is connected to file FILE_NAME, into allocated memory block,
  * and return a pointer to that block. */
 
-extern void map_file( string_t file_name, void **address, int_t *length );
+extern void malaga_map_file( string_t file_name, void **address, int_t *length );
 /* Map file "file_name" into the memory. It will be available in the 
  * memory region starting at *ADDRESS and will occupy LENGTH bytes.
- * After usage, return the memory region via "unmap_file". */
+ * After usage, return the memory region via "malaga_unmap_file". */
 
-extern void unmap_file( void **address, int_t length );
-/* Return the memory region that has been allocated by "map_file".
+extern void malaga_unmap_file( void **address, int_t length );
+/* Return the memory region that has been allocated by "malaga_map_file".
  * The region starts at *ADDRESS and occupies LENGTH bytes. */
 
 /* File name operations. ====================================================*/
diff -Nru malaga-7.12-orig/lex_compiler.c malaga-7.12/lex_compiler.c
--- malaga-7.12-orig/lex_compiler.c	2009-06-10 18:02:28.000000000 +0300
+++ malaga-7.12/lex_compiler.c	2009-06-10 18:06:57.000000000 +0300
@@ -846,7 +846,7 @@
   int_t i;
 
   /* Map file into main memory. */
-  map_file( file_name, &prelex_data, &prelex_length );
+  malaga_map_file( file_name, &prelex_data, &prelex_length );
   header = (prelex_header_t *) prelex_data;
   check_header( &header->common_header, file_name,
 		PRELEX_FILE, MIN_PRELEX_CODE_VERSION, PRELEX_CODE_VERSION );
@@ -859,7 +859,7 @@
     lex_add_allo( strings + entries[i].surface, values + entries[i].feat );
 
   prelex_count = header->entry_count;
-  unmap_file( &prelex_data, prelex_length );
+  malaga_unmap_file( &prelex_data, prelex_length );
   allomorph_count = 0;
 }
 
diff -Nru malaga-7.12-orig/lexicon.c malaga-7.12/lexicon.c
--- malaga-7.12-orig/lexicon.c	2009-06-10 18:02:28.000000000 +0300
+++ malaga-7.12/lexicon.c	2009-06-10 18:06:37.000000000 +0300
@@ -90,7 +90,7 @@
   lexicon_header_t *header; /* Lexicon file header. */
 
   /* Map the lexicon file into memory. */
-  map_file( file_name, &lexicon_data, &lexicon_length );
+  malaga_map_file( file_name, &lexicon_data, &lexicon_length );
 
   /* Check lexicon header. */
   header = (lexicon_header_t *) lexicon_data;
@@ -117,7 +117,7 @@
 terminate_lexicon( void )
 /* Terminate this module. */
 { 
-  unmap_file( &lexicon_data, lexicon_length ); 
+  malaga_unmap_file( &lexicon_data, lexicon_length ); 
 }
 
 /* End of file. =============================================================*/

 	  	 


Index: malaga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga/devel/malaga.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- malaga.spec	25 Feb 2009 23:04:04 -0000	1.6
+++ malaga.spec	14 Jun 2009 19:44:33 -0000	1.7
@@ -1,12 +1,15 @@
 Name:           malaga
 Version:        7.12 
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A programming language for automatic language analysis
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://home.arcor.de/bjoern-beutel/malaga/
 Source0:        http://home.arcor.de/bjoern-beutel/malaga/%{name}-%{version}.tgz
+# Fix map_file symbol conflict with samba, the Voikko project will handle
+# possible upstream submission after going through the other symbols as well
+Patch0:         malaga-rename-map_file.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel readline-devel
@@ -44,6 +47,7 @@ Library files for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 # Remove "@" marks so that the build process is more verbose
 sed -i.debug -e 's|^\([ \t][ \t]*\)@|\1|' Makefile.in
 # Remove "-s" so binaries won't be stripped
@@ -92,6 +96,7 @@ fi
 %{_mandir}/man1/mal*
 
 %files -n lib%{name}
+%defattr(-,root,root,-)
 %doc CHANGES.txt GPL.txt README.txt
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}.so.*
@@ -103,6 +108,14 @@ fi
 
 
 %changelog
+* Sun Jun 14 2009 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 7.12-4
+- Add patch to change the (un)map_file functions to malaga_(un)map_file,
+  there was a symbol conflict with the samba libraries causing a segfault
+  if enchant-voikko and evolution-mapi were both installed when using
+  Evolution. Bugs rhbz #502546 and sourceforge #2802548, patch by Harri
+  Pitkänen.
+- Add defattr to the libmalaga subpackage
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list