- updated to 0.90.0

[packages/WindowMaker.git] / WindowMaker-shared.patch

diff --git a/WindowMaker-shared.patch b/WindowMaker-shared.patch
index 7c3f44d403771e16b7e1400abc922956a129caed..6d292dd7a6192dffeff32049393197c0617f71c2 100644 (file)
--- a/WindowMaker-shared.patch
+++ b/WindowMaker-shared.patch
@@ -1,11 +1,11 @@
 --- WindowMaker-0.80.0/WINGs/Examples/Makefile.am.orig Thu Oct 11 11:59:54 2001
 +++ WindowMaker-0.80.0/WINGs/Examples/Makefile.am      Thu Jan  3 06:09:41 2002
-@@ -2,30 +2,18 @@
+@@ -2,31 +2,18 @@
  
  AUTOMAKE_OPTIONS = no-dependencies
  
 -
- noinst_PROGRAMS = connect server fontl puzzle
+ noinst_PROGRAMS = connect server fontl puzzle colorpick
  
 +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
 +      $(XFTLIBS) $(INTLIBS)
@@ -13,6 +13,7 @@
 -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
 -      @XFTLIBS@ @INTLIBS@
 -
+-colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
 -
 -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
 -
@@ -40,7 +41,7 @@
  
 --- WindowMaker-0.80.0/WINGs/Extras/Makefile.am.orig   Thu Oct 11 11:59:54 2001
 +++ WindowMaker-0.80.0/WINGs/Extras/Makefile.am        Thu Jan  3 06:12:10 2002
-@@ -2,32 +2,25 @@
+@@ -2,33 +2,28 @@
  
  AUTOMAKE_OPTIONS = no-dependencies
  
@@ -54,6 +55,7 @@
 -
 -lib_LIBRARIES = libExtraWINGs.a 
 +lib_LTLIBRARIES = libExtraWINGs.la
++libExtraWINGs_la_LIBADD = $(top_builddir)/WINGs/libWINGs.la
  
  noinst_PROGRAMS = test
  
@@ -66,7 +68,8 @@
        wtableview.h \
        wtabledelegates.h 
  
--
+ AM_CFLAGS = @NOSTRICTALIASING@
+
  INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
 -      -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
 +      -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(HEADER_SEARCH_PATH)
@@ -80,7 +83,7 @@
 -
 --- WindowMaker-0.70.0.orig/WINGs/Makefile.am  Thu Oct  4 05:39:17 2001
 +++ WindowMaker-0.70.0/WINGs/Makefile.am       Thu Oct 18 16:54:22 2001
-@@ -4,24 +4,20 @@
+@@ -4,24 +4,21 @@
  
  SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests
  
@@ -91,9 +94,10 @@
  bin_SCRIPTS = get-wings-flags get-wutil-flags
  
 -lib_LIBRARIES = libWINGs.a libWUtil.a
-+LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
++LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
  
 +lib_LTLIBRARIES = libWINGs.la libWUtil.la
++libWINGs_la_LIBADD = $(top_builddir)/wrlib/libwraster.la $(XFTLIBS)
  
 -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@
  
@@ -117,18 +121,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
@@ -137,8 +142,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
@@ -188,11 +194,11 @@ diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makef
  
 -pkgdatadir  = $(datadir)/@PACKAGE@
 -
- bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle seticons geticonset wmsetbg wmsetup wmagnify
+ bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle convertfonts \
+       seticons geticonset wmsetbg wmsetup wmagnify
  
- bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wmchlocale wkdemenu.pl\
-@@ -12,41 +10,41 @@
-               wkdemenu.pl wmchlocale.in wcopy wpaste
+@@ -12,49 +10,49 @@
+ EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl
  
  INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
 -      @HEADER_SEARCH_PATH@ \
@@ -218,12 +224,21 @@ diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makef
 -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
 +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
  
+ getstyle_SOURCES = getstyle.c fontconv.c
+ 
  setstyle_LDADD = \
 -      $(top_builddir)/WINGs/libWUtil.a \
 -      @XLFLAGS@ @XLIBS@ $(liblist)
 +      $(top_builddir)/WINGs/libWUtil.la \
 +      $(XLFLAGS) $(XLIBS) $(liblist)
  
+ setstyle_SOURCES = setstyle.c fontconv.c
+ 
+-convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist)
+ 
+ convertfonts_SOURCES = convertfonts.c fontconv.c
+ 
 -seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist)
 +seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist)
  
@@ -250,12 +265,13 @@ diff -Nur WindowMaker-0.70.0.orig/test/Makefile.am WindowMaker-0.70.0/test/Makef
  
 --- WindowMaker-0.70.0.orig/wmlib/Makefile.am  Mon Apr 10 02:59:35 2000
 +++ WindowMaker-0.70.0/wmlib/Makefile.am       Thu Oct 18 16:54:22 2001
-@@ -1,13 +1,13 @@
+@@ -1,13 +1,14 @@
  
  AUTOMAKE_OPTIONS = no-dependencies
  
 -lib_LIBRARIES = libWMaker.a
 +lib_LTLIBRARIES = libWMaker.la
++libWMaker_la_LIBADD = $(X_LIBS) -lX11
  
  include_HEADERS = WMaker.h