summaryrefslogtreecommitdiff
path: root/source/xap
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap')
-rwxr-xr-xsource/xap/MPlayer/MPlayer.SlackBuild268
-rw-r--r--source/xap/MPlayer/slack-desc19
-rwxr-xr-xsource/xap/audacious-plugins/audacious-plugins.SlackBuild14
-rw-r--r--source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff25
-rwxr-xr-xsource/xap/audacious/audacious.SlackBuild26
-rwxr-xr-xsource/xap/blackbox/blackbox.SlackBuild12
-rw-r--r--source/xap/blackbox/startblackbox23
-rw-r--r--source/xap/blackbox/textpropertytostring-unconditional.diff28
-rw-r--r--source/xap/blackbox/xinitrc.blackbox4
-rwxr-xr-xsource/xap/blueman/blueman.SlackBuild2
-rwxr-xr-xsource/xap/fluxbox/fluxbox.SlackBuild23
-rw-r--r--source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff14
-rw-r--r--source/xap/fluxbox/xinitrc.fluxbox1
-rw-r--r--source/xap/fvwm/doinst.sh3
-rwxr-xr-xsource/xap/fvwm/fvwm.SlackBuild74
-rw-r--r--source/xap/fvwm/fvwm.colormap.diff20
-rw-r--r--source/xap/fvwm/slack-desc2
-rw-r--r--source/xap/fvwm/startfvwm223
-rw-r--r--source/xap/fvwm/system.fvwm2rc822
-rw-r--r--source/xap/fvwm/xinitrc.fvwm24
-rwxr-xr-xsource/xap/geeqie/geeqie.SlackBuild6
-rw-r--r--source/xap/geeqie/slack-desc1
-rwxr-xr-xsource/xap/gftp/gftp.SlackBuild19
-rwxr-xr-xsource/xap/gimp/gimp.SlackBuild22
-rwxr-xr-xsource/xap/gkrellm/gkrellm.SlackBuild2
-rwxr-xr-xsource/xap/gnuplot/gnuplot.SlackBuild5
-rw-r--r--source/xap/gucharmap/doinst.sh6
-rwxr-xr-xsource/xap/gucharmap/gucharmap.SlackBuild2
-rwxr-xr-xsource/xap/gv/gv.SlackBuild6
-rw-r--r--source/xap/gv/gv.keysym.diff12
-rw-r--r--source/xap/gv/gv.libXaw3d.diff11
-rwxr-xr-xsource/xap/imagemagick/imagemagick.SlackBuild26
-rwxr-xr-xsource/xap/mozilla-firefox/mozilla-firefox.SlackBuild68
-rw-r--r--source/xap/mozilla-thunderbird/mimeTypes.rdf113
-rw-r--r--source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch18
-rwxr-xr-xsource/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild111
-rw-r--r--source/xap/network-manager-applet/doinst.sh20
-rwxr-xr-xsource/xap/network-manager-applet/network-manager-applet.SlackBuild (renamed from source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild)66
-rw-r--r--source/xap/network-manager-applet/slack-desc19
-rwxr-xr-xsource/xap/pan/pan.SlackBuild5
-rw-r--r--source/xap/pan/pan.gcc47.diff10
-rw-r--r--source/xap/pan/slack-desc2
-rw-r--r--source/xap/pidgin/fix-gmain_h-compile-error.diff17
-rwxr-xr-xsource/xap/pidgin/pidgin.SlackBuild24
-rw-r--r--source/xap/pidgin/purple-allow-sign-rsa-md5.patch12
-rw-r--r--source/xap/rdesktop/rdesktop.CVE-2011-1595.diff22
-rwxr-xr-xsource/xap/rdesktop/rdesktop.SlackBuild11
-rwxr-xr-xsource/xap/rxvt/rxvt.SlackBuild29
-rw-r--r--source/xap/sane/sane-backends-1.0.22-v4l.diff64
-rwxr-xr-xsource/xap/sane/sane.SlackBuild24
-rw-r--r--source/xap/seamonkey/pkgconfig/seamonkey-libxul.pc11
-rw-r--r--source/xap/seamonkey/pkgconfig/seamonkey-nss.pc2
-rw-r--r--source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc2
-rwxr-xr-xsource/xap/seamonkey/seamonkey.SlackBuild84
-rwxr-xr-xsource/xap/seyon/seyon.SlackBuild32
-rw-r--r--source/xap/thunar-volman/slack-desc19
-rwxr-xr-xsource/xap/thunar-volman/thunar-volman.SlackBuild84
-rw-r--r--source/xap/windowmaker/WindowMaker.noopensusemenu.diff14
-rwxr-xr-xsource/xap/windowmaker/windowmaker.SlackBuild51
-rw-r--r--source/xap/windowmaker/windowmaker.no-mmx.diff19
-rw-r--r--source/xap/windowmaker/windowmaker.png.1.4.0.diff11
-rw-r--r--source/xap/windowmaker/wmaker.inst.diff29
-rw-r--r--source/xap/windowmaker/xinitrc.wmaker4
-rw-r--r--source/xap/x11-ssh-askpass/slack-desc6
-rwxr-xr-xsource/xap/x3270/x3270.SlackBuild70
-rwxr-xr-xsource/xap/xchat/xchat.SlackBuild2
-rw-r--r--source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff20
-rw-r--r--source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff24
-rw-r--r--source/xap/xfce/patches/mousepad-fix_find.diff43
-rw-r--r--source/xap/xfce/patches/mousepad-fix_find_and_replace.diff36
-rw-r--r--source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch26
-rw-r--r--source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff384
-rw-r--r--source/xap/xfce/patches/xfcalendar.desktop.in.diff9
-rw-r--r--source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff11
-rw-r--r--source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff15
-rw-r--r--source/xap/xfce/patches/xfdesktop-fix_education_icon.diff11
-rw-r--r--source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff49
-rwxr-xr-xsource/xap/xfce/profile.d/xfce.csh6
-rwxr-xr-xsource/xap/xfce/profile.d/xfce.sh7
-rw-r--r--source/xap/xfce/slack-desc19
-rwxr-xr-xsource/xap/xfce/xfce.SlackBuild248
-rw-r--r--source/xap/xfce4-notifyd/doinst.sh10
-rw-r--r--source/xap/xfce4-notifyd/slack-desc19
-rw-r--r--source/xap/xfce4-power-manager/doinst.sh10
-rw-r--r--source/xap/xfce4-power-manager/slack-desc19
-rwxr-xr-xsource/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild116
-rwxr-xr-xsource/xap/xfractint/xfractint.SlackBuild40
-rwxr-xr-xsource/xap/xine-lib/xine-lib.SlackBuild14
-rwxr-xr-xsource/xap/xine-ui/xine-ui.SlackBuild12
-rw-r--r--source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff11
-rw-r--r--source/xap/xine-ui/xine-ui.png14.diff11
-rwxr-xr-xsource/xap/xlockmore/xlockmore.SlackBuild6
-rw-r--r--source/xap/xpdf/patches/03-float.patch25
-rwxr-xr-xsource/xap/xpdf/xpdf.SlackBuild7
-rwxr-xr-xsource/xap/xsane/xsane.SlackBuild2
-rw-r--r--source/xap/xscreensaver/xscreensaver-getimage-file-5.14555
-rwxr-xr-xsource/xap/xscreensaver/xscreensaver.SlackBuild10
97 files changed, 1748 insertions, 2627 deletions
diff --git a/source/xap/MPlayer/MPlayer.SlackBuild b/source/xap/MPlayer/MPlayer.SlackBuild
index 17b8b036..663fe2f8 100755
--- a/source/xap/MPlayer/MPlayer.SlackBuild
+++ b/source/xap/MPlayer/MPlayer.SlackBuild
@@ -1,7 +1,6 @@
#!/bin/sh
-
-# Copyright 2006, 2007, 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# $Id: MPlayer.SlackBuild,v 1.27 2012/07/01 13:07:08 root Exp root $
+# Copyright 2006, 2007, 2008, 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -29,31 +28,106 @@
# For: MPlayer
# Descr: a movie player for LINUX
# URL: http://www.mplayerhq.hu/
+# Needs:
+# Changelog:
+# 1.0rc1-1: 05/Nov/2006 by Eric Hameleers <alien@slackware.com>
+# * Initial build.
+# 1.0rc1-2: 07/Nov/2006 by Eric Hameleers <alien@slackware.com>
+# * Removed MPlayer's internal libdvdcss code from the build, so
+# that MPlayer no longer plays encrypted DVD's by default (and the
+# package is now safe to upload to public repositories).
+# If it is allowed in your country, you can either install
+# libdvdcss (which is picked up automatically by MPlayer), or
+# rebuild MPlayer yourself using this SlackBuild - and set the
+# variable REMOVECSS="no" first (see further down).
+# Use this commandline if you can't or won't modify the script:
+# REMOVECSS="no" ./MPlayer.SlackBuild
+# 1.0rc1-3: 08/Nov/2006 by Eric Hameleers <alien@slackware.com>
+# * Install the mplayer.conf into correct location '/etc/mplayer/'
+# 1.0rc1-4: 15/mar/2007 by Eric Hameleers <alien@slackware.com>
+# * Differentiate between versions of X11 (modular X has another
+# install-prefix); update default skin; enable mplayer menu;
+# add security fix
+# 1.0rc1-5: 07/jun/2007 by Eric Hameleers <alien@slackware.com>
+# * Add security fix.
+# 1.0rc2-1: 09/oct/2007 by Eric Hameleers <alien@slackware.com>
+# * New version.
+# 1.0rc2-2: 01/feb/2008 by Eric Hameleers <alien@slackware.com>
+# * Apply 4 security fixes.
+# 1.0rc2-3: 10/mar/2008 by Eric Hameleers <alien@slackware.com>
+# * Apply a patch that allows compilation against the ivtv driver
+# in the 2.6.24.x kernels.
+# r28148-1: 14/dec/2008 by Eric Hameleers <alien@slackware.com>
+# * Build SVN snapshot - remove support for *all* patented or
+# questionable software if "USE_PATENTS" is set to "NO" - think
+# of DECSS dvd decryption code, and mp3/aac/amr audio encoders.
+# r28929-1: 10/mar/2009 by Eric Hameleers <alien@slackware.com>
+# * Update.
+# r29301-1: 12/may/2009 by Eric Hameleers <alien@slackware.com>
+# * Update.
+# r29301-1: 12/may/2009 by Eric Hameleers <alien@slackware.com>
+# * Update.
+# 20100926-1: 26/sep/2010 by Eric Hameleers <alien@slackware.com>
+# * Slackware has MPlayer now of course, but it does not hurt
+# to have a full-featured binary package available. The 1.0rc3
+# was released recently but I prefer to build a snapshot.
+# 20110624-1: 24/jun/2011 by Eric Hameleers <alien@slackware.com>
+# * Provide an up-to-date snapshot to be used in conjunction
+# with UMPlayer (a MPlayer GUI). New MPlayer source requires
+# a separate ffmpeg download.
+# 20120514-1: 14/may/2012 by volkerdi@slackware.com
+# * Update.
+# 1.1_20120701-1: 28/jun/2012 by alien@slackware.com
+# * Update to the 1.1 branch (essentially this is MPlayer-1.1 but
+# I like to check it out of SVN).
+#
+# Run 'sh MPlayer.SlackBuild' to build a Slackware package.
+# The package (.txz) plus descriptive .txt file are created in /tmp .
+# Install using 'installpkg'.
+#
# -----------------------------------------------------------------------------
+# Set initial variables:
+
PRGNAM=MPlayer
-VERSION=${VERSION:-20101218}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-20120701}
+BRANCH=${BRANCH:-1.1} # leave empty if you want to build MPlayer trunk
+FFMPEG=${FFMPEG:-20120514}
+BUILD=${BUILD:-2}
TAG=${TAG:-}
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
- arm*) export ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
- esac
+# Show the branch version in the package name if we build from a branch:
+[ -n "$BRANCH" ] && PKGVERSION=${BRANCH}_${VERSION} || PKGVERSION=${VERSION}
+
+DOCS="AUTHORS Changelog Copyright LICENSE README VERSION DOCS/HTML DOCS/tech"
+
+# MPlayer repository characteristics:
+MPURI="svn://svn.mplayerhq.hu/mplayer/"
+if [ -n "$BRANCH" ]; then
+ MPBRANCH="branches/$BRANCH"
+else
+ MPBRANCH="trunk"
fi
-DOCS="AUTHORS Changelog Copyright LICENSE README DOCS/HTML DOCS/tech"
+FFURI=git://git.videolan.org/ffmpeg.git
DEFSKIN=${DEFSKIN:-"Blue"} # Download more skins at the following url:
-SKINVER=${SKINVER:-"1.7"} # http://www.mplayerhq.hu/design7/dload.html
+SKINVER=${SKINVER:-"1.8"} # http://www.mplayerhq.hu/design7/dload.html
-# Available languages: all bg cs de dk el en es fr hu it ja
-# ko mk nb nl pl ro ru sk sv tr uk pt_BR zh_CN zh_TW
-LANGUAGES="en nl fr de es" # The default is to just add "en" documentation
+# Available languages: all cs de en es fr hu it pl ru zh_CN
+LANGUAGES="en,de,es,fr"
+
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+ case "$MARCH" in
+ i?86) export ARCH=i486 ;;
+ armv7hl) export ARCH=$MARCH ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$MARCH ;;
+ esac
+fi
if [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
@@ -69,7 +143,8 @@ else
EXTRACONFIGUREOPTIONS=""
fi
-CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs # Where the WIN32 codecs are expected for instance
+# Where the WIN32 codecs are expectedfor instance
+CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs
# ---------------------------------------------------------------------------
# -- PATENT ALERT! --
@@ -79,7 +154,12 @@ CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs # Where the WIN32 codecs are expected
# (needed for FLV and .3GP videos) but these libraries are 'contaminated'
# with patents from Fraunhofer and GGP.
# Also, the AAC encoder has patent issues.
-# The Slackware package is built with "USE_PATENTS=NO" i.e. without using
+# You can build these patended algorithms into ffmpeg, and if you are an
+# ordinary end user, no one will bother you for using them.
+# For the binaries based on this SlackBuild that I distribute, it is a
+# different story. I am not allowed to distribute binary packages that
+# incorporate patented code. So here you go. My Slackware package was
+# built with "USE_PATENTS=NO" i.e. without using
# the lame mp3, faac, AMR and dvdcss libraries.
# This also means that this creates a version of MPlayer that is unable
# to play encrypted DVD's (which is most DVD's on the market). If it is
@@ -87,11 +167,6 @@ CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs # Where the WIN32 codecs are expected
# Install a libdvdcss package and it will be picked up automatically by
# MPlayer's internal libdvdread library, so that MPlayer will again be able
# to play encrypted DVD's.
-#
-# If you have licenses to use the code, and/or the patents do not apply in
-# your region, and you take all legal responsibility, you may wish to build
-# MPlayer with the option USE_PATENTS=YES which will include potentially
-# patent-encumbered code.
# ---------------------------------------------------------------------------
USE_PATENTS=${USE_PATENTS:-"NO"}
@@ -120,6 +195,10 @@ SRCURL[0]=""
SOURCE[1]="$SRCDIR/${DEFSKIN}-${SKINVER}.tar.bz2"
SRCURL[1]="http://www.mplayerhq.hu/MPlayer/skins/${DEFSKIN}-${SKINVER}.tar.bz2"
+# Ffmpeg needs to be checked out separately now:
+SOURCE[2]="$SRCDIR/ffmpeg-${FFMPEG}.tar.xz"
+SRCURL[2]=""
+
# Use the src_checkout() function if no downloadable tarball exists.
# This function checks out sources from SVN/CVS and creates a tarball of them.
src_checkout() {
@@ -137,13 +216,13 @@ src_checkout() {
case ${1} in
0) # mplayer
if [ "$(echo ${VERSION}|cut -c1)" == 'r' ]; then # revision instead of date
- REV=$(echo ${VERSION} | cut -c2-)
+ echo "Only supported VERSION is a date - yyyymmdd - or 'HEAD'"
else
REV="{${VERSION}}"
fi
mkdir MPlayer-${VERSION} \
&& cd MPlayer-${VERSION} \
- && svn checkout --revision $REV svn://svn.mplayerhq.hu/mplayer/trunk . \
+ && svn checkout --revision $REV ${MPURI}/${MPBRANCH} . \
&& svn propget svn:externals | sed -e 's/[[:space:]].*$//g' | xargs svn up --revision $REV \
&& find . -type d -name '.svn' -depth | xargs rm -rf \
&& ([ "$USE_PATENTS" != "YES" ] && rm -rf libdvdcss || true) \
@@ -152,6 +231,28 @@ src_checkout() {
&& tar -${TARCOMP}cf ${2} MPlayer-${VERSION}
rm -rf MPlayer-${VERSION}
;;
+ 2) # ffmpeg-${FFMPEG}
+ mkdir ffmpeg_temp_checkout_$$ \
+ && cd ffmpeg_temp_checkout_$$
+ if [ "$FFMPEG" = "HEAD" ]; then
+ # Checkout without downloading version history (fast!):
+ echo "Checking out HEAD from '$FFURI':"
+ git clone --depth=1 ${FFURI} ffmpeg
+ else
+ # Checkout code from a certain branch and/or date; this will take a
+ # long time because we have to clone the complete git-repository first:
+ echo "Checking out branch 'master' at date $FFMPEG from '$FFURI':"
+ git clone ${FFURI} ffmpeg \
+ && cd ffmpeg \
+ && git checkout master \
+ && git checkout $(git rev-list -n 1 --before="`date -d $FFMPEG`" master) \
+ && cd ..
+ fi
+ chown -R root:root . \
+ && tar --exclude .git -${TARCOMP}cf ${2} ffmpeg
+ cd ..
+ rm -rf ffmpeg_temp_checkout_$$
+ ;;
*) # Do nothing
;;
esac
@@ -221,32 +322,36 @@ echo "++"
if [ "$USE_PATENTS" != "YES" ]; then
cat <<"EOT"
**
-** Removing internal DeCSS library.
+** Removing internal DECSS library.
** If you want to play encrypted DVD's you need to install libdvdcss separately.
-** You take full legal responsibility for any use of DeCSS. We neither supply
-** DeCSS code nor endorse any illegal use of it.
**
-** If you are unaffected by patent concerns because you hold the required
-** licenses and permission to use the patented code, or reside in a
-** location where this is not a concern, and wish to include the patented
-** and restricted code (you take all legal responsibility for doing so),
-** then edit this SlackBuild script and change the line:
+** If you do not want to remove libdvdcss, then
+** edit this SlackBuild script and change the line:
** USE_PATENTS=${USE_PATENTS:-"NO"}
** to:
** USE_PATENTS="YES"
**
EOT
- sleep 5
+ sleep 2
fi
cd $TMP/tmp-$PRGNAM
echo "Extracting the source archive(s) for $PRGNAM..."
tar -xvf ${SOURCE[0]}
-[ "$USE_PATENTS" != "YES" ] && rm -rf libdvdcss
+# Extract the ffmpeg source inside the MPlayer directory:
+( cd ${PRGNAM}-${VERSION} && tar -xvf ${SOURCE[2]} )
+
chown -R root:root *
-chmod -R u+w,go+r-w,a-s *
+chmod -R u+w,go+r-w,a+X-s *
cd ${PRGNAM}-${VERSION}
+# Prevent a compilation error:
+# "libm.h:54:74: error: expected identifier or '(' before 'sizeof'"
+# See also:
+# http://lists.mplayerhq.hu/pipermail/mplayer-users/2012-June/084871.html
+cat $SRCDIR/MPlayer_ffmpeg.patch | patch -p0 --verbose \
+ 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+
# Determine what X we're running (the modular X returns the prefix
# in the next command, while older versions stay silent):
XPREF=$(pkg-config --variable=prefix x11) || true
@@ -256,7 +361,6 @@ XPREF=$(pkg-config --variable=prefix x11) || true
if [ "$USE_PATENTS" != "YES" ]; then
DO_PATENTED="--disable-libdvdcss-internal \
--disable-mp3lame --disable-mp3lame-lavc \
- --disable-faac --disable-faac-lavc \
--disable-libopencore_amrnb \
--disable-libopencore_amrwb"
else
@@ -265,30 +369,37 @@ fi
echo Building ...
# MPlayer wants to automatically determine compiler flags,
-# so we don't provide CFLAGS:
-./configure --prefix=/usr \
- --mandir=/usr/man \
- --confdir=/etc/mplayer \
- --enable-gui \
- --enable-menu \
- --enable-largefiles \
- --disable-arts \
- --codecsdir=${CODECSDIR} \
- --language="${LANGUAGES}" \
- ${EXTRACONFIGUREOPTIONS} \
- ${DO_PATENTED} \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+# so we don't provide CFLAGS.
+./configure \
+ --prefix=/usr \
+ --mandir=/usr/man \
+ --confdir=/etc/mplayer \
+ --enable-gui \
+ --enable-menu \
+ --disable-arts \
+ --disable-bitmap-font \
+ --codecsdir=${CODECSDIR} \
+ --language="${LANGUAGES}" \
+ ${EXTRACONFIGUREOPTIONS} \
+ ${DO_PATENTED} \
+ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
# So that MPlayer does not report "UNKNOWN" as it's version:
-echo $VERSION > VERSION
+if [ ! -f VERSION ]; then
+ echo $VERSION > VERSION
+fi
make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
# Build the html documentation (not all languages are available):
-( cd DOCS/xml
+if [ "$LANGUAGES" = "all" ]; then
+ # make html-chunked
+ make html-single
+else
for i in $(echo $LANGUAGES | tr , ' ') ; do
- [ -d $i ] && make html-single-$i ;
+ # make html-chunked-$i ;
+ make html-single-$i ;
done
-)
+fi
# Prepare the configfile:
mkdir -p $PKG/etc/mplayer
@@ -298,12 +409,12 @@ cp etc/example.conf $PKG/etc/mplayer/mplayer.conf.new
cd $PKG/usr/share/mplayer/skins
tar -xvf ${SOURCE[1]}
chown -R root:root *
-chmod -R u+w,go+r-w,a-s *
+chmod -R u+w,go+r-w,a+X-s *
ln -s ${DEFSKIN} default
cd -
# Add this to the doinst.sh:
-! [ -d $PKG/install ] && mkdir -p $PKG/install
+mkdir -p $PKG/install
cat <<EOINS >> $PKG/install/doinst.sh
# Handle the incoming configuration files:
config() {
@@ -338,32 +449,39 @@ fi
# Prepare the new configuration file
config etc/mplayer/mplayer.conf.new
-if [ -x /usr/bin/update-desktop-database ]; then
- chroot . /usr/bin/update-desktop-database -q usr/share/applications
+# Update the desktop database:
+if [ -x usr/bin/update-desktop-database ]; then
+ chroot . /usr/bin/update-desktop-database usr/share/applications 1> /dev/null 2> /dev/null
fi
+# Update hicolor theme cache:
if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
if [ -x usr/bin/gtk-update-icon-cache ]; then
- chroot . /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ chroot . /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor >/dev/null 2>&1
fi
fi
+# Update the mime database:
+if [ -x usr/bin/update-mime-database ]; then
+ chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
EOINS
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
-cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-#mv $PKG/usr/doc/$PRGNAM-$VERSION/HTML-single $PKG/usr/doc/$PRGNAM-$VERSION/html
+mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$PKGVERSION || true
+cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$PKGVERSION/$PRGNAM.SlackBuild
+mv $PKG/usr/doc/$PRGNAM-$PKGVERSION/HTML $PKG/usr/doc/$PRGNAM-$PKGVERSION/html
# Save a sample of all configuration files:
for i in etc/*.conf ; do
- cp $i $PKG/usr/doc/$PRGNAM-$VERSION/$(basename $i)-sample
+ cp $i $PKG/usr/doc/$PRGNAM-$PKGVERSION/$(basename $i)-sample
done
# Save a transcript of all configured options for this specific build:
if [ -n $OUTPUT/configure-${PRGNAM}.log ]; then
cat $OUTPUT/configure-${PRGNAM}.log \
| sed -n "/^Config files successfully generated/,/^'config.h' and 'config.mak' contain your configuration options./p" \
- > $PKG/usr/doc/$PRGNAM-$VERSION/${PRGNAM}.configuration
+ > $PKG/usr/doc/$PRGNAM-$PKGVERSION/${PRGNAM}.configuration
fi
find $PKG/usr/doc -type f -exec chmod 644 {} \;
@@ -386,11 +504,11 @@ fi
# Build the package:
cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
+md5sum ${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz.md5
cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txt
# Warn about libdvdcss requirement (again):
if [ "$USE_PATENTS" != "YES" ]; then
@@ -398,14 +516,10 @@ if [ "$USE_PATENTS" != "YES" ]; then
**
** Internal DECSS library was not built.
** If you want to play encrypted DVD's you need to install libdvdcss separately.
-** You take full legal responsibility for any use of DeCSS. We neither supply
-** DeCSS code nor endorse any illegal use of it.
**
-** If you are unaffected by patent concerns because you hold the required
-** licenses and permission to use the patented code, or reside in a
-** location where this is not a concern, and wish to include the patented
-** and restricted code (you take all legal responsibility for doing so),
-** then edit this SlackBuild script and change the line:
+** If you do not care about patent issues,
+** and want to keep support for internal libdvdcss, then
+** edit this SlackBuild script and change the line:
** USE_PATENTS=${USE_PATENTS:-"NO"}
** to:
** USE_PATENTS="YES"
diff --git a/source/xap/MPlayer/slack-desc b/source/xap/MPlayer/slack-desc
index a73feb27..71686a3c 100644
--- a/source/xap/MPlayer/slack-desc
+++ b/source/xap/MPlayer/slack-desc
@@ -6,14 +6,15 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-MPlayer: MPlayer (media player)
-MPlayer:
-MPlayer: MPlayer is a movie player. It plays most MPEG/VOB, AVI, Ogg/OGM,
-MPlayer: VIVO, ASF/WMA/WMV, QT/MOV/MP4, RealMedia, Matroska, NUT, NuppelVideo,
-MPlayer: FLI, YUV4MPEG, FILM, RoQ, PVA files, supported by many native, XAnim,
-MPlayer: and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx,
-MPlayer: DivX 3/4/5, WMV and even H.264 movies.
-MPlayer:
-MPlayer: Homepage for MPlayer is http://www.mplayerhq.hu/
+MPlayer: MPlayer (MPEG-4 digital video technology)
MPlayer:
+MPlayer: MPlayer is a movie player for LINUX. It plays most MPEG, VOB, AVI,
+MPlayer: Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo,
+MPlayer: YUV4MPEG, FILM, RoQ, PVA files, supported by many native, XAnim,
+MPlayer: and Win32 DLL codecs. You can watch VideoCD, SVCD, DVD, 3ivx,
+MPlayer: DivX 3/4/5 and even WMV movies, too (without the avifile library).
+MPlayer: MPlayer supports 10 types of subtitles formats: VobSub,
+MPlayer: MicroDVD, SubRip, SubViewer, Sami, VPlayer, RT, SSA, AQTitle, MPsub.
MPlayer:
+MPlayer: Homepage for MPLayer is http://www.mplayerhq.hu/
+
diff --git a/source/xap/audacious-plugins/audacious-plugins.SlackBuild b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
index 50274f1f..20139dff 100755
--- a/source/xap/audacious-plugins/audacious-plugins.SlackBuild
+++ b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -66,8 +66,6 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
cd ${PKGNAM}-$VERSION || exit 1
-zcat $CWD/audacious-plugins.alsa.noise.is.not.helpful.diff.gz | patch -p1 --verbose || exit 1
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
@@ -84,9 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--mandir=/usr/man \
- --enable-chardet \
--enable-amidiplug \
- --disable-altivec \
--program-prefix= \
--program-suffix= \
${ARCHOPTS} \
@@ -129,6 +125,14 @@ cp -a \
AUTHORS COPYING INSTALL Mercurial-Access README* \
$PKG/usr/doc/${PKGNAM}-$VERSION
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff b/source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff
deleted file mode 100644
index e904ab8d..00000000
--- a/source/xap/audacious-plugins/audacious-plugins.alsa.noise.is.not.helpful.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./src/alsa/alsa.c.orig 2011-02-22 11:29:46.000000000 -0600
-+++ ./src/alsa/alsa.c 2011-03-11 15:02:53.340999637 -0600
-@@ -207,10 +207,20 @@
- static gboolean warned = FALSE;
- if (! warned)
- {
-- fprintf (stderr, "\n** WARNING **\nAudacious has detected that "
-+ /* fprintf (stderr, "\n** WARNING **\nAudacious has detected that "
- "your ALSA device has a broken timer. A workaround\nis being "
- "used to prevent CPU overload. Please report this problem to "
-- "your\nLinux distributor or to the ALSA developers.\n\n");
-+ "your\nLinux distributor or to the ALSA developers.\n\n"); */
-+ /* ^^^ COMMENTED OUT ^^^ */
-+
-+ /* I'm glad there is a workaround for this, and the reports
-+ are that it works, so spamming the console about it seems
-+ a little bit extreme. It's not an issue to be solved here
-+ by Slackware, and I would be surprised if the ALSA
-+ developers did not know by now, given this warning.
-+ FWIW, this seems a strange method of communicating with the
-+ ALSA developers. Did they report the bug to them? */
-+
- warned = TRUE;
- }
-
diff --git a/source/xap/audacious/audacious.SlackBuild b/source/xap/audacious/audacious.SlackBuild
index 4a651490..66bb0f90 100755
--- a/source/xap/audacious/audacious.SlackBuild
+++ b/source/xap/audacious/audacious.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006-2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
PKGNAM=audacious
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -87,22 +87,22 @@ CFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--mandir=/usr/man \
--docdir=/usr/doc/${PKGNAM}-$VERSION \
- --disable-altivec \
--program-prefix= \
--program-suffix= \
${ARCHOPTS} \
- --build=$ARCH-slackware-linux
+ --with-buildstamp=$ARCH-slackware-linux \
+ --build=$ARCH-slackware-linux || exit 1
# Build and install:
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
# Fix broken symlinks pointing into the build directory
-( cd $PKG/usr/bin
- rm -f audacious audtool
- ln -s audacious2 audacious
- ln -s audtool2 audtool
-)
+#( cd $PKG/usr/bin
+# rm -f audacious audtool
+# ln -s audacious2 audacious
+# ln -s audtool2 audtool
+#)
# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" \
@@ -137,6 +137,14 @@ cp -a \
AUTHORS COPYING INSTALL Mercurial-Access NEWS README doc/* \
$PKG/usr/doc/${PKGNAM}-$VERSION
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
mkdir -p $PKG/install
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild
index af000496..c7051217 100755
--- a/source/xap/blackbox/blackbox.SlackBuild
+++ b/source/xap/blackbox/blackbox.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,9 +26,8 @@
PKGNAM=blackbox
VERSION=${VERSION:-0.70.1}
BBKEYSVER=${BBKEYSVER:-0.9.1}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-7}
NUMJOBS=${NUMJOBS:-" -j7 "}
-PKGEXT=${PKGEXT:-txz}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -85,6 +84,9 @@ find . \
# Build fix for gcc-4:
zcat $CWD/blackbox-0.70.1-gcc-4.3.patch.gz | patch --verbose -p1 || exit 1
+# Build fix for libX11-1.5+
+zcat $CWD/textpropertytostring-unconditional.diff.gz | patch --verbose -p1 || exit 1
+
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
@@ -112,6 +114,8 @@ make install DESTDIR=$PKG || exit 1
mkdir -p $PKG/etc/X11/xinit
zcat $CWD/xinitrc.blackbox.gz > $PKG/etc/X11/xinit/xinitrc.blackbox
chmod 755 $PKG/etc/X11/xinit/xinitrc.blackbox
+zcat $CWD/startblackbox.gz > $PKG/usr/bin/startblackbox
+chmod 755 $PKG/usr/bin/startblackbox
# Add a documentation directory:
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
@@ -194,4 +198,4 @@ mkdir -p $PKG/install
install -vpm644 $CWD/slack-desc $PKG/install/
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.$PKGEXT
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xap/blackbox/startblackbox b/source/xap/blackbox/startblackbox
new file mode 100644
index 00000000..e72bbd3f
--- /dev/null
+++ b/source/xap/blackbox/startblackbox
@@ -0,0 +1,23 @@
+#!/bin/sh
+# startblackbox v1.0
+
+########################################################################
+## Start DBUS session bus ##
+########################################################################
+
+
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+ eval `dbus-launch --sh-syntax --exit-with-session`
+fi
+
+
+########################################################################
+## Start blackbox Window Manager ##
+########################################################################
+
+
+exec /usr/bin/blackbox
+
+
+########################################################################
+
diff --git a/source/xap/blackbox/textpropertytostring-unconditional.diff b/source/xap/blackbox/textpropertytostring-unconditional.diff
new file mode 100644
index 00000000..ed320388
--- /dev/null
+++ b/source/xap/blackbox/textpropertytostring-unconditional.diff
@@ -0,0 +1,28 @@
+Description: Declare bt::textPropertyToString unconditionally.
+Author: Jakub Wilk <jwilk@debian.org>
+Forwarded: no
+Bug-Debian: http://bugs.debian.org/614468
+Last-Update: 2011-03-12
+
+--- a/lib/Util.hh
++++ b/lib/Util.hh
+@@ -25,6 +25,8 @@
+ #ifndef __Util_hh
+ #define __Util_hh
+
++#include <X11/Xutil.h>
++
+ #include <limits.h>
+ #include <string>
+
+@@ -94,10 +96,8 @@
+
+ std::string tolower(const std::string &string);
+
+-#ifdef _XUTIL_H_
+ std::string textPropertyToString(::Display *display,
+ ::XTextProperty& text_prop);
+-#endif
+
+ } // namespace bt
+
diff --git a/source/xap/blackbox/xinitrc.blackbox b/source/xap/blackbox/xinitrc.blackbox
index 58bd9259..d6ddca3e 100644
--- a/source/xap/blackbox/xinitrc.blackbox
+++ b/source/xap/blackbox/xinitrc.blackbox
@@ -26,7 +26,7 @@ fi
# Start the window manager:
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
- exec ck-launch-session /usr/bin/blackbox
+ exec ck-launch-session /usr/bin/startblackbox
else
- exec /usr/bin/blackbox
+ exec /usr/bin/startblackbox
fi
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild
index 737dae98..f47aabb6 100755
--- a/source/xap/blueman/blueman.SlackBuild
+++ b/source/xap/blueman/blueman.SlackBuild
@@ -25,7 +25,7 @@
PKGNAM=blueman
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xap/fluxbox/fluxbox.SlackBuild b/source/xap/fluxbox/fluxbox.SlackBuild
index 2be30410..52864abb 100755
--- a/source/xap/fluxbox/fluxbox.SlackBuild
+++ b/source/xap/fluxbox/fluxbox.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
PKGNAM=fluxbox
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -59,6 +59,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
+rm -rf fluxbox-$VERSION
tar xvf $CWD/fluxbox-$VERSION.tar.?z* || exit 1
cd fluxbox-$VERSION || exit 1
chown -R root:root .
@@ -68,6 +69,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Make sure that dbus-launch is started for the session:
+zcat $CWD/fluxbox.startfluxbox.dbus.diff.gz | patch -p1 --verbose || exit 1
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -87,7 +91,20 @@ make install DESTDIR=$PKG || exit 1
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-gzip -9 $PKG/usr/man/man?/*
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+ ( cd $PKG/usr/man
+ for manpagedir in $(find . -type d -name "man*") ; do
+ ( cd $manpagedir
+ for eachpage in $( find . -type l -maxdepth 1) ; do
+ ln -s $( readlink $eachpage ).gz $eachpage.gz
+ rm $eachpage
+ done
+ gzip -9 *.?
+ )
+ done
+ )
+fi
mkdir -p $PKG/etc/X11/xinit
zcat $CWD/xinitrc.fluxbox.gz > $PKG/etc/X11/xinit/xinitrc.fluxbox
diff --git a/source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff b/source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff
new file mode 100644
index 00000000..71bea31d
--- /dev/null
+++ b/source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff
@@ -0,0 +1,14 @@
+--- ./util/startfluxbox.in.orig 2011-10-29 08:46:15.000000000 -0500
++++ ./util/startfluxbox.in 2012-08-08 23:35:10.841041336 -0500
+@@ -50,6 +50,11 @@
+ # wmsmixer -w &
+ # idesk &
+
++# Start DBUS session bus:
++if [ -z "\$DBUS_SESSION_BUS_ADDRESS" ]; then
++ eval \$(dbus-launch --sh-syntax --exit-with-session)
++fi
++
+ # And last but not least we start fluxbox.
+ # Because it is the last app you have to run it with ''exec'' before it.
+
diff --git a/source/xap/fluxbox/xinitrc.fluxbox b/source/xap/fluxbox/xinitrc.fluxbox
index 62e425b3..fd08cbc2 100644
--- a/source/xap/fluxbox/xinitrc.fluxbox
+++ b/source/xap/fluxbox/xinitrc.fluxbox
@@ -30,3 +30,4 @@ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
else
exec /usr/bin/startfluxbox
fi
+
diff --git a/source/xap/fvwm/doinst.sh b/source/xap/fvwm/doinst.sh
index 57a23d6f..087da9e3 100644
--- a/source/xap/fvwm/doinst.sh
+++ b/source/xap/fvwm/doinst.sh
@@ -10,4 +10,5 @@ config() {
fi
# Otherwise, we leave the .new copy for the admin to consider...
}
-config etc/X11/fvwm2/system.fvwm2rc.new
+# Might need this later
+#config etc/X11/fvwm2/system.fvwm2rc.new
diff --git a/source/xap/fvwm/fvwm.SlackBuild b/source/xap/fvwm/fvwm.SlackBuild
index 7906a473..b04223c7 100755
--- a/source/xap/fvwm/fvwm.SlackBuild
+++ b/source/xap/fvwm/fvwm.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,8 @@
PKGNAM=fvwm
-VERSION=${VERSION:-2.4.20}
-BUILD=${BUILD:-2}
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-6}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -37,6 +35,8 @@ if [ -z "$ARCH" ]; then
esac
fi
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -46,20 +46,22 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
-cd $TMP
-rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
-cd ${PKGNAM}-$VERSION || exit 1
-# Make sure ownerships and permissions are sane:
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -67,36 +69,37 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
- --sysconfdir=/etc/X11/fvwm2 \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
--mandir=/usr/man \
- --enable-multibyte \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-bidi \
--program-prefix= \
--program-suffix= \
- --enable-extras \
--build=$ARCH-slackware-linux
-# Build and install:
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
-# Add some ancient icons:
+# Add some ancient icons. The fvwm95 sample config still uses these.
( cd $PKG ; tar xzf $CWD/ancient-icons.tar.gz )
+# This script is called from the xinitrc:
+zcat $CWD/startfvwm2.gz > $PKG/usr/bin/startfvwm2
+chmod 755 $PKG/usr/bin/startfvwm2
+
+# This stuff appears to be misplaced junk:
+rm -rf $PKG/usr/share/doc
+
# Add a few more things:
mkdir -p $PKG/etc/X11/xinit
zcat $CWD/xinitrc.fvwm2.gz > $PKG/etc/X11/xinit/xinitrc.fvwm2
chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm2
-mkdir -p $PKG/etc/X11/fvwm2
-zcat $CWD/system.fvwm2rc.gz > $PKG/etc/X11/fvwm2/system.fvwm2rc.new
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/X11
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/X11 && rm -rf fvwm2 )
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/X11 && ln -sf ../../../etc/X11/fvwm2 fvwm2 )
+#zcat $CWD/system.fvwm2rc.gz > $PKG/etc/system.fvwm2rc.new
-# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" \
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -109,27 +112,30 @@ if [ -d $PKG/usr/man ]; then
ln -s $( readlink $eachpage ).gz $eachpage.gz
rm $eachpage
done
- gzip -9 *.*
+ gzip -9 *.?
)
done
)
fi
-# Add a documentation directory:
-mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+# Install some documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
- AUTHORS COPYING INSTALL INSTALL.fvwm NEWS README \
- $PKG/usr/doc/${PKGNAM}-$VERSION
-( cd docs
- cp -a \
- ANNOUNCE BUGS DEVELOPERS FAQ TODO color_combos error_codes fvwm.lsm m4_hacks \
- $PKG/usr/doc/${PKGNAM}-$VERSION
-)
+ AUTHORS COPYING* NEWS README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
mkdir -p $PKG/install
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xap/fvwm/fvwm.colormap.diff b/source/xap/fvwm/fvwm.colormap.diff
deleted file mode 100644
index 2d2eac94..00000000
--- a/source/xap/fvwm/fvwm.colormap.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./fvwm/colormaps.c.orig Mon Sep 13 14:10:25 1999
-+++ ./fvwm/colormaps.c Mon Sep 13 14:12:03 1999
-@@ -90,10 +90,13 @@
- /* Reinstall the colormap that we think should be installed,
- * UNLESS and unrecognized window has the focus - it might be
- * an override-redirect window that has its own colormap. */
-- if((ReInstall)&&(Scr.UnknownWinFocused == None))
-- {
-- XInstallColormap(dpy,last_cmap);
-- }
-+ /* Commented out, since although this behavior is an X standard, it breaks
-+ * xlockmore and some other nifty programs, and having it this way doesn't
-+ * cause any problems that I'm aware of. */
-+ /* if((ReInstall)&&(Scr.UnknownWinFocused == None)) */
-+ /* { */
-+ /* XInstallColormap(dpy,last_cmap); */
-+ /* } */
- }
-
- /************************************************************************
diff --git a/source/xap/fvwm/slack-desc b/source/xap/fvwm/slack-desc
index 77995d92..2d2a9ef5 100644
--- a/source/xap/fvwm/slack-desc
+++ b/source/xap/fvwm/slack-desc
@@ -13,7 +13,7 @@ fvwm: X11. It is a derivative of twm, redesigned to minimize memory
fvwm: consumption, provide a 3-D look to window frames, and provide a simple
fvwm: virtual desktop.
fvwm:
-fvwm:
+fvwm: Homepage: http://www.fvwm.org
fvwm:
fvwm:
fvwm:
diff --git a/source/xap/fvwm/startfvwm2 b/source/xap/fvwm/startfvwm2
new file mode 100644
index 00000000..b9d001d1
--- /dev/null
+++ b/source/xap/fvwm/startfvwm2
@@ -0,0 +1,23 @@
+#!/bin/sh
+# startfvwm2 v1.0
+
+########################################################################
+## Start DBUS session bus ##
+########################################################################
+
+
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+ eval $(dbus-launch --sh-syntax --exit-with-session)
+fi
+
+
+########################################################################
+## Start fvwm2 Window Manager ##
+########################################################################
+
+
+exec /usr/bin/fvwm2
+
+
+########################################################################
+
diff --git a/source/xap/fvwm/system.fvwm2rc b/source/xap/fvwm/system.fvwm2rc
deleted file mode 100644
index 863643a4..00000000
--- a/source/xap/fvwm/system.fvwm2rc
+++ /dev/null
@@ -1,822 +0,0 @@
-#
-# Default system.fvwm2rc for Slackware Linux, adapted from the version
-# for fvwm95 (i.e. beware of non-functional commented-out options)
-#
-
-#========================================================================#
-
-#
-# Fonts - one for window titles, another for icons, and another for the menus
-#
-WindowFont -adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*
-IconFont fixed
-MenuStyle black grey76 grey30 -adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* fvwm
-
-#
-# Set the default window colors. The syntax is:
-# DefaultColors winforecolor winbackcolor titleforecolor titlebackcolor
-# where:
-# winbackcolor is the background (border) color of all windows,
-# including the menu windows
-# winforecolor is used for the menu text
-# titlebackcolor is the background color used for title bars of
-# non selected windows
-# titleforecolor is the color of the title text of non selected windows
-#
-#DefaultColors Black #c3c3c3 #c3c3c3 grey51
-
-#
-# Text and background color for the title bar of the active (selected) window
-#
-#HilightColors White #000080
-
-#
-# Text and background color for the title bar of sticky windows
-#
-#StickyColors grey51 #60c080
-
-# You can also use the Style command to set the colors of individual
-# title bars of some non-selected windows
-
-#Style "*" ForeColor #c3c3c3
-#Style "*" BackColor grey51
-
-#========================================================================#
-
-#
-# Set up the major operating modes
-#
-
-# Let's comment this out and be more UNIX-like :^)
-# Style "*" ClickToFocus
-# If we use the FvwmTaskBar we don't need the icons :-)
-# Style "..." Icon is also commented below.
-Style "*" NoIcon
-Style "*" MWMFunctions
-Style "*" HintOverride
-Style "*" MWMDecor
-
-OpaqueMoveSize 100
-EdgeScroll 100 100
-EdgeResistance 10000 0
-
-#
-# RandomPlacement prevents user interaction while placing windows:
-#
-Style "*" RandomPlacement
-
-#
-# NoPPosition instructs fvwm to ignore the PPosition field in window
-# geometry hints. Emacs annoyingly sets PPosition to (0,0)!
-#
-Style "*" NoPPosition
-
-#========================================================================#
-
-#
-# Set the desk top size in units of physical screen size
-#
-DeskTopSize 3x2
-
-#========================================================================#
-
-# Set the decoration styles and window options
-# Order is important!!!!
-# If compatible styles are set for a single window in multiple Style
-# commands, then the styles are ORed together. If conflicting styles
-# are set, the last one specified is used.
-
-# These commands should command before any menus or functions are defined,
-# and before the internal pager is started.
-
-#
-# Default border and handle widths
-#
-Style "*" BorderWidth 5, HandleWidth 5
-
-Style "Fvwm*" NoTitle, Sticky, WindowListSkip
-Style "Fvwm Pager" StaysOnTop, NoHandles
-Style "FvwmBanner" StaysOnTop
-Style "FvwmButtons" NoTitle, NoHandles, Sticky, WindowListSkip,BorderWidth 5
-Style "*lock" NoTitle, NoHandles, Sticky, WindowListSkip
-Style "xbiff" NoTitle, Sticky, WindowListSkip
-
-#
-# Some mini-icons for the title bar
-#
-#Style "*" TitleIcon mini-x2.xpm
-#Style "*xterm*" TitleIcon mini-term.xpm
-#Style "rxvt" TitleIcon mini-term.xpm
-#Style "xcalc" TitleIcon mini-calc.xpm
-#Style "xsession" TitleIcon mini-bx2.xpm
-#Style "xv" TitleIcon mini-xv.xpm
-#Style "SeaMonkey" TitleIcon mini-nscape.xpm
-#Style "xmag" TitleIcon mini-zoom.xpm
-#Style "textedit" TitleIcon mini-edit.xpm
-#Style "tkps" TitleIcon mini-run.xpm
-#Style "Ghostview" TitleIcon mini-gv.xpm
-#Style "Xcolorsel" TitleIcon mini-colors.xpm
-#Style "IDL*" TitleIcon mini-zoom.xpm
-#Style "xeyes" TitleIcon mini-eyes.xpm
-#Style "*fm*" TitleIcon mini-filemgr.xpm
-# xman resource names
-#Style "topBox" TitleIcon mini-book1.xpm
-#Style "help" TitleIcon mini-book2.xpm
-#Style "manualBrowser" TitleIcon mini-book2.xpm
-# xpaint resource names
-#Style "xpaint" TitleIcon mini-paint.xpm
-#Style "Canvas" TitleIcon mini-paint.xpm
-#Style "fatbits" TitleIcon mini-paint.xpm
-#Style "filebrowser" TitleIcon mini-paint.xpm
-
-#Style "rxvt" Icon term.xpm
-#Style "xterm" Icon xterm.xpm
-#Style "Appointment" Icon datebook.xpm
-#Style "xcalc" Icon rcalc.xpm
-#Style "xbiff" Icon mail1.xpm
-#Style "xmh" Icon mail1.xpm, StartsOnDesk 2
-#Style "xman" Icon xman.xpm
-#Style "xvgr" Icon graphs.xpm
-#Style "matlab" Icon math4.xpm
-#Style "xmag" Icon mag_glass.xpm
-#Style "xgraph" Icon graphs.xpm
-#Style "xv" Icon xview.xpm
-#Style "FvwmButtons" Icon toolbox.xpm
-#Style "xconsole" Icon koala.xpm
-#Style "xsession" Icon koala.xpm
-#Style "textedit" Icon textedit.xpm
-#Style "gv" Icon gv.xpm
-
-#========================================================================#
-
-#
-# Stuff to do at start-up
-#
-
-AddToFunc "InitFunction"
-#+ "I" Module FvwmButtons
-+ "I" Module FvwmButtons MiniButtons
-+ "I" Module FvwmPager 0 0
-
-AddToFunc "RestartFunction"
-#+ "I" Module FvwmButtons
-+ "I" Module FvwmButtons MiniButtons
-+ "I" Module FvwmPager 0 0
-
-#========================================================================#
-
-# Now define some handy complex functions
-
-#
-# This one moves and then raises the window if you drag the mouse,
-# only raises the window if you click, or does a full maximize if
-# you double click
-#
-AddToFunc "Move-or-Raise" "M" Move
-+ "M" Raise
-+ "C" Raise
-+ "D" Maximize 100 100
-
-#
-# This one moves and then lowers the window if you drag the mouse,
-# only lowers the window if you click, or does a RaiseLower if you double
-# click
-#
-AddToFunc "Move-or-Lower" "M" Move
-+ "M" Lower
-+ "C" Lower
-+ "D" RaiseLower
-
-#
-# This one moves or (de)iconifies:
-#
-AddToFunc "Move-or-Iconify" "M" Move
-+ "D" Iconify
-
-#
-# This one resizes and then raises the window if you drag the mouse,
-# only raises the window if you click, or does a RaiseLower if you double
-# click
-#
-AddToFunc "Resize-or-Raise" "M" Resize
-+ "M" Raise
-+ "C" Raise
-+ "D" RaiseLower
-
-
-#========================================================================#
-
-#
-# Now define the menus - defer bindings until later
-#
-
-# This is for the Start menu of the FvwmTaskBar
-
-DestroyMenu "StartMenu"
-AddToMenu "StartMenu"
-+ "Manual Pages %mini-book1.xpm%" Exec xman &
-+ "Magnifying Glass %mini-zoom.xpm%" Exec xmag &
-+ "" Nop
-+ "Accessories%mini-hammer.xpm%" Popup Accessories
-+ "Applications %mini-x2.xpm%" Popup Applications
-+ "File Managers %mini-filemgr.xpm%" Popup Filemanagers
-+ "Games %mini-happy.xpm%" Popup Games
-+ "Shells %mini-term.xpm" Popup Shells
-+ "" Nop
-+ "Lock Screen %mini-lock.xpm%" Popup Screenlock
-+ "Screensaver %mini-display.xpm%" Popup Screensaver
-+ "" Nop
-+ "Refresh Screen %mini-ray.xpm%" Refresh
-+ "" Nop
-+ "Exit Fvwm2 %mini-stop.xpm%" Popup Quit-Verify
-
-DestroyMenu "Shells"
-AddToMenu "Shells"
-+ "Xterm (7x14 font)%mini-term.xpm%" Exec xterm -sb -sl 500 -j -ls -fn 7x14 -fb 7x14bold &
-+ "Large Xterm (10x20 font)%mini-term.xpm%" Exec xterm -sb -sl 500 -j -ls -fn 10x20 &
-+ "" Nop
-+ "Rxvt (7x14 font)%mini-term.xpm%" Exec rxvt -font 7x14 -ls &
-+ "Large Rxvt (10x20 font)%mini-term.xpm%" Exec rxvt -font 10x20 -ls &
-
-DestroyMenu "Screensaver"
-AddToMenu "Screensaver"
-+ "Blank%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode blank &
-+ "Random%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode random &
-+ "" Nop
-+ "Ant%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode ant &
-+ "Ball%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode ball &
-+ "Bat%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bat &
-+ "Blot%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode blot &
-+ "Bomb%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bomb &
-+ "Bouboule%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bouboule &
-#+ "Bob%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode image -bitmap /usr/include/X11/bitmaps/l-bob.xbm -batchcount 7 &
-#+ "Bounce%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bounce &
-+ "\"Bob\"%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bounce &
-+ "Braid%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode braid &
-+ "Bug%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bug &
-+ "Bubble%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode bubble &
-+ "Clock%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode clock &
-+ "Coral%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode coral &
-+ "Crystal%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode crystal &
-+ "Daisy%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode daisy &
-+ "Dclock%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode dclock &
-+ "Deco%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode deco &
-+ "Demon%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode demon &
-+ "Dilemma%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode dilemma &
-+ "Drift%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode drift &
-+ "More" PopUp ScreenSaver2
-
-DestroyMenu "Screensaver2"
-AddToMenu "Screensaver2"
-+ "Eyes%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode eyes &
-+ "Fadeplot%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode fadeplot &
-+ "Flag%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode flag &
-+ "Flame%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode flame &
-+ "Forest%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode forest &
-+ "Galaxy%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode galaxy &
-+ "Geometry%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode geometry &
-+ "Grav%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode grav &
-+ "Helix%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode helix &
-+ "Hop%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode hop &
-+ "Hyper%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode hyper &
-+ "Ico%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode ico &
-+ "Ifs%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode ifs &
-+ "Julia%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode julia &
-+ "Kaleid%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode kaleid &
-+ "Laser%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode laser &
-+ "Life%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode life &
-+ "Life1d%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode life1d &
-+ "Life3d%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode life3d &
-+ "Lightning%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode lightning &
-+ "Lisa%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode lisa &
-+ "Lissie%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode lissie &
-+ "Loop%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode loop &
-+ "More" PopUp ScreenSaver3
-
-DestroyMenu "Screensaver3"
-AddToMenu "Screensaver3"
-+ "Mandelbrot%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode mandelbrot &
-+ "Marquee%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode marquee &
-+ "Maze%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode maze &
-+ "Mountain%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode mountain &
-+ "Munch%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode munch &
-+ "Nose%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode nose &
-+ "Pacman%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode pacman &
-+ "Penguin%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode image -bitmap /usr/include/X11/bitmaps/l-linux.xbm -batchcount 7 &
-+ "Penrose%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode penrose &
-+ "Petal%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode petal &
-+ "Puzzle%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode puzzle &
-+ "Pyro%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode pyro &
-+ "Qix%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode qix &
-+ "Roll%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode roll &
-+ "Rotor%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode rotor &
-+ "Shape%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode shape &
-+ "Sierpinski%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode sierpinski &
-+ "Slip%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode slip &
-+ "Sphere%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode sphere &
-+ "Spiral%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode spiral &
-+ "Spline%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode spline &
-+ "Star%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode star &
-+ "Strange%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode strange &
-+ "More" PopUp ScreenSaver4
-
-DestroyMenu "Screensaver4"
-AddToMenu "Screensaver4"
-+ "Swarm%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode swarm &
-+ "Swirl%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode swirl &
-+ "Triangle%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode triangle &
-+ "Tube%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode tube &
-+ "Turtle%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode turtle &
-+ "Vines%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode vines &
-+ "Voters%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode voters &
-+ "Wator%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode wator &
-+ "Wire%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode wire &
-+ "World%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode world &
-+ "Worm%mini-bball.xpm%" Exec xlock -nolock -nice 0 -mode worm &
-
-DestroyMenu "Screenlock"
-AddToMenu "Screenlock"
-+ "Blank%mini-bball.xpm%" Exec xlock -nice 0 -mode blank &
-+ "Random%mini-bball.xpm%" Exec xlock -nice 0 -mode random &
-+ "" Nop
-+ "Ant%mini-bball.xpm%" Exec xlock -nice 0 -mode ant &
-+ "Ball%mini-bball.xpm%" Exec xlock -nice 0 -mode ball &
-+ "Bat%mini-bball.xpm%" Exec xlock -nice 0 -mode bat &
-+ "Blot%mini-bball.xpm%" Exec xlock -nice 0 -mode blot &
-+ "Bomb%mini-bball.xpm%" Exec xlock -nice 0 -mode bomb &
-+ "Bouboule%mini-bball.xpm%" Exec xlock -nice 0 -mode bouboule &
-#+ "Bob%mini-bball.xpm%" Exec xlock -nice 0 -mode image -bitmap /usr/include/X11/bitmaps/l-bob.xbm -batchcount 7 &
-#+ "Bounce%mini-bball.xpm%" Exec xlock -nice 0 -mode bounce &
-+ "\"Bob\"%mini-bball.xpm%" Exec xlock -nice 0 -mode bounce &
-+ "Braid%mini-bball.xpm%" Exec xlock -nice 0 -mode braid &
-+ "Bug%mini-bball.xpm%" Exec xlock -nice 0 -mode bug &
-+ "Bubble%mini-bball.xpm%" Exec xlock -nice 0 -mode bubble &
-+ "Clock%mini-bball.xpm%" Exec xlock -nice 0 -mode clock &
-+ "Coral%mini-bball.xpm%" Exec xlock -nice 0 -mode coral &
-+ "Crystal%mini-bball.xpm%" Exec xlock -nice 0 -mode crystal &
-+ "Daisy%mini-bball.xpm%" Exec xlock -nice 0 -mode daisy &
-+ "Dclock%mini-bball.xpm%" Exec xlock -nice 0 -mode dclock &
-+ "Deco%mini-bball.xpm%" Exec xlock -nice 0 -mode deco &
-+ "Demon%mini-bball.xpm%" Exec xlock -nice 0 -mode demon &
-+ "Dilemma%mini-bball.xpm%" Exec xlock -nice 0 -mode dilemma &
-+ "Drift%mini-bball.xpm%" Exec xlock -nice 0 -mode drift &
-+ "More" PopUp Screenlock2
-
-DestroyMenu "Screenlock2"
-AddToMenu "Screenlock2"
-+ "Eyes%mini-bball.xpm%" Exec xlock -nice 0 -mode eyes &
-+ "Fadeplot%mini-bball.xpm%" Exec xlock -nice 0 -mode fadeplot &
-+ "Flag%mini-bball.xpm%" Exec xlock -nice 0 -mode flag &
-+ "Flame%mini-bball.xpm%" Exec xlock -nice 0 -mode flame &
-+ "Forest%mini-bball.xpm%" Exec xlock -nice 0 -mode forest &
-+ "Galaxy%mini-bball.xpm%" Exec xlock -nice 0 -mode galaxy &
-+ "Geometry%mini-bball.xpm%" Exec xlock -nice 0 -mode geometry &
-+ "Grav%mini-bball.xpm%" Exec xlock -nice 0 -mode grav &
-+ "Helix%mini-bball.xpm%" Exec xlock -nice 0 -mode helix &
-+ "Hop%mini-bball.xpm%" Exec xlock -nice 0 -mode hop &
-+ "Hyper%mini-bball.xpm%" Exec xlock -nice 0 -mode hyper &
-+ "Ico%mini-bball.xpm%" Exec xlock -nice 0 -mode ico &
-+ "Ifs%mini-bball.xpm%" Exec xlock -nice 0 -mode ifs &
-+ "Julia%mini-bball.xpm%" Exec xlock -nice 0 -mode julia &
-+ "Kaleid%mini-bball.xpm%" Exec xlock -nice 0 -mode kaleid &
-+ "Laser%mini-bball.xpm%" Exec xlock -nice 0 -mode laser &
-+ "Life%mini-bball.xpm%" Exec xlock -nice 0 -mode life &
-+ "Life1d%mini-bball.xpm%" Exec xlock -nice 0 -mode life1d &
-+ "Life3d%mini-bball.xpm%" Exec xlock -nice 0 -mode life3d &
-+ "Lightning%mini-bball.xpm%" Exec xlock -nice 0 -mode lightning &
-+ "Lisa%mini-bball.xpm%" Exec xlock -nice 0 -mode lisa &
-+ "Lissie%mini-bball.xpm%" Exec xlock -nice 0 -mode lissie &
-+ "Loop%mini-bball.xpm%" Exec xlock -nice 0 -mode loop &
-+ "More" PopUp Screenlock3
-
-DestroyMenu "Screenlock3"
-AddToMenu "Screenlock3"
-+ "Mandelbrot%mini-bball.xpm%" Exec xlock -nice 0 -mode mandelbrot &
-+ "Marquee%mini-bball.xpm%" Exec xlock -nice 0 -mode marquee &
-+ "Maze%mini-bball.xpm%" Exec xlock -nice 0 -mode maze &
-+ "Mountain%mini-bball.xpm%" Exec xlock -nice 0 -mode mountain &
-+ "Munch%mini-bball.xpm%" Exec xlock -nice 0 -mode munch &
-+ "Nose%mini-bball.xpm%" Exec xlock -nice 0 -mode nose &
-+ "Pacman%mini-bball.xpm%" Exec xlock -nice 0 -mode pacman &
-+ "Penguin%mini-bball.xpm%" Exec xlock -nice 0 -mode image -bitmap /usr/include/X11/bitmaps/l-linux.xbm -batchcount 7 &
-+ "Penrose%mini-bball.xpm%" Exec xlock -nice 0 -mode penrose &
-+ "Petal%mini-bball.xpm%" Exec xlock -nice 0 -mode petal &
-+ "Puzzle%mini-bball.xpm%" Exec xlock -nice 0 -mode puzzle &
-+ "Pyro%mini-bball.xpm%" Exec xlock -nice 0 -mode pyro &
-+ "Qix%mini-bball.xpm%" Exec xlock -nice 0 -mode qix &
-+ "Roll%mini-bball.xpm%" Exec xlock -nice 0 -mode roll &
-+ "Rotor%mini-bball.xpm%" Exec xlock -nice 0 -mode rotor &
-+ "Shape%mini-bball.xpm%" Exec xlock -nice 0 -mode shape &
-+ "Sierpinski%mini-bball.xpm%" Exec xlock -nice 0 -mode sierpinski &
-+ "Slip%mini-bball.xpm%" Exec xlock -nice 0 -mode slip &
-+ "Sphere%mini-bball.xpm%" Exec xlock -nice 0 -mode sphere &
-+ "Spiral%mini-bball.xpm%" Exec xlock -nice 0 -mode spiral &
-+ "Spline%mini-bball.xpm%" Exec xlock -nice 0 -mode spline &
-+ "Star%mini-bball.xpm%" Exec xlock -nice 0 -mode star &
-+ "Strange%mini-bball.xpm%" Exec xlock -nice 0 -mode strange &
-+ "More" PopUp Screenlock4
-
-DestroyMenu "Screenlock4"
-AddToMenu "Screenlock4"
-+ "Swarm%mini-bball.xpm%" Exec xlock -nice 0 -mode swarm &
-+ "Swirl%mini-bball.xpm%" Exec xlock -nice 0 -mode swirl &
-+ "Triangle%mini-bball.xpm%" Exec xlock -nice 0 -mode triangle &
-+ "Tube%mini-bball.xpm%" Exec xlock -nice 0 -mode tube &
-+ "Turtle%mini-bball.xpm%" Exec xlock -nice 0 -mode turtle &
-+ "Vines%mini-bball.xpm%" Exec xlock -nice 0 -mode vines &
-+ "Voters%mini-bball.xpm%" Exec xlock -nice 0 -mode voters &
-+ "Wator%mini-bball.xpm%" Exec xlock -nice 0 -mode wator &
-+ "Wire%mini-bball.xpm%" Exec xlock -nice 0 -mode wire &
-+ "World%mini-bball.xpm%" Exec xlock -nice 0 -mode world &
-+ "Worm%mini-bball.xpm%" Exec xlock -nice 0 -mode worm &
-
-DestroyMenu "Games"
-AddToMenu "Games"
-+ "Maze%mini-maze.xpm%" Exec maze &
-+ "Spider%mini-espada.xpm%" Exec spider &
-+ "Chess%mini-slon.xpm%" Exec xboard &
-+ "Xlander%mini-xlander.xpm%" Exec xlander &
-#+ "Xmahjongg%mini-xmahjongg.xpm%" Exec xmahjongg &
-+ "Workman%mini-cdlabel.xpm%" Exec workman &
-+ "" Nop
-+ "Amusements" Popup Amusements
-
-DestroyMenu "Amusements"
-AddToMenu "Amusements"
-#+ "Xcat%mini-cat.xpm%" Exec xcat &
-+ "Xeyes%mini-eyes.xpm%" Exec xeyes &
-+ "Xlogo%mini-bx2.xpm%" Exec xlogo &
-+ "Xroach%mini-roach.xpm%" Exec xroach &
-+ "Xsnow%mini-xsnow.xpm%" Exec xsnow &
-+ "Stop Xsnow%mini-stop.xpm%" Exec killall xsnow &
-
-DestroyMenu "Accessories"
-AddToMenu "Accessories"
-+ "Font viewer (xfontsel)%mini-font.xpm%" Exec xfontsel &
-+ "Manual pages%mini-book1.xpm%" Exec xman &
-+ "Magnifying glass%mini-zoom.xpm%" Exec xmag &
-+ "Oclock%mini-clock.xpm%" Exec oclock &
-+ "Running Processes (Top)%mini-run.xpm%" Exec xterm -font 7x14 -T Top -n Top -e top &
-+ "System load%mini-perf.xpm%" Exec xload &
-+ "Xclipboard%mini-clipboard.xpm%" Exec xclipboard &
-+ "Xclock%mini-clock.xpm%" Exec xclock &
-
-DestroyMenu "Applications"
-AddToMenu "Applications"
-+ "Emacs%mini-edit.xpm%" Exec emacs &
-+ "NcFTP%mini-ftp.xpm%" Exec xterm -name NcFtp -T FTP -ls -fn 7x14 -e ncftp &
-+ "GIMP%mini-camera.xpm%" Exec gimp &
-+ "Gv%mini-gv.xpm%" Exec gv &
-+ "Gnuplot%mini-zoom.xpm%" Exec xterm -T "Gnuplot" -name Gnuplot -fn 7x14 -e gnuplot &
-+ "SeaMonkey%mini-nscape.xpm%" Exec seamonkey &
-+ "Pine%mini-mail.xpm%" Exec xterm -name Mail -T Mail -ls -fn 7x14 -e pine -i &
-+ "Xv%mini-xv.xpm%" Exec xv &
-+ "Xedit%mini-edit.xpm%" Exec xedit &
-+ "Xfig%mini-xfig.xpm%" Exec xfig &
-+ "Xfractint%mini-fractal.xpm%" Exec xterm -font 7x14 -e xfractint &
-+ "Xpaint%mini-paint.xpm%" Exec xpaint &
-+ "Xpdf%mini-pdf.xpm%" Exec xpdf &
-+ "Xxgdb%mini-bug2.xpm%" Exec xxgdb &
-
-DestroyMenu "Filemanagers"
-AddToMenu "Filemanagers"
-#+ "TkDesk%mini-desktop.xpm%" Exec tkdesk &
-+ "Xfm%mini-filemgr.xpm%" Exec xfm &
-
-#
-# This menu is invoked as a sub-menu - it allows you to quit,
-# restart, or switch to another WM.
-#
-DestroyMenu "Quit-Verify"
-AddToMenu "Quit-Verify"
-+ "Quit fvwm2%mini-exclam.xpm%" Quit
-+ "" Nop
-+ "Restart Fvwm2%mini-turn.xpm%" Restart fvwm2
-+ "" Nop
-+ "Start fvwm95%mini-exp.xpm%" Restart fvwm95
-+ "Start mwm%mini-mwm.xpm%" Restart mwm
-+ "Start olvwm%mini-olwm.xpm%" Restart /usr/openwin/bin/olvwm
-+ "Start olwm%mini-olwm.xpm%" Restart /usr/openwin/bin/olwm
-+ "Start twm%mini-twm.xpm%" Restart twm
-
-#
-# Provides a list of modules to fire off
-#
-#DestroyMenu "Module-Popup"
-#AddToMenu "Module-Popup"
-##+ "Audio" Module FvwmAudio
-#+ "Banner%mini.fvwm.xpm%" Module FvwmBanner
-#+ "Button Bar%mini-ball.xpm%" Module FvwmButtons
-#+ "Button Bar (Mini)%mini-ball.xpm%" Module FvwmButtons MiniButtons
-##+ "Clean-Up%mini-pencil.xpm%" Module FvwmClean
-##+ "Configure%mini-hammer.xpm%" Module FvwmConfig
-#+ "Debug%mini-bug2.xpm%" Module FvwmDebug
-##+ "Task bar%mini-exp.xpm%" Module FvwmTaskBar
-#+ "Identify%mini-question.xpm%" Module FvwmIdent
-#+ "Save Desktop%mini-desktop.xpm%" Module FvwmSaveDesk
-#+ "Pager%mini-pager.xpm%" Module FvwmPager 0 0
-#+ "Window List%mini-windows.xpm%" Module FvwmWinList
-#+ "Talk%mini-exclam.xpm%" Module FvwmTalk
-
-AddToMenu Module-Popup "FvwmModules" Title
-+ "Identify" Module FvwmIdent
-+ "Talk" Module FvwmTalk
-+ "" Nop
-+ "Button-Bar" Module FvwmButtons
-+ "Pager" Module FvwmPager 0 0
-+ "Pager (2 desks)" Module FvwmPager 0 1
-+ "WinList" Module FvwmWinList
-+ "" Nop
-+ "Banner" Module FvwmBanner
-+ "ScrollBar" Module FvwmScroll 50 50
-+ "Background" Module FvwmBacker
-+ "AutoRaise" Module FvwmAuto 200 Raise Nop
-+ "Stop AutoRaise" KillModule FvwmAuto
-+ "" Nop
-+ "IconBox" Module FvwmIconBox
-+ "IconMan" Module FvwmIconMan
-+ "" Nop
-+ "Form - Rlogin" Module FvwmForm Rlogin
-+ "Form - MyFvwmTalk" Module FvwmForm MyFvwmTalk
-+ "Form - QuitVerify" Module FvwmForm QuitVerify
-
-#
-# This menu will fire up some very common utilities
-#
-DestroyMenu "Utilities"
-AddToMenu "Utilities"
-+ "" Nop
-+ "Xterm%mini-term.xpm%" Exec xterm -sb -sl 500 -j -ls -fn 7x14 -fb 7x14bold &
-+ "Running Processes (Top)%mini-run.xpm%" Exec xterm -font 7x14 -T Top -n Top -e top &
-+ "Calculator%mini-calc.xpm%" Exec xcalc &
-+ "Manual pages%mini-book1.xpm%" Exec xman &
-+ "Magnifying glass%mini-zoom.xpm%" Exec xmag &
-+ "Oclock%mini-clock.xpm%" Exec oclock &
-+ "" Nop
-+ "Applications%mini-x2.xpm%" Popup Applications
-+ "File Managers%mini-filemgr.xpm%" Popup Filemanagers
-+ "Games%mini-happy.xpm%" Popup Games
-+ "Shells%mini-term.xpm" Popup Shells
-+ "" Nop
-+ "Screensaver%mini-display.xpm%" Popup Screensaver
-+ "Lock Screen%mini-lock.xpm%" Popup Screenlock
-+ "" Nop
-+ "Modules%mini-modules.xpm%" Popup Module-Popup
-+ "" Nop
-+ "Refresh Screen%mini-ray.xpm%" Refresh
-+ "" Nop
-+ "Exit Fvwm2%mini-stop.xpm%" Popup Quit-Verify
-
-#
-# This defines the most common window operations
-#
-DestroyMenu "Window Ops"
-AddToMenu "Window Ops" Title
-+ "&Move%mini-move.xpm%" Function Move-or-Raise
-+ "&Resize%mini-resize.xpm%" Function Resize-or-Raise
-+ "R&aise%mini-raise.xpm%" Raise
-+ "&Lower%mini-lower.xpm%" Lower
-+ "(De)Iconify" Iconify
-+ "(Un)Stick" Stick
-+ "(Un)Maximize%mini-max1.xpm%" Function maximize_func
-+ "" Nop
-+ "Kill%mini-bomb.xpm%" Destroy
-+ "&Close%mini-cross.xpm%" Delete
-+ "" Nop
-+ "Switch to..." WindowList
-+ "Refresh Screen%mini-ray.xpm%" Refresh
-
-#
-# A trimmed down version of "Window Ops", good for binding to decorations
-#
-AddToMenu "Window-Ops2" "&Restore" Iconify -1
-+ "&Move" Move-or-Raise
-+ "&Size" Resize-or-Raise
-+ "Mi&nimize" Iconify 1
-+ "Ma&ximize" Maximize 100 100
-+ "" Nop
-+ "&Kill" Destroy
-+ "&Close Alt+F4" Delete
-
-#========================================================================#
-
-#
-# One more complex function - couldn't be defined earlier because it used
-# pop-up menus
-#
-# This creates the "system" menu for the title-bar window-ops
-# pop-up
-#
-AddToFunc "window_ops_func" "C" PopUp Window-Ops2
-+ "M" PopUp Window-Ops2
-+ "D" Delete
-
-
-#========================================================================#
-
-#
-# Mouse bindings
-#
-
-# First, for the mouse in the root window
-# Button 1 gives the Utilities menu
-# Button 2 gives the Window Ops menu
-# Button 3 gives the WindowList (like TwmWindows)
-# I use the AnyModifier (A) option for the modifier field, so you can hold down
-# any shift-control-whatever combination you want!
-
-# Button Context Modifi Function
-Mouse 1 R A Menu "Utilities" Nop
-Mouse 2 R A Menu "Window Ops" Nop
-Mouse 3 R A WindowList
-#Mouse 3 R A Module "winlist" FvwmWinList transient
-
-# Now the title bar buttons
-# Any button in the left title-bar button gives the window ops menu
-# Any button in the first right title-bar button Iconifies the window
-# Any button in the second title-bar button full-maximizes
-# Note the use of "Mouse 0" for AnyButton.
-
-# Button Context Modif Function
-Mouse 0 1 A Function "window_ops_func"
-Mouse 0 2 A Maximize 100 100
-Mouse 0 4 A Iconify
-
-# Now the rest of the frame
-# Here I invoke my complex functions for Move-or-lower, Move-or-raise,
-# and Resize-or-Raise.
-#
-# Button 1 in the corner pieces, with any modifiers, gives resize or raise
-Mouse 1 F A Function "Resize-or-Raise"
-# Button 1 in the title, sides, or icon, w/ any modifiers, gives move or raise
-Mouse 1 TS A Function "Move-or-Raise"
-
-# Button 1 in an icons gives move for a drag, de-iconify for a double-click,
-# nothing for a single click
-# Button 2 in an icon, w/ any modifiers, gives de-iconify
-Mouse 1 I A Function "Move-or-Iconify"
-Mouse 2 I A Iconify
-
-# Button 2 in the corners, sides, or title-bar gives the window ops menu
-Mouse 2 FST A Function "window_ops_func"
-
-# Button 3 anywhere in the decoration (except the title-bar buttons)
-# does a raise-lower
-Mouse 3 TSIF A RaiseLower
-
-# Button 3 in the window, with the Modifier-1 key (usually alt or diamond)
-# gives Raise-Lower. Used to use control here, but that interferes with xterm
-Mouse 3 W M RaiseLower
-
-#========================================================================#
-
-# Now some keyboard shortcuts.
-
-# Arrow Keys
-# press arrow + control anywhere, and scroll by 1 page
-Key Left A C Scroll -100 0
-Key Right A C Scroll +100 +0
-Key Up A C Scroll +0 -100
-Key Down A C Scroll +0 +100
-
-# press arrow + meta key, and scroll by 1/10 of a page
-Key Left A M Scroll -10 +0
-Key Right A M Scroll +10 +0
-Key Up A M Scroll +0 -10
-Key Down A M Scroll +0 +10
-
-# press shift arrow + control anywhere, and move the pointer by 1% of a page
-Key Left A SC CursorMove -1 0
-Key Right A SC CursorMove +1 +0
-Key Up A SC CursorMove +0 -1
-Key Down A SC CursorMove +0 +1
-
-# press shift arrow + meta key, and move the pointer by 1/10 of a page
-Key Left A SM CursorMove -10 +0
-Key Right A SM CursorMove +10 +0
-Key Up A SM CursorMove +0 -10
-Key Down A SM CursorMove +0 +10
-
-# Keyboard accelerators
-Key F1 A M Popup "Utilities"
-Key F1 A M Popup "Utilities"
-Key F2 A M Popup "Window Ops"
-Key F3 A M Module "WindowList" FvwmWinList
-Key F4 A M Iconify
-Key F5 A M Move
-Key F6 A M Resize
-Key F7 A M CirculateUp
-Key F8 A M CirculateDown
-
-#Page Up/Dapge Down keys are used to scroll by one desktop page
-# in any context, press page up/down + control
-# in root context, just pressing page up/down is OK
-#
-# I prefer the non-wrapping scroll. These are for example purposes only
-#Key Next A C Scroll 100000 0
-#Key Next R N Scroll 100000 0
-#Key Prior A C Scroll -100000 0
-#Key Prior R N Scroll -100000 0
-
-Key Tab A M Prev Focus
-Key Tab A MS Next Focus
-
-Key Escape A C WindowList
-
-#========================================================================#
-
-# Definitions used by the modules
-
-#------------------ Pager
-*FvwmPagerBack grey60
-*FvwmPagerFore black
-*FvwmPagerFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
-*FvwmPagerHilight #c3c3c3
-*FvwmPagerGeometry -3-27
-*FvwmPagerLabel 0 Desktop
-*FvwmPagerSmallFont 5x8
-
-#------------------ FvwmButtons
-*FvwmButtonsFore Black
-*FvwmButtonsBack #c3c3c3
-*FvwmButtonsFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
-# Geometry - really likes to pick its own size, but giving a position is OK
-*FvwmButtonsGeometry -5-5
-# Layout: specify rows or columns, not both
-*FvwmButtonsRows 1
-
-# Define the buttons to use.....
-*FvwmButtons xclock clock.xpm Swallow "xclock" Exec xclock -bg \#c3c3c3 -geometry -1500-1500 -padding 0 &
-#*GoodStuff xcmap NULL Swallow "xcmap" xcmap -geometry -1500-1500
-*FvwmButtons (2x1) load NULL Swallow "xload" Exec nice -16 xload -nolabel -bg grey60 -update 5 -geometry -1500-1500
-*FvwmButtons SeaMonkey nscape.xpm Exec "SeaMonkey" seamonkey &
-*FvwmButtons xterm rterm.xpm Exec "xterm" xterm -ls -sb -fn 7x14 &
-*FvwmButtons xfm Xfm.xpm Exec "Xfm" xfm &
-#*FvwmButtons textedit textedit.xpm Exec "Textedit" textedit &
-*FvwmButtons xcalc rcalc.xpm Exec "Calculator" xcalc &
-*FvwmButtons xv xv.xpm Exec "xv" xv &
-#*FvwmButtons gv gv.xpm Exec "gv" gv &
-#*FvwmButtons seamonkey nscape.xpm Exec "SeaMonkey" seamonkey -geometry 920x650+90+5
-*FvwmButtons kill rbomb.xpm Destroy
-#*FvwmButtons (2x1) - whatever SwallowModule Exec "Desktop" FvwmPager 0 0
-*FvwmButtons (2x1, Swallow(UseOld) "Desktop" 'FvwmPager 0 0')
-
-#------------------ MiniButtons
-
-Style "MiniButtons" NoTitle,NoHandles,Sticky,StaysOnTop,WindowListSkip,BorderWidth 0
-
-*MiniButtonsFore Black
-*MiniButtonsBack #c0c0c0
-*MiniButtonsFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
-*MiniButtonsGeometry -5-5
-*MiniButtonsRows 1
-*MiniButtonsPadding 1 1
-
-*MiniButtons - mini-nscape.xpm Exec "SeaMonkey" seamonkey -geometry 790x543+0+0 &
-*MiniButtons - mini-term.xpm Exec "XTerm" xterm -ls -sb -fn 7x14 &
-*MiniButtons - mini-filemgr.xpm Exec "Xfm" xfm &
-*MiniButtons - mini-calc.xpm Exec "Calculator" xcalc &
-#*MiniButtons - mini-gv.xpm Exec "gv" gv &
-*MiniButtons - mini-xv.xpm Exec "xv" xv &
-*MiniButtons - mini-bomb.xpm Destroy
-
-#------------------ Identify
-*FvwmIdentBack #000080
-*FvwmIdentFore Yellow
-*FvwmIdentFont -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
-
-#------------------ FvwmWinList
-*FvwmWinListBack #c3c3c3
-*FvwmWinListFore Black
-*FvwmWinListFont -adobe-helvetica-bold-r-*-*-10-*-*-*-*-*-*-*
-*FvwmWinListAction Click1 Iconify -1,Focus
-*FvwmWinListAction Click2 Iconify
-*FvwmWinListAction Click3 Module "FvwmIdent" FvwmIdent
-*FvwmWinListUseSkipList
-*FvwmWinListGeometry +0-1
-
-#------------------ FvwmTaskBar
-#Style "FvwmTaskBar" NoTitle,BorderWidth 4,HandleWidth 4,Sticky,StaysOnTop,WindowListSkip,CirculateSkip
-# I don't like the taskbar to stay to top, since it covers the bottom
-# part of SeaMonkey in full-screen mode:
-#Style "FvwmTaskBar" NoTitle,BorderWidth 4,HandleWidth 4,Sticky,WindowListSkip,CirculateSkip
-
-*FvwmTaskBarGeometry +0-0
-*FvwmTaskBarFore Black
-*FvwmTaskBarBack #c3c3c3
-*FvwmTaskBarTipsFore black
-*FvwmTaskBarTipsBack bisque
-*FvwmTaskBarFont -adobe-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
-*FvwmTaskBarSelFont -adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
-*FvwmTaskBarAction Click1 Iconify -1,Raise,Focus
-*FvwmTaskBarAction Click2 Iconify
-*FvwmTaskBarAction Click3 Module "FvwmIdent" FvwmIdent
-*FvwmTaskBarUseSkipList
-*FvwmTaskBarAutoStick
-*FvwmTaskBarStartName Start
-*FvwmTaskBarStartMenu StartMenu
-# Just for fun, let's use the Linux penguin for the Start button:
-*FvwmTaskBarStartIcon mini-penguin.xpm
-#*FvwmTaskBarStartIcon mini-exp.xpm
-*FvwmTaskBarShowTips
-*FvwmTaskBarMailProg xterm -e mail
diff --git a/source/xap/fvwm/xinitrc.fvwm2 b/source/xap/fvwm/xinitrc.fvwm2
index 788a4e43..c0fb46b0 100644
--- a/source/xap/fvwm/xinitrc.fvwm2
+++ b/source/xap/fvwm/xinitrc.fvwm2
@@ -28,8 +28,8 @@ fi
xsetroot -solid SteelBlue
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
- ck-launch-session fvwm2
+ ck-launch-session /usr/bin/startfvwm2
else
- fvwm2
+ dbus-launch --exit-with-session /usr/bin/startfvwm2
fi
diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild
index dbde32bb..2c0851b4 100755
--- a/source/xap/geeqie/geeqie.SlackBuild
+++ b/source/xap/geeqie/geeqie.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2010, 2011 Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2012 Patrick Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
PKGNAM=geeqie
-VERSION=1.0
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xap/geeqie/slack-desc b/source/xap/geeqie/slack-desc
index cadbd774..7371d160 100644
--- a/source/xap/geeqie/slack-desc
+++ b/source/xap/geeqie/slack-desc
@@ -17,4 +17,3 @@ geeqie:
geeqie:
geeqie:
geeqie:
-geeqie:
diff --git a/source/xap/gftp/gftp.SlackBuild b/source/xap/gftp/gftp.SlackBuild
index ba93205e..9a293b64 100755
--- a/source/xap/gftp/gftp.SlackBuild
+++ b/source/xap/gftp/gftp.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,20 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=2.0.19
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-2}
+PKGNAM=gftp
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i486 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
NUMJOBS=${NUMJOBS:-" -j7 "}
diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild
index 330ca4f1..45848585 100755
--- a/source/xap/gimp/gimp.SlackBuild
+++ b/source/xap/gimp/gimp.SlackBuild
@@ -23,7 +23,7 @@
PKGNAM=gimp
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -79,8 +79,6 @@ CFLAGS="$SLKCFLAGS" \
--infodir=/usr/info \
--docdir=/usr/doc/gimp-$VERSION \
--disable-static \
- --enable-gimp-remote \
- --without-gvfs \
--with-libcurl \
--build=$ARCH-slackware-linux
@@ -91,10 +89,20 @@ make install DESTDIR=$PKG || exit 1
# Add a manpage symlink for POLA-compliance
( cd $PKG/usr/man/man1 ; ln -sf gimptool-2.?.1 gimptool.1 )
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+ ( cd $PKG/usr/man
+ for manpagedir in $(find . -type d -name "man*") ; do
+ ( cd $manpagedir
+ for eachpage in $( find . -type l -maxdepth 1) ; do
+ ln -s $( readlink $eachpage ).gz $eachpage.gz
+ rm $eachpage
+ done
+ gzip -9 *.?
+ )
+ done
+ )
+fi
mkdir -p $PKG/usr/doc/gimp-$VERSION
cp -a \
diff --git a/source/xap/gkrellm/gkrellm.SlackBuild b/source/xap/gkrellm/gkrellm.SlackBuild
index e156f181..14c07172 100755
--- a/source/xap/gkrellm/gkrellm.SlackBuild
+++ b/source/xap/gkrellm/gkrellm.SlackBuild
@@ -22,7 +22,7 @@
VERSION=2.3.5
PKGVER=2.3.5
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xap/gnuplot/gnuplot.SlackBuild b/source/xap/gnuplot/gnuplot.SlackBuild
index 47cf5eb7..b6203229 100755
--- a/source/xap/gnuplot/gnuplot.SlackBuild
+++ b/source/xap/gnuplot/gnuplot.SlackBuild
@@ -82,6 +82,11 @@ CFLAGS="$SLKCFLAGS" \
--with-readline=builtin \
--build=${ARCH}-slackware-linux
+#
+# I think most people would rather not have a Qt dependency here.
+# --enable-qt
+#
+
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
diff --git a/source/xap/gucharmap/doinst.sh b/source/xap/gucharmap/doinst.sh
index 4e8ba707..f6a66768 100644
--- a/source/xap/gucharmap/doinst.sh
+++ b/source/xap/gucharmap/doinst.sh
@@ -2,3 +2,9 @@ if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
+if [ -e usr/share/glib-2.0/schemas ]; then
+ if [ -x /usr/bin/glib-compile-schemas ]; then
+ /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+ fi
+fi
+
diff --git a/source/xap/gucharmap/gucharmap.SlackBuild b/source/xap/gucharmap/gucharmap.SlackBuild
index 13b249a9..4ceef233 100755
--- a/source/xap/gucharmap/gucharmap.SlackBuild
+++ b/source/xap/gucharmap/gucharmap.SlackBuild
@@ -76,8 +76,6 @@ CFLAGS="$SLKCFLAGS" \
--localstatedir=/var/lib \
--docdir=/usr/doc/gucharmap-$VERSION \
--enable-static=no \
- --disable-gconf \
- --disable-schemas-install \
--disable-scrollkeeper \
--build=$ARCH-slackware-linux
diff --git a/source/xap/gv/gv.SlackBuild b/source/xap/gv/gv.SlackBuild
index 1f300165..67353af1 100755
--- a/source/xap/gv/gv.SlackBuild
+++ b/source/xap/gv/gv.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -58,7 +58,7 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
cd ${PKGNAM}-$VERSION || exit 1
-zcat $CWD/gv.keysym.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/gv.libXaw3d.diff.gz | patch -p1 --verbose || exit 1
# Make sure ownerships and permissions are sane:
chown -R root:root .
@@ -69,7 +69,7 @@ find . \
-exec chmod 644 {} \;
# Configure:
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS $(pkg-config --cflags xaw3d)" \
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/source/xap/gv/gv.keysym.diff b/source/xap/gv/gv.keysym.diff
deleted file mode 100644
index f2e0a7ca..00000000
--- a/source/xap/gv/gv.keysym.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/src/gv_misc_res.dat b/src/gv_misc_res.dat
---- a/src/gv_misc_res.dat 2010-10-15 09:21:36.000000000 +0200
-+++ b/src/gv_misc_res.dat 2010-10-15 09:21:48.000000000 +0200
-@@ -476,7 +476,6 @@
- <Key>BackSpace: GV_Page(up,left-bottom,!page-1,bottom-rightedge)\n\
- <Key>Insert: GV_Page(page-5) \n\
- <Key>Delete: GV_Page(page+5) \n\
-- <Key>apLineDel: GV_Page(page+5) \n\
- <Key>Home: GV_Page(page=0) \n\
- <Key>End: GV_Page(page=99999) \n\
- <Key>Prior: GV_Page(page-1) \n\
-
diff --git a/source/xap/gv/gv.libXaw3d.diff b/source/xap/gv/gv.libXaw3d.diff
new file mode 100644
index 00000000..b64cef00
--- /dev/null
+++ b/source/xap/gv/gv.libXaw3d.diff
@@ -0,0 +1,11 @@
+--- ./src/Scrollbar.c.orig 2011-08-03 11:14:14.000000000 -0500
++++ ./src/Scrollbar.c 2012-05-13 11:19:18.140324835 -0500
+@@ -1006,7 +1006,7 @@
+ TOPLOC = newtop;
+ SHOWNLENGTH = newbot-newtop+1;
+
+- (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE);
++ (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE);
+
+ ENDMESSAGE(Redisplay)
+ }
diff --git a/source/xap/imagemagick/imagemagick.SlackBuild b/source/xap/imagemagick/imagemagick.SlackBuild
index 565d3a0a..cf17f5f3 100755
--- a/source/xap/imagemagick/imagemagick.SlackBuild
+++ b/source/xap/imagemagick/imagemagick.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -29,14 +29,14 @@ BUILD=${BUILD:-1}
# This is a bit messy, so we'll explain it well. :-)
# This is the base version number, which is needed to cd into the source tree
-BASEVER=6.6.6-10
+BASEVER=6.7.7-10
# This is the version number used in the source tarball filename
-FILEVER=6.6.6-10
+FILEVER=6.7.7-10
# This is the version number used in the package, where a version number cannot
# contain a '-'
-PKGVER=6.6.6_10
+PKGVER=6.7.7_10
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -100,6 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
+ --sysconfdir=/etc \
--program-prefix= \
--with-x \
--with-frozenpaths=no \
@@ -111,11 +112,26 @@ CXXFLAGS="$SLKCFLAGS" \
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS INSTALLDIRS=vendor || make INSTALLDIRS=vendor || exit 1
+# First, spam the running development system, as ImageMagick is unable to
+# properly link the utilities against a new shared library major version
+# otherwise which has led to several broken packages over the years:
+make install INSTALLDIRS=vendor || exit 1
+/sbin/ldconfig
+
+# Now build again against the new libraries and headers:
+make clean
+make $NUMJOBS INSTALLDIRS=vendor || make INSTALLDIRS=vendor || exit 1
make install INSTALLDIRS=vendor DESTDIR=$PKG || exit 1
-# Lately ImageMagick has been smoking crack:
+# This should certainly not be included.
+# It stomps on the libtool package.
rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libltdl.*
+# .la files in /usr/lib${LIBDIRSUFFIX}/ should be removed.
+# Other .la files should be left alone, as ImageMagick uses them internally
+# to locate modules.
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
( cd $PKG
# Nothing but a perl upgrade should replace this (and maybe not even that)
find . -name perllocal.pod | xargs rm -f
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 812a7b16..a6f6c65c 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,6 +24,24 @@
# distribute this, and for all the great work! :-)
VERSION=$(basename $(ls firefox-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
+RELEASEVER=$(echo $VERSION | cut -f 1 -d r | cut -f 1 -d b)
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mozilla-firefox
+
+# Figure out if this is a beta, or a release:
+if echo $VERSION | grep -q b ; then # we think it is a beta
+ if bzgrep -q mozilla-beta/ $CWD/firefox-$VERSION.source.tar.bz2 ; then
+ MOZVERS=${MOZVERS:-beta}
+ else # blindly assume it is a release
+ MOZVERS=${MOZVERS:-release}
+ fi
+else # release, no "b" in the tarball version:
+ MOZVERS=${MOZVERS:-release}
+fi
+
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -33,12 +51,6 @@ if [ -z "$ARCH" ]; then
*) export ARCH=$( uname -m ) ;;
esac
fi
-BUILD=${BUILD:-2}
-
-MOZVERS=${MOZVERS:-2.0}
-RELEASEVER=$(echo $VERSION | cut -f 1 -d r)
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
# Try to be gentle to the compiler, no optimizations:
if [ "$ARCH" = "i486" ]; then
@@ -58,9 +70,7 @@ elif [ "$ARCH" = "armel" ]; then
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-mozilla-firefox
+NUMJOBS=${NUMJOBS:-" -j7 "}
rm -rf $PKG
mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}
@@ -92,12 +102,27 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+if gcc --version | grep -q "gcc (GCC) 4.7.0" ; then
+ # Enable compiling with gcc-4.7.0:
+ sed -i '/fcntl.h/a#include <unistd.h>' \
+ ipc/chromium/src/base/{file_util_linux,message_pump_libevent,process_util_posix}.cc &&
+ sed -i '/sys\/time\.h/a#include <unistd.h>' ipc/chromium/src/base/time_posix.cc &&
+ sed -i 's#\"PRIxPTR#\" PRIxPTR#' layout/base/tests/TestPoisonArea.cpp &&
+ sed -i 's# ""##' browser/base/Makefile.in
+fi
+
+# Mozilla devs enforce using an objdir for building
+# and launching configure with the absolute path
+# https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir
+mkdir obj
+cd obj
export MOZILLA_OFFICIAL="1" &&
export BUILD_OFFICIAL="1" &&
export MOZ_PHOENIX="1" &&
export CFLAGS="$SLKCFLAGS" &&
export CXXFLAGS="$SLKCFLAGS" &&
-./configure \
+export MOZ_MAKE_FLAGS="$NUMJOBS" &&
+$TMP/mozilla-$MOZVERS/configure \
--enable-official-branding \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -105,7 +130,6 @@ export CXXFLAGS="$SLKCFLAGS" &&
--with-system-zlib \
--enable-application=browser \
--enable-default-toolkit=cairo-gtk2 \
- --enable-system-cairo \
--enable-startup-notification \
--enable-crypto \
--enable-svg \
@@ -121,6 +145,7 @@ export CXXFLAGS="$SLKCFLAGS" &&
--enable-single-profile \
--disable-ldap \
--disable-accessibility \
+ --disable-crashreporter \
--disable-debug \
--disable-tests \
--disable-pedantic \
@@ -131,10 +156,17 @@ export CXXFLAGS="$SLKCFLAGS" &&
# Complains about missing APNG support in Slackware's libpng:
#--with-system-png \
+# This option breaks mozilla-12.0:
+# --enable-system-cairo \
+#
+
#make -f client.mk build MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1
-make MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1
+make MOZ_MAKE_FLAGS="$NUMJOBS" $NUMJOBS || exit 1
make install DESTDIR=$PKG || exit 1
+# Exit obj directory:
+cd ..
+
# We don't need these (just symlinks anyway):
rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$RELEASEVER
@@ -146,11 +178,13 @@ rm -rf $PKG/usr/include
if [ -d defaults/profile ]; then
zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1
fi
- zcat $CWD/firefox.moz_plugin_path.diff.gz \
- | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
- | patch -p1 --verbose --backup --suffix=.orig || exit 1
+ # OK, this patch is useless on 7.x. We'll float without it and see what happens.
+ # Perhaps it won't make a difference or should be worked around elsewhere.
+ #zcat $CWD/firefox.moz_plugin_path.diff.gz \
+ # | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
+ # | patch -p1 --verbose --backup --suffix=.orig || exit 1
# Clean up if the above patch was successful:
- rm -f firefox.orig
+ #rm -f firefox.orig
) || exit
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
diff --git a/source/xap/mozilla-thunderbird/mimeTypes.rdf b/source/xap/mozilla-thunderbird/mimeTypes.rdf
deleted file mode 100644
index 366df44b..00000000
--- a/source/xap/mozilla-thunderbird/mimeTypes.rdf
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- This file is used as a persistent data store for helper application
- information about both MIME type and protocol scheme helpers.
-
- The root of the data are the two containers
- <RDF:Seq about="urn:mimetypes:root"/> and <RDF:Seq about="urn:schemes:root"/>.
-
- These contain one <RDF:li/> entry per MIME type/protocol. Each <RDF:li/> entry
- corresponds to a "urn:<class>:<type>" resource, where <class> is either
- "mimetype" or "scheme" and <type> is either a MIME type in "major/minor" format
- or a scheme. For example, for HTML we would have "urn:mimetype:text/html",
- while for mailto: we would have "urn:scheme:mailto".
-
- Typically, this resource will be in the <RDF:Description/> node which has the
- corresponding "about" attribute.
-
- Each "urn:<class>:<type>" resource can have the following properties:
-
- NC:Value - the MIME type or scheme string
- NC:editable - a "true" or "false" depending on whether this entry is
- editable
- NC:description - a description of the type ("HTML Document" for text/html)
- NC:fileExtensions - for MIME types, there will be one of these properties
- per extension that corresponds to this MIME type,
- each one having a single extension as its value.
- NC:handlerProp - the way the type should be handled. This corresponds to a
- "urn:<class>:handler:<type>" resource. Eg, the way HTML is
- handled would be stored in the
- "urn:mimetype:handler:text/html" resource.
-
- Each "urn:<class>:handler:<type>" resource can have the following properties:
-
- NC:useSystemDefault - "true" if we should handle per default OS setting,
- "false" or not set otherwise
- NC:saveToDisk - "true" if the data should be saved to disk, "false" or not
- set otherwise.
- (Note - if both of these are false, that means "open in helper app")
- NC:alwaysAsk - "true" if the user should always be prompted before handling
- data of this type, false otherwise.
- NC:externalApplication - the preferred helper application to use for this
- type. This corresponds to a
- "urn:<class>:externalApplication:<type>" resource.
- NC:possibleApplication - a helper application that can be used for this type.
- Since there can be multiple possible applications,
- there can be multiple assertions in the graph with
- this property for a given handler resource.
-
- Each "urn:<class>:externalApplication:<type>" resource, and each resource
- that represents a possible application, can have the following property:
-
- NC:prettyName - the "pretty name" of the application ("Acrobat Reader" for
- /usr/bin/acroread, eg).
-
- If the resource represents a local application, then it can have the following
- property:
-
- NC:path - the path to the application on the local filesystem, for example
- /usr/bin/test or C:\windows\system32\cmd.exe.
-
- If the resource represents a web application, then it can have the following
- property:
-
- NC:uriTemplate - a URI pointing to the web application to which the type
- should be handed off, with %s in the template representing
- the place where the content should be inserted. For example,
- here is a URI template for a service that lets you email
- an address in a mailto: link:
- http://www.example.com/sendmail?link=%s
--->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:NC="http://home.netscape.com/NC-rdf#">
-
- <RDF:Description about="urn:mimetypes">
- <NC:MIME-types>
- <RDF:Seq about="urn:mimetypes:root">
- </RDF:Seq>
- </NC:MIME-types>
- </RDF:Description>
-
- <RDF:Description RDF:about="urn:scheme:handler:http"
- NC:alwaysAsk="false">
- <NC:externalApplication RDF:resource="urn:scheme:externalApplication:http"/>
- </RDF:Description>
- <RDF:Description RDF:about="urn:scheme:externalApplication:http"
- NC:prettyName="firefox"
- NC:path="/usr/bin/firefox" />
- <RDF:Description RDF:about="urn:schemes">
- <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
- </RDF:Description>
- <RDF:Description RDF:about="urn:scheme:http"
- NC:value="http">
- <NC:handlerProp RDF:resource="urn:scheme:handler:http"/>
- </RDF:Description>
-
- <RDF:Description RDF:about="urn:scheme:handler:https"
- NC:alwaysAsk="false">
- <NC:externalApplication RDF:resource="urn:scheme:externalApplication:https"/>
- </RDF:Description>
- <RDF:Description RDF:about="urn:scheme:externalApplication:https"
- NC:prettyName="firefox"
- NC:path="/usr/bin/firefox" />
- <RDF:Description RDF:about="urn:schemes">
- <NC:Protocol-Schemes RDF:resource="urn:schemes:root"/>
- </RDF:Description>
- <RDF:Description RDF:about="urn:scheme:https"
- NC:value="https">
- <NC:handlerProp RDF:resource="urn:scheme:handler:https"/>
- </RDF:Description>
-
-</RDF:RDF>
diff --git a/source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch b/source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch
new file mode 100644
index 00000000..7309b55a
--- /dev/null
+++ b/source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch
@@ -0,0 +1,18 @@
+--- a/xpcom/glue/objs.mk
++++ a/xpcom/glue/objs.mk
+@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS = \
+ SSE.cpp \
+ unused.cpp \
+ nsProxyRelease.cpp \
+ nsTextFormatter.cpp \
+ GenericFactory.cpp \
+ FileUtils.cpp \
+ $(NULL)
+
+-ifeq (arm,$(TARGET_CPU))
++ifneq (,$(filter arm%,$(TARGET_CPU)))
+ XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp
+ endif
+
+ XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS))
+
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index d36fe937..f0e910c4 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,26 +20,43 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
# Thanks to the folks at the Mozilla Foundation for permission to
# distribute this, and for all the great work! :-)
-VERSION=$(basename $(ls thunderbird-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
-BUILD=${BUILD:-2}
+TARBALLVER=$(basename $(ls thunderbird-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
+# Strip the end from beta versions:
+VERSION=$(echo $TARBALLVER | cut -f 1 -d b)
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-mozilla-thunderbird
+
+# Figure out if this is a beta, or a release:
+if echo $TARBALLVER | grep -q b ; then # we think it is a beta
+ if bzgrep -q comm-beta/ $CWD/thunderbird-$TARBALLVER.source.tar.bz2 ; then
+ MOZVERS=${MOZVERS:-beta}
+ else # blindly assume it is a release
+ MOZVERS=${MOZVERS:-release}
+ fi
+else # release, no "b" in the tarball version:
+ MOZVERS=${MOZVERS:-release}
+fi
# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
- arm*) export ARCH=arm ;;
+ case "$MARCH" in
+ i?86) export ARCH=i486 ;;
+ armv7hl) export ARCH=$MARCH ;;
+ arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
+ *) export ARCH=$MARCH ;;
esac
fi
-MOZVERS=${MOZVERS:-1.9.2}
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
# Try to be gentle to the compiler, no optimizations:
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O"
@@ -56,18 +73,19 @@ elif [ "$ARCH" = "arm" ]; then
elif [ "$ARCH" = "armel" ]; then
SLKCFLAGS="-O2 -march=armv4t"
LIBDIRSUFFIX=""
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-mozilla-thunderbird
+NUMJOBS=${NUMJOBS:-" -j7 "}
rm -rf $PKG
mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}
cd $TMP
rm -rf comm-$MOZVERS
-tar xvf $CWD/thunderbird-$VERSION.source.tar.bz2 || exit 1
+tar xvf $CWD/thunderbird-$TARBALLVER.source.tar.bz2 || exit 1
cd comm-$MOZVERS || exit 1
# Fix a long standing bug that's prevented staying current on GTK+.
@@ -80,6 +98,16 @@ endif
EOF
+# Arch-dependent patches:
+case "$ARCH" in
+ armv7hl) ARCH_CONFIG="--with-arch=armv7-a --with-float-abi=hard --with-fpu=vfpv3-d16 --disable-elf-hack"
+ # Make firefox compile on ARM platforms lacking neon support:
+ zcat $CWD/mozilla-firefox.xpcom_arm.patch.gz | patch -p1 --verbose || exit 1
+ ;;
+ *) ARCH_CONFIG=" "
+ ;;
+esac
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -87,12 +115,38 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+if gcc --version | grep -q "gcc (GCC) 4.7.0" ; then
+ # Enable compiling with gcc-4.7.0:
+ sed -i '/fcntl.h/a#include <unistd.h>' \
+ mozilla/ipc/chromium/src/base/{file_util_linux,message_pump_libevent,process_util_posix}.cc &&
+ sed -i '/sys\/time\.h/a#include <unistd.h>' mozilla/ipc/chromium/src/base/time_posix.cc &&
+ sed -i 's#\"PRIxPTR#\" PRIxPTR#g' mozilla/layout/base/tests/TestPoisonArea.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/base/search/src/nsMsgSearchAdapter.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/base/src/nsMsgFolderCompactor.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/compose/src/nsSmtpProtocol.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapMailFolder.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapProtocol.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapServerResponseParser.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/local/src/nsPop3Protocol.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/mime/src/mimedrft.cpp &&
+ sed -i 's#\"MSG_LINEBREAK#\" MSG_LINEBREAK#g' mailnews/mime/src/mimemult.cpp &&
+ sed -i 's#\"MSG_LINEBREAK#\" MSG_LINEBREAK#g' mailnews/base/src/nsMsgFolderCompactor.cpp &&
+ sed -i 's# ""##' mozilla/browser/base/Makefile.in
+fi
+
+# Mozilla devs enforce using an objdir for building
+# and launching configure with the absolute path
+# https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir
+mkdir obj
+cd obj
+export MOZILLA_DIR=$TMP/comm-$MOZVERS/mozilla &&
export MOZILLA_OFFICIAL="1" &&
export BUILD_OFFICIAL="1" &&
export MOZ_PHOENIX="1" &&
export CFLAGS="$SLKCFLAGS" &&
export CXXFLAGS="$SLKCFLAGS" &&
-./configure \
+export MOZ_MAKE_FLAGS="$NUMJOBS" &&
+$TMP/comm-$MOZVERS/configure \
--enable-official-branding \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -102,19 +156,19 @@ export CXXFLAGS="$SLKCFLAGS" &&
--enable-default-toolkit=cairo-gtk2 \
--enable-startup-notification \
--enable-crypto \
+ --enable-ldap \
+ --enable-libxul \
--enable-svg \
--enable-canvas \
--enable-xft \
--enable-xinerama \
- --enable-ldap \
--enable-optimize \
--enable-reorder \
- --enable-static \
--enable-strip \
- --enable-system-cairo \
--enable-cpp-rtti \
--enable-single-profile \
--disable-accessibility \
+ --disable-crashreporter \
--disable-debug \
--disable-tests \
--disable-logging \
@@ -123,21 +177,28 @@ export CXXFLAGS="$SLKCFLAGS" &&
--disable-profilesharing
# Complains about missing APNG support in Slackware's libpng:
#--with-system-png \
+ # Broken with 12.0:
+ #--enable-system-cairo \
#make -f client.mk build MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1
-make MOZ_MAKE_FLAGS="$NUMJOBS" || exit 1
+make $NUMJOBS || exit 1
make install DESTDIR=$PKG || exit 1
+# Exit obj directory:
+cd ..
+
# We don't need these (just symlinks anyway):
rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/thunderbird-devel-$VERSION
# Nor these:
rm -rf $PKG/usr/include
-( cd $PKG/usr/lib${LIBDIRSUFFIX}/thunderbird-$VERSION
- cp -a defaults/profile/mimeTypes.rdf defaults/profile/mimeTypes.rdf.orig
- zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1
-) || exit 1
+# Thunderbird 3.x cruft?
+# If we still need something like this (and you know what we need :), let me know.
+#( cd $PKG/usr/lib${LIBDIRSUFFIX}/thunderbird-$VERSION
+# cp -a defaults/profile/mimeTypes.rdf defaults/profile/mimeTypes.rdf.orig
+# zcat $CWD/mimeTypes.rdf > defaults/profile/mimeTypes.rdf || exit 1
+#) || exit 1
mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
mkdir -p $PKG/usr/share/applications
@@ -176,5 +237,5 @@ mkdir $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $TMP/mozilla-thunderbird-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/mozilla-thunderbird-$TARBALLVER-$ARCH-$BUILD.txz
diff --git a/source/xap/network-manager-applet/doinst.sh b/source/xap/network-manager-applet/doinst.sh
new file mode 100644
index 00000000..6da6f0c0
--- /dev/null
+++ b/source/xap/network-manager-applet/doinst.sh
@@ -0,0 +1,20 @@
+schema_install() {
+ SCHEMA="$1"
+ GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
+ chroot . gconftool-2 --makefile-install-rule \
+ /etc/gconf/schemas/$SCHEMA \
+ 1>/dev/null 2> /dev/null
+}
+
+schema_install nm-applet.schemas
+
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications 1>/dev/null 2> /dev/null
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor 1>/dev/null 2> /dev/null
+ fi
+fi
+
diff --git a/source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
index 2f33dbd8..70221596 100755
--- a/source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild
+++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
@@ -1,9 +1,8 @@
#!/bin/sh
-# Slackware build script for Xfce4-notifyd
+# Slackware build script for network-manager-applet
-# Copyright 2008 Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -12,32 +11,31 @@
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-PKGNAM=xfce4-notifyd
+PKGNAM=network-manager-applet
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
- arm*) export ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
esac
fi
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -60,7 +58,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find . \
@@ -70,21 +68,30 @@ find . \
-exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc/xfce \
+ --sysconfdir=/etc \
--localstatedir=/var \
- --enable-debug=no \
- --build=$ARCH-slackware-linux
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --with-gtkver=2 \
+ --disable-static \
+ --disable-schemas-install \
+ --enable-more-warnings=no \
+ --build=$ARCH-slackware-linux || exit 1
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
- AUTHORS COPYING INSTALL NEWS README TODO \
- $PKG/usr/doc/$PKGNAM-$VERSION
+ AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README \
+ $PKG/usr/doc/$PKGNAM-$VERSION
# If there's a ChangeLog, installing at least part of the recent history
# is useful, but don't let it get totally out of control:
@@ -100,4 +107,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/xap/network-manager-applet/slack-desc b/source/xap/network-manager-applet/slack-desc
new file mode 100644
index 00000000..ad8c8f7d
--- /dev/null
+++ b/source/xap/network-manager-applet/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+network-manager-applet: network-manager-applet (NetworkManager Applet)
+network-manager-applet:
+network-manager-applet: nm-applet is a gui frontend for NetworkManager.
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
+network-manager-applet:
diff --git a/source/xap/pan/pan.SlackBuild b/source/xap/pan/pan.SlackBuild
index 0aab423c..b3bbe857 100755
--- a/source/xap/pan/pan.SlackBuild
+++ b/source/xap/pan/pan.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -59,6 +59,8 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
cd ${PKGNAM}-$VERSION || exit 1
+zcat $CWD/pan.gcc47.diff.gz | patch -p1 --verbose || exit 1
+
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
@@ -74,6 +76,7 @@ CFLAGS="$SLKCFLAGS" \
--localstatedir=/var/lib \
--sysconfdir=/etc \
--mandir=/usr/man \
+ --with-gnutls \
--program-prefix= \
--program-suffix= \
--build=$ARCH-slackware-linux
diff --git a/source/xap/pan/pan.gcc47.diff b/source/xap/pan/pan.gcc47.diff
new file mode 100644
index 00000000..5c57a381
--- /dev/null
+++ b/source/xap/pan/pan.gcc47.diff
@@ -0,0 +1,10 @@
+--- ./pan/data/cert-store.cc.orig 2012-06-29 17:24:54.000000000 -0500
++++ ./pan/data/cert-store.cc 2012-07-10 12:43:12.768183671 -0500
+@@ -20,6 +20,7 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
++#include <unistd.h>
+ #include <string>
+
+ //#include <glib/giochannel.h>
diff --git a/source/xap/pan/slack-desc b/source/xap/pan/slack-desc
index c4336adb..77372ab9 100644
--- a/source/xap/pan/slack-desc
+++ b/source/xap/pan/slack-desc
@@ -15,5 +15,5 @@ pan:
pan:
pan:
pan:
-pan:
+pan: Homepage: http://pan.rebelbase.com
pan:
diff --git a/source/xap/pidgin/fix-gmain_h-compile-error.diff b/source/xap/pidgin/fix-gmain_h-compile-error.diff
new file mode 100644
index 00000000..1e313cde
--- /dev/null
+++ b/source/xap/pidgin/fix-gmain_h-compile-error.diff
@@ -0,0 +1,17 @@
+Since glib-2.32, this is a common error:
+ In file included from rsa_nss.c:27:0:
+ /usr/include/glib-2.0/glib/gmain.h:21:2: error: #error "Only <glib.h> can be included directly."
+Let's fix it :)
+
+diff -Nur pidgin-encryption-3.1.orig/rsa_nss.c pidgin-encryption-3.1/rsa_nss.c
+--- pidgin-encryption-3.1.orig/rsa_nss.c 2010-04-25 20:53:46.000000000 -0500
++++ pidgin-encryption-3.1/rsa_nss.c 2012-05-01 22:58:18.033710803 -0500
+@@ -24,7 +24,7 @@
+ #include <debug.h>
+ #include <gtkdialogs.h>
+
+-#include "glib/gmain.h"
++#include <glib.h>
+
+ #include <string.h>
+ #include <assert.h>
diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild
index bfefef2e..5fa20495 100755
--- a/source/xap/pidgin/pidgin.SlackBuild
+++ b/source/xap/pidgin/pidgin.SlackBuild
@@ -79,9 +79,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Allow certificates signed with rsa-md5:
-zcat $CWD/purple-allow-sign-rsa-md5.patch.gz | patch -p0 --verbose || exit 1
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -92,8 +89,12 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-dot=no \
--disable-schemas-install \
--enable-dbus \
- --enable-gnutls=yes \
- --enable-nss=no \
+ --enable-gnutls=no \
+ --enable-nss=yes \
+ --with-nss-includes="$(pkg-config --variable=includedir nss)" \
+ --with-nss-libs=/usr/lib${LIBDIRSUFFIX}/ \
+ --with-nspr-includes="$(pkg-config --variable=includedir nspr)" \
+ --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/ \
--disable-vv \
--enable-gtkspell \
--enable-cyrus-sasl \
@@ -113,9 +114,9 @@ make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
# Fix misplaced items:
-eval $(perl '-V:archlib')
+eval $(perl '-V:installvendorlib')
eval $(perl '-V:privlib')
-VENDORPERL="$(echo $archlib | sed -e "s/perl5/perl5\/vendor_perl/")"
+VENDORPERL="$(echo $installvendorlib)"
mkdir -vpm755 $PKG/$VENDORPERL/
find $PKG -type f -name perllocal.pod -exec mv -fv {} $PKG/$VENDORPERL/Pidgin.pod \;
@@ -156,6 +157,7 @@ done
rm -rf pidgin-encryption-$PIDGINENC
tar xvf $CWD/pidgin-encryption-$PIDGINENC.tar.gz || exit 1
cd pidgin-encryption-$PIDGINENC
+ zcat $CWD/fix-gmain_h-compile-error.diff.gz | patch -p1 --verbose || exit 1
PIDGIN_CFLAGS="-I${PKG}/usr/include/pidgin" \
PIDGIN_LIBS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \
PURPLE_CFLAGS="-I${PKG}/usr/include/libpurple" \
@@ -164,10 +166,10 @@ done
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--disable-static \
- --with-nss-includes=/usr/include/seamonkey/nss \
- --with-nspr-includes=/usr/include/seamonkey/nspr \
- --with-nss-libs=/usr/lib${LIBDIRSUFFIX}/seamonkey/ \
- --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/seamonkey/ \
+ --with-nss-includes="$(pkg-config --variable=includedir nss)" \
+ --with-nss-libs=/usr/lib${LIBDIRSUFFIX}/ \
+ --with-nspr-includes="$(pkg-config --variable=includedir nspr)" \
+ --with-nspr-libs=/usr/lib${LIBDIRSUFFIX}/ \
--program-prefix="" \
--program-suffix="" \
--build=$ARCH-slackware-linux$ARCHQUADLET || exit 1
diff --git a/source/xap/pidgin/purple-allow-sign-rsa-md5.patch b/source/xap/pidgin/purple-allow-sign-rsa-md5.patch
deleted file mode 100644
index d882a6e8..00000000
--- a/source/xap/pidgin/purple-allow-sign-rsa-md5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libpurple/plugins/ssl/ssl-gnutls.c.old 2008-10-17 18:58:31.000000000 +0200
-+++ libpurple/plugins/ssl/ssl-gnutls.c 2008-10-17 18:53:03.000000000 +0200
-@@ -693,7 +693,8 @@
- (Verisign and possibly others have
- root certificates that predate the
- current standard) */
-- GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT,
-+ GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT
-+ | GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5,
- &verify);
-
- if (ret != 0) {
diff --git a/source/xap/rdesktop/rdesktop.CVE-2011-1595.diff b/source/xap/rdesktop/rdesktop.CVE-2011-1595.diff
deleted file mode 100644
index 0db8c3bc..00000000
--- a/source/xap/rdesktop/rdesktop.CVE-2011-1595.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./disk.c.orig 2008-02-15 18:13:25.000000000 -0600
-+++ ./disk.c 2011-04-20 20:27:55.978000772 -0500
-@@ -356,6 +356,19 @@
- filename[strlen(filename) - 1] = 0;
- sprintf(path, "%s%s", g_rdpdr_device[device_id].local_path, filename);
-
-+ /* Protect against mailicous servers:
-+ somelongpath/.. not allowed
-+ somelongpath/../b not allowed
-+ somelongpath/..b in principle ok, but currently not allowed
-+ somelongpath/b.. ok
-+ somelongpath/b..b ok
-+ somelongpath/b../c ok
-+ */
-+ if (strstr(path, "/.."))
-+ {
-+ return RD_STATUS_ACCESS_DENIED;
-+ }
-+
- switch (create_disposition)
- {
- case CREATE_ALWAYS:
diff --git a/source/xap/rdesktop/rdesktop.SlackBuild b/source/xap/rdesktop/rdesktop.SlackBuild
index 5e1ae2e2..ba6c6772 100755
--- a/source/xap/rdesktop/rdesktop.SlackBuild
+++ b/source/xap/rdesktop/rdesktop.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
PKGNAM=rdesktop
-VERSION=${VERSION:-1.6.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -56,11 +56,9 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
cd ${PKGNAM}-$VERSION || exit 1
-zcat $CWD/rdesktop.CVE-2011-1595.diff.gz | patch -p1 --verbose || exit 1
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
@@ -76,6 +74,7 @@ CFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--with-sound=alsa \
--enable-smartcard \
+ --with-ipv6 \
--mandir=/usr/man \
--build=$ARCH-slackware-linux
diff --git a/source/xap/rxvt/rxvt.SlackBuild b/source/xap/rxvt/rxvt.SlackBuild
index 81d39485..defc62b5 100755
--- a/source/xap/rxvt/rxvt.SlackBuild
+++ b/source/xap/rxvt/rxvt.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,18 +21,39 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=2.7.10
-ARCH=${ARCH:-x86_64}
+PKGNAM=rxvt
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-4}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i486 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i386" ]; then
+ SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+elif [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+else
+ SLKCFLAGS="-O2"
fi
CWD=$(pwd)
diff --git a/source/xap/sane/sane-backends-1.0.22-v4l.diff b/source/xap/sane/sane-backends-1.0.22-v4l.diff
new file mode 100644
index 00000000..4e240e0c
--- /dev/null
+++ b/source/xap/sane/sane-backends-1.0.22-v4l.diff
@@ -0,0 +1,64 @@
+From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 14 Mar 2011 13:35:05 +0100
+Subject: [PATCH] patch: v4l
+
+Squashed commit of the following:
+
+commit 23381932c76846191b42a48e505b37cd74711265
+Author: Julien BLACHE <jb@jblache.org>
+Date: Wed Feb 16 19:37:43 2011 +0100
+
+ Fix v4l build with libv4l 0.8.3+
+
+ (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
+
+ Conflicts:
+
+ ChangeLog
+
+ Signed-off-by: Nils Philippsen <nils@redhat.com>
+---
+ backend/v4l.c | 3 +--
+ backend/v4l.h | 3 ++-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/backend/v4l.c b/backend/v4l.c
+index 6510ef0..38595ed 100644
+--- a/backend/v4l.c
++++ b/backend/v4l.c
+@@ -84,9 +84,8 @@
+ #include "../include/sane/sanei_config.h"
+ #define V4L_CONFIG_FILE "v4l.conf"
+
+-#include "v4l.h"
+-
+ #include <libv4l1.h>
++#include "v4l.h"
+
+ static const SANE_Device **devlist = NULL;
+ static int num_devices;
+diff --git a/backend/v4l.h b/backend/v4l.h
+index 588b96e..6aee586 100644
+--- a/backend/v4l.h
++++ b/backend/v4l.h
+@@ -29,6 +29,7 @@
+ #ifndef v4l_h
+ #define v4l_h
+
++#ifndef __LINUX_VIDEODEV_H
+ /* Kernel interface */
+ /* Only the stuff we need. For more features, more defines are needed */
+
+@@ -165,7 +166,7 @@ struct video_channel
+
+
+ /* end of kernel interface */
+-
++#endif /* !__LINUX_VIDEODEV_H */
+
+ #include <../include/sane/sane.h>
+
+--
+1.7.4
+
diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild
index 613393dc..be9dd725 100755
--- a/source/xap/sane/sane.SlackBuild
+++ b/source/xap/sane/sane.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011 Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012 Patrick Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
VERSION=1.0.22
BACKVER=1.0.22
FRONTVER=1.0.14
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ chown -R root:root .
# everything else catches up with the API change...
zcat $CWD/sane-frontends-1.0.14-sane_cap_always_settable.diff.gz | patch -p1 || exit 1
+# Fix building against v4l-utils-0.8.3:
+zcat $CWD/sane-backends-1.0.22-v4l.diff.gz | patch -p1 --verbose || exit 1
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -87,16 +90,25 @@ make $NUMJOBS || make || exit 1
make install || exit 1
make install DESTDIR=$PKG || exit 1
-# Add the default udev rules
+# Add the default udev rules. Use group "lp" rather than "scanner" to avoid
+# breaking CUPS access for multifunction printer/scanner devices (possibly
+# the most common type of scanner these days)
mkdir -p $PKG/lib/udev/rules.d
-cat tools/udev/libsane.rules > $PKG/lib/udev/rules.d/80-libsane.rules
+cat tools/udev/libsane.rules \
+ | sed -e "s/GROUP=\"scanner\"/GROUP=\"lp\"/g" \
+ | sed -e "s/MODE=\"0664\"/MODE=\"0660\"/g" \
+ > $PKG/lib/udev/rules.d/80-libsane.rules
-# Add the hal fdi file
+# Add the hal fdi file:
mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor/
cat tools/hal/libsane.fdi \
> $PKG/usr/share/hal/fdi/policy/10osvendor/10-libsane.fdi
-# Now let's build the frontends
+# Install the pkgconfig file:
+install -D -m644 tools/sane-backends.pc \
+ $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/sane-backends.pc
+
+# Now let's build the frontends:
cd $TMP
rm -rf sane-frontends-$FRONTVER
tar xvf $CWD/sane-frontends-$FRONTVER.tar.bz2 || exit 1
diff --git a/source/xap/seamonkey/pkgconfig/seamonkey-libxul.pc b/source/xap/seamonkey/pkgconfig/seamonkey-libxul.pc
new file mode 100644
index 00000000..0c990042
--- /dev/null
+++ b/source/xap/seamonkey/pkgconfig/seamonkey-libxul.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+libdir=/usr/@LIB@/seamonkey-@VERSION@
+includedir=/usr/include/seamonkey-@VERSION@
+idldir=/usr/share/idl/seamonkey-@VERSION@
+
+Name: libxul
+Description: The Mozilla Runtime and Embedding Engine
+Version: @VERSION@
+Requires: seamonkey-nspr >= 4.7.1
+Libs: -L${libdir} -lxul -lxpcom
+Cflags: -I${includedir} -fshort-wchar
diff --git a/source/xap/seamonkey/pkgconfig/seamonkey-nss.pc b/source/xap/seamonkey/pkgconfig/seamonkey-nss.pc
index b929f202..f5bf0993 100644
--- a/source/xap/seamonkey/pkgconfig/seamonkey-nss.pc
+++ b/source/xap/seamonkey/pkgconfig/seamonkey-nss.pc
@@ -7,5 +7,5 @@ Name: NSS
Description: Mozilla Network Security Services
Version: @VERSION@
Requires: seamonkey-nspr >= 4.7.1
-Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3
+Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3
Cflags: -I${includedir}/nss
diff --git a/source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc b/source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc
index 4550444a..bbdb1f41 100644
--- a/source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc
+++ b/source/xap/seamonkey/pkgconfig/seamonkey-plugin.pc
@@ -7,4 +7,4 @@ Name: Mozilla Plug-In API
Description: Mozilla Plug-In API
Version: @VERSION@
Requires: seamonkey-nspr >= 4.7.1
-Cflags: -I${includedir}/java -I${includedir}/plugin
+Cflags: -I${includedir}/java -I${includedir}/plugin -DXP_UNIX
diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild
index 6b4173e2..afc1bc96 100755
--- a/source/xap/seamonkey/seamonkey.SlackBuild
+++ b/source/xap/seamonkey/seamonkey.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=${VERSION:-$(basename $(ls seamonkey-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)}
-COMM=${COMM:-central}
-BUILD=${BUILD:-2}
+TARBALLVER=${VERSION:-$(basename $(ls seamonkey-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)}
+# Strip the end from beta versions:
+VERSION=$(echo $TARBALLVER | cut -f 1 -d b)
+COMM=${COMM:-release}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -50,7 +52,7 @@ mkdir -p $TMP $PKG/usr
cd $TMP
rm -rf comm-$COMM
-tar xvf $CWD/seamonkey-${VERSION}.source.tar.?z* || exit 1
+tar xvf $CWD/seamonkey-${TARBALLVER}.source.tar.?z* || exit 1
cd comm-$COMM || exit 1
# Make sure the perms/ownerships are sane:
@@ -71,15 +73,45 @@ endif
EOF
+if gcc --version | grep -q "gcc (GCC) 4.7.0" ; then
+ # Enable compiling with gcc-4.7.0:
+ sed -i '/fcntl.h/a#include <unistd.h>' \
+ mozilla/ipc/chromium/src/base/{file_util_linux,message_pump_libevent,process_util_posix}.cc &&
+ sed -i '/sys\/time\.h/a#include <unistd.h>' mozilla/ipc/chromium/src/base/time_posix.cc &&
+ sed -i 's#\"PRIxPTR#\" PRIxPTR#g' mozilla/layout/base/tests/TestPoisonArea.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/base/search/src/nsMsgSearchAdapter.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/base/src/nsMsgFolderCompactor.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/compose/src/nsSmtpProtocol.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapMailFolder.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapProtocol.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/imap/src/nsImapServerResponseParser.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/local/src/nsPop3Protocol.cpp &&
+ sed -i 's#\"CRLF#\" CRLF#g' mailnews/mime/src/mimedrft.cpp &&
+ sed -i 's#\"MSG_LINEBREAK#\" MSG_LINEBREAK#g' mailnews/mime/src/mimemult.cpp &&
+ sed -i 's#\"MSG_LINEBREAK#\" MSG_LINEBREAK#g' mailnews/base/src/nsMsgFolderCompactor.cpp &&
+ sed -i 's# ""##' mozilla/browser/base/Makefile.in
+fi
+
chown -R root:root .
+
+# Mozilla devs enforce using an objdir for building
+# and launching configure with the absolute path
+# https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir
+mkdir obj
+cd obj
BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
-./configure --prefix=/usr \
+$TMP/comm-$COMM/configure \
+ --prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--enable-optimize=-O2 \
+ --enable-cpp-rtti \
+ --enable-default-toolkit=cairo-gtk2 \
+ --enable-startup-notification \
--disable-debug \
--with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/seamonkey-${VERSION} \
--enable-strip \
--disable-tests \
+ --disable-crashreporter \
--enable-svg \
--enable-canvas \
--disable-short-wchar \
@@ -99,6 +131,7 @@ BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
--target=$ARCH-slackware-linux \
--build=$ARCH-slackware-linux
+ # --enable-system-cairo \
# --with-system-png
make $NUMJOBS || exit 1
DESTDIR=$PKG make install || exit 1
@@ -113,16 +146,25 @@ cp -aL mozilla/dist/include/*.h $PKG/usr/include/seamonkey-${VERSION}
cp -aL mozilla/dist/sdk/include/* $PKG/usr/include/seamonkey-${VERSION}
# compat symlinks
( cd $PKG/usr/include/seamonkey-${VERSION}
- ln -sf . js
+ # make install seems to install js headers into a directory now, so don't make a symlink:
+ #ln -sf . js
+ # Relocate anything that might be in the nss directory, and replace the directory with a symlink.
+ # make install was putting an empty directory here, which was breaking other compiles.
+ if [ -d nss ]; then
+ mv nss/* .
+ rmdir nss
+ fi
ln -sf . nss
ln -sf . plugin
ln -sf . xpcom
)
-#( cd $PKG/usr/include/seamonkey-${VERSION}/plugin
-# for file in ../j*.h ; do
-# ln -sf $file .
-# done
-#)
+
+# Exit obj directory:
+cd ..
+
+# We don't need this stuff in the package:
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/seamonkey-devel-$VERSION
+
chown -R root:root $PKG/usr/include/seamonkey-${VERSION}
find $PKG/usr/include/seamonkey-${VERSION} -name "*.h" -type f -exec chmod 644 {} \;
# Create a more generic include files symlink:
@@ -144,10 +186,12 @@ done
# Add symlinks for the pkgconfig files:
( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
ln -s seamonkey-js.pc js.pc
- ln -s seamonkey-nspr.pc nspr.pc
- ln -s seamonkey-nss.pc nss.pc
+ ln -s seamonkey-libxul.pc libxul.pc
ln -s seamonkey-plugin.pc plugin.pc
ln -s seamonkey-xpcom.pc xpcom.pc
+ # These are now provided by the mozilla-nss package:
+ #ln -s seamonkey-nspr.pc nspr.pc
+ #ln -s seamonkey-nss.pc nss.pc
)
# Compress and if needed symlink the man pages:
@@ -201,7 +245,7 @@ zcat $CWD/doinst.sh.gz | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \
> $PKG/install/doinst.sh
cd $TMP/package-seamonkey
-/sbin/makepkg -l y -c n -p $TMP/seamonkey-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n -p $TMP/seamonkey-$TARBALLVER-$ARCH-$BUILD.txz
# Create a standalone seamonkey-solibs package for RPM, gxine, etc.
rm -r $TMP/package-seamonkey-solibs
@@ -231,14 +275,14 @@ seamonkey-solibs: seamonkey-solibs (Shared libraries from Seamonkey)
seamonkey-solibs:
seamonkey-solibs: This package contains a subset of the shared libraries from Seamonkey
seamonkey-solibs: to provide runtime support for programs that require nss, nspr, and
-seamonkey-solibs: js. These libraries are used in programs like RPM and gxine, and can
-seamonkey-solibs: be used in others. This package is built from the Seamonkey sources
-seamonkey-solibs: and is provided as a standalone runtime package for people who do not
-seamonkey-solibs: want to install the entire seamonkey package (as for server use).
+seamonkey-solibs: js. This package is built from the Seamonkey sources and is provided
+seamonkey-solibs: as a standalone runtime package for people who do not want to install
+seamonkey-solibs: the entire seamonkey package (as for server use).
seamonkey-solibs:
seamonkey-solibs: This package is runtime only. The include files and other files for
seamonkey-solibs: development can be found in the seamonkey package.
+seamonkey-solibs:
EOF
cd $TMP/package-seamonkey-solibs
-/sbin/makepkg -l y -c n -p $TMP/seamonkey-solibs-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n -p $TMP/seamonkey-solibs-$TARBALLVER-$ARCH-$BUILD.txz
diff --git a/source/xap/seyon/seyon.SlackBuild b/source/xap/seyon/seyon.SlackBuild
index 656d2ff9..f2435b19 100755
--- a/source/xap/seyon/seyon.SlackBuild
+++ b/source/xap/seyon/seyon.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2002-2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2002-2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,19 +21,45 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+PKGNAM=seyon
VERSION=2.20c
-ARCH=${ARCH:-x86_64}
BUILD=${BUILD:-3}
-if [ "$ARCH" = "i486" ]; then
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i486 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+if [ "$ARCH" = "i386" ]; then
+ SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
CWD=$(pwd)
diff --git a/source/xap/thunar-volman/slack-desc b/source/xap/thunar-volman/slack-desc
deleted file mode 100644
index a5fdf60b..00000000
--- a/source/xap/thunar-volman/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------|
-thunar-volman: thunar-volman (Thunar Volume Manager Plugin)
-thunar-volman:
-thunar-volman: thunar-volman is an extension for the Thunar File Manager,
-thunar-volman: which enables automatic management of removable drives and
-thunar-volman: media.
-thunar-volman:
-thunar-volman: It was designed to look and act similar to gnome-volume-manager
-thunar-volman: to get consistent removable drive and media management in both
-thunar-volman: Xfce and GNOME.
-thunar-volman:
-thunar-volman:
diff --git a/source/xap/thunar-volman/thunar-volman.SlackBuild b/source/xap/thunar-volman/thunar-volman.SlackBuild
deleted file mode 100755
index bf14ff9e..00000000
--- a/source/xap/thunar-volman/thunar-volman.SlackBuild
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for thunar-volman
-# http://goodies.xfce.org/releases/thunar-volman/
-
-# Copyright 2007-2009 Robby Workman, Northport, Alabama, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-PRGNAM=thunar-volman
-VERSION=0.3.80
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --enable-debug=no \
- --build=$ARCH-slackware-linux
-
-make || exit 1
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
- | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
- $PKG/usr/doc/$PRGNAM-$VERSION
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/xap/windowmaker/WindowMaker.noopensusemenu.diff b/source/xap/windowmaker/WindowMaker.noopensusemenu.diff
new file mode 100644
index 00000000..e68fa85a
--- /dev/null
+++ b/source/xap/windowmaker/WindowMaker.noopensusemenu.diff
@@ -0,0 +1,14 @@
+--- ./util/wmgenmenu.h.orig 2012-05-24 16:28:16.000000000 -0500
++++ ./util/wmgenmenu.h 2012-07-29 15:34:37.242208543 -0500
+@@ -458,7 +458,10 @@
+ char *OpenSUSE[MAX_NR_APPS][2] = {
+ { N_("YaST 2"), "yast2" },
+ { N_("YaST"), "yast !" },
+- { N_("System Settings"), "systemsettings" },
++ /* The KDE systemsettings is mistaken for an OpenSUSE tool, and adds */
++ /* and OpenSUSE menu that starts it. I can't think of any reason */
++ /* this would be useful under WindowMaker, so I'm commenting it out. */
++ /* { N_("System Settings"), "systemsettings" }, */
+ { N_("UMTSMon"), "umtsmon" },
+ { NULL, NULL }
+ };
diff --git a/source/xap/windowmaker/windowmaker.SlackBuild b/source/xap/windowmaker/windowmaker.SlackBuild
index 74462e28..da5ac679 100755
--- a/source/xap/windowmaker/windowmaker.SlackBuild
+++ b/source/xap/windowmaker/windowmaker.SlackBuild
@@ -21,8 +21,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=20060427cvs
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-0.95.3}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -59,15 +59,9 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf WindowMaker-$VERSION
-tar xvf $CWD/WindowMaker-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/WindowMaker-$VERSION.tar.xz || exit 1
cd WindowMaker-$VERSION || exit 1
-zcat $CWD/windowmaker.no-mmx.diff.gz | patch -p1 --verbose -F 3 || exit 1
-
-zcat $CWD/windowmaker.png.1.4.0.diff.gz | patch -p1 --verbose || exit 1
-
-sh autogen.sh
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,7 +70,10 @@ find . \
-exec chmod 644 {} \;
# This should be non-interactive where possible.
-zcat $CWD/wmaker.inst.diff.gz | patch -p1 --verbose || exit
+zcat $CWD/wmaker.inst.diff.gz | patch -p1 --verbose || exit 1
+
+# Get rid of OpenSUSE menu:
+zcat $CWD/WindowMaker.noopensusemenu.diff.gz | patch -p1 --verbose || exit 1
LINGUAS="$(cd po ; /bin/ls *.po | sed 's/.po//g')" \
GNUSTEP_LOCAL_ROOT=/usr/lib${LIBDIRSUFFIX}/GNUstep \
@@ -87,10 +84,11 @@ NLSDIR=/usr/share/locale \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--sysconfdir=/etc/X11 \
- --enable-gnome \
- --enable-kde \
+ --docdir=/usr/doc/WindowMaker-$VERSION \
--enable-usermenu \
- --with-appspath=/usr/lib${LIBDIRSUFFIX}/GNUstep/Applications \
+ --enable-xrandr \
+ --enable-xinerama \
+ --disable-static \
--build=$ARCH-slackware-linux
# NLS bugs like -i
@@ -100,10 +98,18 @@ make $NUMJOBS || make -i || exit 1
sed -i -e "s#/usr/local/GNUstep/Applications/WPrefs.app/#/usr/lib${LIBDIRSUFFIX}/GNUstep/Applications/WPrefs.app/#" \
$(grep -lr '/usr/local/GNUstep/Applications/WPrefs.app/' *)
+# Fix hard coded paths in util/wmgenmenu.c for
+# "Configure Window Maker" root menu entry
+# Appearance/{Themes, Styles, Icons} entries.
+
+sed -i -e "s#WMCreatePLString(\"WPrefs\")#WMCreatePLString(\"/usr/lib${LIBDIRSUFFIX}/GNUstep/Applications/WPrefs.app/WPrefs\")#" \
+ -e "s#/usr/local/share#/usr/share/#" util/wmgenmenu.c
+
+
make -i install DESTDIR=$PKG
mkdir -p $PKG/usr/doc/WindowMaker-$VERSION
cp -a \
- AUTHORS BUGFORM BUGS COPYING COPYING.WTFPL FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk INSTALL INSTALL.cs INSTALL.es INSTALL.fr INSTALL.pt INSTALL.sk MIRRORS NEWS README README.definable-cursor README.pt TODO \
+ AUTHORS BUGFORM BUGS COPYING* FAQ* INSTALL* MIRRORS NEWS README* TODO \
$PKG/usr/doc/WindowMaker-$VERSION
# If there's a ChangeLog, installing at least part of the recent history
@@ -116,7 +122,7 @@ fi
cd $TMP
rm -rf WindowMaker-extra-0.1
-tar xvf $CWD/WindowMaker-extra-0.1.tar.gz || exit 1
+tar xvf $CWD/WindowMaker-extra-0.1.tar.xz || exit 1
cd WindowMaker-extra-0.1 || exit 1
CFLAGS="$SLKCFLAGS" \
./configure \
@@ -135,7 +141,20 @@ mkdir -p $PKG/etc/X11/xinit
zcat $CWD/xinitrc.wmaker.gz > $PKG/etc/X11/xinit/xinitrc.wmaker
chmod 0755 $PKG/etc/X11/xinit/xinitrc.wmaker
-gzip -9 $PKG/usr/man/man1/* $PKG/usr/man/sk/man1/*
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+ ( cd $PKG/usr/man
+ for manpagedir in $(find . -type d -name "man*") ; do
+ ( cd $manpagedir
+ for eachpage in $( find . -type l -maxdepth 1) ; do
+ ln -s $( readlink $eachpage ).gz $eachpage.gz
+ rm $eachpage
+ done
+ gzip -9 *.?
+ )
+ done
+ )
+fi
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/xap/windowmaker/windowmaker.no-mmx.diff b/source/xap/windowmaker/windowmaker.no-mmx.diff
deleted file mode 100644
index 277cc79e..00000000
--- a/source/xap/windowmaker/windowmaker.no-mmx.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./configure.ac.01 2008-06-02 08:42:30.000000000 +0200
-+++ ./configure.ac 2008-06-02 08:46:49.000000000 +0200
-@@ -190,7 +190,15 @@
- # until we fix it, leave it disabled
- asm_support=no
- mmx_support=no
--if test "$ac_cv_prog_gcc" = yes; then
-+
-+check_for_mmx_support=yes
-+AC_ARG_ENABLE(mmx,
-+ [ --disable-mmx disable compilation of MMX inline assembly ],
-+ [if test x$enableval != xyes; then
-+ check_for_mmx_support=no
-+ fi])
-+
-+if test "$ac_cv_prog_gcc" = yes -a "$check_for_mmx_support" = yes; then
- case $host_cpu in
- *i?86*)
- # gcc-3.3 or newer complains about some of our stuff without this
diff --git a/source/xap/windowmaker/windowmaker.png.1.4.0.diff b/source/xap/windowmaker/windowmaker.png.1.4.0.diff
deleted file mode 100644
index a6359c4b..00000000
--- a/source/xap/windowmaker/windowmaker.png.1.4.0.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./wrlib/load.c.orig 2008-04-30 15:45:26.000000000 -0500
-+++ ./wrlib/load.c 2010-02-11 15:39:38.000000000 -0600
-@@ -348,7 +348,7 @@
-
- #ifdef USE_PNG
- /* check for PNG */
-- if (png_check_sig(buffer, 8))
-+ if (!png_sig_cmp(buffer, 0, 8))
- return IM_PNG;
- #endif
-
diff --git a/source/xap/windowmaker/wmaker.inst.diff b/source/xap/windowmaker/wmaker.inst.diff
index c80edd34..3fdfe643 100644
--- a/source/xap/windowmaker/wmaker.inst.diff
+++ b/source/xap/windowmaker/wmaker.inst.diff
@@ -1,10 +1,12 @@
---- ./util/wmaker.inst.in.orig 2002-05-30 13:13:46.000000000 -0700
-+++ ./util/wmaker.inst.in 2002-05-30 13:16:37.000000000 -0700
-@@ -37,19 +37,7 @@
- make_script() {
- ISCRIPT=$1
+diff -Nur WindowMaker-0.95.2.orig/util/wmaker.inst.in WindowMaker-0.95.2/util/wmaker.inst.in
+--- WindowMaker-0.95.2.orig/util/wmaker.inst.in 2012-02-14 13:36:01.000000000 -0600
++++ WindowMaker-0.95.2/util/wmaker.inst.in 2012-02-14 18:25:28.213206250 -0600
+@@ -33,20 +33,7 @@
-- cat << EOF >> $ISCRIPT
+ make_script() {
+ ISCRIPT="$1"
+-
+- cat << EOF >> "$ISCRIPT"
-# Window Maker default X session startup script
-
-PATH="\$PATH:$BINDIR"
@@ -12,16 +14,16 @@
-# If you login from xdm, uncomment this to make error messages appear
-# in the console window.
-#
--# tail -f $HOME/.xsession-errors > /dev/console &
+-# tail -f "$HOME"/.xsession-errors > /dev/console &
-
-exec wmaker
-
-EOF
-+ cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT
- chmod +rx $ISCRIPT
++ cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT
+ chmod +rx "$ISCRIPT"
}
-@@ -329,20 +317,7 @@
+@@ -298,19 +285,7 @@
trap "show_end_message;exit" 2
@@ -38,8 +40,7 @@
- echo "Using .xinitrc as a default value"
- file=.xinitrc
-fi
--
+file=.xinitrc
- if [ -f $USERDIR/$file ]; then
- mv $USERDIR/$file $USERDIR/$file.old.$DATE
- fi
+
+ if [ -f "$USERDIR/$file" ]; then
+ mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE"
diff --git a/source/xap/windowmaker/xinitrc.wmaker b/source/xap/windowmaker/xinitrc.wmaker
index 2c43c1eb..386588a4 100644
--- a/source/xap/windowmaker/xinitrc.wmaker
+++ b/source/xap/windowmaker/xinitrc.wmaker
@@ -36,7 +36,7 @@ fi
# Start the window manager:
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
- exec ck-launch-session /usr/bin/wmaker $NOCPP
+ exec ck-launch-session dbus-launch --exit-with-session /usr/bin/wmaker $NOCPP
else
- exec /usr/bin/wmaker $NOCPP
+ exec dbus-launch --exit-with-session /usr/bin/wmaker $NOCPP
fi
diff --git a/source/xap/x11-ssh-askpass/slack-desc b/source/xap/x11-ssh-askpass/slack-desc
index d467253f..49faabba 100644
--- a/source/xap/x11-ssh-askpass/slack-desc
+++ b/source/xap/x11-ssh-askpass/slack-desc
@@ -5,11 +5,11 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler---------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
x11-ssh-askpass: x11-ssh-askpass (an X11-based passphrase dialog)
x11-ssh-askpass:
-x11-ssh-askpass: x11-ssh-askpass is an X11-based passphrase dialog for use
-x11-ssh-askpass: with OpenSSH.
+x11-ssh-askpass: x11-ssh-askpass is an X11-based passphrase dialog for use with
+x11-ssh-askpass: OpenSSH.
x11-ssh-askpass:
x11-ssh-askpass:
x11-ssh-askpass:
diff --git a/source/xap/x3270/x3270.SlackBuild b/source/xap/x3270/x3270.SlackBuild
index 225142a2..fd2f53fa 100755
--- a/source/xap/x3270/x3270.SlackBuild
+++ b/source/xap/x3270/x3270.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,48 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-TARBVER=3.3.7p8
-VERSION=3.3.7p8
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-1}
+PKGNAM=x3270
+VERSION=3.3
+TARBVER=${TARBVER:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=$(echo $TARBVER | cut -f 1,2 -d .)
+BUILD=${BUILD:-2}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i486 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+if [ "$ARCH" = "i386" ]; then
+ SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i486" ]; then
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -35,7 +73,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf x3270-$VERSION
-tar xvf $CWD/x3270-$TARBVER.tar.bz2 || exit 1
+tar xvf $CWD/x3270-$TARBVER.tar.?z* || exit 1
cd x3270-3.3 || exit 1
chown -R root:root .
find . \
@@ -44,6 +82,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--sysconfdir=/etc/X11 \
@@ -54,13 +94,13 @@ make install DESTDIR=$PKG
mv $PKG/etc/X11/x3270/ibm_hosts $PKG/etc/X11/x3270/ibm_hosts.new
find $PKG -name fonts.dir -exec rm {} \;
-if [ -d $PKG/usr/lib/X11/fonts/misc ]; then
+if [ -d $PKG/usr/lib$LIBDIRSUFFIX/X11/fonts/misc ]; then
mkdir -p $PKG/usr/share/fonts
- mv $PKG/usr/lib/X11/fonts/misc $PKG/usr/share/fonts
- rmdir $PKG/usr/lib/X11/fonts/misc 2> /dev/null
- rmdir $PKG/usr/lib/X11/fonts 2> /dev/null
- rmdir $PKG/usr/lib/X11 2> /dev/null
- rmdir $PKG/usr/lib 2> /dev/null
+ mv $PKG/usr/lib$LIBDIRSUFFIX/X11/fonts/misc $PKG/usr/share/fonts
+ rmdir $PKG/usr/lib$LIBDIRSUFFIX/X11/fonts/misc 2> /dev/null
+ rmdir $PKG/usr/lib$LIBDIRSUFFIX/X11/fonts 2> /dev/null
+ rmdir $PKG/usr/lib$LIBDIRSUFFIX/X11 2> /dev/null
+ rmdir $PKG/usr/lib$LIBDIRSUFFIX 2> /dev/null
fi
mkdir -p $PKG/etc/X11/app-defaults
@@ -75,15 +115,15 @@ for file in x3270-script.man x3270.man x3270if.man ; do
done
cat ibm_hosts.man | gzip -9c > $PKG/usr/man/man5/ibm_hosts.5.gz
-mkdir -p $PKG/usr/doc/x3270-$VERSION
+mkdir -p $PKG/usr/doc/x3270-$TARBVER
cp -a \
LICENSE README* Examples html \
- $PKG/usr/doc/x3270-$VERSION
+ $PKG/usr/doc/x3270-$TARBVER
mkdir -p $PKG/install
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $TMP/x3270-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/x3270-$TARBVER-$ARCH-$BUILD.txz
diff --git a/source/xap/xchat/xchat.SlackBuild b/source/xap/xchat/xchat.SlackBuild
index cc7b5e1a..c02a71e5 100755
--- a/source/xap/xchat/xchat.SlackBuild
+++ b/source/xap/xchat/xchat.SlackBuild
@@ -22,7 +22,7 @@
VERSION=2.8.8
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-6}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff b/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff
deleted file mode 100644
index 7d92c3e4..00000000
--- a/source/xap/xfce/patches/Thunar.thunar-vfs-io-local.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- thunar-vfs/thunar-vfs-io-local.c.old 2008-06-13 12:43:52.000000000 +0200
-+++ thunar-vfs/thunar-vfs-io-local.c 2008-06-13 14:41:46.000000000 +0200
-@@ -301,7 +301,7 @@
- }
-
- /* check whether we have a hidden file here */
-- if ((s - (const guchar *) name) > 1 && (*name == '.' || *(s - 1) == '~'))
-+ if ((s - (const guchar *) name) > 1 && (*name == '.' ))
- info->flags = THUNAR_VFS_FILE_FLAGS_HIDDEN;
- else
- info->flags = THUNAR_VFS_FILE_FLAGS_NONE;
-@@ -1029,7 +1029,7 @@
- info->display_name = g_strdup (name);
-
- /* check if this is a hidden file now */
-- if (strlen (name) > 1 && (name[0] == '.' || name[strlen (name) - 1] == '~'))
-+ if (strlen (name) > 1 && (name[0] == '.'))
- info->flags |= THUNAR_VFS_FILE_FLAGS_HIDDEN;
- else
- info->flags &= ~THUNAR_VFS_FILE_FLAGS_HIDDEN;
diff --git a/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff b/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff
deleted file mode 100644
index be64a2da..00000000
--- a/source/xap/xfce/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From b55be8ded0c7e1119eb062a5831b246b618c89e8 Mon Sep 17 00:00:00 2001
-From: Mike Massonnet <mmassonnet@gmail.com>
-Date: Thu, 8 Apr 2010 22:38:50 +0200
-Subject: [PATCH] use right comment character (! and not #) in Xft.xrdb file (bug 6314)
-
- scripts/Xft.xrdb | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/scripts/Xft.xrdb b/scripts/Xft.xrdb
-index af45361..cd26513 100644
---- a/scripts/Xft.xrdb
-+++ b/scripts/Xft.xrdb
-@@ -1,7 +1,7 @@
--# Those are fallback settings, use the ui plugin to change it
--# or add your overrides to ~/.Xresources
--# Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
--# Xft hinting: 1/0
-+! Those are fallback settings, use the ui plugin to change it
-+! or add your overrides to ~/.Xresources
-+! Xft.hintstyle: hintnone/hintslight/hintmedium/hintfull
-+! Xft hinting: 1/0
-
- Xft.hinting: 1
- Xft.hintstyle: hintmedium
diff --git a/source/xap/xfce/patches/mousepad-fix_find.diff b/source/xap/xfce/patches/mousepad-fix_find.diff
deleted file mode 100644
index 6477cd78..00000000
--- a/source/xap/xfce/patches/mousepad-fix_find.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-commit a6383ccf4e3ba425ffb6489a795785e6a626c048
-Author: Nick Schermer <nick@xfce.org>
-Date: Tue Jul 6 17:53:54 2010 +0200
-
- Also fix find (bug #6544).
-
-diff --git a/src/search.c b/src/search.c
-index 4fb1c5b..91f69cf 100644
---- a/src/search.c
-+++ b/src/search.c
-@@ -78,7 +78,7 @@ gboolean document_search_real(StructData *sd, gint direction)
- static gint document_replace_real(StructData *sd)
- {
- GtkTextIter iter, match_start, match_end;
-- GtkTextMark *mark_init = NULL;
-+ GtkTextMark *mark_init = NULL, *mark_start, *mark_end;
- gboolean res;
- gint num = 0;
- GtkWidget *q_dialog = NULL;
-@@ -113,6 +113,11 @@ static gint document_replace_real(StructData *sd)
- if (num == 0 && q_dialog == NULL)
- q_dialog = create_dialog_message_question(
- gtk_widget_get_toplevel(sd->mainwin->textview), _("Replace?"));
-+
-+ gtk_text_buffer_get_selection_bounds(textbuffer, &match_start, &match_end);
-+ mark_start = gtk_text_buffer_create_mark(textbuffer, NULL, &match_start, FALSE);
-+ mark_end = gtk_text_buffer_create_mark(textbuffer, NULL, &match_end, FALSE);
-+
- switch (gtk_dialog_run(GTK_DIALOG(q_dialog))) {
- case GTK_RESPONSE_CANCEL:
- res = 0;
-@@ -122,6 +127,11 @@ static gint document_replace_real(StructData *sd)
- case GTK_RESPONSE_NO:
- continue;
- }
-+
-+ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_start, mark_start);
-+ gtk_text_buffer_get_iter_at_mark(textbuffer, &match_end, mark_end);
-+ gtk_text_buffer_move_mark_by_name(textbuffer, "selection_bound", &match_start);
-+ gtk_text_buffer_move_mark_by_name(textbuffer, "insert", &match_end);
- }
- gtk_text_buffer_delete_selection(textbuffer, TRUE, TRUE);
- undo_set_sequency(TRUE);
diff --git a/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff b/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff
deleted file mode 100644
index 5db73b1e..00000000
--- a/source/xap/xfce/patches/mousepad-fix_find_and_replace.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 80819d447df5661ee6c9e9cd22f501cee612da8b
-Author: Lionel Le Folgoc <mrpouit@gmail.com>
-Date: Mon Jul 5 19:57:53 2010 +0200
-
- Fix find and replace (bug #5831).
-
-diff --git a/src/search.c b/src/search.c
-index 07e29c7..4fb1c5b 100644
---- a/src/search.c
-+++ b/src/search.c
-@@ -210,8 +210,11 @@ gint run_dialog_find(StructData *sd)
- G_CALLBACK(toggle_sensitivity), NULL);
- g_signal_connect(G_OBJECT(entry_find), "delete-text",
- G_CALLBACK(toggle_sensitivity), NULL);
-- if (sd->search.string_find)
-+ if (sd->search.string_find) {
- gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+ GTK_RESPONSE_OK, TRUE);
-+ }
-
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- gtk_entry_set_activates_default(GTK_ENTRY(entry_find), TRUE);
-@@ -275,8 +278,11 @@ gint run_dialog_replace(StructData *sd)
- G_CALLBACK(toggle_sensitivity), NULL);
- g_signal_connect(G_OBJECT(entry_find), "delete-text",
- G_CALLBACK(toggle_sensitivity), NULL);
-- if (sd->search.string_find)
-+ if (sd->search.string_find) {
- gtk_entry_set_text(GTK_ENTRY(entry_find), sd->search.string_find);
-+ gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog),
-+ GTK_RESPONSE_OK, TRUE);
-+ }
- label_replace = gtk_label_new_with_mnemonic(_("Re_place with: "));
- gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label_replace, 0, 1, 1, 2);
diff --git a/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch b/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch
deleted file mode 100644
index 6e5b4a9a..00000000
--- a/source/xap/xfce/patches/no_sensitive_panel_during_plugin_moves.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8ae5177d843802b49e90ecf801d8a4fac00b866a Mon Sep 17 00:00:00 2001
-From: Robby Workman <rworkman@slackware.com>
-Date: Tue, 22 Feb 2011 21:48:56 -0600
-Subject: [PATCH] panel/panel.c: Don't make panel insensitive during plugin moves
-
-This fixes http://bugzilla.xfce.org/show_bug.cgi?id=6818 while
-working around https://bugzilla.gnome.org/show_bug.cgi?id=634765
----
- panel/panel.c | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/panel/panel.c b/panel/panel.c
-index fa0709b..e7a9eac 100644
---- a/panel/panel.c
-+++ b/panel/panel.c
-@@ -811,7 +811,6 @@ _item_start_move (GtkWidget *item,
-
- if (!priv->edit_mode)
- {
-- panel_set_items_sensitive (p, FALSE);
- xfce_itembar_raise_event_window (XFCE_ITEMBAR (priv->itembar));
- panel_block_autohide (p);
- }
---
-1.7.4.1
-
diff --git a/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff b/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff
deleted file mode 100644
index 7315ecea..00000000
--- a/source/xap/xfce/patches/thunar-1.0.2-fixup_docdir.diff
+++ /dev/null
@@ -1,384 +0,0 @@
-diff -Nur Thunar-1.0.2.orig//Makefile.in Thunar-1.0.2/Makefile.in
---- Thunar-1.0.2.orig//Makefile.in 2010-05-21 12:11:02.000000000 -0500
-+++ Thunar-1.0.2/Makefile.in 2010-05-23 17:44:59.068552125 -0500
-@@ -1040,7 +1040,7 @@
-
- ThunarHelp: ThunarHelp.in Makefile
- rm -f ThunarHelp.gen ThunarHelp
-- sed -e "s,\@datadir\@,$(datadir),g" \
-+ sed -e "s,\@htmldir\@,$(htmldir),g" \
- < $(srcdir)/ThunarHelp.in \
- > ThunarHelp.gen
- mv ThunarHelp.gen ThunarHelp
-diff -Nur Thunar-1.0.2.orig//ThunarHelp.in Thunar-1.0.2/ThunarHelp.in
---- Thunar-1.0.2.orig//ThunarHelp.in 2010-05-21 12:10:52.000000000 -0500
-+++ Thunar-1.0.2/ThunarHelp.in 2010-05-23 17:45:26.207677481 -0500
-@@ -19,7 +19,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
-
--HELPDIR="@datadir@/doc/Thunar/html/"
-+HELPDIR="@htmldir@/"
-
- if test -n "$LC_ALL"; then
- LC=$LC_ALL
-diff -Nur Thunar-1.0.2.orig//docs/Makefile.in Thunar-1.0.2/docs/Makefile.in
---- Thunar-1.0.2.orig//docs/Makefile.in 2010-05-21 12:10:57.000000000 -0500
-+++ Thunar-1.0.2/docs/Makefile.in 2010-05-23 17:46:08.776567272 -0500
-@@ -322,7 +322,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(datadir)/doc/Thunar
-+docdir = @docdir@
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-diff -Nur Thunar-1.0.2.orig//docs/manual/C/Makefile.in Thunar-1.0.2/docs/manual/C/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/C/Makefile.in 2010-05-21 12:10:57.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/C/Makefile.in 2010-05-23 17:46:52.539542089 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/C
-+TARGET_DIR = $(htmldir)/C
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/C/images/Makefile.in Thunar-1.0.2/docs/manual/C/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/C/images/Makefile.in 2010-05-21 12:10:57.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/C/images/Makefile.in 2010-05-23 17:47:25.359542363 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/C/images
-+imagesdir = $(htmldir)/C/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/Makefile.in Thunar-1.0.2/docs/manual/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/Makefile.in 2010-05-21 12:10:57.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/Makefile.in 2010-05-23 17:48:04.650570173 -0500
-@@ -370,7 +370,7 @@
- tr \
- zh_TW
-
--cssdir = $(datadir)/doc/Thunar/html
-+cssdir = $(htmldir)
- css_DATA = \
- thunar.css
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/am/Makefile.in Thunar-1.0.2/docs/manual/am/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/am/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/am/Makefile.in 2010-05-23 17:48:35.304542671 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/am
-+TARGET_DIR = $(htmldir)/am
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/am/images/Makefile.in Thunar-1.0.2/docs/manual/am/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/am/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/am/images/Makefile.in 2010-05-23 17:51:21.111542305 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/am/images
-+imagesdir = $(htmldir)/am/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/da/Makefile.in Thunar-1.0.2/docs/manual/da/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/da/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/da/Makefile.in 2010-05-23 17:48:52.108550193 -0500
-@@ -334,7 +334,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/da
-+TARGET_DIR = $(htmldir)/da
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/da/images/Makefile.in Thunar-1.0.2/docs/manual/da/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/da/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/da/images/Makefile.in 2010-05-23 17:51:27.753542103 -0500
-@@ -314,7 +314,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/da/images
-+imagesdir = $(htmldir)/da/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/es/Makefile.in Thunar-1.0.2/docs/manual/es/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/es/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/es/Makefile.in 2010-05-23 17:48:58.300552519 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/es
-+TARGET_DIR = $(htmldir)/es
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/es/images/Makefile.in Thunar-1.0.2/docs/manual/es/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/es/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/es/images/Makefile.in 2010-05-23 17:51:34.373542961 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/es/images
-+imagesdir = $(htmldir)/es/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/eu/Makefile.in Thunar-1.0.2/docs/manual/eu/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/eu/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/eu/Makefile.in 2010-05-23 17:49:05.977677434 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/eu
-+TARGET_DIR = $(htmldir)/eu
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/eu/images/Makefile.in Thunar-1.0.2/docs/manual/eu/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/eu/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/eu/images/Makefile.in 2010-05-23 17:51:42.643542360 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/eu/images
-+imagesdir = $(htmldir)/eu/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/fr/Makefile.in Thunar-1.0.2/docs/manual/fr/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/fr/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/fr/Makefile.in 2010-05-23 17:49:12.495542046 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/fr
-+TARGET_DIR = $(htmldir)/fr
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/fr/images/Makefile.in Thunar-1.0.2/docs/manual/fr/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/fr/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/fr/images/Makefile.in 2010-05-23 17:51:51.116702819 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/fr/images
-+imagesdir = $(htmldir)/fr/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/gl/Makefile.in Thunar-1.0.2/docs/manual/gl/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/gl/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/gl/Makefile.in 2010-05-23 17:49:19.882542284 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/gl
-+TARGET_DIR = $(htmldir)/gl
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/gl/images/Makefile.in Thunar-1.0.2/docs/manual/gl/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/gl/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/gl/images/Makefile.in 2010-05-23 17:51:57.596588720 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/gl/images
-+imagesdir = $(htmldir)/gl/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/it/Makefile.in Thunar-1.0.2/docs/manual/it/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/it/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/it/Makefile.in 2010-05-23 17:49:27.597676807 -0500
-@@ -334,7 +334,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/it
-+TARGET_DIR = $(htmldir)/it
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/it/images/Makefile.in Thunar-1.0.2/docs/manual/it/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/it/images/Makefile.in 2010-05-21 12:10:58.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/it/images/Makefile.in 2010-05-23 17:52:05.152568701 -0500
-@@ -314,7 +314,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/it/images
-+imagesdir = $(htmldir)/it/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/ja/Makefile.in Thunar-1.0.2/docs/manual/ja/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/ja/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/ja/Makefile.in 2010-05-23 17:49:35.728552141 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/ja
-+TARGET_DIR = $(htmldir)/ja
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/ja/images/Makefile.in Thunar-1.0.2/docs/manual/ja/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/ja/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/ja/images/Makefile.in 2010-05-23 17:52:13.534542157 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/ja/images
-+imagesdir = $(htmldir)/ja/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/nl/Makefile.in Thunar-1.0.2/docs/manual/nl/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/nl/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/nl/Makefile.in 2010-05-23 17:49:42.981677782 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/nl
-+TARGET_DIR = $(htmldir)/nl
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/nl/images/Makefile.in Thunar-1.0.2/docs/manual/nl/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/nl/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/nl/images/Makefile.in 2010-05-23 17:52:19.353553300 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/nl/images
-+imagesdir = $(htmldir)/nl/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/pl/Makefile.in Thunar-1.0.2/docs/manual/pl/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/pl/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/pl/Makefile.in 2010-05-23 17:49:51.863542378 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/pl
-+TARGET_DIR = $(htmldir)/pl
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/pl/images/Makefile.in Thunar-1.0.2/docs/manual/pl/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/pl/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/pl/images/Makefile.in 2010-05-23 17:52:27.285677594 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/pl/images
-+imagesdir = $(htmldir)/pl/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/ru/Makefile.in Thunar-1.0.2/docs/manual/ru/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/ru/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/ru/Makefile.in 2010-05-23 17:49:59.951552903 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/ru
-+TARGET_DIR = $(htmldir)/ru
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/ru/images/Makefile.in Thunar-1.0.2/docs/manual/ru/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/ru/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/ru/images/Makefile.in 2010-05-23 17:52:33.673677284 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/ru/images
-+imagesdir = $(htmldir)/ru/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/tr/Makefile.in Thunar-1.0.2/docs/manual/tr/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/tr/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/tr/Makefile.in 2010-05-23 17:50:08.415553080 -0500
-@@ -334,7 +334,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/tr
-+TARGET_DIR = $(htmldir)/tr
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/tr/images/Makefile.in Thunar-1.0.2/docs/manual/tr/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/tr/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/tr/images/Makefile.in 2010-05-23 17:52:40.320542409 -0500
-@@ -314,7 +314,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/tr/images
-+imagesdir = $(htmldir)/tr/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
-diff -Nur Thunar-1.0.2.orig//docs/manual/zh_TW/Makefile.in Thunar-1.0.2/docs/manual/zh_TW/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/zh_TW/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/zh_TW/Makefile.in 2010-05-23 17:50:20.989569041 -0500
-@@ -336,7 +336,7 @@
- SUBDIRS = \
- images
-
--TARGET_DIR = $(datadir)/doc/Thunar/html/zh_TW
-+TARGET_DIR = $(htmldir)/zh_TW
- STYLESHEET = ../thunar.xsl
- DOCUMENT = Thunar.xml
-
-diff -Nur Thunar-1.0.2.orig//docs/manual/zh_TW/images/Makefile.in Thunar-1.0.2/docs/manual/zh_TW/images/Makefile.in
---- Thunar-1.0.2.orig//docs/manual/zh_TW/images/Makefile.in 2010-05-21 12:10:59.000000000 -0500
-+++ Thunar-1.0.2/docs/manual/zh_TW/images/Makefile.in 2010-05-23 17:52:47.172552372 -0500
-@@ -316,7 +316,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- xfconf_query_found = @xfconf_query_found@
--imagesdir = $(datadir)/doc/Thunar/html/zh_TW/images
-+imagesdir = $(htmldir)/zh_TW/images
- images_DATA = \
- bulk-rename.png \
- file-manager-window.png \
diff --git a/source/xap/xfce/patches/xfcalendar.desktop.in.diff b/source/xap/xfce/patches/xfcalendar.desktop.in.diff
deleted file mode 100644
index d8826781..00000000
--- a/source/xap/xfce/patches/xfcalendar.desktop.in.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/xfcalendar.desktop.in 2009-03-01 10:13:10.349305702 -0600
-+++ b/xfcalendar.desktop.in 2009-03-01 10:13:29.564307721 -0600
-@@ -10,4 +10,5 @@
- Terminal=false
- Type=Application
- Categories=X-XFCE;Office;Calendar;GTK;
-+OnlyShowIn=XFCE;
- _GenericName=Calendar
-
diff --git a/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff b/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
deleted file mode 100644
index fde47a9e..00000000
--- a/source/xap/xfce/patches/xfce-utils-load_systemwide_Xmodmap.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur xfce-utils-4.6.2.orig//scripts/xinitrc.in.in xfce-utils-4.6.2/scripts/xinitrc.in.in
---- xfce-utils-4.6.2.orig//scripts/xinitrc.in.in 2010-05-21 11:56:26.000000000 -0500
-+++ xfce-utils-4.6.2/scripts/xinitrc.in.in 2011-03-09 22:56:18.687297854 -0600
-@@ -97,6 +97,7 @@
- cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
-
- # load local modmap
-+test -r /etc/X11/xinit/.Xmodmap && xmodmap /etc/X11/xinit/.Xmodmap
- test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
-
- # Launch xscreensaver (if available), but only as non-root user
diff --git a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff b/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
deleted file mode 100644
index 206f6607..00000000
--- a/source/xap/xfce/patches/xfce-utils.xinitrc.consolekit.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./scripts/xinitrc.in.in.orig 2009-04-09 18:21:13.000000000 -0500
-+++ ./scripts/xinitrc.in.in 2010-06-18 11:33:37.000000000 -0500
-@@ -131,7 +131,11 @@
- x|xno*)
- ;;
- *)
-- $xfcesm
-+ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
-+ ck-launch-session $xfcesm
-+ else
-+ $xfcesm
-+ fi
-
- if test $kill_sshagent -eq 1; then
- eval `$sshagent -k`
diff --git a/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff b/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff
deleted file mode 100644
index 56a34060..00000000
--- a/source/xap/xfce/patches/xfdesktop-fix_education_icon.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur xfdesktop-4.6.1.orig/modules/menu/directory-data/xfce-education.directory.in xfdesktop-4.6.1/modules/menu/directory-data/xfce-education.directory.in
---- xfdesktop-4.6.1.orig/modules/menu/directory-data/xfce-education.directory.in 2009-01-12 16:03:19.000000000 -0600
-+++ xfdesktop-4.6.1/modules/menu/directory-data/xfce-education.directory.in 2009-07-31 01:04:29.029467762 -0500
-@@ -2,6 +2,6 @@
- Version=1.0
- Encoding=UTF-8
- Type=Directory
--Icon=
-+Icon=applications-education
- _Name=Education
- _Comment=Educational software
diff --git a/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff b/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
deleted file mode 100644
index 9c54cf9a..00000000
--- a/source/xap/xfce/patches/xfsm-compat-kde.c-start-kde4-services.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-From 51ee1e872e8671bf439e5d391b86432904cbc5ef Mon Sep 17 00:00:00 2001
-From: Robby Workman <rworkman@slackware.com>
-Date: Sun, 6 Mar 2011 23:55:35 -0600
-Subject: [PATCH] xfsm-compat-kde.c: Start KDE4 services instead of KDE3
-
----
- xfce4-session/xfsm-compat-kde.c | 10 ++++------
- 1 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/xfce4-session/xfsm-compat-kde.c b/xfce4-session/xfsm-compat-kde.c
-index ced6ece..b51387e 100644
---- a/xfce4-session/xfsm-compat-kde.c
-+++ b/xfce4-session/xfsm-compat-kde.c
-@@ -123,10 +123,10 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash)
- if (G_LIKELY (splash != NULL))
- xfsm_splash_screen_next (splash, _("Starting KDE services"));
-
-- run ("kdeinit");
-+ run ("kdeinit4");
-
- /* tell klauncher about the session manager */
-- g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv "
-+ g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv "
- "SESSION_MANAGER \"%s\"",
- g_getenv ("SESSION_MANAGER"));
- run (command);
-@@ -134,7 +134,7 @@ xfsm_compat_kde_startup (XfsmSplashScreen *splash)
- /* tell kde if we are running multi-head */
- if (gdk_display_get_n_screens (gdk_display_get_default ()) > 1)
- {
-- g_snprintf (command, 256, "dcop klauncher klauncher setLaunchEnv "
-+ g_snprintf (command, 256, "qdbus org.kde.klauncher /KLauncher setLaunchEnv "
- "KDE_MULTIHEAD \"true\"");
- run (command);
- }
-@@ -150,9 +150,7 @@ xfsm_compat_kde_shutdown (void)
- return;
-
- /* shutdown KDE services */
-- run ("kdeinit_shutdown");
-- run ("dcopserver_shutdown");
-- run ("artsshell -q terminate");
-+ run ("kdeinit4_shutdown");
-
- kde_compat_started = FALSE;
- }
---
-1.7.4.1
-
diff --git a/source/xap/xfce/profile.d/xfce.csh b/source/xap/xfce/profile.d/xfce.csh
deleted file mode 100755
index ccc2b8f1..00000000
--- a/source/xap/xfce/profile.d/xfce.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/csh
-if ( $?XDG_CONFIG_DIRS ) then
- setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/xfce/xdg
-else
- setenv XDG_CONFIG_DIRS /etc/xdg:/etc/xfce/xdg
-endif
diff --git a/source/xap/xfce/profile.d/xfce.sh b/source/xap/xfce/profile.d/xfce.sh
deleted file mode 100755
index adb187c1..00000000
--- a/source/xap/xfce/profile.d/xfce.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
- XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/xfce/xdg
-else
- XDG_CONFIG_DIRS=/etc/xdg:/etc/xfce/xdg
-fi
-export XDG_CONFIG_DIRS
diff --git a/source/xap/xfce/slack-desc b/source/xap/xfce/slack-desc
deleted file mode 100644
index ecedf010..00000000
--- a/source/xap/xfce/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-xfce: xfce (a fast and lightweight desktop environment for X)
-xfce:
-xfce: Xfce is a fast and lightweight desktop environment that is both
-xfce: visually appealing and easy to use.
-xfce:
-xfce: For more information, see: http://www.xfce.org
-xfce:
-xfce: Xfce was developed by Olivier Fourdan.
-xfce:
-xfce:
-xfce:
diff --git a/source/xap/xfce/xfce.SlackBuild b/source/xap/xfce/xfce.SlackBuild
deleted file mode 100755
index aaa38f99..00000000
--- a/source/xap/xfce/xfce.SlackBuild
+++ /dev/null
@@ -1,248 +0,0 @@
-#!/bin/sh
-
-# Copyright 2003 Slackware Linux, Inc., Concord, CA, USA
-# Copyright 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-VERSION=4.6.2
-BUILD=${BUILD:-5}
-
-# A few tarballs have different versions; handle them here
-XDT_VERS=4.8.0 # xfce4-dev-tools version
-# We're going to ship xdt from xfce-4.8 since it's not used for building
-# release tarballs anyway, but it's handy to have around for building from
-# git, and some folks might want to do that later...
-EXO_VERS=0.3.107 # exo version
-THUNAR_VERS=1.0.2 # thunar version
-GXE_VERS=2.6.0 # gtk-xfce-engine version
-TERM_VERS=0.4.6 # terminal version
-MPAD_VERS=0.2.16 # mousepad version
-XFWM_VERS=4.6.2 # xfwm4 version
-XFWMTHEME_VERS=4.6.0 # xfwm4-themes version
-SETTINGS_VERS=4.6.5 # xfce4-settings version
-SESSION_VERS=4.6.2 # xfce4-settings version
-PANEL_VERS=4.6.4 # xfce4-panel version
-XFCEGUI_VERS=4.6.4 # libxfcegui4 version
-XFCEMENU_VERS=4.6.2 # libxfce4menu version
-LIBUTIL_VERS=4.6.2 # libxfce4util version
-UTILS_VERS=4.6.2 # xfce-utils version
-APPFINDER_VERS=4.6.2 # xfce4-appfinder version
-XFCONF_VERS=4.6.2 # xfconf version
-XFDESKTOP_VERS=4.6.2 # xfdesktop version
-MIXER_VERS=4.6.1 # xfce4-mixer version
-XFPRINT_VERS=4.6.1 # xfprint version
-ORAGE_VERS=4.6.1 # orage version
-
-NUMJOBS=${NUMJOBS:--j6}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
- arm*) export ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/xfce-build-dir}
-PKG=$TMP/package-xfce
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP || exit 1
-
-COMPRESSION=xz
-COMPRESSUTIL=xz
-
-for file in \
- xfce4-dev-tools-$XDT_VERS.tar.$COMPRESSION \
- libxfce4util-$LIBUTIL_VERS.tar.$COMPRESSION \
- xfconf-$XFCONF_VERS.tar.$COMPRESSION \
- libxfcegui4-$XFCEGUI_VERS.tar.$COMPRESSION \
- libxfce4menu-$XFCEMENU_VERS.tar.$COMPRESSION \
- exo-$EXO_VERS.tar.$COMPRESSION \
- xfce4-panel-$PANEL_VERS.tar.$COMPRESSION \
- Thunar-$THUNAR_VERS.tar.$COMPRESSION \
- xfce4-settings-$SETTINGS_VERS.tar.$COMPRESSION \
- xfce4-session-$SESSION_VERS.tar.$COMPRESSION \
- xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION \
- xfwm4-$XFWM_VERS.tar.$COMPRESSION \
- xfce-utils-$UTILS_VERS.tar.$COMPRESSION \
- xfce4-mixer-$MIXER_VERS.tar.$COMPRESSION \
- xfprint-$XFPRINT_VERS.tar.$COMPRESSION \
- xfce4-appfinder-$APPFINDER_VERS.tar.$COMPRESSION \
- gtk-xfce-engine-$GXE_VERS.tar.$COMPRESSION \
- Terminal-$TERM_VERS.tar.$COMPRESSION \
- xfwm4-themes-$XFWMTHEME_VERS.tar.$COMPRESSION \
- mousepad-$MPAD_VERS.tar.$COMPRESSION \
- orage-$ORAGE_VERS.tar.$COMPRESSION ;
-do
- $COMPRESSUTIL -dc $CWD/src/$file | tar xvf - || exit 1
- cd $(basename $file .tar.$COMPRESSION) || exit 1
- chown -R root:root .
- find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
- # Here's where we patch or set up any other package-specific stuff:
- # Patch to only show xfcalendar in XFce (otherwise it shows up in
- # KDE's Lost & Found and does not work):
- if [ "$file" = "orage-$ORAGE_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/xfcalendar.desktop.in.diff.gz | patch -p1 --verbose || exit 1
- fi
- # Make Thunar respect --docdir
- if [ "$file" = "Thunar-$THUNAR_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/thunar-1.0.2-fixup_docdir.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/patches/Thunar.thunar-vfs-io-local.diff.gz | patch -p0 --verbose || exit 1
- fi
- # Fix the missing education icon in the desktop menu
- if [ "$file" = "xfdesktop-$XFDESKTOP_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/xfdesktop-fix_education_icon.diff.gz | patch -p1 --verbose || exit 1
- fi
- # 1) Launch xfce through consolekit so that ck enabled stuff works in xfce
- # 2) Fix comments in /etc/xfce/xdg/xfce4/Xft.xrdb
- # http://bugzilla.xfce.org/show_bug.cgi?id=6314
- # 3) Load system-wide .Xmodmap, not just the one in $HOME
- if [ "$file" = "xfce-utils-$UTILS_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/xfce-utils.xinitrc.consolekit.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/patches/fixup_comments_in_xfce-utils-Xft.xrdb.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/patches/xfce-utils-load_systemwide_Xmodmap.diff.gz | patch -p1 --verbose || exit 1
- fi
- # Fix a couple of bugs from mousepad git
- if [ "$file" = "mousepad-$MPAD_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/mousepad-fix_find_and_replace.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/patches/mousepad-fix_find.diff.gz | patch -p1 --verbose || exit 1
- fi
- # Fix a plugin moving bug in the panel
- if [ "$file" = "xfce4-panel-$PANEL_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/no_sensitive_panel_during_plugin_moves.patch.gz | patch -p1 --verbose || exit 1
- fi
- # Start kde4 services instead of kde3
- # http://bugzilla.xfce.org/show_bug.cgi?id=7382
- if [ "$file" = "xfce4-session-$SESSION_VERS.tar.$COMPRESSION" ]; then
- zcat $CWD/patches/xfsm-compat-kde.c-start-kde4-services.diff.gz | patch -p1 --verbose || exit 1
- fi
- # End patches/package-specific stuff
-
- CFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS" \
- ./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc/xfce \
- --mandir=/usr/man \
- --docdir=/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION) \
- --htmldir=/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION)/html \
- --disable-static \
- --build=$ARCH-slackware-linux \
- $PACKAGE_SPECIFIC_OPTIONS
-
- # Unset this now -- we're done with it
- unset PACKAGE_SPECIFIC_OPTIONS
-
- make $NUMJOBS || make || exit 1
- make install || exit 1
- make install DESTDIR=$PKG
-
- mkdir -p $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION)
- # This will cause errors, but won't miss any docs:
- cp -a \
- AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
- NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
- $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION) \
- 2> /dev/null || true
-
- # If there's a ChangeLog, installing at least part of the recent history
- # is useful, but don't let it get totally out of control:
- if [ -r ChangeLog ]; then
- DOCSDIR=$(echo $PKG/usr/doc/xfce-$VERSION/$(basename $file .tar.$COMPRESSION))
- cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
- touch -r ChangeLog $DOCSDIR/ChangeLog
- fi
-
- cd - ;
-done
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-# The Rodent icon theme isn't xdg compliant, so it spews errors quite often
-# and just flat breaks some things here and there, so the Xfce team elected
-# not to ship it with 4.6.x. In the meantime, we'll default to gnome.
-sed -i s/Rodent/gnome/ \
- $PKG/etc/xfce/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
-
-# We're going to borrow the "applications-education" icons (six of them)
-# from the kde oxygen icon theme (it's LGPL)
-tar xf $CWD/icons.tar.xz -C $PKG/usr/share
-
-# We don't want any of those icon caches
-find $PKG/usr/share/icons -type f -name "index-theme.cache" -exec rm -f {} \;
-
-# Compress and if needed symlink the man pages:
-if [ -d $PKG/usr/man ]; then
- ( cd $PKG/usr/man
- for manpagedir in $(find . -type d -name "man*") ; do
- ( cd $manpagedir
- for eachpage in $( find . -type l -maxdepth 1) ; do
- ln -s $( readlink $eachpage ).gz $eachpage.gz
- rm $eachpage
- done
- gzip -9 *.?
- )
- done
- )
-fi
-
-mkdir -p $PKG/etc/profile.d
-cp -a $CWD/profile.d/* $PKG/etc/profile.d
-chown root:root $PKG/etc/profile.d/*
-chmod 755 $PKG/etc/profile.d/*
-
-mkdir -p $PKG/etc/X11/xinit
-( cd $PKG/etc/X11/xinit
- ln -sf ../../xfce/xdg/xfce4/xinitrc xinitrc.xfce
- chmod 755 ../../xfce/xdg/xfce4/xinitrc
-)
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/xfce-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/xap/xfce4-notifyd/doinst.sh b/source/xap/xfce4-notifyd/doinst.sh
deleted file mode 100644
index ec1b3d8a..00000000
--- a/source/xap/xfce4-notifyd/doinst.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications 2>/dev/null
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
-
diff --git a/source/xap/xfce4-notifyd/slack-desc b/source/xap/xfce4-notifyd/slack-desc
deleted file mode 100644
index 1463db0b..00000000
--- a/source/xap/xfce4-notifyd/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-xfce4-notifyd: xfce4-notifyd (Xfce Notify Daemon)
-xfce4-notifyd:
-xfce4-notifyd: Xfce4-notifyd is a simple, visually-appealing notification daemon
-xfce4-notifyd: for Xfce. Applications can use xfce4-notifyd to pop up a notification
-xfce4-notifyd: bubble by sending messages through D-Bus.
-xfce4-notifyd:
-xfce4-notifyd: Homepage: http://spuriousinterrupt.org/projects/xfce4-notifyd
-xfce4-notifyd:
-xfce4-notifyd:
-xfce4-notifyd:
-xfce4-notifyd:
diff --git a/source/xap/xfce4-power-manager/doinst.sh b/source/xap/xfce4-power-manager/doinst.sh
deleted file mode 100644
index 1f8ff67d..00000000
--- a/source/xap/xfce4-power-manager/doinst.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
- if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
- fi
-fi
-
diff --git a/source/xap/xfce4-power-manager/slack-desc b/source/xap/xfce4-power-manager/slack-desc
deleted file mode 100644
index d1dd7ec1..00000000
--- a/source/xap/xfce4-power-manager/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------|
-xfce4-power-manager: xfce4-power-manager (Power Management Daemon for Xfce)
-xfce4-power-manager:
-xfce4-power-manager: xfce4-power-manager makes power management functions (such as
-xfce4-power-manager: suspend and hibernate) easy inside the Xfce Desktop Environment
-xfce4-power-manager: (but it should also work in any other desktop environment).
-xfce4-power-manager:
-xfce4-power-manager:
-xfce4-power-manager:
-xfce4-power-manager:
-xfce4-power-manager:
-xfce4-power-manager:
diff --git a/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild
deleted file mode 100755
index 1aa24bde..00000000
--- a/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for xfce4-power-manager
-
-# Copyright 2006-2010 Robby Workman Northport, Alabama, USA
-# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-PKGNAM=xfce4-power-manager
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
- arm*) export ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
- esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG
-cd $TMP || exit 1
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc/xfce \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --enable-shared=yes \
- --enable-static=no \
- --enable-debug=no \
- --disable-network-manager \
- --build=$ARCH-slackware-linux
-
-make || exit 1
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
- | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-gzip -9 $PKG/usr/man/man?/*.?
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
-cp -a \
- AUTHORS COPYING NEWS README TODO \
- $PKG/usr/doc/$PKGNAM-$VERSION
-( cd $PKG/usr/doc/$PKGNAM-$VERSION/html
- ln -s /usr/share/xfce4/doc/C/xfce4-power-manager.html index.html
- ln -s /usr/share/xfce4/doc/C/images .
-)
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
- DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
- cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
- touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/xap/xfractint/xfractint.SlackBuild b/source/xap/xfractint/xfractint.SlackBuild
index 1ae5e6fe..e6b8bb4d 100755
--- a/source/xap/xfractint/xfractint.SlackBuild
+++ b/source/xap/xfractint/xfractint.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2007, 2008, 2009 Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2007, 2008, 2009, 2012 Patrick Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,46 @@
PKGNAM=xfractint
-VERSION=${VERSION:-20.04p09}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-20.04p11}
BUILD=${BUILD:-1}
-if [ "$ARCH" = "i486" ]; then
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i486 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$ARCH" = "i386" ]; then
+ SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
CWD=$(pwd)
@@ -42,7 +72,7 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/xfractint-${VERSION}.tar.bz2 || exit 1
+tar xvf $CWD/xfractint-${VERSION}.tar.xz || exit 1
cd ${PKGNAM}-${VERSION} || exit 1
rm -f unix/calmanfx.o # contains i386 code
diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild
index c1127593..97391f39 100755
--- a/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/source/xap/xine-lib/xine-lib.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,13 @@
# Version on the tarball
-VERSION=1.1.19
+VERSION=1.1.21
# Version used in the source directory to cd into
-DIRVER=1.1.19
+DIRVER=1.1.21
# Version used for the Slackware package
-PKGVER=1.1.19
+PKGVER=1.1.21
+
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -41,7 +43,6 @@ fi
# I would use "-march=i486 -mtune=i686" here as usual, but with XINE it's all or nothing.
# I'd rather have it work well for the i686/Athlon crowd than suck for everyone.
TARGET=${TARGET:-$ARCH-pc-linux-gnu}
-BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -64,6 +65,9 @@ cd xine-lib-$DIRVER || exit 1
zcat $CWD/xine-lib.XvMClib.h.diff.gz | patch -p1 --verbose || exit 1
+# Fix for zlib-1.2.6 (or higher):
+sed -i 's#gzgetc(#gzgetc_(#' src/xine-engine/osd.c
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild
index 61650223..65a18c18 100755
--- a/source/xap/xine-ui/xine-ui.SlackBuild
+++ b/source/xap/xine-ui/xine-ui.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
VERSION=${VERSION:-$(echo xine-ui-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
# I would use "-march=i486 -mcpu=i686" here as usual, but with XINE it's all or nothing.
# I'd rather have it work well for the i686/Athlon crowd than suck for everyone.
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -47,11 +47,9 @@ mkdir -p $TMP $PKG/usr
cd $TMP
rm -rf xine-ui-$VERSION
-tar xvf $CWD/xine-ui-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/xine-ui-$VERSION.tar.?z* || exit 1
cd xine-ui-$VERSION || exit 1
-zcat $CWD/xine-ui.png14.diff.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -59,11 +57,15 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+zcat $CWD/xine-ui.no.deprecated.curl.headers.diff.gz | patch -p1 --verbose || exit 1
+
XINE_BUILD=$TARGET \
./configure \
--prefix=/usr \
--with-aalib \
--with-caca \
+ --disable-lirc \
+ --mandir=/usr/man \
--build=$TARGET
make $NUMJOBS || make || exit 1
diff --git a/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff b/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff
new file mode 100644
index 00000000..63e57717
--- /dev/null
+++ b/source/xap/xine-ui/xine-ui.no.deprecated.curl.headers.diff
@@ -0,0 +1,11 @@
+--- ./src/xitk/download.c.orig 2009-12-18 18:34:22.000000000 -0600
++++ ./src/xitk/download.c 2012-09-09 12:47:15.757552304 -0500
+@@ -28,8 +28,6 @@
+
+ #ifdef HAVE_CURL
+ #include <curl/curl.h>
+-#include <curl/types.h>
+-#include <curl/easy.h>
+ #endif
+
+ #include "common.h"
diff --git a/source/xap/xine-ui/xine-ui.png14.diff b/source/xap/xine-ui/xine-ui.png14.diff
deleted file mode 100644
index 35a06513..00000000
--- a/source/xap/xine-ui/xine-ui.png14.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/xitk/Imlib-light/load.c.orig 2003-07-14 17:44:10.000000000 -0500
-+++ ./src/xitk/Imlib-light/load.c 2010-02-19 13:41:27.000000000 -0600
-@@ -193,7 +193,7 @@
- return 0;
- fread(buf, 1, 8, f);
- rewind(f);
-- return (int)png_check_sig(buf, 8);
-+ return (int)(png_sig_cmp(buf, 0, 8) == 0);
- }
-
- ImlibImage * Imlib_load_image(ImlibData * id, char *file) {
diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild
index 09ce261f..c7ced75b 100755
--- a/source/xap/xlockmore/xlockmore.SlackBuild
+++ b/source/xap/xlockmore/xlockmore.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
PKGNAM=xlockmore
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
@@ -63,7 +63,7 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf xlockmore-$VERSION
-tar xvf $CWD/xlockmore-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/xlockmore-$VERSION.tar.?z* || exit 1
cd xlockmore-$VERSION || exit 1
chown -R root:root .
find . \
diff --git a/source/xap/xpdf/patches/03-float.patch b/source/xap/xpdf/patches/03-float.patch
new file mode 100644
index 00000000..208c765a
--- /dev/null
+++ b/source/xap/xpdf/patches/03-float.patch
@@ -0,0 +1,25 @@
+description: fix a floating point quirk that is exposed by gcc 4.4
+ (this was leading to slow pdf document scrolling on i386)
+author: Michael Gilbert <michael.s.gilbert@gmail.com>
+bug-debian: http://bugs.debian.org/577031
+--- xpdf-3.02.orig/xpdf/PDFCore.h
++++ xpdf-3.02/xpdf/PDFCore.h
+@@ -40,6 +40,7 @@ class PDFCore;
+ #define zoomPage -1
+ #define zoomWidth -2
+ #define defZoom 125
++#define EPSILON 1.0e-7 // 32-bit floating point machine precision
+
+ //------------------------------------------------------------------------
+
+--- xpdf-3.02.orig/xpdf/PDFCore.cc
++++ xpdf-3.02/xpdf/PDFCore.cc
+@@ -445,7 +445,7 @@ void PDFCore::update(int topPageA, int s
+ // object
+ if (force || pages->getLength() == 0 ||
+ (!continuousMode && topPageA != topPage) ||
+- zoomA != zoom || dpiA != dpi || rotateA != rotate) {
++ zoomA != zoom || fabs( dpiA - dpi ) > EPSILON || rotateA != rotate) {
+ needUpdate = gTrue;
+ setSelection(0, 0, 0, 0, 0);
+ while (pages->getLength() > 0) {
diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild
index b19b3aca..6093f21d 100755
--- a/source/xap/xpdf/xpdf.SlackBuild
+++ b/source/xap/xpdf/xpdf.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
VERSION=3.02
PATCHLEVEL=pl6
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -78,6 +78,7 @@ cat $CWD/patches/xpdf-3.02pl4.patch | patch -p1 --verbose || exit 1
cat $CWD/patches/xpdf-3.02pl5.patch | patch -p1 --verbose || exit 1
zcat $CWD/patches/xpdf_3.02-1.3.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/patches/xpdfrc.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/patches/03-float.patch.gz | patch -p1 --verbose || exit 1
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -89,7 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \
--with-gzip \
--with-freetype2-includes=/usr/include/freetype2 \
--without-t1-library \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
diff --git a/source/xap/xsane/xsane.SlackBuild b/source/xap/xsane/xsane.SlackBuild
index 1b711715..b301d081 100755
--- a/source/xap/xsane/xsane.SlackBuild
+++ b/source/xap/xsane/xsane.SlackBuild
@@ -22,7 +22,7 @@
VERSION=0.998
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xap/xscreensaver/xscreensaver-getimage-file-5.14 b/source/xap/xscreensaver/xscreensaver-getimage-file-5.14
new file mode 100644
index 00000000..bc7bcbd9
--- /dev/null
+++ b/source/xap/xscreensaver/xscreensaver-getimage-file-5.14
@@ -0,0 +1,555 @@
+#!/usr/bin/perl -w
+# Copyright © 2001-2011 Jamie Zawinski <jwz@jwz.org>.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation. No representations are made about the suitability of this
+# software for any purpose. It is provided "as is" without express or
+# implied warranty.
+#
+# This program chooses a random file from under the given directory, and
+# prints its name. The file will be an image file whose dimensions are
+# larger than a certain minimum size.
+#
+# The various xscreensaver hacks that manipulate images ("jigsaw", etc.) get
+# the image to manipulate by running the "xscreensaver-getimage" program.
+#
+# Under X11, the "xscreensaver-getimage" program invokes this script,
+# depending on the value of the "chooseRandomImages" and "imageDirectory"
+# settings in the ~/.xscreensaver file (or .../app-defaults/XScreenSaver).
+# The screen savers invoke "xscreensaver-getimage" via utils/grabclient.c,
+# which then invokes this script.
+#
+# Under Cocoa, this script lives inside the .saver bundle, and is invoked
+# directly from utils/grabclient.c.
+#
+# Created: 12-Apr-01.
+
+require 5;
+#use diagnostics; # Fails on some MacOS 10.5 systems
+use strict;
+
+use POSIX;
+use Fcntl;
+
+use Fcntl ':flock'; # import LOCK_* constants
+
+use POSIX ':fcntl_h'; # S_ISDIR was here in Perl 5.6
+import Fcntl ':mode' unless defined &S_ISUID; # but it is here in Perl 5.8
+ # but in Perl 5.10, both of these load, and cause errors!
+ # So we have to check for S_ISUID instead of S_ISDIR? WTF?
+
+use bytes; # Larry can take Unicode and shove it up his ass sideways.
+ # Perl 5.8.0 causes us to start getting incomprehensible
+ # errors about UTF-8 all over the place without this.
+
+my $progname = $0; $progname =~ s@.*/@@g;
+my $version = q{ $Revision: 1.29 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+
+my $verbose = 0;
+
+# Whether to use MacOS X's Spotlight to generate the list of files.
+# When set to -1, uses Spotlight if "mdfind" exists.
+#
+# (In my experience, this isn't actually any faster, and might not find
+# everything if your Spotlight index is out of date, which happens often.)
+#
+my $use_spotlight_p = 0;
+
+# Whether to cache the results of the last run.
+#
+my $cache_p = 1;
+
+# Regenerate the cache if it is older than this many seconds.
+#
+my $cache_max_age = 60 * 60 * 3; # 3 hours
+
+
+# This matches files that we are allowed to use as images (case-insensitive.)
+# Anything not matching this is ignored. This is so you can point your
+# imageDirectory at directory trees that have things other than images in
+# them, but it assumes that you gave your images sensible file extensions.
+#
+my @good_extensions = ('jpg', 'jpeg', 'pjpeg', 'pjpg', 'png', 'gif',
+ 'tif', 'tiff', 'xbm', 'xpm');
+my $good_file_re = '\.(' . join("|", @good_extensions) . ')$';
+
+# This matches file extensions that might occur in an image directory,
+# and that are never used in the name of a subdirectory. This is an
+# optimization that prevents us from having to stat() those files to
+# tell whether they are directories or not. (It speeds things up a
+# lot. Don't give your directories stupid names.)
+#
+my @nondir_extensions = ('ai', 'bmp', 'bz2', 'cr2', 'crw', 'db',
+ 'dmg', 'eps', 'gz', 'hqx', 'htm', 'html', 'icns', 'ilbm', 'mov',
+ 'nef', 'pbm', 'pdf', 'pl', 'ppm', 'ps', 'psd', 'sea', 'sh', 'shtml',
+ 'tar', 'tgz', 'thb', 'txt', 'xcf', 'xmp', 'Z', 'zip' );
+my $nondir_re = '\.(' . join("|", @nondir_extensions) . ')$';
+
+
+# JPEG, GIF, and PNG files that are are smaller than this are rejected:
+# this is so that you can use an image directory that contains both big
+# images and thumbnails, and have it only select the big versions.
+#
+my $min_image_width = 255;
+my $min_image_height = 255;
+
+my @all_files = (); # list of "good" files we've collected
+my %seen_inodes; # for breaking recursive symlink loops
+
+# For diagnostic messages:
+#
+my $dir_count = 1; # number of directories seen
+my $stat_count = 0; # number of files/dirs stat'ed
+my $skip_count_unstat = 0; # number of files skipped without stat'ing
+my $skip_count_stat = 0; # number of files skipped after stat
+
+sub find_all_files($);
+sub find_all_files($) {
+ my ($dir) = @_;
+
+ print STDERR "$progname: + reading dir $dir/...\n" if ($verbose > 1);
+
+ my $dd;
+ if (! opendir ($dd, $dir)) {
+ print STDERR "$progname: couldn't open $dir: $!\n" if ($verbose);
+ return;
+ }
+ my @files = readdir ($dd);
+ closedir ($dd);
+
+ my @dirs = ();
+
+ foreach my $file (@files) {
+ next if ($file =~ m/^\./); # silently ignore dot files/dirs
+
+ if ($file =~ m/[~%\#]$/) { # ignore backup files (and dirs...)
+ $skip_count_unstat++;
+ print STDERR "$progname: - skip file $file\n" if ($verbose > 1);
+ }
+
+ $file = "$dir/$file";
+
+ if ($file =~ m/$good_file_re/io) {
+ #
+ # Assume that files ending in .jpg exist and are not directories.
+ #
+ push @all_files, $file;
+ print STDERR "$progname: - found file $file\n" if ($verbose > 1);
+
+ } elsif ($file =~ m/$nondir_re/io) {
+ #
+ # Assume that files ending in .html are not directories.
+ #
+ $skip_count_unstat++;
+ print STDERR "$progname: -- skip file $file\n" if ($verbose > 1);
+
+ } else {
+ #
+ # Now we need to stat the file to see if it's a subdirectory.
+ #
+ # Note: we could use the trick of checking "nlinks" on the parent
+ # directory to see if this directory contains any subdirectories,
+ # but that would exclude any symlinks to directories.
+ #
+ my @st = stat($file);
+ my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+ $atime,$mtime,$ctime,$blksize,$blocks) = @st;
+
+ $stat_count++;
+
+ if ($#st == -1) {
+ if ($verbose) {
+ my $ll = readlink $file;
+ if (defined ($ll)) {
+ print STDERR "$progname: + dangling symlink: $file -> $ll\n";
+ } else {
+ print STDERR "$progname: + unreadable: $file\n";
+ }
+ }
+ next;
+ }
+
+ next if ($seen_inodes{"$dev:$ino"}); # break symlink loops
+ $seen_inodes{"$dev:$ino"} = 1;
+
+ if (S_ISDIR($mode)) {
+ push @dirs, $file;
+ $dir_count++;
+ print STDERR "$progname: + found dir $file\n" if ($verbose > 1);
+
+ } else {
+ $skip_count_stat++;
+ print STDERR "$progname: + skip file $file\n" if ($verbose > 1);
+ }
+ }
+ }
+
+ foreach (@dirs) {
+ find_all_files ($_);
+ }
+}
+
+
+sub spotlight_all_files($) {
+ my ($dir) = @_;
+
+ my @terms = ();
+ # "public.image" matches all (indexed) images, including Photoshop, etc.
+# push @terms, "kMDItemContentTypeTree == 'public.image'";
+ foreach (@good_extensions) {
+
+ # kMDItemFSName hits the file system every time: much worse than "find".
+# push @terms, "kMDItemFSName == '*.$_'";
+
+ # kMDItemDisplayName matches against the name in the Spotlight index,
+ # but won't find files that (for whatever reason) didn't get indexed.
+ push @terms, "kMDItemDisplayName == '*.$_'";
+ }
+
+ $dir =~ s@([^-_/a-z\d.,])@\\$1@gsi; # quote for sh
+ my $cmd = "mdfind -onlyin $dir \"" . join (' || ', @terms) . "\"";
+
+ print STDERR "$progname: executing: $cmd\n" if ($verbose > 1);
+ @all_files = split (/[\r\n]+/, `$cmd`);
+}
+
+
+# If we're using cacheing, read the cache file and return its contents,
+# if any. This also holds an exclusive lock on the cache file, which
+# has the additional benefit that if two copies of this program are
+# running at once, one will wait for the other, instead of both of
+# them spanking the same file system at the same time.
+#
+my $cache_fd = undef;
+my $cache_file_name = undef;
+my $read_cache_p = 0;
+
+sub read_cache($) {
+ my ($dir) = @_;
+
+ return () unless ($cache_p);
+
+ my $dd = "$ENV{HOME}/Library/Caches"; # MacOS location
+ if (-d $dd) {
+ $cache_file_name = "$dd/org.jwz.xscreensaver.getimage.cache";
+ } elsif (-d "$ENV{HOME}/tmp") {
+ $cache_file_name = "$ENV{HOME}/tmp/.xscreensaver-getimage.cache";
+ } else {
+ $cache_file_name = "$ENV{HOME}/.xscreensaver-getimage.cache";
+ }
+
+ print STDERR "$progname: awaiting lock: $cache_file_name\n"
+ if ($verbose > 1);
+
+ my $file = $cache_file_name;
+ open ($cache_fd, '+>>', $file) || error ("unable to write $file: $!");
+ flock ($cache_fd, LOCK_EX) || error ("unable to lock $file: $!");
+ seek ($cache_fd, 0, 0) || error ("unable to rewind $file: $!");
+
+ my $mtime = (stat($cache_fd))[9];
+
+ if ($mtime + $cache_max_age < time) {
+ print STDERR "$progname: cache is too old\n" if ($verbose);
+ return ();
+ }
+
+ my $odir = <$cache_fd>;
+ $odir =~ s/[\r\n]+$//s if defined ($odir);
+ if (!defined ($odir) || ($dir ne $odir)) {
+ print STDERR "$progname: cache is for $odir, not $dir\n"
+ if ($verbose && $odir);
+ return ();
+ }
+
+ my @files = ();
+ while (<$cache_fd>) {
+ s/[\r\n]+$//s;
+ push @files, "$odir/$_";
+ }
+
+ print STDERR "$progname: " . ($#files+1) . " files in cache\n"
+ if ($verbose);
+
+ $read_cache_p = 1;
+ return @files;
+}
+
+
+sub write_cache($) {
+ my ($dir) = @_;
+
+ return unless ($cache_p);
+
+ # If we read the cache, just close it without rewriting it.
+ # If we didn't read it, then write it now.
+
+ if (! $read_cache_p) {
+
+ truncate ($cache_fd, 0) ||
+ error ("unable to truncate $cache_file_name: $!");
+ seek ($cache_fd, 0, 0) ||
+ error ("unable to rewind $cache_file_name: $!");
+
+ if ($#all_files >= 0) {
+ print $cache_fd "$dir\n";
+ foreach (@all_files) {
+ my $f = $_; # stupid Perl. do this to avoid modifying @all_files!
+ $f =~ s@^\Q$dir\L/@@so || die; # remove $dir from front
+ print $cache_fd "$f\n";
+ }
+ }
+
+ print STDERR "$progname: cached " . ($#all_files+1) . " files\n"
+ if ($verbose);
+ }
+
+ flock ($cache_fd, LOCK_UN) ||
+ error ("unable to unlock $cache_file_name: $!");
+ close ($cache_fd);
+ $cache_fd = undef;
+}
+
+
+sub find_random_file($) {
+ my ($dir) = @_;
+
+ if ($use_spotlight_p == -1) {
+ $use_spotlight_p = 0;
+ if (-x '/usr/bin/mdfind') {
+ $use_spotlight_p = 1;
+ }
+ }
+
+ @all_files = read_cache ($dir);
+
+ if ($#all_files >= 0) {
+ # got it from the cache...
+
+ } elsif ($use_spotlight_p) {
+ print STDERR "$progname: spotlighting $dir...\n" if ($verbose);
+ spotlight_all_files ($dir);
+ print STDERR "$progname: found " . ($#all_files+1) .
+ " file" . ($#all_files == 0 ? "" : "s") .
+ " via Spotlight\n"
+ if ($verbose);
+ } else {
+ print STDERR "$progname: recursively reading $dir...\n" if ($verbose);
+ find_all_files ($dir);
+ print STDERR "$progname: " .
+ "f=" . ($#all_files+1) . "; " .
+ "d=$dir_count; " .
+ "s=$stat_count; " .
+ "skip=${skip_count_unstat}+$skip_count_stat=" .
+ ($skip_count_unstat + $skip_count_stat) .
+ ".\n"
+ if ($verbose);
+ }
+
+ write_cache ($dir);
+
+# @all_files = sort(@all_files);
+
+ if ($#all_files < 0) {
+ print STDERR "$progname: no files in $dir\n";
+ exit 1;
+ }
+
+ my $max_tries = 50;
+ for (my $i = 0; $i < $max_tries; $i++) {
+
+ my $n = int (rand ($#all_files + 1));
+ my $file = $all_files[$n];
+ if (large_enough_p ($file)) {
+ $file =~ s@^\Q$dir\L/@@so || die; # remove $dir from front
+ return $file;
+ }
+ }
+
+ print STDERR "$progname: no suitable images in $dir " .
+ "(after $max_tries tries)\n";
+ exit 1;
+}
+
+
+sub large_enough_p($) {
+ my ($file) = @_;
+
+ my ($w, $h) = image_file_size ($file);
+
+ if (!defined ($h)) {
+ print STDERR "$progname: $file: unable to determine image size\n"
+ if ($verbose);
+ # Assume that unknown files are of good sizes: this will happen if
+ # they matched $good_file_re, but we don't have code to parse them.
+ # (This will also happen if the file is junk...)
+ return 1;
+ }
+
+ if ($w < $min_image_width || $h < $min_image_height) {
+ print STDERR "$progname: $file: too small ($w x $h)\n" if ($verbose);
+ return 0;
+ }
+
+ print STDERR "$progname: $file: $w x $h\n" if ($verbose);
+ return 1;
+}
+
+
+
+# Given the raw body of a GIF document, returns the dimensions of the image.
+#
+sub gif_size($) {
+ my ($body) = @_;
+ my $type = substr($body, 0, 6);
+ my $s;
+ return () unless ($type =~ /GIF8[7,9]a/);
+ $s = substr ($body, 6, 10);
+ my ($a,$b,$c,$d) = unpack ("C"x4, $s);
+ return (($b<<8|$a), ($d<<8|$c));
+}
+
+# Given the raw body of a JPEG document, returns the dimensions of the image.
+#
+sub jpeg_size($) {
+ my ($body) = @_;
+ my $i = 0;
+ my $L = length($body);
+
+ my $c1 = substr($body, $i, 1); $i++;
+ my $c2 = substr($body, $i, 1); $i++;
+ return () unless (ord($c1) == 0xFF && ord($c2) == 0xD8);
+
+ my $ch = "0";
+ while (ord($ch) != 0xDA && $i < $L) {
+ # Find next marker, beginning with 0xFF.
+ while (ord($ch) != 0xFF) {
+ return () if (length($body) <= $i);
+ $ch = substr($body, $i, 1); $i++;
+ }
+ # markers can be padded with any number of 0xFF.
+ while (ord($ch) == 0xFF) {
+ return () if (length($body) <= $i);
+ $ch = substr($body, $i, 1); $i++;
+ }
+
+ # $ch contains the value of the marker.
+ my $marker = ord($ch);
+
+ if (($marker >= 0xC0) &&
+ ($marker <= 0xCF) &&
+ ($marker != 0xC4) &&
+ ($marker != 0xCC)) { # it's a SOFn marker
+ $i += 3;
+ return () if (length($body) <= $i);
+ my $s = substr($body, $i, 4); $i += 4;
+ my ($a,$b,$c,$d) = unpack("C"x4, $s);
+ return (($c<<8|$d), ($a<<8|$b));
+
+ } else {
+ # We must skip variables, since FFs in variable names aren't
+ # valid JPEG markers.
+ return () if (length($body) <= $i);
+ my $s = substr($body, $i, 2); $i += 2;
+ my ($c1, $c2) = unpack ("C"x2, $s);
+ my $length = ($c1 << 8) | $c2;
+ return () if ($length < 2);
+ $i += $length-2;
+ }
+ }
+ return ();
+}
+
+# Given the raw body of a PNG document, returns the dimensions of the image.
+#
+sub png_size($) {
+ my ($body) = @_;
+ return () unless ($body =~ m/^\211PNG\r/s);
+ my ($bits) = ($body =~ m/^.{12}(.{12})/s);
+ return () unless defined ($bits);
+ return () unless ($bits =~ /^IHDR/);
+ my ($ign, $w, $h) = unpack("a4N2", $bits);
+ return ($w, $h);
+}
+
+
+# Given the raw body of a GIF, JPEG, or PNG document, returns the dimensions
+# of the image.
+#
+sub image_size($) {
+ my ($body) = @_;
+ return () if (length($body) < 10);
+ my ($w, $h) = gif_size ($body);
+ if ($w && $h) { return ($w, $h); }
+ ($w, $h) = jpeg_size ($body);
+ if ($w && $h) { return ($w, $h); }
+ # #### TODO: need image parsers for TIFF, XPM, XBM.
+ return png_size ($body);
+}
+
+# Returns the dimensions of the image file.
+#
+sub image_file_size($) {
+ my ($file) = @_;
+ my $in;
+ if (! open ($in, '<', $file)) {
+ print STDERR "$progname: $file: $!\n" if ($verbose);
+ return undef;
+ }
+ binmode ($in); # Larry can take Unicode and shove it up his ass sideways.
+ my $body = '';
+ sysread ($in, $body, 1024 * 50); # The first 50k should be enough.
+ close $in; # (It's not for certain huge jpegs...
+ return image_size ($body); # but we know they're huge!)
+}
+
+
+sub error($) {
+ my ($err) = @_;
+ print STDERR "$progname: $err\n";
+ exit 1;
+}
+
+sub usage() {
+ print STDERR "usage: $progname [--verbose] directory\n" .
+ " Prints the name of a randomly-selected image file. The directory\n" .
+ " is searched recursively. Images smaller than " .
+ "${min_image_width}x${min_image_height} are excluded.\n";
+ exit 1;
+}
+
+sub main() {
+ my $dir = undef;
+
+ while ($_ = $ARGV[0]) {
+ shift @ARGV;
+ if ($_ eq "--verbose") { $verbose++; }
+ elsif (m/^-v+$/) { $verbose += length($_)-1; }
+ elsif ($_ eq "--name") { } # ignored, for compatibility
+ elsif ($_ eq "--spotlight") { $use_spotlight_p = 1; }
+ elsif ($_ eq "--no-spotlight") { $use_spotlight_p = 0; }
+ elsif ($_ eq "--cache") { $cache_p = 1; }
+ elsif ($_ eq "--no-cache") { $cache_p = 0; }
+ elsif (m/^-./) { usage; }
+ elsif (!defined($dir)) { $dir = $_; }
+ else { usage; }
+ }
+
+ usage unless (defined($dir));
+
+ $dir =~ s@^~/@$ENV{HOME}/@s; # allow literal "~/"
+ $dir =~ s@/+$@@s; # omit trailing /
+
+ if (! -d $dir) {
+ print STDERR "$progname: $dir: not a directory\n";
+ usage;
+ }
+
+ my $file = find_random_file ($dir);
+ print STDOUT "$file\n";
+}
+
+main;
+exit 0;
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild
index 57943911..830c4dd9 100755
--- a/source/xap/xscreensaver/xscreensaver.SlackBuild
+++ b/source/xap/xscreensaver/xscreensaver.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -106,6 +106,12 @@ cp -a \
README* \
$PKG/usr/doc/xscreensaver-$VERSION
+# Insert an older version of xscreensaver-getimage-file to avoid depending
+# on libwww-perl. Maybe we'll eventually add this, but bundling 14 perl
+# modules is a lot of maintainance just to get slidescreen working again.
+# This restores the functionality that we had before without all that.
+cat $CWD/xscreensaver-getimage-file-5.14 > $PKG/usr/bin/xscreensaver-getimage-file
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc