]> git.pld-linux.org Git - packages/WindowMaker.git/blobdiff - WindowMaker-shared.patch
projects / packages / WindowMaker.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- release 4,
[packages/WindowMaker.git] / WindowMaker-shared.patch
diff --git a/WindowMaker-shared.patch b/WindowMaker-shared.patch
index fe28a06ed8609cb2c5384662039dd2e34795f9cd..c28494b8d959eb345c50638581ea5d87d5280933 100644 (file)
--- a/WindowMaker-shared.patch
+++ b/WindowMaker-shared.patch
@@ -1,95 +1,154 @@
-diff -Nru WindowMaker-0.62.1/WINGs/Makefile.am WindowMaker-0.62.1.new/WINGs/Makefile.am
---- WindowMaker-0.62.1/WINGs/Makefile.am       Tue Aug  8 00:51:57 2000
-+++ WindowMaker-0.62.1.new/WINGs/Makefile.am   Tue Aug  8 00:41:38 2000
-@@ -10,11 +10,12 @@
-       -lm @LIBPL@
+diff -Nru WindowMaker-0.64.0/WINGs/Examples/Makefile.am WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am
+--- WindowMaker-0.64.0/WINGs/Examples/Makefile.am      Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WINGs/Examples/Makefile.am  Tue Feb 13 18:56:19 2001
+@@ -6,22 +6,22 @@
+ noinst_PROGRAMS = connect server fontl puzzle
  
  
--#lib_LTLIBRARIES = libWINGs.la
-+lib_LTLIBRARIES = libWINGs.la libWUtil.la
+-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
++LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@
  
--lib_LIBRARIES = libWINGs.a libWUtil.a
-+#lib_LIBRARIES = libWINGs.a libWUtil.la
  
--#libWINGs_la_LDFLAGS = -version-info 1:1:0
-+libWINGs_la_LDFLAGS = -version-info 1:1:0
-+libWUtil_la_LDFLAGS = -version-info 1:1:0
+-fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
++fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
  
- include_HEADERS = WINGs.h WUtil.h WINGsP.h
+-puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
++puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
  
-@@ -24,39 +25,39 @@
+-connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
++connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
  
- testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
+-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
++connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
+       @NETLIBS@ @LIBPL@
  
--testmywidget_LDADD = libWINGs.a $(LIBLIST)
-+testmywidget_LDADD = libWINGs.la $(LIBLIST)
+-server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
++server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
  
- fontl_SOURCES = fontl.c
+-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
++server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
+       @NETLIBS@ @LIBPL@
  
--fontl_LDADD = libWINGs.a $(LIBLIST)
-+fontl_LDADD = libWINGs.la $(LIBLIST)
  
- wtest_SOURCES = wtest.c
+diff -Nru WindowMaker-0.64.0/WINGs/Extras/Makefile.am WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am
+--- WindowMaker-0.64.0/WINGs/Extras/Makefile.am        Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WINGs/Extras/Makefile.am    Tue Feb 13 18:56:19 2001
+@@ -10,13 +10,13 @@
+ include_HEADERS = wtableview.h wtabledelegates.h 
  
--wtest_LDADD = libWINGs.a $(LIBLIST)
-+wtest_LDADD = libWINGs.la $(LIBLIST)
  
--wtest_DEPENDENCIES = libWINGs.a
-+wtest_DEPENDENCIES = libWINGs.la
+-lib_LIBRARIES = libExtraWINGs.a 
++lib_LTLIBRARIES = libExtraWINGs.la
  
- wmfile_SOURCES = wmfile.c 
+ noinst_PROGRAMS = test
  
--wmfile_LDADD = libWINGs.a $(LIBLIST)
-+wmfile_LDADD = libWINGs.la $(LIBLIST)
-       
- testcolorpanel_SOURCES = testcolorpanel.c
+ EXTRA_DIST = 
  
--testcolorpanel_LDADD = libWINGs.a $(LIBLIST)
-+testcolorpanel_LDADD = libWINGs.la $(LIBLIST)
+-libExtraWINGs_a_SOURCES =     \
++libExtraWINGs_la_SOURCES =    \
+       wtableview.c \
+       wtabledelegates.c \
+       wtableview.h \
+@@ -26,7 +26,7 @@
+ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
+       -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
  
- wmquery_SOURCES = wmquery.c 
+-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
++LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+         @LIBPL@ 
  
