This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

enchant: Updated to version 1.6.1

  • Loading branch information...
Arnavion committed Sep 7, 2016
1 parent 11071de commit d0cf7c6f3c4b7c36060ae2ff2c1e93ffe5ee38c2
Showing with 45 additions and 32 deletions.
  1. +1 −1 README.md
  2. +1 −1 build.ps1
  3. +1 −1 enchant/mod.md
  4. +5 −1 enchant/src/config.h
  5. +4 −4 enchant/src/libenchant.rc
  6. +33 −24 enchant/src/makefile.mak
@@ -25,7 +25,7 @@ These are the libraries in the bundle:
| ---------------------- | -------------- | ------
| ATK | 2.20.0 | [Source](https://dl.hexchat.net/gtk-win32/src/atk-2.20.0.tar.xz)
| Cairo | 1.14.6 | [Source](https://dl.hexchat.net/gtk-win32/src/cairo-1.14.6.tar.xz)
| Enchant | 1.6.0 | [Source](https://dl.hexchat.net/gtk-win32/src/enchant-1.6.0.tar.gz)
| Enchant | 1.6.1 | [Source](https://dl.hexchat.net/gtk-win32/src/enchant-1.6.1.tar.xz)
| Fontconfig | 2.8.0 | [Source](https://dl.hexchat.net/gtk-win32/src/fontconfig-2.8.0.tar.gz)
| FreeType | 2.6.3 | [Source](https://dl.hexchat.net/gtk-win32/src/freetype-2.6.3.tar.bz2)
| GDK-PixBuf | 2.34.0 | [Source](https://dl.hexchat.net/gtk-win32/src/gdk-pixbuf-2.34.0.tar.xz)
@@ -158,7 +158,7 @@ $items = @{
};

'enchant' = @{
'ArchiveUrl' = 'http://dl.hexchat.net/gtk-win32/src/enchant-1.6.0.tar.gz'
'ArchiveUrl' = 'http://dl.hexchat.net/gtk-win32/src/enchant-1.6.1.tar.xz'
'Dependencies' = @('glib')
};

@@ -1 +1 @@
* Download [Enchant 1.6.0](http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz)
* Download [Enchant 1.6.1](https://github.com/AbiWord/enchant/archive/enchant-1-6-1.tar.gz)
@@ -12,4 +12,8 @@ typedef int ssize_t;
#define SSIZE_T_DEFINED
#endif

#define ENCHANT_VERSION_STRING "1.6.0"
#define ENCHANT_VERSION_STRING "1.6.1"

#if defined(_MSC_VER)
#pragma warning(disable: 4996) /* The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name. */
#endif
@@ -1,8 +1,8 @@
#include <winver.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,6,0,0
PRODUCTVERSION 1,6,0,0
FILEVERSION 1,6,1,0
PRODUCTVERSION 1,6,1,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
@@ -15,11 +15,11 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "none"
VALUE "FileDescription", "libenchant"
VALUE "FileVersion", "1.6.0.0"
VALUE "FileVersion", "1.6.1.0"
VALUE "InternalName", "libenchant"
VALUE "OriginalFilename", "libenchant.dll"
VALUE "ProductName", "libenchant"
VALUE "ProductVersion", "1.6.0"
VALUE "ProductVersion", "1.6.1"
END
END
BLOCK "VarFileInfo"
@@ -485,6 +485,11 @@ LIBENCHANT_MYSPELL_DEFINES = \
LIBENCHANT_MYSPELL_DLL=$(outdir)\libenchant_myspell.dll
LIBENCHANT_MYSPELL_LIB=$(libdir)\libenchant_myspell.lib
LIBENCHANT_MYSPELL_PDB=$(pdbdir)\libenchant_myspell.pdb
LIBENCHANT_MYSPELL_RES=$(srcdir)\libenchant_myspell.res
LIBENCHANT_MYSPELL_RC=$(srcdir)\libenchant_myspell.rc

$(LIBENCHANT_MYSPELL_RES) : $(LIBENCHANT_MYSPELL_RC)
rc -Fo $(LIBENCHANT_MYSPELL_RES) $(LIBENCHANT_MYSPELL_RC)

LIBENCHANT_MYSPELL_LIBS = \
$(otherlibdir)\glib-2.0.lib \
@@ -495,16 +500,17 @@ LIBENCHANT_MYSPELL_LIBS = \
LIBENCHANT_MYSPELL_OBJECTS = \
$(objdir)\affentry.obj \
$(objdir)\affixmgr.obj \
$(objdir)\dictmgr.obj \
$(objdir)\csutil.obj \
$(objdir)\utf_info.obj \
$(objdir)\dictmgr.obj \
$(objdir)\filemgr.obj \
$(objdir)\hashmgr.obj \
$(objdir)\suggestmgr.obj \
$(objdir)\hunspell.obj \
$(objdir)\filemgr.obj \
$(objdir)\phonet.obj \
$(objdir)\hunzip.obj \
$(objdir)\myspell_checker.obj
$(objdir)\myspell_checker.obj \
$(objdir)\phonet.obj \
$(objdir)\replist.obj \
$(objdir)\suggestmgr.obj \
$(objdir)\utf_info.obj

!if !$(DLL)
libenchant_myspell: LIBENCHANT_MYSPELL_LIB
@@ -520,51 +526,54 @@ $(objdir)\affentry.obj : $(srcdir)\affentry.cxx
$(objdir)\affixmgr.obj : $(srcdir)\affixmgr.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)

$(objdir)\dictmgr.obj : $(srcdir)\dictmgr.cxx
$(objdir)\csutil.obj : $(srcdir)\csutil.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)

$(objdir)\csutil.obj : $(srcdir)\csutil.cxx
$(objdir)\dictmgr.obj : $(srcdir)\dictmgr.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)

$(objdir)\utf_info.obj : $(srcdir)\utf_info.cxx
$(objdir)\filemgr.obj : $(srcdir)\filemgr.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)

$(objdir)\hashmgr.obj : $(srcdir)\hashmgr.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)

$(objdir)\suggestmgr.obj : $(srcdir)\suggestmgr.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)


$(objdir)\hunspell.obj : $(srcdir)\hunspell.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
$(objdir)\filemgr.obj : $(srcdir)\filemgr.cxx

$(objdir)\hunzip.obj : $(srcdir)\hunzip.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)


$(objdir)\myspell_checker.obj : $(srcdir)\myspell_checker.cpp
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)

