- long overdue major update of afterstep to 2.2.9...too many changes to list here

This commit is contained in:
jasper 2009-12-06 15:09:22 +00:00
parent 894e572092
commit 31ebff5110
22 changed files with 1742 additions and 668 deletions

View File

@ -1,42 +1,55 @@
# $OpenBSD: Makefile,v 1.31 2009/12/03 12:37:24 jasper Exp $
# $OpenBSD: Makefile,v 1.32 2009/12/06 15:09:22 jasper Exp $
COMMENT= window manager, continuation of the Bowman NeXTSTEP clone
DISTNAME= AfterStep-1.8.9
PKGNAME= ${DISTNAME:L}p0
DISTNAME= AfterStep-2.2.9
PKGNAME= ${DISTNAME:L}
CATEGORIES= x11
MASTER_SITES= ftp://ftp.afterstep.org/stable/
HOMEPAGE= http://www.afterstep.org/
RUN_DEPENDS= :asclock-*:x11/asclock,classic,english
LIB_DEPENDS= png.>=2::graphics/png \
jpeg.>=62::graphics/jpeg \
rplay::audio/rplay
# GPLv2/LGPLv2/X11
# MIT
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE SM X11 Xext Xpm c m z
WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0
WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
WANTLIB += png pthread pthread-stubs tiff xcb z
MODULES= devel/gettext
RUN_DEPENDS= ::shells/bash \
:asclock-*:x11/asclock,classic,english \
::x11/aterm
LIB_DEPENDS= dbus-1::x11/dbus \
rsvg-2::x11/gnome/librsvg
FAKE= lib
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-different-looknfeels \
--with-helpcommand="xterm -e man" \
--with-jpeg-includes=${DEPBASE}/include \
--with-jpeg-library=${DEPBASE}/lib \
--with-png-includes=${DEPBASE}/include/libpng \
--with-png-library=${DEPBASE}/lib
CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \
LDFLAGS="-L${DEPBASE}/lib" \
CFLAGS="${CFLAGS} -fsigned-char"
CONFIGURE_ARGS= --with-helpcommand="aterm -e man" \
--with-jpeg-includes=${LOCALBASE}/include \
--with-jpeg-library=${LOCALBASE}/lib \
--with-png-includes=${LOCALBASE}/include/libpng \
--with-png-library=${LOCALBASE}/lib \
--disable-send-postcard-to-developer \
--enable-i18n \
--enable-different-looknfeels
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
CFLAGS+="${CFLAGS} -fsigned-char"
NO_REGRESS= Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/configure ${WRKSRC}/tools/importasmenu
post-install:
${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm \
${PREFIX}/share/afterstep/desktop/icons/common

View File

@ -1,5 +1,5 @@
MD5 (AfterStep-1.8.9.tar.gz) = SvcQ5PIaaNOYyFBHCx5kIA==
RMD160 (AfterStep-1.8.9.tar.gz) = 0NMfq9JMrlhzyzjPfh9kGvHf+zM=
SHA1 (AfterStep-1.8.9.tar.gz) = yQF0w/AoO3cGaTGlt2Txul12VdM=
SHA256 (AfterStep-1.8.9.tar.gz) = 3nqXPvpnOzJFfuU/ndB5Mm8rfuEnmj1TdAGEB/xQtS8=
SIZE (AfterStep-1.8.9.tar.gz) = 1300602
MD5 (AfterStep-2.2.9.tar.gz) = pMN0CmgXgYARMaPpLxPYyQ==
RMD160 (AfterStep-2.2.9.tar.gz) = xgS0B8xEcDsRVeZTcLb6Wm/qQzY=
SHA1 (AfterStep-2.2.9.tar.gz) = nO+e7tVnePCN9hG8k4ORUUENyao=
SHA256 (AfterStep-2.2.9.tar.gz) = xZs+TIvb3YZHop9ggWGUTTlbLt99aUUpPWU3sWsriIY=
SIZE (AfterStep-2.2.9.tar.gz) = 6563542

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2002/04/08 01:02:16 naddy Exp $
--- Makefile.in.orig Mon Apr 8 02:56:05 2002
+++ Makefile.in Mon Apr 8 02:57:29 2002
@@ -35,24 +35,6 @@ install.script:
for I in ${subdirs}; do (cd $$I; ${MAKE} install.script || exit 1); done
install.data:
- @if [ -d /usr/local/share/gnome/wm-properties ] ; then \
- if [ -w /usr/local/share/gnome/wm-properties ] ; then \
- echo $(CP) AfterStep.desktop /usr/local/share/gnome/wm-properties/; \
- $(CP) AfterStep.desktop /usr/local/share/gnome/wm-properties/; \
- else \
- echo "/usr/local/share/gnome/wm-properties exists but is not writable."; \
- echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
- fi \
- fi
- @if [ -d /usr/share/gnome/wm-properties ] ; then \
- if [ -w /usr/share/gnome/wm-properties ] ; then \
- echo $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
- $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
- else \
- echo "/usr/share/gnome/wm-properties exists but is not writable."; \
- echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
- fi \
- fi
@if [ -d $(AFTER_SHAREDIR) ] ; then \
echo $(RMF) -r $(AFTER_SHAREDIR)_old; \
echo $(MV) $(AFTER_SHAREDIR) $(AFTER_SHAREDIR)_old; \

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-afterstep_Makefile_in,v 1.1 2009/12/06 15:09:22 jasper Exp $
Don't create share/afterstep_old.
--- afterstep/Makefile.in.orig Mon Jan 7 23:14:35 2008
+++ afterstep/Makefile.in Thu Dec 3 22:31:29 2009
@@ -30,19 +30,7 @@ remove_old:
fi
install.data_reinstall: remove_old
- @$(RMF) no_data_reinstall ; \
- if [ -d $(AFTER_SHAREDIR) ] ; then \
- echo $(MV) $(AFTER_SHAREDIR) $(AFTER_SHAREDIR)_old; \
- $(MV) $(AFTER_SHAREDIR) $(AFTER_SHAREDIR)_old; \
- if [ -d $(AFTER_SHAREDIR)_old/desktop -a -d $(AFTER_SHAREDIR)_old/desktop/tiles ] ; then \
- no_data_reinstall=$(NO_DATA_REINSTALL); \
- fi; \
- if [ -n "$$no_data_reinstall" ]; then \
- touch no_data_reinstall; \
- fi; \
- else \
- echo "no previous installation detected"; \
- fi
+ @$(RMF) no_data_reinstall
share_dirs:
$(MKDIR) -p $(AFTER_SHAREDIR)

View File

@ -1,20 +0,0 @@
--- afterstep/wharf.in.orig Sat Aug 11 18:49:34 2001
+++ afterstep/wharf.in Sat Aug 11 18:50:04 2001
@@ -99,7 +99,7 @@
#
*Wharf Applications FileFolders.xpm,3_dots.xpm Folders
#*Wharf Files Computer.xpm Exec "-" Files &
- *Wharf xterm linux-penguin.xpm Exec "-" (exec aterm) || (exec xterm) &
+ *Wharf xterm monitor_bsd.xpm Exec "-" (exec aterm) || (exec xterm) &
*Wharf Helpme Info.xpm,3_dots.xpm Folders
*Wharf xman Bookshelf.xpm Exec "-" xman &
@@ -130,7 +130,7 @@
#
# Screen saver
#
-*Wharf xlock Recycler.xpm Exec "-" xlock -nolock -nice 0 -mode random &
+*Wharf xlock Recycler.xpm Exec "-" xlock -nice 0 -mode random &
#
# X eyes

View File

@ -1,11 +0,0 @@
--- afterstep/zharf.in.orig Sat Aug 11 18:51:12 2001
+++ afterstep/zharf.in Sat Aug 11 18:59:33 2001
@@ -26,7 +26,7 @@
*Zharf Disk - Swallow "asfsm" asfsm_lite -bg Grey30 -fg Grey70 -bp None -pbg Grey30 -pfg Grey70 -pbp None
*Zharf Start Start.xpm Popup "0"
*Zharf Swap Install.xpm WindowList
-*Zharf Xiterm linux-penguin.xpm Exec "xiterm" xterm -fg wheat -bg black &
+*Zharf Xterm monitor_bsd.xpm Exec "xiterm" xterm -fg wheat -bg black &
*Zharf Netscape netscape.xpm Exec "netscape" netscape &
*Zharf(3x1) - whatever SwallowModule "Pager" Pager 0 @with_desktops_1@
*Zharf Quit? RedFire.xpm Module "QuitForm" Form QuitForm

View File

@ -0,0 +1,39 @@
$OpenBSD: patch-configure,v 1.1 2009/12/06 15:09:22 jasper Exp $
--- configure.orig Mon May 4 22:56:26 2009
+++ configure Thu Dec 3 17:09:42 2009
@@ -1810,7 +1810,7 @@ fi;
# Check whether --enable-reuse-font or --disable-reuse-font was given.
if test "${enable_reuse_font+set}" = set; then
enableval="$enable_reuse_font"
- if test x$enableval == "xyes"; then
+ if test x$enableval = "xyes"; then
cat >>confdefs.h <<\_ACEOF
#define MODULE_REUSE_LOADED_FONT 1
_ACEOF
@@ -8131,7 +8131,7 @@ fi
if test "x$enable_staticlibs" = "xyes"; then
- AFTERBASE_LIB="../../libAfterBase/libAfterBase.a"
+ AFTERBASE_LIB="../../libAfterBase/libAfterBase.a ${LOCALBASE}/lib/libexecinfo.a"
AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.a"
AFTERSTEP_LIB="../../libAfterStep/libAfterStep.a"
AFTERCONF_LIB="../../libAfterConf/libAfterConf.a"
@@ -8152,7 +8152,7 @@ else
LIBINSTALL="install.cyg"
LIBUNINSTALL="uninstall.cyg"
else
- AFTERBASE_LIB="../../libAfterBase/libAfterBase.so"
+ AFTERBASE_LIB="../../libAfterBase/libAfterBase.so ${LOCALBASE}/lib/libexecinfo.a"
AFTERIMAGE_LIB="../../libAfterImage/libAfterImage.so"
AFTERSTEP_LIB="../../libAfterStep/libAfterStep.so"
AFTERCONF_LIB="../../libAfterConf/libAfterConf.so"
@@ -8164,7 +8164,7 @@ else
fi
fi
-AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a"
+AFTERBASE_STATIC_LIB="../../libAfterBase/libAfterBase.a ${LOCALBASE}/lib/libexecinfo.a"
AFTERIMAGE_STATIC_LIB="../../libAfterImage/libAfterImage.a"
AFTERSTEP_STATIC_LIB="../../libAfterStep/libAfterStep.a"
AFTERCONF_STATIC_LIB="../../libAfterConf/libAfterConf.a"

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-doc_afterstepdoc_in,v 1.1 2009/12/06 15:09:22 jasper Exp $
Set a more sensible order.
--- doc/afterstepdoc.in.orig Fri Dec 4 11:57:33 2009
+++ doc/afterstepdoc.in Fri Dec 4 11:58:12 2009
@@ -9,7 +9,7 @@
# First try standard path, then local, then other possible paths
#
-for app in opera konqueror firefox mozilla netscape; do
+for app in firefox konqueror opera; do
full_path=`which $app`
if [ "x$full_path" != "x" ] ; then
$app @datadir@/afterstep/doc/html/index.html & exit

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-libASGTK_asgtklookedit_c,v 1.1 2009/12/06 15:09:22 jasper Exp $
implicit declaration of char *make_session_data_file()
--- libASGTK/asgtklookedit.c.orig Thu Dec 3 17:44:42 2009
+++ libASGTK/asgtklookedit.c Thu Dec 3 17:44:44 2009
@@ -29,6 +29,7 @@
#include "../libAfterStep/freestor.h"
#include "../libAfterStep/mystyle.h"
#include "../libAfterConf/afterconf.h"
+#include "../libAfterStep/session.h"
#include <unistd.h>

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-libAfterBase_Makefile_in,v 1.1 2009/12/06 15:09:22 jasper Exp $
Honor CPPFLAGS.
--- libAfterBase/Makefile.in.orig Sat Apr 21 00:10:45 2007
+++ libAfterBase/Makefile.in Thu Dec 3 16:18:58 2009
@@ -48,6 +48,7 @@ LIBVERMAJOR = 0
CC = @CC@
CCFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
# -march=pentiumpro -mcpu=pentiumpro
EXTRA_DEFINES = @DEFINE_XLOCALE@
@@ -297,10 +298,10 @@ $(LIB_STATIC): $(LIB_OBJS) $(LIB_INCS)
$(RANLIB) $(LIB_STATIC)
.c.o:
- $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
+ $(CC) $(CCFLAGS) $(CPPFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
.c.s:
- $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -S $*.c
+ $(CC) $(CCFLAGS) $(CPPFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -S $*.c
#
# include dependency files if they exist

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-libAfterBase_configure,v 1.1 2009/12/06 15:09:22 jasper Exp $
Force disable libexecinfo, causes problems during linking.
--- libAfterBase/configure.orig Mon May 4 22:56:26 2009
+++ libAfterBase/configure Thu Dec 3 17:22:18 2009
@@ -5660,7 +5660,7 @@ done
-for ac_header in sys/wait.h sys/dirent.h sys/time.h link.h execinfo.h malloc.h stdlib.h
+for ac_header in sys/wait.h sys/dirent.h sys/time.h link.h malloc.h stdlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -6379,6 +6379,7 @@ done
+if false; then
for ac_func in backtrace_symbols_fd backtrace_symbols backtrace
@@ -6481,6 +6482,7 @@ _ACEOF
fi
done
+fi
echo "$as_me:$LINENO: checking for struct sigcontext" >&5
echo $ECHO_N "checking for struct sigcontext... $ECHO_C" >&6

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-libAfterBase_safemalloc_h,v 1.1 2009/12/06 15:09:22 jasper Exp $
malloc() is in stdlib.h, so stop warning.
--- libAfterBase/safemalloc.h.orig Thu Dec 3 22:32:23 2009
+++ libAfterBase/safemalloc.h Thu Dec 3 22:32:41 2009
@@ -1,7 +1,7 @@
#ifndef SAFEMALLOC_H_HEADER_INCLUDED
#define SAFEMALLOC_H_HEADER_INCLUDED
-#ifdef HAVE_MALLOC_H
+#if defined(HAVE_MALLOC_H) && !defined(__OpenBSD__)
#include <malloc.h>
#else
#ifdef HAVE_STDLIB_H

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-libAfterImage_Makefile_in,v 1.1 2009/12/06 15:09:22 jasper Exp $
Honor CPPFLAGS.
--- libAfterImage/Makefile.in.orig Wed Dec 17 18:29:14 2008
+++ libAfterImage/Makefile.in Thu Dec 3 16:18:44 2009
@@ -72,6 +72,7 @@ LIBVERMAJOR = 0
CC = @CC@
CCFLAGS = @CFLAGS@ @MMX_CFLAGS@
+CPPFLAGS = @CPPFLAGS@
# -march=pentiumpro -mcpu=pentiumpro
EXTRA_DEFINES = @DEFINE_XLOCALE@
@@ -367,10 +368,10 @@ test_mmx: test_mmx.o
.c.o:
- $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c -o $@
+ $(CC) $(CCFLAGS) $(CPPFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c -o $@
.c.s:
- $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -S $*.c
+ $(CC) $(CCFLAGS) $(CPPFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -S $*.c
#
# include dependency files if they exist

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-lib_asproperty_c,v 1.1 2008/11/21 15:13:58 jasper Exp $
--- lib/asproperty.c.orig Fri Nov 21 13:39:34 2008
+++ lib/asproperty.c Fri Nov 21 13:39:49 2008
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <X11/X.h>
#include <X11/Xatom.h>

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-lib_wild_c,v 1.1 2008/11/21 15:13:58 jasper Exp $
--- lib/wild.c.orig Fri Nov 21 13:37:53 2008
+++ lib/wild.c Fri Nov 21 13:39:21 2008
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <string.h>
#include "../configure.h"
#include "../include/aftersteplib.h"

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_ASDocGen_xmlproc_c,v 1.1 2009/12/06 15:09:22 jasper Exp $
Fix build on sparc64.
--- src/ASDocGen/xmlproc.c.orig Thu Dec 3 22:33:41 2009
+++ src/ASDocGen/xmlproc.c Thu Dec 3 22:34:15 2009
@@ -504,9 +504,10 @@ add_glossary_item( xml_elem_t* doc, ASXMLInterpreterSt
char *target = NULL, *target2 ;
char *term = NULL, *term2 ;
char *ptr = &(state->dest_file[strlen(state->dest_file)-4]);
+ size_t curr_url_anchor_len = state->curr_url_anchor ? strlen(state->curr_url_anchor) : 0;
if( state->doc_type == DocType_PHP && *ptr == '.')
*ptr = '\0' ;
- target = safemalloc( strlen( state->dest_file)+5+1+strlen(state->curr_url_anchor)+1);
+ target = safemalloc( strlen( state->dest_file)+5+1+curr_url_anchor_len+1);
sprintf( target, "%s#%s", state->dest_file, state->curr_url_anchor );
if( state->doc_type == DocType_PHP && *ptr == '\0' )
*ptr = '.' ;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Sound_ASSound_c,v 1.1 2002/12/28 22:51:42 pvalchev Exp $
--- src/Sound/ASSound.c.orig Sat Dec 28 13:47:43 2002
+++ src/Sound/ASSound.c Sat Dec 28 13:47:52 2002
@@ -156,7 +156,7 @@ PlaySound (int sid)
$OpenBSD: patch-src_Sound_ASSound_c,v 1.2 2009/12/06 15:09:22 jasper Exp $
--- src/Sound/ASSound.c.orig Wed Apr 1 23:35:09 2009
+++ src/Sound/ASSound.c Thu Dec 3 15:17:09 2009
@@ -159,7 +159,7 @@ PlaySound (int sid)
return;
else if (child == 0)
{

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_WinCommand_WinCommand_c,v 1.1 2009/12/06 15:09:22 jasper Exp $
Declare at the right place and remove trailing whitespace.
--- src/WinCommand/WinCommand.c.orig Thu Dec 3 22:36:28 2009
+++ src/WinCommand/WinCommand.c Thu Dec 3 22:36:58 2009
@@ -307,12 +307,13 @@ main( int argc, char **argv )
ASBiDirElem *curr;
char *command;
action_t *a;
- ASWinCommandState WinCommandState ;
+ ASWinCommandState WinCommandState ;
+ ASBiDirList *operations;
InitMyApp (CLASS_WINCOMMAND, argc, argv, NULL, NULL, OPTION_SINGLE|OPTION_RESTART );
ConnectX( ASDefaultScr, 0 );
- ASBiDirList *operations = create_asbidirlist( NULL );
+ operations = create_asbidirlist( NULL );
/* Initialize State */
memset( &WinCommandState, 0x00, sizeof(WinCommandState));

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_WinList_List_c,v 1.1 2008/11/21 15:13:58 jasper Exp $
--- src/WinList/List.c.orig Fri Nov 21 13:45:15 2008
+++ src/WinList/List.c Fri Nov 21 13:45:24 2008
@@ -23,6 +23,7 @@
#include "../../configure.h"
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "List.h"
#include "../../include/aftersteplib.h"
#include "../../include/module.h"

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_afterstep_resize_c,v 1.1 2008/11/21 15:13:58 jasper Exp $
--- src/afterstep/resize.c.orig Fri Nov 21 13:40:36 2008
+++ src/afterstep/resize.c Fri Nov 21 13:40:58 2008
@@ -37,6 +37,7 @@
#include "../../configure.h"
#include <stdio.h>
+#include <string.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-tools_importasmenu,v 1.1 2009/12/06 15:09:22 jasper Exp $
--- tools/importasmenu.orig Fri Dec 4 11:40:00 2009
+++ tools/importasmenu Fri Dec 4 11:40:10 2009
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
if [[ "X$1" = "X" || "X$2" = "X" ]]; then
echo "Usage: importasmenu <foreignmenudir> <targetasmenudir>";

File diff suppressed because it is too large Load Diff