- _really_ updated to 0.63.1

Changed files:
    WindowMaker-shared.patch -> 1.5
    WindowMaker-singleclick.patch -> 1.5

diff --git a/WindowMaker-shared.patch b/WindowMaker-shared.patch
index bc73c77f4e0d5695340fcab35e15710c07426b6c..15217a3d40a1df6544baf25c1bfffb605cb9bcc3 100644 (file)
--- a/WindowMaker-shared.patch
+++ b/WindowMaker-shared.patch
@@ -1,31 +1,56 @@
-diff -Nru WindowMaker-0.63.1/WINGs/Makefile.am WindowMaker-0.63.1.new/WINGs/Makefile.am
---- WindowMaker-0.63.1/WINGs/Makefile.am       Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/WINGs/Makefile.am   Sun Jan  7 23:25:42 2001
-@@ -4,10 +4,6 @@
+diff -Naur WindowMaker-0.63.1/WINGs/Examples/Makefile.am WindowMaker-0.63.1-p/WINGs/Examples/Makefile.am
+--- WindowMaker-0.63.1/WINGs/Examples/Makefile.am      Sun Jan  7 00:21:58 2001
++++ WindowMaker-0.63.1-p/WINGs/Examples/Makefile.am    Mon Jan  8 13:34:33 2001
+@@ -6,17 +6,17 @@
+ noinst_PROGRAMS = connect fontl puzzle
+ 
+ 
+-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
++LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+       @LIBPL@
+ 
+ 
+-fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
++fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ 
+-puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a
++puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ 
+-connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
++connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
+ 
+-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \
++connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \
+       @NETLIBS@ @LIBPL@
  
- SUBDIRS = . Documentation Resources Examples Extras Tests
  
--
--
--#libWINGs_la_LDFLAGS = -version-info 1:1:0
--
- # is this a kluge? if so, how should i do it?
- includedir = @includedir@/WINGs
+diff -Naur WindowMaker-0.63.1/WINGs/Extras/Makefile.am WindowMaker-0.63.1-p/WINGs/Extras/Makefile.am
+--- WindowMaker-0.63.1/WINGs/Extras/Makefile.am        Sun Jan  7 00:21:58 2001
++++ WindowMaker-0.63.1-p/WINGs/Extras/Makefile.am      Mon Jan  8 13:35:39 2001
+@@ -26,7 +26,7 @@
+ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
+       -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
  
-@@ -15,16 +11,17 @@
+-LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \
++LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+         @LIBPL@ 
+ 
+ test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
+diff -Naur WindowMaker-0.63.1/WINGs/Makefile.am WindowMaker-0.63.1-p/WINGs/Makefile.am
+--- WindowMaker-0.63.1/WINGs/Makefile.am       Sun Jan  7 00:21:58 2001
++++ WindowMaker-0.63.1-p/WINGs/Makefile.am     Mon Jan  8 13:33:37 2001
+@@ -15,16 +15,16 @@
  
  bin_SCRIPTS = get-wings-flags get-wutil-flags
  
 -lib_LIBRARIES = libWINGs.a libWUtil.a
--
-+lib_LIBRARIES = libWINGs.la libWUtil.la
++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.a $(top_builddir)/wrlib/libwraster.la @LIBPL@
 +LDADD= libWINGs.la $(top_builddir)/wrlib/libwraster.la @LIBPL@
  
+ 
  EXTRA_DIST = BUGS
  
  # wbutton.c 
@@ -34,7 +59,7 @@ diff -Nru WindowMaker-0.63.1/WINGs/Makefile.am WindowMaker-0.63.1.new/WINGs/Make
        WINGs.h \
        WINGsP.h \
        array.c \
-@@ -80,7 +77,7 @@
+@@ -80,7 +80,7 @@
        wwindow.c
  
  
@@ -43,9 +68,28 @@ diff -Nru WindowMaker-0.63.1/WINGs/Makefile.am WindowMaker-0.63.1.new/WINGs/Make
        WINGs.h \
        WINGsP.h \
        array.c \
