commit 305faa30ade71c530166175a83b87dd94a0cff38
Author: Jakub Bogusz <[email protected]>
Date: Sat Dec 23 08:10:54 2023 +0100
- updated to 2.2.12
AfterStep-ac.patch | 16 +++++++++
AfterStep-ar.patch | 33 +++++++++++++++++++
AfterStep-inline.patch | 82 ++++++++++++++++++++++------------------------
AfterStep-libpng-1.5.patch | 33 -------------------
AfterStep-link.patch | 21 +++---------
AfterStep-opt.patch | 33 +++++++++++++++----
AfterStep.spec | 56 ++++++++++++++++++++-----------
7 files changed, 157 insertions(+), 117 deletions(-)
---
diff --git a/AfterStep.spec b/AfterStep.spec
index 5f1adc2..378b16a 100644
--- a/AfterStep.spec
+++ b/AfterStep.spec
@@ -2,10 +2,12 @@
# Conditional build:
%bcond_with mmx # use MMX
%bcond_with gnome2 # build with support for GNOME2 wm-properties
+%bcond_without opengl # GLX support
#
%ifarch pentium3 pentium4 athlon %{x8664}
%define with_mmx 1
%endif
+%define afterstep_ver 2.2.12
# versions from libAfter{Base,Image}/configure.in respectively
%define afterbase_ver 1.14
%define afterimage_ver 1.20
@@ -13,36 +15,42 @@ Summary: AfterStep Window Manager
Summary(ja.UTF-8): AfterStep ウィンドウマネージャ (NeXT風)
Summary(pl.UTF-8): AfterStep - zarządca okien
Name: AfterStep
-Version: 2.2.11
-Release: 2
+Version: %{afterstep_ver}
+Release: 1
License: GPL v2+
Group: X11/Window Managers
Source0: ftp://ftp.afterstep.org/stable/%{name}-%{version}.tar.bz2
-# Source0-md5: dbedd3dd4cd6bad56edcab4ee6fb4de8
+# Source0-md5: a3ab1a878270998d420bb2a5ca15801b
#Source1: %{name}.RunWM
Source3: %{name}-xsession.desktop
Patch0: %{name}-no_bash_fix.patch
Patch1: %{name}-ldconfig.patch
Patch2: %{name}-opt.patch
Patch3: %{name}-link.patch
-Patch4: %{name}-libpng-1.5.patch
+Patch4: %{name}-ac.patch
Patch5: %{name}-inline.patch
+Patch6: %{name}-ar.patch
URL: http://www.afterstep.org/
+%{?with_opengl:BuildRequires: OpenGL-devel}
+BuildRequires: alsa-lib-devel >= 0.9
BuildRequires: autoconf >= 2.59-9
BuildRequires: automake
-BuildRequires: dbus-devel
+BuildRequires: dbus-devel >= 0.22
BuildRequires: fltk-devel
BuildRequires: freetype-devel >= 2.0
BuildRequires: gdk-pixbuf2-devel >= 2.0
BuildRequires: giflib-devel
+BuildRequires: glib2-devel >= 2.0.0
BuildRequires: gtk+2-devel >= 1:2.0.0
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: librsvg-devel
+BuildRequires: librsvg-devel >= 2.0.0
BuildRequires: libtiff-devel
+BuildRequires: ncurses-devel
BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: sgml-tools
+BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXinerama-devel
Requires: libAfterBase = %{afterbase_ver}-%{release}
@@ -195,7 +203,7 @@ Requires: gdk-pixbuf2-devel >= 2.0
Requires: giflib-devel
Requires: libjpeg-devel
Requires: libpng-devel
-Requires: librsvg-devel
+Requires: librsvg-devel >= 2.0.0
Requires: libtiff-devel
Requires: xorg-lib-libXext-devel
@@ -219,20 +227,26 @@ Static AfterImage library.
Statyczna biblioteka AfterImage.
%prep
-%setup -q
+%setup -q -n afterstep-devel-%{afterstep_ver}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
-cp -f autoconf/configure*.in .
+#cp -f autoconf/configure*.in .
%build
+cd autoconf
%{__aclocal}
-%{__autoconf}
-%{__autoheader}
+cd ..
+%{__autoconf} -I autoconf autoconf/configure.in > autoconf/configure
+%{__autoconf} -I autoconf autoconf/configure.libs.in > autoconf/configure.libs
+chmod 755 autoconf/configure autoconf/configure.libs
+%{__mv} autoconf/configure autoconf/configure.libs .
+%{__autoheader} autoconf/configure.in
cd libAfterBase
%{__autoconf}
%{__autoheader}
@@ -242,6 +256,7 @@ cd ../libAfterImage
cd ..
%configure \
%{!?with_mmx:--disable-mmx-optimization} \
+ %{?with_opengl:--enable-glx} \
--enable-i18n \
--enable-sharedlibs \
--with-gif \
@@ -250,20 +265,23 @@ cd ..
--with-png \
--with-xpm
-%{__make}
+%{__make} -j1
+
sgml2html doc/afterstep.sgml
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_wmpropsdir},%{_datadir}/xsessions,/etc/sysconfig/wmstyle}
+install -d $RPM_BUILD_ROOT{%{_datadir}/xsessions,/etc/sysconfig/wmstyle}
+%if %{with gnome2}
+# AfterStep.desktop is installed here if dir exists
+install -d $RPM_BUILD_ROOT%{_wmpropsdir}
+%endif
%{__make} -j1 install \
DESTDIR=$RPM_BUILD_ROOT
-%{?with_gnome2:install AfterStep.desktop $RPM_BUILD_ROOT%{_wmpropsdir}}
-
-#install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/afterstep.sh
-install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/xsessions/AfterStep.desktop
+#cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/wmstyle/afterstep.sh
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/xsessions/AfterStep.desktop
# demo programs source and comments don't belong to man3 (and mans in general)
%{__rm}
$RPM_BUILD_ROOT%{_mandir}/man3/{asflip,asgrad,asmerge,asscale,astext,astile,asview,common}.*
@@ -281,9 +299,9 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc doc/code doc/languages TODO *.html
-%doc UPGRADE NEW README TEAM README.RedHat doc/languages/*
+%doc COPYRIGHT COPYRIGHT.OLD ChangeLog NEW NEW.1.x README TEAM TODO
afterstep*.html doc/languages/README.*
%attr(755,root,root) %{_bindir}/ASFileBrowser
+%attr(755,root,root) %{_bindir}/ASMount
%attr(755,root,root) %{_bindir}/ASRun
%attr(755,root,root) %{_bindir}/ASWallpaper
%attr(755,root,root) %{_bindir}/Animate
diff --git a/AfterStep-ac.patch b/AfterStep-ac.patch
new file mode 100644
index 0000000..9bebb3b
--- /dev/null
+++ b/AfterStep-ac.patch
@@ -0,0 +1,16 @@
+--- afterstep-devel-2.2.12/autoconf/configure.in.orig 2023-12-21
13:59:30.463612638 +0100
++++ afterstep-devel-2.2.12/autoconf/configure.in 2023-12-21
18:10:14.268780022 +0100
+@@ -655,10 +655,10 @@ else
+ CLEAN_GIOLIB_CFLAGS=
+
+ AC_DEFINE(HAVE_GIOLIB,1,GIOLIB v.2.0 or higher is
available )
+- gio_saved_cflags=$CFLAGS
+- export CFLAGS="$CFLAGS $GIOLIB_CFLAGS"
++ gio_saved_cflags="$CFLAGS"
++ CFLAGS="$CFLAGS $GIOLIB_CFLAGS"
+ AC_CHECK_TYPES([GSettings],[],[],[[#include
"gio/gio.h"]])
+- export CFLAGS=$gio_saved_cflags
++ CFLAGS="$gio_saved_cflags"
+
+ present_libs="$LDFLAGS $LIBS $x_libs $AFTERIMAGE_LIBS";
+ for l in `echo "$GIOLIB_LIBS"`; do
diff --git a/AfterStep-ar.patch b/AfterStep-ar.patch
new file mode 100644
index 0000000..fb0137c
--- /dev/null
+++ b/AfterStep-ar.patch
@@ -0,0 +1,33 @@
+--- afterstep-devel-2.2.12/libAfterBase/Makefile.in.orig 2023-12-21
18:11:20.858419275 +0100
++++ afterstep-devel-2.2.12/libAfterBase/Makefile.in 2023-12-21
19:25:37.880940179 +0100
+@@ -58,7 +58,7 @@ CCFLAGS = @CFLAGS@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+
+ RANLIB = @RANLIB@
+-AR = ar clq
++AR = ar cq
+ CP = @CP@
+ MV = @MV@
+ RM = @RM@
+--- afterstep-devel-2.2.12/libAfterImage/Makefile.in.orig 2023-12-21
19:26:43.370585391 +0100
++++ afterstep-devel-2.2.12/libAfterImage/Makefile.in 2023-12-21
20:35:05.758360850 +0100
+@@ -76,7 +76,7 @@ CCFLAGS = @CFLAGS@ @MMX_CFLAGS@
+ EXTRA_DEFINES = @DEFINE_XLOCALE@
+
+ RANLIB = @RANLIB@
+-AR = ar clq
++AR = ar cq
+ CP = @CP@
+ MV = @MV@
+ RM = @RM@
+--- afterstep-devel-2.2.12/autoconf/Makefile.defines.in.orig 2013-05-01
15:34:11.000000000 +0200
++++ afterstep-devel-2.2.12/autoconf/Makefile.defines.in 2023-12-21
20:39:29.353599499 +0100
+@@ -9,7 +9,7 @@ CCFLAGS = @CFLAGS@
+ EXTRA_DEFINES =
+
+ RANLIB = @RANLIB@
+-AR = ar clq
++AR = ar cq
+ CP = @CP@
+ MV = @MV@
+ RM = @RM@
diff --git a/AfterStep-inline.patch b/AfterStep-inline.patch
index 3522e22..fcc5e7d 100644
--- a/AfterStep-inline.patch
+++ b/AfterStep-inline.patch
@@ -6,7 +6,7 @@ diff -ur AfterStep-2.2.11/libAfterBase/asvector.c
AfterStep-2.2.11.new/libAfterB
/* finds index of the first element in the vector that is exactly matching
specifyed
* data */
-inline size_t vector_find_data( ASVector *v, void *data )
-+extern inline size_t vector_find_data( ASVector *v, void *data )
++size_t vector_find_data( ASVector *v, void *data )
{
register int i ;
/* word copying is usually faster then raw memory copying */
@@ -18,69 +18,65 @@ diff -ur AfterStep-2.2.11/libAfterBase/parse.c
AfterStep-2.2.11.new/libAfterBase
static char _as_hex_to_char_table[] = "0123456789ABCDEF";
-inline int
-+extern inline int
++int
unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val)
{
int i = buffer_size-1 ;
-diff -ur AfterStep-2.2.11/libAfterStep/functions.c
AfterStep-2.2.11.new/libAfterStep/functions.c
---- AfterStep-2.2.11/libAfterStep/functions.c 2009-12-11 23:38:48.000000000
+0100
-+++ AfterStep-2.2.11.new/libAfterStep/functions.c 2016-11-14
03:04:31.641924138 +0100
-@@ -314,7 +314,7 @@
- }
+--- afterstep-devel-2.2.12/libAfterStep/functions.c.orig 2023-12-21
21:27:43.791252318 +0100
++++ afterstep-devel-2.2.12/libAfterStep/functions.c 2023-12-22
23:16:30.917822883 +0100
+@@ -307,7 +307,7 @@ void dup_func_data (FunctionData * dst,
+ }
}
--inline FunctionData *
-+extern inline FunctionData *
- create_named_function( int func, char *name)
+-inline FunctionData *create_named_function (int func, char *name)
++FunctionData *create_named_function (int func, char *name)
{
- FunctionData *fdata = safecalloc( 1, sizeof(FunctionData) );
-diff -ur AfterStep-2.2.11/libAfterStep/mylook.c
AfterStep-2.2.11.new/libAfterStep/mylook.c
---- AfterStep-2.2.11/libAfterStep/mylook.c 2008-01-10 00:23:13.000000000
+0100
-+++ AfterStep-2.2.11.new/libAfterStep/mylook.c 2016-11-14 03:10:59.618805004
+0100
-@@ -861,7 +861,7 @@
- return NULL;
+ FunctionData *fdata = safecalloc (1, sizeof (FunctionData));
+
+--- afterstep-devel-2.2.12/libAfterStep/mylook.c.orig 2023-12-21
21:27:43.801252264 +0100
++++ afterstep-devel-2.2.12/libAfterStep/mylook.c 2023-12-22
23:19:08.513635780 +0100
+@@ -843,7 +843,7 @@ MyStyle *mylook_get_style (MyLook * look
+ return NULL;
}
--inline MyDesktopConfig *
-+extern inline MyDesktopConfig *
- mylook_get_desk_config(MyLook *look, long desk)
+-inline MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk)
++MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk)
{
- if( look )
-@@ -875,7 +875,7 @@
+ if (look) {
+ ASHashData hdata = { 0 };
+@@ -856,7 +856,7 @@ inline MyDesktopConfig *mylook_get_desk_
}
--inline MyBackground *
-+extern inline MyBackground *
- mylook_get_desk_back(MyLook *look, long desk)
+-inline MyBackground *mylook_get_desk_back (MyLook * look, long desk)
++MyBackground *mylook_get_desk_back (MyLook * look, long desk)
{
- MyBackground *myback = NULL ;
-@@ -902,7 +902,7 @@
+ MyBackground *myback = NULL;
+
+@@ -888,7 +888,7 @@ inline MyBackground *mylook_get_desk_bac
}
--inline MyBackground *
-+extern inline MyBackground *
- mylook_get_back(MyLook *look, char *name)
+-inline MyBackground *mylook_get_back (MyLook * look, char *name)
++MyBackground *mylook_get_back (MyLook * look, char *name)
{
- ASHashData hdata = {0};
-diff -ur AfterStep-2.2.11/src/afterstep/misc.c
AfterStep-2.2.11.new/src/afterstep/misc.c
---- AfterStep-2.2.11/src/afterstep/misc.c 2005-04-01 18:36:57.000000000
+0200
-+++ AfterStep-2.2.11.new/src/afterstep/misc.c 2016-11-14 03:09:49.125128119
+0100
-@@ -32,14 +32,14 @@
+ ASHashData hdata = { 0 };
+ if (look && name)
+--- afterstep-devel-2.2.12/src/afterstep/misc.c.orig 2023-12-21
21:27:43.814585525 +0100
++++ afterstep-devel-2.2.12/src/afterstep/misc.c 2023-12-22
23:19:34.623494331 +0100
+@@ -32,13 +32,13 @@
/****************************************************************************/
/* window management specifics - button ungrabbing convinience functions: */
/****************************************************************************/
--inline void
-+extern inline void
- ungrab_window_buttons( Window w )
+-inline void ungrab_window_buttons (Window w)
++void ungrab_window_buttons (Window w)
{
- LOCAL_DEBUG_OUT( "w = %lX", w );
- XUngrabButton (dpy, AnyButton, AnyModifier, w);
+ LOCAL_DEBUG_OUT ("w = %lX", w);
+ XUngrabButton (dpy, AnyButton, AnyModifier, w);
}
--inline void
-+extern inline void
- ungrab_window_keys (Window w )
+-inline void ungrab_window_keys (Window w)
++void ungrab_window_keys (Window w)
{
- XUngrabKey (dpy, AnyKey, AnyModifier, w);
+ XUngrabKey (dpy, AnyKey, AnyModifier, w);
+ }
diff --git a/AfterStep-libpng-1.5.patch b/AfterStep-libpng-1.5.patch
deleted file mode 100644
index 0a4f321..0000000
--- a/AfterStep-libpng-1.5.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur AfterStep-2.2.11.orig/libAfterImage/export.c
AfterStep-2.2.11/libAfterImage/export.c
---- AfterStep-2.2.11.orig/libAfterImage/export.c 2010-09-23
21:52:15.000000000 +0100
-+++ AfterStep-2.2.11/libAfterImage/export.c 2012-06-18 01:48:11.054109582
+0100
-@@ -496,7 +496,7 @@
- png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL,
NULL );
- if ( png_ptr != NULL )
- if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
-- if( setjmp(png_ptr->jmpbuf) )
-+ if( setjmp(png_jmpbuf(png_ptr)) )
- {
- png_destroy_info_struct(png_ptr, (png_infopp)
&info_ptr);
- info_ptr = NULL ;
-diff -ur AfterStep-2.2.11.orig/libAfterImage/import.c
AfterStep-2.2.11/libAfterImage/import.c
---- AfterStep-2.2.11.orig/libAfterImage/import.c 2010-09-23
21:57:57.000000000 +0100
-+++ AfterStep-2.2.11/libAfterImage/import.c 2012-06-18 01:55:43.547156261
+0100
-@@ -1251,7 +1251,7 @@
- * the normal method of doing things with libpng).
REQUIRED unless you
- * set up your own error handlers in the
png_create_read_struct() earlier.
- */
-- if ( !setjmp (png_ptr->jmpbuf))
-+ if ( !setjmp(png_jmpbuf(png_ptr)))
- {
- ASFlagType rgb_flags =
ASStorage_RLEDiffCompress|ASStorage_32Bit ;
-
-@@ -1468,7 +1468,7 @@
-
- static void asim_png_read_data(png_structp png_ptr, png_bytep data,
png_size_t length)
- {
-- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
-+ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *) png_get_io_ptr(png_ptr);
- memcpy(data, buf->buffer, length);
- buf->buffer += length;
- }
diff --git a/AfterStep-link.patch b/AfterStep-link.patch
index 5214de3..72746c6 100644
--- a/AfterStep-link.patch
+++ b/AfterStep-link.patch
@@ -42,25 +42,14 @@
AC_CHECK_LIB(X11, XOpenDisplay, [x_libs="-lX11 $x_libs"],,$x_libs)
PATH_XTRA_CHECKED=yes
---- AfterStep-2.2.3/libAfterImage/Makefile.in.orig 2006-08-16
20:58:41.000000000 +0200
-+++ AfterStep-2.2.3/libAfterImage/Makefile.in 2006-11-04 10:28:10.389510250
+0100
-@@ -342,7 +342,7 @@
+--- afterstep-devel-2.2.12/libAfterImage/Makefile.in.orig 2023-12-20
21:54:30.523950178 +0100
++++ afterstep-devel-2.2.12/libAfterImage/Makefile.in 2023-12-20
22:43:31.391351466 +0100
+@@ -404,7 +404,7 @@ $(LIB_SHARED).$(LIBVERMAJOR): $(LIB_SHAR
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o
$(LIB_SHARED).$(LIBVER) \
+ $(LIB_SHARED).$(LIBVER): show_flags_cc $(LIB_OBJS) $(LIB_INCS) config.h
Makefile
+ $(CC) -shared $(LDFLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o
$(LIB_SHARED).$(LIBVER) \
- $(LIB_OBJS)
+ $(LIB_OBJS) $(LIBS_AFTERIMAGE)
install.man:
@if [ -d doc/man ] ; then \
---- AfterStep-2.2.11/libAfterBase/Makefile.in~ 2011-04-07 14:11:04.140341198
+0100
-+++ AfterStep-2.2.11/libAfterBase/Makefile.in 2011-04-07 14:20:00.303980335
+0100
-@@ -324,7 +324,7 @@
-
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS)
- $(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o
$(LIB_SHARED).$(LIBVER) \
-- $(USER_LD_FLAGS) $(LIBS_X) $(LIB_OBJS)
-+ $(USER_LD_FLAGS) $(LIB_OBJS) $(LIBS_X)
-
- install: install.lib
-
diff --git a/AfterStep-opt.patch b/AfterStep-opt.patch
index 8ed2719..eccf77c 100644
--- a/AfterStep-opt.patch
+++ b/AfterStep-opt.patch
@@ -17,9 +17,31 @@
dnl# some standard checks :
dnl# let's check for endiannes of our box
---- AfterStep-2.2.3/libAfterImage/configure.in.orig 2006-05-23
19:59:30.000000000 +0200
-+++ AfterStep-2.2.3/libAfterImage/configure.in 2006-11-04 10:16:22.373262000
+0100
-@@ -160,16 +160,6 @@
+--- afterstep-devel-2.2.12/libAfterImage/configure.in.orig 2023-12-20
21:45:22.670251489 +0100
++++ afterstep-devel-2.2.12/libAfterImage/configure.in 2023-12-20
21:54:02.670767738 +0100
+@@ -160,19 +160,8 @@ else
+ dnl# we are alone - have to do all the checks ourselves :
+ dnl# Add -fPIC for IA64 compilation
+
+- dnl# Add -g
+- if test "x$enable_gdb" = "xyes"; then
+- if ! test -n "`echo $CFLAGS' ' | grep '\-g ' 2> /dev/null`" ;
then
+- CFLAGS="$CFLAGS -g -w"
+- fi
+- else
+- DIRTY_CFLAGS="$CFLAGS"
+- CFLAGS="-DNO_DEBUG_OUTPUT"
+- for f in $DIRTY_CFLAGS; do
+- if test "x$f" != "x-g"; then
+- CFLAGS="$CFLAGS $f"
+- fi
+- done
++ if test "x$enable_gdb" != "xyes"; then
++ CFLAGS="$CFLAGS -DNO_DEBUG_OUTPUT"
+ fi
+ dnl# Add -pg
+ if test "x$enable_gprof" = "xyes"; then
+@@ -202,15 +191,6 @@ dnl# we are alone - have to do all the c
AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin)
fi
@@ -32,7 +54,6 @@
- fi
- done
-fi
--
- dnl# Check for MMX :
- if test "x$enable_mmx_optimization" = "xyes"; then
+
+ MMX_CFLAGS="-mmmx -Winline --param inline-unit-growth=10000 --param
large-function-growth=10000"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/AfterStep.git/commitdiff/305faa30ade71c530166175a83b87dd94a0cff38
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
