File enchant-1.4.2-tml.patch of Package mingw64-enchant

Overview Repositories Revisions Requests Users Attributes Meta

File enchant-1.4.2-tml.patch of Package mingw64-enchant (Revision eccddba87ff6281247325f0825a36ccf)

Currently displaying revision eccddba87ff6281247325f0825a36ccf , Show latest

--- enchant-1.4.2/compile-resource	1970-01-01 01:00:00.000000000 +0100
+++ enchant-1.4.2/compile-resource	2009-01-20 17:08:21.000000000 +0100
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# Script to compile a resource file for a DLL if there is a .rc file
+# for it. The resource source file is supposed to contain a version
+# info section, that uses the string BUILDNUMBER as the least
+# significant part of the version numbers. This script replaces that
+# string with a "build number" before compiling the binary resource
+# file. The build number is kept between builds in a "stamp" file, and
+# incremented each time. (If there is no stamp file, build number 0 is
+# used.) The intention is that only the "official" maintainer of a DLL
+# keeps such a stamp file, and thus the DLLs he releases have
+# increasing version number resources, which can be used by an
+# installer program to decide whether to replace an existing DLL with
+# the same name.
+
+# This is just my (tml@iki.fi) idea, if somebody comes up with a
+# better way to generate version number resources, don't hesitate to
+# suggest.
+
+# The command line arguments are:
+# $1: the name of the .rc file to check
+# $2: the name of the resource object file to produce, if the rc file exists
+
+# Check if we have a resource file for this DLL.
+rcfile=$1
+resfile=$2
+if [ -f $rcfile ]; then
+    # Check if we have a build number stamp file.
+    basename=`basename $rcfile .rc`
+    if [ -f $basename-build.stamp ]; then
+	read number <$basename-build.stamp
+	buildnumber=$[number]
+	echo Build number $buildnumber
+	rm -rf $basename-build.stamp
+    else
+	echo Using zero as build number
+        buildnumber=0
+    fi
+
+    m4 -DBUILDNUMBER=$buildnumber <$rcfile >$$.rc &&
+	${WINDRES-windres} $$.rc $resfile &&
+	rm $$.rc
+else
+    # Return failure
+    exit 1
+fi
--- enchant-1.4.2/configure.in	2008-05-05 22:26:54.000000000 +0200
+++ enchant-1.4.2/configure.in	2009-01-21 09:03:45.000000000 +0100
@@ -1,5 +1,5 @@
 AC_INIT(src/enchant.h)
-AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 
 dnl Set release number
 dnl This is derived from "Versioning" chapter of info libtool documentation.
@@ -286,18 +286,24 @@
 fi
 AM_CONDITIONAL(WITH_MYSPELL, test "x$build_myspell" = "xyes")
 
