- updated for 20040718

Changed files:
    WindowMaker-shared.patch -> 1.15

diff --git a/WindowMaker-shared.patch b/WindowMaker-shared.patch
index f5e2b6f3ed45c2e7b961383dfa530a8ecae52835..ac570bccb413b84140e0c88f963fccfdc6fc271c 100644 (file)
--- a/WindowMaker-shared.patch
+++ b/WindowMaker-shared.patch
@@ -119,18 +119,19 @@
        array.c \
        bagtree.c \
        connection.c \
---- WindowMaker-0.80.0/WINGs/Tests/Makefile.am.orig    Thu Oct 11 11:59:54 2001
-+++ WindowMaker-0.80.0/WINGs/Tests/Makefile.am Thu Jan  3 06:14:31 2002
-@@ -4,18 +4,14 @@
+diff -ur WindowMaker-CVS-20040723.orig/WINGs/Tests/Makefile.am WindowMaker-CVS-20040723/WINGs/Tests/Makefile.am
+--- WindowMaker-CVS-20040723.orig/WINGs/Tests/Makefile.am      2004-04-11 07:01:02.000000000 +0200
++++ WindowMaker-CVS-20040723/WINGs/Tests/Makefile.am   2004-09-05 03:55:39.906430016 +0200
+@@ -4,19 +4,16 @@
  
  noinst_PROGRAMS = wtest wmquery wmfile testmywidget 
  
 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
 -      @XFTLIBS@ @INTLIBS@
--
 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 +      $(XFTLIBS) $(INTLIBS)
  
+ 
  testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
  
 -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
@@ -139,8 +140,9 @@
  EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
  
  INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
--      -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
-+      -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH)
+-      -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ \
++      -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(XFTFLAGS) $(HEADER_SEARCH_PATH) \
+       -DDEBUG
  
  
 --- WindowMaker-0.70.0.orig/WPrefs.app/Makefile.am     Thu Oct  4 05:39:18 2001