gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-03 12:24:17 +01:00
Code Issues Projects Releases Wiki Activity

attempt to fix compilation on solaris with openwin

Browse Source
This commit is contained in:
dan
2004-10-30 06:39:27 +00:00
parent 558615a853
commit e9e1186f1d
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -4,6 +4,7 @@ Changes since version 0.91.0:
- updated Japanese translations (Takeo Hashimoto <HashimotoTakeo@mac.com>) - updated Japanese translations (Takeo Hashimoto <HashimotoTakeo@mac.com>)
- allow disable of switch panel when SwitchPanelImages=None - allow disable of switch panel when SwitchPanelImages=None
- added X Input Methods support in WINGs - added X Input Methods support in WINGs
- fixed issue with compiling on Solaris with openwin
Changes since version 0.90.0: Changes since version 0.90.0:

2
WINGs/WINGs/WINGs.h
View File

@@ -7,7 +7,7 @@
#include <WINGs/WUtil.h> #include <WINGs/WUtil.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#define WINGS_H_VERSION 20040406 #define WINGS_H_VERSION 20041030
#ifdef __cplusplus #ifdef __cplusplus

2
WINGs/WINGs/WINGsP.h
View File

@@ -8,7 +8,7 @@
#include <WINGs/WINGs.h> #include <WINGs/WINGs.h>
#if WINGS_H_VERSION < 20040406 #if WINGS_H_VERSION < 20041030
#error There_is_an_old_WINGs.h_file_somewhere_in_your_system._Please_remove_it. #error There_is_an_old_WINGs.h_file_somewhere_in_your_system._Please_remove_it.
#endif #endif

10
WINGs/wfont.c
View File

@@ -1,17 +1,17 @@
#include "wconfig.h"
#include <X11/Xft/Xft.h>
#include <fontconfig/fontconfig.h>
#include <stdlib.h> #include <stdlib.h>
#include "wconfig.h"
#include "WINGsP.h" #include "WINGsP.h"
#include <wraster.h> #include <wraster.h>
#include <assert.h> #include <assert.h>
#include <X11/Xlocale.h> #include <X11/Xlocale.h>
#include <X11/Xft/Xft.h>
#include <fontconfig/fontconfig.h>
#define DEFAULT_FONT "sans serif:pixelsize=12" #define DEFAULT_FONT "sans serif:pixelsize=12"

1
acinclude.m4
View File

@@ -41,6 +41,7 @@ AC_MSG_CHECKING([whether libXft is at least version $1])
AC_CACHE_VAL(ac_cv_lib_xft_version_ok, AC_CACHE_VAL(ac_cv_lib_xft_version_ok,
[AC_TRY_LINK( [AC_TRY_LINK(
[/* Test version of libXft we have */ [/* Test version of libXft we have */
#include <X11/Xlib.h>
#include <X11/Xft/Xft.h> #include <X11/Xft/Xft.h>
#if !defined(XFT_VERSION) || XFT_VERSION < $xft_major_version*10000 + $xft_minor_version*100 + $xft_micro_version #if !defined(XFT_VERSION) || XFT_VERSION < $xft_major_version*10000 + $xft_minor_version*100 + $xft_micro_version