$(objdir)\phonet.obj : $(srcdir)\phonet.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)

$(objdir)\hunzip.obj : $(srcdir)\hunzip.cxx
$(objdir)\replist.obj : $(srcdir)\replist.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)
$(objdir)\myspell_checker.obj : $(srcdir)\myspell_checker.cpp

$(objdir)\suggestmgr.obj : $(srcdir)\suggestmgr.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)


$(objdir)\utf_info.obj : $(srcdir)\utf_info.cxx
$(CC_OBJ) $** $(LIBENCHANT_MYSPELL_DEFINES)

LIBENCHANT_MYSPELL_LIB : $(LIBENCHANT_MYSPELL_OBJECTS)
-$(RM) $(LIBENCHANT_MYSPELL_LIB)
$(AR) $(AR_FLAGS)$(LIBENCHANT_MYSPELL_LIB) $(LIBENCHANT_MYSPELL_OBJECTS)

# libenchant_myspell.dll and libenchant_myspell.lib are created together.
LIBENCHANT_MYSPELL_DLL : $(LIBENCHANT_MYSPELL_OBJECTS)
$(LINK_DLL) $(LIBENCHANT_MYSPELL_OBJECTS) $(LIBENCHANT_MYSPELL_LIBS) -OUT:$(LIBENCHANT_MYSPELL_DLL)
LIBENCHANT_MYSPELL_DLL : $(LIBENCHANT_MYSPELL_OBJECTS) $(LIBENCHANT_MYSPELL_RES)
$(LINK_DLL) $(LIBENCHANT_MYSPELL_OBJECTS) $(LIBENCHANT_MYSPELL_LIBS) $(LIBENCHANT_MYSPELL_RES) -OUT:$(LIBENCHANT_MYSPELL_DLL)
$(EMBED_MANIFEST:exe_name=libenchant_myspell.dll)
$(CLEAN_MANIFEST:exe_name=libenchant_myspell.dll)

libenchant_myspell_lib_clean:
$(RM) $(LIBENCHANT_MYSPELL_OBJECTS) $(LIBENCHANT_MYSPELL_LIB)

libenchant_myspell_dll_clean:
$(RM) $(LIBENCHANT_MYSPELL_OBJECTS) $(LIBENCHANT_MYSPELL_LIB) $(LIBENCHANT_MYSPELL_DLL) $(LIBENCHANT_MYSPELL_PDB)
$(RM) $(LIBENCHANT_MYSPELL_OBJECTS) $(LIBENCHANT_MYSPELL_LIB) $(LIBENCHANT_MYSPELL_DLL) $(LIBENCHANT_MYSPELL_PDB) $(LIBENCHANT_MYSPELL_RES) $(LIBENCHANT_MYSPELL_RC)

################################################################################

0 comments on commit d0cf7c6

Please sign in to comment.