From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.2.5 Message-ID: <48EB0514.8060606@ukr.net> Date: Tue, 07 Oct 2008 09:43:32 +0300 From: "K. A. Bylym" User-Agent: Thunderbird 2.0.0.17 (X11/20080929) MIME-Version: 1.0 To: ALT Linux Sisyphus discussions Content-Type: multipart/mixed; boundary="------------060001080207080104070504" Subject: [sisyphus] syntax error near unexpected token `GTK,' X-BeenThere: sisyphus@lists.altlinux.org X-Mailman-Version: 2.1.10b3 Precedence: list Reply-To: ALT Linux Sisyphus discussions List-Id: ALT Linux Sisyphus discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Oct 2008 06:38:05 -0000 Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --------------060001080207080104070504 Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 8bit Доброго времени суток. Должен вначале оговориться, что у меня не сизиф, но ALD41, но mike@ посоветовал сюда и вот я здесь ) Проблема: пытаюсь собрать AfterStep-2.2.8 в hasher-е. Тарболл брал отсюда: ftp://ftp.afterstep.org/stable/AfterStep-2.2.8.tar.bz2 , пример --- ftp://ftp.linux.kiev.ua/pub/Linux/ALT/Sisyphus/orphaned/AfterStep-2.0-alt1.cvs20040319.1.src.rpm Патч, который у меня получился --- во вложении. Спек с минимальными изменениями там же. Сборка вылетает с сообщением ./configure: line 8815: syntax error near unexpected token `GTK,' ./configure: line 8815: ` PKG_CHECK_MODULES(GTK, $pkg_modules,,have_gtk=no)' mike@ посоветовал план действий: > hsh-install ~/HASHER gtk+-devel libgtk+2-devel vim rpm-utils > hsh-shell ~/HASHER > cd ~/RPM/SPECS > buildreq *.spec но положения это не изменило ( Посему вопрос: Каким образом обходится подобная проблема? -- wbr, Константин Былым. --------------060001080207080104070504 Content-Type: text/plain; name="all.patch" Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="all.patch" diff -ru AfterStep-2.2.8/afterstep/base.in AfterStep-2.2.8.fix/afterstep/base.in --- AfterStep-2.2.8/afterstep/base.in 2007-10-25 20:39:13 +0300 +++ AfterStep-2.2.8.fix/afterstep/base.in 2008-10-06 09:21:00 +0300 @@ -9,9 +9,9 @@ # Directories # ModulePath @bindir@ -IconPath @x_includes@/X11/bitmaps/ -FontPath @with_afterdir@/desktop/fonts/:@datadir@/afterstep/desktop/fonts/:/usr/share/fonts/default/TrueType/:/usr/share/fonts/truetype/freefont/:@x_libraries@/X11/fonts/TTF -PixmapPath @with_afterdir@/desktop/icons/:@datadir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:@datadir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:@datadir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:@datadir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/:/usr/share/pixmaps/:/usr/share/icons/hicolor/48x48/apps/ +IconPath @x_includes@/X11/bitmaps/:/usr/share/icons/:/usr/share/icons/mini/:/usr/share/icons/large +FontPath ~./fonts:@with_afterdir@/desktop/fonts/:@datadir@/afterstep/desktop/fonts/:/usr/share/fonts/default/TrueType/:@x_libraries@/X11/fonts/TTF +PixmapPath @with_afterdir@/desktop/icons/:@datadir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:@datadir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:@datadir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:@datadir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/:/usr/share/pixmaps CursorPath @with_afterdir@/desktop/cursors:@datadir@/afterstep/desktop/cursors *ScriptPath @with_afterdir@/scripts/:@datadir@/afterstep/scripts/ # п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/afterstep: base.in~ diff -ru AfterStep-2.2.8/afterstep/database AfterStep-2.2.8.fix/afterstep/database --- AfterStep-2.2.8/afterstep/database 2007-07-22 05:29:55 +0300 +++ AfterStep-2.2.8.fix/afterstep/database 2008-10-06 09:25:08 +0300 @@ -64,9 +64,8 @@ Style "wmsystray" AvoidCover, StartIconic, NoTitle, Layer 4,NoHandles # Web browsers -Style "Mozilla-bin" Icon logos/mozilla, IgnoreConfig -# , StartsOnDesk 1 -Style "Firefox-bin" Icon logos/Firefox, IgnoreConfig +Style "Firefox" Icon logos/Firefox, IgnoreConfig, StartsOnDesk 1 +Style "Mozilla" Icon logos/mozilla, IgnoreConfig, StartsOnDesk 1 # this will prevent firefox's download manager from poping on top every time: Style "*Downloads" Icon logos/Package, IgnoreRestack # , StartsOnDesk 1 @@ -76,7 +75,7 @@ # , StartsOnDesk 1 # Email apps -#Style "Thunderbird-bin" StartsOnDesk 2 +Style "Thunderbird" StartsOnDesk 2, StartsOnDesk 2 Style "evolution" IgnoreConfig #, StartsOnDesk 2 п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/afterstep: database~ diff -ru AfterStep-2.2.8/afterstep/wharf AfterStep-2.2.8.fix/afterstep/wharf --- AfterStep-2.2.8/afterstep/wharf 2008-02-13 07:29:04 +0200 +++ AfterStep-2.2.8.fix/afterstep/wharf 2008-10-06 09:28:27 +0300 @@ -117,9 +117,8 @@ # # First available GUI Web Browser : # -*Wharf WebBrowser normal/WWW Exec x-www-browser & *Wharf WebBrowser logos/Firefox Exec "Firefox" firefox & -*Wharf WebBrowser logos/Firefox Exec "Firefox2" mozilla-firefox & +*Wharf WebBrowser normal/WWW Exec x-www-browser & *Wharf WebBrowser logos/mozilla Exec "Mozilla" mozilla & *Wharf WebBrowser logos/Opera Exec "Opera Web Browser" opera & *Wharf WebBrowser normal/WWW Exec sensible-browser & @@ -127,10 +126,10 @@ # # First available GUI e-mail client : # -*Wharf Mail logos/Thunderbird Exec "Thunderbird" thunderbird & -*Wharf Mail logos/Thunderbird Exec "Thunderbird2" mozilla-thunderbird & +*Wharf Mail normal/MailBox2 Exec "Thunderbird" thunderbird & *Wharf Mail normal/MailBox2 Exec "mozilla-mail" mozilla --mail & *Wharf Mail normal/MailBox2 Exec "kmail" kmail & +*Wharf Mail normal/MailBox2 Exec "Mutt" xterm -fg yellow -bg blue -e mutt & *Wharf Mail normal/MailBox2 Exec "balsa" balsa & *Wharf Mail normal/MailBox2 ExecInTerm "Pine" -title "Pine e-mail and news reader" -e pine & @@ -138,12 +137,14 @@ # # First available GUI image editor : # -*Wharf ImageEditor logos/gimp Exec "GIMP" gimp & -*Wharf ImageEditor normal/XV Exec "XV" xv & +*Wharf ImageEditor normal/gimp Exec "OpenOffice.org Draw" oodraw & +*Wharf ImageEditor logos/gimp Exec "GIMP" gimp & +*Wharf ImageEditor normal/XV Exec "XV" xv & # # First available GUI text editor : # +*Wharf TextEditor Text.xpm Exec "Gedit" gedit & *Wharf TextEditor Text.xpm Exec "NEdit" nedit & *Wharf TextEditor Text.xpm Exec "cooledit" cooledit --look next & *Wharf TextEditor logos/GNU Exec "XEmacs" xemacs & @@ -152,6 +153,7 @@ # # First available Word processor : # +*Wharf WordProcessor normal/Document Exec "OpenOffice.org Writer" oowriter & *Wharf WordProcessor normal/Document Exec "AbiWord" abiword & *Wharf WordProcessor normal/Document Exec "KWord" kword & *Wharf WordProcessor normal/Document Exec "Pathetic Writer" pw & @@ -160,6 +162,7 @@ # # First available Spreadsheet processor : # +*Wharf Spreadsheet normal/Table Exec "OpenOffice.org Calc" oocalc & *Wharf Spreadsheet normal/Table Exec "KSpread" kspread & *Wharf Spreadsheet normal/Table Exec "GNUMERIC" gnumeric & *Wharf Spreadsheet normal/Table Exec "Siag" siag & @@ -167,9 +170,14 @@ # # First available IRC client : # -*Wharf IRC normal/IRCTransparent Exec "XCHAT" xchat & -*Wharf IRC normal/IRCTransparent ExecInTerm "BitchX" -title "BitchX IRC" +sb if(aterm){-tr -sh 50 -fg white -bg black} if(Eterm){-O --shade 50 -f white -b black) if(rxvt){-tr -fg white -bg black} if(xterm){-fg white -bg black} -e BitchX irc.freenode.net & - +*Wharf IRC normal/IRCTransparent Exec "XCHAT2" xchat2 & +*Wharf IRC normal/IRCTransparent Exec "XCHAT" xchat & +*Wharf IRC normal/IRCTransparent Exec "Chatzilla" firefox -chat & +*Wharf IRC normal/IRCTransparent Exec "Chatzilla" mozilla -chat & +*Wharf IRC normal/IRCTransparent Exec "BitchX" aterm +sb -title "BitchX IRC" -tr -sh 50 -fg white -bg black -e BitchX irc.freenode.net & +*Wharf IRC normal/IRCTransparent Exec "BitchX" rxvt +sb -title "BitchX IRC" -tr -fg yellow -bg black -e BitchX irc.freenode.net & +*Wharf IRC normal/IRCTransparent Exec "BitchX" eterm +sb -title "BitchX IRC" -tr -sh 50 -fg yellow -bg black -e BitchX irc.freenode.net & +*Wharf IRC normal/IRCTransparent Exec "BitchX" xterm -fg yellow -bg blue -e BitchX irc.freenode.net & # subfolder full of games : *Wharf Games - Category "Games" @@ -191,8 +199,8 @@ # # First available Video player : # - - +*Wharf VideoPlayer normal/MovieProjector Exec "MPlayer" gmplayer & +*Wharf VideoPlayer normal/MovieProjector Exec "Xine" xine & # п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/afterstep: wharf~ diff -ru AfterStep-2.2.8/autoconf/configure.in AfterStep-2.2.8.fix/autoconf/configure.in --- AfterStep-2.2.8/autoconf/configure.in 2008-03-04 18:18:15 +0200 +++ AfterStep-2.2.8.fix/autoconf/configure.in 2008-10-06 09:13:56 +0300 @@ -87,8 +87,8 @@ AC_ARG_ENABLE(shmimage, [ --enable-shmimage support shared memory images [[yes]] ],enable_shmimage=$enableval,enable_shmimage="yes") AC_ARG_ENABLE(xinerama, [ --enable-xinerama support Xinerama Multihead extentions [[yes]] ],enable_xinerama=$enableval,enable_xinerama="yes") AC_ARG_ENABLE(glx, [ --enable-glx support for OpenGL extention [[yes]] ],enable_glx=$enableval,enable_glx="no") -AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libafterstep statically [[yes]] ],enable_staticlibs=$enableval,enable_staticlibs="yes") -AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libafterstep dynamically [[no]] ],enable_sharedlibs=$enableval,enable_sharedlibs="no") +AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libafterstep statically [[yes]] ],enable_staticlibs=$enableval,enable_staticlibs="no") +AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libafterstep dynamically [[no]] ],enable_sharedlibs=$enableval,enable_sharedlibs="yes") AC_ARG_WITH(readline, [ --with-readline make WinCommand use readline library for interactive mode[[yes]] ], with_readline=$withval,with_readline="") AC_ARG_WITH(libefence, [ --with-libefence compile with libefence to debug buffer overruns [[no]] ],with_libefence=$withval,with_libefence="") @@ -211,8 +211,6 @@ export FIND AC_PATH_PROG(XARGS, xargs, xargs) export XARGS -AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin) -export LDCONFIG dnl# Checks for optional programs AC_PROG_LEX п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/autoconf: configure.in~ diff -ru AfterStep-2.2.8/autoconf/configure.libs.in AfterStep-2.2.8.fix/autoconf/configure.libs.in --- AfterStep-2.2.8/autoconf/configure.libs.in 2005-03-22 18:10:50 +0200 +++ AfterStep-2.2.8.fix/autoconf/configure.libs.in 2008-10-06 09:14:23 +0300 @@ -155,8 +155,6 @@ export FIND AC_PATH_PROG(XARGS, xargs, xargs) export XARGS -AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin) -export LDCONFIG dnl# Checks for optional programs AC_PROG_LEX п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/autoconf: configure.libs.in~ diff -ru AfterStep-2.2.8/autoconf/Makefile.common.lib.in AfterStep-2.2.8.fix/autoconf/Makefile.common.lib.in --- AfterStep-2.2.8/autoconf/Makefile.common.lib.in 2007-04-21 01:10:45 +0300 +++ AfterStep-2.2.8.fix/autoconf/Makefile.common.lib.in 2008-10-06 09:11:25 +0300 @@ -44,23 +44,11 @@ install.script: install.dyn: uninstall.dyn - @( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)"; \ - $(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR); \ - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \ - $(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \ - if test `uname` = "Linux"; then \ - if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \ - echo "" > /dev/null; \ - elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \ - echo "" > /dev/null; \ - else \ - echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \ - echo "$(LIB_SHARED), you may need to add it or set LD_LIBRARY_PATH."; \ - fi; \ - echo "$(LDCONFIG)"; \ - $(LDCONFIG); \ - fi \ - ) + $(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR) + if test "x$$CONFIG_OBJS" != "x"; then $(INSTALL_SCRIPT) $(CONFIG_OBJS) $(AFTER_BIN_DIR);fi + -@/bin/rm -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED) + ln -sf $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) + ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED) install.cyg: uninstall.cyg @( echo "$(INSTALL_LIB) $(LIB_SHARED_CYG) $(AFTER_BIN_DIR)"; \ п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/autoconf: Makefile.common.lib.in~ diff -ru AfterStep-2.2.8/autoconf/Makefile.defines.in AfterStep-2.2.8.fix/autoconf/Makefile.defines.in --- AfterStep-2.2.8/autoconf/Makefile.defines.in 2008-01-16 23:23:07 +0200 +++ AfterStep-2.2.8.fix/autoconf/Makefile.defines.in 2008-10-06 09:16:01 +0300 @@ -17,7 +17,6 @@ MKDIR = @MKDIR@ FIND = @FIND@ XARGS = @XARGS@ -LDCONFIG = @LDCONFIG@ LN_S = @LN_S@ YACC = @YACC@ п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/autoconf: Makefile.defines.in~ diff -ru AfterStep-2.2.8/libAfterBase/configure.in AfterStep-2.2.8.fix/libAfterBase/configure.in --- AfterStep-2.2.8/libAfterBase/configure.in 2008-03-04 18:18:15 +0200 +++ AfterStep-2.2.8.fix/libAfterBase/configure.in 2008-10-06 09:16:56 +0300 @@ -30,8 +30,8 @@ AC_ARG_ENABLE(i18n, [ --enable-i18n support I18N [no] ],enable_i18n=$enableval,enable_i18n="no") AC_ARG_ENABLE(xlocale, [ --enable-xlocale using X_LOCALE [no] ],enable_xlocale=$enableval,enable_xlocale="no") AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ],with_locale=$withval,with_locale="") -AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libAfterBase statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="yes") -AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libAfterBase dynamically [no] ],enable_sharedlibs=$enableval,enable_sharedlibs="no") +AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libAfterBase statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="no") +AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libAfterBase dynamically [no] ],enable_sharedlibs=$enableval,enable_sharedlibs="yes") AC_ARG_ENABLE(gdb, [ --enable-gdb add gdb symbols (-g) (for debugging) [no] ],enable_gdb=$enableval,enable_gdb="no") AC_ARG_ENABLE(warn, [ --enable-warn turn on more compiler warnings (for debugging) [no] ],enable_warn=$enableval,enable_warn="no") @@ -66,7 +66,6 @@ AC_SUBST(PERL) AC_SUBST(FIND) AC_SUBST(XARGS) - AC_SUBST(LDCONFIG) AC_SUBST(LEX) AC_SUBST(LEXLIB) AC_SUBST(YACC) @@ -137,7 +136,6 @@ AC_PATH_PROG(PERL, perl, perl) AC_PATH_PROG(FIND, find, find) AC_PATH_PROG(XARGS, xargs, xargs) - AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin) fi if test "x$enable_gdb" = "xno"; then п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/libAfterBase: configure.in~ diff -ru AfterStep-2.2.8/libAfterImage/apps/Makefile.in AfterStep-2.2.8.fix/libAfterImage/apps/Makefile.in --- AfterStep-2.2.8/libAfterImage/apps/Makefile.in 2007-12-27 19:50:46 +0200 +++ AfterStep-2.2.8.fix/libAfterImage/apps/Makefile.in 2008-10-06 09:18:15 +0300 @@ -16,7 +16,6 @@ MKDIR = @MKDIR@ FIND = @FIND@ XARGS = @XARGS@ -LDCONFIG = @LDCONFIG@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL@ -m 755 п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/libAfterImage/apps: Makefile.in~ diff -ru AfterStep-2.2.8/libAfterImage/configure.in AfterStep-2.2.8.fix/libAfterImage/configure.in --- AfterStep-2.2.8/libAfterImage/configure.in 2008-03-04 18:18:16 +0200 +++ AfterStep-2.2.8.fix/libAfterImage/configure.in 2008-10-06 09:16:49 +0300 @@ -28,8 +28,8 @@ AC_ARG_ENABLE(i18n, [ --enable-i18n support I18N [no] ],enable_i18n=$enableval,enable_i18n="no") AC_ARG_ENABLE(xlocale, [ --enable-xlocale using X_LOCALE [no] ],enable_xlocale=$enableval,enable_xlocale="no") AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ],with_locale=$withval,with_locale="") -AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libAfterImage statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="yes") -AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libAfterImage dynamically [no] ],enable_sharedlibs=$enableval,enable_sharedlibs="no") +AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libAfterImage statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="no") +AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libAfterImage dynamically [no] ],enable_sharedlibs=$enableval,enable_sharedlibs="yes") AC_ARG_ENABLE(gdb, [ --enable-gdb add gdb symbols (-g) (for debugging) [no] ],enable_gdb=$enableval,enable_gdb="no") AC_ARG_ENABLE(warn, [ --enable-warn turn on more compiler warnings (for debugging) [no] ],enable_warn=$enableval,enable_warn="no") @@ -108,7 +108,6 @@ AC_SUBST(PERL) AC_SUBST(FIND) AC_SUBST(XARGS) - AC_SUBST(LDCONFIG) AC_SUBST(LEX) AC_SUBST(LEXLIB) AC_SUBST(YACC) @@ -170,7 +169,6 @@ AC_PATH_PROG(PERL, perl, perl) AC_PATH_PROG(FIND, find, find) AC_PATH_PROG(XARGS, xargs, xargs) - AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin) fi if test "x$enable_gdb" = "xno"; then п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/libAfterImage: configure.in~ diff -ru AfterStep-2.2.8/libAfterImage/Makefile.in AfterStep-2.2.8.fix/libAfterImage/Makefile.in --- AfterStep-2.2.8/libAfterImage/Makefile.in 2007-12-27 22:57:08 +0200 +++ AfterStep-2.2.8.fix/libAfterImage/Makefile.in 2008-10-06 09:19:51 +0300 @@ -84,7 +84,6 @@ MKDIR = @MKDIR@ FIND = @FIND@ XARGS = @XARGS@ -LDCONFIG = @LDCONFIG@ ROBODOC = robodoc LN_S = @LN_S@ п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/libAfterImage: Makefile.in~ diff -ru AfterStep-2.2.8/tools/installastheme.pl.in AfterStep-2.2.8.fix/tools/installastheme.pl.in --- AfterStep-2.2.8/tools/installastheme.pl.in 2001-06-23 06:50:20 +0300 +++ AfterStep-2.2.8.fix/tools/installastheme.pl.in 2008-10-06 09:02:20 +0300 @@ -116,6 +116,7 @@ my $TARFILE = 0; my $TMPDIR = "/tmp/astheme.$$"; my $UPDATE_AS = 1; +my $INSTALL_PATH = ""; ################## # Command Line Syntax Checking @@ -124,13 +125,14 @@ $usage = sprintf( "Usage: \n" . "%s [-h] [--no_wharf] [--no_pager] [--no_winlist] [--no_background]\n" . - "%*s [--no-update] [-q] [-v] [-V] [[-t] ]\n" . + "%*s [--no-update] [-q] [-v] [-V] [-p ] [[-t] ]\n" . " -h --help this help\n" . " --no_background do not install desktop background\n" . " --no_pager do not install pager options\n" . " --no_wharf do not install wharf options\n" . " --no_winlist do not install winlist options\n" . " --no-update do not tell AfterStep to load the theme\n" . + " -p --prefix install theme in \n" . " -q --quiet do not print anything\n" . " -t --theme specify theme to install\n" . " -V --verbose warn about missing options\n" . @@ -147,6 +149,9 @@ my $argument = shift; if (($argument eq "-t" || $argument eq "--theme") && @ARGV) { $THEME_NAME = shift; + } elsif ($argument eq "-p" || $argument eq "--prefix") { + die "Error: argument '' missing!\n" unless @ARGV; + $INSTALL_PATH = shift; } elsif ($argument eq "--no_wharf") { delete $MOD_FLAGS{wharf}; } elsif ($argument eq "--no_pager") { @@ -189,7 +194,7 @@ # Determine base directory names my $AFTERSTEP_DIR="~/GNUstep/Library/AfterStep"; -my $SHARE_DIR="/usr/local/share/afterstep"; +my $SHARE_DIR="/usr/X11R6/share/afterstep"; open (PROC, "afterstep -c 2> /dev/null |"); if (eof(PROC)) { @@ -205,6 +210,7 @@ close PROC; $AFTERSTEP_DIR =~ s@^~/@$ENV{HOME}/@; +$AFTERSTEP_DIR=$INSTALL_PATH if ($INSTALL_PATH); ################### # Derive some more directory names @@ -481,6 +487,8 @@ # could probably be done with a subroutine. foreach my $module (keys %MOD_FLAGS) { + copy_file($FILE_NAMES{$module}, "$FILE_NAMES{$module}.themesave"); + print "'$FILE_NAMES{$module}' saved as '$FILE_NAMES{$module}.themesave'\n"; &edit_config($module); } п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/tools: installastheme.pl.in~ diff -ru AfterStep-2.2.8/tools/makeastheme.pl.in AfterStep-2.2.8.fix/tools/makeastheme.pl.in --- AfterStep-2.2.8/tools/makeastheme.pl.in 2002-04-21 10:14:05 +0300 +++ AfterStep-2.2.8.fix/tools/makeastheme.pl.in 2008-10-06 09:04:03 +0300 @@ -211,7 +211,7 @@ my $AFTERSTEP_VERSION; my $AFTERSTEP_DIR="~/GNUstep/Library/AfterStep"; -my $SHARE_DIR="/usr/local/share/afterstep"; +my $SHARE_DIR="/usr/X11R6/share/afterstep"; open (PROC, "afterstep -c 2> /dev/null |"); if (eof(PROC)) { п╒п╬п╩я▄п╨п╬ п╡ AfterStep-2.2.8.fix/tools: makeastheme.pl.in~ --------------060001080207080104070504 Content-Type: text/plain; name="AfterStep.spec" Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="AfterStep.spec" %define prefix %_x11dir %define rversion 0 Name: AfterStep Version: 2.2.8 Release: alt1 Summary: AfterStep Window Manager License: GPL Group: Graphical desktop/Other Url: http://www.afterstep.org/ Source: ftp://ftp.afterstep.org/stable/%name-%version.tar.bz2 Source1: AfterStep-altconf.tar.bz2 Source2: %name.menu-method Source3: %name.xpm Source4: %name-32.xpm Source5: %name-64.xpm Source6: %name.wmsession Source7: startafterstep # ALT Linux patch #Patch0: AfterStep-shared.patch Patch1: all.patch #Patch2: gtk.patch #Patch7: AfterStep-tools.patch #Patch8: AfterStep-afterstep-cfg.patch #Patch9: AfterStep-remove-ldconfig.patch Requires: xli # Automatically added by buildreq on Wed Sep 03 2003 BuildRequires: xorg-devel xorg-libs flex freetype2-devel gcc-c++ BuildRequires: libOpenSP libjpeg-devel libpng-devel libtiff-devel libungif-devel BuildRequires: sgml-tools zlib-devel OpenSP #AutoReqProv: noperl %description AfterStep is a Window Manager for X which started by emulating the NEXTSTEP look and feel, but which has been significantly altered according to the requests of various users. Many adepts will tell you that NEXTSTEP is not only the most visually pleasant interface, but also one of the most functional and intuitive out there. AfterStep aims to incorporate the advantages of the NEXTSTEP interface, and add additional useful features. WARNING: This version still _UNSTABLE_ to use. %prep %setup -n %name-%version -q #setup -n %name-%version-%rversion -q -a1 #%patch0 -p1 %patch1 -p1 #%patch2 -p1 #patch7 -p1 #%patch8 -p1 #%patch9 -p1 %__autoconf -o ./configure autoconf/configure.in cd libAfterBase %__autoconf cd - cd libAfterImage %__autoconf cd - %build %add_optflags %optflags_shared CFLAGS="%optflags"; export CFLAGS %configure \ --prefix=%_x11dir \ --bindir=%_x11bindir \ --libdir=%_x11libdir \ --mandir=%_x11mandir \ --datadir=%_x11datadir \ --with-gif \ --enable-ascp \ --enable-staticlibs=no \ --enable-i18n \ --with-imageloader="/usr/X11R6/bin/xsetbg" \ --with-helpcommand="/usr/X11R6/xterm -e man" %make_build %make_build doc # Add icons for d in $(find afterstep/start -type d|grep -v CVS); do [ ! -f $d/.include ] || continue cat << EOF > $d/.include name ${d##*/} minipixmap /usr/X11R6/share/afterstep/desktop/icons/mini-app.xpm keepname EOF done %__subst 's|^.*minipixmap .*|minipixmap /usr/X11R6/share/afterstep/desktop/icons/mini-app.xpm|' afterstep/start/.include %install %makeinstall DESTDIR=%buildroot # Move afterstep default menu %__mv %buildroot%_x11datadir/afterstep/start \ %buildroot%_x11datadir/afterstep/start-main %__install -pD -m755 %SOURCE2 %buildroot%_sysconfdir/menu-methods/%name %__install -d 644 %buildroot%_menudir cat << EOF > %buildroot%_menudir/%name ?package(%name):needs=wm section="Session/Windowmanagers" icon="%name.xpm" title="AfterStep" command="afterstep" EOF # Not needed with Linux-Mandrake menu rm -fr %buildroot%_x11datadir/afterstep/start/Applications/ %__install -pD -m644 %SOURCE3 %buildroot%_miconsdir/%name.xpm %__install -pD -m644 %SOURCE4 %buildroot%_iconsdir/%name.xpm %__install -p -m644 %SOURCE5 %buildroot%_iconsdir/ %__install -pD -m644 %SOURCE6 %buildroot%_sysconfdir/X11/wmsession.d/06AfterStep %__install -p -m755 %SOURCE7 %buildroot%_x11bindir/ rm -f %buildroot%_x11bindir/MonitorWharf ln -s %_x11bindir/Wharf %buildroot%_x11bindir/MonitorWharf %post %update_menus %update_wms %post_ldconfig %postun %clean_menus %clean_wms #rm -rf %_x11datadir/afterstep #rm -rf %_datadir/afterstep %postun_ldconfig %files %config(noreplace) %_sysconfdir/menu-methods/* %config %_sysconfdir/X11/wmsession.d/* %_x11bindir/* %_x11libdir/* %_x11mandir/man?/* %dir %_x11datadir/afterstep %dir %_includedir/libAfterConf %dir %_includedir/libAfterStep %_x11datadir/afterstep %_includedir/libAfterConf %_includedir/libAfterStep %_menudir/* %_iconsdir/*.xpm %_iconsdir/*/*.xpm %doc ChangeLog NEW README* TEAM UPGRADE doc/code doc/languages doc/licences TODO %changelog * Fri Sep 17 2004 ALT QA Team Robot 2.0-alt1.cvs20040319.1 - Rebuilt with libtiff.so.4. * Mon Mar 22 2004 Alexey Gladkov 2.0-alt1.cvs20040319 - new cvs scapshot; - spec fix; * Thu Mar 04 2004 Alexey Gladkov 2.0-alt1.cvs20040304 - new cvs snapshot; * Mon Jan 19 2004 Alexey Gladkov 2.0-alt1.cvs20040119 - new cvs snapshot. - menu fix. * Mon Dec 15 2003 Alexey Gladkov 2.0-alt1.cvs20031211 - new cvs snapshot - i18n support added. * Fri Nov 21 2003 Alexey Gladkov 2.0-alt1.cvs20031121 - new cvs snapshot * Thu Nov 13 2003 Alexey Gladkov 2.0-alt1.cvs20031113 - new cvs snapshot - TEXTREL problem fixed. * Wed Oct 08 2003 Alexey Gladkov 2.0-alt1.cvs20031017 - new cvs snapshot. - default system background added. - default look changed. - menu method fix (again). * Wed Sep 03 2003 Alexey Gladkov 2.0-alt1.cvs20030830 - cvs snapshot - menu-method changed * Sat Jan 11 2003 Alexey Gladkov 1.8.11-alt1 - 1.8.11 * Wed Jan 09 2002 Dmitry V. Levin 1.8.8-ipl5mdk - Updated wmsession.d and startup scripts. - Minor specfile cleanup. * Thu Oct 11 2001 AEN 1.8.8-ipl4mdk - Rebuilt with libpng.so.3 * Mon Jan 08 2001 AEN - clean up spec - 1.8.8 * Tue Dec 05 2000 AEN - fonts patch - build for RE * Fri Nov 10 2000 David BAUDENS 1.8.4-1mdk - 1.8.4 patch 2 - Build with glibc-2.2 & gcc-2.96 * Fri Sep 29 2000 Daouda Lo 1.8.0.3-6mdk - add icons for menu. - macrozifications * Wed Sep 27 2000 Frederic Lepied 1.8.0.3-5mdk - entry in /etc/X11/wmsession.d - noreplace * Mon Aug 07 2000 Frederic Lepied 1.8.0.3-4mdk - automatically added BuildRequires * Sun Jul 09 2000 David BAUDENS 1.8.0.3-3mdk - Build with right options * Sat Jul 08 2000 David BAUDENS 1.8.0.3-2mdk - Add serial to force update * Sat Jul 08 2000 David BAUDENS 1.8.0.3-1mdk - 1.8.0 patch 3 * Wed Jul 05 2000 David BAUDENS 1.8.0.2-1mdk - 1.8.0 patch 2 (sasha+contrib) - Fix version number * Fri Apr 28 2000 dam's 1.8.1-6mdk - Add fndSession call. * Mon Apr 10 2000 Dindinx 1.8.1-5mdk - Add menu key support * Thu Apr 6 2000 Chmouel Boudjnah 1.8.1-4mdk - Make default background viewver xsetbg (no more xli). - Add menus. - Remove %pre (handle by %config). * Mon Mar 27 2000 DindinX 1.8.1-3mdk - Fix group, specs updates, removing .so files, etc. * Tue Mar 14 2000 David BAUDENS 1.8.1-2mdk - Update Group * Tue Feb 29 2000 David BAUDENS 1.8.1-1mdk - 1.8.1 - Merge with official AfterStep spec * Thu Jan 06 2000 - David BAUDENS - 1.7.142-5mdk: Requires mandrake_desk >= 1.0.1-11 * Wed Jan 05 2000 - David BAUDENS - Remove afsdrake for 7.0 - Back to old config files - Change default background for old config files * Sat Dec 25 1999 - David BAUDENS - Change default background - Disable afsdrake by default * Tue Dec 21 1999 - David BAUDENS - Add afsdrake * Sat Dec 04 1999 - David BAUDENS - 1.7.142 * Tue Jul 20 1999 Chmouel Boudjnah - New icons * Mon Jul 19 1999 Chmouel Boudjnah - Mandrake customisations (background, menus, icons). * Fri Jun 11 1999 Bernhard RosenkrДnzer - 1.7.111 * Thu Jun 10 1999 Bernhard RosenkrДnzer - 1.7.90 - Mandrake adaptions * Mon Feb 8 1999 Ryan Weaver [AfterStep-1.6.10-1] - Upgraded to 1.6.10 * Mon Jan 4 1999 Ryan Weaver [AfterStep-1.6.6-3] - Added a pre-install script to check to see if a previous versions share directory exists... If one does, it will copy it to afterstep_old. * Thu Dec 31 1998 Ryan Weaver [AfterStep-1.6.6-2] - Configuring with no special settings and installing into default dirs as per David Mihm * Wed Dec 30 1998 Michael K. Neylon - Updated to 1.6.6 * Fri Dec 11 1998 Michael K. Neylon - Updated to 1.6 (final) * Tue Nov 24 1998 Michael K. Neylon - Updated to 1.5 beta 6 (ascp no longer part of package) * Tue Sep 22 1998 Michael K. Neylon - Moved ascp to a subpackage * Thu Sep 21 1998 Michael K. Neylon - Updated to 1.5beta4 - Huzzah! configure flags! * Thu Sep 3 1998 Michael K. Neylon - Updated to 1.5beta3 - Tried to use some of RPM's internal variables for later ease. * Sun Aug 9 1998 Michael K. Neylon - Updated to 1.5pre7 * Mon Jul 13 1998 Michael K. Neylon - Updated to 1.5pre6 * Thu Jul 2 1998 Michael K. Neylon - Updated to 1.5pre5 * Thu Jun 25 1998 Michael K. Neylon 1.5pre3 - Updated to this version. - Borrows xiterm source for 1.4.5.55N6 (as per readme). * Tue Jun 2 1998 Michael K. Neylon 1.4.5.55N6-2 - Enabled compiled-time option of saving windows. * Sat May 26 1998 Michael K. Neylon 1.4.5.55N6-1 - N6 update - Removed requirement for sgml-tools. Do release that you will needs these to rebuild the .src.rpm (Available as contrib packages at Redhat) * Sat May 16 1998 Michael K. Neylon 1.4.5.55N-1 - 1.4.5.55N update * Thu Apr 23 1998 Michael K. Neylon 1.4.5.3-1 - 1.4.5.3 patch (applied to 1.4.5.1, odd, but...) * Sun Apr 19 1998 Michael K. Neylon 1.4.5.2-1 - 1.4.5.2 patch * Thu Apr 16 1998 Michael K. Neylon 1.4.5.1-1 - Included major documentation patch. * Tue Apr 14 1998 Michael K. Neylon 1.4.5.0-1 - Update to new 1.4.5 * Wed Mar 11 1998 Michael K. Neylon 1.4.4-1 - Update to new 1.4.4 beta, with necessary spec file adjustments - New changes no longer require OffiX-devel (as astrash isn't included) - put "afterstepdoc" and related files in the right place :-) * Tue Feb 17 1998 Michael K. Neylon 1.4-2 - Fixed documentation problems * Thu Feb 11 1998 Michael K. Neylon 1.4 - Updated to 1.4, using root install (including the startmenu worldwrite fix * Thu Jan 15 1998 Kjetil Wiekhorst JЬrgensen 1.0-7 - Fixed a minor bug in the code using mktemp(3). * Tue Jan 13 1998 Kjetil Wiekhorst JЬrgensen 1.0-6 - Added patch to allow the usage of m4 to configure afterstep. * Thu Nov 20 1997 Greg Boehnlein 1.0-5 - Modified Exist patch to look in /etc/X11/afterstep for system.steprc * Wed Nov 19 1997 Greg Boehnlein 1.0-4 - Rebuilt RPM under RedHat Mustang (glibc) * Tue Jul 17 1997 Ximenes Zalteca 1.0-3 - Added Exist popup patch - Oh ya, and Malda's cool3.diff has been in since -2 :) * Wed Jul 03 1997 Ximenes Zalteca 1.0-2 - Put sample.steprc in /etc/X11/afterstep * Sat Jun 28 1997 Ximenes Zalteca 1.0-2 - Added patch to build properly on Linux/Alpha - Modified description - Modified BuildRoot - Updated URLs - Moved things from /usr/lib/X11 to /usr/X11R6/lib/X11 --------------060001080207080104070504--