2007-04-30 Doug Scott <
[email protected]>
* SFEaterm.spec: Added afterstep terminal
* base-specs/aterm.spec: Added afterstep terminal
* base-specs/afterstep.spec: Added afterstep basespec
* SFEafterstep.spec: Added afterstep (Needs work....)
* patches/afterstep-01-lX11.diff: Add -lX11
* patches/afterstep-02-sharedlib.diff: Solaris shared libs
* patches/afterstep-03-typo.diff: Missing quote
* patches/afterstep-04-debug.diff: segv hack
* SFEwine.spec: Added freetype requirement for nice TTF fonts
* patches/wine-02-configure.diff: Fixed nodefs hack
* SFEfreetype.spec: Added, some apps need a modern freetype
* patches/freetype-01-options.diff: patch to add features
--- a/ChangeLog Sat Apr 28 01:54:42 2007 +0000
+++ b/ChangeLog Sun Apr 29 17:24:38 2007 +0000
@@ -1,3 +1,18 @@
+2007-04-30 Doug Scott <[email protected]>
+
+ * SFEaterm.spec: Added afterstep terminal
+ * base-specs/aterm.spec: Added afterstep terminal
+ * base-specs/afterstep.spec: Added afterstep basespec
+ * SFEafterstep.spec: Added afterstep (Needs work....)
+ * patches/afterstep-01-lX11.diff: Add -lX11
+ * patches/afterstep-02-sharedlib.diff: Solaris shared libs
+ * patches/afterstep-03-typo.diff: Missing quote
+ * patches/afterstep-04-debug.diff: segv hack
+ * SFEwine.spec: Added freetype requirement for nice TTF fonts
+ * patches/wine-02-configure.diff: Fixed nodefs hack
+ * SFEfreetype.spec: Added, some apps need a modern freetype
+ * patches/freetype-01-options.diff: patch to add features
+
2007-04-28 Doug Scott <[email protected]>
* SFEbochs.spec: Added bochs IA32 emulator
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEafterstep.spec Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,62 @@
+#
+# spec file for package SFEafterstep.spec
+#
+# includes module(s): afterstep
+#
+%include Solaris.inc
+
+%include base.inc
+%use afterstep = afterstep.spec
+
+Name: SFEafterstep
+Summary: %{afterstep.summary}
+Version: %{afterstep.version}
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+Requires: SFEfltk
+BuildRequires: SFEreadline-devel
+Requires: SFEreadline
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+
+mkdir %name-%version/%{base_arch}
+%afterstep.prep -d %name-%version/%{base_arch}
+
+%build
+%afterstep.build -d %name-%version/%{base_arch}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%afterstep.install -d %name-%version/%{base_arch}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%{_libdir}
+%{_mandir}
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/afterstep
+%{_datadir}/afterstep_old
+%{_datadir}/xsessions
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+
+%changelog
+* Sat Apr 28 2007 - [email protected]
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEaterm.spec Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,47 @@
+#
+# spec file for package SFEaterm.spec
+#
+# includes module(s): aterm
+#
+%include Solaris.inc
+
+%include base.inc
+%use aterm = aterm.spec
+
+Name: SFEaterm
+Summary: %{aterm.summary}
+Version: %{aterm.version}
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+BuildRequires: SFEafterstep-devel
+Requires: SFEafterstep
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+
+mkdir %name-%version/%{base_arch}
+%aterm.prep -d %name-%version/%{base_arch}
+
+%build
+%aterm.build -d %name-%version/%{base_arch}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%aterm.install -d %name-%version/%{base_arch}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%{_bindir}
+%{_mandir}
+%dir %attr (0755, root, sys) %{_datadir}
+
+%changelog
+* Sat Apr 28 2007 - [email protected]
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEfreetype.spec Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,77 @@
+#
+# spec file for package SFEfreetype
+#
+# includes module(s): GNU freetype
+#
+%include Solaris.inc
+%include usr-gnu.inc
+
+%define src_name freetype
+Name: SFEfreetype
+Summary: Freetype
+Version: 2.3.4
+Source: http://savannah.nongnu.org/download/%{src_name}/%{src_name}-%{version}.tar.bz2
+Patch1: freetype-01-options.diff
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%{version}
+%patch1 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+
+
+bash ./autogen.sh
+./configure --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --includedir=%{_includedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir}
+
+make -j$CPUS
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_prefix}
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr (0755, root, other) %{_datadir}/aclocal
+%{_datadir}/aclocal/*
+
+%changelog
+* Mon Apr 30 2007 - [email protected]
+- Initial spec - some apps need modern freetype
--- a/SFEwine.spec Sat Apr 28 01:54:42 2007 +0000
+++ b/SFEwine.spec Sun Apr 29 17:24:38 2007 +0000
@@ -10,7 +10,7 @@
Name: SFEwine
Summary: Windows Emulator
-Version: 0.9.35
+Version: 0.9.36
Source: %{src_url}/%{src_name}-%{version}.tar.bz2
Patch1: wine-01-nameconfict.diff
Patch2: wine-02-configure.diff
@@ -26,6 +26,8 @@
Requires: SUNWxorg-clientlibs
BuildRequires: SFEfontforge-devel
Requires: SFEfontforge
+BuildRequires: SFEfreetype-devel
+Requires: SFEfreetype
%package devel
Summary: wine - developer files, /usr
@@ -48,10 +50,9 @@
GNULIB="-L/usr/gnu/lib -R/usr/gnu/lib"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export CC=/usr/sfw/bin/gcc
-export CPPFLAGS="-I/usr/sfw/include -I/usr/X11/include -I/usr/gnu/include"
+export CPPFLAGS="-I/usr/X11/include -I/usr/gnu/include -I/usr/sfw/include"
export CFLAGS="-O3 -fno-omit-frame-pointer -fpic -Dpic"
-export LDFLAGS="-zignore $X11LIB $SFWLIB $GNULIB"
-export LD_OPTIONS="-zignore"
+export LDFLAGS="$X11LIB $GNULIB $SFWLIB"
export LD=/usr/ccs/bin/ld
./configure --prefix=%{_prefix} \
--bindir=%{_bindir} \
@@ -111,7 +112,9 @@
%{_datadir}/aclocal/*
%changelog
-* Mon Apr 23 2006 - [email protected]
+* Mon Apr 30 2007 - [email protected]
+- Added Requires: SFEfreetype to fix bad fonts
+* Mon Apr 23 2007 - [email protected]
- Fixed Summary
-* Sun Apr 22 2006 - [email protected]
+* Sun Apr 22 2007 - [email protected]
- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/afterstep.spec Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,64 @@
+#
+# spec file for package afterstep.spec
+#
+# includes module(s): afterstep
+#
+%include Solaris.inc
+
+%define src_name AfterStep
+%define src_url ftp://ftp.afterstep.org/stable
+
+Name: afterstep
+Summary: afterstep window manager
+Version: 2.2.5
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+Patch1: afterstep-01-lX11.diff
+Patch2: afterstep-02-sharedlib.diff
+Patch3: afterstep-03-typo.diff
+Patch4: afterstep-04-debug.diff
+
+%prep
+%setup -q -n %{src_name}-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+find . \( -name \*.c -o -name \*.h \) -print | while read i ; do
+ dos2unix $i $i
+done
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+X11LIB="-L/usr/X11/lib -R/usr/X11/lib"
+GNULIB="-L/usr/gnu/lib -R/usr/gnu/lib"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+cppflags="-I/usr/gnu/include -I/usr/X11/include"
+export CFLAGS="-g -O4 -fPIC -DPIC -Xlinker -i -fno-omit-frame-pointer $cppflags"
+export LD_OPTIONS="$GNULIB $X11LIB"
+export LDFLAGS="%{_ldflags} $GNULIB $X11LIB"
+export CC=gcc
+
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --datadir=%{_datadir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --disable-sigsegv \
+ --enable-staticlibs \
+ --disable-sharedlibs
+
+make -j$CPUS
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%changelog
+* Sat Apr 28 2007 - [email protected]
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/aterm.spec Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,54 @@
+#
+# spec file for package aterm.spec
+#
+# includes module(s): aterm
+#
+%include Solaris.inc
+
+%define src_name aterm
+%define src_url ftp://ftp.afterstep.org/apps/aterm
+
+Name: aterm
+Summary: aterm terminal
+Version: 1.0.0
+Source: %{src_url}/%{src_name}-%{version}.tar.bz2
+
+%prep
+%setup -q -n %{src_name}-%{version}
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+X11LIB="-L/usr/X11/lib -R/usr/X11/lib"
+SFWLIB="-L/usr/sfw/lib -R/usr/sfw/lib"
+GNULIB="-L/usr/gnu/lib -R/usr/gnu/lib"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+cppflags="-I/usr/sfw/include/freetype2 -I/usr/gnu/include -I/usr/sfw/include -I/usr/X11/include"
+export CFLAGS="-O4 -fPIC -DPIC -Xlinker -i -fno-omit-frame-pointer $cppflags"
+export LDFLAGS="%{_ldflags} $GNULIB $SFWLIB $X11LIB"
+export LD_OPTIONS="$GNULIB $SFWLIB $X11LIB"
+export CC=gcc
+
+./configure --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --mandir=%{_mandir} \
+ --libdir=%{_libdir} \
+ --datadir=%{_datadir} \
+ --libexecdir=%{_libexecdir} \
+ --sysconfdir=%{_sysconfdir} \
+ --with-gtk \
+ --with-readline \
+ --disable-staticlibs \
+ --enable-sharedlibs
+
+make -j$CPUS
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%changelog
+* Sat Apr 28 2007 - [email protected]
+- Initial version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/afterstep-01-lX11.diff Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,12 @@
+diff -ur AfterStep-2.2.5-orig/configure AfterStep-2.2.5/configure
+--- AfterStep-2.2.5-orig/configure 2007-04-24 04:17:11.000000000 +0700
++++ AfterStep-2.2.5/configure 2007-04-28 11:36:48.521882636 +0700
+@@ -5669,7 +5669,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
++ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE -lX11"
+ fi
+
+ LDFLAGS=$ac_save_LDFLAGS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/afterstep-02-sharedlib.diff Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,127 @@
+diff -ur AfterStep-2.2.5-orig/autoconf/Makefile.common.lib.in AfterStep-2.2.5/autoconf/Makefile.common.lib.in
+--- AfterStep-2.2.5-orig/autoconf/Makefile.common.lib.in 2007-04-21 05:10:45.000000000 +0700
++++ AfterStep-2.2.5/autoconf/Makefile.common.lib.in 2007-04-28 14:54:56.940641247 +0700
+@@ -245,8 +245,8 @@
+ $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
+- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+- $(LIB_OBJS)
++ $(CC) -Wl,-G,-h,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++ $(LIB_OBJS) $(USER_LD_FLAGS) $(LIBS_ALL)
+
+ install: install.lib install.bin
+
+diff -ur AfterStep-2.2.5-orig/autoconf/configure.in AfterStep-2.2.5/autoconf/configure.in
+--- AfterStep-2.2.5-orig/autoconf/configure.in 2007-04-24 04:17:11.000000000 +0700
++++ AfterStep-2.2.5/autoconf/configure.in 2007-04-28 14:10:35.486922756 +0700
+@@ -144,7 +144,6 @@
+ if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -fPIC"
+ fi
+- LDFLAGS="$LDFLAGS -rdynamic"
+ fi
+
+ dnl# Add -g
+diff -ur AfterStep-2.2.5-orig/autoconf/configure.libs.in AfterStep-2.2.5/autoconf/configure.libs.in
+--- AfterStep-2.2.5-orig/autoconf/configure.libs.in 2005-03-22 23:10:50.000000000 +0700
++++ AfterStep-2.2.5/autoconf/configure.libs.in 2007-04-28 14:10:24.006460177 +0700
+@@ -116,9 +116,6 @@
+ CFLAGS="$CFLAGS -Wuninitialized -Wwrite-strings -Wcast-qual -Wbad-function-cast -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wconversion -Wcomment -Wcast-align -Winline -Wshadow -Wredundant-decls -Wid-clash-31"
+ fi
+
+-if test "x$GCC" = "xyes"; then
+- LDFLAGS="$LDFLAGS -rdynamic"
+-fi
+
+ dnl# done with flags - lets export those for our children to use :
+ export CFLAGS
+diff -ur AfterStep-2.2.5-orig/configure AfterStep-2.2.5/configure
+--- AfterStep-2.2.5-orig/configure 2007-04-24 04:17:11.000000000 +0700
++++ AfterStep-2.2.5/configure 2007-04-28 15:15:14.431259619 +0700
+@@ -3197,7 +3197,6 @@
+ if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -fPIC"
+ fi
+- LDFLAGS="$LDFLAGS -rdynamic"
+ fi
+
+ STRIP_BINARIES=
+diff -ur AfterStep-2.2.5-orig/libAfterBase/Makefile.in AfterStep-2.2.5/libAfterBase/Makefile.in
+--- AfterStep-2.2.5-orig/libAfterBase/Makefile.in 2007-04-21 05:10:45.000000000 +0700
++++ AfterStep-2.2.5/libAfterBase/Makefile.in 2007-04-28 15:18:03.176642692 +0700
+@@ -325,7 +325,7 @@
+ $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
+- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++ $(CC) -Wl,-G,-h,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+ $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS)
+
+ install: install.lib
+diff -ur AfterStep-2.2.5-orig/libAfterBase/configure AfterStep-2.2.5/libAfterBase/configure
+--- AfterStep-2.2.5-orig/libAfterBase/configure 2007-04-24 04:17:11.000000000 +0700
++++ AfterStep-2.2.5/libAfterBase/configure 2007-04-28 15:15:03.495068645 +0700
+@@ -2468,7 +2468,6 @@
+ if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -fPIC"
+ fi
+- LDFLAGS="$LDFLAGS -rdynamic"
+ fi
+
+ else
+diff -ur AfterStep-2.2.5-orig/libAfterBase/configure.in AfterStep-2.2.5/libAfterBase/configure.in
+--- AfterStep-2.2.5-orig/libAfterBase/configure.in 2007-04-24 04:17:11.000000000 +0700
++++ AfterStep-2.2.5/libAfterBase/configure.in 2007-04-28 14:10:48.455016197 +0700
+@@ -74,7 +74,6 @@
+ if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -fPIC"
+ fi
+- LDFLAGS="$LDFLAGS -rdynamic"
+ fi
+
+ else
+@@ -93,7 +92,6 @@
+ if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -fPIC"
+ fi
+- LDFLAGS="$LDFLAGS -rdynamic"
+ fi
+
+ dnl# Add -g
+diff -ur AfterStep-2.2.5-orig/libAfterImage/Makefile.in AfterStep-2.2.5/libAfterImage/Makefile.in
+--- AfterStep-2.2.5-orig/libAfterImage/Makefile.in 2007-04-21 05:10:45.000000000 +0700
++++ AfterStep-2.2.5/libAfterImage/Makefile.in 2007-04-28 15:13:48.451534309 +0700
+@@ -383,8 +383,8 @@
+ $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
+
+ $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
+- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
+- $(LIB_OBJS)
++ $(CC) -Wl,-G,-h,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
++ $(LIB_OBJS) $(USER_LD_FLAGS) $(LIBRARIES)
+
+ install.man:
+ @if [ -d doc/man ] ; then \
+diff -ur AfterStep-2.2.5-orig/libAfterImage/configure AfterStep-2.2.5/libAfterImage/configure
+--- AfterStep-2.2.5-orig/libAfterImage/configure 2007-04-24 04:17:11.000000000 +0700
++++ AfterStep-2.2.5/libAfterImage/configure 2007-04-28 15:14:57.935903505 +0700
+@@ -2628,7 +2628,6 @@
+ if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -fPIC"
+ fi
+- LDFLAGS="$LDFLAGS -rdynamic"
+ fi
+
+
+diff -ur AfterStep-2.2.5-orig/libAfterImage/configure.in AfterStep-2.2.5/libAfterImage/configure.in
+--- AfterStep-2.2.5-orig/libAfterImage/configure.in 2007-04-24 04:17:12.000000000 +0700
++++ AfterStep-2.2.5/libAfterImage/configure.in 2007-04-28 14:09:53.534088916 +0700
+@@ -75,7 +75,6 @@
+ if test -z "`echo $CFLAGS | grep '\-fPIC' 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -fPIC"
+ fi
+- LDFLAGS="$LDFLAGS -rdynamic"
+ fi
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/afterstep-03-typo.diff Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,12 @@
+diff -ur AfterStep-2.2.5-orig/afterstep/database AfterStep-2.2.5/afterstep/database
+--- AfterStep-2.2.5-orig/afterstep/database 2007-04-25 05:48:42.000000000 +0700
++++ AfterStep-2.2.5/afterstep/database 2007-04-28 16:23:26.535168675 +0700
+@@ -41,7 +41,7 @@
+ Style "ASMenu" NoButton 1, NoButton 3
+
+ # Several AfterStep tools :
+-Style "ASRun Icon logos/AfterStep
++Style "ASRun" Icon logos/AfterStep
+ Style "GWCommand" FocusOnMap
+
+ # Wharf apps and AfterStep close apps and terms
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/afterstep-04-debug.diff Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,12 @@
+diff -ur AfterStep-2.2.5-orig/src/afterstep/dirtree.c AfterStep-2.2.5/src/afterstep/dirtree.c
+--- AfterStep-2.2.5-orig/src/afterstep/dirtree.c 2006-12-09 03:01:54.000000000 +0700
++++ AfterStep-2.2.5/src/afterstep/dirtree.c 2007-04-28 17:21:30.440273069 +0700
+@@ -273,7 +273,7 @@
+ ASSERT_TREE(dc);
+ ASSERT_TREE(ct);
+
+- LOCAL_DEBUG_OUT( "DesktopCategory \"%s\", has %d entries", dc->name, PVECTOR_USED(dc->entries) );
++ // LOCAL_DEBUG_OUT( "DesktopCategory \"%s\", has %d entries", dc->name, PVECTOR_USED(dc->entries) );
+ entries = desktop_category_get_entries( ct, dc, include_children?1:0, exclusions, &valid_entries_num);
+
+ if( entries )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/freetype-01-options.diff Sun Apr 29 17:24:38 2007 +0000
@@ -0,0 +1,39 @@
+diff -ur freetype-2.3.4-orig/include/freetype/config/ftoption.h freetype-2.3.4/include/freetype/config/ftoption.h
+--- freetype-2.3.4-orig/include/freetype/config/ftoption.h 2007-01-05 23:18:45.000000000 +0700
++++ freetype-2.3.4/include/freetype/config/ftoption.h 2007-04-29 23:27:45.217383492 +0700
+@@ -92,7 +92,7 @@
+ /* This is done to allow FreeType clients to run unmodified, forcing */
+ /* them to display normal gray-level anti-aliased glyphs. */
+ /* */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /*************************************************************************/
+@@ -163,7 +163,7 @@
+ /* Do not #undef this macro here since the build system might define */
+ /* it for certain configurations only. */
+ /* */
+-/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
++#define FT_CONFIG_OPTION_SYSTEM_ZLIB
+
+
+ /*************************************************************************/
+@@ -294,7 +294,7 @@
+ /* This allows FreeType to be used with the PostScript language, using */
+ /* the GhostScript interpreter. */
+ /* */
+-/* #define FT_CONFIG_OPTION_INCREMENTAL */
++#define FT_CONFIG_OPTION_INCREMENTAL
+
+
+ /*************************************************************************/
+@@ -456,7 +456,7 @@
+ /* Do not #undef this macro here, since the build system might */
+ /* define it for certain configurations only. */
+ /* */
+-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+
+
+ /*************************************************************************/
--- a/patches/wine-02-configure.diff Sat Apr 28 01:54:42 2007 +0000
+++ b/patches/wine-02-configure.diff Sun Apr 29 17:24:38 2007 +0000
@@ -7,14 +7,14 @@
- { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-z,defs" >&5
-echo $ECHO_N "checking whether the compiler supports -fPIC -shared -Wl,-Bsymbolic,-z,defs... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,G,-Bsymbolic,-z,defs,-z,ignore,z,combreloc" >&5
-+echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,G,-Bsymbolic,-z,defs,-z,ignore,z,combreloc... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,G,-Bsymbolic,-z,defs" >&5
++echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,G,-Bsymbolic,-z,defs... $ECHO_C" >&6; }
if test "${ac_cv_cflags__fPIC__shared__Wl__Bsymbolic__z_defs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -shared -Wl,-Bsymbolic,-z,defs"
-+CFLAGS="$CFLAGS -fPIC -Wl,G,-Bsymbolic,-z,defs,-z,ignore,-z,combreloc"
++CFLAGS="$CFLAGS -fPIC -Wl,G,-Bsymbolic,-z,defs"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -39,7 +39,7 @@
+ [LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,%)"])])
- WINE_TRY_CFLAGS([-fPIC -shared -Wl,-Bsymbolic,-z,defs], [LDDLLFLAGS="$LDDLLFLAGS,-z,defs"])
-+ WINE_TRY_CFLAGS([-fPIC -Wl,-G,-Bsymbolic,-z,nodefs], [LDDLLFLAGS="$LDDLLFLAGS,-z,defs"])
++ WINE_TRY_CFLAGS([-fPIC -Wl,-G,-Bsymbolic,-z,defs], [LDDLLFLAGS="$LDDLLFLAGS,-z,defs"])
WINE_TRY_CFLAGS([-fPIC -shared -Wl,-Bsymbolic,-init,__wine_spec_init,-fini,__wine_spec_fini],
[LDDLLFLAGS="$LDDLLFLAGS,-init,__wine_spec_init,-fini,__wine_spec_fini"])