Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/x11-wm
In directory vz-cvs-3.sog:/tmp/cvs-serv20290
Added Files:
windowmaker.info windowmaker.patch
Log Message:
Works for me; with libversion upgrades and misc dep cleanups; all okay
w/maintainer
--- NEW FILE: windowmaker.info ---
# DISCLAIMER: Max Horn is the sole maintainer of this package.
# Please DO NOT MAKE MODIFICATIONS without informing the maintainer.
# Preferably, send a patch to me instead of making changes yourself!
# If that is not possible due to extra urgency, at least send me a mail.
#
# Explanation: I am sick and tired of getting back to my packages and
# discovering that people have messed with it. I am then forced to
# retrace their steps, find out who, when and why did make a certain
# change etc. -- i.e. it makes my life as maintainer harder.
# Furthermore, as maintainer I am responsible for problems caused by my
# packages. But I am not willing to take responsibility for something I
# did not do. In particular, for changes that other people introduced
# behind my back, no matter how good and noble their intentions were. As
# such, I may see myself forced to drop responsibility for (and hence,
# maintainership of) the affected package.
Package: windowmaker
Version: 0.92.0
Revision: 15
Maintainer: Max Horn <m...@quendi.de>
Depends: <<
%N-shlibs (= %v-%r),
fontconfig2-shlibs (>= 2.8.0-4),
freetype219-shlibs (>= 2.3.12-1),
libjpeg8-shlibs,
libpng15-shlibs,
libtiff-shlibs,
x11-shlibs,
xft2-shlibs (>= 2.1.14-1)
<<
BuildDepends: <<
x11-dev,
fontconfig2-dev (>= 2.8.0-4),
freetype219 (>= 2.3.12-1),
giflib,
libpng15,
libjpeg8,
libtiff,
libgettext8-dev,
gettext-bin,
gettext-tools,
fink-package-precedence,
xft2-dev (>= 2.1.14-1)
<<
Source: ftp://www.windowmaker.org/pub/source/release/WindowMaker-%v.tar.bz2
Source-MD5: aaac5421b686ed2d3e6ab65229c98097
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
SetCPPFLAGS: -MD
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:$PKG_CONFIG_PATH \
ac_cv_c_inline_asm=no
<<
PatchFile: %n.patch
PatchFile-MD5: a2d5233ce9ab921cf6a46aee39741dff
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
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: <<
%{default_script}
fink-package-precedence --depfile-ext='\.d' .
<<
InstallScript: <<
make install-strip DESTDIR=%d
(cd %i/share/man/man1 ; for i in geticonset getstyle seticons setstyle wdwrite
wmaker wmsetbg wxcopy wxpaste ; do mv $i.1x $i.1 ; done )
(cd %i/share/man/sk/man1 ; for i in geticonset getstyle seticons setstyle
wdwrite wmaker wmsetbg wxcopy wxpaste ; do mv $i.1x $i.1 ; done )
rmdir %i/lib/locale
<<
ConfFiles: <<
%p/etc/WindowMaker/WindowMaker
%p/etc/WindowMaker/WMGLOBAL
%p/etc/WindowMaker/WMRootMenu
%p/etc/WindowMaker/WMState
%p/etc/WindowMaker/WMWindowAttributes
<<
SplitOff: <<
Package: %N-shlibs
Replaces: %N (<= 0.80.0-5)
Depends: x11, giflib-bin, giflib-shlibs, libpng15-shlibs, libjpeg8-shlibs,
libtiff-shlibs
Files: lib/libwraster.*.dylib
Shlibs: %p/lib/libwraster.3.dylib 5.0.0 %n (>= 0.92.0-14)
DocFiles: COPYING* README* AUTHORS BUGS FAQ* NEWS
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
Files: include lib/libwraster.dylib lib/*.a lib/*.la
DocFiles: COPYING* README* AUTHORS BUGS FAQ* NEWS
<<
DocFiles: COPYING* README* AUTHORS BUGS FAQ* NEWS
Description: GNUstep (NeXT-like) Window Manager
DescPort: <<
The man pages must be renamed so that Darwin's man command can find
them.
We disable inline assembler (for Intel/MMX) code, because it causes
a compiler error.
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.
Earlier versions by Christoph Pfisterer
<<
DescUsage: <<
Before you can use Window Maker, you must run 'wmaker.inst' to set up
the preferences files for your account. That script can also create
an appropriate .xinitrc file to start Window Maker as your default
window manager.
To use Window Maker with GNOME, leave .xinitrc alone and instead
select Window Maker in the Window Manager panel of the GNOME Control
Center.
<<
License: GPL
Homepage: http://www.windowmaker.org/
--- NEW FILE: windowmaker.patch ---
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 2010-08-06
00:24:49.000000000 +0200
@@ -175,12 +175,6 @@
}
}
- path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
- if (path) {
- wfree(appdir);
- return path;
- }
-
if (getenv("GNUSTEP_SYSTEM_ROOT")) {
path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource);
@@ -190,7 +184,7 @@
}
}
- path = checkFile("/usr/GNUstep", appdir, ext, resource);
+ path = checkFile("@PREFIX@/lib/GNUstep", appdir, ext, resource);
if (path) {
wfree(appdir);
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 2010-08-06
00:24:49.000000000 +0200
@@ -577,7 +577,7 @@
data->param.exec.command = "xv";
data = putNewItem(panel, pad, ExecInfo, _("Acrobat Reader"));
- data->param.exec.command = "acroread ||
/usr/local/Acrobat4/bin/acroread";
+ data->param.exec.command = "open -b com.adobe.Reader";
data = putNewItem(panel, pad, ExecInfo, _("ghostview"));
data->param.exec.command = "gv";
@@ -616,17 +616,17 @@
data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
data->param.directory.command = "setstyle";
- data->param.directory.directory = "/usr/share/WindowMaker/Themes
/usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
+ data->param.directory.directory = "@PREFIX@/share/WindowMaker/Themes
$HOME/GNUstep/Library/WindowMaker/Themes";
data->param.directory.stripExt = 1;
data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
data->param.directory.command = "wmsetbg -u -s";
- data->param.directory.directory = "/opt/kde2/share/wallpapers
/usr/share/WindowMaker/Backgrounds
$HOME/GNUstep/Library/WindowMaker/Backgrounds";
+ data->param.directory.directory =
"@PREFIX@/share/WindowMaker/Backgrounds
$HOME/GNUstep/Library/WindowMaker/Backgrounds";
data->param.directory.stripExt = 1;
data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (tile)"));
data->param.directory.command = "wmsetbg -u -t";
- data->param.directory.directory = "/opt/kde2/share/wallpapers
/usr/share/WindowMaker/Backgrounds
$HOME/GNUstep/Library/WindowMaker/Backgrounds";
+ data->param.directory.directory =
"@PREFIX@/share/WindowMaker/Backgrounds
$HOME/GNUstep/Library/WindowMaker/Backgrounds";
data->param.directory.stripExt = 1;
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 2010-08-06
00:24:49.000000000 +0200
@@ -86,9 +86,7 @@
addPathToList(panel->icoL, -1, "~/pixmaps");
addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
- addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
+ addPathToList(panel->icoL, -1, "@PREFIX@/share/WindowMaker/Icons");
} else {
for (i=0; i<WMGetPropListItemCount(array); i++) {
val = WMGetFromPLArray(array, i);
@@ -102,7 +100,7 @@
wwarning(_("bad value in option PixmapPath. Using default path
list"));
addPathToList(panel->pixL, -1, "~/pixmaps");
addPathToList(panel->pixL, -1,
"~/GNUstep/Library/WindowMaker/Pixmaps");
- addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
+ addPathToList(panel->pixL, -1,
"@PREFIX@/local/share/WindowMaker/Pixmaps");
} else {
for (i=0; i<WMGetPropListItemCount(array); i++) {
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
2010-08-06 00:24:49.000000000 +0200
@@ -14,9 +14,9 @@
"#pkgdatadir#/Pixmaps",
"/usr/X11R6/include/X11/pixmaps",
"~/GNUstep/Library/WindowMaker/Pixmaps",
- "/usr/share/icons",
+ "@PREFIX@/share/icons",
"/usr/local/share/pixmaps",
- "/usr/share/pixmaps"
+ "@PREFIX@/share/pixmaps"
);
PixmapPath = (
"~/GNUstep/Library/WindowMaker/Pixmaps",
@@ -25,7 +25,7 @@
"#pkgdatadir#/Backgrounds",
"/usr/X11R6/include/X11/pixmaps",
"/usr/local/share/pixmaps",
- "/usr/share/pixmaps"
+ "@PREFIX@/share/pixmaps"
);
WindowTitleBalloons = YES;
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 2010-08-06
00:24:49.000000000 +0200
@@ -44,7 +44,7 @@
%build
CFLAGS="$RPM_OPT_FLAGS";
LINGUAS="@supported_locales@";
-NLSDIR="/usr/share/locale";
+NLSDIR="@PREFIX@/share/locale";
GNUSTEP_LOCAL_ROOT='$(prefix)/X11R6/lib/GNUstep';
export CFLAGS LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT;
@@ -78,9 +78,9 @@
/usr/X11R6/lib/lib*
/usr/X11R6/lib/GNUstep/Applications/WPrefs.app
/usr/include/*
-/usr/share/WindowMaker
-/usr/share/locale/*/LC_MESSAGES/*
-/usr/share/WINGs
+@PREFIX@/share/WindowMaker
+@PREFIX@/share/locale/*/LC_MESSAGES/*
+@PREFIX@/share/WINGs
/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 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"
+. @PREFIX@/bin/init.sh
# If you login from xdm, uncomment this to make error messages appear
# in the console window.
#
# tail -f $HOME/.xsession-errors > /dev/console &
+quartz-wm --only-proxy &
exec wmaker
EOF
diff -ru WindowMaker-0.92.0/wrlib/png.c WindowMaker-0.92.0-patched/wrlib/png.c
--- WindowMaker-0.92.0/wrlib/png.c 2004-10-12 14:22:04.000000000 -0400
+++ WindowMaker-0.92.0-patched/wrlib/png.c 2011-11-02 15:43:28.000000000
-0400
@@ -97,7 +97,7 @@
}
RErrorCode = RERR_INTERNAL;
- if (setjmp(png->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png))) {
fclose(f);
png_destroy_read_struct(&png, &pinfo, &einfo);
if (image)
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