--wmquery_LDADD = libWINGs.a $(LIBLIST)
-+wmquery_LDADD = libWINGs.la $(LIBLIST)
+ test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
+diff -Nru WindowMaker-0.64.0/WINGs/Makefile.am WindowMaker-0.64.0.new/WINGs/Makefile.am
+--- WindowMaker-0.64.0/WINGs/Makefile.am       Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WINGs/Makefile.am   Tue Feb 13 19:00:21 2001
+@@ -4,22 +4,19 @@
  
- connect_SOURCES = connect.c
+ SUBDIRS = WINGs . Documentation Resources Examples Extras Tests
  
--connect_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@
-+connect_LDADD = libWUtil.la @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@
+-
+-
+-#libWINGs_la_LDFLAGS = -version-info 1:1:0
+-
+ bin_SCRIPTS = get-wings-flags get-wutil-flags
+ 
+-lib_LIBRARIES = libWINGs.a libWUtil.a
+-
++lib_LTLIBRARIES = libWINGs.la libWUtil.la
+ 
+-LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @LIBPL@
++libWINGs_la_LDFLAGS = -version-info 1:1:0
++libWUtil_la_LDFLAGS = -version-info 1:1:0
  
++LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @LIBPL@
  
- EXTRA_DIST = logo.xpm BUGS
+ EXTRA_DIST = BUGS
  
  # wbutton.c 
 -libWINGs_a_SOURCES =  \
 +libWINGs_la_SOURCES =         \
-       WINGs.h \
-       WINGsP.h \
+       array.c \
+       bagtree.c \
        configuration.c \
-@@ -108,7 +109,7 @@
-       usleep.c
+@@ -74,7 +71,7 @@
+       wwindow.c
  
  
 -libWUtil_a_SOURCES =  \
 +libWUtil_la_SOURCES =         \
-       WINGs.h \
-       WINGsP.h \
-       bagarray.c \
-diff -Nru WindowMaker-0.62.1/src/Makefile.am WindowMaker-0.62.1.new/src/Makefile.am
---- WindowMaker-0.62.1/src/Makefile.am Fri Jan 14 17:30:56 2000
-+++ WindowMaker-0.62.1.new/src/Makefile.am     Tue Aug  8 00:52:09 2000
-@@ -114,7 +114,7 @@
+       array.c \
+       bagtree.c \
+       connection.c \
+diff -Nru WindowMaker-0.64.0/WINGs/Tests/Makefile.am WindowMaker-0.64.0.new/WINGs/Tests/Makefile.am
+--- WindowMaker-0.64.0/WINGs/Tests/Makefile.am Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WINGs/Tests/Makefile.am     Tue Feb 13 18:56:19 2001
+@@ -4,13 +4,13 @@
+ 
+ noinst_PROGRAMS = wtest wmquery wmfile testmywidget testcolorpanel 
+ 
+-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
++LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@
+ 
+ 
+ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
+ 
+-wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
++wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ 
+ 
+ EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
+diff -Nru WindowMaker-0.64.0/WPrefs.app/Makefile.am WindowMaker-0.64.0.new/WPrefs.app/Makefile.am
+--- WindowMaker-0.64.0/WPrefs.app/Makefile.am  Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/WPrefs.app/Makefile.am      Tue Feb 13 18:56:19 2001
+@@ -46,10 +46,10 @@
+ 
+ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+ 
+-WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
++WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ 
+ WPrefs_LDADD = \
+-      $(top_builddir)/WINGs/libWINGs.a\
++      $(top_builddir)/WINGs/libWINGs.la\
+       $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@ \
+       @INTLIBS@
+diff -Nru WindowMaker-0.64.0/src/Makefile.am WindowMaker-0.64.0.new/src/Makefile.am
+--- WindowMaker-0.64.0/src/Makefile.am Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/src/Makefile.am     Tue Feb 13 18:56:19 2001
+@@ -113,7 +113,7 @@
  
  
  wmaker_LDADD = \
 -      $(top_builddir)/WINGs/libWINGs.a\
 +      $(top_builddir)/WINGs/libWINGs.la\
        $(top_builddir)/wrlib/libwraster.la\
-       @LIBRARY_SEARCH_PATH@ \
        @LIBPL@ \
-diff -Nru WindowMaker-0.62.1/test/Makefile.am WindowMaker-0.62.1.new/test/Makefile.am
---- WindowMaker-0.62.1/test/Makefile.am        Tue Aug  8 00:51:57 2000
-+++ WindowMaker-0.62.1.new/test/Makefile.am    Tue Aug  8 00:41:38 2000
+       @XLIBS@ \
+diff -Nru WindowMaker-0.64.0/test/Makefile.am WindowMaker-0.64.0.new/test/Makefile.am
+--- WindowMaker-0.64.0/test/Makefile.am        Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/test/Makefile.am    Tue Feb 13 18:56:19 2001
 @@ -8,7 +8,7 @@
  
  wtest_SOURCES = wtest.c
