diff -ru WindowMaker-0.50.1/Makefile.am wmaker_0.50.1.patched/Makefile.am --- WindowMaker-0.50.1/Makefile.am Fri Jan 8 21:27:49 1999 +++ wmaker_0.50.1.patched/Makefile.am Sat Jan 9 08:59:18 1999 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = libPropList wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc +SUBDIRS = @libPropList_SRCS@ wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS Install acconfig.h\ mkpatch README.KDE Only in WindowMaker-0.50.1: Makefile.in diff -ru WindowMaker-0.50.1/WINGs/Makefile.am wmaker_0.50.1.patched/WINGs/Makefile.am --- WindowMaker-0.50.1/WINGs/Makefile.am Fri Jan 8 21:27:49 1999 +++ wmaker_0.50.1.patched/WINGs/Makefile.am Sat Jan 9 08:59:18 1999 @@ -7,14 +7,14 @@ LIBLIST= $(top_builddir)/wrlib/libwraster.la\ @GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ \ - -lm $(top_builddir)/libPropList/libPropList.la + -lm @libPropList_LIBS@ -#lib_LTLIBRARIES = libWINGs.la +lib_LTLIBRARIES = libWINGs.la -lib_LIBRARIES = libWINGs.a +#lib_LIBRARIES = libWINGs.a -#libWINGs_la_LDFLAGS = -version-info 1:1:0 +libWINGs_la_LDFLAGS = -static include_HEADERS = WINGs.h WUtil.h WINGsP.h @@ -24,32 +24,32 @@ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h -testmywidget_LDADD = libWINGs.a $(LIBLIST) +testmywidget_LDADD = $(top_builddir)/WINGs/libWINGs.la $(LIBLIST) fontl_SOURCES = fontl.c -fontl_LDADD = libWINGs.a $(LIBLIST) +fontl_LDADD = $(top_builddir)/WINGs/libWINGs.la $(LIBLIST) wtest_SOURCES = wtest.c -wtest_LDADD = libWINGs.a $(LIBLIST) +wtest_LDADD = $(top_builddir)/WINGs/libWINGs.la $(LIBLIST) -wtest_DEPENDENCIES = libWINGs.a +wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la wmfile_SOURCES = wmfile.c -wmfile_LDADD = libWINGs.a $(LIBLIST) +wmfile_LDADD = $(top_builddir)/WINGs/libWINGs.la $(LIBLIST) wmquery_SOURCES = wmquery.c -wmquery_LDADD = libWINGs.a $(LIBLIST) +wmquery_LDADD = $(top_builddir)/WINGs/libWINGs.la $(LIBLIST) EXTRA_DIST = logo.xpm # wbutton.c -libWINGs_a_SOURCES = \ +libWINGs_la_SOURCES = \ WINGs.h \ WINGsP.h \ configuration.c \ @@ -91,7 +91,6 @@ ## Find a better way than $(GFXFLAGS) to inform widgets.c wich of ## tiff or xpm images should be used -INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ +INCLUDES = -D_REENTRANT -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ -DRESOURCE_PATH=\"$(datadir)/WINGs\" $(GFXFLAGS) -DDEBUG \ - -I$(top_srcdir)/libPropList @XCFLAGS@ - + @libPropList_INCS@ @XCFLAGS@ Only in WindowMaker-0.50.1/WINGs: Makefile.in Only in WindowMaker-0.50.1/WINGs/Resources: Makefile.in diff -ru WindowMaker-0.50.1/WPrefs.app/Makefile.am wmaker_0.50.1.patched/WPrefs.app/Makefile.am --- WindowMaker-0.50.1/WPrefs.app/Makefile.am Tue Jan 5 08:00:00 1999 +++ wmaker_0.50.1.patched/WPrefs.app/Makefile.am Sat Jan 9 08:43:00 1999 @@ -51,15 +51,15 @@ INCLUDES = \ -I$(top_srcdir)/wrlib \ -I$(top_srcdir)/WINGs \ - -I$(top_srcdir)/libPropList \ + @libPropList_INCS@ \ @XCFLAGS@ -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 \ - $(top_builddir)/libPropList/libPropList.la \ + @libPropList_LIBS@ \ @GFXLFLAGS@ \ @XLFLAGS@ \ @GFXLIBS@ \ Only in WindowMaker-0.50.1/WPrefs.app: Makefile.in diff -ru WindowMaker-0.50.1/WPrefs.app/po/Makefile.am wmaker_0.50.1.patched/WPrefs.app/po/Makefile.am --- WindowMaker-0.50.1/WPrefs.app/po/Makefile.am Fri Jan 8 21:27:51 1999 +++ wmaker_0.50.1.patched/WPrefs.app/po/Makefile.am Sat Jan 9 08:59:18 1999 @@ -1,8 +1,8 @@ -nlsdir = @NLSDIR@ +nlsdir = $(DESTDIR)/@NLSDIR@ CATALOGS = @WPMOFILES@ -CLEANFILES = $(CATALOGS) +CLEANFILES = $(CATALOGS) WPrefs.pot EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po Only in WindowMaker-0.50.1/WPrefs.app/po: Makefile.in diff -ru WindowMaker-0.50.1/WPrefs.app/po/hr.po wmaker_0.50.1.patched/WPrefs.app/po/hr.po --- WindowMaker-0.50.1/WPrefs.app/po/hr.po Tue Jan 5 08:00:00 1999 +++ wmaker_0.50.1.patched/WPrefs.app/po/hr.po Sat Jan 9 08:43:00 1999 @@ -1271,4 +1271,3 @@ # msgid "Icon Size" # msgstr "Veličina ikone" # - \ No newline at end of file Only in WindowMaker-0.50.1/WPrefs.app/tiff: Makefile.in Only in WindowMaker-0.50.1/WPrefs.app/xpm: Makefile.in Only in WindowMaker-0.50.1/WindowMaker/Backgrounds: Makefile.in diff -ru WindowMaker-0.50.1/WindowMaker/Defaults/Makefile.am wmaker_0.50.1.patched/WindowMaker/Defaults/Makefile.am --- WindowMaker-0.50.1/WindowMaker/Defaults/Makefile.am Tue Jan 5 08:00:00 1999 +++ wmaker_0.50.1.patched/WindowMaker/Defaults/Makefile.am Sun Nov 29 20:07:21 1998 @@ -18,7 +18,7 @@ sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in > WindowMaker chmod 644 WindowMaker -WMState: $(srcdir)/WMState.in ./Makefile +WMState: $(srcdir)/WMState.in $(srcdir)/Makefile -rm -f WMState sed -e "s:#wprefs#:$(wprefsdir)/WPrefs:" $(srcdir)/WMState.in > WMState chmod 644 WMState Only in WindowMaker-0.50.1/WindowMaker/Defaults: Makefile.in diff -ru WindowMaker-0.50.1/WindowMaker/Makefile.am wmaker_0.50.1.patched/WindowMaker/Makefile.am --- WindowMaker-0.50.1/WindowMaker/Makefile.am Fri Jan 8 21:27:51 1999 +++ wmaker_0.50.1.patched/WindowMaker/Makefile.am Sat Jan 9 08:59:18 1999 @@ -1,6 +1,6 @@ SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes -prefsdatadir = $(pkgdatadir) +prefsdatadir = $(sysconfdir) prefsdata_DATA =\ README\ Only in WindowMaker-0.50.1/WindowMaker: Makefile.in Only in WindowMaker-0.50.1/WindowMaker/Pixmaps: Makefile.in Only in wmaker_0.50.1.patched/WindowMaker: Sounds Only in WindowMaker-0.50.1/WindowMaker/Styles: Makefile.in Only in WindowMaker-0.50.1/WindowMaker/Themes/Checker.themed: Makefile.in Only in WindowMaker-0.50.1/WindowMaker/Themes: Makefile.in Only in WindowMaker-0.50.1/WindowMaker/Themes/Night.themed: Makefile.in Only in wmaker_0.50.1.patched/WindowMaker: appearance.menu Only in wmaker_0.50.1.patched/WindowMaker: background.menu diff -ru WindowMaker-0.50.1/WindowMaker/menu wmaker_0.50.1.patched/WindowMaker/menu --- WindowMaker-0.50.1/WindowMaker/menu Fri Jan 8 21:27:51 1999 +++ wmaker_0.50.1.patched/WindowMaker/menu Sat Jan 9 08:59:18 1999 @@ -209,5 +209,3 @@ "Kill session..." SHUTDOWN "Exit" END "Applications" END - - diff -ru WindowMaker-0.50.1/WindowMaker/menu.gl wmaker_0.50.1.patched/WindowMaker/menu.gl --- WindowMaker-0.50.1/WindowMaker/menu.gl Tue Jan 5 08:00:00 1999 +++ wmaker_0.50.1.patched/WindowMaker/menu.gl Sun Nov 29 18:37:35 1998 @@ -118,8 +118,6 @@ #if (UID==0) // Só o ve root ou usuarios con UID=0 "Sistema" MENU - // Panel de control - "Panel de control de RH" EXEC control-panel "Sistema" END #endif "Sair" MENU Only in WindowMaker-0.50.1: aclocal.m4 Only in WindowMaker-0.50.1: config.guess Only in WindowMaker-0.50.1: config.sub Only in WindowMaker-0.50.1: configure diff -ru WindowMaker-0.50.1/configure.in wmaker_0.50.1.patched/configure.in --- WindowMaker-0.50.1/configure.in Fri Jan 8 21:27:52 1999 +++ wmaker_0.50.1.patched/configure.in Sat Jan 9 08:59:18 1999 @@ -27,11 +27,49 @@ ;; esac - - dnl configure/build bundled libraries dnl =================================== -AC_CONFIG_SUBDIRS(libPropList) +dnl AC_CONFIG_SUBDIRS(libPropList) + + +dnl Deal with libPropList issues +dnl ============================ + +AC_ARG_WITH(lPL-incs, +[ --with-lPL-incs=PATH location of libPropList headers ]) + +AC_ARG_WITH(lPL-libs, +[ --with-lPL-libs=PATH location of libPropList libraries ]) + +dnl This is nasty, but since two values are needed for correct operation, +dnl there's no other way arround it. +dnl +dnl if both LPL_INCS and LPL_LIBS are empty, use the supplied libPropList +dnl if LPL_INCS is NOT empty, test if LPL_LIBS IS empty, and put a default +dnl value there. +dnl if LPL_INCS is EMPTY, LPL_LIBS is not, and a default value for LPL_INCS +dnl is needed. + +if test -z "$with_lPL_incs" -a -z "$with_lPL_libs" ; then + AC_CONFIG_SUBDIRS(libPropList) + libPropList_SRCS=libPropList + libPropList_INCS='-I$(top_srcdir)/libPropList' + libPropList_LIBS='$(top_builddir)/libPropList/libPropList.la' +else + libPropList_SRCS='' + libPropList_INCS='' + libPropList_LIBS='-lPropList' + if test "${with_lPL_incs+notset}" = notset; then + libPropList_INCS="-I$with_lPL_incs" + fi + if test "${with_lPL_libs+notset}" = notset ; then + libPropList_LIBS="-L$with_lPL_libs -lPropList" + fi +fi + +AC_SUBST(libPropList_SRCS) +AC_SUBST(libPropList_INCS) +AC_SUBST(libPropList_LIBS) AM_CONFIG_HEADER(src/config.h) diff -ru WindowMaker-0.50.1/po/Makefile.am wmaker_0.50.1.patched/po/Makefile.am --- WindowMaker-0.50.1/po/Makefile.am Fri Jan 8 21:27:53 1999 +++ wmaker_0.50.1.patched/po/Makefile.am Sat Jan 9 08:59:18 1999 @@ -1,8 +1,8 @@ -nlsdir = @NLSDIR@ +nlsdir = $(DESTDIR)/@NLSDIR@ CATALOGS = @MOFILES@ -CLEANFILES = $(CATALOGS) +CLEANFILES = $(CATALOGS) WindowMaker.pot EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po \ no.po ru.po tr.po fi.po hr.po el.po pl.po ja.po.broken ro.po Only in WindowMaker-0.50.1/po: Makefile.in diff -ru WindowMaker-0.50.1/src/Makefile.am wmaker_0.50.1.patched/src/Makefile.am --- WindowMaker-0.50.1/src/Makefile.am Tue Jan 5 08:00:00 1999 +++ wmaker_0.50.1.patched/src/Makefile.am Sat Jan 9 11:06:07 1999 @@ -110,15 +110,15 @@ INCLUDES = \ - -I$(top_srcdir)/libPropList \ + @libPropList_INCS@ \ -I$(top_srcdir)/wrlib \ -I$(top_srcdir)/WINGs @XCFLAGS@ wmaker_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a\ + $(top_builddir)/WINGs/libWINGs.la\ $(top_builddir)/wrlib/libwraster.la\ - $(top_builddir)/libPropList/libPropList.la\ + @libPropList_LIBS@\ @GFXLFLAGS@ \ @XLFLAGS@ \ @GFXLIBS@ \ Only in WindowMaker-0.50.1/src: Makefile.in Only in WindowMaker-0.50.1/src: wconfig.h diff -ru WindowMaker-0.50.1/src/window.c wmaker_0.50.1.patched/src/window.c --- WindowMaker-0.50.1/src/window.c Fri Jan 8 21:27:54 1999 +++ wmaker_0.50.1.patched/src/window.c Sat Jan 9 08:59:18 1999 @@ -1449,8 +1449,8 @@ } } else { width = (height * sizeh->min_aspect.x) / sizeh->min_aspect.y; - if (width > sizeh->min_width) { - width = sizeh->min_width; + if (width > sizeh->max_width) { + width = sizeh->max_width; height = (width*sizeh->min_aspect.y) / sizeh->min_aspect.x; } } diff -ru WindowMaker-0.50.1/test/Makefile.am wmaker_0.50.1.patched/test/Makefile.am --- WindowMaker-0.50.1/test/Makefile.am Tue Jan 5 08:00:00 1999 +++ wmaker_0.50.1.patched/test/Makefile.am Sat Jan 9 08:43:02 1999 @@ -8,7 +8,7 @@ wtest_SOURCES = wtest.c -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib Only in WindowMaker-0.50.1/test: Makefile.in diff -ru WindowMaker-0.50.1/util/Makefile.am wmaker_0.50.1.patched/util/Makefile.am --- WindowMaker-0.50.1/util/Makefile.am Fri Jan 8 21:27:54 1999 +++ wmaker_0.50.1.patched/util/Makefile.am Sat Jan 9 08:43:02 1999 @@ -9,11 +9,11 @@ EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont -INCLUDES = @DFLAGS@ -I$(top_srcdir)/wrlib -I$(top_srcdir)/libPropList\ +INCLUDES = @DFLAGS@ -I$(top_srcdir)/wrlib @libPropList_INCS@\ @XCFLAGS@ @GFXFLAGS@ # X_EXTRA_LIBS is for libproplist in systems that need -lsocket -liblist= $(top_builddir)/libPropList/libPropList.la @X_EXTRA_LIBS@ +liblist= @libPropList_LIBS@ @X_EXTRA_LIBS@ wdwrite_LDADD = $(liblist) @@ -30,10 +30,9 @@ geticonset_LDADD= $(liblist) -wmsetbg_LDADD = \ +wmsetbg_LDADD = @libPropList_LIBS@ \ $(top_builddir)/wrlib/libwraster.la \ - $(top_builddir)/WINGs/libWINGs.a \ - $(top_builddir)/libPropList/libPropList.la \ + $(top_builddir)/WINGs/libWINGs.la \ @GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm getstyle_SOURCES = getstyle.c Only in WindowMaker-0.50.1/util: Makefile.in diff -ru WindowMaker-0.50.1/wmlib/Makefile.am wmaker_0.50.1.patched/wmlib/Makefile.am --- WindowMaker-0.50.1/wmlib/Makefile.am Tue Jan 5 08:00:00 1999 +++ wmaker_0.50.1.patched/wmlib/Makefile.am Sun Nov 29 19:24:27 1998 @@ -1,13 +1,15 @@ AUTOMAKE_OPTIONS = no-dependencies -lib_LIBRARIES = libWMaker.a +lib_LTLIBRARIES = libWMaker.la + +libWMaker_la_LDFLAGS = -version-info 0:0:0 -lc @XLFLAGS@ @GFXLIBS@ include_HEADERS = WMaker.h -INCLUDES = @DFLAGS@ @XCFLAGS@ +INCLUDES = -D_REENTRANT @DFLAGS@ @XCFLAGS@ -libWMaker_a_SOURCES = \ +libWMaker_la_SOURCES = \ menu.c \ app.c \ event.c \ Only in WindowMaker-0.50.1/wmlib: Makefile.in diff -ru WindowMaker-0.50.1/wrlib/Makefile.am wmaker_0.50.1.patched/wrlib/Makefile.am --- WindowMaker-0.50.1/wrlib/Makefile.am Tue Jan 5 08:00:00 1999 +++ wmaker_0.50.1.patched/wrlib/Makefile.am Sat Jan 9 08:43:02 1999 @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libwraster.la -libwraster_la_LDFLAGS = -version-info 1:1:0 +libwraster_la_LDFLAGS = -version-info 1:1:0 -lc @XLFLAGS@ @GFXLIBS@ noinst_PROGRAMS = test testgrad testdraw view @@ -35,9 +35,9 @@ gif.c -INCLUDES = @DFLAGS@ @XCFLAGS@ @GFXFLAGS@ @XSHM@ +INCLUDES = -D_REENTRANT @DFLAGS@ @XCFLAGS@ @GFXFLAGS@ @XSHM@ -LIBLIST = libwraster.la @GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm +LIBLIST = $(top_builddir)/wrlib/libwraster.la @GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm view_SOURCES= view.c Only in WindowMaker-0.50.1/wrlib: Makefile.in