diff options
| author | Raymond Danks <raymond@edanks.com> | 2006-07-24 16:08:32 +0000 |
|---|---|---|
| committer | Raymond Danks <raymond@edanks.com> | 2006-07-24 16:08:32 +0000 |
| commit | 1e6438c6cb5d855c836018d621be963eed44ae11 (patch) | |
| tree | c4f3db8c2366133c9fffd0bc23d9f1eddd7d99a7 /packages/icewm/icewm-1.2.26 | |
| parent | cbe58c1e1ca9714d8dd7fcd6391a4dd45ced0936 (diff) | |
icewm - configure patch for using pkgconfig to find libxft.
- point to correct X includes, libs, and mkfontdir-native.
- upgrade to icewm version 1.2.26.
Diffstat (limited to 'packages/icewm/icewm-1.2.26')
| -rw-r--r-- | packages/icewm/icewm-1.2.26/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/icewm/icewm-1.2.26/configure.patch | 22 | ||||
| -rw-r--r-- | packages/icewm/icewm-1.2.26/makefile.patch | 26 |
3 files changed, 48 insertions, 0 deletions
diff --git a/packages/icewm/icewm-1.2.26/.mtn2git_empty b/packages/icewm/icewm-1.2.26/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/icewm/icewm-1.2.26/.mtn2git_empty diff --git a/packages/icewm/icewm-1.2.26/configure.patch b/packages/icewm/icewm-1.2.26/configure.patch new file mode 100644 index 0000000000..ade427d5e0 --- /dev/null +++ b/packages/icewm/icewm-1.2.26/configure.patch @@ -0,0 +1,22 @@ +--- icewm-1.2.26/configure.in.orig 2006-07-18 15:16:37.024817360 -0600 ++++ icewm-1.2.26/configure.in 2006-07-18 15:17:32.889324664 -0600 +@@ -426,14 +426,11 @@ + AC_MSG_ERROR("xfreetype or core fonts must be enabled") + fi + if test "$enable_xfreetype" != "no" -o "$enable_xfreetype" = "implied"; then +- AC_PATH_PROG(XFT_CONFIG, xft-config,, ${with_xft_arg-${PATH}}) +- if test "${XFT_CONFIG}" == ""; then +- AC_PATH_PROG(PKG_CONFIG, pkg-config) +- if test "${PKG_CONFIG}" != ""; then +- ${PKG_CONFIG} xft 2>/dev/null +- if test $? -eq 0 ; then +- XFT_CONFIG='pkg-config xft' +- fi ++ AC_PATH_PROG(PKG_CONFIG, pkg-config) ++ if test "${PKG_CONFIG}" != ""; then ++ ${PKG_CONFIG} xft 2>/dev/null ++ if test $? -eq 0 ; then ++ XFT_CONFIG='pkg-config xft' + fi + fi + if test "${XFT_CONFIG}" != ""; then diff --git a/packages/icewm/icewm-1.2.26/makefile.patch b/packages/icewm/icewm-1.2.26/makefile.patch new file mode 100644 index 0000000000..9473c9b2a9 --- /dev/null +++ b/packages/icewm/icewm-1.2.26/makefile.patch @@ -0,0 +1,26 @@ +--- ./src/Makefile.in 2005-02-01 21:56:08.000000000 +0100 ++++ ./src/Makefile.in 2005-02-01 21:55:12.000000000 +0100 +@@ -206,10 +206,21 @@ + %.o: %.cc + @echo " CXX " $@ + @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $< +- +-genpref $(BINARIES): ++ ++HOSTCXX=g++ ++HOSTLD=g++ ++ ++genpref.o: genpref.cc ++ @echo " HOSTCXX " $@ ++ @$(HOSTCXX) $(CXXFLAGS) $(GCCDEP) -c $< ++ ++$(BINARIES): + @echo " LD " $@ + @$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) ++ ++genpref: ++ @echo " HOSTLD " $@ ++ @$(HOSTLD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS) + + ################################################################################ + |