@@ -99,21 +158,35 @@ diff -Nru WindowMaker-0.62.1/test/Makefile.am WindowMaker-0.62.1.new/test/Makefi
  
  
  INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib 
-diff -Nru WindowMaker-0.62.1/util/Makefile.am WindowMaker-0.62.1.new/util/Makefile.am
---- WindowMaker-0.62.1/util/Makefile.am        Tue Aug  8 00:51:57 2000
-+++ WindowMaker-0.62.1.new/util/Makefile.am    Tue Aug  8 00:41:38 2000
-@@ -31,7 +31,7 @@
+diff -Nru WindowMaker-0.64.0/util/Makefile.am WindowMaker-0.64.0.new/util/Makefile.am
+--- WindowMaker-0.64.0/util/Makefile.am        Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/util/Makefile.am    Tue Feb 13 18:56:19 2001
+@@ -36,19 +36,19 @@
  geticonset_LDADD= $(liblist)
  
+ wmagnify_LDADD = \
+-      $(top_builddir)/WINGs/libWINGs.a \
++      $(top_builddir)/WINGs/libWINGs.la \
+       $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@ \
+       @DLLIBS@
+ 
+ wmsetup_LDADD = \
+-      $(top_builddir)/WINGs/libWINGs.a \
++      $(top_builddir)/WINGs/libWINGs.la \
+       $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@ \
+       @DLLIBS@
+ 
  wmsetbg_LDADD = \
 -      $(top_builddir)/WINGs/libWINGs.a \
 +      $(top_builddir)/WINGs/libWINGs.la \
        $(top_builddir)/wrlib/libwraster.la \
-       @LIBRARY_SEARCH_PATH@ \
        @LIBPL@ \
-diff -Nru WindowMaker-0.62.1/wmlib/Makefile.am WindowMaker-0.62.1.new/wmlib/Makefile.am
---- WindowMaker-0.62.1/wmlib/Makefile.am       Tue Aug  8 00:51:57 2000
-+++ WindowMaker-0.62.1.new/wmlib/Makefile.am   Tue Aug  8 00:41:38 2000
+       @DLLIBS@
+diff -Nru WindowMaker-0.64.0/wmlib/Makefile.am WindowMaker-0.64.0.new/wmlib/Makefile.am
+--- WindowMaker-0.64.0/wmlib/Makefile.am       Tue Feb 13 18:58:56 2001
++++ WindowMaker-0.64.0.new/wmlib/Makefile.am   Tue Feb 13 18:56:19 2001
 @@ -1,13 +1,13 @@
  
  AUTOMAKE_OPTIONS = no-dependencies
@@ -123,7 +196,7 @@ diff -Nru WindowMaker-0.62.1/wmlib/Makefile.am WindowMaker-0.62.1.new/wmlib/Make
  
  include_HEADERS = WMaker.h
  
- INCLUDES = @DFLAGS@ @XCFLAGS@
+ INCLUDES = $(DFLAGS) @XCFLAGS@
  
 -libWMaker_a_SOURCES =         \
 +libWMaker_la_SOURCES =        \
@@ -135,19 +208,3 @@ diff -Nru WindowMaker-0.62.1/wmlib/Makefile.am WindowMaker-0.62.1.new/wmlib/Make
        menu.h  
  
 +libWMaker_la_LDFLAGS = -version-info 1:1:1
-diff -Nru WindowMaker-0.62.1/WPrefs.app/Makefile.am WindowMaker-0.62.1.new/WPrefs.app/Makefile.am
---- WindowMaker-0.62.1/WPrefs.app/Makefile.am  Sun Apr  2 23:18:15 2000
-+++ WindowMaker-0.62.1.new/WPrefs.app/Makefile.am      Tue Aug  8 01:20:38 2000
-@@ -48,10 +48,10 @@
-       -I$(top_srcdir)/wrlib \
-       -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
- 
--WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
-+WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
- 
- WPrefs_LDADD = \
--      $(top_builddir)/WINGs/libWINGs.a\
-+      $(top_builddir)/WINGs/libWINGs.la\
-       $(top_builddir)/wrlib/libwraster.la \
-       @LIBRARY_SEARCH_PATH@ \
-       @LIBPL@ \
NeXT-alike window manager
This page took 0.039957 seconds and 4 git commands to generate.