-diff -Nru WindowMaker-0.63.1/WPrefs.app/Makefile.am WindowMaker-0.63.1.new/WPrefs.app/Makefile.am
+diff -Naur WindowMaker-0.63.1/WINGs/Tests/Makefile.am WindowMaker-0.63.1-p/WINGs/Tests/Makefile.am
+--- WindowMaker-0.63.1/WINGs/Tests/Makefile.am Sun Jan  7 00:21:58 2001
++++ WindowMaker-0.63.1-p/WINGs/Tests/Makefile.am       Mon Jan  8 13:36:52 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 -Naur WindowMaker-0.63.1/WPrefs.app/Makefile.am WindowMaker-0.63.1-p/WPrefs.app/Makefile.am
 --- WindowMaker-0.63.1/WPrefs.app/Makefile.am  Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/WPrefs.app/Makefile.am      Sun Jan  7 23:23:08 2001
++++ WindowMaker-0.63.1-p/WPrefs.app/Makefile.am        Mon Jan  8 13:33:37 2001
 @@ -46,10 +46,10 @@
  
  INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
@@ -59,9 +103,9 @@ diff -Nru WindowMaker-0.63.1/WPrefs.app/Makefile.am WindowMaker-0.63.1.new/WPref
        $(top_builddir)/wrlib/libwraster.la \
        @LIBPL@ \
        @INTLIBS@
-diff -Nru WindowMaker-0.63.1/src/Makefile.am WindowMaker-0.63.1.new/src/Makefile.am
+diff -Naur WindowMaker-0.63.1/src/Makefile.am WindowMaker-0.63.1-p/src/Makefile.am
 --- WindowMaker-0.63.1/src/Makefile.am Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/src/Makefile.am     Sun Jan  7 23:23:08 2001
++++ WindowMaker-0.63.1-p/src/Makefile.am       Mon Jan  8 13:33:37 2001
 @@ -113,7 +113,7 @@
  
  
@@ -71,9 +115,9 @@ diff -Nru WindowMaker-0.63.1/src/Makefile.am WindowMaker-0.63.1.new/src/Makefile
        $(top_builddir)/wrlib/libwraster.la\
        @LIBPL@ \
        @XLIBS@ \
-diff -Nru WindowMaker-0.63.1/test/Makefile.am WindowMaker-0.63.1.new/test/Makefile.am
+diff -Naur WindowMaker-0.63.1/test/Makefile.am WindowMaker-0.63.1-p/test/Makefile.am
 --- WindowMaker-0.63.1/test/Makefile.am        Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/test/Makefile.am    Sun Jan  7 23:23:08 2001
++++ WindowMaker-0.63.1-p/test/Makefile.am      Mon Jan  8 13:33:37 2001
 @@ -8,7 +8,7 @@
  
  wtest_SOURCES = wtest.c
@@ -83,9 +127,9 @@ diff -Nru WindowMaker-0.63.1/test/Makefile.am WindowMaker-0.63.1.new/test/Makefi
  
  
  INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib 
-diff -Nru WindowMaker-0.63.1/util/Makefile.am WindowMaker-0.63.1.new/util/Makefile.am
+diff -Naur WindowMaker-0.63.1/util/Makefile.am WindowMaker-0.63.1-p/util/Makefile.am
 --- WindowMaker-0.63.1/util/Makefile.am        Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/util/Makefile.am    Sun Jan  7 23:23:08 2001
++++ WindowMaker-0.63.1-p/util/Makefile.am      Mon Jan  8 13:33:37 2001
 @@ -46,7 +46,7 @@
        @DLLIBS@
  
@@ -95,15 +139,15 @@ diff -Nru WindowMaker-0.63.1/util/Makefile.am WindowMaker-0.63.1.new/util/Makefi
        $(top_builddir)/wrlib/libwraster.la \
        @LIBPL@ \
        @DLLIBS@