-myspell_dir=${datadir}/myspell/dicts
-AC_ARG_WITH(myspell-dir, [  --with-myspell-dir=PATH    path to installed myspell dicts ])
+AC_ARG_WITH(system-myspell, [  --without-system-myspell  don't use the myspell installed on system.], system_myspell="$withval", system_myspell=yes)
 
-if test "x$with_myspell_dir" != "x" ; then
-   myspell_dir=$with_myspell_dir
-fi
+if test x$system_myspell = xyes; then
+  myspell_dir=${datadir}/myspell/dicts
+  AC_ARG_WITH(myspell-dir, [  --with-myspell-dir=PATH    path to installed myspell dicts ])
+
+  if test "x$with_myspell_dir" != "x" ; then
+     myspell_dir=$with_myspell_dir
+  fi
 
-MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DENCHANT_MYSPELL_DICT_DIR='\"$myspell_dir\"'"
-PKG_CHECK_MODULES(MYSPELL, [hunspell], have_system_myspell=true, have_system_myspell=false)
-AC_SUBST(MYSPELL_CFLAGS)
-AC_SUBST(MYSPELL_LIBS)
-AM_CONDITIONAL(WITH_SYSTEM_MYSPELL, test "x$have_system_myspell" = "xtrue")
+  MYSPELL_CFLAGS="$MYSPELL_CFLAGS -DENCHANT_MYSPELL_DICT_DIR='\"$myspell_dir\"'"
+  PKG_CHECK_MODULES(MYSPELL, [hunspell], have_system_myspell=true, have_system_myspell=false)
+else
+  have_system_myspell=$false
+fi
+  AC_SUBST(MYSPELL_CFLAGS)
+  AC_SUBST(MYSPELL_LIBS)
+  AM_CONDITIONAL(WITH_SYSTEM_MYSPELL, test "x$have_system_myspell" = "xtrue")
 
 check_aspell=yes
 build_aspell=no
--- enchant-1.4.2/src/aspell/aspell_provider.c	2008-05-05 22:19:17.000000000 +0200
+++ enchant-1.4.2/src/aspell/aspell_provider.c	2009-01-20 17:08:21.000000000 +0100
@@ -338,14 +338,14 @@
 
 #if defined(_WIN32)
 
-static WCHAR* GetDirectoryOfThisLibrary()
+static WCHAR* GetDirectoryOfThisLibrary(void)
 {
 	WCHAR dll_path[MAX_PATH];
     gchar* utf8_dll_path;
     gchar* utf8_prefix;
     gunichar2* utf16_prefix;
 
-    if(!GetModuleFileName(s_hModule,dll_path,MAX_PATH))
+    if(!GetModuleFileNameW(s_hModule,dll_path,MAX_PATH))
         { /* unable to determine filename of this library */
             return NULL;
         }
@@ -372,7 +372,7 @@
     wcscat(wszFullLibraryPath, L"\\");
     wcscat(wszFullLibraryPath, libraryName);
 
-    h = LoadLibrary(wszFullLibraryPath);
+    h = LoadLibraryW(wszFullLibraryPath);
 
     g_free(wszFullLibraryPath);
     return h;
@@ -385,13 +385,13 @@
 	DWORD dwSize;
 	WCHAR* wszValue = NULL;
 
-	if(RegOpenKeyEx(baseKey, uKeyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+	if(RegOpenKeyExW(baseKey, uKeyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
 		{
 			/* Determine size of string */
-			if(RegQueryValueEx( hKey, uKey, NULL, &lType, NULL, &dwSize) == ERROR_SUCCESS)
+			if(RegQueryValueExW( hKey, uKey, NULL, &lType, NULL, &dwSize) == ERROR_SUCCESS)
 				{
 					wszValue = g_new0(WCHAR, dwSize + 1);
-					RegQueryValueEx(hKey, uKey, NULL, &lType, (LPBYTE) wszValue, &dwSize);
+					RegQueryValueExW(hKey, uKey, NULL, &lType, (LPBYTE) wszValue, &dwSize);
 				}
 		}
 
@@ -399,10 +399,9 @@
 }
 #endif
 
-void configure_enchant_provider(EnchantProvider * me, const char *dir_name)
-{
 #if defined(_WIN32)
-    const WCHAR* aspell_module_name = L"aspell-15.dll";
+gboolean try(EnchantProvider * me, const char *dir_name, const WCHAR *aspell_module_name)
+{
     HMODULE aspell_module = NULL;
     char* szModule;
 
@@ -413,7 +412,7 @@
         WCHAR* wszModule;
 
 	    wszModule = g_utf8_to_utf16 (szModule, -1, NULL, NULL, NULL);
-        aspell_module = LoadLibrary(wszModule);
+        aspell_module = LoadLibraryW(wszModule);
         g_free(wszModule);
     }
 
@@ -442,7 +441,7 @@
     if (aspell_module == NULL) 
         {
             /* then try default lookup */
-            aspell_module = LoadLibrary(aspell_module_name);
+            aspell_module = LoadLibraryW(aspell_module_name);
         }
 
     if (aspell_module == NULL) 
@@ -452,9 +451,18 @@
             me->request_dict = NULL;
             me->dispose_dict = NULL;
             me->list_dicts = NULL;
+	    return FALSE;
         }
+    return TRUE;
+}
 #endif
 
+void configure_provider(EnchantProvider * me, const char *dir_name)
+{
+#if defined(_WIN32)
+	try(me, dir_name, L"aspell-15.dll") ||
+	try(me, dir_name, L"libaspell-15.dll");
+#endif
 }
 
 
--- enchant-1.4.2/src/enchant.c	2008-05-05 22:19:19.000000000 +0200
+++ enchant-1.4.2/src/enchant.c	2009-01-20 17:08:21.000000000 +0100
@@ -314,13 +314,13 @@
 	uKeyName = g_utf8_to_utf16 (keyName, -1, NULL, NULL, NULL);
 	uKey = g_utf8_to_utf16 (key, -1, NULL, NULL, NULL);
 
-	if(RegOpenKeyEx(baseKey, uKeyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+	if(RegOpenKeyExW(baseKey, uKeyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
 		{
 			/* Determine size of string */
-			if(RegQueryValueEx( hKey, uKey, NULL, &lType, NULL, &dwSize) == ERROR_SUCCESS)
+			if(RegQueryValueExW( hKey, uKey, NULL, &lType, NULL, &dwSize) == ERROR_SUCCESS)
 				{
 					wszValue = g_new0(WCHAR, dwSize + 1);
-					RegQueryValueEx(hKey, uKey, NULL, &lType, (LPBYTE) wszValue, &dwSize);
+					RegQueryValueExW(hKey, uKey, NULL, &lType, (LPBYTE) wszValue, &dwSize);
 				}
 		}
 
@@ -2160,17 +2160,18 @@
 #ifdef _WIN32
 	if (!prefix) {
 		/* Dynamically locate library and return containing directory */
-		HINSTANCE hInstance = GetModuleHandle(L"libenchant");
-		if(hInstance != NULL)
+		WCHAR dll_path[MAX_PATH];
+
+		if(GetModuleFileNameW(s_hModule,dll_path,MAX_PATH))
 			{
-				WCHAR dll_path[MAX_PATH];
-	  
-				if(GetModuleFileName(hInstance,dll_path,MAX_PATH))
-					{
-						gchar* utf8_dll_path = g_utf16_to_utf8 (dll_path, -1, NULL, NULL, NULL);
-						prefix = g_path_get_dirname(utf8_dll_path);
-						g_free(utf8_dll_path);
-					}
+				gchar* utf8_dll_path = g_utf16_to_utf8 (dll_path, -1, NULL, NULL, NULL);
+				prefix = g_path_get_dirname(utf8_dll_path);
+				g_free(utf8_dll_path);
+				/* Strip off "bin" subfolder if present */
+				if (strlen(prefix) >=6 &&
+				    G_IS_DIR_SEPARATOR(prefix[strlen(prefix)-4]) &&
+				    g_ascii_strcasecmp(prefix+strlen(prefix)-3, "bin") == 0)
+					prefix[strlen(prefix)-4] = '\0';
 			}
 	}
 #endif
--- enchant-1.4.2/src/myspell/Makefile.am	2008-05-05 22:19:18.000000000 +0200
+++ enchant-1.4.2/src/myspell/Makefile.am	2009-01-20 17:08:21.000000000 +0100
@@ -39,7 +39,7 @@
 EXTRA_MYSPELL_CFLAGS=-DWITH_SYSTEM_MYSPELL
 else
 EXTRA_MYSPELL_FILES=$(COPIED_MYSPELL_FILES)
-EXTRA_MYSPELL_CFLAGS=
+EXTRA_MYSPELL_CFLAGS=-DHUNSPELL_STATIC
 endif
 
 INCLUDES=-I$(top_srcdir)/src $(ENCHANT_CFLAGS) $(MYSPELL_CFLAGS) $(CXX_WARN_CFLAGS) $(EXTRA_MYSPELL_CFLAGS) -D_ENCHANT_BUILD=1
--- enchant-1.4.2/src/myspell/myspell_checker.cpp	2008-05-05 22:19:18.000000000 +0200
+++ enchant-1.4.2/src/myspell/myspell_checker.cpp	2009-01-20 17:08:21.000000000 +0100
@@ -81,13 +81,13 @@
 	DWORD dwSize;
 	WCHAR* wszValue = NULL;
 
-	if(RegOpenKeyEx(baseKey, uKeyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
+	if(RegOpenKeyExW(baseKey, uKeyName, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
 		{
 			/* Determine size of string */
-			if(RegQueryValueEx( hKey, uKey, NULL, &lType, NULL, &dwSize) == ERROR_SUCCESS)
+			if(RegQueryValueExW( hKey, uKey, NULL, &lType, NULL, &dwSize) == ERROR_SUCCESS)
 				{
 					wszValue = g_new0(WCHAR, dwSize + 1);
-					RegQueryValueEx(hKey, uKey, NULL, &lType, (LPBYTE) wszValue, &dwSize);
+					RegQueryValueExW(hKey, uKey, NULL, &lType, (LPBYTE) wszValue, &dwSize);
 				}
 		}
 
--- enchant-1.4.2/src/pwl.c	2008-05-05 22:19:19.000000000 +0200
+++ enchant-1.4.2/src/pwl.c	2009-01-20 17:08:21.000000000 +0100
@@ -60,7 +60,8 @@
 #include <fcntl.h>
 
 #ifdef _WIN32
-#include <io.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #endif
 
 #include <glib.h>
@@ -197,7 +198,13 @@
 #elif defined(HAVE_LOCKF)
 	lockf (fileno (f), F_LOCK, 0);
 #elif defined(_WIN32)
-	_lock_file(f);
+	OVERLAPPED overlapped;
+
+	overlapped.Offset = 0;
+	overlapped.OffsetHigh = 0;
+	overlapped.hEvent = NULL;
+	if (!LockFileEx ((HANDLE) _get_osfhandle (fileno (f)), LOCKFILE_EXCLUSIVE_LOCK, 0, 0, 0x80000000, &overlapped))
+		g_warning ("Could not lock file\n");
 #else
 	/* TODO: UNIX fcntl. This race condition probably isn't too bad. */
 #endif /* HAVE_FLOCK */
@@ -211,7 +218,13 @@
 #elif defined(HAVE_LOCKF)
 	lockf (fileno (f), F_ULOCK, 0);
 #elif defined(_WIN32)
-	_unlock_file(f);
+	OVERLAPPED overlapped;
+
+	overlapped.Offset = 0;
+	overlapped.OffsetHigh = 0;
+	overlapped.hEvent = NULL;
+	if (!UnlockFileEx ((HANDLE) _get_osfhandle (fileno (f)), 0, 0, 0x80000000, &overlapped))
+		g_warning ("Could not unlock file\n");
 #else
 	/* TODO: UNIX fcntl. This race condition probably isn't too bad. */
 #endif /* HAVE_FLOCK */

Places

File enchant-1.4.2-tml.patch of Package mingw64-enchant (Revision eccddba87ff6281247325f0825a36ccf)

Places