Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18235
Modified Files:
windowmaker.info windowmaker.patch
Log Message:
Revised Windowmaker packages, now hopefully compiles and runs correctly under
10.6. Thanks to dmacks for valuable hints
Index: windowmaker.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/windowmaker.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- windowmaker.info 16 Apr 2009 12:38:02 -0000 1.5
+++ windowmaker.info 5 Aug 2010 23:29:52 -0000 1.6
@@ -16,30 +16,51 @@
Package: windowmaker
Version: 0.92.0
-Revision: 13
+Revision: 14
Maintainer: Max Horn <[email protected]>
Depends: %N-shlibs (= %v-%r)
-BuildDepends: x11-dev, hermes, giflib, libpng3, libjpeg, libtiff,
libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, fink (>= 0.24.12)
+BuildDepends: <<
+ x11-dev,
+ hermes,
+ giflib,
+ libpng3,
+ libjpeg,
+ libtiff,
+ libgettext3-dev,
+ gettext-bin,
+ gettext-tools,
+ libiconv-dev,
+ fink (>= 0.24.12)
+<<
Source: ftp://www.windowmaker.org/pub/source/release/WindowMaker-%v.tar.bz2
Source-MD5: aaac5421b686ed2d3e6ab65229c98097
-SetLDFLAGS: -L/usr/X11R6/lib
-SetLIBS: -lintl -lX11
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-NoSetCPPFLAGS: true
-ConfigureParams: --enable-gnome --enable-xinerama --mandir=%p/share/man
--with-gnustepdir=%p/lib/GNUstep
+ConfigureParams: <<
+ --enable-gnome \
+ --enable-xinerama \
+ --mandir=%p/share/man \
+ --with-gnustepdir=%p/lib/GNUstep \
+ --x-includes=/usr/X11R6/include \
+ --x-libraries=/usr/X11R6/lib \
+
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:%p/lib/xft2/lib/pkgconfig:$PKG_CONFIG_PATH
\
+ ac_cv_c_inline_asm=no
+<<
PatchFile: %n.patch
-PatchFile-MD5: 347b53272c7d519cb6a66db91e146a94
+PatchFile-MD5: d74f6135ab7894732ab12fc0a95a04cd
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
- perl -pi.bak -e 's,hardcode_direct=yes,hardcode_direct=no,g' configure
- perl -pi.bak -e 's|/usr/local/Acrobat3/bin/acroread|open -b
com.adobe.Reader|g' WindowMaker/plmenu*
- perl -pi.bak -e 's|/usr/local/GNUstep|%p/GNUstep|g' WindowMaker/plmenu*
WindowMaker/menu*
- perl -pi.bak -e 's|/usr/local/share/WindowMaker|%p/share/WindowMaker|g'
WindowMaker/plmenu* WindowMaker/menu*
- perl -pi.bak -e 's|/usr/share/WindowMaker|%p/share/WindowMaker|g'
doc/wmaker.1x doc/sk/wmaker.1x
+ perl -pi -e 's,hardcode_direct=yes,hardcode_direct=no,g' configure
+ perl -pi -e 's|/usr/local/Acrobat3/bin/acroread|open -b com.adobe.Reader|g'
WindowMaker/plmenu*
+ perl -pi -e 's|/usr/local/GNUstep|%p/GNUstep|g' WindowMaker/plmenu*
WindowMaker/menu*
+ perl -pi -e 's|/usr/local/share/WindowMaker|%p/share/WindowMaker|g'
WindowMaker/plmenu* WindowMaker/menu*
+ perl -pi -e 's|/usr/share/WindowMaker|%p/share/WindowMaker|g' doc/wmaker.1x
doc/sk/wmaker.1x
+ perl -pi -e 's/(AM_CPPFLAGS.*)/\1 \...@xftflags\@/' WPrefs.app/Makefile.in
<<
CompileScript: <<
- export CPATH=%p/include ; ./configure %c ac_cv_c_inline_asm=no; make
+# export CPATH=%p/include ; ./configure %c ac_cv_c_inline_asm=no; make
+ env
+ ./configure %c; make
<<
InstallScript: <<
make install-strip DESTDIR=%d
@@ -59,7 +80,7 @@
Replaces: %N (<= 0.80.0-5)
Depends: x11, hermes-shlibs, giflib-bin, libpng3-shlibs, libjpeg-shlibs,
libtiff-shlibs, libgettext3-shlibs
Files: lib/libwraster.*.dylib
- Shlibs: %p/lib/libwraster.2.dylib 5.0.0 %n (>= 0.80.2-11)
+ Shlibs: %p/lib/libwraster.3.dylib 5.0.0 %n (>= 0.92.0-14)
DocFiles: COPYING* README* AUTHORS BUGS FAQ* NEWS
<<
SplitOff2: <<
@@ -75,18 +96,16 @@
The man pages must be renamed so that Darwin's man command can find
them.
-The locale workaround in recent CVS versions of XFree86 requires that
-every program is linked with libX11. Window Maker detects the
-workaround, but doesn't add the link flags. So we add them to LDFLAGS
-and LIBS.
+We disable inline assembler (for Intel/MMX) code, because it causes
+a compiler error.
-Earlier versions by Christoph Pfisterer
+Needs help to link against the right library.
<<
DescPackaging: <<
The GNUstep directory, in which applications like WPrefs.app reside, is
configured to be %p/lib/GNUstep/Applications.
-Needs help to link against the right library.
+Earlier versions by Christoph Pfisterer
<<
DescUsage: <<
Before you can use Window Maker, you must run 'wmaker.inst' to set up
Index: windowmaker.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11-wm/windowmaker.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- windowmaker.patch 20 Jan 2006 20:34:22 -0000 1.1
+++ windowmaker.patch 5 Aug 2010 23:29:52 -0000 1.2
@@ -1,6 +1,24 @@
+diff -ru WindowMaker-0.92.0/WINGs/Examples/Makefile.in
WindowMaker-0.92.0-patched/WINGs/Examples/Makefile.in
+--- WindowMaker-0.92.0/WINGs/Examples/Makefile.in 2005-06-19
05:23:00.000000000 +0200
++++ WindowMaker-0.92.0-patched/WINGs/Examples/Makefile.in 2010-08-06
01:02:07.000000000 +0200
+@@ -127,12 +127,12 @@
+
+ connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+
+-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@
@NETLIBS@ @INTLIBS@
++connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@
@NETLIBS@ @INTLIBS@ @XLIBS@
+
+
+ server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+
+-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@
@NETLIBS@ @INTLIBS@
++server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@
@NETLIBS@ @INTLIBS@ @XLIBS@
+
+
+ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
diff -ru WindowMaker-0.92.0/WINGs/wapplication.c
WindowMaker-0.92.0-patched/WINGs/wapplication.c
--- WindowMaker-0.92.0/WINGs/wapplication.c 2004-10-24 05:13:29.000000000
+0200
-+++ WindowMaker-0.92.0-patched/WINGs/wapplication.c 2005-08-20
16:49:22.000000000 +0200
++++ WindowMaker-0.92.0-patched/WINGs/wapplication.c 2010-08-06
00:24:49.000000000 +0200
@@ -175,12 +175,6 @@
}
}
@@ -25,7 +43,7 @@
return path;
diff -ru WindowMaker-0.92.0/WPrefs.app/Menu.c
WindowMaker-0.92.0-patched/WPrefs.app/Menu.c
--- WindowMaker-0.92.0/WPrefs.app/Menu.c 2004-10-26 04:23:39.000000000
+0200
-+++ WindowMaker-0.92.0-patched/WPrefs.app/Menu.c 2005-08-10
14:10:39.000000000 +0200
++++ WindowMaker-0.92.0-patched/WPrefs.app/Menu.c 2010-08-06
00:24:49.000000000 +0200
@@ -577,7 +577,7 @@
data->param.exec.command = "xv";
@@ -58,7 +76,7 @@
smenu = putNewSubmenu(pad, _("Assorted XTerms"));
diff -ru WindowMaker-0.92.0/WPrefs.app/Paths.c
WindowMaker-0.92.0-patched/WPrefs.app/Paths.c
--- WindowMaker-0.92.0/WPrefs.app/Paths.c 2004-10-12 22:18:33.000000000
+0200
-+++ WindowMaker-0.92.0-patched/WPrefs.app/Paths.c 2005-08-10
14:09:53.000000000 +0200
++++ WindowMaker-0.92.0-patched/WPrefs.app/Paths.c 2010-08-06
00:24:49.000000000 +0200
@@ -86,9 +86,7 @@
addPathToList(panel->icoL, -1, "~/pixmaps");
addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
@@ -81,7 +99,7 @@
val = WMGetFromPLArray(array, i);
diff -ru WindowMaker-0.92.0/WindowMaker/Defaults/WindowMaker.in
WindowMaker-0.92.0-patched/WindowMaker/Defaults/WindowMaker.in
--- WindowMaker-0.92.0/WindowMaker/Defaults/WindowMaker.in 2004-10-27
05:01:38.000000000 +0200
-+++ WindowMaker-0.92.0-patched/WindowMaker/Defaults/WindowMaker.in
2005-08-10 15:20:20.000000000 +0200
++++ WindowMaker-0.92.0-patched/WindowMaker/Defaults/WindowMaker.in
2010-08-06 00:24:49.000000000 +0200
@@ -14,9 +14,9 @@
"#pkgdatadir#/Pixmaps",
"/usr/X11R6/include/X11/pixmaps",
@@ -105,7 +123,7 @@
IconSize = 64;
diff -ru WindowMaker-0.92.0/contrib/WindowMaker.spec.in
WindowMaker-0.92.0-patched/contrib/WindowMaker.spec.in
--- WindowMaker-0.92.0/contrib/WindowMaker.spec.in 2004-10-24
05:14:42.000000000 +0200
-+++ WindowMaker-0.92.0-patched/contrib/WindowMaker.spec.in 2005-08-10
15:20:20.000000000 +0200
++++ WindowMaker-0.92.0-patched/contrib/WindowMaker.spec.in 2010-08-06
00:24:49.000000000 +0200
@@ -44,7 +44,7 @@
%build
CFLAGS="$RPM_OPT_FLAGS";
@@ -128,15 +146,26 @@
/usr/man/*/*
/usr/man/*/*/*
+diff -ru WindowMaker-0.92.0/util/Makefile.in
WindowMaker-0.92.0-patched/util/Makefile.in
+--- WindowMaker-0.92.0/util/Makefile.in 2005-06-19 05:23:00.000000000
+0200
++++ WindowMaker-0.92.0-patched/util/Makefile.in 2010-08-06
01:06:52.000000000 +0200
+@@ -124,7 +124,7 @@
+ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib
@HEADER_SEARCH_PATH@ -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
+
+
+-liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@
++liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@ @XLIBS@
+
+ wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
+
diff -ru WindowMaker-0.92.0/util/wmaker.inst.in
WindowMaker-0.92.0-patched/util/wmaker.inst.in
--- WindowMaker-0.92.0/util/wmaker.inst.in 2005-04-08 13:24:14.000000000
+0200
-+++ WindowMaker-0.92.0-patched/util/wmaker.inst.in 2005-08-10
15:14:53.000000000 +0200
-@@ -40,13 +40,15 @@
++++ WindowMaker-0.92.0-patched/util/wmaker.inst.in 2010-08-06
01:22:37.000000000 +0200
+@@ -40,13 +40,14 @@
cat << EOF >> $ISCRIPT
# Window Maker default X session startup script
-PATH="\$PATH:$BINDIR"
-+export DYLD_FALLBACK_LIBRARY_PATH=:
+. @PREFIX@/bin/init.sh
# If you login from xdm, uncomment this to make error messages appear
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