-diff -Nru WindowMaker-0.63.1/wmlib/Makefile.am WindowMaker-0.63.1.new/wmlib/Makefile.am
+diff -Naur WindowMaker-0.63.1/wmlib/Makefile.am WindowMaker-0.63.1-p/wmlib/Makefile.am
 --- WindowMaker-0.63.1/wmlib/Makefile.am       Sun Jan  7 00:21:58 2001
-+++ WindowMaker-0.63.1.new/wmlib/Makefile.am   Sun Jan  7 23:23:51 2001
++++ WindowMaker-0.63.1-p/wmlib/Makefile.am     Mon Jan  8 13:33:37 2001
 @@ -1,13 +1,13 @@
  
  AUTOMAKE_OPTIONS = no-dependencies
  
 -lib_LIBRARIES = libWMaker.a
-+lib_LIBRARIES = libWMaker.la
++lib_LTLIBRARIES = libWMaker.la
  
  include_HEADERS = WMaker.h
  
@@ -119,3 +163,21 @@ diff -Nru WindowMaker-0.63.1/wmlib/Makefile.am WindowMaker-0.63.1.new/wmlib/Make
        menu.h  
  
 +libWMaker_la_LDFLAGS = -version-info 1:1:1
+--- WindowMaker-0.63.1-p/util/Makefile.am      Mon Jan  8 13:33:37 2001
++++ WindowMaker-0.63.1/util/Makefile.am        Mon Jan  8 13:58:25 2001
+@@ -34,13 +34,13 @@
+ 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@

diff --git a/WindowMaker-singleclick.patch b/WindowMaker-singleclick.patch
index c5ad6c1febb2a1dc4de924e4b7c22ee80637c053..e2ce6b174dacf76981d79123275a3295139297a1 100644 (file)
--- a/WindowMaker-singleclick.patch
+++ b/WindowMaker-singleclick.patch
@@ -1,42 +1,6 @@
-diff -Nru WindowMaker-0.63.1/WPrefs.app/Expert.c WindowMaker-0.63.1.new/WPrefs.app/Expert.c
---- WindowMaker-0.63.1/WPrefs.app/Expert.c     Sat Jan  6 23:43:21 2001
-+++ WindowMaker-0.63.1.new/WPrefs.app/Expert.c Sun Jan  7 23:06:09 2001
-@@ -54,6 +54,7 @@
-     WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling"));
-     WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill"));
-     WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking"));
-+    WMSetButtonSelected(panel->swi[6], GetBoolForKey("SingleClickLaunch"));
- }
- 
- 
-@@ -67,7 +68,7 @@
-     WMResizeWidget(panel->frame, FRAME_WIDTH, FRAME_HEIGHT);
-     WMMoveWidget(panel->frame, FRAME_LEFT, FRAME_TOP);
- 
--    for (i=0; i<7; i++) {
-+    for (i=0; i<8; i++) {
-       panel->swi[i] = WMCreateSwitchButton(panel->frame);
-       WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
-       WMMoveWidget(panel->swi[i], 20, 20+i*25);
-@@ -80,6 +81,7 @@
-     WMSetButtonText(panel->swi[4], _("Use Windoze style cycling"));
-     WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command"));
-     WMSetButtonText(panel->swi[6], _("Disable cycling color highlighting of icons"));
-+    WMSetButtonText(panel->swi[6], _("Launch applications and restore windows with a single click"));
- 
-     WMRealizeWidget(panel->frame);
-     WMMapSubwidgets(panel->frame);
-@@ -102,6 +104,7 @@
-     SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");
-     SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
-     SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");
-+    SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "SingleClickLaunch");
- }
- 
- 
-diff -Nru WindowMaker-0.63.1/src/WindowMaker.h WindowMaker-0.63.1.new/src/WindowMaker.h
+diff -Naur WindowMaker-0.63.1/src/WindowMaker.h WindowMaker-0.63.1-p/src/WindowMaker.h
 --- WindowMaker-0.63.1/src/WindowMaker.h       Fri Nov 17 03:10:32 2000
-+++ WindowMaker-0.63.1.new/src/WindowMaker.h   Sun Jan  7 23:02:54 2001
++++ WindowMaker-0.63.1-p/src/WindowMaker.h     Mon Jan  8 12:15:41 2001
 @@ -424,6 +424,9 @@
      /* shading animation */
      signed char shade_speed;
@@ -47,9 +11,9 @@ diff -Nru WindowMaker-0.63.1/src/WindowMaker.h WindowMaker-0.63.1.new/src/Window
      int edge_resistance;
      char attract;
  
-diff -Nru WindowMaker-0.63.1/src/appicon.c WindowMaker-0.63.1.new/src/appicon.c
+diff -Naur WindowMaker-0.63.1/src/appicon.c WindowMaker-0.63.1-p/src/appicon.c
 --- WindowMaker-0.63.1/src/appicon.c   Wed Nov  1 16:40:16 2000
-+++ WindowMaker-0.63.1.new/src/appicon.c       Sun Jan  7 23:02:54 2001
++++ WindowMaker-0.63.1-p/src/appicon.c Mon Jan  8 12:15:41 2001
 @@ -717,6 +717,7 @@
      int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;
      int ix, iy;
@@ -84,9 +48,9 @@ diff -Nru WindowMaker-0.63.1/src/appicon.c WindowMaker-0.63.1.new/src/appicon.c
            break;
        }
      }
-diff -Nru WindowMaker-0.63.1/src/defaults.c WindowMaker-0.63.1.new/src/defaults.c
+diff -Naur WindowMaker-0.63.1/src/defaults.c WindowMaker-0.63.1-p/src/defaults.c
 --- WindowMaker-0.63.1/src/defaults.c  Sat Jan  6 22:28:02 2001
-+++ WindowMaker-0.63.1.new/src/defaults.c      Sun Jan  7 23:02:54 2001
++++ WindowMaker-0.63.1-p/src/defaults.c        Mon Jan  8 12:15:41 2001
 @@ -547,6 +547,9 @@
      {"DisableBlinking",       "NO",           NULL,
           &wPreferences.dont_blink,    getBool,        NULL
@@ -97,9 +61,9 @@ diff -Nru WindowMaker-0.63.1/src/defaults.c WindowMaker-0.63.1.new/src/defaults.
        /* style options */
      {"MenuStyle",     "normal",               seMenuStyles,
        &wPreferences.menu_style, getEnum,      setMenuStyle
-diff -Nru WindowMaker-0.63.1/src/dock.c WindowMaker-0.63.1.new/src/dock.c
+diff -Naur WindowMaker-0.63.1/src/dock.c WindowMaker-0.63.1-p/src/dock.c
 --- WindowMaker-0.63.1/src/dock.c      Wed Nov  1 16:40:16 2000
-+++ WindowMaker-0.63.1.new/src/dock.c  Sun Jan  7 23:02:54 2001
++++ WindowMaker-0.63.1-p/src/dock.c    Mon Jan  8 12:15:41 2001
 @@ -3752,7 +3752,7 @@
  
  
@@ -154,9 +118,9 @@ diff -Nru WindowMaker-0.63.1/src/dock.c WindowMaker-0.63.1.new/src/dock.c
  
      } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
                 aicon==scr->clip_icon) {
-diff -Nru WindowMaker-0.63.1/src/icon.c WindowMaker-0.63.1.new/src/icon.c
+diff -Naur WindowMaker-0.63.1/src/icon.c WindowMaker-0.63.1-p/src/icon.c
 --- WindowMaker-0.63.1/src/icon.c      Sat Jan  6 22:28:02 2001
-+++ WindowMaker-0.63.1.new/src/icon.c  Sun Jan  7 23:02:54 2001
++++ WindowMaker-0.63.1-p/src/icon.c    Mon Jan  8 12:15:41 2001
 @@ -874,6 +874,7 @@
      int dx=event->xbutton.x, dy=event->xbutton.y;
      int grabbed=0;