summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--extra/source/xf86-video-fbdev/slack-desc (renamed from source/x/x11/slack-desc/xf86-input-summa)22
-rw-r--r--source/a/isapnptools/slack-desc (renamed from source/x/x11/slack-desc/rstart)22
-rw-r--r--source/a/kernel-firmware/slack-desc (renamed from source/x/x11/slack-desc/xf86-input-ur98)22
-rw-r--r--source/a/udisks2/slack-desc (renamed from source/x/x11/slack-desc/scripts)22
-rw-r--r--source/ap/soma/slack-desc (renamed from source/x/x11/slack-desc/xfwp)22
-rw-r--r--source/kde/slack-desc/ark (renamed from source/x/x11/slack-desc/xrx)22
-rw-r--r--source/kde/slack-desc/kde-base-artwork (renamed from source/x/x11/slack-desc/xorg-server-xdmx)22
-rw-r--r--source/kde/slack-desc/kdevelop-pg-qt (renamed from source/x/x11/slack-desc/windowswmproto)22
-rw-r--r--source/kde/slack-desc/kmag (renamed from source/xap/xfce/slack-desc)22
-rw-r--r--source/kde/slack-desc/konsole (renamed from source/x/x11/slack-desc/x11-lib)24
-rw-r--r--source/kde/slack-desc/kwallet (renamed from source/x/x11/slack-desc/x11-doc)24
-rw-r--r--source/kde/slack-desc/libkdeedu (renamed from source/x/x11/slack-desc/x11-proto)22
-rw-r--r--source/kde/slack-desc/prison (renamed from source/x/x11/slack-desc/x11-app)24
-rw-r--r--source/l/gnome-keyring/slack-desc (renamed from source/x/x11/slack-desc/xf86rushproto)22
-rw-r--r--source/l/keyutils/slack-desc (renamed from source/x/x11/slack-desc/libxkbui)22
-rw-r--r--source/l/libgnome-keyring/slack-desc (renamed from source/x/x11/slack-desc/xf86-video-cyrix)22
-rw-r--r--source/l/libsoup/slack-desc (renamed from source/x/x11/slack-desc/liboldX)22
-rw-r--r--source/l/libtasn1/slack-desc (renamed from source/x/x11/slack-desc/lbxproxy)24
-rwxr-xr-xsource/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild (renamed from source/x/radeon_ucode/radeon_ucode.SlackBuild)44
-rw-r--r--source/n/ModemManager/slack-desc (renamed from source/x/radeon_ucode/slack-desc)22
-rwxr-xr-xsource/x/fontconfig/fontconfig.SlackBuild1
-rw-r--r--source/x/fontconfig/fontconfig.dejavu.diff103
-rw-r--r--source/x/freeglut/RATIONALE14
-rwxr-xr-xsource/x/freeglut/freeglut.SlackBuild97
-rw-r--r--source/x/freeglut/slack-desc19
-rwxr-xr-xsource/x/libdrm/libdrm.SlackBuild4
-rw-r--r--source/x/libdrm/libdrm.uint32_t.diff11
-rwxr-xr-xsource/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild6
-rwxr-xr-xsource/x/libhangul/libhangul.SlackBuild34
-rw-r--r--source/x/libhangul/slack-desc2
-rwxr-xr-xsource/x/mesa/get-mesa.sh2
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild34
-rw-r--r--source/x/mesa/patches/i915_fragment_shader_disable.patch26
-rw-r--r--source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch89
-rwxr-xr-xsource/x/mtdev/mtdev.SlackBuild (renamed from source/kde/kdepim-runtime/kdepim-runtime.SlackBuild)96
-rw-r--r--source/x/mtdev/mtdev.url1
-rw-r--r--source/x/mtdev/slack-desc19
-rw-r--r--source/x/radeon_ucode/ucode-20110302/LICENSE.radeon51
-rwxr-xr-xsource/x/scim-anthy/scim-anthy.SlackBuild32
-rwxr-xr-xsource/x/scim-bridge/scim-bridge.SlackBuild31
-rwxr-xr-xsource/x/scim-hangul/scim-hangul.SlackBuild35
-rw-r--r--source/x/scim-hangul/scim-hangul.gcc47.diff11
-rwxr-xr-xsource/x/scim-input-pad/scim-input-pad.SlackBuild34
-rw-r--r--source/x/scim-input-pad/slack-desc2
-rwxr-xr-xsource/x/scim-m17n/scim-m17n.SlackBuild32
-rwxr-xr-xsource/x/scim-pinyin/scim-pinyin.SlackBuild34
-rwxr-xr-xsource/x/scim-tables/scim-tables.SlackBuild34
-rw-r--r--source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch11
-rwxr-xr-xsource/x/scim/scim.SlackBuild40
-rw-r--r--source/x/x11-skel/scripts/xwmconfig12
-rwxr-xr-xsource/x/x11-skel/x11-skel.SlackBuild6
-rw-r--r--source/x/x11/build/libXaw3d (renamed from source/x/x11/build/libX11)0
-rw-r--r--source/x/x11/build/xcb-proto (renamed from source/x/x11/build/xf86-video-cirrus)0
-rw-r--r--source/x/x11/build/xdm (renamed from source/x/x11/build/xcompmgr)0
-rw-r--r--source/x/x11/build/xf86-input-wacom (renamed from source/x/x11/build/xf86-input-acecad)0
-rw-r--r--source/x/x11/build/xf86-video-apm (renamed from source/x/x11/build/xf86-input-penmount)0
-rw-r--r--source/x/x11/build/xf86-video-chips (renamed from source/x/x11/build/xf86-video-openchrome)0
-rw-r--r--source/x/x11/build/xf86-video-i7402
-rw-r--r--source/x/x11/build/xf86-video-mach641
-rw-r--r--source/x/x11/build/xf86-video-r1281
-rw-r--r--source/x/x11/build/xf86-video-s32
-rw-r--r--source/x/x11/build/xf86-video-s3virge1
-rw-r--r--source/x/x11/build/xf86-video-sisusb (renamed from source/x/x11/build/xf86-video-radeonhd)0
-rw-r--r--source/x/x11/build/xf86-video-tdfx1
-rw-r--r--source/x/x11/build/xf86-video-tga2
-rw-r--r--source/x/x11/build/xf86-video-tseng1
-rw-r--r--source/x/x11/build/xf86-video-v4l2
-rw-r--r--source/x/x11/build/xf86-video-vesa1
-rw-r--r--source/x/x11/build/xf86-video-voodoo1
-rw-r--r--source/x/x11/build/xf86-video-xgi1
-rw-r--r--source/x/x11/build/xorg-server1
-rw-r--r--source/x/x11/build/xpyb1
-rw-r--r--source/x/x11/configure/compiz2
-rw-r--r--source/x/x11/configure/libXaw3d16
-rw-r--r--source/x/x11/configure/xf86-video-ati21
-rw-r--r--source/x/x11/configure/xorg-server5
-rw-r--r--source/x/x11/doinst.sh/xdm15
-rw-r--r--source/x/x11/modularize52
-rw-r--r--source/x/x11/noarch5
-rw-r--r--source/x/x11/patch/xf86-video-chips.patch4
-rw-r--r--source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch588
-rw-r--r--source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch29
-rw-r--r--source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch50
-rw-r--r--source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch27
-rw-r--r--source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch283
-rw-r--r--source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch35
-rw-r--r--source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch51
-rw-r--r--source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch31
-rw-r--r--source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch25
-rw-r--r--source/x/x11/patch/xorg-server.patch2
-rw-r--r--source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff21
-rw-r--r--source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff11
-rw-r--r--source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff11
-rw-r--r--source/x/x11/post-install/lbxproxy.post-install5
-rw-r--r--[-rwxr-xr-x]source/x/x11/post-install/libXaw3d.post-install (renamed from source/n/rt61-firmware/rt61-firmware.SlackBuild)45
-rw-r--r--source/x/x11/post-install/proxymngr.post-install5
-rw-r--r--source/x/x11/post-install/rstart.post-install5
-rw-r--r--source/x/x11/post-install/util-macros.post-install2
-rw-r--r--source/x/x11/post-install/xcb-util.post-install8
-rw-r--r--source/x/x11/post-install/xdm.post-install35
-rw-r--r--source/x/x11/post-install/xf86-input-wacom.post-install5
-rw-r--r--source/x/x11/post-install/xf86-input-wacom/60-wacom.rules6
-rw-r--r--source/x/x11/slack-desc/appres10
-rw-r--r--source/x/x11/slack-desc/bdftopcf12
-rw-r--r--source/x/x11/slack-desc/beforelight12
-rw-r--r--source/x/x11/slack-desc/bigreqsproto2
-rw-r--r--source/x/x11/slack-desc/bitmap10
-rw-r--r--source/x/x11/slack-desc/compiz10
-rw-r--r--source/x/x11/slack-desc/compositeproto2
-rw-r--r--source/x/x11/slack-desc/damageproto2
-rw-r--r--source/x/x11/slack-desc/dmxproto2
-rw-r--r--source/x/x11/slack-desc/dri2proto2
-rw-r--r--source/x/x11/slack-desc/editres2
-rw-r--r--source/x/x11/slack-desc/encodings2
-rw-r--r--source/x/x11/slack-desc/evieext2
-rw-r--r--source/x/x11/slack-desc/fixesproto2
-rw-r--r--source/x/x11/slack-desc/font-adobe-100dpi2
-rw-r--r--source/x/x11/slack-desc/font-adobe-75dpi2
-rw-r--r--source/x/x11/slack-desc/font-adobe-utopia-100dpi2
-rw-r--r--source/x/x11/slack-desc/font-adobe-utopia-75dpi2
-rw-r--r--source/x/x11/slack-desc/font-adobe-utopia-type12
-rw-r--r--source/x/x11/slack-desc/font-alias2
-rw-r--r--source/x/x11/slack-desc/font-arabic-misc2
-rw-r--r--source/x/x11/slack-desc/font-bh-100dpi2
-rw-r--r--source/x/x11/slack-desc/font-bh-75dpi2
-rw-r--r--source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi2
-rw-r--r--source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi2
-rw-r--r--source/x/x11/slack-desc/font-bh-ttf2
-rw-r--r--source/x/x11/slack-desc/font-bh-type12
-rw-r--r--source/x/x11/slack-desc/font-bitstream-100dpi2
-rw-r--r--source/x/x11/slack-desc/font-bitstream-75dpi2
-rw-r--r--source/x/x11/slack-desc/font-bitstream-speedo2
-rw-r--r--source/x/x11/slack-desc/font-bitstream-type12
-rw-r--r--source/x/x11/slack-desc/font-cronyx-cyrillic2
-rw-r--r--source/x/x11/slack-desc/font-cursor-misc2
-rw-r--r--source/x/x11/slack-desc/font-daewoo-misc2
-rw-r--r--source/x/x11/slack-desc/font-dec-misc2
-rw-r--r--source/x/x11/slack-desc/font-ibm-type12
-rw-r--r--source/x/x11/slack-desc/font-isas-misc2
-rw-r--r--source/x/x11/slack-desc/font-jis-misc2
-rw-r--r--source/x/x11/slack-desc/font-micro-misc2
-rw-r--r--source/x/x11/slack-desc/font-misc-cyrillic2
-rw-r--r--source/x/x11/slack-desc/font-misc-ethiopic2
-rw-r--r--source/x/x11/slack-desc/font-misc-meltho2
-rw-r--r--source/x/x11/slack-desc/font-misc-misc2
-rw-r--r--source/x/x11/slack-desc/font-mutt-misc2
-rw-r--r--source/x/x11/slack-desc/font-schumacher-misc2
-rw-r--r--source/x/x11/slack-desc/font-screen-cyrillic2
-rw-r--r--source/x/x11/slack-desc/font-sony-misc2
-rw-r--r--source/x/x11/slack-desc/font-sun-misc2
-rw-r--r--source/x/x11/slack-desc/font-util2
-rw-r--r--source/x/x11/slack-desc/font-winitzki-cyrillic2
-rw-r--r--source/x/x11/slack-desc/font-xfree86-type12
-rw-r--r--source/x/x11/slack-desc/fontcacheproto2
-rw-r--r--source/x/x11/slack-desc/fontsproto2
-rw-r--r--source/x/x11/slack-desc/fonttosfnt2
-rw-r--r--source/x/x11/slack-desc/fslsfonts2
-rw-r--r--source/x/x11/slack-desc/fstobdf10
-rw-r--r--source/x/x11/slack-desc/gccmakedep2
-rw-r--r--source/x/x11/slack-desc/glproto2
-rw-r--r--source/x/x11/slack-desc/iceauth10
-rw-r--r--source/x/x11/slack-desc/ico10
-rw-r--r--source/x/x11/slack-desc/imake10
-rw-r--r--source/x/x11/slack-desc/inputproto2
-rw-r--r--source/x/x11/slack-desc/intel-gpu-tools20
-rw-r--r--source/x/x11/slack-desc/kbproto2
-rw-r--r--source/x/x11/slack-desc/libAppleWM19
-rw-r--r--source/x/x11/slack-desc/libFS2
-rw-r--r--source/x/x11/slack-desc/libICE2
-rw-r--r--source/x/x11/slack-desc/libSM2
-rw-r--r--source/x/x11/slack-desc/libWindowsWM19
-rw-r--r--source/x/x11/slack-desc/libX112
-rw-r--r--source/x/x11/slack-desc/libXScrnSaver2
-rw-r--r--source/x/x11/slack-desc/libXau12
-rw-r--r--source/x/x11/slack-desc/libXaw10
-rw-r--r--source/x/x11/slack-desc/libXaw3d19
-rw-r--r--source/x/x11/slack-desc/libXcm19
-rw-r--r--source/x/x11/slack-desc/libXcomposite2
-rw-r--r--source/x/x11/slack-desc/libXcursor2
-rw-r--r--source/x/x11/slack-desc/libXdamage2
-rw-r--r--source/x/x11/slack-desc/libXdmcp2
-rw-r--r--source/x/x11/slack-desc/libXevie2
-rw-r--r--source/x/x11/slack-desc/libXext2
-rw-r--r--source/x/x11/slack-desc/libXfixes2
-rw-r--r--source/x/x11/slack-desc/libXfont14
-rw-r--r--source/x/x11/slack-desc/libXfontcache2
-rw-r--r--source/x/x11/slack-desc/libXft2
-rw-r--r--source/x/x11/slack-desc/libXi2
-rw-r--r--source/x/x11/slack-desc/libXinerama2
-rw-r--r--source/x/x11/slack-desc/libXmu10
-rw-r--r--source/x/x11/slack-desc/libXp2
-rw-r--r--source/x/x11/slack-desc/libXpm2
-rw-r--r--source/x/x11/slack-desc/libXrandr2
-rw-r--r--source/x/x11/slack-desc/libXrender2
-rw-r--r--source/x/x11/slack-desc/libXres2
-rw-r--r--source/x/x11/slack-desc/libXt2
-rw-r--r--source/x/x11/slack-desc/libXtst2
-rw-r--r--source/x/x11/slack-desc/libXv2
-rw-r--r--source/x/x11/slack-desc/libXvMC2
-rw-r--r--source/x/x11/slack-desc/libXxf86dga2
-rw-r--r--source/x/x11/slack-desc/libXxf86misc2
-rw-r--r--source/x/x11/slack-desc/libXxf86vm2
-rw-r--r--source/x/x11/slack-desc/libdmx2
-rw-r--r--source/x/x11/slack-desc/libfontenc2
-rw-r--r--source/x/x11/slack-desc/liblbxutil19
-rw-r--r--source/x/x11/slack-desc/libpciaccess2
-rw-r--r--source/x/x11/slack-desc/libpthread-stubs12
-rw-r--r--source/x/x11/slack-desc/libxkbfile2
-rw-r--r--source/x/x11/slack-desc/listres10
-rw-r--r--source/x/x11/slack-desc/lndir2
-rw-r--r--source/x/x11/slack-desc/luit10
-rw-r--r--source/x/x11/slack-desc/makedepend2
-rw-r--r--source/x/x11/slack-desc/mkcomposecache2
-rw-r--r--source/x/x11/slack-desc/mkfontdir10
-rw-r--r--source/x/x11/slack-desc/mkfontscale10
-rw-r--r--source/x/x11/slack-desc/oclock10
-rw-r--r--source/x/x11/slack-desc/pixman2
-rw-r--r--source/x/x11/slack-desc/printproto10
-rw-r--r--source/x/x11/slack-desc/randrproto10
-rw-r--r--source/x/x11/slack-desc/recordproto2
-rw-r--r--source/x/x11/slack-desc/rendercheck10
-rw-r--r--source/x/x11/slack-desc/renderproto2
-rw-r--r--source/x/x11/slack-desc/resourceproto2
-rw-r--r--source/x/x11/slack-desc/rgb2
-rw-r--r--source/x/x11/slack-desc/scrnsaverproto2
-rw-r--r--source/x/x11/slack-desc/sessreg10
-rw-r--r--source/x/x11/slack-desc/setxkbmap2
-rw-r--r--source/x/x11/slack-desc/showfont10
-rw-r--r--source/x/x11/slack-desc/smproxy10
-rw-r--r--source/x/x11/slack-desc/transset (renamed from source/x/x11/slack-desc/constype)22
-rw-r--r--source/x/x11/slack-desc/trapproto19
-rw-r--r--source/x/x11/slack-desc/twm2
-rw-r--r--source/x/x11/slack-desc/util-macros10
-rw-r--r--source/x/x11/slack-desc/videoproto2
-rw-r--r--source/x/x11/slack-desc/viewres2
-rw-r--r--source/x/x11/slack-desc/x11-data19
-rw-r--r--source/x/x11/slack-desc/x11-font19
-rw-r--r--source/x/x11/slack-desc/x11-util19
-rw-r--r--source/x/x11/slack-desc/x11perf2
-rw-r--r--source/x/x11/slack-desc/xauth10
-rw-r--r--source/x/x11/slack-desc/xbacklight12
-rw-r--r--source/x/x11/slack-desc/xbiff10
-rw-r--r--source/x/x11/slack-desc/xbitmaps2
-rw-r--r--source/x/x11/slack-desc/xcalc10
-rw-r--r--source/x/x11/slack-desc/xcb-proto12
-rw-r--r--source/x/x11/slack-desc/xcb-util4
-rw-r--r--source/x/x11/slack-desc/xcb-util-image (renamed from source/x/x11/slack-desc/xf86-input-dmc)22
-rw-r--r--source/x/x11/slack-desc/xcb-util-keysyms (renamed from source/x/x11/slack-desc/libXprintAppUtil)22
-rw-r--r--source/x/x11/slack-desc/xcb-util-renderutil (renamed from source/x/x11/slack-desc/xprehashprinterlist)22
-rw-r--r--source/x/x11/slack-desc/xcb-util-wm (renamed from source/x/x11/slack-desc/xsetpointer)22
-rw-r--r--source/x/x11/slack-desc/xclipboard10
-rw-r--r--source/x/x11/slack-desc/xclock10
-rw-r--r--source/x/x11/slack-desc/xcmiscproto2
-rw-r--r--source/x/x11/slack-desc/xcmsdb10
-rw-r--r--source/x/x11/slack-desc/xcompmgr10
-rw-r--r--source/x/x11/slack-desc/xconsole10
-rw-r--r--source/x/x11/slack-desc/xcursor-themes10
-rw-r--r--source/x/x11/slack-desc/xcursorgen2
-rw-r--r--source/x/x11/slack-desc/xdbedizzy10
-rw-r--r--source/x/x11/slack-desc/xditview2
-rw-r--r--source/x/x11/slack-desc/xdm2
-rw-r--r--source/x/x11/slack-desc/xdpyinfo2
-rw-r--r--source/x/x11/slack-desc/xdriinfo2
-rw-r--r--source/x/x11/slack-desc/xedit2
-rw-r--r--source/x/x11/slack-desc/xev16
-rw-r--r--source/x/x11/slack-desc/xextproto2
-rw-r--r--source/x/x11/slack-desc/xeyes2
-rw-r--r--source/x/x11/slack-desc/xf86-input-acecad2
-rw-r--r--source/x/x11/slack-desc/xf86-input-aiptek2
-rw-r--r--source/x/x11/slack-desc/xf86-input-calcomp19
-rw-r--r--source/x/x11/slack-desc/xf86-input-citron19
-rw-r--r--source/x/x11/slack-desc/xf86-input-dynapro19
-rw-r--r--source/x/x11/slack-desc/xf86-input-elo230019
-rw-r--r--source/x/x11/slack-desc/xf86-input-elographics19
-rw-r--r--source/x/x11/slack-desc/xf86-input-evdev2
-rw-r--r--source/x/x11/slack-desc/xf86-input-joystick2
-rw-r--r--source/x/x11/slack-desc/xf86-input-keyboard10
-rw-r--r--source/x/x11/slack-desc/xf86-input-magellan19
-rw-r--r--source/x/x11/slack-desc/xf86-input-magictouch19
-rw-r--r--source/x/x11/slack-desc/xf86-input-microtouch19
-rw-r--r--source/x/x11/slack-desc/xf86-input-mouse10
-rw-r--r--source/x/x11/slack-desc/xf86-input-mutouch19
-rw-r--r--source/x/x11/slack-desc/xf86-input-palmax19
-rw-r--r--source/x/x11/slack-desc/xf86-input-penmount2
-rw-r--r--source/x/x11/slack-desc/xf86-input-spaceorb19
-rw-r--r--source/x/x11/slack-desc/xf86-input-synaptics2
-rw-r--r--source/x/x11/slack-desc/xf86-input-tek495719
-rw-r--r--source/x/x11/slack-desc/xf86-input-vmmouse2
-rw-r--r--source/x/x11/slack-desc/xf86-input-void2
-rw-r--r--source/x/x11/slack-desc/xf86-input-wacom12
-rw-r--r--source/x/x11/slack-desc/xf86-video-apm2
-rw-r--r--source/x/x11/slack-desc/xf86-video-ark2
-rw-r--r--source/x/x11/slack-desc/xf86-video-ast2
-rw-r--r--source/x/x11/slack-desc/xf86-video-ati2
-rw-r--r--source/x/x11/slack-desc/xf86-video-chips2
-rw-r--r--source/x/x11/slack-desc/xf86-video-cirrus2
-rw-r--r--source/x/x11/slack-desc/xf86-video-dummy2
-rw-r--r--source/x/x11/slack-desc/xf86-video-fbdev10
-rw-r--r--source/x/x11/slack-desc/xf86-video-geode2
-rw-r--r--source/x/x11/slack-desc/xf86-video-glint2
-rw-r--r--source/x/x11/slack-desc/xf86-video-i1282
-rw-r--r--source/x/x11/slack-desc/xf86-video-i7402
-rw-r--r--source/x/x11/slack-desc/xf86-video-intel2
-rw-r--r--source/x/x11/slack-desc/xf86-video-mach642
-rw-r--r--source/x/x11/slack-desc/xf86-video-mga2
-rw-r--r--source/x/x11/slack-desc/xf86-video-modesetting (renamed from source/x/x11/slack-desc/xf86-input-digitaledge)22
-rw-r--r--source/x/x11/slack-desc/xf86-video-neomagic2
-rw-r--r--source/x/x11/slack-desc/xf86-video-newport19
-rw-r--r--source/x/x11/slack-desc/xf86-video-nouveau2
-rw-r--r--source/x/x11/slack-desc/xf86-video-nv2
-rw-r--r--source/x/x11/slack-desc/xf86-video-openchrome2
-rw-r--r--source/x/x11/slack-desc/xf86-video-qxl (renamed from source/n/rt71w-firmware/slack-desc)22
-rw-r--r--source/x/x11/slack-desc/xf86-video-r1282
-rw-r--r--source/x/x11/slack-desc/xf86-video-radeonhd19
-rw-r--r--source/x/x11/slack-desc/xf86-video-rendition2
-rw-r--r--source/x/x11/slack-desc/xf86-video-s32
-rw-r--r--source/x/x11/slack-desc/xf86-video-s3virge2
-rw-r--r--source/x/x11/slack-desc/xf86-video-savage2
-rw-r--r--source/x/x11/slack-desc/xf86-video-siliconmotion2
-rw-r--r--source/x/x11/slack-desc/xf86-video-sis2
-rw-r--r--source/x/x11/slack-desc/xf86-video-sisusb2
-rw-r--r--source/x/x11/slack-desc/xf86-video-sunbw219
-rw-r--r--source/x/x11/slack-desc/xf86-video-suncg1419
-rw-r--r--source/x/x11/slack-desc/xf86-video-suncg319
-rw-r--r--source/x/x11/slack-desc/xf86-video-suncg619
-rw-r--r--source/x/x11/slack-desc/xf86-video-sunffb19
-rw-r--r--source/x/x11/slack-desc/xf86-video-sunleo19
-rw-r--r--source/x/x11/slack-desc/xf86-video-suntcx19
-rw-r--r--source/x/x11/slack-desc/xf86-video-tdfx2
-rw-r--r--source/x/x11/slack-desc/xf86-video-tga2
-rw-r--r--source/x/x11/slack-desc/xf86-video-trident2
-rw-r--r--source/x/x11/slack-desc/xf86-video-tseng2
-rw-r--r--source/x/x11/slack-desc/xf86-video-v4l2
-rw-r--r--source/x/x11/slack-desc/xf86-video-vermilion19
-rw-r--r--source/x/x11/slack-desc/xf86-video-vesa2
-rw-r--r--source/x/x11/slack-desc/xf86-video-via19
-rw-r--r--source/x/x11/slack-desc/xf86-video-vmware2
-rw-r--r--source/x/x11/slack-desc/xf86-video-voodoo2
-rw-r--r--source/x/x11/slack-desc/xf86-video-wsfb19
-rw-r--r--source/x/x11/slack-desc/xf86-video-xgi2
-rw-r--r--source/x/x11/slack-desc/xf86-video-xgixp19
-rw-r--r--source/x/x11/slack-desc/xf86bigfontproto2
-rw-r--r--source/x/x11/slack-desc/xf86dga2
-rw-r--r--source/x/x11/slack-desc/xf86dgaproto10
-rw-r--r--source/x/x11/slack-desc/xf86driproto2
-rw-r--r--source/x/x11/slack-desc/xf86miscproto10
-rw-r--r--source/x/x11/slack-desc/xf86vidmodeproto2
-rw-r--r--source/x/x11/slack-desc/xfd10
-rw-r--r--source/x/x11/slack-desc/xfindproxy19
-rw-r--r--source/x/x11/slack-desc/xfontsel10
-rw-r--r--source/x/x11/slack-desc/xfs2
-rw-r--r--source/x/x11/slack-desc/xfsinfo12
-rw-r--r--source/x/x11/slack-desc/xgamma10
-rw-r--r--source/x/x11/slack-desc/xgc10
-rw-r--r--source/x/x11/slack-desc/xhost10
-rw-r--r--source/x/x11/slack-desc/xineramaproto2
-rw-r--r--source/x/x11/slack-desc/xinit10
-rw-r--r--source/x/x11/slack-desc/xinput8
-rw-r--r--source/x/x11/slack-desc/xkbcomp2
-rw-r--r--source/x/x11/slack-desc/xkbdata19
-rw-r--r--source/x/x11/slack-desc/xkbevd2
-rw-r--r--source/x/x11/slack-desc/xkbprint10
-rw-r--r--source/x/x11/slack-desc/xkbutils10
-rw-r--r--source/x/x11/slack-desc/xkeyboard-config14
-rw-r--r--source/x/x11/slack-desc/xkill10
-rw-r--r--source/x/x11/slack-desc/xload2
-rw-r--r--source/x/x11/slack-desc/xlogo2
-rw-r--r--source/x/x11/slack-desc/xlsatoms2
-rw-r--r--source/x/x11/slack-desc/xlsclients10
-rw-r--r--source/x/x11/slack-desc/xlsfonts10
-rw-r--r--source/x/x11/slack-desc/xmag10
-rw-r--r--source/x/x11/slack-desc/xman2
-rw-r--r--source/x/x11/slack-desc/xmessage10
-rw-r--r--source/x/x11/slack-desc/xmh10
-rw-r--r--source/x/x11/slack-desc/xmodmap10
-rw-r--r--source/x/x11/slack-desc/xmore2
-rw-r--r--source/x/x11/slack-desc/xorg-cf-files12
-rw-r--r--source/x/x11/slack-desc/xorg-docs10
-rw-r--r--source/x/x11/slack-desc/xorg-sgml-doctools14
-rw-r--r--source/x/x11/slack-desc/xphelloworld19
-rw-r--r--source/x/x11/slack-desc/xpr10
-rw-r--r--source/x/x11/slack-desc/xprop2
-rw-r--r--source/x/x11/slack-desc/xproto2
-rw-r--r--source/x/x11/slack-desc/xproxymanagementprotocol19
-rw-r--r--source/x/x11/slack-desc/xpyb12
-rw-r--r--source/x/x11/slack-desc/xrandr10
-rw-r--r--source/x/x11/slack-desc/xrdb2
-rw-r--r--source/x/x11/slack-desc/xrefresh2
-rw-r--r--source/x/x11/slack-desc/xscope2
-rw-r--r--source/x/x11/slack-desc/xset10
-rw-r--r--source/x/x11/slack-desc/xsetmode19
-rw-r--r--source/x/x11/slack-desc/xsetroot2
-rw-r--r--source/x/x11/slack-desc/xsm2
-rw-r--r--source/x/x11/slack-desc/xstdcmap12
-rw-r--r--source/x/x11/slack-desc/xtrans10
-rw-r--r--source/x/x11/slack-desc/xvidtune10
-rw-r--r--source/x/x11/slack-desc/xvinfo10
-rw-r--r--source/x/x11/slack-desc/xwd2
-rw-r--r--source/x/x11/slack-desc/xwininfo10
-rw-r--r--source/x/x11/slack-desc/xwud10
-rwxr-xr-xsource/x/x11/src/get-xf86-video-nouveau.sh10
-rwxr-xr-xsource/x/xaw3d/pull-xaw3d.sh7
-rw-r--r--source/x/xaw3d/slack-desc19
-rwxr-xr-xsource/x/xaw3d/xaw3d.SlackBuild92
-rwxr-xr-xsource/x/xdg-user-dirs/xdg-user-dirs.SlackBuild10
-rw-r--r--source/x/xterm/doinst.sh (renamed from source/xap/xfce4-power-manager/doinst.sh)0
-rwxr-xr-xsource/x/xterm/xterm.SlackBuild8
-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.SlackBuild109
-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/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
-rwxr-xr-xsource/xap/xfce/xfce.SlackBuild248
-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
-rwxr-xr-xsource/xfce/Terminal/Terminal.SlackBuild120
-rw-r--r--source/xfce/Terminal/slack-desc (renamed from source/x/x11/slack-desc/libXTrap)22
-rwxr-xr-xsource/xfce/Thunar/Thunar.SlackBuild135
-rw-r--r--source/xfce/Thunar/slack-desc19
-rwxr-xr-xsource/xfce/exo/exo.SlackBuild135
-rw-r--r--source/xfce/exo/slack-desc (renamed from source/l/wv2/slack-desc)22
-rwxr-xr-xsource/xfce/garcon/garcon.SlackBuild135
-rw-r--r--source/xfce/garcon/slack-desc19
-rwxr-xr-xsource/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild135
-rw-r--r--source/xfce/gtk-xfce-engine/slack-desc (renamed from source/x/x11/slack-desc/xf86-input-fpit)22
-rwxr-xr-xsource/xfce/libxfce4ui/libxfce4ui.SlackBuild140
-rw-r--r--source/xfce/libxfce4ui/slack-desc (renamed from source/x/x11/slack-desc/x11-driver)22
-rwxr-xr-xsource/xfce/libxfce4util/libxfce4util.SlackBuild135
-rw-r--r--source/xfce/libxfce4util/slack-desc (renamed from source/x/x11/slack-desc/xplsprinters)22
-rwxr-xr-xsource/xfce/libxfcegui4/libxfcegui4.SlackBuild135
-rw-r--r--source/xfce/libxfcegui4/slack-desc (renamed from source/kde/polkit-kde-1/slack-desc)23
-rwxr-xr-xsource/xfce/orage/orage.SlackBuild121
-rw-r--r--source/xfce/orage/slack-desc (renamed from source/x/x11/slack-desc/xtrap)22
-rw-r--r--source/xfce/thunar-volman/slack-desc (renamed from source/xap/thunar-volman/slack-desc)6
-rwxr-xr-xsource/xfce/thunar-volman/thunar-volman.SlackBuild (renamed from source/xap/thunar-volman/thunar-volman.SlackBuild)51
-rw-r--r--source/xfce/tumbler/slack-desc19
-rwxr-xr-xsource/xfce/tumbler/tumbler.SlackBuild135
-rwxr-xr-xsource/xfce/xfce-build-all.sh72
-rw-r--r--source/xfce/xfce4-appfinder/slack-desc19
-rwxr-xr-xsource/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild135
-rw-r--r--source/xfce/xfce4-clipman-plugin/doinst.sh10
-rw-r--r--source/xfce/xfce4-clipman-plugin/slack-desc19
-rwxr-xr-xsource/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild108
-rw-r--r--source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url1
-rw-r--r--source/xfce/xfce4-dev-tools/slack-desc (renamed from source/x/x11/slack-desc/xf86-video-i810)22
-rwxr-xr-xsource/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild135
-rw-r--r--source/xfce/xfce4-mixer/doinst.sh14
-rw-r--r--source/xfce/xfce4-mixer/slack-desc19
-rwxr-xr-xsource/xfce/xfce4-mixer/xfce4-mixer.SlackBuild106
-rw-r--r--source/xfce/xfce4-notifyd/doinst.sh (renamed from source/xap/xfce4-notifyd/doinst.sh)0
-rw-r--r--source/xfce/xfce4-notifyd/slack-desc (renamed from source/xap/xfce4-notifyd/slack-desc)0
-rwxr-xr-xsource/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild (renamed from source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild)26
-rw-r--r--source/xfce/xfce4-panel/slack-desc19
-rwxr-xr-xsource/xfce/xfce4-panel/xfce4-panel.SlackBuild135
-rw-r--r--source/xfce/xfce4-power-manager/doinst.sh10
-rw-r--r--source/xfce/xfce4-power-manager/slack-desc (renamed from source/xap/xfce4-power-manager/slack-desc)4
-rwxr-xr-xsource/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild (renamed from source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild)33
-rw-r--r--source/xfce/xfce4-screenshooter/doinst.sh10
-rw-r--r--source/xfce/xfce4-screenshooter/slack-desc (renamed from source/x/x11/slack-desc/xf86-input-hyperpen)22
-rwxr-xr-xsource/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild130
-rw-r--r--source/xfce/xfce4-screenshooter/xfce4-screenshooter.url1
-rw-r--r--source/xfce/xfce4-session/slack-desc (renamed from source/x/x11/slack-desc/libXprintUtil)22
-rwxr-xr-xsource/xfce/xfce4-session/xfce4-session.SlackBuild138
-rw-r--r--source/xfce/xfce4-settings/slack-desc (renamed from source/x/x11/slack-desc/xf86-video-nsc)22
-rwxr-xr-xsource/xfce/xfce4-settings/xfce4-settings.SlackBuild140
-rw-r--r--source/xfce/xfce4-settings/xfce4-settings.theme.diff12
-rw-r--r--source/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff23
-rw-r--r--source/xfce/xfce4-systemload-plugin/slack-desc19
-rwxr-xr-xsource/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild106
-rw-r--r--source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url1
-rw-r--r--source/xfce/xfce4-taskmanager/doinst.sh4
-rw-r--r--source/xfce/xfce4-taskmanager/slack-desc (renamed from source/x/x11/slack-desc/xf86-video-impact)22
-rwxr-xr-xsource/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild105
-rw-r--r--source/xfce/xfce4-taskmanager/xfce4-taskmanager.url1
-rw-r--r--source/xfce/xfce4-volumed/slack-desc19
-rwxr-xr-xsource/xfce/xfce4-volumed/xfce4-volumed.SlackBuild106
-rw-r--r--source/xfce/xfce4-weather-plugin/slack-desc (renamed from source/x/x11/slack-desc/xf86-input-jamstudio)22
-rwxr-xr-xsource/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild106
-rw-r--r--source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url1
-rw-r--r--source/xfce/xfconf/slack-desc19
-rwxr-xr-xsource/xfce/xfconf/xfconf.SlackBuild135
-rw-r--r--source/xfce/xfdesktop/slack-desc (renamed from source/x/x11/slack-desc/proxymngr)22
-rwxr-xr-xsource/xfce/xfdesktop/xfdesktop.SlackBuild135
-rw-r--r--source/xfce/xfwm4-themes/slack-desc (renamed from source/x/x11/slack-desc/applewmproto)22
-rwxr-xr-xsource/xfce/xfwm4-themes/xfwm4-themes.SlackBuild135
-rw-r--r--source/xfce/xfwm4/slack-desc19
-rwxr-xr-xsource/xfce/xfwm4/xfwm4.SlackBuild139
-rw-r--r--source/xfce/xfwm4/xinitrc.xfce40
-rw-r--r--testing/source/xf86-video-ati/slack-desc (renamed from source/x/x11/slack-desc/xf86-video-vga)22
-rw-r--r--testing/source/xf86-video-intel/slack-desc (renamed from source/x/x11/slack-desc/xf86-video-imstt)22
571 files changed, 8521 insertions, 4847 deletions
diff --git a/source/x/x11/slack-desc/xf86-input-summa b/extra/source/xf86-video-fbdev/slack-desc
index c69177bce..08a636a11 100644
--- a/source/x/x11/slack-desc/xf86-input-summa
+++ b/extra/source/xf86-video-fbdev/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-summa: xf86-input-summa
-xf86-input-summa:
-xf86-input-summa: xf86-input-summa is part of X11.
-xf86-input-summa:
-xf86-input-summa: For more information about the X.Org Foundation (the providers of the
-xf86-input-summa: X.Org implementation of the X Window System), see their website:
-xf86-input-summa:
-xf86-input-summa: http://www.x.org
-xf86-input-summa:
-xf86-input-summa:
-xf86-input-summa:
+xf86-video-fbdev: xf86-video-fbdev (X.Org generic framebuffer video driver)
+xf86-video-fbdev:
+xf86-video-fbdev: xf86-video-fbdev is the generic framebuffer video driver for X.Org,
+xf86-video-fbdev: designed to draw into a video framebuffer provided by the
+xf86-video-fbdev: underlying operating system.
+xf86-video-fbdev:
+xf86-video-fbdev:
+xf86-video-fbdev:
+xf86-video-fbdev:
+xf86-video-fbdev:
+xf86-video-fbdev:
diff --git a/source/x/x11/slack-desc/rstart b/source/a/isapnptools/slack-desc
index e009e289f..8646def6e 100644
--- a/source/x/x11/slack-desc/rstart
+++ b/source/a/isapnptools/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-rstart: rstart
-rstart:
-rstart: rstart is part of X11.
-rstart:
-rstart: For more information about the X.Org Foundation (the providers of the
-rstart: X.Org implementation of the X Window System), see their website:
-rstart:
-rstart: http://www.x.org
-rstart:
-rstart:
-rstart:
+isapnptools: isapnptools (ISA Plug-And-Play tools)
+isapnptools:
+isapnptools: These programs allow ISA Plug-And-Play devices to be configured
+isapnptools: on a Linux machine.
+isapnptools:
+isapnptools:
+isapnptools:
+isapnptools:
+isapnptools:
+isapnptools:
+isapnptools:
diff --git a/source/x/x11/slack-desc/xf86-input-ur98 b/source/a/kernel-firmware/slack-desc
index 66680d8cd..5231a4267 100644
--- a/source/x/x11/slack-desc/xf86-input-ur98
+++ b/source/a/kernel-firmware/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-ur98: xf86-input-ur98
-xf86-input-ur98:
-xf86-input-ur98: xf86-input-ur98 is part of X11.
-xf86-input-ur98:
-xf86-input-ur98: For more information about the X.Org Foundation (the providers of the
-xf86-input-ur98: X.Org implementation of the X Window System), see their website:
-xf86-input-ur98:
-xf86-input-ur98: http://www.x.org
-xf86-input-ur98:
-xf86-input-ur98:
-xf86-input-ur98:
+kernel-firmware: kernel-firmware (Firmware for the kernel)
+kernel-firmware:
+kernel-firmware: These are firmware files for the Linux kernel.
+kernel-firmware:
+kernel-firmware: You'll need these to use certain hardware drivers with Linux.
+kernel-firmware:
+kernel-firmware: Upstream site:
+kernel-firmware:
+kernel-firmware: git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
+kernel-firmware:
+kernel-firmware:
diff --git a/source/x/x11/slack-desc/scripts b/source/a/udisks2/slack-desc
index 549159b27..0d6d44272 100644
--- a/source/x/x11/slack-desc/scripts
+++ b/source/a/udisks2/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-scripts: scripts
-scripts:
-scripts: scripts is part of X11.
-scripts:
-scripts: For more information about the X.Org Foundation (the providers of the
-scripts: X.Org implementation of the X Window System), see their website:
-scripts:
-scripts: http://www.x.org
-scripts:
-scripts:
-scripts:
+udisks2: udisks2 (storage device daemon v2)
+udisks2:
+udisks2: The udisks project provides a storage daemon that implements D-Bus
+udisks2: interfaces that can be used to query and manipulate storage devices.
+udisks2:
+udisks2: It also includes a command-line tool, udisks(1), that can be used to
+udisks2: query and control the daemon.
+udisks2:
+udisks2: Homepage: http://www.freedesktop.org/wiki/Software/udisks
+udisks2:
+udisks2:
diff --git a/source/x/x11/slack-desc/xfwp b/source/ap/soma/slack-desc
index 572036c67..bc1725a6c 100644
--- a/source/x/x11/slack-desc/xfwp
+++ b/source/ap/soma/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xfwp: xfwp
-xfwp:
-xfwp: xfwp is part of X11.
-xfwp:
-xfwp: For more information about the X.Org Foundation (the providers of the
-xfwp: X.Org implementation of the X Window System), see their website:
-xfwp:
-xfwp: http://www.x.org
-xfwp:
-xfwp:
-xfwp:
+soma: Soma - a command line/dialog internet radio player
+soma:
+soma: Soma is a frontend for mplayer to play radio playlists pls,m3u and
+soma: ram. More will be added as it progresses.
+soma:
+soma: Homepage: http://www.dawoodfall.net/slackbuilds/noversion/soma
+soma:
+soma:
+soma:
+soma:
+soma:
diff --git a/source/x/x11/slack-desc/xrx b/source/kde/slack-desc/ark
index 3a6e369c8..93dd1c890 100644
--- a/source/x/x11/slack-desc/xrx
+++ b/source/kde/slack-desc/ark
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xrx: xrx
-xrx:
-xrx: xrx is part of X11.
-xrx:
-xrx: For more information about the X.Org Foundation (the providers of the
-xrx: X.Org implementation of the X Window System), see their website:
-xrx:
-xrx: http://www.x.org
-xrx:
-xrx:
-xrx:
+ark: ark (KDE archiver tool)
+ark:
+ark: This is KDE's application to work with compressed archives.
+ark:
+ark: Ark's home page is: http://kde.org
+ark:
+ark:
+ark:
+ark:
+ark:
+ark:
diff --git a/source/x/x11/slack-desc/xorg-server-xdmx b/source/kde/slack-desc/kde-base-artwork
index 0cfe5c8ff..f7df2d0fd 100644
--- a/source/x/x11/slack-desc/xorg-server-xdmx
+++ b/source/kde/slack-desc/kde-base-artwork
@@ -6,14 +6,14 @@
# leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xorg-server-xdmx: xorg-server-xdmx (Distributed Multi-head X server)
-xorg-server-xdmx:
-xorg-server-xdmx: Xdmx is a proxy X server that uses one or more other X servers as its
-xorg-server-xdmx: display devices. It provides multi-head X functionality for displays
-xorg-server-xdmx: that might be located on different machines.
-xorg-server-xdmx:
-xorg-server-xdmx:
-xorg-server-xdmx:
-xorg-server-xdmx:
-xorg-server-xdmx:
-xorg-server-xdmx:
+kde-base-artwork: kde-base-artwork (KDE themes artwork)
+kde-base-artwork:
+kde-base-artwork: This package contains KSplash themes and other artwork.
+kde-base-artwork:
+kde-base-artwork: For more information, visit: http://www.kde.org
+kde-base-artwork:
+kde-base-artwork:
+kde-base-artwork:
+kde-base-artwork:
+kde-base-artwork:
+kde-base-artwork:
diff --git a/source/x/x11/slack-desc/windowswmproto b/source/kde/slack-desc/kdevelop-pg-qt
index 38e977285..3b158dd2d 100644
--- a/source/x/x11/slack-desc/windowswmproto
+++ b/source/kde/slack-desc/kdevelop-pg-qt
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-windowswmproto: windowswmproto
-windowswmproto:
-windowswmproto: windowswmproto is part of X11.
-windowswmproto:
-windowswmproto: For more information about the X.Org Foundation (the providers of the
-windowswmproto: X.Org implementation of the X Window System), see their website:
-windowswmproto:
-windowswmproto: http://www.x.org
-windowswmproto:
-windowswmproto:
-windowswmproto:
+kdevelop-pg-qt: kdevelop-pg-qt (KDevelop Parser Generator)
+kdevelop-pg-qt:
+kdevelop-pg-qt: KDevelop Parser Generator used in the PHP language plugin and others.
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
+kdevelop-pg-qt:
diff --git a/source/xap/xfce/slack-desc b/source/kde/slack-desc/kmag
index ecedf0104..b05480285 100644
--- a/source/xap/xfce/slack-desc
+++ b/source/kde/slack-desc/kmag
@@ -6,14 +6,14 @@
# 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:
+kmag: kmag (Screen magnifier)
+kmag:
+kmag: Magnifies a part of your screen.
+kmag:
+kmag: For more information, visit: http://www.kde.org
+kmag:
+kmag:
+kmag:
+kmag:
+kmag:
+kmag:
diff --git a/source/x/x11/slack-desc/x11-lib b/source/kde/slack-desc/konsole
index 3090338c6..31cfa2c70 100644
--- a/source/x/x11/slack-desc/x11-lib
+++ b/source/kde/slack-desc/konsole
@@ -5,15 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler------------------------------------------------------|
-x11-lib: x11-lib (X11 libraries and header files)
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
-x11-lib:
+ |-----handy-ruler-----------------------------------------------------|
+konsole: konsole (KDE's terminal emulator)
+konsole:
+konsole: Konsole is KDE's terminal emulator.
+konsole:
+konsole: Homepage: http://kde.org
+konsole:
+konsole:
+konsole:
+konsole:
+konsole:
+konsole:
diff --git a/source/x/x11/slack-desc/x11-doc b/source/kde/slack-desc/kwallet
index 8ac7b8b9e..64fbcf43c 100644
--- a/source/x/x11/slack-desc/x11-doc
+++ b/source/kde/slack-desc/kwallet
@@ -1,19 +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
+# on the right side mkwallets 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------------------------------------------------------|
-x11-doc: x11-doc (documentation for X)
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
-x11-doc:
+kwallet: kwallet (KDE wallet manager)
+kwallet:
+kwallet: KDE Wallet Manager is a tool to manage your passwords under KDE.
+kwallet:
+kwallet: kwallet's home page is:
+kwallet: https://projects.kde.org/projects/kde/kdeutils
+kwallet:
+kwallet:
+kwallet:
+kwallet:
+kwallet:
diff --git a/source/x/x11/slack-desc/x11-proto b/source/kde/slack-desc/libkdeedu
index 1c1f97661..ab58c79c8 100644
--- a/source/x/x11/slack-desc/x11-proto
+++ b/source/kde/slack-desc/libkdeedu
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-x11-proto: x11-proto (files used for developing X)
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
-x11-proto:
+libkdeedu: libkdeedu (Educational applications)
+libkdeedu:
+libkdeedu: Educational applications for the KDE Software Compilation.
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
+libkdeedu:
diff --git a/source/x/x11/slack-desc/x11-app b/source/kde/slack-desc/prison
index 2667d321a..aa990092d 100644
--- a/source/x/x11/slack-desc/x11-app
+++ b/source/kde/slack-desc/prison
@@ -5,15 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler------------------------------------------------------|
-x11-app: x11-app (the traditional collection of basic X apps)
-x11-app:
-x11-app: These are the basic X programs that come with the X Window System.
-x11-app:
-x11-app:
-x11-app:
-x11-app:
-x11-app:
-x11-app:
-x11-app:
-x11-app:
+ |-----handy-ruler-----------------------------------------------------|
+prison: prison (Qt based Barcode API)
+prison:
+prison: Prison is a barcode API currently offering a Qt API to produce
+prison: QRCode barcodes and DotMatrix barcodes.
+prison:
+prison: git clone git://anongit.kde.org/prison
+prison:
+prison:
+prison:
+prison:
+prison:
diff --git a/source/x/x11/slack-desc/xf86rushproto b/source/l/gnome-keyring/slack-desc
index 0013da938..33e06ef94 100644
--- a/source/x/x11/slack-desc/xf86rushproto
+++ b/source/l/gnome-keyring/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86rushproto: xf86rushproto
-xf86rushproto:
-xf86rushproto: xf86rushproto is part of X11.
-xf86rushproto:
-xf86rushproto: For more information about the X.Org Foundation (the providers of the
-xf86rushproto: X.Org implementation of the X Window System), see their website:
-xf86rushproto:
-xf86rushproto: http://www.x.org
-xf86rushproto:
-xf86rushproto:
-xf86rushproto:
+gnome-keyring: GNOME Keyring (a tool to handle security credentials)
+gnome-keyring:
+gnome-keyring: GNOME Keyring is a program designed to take care of the user's
+gnome-keyring: security credentials, such as user names and passwords, in an
+gnome-keyring: easy to access manner. The keyring is implemented as a daemon
+gnome-keyring: and uses the process name gnome-keyring-daemon.
+gnome-keyring:
+gnome-keyring:
+gnome-keyring:
+gnome-keyring:
+gnome-keyring:
diff --git a/source/x/x11/slack-desc/libxkbui b/source/l/keyutils/slack-desc
index 332ad4144..2091c5548 100644
--- a/source/x/x11/slack-desc/libxkbui
+++ b/source/l/keyutils/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libxkbui: libxkbui
-libxkbui:
-libxkbui: libxkbui is part of X11.
-libxkbui:
-libxkbui: For more information about the X.Org Foundation (the providers of the
-libxkbui: X.Org implementation of the X Window System), see their website:
-libxkbui:
-libxkbui: http://www.x.org
-libxkbui:
-libxkbui:
-libxkbui:
+keyutils: keyutils (Kernel key management utilities)
+keyutils:
+keyutils: This package contains tools and a wrapper library to control the
+keyutils: Linux kernel key management facility and to provide a mechanism by
+keyutils: which the kernel can call back to user space to get a key
+keyutils: instantiated.
+keyutils:
+keyutils: Homepage: http://people.redhat.com/~dhowells/keyutils/
+keyutils:
+keyutils:
+keyutils:
diff --git a/source/x/x11/slack-desc/xf86-video-cyrix b/source/l/libgnome-keyring/slack-desc
index aebae0068..1d759e20c 100644
--- a/source/x/x11/slack-desc/xf86-video-cyrix
+++ b/source/l/libgnome-keyring/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-cyrix: xf86-video-cyrix
-xf86-video-cyrix:
-xf86-video-cyrix: xf86-video-cyrix is part of X11.
-xf86-video-cyrix:
-xf86-video-cyrix: For more information about the X.Org Foundation (the providers of the
-xf86-video-cyrix: X.Org implementation of the X Window System), see their website:
-xf86-video-cyrix:
-xf86-video-cyrix: http://www.x.org
-xf86-video-cyrix:
-xf86-video-cyrix:
-xf86-video-cyrix:
+libgnome-keyring: libgnome-keyring (gnome-keyring library)
+libgnome-keyring:
+libgnome-keyring: gnome-keyring is a program that keep password and other secrets
+libgnome-keyring: for users. The library libgnome-keyring is used by applications
+libgnome-keyring: to integrate with the gnome keyring system.
+libgnome-keyring:
+libgnome-keyring:
+libgnome-keyring:
+libgnome-keyring:
+libgnome-keyring:
+libgnome-keyring:
diff --git a/source/x/x11/slack-desc/liboldX b/source/l/libsoup/slack-desc
index d8e65ba42..80cd6ef03 100644
--- a/source/x/x11/slack-desc/liboldX
+++ b/source/l/libsoup/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-liboldX: liboldX
-liboldX:
-liboldX: liboldX is part of X11.
-liboldX:
-liboldX: For more information about the X.Org Foundation (the providers of the
-liboldX: X.Org implementation of the X Window System), see their website:
-liboldX:
-liboldX: http://www.x.org
-liboldX:
-liboldX:
-liboldX:
+libsoup: libsoup (an HTTP client/server library)
+libsoup:
+libsoup: Soup is an HTTP client/server library implementation in C. It uses
+libsoup: GObjects and the glib main loop to integrate well with GTK+
+libsoup: applications, and has a synchronous API suitable for use in threaded
+libsoup: applications.
+libsoup:
+libsoup:
+libsoup:
+libsoup:
+libsoup:
diff --git a/source/x/x11/slack-desc/lbxproxy b/source/l/libtasn1/slack-desc
index 578f938f4..da00dacb8 100644
--- a/source/x/x11/slack-desc/lbxproxy
+++ b/source/l/libtasn1/slack-desc
@@ -5,15 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler------------------------------------------------------|
-lbxproxy: lbxproxy
-lbxproxy:
-lbxproxy: lbxproxy is part of X11.
-lbxproxy:
-lbxproxy: For more information about the X.Org Foundation (the providers of the
-lbxproxy: X.Org implementation of the X Window System), see their website:
-lbxproxy:
-lbxproxy: http://www.x.org
-lbxproxy:
-lbxproxy:
-lbxproxy:
+ |-----handy-ruler-----------------------------------------------------|
+libtasn1: libtasn1 (ASN.1 library)
+libtasn1:
+libtasn1: Libtasn1 is the GNU ASN.1 library. Abstract Syntax Notation One
+libtasn1: (ASN.1) is a standard and flexible notation that describes rules and
+libtasn1: structures for representing, encoding, transmitting, and decoding
+libtasn1: data in telecommunications and computer networking.
+libtasn1:
+libtasn1: Libtasn1 was written by Fabio Fiorina.
+libtasn1:
+libtasn1:
+libtasn1:
diff --git a/source/x/radeon_ucode/radeon_ucode.SlackBuild b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild
index 7482b4cc6..e9ab1b542 100755
--- a/source/x/radeon_ucode/radeon_ucode.SlackBuild
+++ b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild
@@ -1,9 +1,8 @@
#!/bin/sh
-# Slackware build script for radeon_ucode
+# Slackware build script for sound-theme-freedesktop
-# Copyright 2010 Robby Workman, Northport, Alabama, USA
-# Copyright 2010, 2011 Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2010, 2011, 2012 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +22,8 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PKGNAM=radeon_ucode
-VERSION=20110302
+PKGNAM=sound-theme-freedesktop
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
ARCH=noarch
@@ -34,20 +33,41 @@ TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
rm -rf $PKG
-mkdir -p $PKG/lib/firmware/radeon $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a $CWD/ucode-$VERSION/* $PKG/lib/firmware/radeon
-mv $PKG/lib/firmware/radeon/LICENSE.radeon $PKG/usr/doc/$PKGNAM-$VERSION
-
-chown -R root:root $PKG
-find $PKG \
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 {} \;
+./configure \
+ --prefix=/usr \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --build=$ARCH-slackware-linux || exit 1
+
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING* 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:
+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
cd $PKG
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/x/radeon_ucode/slack-desc b/source/n/ModemManager/slack-desc
index 01810b94b..2455ad8ef 100644
--- a/source/x/radeon_ucode/slack-desc
+++ b/source/n/ModemManager/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-radeon_ucode: radeon_ucode (microcode/firmware for some Radeon graphics cards)
-radeon_ucode:
-radeon_ucode: radeon_ucode contains the microcode/firmware for some models of
-radeon_ucode: ATI/AMD Radeon graphics cards.
-radeon_ucode:
-radeon_ucode: http://people.freedesktop.org/~agd5f/radeon_ucode/
-radeon_ucode:
-radeon_ucode:
-radeon_ucode:
-radeon_ucode:
-radeon_ucode:
+ModemManager: ModemManager (mobile broadband modem API)
+ModemManager:
+ModemManager: ModemManager provides a unified high level API for communicating with
+ModemManager: mobile broadband modems.
+ModemManager:
+ModemManager:
+ModemManager:
+ModemManager:
+ModemManager: For more info, see:
+ModemManager: http://cgit.freedesktop.org/ModemManager/ModemManager/
+ModemManager:
diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild
index 5feb6fd90..bb3b192f5 100755
--- a/source/x/fontconfig/fontconfig.SlackBuild
+++ b/source/x/fontconfig/fontconfig.SlackBuild
@@ -87,6 +87,7 @@ CFLAGS=$SLKCFLAGS \
--mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
+ --enable-static=no \
--build=$ARCH-slackware-linux
# Uses a currently non-functional sgml tool, thus '-i':
diff --git a/source/x/fontconfig/fontconfig.dejavu.diff b/source/x/fontconfig/fontconfig.dejavu.diff
index af71a44bd..6edcfd37b 100644
--- a/source/x/fontconfig/fontconfig.dejavu.diff
+++ b/source/x/fontconfig/fontconfig.dejavu.diff
@@ -1,42 +1,5 @@
-diff -Nur fontconfig-2.8.0.orig/conf.d/45-latin.conf fontconfig-2.8.0/conf.d/45-latin.conf
---- fontconfig-2.8.0.orig/conf.d/45-latin.conf 2009-11-16 11:24:52.000000000 -0600
-+++ fontconfig-2.8.0/conf.d/45-latin.conf 2009-12-01 21:45:42.639936724 -0600
-@@ -10,9 +10,9 @@
- Serif faces
- -->
- <alias>
-- <family>Bitstream Vera Serif</family>
- <family>DejaVu Serif</family>
- <family>Liberation Serif</family>
-+ <family>Bitstream Vera Serif</family>
- <family>Times New Roman</family>
- <family>Times</family>
- <family>Nimbus Roman No9 L</family>
-@@ -25,9 +25,9 @@
- Sans-serif faces
- -->
- <alias>
-- <family>Bitstream Vera Sans</family>
- <family>DejaVu Sans</family>
- <family>Liberation Sans</family>
-+ <family>Bitstream Vera Sans</family>
- <family>Arial</family>
- <family>Helvetica</family>
- <family>Verdana</family>
-@@ -41,9 +41,9 @@
- Monospace faces
- -->
- <alias>
-- <family>Bitstream Vera Sans Mono</family>
- <family>DejaVu Sans Mono</family>
- <family>Liberation Mono</family>
-+ <family>Bitstream Vera Sans Mono</family>
- <family>Inconsolata</family>
- <family>Courier New</family>
- <family>Courier</family>
-diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60-latin.conf
---- fontconfig-2.8.0.orig/conf.d/60-latin.conf 2009-11-16 11:24:52.000000000 -0600
-+++ fontconfig-2.8.0/conf.d/60-latin.conf 2009-12-01 21:46:39.925935327 -0600
+--- ./conf.d/60-latin.conf.orig 2012-03-10 00:24:45.000000000 -0600
++++ ./conf.d/60-latin.conf 2012-07-03 15:57:40.109978298 -0500
@@ -4,8 +4,8 @@
<alias>
<family>serif</family>
@@ -67,3 +30,65 @@ diff -Nur fontconfig-2.8.0.orig/conf.d/60-latin.conf fontconfig-2.8.0/conf.d/60-
<family>Inconsolata</family>
<family>Andale Mono</family>
<family>Courier New</family>
+--- ./conf.d/45-latin.conf.orig 2012-03-10 00:24:45.000000000 -0600
++++ ./conf.d/45-latin.conf 2012-07-03 15:57:28.685978786 -0500
+@@ -10,15 +10,15 @@
+ Serif faces
+ -->
+ <alias>
+- <family>Bitstream Vera Serif</family>
++ <family>DejaVu Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
+- <family>DejaVu Serif</family>
++ <family>Liberation Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
+- <family>Liberation Serif</family>
++ <family>Bitstream Vera Serif</family>
+ <default><family>serif</family></default>
+ </alias>
+ <alias>
+@@ -49,15 +49,15 @@
+ Sans-serif faces
+ -->
+ <alias>
+- <family>Bitstream Vera Sans</family>
++ <family>DejaVu Sans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
+- <family>DejaVu Sans</family>
++ <family>Liberation Sans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
+- <family>Liberation Sans</family>
++ <family>Bitstream Vera Sans</family>
+ <default><family>sans-serif</family></default>
+ </alias>
+ <alias>
+@@ -91,10 +91,6 @@
+ <!--
+ Monospace faces
+ -->
+- <alias>
+- <family>Bitstream Vera Sans Mono</family>
+- <default><family>monospace</family></default>
+- </alias>
+ <alias>
+ <family>DejaVu Sans Mono</family>
+ <default><family>monospace</family></default>
+@@ -103,6 +99,10 @@
+ <family>Liberation Mono</family>
+ <default><family>monospace</family></default>
+ </alias>
++ <alias>
++ <family>Bitstream Vera Sans Mono</family>
++ <default><family>monospace</family></default>
++ </alias>
+ <alias>
+ <family>Inconsolata</family>
+ <default><family>monospace</family></default>
diff --git a/source/x/freeglut/RATIONALE b/source/x/freeglut/RATIONALE
new file mode 100644
index 000000000..0e2c59bad
--- /dev/null
+++ b/source/x/freeglut/RATIONALE
@@ -0,0 +1,14 @@
+From mesa-8.0 git log:
+
+ commit 34a28ccbf459ed5710aafba5e7149e8291cb808c
+ Author: José Fonseca <jose.r.fonseca@gmail.com>
+ Date: Sat Jul 9 11:07:14 2011 +0100
+
+ glut: Remove GLUT source.
+
+ Most distros ship freeglut, and most people don't care one vs the other,
+ and it hasn't been really maintained.
+
+ So it is better to have Mesa GLUT be revisioned and built separately
+ from Mesa.
+
diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild
new file mode 100755
index 000000000..e209f82e4
--- /dev/null
+++ b/source/x/freeglut/freeglut.SlackBuild
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# Slackware build script for freeglut
+
+# Copyright 2012 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=freeglut
+VERSION=${VERSION:-2.8.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+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"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1
+cd $PRGNAM-$VERSION
+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 \
+ --disable-static \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --build=$ARCH-slackware-linux || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+find $PKG -print0 | xargs -0 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/$PRGNAM-$VERSION/html
+cp -a \
+ AUTHORS COPYING* INSTALL NEWS README TODO \
+ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/*.{html,png} $PKG/usr/doc/$PRGNAM-$VERSION/html
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
+
+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/x/freeglut/slack-desc b/source/x/freeglut/slack-desc
new file mode 100644
index 000000000..9fcda6f5e
--- /dev/null
+++ b/source/x/freeglut/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 ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+freeglut: freeglut (alternative GLUT library)
+freeglut:
+freeglut: freeglut is a completely OpenSourced alternative to the OpenGL
+freeglut: Utility Toolkit (GLUT) library. GLUT (and hence freeglut) allows
+freeglut: the user to create and manage windows containing OpenGL contexts
+freeglut: on a wide range of platforms and also read the mouse, keyboard, and
+freeglut: joystick functions.
+freeglut:
+freeglut: Homepage: http://freeglut.sourceforge.net/
+freeglut:
+freeglut:
diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild
index fff398a10..31181fb5c 100755
--- a/source/x/libdrm/libdrm.SlackBuild
+++ b/source/x/libdrm/libdrm.SlackBuild
@@ -60,9 +60,6 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
cd ${PKGNAM}-$VERSION
-# Fix missing definitions in drm_mode.h:
-zcat $CWD/libdrm.uint32_t.diff.gz | patch -p1 --verbose || exit 1
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
@@ -79,6 +76,7 @@ CFLAGS="$SLKCFLAGS" \
--enable-udev \
--enable-nouveau-experimental-api \
--enable-vmwgfx-experimental-api \
+ --enable-omap-experimental-api \
--build=$ARCH-slackware-linux
# Build and install:
diff --git a/source/x/libdrm/libdrm.uint32_t.diff b/source/x/libdrm/libdrm.uint32_t.diff
deleted file mode 100644
index 571d72ac1..000000000
--- a/source/x/libdrm/libdrm.uint32_t.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/drm/drm_mode.h.orig 2010-01-21 12:45:40.000000000 -0600
-+++ ./include/drm/drm_mode.h 2010-02-22 13:16:36.000000000 -0600
-@@ -307,6 +307,8 @@
- #define DRM_MODE_PAGE_FLIP_EVENT 0x01
- #define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT
-
-+#include <stdint.h> /* needed for uint32_t and uint64_t typedefs */
-+
- struct drm_mode_crtc_page_flip {
- uint32_t crtc_id;
- uint32_t fb_id;
diff --git a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
index 9dcecac19..97a92cb40 100755
--- a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
+++ b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.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
@@ -21,9 +21,9 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=1.06.0.20100721
+VERSION=1.07.2
ARCH=noarch
-BUILD=3
+BUILD=1
CWD=$(pwd)
TMP=${TMP:-/tmp}
diff --git a/source/x/libhangul/libhangul.SlackBuild b/source/x/libhangul/libhangul.SlackBuild
index 92a9ed16f..9394cc074 100755
--- a/source/x/libhangul/libhangul.SlackBuild
+++ b/source/x/libhangul/libhangul.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
-# Copyright 2008, 2009 Eric Hameleers , Eindhoven, NL
-# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012 Eric Hameleers , Eindhoven, NL
+# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -32,23 +32,27 @@
#
# -----------------------------------------------------------------------------
+# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+
PKGNAM=libhangul
-VERSION=${VERSION:-0.0.12}
+VERSION=${VERSION:-0.1.0}
BUILD=${BUILD:-1}
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
# 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
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -58,11 +62,19 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
fi
+case "$ARCH" in
+ arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+ *) TARGET=$ARCH-slackware-linux ;;
+esac
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -93,7 +105,7 @@ CFLAGS="$SLKCFLAGS" \
--disable-static \
--program-prefix= \
--program-suffix= \
- --build=$ARCH-slackware-linux
+ --build=$TARGET
make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
@@ -129,5 +141,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/libhangul/slack-desc b/source/x/libhangul/slack-desc
index 8d76a7579..49b2eec1d 100644
--- a/source/x/libhangul/slack-desc
+++ b/source/x/libhangul/slack-desc
@@ -12,7 +12,7 @@ libhangul: This library implements Hangul keyboard input with various types of
libhangul: Korean keyboards. It is intended to be a base library of Korean
libhangul: input methods on multiple platforms.
libhangul:
-libhangul: libhangul home: http://kldp.net/projects/hangul/
+libhangul: libhangul home: http://code.google.com/p/libhangul/
libhangul:
libhangul:
libhangul:
diff --git a/source/x/mesa/get-mesa.sh b/source/x/mesa/get-mesa.sh
index c014d8a13..253deeb4c 100755
--- a/source/x/mesa/get-mesa.sh
+++ b/source/x/mesa/get-mesa.sh
@@ -1,5 +1,5 @@
# Pull a stable branch + patches
-BRANCH=7.9
+BRANCH=7.10
rm -rf mesa
git clone git://anongit.freedesktop.org/git/mesa/mesa
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 7bdc273e0..ca6701886 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -21,14 +21,14 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PKGNAM=mesa
-VERSION=7.9.2
+VERSION=8.0.4
DEMOVERS=8.0.1
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j8}
# Be sure this list is up-to-date:
-DRI_DRIVERS="i810,i915,i965,mach64,mga,nouveau,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast"
+DRI_DRIVERS="i915,i965,nouveau,r200,radeon,swrast"
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -59,11 +59,6 @@ cd $TMP
rm -rf Mesa-${VERSION}
tar xvf $CWD/MesaLib-${VERSION}.tar.?z* || exit 1
-# If MesaLib came from git, we might already have GLUT.
-if [ ! -d Mesa-${VERSION}/src/glut/glx ]; then
- tar xvf $CWD/MesaGLUT-${VERSION}.tar.?z* || exit 1
-fi
-
cd Mesa-$VERSION
# Make sure ownerships and permissions are sane:
@@ -76,21 +71,14 @@ find . \
# Apply patches from git (and maybe elsewhere):
# Patches obtained by:
-# git checkout origin/7.9
-# git format-patch 67aeab0b77fb6be864088e69ea74a010b6543fa1..
+# git checkout origin/8.0
+# git format-patch 3d657b14b4cab98a2945904823e78cd8950944f4.. # 8.0.3 release
if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
for patch in $CWD/patches/*.patch ; do
patch -p1 < $patch || exit 1 ;
done
fi
-# Revert "i915: Enable ARB_fragment_shader by default."
-# https://bugzilla.redhat.com/show_bug.cgi?id=643399
-zcat $CWD/patches/i915_fragment_shader_disable.patch.gz | patch -p1 || exit 1
-
-# Allow to build against libdrm-2.4.23:
-zcat $CWD/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz | patch -p1 || exit 1
-
if [ ! -r configure ]; then
autoreconf || exit 1
fi
@@ -104,17 +92,13 @@ CFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/mesa-$VERSION \
--with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
--with-dri-drivers="$DRI_DRIVERS" \
- --enable-xcb \
- --enable-gallium-nouveau \
+ --with-gallium-drivers=nouveau,swrast,r300,r600 \
+ --enable-gallium-llvm \
--build=$ARCH-slackware-linux
-# --enable-gallium-llvm \
-# --enable-gallium-swrast \
-# --disable-gallium-svga \
-# --disable-gallium-i915 \
-# --disable-gallium-i965 \
-# --disable-gallium-radeon \
-# --disable-gallium-r600 \
+# r300 requires llvm
+# Other gallium drivers:
+# galahad,i915,identity,llvmpipe,noop,nv50,nvc0,nvfx,rbug,softpipe,svga,trace
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
diff --git a/source/x/mesa/patches/i915_fragment_shader_disable.patch b/source/x/mesa/patches/i915_fragment_shader_disable.patch
deleted file mode 100644
index d2aee8e73..000000000
--- a/source/x/mesa/patches/i915_fragment_shader_disable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001
-From: Robert Hooker <sarvatt@ubuntu.com>
-Date: Wed, 8 Sep 2010 12:33:09 -0400
-Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default."
-
-This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d.
----
- src/mesa/drivers/dri/intel/intel_screen.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
-index 0a542a7..8ae2cd2 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] =
- DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).")
- DRI_CONF_OPT_END
-
-- DRI_CONF_OPT_BEGIN(fragment_shader, bool, true)
-+ DRI_CONF_OPT_BEGIN(fragment_shader, bool, false)
- DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.")
- DRI_CONF_OPT_END
-
---
-1.7.2
-
diff --git a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch b/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
deleted file mode 100644
index d0ce04d26..000000000
--- a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -ur a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
---- a/src/gallium/drivers/nouveau/nouveau_screen.c 2010-10-02 00:51:28.000000000 +0200
-+++ b/src/gallium/drivers/nouveau/nouveau_screen.c 2010-12-11 18:18:20.527000045 +0100
-@@ -236,7 +236,7 @@
- int ret;
-
- ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202,
-- &screen->channel);
-+ 512*1024, &screen->channel);
- if (ret)
- return ret;
- screen->device = dev;
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-12-11 18:18:20.528000045 +0100
-@@ -129,7 +129,7 @@
-
- /* Allocate a hardware channel. */
- ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202,
-- &nctx->hw.chan);
-+ 512*1024, &nctx->hw.chan);
- if (ret) {
- nouveau_error("Error initializing the FIFO.\n");
- return GL_FALSE;
-Nur in b/src/mesa/drivers/dri/nouveau: nouveau_context.c.orig.
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_surface.c b/src/mesa/drivers/dri/nouveau/nouveau_surface.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-04-27 23:41:21.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-12-11 18:09:19.750000046 +0100
-@@ -34,8 +34,8 @@
- unsigned flags, unsigned format,
- unsigned width, unsigned height)
- {
-- unsigned tile_mode, cpp = _mesa_get_format_bytes(format);
-- int ret;
-+ unsigned tile_mode = 0, tile_flags = 0;
-+ int ret, cpp = _mesa_get_format_bytes(format);
-
- nouveau_bo_ref(NULL, &s->bo);
-
-@@ -51,13 +51,21 @@
- if (layout == TILED) {
- s->pitch = align(s->pitch, 256);
- tile_mode = s->pitch;
-+
-+ if (cpp == 4)
-+ tile_flags = NOUVEAU_BO_TILE_32BPP;
-+ else if (cpp == 2)
-+ tile_flags = NOUVEAU_BO_TILE_16BPP;
-+
-+ if (_mesa_get_format_bits(format, GL_DEPTH_BITS))
-+ tile_flags |= NOUVEAU_BO_TILE_ZETA;
-+
- } else {
- s->pitch = align(s->pitch, 64);
-- tile_mode = 0;
- }
-
- ret = nouveau_bo_new_tile(context_dev(ctx), flags, 0, s->pitch * height,
-- tile_mode, 0, &s->bo);
-+ tile_mode, tile_flags, &s->bo);
- assert(!ret);
- }
-
-diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
---- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-12-11 18:18:20.528000045 +0100
-@@ -32,7 +32,7 @@
-
- /* Arbitrary pushbuf length we can assume we can get with a single
- * WAIT_RING. */
--#define PUSHBUF_DWORDS 2048
-+#define PUSHBUF_DWORDS 65536
-
- /* Functions to set up struct nouveau_array_state from something like
- * a GL array or index buffer. */
-diff -ur a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c
---- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-10-05 03:58:00.000000000 +0200
-+++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-12-11 18:15:17.756000046 +0100
-@@ -64,8 +64,8 @@
-
- if (!nfb->lma_bo || nfb->lma_bo->size != size) {
- nouveau_bo_ref(NULL, &nfb->lma_bo);
-- nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
-- &nfb->lma_bo);
-+ nouveau_bo_new_tile(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size,
-+ 0, NOUVEAU_BO_TILE_ZETA, &nfb->lma_bo);
- }
-
- nouveau_bo_markl(bctx, celsius, NV17TCL_LMA_DEPTH_BUFFER_OFFSET,
diff --git a/source/kde/kdepim-runtime/kdepim-runtime.SlackBuild b/source/x/mtdev/mtdev.SlackBuild
index 51b89c51f..e973ed342 100755
--- a/source/kde/kdepim-runtime/kdepim-runtime.SlackBuild
+++ b/source/x/mtdev/mtdev.SlackBuild
@@ -1,6 +1,8 @@
#!/bin/sh
-# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Slackware build script for mtdev
+
+# Copyright 2012 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -9,7 +11,7 @@
# 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
+# 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,
@@ -20,33 +22,44 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=kdepim-runtime
+PRGNAM=mtdev
+VERSION=${VERSION:-1.1.2}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PRGNAM
-# Set the config option variables if they are not already set:
-if [ -r ../KDE.options ]; then
- . ../KDE.options
-fi
-
-# The global options may be overridden here (if needed):
-if [ -r ./local.options ]; then
- . ./local.options
+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
-# Avoid a version number in .la files:
-if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then
- QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
-fi
+set -e
rm -rf $PKG
-mkdir -p $PKG/usr
+mkdir -p $TMP $PKG
cd $TMP
-echo "Building $PRGNAM-$VERSION..."
-tar xvf $CWD/../src/$PRGNAM-$VERSION.tar.?z* || exit 1
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -54,38 +67,31 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-mkdir -p build
-cd build
- cmake \
- $KDE_OPT_ARGS \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DSYSCONF_INSTALL_DIR=/etc/kde \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- ..
- make $NUMJOBS || exit 1
- make install DESTDIR=$PKG || exit 1
-cd -
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux \
+ --disable-static
-if [ -d $PKG/usr/man ]; then
- gzip -9 $PKG/usr/man/man?/*
-fi
+make
+make install DESTDIR=$PKG
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING* MAINTAINERS README* $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
+ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ COPYING ChangeLog INSTALL README \
+ $PKG/usr/doc/$PRGNAM-$VERSION
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/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/x/mtdev/mtdev.url b/source/x/mtdev/mtdev.url
new file mode 100644
index 000000000..f1989e190
--- /dev/null
+++ b/source/x/mtdev/mtdev.url
@@ -0,0 +1 @@
+http://bitmath.org/code/mtdev/
diff --git a/source/x/mtdev/slack-desc b/source/x/mtdev/slack-desc
new file mode 100644
index 000000000..0eaaae9e7
--- /dev/null
+++ b/source/x/mtdev/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 ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+mtdev: mtdev (multitouch device library)
+mtdev:
+mtdev: mtdev is a stand-alone library which transforms all variants of
+mtdev: kernel MT events to the slotted type B protocol. The events put
+mtdev: into mtdev may be from any MT device, specifically type A without
+mtdev: contact tracking, type A with contact tracking, or type B with
+mtdev: contact tracking.
+mtdev: The bulk of the mtdev code has been out there since 2008 as part of
+mtdev: the Multitouch X Driver. With this package, finger tracking and
+mtdev: seamless MT protocol handling is available under a free license.
+mtdev:
diff --git a/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon b/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon
deleted file mode 100644
index 2542d6490..000000000
--- a/source/x/radeon_ucode/ucode-20110302/LICENSE.radeon
+++ /dev/null
@@ -1,51 +0,0 @@
-Copyright (C) 2009-2011 Advanced Micro Devices, Inc. All rights reserved.
-
-REDISTRIBUTION: Permission is hereby granted, free of any license fees,
-to any person obtaining a copy of this microcode (the "Software"), to
-install, reproduce, copy and distribute copies, in binary form only, of
-the Software and to permit persons to whom the Software is provided to
-do the same, provided that the following conditions are met:
-
-No reverse engineering, decompilation, or disassembly of this Software
-is permitted.
-
-Redistributions must reproduce the above copyright notice, this
-permission notice, and the following disclaimers and notices in the
-Software documentation and/or other materials provided with the
-Software.
-
-DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK. THE SOFTWARE
-IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT
-HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL
-MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE
-UNINTERRUPTED OR ERROR-FREE. THE ENTIRE RISK ASSOCIATED WITH THE USE OF
-THE SOFTWARE IS ASSUMED BY YOU. FURTHERMORE, COPYRIGHT HOLDER AND ITS
-LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE
-OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS,
-ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE.
-
-DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT
-HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS
-("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS
-PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE
-LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE,
-BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED
-INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL
-PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED
-REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN
-NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL
-LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN
-CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF
-US$10.
-
-Notice: The Software is subject to United States export laws and
-regulations. You agree to comply with all domestic and international
-export laws and regulations that apply to the Software, including but
-not limited to the Export Administration Regulations administered by the
-U.S. Department of Commerce and International Traffic in Arm Regulations
-administered by the U.S. Department of State. These laws include
-restrictions on destinations, end users and end use.
diff --git a/source/x/scim-anthy/scim-anthy.SlackBuild b/source/x/scim-anthy/scim-anthy.SlackBuild
index 368506355..ee43c38bf 100755
--- a/source/x/scim-anthy/scim-anthy.SlackBuild
+++ b/source/x/scim-anthy/scim-anthy.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -33,12 +33,22 @@
# -----------------------------------------------------------------------------
-PRGNAM=scim-anthy
-VERSION=${VERSION:-1.2.4}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-anthy
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
NUMJOBS=${NUMJOBS:-" -j7 "}
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" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -52,14 +62,14 @@ fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
zcat $CWD/scim-anthy.gcc43.diff.gz | patch -p1 --verbose || exit 1
@@ -87,10 +97,10 @@ make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
ABOUT-NLS AUTHORS COPYING ChangeLog DIARY INSTALL NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
# Compress the man page(s):
@@ -109,5 +119,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/scim-bridge/scim-bridge.SlackBuild b/source/x/scim-bridge/scim-bridge.SlackBuild
index c3494c8b4..8501d9c4b 100755
--- a/source/x/scim-bridge/scim-bridge.SlackBuild
+++ b/source/x/scim-bridge/scim-bridge.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -33,18 +33,19 @@
# -----------------------------------------------------------------------------
-PRGNAM=scim-bridge
-VERSION=${VERSION:-0.4.16}
+PKGNAM=scim-bridge
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-5}
# 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 ;;
+ 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:
- *) export ARCH=$( uname -m ) ;;
+ *) ARCH=$(uname -m) ;;
esac
+ export ARCH
fi
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -68,14 +69,14 @@ fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
#sed -i -e "s/ -doxygen / doxygen /" $( grep -lr ' -doxygen ' * )
zcat $CWD/patches/scim-bridge-0.4.16-scim-bridge-agent-application.cpp.patch.gz | patch -p1 --verbose || exit 1
@@ -101,7 +102,7 @@ CFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--sysconfdir=/etc \
--mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
--enable-agent \
--enable-ltdl-install \
--enable-gtk2-immodule \
@@ -129,10 +130,10 @@ fi
EOINS
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
AUTHORS COPYING* ChangeLog INSTALL NEWS README* doc/LICENSE.* \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
# Compress the man page(s):
@@ -151,5 +152,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/scim-hangul/scim-hangul.SlackBuild b/source/x/scim-hangul/scim-hangul.SlackBuild
index 1731a2023..58f17654a 100755
--- a/source/x/scim-hangul/scim-hangul.SlackBuild
+++ b/source/x/scim-hangul/scim-hangul.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -33,11 +33,21 @@
# -----------------------------------------------------------------------------
-PRGNAM=scim-hangul
-VERSION=${VERSION:-0.3.2}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-hangul
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-2}
+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
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -52,17 +62,18 @@ fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
zcat $CWD/scim-hangul.gcc43.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/scim-hangul.gcc47.diff.gz | patch -p1 --verbose || exit 1
chown -R root:root .
find . \
@@ -89,10 +100,10 @@ make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
AUTHORS COPYING NEWS README ChangeLog \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
# Compress the man page(s):
@@ -111,5 +122,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/scim-hangul/scim-hangul.gcc47.diff b/source/x/scim-hangul/scim-hangul.gcc47.diff
new file mode 100644
index 000000000..7e0c52c6d
--- /dev/null
+++ b/source/x/scim-hangul/scim-hangul.gcc47.diff
@@ -0,0 +1,11 @@
+--- ./src/scim_hangul_imengine.cpp.orig 2012-05-11 22:51:39.653751057 -0500
++++ ./src/scim_hangul_imengine.cpp 2012-05-11 22:53:45.793739278 -0500
+@@ -33,6 +33,8 @@
+ #include <config.h>
+ #endif
+
++#include <unistd.h>
++
+ #include <scim.h>
+ #include "scim_hangul_imengine.h"
+
diff --git a/source/x/scim-input-pad/scim-input-pad.SlackBuild b/source/x/scim-input-pad/scim-input-pad.SlackBuild
index a836a3fa1..e5985946f 100755
--- a/source/x/scim-input-pad/scim-input-pad.SlackBuild
+++ b/source/x/scim-input-pad/scim-input-pad.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -24,11 +24,21 @@
# -----------------------------------------------------------------------------
-PRGNAM=scim-input-pad
-VERSION=${VERSION:-0.1.2}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-input-pad
+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
@@ -50,14 +60,14 @@ fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PRGNAM}-${VERSION} || 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 \) \
@@ -85,11 +95,11 @@ make DESTDIR=$PKG install || exit 1
sed -i -e "s#/usr/lib${LIBDIRSUFFIX}/scim-.*/scim-helper-launcher#$(ls /usr/lib${LIBDIRSUFFIX}/scim-*/scim-helper-launcher)#" $PKG/usr/bin/scim-input-pad
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README \
- $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+ $PKG/usr/doc/$PKGNAM-$VERSION
+chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
# Strip binaries:
cd $PKG
@@ -102,5 +112,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/scim-input-pad/slack-desc b/source/x/scim-input-pad/slack-desc
index add837f7d..d62756923 100644
--- a/source/x/scim-input-pad/slack-desc
+++ b/source/x/scim-input-pad/slack-desc
@@ -9,7 +9,7 @@
scim-input-pad: scim-input-pad (on-screen input pad for scim)
scim-input-pad:
scim-input-pad: This is scim-input-pad, which provides an on-screen input pad
-scim-input-pad: to enter symbols and chinese characters.
+scim-input-pad: to enter symbols and Chinese characters.
scim-input-pad:
scim-input-pad:
scim-input-pad:
diff --git a/source/x/scim-m17n/scim-m17n.SlackBuild b/source/x/scim-m17n/scim-m17n.SlackBuild
index e624ca806..cf0602216 100755
--- a/source/x/scim-m17n/scim-m17n.SlackBuild
+++ b/source/x/scim-m17n/scim-m17n.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -33,11 +33,21 @@
# -----------------------------------------------------------------------------
-PRGNAM=scim-m17n
-VERSION=${VERSION:-0.2.3}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-m17n
+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) 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
@@ -59,14 +69,14 @@ fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || 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 \) \
@@ -91,10 +101,10 @@ make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
# Compress the man page(s):
@@ -119,5 +129,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/scim-pinyin/scim-pinyin.SlackBuild b/source/x/scim-pinyin/scim-pinyin.SlackBuild
index 79337b1ee..9eefad63d 100755
--- a/source/x/scim-pinyin/scim-pinyin.SlackBuild
+++ b/source/x/scim-pinyin/scim-pinyin.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2007 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -33,12 +33,22 @@
# -----------------------------------------------------------------------------
-PRGNAM=scim-pinyin
-VERSION=${VERSION:-0.5.91}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-pinyin
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
NUMJOBS=${NUMJOBS:-" -j7 "}
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" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -52,14 +62,14 @@ fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || exit 1
+cd ${PKGNAM}-${VERSION} || exit 1
# Apply fix for our gcc 4.3.x
zcat $CWD/scim-pinyin.gcc43.diff.gz | patch -p1 --verbose || exit 1
@@ -103,11 +113,11 @@ make DESTDIR=$PKG install || exit 1
#cd -
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+ $PKG/usr/doc/$PKGNAM-$VERSION
+chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
# Compress the man page(s):
if [ -d $PKG/usr/man ]; then
@@ -125,5 +135,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/scim-tables/scim-tables.SlackBuild b/source/x/scim-tables/scim-tables.SlackBuild
index 8f5773455..a6d219c2b 100755
--- a/source/x/scim-tables/scim-tables.SlackBuild
+++ b/source/x/scim-tables/scim-tables.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 2007 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -33,11 +33,21 @@
# -----------------------------------------------------------------------------
-PRGNAM=scim-tables
-VERSION=${VERSION:-0.5.9}
-ARCH=${ARCH:-x86_64}
+PKGNAM=scim-tables
+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 "}
if [ "$ARCH" = "i486" ]; then
@@ -59,14 +69,14 @@ fi
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar -xvf $CWD/${PRGNAM}-${VERSION}.tar.gz || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
+rm -rf ${PKGNAM}-${VERSION}
+tar -xvf $CWD/${PKGNAM}-${VERSION}.tar.gz || 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 \) \
@@ -92,11 +102,11 @@ make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
- $PKG/usr/doc/$PRGNAM-$VERSION
-chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
+ $PKG/usr/doc/$PKGNAM-$VERSION
+chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/*
# Compress the man page(s):
if [ -d $PKG/usr/man ]; then
@@ -115,5 +125,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch b/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch
deleted file mode 100644
index 1d9590fdc..000000000
--- a/source/x/scim/scim-1.4.9-fix-ltdl.cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scim-1.4.9/src/ltdl.cpp.bak 2008-11-02 14:42:40.000000000 +0800
-+++ scim-1.4.9/src/ltdl.cpp 2010-09-12 00:23:24.085978400 +0800
-@@ -3361,7 +3361,7 @@
- {
- lt_dlhandle handle = 0;
- char * tmp = 0;
-- char * ext = 0;
-+ const char * ext = 0;
- size_t len;
- int errors = 0;
-
diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild
index c0c50fb4c..d03adc6e6 100755
--- a/source/x/scim/scim.SlackBuild
+++ b/source/x/scim/scim.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
-# Copyright 2006,2007,2008 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2006, 2007, 2008 Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -33,18 +33,19 @@
# -----------------------------------------------------------------------------
-PRGNAM=scim
-VERSION=${VERSION:-1.4.9}
-BUILD=${BUILD:-5}
+PKGNAM=scim
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+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 ;;
+ 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:
- *) export ARCH=$( uname -m ) ;;
+ *) ARCH=$(uname -m) ;;
esac
+ export ARCH
fi
if [ "$ARCH" = "i486" ]; then
@@ -68,17 +69,15 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar xvf $CWD/${PRGNAM}-${VERSION}.tar.?z* || exit 1
-cd ${PRGNAM}-${VERSION} || exit 1
-
-zcat $CWD/scim-1.4.9-fix-ltdl.cpp.patch.gz | patch -p1 --verbose || 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 . \
@@ -95,6 +94,7 @@ CXXFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--sysconfdir=/etc \
--disable-static \
+ --with-gtk-version=2 \
--program-prefix= \
--program-suffix= \
--build=$ARCH-slackware-linux
@@ -265,15 +265,15 @@ fi
EOINS
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/figures
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures
cp -a \
ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$VERSION
# Install documentation and user manual
cp -a docs/manual/zh_CN/user-manual.html \
- $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/
+ $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/
cp -a docs/manual/zh_CN/figures/*.png \
- $PKG/usr/doc/$PRGNAM-$VERSION/manual/zh_CN/figures/
+ $PKG/usr/doc/$PKGNAM-$VERSION/manual/zh_CN/figures/
# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" \
@@ -285,5 +285,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+/sbin/makepkg --prepend --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
diff --git a/source/x/x11-skel/scripts/xwmconfig b/source/x/x11-skel/scripts/xwmconfig
index 944207bf5..724242ab8 100644
--- a/source/x/x11-skel/scripts/xwmconfig
+++ b/source/x/x11-skel/scripts/xwmconfig
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 1999, 2002 Patrick Volkerding, Moorhead, Minnesota USA
+# Copyright 1999, 2002, 2012 Patrick Volkerding, Moorhead, Minnesota USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -50,7 +50,7 @@ fi
if [ "$USER" = "root" ]; then
BACKTITLE="--backtitle \"Setting system-wide default window manager in /etc/X11/xinit/\""
else
- BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc\""
+ BACKTITLE="--backtitle \"Setting default window manager in $HOME/.xinitrc and $HOME/.xsession\""
fi
# This stops --backtitle from cluttering the initial install:
@@ -211,13 +211,19 @@ if [ "$USER" = "root" ]; then
fi
fi
-# Also set up a new $HOME/.xinitrc:
+# Also set up a new $HOME/.xinitrc and $HOME/.xinitrc:
if [ -r /etc/X11/xinit/$OUTPUT -a ! "$HOME" = "/" ]; then
if [ -r $HOME/.xinitrc ]; then
rm -f $HOME/.xinitrc-backup
mv $HOME/.xinitrc $HOME/.xinitrc-backup
fi
cat /etc/X11/xinit/$OUTPUT > $HOME/.xinitrc
+ if [ -r $HOME/.xsession ]; then
+ rm -f $HOME/.xsession-backup
+ mv $HOME/.xsession $HOME/.xsession-backup
+ fi
+ cat /etc/X11/xinit/$OUTPUT > $HOME/.xsession
+ chmod 755 $HOME/.xsession
fi
rm -f $TMP/tmpscript.sh $TMP/output
diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild
index cd8559b71..98381b680 100755
--- a/source/x/x11-skel/x11-skel.SlackBuild
+++ b/source/x/x11-skel/x11-skel.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=7.4
-BUILD=${BUILD:-2}
+VERSION=7.7
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/x/x11/build/libX11 b/source/x/x11/build/libXaw3d
index 0cfbf0888..0cfbf0888 100644
--- a/source/x/x11/build/libX11
+++ b/source/x/x11/build/libXaw3d
diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xcb-proto
index 00750edc0..00750edc0 100644
--- a/source/x/x11/build/xf86-video-cirrus
+++ b/source/x/x11/build/xcb-proto
diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xdm
index 0cfbf0888..0cfbf0888 100644
--- a/source/x/x11/build/xcompmgr
+++ b/source/x/x11/build/xdm
diff --git a/source/x/x11/build/xf86-input-acecad b/source/x/x11/build/xf86-input-wacom
index 0cfbf0888..0cfbf0888 100644
--- a/source/x/x11/build/xf86-input-acecad
+++ b/source/x/x11/build/xf86-input-wacom
diff --git a/source/x/x11/build/xf86-input-penmount b/source/x/x11/build/xf86-video-apm
index 0cfbf0888..0cfbf0888 100644
--- a/source/x/x11/build/xf86-input-penmount
+++ b/source/x/x11/build/xf86-video-apm
diff --git a/source/x/x11/build/xf86-video-openchrome b/source/x/x11/build/xf86-video-chips
index 0cfbf0888..0cfbf0888 100644
--- a/source/x/x11/build/xf86-video-openchrome
+++ b/source/x/x11/build/xf86-video-chips
diff --git a/source/x/x11/build/xf86-video-i740 b/source/x/x11/build/xf86-video-i740
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-i740
+++ b/source/x/x11/build/xf86-video-i740
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64
deleted file mode 100644
index 00750edc0..000000000
--- a/source/x/x11/build/xf86-video-mach64
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128
deleted file mode 100644
index 00750edc0..000000000
--- a/source/x/x11/build/xf86-video-r128
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3
index 00750edc0..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-s3
+++ b/source/x/x11/build/xf86-video-s3
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge
deleted file mode 100644
index 00750edc0..000000000
--- a/source/x/x11/build/xf86-video-s3virge
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-radeonhd b/source/x/x11/build/xf86-video-sisusb
index 0cfbf0888..0cfbf0888 100644
--- a/source/x/x11/build/xf86-video-radeonhd
+++ b/source/x/x11/build/xf86-video-sisusb
diff --git a/source/x/x11/build/xf86-video-tdfx b/source/x/x11/build/xf86-video-tdfx
deleted file mode 100644
index 00750edc0..000000000
--- a/source/x/x11/build/xf86-video-tdfx
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-tga b/source/x/x11/build/xf86-video-tga
index 0cfbf0888..b8626c4cf 100644
--- a/source/x/x11/build/xf86-video-tga
+++ b/source/x/x11/build/xf86-video-tga
@@ -1 +1 @@
-2
+4
diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86-video-tseng
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l
index b8626c4cf..7ed6ff82d 100644
--- a/source/x/x11/build/xf86-video-v4l
+++ b/source/x/x11/build/xf86-video-v4l
@@ -1 +1 @@
-4
+5
diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa
deleted file mode 100644
index 00750edc0..000000000
--- a/source/x/x11/build/xf86-video-vesa
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86-video-voodoo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86-video-xgi b/source/x/x11/build/xf86-video-xgi
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xf86-video-xgi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xorg-server
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xpyb b/source/x/x11/build/xpyb
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/source/x/x11/build/xpyb
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/configure/compiz b/source/x/x11/configure/compiz
index aebd49a2f..8a960f3dc 100644
--- a/source/x/x11/configure/compiz
+++ b/source/x/x11/configure/compiz
@@ -11,6 +11,6 @@ CXXFLAGS=$SLKCFLAGS \
--disable-static \
--disable-gconf \
--disable-kde \
- --enable-kde4 \
+ --disable-kde4 \
--enable-librsvg \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libXaw3d b/source/x/x11/configure/libXaw3d
new file mode 100644
index 000000000..0d802fa3b
--- /dev/null
+++ b/source/x/x11/configure/libXaw3d
@@ -0,0 +1,16 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+ --disable-static \
+ --enable-multiplane-bitmaps \
+ --enable-gray-stipples \
+ --enable-arrow-scrollbars \
+ --enable-internationalization \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati
deleted file mode 100644
index 0eacb0c39..000000000
--- a/source/x/x11/configure/xf86-video-ati
+++ /dev/null
@@ -1,21 +0,0 @@
-xserver_source="/tmp/x11-build/xorg-server-1.9.3"
-
-# Let these just fail to build. In any case, an "exit 1"
-# here is just plain wrong.
-#if [ ! -d "$xserver_source" ]; then
-# echo "$xserver_source does not exist, and you need it."
-# exit 1
-#fi
-
-CFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-CXXFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/info \
- --mandir=/usr/man \
- --disable-static \
- --with-xserver-source=${xserver_source} \
- --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index cf9bd8435..778d7668a 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -27,14 +27,15 @@ CFLAGS="$SLKCFLAGS" \
--with-int10=x86emu \
--with-default-font-path="${DEF_FONTPATH}" \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
- --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
- --with-os-name="Slackware 13.37" \
+ --with-os-name="Slackware 14.0" \
--with-os-vendor="Slackware Linux Project" \
--with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/lib/xkb \
$BUILD_SERVERS \
--build=$ARCH-slackware-linux
+# --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri
+
if [ "$ARCH" = "x86_64" ]; then
# To prevent the error "No rule to make target `-ldl'"
sed -i -e 's#-ldl##' hw/xfree86/Makefile
diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm
index bb08dc5f2..e1d72520d 100644
--- a/source/x/x11/doinst.sh/xdm
+++ b/source/x/x11/doinst.sh/xdm
@@ -1,15 +1,18 @@
-#!/bin/sh
config() {
NEW="$1"
- OLD="`dirname $NEW`/`basename $NEW .new`"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
# If there's no config file by that name, mv it over:
if [ ! -r $OLD ]; then
mv $NEW $OLD
- elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
rm $NEW
fi
# Otherwise, we leave the .new copy for the admin to consider...
}
-config etc/X11/xdm/xdm-config.new
-config etc/X11/xdm/Xservers.new
-config etc/X11/xdm/Xsession.new
+for conffile in \
+ Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \
+ GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ;
+do
+ config etc/X11/xdm/${conffile}.new
+done
+
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index 47da583fd..d6eb2f68a 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -1,7 +1,6 @@
# If a package is listed here, it will be built apart from the
# usual "grab bag" package that's made from each source directory.
-applewmproto
appres
bdftopcf
beforelight
@@ -9,7 +8,6 @@ bigreqsproto
bitmap
compiz
compositeproto
-constype
damageproto
dmxproto
dri2proto
@@ -67,16 +65,15 @@ imake
inputproto
intel-gpu-tools
kbproto
-libAppleWM
libFS
libICE
libSM
-libWindowsWM
libX11
libXScrnSaver
-libXTrap
libXau
libXaw
+libXaw3d
+libXcm
libXcomposite
libXcursor
libXdamage
@@ -92,8 +89,6 @@ libXinerama
libXmu
libXp
libXpm
-libXprintAppUtil
-libXprintUtil
libXrandr
libXrender
libXres
@@ -110,38 +105,31 @@ libpciaccess
libpthread-stubs
libxcb
libxkbfile
-libxkbui
listres
lndir
luit
makedepend
-mkcfm
mkcomposecache
mkfontdir
mkfontscale
oclock
pixman
printproto
-proxymngr
randrproto
recordproto
rendercheck
renderproto
resourceproto
rgb
-rstart
-scripts
scrnsaverproto
sessreg
setxkbmap
showfont
smproxy
-trapproto
twm
util-macros
videoproto
viewres
-windowswmproto
x11perf
xauth
xbacklight
@@ -150,6 +138,10 @@ xbitmaps
xcalc
xcb-proto
xcb-util
+xcb-util-image
+xcb-util-keysyms
+xcb-util-renderutil
+xcb-util-wm
xclipboard
xclock
xcmiscproto
@@ -169,17 +161,13 @@ xextproto
xeyes
xf86-input-acecad
xf86-input-aiptek
-xf86-input-citron
xf86-input-evdev
xf86-input-joystick
-xf86-input-keyboard
-xf86-input-mouse
xf86-input-penmount
xf86-input-synaptics
xf86-input-vmmouse
xf86-input-void
xf86-input-wacom
-xf86-video-geode
xf86-video-apm
xf86-video-ark
xf86-video-ast
@@ -187,19 +175,19 @@ xf86-video-ati
xf86-video-chips
xf86-video-cirrus
xf86-video-dummy
-xf86-video-fbdev
+xf86-video-geode
xf86-video-glint
xf86-video-i128
xf86-video-i740
-xf86-video-i810
xf86-video-intel
xf86-video-mach64
xf86-video-mga
+xf86-video-modesetting
xf86-video-neomagic
xf86-video-nouveau
-xf86-video-nsc
xf86-video-nv
xf86-video-openchrome
+xf86-video-qxl
xf86-video-r128
xf86-video-rendition
xf86-video-s3
@@ -208,13 +196,6 @@ xf86-video-savage
xf86-video-siliconmotion
xf86-video-sis
xf86-video-sisusb
-xf86-video-sunbw2
-xf86-video-suncg14
-xf86-video-suncg3
-xf86-video-suncg6
-xf86-video-sunffb
-xf86-video-sunleo
-xf86-video-suntcx
xf86-video-tdfx
xf86-video-tga
xf86-video-trident
@@ -223,22 +204,17 @@ xf86-video-v4l
xf86-video-vesa
xf86-video-vmware
xf86-video-voodoo
-xf86-video-wsfb
xf86-video-xgi
-xf86-video-xgixp
xf86bigfontproto
xf86dga
xf86dgaproto
xf86driproto
xf86miscproto
-xf86rushproto
xf86vidmodeproto
xfd
-xfindproxy
xfontsel
xfs
xfsinfo
-xfwp
xgamma
xgc
xhost
@@ -265,27 +241,23 @@ xmore
xorg-cf-files
xorg-docs
xorg-server
+xorg-server-xephyr
+xorg-server-xnest
+xorg-server-xvfb
xorg-sgml-doctools
-xphelloworld
-xplsprinters
xpr
-xprehashprinterlist
xprop
xproto
-xproxymanagementprotocol
xpyb
xrandr
xrdb
xrefresh
xscope
xset
-xsetmode
-xsetpointer
xsetroot
xsm
xstdcmap
xtrans
-xtrap
xvidtune
xvinfo
xwd
diff --git a/source/x/x11/noarch b/source/x/x11/noarch
index 79eb0e569..480ffc26c 100644
--- a/source/x/x11/noarch
+++ b/source/x/x11/noarch
@@ -56,26 +56,21 @@ randrproto
recordproto
renderproto
resourceproto
-scripts
scrnsaverproto
-trapproto
ttf-indic-fonts
util-macros
videoproto
x11-skel
-xcb-proto
xcmiscproto
xcursor-themes
xf86bigfontproto
xf86dgaproto
xf86driproto
xf86miscproto
-xf86rushproto
xf86vidmodeproto
xineramaproto
xkeyboard-config
xorg-cf-files
xorg-docs
xproto
-xproxymanagementprotocol
xtrans
diff --git a/source/x/x11/patch/xf86-video-chips.patch b/source/x/x11/patch/xf86-video-chips.patch
new file mode 100644
index 000000000..a5a54ac0e
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips.patch
@@ -0,0 +1,4 @@
+for patchfile in $CWD/patch/xf86-video-chips/*.patch ; do
+ cat $patchfile | patch -p1 --verbose \
+ || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } ;
+done
diff --git a/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch b/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch
new file mode 100644
index 000000000..a52e41037
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0001-chips-gut-the-overlay-8-16-support-from-driver.patch
@@ -0,0 +1,588 @@
+From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Tue, 29 Mar 2011 13:53:31 +1000
+Subject: [PATCH 1/9] chips: gut the overlay 8/16 support from driver.
+
+This driver is for chips that were bought by Intel in 1997,
+this feature means maintaining a lot of code in the X server
+for little gain.
+
+Drop it like its hot.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+ man/chips.man | 3 -
+ src/ct_accel.c | 46 ++---------
+ src/ct_driver.c | 234 ++++++-------------------------------------------------
+ src/ct_driver.h | 1 -
+ src/ct_video.c | 3 +-
+ 5 files changed, 28 insertions(+), 259 deletions(-)
+
+diff --git a/man/chips.man b/man/chips.man
+index 740af38..0c022ee 100644
+--- a/man/chips.man
++++ b/man/chips.man
+@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off
+ Force driver to leave centering and stretching registers alone. This
+ can fix some laptop suspend/resume problems. Default: off
+ .TP
+-.BI "Option \*qOverlay\*q"
+-Enable 8+24 overlay mode. Only appropriate for depth 24. Default: off.
+-.TP
+ .BI "Option \*qColorKey\*q \*q" integer \*q
+ Set the colormap index used for the transparency key for the depth 8 plane
+ when operating in 8+16 overlay mode. The value must be in the range
+diff --git a/src/ct_accel.c b/src/ct_accel.c
+index 3920b0a..4b5776a 100644
+--- a/src/ct_accel.c
++++ b/src/ct_accel.c
+@@ -428,19 +428,7 @@ chips_imagewrite:
+ infoPtr->ImageWriteFlags |= NO_PLANEMASK;
+ #endif
+
+-
+-#ifdef CHIPS_HIQV
+- if (XAAInit(pScreen, infoPtr)) {
+- if (cPtr->Flags & ChipsOverlay8plus16)
+- return(XAAInitDualFramebufferOverlay(pScreen,
+- CTNAME(DepthChange)));
+- else
+- return TRUE;
+- } else
+- return FALSE;
+-#else
+ return(XAAInit(pScreen, infoPtr));
+-#endif
+ }
+
+ #ifdef CHIPS_HIQV
+@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn,
+ #endif
+ w *= cAcl->BytesPerPixel;
+ ctBLTWAIT;
+-#ifdef CHIPS_HIQV
+- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) &&
+- (pScrn->depth == 8))
+- ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes);
+-#endif
+ ctSETSRCADDR(srcaddr);
+ ctSETDSTADDR(destaddr);
+ #ifdef CHIPS_HIQV
+@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+ patternaddr = (paty * pScrn->displayWidth +
+ (patx & ~0x3F)) * cAcl->BytesPerPixel;
+ cAcl->patternyrot = (patx & 0x3F) >> 3;
+-#ifdef CHIPS_HIQV
+- if (cPtr->Flags & ChipsOverlay8plus16)
+- patternaddr += cPtr->FbOffset16;
+-#endif
+
+ ctBLTWAIT;
+ ctSETPATSRCADDR(patternaddr);
+@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+
+ #ifdef CHIPS_HIQV
+ patternaddr = paty * pScrn->displayWidth + patx;
+- if (cPtr->Flags & ChipsOverlay8plus16)
+- patternaddr = patternaddr * 2 + cPtr->FbOffset16;
+- else
+- patternaddr *= cAcl->BytesPerPixel;
++ patternaddr *= cAcl->BytesPerPixel;
+ #else
+ patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel;
+ #endif
+@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ dwords = (((skipleft + bytesPerLine + 0x7) & ~0x7)) >> 2;
+ destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+ destpitch = pScrn->displayWidth * (bpp >> 3);
+- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+- destaddr += cPtr->FbOffset16;
+- else
+- destaddr += cAcl->FbOffset;
++ destaddr += cAcl->FbOffset;
+
+ ctBLTWAIT;
+
+@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ y++;
+
+ destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+- destaddr += cPtr->FbOffset16;
+- else
+- destaddr += cAcl->FbOffset;
++ destaddr += cAcl->FbOffset;
+
+ ctBLTWAIT;
+ ctSETDSTADDR(destaddr);
+@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2;
+ srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+ srcpitch = pScrn->displayWidth * (bpp >> 3);
+- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+- srcaddr += cPtr->FbOffset16;
+- else
+- srcaddr += cAcl->FbOffset;
++ srcaddr += cAcl->FbOffset;
+
+ ctBLTWAIT;
+ ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM |
+@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ dst += dstwidth;
+ y++;
+ srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+- srcaddr += cPtr->FbOffset16;
+- else
+- srcaddr += cAcl->FbOffset;
++ srcaddr += cAcl->FbOffset;
+ ctBLTWAIT;
+ ctSETSRCADDR(srcaddr);
+ ctSETHEIGHTWIDTHGO(h, bytesPerLine);
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 6624b79..08df050 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+ }
+ }
+
+- if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
+- if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
+- if (pScrn->bitsPerPixel == 16) {
+- if (cPtr->Flags & ChipsLinearSupport) {
+- cPtr->Flags |= ChipsOverlay8plus16;
+- if(!xf86GetOptValInteger(
+- cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
+- pScrn->colorKey = TRANSPARENCY_KEY;
+- pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
+- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+- "PseudoColor overlay enabled.\n");
+- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
+- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+- " - Forcing option \"Stretch\" \"ON\".\n");
+- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
+- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+- " - Forcing option \"LcdCenter\" \"OFF\".\n");
+- if (cPtr->Flags & ChipsShadowFB) {
+- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+- " - Disabling \"Shadow Framebuffer\".\n");
+- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+- " Not support with option \"8Plus16\".\n");
+- cPtr->Flags &= ~ChipsShadowFB;
+- cPtr->Rotate = 0;
+- }
+- } else {
+- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
+- }
+- } else {
+- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+- "Option \"Overlay\" is not supported in this configuration\n");
+- }
+- } else {
+- xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+- "\"%s\" is not a valid value for Option \"Overlay\"\n", s);
+- }
+- }
+-
+- if (!(cPtr->Flags & ChipsOverlay8plus16)) {
+- if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
+- &(cPtr->videoKey))) {
+- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
++ if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
++ &(cPtr->videoKey))) {
++ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
+ cPtr->videoKey);
+- } else {
+- cPtr->videoKey = (1 << pScrn->offset.red) |
++ } else {
++ cPtr->videoKey = (1 << pScrn->offset.red) |
+ (1 << pScrn->offset.green) |
+ (((pScrn->mask.blue >> pScrn->offset.blue) - 1)
+ << pScrn->offset.blue);
+- }
+ }
+
+ if (cPtr->Flags & ChipsShadowFB) {
+@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+ /* and 32bits on the others. Thus multiply by a suitable factor */
+ if (cPtr->Flags & Chips64BitMemory) {
+ if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
+- if (cPtr->Flags & ChipsOverlay8plus16 )
+- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
+- else
+ cPtr->MaxClock = min(cPtr->MaxClock,
+ MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
+ else
+- if (cPtr->Flags & ChipsOverlay8plus16)
+- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
+- else
+ cPtr->MaxClock = min(cPtr->MaxClock,
+ MemClk->Clk * 8 * 0.7 / bytesPerPixel);
+ } else {
+ if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
+- if (cPtr->Flags & ChipsOverlay8plus16 )
+- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
+- else
+ cPtr->MaxClock = min(cPtr->MaxClock,
+ MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
+ else
+- if (cPtr->Flags & ChipsOverlay8plus16)
+- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
+- else
+ cPtr->MaxClock = min(cPtr->MaxClock,
+ MemClk->Clk * 4 * 0.7 / bytesPerPixel);
+ }
+@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
+ /* Should we re-save the text mode on each VT enter? */
+ if(!chipsModeInit(pScrn, pScrn->currentMode))
+ return FALSE;
+- if ((!(cPtr->Flags & ChipsOverlay8plus16))
+- && (cPtr->Flags & ChipsVideoSupport)
++ if ((cPtr->Flags & ChipsVideoSupport)
+ && (cPtr->Flags & ChipsLinearSupport))
+ CHIPSResetVideo(pScrn);
+
+@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
+ int i, index, shift ;
+ CHIPSEntPtr cPtrEnt;
+
+- shift = ((pScrn->depth == 15) &&
+- (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
++ shift = (pScrn->depth == 15) ? 3 : 0;
+
+ if (cPtr->UseDualChannel) {
+ cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
+@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
+ hwp->disablePalette(hwp);
+ }
+
+-static Bool
+-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+- int xsize, int ysize, int dpix, int dpiy,
+- int width16, int width8)
+-{
+- return
+- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
+- dpix, dpiy, width16, width8, 16, 8) &&
+- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
+- dpix, dpiy, width16, width8, 16, 8, 16, 8));
+-}
+-
+ /* Mandatory */
+ static Bool
+ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ if (!chipsMapMem(pScrn))
+ return FALSE;
+
+- /* Setup a pointer to the overlay if needed */
+- if (cPtr->Flags & ChipsOverlay8plus16) {
+- cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
+- cPtr->FbSize16 = (pScrn->displayWidth << 1) * pScrn->virtualY;
+- if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
+- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+- "Too little memory for overlay. Disabling.\n");
+- cPtr->Flags &= ~ChipsOverlay8plus16;
+- }
+- if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
+- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+- "Max overlay Width/Height 1024 pixels. Disabling.\n");
+- cPtr->Flags &= ~ChipsOverlay8plus16;
+- }
+- }
+-
+ /* Setup the MMIO register access functions if need */
+ if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
+ CHIPSSetMmioExtFuncs(cPtr);
+@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ miClearVisualTypes();
+
+ /* Setup the visuals we support. */
+- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
+- if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
+- pScrn->rgbBits, PseudoColor))
+- return FALSE;
+- if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
+- return FALSE;
+- } else {
+- if (!miSetVisualTypes(pScrn->depth,
++ if (!miSetVisualTypes(pScrn->depth,
+ miGetDefaultVisualMask(pScrn->depth),
+ pScrn->rgbBits, pScrn->defaultVisual))
+- return FALSE;
+- }
++ return FALSE;
+ miSetPixmapDepths ();
+
+ /*
+@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ break;
+ #endif
+ case 16:
+- if (cPtr->Flags & ChipsOverlay8plus16) {
+- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart +
+- cPtr->FbOffset16, FBStart, width,
+- height, pScrn->xDpi, pScrn->yDpi,
+- displayWidth, displayWidth);
+- break;
+- }
+ default:
+ ret = fbScreenInit(pScreen, FBStart,
+ width,height,
+@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ if (pScrn->bitsPerPixel < 8)
+ freespace = allocatebase - pScrn->displayWidth *
+ pScrn->virtualY / 2;
+- else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
+- freespace = allocatebase - pScrn->displayWidth *
+- pScrn->virtualY - cPtr->FbSize16;
+ else
+ freespace = allocatebase - pScrn->displayWidth *
+ pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
+@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ AvailFBArea.y2 = cAcl->CacheEnd /
+ (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
+
+- if (!(cPtr->Flags & ChipsOverlay8plus16)) {
+- xf86InitFBManager(pScreen, &AvailFBArea);
+- }
++ xf86InitFBManager(pScreen, &AvailFBArea);
+ }
+ if (cPtr->Flags & ChipsAccelSupport) {
+ if (IS_HiQV(cPtr)) {
+@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ if (!miCreateDefColormap(pScreen))
+ return FALSE;
+
+- if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
+- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
+- NULL, CMAP_RELOAD_ON_MODE_SWITCH))
+- return FALSE;
+- } else {
+- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
++ if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
+ (pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
+ NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
+- return FALSE;
+- }
++ return FALSE;
+
+ #ifndef XSERVER_LIBPCIACCESS
+ racflag = RAC_COLORMAP;
+@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ xf86SetSilkenMouse(pScreen);
+ #endif
+
+- if ((!(cPtr->Flags & ChipsOverlay8plus16))
+- && (cPtr->Flags & ChipsVideoSupport)
++ if ((cPtr->Flags & ChipsVideoSupport)
+ && (cPtr->Flags & ChipsLinearSupport)) {
+ CHIPSInitVideo(pScreen);
+ }
+@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
+ Base >>= 3;
+ break;
+ case 16:
+- if (!(cPtr->Flags & ChipsOverlay8plus16))
+- Base >>= 1;
+- else
+- Base >>= 2;
++ Base >>= 1;
+ break;
+ case 24:
+ if (!IS_HiQV(cPtr))
+@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
+ cPtr->writeMSS(cPtr, hwp, MSS);
+ }
+
+- if (cPtr->Flags & ChipsOverlay8plus16) {
+- Base = (Base << 3) & ~(unsigned long)0xF;
+-
+- cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
+- cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
+- cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
+- }
+-
+ }
+
+ /* Mandatory */
+@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+ ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ CHIPSPtr cPtr = CHIPSPTR(pScrn);
+
+- if (flags & MODECHECK_FINAL) {
+- /* Don't subtract FrambufferSize here as it should be subtracted already */
+- if ((cPtr->Flags & ChipsOverlay8plus16)
+- && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY
+- < 0))
+- return MODE_MEM;
+- }
+ /* The tests here need to be expanded */
+ if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
+ return MODE_NO_INTERLACE;
+@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ } else {
+ ChipsStd->Attribute[0x10] = 0x01; /* mode */
+ }
+- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
+- /* Make sure that the overlay isn't visible in the overscan region */
+- if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
+- ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
+- } else
+- ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */
++ ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */
+ ChipsStd->Attribute[0x12] = 0x0F; /* enable all color planes */
+ ChipsStd->Attribute[0x13] = 0x00; /* horiz pixel panning 0 */
+
+@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ /* set virtual screen width */
+ tmp = pScrn->displayWidth >> 3;
+ if (pScrn->bitsPerPixel == 16) {
+- if (!(cPtr->Flags & ChipsOverlay8plus16))
+- tmp <<= 1; /* double the width of the buffer */
++ tmp <<= 1; /* double the width of the buffer */
+ } else if (pScrn->bitsPerPixel == 24) {
+ tmp += tmp << 1;
+ } else if (pScrn->bitsPerPixel == 32) {
+@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+
+ /* centering/stretching */
+ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
+- if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
+- (cPtr->Flags & ChipsOverlay8plus16)) {
++ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
+ ChipsNew->FR[0x40] &= 0xDF; /* Disable Horizontal stretching */
+ ChipsNew->FR[0x48] &= 0xFB; /* Disable vertical stretching */
+ ChipsNew->XR[0xA0] = 0x10; /* Disable cursor stretching */
+@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ }
+ }
+
+- if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
+- || (cPtr->Flags & ChipsOverlay8plus16)) {
++ if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
+ ChipsNew->FR[0x40] |= 0x3; /* Enable Horizontal centering */
+ ChipsNew->FR[0x48] |= 0x3; /* Enable Vertical centering */
+ } else {
+@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ ChipsNew->XR[0x82] |=0x02;
+
+ /* software mode flag */
+- ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
+- 8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
++ ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
+ min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
+ mode->CrtcHDisplay, mode->CrtcVDisplay);
+ #ifdef DEBUG
+@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ }
+ }
+ /* bpp depend */
+- if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
++ if (pScrn->bitsPerPixel == 16) {
+ ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
+ if (cPtr->Flags & ChipsGammaSupport)
+ ChipsNew->XR[0x82] |= 0x0C;
+@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ /* Turn off multimedia by default as it degrades performance */
+ ChipsNew->XR[0xD0] &= 0x0f;
+
+- /* Setup the video/overlay */
+- if (cPtr->Flags & ChipsOverlay8plus16) {
+- ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */
+-#ifdef SAR04
+- ChipsNew->XR[0x4F] = 0x2A; /* SAR04 >352 pixel overlay width */
+-#endif
+- ChipsNew->MR[0x1E] &= 0xE0; /* Set Zoom and Direction */
+- if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
+- ChipsNew->MR[0x1E] |= 0x10; /* Interlace */
+- ChipsNew->MR[0x1F] &= 0x14; /* Mask reserved bits */
+- ChipsNew->MR[0x1F] |= 0x08; /* RGB 16bpp */
+- if (pScrn->weight.green == 5)
+- ChipsNew->MR[0x1F] |= 0x01; /* RGB 15bpp */
+-
+- ChipsNew->MR[0x20] &= 0x03; /* Mask reserved bits */
+- ChipsNew->MR[0x20] |= 0x80; /* Auto Centre, Use mem ptr1 */
+- ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 1 */
+- ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
+- ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
+- ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 2 */
+- ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
+- ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
+- ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */
+- ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
+-
+- /* Left Edge of Overlay */
+- ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
+- ChipsNew->MR[0x2B] &= 0xF8; /* Mask reserved bits */
+- ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
+- /* Right Edge of Overlay */
+- ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth -
+- 1) & 0xFF;
+- ChipsNew->MR[0x2D] &= 0xF8; /* Mask reserved bits */
+- ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
+- 1) >> 8) & 0x07;
+- /* Top Edge of Overlay */
+- ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
+- ChipsNew->MR[0x2F] &= 0xF8;
+- ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
+- /* Bottom Edge of Overlay*/
+- ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
+- ChipsNew->MR[0x31] &= 0xF8; /* Mask reserved bits */
+- ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY -
+- 1 ) >> 8) & 0x07;
+-
+- ChipsNew->MR[0x3C] &= 0x18; /* Mask reserved bits */
+- ChipsNew->MR[0x3C] |= 0x07; /* Enable keyed overlay window */
+- ChipsNew->MR[0x3D] = 0x00;
+- ChipsNew->MR[0x3E] = 0x00;
+- ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
+- ChipsNew->MR[0x40] = 0xFF;
+- ChipsNew->MR[0x41] = 0xFF;
+- ChipsNew->MR[0x42] = 0x00;
+- } else if (cPtr->Flags & ChipsVideoSupport) {
++ if (cPtr->Flags & ChipsVideoSupport) {
+ #if 0 /* if we do this even though video isn't playing we kill performance */
+ ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */
+ #endif
+@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs)
+ }
+
+ /* Set SAR04 multimedia register correctly */
+- if ((cPtr->Flags & ChipsOverlay8plus16)
+- || (cPtr->Flags & ChipsVideoSupport)) {
++ if ((cPtr->Flags & ChipsVideoSupport)) {
+ #ifdef SAR04
+ cPtr->writeXR(cPtr, 0x4E, 0x04);
+ if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
+diff --git a/src/ct_driver.h b/src/ct_driver.h
+index d8ce228..10a24d4 100644
+--- a/src/ct_driver.h
++++ b/src/ct_driver.h
+@@ -114,7 +114,6 @@ typedef struct {
+ /* Options flags for the C&T chipsets */
+ #define ChipsHWCursor 0x00001000
+ #define ChipsShadowFB 0x00002000
+-#define ChipsOverlay8plus16 0x00004000
+ #define ChipsUseNewFB 0x00008000
+
+ /* Architecture type flags */
+diff --git a/src/ct_video.c b/src/ct_video.c
+index a68acb9..c9e5bb4 100644
+--- a/src/ct_video.c
++++ b/src/ct_video.c
+@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
+ CHIPSPtr cPtr = CHIPSPTR(pScrn);
+ int num_adaptors;
+
+- if (!(cPtr->Flags & ChipsOverlay8plus16) &&
+- (cPtr->Flags & ChipsVideoSupport)) {
++ if ((cPtr->Flags & ChipsVideoSupport)) {
+ newAdaptor = CHIPSSetupImageVideo(pScreen);
+ CHIPSInitOffscreenImages(pScreen);
+ }
+--
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch b/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch
new file mode 100644
index 000000000..6caaa210d
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0002-PciTag-is-unused-when-using-libpciaccess.patch
@@ -0,0 +1,29 @@
+From 5f8a7320123255408b393eab9ecfae783920622a Mon Sep 17 00:00:00 2001
+From: Mark Kettenis <kettenis@openbsd.org>
+Date: Mon, 26 Sep 2011 21:26:26 +0200
+Subject: [PATCH 2/9] PciTag is unused when using libpciaccess
+
+Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
+Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+---
+ src/ct_driver.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/ct_driver.h b/src/ct_driver.h
+index 10a24d4..39eeb6e 100644
+--- a/src/ct_driver.h
++++ b/src/ct_driver.h
+@@ -271,7 +271,9 @@ typedef struct {
+
+ typedef struct _CHIPSRec {
+ pciVideoPtr PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+ PCITAG PciTag;
++#endif
+ int Chipset;
+ EntityInfoPtr pEnt;
+ IOADDRESS PIOBase;
+--
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch b/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch
new file mode 100644
index 000000000..de379e4dd
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0003-Use-malloc-calloc-realloc-free-directly.patch
@@ -0,0 +1,50 @@
+From 7ca1840f39d0216e44fe1ca938cfc3ced048da1d Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 22:24:54 -0700
+Subject: [PATCH 3/9] Use malloc/calloc/realloc/free directly
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ src/ct_driver.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 08df050..e6538c6 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags)
+ }
+
+ }
+- xfree(usedChips);
++ free(usedChips);
+ }
+ }
+
+@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags)
+ pScrn->ValidMode = CHIPSValidMode;
+ foundScreen = TRUE;
+ }
+- xfree(usedChips);
++ free(usedChips);
+ }
+ }
+ #endif
+
+- xfree(devSections);
++ free(devSections);
+ return foundScreen;
+ }
+ #endif
+@@ -4126,7 +4126,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ }
+ if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
+ pScrn->displayWidth, pBankInfo)) {
+- xfree(pBankInfo);
++ free(pBankInfo);
+ pBankInfo = NULL;
+ return FALSE;
+ }
+--
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch b/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch
new file mode 100644
index 000000000..bcf6355a1
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0004-configure.ac-Remove-AM_PROG_CC_C_O.patch
@@ -0,0 +1,27 @@
+From f5191838b70d67e991bef3491d2a60915988079c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 22:37:00 -0700
+Subject: [PATCH 4/9] configure.ac: Remove AM_PROG_CC_C_O
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 225e516..c0ed508 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+
+-# Checks for programs.
+-AM_PROG_CC_C_O
+-
+ AH_TOP([#include "xorg-server.h"])
+
+ # Define a configure option for an alternate module directory
+--
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch b/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch
new file mode 100644
index 000000000..77d0d5bc0
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0005-util-Consolidate-common-macros.patch
@@ -0,0 +1,283 @@
+From 94a8b34528b42a4fe6f81c8b8bd1ddb6bebaeea9 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 23:04:32 -0700
+Subject: [PATCH 5/9] util: Consolidate common macros
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ util/dRegs.c | 57 +------------------------------------------------------
+ util/iopl.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ util/mRegs.c | 57 +------------------------------------------------------
+ util/modClock.c | 53 ++-------------------------------------------------
+ 4 files changed, 58 insertions(+), 163 deletions(-)
+ create mode 100644 util/iopl.h
+
+diff --git a/util/dRegs.c b/util/dRegs.c
+index b7edc8f..0d2f0cb 100644
+--- a/util/dRegs.c
++++ b/util/dRegs.c
+@@ -1,63 +1,8 @@
+-
+-
+-
+-
+-
+-
+-#ifdef __NetBSD__
+-# include <sys/types.h>
+-# include <machine/pio.h>
+-# include <machine/sysarch.h>
+-#else
+-# if defined(SVR4) && defined(i386)
+-# include <sys/types.h>
+-# ifdef NCR
+- /* broken NCR <sys/sysi86.h> */
+-# define __STDC
+-# include <sys/sysi86.h>
+-# undef __STDC
+-# else
+-# include <sys/sysi86.h>
+-# endif
+-# ifdef SVR4
+-# if !defined(sun)
+-# include <sys/seg.h>
+-# endif
+-# endif
+-# include <sys/v86.h>
+-# if defined(sun)
+-# include <sys/psw.h>
+-# endif
+-# endif
+-# include "AsmMacros.h"
+-#endif /* NetBSD */
+-
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+
+-#ifdef __NetBSD__
+-# define SET_IOPL() i386_iopl(3)
+-# define RESET_IOPL() i386_iopl(0)
+-#else
+-# if defined(SVR4) && defined(i386)
+-# ifndef SI86IOPL
+-# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+-# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+-# else
+-# define SET_IOPL() sysi86(SI86IOPL,3)
+-# define RESET_IOPL() sysi86(SI86IOPL,0)
+-# endif
+-# else
+-# ifdef linux
+-# define SET_IOPL() iopl(3)
+-# define RESET_IOPL() iopl(0)
+-# else
+-# define SET_IOPL() (void)0
+-# define RESET_IOPL() (void)0
+-# endif
+-# endif
+-#endif
++#include "iopl.h"
+
+ int main(void)
+ {
+diff --git a/util/iopl.h b/util/iopl.h
+new file mode 100644
+index 0000000..d7890b3
+--- /dev/null
++++ b/util/iopl.h
+@@ -0,0 +1,54 @@
++#ifdef __NetBSD__
++# include <sys/types.h>
++# include <machine/pio.h>
++# include <machine/sysarch.h>
++#else
++# if defined(SVR4) && defined(i386)
++# include <sys/types.h>
++# ifdef NCR
++ /* broken NCR <sys/sysi86.h> */
++# define __STDC
++# include <sys/sysi86.h>
++# undef __STDC
++# else
++# include <sys/sysi86.h>
++# endif
++# ifdef SVR4
++# if !defined(sun)
++# include <sys/seg.h>
++# endif
++# endif
++# include <sys/v86.h>
++# if defined(sun)
++# include <sys/psw.h>
++# endif
++# endif
++# include "AsmMacros.h"
++#endif /* NetBSD */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#ifdef __NetBSD__
++# define SET_IOPL() i386_iopl(3)
++# define RESET_IOPL() i386_iopl(0)
++#else
++# if defined(SVR4) && defined(i386)
++# ifndef SI86IOPL
++# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
++# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
++# else
++# define SET_IOPL() sysi86(SI86IOPL,3)
++# define RESET_IOPL() sysi86(SI86IOPL,0)
++# endif
++# else
++# ifdef linux
++# define SET_IOPL() iopl(3)
++# define RESET_IOPL() iopl(0)
++# else
++# define SET_IOPL() (void)0
++# define RESET_IOPL() (void)0
++# endif
++# endif
++#endif
+diff --git a/util/mRegs.c b/util/mRegs.c
+index f359738..843d01d 100644
+--- a/util/mRegs.c
++++ b/util/mRegs.c
+@@ -1,63 +1,8 @@
+-
+-
+-
+-
+-
+-
+-#ifdef __NetBSD__
+-# include <sys/types.h>
+-# include <machine/pio.h>
+-# include <machine/sysarch.h>
+-#else
+-# if defined(SVR4) && defined(i386)
+-# include <sys/types.h>
+-# ifdef NCR
+- /* broken NCR <sys/sysi86.h> */
+-# define __STDC
+-# include <sys/sysi86.h>
+-# undef __STDC
+-# else
+-# include <sys/sysi86.h>
+-# endif
+-# ifdef SVR4
+-# if !defined(sun)
+-# include <sys/seg.h>
+-# endif
+-# endif
+-# include <sys/v86.h>
+-# if defined(sun)
+-# include <sys/psw.h>
+-# endif
+-# endif
+-# include "AsmMacros.h"
+-#endif /* NetBSD */
+-
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+
+-#ifdef __NetBSD__
+-# define SET_IOPL() i386_iopl(3)
+-# define RESET_IOPL() i386_iopl(0)
+-#else
+-# if defined(SVR4) && defined(i386)
+-# ifndef SI86IOPL
+-# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+-# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+-# else
+-# define SET_IOPL() sysi86(SI86IOPL,3)
+-# define RESET_IOPL() sysi86(SI86IOPL,0)
+-# endif
+-# else
+-# ifdef linux
+-# define SET_IOPL() iopl(3)
+-# define RESET_IOPL() iopl(0)
+-# else
+-# define SET_IOPL() (void)0
+-# define RESET_IOPL() (void)0
+-# endif
+-# endif
+-#endif
++#include "iopl.h"
+
+ int hex2int(char* str);
+
+diff --git a/util/modClock.c b/util/modClock.c
+index 89a291a..45af19b 100644
+--- a/util/modClock.c
++++ b/util/modClock.c
+@@ -1,61 +1,12 @@
+-
+-#ifdef __NetBSD__
+-# include <sys/types.h>
+-# include <machine/pio.h>
+-# include <machine/sysarch.h>
+-#else
+-# if defined(SVR4) && defined(i386)
+-# include <sys/types.h>
+-# ifdef NCR
+- /* broken NCR <sys/sysi86.h> */
+-# define __STDC
+-# include <sys/sysi86.h>
+-# undef __STDC
+-# else
+-# include <sys/sysi86.h>
+-# endif
+-# ifdef SVR4
+-# if !defined(sun)
+-# include <sys/seg.h>
+-# endif
+-# endif
+-# include <sys/v86.h>
+-# if defined(sun)
+-# include <sys/psw.h>
+-# endif
+-# endif
+-# include "AsmMacros.h"
+-#endif /* NetBSD */
+-
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++
+ #ifndef Lynx
+ #include <fnmatch.h>
+ #endif
+
+-#ifdef __NetBSD__
+-# define SET_IOPL() i386_iopl(3)
+-# define RESET_IOPL() i386_iopl(0)
+-#else
+-# if defined(SVR4) && defined(i386)
+-# ifndef SI86IOPL
+-# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+-# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+-# else
+-# define SET_IOPL() sysi86(SI86IOPL,3)
+-# define RESET_IOPL() sysi86(SI86IOPL,0)
+-# endif
+-# else
+-# ifdef linux
+-# define SET_IOPL() iopl(3)
+-# define RESET_IOPL() iopl(0)
+-# else
+-# define SET_IOPL() (void)0
+-# define RESET_IOPL() (void)0
+-# endif
+-# endif
+-#endif
++#include "iopl.h"
+
+ #define tolerance 0.01 /* +/- 1% */
+
+--
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch b/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch
new file mode 100644
index 000000000..a0b4bb4b9
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0006-Fix-implicit-declaration-of-iopl.patch
@@ -0,0 +1,35 @@
+From c421f2477c99990d0dc712d6aece981fa6c961e5 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 23:09:09 -0700
+Subject: [PATCH 6/9] Fix implicit declaration of iopl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+warning: implicit declaration of function ‘iopl’ [-Wimplicit-function-declaration]
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ util/iopl.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/util/iopl.h b/util/iopl.h
+index d7890b3..e08207c 100644
+--- a/util/iopl.h
++++ b/util/iopl.h
+@@ -3,6 +3,12 @@
+ # include <machine/pio.h>
+ # include <machine/sysarch.h>
+ #else
++# if defined(__linux__)
++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
++ * # include <sys/io.h>
++ */
++int iopl(int level);
++# endif
+ # if defined(SVR4) && defined(i386)
+ # include <sys/types.h>
+ # ifdef NCR
+--
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch b/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch
new file mode 100644
index 000000000..12dc51316
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0007-Build-fix-for-ABI-Version-12.patch
@@ -0,0 +1,51 @@
+From 8a5ea07f30cc71ecc413fad0713facff72f77472 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue, 18 Oct 2011 23:21:33 -0700
+Subject: [PATCH 7/9] Build fix for ABI Version 12
+
+ABI Version 12 removes support for multiple PCI domains. If you need to
+use this driver on a system with more than one PCI domain, you should
+either port this driver to using libpciaccess directly or stick with an
+older server.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+ src/ct_driver.c | 5 +++++
+ src/ct_driver.h | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index e6538c6..a2e5c94 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+
+ hwp = VGAHWPTR(pScrn);
+ vgaHWGetIOBase(hwp);
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ cPtr->PIOBase = hwp->PIOOffset;
++#else
++ cPtr->PIOBase = 0;
++#endif
++
+ /*
+ * Must allow ensure that storage for the 2nd set of vga registers is
+ * allocated for dual channel cards
+diff --git a/src/ct_driver.h b/src/ct_driver.h
+index 39eeb6e..9033867 100644
+--- a/src/ct_driver.h
++++ b/src/ct_driver.h
+@@ -276,8 +276,8 @@ typedef struct _CHIPSRec {
+ #endif
+ int Chipset;
+ EntityInfoPtr pEnt;
+- IOADDRESS PIOBase;
+- CARD32 IOAddress;
++ unsigned long PIOBase;
++ unsigned long IOAddress;
+ unsigned long FbAddress;
+ unsigned int IOBase;
+ unsigned char * FbBase;
+--
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch b/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch
new file mode 100644
index 000000000..3478fa34b
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0008-Fall-back-to-shadowfb-if-XAA-is-unavailable.patch
@@ -0,0 +1,31 @@
+From 5d5753551609f1483801e5edd8d42b11713c981e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 19 Dec 2011 16:18:34 -0500
+Subject: [PATCH 8/9] Fall back to shadowfb if XAA is unavailable
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/ct_driver.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index a2e5c94..95092a2 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -1345,10 +1345,9 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
+
+ if (cPtr->Flags & ChipsAccelSupport) {
+ if (!xf86LoadSubModule(pScrn, "xaa")) {
+- vbeFree(cPtr->pVbe);
+- cPtr->pVbe = NULL;
+- CHIPSFreeRec(pScrn);
+- return FALSE;
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
++ cPtr->Flags &= ~(ChipsAccelSupport);
++ cPtr->Flags |= ChipsShadowFB;
+ }
+ }
+
+--
+1.7.9.4
+
diff --git a/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch b/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch
new file mode 100644
index 000000000..74ec37225
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-chips/0009-Fix-for-new-vgaHW-ABI.patch
@@ -0,0 +1,25 @@
+From 989cf4f1fb2ac57f38d363734b71a5cf749db146 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 19 Dec 2011 17:45:41 -0500
+Subject: [PATCH 9/9] Fix for new vgaHW ABI
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/ct_driver.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 95092a2..08ccd72 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -1444,6 +1444,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+ return FALSE;
+
+ hwp = VGAHWPTR(pScrn);
++ vgaHWSetStdFuncs(hwp);
+ vgaHWGetIOBase(hwp);
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ cPtr->PIOBase = hwp->PIOOffset;
+--
+1.7.9.4
+
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index e3218a038..01be43a3b 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -1,3 +1 @@
zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xorg-server/xorg-server.try_nouveau.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff
index bfa9c305d..8c0e3b546 100644
--- a/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff
+++ b/source/x/x11/patch/xorg-server/x11.startwithblackscreen.diff
@@ -1,13 +1,14 @@
---- ./dix/window.c.orig 2007-01-22 23:39:15.000000000 -0600
-+++ ./dix/window.c 2007-02-14 03:21:03.000000000 -0600
-@@ -140,8 +140,8 @@
- *
- ******/
+diff -Nur xorg-server-1.12.1.orig/dix/window.c xorg-server-1.12.1/dix/window.c
+--- xorg-server-1.12.1.orig/dix/window.c 2012-03-29 21:57:25.000000000 -0500
++++ xorg-server-1.12.1/dix/window.c 2012-04-13 22:01:24.456073603 -0500
+@@ -145,8 +145,8 @@
--static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11};
--static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88};
-+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00};
-+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00};
+ Bool bgNoneRoot = FALSE;
- _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF;
+-static unsigned char _back_lsb[4] = { 0x88, 0x22, 0x44, 0x11 };
+-static unsigned char _back_msb[4] = { 0x11, 0x44, 0x22, 0x88 };
++static unsigned char _back_lsb[4] = { 0x00, 0x00, 0x00, 0x00 };
++static unsigned char _back_msb[4] = { 0x00, 0x00, 0x00, 0x00 };
+ static Bool WindowParentHasDeviceCursor(WindowPtr pWin,
+ DeviceIntPtr pDev, CursorPtr pCurs);
diff --git a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff b/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff
deleted file mode 100644
index f8abdccb2..000000000
--- a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./fb/fbpict.c.orig 2010-03-11 22:38:21.000000000 -0600
-+++ ./fb/fbpict.c 2010-04-29 14:14:52.000000000 -0500
-@@ -37,7 +37,7 @@
- #include "mipict.h"
- #include "fbpict.h"
-
--#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
-+#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b))
-
- void
- fbWalkCompositeRegion (CARD8 op,
diff --git a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff b/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
deleted file mode 100644
index 74f799a11..000000000
--- a/source/x/x11/patch/xorg-server/xorg-server.try_nouveau.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./hw/xfree86/common/xf86pciBus.c.orig 2010-07-01 12:17:35.000000000 -0500
-+++ ./hw/xfree86/common/xf86pciBus.c 2010-11-18 16:56:57.633003654 -0600
-@@ -1118,7 +1118,7 @@
- break;
- case 0x102b: driverList[0] = "mga"; break;
- case 0x10c8: driverList[0] = "neomagic"; break;
-- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
-+ case 0x10de: case 0x12d2: driverList[0] = "nouveau" ; driverList[1] = "nv"; break;
- case 0x1106: driverList[0] = "openchrome"; break;
- case 0x1b36: driverList[0] = "qxl"; break;
- case 0x1163: driverList[0] = "rendition"; break;
diff --git a/source/x/x11/post-install/lbxproxy.post-install b/source/x/x11/post-install/lbxproxy.post-install
deleted file mode 100644
index 9bb110324..000000000
--- a/source/x/x11/post-install/lbxproxy.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
- mv lbxproxy $PKG/etc/X11
- ln -sf ../../../etc/X11/lbxproxy .
-)
diff --git a/source/n/rt61-firmware/rt61-firmware.SlackBuild b/source/x/x11/post-install/libXaw3d.post-install
index 7734f9ee8..5b2d5bf28 100755..100644
--- a/source/n/rt61-firmware/rt61-firmware.SlackBuild
+++ b/source/x/x11/post-install/libXaw3d.post-install
@@ -1,6 +1,5 @@
-#!/bin/sh
-# Copyright 2006, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -19,42 +18,12 @@
# 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.
+#
+# Create some compat symlinks for older versions:
-CWD=$(pwd)
-
-PKGNAM=rt61-firmware
-VERSION=${VERSION:-1.2}
-ARCH=${ARCH:-fw}
-BUILD=${BUILD:-1}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf RT61_Firmware_V${VERSION}
-unzip $CWD/RT61_Firmware_V${VERSION}.zip || exit 1
-cd RT61_Firmware_V${VERSION}
-
-# Make sure ownerships and permissions are sane:
-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 {} \;
-
-# Install:
-mkdir -p $PKG/lib/firmware
-mv LICEN* $PKG/lib/firmware/LICENSE.ralink-firmware-RT61_Firmware_V${VERSION}.txt
-mv * $PKG/lib/firmware
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+( cd $PKG/usr/lib
+ ln -sf libXaw3d.so.8 libXaw3d.so.6
+ ln -sf libXaw3d.so.8 libXaw3d.so.7
+)
diff --git a/source/x/x11/post-install/proxymngr.post-install b/source/x/x11/post-install/proxymngr.post-install
deleted file mode 100644
index 29c647c30..000000000
--- a/source/x/x11/post-install/proxymngr.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
- mv proxymngr $PKG/etc/X11
- ln -sf ../../../etc/X11/proxymngr .
-)
diff --git a/source/x/x11/post-install/rstart.post-install b/source/x/x11/post-install/rstart.post-install
deleted file mode 100644
index d51ad34d5..000000000
--- a/source/x/x11/post-install/rstart.post-install
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
- mv rstart $PKG/etc/X11
- ln -sf ../../../etc/X11/rstart .
-)
diff --git a/source/x/x11/post-install/util-macros.post-install b/source/x/x11/post-install/util-macros.post-install
deleted file mode 100644
index b25fb344b..000000000
--- a/source/x/x11/post-install/util-macros.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-mkdir -p $PKG/usr/lib
-mv $PKG/usr/share/pkgconfig $PKG/usr/lib
diff --git a/source/x/x11/post-install/xcb-util.post-install b/source/x/x11/post-install/xcb-util.post-install
new file mode 100644
index 000000000..ac269177a
--- /dev/null
+++ b/source/x/x11/post-install/xcb-util.post-install
@@ -0,0 +1,8 @@
+# The libraries libxcb-{atom,aux,event} have been merged into the
+# libxcb-util library. To maintain compatibility with existing
+# binaries, add some runtime-only compat symlinks:
+( cd $PKG/usr/lib
+ ln -sf libxcb-util.so.?.?.? libxcb-atom.so.1
+ ln -sf libxcb-util.so.?.?.? libxcb-aux.so.0
+ ln -sf libxcb-util.so.?.?.? libxcb-event.so.1
+)
diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install
index 83dcf7889..73611b47e 100644
--- a/source/x/x11/post-install/xdm.post-install
+++ b/source/x/x11/post-install/xdm.post-install
@@ -1,19 +1,30 @@
mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
- mv xdm $PKG/etc/X11
- ln -sf ../../../etc/X11/xdm .
-)
-mv $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsession.orig
-mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0.orig
+mv $PKG/usr/lib/X11/xdm $PKG/etc/X11
+ln -sf ../../../etc/X11/xdm $PKG/usr/lib/X11/xdm
+
+#( cd $PKG/usr/lib/X11
+# mv xdm $PKG/etc/X11
+# ln -sf ../../../etc/X11/xdm .
+#)
+
+mkdir -p $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION
+mv $PKG/etc/X11/xdm/Xsession $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsession.orig
+mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsetup_0.orig
+
cp -a $CWD/post-install/xdm/Xsession $PKG/etc/X11/xdm/Xsession
cp -a $CWD/post-install/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0
+
chown root:root $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
-chmod 755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
-( cd $PKG/etc/X11/xdm
- mv xdm-config xdm-config.new
- mv Xservers Xservers.new
- mv Xsession Xsession.new
-)
+chmod 0755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
+
+for conffile in \
+ Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \
+ GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ;
+do
+ mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ;
+done
+
mkdir -p $PKG/var/lib/xdm
chown root:root $PKG/var/lib/xdm
chmod 755 $PKG/var/lib/xdm
+
diff --git a/source/x/x11/post-install/xf86-input-wacom.post-install b/source/x/x11/post-install/xf86-input-wacom.post-install
new file mode 100644
index 000000000..d2b17ecc5
--- /dev/null
+++ b/source/x/x11/post-install/xf86-input-wacom.post-install
@@ -0,0 +1,5 @@
+# I'm not sure we need this any more, so let's wait for a bug report
+# https://wiki.archlinux.org/index.php/Wacom_Tablet
+mkdir -p $PKG/lib/udev/rules.d
+cat $CWD/post-install/xf86-input-wacom/60-wacom.rules > \
+ $PKG/lib/udev/rules.d/60-wacom.rules
diff --git a/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules b/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules
new file mode 100644
index 000000000..59224786a
--- /dev/null
+++ b/source/x/x11/post-install/xf86-input-wacom/60-wacom.rules
@@ -0,0 +1,6 @@
+# From https://wiki.archlinux.org/index.php/Wacom_Tablet
+ACTION!="add|change", GOTO="wacom_end"
+ # Match all wacom tablets with a serial ID starting with WACf or FUJ*
+ ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+ ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1"
+LABEL="wacom_end"
diff --git a/source/x/x11/slack-desc/appres b/source/x/x11/slack-desc/appres
index e397c8cd1..001a3f341 100644
--- a/source/x/x11/slack-desc/appres
+++ b/source/x/x11/slack-desc/appres
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-appres: appres
+appres: appres (X resource inspection utility)
appres:
-appres: appres is part of X11.
+appres: The appres program prints the resources seen by an application
+appres: (or subhierarchy of an application) with the specified class and
+appres: instance names. It can be used to determine which resources a
+appres: particular program will load.
appres:
-appres: For more information about the X.Org Foundation (the providers of the
-appres: X.Org implementation of the X Window System), see their website:
appres:
-appres: http://www.x.org
appres:
appres:
appres:
diff --git a/source/x/x11/slack-desc/bdftopcf b/source/x/x11/slack-desc/bdftopcf
index cb2a80a13..c9514c16e 100644
--- a/source/x/x11/slack-desc/bdftopcf
+++ b/source/x/x11/slack-desc/bdftopcf
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-bdftopcf: bdftopcf
+bdftopcf: bdftopcf (font compiler for the X server and font server)
bdftopcf:
-bdftopcf: bdftopcf is part of X11.
+bdftopcf: Fonts in Portable Compiled Format can be read by any architecture,
+bdftopcf: although the file is structured to allow one particular architecture
+bdftopcf: to read them directly without reformatting. This allows fast reading
+bdftopcf: on the appropriate machine, but the files are still portable (but
+bdftopcf: read more slowly) on other machines.
bdftopcf:
-bdftopcf: For more information about the X.Org Foundation (the providers of the
-bdftopcf: X.Org implementation of the X Window System), see their website:
-bdftopcf:
-bdftopcf: http://www.x.org
bdftopcf:
bdftopcf:
bdftopcf:
diff --git a/source/x/x11/slack-desc/beforelight b/source/x/x11/slack-desc/beforelight
index 20549ac45..a2a5f48e4 100644
--- a/source/x/x11/slack-desc/beforelight
+++ b/source/x/x11/slack-desc/beforelight
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-beforelight: beforelight
+beforelight: beforelight (X11 screensaver)
beforelight:
-beforelight: beforelight is part of X11.
+beforelight: The beforelight program is a sample implementation of a screen saver
+beforelight: for X servers supporting the MIT-SCREEN-SAVER extension. It is only
+beforelight: recommended for use as a code sample, as it does not include features
+beforelight: such as screen locking or configurability, and relies on the legacy
+beforelight: Xaw toolkit.
beforelight:
-beforelight: For more information about the X.Org Foundation (the providers of the
-beforelight: X.Org implementation of the X Window System), see their website:
-beforelight:
-beforelight: http://www.x.org
beforelight:
beforelight:
beforelight:
diff --git a/source/x/x11/slack-desc/bigreqsproto b/source/x/x11/slack-desc/bigreqsproto
index 55c66bbc0..8b35e52fd 100644
--- a/source/x/x11/slack-desc/bigreqsproto
+++ b/source/x/x11/slack-desc/bigreqsproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-bigreqsproto: bigreqsproto
+bigreqsproto: bigreqsproto (C prototypes for X11 Big Requests Extension)
bigreqsproto:
bigreqsproto: bigreqsproto is part of X11.
bigreqsproto:
diff --git a/source/x/x11/slack-desc/bitmap b/source/x/x11/slack-desc/bitmap
index 72423e767..60ed7c74a 100644
--- a/source/x/x11/slack-desc/bitmap
+++ b/source/x/x11/slack-desc/bitmap
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-bitmap: bitmap
+bitmap: bitmap (X bitmap (XBM) editor and converter utilities)
+bitmap:
+bitmap: The bitmap package includes the bitmap, bmtoa, and atobm programs.
+bitmap:
+bitmap:
bitmap:
-bitmap: bitmap is part of X11.
bitmap:
-bitmap: For more information about the X.Org Foundation (the providers of the
-bitmap: X.Org implementation of the X Window System), see their website:
bitmap:
-bitmap: http://www.x.org
bitmap:
bitmap:
bitmap:
diff --git a/source/x/x11/slack-desc/compiz b/source/x/x11/slack-desc/compiz
index e13991198..c81aae0e9 100644
--- a/source/x/x11/slack-desc/compiz
+++ b/source/x/x11/slack-desc/compiz
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-compiz: compiz
+compiz: compiz (OpenGL window and compositing manager)
compiz:
-compiz: compiz is part of X11.
+compiz: Compiz is an OpenGL compositing manager that use
+compiz: GLX_EXT_texture_from_pixmap for binding redirected top-level windows
+compiz: to texture objects. It has a flexible plug-in system and it is designed
+compiz: to run well on most graphics hardware.
compiz:
-compiz: For more information about the X.Org Foundation (the providers of the
-compiz: X.Org implementation of the X Window System), see their website:
compiz:
-compiz: http://www.x.org
compiz:
compiz:
compiz:
diff --git a/source/x/x11/slack-desc/compositeproto b/source/x/x11/slack-desc/compositeproto
index 63e26c778..197ece99d 100644
--- a/source/x/x11/slack-desc/compositeproto
+++ b/source/x/x11/slack-desc/compositeproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-compositeproto: compositeproto
+compositeproto: compositeproto (C prototypes for X11 Composite Extension)
compositeproto:
compositeproto: compositeproto is part of X11.
compositeproto:
diff --git a/source/x/x11/slack-desc/damageproto b/source/x/x11/slack-desc/damageproto
index 98c085fec..5998b60a2 100644
--- a/source/x/x11/slack-desc/damageproto
+++ b/source/x/x11/slack-desc/damageproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-damageproto: damageproto
+damageproto: damageproto (C prototypes for X11 Damage Extension)
damageproto:
damageproto: damageproto is part of X11.
damageproto:
diff --git a/source/x/x11/slack-desc/dmxproto b/source/x/x11/slack-desc/dmxproto
index a9598f9a7..7df2c84f9 100644
--- a/source/x/x11/slack-desc/dmxproto
+++ b/source/x/x11/slack-desc/dmxproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-dmxproto: dmxproto
+dmxproto: dmxproto (C prototypes for X11 Distributed Multihead X Extension)
dmxproto:
dmxproto: dmxproto is part of X11.
dmxproto:
diff --git a/source/x/x11/slack-desc/dri2proto b/source/x/x11/slack-desc/dri2proto
index c416449a2..06ac495d8 100644
--- a/source/x/x11/slack-desc/dri2proto
+++ b/source/x/x11/slack-desc/dri2proto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-dri2proto: dri2proto
+dri2proto: dri2proto (C prototypes for X11 Direct Rendering Infrastructure 2)
dri2proto:
dri2proto: dri2proto is part of X11.
dri2proto:
diff --git a/source/x/x11/slack-desc/editres b/source/x/x11/slack-desc/editres
index efdc8d751..01fe56c8f 100644
--- a/source/x/x11/slack-desc/editres
+++ b/source/x/x11/slack-desc/editres
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-editres: editres
+editres: editres (X11 resource editor)
editres:
editres: editres is part of X11.
editres:
diff --git a/source/x/x11/slack-desc/encodings b/source/x/x11/slack-desc/encodings
index a6de35175..9d35da9ff 100644
--- a/source/x/x11/slack-desc/encodings
+++ b/source/x/x11/slack-desc/encodings
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-encodings: encodings
+encodings: encodings (X11 font encodings)
encodings:
encodings: encodings is part of X11.
encodings:
diff --git a/source/x/x11/slack-desc/evieext b/source/x/x11/slack-desc/evieext
index 36a135e6b..cff1b67d1 100644
--- a/source/x/x11/slack-desc/evieext
+++ b/source/x/x11/slack-desc/evieext
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-evieext: evieext
+evieext: evieext (C prototypes for X11 Extended Visual Information Extension)
evieext:
evieext: evieext is part of X11.
evieext:
diff --git a/source/x/x11/slack-desc/fixesproto b/source/x/x11/slack-desc/fixesproto
index 7e1a1eab9..83cfded02 100644
--- a/source/x/x11/slack-desc/fixesproto
+++ b/source/x/x11/slack-desc/fixesproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-fixesproto: fixesproto
+fixesproto: fixesproto (C prototypes for X11 X Fixes Extension)
fixesproto:
fixesproto: fixesproto is part of X11.
fixesproto:
diff --git a/source/x/x11/slack-desc/font-adobe-100dpi b/source/x/x11/slack-desc/font-adobe-100dpi
index 50996b1be..ea59df87f 100644
--- a/source/x/x11/slack-desc/font-adobe-100dpi
+++ b/source/x/x11/slack-desc/font-adobe-100dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-adobe-100dpi: font-adobe-100dpi
+font-adobe-100dpi: font-adobe-100dpi (bitmap fonts for X11)
font-adobe-100dpi:
font-adobe-100dpi: font-adobe-100dpi is part of X11.
font-adobe-100dpi:
diff --git a/source/x/x11/slack-desc/font-adobe-75dpi b/source/x/x11/slack-desc/font-adobe-75dpi
index ca91ae5e9..fac2cc42e 100644
--- a/source/x/x11/slack-desc/font-adobe-75dpi
+++ b/source/x/x11/slack-desc/font-adobe-75dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-adobe-75dpi: font-adobe-75dpi
+font-adobe-75dpi: font-adobe-75dpi (bitmap fonts for X11)
font-adobe-75dpi:
font-adobe-75dpi: font-adobe-75dpi is part of X11.
font-adobe-75dpi:
diff --git a/source/x/x11/slack-desc/font-adobe-utopia-100dpi b/source/x/x11/slack-desc/font-adobe-utopia-100dpi
index 956f6d53a..29cebe236 100644
--- a/source/x/x11/slack-desc/font-adobe-utopia-100dpi
+++ b/source/x/x11/slack-desc/font-adobe-utopia-100dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-adobe-utopia-100dpi: font-adobe-utopia-100dpi
+font-adobe-utopia-100dpi: font-adobe-utopia-100dpi (bitmap fonts for X11)
font-adobe-utopia-100dpi:
font-adobe-utopia-100dpi: font-adobe-utopia-100dpi is part of X11.
font-adobe-utopia-100dpi:
diff --git a/source/x/x11/slack-desc/font-adobe-utopia-75dpi b/source/x/x11/slack-desc/font-adobe-utopia-75dpi
index 73571791d..1c941b8ae 100644
--- a/source/x/x11/slack-desc/font-adobe-utopia-75dpi
+++ b/source/x/x11/slack-desc/font-adobe-utopia-75dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-adobe-utopia-75dpi: font-adobe-utopia-75dpi
+font-adobe-utopia-75dpi: font-adobe-utopia-75dpi (bitmap fonts for X11)
font-adobe-utopia-75dpi:
font-adobe-utopia-75dpi: font-adobe-utopia-75dpi is part of X11.
font-adobe-utopia-75dpi:
diff --git a/source/x/x11/slack-desc/font-adobe-utopia-type1 b/source/x/x11/slack-desc/font-adobe-utopia-type1
index 5f6d7d1b3..7c6141c4e 100644
--- a/source/x/x11/slack-desc/font-adobe-utopia-type1
+++ b/source/x/x11/slack-desc/font-adobe-utopia-type1
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-adobe-utopia-type1: font-adobe-utopia-type1
+font-adobe-utopia-type1: font-adobe-utopia-type1 (scalable fonts for X11)
font-adobe-utopia-type1:
font-adobe-utopia-type1: font-adobe-utopia-type1 is part of X11.
font-adobe-utopia-type1:
diff --git a/source/x/x11/slack-desc/font-alias b/source/x/x11/slack-desc/font-alias
index d5e513d5b..8f34e3897 100644
--- a/source/x/x11/slack-desc/font-alias
+++ b/source/x/x11/slack-desc/font-alias
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-alias: font-alias
+font-alias: font-alias (X11 font aliases)
font-alias:
font-alias: font-alias is part of X11.
font-alias:
diff --git a/source/x/x11/slack-desc/font-arabic-misc b/source/x/x11/slack-desc/font-arabic-misc
index bf9d34e26..8f2d661b2 100644
--- a/source/x/x11/slack-desc/font-arabic-misc
+++ b/source/x/x11/slack-desc/font-arabic-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-arabic-misc: font-arabic-misc
+font-arabic-misc: font-arabic-misc (bitmap fonts for X11)
font-arabic-misc:
font-arabic-misc: font-arabic-misc is part of X11.
font-arabic-misc:
diff --git a/source/x/x11/slack-desc/font-bh-100dpi b/source/x/x11/slack-desc/font-bh-100dpi
index 3db086b41..2ec640788 100644
--- a/source/x/x11/slack-desc/font-bh-100dpi
+++ b/source/x/x11/slack-desc/font-bh-100dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bh-100dpi: font-bh-100dpi
+font-bh-100dpi: font-bh-100dpi (bitmap fonts for X11)
font-bh-100dpi:
font-bh-100dpi: font-bh-100dpi is part of X11.
font-bh-100dpi:
diff --git a/source/x/x11/slack-desc/font-bh-75dpi b/source/x/x11/slack-desc/font-bh-75dpi
index ab93f8a95..36f1efd37 100644
--- a/source/x/x11/slack-desc/font-bh-75dpi
+++ b/source/x/x11/slack-desc/font-bh-75dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bh-75dpi: font-bh-75dpi
+font-bh-75dpi: font-bh-75dpi (bitmap fonts for X11)
font-bh-75dpi:
font-bh-75dpi: font-bh-75dpi is part of X11.
font-bh-75dpi:
diff --git a/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi b/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
index d289f9a2a..30805c875 100644
--- a/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
+++ b/source/x/x11/slack-desc/font-bh-lucidatypewriter-100dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi
+font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi (bitmap fonts for X11)
font-bh-lucidatypewriter-100dpi:
font-bh-lucidatypewriter-100dpi: font-bh-lucidatypewriter-100dpi is part of X11.
font-bh-lucidatypewriter-100dpi:
diff --git a/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi b/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
index a9ae87e3a..23c5b8e49 100644
--- a/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
+++ b/source/x/x11/slack-desc/font-bh-lucidatypewriter-75dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi
+font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi (bitmap fonts for X11)
font-bh-lucidatypewriter-75dpi:
font-bh-lucidatypewriter-75dpi: font-bh-lucidatypewriter-75dpi is part of X11.
font-bh-lucidatypewriter-75dpi:
diff --git a/source/x/x11/slack-desc/font-bh-ttf b/source/x/x11/slack-desc/font-bh-ttf
index 5965002dc..2d6955625 100644
--- a/source/x/x11/slack-desc/font-bh-ttf
+++ b/source/x/x11/slack-desc/font-bh-ttf
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bh-ttf: font-bh-ttf
+font-bh-ttf: font-bh-ttf (scalable fonts for X11)
font-bh-ttf:
font-bh-ttf: font-bh-ttf is part of X11.
font-bh-ttf:
diff --git a/source/x/x11/slack-desc/font-bh-type1 b/source/x/x11/slack-desc/font-bh-type1
index eb61ed80b..7d988cd33 100644
--- a/source/x/x11/slack-desc/font-bh-type1
+++ b/source/x/x11/slack-desc/font-bh-type1
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bh-type1: font-bh-type1
+font-bh-type1: font-bh-type1 (scalable fonts for X11)
font-bh-type1:
font-bh-type1: font-bh-type1 is part of X11.
font-bh-type1:
diff --git a/source/x/x11/slack-desc/font-bitstream-100dpi b/source/x/x11/slack-desc/font-bitstream-100dpi
index 3ebccefc2..d2461bb0a 100644
--- a/source/x/x11/slack-desc/font-bitstream-100dpi
+++ b/source/x/x11/slack-desc/font-bitstream-100dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bitstream-100dpi: font-bitstream-100dpi
+font-bitstream-100dpi: font-bitstream-100dpi (bitmap fonts for X11)
font-bitstream-100dpi:
font-bitstream-100dpi: font-bitstream-100dpi is part of X11.
font-bitstream-100dpi:
diff --git a/source/x/x11/slack-desc/font-bitstream-75dpi b/source/x/x11/slack-desc/font-bitstream-75dpi
index 49b1f2627..8604be9f8 100644
--- a/source/x/x11/slack-desc/font-bitstream-75dpi
+++ b/source/x/x11/slack-desc/font-bitstream-75dpi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bitstream-75dpi: font-bitstream-75dpi
+font-bitstream-75dpi: font-bitstream-75dpi (bitmap fonts for X11)
font-bitstream-75dpi:
font-bitstream-75dpi: font-bitstream-75dpi is part of X11.
font-bitstream-75dpi:
diff --git a/source/x/x11/slack-desc/font-bitstream-speedo b/source/x/x11/slack-desc/font-bitstream-speedo
index f5db39e8c..51236f964 100644
--- a/source/x/x11/slack-desc/font-bitstream-speedo
+++ b/source/x/x11/slack-desc/font-bitstream-speedo
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bitstream-speedo: font-bitstream-speedo
+font-bitstream-speedo: font-bitstream-speedo (scalable fonts for X11)
font-bitstream-speedo:
font-bitstream-speedo: font-bitstream-speedo is part of X11.
font-bitstream-speedo:
diff --git a/source/x/x11/slack-desc/font-bitstream-type1 b/source/x/x11/slack-desc/font-bitstream-type1
index c2c8c89c7..ce26f50a1 100644
--- a/source/x/x11/slack-desc/font-bitstream-type1
+++ b/source/x/x11/slack-desc/font-bitstream-type1
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-bitstream-type1: font-bitstream-type1
+font-bitstream-type1: font-bitstream-type1 (scalable fonts for X11)
font-bitstream-type1:
font-bitstream-type1: font-bitstream-type1 is part of X11.
font-bitstream-type1:
diff --git a/source/x/x11/slack-desc/font-cronyx-cyrillic b/source/x/x11/slack-desc/font-cronyx-cyrillic
index 1d8aa0cd9..5e5dd4f83 100644
--- a/source/x/x11/slack-desc/font-cronyx-cyrillic
+++ b/source/x/x11/slack-desc/font-cronyx-cyrillic
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-cronyx-cyrillic: font-cronyx-cyrillic
+font-cronyx-cyrillic: font-cronyx-cyrillic (bitmap fonts for X11)
font-cronyx-cyrillic:
font-cronyx-cyrillic: font-cronyx-cyrillic is part of X11.
font-cronyx-cyrillic:
diff --git a/source/x/x11/slack-desc/font-cursor-misc b/source/x/x11/slack-desc/font-cursor-misc
index 846a7ee5b..99b22e06c 100644
--- a/source/x/x11/slack-desc/font-cursor-misc
+++ b/source/x/x11/slack-desc/font-cursor-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-cursor-misc: font-cursor-misc
+font-cursor-misc: font-cursor-misc (bitmap fonts for X11)
font-cursor-misc:
font-cursor-misc: font-cursor-misc is part of X11.
font-cursor-misc:
diff --git a/source/x/x11/slack-desc/font-daewoo-misc b/source/x/x11/slack-desc/font-daewoo-misc
index ea2a14fe2..82cedda06 100644
--- a/source/x/x11/slack-desc/font-daewoo-misc
+++ b/source/x/x11/slack-desc/font-daewoo-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-daewoo-misc: font-daewoo-misc
+font-daewoo-misc: font-daewoo-misc (bitmap fonts for X11)
font-daewoo-misc:
font-daewoo-misc: font-daewoo-misc is part of X11.
font-daewoo-misc:
diff --git a/source/x/x11/slack-desc/font-dec-misc b/source/x/x11/slack-desc/font-dec-misc
index 9f1f8457d..be0b1bea9 100644
--- a/source/x/x11/slack-desc/font-dec-misc
+++ b/source/x/x11/slack-desc/font-dec-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-dec-misc: font-dec-misc
+font-dec-misc: font-dec-misc (bitmap fonts for X11)
font-dec-misc:
font-dec-misc: font-dec-misc is part of X11.
font-dec-misc:
diff --git a/source/x/x11/slack-desc/font-ibm-type1 b/source/x/x11/slack-desc/font-ibm-type1
index 773d7c57c..44388e4e9 100644
--- a/source/x/x11/slack-desc/font-ibm-type1
+++ b/source/x/x11/slack-desc/font-ibm-type1
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-ibm-type1: font-ibm-type1
+font-ibm-type1: font-ibm-type1 (scalable fonts for X11)
font-ibm-type1:
font-ibm-type1: font-ibm-type1 is part of X11.
font-ibm-type1:
diff --git a/source/x/x11/slack-desc/font-isas-misc b/source/x/x11/slack-desc/font-isas-misc
index 2be2ce734..437bb4238 100644
--- a/source/x/x11/slack-desc/font-isas-misc
+++ b/source/x/x11/slack-desc/font-isas-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-isas-misc: font-isas-misc
+font-isas-misc: font-isas-misc (bitmap fonts for X11)
font-isas-misc:
font-isas-misc: font-isas-misc is part of X11.
font-isas-misc:
diff --git a/source/x/x11/slack-desc/font-jis-misc b/source/x/x11/slack-desc/font-jis-misc
index bbdf362e4..6541bbcdd 100644
--- a/source/x/x11/slack-desc/font-jis-misc
+++ b/source/x/x11/slack-desc/font-jis-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-jis-misc: font-jis-misc
+font-jis-misc: font-jis-misc (bitmap fonts for X11)
font-jis-misc:
font-jis-misc: font-jis-misc is part of X11.
font-jis-misc:
diff --git a/source/x/x11/slack-desc/font-micro-misc b/source/x/x11/slack-desc/font-micro-misc
index f26eae31d..aa2a38956 100644
--- a/source/x/x11/slack-desc/font-micro-misc
+++ b/source/x/x11/slack-desc/font-micro-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-micro-misc: font-micro-misc
+font-micro-misc: font-micro-misc (bitmap fonts for X11)
font-micro-misc:
font-micro-misc: font-micro-misc is part of X11.
font-micro-misc:
diff --git a/source/x/x11/slack-desc/font-misc-cyrillic b/source/x/x11/slack-desc/font-misc-cyrillic
index 4e443cbab..8317cb636 100644
--- a/source/x/x11/slack-desc/font-misc-cyrillic
+++ b/source/x/x11/slack-desc/font-misc-cyrillic
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-misc-cyrillic: font-misc-cyrillic
+font-misc-cyrillic: font-misc-cyrillic (bitmap fonts for X11)
font-misc-cyrillic:
font-misc-cyrillic: font-misc-cyrillic is part of X11.
font-misc-cyrillic:
diff --git a/source/x/x11/slack-desc/font-misc-ethiopic b/source/x/x11/slack-desc/font-misc-ethiopic
index edaa22784..16f735a28 100644
--- a/source/x/x11/slack-desc/font-misc-ethiopic
+++ b/source/x/x11/slack-desc/font-misc-ethiopic
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-misc-ethiopic: font-misc-ethiopic
+font-misc-ethiopic: font-misc-ethiopic (bitmap fonts for X11)
font-misc-ethiopic:
font-misc-ethiopic: font-misc-ethiopic is part of X11.
font-misc-ethiopic:
diff --git a/source/x/x11/slack-desc/font-misc-meltho b/source/x/x11/slack-desc/font-misc-meltho
index a30da3d02..7af6d1bac 100644
--- a/source/x/x11/slack-desc/font-misc-meltho
+++ b/source/x/x11/slack-desc/font-misc-meltho
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-misc-meltho: font-misc-meltho
+font-misc-meltho: font-misc-meltho (bitmap fonts for X11)
font-misc-meltho:
font-misc-meltho: font-misc-meltho is part of X11.
font-misc-meltho:
diff --git a/source/x/x11/slack-desc/font-misc-misc b/source/x/x11/slack-desc/font-misc-misc
index 99c7d8ae1..bdf59a802 100644
--- a/source/x/x11/slack-desc/font-misc-misc
+++ b/source/x/x11/slack-desc/font-misc-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-misc-misc: font-misc-misc
+font-misc-misc: font-misc-misc (bitmap fonts for X11)
font-misc-misc:
font-misc-misc: font-misc-misc is part of X11.
font-misc-misc:
diff --git a/source/x/x11/slack-desc/font-mutt-misc b/source/x/x11/slack-desc/font-mutt-misc
index f1f7a248e..c273a72b0 100644
--- a/source/x/x11/slack-desc/font-mutt-misc
+++ b/source/x/x11/slack-desc/font-mutt-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-mutt-misc: font-mutt-misc
+font-mutt-misc: font-mutt-misc (bitmap fonts for X11)
font-mutt-misc:
font-mutt-misc: font-mutt-misc is part of X11.
font-mutt-misc:
diff --git a/source/x/x11/slack-desc/font-schumacher-misc b/source/x/x11/slack-desc/font-schumacher-misc
index 4d7c58b0a..55546ea42 100644
--- a/source/x/x11/slack-desc/font-schumacher-misc
+++ b/source/x/x11/slack-desc/font-schumacher-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-schumacher-misc: font-schumacher-misc
+font-schumacher-misc: font-schumacher-misc (bitmap fonts for X11)
font-schumacher-misc:
font-schumacher-misc: font-schumacher-misc is part of X11.
font-schumacher-misc:
diff --git a/source/x/x11/slack-desc/font-screen-cyrillic b/source/x/x11/slack-desc/font-screen-cyrillic
index 9d65d38d6..b60e6da45 100644
--- a/source/x/x11/slack-desc/font-screen-cyrillic
+++ b/source/x/x11/slack-desc/font-screen-cyrillic
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-screen-cyrillic: font-screen-cyrillic
+font-screen-cyrillic: font-screen-cyrillic (bitmap fonts for X11)
font-screen-cyrillic:
font-screen-cyrillic: font-screen-cyrillic is part of X11.
font-screen-cyrillic:
diff --git a/source/x/x11/slack-desc/font-sony-misc b/source/x/x11/slack-desc/font-sony-misc
index 8fc8b85ee..8a539888e 100644
--- a/source/x/x11/slack-desc/font-sony-misc
+++ b/source/x/x11/slack-desc/font-sony-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-sony-misc: font-sony-misc
+font-sony-misc: font-sony-misc (bitmap fonts for X11)
font-sony-misc:
font-sony-misc: font-sony-misc is part of X11.
font-sony-misc:
diff --git a/source/x/x11/slack-desc/font-sun-misc b/source/x/x11/slack-desc/font-sun-misc
index d2fd1a338..d941087db 100644
--- a/source/x/x11/slack-desc/font-sun-misc
+++ b/source/x/x11/slack-desc/font-sun-misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-sun-misc: font-sun-misc
+font-sun-misc: font-sun-misc (bitmap fonts for X11)
font-sun-misc:
font-sun-misc: font-sun-misc is part of X11.
font-sun-misc:
diff --git a/source/x/x11/slack-desc/font-util b/source/x/x11/slack-desc/font-util
index 4c6a2b2ab..05e2f0541 100644
--- a/source/x/x11/slack-desc/font-util
+++ b/source/x/x11/slack-desc/font-util
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-util: font-util
+font-util: font-util (X.Org font package creation/installation utilities)
font-util:
font-util: font-util is part of X11.
font-util:
diff --git a/source/x/x11/slack-desc/font-winitzki-cyrillic b/source/x/x11/slack-desc/font-winitzki-cyrillic
index c278dfffd..573c09fd9 100644
--- a/source/x/x11/slack-desc/font-winitzki-cyrillic
+++ b/source/x/x11/slack-desc/font-winitzki-cyrillic
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-winitzki-cyrillic: font-winitzki-cyrillic
+font-winitzki-cyrillic: font-winitzki-cyrillic (bitmap fonts for X11)
font-winitzki-cyrillic:
font-winitzki-cyrillic: font-winitzki-cyrillic is part of X11.
font-winitzki-cyrillic:
diff --git a/source/x/x11/slack-desc/font-xfree86-type1 b/source/x/x11/slack-desc/font-xfree86-type1
index 57ab76c60..1e70a7d48 100644
--- a/source/x/x11/slack-desc/font-xfree86-type1
+++ b/source/x/x11/slack-desc/font-xfree86-type1
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-font-xfree86-type1: font-xfree86-type1
+font-xfree86-type1: font-xfree86-type1 (scalable fonts for X11)
font-xfree86-type1:
font-xfree86-type1: font-xfree86-type1 is part of X11.
font-xfree86-type1:
diff --git a/source/x/x11/slack-desc/fontcacheproto b/source/x/x11/slack-desc/fontcacheproto
index 8388f4c35..eaec530c1 100644
--- a/source/x/x11/slack-desc/fontcacheproto
+++ b/source/x/x11/slack-desc/fontcacheproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-fontcacheproto: fontcacheproto
+fontcacheproto: fontcacheproto (C prototypes for X11 Font Cache Extension)
fontcacheproto:
fontcacheproto: fontcacheproto is part of X11.
fontcacheproto:
diff --git a/source/x/x11/slack-desc/fontsproto b/source/x/x11/slack-desc/fontsproto
index 7f5c20a2d..a46da2983 100644
--- a/source/x/x11/slack-desc/fontsproto
+++ b/source/x/x11/slack-desc/fontsproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-fontsproto: fontsproto
+fontsproto: fontsproto (C prototypes for X11 X Fonts Extension)
fontsproto:
fontsproto: fontsproto is part of X11.
fontsproto:
diff --git a/source/x/x11/slack-desc/fonttosfnt b/source/x/x11/slack-desc/fonttosfnt
index 158fe2e3f..1f8097346 100644
--- a/source/x/x11/slack-desc/fonttosfnt
+++ b/source/x/x11/slack-desc/fonttosfnt
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-fonttosfnt: fonttosfnt
+fonttosfnt: fonttosfnt (utility to wrap a bitmap font in a sfnt wrapper)
fonttosfnt:
fonttosfnt: fonttosfnt is part of X11.
fonttosfnt:
diff --git a/source/x/x11/slack-desc/fslsfonts b/source/x/x11/slack-desc/fslsfonts
index ca4c416f6..53957d1a4 100644
--- a/source/x/x11/slack-desc/fslsfonts
+++ b/source/x/x11/slack-desc/fslsfonts
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-fslsfonts: fslsfonts
+fslsfonts: fslsfonts (produces a list of fonts served by an X font server)
fslsfonts:
fslsfonts: fslsfonts is part of X11.
fslsfonts:
diff --git a/source/x/x11/slack-desc/fstobdf b/source/x/x11/slack-desc/fstobdf
index ada9e2ac9..4a28eb7ba 100644
--- a/source/x/x11/slack-desc/fstobdf
+++ b/source/x/x11/slack-desc/fstobdf
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-fstobdf: fstobdf
+fstobdf: fstobdf (copy fonts from an X11 font server)
fstobdf:
-fstobdf: fstobdf is part of X11.
+fstobdf: The fstobdf program reads a font from a font server and prints a BDF
+fstobdf: file on the standard output that may be used to recreate the font.
+fstobdf: This is useful in testing servers, debugging font metrics, and
+fstobdf: reproducing lost BDF files.
fstobdf:
-fstobdf: For more information about the X.Org Foundation (the providers of the
-fstobdf: X.Org implementation of the X Window System), see their website:
fstobdf:
-fstobdf: http://www.x.org
fstobdf:
fstobdf:
fstobdf:
diff --git a/source/x/x11/slack-desc/gccmakedep b/source/x/x11/slack-desc/gccmakedep
index 1220112e0..21db55cda 100644
--- a/source/x/x11/slack-desc/gccmakedep
+++ b/source/x/x11/slack-desc/gccmakedep
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-gccmakedep: gccmakedep
+gccmakedep: gccmakedep (create dependencies in makefiles)
gccmakedep:
gccmakedep: gccmakedep is part of X11.
gccmakedep:
diff --git a/source/x/x11/slack-desc/glproto b/source/x/x11/slack-desc/glproto
index 2c2ddb6f4..6d0b506a6 100644
--- a/source/x/x11/slack-desc/glproto
+++ b/source/x/x11/slack-desc/glproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-glproto: glproto
+glproto: glproto (C prototypes for X11 OpenGL Extension)
glproto:
glproto: glproto is part of X11.
glproto:
diff --git a/source/x/x11/slack-desc/iceauth b/source/x/x11/slack-desc/iceauth
index 17b0197f8..54f525d6a 100644
--- a/source/x/x11/slack-desc/iceauth
+++ b/source/x/x11/slack-desc/iceauth
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-iceauth: iceauth
+iceauth: iceauth (display/edit ICE authorization information)
+iceauth:
+iceauth: The iceauth program is used to edit and display the authorization
+iceauth: information used in connecting with ICE. It operates very much like
+iceauth: the xauth program for X11 connection authentication records.
iceauth:
-iceauth: iceauth is part of X11.
iceauth:
-iceauth: For more information about the X.Org Foundation (the providers of the
-iceauth: X.Org implementation of the X Window System), see their website:
iceauth:
-iceauth: http://www.x.org
iceauth:
iceauth:
iceauth:
diff --git a/source/x/x11/slack-desc/ico b/source/x/x11/slack-desc/ico
index 025dd68cf..b4aeb4a5d 100644
--- a/source/x/x11/slack-desc/ico
+++ b/source/x/x11/slack-desc/ico
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-ico: ico
+ico: ico (X11 test client)
ico:
-ico: ico is part of X11.
+ico: ico is a simple animation program that may be used for testing various
+ico: X11 operations and extensions. It displays a wire-frame rotating
+ico: polyhedron, with hidden lines removed, or a solid-fill polyhedron
+ico: with hidden faces removed.
ico:
-ico: For more information about the X.Org Foundation (the providers of the
-ico: X.Org implementation of the X Window System), see their website:
ico:
-ico: http://www.x.org
ico:
ico:
ico:
diff --git a/source/x/x11/slack-desc/imake b/source/x/x11/slack-desc/imake
index 8b1d56313..53599ebfe 100644
--- a/source/x/x11/slack-desc/imake
+++ b/source/x/x11/slack-desc/imake
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-imake: imake
+imake: imake (C preprocessor interface to the make utility)
+imake:
+imake: The imake package contains the imake utility, plus the following
+imake: support programs: ccmakedep, mergelib, revpath, mkdirhier, makeg,
+imake: cleanlinks, mkhtmlindex, xmkmf
imake:
-imake: imake is part of X11.
imake:
-imake: For more information about the X.Org Foundation (the providers of the
-imake: X.Org implementation of the X Window System), see their website:
imake:
-imake: http://www.x.org
imake:
imake:
imake:
diff --git a/source/x/x11/slack-desc/inputproto b/source/x/x11/slack-desc/inputproto
index 6b9a33024..d5e586792 100644
--- a/source/x/x11/slack-desc/inputproto
+++ b/source/x/x11/slack-desc/inputproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-inputproto: inputproto
+inputproto: inputproto (C prototypes for X Input extension)
inputproto:
inputproto: inputproto is part of X11.
inputproto:
diff --git a/source/x/x11/slack-desc/intel-gpu-tools b/source/x/x11/slack-desc/intel-gpu-tools
index b9cdf7c15..3fcee9a3d 100644
--- a/source/x/x11/slack-desc/intel-gpu-tools
+++ b/source/x/x11/slack-desc/intel-gpu-tools
@@ -7,13 +7,13 @@
|-----handy-ruler------------------------------------------------------|
intel-gpu-tools: intel-gpu-tools (Intel DRM Driver Testing Tools)
-intel-gpu-tools:
-intel-gpu-tools: This is a collection of tools for development and testing of the Intel
-intel-gpu-tools: DRM driver. There are many macro-level test suites including xtest,
-intel-gpu-tools: rendercheck, piglit, and oglconform.
-intel-gpu-tools:
-intel-gpu-tools:
-intel-gpu-tools:
-intel-gpu-tools:
-intel-gpu-tools:
-intel-gpu-tools:
+intel-gpu-tools:
+intel-gpu-tools: This is a collection of tools for development and testing of the
+intel-gpu-tools: Intel DRM driver. There are many macro-level test suites including
+intel-gpu-tools: xtest, rendercheck, piglit, and oglconform.
+intel-gpu-tools:
+intel-gpu-tools:
+intel-gpu-tools:
+intel-gpu-tools:
+intel-gpu-tools:
+intel-gpu-tools:
diff --git a/source/x/x11/slack-desc/kbproto b/source/x/x11/slack-desc/kbproto
index c9703ab3a..822d8cfd5 100644
--- a/source/x/x11/slack-desc/kbproto
+++ b/source/x/x11/slack-desc/kbproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-kbproto: kbproto
+kbproto: kbproto (C prototypes for X11 X Keyboard Extension)
kbproto:
kbproto: kbproto is part of X11.
kbproto:
diff --git a/source/x/x11/slack-desc/libAppleWM b/source/x/x11/slack-desc/libAppleWM
deleted file mode 100644
index d55625101..000000000
--- a/source/x/x11/slack-desc/libAppleWM
+++ /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------------------------------------------------------|
-libAppleWM: libAppleWM
-libAppleWM:
-libAppleWM: libAppleWM is part of X11.
-libAppleWM:
-libAppleWM: For more information about the X.Org Foundation (the providers of the
-libAppleWM: X.Org implementation of the X Window System), see their website:
-libAppleWM:
-libAppleWM: http://www.x.org
-libAppleWM:
-libAppleWM:
-libAppleWM:
diff --git a/source/x/x11/slack-desc/libFS b/source/x/x11/slack-desc/libFS
index 6fe37f3e5..6554f511e 100644
--- a/source/x/x11/slack-desc/libFS
+++ b/source/x/x11/slack-desc/libFS
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libFS: libFS
+libFS: libFS (X Font Service client library)
libFS:
libFS: libFS is part of X11.
libFS:
diff --git a/source/x/x11/slack-desc/libICE b/source/x/x11/slack-desc/libICE
index 78a4761c9..47b74926f 100644
--- a/source/x/x11/slack-desc/libICE
+++ b/source/x/x11/slack-desc/libICE
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libICE: libICE
+libICE: libICE (X Inter-Client Exchange Library)
libICE:
libICE: libICE is part of X11.
libICE:
diff --git a/source/x/x11/slack-desc/libSM b/source/x/x11/slack-desc/libSM
index 06803b32e..192929001 100644
--- a/source/x/x11/slack-desc/libSM
+++ b/source/x/x11/slack-desc/libSM
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libSM: libSM
+libSM: libSM (X Session Management Library)
libSM:
libSM: libSM is part of X11.
libSM:
diff --git a/source/x/x11/slack-desc/libWindowsWM b/source/x/x11/slack-desc/libWindowsWM
deleted file mode 100644
index 162e44bee..000000000
--- a/source/x/x11/slack-desc/libWindowsWM
+++ /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------------------------------------------------------|
-libWindowsWM: libWindowsWM
-libWindowsWM:
-libWindowsWM: libWindowsWM is part of X11.
-libWindowsWM:
-libWindowsWM: For more information about the X.Org Foundation (the providers of the
-libWindowsWM: X.Org implementation of the X Window System), see their website:
-libWindowsWM:
-libWindowsWM: http://www.x.org
-libWindowsWM:
-libWindowsWM:
-libWindowsWM:
diff --git a/source/x/x11/slack-desc/libX11 b/source/x/x11/slack-desc/libX11
index e7f012739..2ec4f39a3 100644
--- a/source/x/x11/slack-desc/libX11
+++ b/source/x/x11/slack-desc/libX11
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libX11: libX11
+libX11: libX11 (Core X11 protocol client library)
libX11:
libX11: libX11 is part of X11.
libX11:
diff --git a/source/x/x11/slack-desc/libXScrnSaver b/source/x/x11/slack-desc/libXScrnSaver
index dea8d8649..ae6eea7c5 100644
--- a/source/x/x11/slack-desc/libXScrnSaver
+++ b/source/x/x11/slack-desc/libXScrnSaver
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXScrnSaver: libXScrnSaver
+libXScrnSaver: libXScrnSaver (X11 Screen Saver extension client library)
libXScrnSaver:
libXScrnSaver: libXScrnSaver is part of X11.
libXScrnSaver:
diff --git a/source/x/x11/slack-desc/libXau b/source/x/x11/slack-desc/libXau
index f2b092016..6e565d76b 100644
--- a/source/x/x11/slack-desc/libXau
+++ b/source/x/x11/slack-desc/libXau
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXau: libXau
+libXau: libXau (Sample Authorization Protocol for X)
libXau:
-libXau: libXau is part of X11.
+libXau: This is a very simple mechanism for providing individual access to
+libXau: an X Window System display.It uses existing core protocol and library
+libXau: hooks for specifying authorization data in the connection setup block
+libXau: to restrict use of the display to only those clients that show that
+libXau: they know a server-specific key called a "magic cookie."
libXau:
-libXau: For more information about the X.Org Foundation (the providers of the
-libXau: X.Org implementation of the X Window System), see their website:
-libXau:
-libXau: http://www.x.org
libXau:
libXau:
libXau:
diff --git a/source/x/x11/slack-desc/libXaw b/source/x/x11/slack-desc/libXaw
index 3174674bc..727adeac1 100644
--- a/source/x/x11/slack-desc/libXaw
+++ b/source/x/x11/slack-desc/libXaw
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXaw: libXaw
+libXaw: libXaw (client library for the X Athena Widget Set)
+libXaw:
+libXaw: Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library.
+libXaw:
+libXaw:
libXaw:
-libXaw: libXaw is part of X11.
libXaw:
-libXaw: For more information about the X.Org Foundation (the providers of the
-libXaw: X.Org implementation of the X Window System), see their website:
libXaw:
-libXaw: http://www.x.org
libXaw:
libXaw:
libXaw:
diff --git a/source/x/x11/slack-desc/libXaw3d b/source/x/x11/slack-desc/libXaw3d
new file mode 100644
index 000000000..48f7ddc32
--- /dev/null
+++ b/source/x/x11/slack-desc/libXaw3d
@@ -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------------------------------------------------------|
+libXaw3d: libXaw3d (3D enhanced version of the MIT Athena widget set)
+libXaw3d:
+libXaw3d: Xaw3d is an enhanced version of the MIT Athena Widget set for
+libXaw3d: the X Window System. Xaw3d adds a three-dimensional look to
+libXaw3d: applications with minimal or no source code changes.
+libXaw3d:
+libXaw3d: You should install Xaw3d if you are using applications which
+libXaw3d: incorporate the MIT Athena widget set and you'd like to
+libXaw3d: incorporate a 3D look into those applications.
+libXaw3d:
+libXaw3d:
diff --git a/source/x/x11/slack-desc/libXcm b/source/x/x11/slack-desc/libXcm
new file mode 100644
index 000000000..0516aaf7e
--- /dev/null
+++ b/source/x/x11/slack-desc/libXcm
@@ -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------------------------------------------------------|
+libXcm: libXcm (reference implementation of the net-color specification)
+libXcm:
+libXcm: The libXcm library is a reference implementation of the net-color
+libXcm: spec. It allows to attach color regions to X windows to communicate
+libXcm: with color servers.
+libXcm:
+libXcm:
+libXcm:
+libXcm:
+libXcm:
+libXcm:
diff --git a/source/x/x11/slack-desc/libXcomposite b/source/x/x11/slack-desc/libXcomposite
index 2fcbe0699..cf43dc4f0 100644
--- a/source/x/x11/slack-desc/libXcomposite
+++ b/source/x/x11/slack-desc/libXcomposite
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXcomposite: libXcomposite
+libXcomposite: libXcomposite (client library for the X Composite extension)
libXcomposite:
libXcomposite: libXcomposite is part of X11.
libXcomposite:
diff --git a/source/x/x11/slack-desc/libXcursor b/source/x/x11/slack-desc/libXcursor
index 1e9116484..2906c6aaf 100644
--- a/source/x/x11/slack-desc/libXcursor
+++ b/source/x/x11/slack-desc/libXcursor
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXcursor: libXcursor
+libXcursor: libXcursor (X Window System Cursor management library)
libXcursor:
libXcursor: libXcursor is part of X11.
libXcursor:
diff --git a/source/x/x11/slack-desc/libXdamage b/source/x/x11/slack-desc/libXdamage
index 58f917df5..05c618bf4 100644
--- a/source/x/x11/slack-desc/libXdamage
+++ b/source/x/x11/slack-desc/libXdamage
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXdamage: libXdamage
+libXdamage: libXdamage (client library for the X Damage Extension)
libXdamage:
libXdamage: libXdamage is part of X11.
libXdamage:
diff --git a/source/x/x11/slack-desc/libXdmcp b/source/x/x11/slack-desc/libXdmcp
index fc03f5bb3..f3dc23967 100644
--- a/source/x/x11/slack-desc/libXdmcp
+++ b/source/x/x11/slack-desc/libXdmcp
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXdmcp: libXdmcp
+libXdmcp: libXdmcp (X Display Manager Control Protocol library)
libXdmcp:
libXdmcp: libXdmcp is part of X11.
libXdmcp:
diff --git a/source/x/x11/slack-desc/libXevie b/source/x/x11/slack-desc/libXevie
index c97015924..2af8d8755 100644
--- a/source/x/x11/slack-desc/libXevie
+++ b/source/x/x11/slack-desc/libXevie
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXevie: libXevie
+libXevie: libXevie (X Event Interception Extension (XEvIE) library)
libXevie:
libXevie: libXevie is part of X11.
libXevie:
diff --git a/source/x/x11/slack-desc/libXext b/source/x/x11/slack-desc/libXext
index cb5b395b4..a636363a5 100644
--- a/source/x/x11/slack-desc/libXext
+++ b/source/x/x11/slack-desc/libXext
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXext: libXext
+libXext: libXext (library for common extensions to the X11 protocol)
libXext:
libXext: libXext is part of X11.
libXext:
diff --git a/source/x/x11/slack-desc/libXfixes b/source/x/x11/slack-desc/libXfixes
index 9b6b9df7a..3c44fa46f 100644
--- a/source/x/x11/slack-desc/libXfixes
+++ b/source/x/x11/slack-desc/libXfixes
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXfixes: libXfixes
+libXfixes: libXfixes (client library for the Xfixes extension)
libXfixes:
libXfixes: libXfixes is part of X11.
libXfixes:
diff --git a/source/x/x11/slack-desc/libXfont b/source/x/x11/slack-desc/libXfont
index 109b391c6..d78d6a0e9 100644
--- a/source/x/x11/slack-desc/libXfont
+++ b/source/x/x11/slack-desc/libXfont
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXfont: libXfont
+libXfont: libXfont (library for legacy X11 font system)
libXfont:
-libXfont: libXfont is part of X11.
-libXfont:
-libXfont: For more information about the X.Org Foundation (the providers of the
-libXfont: X.Org implementation of the X Window System), see their website:
-libXfont:
-libXfont: http://www.x.org
+libXfont: libXfont provides the core of the legacy X11 font system, handling the
+libXfont: index files (fonts.dir, fonts.alias, fonts.scale), the various font
+libXfont: file formats, and rasterizing them. It is used by the X servers, the
+libXfont: X Font Server (xfs), and some font utilities (bdftopcf for instance),
+libXfont: but should not be used by normal X11 clients. X11 clients access fonts
+libXfont: via either the new API's in libXft, or the legacy API's in libX11.
libXfont:
libXfont:
libXfont:
diff --git a/source/x/x11/slack-desc/libXfontcache b/source/x/x11/slack-desc/libXfontcache
index 735bdaa77..fdf8ca36d 100644
--- a/source/x/x11/slack-desc/libXfontcache
+++ b/source/x/x11/slack-desc/libXfontcache
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXfontcache: libXfontcache
+libXfontcache: libXfontcache (X-TrueType font cache extension client library)
libXfontcache:
libXfontcache: libXfontcache is part of X11.
libXfontcache:
diff --git a/source/x/x11/slack-desc/libXft b/source/x/x11/slack-desc/libXft
index a87a87d46..856e28281 100644
--- a/source/x/x11/slack-desc/libXft
+++ b/source/x/x11/slack-desc/libXft
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXft: libXft
+libXft: libXft (X FreeType library)
libXft:
libXft: libXft is part of X11.
libXft:
diff --git a/source/x/x11/slack-desc/libXi b/source/x/x11/slack-desc/libXi
index f3f0c633c..4585f82e1 100644
--- a/source/x/x11/slack-desc/libXi
+++ b/source/x/x11/slack-desc/libXi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXi: libXi
+libXi: libXi (library for the X Input Extension)
libXi:
libXi: libXi is part of X11.
libXi:
diff --git a/source/x/x11/slack-desc/libXinerama b/source/x/x11/slack-desc/libXinerama
index e01ab025c..3b16b81f7 100644
--- a/source/x/x11/slack-desc/libXinerama
+++ b/source/x/x11/slack-desc/libXinerama
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXinerama: libXinerama
+libXinerama: libXinerama (library for Xinerama extension to X11 Protocol)
libXinerama:
libXinerama: libXinerama is part of X11.
libXinerama:
diff --git a/source/x/x11/slack-desc/libXmu b/source/x/x11/slack-desc/libXmu
index dd6aff00c..de36044c5 100644
--- a/source/x/x11/slack-desc/libXmu
+++ b/source/x/x11/slack-desc/libXmu
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXmu: libXmu
+libXmu: libXmu (X miscellaneous utility library)
libXmu:
-libXmu: libXmu is part of X11.
+libXmu: This library contains miscellaneous utilities and is not part of the
+libXmu: Xlib standard. It contains routines which only use public interfaces
+libXmu: so that it may be layered on top of any proprietary implementation
+libXmu: of Xlib or Xt.
libXmu:
-libXmu: For more information about the X.Org Foundation (the providers of the
-libXmu: X.Org implementation of the X Window System), see their website:
libXmu:
-libXmu: http://www.x.org
libXmu:
libXmu:
libXmu:
diff --git a/source/x/x11/slack-desc/libXp b/source/x/x11/slack-desc/libXp
index 16eb84a12..b68a66640 100644
--- a/source/x/x11/slack-desc/libXp
+++ b/source/x/x11/slack-desc/libXp
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXp: libXp
+libXp: libXp (X Print Client Library)
libXp:
libXp: libXp is part of X11.
libXp:
diff --git a/source/x/x11/slack-desc/libXpm b/source/x/x11/slack-desc/libXpm
index 82d043809..77c809a57 100644
--- a/source/x/x11/slack-desc/libXpm
+++ b/source/x/x11/slack-desc/libXpm
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXpm: libXpm
+libXpm: libXpm (X Pixmap (XPM) image file format library)
libXpm:
libXpm: libXpm is part of X11.
libXpm:
diff --git a/source/x/x11/slack-desc/libXrandr b/source/x/x11/slack-desc/libXrandr
index c86d49abc..ad2e243b8 100644
--- a/source/x/x11/slack-desc/libXrandr
+++ b/source/x/x11/slack-desc/libXrandr
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXrandr: libXrandr
+libXrandr: libXrandr (X Resize, Rotate and Reflection extension library)
libXrandr:
libXrandr: libXrandr is part of X11.
libXrandr:
diff --git a/source/x/x11/slack-desc/libXrender b/source/x/x11/slack-desc/libXrender
index fe9f3b543..c5fe72697 100644
--- a/source/x/x11/slack-desc/libXrender
+++ b/source/x/x11/slack-desc/libXrender
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXrender: libXrender
+libXrender: libXrender (library for the Render Extension to the X11 protocol)
libXrender:
libXrender: libXrender is part of X11.
libXrender:
diff --git a/source/x/x11/slack-desc/libXres b/source/x/x11/slack-desc/libXres
index 783719f2d..4582cd5f9 100644
--- a/source/x/x11/slack-desc/libXres
+++ b/source/x/x11/slack-desc/libXres
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXres: libXres
+libXres: libXres (X-Resource extension client library)
libXres:
libXres: libXres is part of X11.
libXres:
diff --git a/source/x/x11/slack-desc/libXt b/source/x/x11/slack-desc/libXt
index 9a03bd981..3b8df4b03 100644
--- a/source/x/x11/slack-desc/libXt
+++ b/source/x/x11/slack-desc/libXt
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXt: libXt
+libXt: libXt (X Toolkit Intrinsics library)
libXt:
libXt: libXt is part of X11.
libXt:
diff --git a/source/x/x11/slack-desc/libXtst b/source/x/x11/slack-desc/libXtst
index f71c8475e..63b93c019 100644
--- a/source/x/x11/slack-desc/libXtst
+++ b/source/x/x11/slack-desc/libXtst
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXtst: libXtst
+libXtst: libXtst (client library for the XTEST & RECORD extensions)
libXtst:
libXtst: libXtst is part of X11.
libXtst:
diff --git a/source/x/x11/slack-desc/libXv b/source/x/x11/slack-desc/libXv
index 3bfe02990..d72865bf0 100644
--- a/source/x/x11/slack-desc/libXv
+++ b/source/x/x11/slack-desc/libXv
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXv: libXv
+libXv: libXv (library for the X Video (Xv) extension to the X Window System)
libXv:
libXv: libXv is part of X11.
libXv:
diff --git a/source/x/x11/slack-desc/libXvMC b/source/x/x11/slack-desc/libXvMC
index 5557fdb84..aecd7f3aa 100644
--- a/source/x/x11/slack-desc/libXvMC
+++ b/source/x/x11/slack-desc/libXvMC
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXvMC: libXvMC
+libXvMC: libXvMC (X.Org X11 libXvMC runtime library)
libXvMC:
libXvMC: libXvMC is part of X11.
libXvMC:
diff --git a/source/x/x11/slack-desc/libXxf86dga b/source/x/x11/slack-desc/libXxf86dga
index 99492bc2a..88023255e 100644
--- a/source/x/x11/slack-desc/libXxf86dga
+++ b/source/x/x11/slack-desc/libXxf86dga
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXxf86dga: libXxf86dga
+libXxf86dga: libXxf86dga (client library for the XFree86-DGA extension)
libXxf86dga:
libXxf86dga: libXxf86dga is part of X11.
libXxf86dga:
diff --git a/source/x/x11/slack-desc/libXxf86misc b/source/x/x11/slack-desc/libXxf86misc
index 8c69dedb9..ccc2c29b3 100644
--- a/source/x/x11/slack-desc/libXxf86misc
+++ b/source/x/x11/slack-desc/libXxf86misc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXxf86misc: libXxf86misc
+libXxf86misc: libXxf86misc (Extension library for the XFree86-Misc X extension)
libXxf86misc:
libXxf86misc: libXxf86misc is part of X11.
libXxf86misc:
diff --git a/source/x/x11/slack-desc/libXxf86vm b/source/x/x11/slack-desc/libXxf86vm
index 0c4820a0d..872c89266 100644
--- a/source/x/x11/slack-desc/libXxf86vm
+++ b/source/x/x11/slack-desc/libXxf86vm
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXxf86vm: libXxf86vm
+libXxf86vm: libXxf86vm (library for the XFree86-VidMode X extension)
libXxf86vm:
libXxf86vm: libXxf86vm is part of X11.
libXxf86vm:
diff --git a/source/x/x11/slack-desc/libdmx b/source/x/x11/slack-desc/libdmx
index f757df998..893fa6702 100644
--- a/source/x/x11/slack-desc/libdmx
+++ b/source/x/x11/slack-desc/libdmx
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libdmx: libdmx
+libdmx: libdmx (DMX (Distributed Multihead X) extension library)
libdmx:
libdmx: libdmx is part of X11.
libdmx:
diff --git a/source/x/x11/slack-desc/libfontenc b/source/x/x11/slack-desc/libfontenc
index 78b26b029..0172d1ae7 100644
--- a/source/x/x11/slack-desc/libfontenc
+++ b/source/x/x11/slack-desc/libfontenc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libfontenc: libfontenc
+libfontenc: libfontenc (font encoding library)
libfontenc:
libfontenc: libfontenc is part of X11.
libfontenc:
diff --git a/source/x/x11/slack-desc/liblbxutil b/source/x/x11/slack-desc/liblbxutil
deleted file mode 100644
index 0a42196ec..000000000
--- a/source/x/x11/slack-desc/liblbxutil
+++ /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------------------------------------------------------|
-liblbxutil: liblbxutil
-liblbxutil:
-liblbxutil: liblbxutil is part of X11.
-liblbxutil:
-liblbxutil: For more information about the X.Org Foundation (the providers of the
-liblbxutil: X.Org implementation of the X Window System), see their website:
-liblbxutil:
-liblbxutil: http://www.x.org
-liblbxutil:
-liblbxutil:
-liblbxutil:
diff --git a/source/x/x11/slack-desc/libpciaccess b/source/x/x11/slack-desc/libpciaccess
index 0c499f77a..c3d6d648b 100644
--- a/source/x/x11/slack-desc/libpciaccess
+++ b/source/x/x11/slack-desc/libpciaccess
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libpciaccess: libpciaccess
+libpciaccess: libpciaccess (Generic PCI access library)
libpciaccess:
libpciaccess: libpciaccess is part of X11.
libpciaccess:
diff --git a/source/x/x11/slack-desc/libpthread-stubs b/source/x/x11/slack-desc/libpthread-stubs
index 8c0c0e5d3..e64f33d39 100644
--- a/source/x/x11/slack-desc/libpthread-stubs
+++ b/source/x/x11/slack-desc/libpthread-stubs
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libpthread-stubs: libpthread-stubs
+libpthread-stubs: libpthread-stubs (thread support stubs)
libpthread-stubs:
-libpthread-stubs: libpthread-stubs is part of X11.
+libpthread-stubs: This library provides weak aliases for pthread functions not provided
+libpthread-stubs: in libc or otherwise available by default. Libraries like libxcb rely
+libpthread-stubs: on pthread stubs to use pthreads optionally, becoming thread-safe
+libpthread-stubs: when linked to libpthread, while avoiding any performance hit when
+libpthread-stubs: running single-threaded.
libpthread-stubs:
-libpthread-stubs: For more information about the X.Org Foundation (the providers of the
-libpthread-stubs: X.Org implementation of the X Window System), see their website:
-libpthread-stubs:
-libpthread-stubs: http://www.x.org
libpthread-stubs:
libpthread-stubs:
libpthread-stubs:
diff --git a/source/x/x11/slack-desc/libxkbfile b/source/x/x11/slack-desc/libxkbfile
index ffaa00a44..fe2d59f20 100644
--- a/source/x/x11/slack-desc/libxkbfile
+++ b/source/x/x11/slack-desc/libxkbfile
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libxkbfile: libxkbfile
+libxkbfile: libxkbfile (X11 keyboard file manipulation library)
libxkbfile:
libxkbfile: libxkbfile is part of X11.
libxkbfile:
diff --git a/source/x/x11/slack-desc/listres b/source/x/x11/slack-desc/listres
index 16ae55b50..f14aa2cef 100644
--- a/source/x/x11/slack-desc/listres
+++ b/source/x/x11/slack-desc/listres
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-listres: listres
+listres: listres (X11 resource lister)
+listres:
+listres: The listres program generates a list of X resources for a widget in
+listres: an X client written using a toolkit based on libXt.
+listres:
listres:
-listres: listres is part of X11.
listres:
-listres: For more information about the X.Org Foundation (the providers of the
-listres: X.Org implementation of the X Window System), see their website:
listres:
-listres: http://www.x.org
listres:
listres:
listres:
diff --git a/source/x/x11/slack-desc/lndir b/source/x/x11/slack-desc/lndir
index 0a73ae95d..c9a27e201 100644
--- a/source/x/x11/slack-desc/lndir
+++ b/source/x/x11/slack-desc/lndir
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-lndir: lndir
+lndir: lndir (create shadow directory of symbolic links to another directory)
lndir:
lndir: lndir is part of X11.
lndir:
diff --git a/source/x/x11/slack-desc/luit b/source/x/x11/slack-desc/luit
index ab7f144f2..cd9d9664b 100644
--- a/source/x/x11/slack-desc/luit
+++ b/source/x/x11/slack-desc/luit
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-luit: luit
+luit: luit (character encoding convertor for X11 terminals)
luit:
-luit: luit is part of X11.
+luit: Luit is a filter that can be run between an arbitrary application and
+luit: a UTF-8 terminal emulator such as xterm. It will convert application
+luit: output from the locale's encoding into UTF-8, and convert terminal
+luit: input from UTF-8 into the locale's encoding.
luit:
-luit: For more information about the X.Org Foundation (the providers of the
-luit: X.Org implementation of the X Window System), see their website:
luit:
-luit: http://www.x.org
luit:
luit:
luit:
diff --git a/source/x/x11/slack-desc/makedepend b/source/x/x11/slack-desc/makedepend
index 444713af3..ec831dd4b 100644
--- a/source/x/x11/slack-desc/makedepend
+++ b/source/x/x11/slack-desc/makedepend
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-makedepend: makedepend
+makedepend: makedepend (create dependencies in makefiles)
makedepend:
makedepend: makedepend is part of X11.
makedepend:
diff --git a/source/x/x11/slack-desc/mkcomposecache b/source/x/x11/slack-desc/mkcomposecache
index c219f99fe..ed04a5547 100644
--- a/source/x/x11/slack-desc/mkcomposecache
+++ b/source/x/x11/slack-desc/mkcomposecache
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-mkcomposecache: mkcomposecache
+mkcomposecache: mkcomposecache (creates global (system-wide) Compose cache files)
mkcomposecache:
mkcomposecache: mkcomposecache is part of X11.
mkcomposecache:
diff --git a/source/x/x11/slack-desc/mkfontdir b/source/x/x11/slack-desc/mkfontdir
index 681db8f21..3f97b7e84 100644
--- a/source/x/x11/slack-desc/mkfontdir
+++ b/source/x/x11/slack-desc/mkfontdir
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-mkfontdir: mkfontdir
+mkfontdir: mkfontdir (X11 font utility)
mkfontdir:
-mkfontdir: mkfontdir is part of X11.
+mkfontdir: mkfontdir creates the fonts.dir files needed by the legacy X server
+mkfontdir: core font system. The current implementation is a simple wrapper
+mkfontdir: script around the mkfontscale program, which must be built and
+mkfontdir: installed first.
mkfontdir:
-mkfontdir: For more information about the X.Org Foundation (the providers of the
-mkfontdir: X.Org implementation of the X Window System), see their website:
mkfontdir:
-mkfontdir: http://www.x.org
mkfontdir:
mkfontdir:
mkfontdir:
diff --git a/source/x/x11/slack-desc/mkfontscale b/source/x/x11/slack-desc/mkfontscale
index 57c6f825e..176336f79 100644
--- a/source/x/x11/slack-desc/mkfontscale
+++ b/source/x/x11/slack-desc/mkfontscale
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-mkfontscale: mkfontscale
+mkfontscale: mkfontscale (X11 font utility)
+mkfontscale:
+mkfontscale: mkfontscale creates the fonts.scale and fonts.dir index files used
+mkfontscale: by the legacy X11 font system.
+mkfontscale:
mkfontscale:
-mkfontscale: mkfontscale is part of X11.
mkfontscale:
-mkfontscale: For more information about the X.Org Foundation (the providers of the
-mkfontscale: X.Org implementation of the X Window System), see their website:
mkfontscale:
-mkfontscale: http://www.x.org
mkfontscale:
mkfontscale:
mkfontscale:
diff --git a/source/x/x11/slack-desc/oclock b/source/x/x11/slack-desc/oclock
index 7e4b2acd2..1ec87ceb6 100644
--- a/source/x/x11/slack-desc/oclock
+++ b/source/x/x11/slack-desc/oclock
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-oclock: oclock
+oclock: oclock (X11 on-screen clock)
+oclock:
+oclock: oclock is a simple analog clock using the SHAPE extension to make a
+oclock: round (possibly transparent) window.
+oclock:
oclock:
-oclock: oclock is part of X11.
oclock:
-oclock: For more information about the X.Org Foundation (the providers of the
-oclock: X.Org implementation of the X Window System), see their website:
oclock:
-oclock: http://www.x.org
oclock:
oclock:
oclock:
diff --git a/source/x/x11/slack-desc/pixman b/source/x/x11/slack-desc/pixman
index 350e53dd7..73c93440d 100644
--- a/source/x/x11/slack-desc/pixman
+++ b/source/x/x11/slack-desc/pixman
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-pixman: pixman
+pixman: pixman (pixel manipulation library)
pixman:
pixman: pixman contains low-level pixel manipulation routines and is used by
pixman: both xorg and cairo.
diff --git a/source/x/x11/slack-desc/printproto b/source/x/x11/slack-desc/printproto
index 3aa4fe072..28fb1a2ae 100644
--- a/source/x/x11/slack-desc/printproto
+++ b/source/x/x11/slack-desc/printproto
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-printproto: printproto
+printproto: printproto (C prototypes for X11 Xprint extension)
+printproto:
+printproto: Xprint extension to the X11 protocol - a portable, network-transparent
+printproto: printing system
+printproto:
printproto:
-printproto: printproto is part of X11.
printproto:
-printproto: For more information about the X.Org Foundation (the providers of the
-printproto: X.Org implementation of the X Window System), see their website:
printproto:
-printproto: http://www.x.org
printproto:
printproto:
printproto:
diff --git a/source/x/x11/slack-desc/randrproto b/source/x/x11/slack-desc/randrproto
index a56827c9a..f97ca0952 100644
--- a/source/x/x11/slack-desc/randrproto
+++ b/source/x/x11/slack-desc/randrproto
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-randrproto: randrproto
+randrproto: randrproto (C prototypes for RandR)
+randrproto:
+randrproto: RandR is the X11 Resize and Rotate Extension
+randrproto:
+randrproto:
randrproto:
-randrproto: randrproto is part of X11.
randrproto:
-randrproto: For more information about the X.Org Foundation (the providers of the
-randrproto: X.Org implementation of the X Window System), see their website:
randrproto:
-randrproto: http://www.x.org
randrproto:
randrproto:
randrproto:
diff --git a/source/x/x11/slack-desc/recordproto b/source/x/x11/slack-desc/recordproto
index caecfd7e4..4fc28e900 100644
--- a/source/x/x11/slack-desc/recordproto
+++ b/source/x/x11/slack-desc/recordproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-recordproto: recordproto
+recordproto: recordproto (C prototypes for X Record Extension)
recordproto:
recordproto: recordproto is part of X11.
recordproto:
diff --git a/source/x/x11/slack-desc/rendercheck b/source/x/x11/slack-desc/rendercheck
index 9503468ee..e8a502ea7 100644
--- a/source/x/x11/slack-desc/rendercheck
+++ b/source/x/x11/slack-desc/rendercheck
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-rendercheck: rendercheck
+rendercheck: rendercheck (test X11 Render support)
+rendercheck:
+rendercheck: rendercheck is a program to test a Render extension implementation
+rendercheck: against separate calculations of expected output.
+rendercheck:
rendercheck:
-rendercheck: rendercheck is part of X11.
rendercheck:
-rendercheck: For more information about the X.Org Foundation (the providers of the
-rendercheck: X.Org implementation of the X Window System), see their website:
rendercheck:
-rendercheck: http://www.x.org
rendercheck:
rendercheck:
rendercheck:
diff --git a/source/x/x11/slack-desc/renderproto b/source/x/x11/slack-desc/renderproto
index cdc21f016..ef667f974 100644
--- a/source/x/x11/slack-desc/renderproto
+++ b/source/x/x11/slack-desc/renderproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-renderproto: renderproto
+renderproto: renderproto (C prototypes for X Rendering Extension)
renderproto:
renderproto: renderproto is part of X11.
renderproto:
diff --git a/source/x/x11/slack-desc/resourceproto b/source/x/x11/slack-desc/resourceproto
index 8303f74d4..6881a8e59 100644
--- a/source/x/x11/slack-desc/resourceproto
+++ b/source/x/x11/slack-desc/resourceproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-resourceproto: resourceproto
+resourceproto: resourceproto (C prototypes for X Resource Extension)
resourceproto:
resourceproto: resourceproto is part of X11.
resourceproto:
diff --git a/source/x/x11/slack-desc/rgb b/source/x/x11/slack-desc/rgb
index 34263a01c..f339502eb 100644
--- a/source/x/x11/slack-desc/rgb
+++ b/source/x/x11/slack-desc/rgb
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-rgb: rgb
+rgb: rgb (X color name database)
rgb:
rgb: rgb is part of X11.
rgb:
diff --git a/source/x/x11/slack-desc/scrnsaverproto b/source/x/x11/slack-desc/scrnsaverproto
index 70142f892..3218b7e7e 100644
--- a/source/x/x11/slack-desc/scrnsaverproto
+++ b/source/x/x11/slack-desc/scrnsaverproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-scrnsaverproto: scrnsaverproto
+scrnsaverproto: scrnsaverproto (C prototypes for X11 MIT Screen Saver Extension)
scrnsaverproto:
scrnsaverproto: scrnsaverproto is part of X11.
scrnsaverproto:
diff --git a/source/x/x11/slack-desc/sessreg b/source/x/x11/slack-desc/sessreg
index 8a85e3268..0da458bb0 100644
--- a/source/x/x11/slack-desc/sessreg
+++ b/source/x/x11/slack-desc/sessreg
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-sessreg: sessreg
+sessreg: sessreg (simple program for managing utmp/wtmp entries for X sessions)
+sessreg:
+sessreg: sessreg was originally written for use with xdm, but it may also be
+sessreg: used with other display managers such as gdm or kdm.
+sessreg:
sessreg:
-sessreg: sessreg is part of X11.
sessreg:
-sessreg: For more information about the X.Org Foundation (the providers of the
-sessreg: X.Org implementation of the X Window System), see their website:
sessreg:
-sessreg: http://www.x.org
sessreg:
sessreg:
sessreg:
diff --git a/source/x/x11/slack-desc/setxkbmap b/source/x/x11/slack-desc/setxkbmap
index 99beaa92a..a3b1841a9 100644
--- a/source/x/x11/slack-desc/setxkbmap
+++ b/source/x/x11/slack-desc/setxkbmap
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-setxkbmap: setxkbmap
+setxkbmap: setxkbmap (change X11 keyboard layout)
setxkbmap:
setxkbmap: setxkbmap is part of X11.
setxkbmap:
diff --git a/source/x/x11/slack-desc/showfont b/source/x/x11/slack-desc/showfont
index b53ce29ad..24665efe3 100644
--- a/source/x/x11/slack-desc/showfont
+++ b/source/x/x11/slack-desc/showfont
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-showfont: showfont
+showfont: showfont (displays data about a font from an X font server)
+showfont:
+showfont: The information shown includes font information, font properties,
+showfont: character metrics, and character bitmaps.
+showfont:
showfont:
-showfont: showfont is part of X11.
showfont:
-showfont: For more information about the X.Org Foundation (the providers of the
-showfont: X.Org implementation of the X Window System), see their website:
showfont:
-showfont: http://www.x.org
showfont:
showfont:
showfont:
diff --git a/source/x/x11/slack-desc/smproxy b/source/x/x11/slack-desc/smproxy
index a8bc5976c..c40480a91 100644
--- a/source/x/x11/slack-desc/smproxy
+++ b/source/x/x11/slack-desc/smproxy
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-smproxy: smproxy
+smproxy: smproxy (X11 session management proxy)
+smproxy:
+smproxy: smproxy allows X applications that do not support X11R6 session
+smproxy: management to participate in an X11R6 session.
+smproxy:
smproxy:
-smproxy: smproxy is part of X11.
smproxy:
-smproxy: For more information about the X.Org Foundation (the providers of the
-smproxy: X.Org implementation of the X Window System), see their website:
smproxy:
-smproxy: http://www.x.org
smproxy:
smproxy:
smproxy:
diff --git a/source/x/x11/slack-desc/constype b/source/x/x11/slack-desc/transset
index ddcf95df0..1e1128c5f 100644
--- a/source/x/x11/slack-desc/constype
+++ b/source/x/x11/slack-desc/transset
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-constype: constype
-constype:
-constype: constype is part of X11.
-constype:
-constype: For more information about the X.Org Foundation (the providers of the
-constype: X.Org implementation of the X Window System), see their website:
-constype:
-constype: http://www.x.org
-constype:
-constype:
-constype:
+transset: transset (utility for setting opacity property)
+transset:
+transset: transset is a utility for setting opacity property.
+transset:
+transset: Some of the features:
+transset: * select window by clicking (as transset)
+transset: * select actual focused X11 window
+transset: * select window by pointing
+transset: * select by window name or id
+transset: * force toggle
+transset: * increase or decrease opacity
diff --git a/source/x/x11/slack-desc/trapproto b/source/x/x11/slack-desc/trapproto
deleted file mode 100644
index 5b0a2174a..000000000
--- a/source/x/x11/slack-desc/trapproto
+++ /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------------------------------------------------------|
-trapproto: trapproto
-trapproto:
-trapproto: trapproto is part of X11.
-trapproto:
-trapproto: For more information about the X.Org Foundation (the providers of the
-trapproto: X.Org implementation of the X Window System), see their website:
-trapproto:
-trapproto: http://www.x.org
-trapproto:
-trapproto:
-trapproto:
diff --git a/source/x/x11/slack-desc/twm b/source/x/x11/slack-desc/twm
index 78c09f215..590eec460 100644
--- a/source/x/x11/slack-desc/twm
+++ b/source/x/x11/slack-desc/twm
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-twm: twm
+twm: twm (Tab Window Manager for the X Window System)
twm:
twm: twm is part of X11.
twm:
diff --git a/source/x/x11/slack-desc/util-macros b/source/x/x11/slack-desc/util-macros
index 39426633e..f339dfa8c 100644
--- a/source/x/x11/slack-desc/util-macros
+++ b/source/x/x11/slack-desc/util-macros
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-util-macros: util-macros
+util-macros: util-macros (autoconf support for X11)
+util-macros:
+util-macros: This is a set of autoconf macros used by the configure.ac scripts in
+util-macros: other Xorg modular packages, and is needed to generate new versions
+util-macros: of their configure scripts with autoconf.
util-macros:
-util-macros: util-macros is part of X11.
util-macros:
-util-macros: For more information about the X.Org Foundation (the providers of the
-util-macros: X.Org implementation of the X Window System), see their website:
util-macros:
-util-macros: http://www.x.org
util-macros:
util-macros:
util-macros:
diff --git a/source/x/x11/slack-desc/videoproto b/source/x/x11/slack-desc/videoproto
index e90690c2a..f65573bc8 100644
--- a/source/x/x11/slack-desc/videoproto
+++ b/source/x/x11/slack-desc/videoproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-videoproto: videoproto
+videoproto: videoproto (C prototypes for X Video Extension)
videoproto:
videoproto: videoproto is part of X11.
videoproto:
diff --git a/source/x/x11/slack-desc/viewres b/source/x/x11/slack-desc/viewres
index e710f02bf..05682ea7c 100644
--- a/source/x/x11/slack-desc/viewres
+++ b/source/x/x11/slack-desc/viewres
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-viewres: viewres
+viewres: viewres (view widget class hierarchy of the Athena Widget Set)
viewres:
viewres: viewres is part of X11.
viewres:
diff --git a/source/x/x11/slack-desc/x11-data b/source/x/x11/slack-desc/x11-data
deleted file mode 100644
index 0b8ef63b8..000000000
--- a/source/x/x11/slack-desc/x11-data
+++ /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------------------------------------------------------|
-x11-data: x11-data (data files used by X)
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
-x11-data:
diff --git a/source/x/x11/slack-desc/x11-font b/source/x/x11/slack-desc/x11-font
deleted file mode 100644
index b0bf50f61..000000000
--- a/source/x/x11/slack-desc/x11-font
+++ /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------------------------------------------------------|
-x11-font: x11-font (fonts for X)
-x11-font:
-x11-font: Fonts for X.
-x11-font:
-x11-font:
-x11-font:
-x11-font:
-x11-font:
-x11-font:
-x11-font:
-x11-font:
diff --git a/source/x/x11/slack-desc/x11-util b/source/x/x11/slack-desc/x11-util
deleted file mode 100644
index a5d30280d..000000000
--- a/source/x/x11/slack-desc/x11-util
+++ /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------------------------------------------------------|
-x11-util: x11-util (a set of handy utilities for X11)
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
-x11-util:
diff --git a/source/x/x11/slack-desc/x11perf b/source/x/x11/slack-desc/x11perf
index 8d6996acd..fc51a61e5 100644
--- a/source/x/x11/slack-desc/x11perf
+++ b/source/x/x11/slack-desc/x11perf
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-x11perf: x11perf
+x11perf: x11perf (X11 server performance test program)
x11perf:
x11perf: x11perf is part of X11.
x11perf:
diff --git a/source/x/x11/slack-desc/xauth b/source/x/x11/slack-desc/xauth
index 71829a5d7..837b45bb0 100644
--- a/source/x/x11/slack-desc/xauth
+++ b/source/x/x11/slack-desc/xauth
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xauth: xauth
+xauth: xauth (X11 authorization utility)
+xauth:
+xauth: The xauth program is used to edit and display the authorization
+xauth: information used in connecting to the X server.
+xauth:
xauth:
-xauth: xauth is part of X11.
xauth:
-xauth: For more information about the X.Org Foundation (the providers of the
-xauth: X.Org implementation of the X Window System), see their website:
xauth:
-xauth: http://www.x.org
xauth:
xauth:
xauth:
diff --git a/source/x/x11/slack-desc/xbacklight b/source/x/x11/slack-desc/xbacklight
index 914a6a79a..45d0a7ab6 100644
--- a/source/x/x11/slack-desc/xbacklight
+++ b/source/x/x11/slack-desc/xbacklight
@@ -5,15 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler------------------------------------------------------|
-xbacklight: xbacklight
+ |-----handy-ruler------------------------------------------------------|
+xbacklight: xbacklight (adjust the backlight brightness where supported)
+xbacklight:
+xbacklight: It uses the RandR extension to find all outputs on the X server
+xbacklight: supporting backlight brightness control and changes them all in the
+xbacklight: same way.
xbacklight:
-xbacklight: xbacklight is part of X11.
xbacklight:
-xbacklight: For more information about the X.Org Foundation (the providers of the
-xbacklight: X.Org implementation of the X Window System), see their website:
xbacklight:
-xbacklight: http://www.x.org
xbacklight:
xbacklight:
xbacklight:
diff --git a/source/x/x11/slack-desc/xbiff b/source/x/x11/slack-desc/xbiff
index ef65aff3b..289c97387 100644
--- a/source/x/x11/slack-desc/xbiff
+++ b/source/x/x11/slack-desc/xbiff
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xbiff: xbiff
+xbiff: xbiff (X11 mail notifier)
+xbiff:
+xbiff: xbiff provides graphical notification of new e-mail. It only handles
+xbiff: mail stored in a filesystem accessible file, not via IMAP, POP or
+xbiff: other remote access protocols.
xbiff:
-xbiff: xbiff is part of X11.
xbiff:
-xbiff: For more information about the X.Org Foundation (the providers of the
-xbiff: X.Org implementation of the X Window System), see their website:
xbiff:
-xbiff: http://www.x.org
xbiff:
xbiff:
xbiff:
diff --git a/source/x/x11/slack-desc/xbitmaps b/source/x/x11/slack-desc/xbitmaps
index 91b0a4d24..cdcd81490 100644
--- a/source/x/x11/slack-desc/xbitmaps
+++ b/source/x/x11/slack-desc/xbitmaps
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xbitmaps: xbitmaps
+xbitmaps: xbitmaps (miscellaneous X bitmap files)
xbitmaps:
xbitmaps: xbitmaps is part of X11.
xbitmaps:
diff --git a/source/x/x11/slack-desc/xcalc b/source/x/x11/slack-desc/xcalc
index d0f6d2e18..4e1101e6e 100644
--- a/source/x/x11/slack-desc/xcalc
+++ b/source/x/x11/slack-desc/xcalc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xcalc: xcalc
+xcalc: xcalc (X11 calculator)
+xcalc:
+xcalc: xcalc is a scientific calculator X11 client that can emulate a TI-30
+xcalc: or an HP-10C.
+xcalc:
xcalc:
-xcalc: xcalc is part of X11.
xcalc:
-xcalc: For more information about the X.Org Foundation (the providers of the
-xcalc: X.Org implementation of the X Window System), see their website:
xcalc:
-xcalc: http://www.x.org
xcalc:
xcalc:
xcalc:
diff --git a/source/x/x11/slack-desc/xcb-proto b/source/x/x11/slack-desc/xcb-proto
index 72736593d..c66b71404 100644
--- a/source/x/x11/slack-desc/xcb-proto
+++ b/source/x/x11/slack-desc/xcb-proto
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xcb-proto: xcb-proto
+xcb-proto: xcb-proto (X protocol C-language Binding protocol descriptions)
xcb-proto:
-xcb-proto: xcb-proto is part of X11.
+xcb-proto: xcb-proto provides the XML-XCB protocol descriptions that libxcb
+xcb-proto: uses to generate the majority of its code and API. We provide them
+xcb-proto: separately from libxcb to allow reuse by other projects, such as
+xcb-proto: additional language bindings, protocol dissectors, or documentation
+xcb-proto: generators.
xcb-proto:
-xcb-proto: For more information about the X.Org Foundation (the providers of the
-xcb-proto: X.Org implementation of the X Window System), see their website:
-xcb-proto:
-xcb-proto: http://www.x.org
xcb-proto:
xcb-proto:
xcb-proto:
diff --git a/source/x/x11/slack-desc/xcb-util b/source/x/x11/slack-desc/xcb-util
index 450722989..040881be5 100644
--- a/source/x/x11/slack-desc/xcb-util
+++ b/source/x/x11/slack-desc/xcb-util
@@ -5,8 +5,8 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler-------------------------------------------------------|
-xcb-util: xcb-util
+ |-----handy-ruler------------------------------------------------------|
+xcb-util: xcb-util (utility libraries for X protocol C-language Binding)
xcb-util:
xcb-util: xcb-util is part of X11.
xcb-util:
diff --git a/source/x/x11/slack-desc/xf86-input-dmc b/source/x/x11/slack-desc/xcb-util-image
index 890f92e92..ffa50aa91 100644
--- a/source/x/x11/slack-desc/xf86-input-dmc
+++ b/source/x/x11/slack-desc/xcb-util-image
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-dmc: xf86-input-dmc
-xf86-input-dmc:
-xf86-input-dmc: xf86-input-dmc is part of X11.
-xf86-input-dmc:
-xf86-input-dmc: For more information about the X.Org Foundation (the providers of the
-xf86-input-dmc: X.Org implementation of the X Window System), see their website:
-xf86-input-dmc:
-xf86-input-dmc: http://www.x.org
-xf86-input-dmc:
-xf86-input-dmc:
-xf86-input-dmc:
+xcb-util-image: xcb-util-image (port of Xlib's XImage and XShmImage functions)
+xcb-util-image:
+xcb-util-image: xcb-util-image provides a port of Xlib's XImage and XShmImage
+xcb-util-image: functions.
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
+xcb-util-image:
diff --git a/source/x/x11/slack-desc/libXprintAppUtil b/source/x/x11/slack-desc/xcb-util-keysyms
index 4ef7b3ede..a629d39eb 100644
--- a/source/x/x11/slack-desc/libXprintAppUtil
+++ b/source/x/x11/slack-desc/xcb-util-keysyms
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXprintAppUtil: libXprintAppUtil
-libXprintAppUtil:
-libXprintAppUtil: libXprintAppUtil is part of X11.
-libXprintAppUtil:
-libXprintAppUtil: For more information about the X.Org Foundation (the providers of the
-libXprintAppUtil: X.Org implementation of the X Window System), see their website:
-libXprintAppUtil:
-libXprintAppUtil: http://www.x.org
-libXprintAppUtil:
-libXprintAppUtil:
-libXprintAppUtil:
+xcb-util-keysyms: xcb-util-keysyms (keysyms library for XCB)
+xcb-util-keysyms:
+xcb-util-keysyms: xcb-util-keysyms provides the keysyms library, which handles
+xcb-util-keysyms: standard X key constants and conversion to/from keycodes.
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
+xcb-util-keysyms:
diff --git a/source/x/x11/slack-desc/xprehashprinterlist b/source/x/x11/slack-desc/xcb-util-renderutil
index 3444a5eed..1cec3346d 100644
--- a/source/x/x11/slack-desc/xprehashprinterlist
+++ b/source/x/x11/slack-desc/xcb-util-renderutil
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xprehashprinterlist: xprehashprinterlist
-xprehashprinterlist:
-xprehashprinterlist: xprehashprinterlist is part of X11.
-xprehashprinterlist:
-xprehashprinterlist: For more information about the X.Org Foundation (the providers of the
-xprehashprinterlist: X.Org implementation of the X Window System), see their website:
-xprehashprinterlist:
-xprehashprinterlist: http://www.x.org
-xprehashprinterlist:
-xprehashprinterlist:
-xprehashprinterlist:
+xcb-util-renderutil: xcb-util-renderutil (XCB renderutil library)
+xcb-util-renderutil:
+xcb-util-renderutil: xcb-util-renderutil provides the XCB renderutil library, which
+xcb-util-renderutil: includes some convenience functions for the Render extension.
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
+xcb-util-renderutil:
diff --git a/source/x/x11/slack-desc/xsetpointer b/source/x/x11/slack-desc/xcb-util-wm
index cbfaa0c2d..8d5103a5a 100644
--- a/source/x/x11/slack-desc/xsetpointer
+++ b/source/x/x11/slack-desc/xcb-util-wm
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xsetpointer: xsetpointer
-xsetpointer:
-xsetpointer: xsetpointer is part of X11.
-xsetpointer:
-xsetpointer: For more information about the X.Org Foundation (the providers of the
-xsetpointer: X.Org implementation of the X Window System), see their website:
-xsetpointer:
-xsetpointer: http://www.x.org
-xsetpointer:
-xsetpointer:
-xsetpointer:
+xcb-util-wm: xcb-util-wm (XCB libraries for EWMH and ICCCM)
+xcb-util-wm:
+xcb-util-wm: xcb-util-wm provides the XCB ewmh and iccm libraries, which include
+xcb-util-wm: client and window manager helpers for EWMH and ICCCM.
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
+xcb-util-wm:
diff --git a/source/x/x11/slack-desc/xclipboard b/source/x/x11/slack-desc/xclipboard
index 9f3092058..fc0bcb456 100644
--- a/source/x/x11/slack-desc/xclipboard
+++ b/source/x/x11/slack-desc/xclipboard
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xclipboard: xclipboard
+xclipboard: xclipboard (X11 clipboard utility)
xclipboard:
-xclipboard: xclipboard is part of X11.
+xclipboard: xclipboard is used to collect and display text selections that are
+xclipboard: sent to the CLIPBOARD by other clients. It is typically used to
+xclipboard: save CLIPBOARD selections for later use. It stores each CLIPBOARD
+xclipboard: selection as a separate string, each of which can be selected.
xclipboard:
-xclipboard: For more information about the X.Org Foundation (the providers of the
-xclipboard: X.Org implementation of the X Window System), see their website:
xclipboard:
-xclipboard: http://www.x.org
xclipboard:
xclipboard:
xclipboard:
diff --git a/source/x/x11/slack-desc/xclock b/source/x/x11/slack-desc/xclock
index 04781f5ec..39cb9ff1d 100644
--- a/source/x/x11/slack-desc/xclock
+++ b/source/x/x11/slack-desc/xclock
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xclock: xclock
+xclock: xclock (X11 on-screen clock)
+xclock:
+xclock: xclock is the classic X Window System clock utility. It displays the
+xclock: time in analog or digital form, continuously updated at a frequency
+xclock: which may be specified by the user.
xclock:
-xclock: xclock is part of X11.
xclock:
-xclock: For more information about the X.Org Foundation (the providers of the
-xclock: X.Org implementation of the X Window System), see their website:
xclock:
-xclock: http://www.x.org
xclock:
xclock:
xclock:
diff --git a/source/x/x11/slack-desc/xcmiscproto b/source/x/x11/slack-desc/xcmiscproto
index a8c9dcc48..d72912516 100644
--- a/source/x/x11/slack-desc/xcmiscproto
+++ b/source/x/x11/slack-desc/xcmiscproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xcmiscproto: xcmiscproto
+xcmiscproto: xcmiscproto (C prototypes for X11 XC-MISC Extension)
xcmiscproto:
xcmiscproto: xcmiscproto is part of X11.
xcmiscproto:
diff --git a/source/x/x11/slack-desc/xcmsdb b/source/x/x11/slack-desc/xcmsdb
index 9075a18fd..058adf03a 100644
--- a/source/x/x11/slack-desc/xcmsdb
+++ b/source/x/x11/slack-desc/xcmsdb
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xcmsdb: xcmsdb
+xcmsdb: xcmsdb (X11 color utility)
xcmsdb:
-xcmsdb: xcmsdb is part of X11.
+xcmsdb: xcmsdb is used to load, query, or remove Device Color Characterization
+xcmsdb: data stored in properties on the root window of a screen as specified
+xcmsdb: in section 7, Device Color Characterization, of the X11 Inter-Client
+xcmsdb: Communication Conventions Manual (ICCCM).
xcmsdb:
-xcmsdb: For more information about the X.Org Foundation (the providers of the
-xcmsdb: X.Org implementation of the X Window System), see their website:
xcmsdb:
-xcmsdb: http://www.x.org
xcmsdb:
xcmsdb:
xcmsdb:
diff --git a/source/x/x11/slack-desc/xcompmgr b/source/x/x11/slack-desc/xcompmgr
index 1381b7be3..f5527a847 100644
--- a/source/x/x11/slack-desc/xcompmgr
+++ b/source/x/x11/slack-desc/xcompmgr
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xcompmgr: xcompmgr
+xcompmgr: xcompmgr (X11 compositing manager)
+xcompmgr:
+xcompmgr: xcompmgr is a sample compositing manager for X servers supporting the
+xcompmgr: XFIXES, DAMAGE, RENDER, and COMPOSITE extensions. It enables basic
+xcompmgr: eye-candy effects.
xcompmgr:
-xcompmgr: xcompmgr is part of X11.
xcompmgr:
-xcompmgr: For more information about the X.Org Foundation (the providers of the
-xcompmgr: X.Org implementation of the X Window System), see their website:
xcompmgr:
-xcompmgr: http://www.x.org
xcompmgr:
xcompmgr:
xcompmgr:
diff --git a/source/x/x11/slack-desc/xconsole b/source/x/x11/slack-desc/xconsole
index f3a8f2bd5..2a543f2e7 100644
--- a/source/x/x11/slack-desc/xconsole
+++ b/source/x/x11/slack-desc/xconsole
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xconsole: xconsole
+xconsole: xconsole (X11 console)
+xconsole:
+xconsole: xconsole displays in a X11 window the messages which are usually sent
+xconsole: to /dev/console
+xconsole:
xconsole:
-xconsole: xconsole is part of X11.
xconsole:
-xconsole: For more information about the X.Org Foundation (the providers of the
-xconsole: X.Org implementation of the X Window System), see their website:
xconsole:
-xconsole: http://www.x.org
xconsole:
xconsole:
xconsole:
diff --git a/source/x/x11/slack-desc/xcursor-themes b/source/x/x11/slack-desc/xcursor-themes
index d3ffeeb50..dbe8023e4 100644
--- a/source/x/x11/slack-desc/xcursor-themes
+++ b/source/x/x11/slack-desc/xcursor-themes
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xcursor-themes: xcursor-themes
+xcursor-themes: xcursor-themes (X11 cursor themes)
+xcursor-themes:
+xcursor-themes: This is a default set of cursor themes for use with libXcursor,
+xcursor-themes: originally created for the XFree86 Project, and now shipped as part
+xcursor-themes: of the X.Org software distribution.
xcursor-themes:
-xcursor-themes: xcursor-themes is part of X11.
xcursor-themes:
-xcursor-themes: For more information about the X.Org Foundation (the providers of the
-xcursor-themes: X.Org implementation of the X Window System), see their website:
xcursor-themes:
-xcursor-themes: http://www.x.org
xcursor-themes:
xcursor-themes:
xcursor-themes:
diff --git a/source/x/x11/slack-desc/xcursorgen b/source/x/x11/slack-desc/xcursorgen
index bce69340e..b084b9d33 100644
--- a/source/x/x11/slack-desc/xcursorgen
+++ b/source/x/x11/slack-desc/xcursorgen
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xcursorgen: xcursorgen
+xcursorgen: xcursorgen (prepares X11 cursor sets for use with libXcursor)
xcursorgen:
xcursorgen: xcursorgen is part of X11.
xcursorgen:
diff --git a/source/x/x11/slack-desc/xdbedizzy b/source/x/x11/slack-desc/xdbedizzy
index 03ecda051..122d3cfc2 100644
--- a/source/x/x11/slack-desc/xdbedizzy
+++ b/source/x/x11/slack-desc/xdbedizzy
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xdbedizzy: xdbedizzy
+xdbedizzy: xdbedizzy (X11 test utility)
+xdbedizzy:
+xdbedizzy: xdbedizzy is a demo of the X11 Double Buffer Extension (DBE) creating
+xdbedizzy: a double buffered spinning scene.
+xdbedizzy:
xdbedizzy:
-xdbedizzy: xdbedizzy is part of X11.
xdbedizzy:
-xdbedizzy: For more information about the X.Org Foundation (the providers of the
-xdbedizzy: X.Org implementation of the X Window System), see their website:
xdbedizzy:
-xdbedizzy: http://www.x.org
xdbedizzy:
xdbedizzy:
xdbedizzy:
diff --git a/source/x/x11/slack-desc/xditview b/source/x/x11/slack-desc/xditview
index 82b175fbf..60eebb74a 100644
--- a/source/x/x11/slack-desc/xditview
+++ b/source/x/x11/slack-desc/xditview
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xditview: xditview
+xditview: xditview (displays ditroff output on an X display)
xditview:
xditview: xditview is part of X11.
xditview:
diff --git a/source/x/x11/slack-desc/xdm b/source/x/x11/slack-desc/xdm
index 88446a5ec..121698088 100644
--- a/source/x/x11/slack-desc/xdm
+++ b/source/x/x11/slack-desc/xdm
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xdm: xdm
+xdm: xdm (X11 display manager)
xdm:
xdm: xdm is part of X11.
xdm:
diff --git a/source/x/x11/slack-desc/xdpyinfo b/source/x/x11/slack-desc/xdpyinfo
index 80af8f41e..8c6c48ffa 100644
--- a/source/x/x11/slack-desc/xdpyinfo
+++ b/source/x/x11/slack-desc/xdpyinfo
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xdpyinfo: xdpyinfo
+xdpyinfo: xdpyinfo (utility for displaying information about an X server)
xdpyinfo:
xdpyinfo: xdpyinfo is part of X11.
xdpyinfo:
diff --git a/source/x/x11/slack-desc/xdriinfo b/source/x/x11/slack-desc/xdriinfo
index e5850b3ae..bcddebfd2 100644
--- a/source/x/x11/slack-desc/xdriinfo
+++ b/source/x/x11/slack-desc/xdriinfo
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xdriinfo: xdriinfo
+xdriinfo: xdriinfo (query configuration information of X11 DRI drivers)
xdriinfo:
xdriinfo: xdriinfo is part of X11.
xdriinfo:
diff --git a/source/x/x11/slack-desc/xedit b/source/x/x11/slack-desc/xedit
index 00e969ceb..6916c0c7c 100644
--- a/source/x/x11/slack-desc/xedit
+++ b/source/x/x11/slack-desc/xedit
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xedit: xedit
+xedit: xedit (simple text editor for X)
xedit:
xedit: xedit is part of X11.
xedit:
diff --git a/source/x/x11/slack-desc/xev b/source/x/x11/slack-desc/xev
index 6e95b7f9a..4e78a1b61 100644
--- a/source/x/x11/slack-desc/xev
+++ b/source/x/x11/slack-desc/xev
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xev: xev
-xev:
-xev: xev is part of X11.
-xev:
-xev: For more information about the X.Org Foundation (the providers of the
-xev: X.Org implementation of the X Window System), see their website:
-xev:
-xev: http://www.x.org
+xev: xev (X11 event viewer)
xev:
+xev: xev creates a window and then asks the X server to send it X11 events
+xev: whenever anything happens to the window (such as it being moved,
+xev: resized, typed in, clicked in, etc.). You can also attach it to an
+xev: existing window. It is useful for seeing what causes events to occur
+xev: and to display the information that they contain; it is essentially
+xev: a debugging and development tool, and should not be needed in normal
+xev: usage.
xev:
xev:
diff --git a/source/x/x11/slack-desc/xextproto b/source/x/x11/slack-desc/xextproto
index 53df9fed0..6ea870d03 100644
--- a/source/x/x11/slack-desc/xextproto
+++ b/source/x/x11/slack-desc/xextproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xextproto: xextproto
+xextproto: xextproto (C prototypes for X Protocol Extensions)
xextproto:
xextproto: xextproto is part of X11.
xextproto:
diff --git a/source/x/x11/slack-desc/xeyes b/source/x/x11/slack-desc/xeyes
index ddf82f0d5..7e1297ee9 100644
--- a/source/x/x11/slack-desc/xeyes
+++ b/source/x/x11/slack-desc/xeyes
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xeyes: xeyes
+xeyes: xeyes (a follow the mouse X demo, using the X SHAPE extension)
xeyes:
xeyes: xeyes is part of X11.
xeyes:
diff --git a/source/x/x11/slack-desc/xf86-input-acecad b/source/x/x11/slack-desc/xf86-input-acecad
index 26ca95cea..e3421df57 100644
--- a/source/x/x11/slack-desc/xf86-input-acecad
+++ b/source/x/x11/slack-desc/xf86-input-acecad
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-acecad: xf86-input-acecad
+xf86-input-acecad: xf86-input-acecad (Acecad Flair input driver for the Xorg X server)
xf86-input-acecad:
xf86-input-acecad: xf86-input-acecad is part of X11.
xf86-input-acecad:
diff --git a/source/x/x11/slack-desc/xf86-input-aiptek b/source/x/x11/slack-desc/xf86-input-aiptek
index f7721e572..1ed242437 100644
--- a/source/x/x11/slack-desc/xf86-input-aiptek
+++ b/source/x/x11/slack-desc/xf86-input-aiptek
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-aiptek: xf86-input-aiptek
+xf86-input-aiptek: xf86-input-aiptek (Aiptek USB Digital Tablet Input Driver for Linux)
xf86-input-aiptek:
xf86-input-aiptek: xf86-input-aiptek is part of X11.
xf86-input-aiptek:
diff --git a/source/x/x11/slack-desc/xf86-input-calcomp b/source/x/x11/slack-desc/xf86-input-calcomp
deleted file mode 100644
index 76dd2653c..000000000
--- a/source/x/x11/slack-desc/xf86-input-calcomp
+++ /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------------------------------------------------------|
-xf86-input-calcomp: xf86-input-calcomp
-xf86-input-calcomp:
-xf86-input-calcomp: xf86-input-calcomp is part of X11.
-xf86-input-calcomp:
-xf86-input-calcomp: For more information about the X.Org Foundation (the providers of the
-xf86-input-calcomp: X.Org implementation of the X Window System), see their website:
-xf86-input-calcomp:
-xf86-input-calcomp: http://www.x.org
-xf86-input-calcomp:
-xf86-input-calcomp:
-xf86-input-calcomp:
diff --git a/source/x/x11/slack-desc/xf86-input-citron b/source/x/x11/slack-desc/xf86-input-citron
deleted file mode 100644
index 5548268ac..000000000
--- a/source/x/x11/slack-desc/xf86-input-citron
+++ /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------------------------------------------------------|
-xf86-input-citron: xf86-input-citron
-xf86-input-citron:
-xf86-input-citron: xf86-input-citron is part of X11.
-xf86-input-citron:
-xf86-input-citron: For more information about the X.Org Foundation (the providers of the
-xf86-input-citron: X.Org implementation of the X Window System), see their website:
-xf86-input-citron:
-xf86-input-citron: http://www.x.org
-xf86-input-citron:
-xf86-input-citron:
-xf86-input-citron:
diff --git a/source/x/x11/slack-desc/xf86-input-dynapro b/source/x/x11/slack-desc/xf86-input-dynapro
deleted file mode 100644
index 346eefe89..000000000
--- a/source/x/x11/slack-desc/xf86-input-dynapro
+++ /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------------------------------------------------------|
-xf86-input-dynapro: xf86-input-dynapro
-xf86-input-dynapro:
-xf86-input-dynapro: xf86-input-dynapro is part of X11.
-xf86-input-dynapro:
-xf86-input-dynapro: For more information about the X.Org Foundation (the providers of the
-xf86-input-dynapro: X.Org implementation of the X Window System), see their website:
-xf86-input-dynapro:
-xf86-input-dynapro: http://www.x.org
-xf86-input-dynapro:
-xf86-input-dynapro:
-xf86-input-dynapro:
diff --git a/source/x/x11/slack-desc/xf86-input-elo2300 b/source/x/x11/slack-desc/xf86-input-elo2300
deleted file mode 100644
index 6c0bdd574..000000000
--- a/source/x/x11/slack-desc/xf86-input-elo2300
+++ /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------------------------------------------------------|
-xf86-input-elo2300: xf86-input-elo2300
-xf86-input-elo2300:
-xf86-input-elo2300: xf86-input-elo2300 is part of X11.
-xf86-input-elo2300:
-xf86-input-elo2300: For more information about the X.Org Foundation (the providers of the
-xf86-input-elo2300: X.Org implementation of the X Window System), see their website:
-xf86-input-elo2300:
-xf86-input-elo2300: http://www.x.org
-xf86-input-elo2300:
-xf86-input-elo2300:
-xf86-input-elo2300:
diff --git a/source/x/x11/slack-desc/xf86-input-elographics b/source/x/x11/slack-desc/xf86-input-elographics
deleted file mode 100644
index 1e256565f..000000000
--- a/source/x/x11/slack-desc/xf86-input-elographics
+++ /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------------------------------------------------------|
-xf86-input-elographics: xf86-input-elographics
-xf86-input-elographics:
-xf86-input-elographics: xf86-input-elographics is part of X11.
-xf86-input-elographics:
-xf86-input-elographics: For more information about the X.Org Foundation (the providers of the
-xf86-input-elographics: X.Org implementation of the X Window System), see their website:
-xf86-input-elographics:
-xf86-input-elographics: http://www.x.org
-xf86-input-elographics:
-xf86-input-elographics:
-xf86-input-elographics:
diff --git a/source/x/x11/slack-desc/xf86-input-evdev b/source/x/x11/slack-desc/xf86-input-evdev
index 0adcb026e..93aeb3f64 100644
--- a/source/x/x11/slack-desc/xf86-input-evdev
+++ b/source/x/x11/slack-desc/xf86-input-evdev
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-evdev: xf86-input-evdev
+xf86-input-evdev: xf86-input-evdev (Generic Linux input driver for the Xorg X server)
xf86-input-evdev:
xf86-input-evdev: xf86-input-evdev is part of X11.
xf86-input-evdev:
diff --git a/source/x/x11/slack-desc/xf86-input-joystick b/source/x/x11/slack-desc/xf86-input-joystick
index 3a43a2545..46963b88f 100644
--- a/source/x/x11/slack-desc/xf86-input-joystick
+++ b/source/x/x11/slack-desc/xf86-input-joystick
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-joystick: xf86-input-joystick
+xf86-input-joystick: xf86-input-joystick (Joystick input driver for the Xorg X server)
xf86-input-joystick:
xf86-input-joystick: xf86-input-joystick is part of X11.
xf86-input-joystick:
diff --git a/source/x/x11/slack-desc/xf86-input-keyboard b/source/x/x11/slack-desc/xf86-input-keyboard
index 640e2b55e..e72beb41a 100644
--- a/source/x/x11/slack-desc/xf86-input-keyboard
+++ b/source/x/x11/slack-desc/xf86-input-keyboard
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-keyboard: xf86-input-keyboard
+xf86-input-keyboard: kbd (Keyboard input driver for the Xorg X server)
+xf86-input-keyboard:
+xf86-input-keyboard: This is the non-evdev keyboard driver for X. Most Linux systems
+xf86-input-keyboard: should be using the evdev driver to handle input devices such as
+xf86-input-keyboard: keyboards and mice, but this driver may be useful as a fallback.
xf86-input-keyboard:
-xf86-input-keyboard: xf86-input-keyboard is part of X11.
xf86-input-keyboard:
-xf86-input-keyboard: For more information about the X.Org Foundation (the providers of the
-xf86-input-keyboard: X.Org implementation of the X Window System), see their website:
xf86-input-keyboard:
-xf86-input-keyboard: http://www.x.org
xf86-input-keyboard:
xf86-input-keyboard:
xf86-input-keyboard:
diff --git a/source/x/x11/slack-desc/xf86-input-magellan b/source/x/x11/slack-desc/xf86-input-magellan
deleted file mode 100644
index 70ef43827..000000000
--- a/source/x/x11/slack-desc/xf86-input-magellan
+++ /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------------------------------------------------------|
-xf86-input-magellan: xf86-input-magellan
-xf86-input-magellan:
-xf86-input-magellan: xf86-input-magellan is part of X11.
-xf86-input-magellan:
-xf86-input-magellan: For more information about the X.Org Foundation (the providers of the
-xf86-input-magellan: X.Org implementation of the X Window System), see their website:
-xf86-input-magellan:
-xf86-input-magellan: http://www.x.org
-xf86-input-magellan:
-xf86-input-magellan:
-xf86-input-magellan:
diff --git a/source/x/x11/slack-desc/xf86-input-magictouch b/source/x/x11/slack-desc/xf86-input-magictouch
deleted file mode 100644
index 72d02f52d..000000000
--- a/source/x/x11/slack-desc/xf86-input-magictouch
+++ /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------------------------------------------------------|
-xf86-input-magictouch: xf86-input-magictouch
-xf86-input-magictouch:
-xf86-input-magictouch: xf86-input-magictouch is part of X11.
-xf86-input-magictouch:
-xf86-input-magictouch: For more information about the X.Org Foundation (the providers of the
-xf86-input-magictouch: X.Org implementation of the X Window System), see their website:
-xf86-input-magictouch:
-xf86-input-magictouch: http://www.x.org
-xf86-input-magictouch:
-xf86-input-magictouch:
-xf86-input-magictouch:
diff --git a/source/x/x11/slack-desc/xf86-input-microtouch b/source/x/x11/slack-desc/xf86-input-microtouch
deleted file mode 100644
index 412cb01af..000000000
--- a/source/x/x11/slack-desc/xf86-input-microtouch
+++ /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------------------------------------------------------|
-xf86-input-microtouch: xf86-input-microtouch
-xf86-input-microtouch:
-xf86-input-microtouch: xf86-input-microtouch is part of X11.
-xf86-input-microtouch:
-xf86-input-microtouch: For more information about the X.Org Foundation (the providers of the
-xf86-input-microtouch: X.Org implementation of the X Window System), see their website:
-xf86-input-microtouch:
-xf86-input-microtouch: http://www.x.org
-xf86-input-microtouch:
-xf86-input-microtouch:
-xf86-input-microtouch:
diff --git a/source/x/x11/slack-desc/xf86-input-mouse b/source/x/x11/slack-desc/xf86-input-mouse
index 5ce1494d1..73bd88af3 100644
--- a/source/x/x11/slack-desc/xf86-input-mouse
+++ b/source/x/x11/slack-desc/xf86-input-mouse
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-mouse: xf86-input-mouse
+xf86-input-mouse: xf86-input-mouse (Mouse Support for X)
+xf86-input-mouse:
+xf86-input-mouse: This is the non-evdev mouse driver for X. Most Linux systems should
+xf86-input-mouse: be using the evdev driver to handle input devices such as keyboards
+xf86-input-mouse: and mice, but this driver may be useful as a fallback.
xf86-input-mouse:
-xf86-input-mouse: xf86-input-mouse is part of X11.
xf86-input-mouse:
-xf86-input-mouse: For more information about the X.Org Foundation (the providers of the
-xf86-input-mouse: X.Org implementation of the X Window System), see their website:
xf86-input-mouse:
-xf86-input-mouse: http://www.x.org
xf86-input-mouse:
xf86-input-mouse:
xf86-input-mouse:
diff --git a/source/x/x11/slack-desc/xf86-input-mutouch b/source/x/x11/slack-desc/xf86-input-mutouch
deleted file mode 100644
index 7c8c7f83c..000000000
--- a/source/x/x11/slack-desc/xf86-input-mutouch
+++ /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------------------------------------------------------|
-xf86-input-mutouch: xf86-input-mutouch
-xf86-input-mutouch:
-xf86-input-mutouch: xf86-input-mutouch is part of X11.
-xf86-input-mutouch:
-xf86-input-mutouch: For more information about the X.Org Foundation (the providers of the
-xf86-input-mutouch: X.Org implementation of the X Window System), see their website:
-xf86-input-mutouch:
-xf86-input-mutouch: http://www.x.org
-xf86-input-mutouch:
-xf86-input-mutouch:
-xf86-input-mutouch:
diff --git a/source/x/x11/slack-desc/xf86-input-palmax b/source/x/x11/slack-desc/xf86-input-palmax
deleted file mode 100644
index 73328d76a..000000000
--- a/source/x/x11/slack-desc/xf86-input-palmax
+++ /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------------------------------------------------------|
-xf86-input-palmax: xf86-input-palmax
-xf86-input-palmax:
-xf86-input-palmax: xf86-input-palmax is part of X11.
-xf86-input-palmax:
-xf86-input-palmax: For more information about the X.Org Foundation (the providers of the
-xf86-input-palmax: X.Org implementation of the X Window System), see their website:
-xf86-input-palmax:
-xf86-input-palmax: http://www.x.org
-xf86-input-palmax:
-xf86-input-palmax:
-xf86-input-palmax:
diff --git a/source/x/x11/slack-desc/xf86-input-penmount b/source/x/x11/slack-desc/xf86-input-penmount
index ca7e48b84..942187880 100644
--- a/source/x/x11/slack-desc/xf86-input-penmount
+++ b/source/x/x11/slack-desc/xf86-input-penmount
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-penmount: xf86-input-penmount
+xf86-input-penmount: xf86-input-penmount (PenMount input driver for the Xorg X server)
xf86-input-penmount:
xf86-input-penmount: xf86-input-penmount is part of X11.
xf86-input-penmount:
diff --git a/source/x/x11/slack-desc/xf86-input-spaceorb b/source/x/x11/slack-desc/xf86-input-spaceorb
deleted file mode 100644
index b127b8956..000000000
--- a/source/x/x11/slack-desc/xf86-input-spaceorb
+++ /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------------------------------------------------------|
-xf86-input-spaceorb: xf86-input-spaceorb
-xf86-input-spaceorb:
-xf86-input-spaceorb: xf86-input-spaceorb is part of X11.
-xf86-input-spaceorb:
-xf86-input-spaceorb: For more information about the X.Org Foundation (the providers of the
-xf86-input-spaceorb: X.Org implementation of the X Window System), see their website:
-xf86-input-spaceorb:
-xf86-input-spaceorb: http://www.x.org
-xf86-input-spaceorb:
-xf86-input-spaceorb:
-xf86-input-spaceorb:
diff --git a/source/x/x11/slack-desc/xf86-input-synaptics b/source/x/x11/slack-desc/xf86-input-synaptics
index 20858404c..1425e1290 100644
--- a/source/x/x11/slack-desc/xf86-input-synaptics
+++ b/source/x/x11/slack-desc/xf86-input-synaptics
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-synaptics: xf86-input-synaptics
+xf86-input-synaptics: xf86-input-synaptics (Synaptics touchpad driver for X.Org)
xf86-input-synaptics:
xf86-input-synaptics: xf86-input-synaptics is part of X11.
xf86-input-synaptics:
diff --git a/source/x/x11/slack-desc/xf86-input-tek4957 b/source/x/x11/slack-desc/xf86-input-tek4957
deleted file mode 100644
index 2e0a13ff7..000000000
--- a/source/x/x11/slack-desc/xf86-input-tek4957
+++ /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------------------------------------------------------|
-xf86-input-tek4957: xf86-input-tek4957
-xf86-input-tek4957:
-xf86-input-tek4957: xf86-input-tek4957 is part of X11.
-xf86-input-tek4957:
-xf86-input-tek4957: For more information about the X.Org Foundation (the providers of the
-xf86-input-tek4957: X.Org implementation of the X Window System), see their website:
-xf86-input-tek4957:
-xf86-input-tek4957: http://www.x.org
-xf86-input-tek4957:
-xf86-input-tek4957:
-xf86-input-tek4957:
diff --git a/source/x/x11/slack-desc/xf86-input-vmmouse b/source/x/x11/slack-desc/xf86-input-vmmouse
index 640cc71a1..d56389653 100644
--- a/source/x/x11/slack-desc/xf86-input-vmmouse
+++ b/source/x/x11/slack-desc/xf86-input-vmmouse
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-vmmouse: xf86-input-vmmouse
+xf86-input-vmmouse: xf86-input-vmmouse (support for VMWare's VMMouse guest mouse device)
xf86-input-vmmouse:
xf86-input-vmmouse: xf86-input-vmmouse is part of X11.
xf86-input-vmmouse:
diff --git a/source/x/x11/slack-desc/xf86-input-void b/source/x/x11/slack-desc/xf86-input-void
index 889017af2..ef38f7d59 100644
--- a/source/x/x11/slack-desc/xf86-input-void
+++ b/source/x/x11/slack-desc/xf86-input-void
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-void: xf86-input-void
+xf86-input-void: xf86-input-void (null input driver for Xorg server)
xf86-input-void:
xf86-input-void: xf86-input-void is part of X11.
xf86-input-void:
diff --git a/source/x/x11/slack-desc/xf86-input-wacom b/source/x/x11/slack-desc/xf86-input-wacom
index 88f68c1d2..86f4ca62c 100644
--- a/source/x/x11/slack-desc/xf86-input-wacom
+++ b/source/x/x11/slack-desc/xf86-input-wacom
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-wacom: xf86-input-wacom
+xf86-input-wacom: xf86-input-wacom (driver for Wacom tablets)
xf86-input-wacom:
-xf86-input-wacom: xf86-input-wacom is part of X11.
+xf86-input-wacom: This package provides the X.Org X11 driver for Wacom and Wacom-like
+xf86-input-wacom: tablets. It obsoletes the linuxwacom driver and supports X server
+xf86-input-wacom: versions 1.7 and higher. Server versions lower than 1.7 may be
+xf86-input-wacom: supported by this driver, but users are encouraged to use the old
+xf86-input-wacom: linuxwacom driver instead.
xf86-input-wacom:
-xf86-input-wacom: For more information about the X.Org Foundation (the providers of the
-xf86-input-wacom: X.Org implementation of the X Window System), see their website:
-xf86-input-wacom:
-xf86-input-wacom: http://www.x.org
xf86-input-wacom:
xf86-input-wacom:
xf86-input-wacom:
diff --git a/source/x/x11/slack-desc/xf86-video-apm b/source/x/x11/slack-desc/xf86-video-apm
index b433ed1dc..2ee130c9e 100644
--- a/source/x/x11/slack-desc/xf86-video-apm
+++ b/source/x/x11/slack-desc/xf86-video-apm
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-apm: xf86-video-apm
+xf86-video-apm: xf86-video-apm (driver for Alliance Promotion graphics chipsets)
xf86-video-apm:
xf86-video-apm: xf86-video-apm is part of X11.
xf86-video-apm:
diff --git a/source/x/x11/slack-desc/xf86-video-ark b/source/x/x11/slack-desc/xf86-video-ark
index 20abb2245..eba356f73 100644
--- a/source/x/x11/slack-desc/xf86-video-ark
+++ b/source/x/x11/slack-desc/xf86-video-ark
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-ark: xf86-video-ark
+xf86-video-ark: xf86-video-ark (Ark Logic video driver for Xorg X server)
xf86-video-ark:
xf86-video-ark: xf86-video-ark is part of X11.
xf86-video-ark:
diff --git a/source/x/x11/slack-desc/xf86-video-ast b/source/x/x11/slack-desc/xf86-video-ast
index 8861724bc..57efd5dfb 100644
--- a/source/x/x11/slack-desc/xf86-video-ast
+++ b/source/x/x11/slack-desc/xf86-video-ast
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-ast: xf86-video-ast
+xf86-video-ast: xf86-video-ast (ASpeed Technologies graphics driver for Xorg X server)
xf86-video-ast:
xf86-video-ast: xf86-video-ast is part of X11.
xf86-video-ast:
diff --git a/source/x/x11/slack-desc/xf86-video-ati b/source/x/x11/slack-desc/xf86-video-ati
index b6847e1dd..7387c43c1 100644
--- a/source/x/x11/slack-desc/xf86-video-ati
+++ b/source/x/x11/slack-desc/xf86-video-ati
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-ati: xf86-video-ati
+xf86-video-ati: xf86-video-ati (ATI Radeon video driver for the Xorg X server)
xf86-video-ati:
xf86-video-ati: xf86-video-ati is part of X11.
xf86-video-ati:
diff --git a/source/x/x11/slack-desc/xf86-video-chips b/source/x/x11/slack-desc/xf86-video-chips
index 2422bc205..f615b79c3 100644
--- a/source/x/x11/slack-desc/xf86-video-chips
+++ b/source/x/x11/slack-desc/xf86-video-chips
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-chips: xf86-video-chips
+xf86-video-chips: xf86-video-chips (Chips and Technologies video driver for Xorg)
xf86-video-chips:
xf86-video-chips: xf86-video-chips is part of X11.
xf86-video-chips:
diff --git a/source/x/x11/slack-desc/xf86-video-cirrus b/source/x/x11/slack-desc/xf86-video-cirrus
index f7188813f..ef65ecc27 100644
--- a/source/x/x11/slack-desc/xf86-video-cirrus
+++ b/source/x/x11/slack-desc/xf86-video-cirrus
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-cirrus: xf86-video-cirrus
+xf86-video-cirrus: xf86-video-cirrus (Cirrus Logic video driver for the Xorg X server)
xf86-video-cirrus:
xf86-video-cirrus: xf86-video-cirrus is part of X11.
xf86-video-cirrus:
diff --git a/source/x/x11/slack-desc/xf86-video-dummy b/source/x/x11/slack-desc/xf86-video-dummy
index 389e9e3be..98cac3353 100644
--- a/source/x/x11/slack-desc/xf86-video-dummy
+++ b/source/x/x11/slack-desc/xf86-video-dummy
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-dummy: xf86-video-dummy
+xf86-video-dummy: xf86-video-dummy (virtual frame buffer driver for the Xorg X server)
xf86-video-dummy:
xf86-video-dummy: xf86-video-dummy is part of X11.
xf86-video-dummy:
diff --git a/source/x/x11/slack-desc/xf86-video-fbdev b/source/x/x11/slack-desc/xf86-video-fbdev
index ba6e4a6b3..08a636a11 100644
--- a/source/x/x11/slack-desc/xf86-video-fbdev
+++ b/source/x/x11/slack-desc/xf86-video-fbdev
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-fbdev: xf86-video-fbdev
+xf86-video-fbdev: xf86-video-fbdev (X.Org generic framebuffer video driver)
+xf86-video-fbdev:
+xf86-video-fbdev: xf86-video-fbdev is the generic framebuffer video driver for X.Org,
+xf86-video-fbdev: designed to draw into a video framebuffer provided by the
+xf86-video-fbdev: underlying operating system.
xf86-video-fbdev:
-xf86-video-fbdev: xf86-video-fbdev is part of X11.
xf86-video-fbdev:
-xf86-video-fbdev: For more information about the X.Org Foundation (the providers of the
-xf86-video-fbdev: X.Org implementation of the X Window System), see their website:
xf86-video-fbdev:
-xf86-video-fbdev: http://www.x.org
xf86-video-fbdev:
xf86-video-fbdev:
xf86-video-fbdev:
diff --git a/source/x/x11/slack-desc/xf86-video-geode b/source/x/x11/slack-desc/xf86-video-geode
index f96580470..003286bff 100644
--- a/source/x/x11/slack-desc/xf86-video-geode
+++ b/source/x/x11/slack-desc/xf86-video-geode
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-geode: xf86-video-geode (AMD Geode GX and LX video driver)
+xf86-video-geode: xf86-video-geode (AMD Geode GX and LX graphics driver for X.org)
xf86-video-geode:
xf86-video-geode: xf86-video-geode is part of X11.
xf86-video-geode:
diff --git a/source/x/x11/slack-desc/xf86-video-glint b/source/x/x11/slack-desc/xf86-video-glint
index 32fb11c4a..7e4eeae06 100644
--- a/source/x/x11/slack-desc/xf86-video-glint
+++ b/source/x/x11/slack-desc/xf86-video-glint
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-glint: xf86-video-glint
+xf86-video-glint: xf86-video-glint (GLINT/Permedia video driver for the Xorg X server)
xf86-video-glint:
xf86-video-glint: xf86-video-glint is part of X11.
xf86-video-glint:
diff --git a/source/x/x11/slack-desc/xf86-video-i128 b/source/x/x11/slack-desc/xf86-video-i128
index bab537802..bbf2aa003 100644
--- a/source/x/x11/slack-desc/xf86-video-i128
+++ b/source/x/x11/slack-desc/xf86-video-i128
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-i128: xf86-video-i128
+xf86-video-i128: xf86-video-i128 (Number Nine I128 video driver for the Xorg X server)
xf86-video-i128:
xf86-video-i128: xf86-video-i128 is part of X11.
xf86-video-i128:
diff --git a/source/x/x11/slack-desc/xf86-video-i740 b/source/x/x11/slack-desc/xf86-video-i740
index e31e5ad49..3b61c6aa6 100644
--- a/source/x/x11/slack-desc/xf86-video-i740
+++ b/source/x/x11/slack-desc/xf86-video-i740
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-i740: xf86-video-i740
+xf86-video-i740: xf86-video-i740 (Intel i740 video driver for the Xorg X server)
xf86-video-i740:
xf86-video-i740: xf86-video-i740 is part of X11.
xf86-video-i740:
diff --git a/source/x/x11/slack-desc/xf86-video-intel b/source/x/x11/slack-desc/xf86-video-intel
index 55be1e31d..c51417a7c 100644
--- a/source/x/x11/slack-desc/xf86-video-intel
+++ b/source/x/x11/slack-desc/xf86-video-intel
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-intel: xf86-video-intel
+xf86-video-intel: xf86-video-intel (X.org graphics driver for Intel graphics)
xf86-video-intel:
xf86-video-intel: xf86-video-intel is part of X11.
xf86-video-intel:
diff --git a/source/x/x11/slack-desc/xf86-video-mach64 b/source/x/x11/slack-desc/xf86-video-mach64
index ae70d0990..46c7f7f68 100644
--- a/source/x/x11/slack-desc/xf86-video-mach64
+++ b/source/x/x11/slack-desc/xf86-video-mach64
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-mach64: xf86-video-mach64
+xf86-video-mach64: xf86-video-mach64 (ATI Mach64 driver for the Xorg X server)
xf86-video-mach64:
xf86-video-mach64: xf86-video-mach64 is part of X11.
xf86-video-mach64:
diff --git a/source/x/x11/slack-desc/xf86-video-mga b/source/x/x11/slack-desc/xf86-video-mga
index e0df509fd..34e34e613 100644
--- a/source/x/x11/slack-desc/xf86-video-mga
+++ b/source/x/x11/slack-desc/xf86-video-mga
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-mga: xf86-video-mga
+xf86-video-mga: xf86-video-mga (Matrox video driver for the Xorg X server)
xf86-video-mga:
xf86-video-mga: xf86-video-mga is part of X11.
xf86-video-mga:
diff --git a/source/x/x11/slack-desc/xf86-input-digitaledge b/source/x/x11/slack-desc/xf86-video-modesetting
index a199da40e..d6ffe28e0 100644
--- a/source/x/x11/slack-desc/xf86-input-digitaledge
+++ b/source/x/x11/slack-desc/xf86-video-modesetting
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-digitaledge: xf86-input-digitaledge
-xf86-input-digitaledge:
-xf86-input-digitaledge: xf86-input-digitaledge is part of X11.
-xf86-input-digitaledge:
-xf86-input-digitaledge: For more information about the X.Org Foundation (the providers of the
-xf86-input-digitaledge: X.Org implementation of the X Window System), see their website:
-xf86-input-digitaledge:
-xf86-input-digitaledge: http://www.x.org
-xf86-input-digitaledge:
-xf86-input-digitaledge:
-xf86-input-digitaledge:
+xf86-video-modesetting: xf86-video-modesetting (X.org modesetting fallback driver)
+xf86-video-modesetting:
+xf86-video-modesetting: xf86-video-modesetting is part of X11.
+xf86-video-modesetting:
+xf86-video-modesetting: For more information about the X.Org Foundation (the providers of the
+xf86-video-modesetting: X.Org implementation of the X Window System), see their website:
+xf86-video-modesetting:
+xf86-video-modesetting: http://www.x.org
+xf86-video-modesetting:
+xf86-video-modesetting:
+xf86-video-modesetting:
diff --git a/source/x/x11/slack-desc/xf86-video-neomagic b/source/x/x11/slack-desc/xf86-video-neomagic
index 89676c27a..862a43061 100644
--- a/source/x/x11/slack-desc/xf86-video-neomagic
+++ b/source/x/x11/slack-desc/xf86-video-neomagic
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-neomagic: xf86-video-neomagic
+xf86-video-neomagic: xf86-video-neomagic (NeoMagic video driver for the Xorg X server)
xf86-video-neomagic:
xf86-video-neomagic: xf86-video-neomagic is part of X11.
xf86-video-neomagic:
diff --git a/source/x/x11/slack-desc/xf86-video-newport b/source/x/x11/slack-desc/xf86-video-newport
deleted file mode 100644
index 18d0daf97..000000000
--- a/source/x/x11/slack-desc/xf86-video-newport
+++ /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------------------------------------------------------|
-xf86-video-newport: xf86-video-newport
-xf86-video-newport:
-xf86-video-newport: xf86-video-newport is part of X11.
-xf86-video-newport:
-xf86-video-newport: For more information about the X.Org Foundation (the providers of the
-xf86-video-newport: X.Org implementation of the X Window System), see their website:
-xf86-video-newport:
-xf86-video-newport: http://www.x.org
-xf86-video-newport:
-xf86-video-newport:
-xf86-video-newport:
diff --git a/source/x/x11/slack-desc/xf86-video-nouveau b/source/x/x11/slack-desc/xf86-video-nouveau
index 8697a60e6..ef2076229 100644
--- a/source/x/x11/slack-desc/xf86-video-nouveau
+++ b/source/x/x11/slack-desc/xf86-video-nouveau
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-nouveau: xf86-video-nouveau
+xf86-video-nouveau: xf86-video-nouveau (accelerated open source driver for nVidia cards)
xf86-video-nouveau:
xf86-video-nouveau: xf86-video-nouveau is part of X11.
xf86-video-nouveau:
diff --git a/source/x/x11/slack-desc/xf86-video-nv b/source/x/x11/slack-desc/xf86-video-nv
index dfed5106f..cd866957f 100644
--- a/source/x/x11/slack-desc/xf86-video-nv
+++ b/source/x/x11/slack-desc/xf86-video-nv
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-nv: xf86-video-nv
+xf86-video-nv: xf86-video-nv (old NVIDIA video driver for the Xorg X server)
xf86-video-nv:
xf86-video-nv: xf86-video-nv is part of X11.
xf86-video-nv:
diff --git a/source/x/x11/slack-desc/xf86-video-openchrome b/source/x/x11/slack-desc/xf86-video-openchrome
index 263de3156..32e4c312c 100644
--- a/source/x/x11/slack-desc/xf86-video-openchrome
+++ b/source/x/x11/slack-desc/xf86-video-openchrome
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-openchrome: xf86-video-openchrome
+xf86-video-openchrome: xf86-video-openchrome (VIA video driver for the Xorg X server)
xf86-video-openchrome:
xf86-video-openchrome: xf86-video-openchrome is part of X11.
xf86-video-openchrome:
diff --git a/source/n/rt71w-firmware/slack-desc b/source/x/x11/slack-desc/xf86-video-qxl
index 57fc43e97..e5eae0ce9 100644
--- a/source/n/rt71w-firmware/slack-desc
+++ b/source/x/x11/slack-desc/xf86-video-qxl
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-rt71w-firmware: rt71w-firmware (Firmware for Ralink rt71w wireless chips)
-rt71w-firmware:
-rt71w-firmware: This is firmware for the Ralink rt71w wireless chip.
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
-rt71w-firmware:
+xf86-video-qxl: xf86-video-qxl (driver for the spice virtual GPU)
+xf86-video-qxl:
+xf86-video-qxl: QXL is a driver for the spice virtual GPU.
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
+xf86-video-qxl:
diff --git a/source/x/x11/slack-desc/xf86-video-r128 b/source/x/x11/slack-desc/xf86-video-r128
index 6a5807bcb..ae700aa97 100644
--- a/source/x/x11/slack-desc/xf86-video-r128
+++ b/source/x/x11/slack-desc/xf86-video-r128
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-r128: xf86-video-r128
+xf86-video-r128: xf86-video-r128 (ATI Rage 128 video driver for the Xorg X server)
xf86-video-r128:
xf86-video-r128: xf86-video-r128 is part of X11.
xf86-video-r128:
diff --git a/source/x/x11/slack-desc/xf86-video-radeonhd b/source/x/x11/slack-desc/xf86-video-radeonhd
deleted file mode 100644
index ce2e72658..000000000
--- a/source/x/x11/slack-desc/xf86-video-radeonhd
+++ /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------------------------------------------------------|
-xf86-video-radeonhd: xf86-video-radeonhd (driver for AMD GPG (ATI) R5xx/R6xx chipsets)
-xf86-video-radeonhd:
-xf86-video-radeonhd: xf86-video-radeonhd is part of X11.
-xf86-video-radeonhd:
-xf86-video-radeonhd: For more information about the X.Org Foundation (the providers of the
-xf86-video-radeonhd: X.Org implementation of the X Window System), see their website:
-xf86-video-radeonhd:
-xf86-video-radeonhd: http://www.x.org
-xf86-video-radeonhd:
-xf86-video-radeonhd:
-xf86-video-radeonhd:
diff --git a/source/x/x11/slack-desc/xf86-video-rendition b/source/x/x11/slack-desc/xf86-video-rendition
index 99561b3a6..a4c4dac56 100644
--- a/source/x/x11/slack-desc/xf86-video-rendition
+++ b/source/x/x11/slack-desc/xf86-video-rendition
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-rendition: xf86-video-rendition
+xf86-video-rendition: xf86-video-rendition (Rendition video driver for the Xorg X server)
xf86-video-rendition:
xf86-video-rendition: xf86-video-rendition is part of X11.
xf86-video-rendition:
diff --git a/source/x/x11/slack-desc/xf86-video-s3 b/source/x/x11/slack-desc/xf86-video-s3
index f91fd6e99..960fd1f07 100644
--- a/source/x/x11/slack-desc/xf86-video-s3
+++ b/source/x/x11/slack-desc/xf86-video-s3
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-s3: xf86-video-s3
+xf86-video-s3: xf86-video-s3 (Xorg driver for S3 chipsets other than ViRGE or Savage)
xf86-video-s3:
xf86-video-s3: xf86-video-s3 is part of X11.
xf86-video-s3:
diff --git a/source/x/x11/slack-desc/xf86-video-s3virge b/source/x/x11/slack-desc/xf86-video-s3virge
index 52fe0a346..87042f44e 100644
--- a/source/x/x11/slack-desc/xf86-video-s3virge
+++ b/source/x/x11/slack-desc/xf86-video-s3virge
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-s3virge: xf86-video-s3virge
+xf86-video-s3virge: xf86-video-s3virge (S3 ViRGE video driver for the Xorg X server)
xf86-video-s3virge:
xf86-video-s3virge: xf86-video-s3virge is part of X11.
xf86-video-s3virge:
diff --git a/source/x/x11/slack-desc/xf86-video-savage b/source/x/x11/slack-desc/xf86-video-savage
index f31d670c8..b789b634b 100644
--- a/source/x/x11/slack-desc/xf86-video-savage
+++ b/source/x/x11/slack-desc/xf86-video-savage
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-savage: xf86-video-savage
+xf86-video-savage: xf86-video-savage (S3 Savage video driver for the Xorg X server)
xf86-video-savage:
xf86-video-savage: xf86-video-savage is part of X11.
xf86-video-savage:
diff --git a/source/x/x11/slack-desc/xf86-video-siliconmotion b/source/x/x11/slack-desc/xf86-video-siliconmotion
index 97a28f018..3a50a9a9e 100644
--- a/source/x/x11/slack-desc/xf86-video-siliconmotion
+++ b/source/x/x11/slack-desc/xf86-video-siliconmotion
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-siliconmotion: xf86-video-siliconmotion
+xf86-video-siliconmotion: xf86-video-siliconmotion (Silicon Motion video driver for Xorg)
xf86-video-siliconmotion:
xf86-video-siliconmotion: xf86-video-siliconmotion is part of X11.
xf86-video-siliconmotion:
diff --git a/source/x/x11/slack-desc/xf86-video-sis b/source/x/x11/slack-desc/xf86-video-sis
index d0261754b..f08c5495d 100644
--- a/source/x/x11/slack-desc/xf86-video-sis
+++ b/source/x/x11/slack-desc/xf86-video-sis
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-sis: xf86-video-sis
+xf86-video-sis: xf86-video-sis (SiS and XGI video driver for the Xorg X server)
xf86-video-sis:
xf86-video-sis: xf86-video-sis is part of X11.
xf86-video-sis:
diff --git a/source/x/x11/slack-desc/xf86-video-sisusb b/source/x/x11/slack-desc/xf86-video-sisusb
index 9ab8bcbba..bda16ac58 100644
--- a/source/x/x11/slack-desc/xf86-video-sisusb
+++ b/source/x/x11/slack-desc/xf86-video-sisusb
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-sisusb: xf86-video-sisusb
+xf86-video-sisusb: xf86-video-sisusb (SiS Net2280-based USB video driver for Xorg)
xf86-video-sisusb:
xf86-video-sisusb: xf86-video-sisusb is part of X11.
xf86-video-sisusb:
diff --git a/source/x/x11/slack-desc/xf86-video-sunbw2 b/source/x/x11/slack-desc/xf86-video-sunbw2
deleted file mode 100644
index f432ae42b..000000000
--- a/source/x/x11/slack-desc/xf86-video-sunbw2
+++ /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------------------------------------------------------|
-xf86-video-sunbw2: xf86-video-sunbw2
-xf86-video-sunbw2:
-xf86-video-sunbw2: xf86-video-sunbw2 is part of X11.
-xf86-video-sunbw2:
-xf86-video-sunbw2: For more information about the X.Org Foundation (the providers of the
-xf86-video-sunbw2: X.Org implementation of the X Window System), see their website:
-xf86-video-sunbw2:
-xf86-video-sunbw2: http://www.x.org
-xf86-video-sunbw2:
-xf86-video-sunbw2:
-xf86-video-sunbw2:
diff --git a/source/x/x11/slack-desc/xf86-video-suncg14 b/source/x/x11/slack-desc/xf86-video-suncg14
deleted file mode 100644
index de038ed1f..000000000
--- a/source/x/x11/slack-desc/xf86-video-suncg14
+++ /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------------------------------------------------------|
-xf86-video-suncg14: xf86-video-suncg14
-xf86-video-suncg14:
-xf86-video-suncg14: xf86-video-suncg14 is part of X11.
-xf86-video-suncg14:
-xf86-video-suncg14: For more information about the X.Org Foundation (the providers of the
-xf86-video-suncg14: X.Org implementation of the X Window System), see their website:
-xf86-video-suncg14:
-xf86-video-suncg14: http://www.x.org
-xf86-video-suncg14:
-xf86-video-suncg14:
-xf86-video-suncg14:
diff --git a/source/x/x11/slack-desc/xf86-video-suncg3 b/source/x/x11/slack-desc/xf86-video-suncg3
deleted file mode 100644
index c4b70a91c..000000000
--- a/source/x/x11/slack-desc/xf86-video-suncg3
+++ /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------------------------------------------------------|
-xf86-video-suncg3: xf86-video-suncg3
-xf86-video-suncg3:
-xf86-video-suncg3: xf86-video-suncg3 is part of X11.
-xf86-video-suncg3:
-xf86-video-suncg3: For more information about the X.Org Foundation (the providers of the
-xf86-video-suncg3: X.Org implementation of the X Window System), see their website:
-xf86-video-suncg3:
-xf86-video-suncg3: http://www.x.org
-xf86-video-suncg3:
-xf86-video-suncg3:
-xf86-video-suncg3:
diff --git a/source/x/x11/slack-desc/xf86-video-suncg6 b/source/x/x11/slack-desc/xf86-video-suncg6
deleted file mode 100644
index e9efb9407..000000000
--- a/source/x/x11/slack-desc/xf86-video-suncg6
+++ /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------------------------------------------------------|
-xf86-video-suncg6: xf86-video-suncg6
-xf86-video-suncg6:
-xf86-video-suncg6: xf86-video-suncg6 is part of X11.
-xf86-video-suncg6:
-xf86-video-suncg6: For more information about the X.Org Foundation (the providers of the
-xf86-video-suncg6: X.Org implementation of the X Window System), see their website:
-xf86-video-suncg6:
-xf86-video-suncg6: http://www.x.org
-xf86-video-suncg6:
-xf86-video-suncg6:
-xf86-video-suncg6:
diff --git a/source/x/x11/slack-desc/xf86-video-sunffb b/source/x/x11/slack-desc/xf86-video-sunffb
deleted file mode 100644
index 17400a0e3..000000000
--- a/source/x/x11/slack-desc/xf86-video-sunffb
+++ /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------------------------------------------------------|
-xf86-video-sunffb: xf86-video-sunffb
-xf86-video-sunffb:
-xf86-video-sunffb: xf86-video-sunffb is part of X11.
-xf86-video-sunffb:
-xf86-video-sunffb: For more information about the X.Org Foundation (the providers of the
-xf86-video-sunffb: X.Org implementation of the X Window System), see their website:
-xf86-video-sunffb:
-xf86-video-sunffb: http://www.x.org
-xf86-video-sunffb:
-xf86-video-sunffb:
-xf86-video-sunffb:
diff --git a/source/x/x11/slack-desc/xf86-video-sunleo b/source/x/x11/slack-desc/xf86-video-sunleo
deleted file mode 100644
index 03b0c2eaa..000000000
--- a/source/x/x11/slack-desc/xf86-video-sunleo
+++ /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------------------------------------------------------|
-xf86-video-sunleo: xf86-video-sunleo
-xf86-video-sunleo:
-xf86-video-sunleo: xf86-video-sunleo is part of X11.
-xf86-video-sunleo:
-xf86-video-sunleo: For more information about the X.Org Foundation (the providers of the
-xf86-video-sunleo: X.Org implementation of the X Window System), see their website:
-xf86-video-sunleo:
-xf86-video-sunleo: http://www.x.org
-xf86-video-sunleo:
-xf86-video-sunleo:
-xf86-video-sunleo:
diff --git a/source/x/x11/slack-desc/xf86-video-suntcx b/source/x/x11/slack-desc/xf86-video-suntcx
deleted file mode 100644
index 800bade3c..000000000
--- a/source/x/x11/slack-desc/xf86-video-suntcx
+++ /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------------------------------------------------------|
-xf86-video-suntcx: xf86-video-suntcx
-xf86-video-suntcx:
-xf86-video-suntcx: xf86-video-suntcx is part of X11.
-xf86-video-suntcx:
-xf86-video-suntcx: For more information about the X.Org Foundation (the providers of the
-xf86-video-suntcx: X.Org implementation of the X Window System), see their website:
-xf86-video-suntcx:
-xf86-video-suntcx: http://www.x.org
-xf86-video-suntcx:
-xf86-video-suntcx:
-xf86-video-suntcx:
diff --git a/source/x/x11/slack-desc/xf86-video-tdfx b/source/x/x11/slack-desc/xf86-video-tdfx
index 8d375baf5..dddcaf59f 100644
--- a/source/x/x11/slack-desc/xf86-video-tdfx
+++ b/source/x/x11/slack-desc/xf86-video-tdfx
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-tdfx: xf86-video-tdfx
+xf86-video-tdfx: xf86-video-tdfx (3Dfx video driver for the Xorg X server)
xf86-video-tdfx:
xf86-video-tdfx: xf86-video-tdfx is part of X11.
xf86-video-tdfx:
diff --git a/source/x/x11/slack-desc/xf86-video-tga b/source/x/x11/slack-desc/xf86-video-tga
index 52a30eb0a..fead6cbe9 100644
--- a/source/x/x11/slack-desc/xf86-video-tga
+++ b/source/x/x11/slack-desc/xf86-video-tga
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-tga: xf86-video-tga
+xf86-video-tga: xf86-video-tga (DEC21030/TGA video driver for the Xorg X server)
xf86-video-tga:
xf86-video-tga: xf86-video-tga is part of X11.
xf86-video-tga:
diff --git a/source/x/x11/slack-desc/xf86-video-trident b/source/x/x11/slack-desc/xf86-video-trident
index f4b6a5702..691972789 100644
--- a/source/x/x11/slack-desc/xf86-video-trident
+++ b/source/x/x11/slack-desc/xf86-video-trident
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-trident: xf86-video-trident
+xf86-video-trident: xf86-video-trident (Trident video driver for the Xorg X server)
xf86-video-trident:
xf86-video-trident: xf86-video-trident is part of X11.
xf86-video-trident:
diff --git a/source/x/x11/slack-desc/xf86-video-tseng b/source/x/x11/slack-desc/xf86-video-tseng
index 3192fe149..8e0a12b44 100644
--- a/source/x/x11/slack-desc/xf86-video-tseng
+++ b/source/x/x11/slack-desc/xf86-video-tseng
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-tseng: xf86-video-tseng
+xf86-video-tseng: xf86-video-tseng (Tseng Labs video driver for the Xorg X server)
xf86-video-tseng:
xf86-video-tseng: xf86-video-tseng is part of X11.
xf86-video-tseng:
diff --git a/source/x/x11/slack-desc/xf86-video-v4l b/source/x/x11/slack-desc/xf86-video-v4l
index 27e7795fd..e6e1aab13 100644
--- a/source/x/x11/slack-desc/xf86-video-v4l
+++ b/source/x/x11/slack-desc/xf86-video-v4l
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-v4l: xf86-video-v4l
+xf86-video-v4l: xf86-video-v4l (Video 4 Linux adaptor driver for X)
xf86-video-v4l:
xf86-video-v4l: xf86-video-v4l is part of X11.
xf86-video-v4l:
diff --git a/source/x/x11/slack-desc/xf86-video-vermilion b/source/x/x11/slack-desc/xf86-video-vermilion
deleted file mode 100644
index 2ca79f3e0..000000000
--- a/source/x/x11/slack-desc/xf86-video-vermilion
+++ /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------------------------------------------------------|
-xf86-video-vermilion: xf86-video-vermilion
-xf86-video-vermilion:
-xf86-video-vermilion: xf86-video-vermilion supports the Intel Vermilion Range of chipsets.
-xf86-video-vermilion:
-xf86-video-vermilion: For more information about the X.Org Foundation (the providers of the
-xf86-video-vermilion: X.Org implementation of the X Window System), see their website:
-xf86-video-vermilion:
-xf86-video-vermilion: http://www.x.org
-xf86-video-vermilion:
-xf86-video-vermilion:
-xf86-video-vermilion:
diff --git a/source/x/x11/slack-desc/xf86-video-vesa b/source/x/x11/slack-desc/xf86-video-vesa
index 5a1edcafe..0c7e742d6 100644
--- a/source/x/x11/slack-desc/xf86-video-vesa
+++ b/source/x/x11/slack-desc/xf86-video-vesa
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-vesa: xf86-video-vesa
+xf86-video-vesa: xf86-video-vesa (Generic VESA video driver for the Xorg X server)
xf86-video-vesa:
xf86-video-vesa: xf86-video-vesa is part of X11.
xf86-video-vesa:
diff --git a/source/x/x11/slack-desc/xf86-video-via b/source/x/x11/slack-desc/xf86-video-via
deleted file mode 100644
index 901931810..000000000
--- a/source/x/x11/slack-desc/xf86-video-via
+++ /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------------------------------------------------------|
-xf86-video-via: xf86-video-via
-xf86-video-via:
-xf86-video-via: xf86-video-via is part of X11.
-xf86-video-via:
-xf86-video-via: For more information about the X.Org Foundation (the providers of the
-xf86-video-via: X.Org implementation of the X Window System), see their website:
-xf86-video-via:
-xf86-video-via: http://www.x.org
-xf86-video-via:
-xf86-video-via:
-xf86-video-via:
diff --git a/source/x/x11/slack-desc/xf86-video-vmware b/source/x/x11/slack-desc/xf86-video-vmware
index d3d818b21..7ca2802ee 100644
--- a/source/x/x11/slack-desc/xf86-video-vmware
+++ b/source/x/x11/slack-desc/xf86-video-vmware
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-vmware: xf86-video-vmware
+xf86-video-vmware: xf86-video-vmware (VMWare SVGA video driver for the Xorg X server)
xf86-video-vmware:
xf86-video-vmware: xf86-video-vmware is part of X11.
xf86-video-vmware:
diff --git a/source/x/x11/slack-desc/xf86-video-voodoo b/source/x/x11/slack-desc/xf86-video-voodoo
index 5ba59ab2f..357315d45 100644
--- a/source/x/x11/slack-desc/xf86-video-voodoo
+++ b/source/x/x11/slack-desc/xf86-video-voodoo
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-voodoo: xf86-video-voodoo
+xf86-video-voodoo: xf86-video-voodoo (3DFX Voodoo/Voodoo2 video driver for Xorg)
xf86-video-voodoo:
xf86-video-voodoo: xf86-video-voodoo is part of X11.
xf86-video-voodoo:
diff --git a/source/x/x11/slack-desc/xf86-video-wsfb b/source/x/x11/slack-desc/xf86-video-wsfb
deleted file mode 100644
index 0253575ed..000000000
--- a/source/x/x11/slack-desc/xf86-video-wsfb
+++ /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------------------------------------------------------|
-xf86-video-wsfb: xf86-video-wsfb
-xf86-video-wsfb:
-xf86-video-wsfb: xf86-video-wsfb is part of X11.
-xf86-video-wsfb:
-xf86-video-wsfb: For more information about the X.Org Foundation (the providers of the
-xf86-video-wsfb: X.Org implementation of the X Window System), see their website:
-xf86-video-wsfb:
-xf86-video-wsfb: http://www.x.org
-xf86-video-wsfb:
-xf86-video-wsfb:
-xf86-video-wsfb:
diff --git a/source/x/x11/slack-desc/xf86-video-xgi b/source/x/x11/slack-desc/xf86-video-xgi
index a92ec854d..1792db1b6 100644
--- a/source/x/x11/slack-desc/xf86-video-xgi
+++ b/source/x/x11/slack-desc/xf86-video-xgi
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-xgi: xf86-video-xgi
+xf86-video-xgi: xf86-video-xgi (XGI video driver for the Xorg X server)
xf86-video-xgi:
xf86-video-xgi: xf86-video-xgi is part of X11.
xf86-video-xgi:
diff --git a/source/x/x11/slack-desc/xf86-video-xgixp b/source/x/x11/slack-desc/xf86-video-xgixp
deleted file mode 100644
index 32aea9fd0..000000000
--- a/source/x/x11/slack-desc/xf86-video-xgixp
+++ /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------------------------------------------------------|
-xf86-video-xgixp: xf86-video-xgixp
-xf86-video-xgixp:
-xf86-video-xgixp: xf86-video-xgixp is part of X11.
-xf86-video-xgixp:
-xf86-video-xgixp: For more information about the X.Org Foundation (the providers of the
-xf86-video-xgixp: X.Org implementation of the X Window System), see their website:
-xf86-video-xgixp:
-xf86-video-xgixp: http://www.x.org
-xf86-video-xgixp:
-xf86-video-xgixp:
-xf86-video-xgixp:
diff --git a/source/x/x11/slack-desc/xf86bigfontproto b/source/x/x11/slack-desc/xf86bigfontproto
index d42c5419d..d9f1cc2e5 100644
--- a/source/x/x11/slack-desc/xf86bigfontproto
+++ b/source/x/x11/slack-desc/xf86bigfontproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86bigfontproto: xf86bigfontproto
+xf86bigfontproto: xf86bigfontproto (X.Org XF86BIGFONT protocol headers)
xf86bigfontproto:
xf86bigfontproto: xf86bigfontproto is part of X11.
xf86bigfontproto:
diff --git a/source/x/x11/slack-desc/xf86dga b/source/x/x11/slack-desc/xf86dga
index 08c928a98..70d189ea3 100644
--- a/source/x/x11/slack-desc/xf86dga
+++ b/source/x/x11/slack-desc/xf86dga
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86dga: xf86dga
+xf86dga: xf86dga (simple test client for the XFree86-DGA extension)
xf86dga:
xf86dga: xf86dga is part of X11.
xf86dga:
diff --git a/source/x/x11/slack-desc/xf86dgaproto b/source/x/x11/slack-desc/xf86dgaproto
index c9ca3fc23..cbc21ac67 100644
--- a/source/x/x11/slack-desc/xf86dgaproto
+++ b/source/x/x11/slack-desc/xf86dgaproto
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86dgaproto: xf86dgaproto
+xf86dgaproto: xf86dgaproto (X.Org XFree86-DGA protocol headers)
+xf86dgaproto:
+xf86dgaproto: xf86dgaproto provides the wire protocol for the XFree86-DGA extension
+xf86dgaproto: in X.Org. It provides direct, framebuffer-like, graphics access.
+xf86dgaproto:
xf86dgaproto:
-xf86dgaproto: xf86dgaproto is part of X11.
xf86dgaproto:
-xf86dgaproto: For more information about the X.Org Foundation (the providers of the
-xf86dgaproto: X.Org implementation of the X Window System), see their website:
xf86dgaproto:
-xf86dgaproto: http://www.x.org
xf86dgaproto:
xf86dgaproto:
xf86dgaproto:
diff --git a/source/x/x11/slack-desc/xf86driproto b/source/x/x11/slack-desc/xf86driproto
index c327a43ba..e9466bdee 100644
--- a/source/x/x11/slack-desc/xf86driproto
+++ b/source/x/x11/slack-desc/xf86driproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86driproto: xf86driproto
+xf86driproto: xf86driproto (C prototypes for XFree86 DRI)
xf86driproto:
xf86driproto: xf86driproto is part of X11.
xf86driproto:
diff --git a/source/x/x11/slack-desc/xf86miscproto b/source/x/x11/slack-desc/xf86miscproto
index 883ef9fe1..bf1297b17 100644
--- a/source/x/x11/slack-desc/xf86miscproto
+++ b/source/x/x11/slack-desc/xf86miscproto
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86miscproto: xf86miscproto
+xf86miscproto: xf86miscproto (C prototypes for XFree86-Misc)
xf86miscproto:
-xf86miscproto: xf86miscproto is part of X11.
+xf86miscproto: This package includes the protocol definitions of the "XFree86-Misc"
+xf86miscproto: extension to the X11 protocol. The "XFree86-Misc" extension is
+xf86miscproto: supported by the XFree86 X server and versions of the Xorg X server
+xf86miscproto: prior to Xorg 1.6.
xf86miscproto:
-xf86miscproto: For more information about the X.Org Foundation (the providers of the
-xf86miscproto: X.Org implementation of the X Window System), see their website:
xf86miscproto:
-xf86miscproto: http://www.x.org
xf86miscproto:
xf86miscproto:
xf86miscproto:
diff --git a/source/x/x11/slack-desc/xf86vidmodeproto b/source/x/x11/slack-desc/xf86vidmodeproto
index 13acda811..2e6d8ea0e 100644
--- a/source/x/x11/slack-desc/xf86vidmodeproto
+++ b/source/x/x11/slack-desc/xf86vidmodeproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86vidmodeproto: xf86vidmodeproto
+xf86vidmodeproto: xf86vidmodeproto (C prototypes for XFree86 Video Mode Extension)
xf86vidmodeproto:
xf86vidmodeproto: xf86vidmodeproto is part of X11.
xf86vidmodeproto:
diff --git a/source/x/x11/slack-desc/xfd b/source/x/x11/slack-desc/xfd
index 31f646f5a..4d47163e2 100644
--- a/source/x/x11/slack-desc/xfd
+++ b/source/x/x11/slack-desc/xfd
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xfd: xfd
+xfd: xfd (X11 font utility)
+xfd:
+xfd: xfd displays all the characters in a font using either the X11 core
+xfd: protocol or libXft2.
+xfd:
xfd:
-xfd: xfd is part of X11.
xfd:
-xfd: For more information about the X.Org Foundation (the providers of the
-xfd: X.Org implementation of the X Window System), see their website:
xfd:
-xfd: http://www.x.org
xfd:
xfd:
xfd:
diff --git a/source/x/x11/slack-desc/xfindproxy b/source/x/x11/slack-desc/xfindproxy
deleted file mode 100644
index 64125d2ce..000000000
--- a/source/x/x11/slack-desc/xfindproxy
+++ /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------------------------------------------------------|
-xfindproxy: xfindproxy
-xfindproxy:
-xfindproxy: xfindproxy is part of X11.
-xfindproxy:
-xfindproxy: For more information about the X.Org Foundation (the providers of the
-xfindproxy: X.Org implementation of the X Window System), see their website:
-xfindproxy:
-xfindproxy: http://www.x.org
-xfindproxy:
-xfindproxy:
-xfindproxy:
diff --git a/source/x/x11/slack-desc/xfontsel b/source/x/x11/slack-desc/xfontsel
index cb4594c23..0638c5e83 100644
--- a/source/x/x11/slack-desc/xfontsel
+++ b/source/x/x11/slack-desc/xfontsel
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xfontsel: xfontsel
+xfontsel: xfontsel (X11 font selector)
+xfontsel:
+xfontsel: xfontsel application provides a simple way to display the X11 core
+xfontsel: protocol fonts known to your X server, examine samples of each, and
+xfontsel: retrieve the X Logical Font Description ("XLFD") full name for a font.
xfontsel:
-xfontsel: xfontsel is part of X11.
xfontsel:
-xfontsel: For more information about the X.Org Foundation (the providers of the
-xfontsel: X.Org implementation of the X Window System), see their website:
xfontsel:
-xfontsel: http://www.x.org
xfontsel:
xfontsel:
xfontsel:
diff --git a/source/x/x11/slack-desc/xfs b/source/x/x11/slack-desc/xfs
index 33ea36875..63d8766e6 100644
--- a/source/x/x11/slack-desc/xfs
+++ b/source/x/x11/slack-desc/xfs
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xfs: xfs
+xfs: xfs (font server for X11)
xfs:
xfs: xfs is part of X11.
xfs:
diff --git a/source/x/x11/slack-desc/xfsinfo b/source/x/x11/slack-desc/xfsinfo
index 87abf1e48..85e5ef229 100644
--- a/source/x/x11/slack-desc/xfsinfo
+++ b/source/x/x11/slack-desc/xfsinfo
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xfsinfo: xfsinfo
+xfsinfo: xfsinfo (X11 font server utility)
xfsinfo:
-xfsinfo: xfsinfo is part of X11.
+xfsinfo: xfsinfo is a utility for displaying information about an X font server.
+xfsinfo: It is used to examine the capabilities of a server, the predefined
+xfsinfo: values for various parameters used in communicating between clients
+xfsinfo: and the server, and the font catalogues and alternate servers that
+xfsinfo: are available.
xfsinfo:
-xfsinfo: For more information about the X.Org Foundation (the providers of the
-xfsinfo: X.Org implementation of the X Window System), see their website:
-xfsinfo:
-xfsinfo: http://www.x.org
xfsinfo:
xfsinfo:
xfsinfo:
diff --git a/source/x/x11/slack-desc/xgamma b/source/x/x11/slack-desc/xgamma
index 69df14aaa..c7ebcb959 100644
--- a/source/x/x11/slack-desc/xgamma
+++ b/source/x/x11/slack-desc/xgamma
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xgamma: xgamma
+xgamma: xgamma (X11 gamma utility)
+xgamma:
+xgamma: xgamma allows X users to query and alter the gamma correction of a
+xgamma: monitor via the X video mode extension (XFree86-VidModeExtension).
+xgamma:
xgamma:
-xgamma: xgamma is part of X11.
xgamma:
-xgamma: For more information about the X.Org Foundation (the providers of the
-xgamma: X.Org implementation of the X Window System), see their website:
xgamma:
-xgamma: http://www.x.org
xgamma:
xgamma:
xgamma:
diff --git a/source/x/x11/slack-desc/xgc b/source/x/x11/slack-desc/xgc
index 0de84bc07..e07e9bad8 100644
--- a/source/x/x11/slack-desc/xgc
+++ b/source/x/x11/slack-desc/xgc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xgc: xgc
+xgc: xgc (X11 demo client)
+xgc:
+xgc: xgc is an X11 graphics demo that shows various features of the X11
+xgc: core protocol graphics primitives.
+xgc:
xgc:
-xgc: xgc is part of X11.
xgc:
-xgc: For more information about the X.Org Foundation (the providers of the
-xgc: X.Org implementation of the X Window System), see their website:
xgc:
-xgc: http://www.x.org
xgc:
xgc:
xgc:
diff --git a/source/x/x11/slack-desc/xhost b/source/x/x11/slack-desc/xhost
index 53f9620b2..a4b9501d6 100644
--- a/source/x/x11/slack-desc/xhost
+++ b/source/x/x11/slack-desc/xhost
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xhost: xhost
+xhost: xhost (X11 authorization utility)
+xhost:
+xhost: xhost is used to manage the list of host names or user names allowed
+xhost: to make connections to the X server.
+xhost:
xhost:
-xhost: xhost is part of X11.
xhost:
-xhost: For more information about the X.Org Foundation (the providers of the
-xhost: X.Org implementation of the X Window System), see their website:
xhost:
-xhost: http://www.x.org
xhost:
xhost:
xhost:
diff --git a/source/x/x11/slack-desc/xineramaproto b/source/x/x11/slack-desc/xineramaproto
index dbdde8001..6a39b1a13 100644
--- a/source/x/x11/slack-desc/xineramaproto
+++ b/source/x/x11/slack-desc/xineramaproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xineramaproto: xineramaproto
+xineramaproto: xineramaproto (C prototypes for X11 Xinerama Extension)
xineramaproto:
xineramaproto: xineramaproto is part of X11.
xineramaproto:
diff --git a/source/x/x11/slack-desc/xinit b/source/x/x11/slack-desc/xinit
index c1b053181..c64cd86a2 100644
--- a/source/x/x11/slack-desc/xinit
+++ b/source/x/x11/slack-desc/xinit
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xinit: xinit
+xinit: xinit (scripts to start X11 servers)
+xinit:
+xinit: xinit is not intended for naive users. Instead, site administrators
+xinit: should design user-friendly scripts that present the desired interface
+xinit: when starting up X. The startx script is one such example.
xinit:
-xinit: xinit is part of X11.
xinit:
-xinit: For more information about the X.Org Foundation (the providers of the
-xinit: X.Org implementation of the X Window System), see their website:
xinit:
-xinit: http://www.x.org
xinit:
xinit:
xinit:
diff --git a/source/x/x11/slack-desc/xinput b/source/x/x11/slack-desc/xinput
index 758a6ba6f..6ae25aeca 100644
--- a/source/x/x11/slack-desc/xinput
+++ b/source/x/x11/slack-desc/xinput
@@ -5,15 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler------------------------------------------------------|
-xinput: xinput
+ |-----handy-ruler------------------------------------------------------|
+xinput: xinput (utility to configure and test X11 input devices)
xinput:
xinput: xinput is a utility to configure and test XInput devices. It wasn't
xinput: originally designed to be the primary tool for doing this but it's
xinput: still pretty much the only program out there for doing it. :-)
xinput:
-xinput: xinput is part of X11.
-xinput:
xinput: For more information about the X.Org Foundation (the providers of the
xinput: X.Org implementation of the X Window System), see their website:
xinput: http://www.x.org
+xinput:
+xinput:
diff --git a/source/x/x11/slack-desc/xkbcomp b/source/x/x11/slack-desc/xkbcomp
index ab3fc9b79..dc0da9b2b 100644
--- a/source/x/x11/slack-desc/xkbcomp
+++ b/source/x/x11/slack-desc/xkbcomp
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xkbcomp: xkbcomp
+xkbcomp: xkbcomp (X Keyboard Extension)
xkbcomp:
xkbcomp: xkbcomp is part of X11.
xkbcomp:
diff --git a/source/x/x11/slack-desc/xkbdata b/source/x/x11/slack-desc/xkbdata
deleted file mode 100644
index 5fafad26a..000000000
--- a/source/x/x11/slack-desc/xkbdata
+++ /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------------------------------------------------------|
-xkbdata: xkbdata
-xkbdata:
-xkbdata: xkbdata is part of X11.
-xkbdata:
-xkbdata: For more information about the X.Org Foundation (the providers of the
-xkbdata: X.Org implementation of the X Window System), see their website:
-xkbdata:
-xkbdata: http://www.x.org
-xkbdata:
-xkbdata:
-xkbdata:
diff --git a/source/x/x11/slack-desc/xkbevd b/source/x/x11/slack-desc/xkbevd
index 9909e676c..59b3f14ef 100644
--- a/source/x/x11/slack-desc/xkbevd
+++ b/source/x/x11/slack-desc/xkbevd
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xkbevd: xkbevd
+xkbevd: xkbevd (X11 keyboard event daemon)
xkbevd:
xkbevd: xkbevd is part of X11.
xkbevd:
diff --git a/source/x/x11/slack-desc/xkbprint b/source/x/x11/slack-desc/xkbprint
index efbe7ab94..ab30d0519 100644
--- a/source/x/x11/slack-desc/xkbprint
+++ b/source/x/x11/slack-desc/xkbprint
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xkbprint: xkbprint
+xkbprint: xkbprint (X11 keyboard utility)
+xkbprint:
+xkbprint: xkbprint generates a printable or encapsulated PostScript description
+xkbprint: of an XKB keyboard description.
+xkbprint:
xkbprint:
-xkbprint: xkbprint is part of X11.
xkbprint:
-xkbprint: For more information about the X.Org Foundation (the providers of the
-xkbprint: X.Org implementation of the X Window System), see their website:
xkbprint:
-xkbprint: http://www.x.org
xkbprint:
xkbprint:
xkbprint:
diff --git a/source/x/x11/slack-desc/xkbutils b/source/x/x11/slack-desc/xkbutils
index 1e98d49d4..80f8ee9e5 100644
--- a/source/x/x11/slack-desc/xkbutils
+++ b/source/x/x11/slack-desc/xkbutils
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xkbutils: xkbutils
+xkbutils: xkbutils (X11 keyboard utilities)
+xkbutils:
+xkbutils: xkbutils is a collection of small utilities utilizing the XKeyboard
+xkbutils: (XKB) extension to the X11 protocol.
+xkbutils:
xkbutils:
-xkbutils: xkbutils is part of X11.
xkbutils:
-xkbutils: For more information about the X.Org Foundation (the providers of the
-xkbutils: X.Org implementation of the X Window System), see their website:
xkbutils:
-xkbutils: http://www.x.org
xkbutils:
xkbutils:
xkbutils:
diff --git a/source/x/x11/slack-desc/xkeyboard-config b/source/x/x11/slack-desc/xkeyboard-config
index 3b9b0bb77..01454254d 100644
--- a/source/x/x11/slack-desc/xkeyboard-config
+++ b/source/x/x11/slack-desc/xkeyboard-config
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xkeyboard-config: xkeyboard-config
+xkeyboard-config: xkeyboard-config (X Keyboard Extension config files)
xkeyboard-config:
-xkeyboard-config: xkeyboard-config is part of X11.
-xkeyboard-config:
-xkeyboard-config: For more information about the X.Org Foundation (the providers of the
-xkeyboard-config: X.Org implementation of the X Window System), see their website:
-xkeyboard-config:
-xkeyboard-config: http://www.x.org
+xkeyboard-config: The X Keyboard Extension essentially replaces the core protocol
+xkeyboard-config: definition of keyboard. The extension makes possible to clearly and
+xkeyboard-config: explicitly specify most aspects of keyboard behaviour on per-key
+xkeyboard-config: basis and to more closely track the logical and physical state of the
+xkeyboard-config: keyboard. It also includes a number of keyboard controls designed to
+xkeyboard-config: make keyboards more accessible to people with physical impairments.
xkeyboard-config:
xkeyboard-config:
xkeyboard-config:
diff --git a/source/x/x11/slack-desc/xkill b/source/x/x11/slack-desc/xkill
index 82aedb48b..66904b44d 100644
--- a/source/x/x11/slack-desc/xkill
+++ b/source/x/x11/slack-desc/xkill
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xkill: xkill
+xkill: xkill (X11 utility)
+xkill:
+xkill: xkill is a utility for forcing the X server to close connections to
+xkill: clients. This program is very dangerous, but is useful for aborting
+xkill: programs that have displayed undesired windows on a user's screen.
xkill:
-xkill: xkill is part of X11.
xkill:
-xkill: For more information about the X.Org Foundation (the providers of the
-xkill: X.Org implementation of the X Window System), see their website:
xkill:
-xkill: http://www.x.org
xkill:
xkill:
xkill:
diff --git a/source/x/x11/slack-desc/xload b/source/x/x11/slack-desc/xload
index b95b6b6cb..24adeac76 100644
--- a/source/x/x11/slack-desc/xload
+++ b/source/x/x11/slack-desc/xload
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xload: xload
+xload: xload (displays a histogram of the system load average)
xload:
xload: xload is part of X11.
xload:
diff --git a/source/x/x11/slack-desc/xlogo b/source/x/x11/slack-desc/xlogo
index fbd28cc1e..e97b3e259 100644
--- a/source/x/x11/slack-desc/xlogo
+++ b/source/x/x11/slack-desc/xlogo
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xlogo: xlogo
+xlogo: xlogo (displays the X Window System logo)
xlogo:
xlogo: xlogo is part of X11.
xlogo:
diff --git a/source/x/x11/slack-desc/xlsatoms b/source/x/x11/slack-desc/xlsatoms
index f4e7e79c9..c6e958aef 100644
--- a/source/x/x11/slack-desc/xlsatoms
+++ b/source/x/x11/slack-desc/xlsatoms
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xlsatoms: xlsatoms
+xlsatoms: xlsatoms (lists the interned atoms defined on an X11 server)
xlsatoms:
xlsatoms: xlsatoms is part of X11.
xlsatoms:
diff --git a/source/x/x11/slack-desc/xlsclients b/source/x/x11/slack-desc/xlsclients
index 2bcf25fb1..2cf50b064 100644
--- a/source/x/x11/slack-desc/xlsclients
+++ b/source/x/x11/slack-desc/xlsclients
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xlsclients: xlsclients
+xlsclients: xlsclients (X11 utility for listing X client info)
+xlsclients:
+xlsclients: xlsclients is a utility for listing information about the client
+xlsclients: applications running on a X11 server.
+xlsclients:
xlsclients:
-xlsclients: xlsclients is part of X11.
xlsclients:
-xlsclients: For more information about the X.Org Foundation (the providers of the
-xlsclients: X.Org implementation of the X Window System), see their website:
xlsclients:
-xlsclients: http://www.x.org
xlsclients:
xlsclients:
xlsclients:
diff --git a/source/x/x11/slack-desc/xlsfonts b/source/x/x11/slack-desc/xlsfonts
index 25e25afc7..d285ab052 100644
--- a/source/x/x11/slack-desc/xlsfonts
+++ b/source/x/x11/slack-desc/xlsfonts
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xlsfonts: xlsfonts
+xlsfonts: xlsfonts (X11 font utility to list available fonts)
+xlsfonts:
+xlsfonts: xlsfonts lists fonts available from an X server via the X11 core
+xlsfonts: protocol.
+xlsfonts:
xlsfonts:
-xlsfonts: xlsfonts is part of X11.
xlsfonts:
-xlsfonts: For more information about the X.Org Foundation (the providers of the
-xlsfonts: X.Org implementation of the X Window System), see their website:
xlsfonts:
-xlsfonts: http://www.x.org
xlsfonts:
xlsfonts:
xlsfonts:
diff --git a/source/x/x11/slack-desc/xmag b/source/x/x11/slack-desc/xmag
index 38174dd73..50c329f83 100644
--- a/source/x/x11/slack-desc/xmag
+++ b/source/x/x11/slack-desc/xmag
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xmag: xmag
+xmag: xmag (X11 accessibility utility)
+xmag:
+xmag: xmag displays a magnified snapshot of a portion of an X11 screen.
+xmag:
+xmag:
xmag:
-xmag: xmag is part of X11.
xmag:
-xmag: For more information about the X.Org Foundation (the providers of the
-xmag: X.Org implementation of the X Window System), see their website:
xmag:
-xmag: http://www.x.org
xmag:
xmag:
xmag:
diff --git a/source/x/x11/slack-desc/xman b/source/x/x11/slack-desc/xman
index 98ce929c3..206da5c89 100644
--- a/source/x/x11/slack-desc/xman
+++ b/source/x/x11/slack-desc/xman
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xman: xman
+xman: xman (graphical manual page browser using the Xaw toolkit)
xman:
xman: xman is part of X11.
xman:
diff --git a/source/x/x11/slack-desc/xmessage b/source/x/x11/slack-desc/xmessage
index 12c9c0dfa..233d4aa26 100644
--- a/source/x/x11/slack-desc/xmessage
+++ b/source/x/x11/slack-desc/xmessage
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xmessage: xmessage
+xmessage: xmessage (displays a message or query in a window)
+xmessage:
+xmessage: The user can click on an "okay" button to dismiss it or can select
+xmessage: one of several buttons to answer a question. xmessage can also exit
+xmessage: after a specified time.
xmessage:
-xmessage: xmessage is part of X11.
xmessage:
-xmessage: For more information about the X.Org Foundation (the providers of the
-xmessage: X.Org implementation of the X Window System), see their website:
xmessage:
-xmessage: http://www.x.org
xmessage:
xmessage:
xmessage:
diff --git a/source/x/x11/slack-desc/xmh b/source/x/x11/slack-desc/xmh
index a1415c8bb..8730f1f2a 100644
--- a/source/x/x11/slack-desc/xmh
+++ b/source/x/x11/slack-desc/xmh
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xmh: xmh
+xmh: xmh (X11 mail handler)
+xmh:
+xmh: The xmh program provides a graphical user interface to the MH Message
+xmh: Handling System. To actually do things with your mail, it makes
+xmh: calls to the MH package.
xmh:
-xmh: xmh is part of X11.
xmh:
-xmh: For more information about the X.Org Foundation (the providers of the
-xmh: X.Org implementation of the X Window System), see their website:
xmh:
-xmh: http://www.x.org
xmh:
xmh:
xmh:
diff --git a/source/x/x11/slack-desc/xmodmap b/source/x/x11/slack-desc/xmodmap
index aeb77cff6..9397f1c39 100644
--- a/source/x/x11/slack-desc/xmodmap
+++ b/source/x/x11/slack-desc/xmodmap
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xmodmap: xmodmap
+xmodmap: xmodmap (X11 keyboard utility)
xmodmap:
-xmodmap: xmodmap is part of X11.
+xmodmap: The xmodmap program is used to edit and display the keyboard modifier
+xmodmap: map and keymap table that are used by client applications to convert
+xmodmap: event keycodes into keysyms. It is usually run from a user's session
+xmodmap: startup script to configure the keyboard according to personal tastes.
xmodmap:
-xmodmap: For more information about the X.Org Foundation (the providers of the
-xmodmap: X.Org implementation of the X Window System), see their website:
xmodmap:
-xmodmap: http://www.x.org
xmodmap:
xmodmap:
xmodmap:
diff --git a/source/x/x11/slack-desc/xmore b/source/x/x11/slack-desc/xmore
index a714db3df..c8696b875 100644
--- a/source/x/x11/slack-desc/xmore
+++ b/source/x/x11/slack-desc/xmore
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xmore: xmore
+xmore: xmore (plain text display program for the X Window System)
xmore:
xmore: xmore is part of X11.
xmore:
diff --git a/source/x/x11/slack-desc/xorg-cf-files b/source/x/x11/slack-desc/xorg-cf-files
index a5f15784f..343f50374 100644
--- a/source/x/x11/slack-desc/xorg-cf-files
+++ b/source/x/x11/slack-desc/xorg-cf-files
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xorg-cf-files: xorg-cf-files
+xorg-cf-files: xorg-cf-files (X11 config files for imake)
xorg-cf-files:
-xorg-cf-files: xorg-cf-files is part of X11.
+xorg-cf-files: The xorg-cf-files package contains the data files for the imake
+xorg-cf-files: utility, defining the known settings for a wide variety of platforms
+xorg-cf-files: (many of which have not been verified or tested in over a decade) and
+xorg-cf-files: for many of the libraries formerly delivered in the X.Org monolithic
+xorg-cf-files: releases.
xorg-cf-files:
-xorg-cf-files: For more information about the X.Org Foundation (the providers of the
-xorg-cf-files: X.Org implementation of the X Window System), see their website:
-xorg-cf-files:
-xorg-cf-files: http://www.x.org
xorg-cf-files:
xorg-cf-files:
xorg-cf-files:
diff --git a/source/x/x11/slack-desc/xorg-docs b/source/x/x11/slack-desc/xorg-docs
index aee2a992a..dfe9e2499 100644
--- a/source/x/x11/slack-desc/xorg-docs
+++ b/source/x/x11/slack-desc/xorg-docs
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xorg-docs: xorg-docs
+xorg-docs: xorg-docs (documentation for X11)
xorg-docs:
-xorg-docs: xorg-docs is part of X11.
+xorg-docs: This package provides miscellaneous documentation for the X Window
+xorg-docs: System that doesn't better fit into other packages.
+xorg-docs:
+xorg-docs: The preferred documentation format for these documents is DocBook XML.
xorg-docs:
-xorg-docs: For more information about the X.Org Foundation (the providers of the
-xorg-docs: X.Org implementation of the X Window System), see their website:
xorg-docs:
-xorg-docs: http://www.x.org
xorg-docs:
xorg-docs:
xorg-docs:
diff --git a/source/x/x11/slack-desc/xorg-sgml-doctools b/source/x/x11/slack-desc/xorg-sgml-doctools
index 1467fb828..df8670042 100644
--- a/source/x/x11/slack-desc/xorg-sgml-doctools
+++ b/source/x/x11/slack-desc/xorg-sgml-doctools
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xorg-sgml-doctools: xorg-sgml-doctools
+xorg-sgml-doctools: xorg-sgml-doctools (X.org documentation tools)
xorg-sgml-doctools:
-xorg-sgml-doctools: xorg-sgml-doctools is part of X11.
-xorg-sgml-doctools:
-xorg-sgml-doctools: For more information about the X.Org Foundation (the providers of the
-xorg-sgml-doctools: X.Org implementation of the X Window System), see their website:
-xorg-sgml-doctools:
-xorg-sgml-doctools: http://www.x.org
+xorg-sgml-doctools: This package provides a common set of SGML entities and XML/CSS style
+xorg-sgml-doctools: sheets used in building/formatting the documentation provided in other
+xorg-sgml-doctools: X.Org packages. It's typically only needed by people building from
+xorg-sgml-doctools: source who want to produce formatted documentation from their builds,
+xorg-sgml-doctools: or those who have installed the HTML version of the documentation,
+xorg-sgml-doctools: which refers to the included common xorg.css stylesheet.
xorg-sgml-doctools:
xorg-sgml-doctools:
xorg-sgml-doctools:
diff --git a/source/x/x11/slack-desc/xphelloworld b/source/x/x11/slack-desc/xphelloworld
deleted file mode 100644
index e5ae0f3b6..000000000
--- a/source/x/x11/slack-desc/xphelloworld
+++ /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------------------------------------------------------|
-xphelloworld: xphelloworld
-xphelloworld:
-xphelloworld: xphelloworld is part of X11.
-xphelloworld:
-xphelloworld: For more information about the X.Org Foundation (the providers of the
-xphelloworld: X.Org implementation of the X Window System), see their website:
-xphelloworld:
-xphelloworld: http://www.x.org
-xphelloworld:
-xphelloworld:
-xphelloworld:
diff --git a/source/x/x11/slack-desc/xpr b/source/x/x11/slack-desc/xpr
index 1e7795cac..45936d409 100644
--- a/source/x/x11/slack-desc/xpr
+++ b/source/x/x11/slack-desc/xpr
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xpr: xpr
+xpr: xpr (dump an X window directly to a printer)
+xpr:
+xpr: xpr takes as input a window dump file produced by xwd
+xpr: and formats it for output on various types of printers.
+xpr:
xpr:
-xpr: xpr is part of X11.
xpr:
-xpr: For more information about the X.Org Foundation (the providers of the
-xpr: X.Org implementation of the X Window System), see their website:
xpr:
-xpr: http://www.x.org
xpr:
xpr:
xpr:
diff --git a/source/x/x11/slack-desc/xprop b/source/x/x11/slack-desc/xprop
index 8996f5097..99788723a 100644
--- a/source/x/x11/slack-desc/xprop
+++ b/source/x/x11/slack-desc/xprop
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xprop: xprop
+xprop: xprop (displays window and font properties of an X server)
xprop:
xprop: xprop is part of X11.
xprop:
diff --git a/source/x/x11/slack-desc/xproto b/source/x/x11/slack-desc/xproto
index e57551ab9..1c230b1e3 100644
--- a/source/x/x11/slack-desc/xproto
+++ b/source/x/x11/slack-desc/xproto
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xproto: xproto
+xproto: xproto (C prototypes for X Window System Core Protocol)
xproto:
xproto: xproto is part of X11.
xproto:
diff --git a/source/x/x11/slack-desc/xproxymanagementprotocol b/source/x/x11/slack-desc/xproxymanagementprotocol
deleted file mode 100644
index a5586dc68..000000000
--- a/source/x/x11/slack-desc/xproxymanagementprotocol
+++ /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------------------------------------------------------|
-xproxymanagementprotocol: xproxymanagementprotocol
-xproxymanagementprotocol:
-xproxymanagementprotocol: xproxymanagementprotocol is part of X11.
-xproxymanagementprotocol:
-xproxymanagementprotocol: For more information about the X.Org Foundation (the providers of the
-xproxymanagementprotocol: X.Org implementation of the X Window System), see their website:
-xproxymanagementprotocol:
-xproxymanagementprotocol: http://www.x.org
-xproxymanagementprotocol:
-xproxymanagementprotocol:
-xproxymanagementprotocol:
diff --git a/source/x/x11/slack-desc/xpyb b/source/x/x11/slack-desc/xpyb
index 92baab773..4d96cc270 100644
--- a/source/x/x11/slack-desc/xpyb
+++ b/source/x/x11/slack-desc/xpyb
@@ -5,15 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler-------------------------------------------------------|
-xpyb: xpyb
+ |-----handy-ruler------------------------------------------------------|
+xpyb: xpyb (Python bindings for X)
+xpyb:
+xpyb: xpyb provides a Python binding to the X Window System protocol
+xpyb: via libxcb.
+xpyb:
xpyb:
-xpyb: xpyb is part of X11.
xpyb:
-xpyb: For more information about the X.Org Foundation (the providers of the
-xpyb: X.Org implementation of the X Window System), see their website:
xpyb:
-xpyb: http://www.x.org
xpyb:
xpyb:
xpyb:
diff --git a/source/x/x11/slack-desc/xrandr b/source/x/x11/slack-desc/xrandr
index 8f158dd02..059fe1b32 100644
--- a/source/x/x11/slack-desc/xrandr
+++ b/source/x/x11/slack-desc/xrandr
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xrandr: xrandr
+xrandr: xrandr (X11 RandR utility)
+xrandr:
+xrandr: Primitive command line interface to X11 Resize, Rotate, and Reflect
+xrandr: (RandR) extension
+xrandr:
xrandr:
-xrandr: xrandr is part of X11.
xrandr:
-xrandr: For more information about the X.Org Foundation (the providers of the
-xrandr: X.Org implementation of the X Window System), see their website:
xrandr:
-xrandr: http://www.x.org
xrandr:
xrandr:
xrandr:
diff --git a/source/x/x11/slack-desc/xrdb b/source/x/x11/slack-desc/xrdb
index 26ea47867..9adef9742 100644
--- a/source/x/x11/slack-desc/xrdb
+++ b/source/x/x11/slack-desc/xrdb
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xrdb: xrdb
+xrdb: xrdb (X server resource database utility)
xrdb:
xrdb: xrdb is part of X11.
xrdb:
diff --git a/source/x/x11/slack-desc/xrefresh b/source/x/x11/slack-desc/xrefresh
index 65e7140c4..f641dcf80 100644
--- a/source/x/x11/slack-desc/xrefresh
+++ b/source/x/x11/slack-desc/xrefresh
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xrefresh: xrefresh
+xrefresh: xrefresh (refresh all or part of an X screen)
xrefresh:
xrefresh: xrefresh is part of X11.
xrefresh:
diff --git a/source/x/x11/slack-desc/xscope b/source/x/x11/slack-desc/xscope
index 5008a745a..a513cba6c 100644
--- a/source/x/x11/slack-desc/xscope
+++ b/source/x/x11/slack-desc/xscope
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xscope: xscope
+xscope: xscope (program to monitor X11/Client conversations)
xscope:
xscope: xscope is part of X11.
xscope:
diff --git a/source/x/x11/slack-desc/xset b/source/x/x11/slack-desc/xset
index e434079c7..da54a2740 100644
--- a/source/x/x11/slack-desc/xset
+++ b/source/x/x11/slack-desc/xset
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xset: xset
+xset: xset (get and set various preferences and properties)
+xset:
+xset: xset is a command line utility to get and set various preferences
+xset: and properties for the current session.
+xset:
xset:
-xset: xset is part of X11.
xset:
-xset: For more information about the X.Org Foundation (the providers of the
-xset: X.Org implementation of the X Window System), see their website:
xset:
-xset: http://www.x.org
xset:
xset:
xset:
diff --git a/source/x/x11/slack-desc/xsetmode b/source/x/x11/slack-desc/xsetmode
deleted file mode 100644
index b727c3e95..000000000
--- a/source/x/x11/slack-desc/xsetmode
+++ /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------------------------------------------------------|
-xsetmode: xsetmode
-xsetmode:
-xsetmode: xsetmode is part of X11.
-xsetmode:
-xsetmode: For more information about the X.Org Foundation (the providers of the
-xsetmode: X.Org implementation of the X Window System), see their website:
-xsetmode:
-xsetmode: http://www.x.org
-xsetmode:
-xsetmode:
-xsetmode:
diff --git a/source/x/x11/slack-desc/xsetroot b/source/x/x11/slack-desc/xsetroot
index 8a9a4be32..569396ae3 100644
--- a/source/x/x11/slack-desc/xsetroot
+++ b/source/x/x11/slack-desc/xsetroot
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xsetroot: xsetroot
+xsetroot: xsetroot (root window parameter setting utility for X)
xsetroot:
xsetroot: xsetroot is part of X11.
xsetroot:
diff --git a/source/x/x11/slack-desc/xsm b/source/x/x11/slack-desc/xsm
index 8fe6ba3c1..0034f323d 100644
--- a/source/x/x11/slack-desc/xsm
+++ b/source/x/x11/slack-desc/xsm
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xsm: xsm
+xsm: xsm (X11 Session Manager)
xsm:
xsm: xsm is part of X11.
xsm:
diff --git a/source/x/x11/slack-desc/xstdcmap b/source/x/x11/slack-desc/xstdcmap
index b1bd5e6af..f659e7582 100644
--- a/source/x/x11/slack-desc/xstdcmap
+++ b/source/x/x11/slack-desc/xstdcmap
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xstdcmap: xstdcmap
+xstdcmap: xstdcmap (X11 color utility)
xstdcmap:
-xstdcmap: xstdcmap is part of X11.
+xstdcmap: The xstdcmap utility can be used to selectively define standard
+xstdcmap: colormap properties. It is intended to be run from a user's X
+xstdcmap: startup script to create standard colormap definitions in order to
+xstdcmap: facilitate sharing of scarce colormap resources among clients using
+xstdcmap: PseudoColor visuals.
xstdcmap:
-xstdcmap: For more information about the X.Org Foundation (the providers of the
-xstdcmap: X.Org implementation of the X Window System), see their website:
-xstdcmap:
-xstdcmap: http://www.x.org
xstdcmap:
xstdcmap:
xstdcmap:
diff --git a/source/x/x11/slack-desc/xtrans b/source/x/x11/slack-desc/xtrans
index f7ea71c32..26c4866af 100644
--- a/source/x/x11/slack-desc/xtrans
+++ b/source/x/x11/slack-desc/xtrans
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xtrans: xtrans
+xtrans: xtrans (X network transport library)
xtrans:
-xtrans: xtrans is part of X11.
+xtrans: xtrans is a library of code that is shared among various X packages
+xtrans: to handle network protocol transport in a modular fashion, allowing a
+xtrans: single place to add new transport types. It is used by the X server,
+xtrans: libX11, libICE, the X font server, and related components.
xtrans:
-xtrans: For more information about the X.Org Foundation (the providers of the
-xtrans: X.Org implementation of the X Window System), see their website:
xtrans:
-xtrans: http://www.x.org
xtrans:
xtrans:
xtrans:
diff --git a/source/x/x11/slack-desc/xvidtune b/source/x/x11/slack-desc/xvidtune
index bdadf298b..d55fae9fb 100644
--- a/source/x/x11/slack-desc/xvidtune
+++ b/source/x/x11/slack-desc/xvidtune
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xvidtune: xvidtune
+xvidtune: xvidtune (X11 video utility)
+xvidtune:
+xvidtune: xvidtune is a client interface to the X server video mode extension
+xvidtune: (XFree86-VidModeExtension).
+xvidtune:
xvidtune:
-xvidtune: xvidtune is part of X11.
xvidtune:
-xvidtune: For more information about the X.Org Foundation (the providers of the
-xvidtune: X.Org implementation of the X Window System), see their website:
xvidtune:
-xvidtune: http://www.x.org
xvidtune:
xvidtune:
xvidtune:
diff --git a/source/x/x11/slack-desc/xvinfo b/source/x/x11/slack-desc/xvinfo
index 54a44c8a4..84f50e6f5 100644
--- a/source/x/x11/slack-desc/xvinfo
+++ b/source/x/x11/slack-desc/xvinfo
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xvinfo: xvinfo
+xvinfo: xvinfo (X11 X-Video utility)
+xvinfo:
+xvinfo: xvinfo prints out the capabilities of any video adaptors associated
+xvinfo: with the display that are accessible through the X-Video extension.
+xvinfo:
xvinfo:
-xvinfo: xvinfo is part of X11.
xvinfo:
-xvinfo: For more information about the X.Org Foundation (the providers of the
-xvinfo: X.Org implementation of the X Window System), see their website:
xvinfo:
-xvinfo: http://www.x.org
xvinfo:
xvinfo:
xvinfo:
diff --git a/source/x/x11/slack-desc/xwd b/source/x/x11/slack-desc/xwd
index 6b2450a06..8230f3368 100644
--- a/source/x/x11/slack-desc/xwd
+++ b/source/x/x11/slack-desc/xwd
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xwd: xwd
+xwd: xwd (dump an image of an X window)
xwd:
xwd: xwd is part of X11.
xwd:
diff --git a/source/x/x11/slack-desc/xwininfo b/source/x/x11/slack-desc/xwininfo
index 03e11ddf5..9545fbfa7 100644
--- a/source/x/x11/slack-desc/xwininfo
+++ b/source/x/x11/slack-desc/xwininfo
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xwininfo: xwininfo
+xwininfo: xwininfo (prints information about windows on an X server)
+xwininfo:
+xwininfo: Various information is displayed depending on which options are
+xwininfo: selected.
+xwininfo:
xwininfo:
-xwininfo: xwininfo is part of X11.
xwininfo:
-xwininfo: For more information about the X.Org Foundation (the providers of the
-xwininfo: X.Org implementation of the X Window System), see their website:
xwininfo:
-xwininfo: http://www.x.org
xwininfo:
xwininfo:
xwininfo:
diff --git a/source/x/x11/slack-desc/xwud b/source/x/x11/slack-desc/xwud
index f0c22d345..6ae90864d 100644
--- a/source/x/x11/slack-desc/xwud
+++ b/source/x/x11/slack-desc/xwud
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xwud: xwud
+xwud: xwud (X screen dump viewer)
+xwud:
+xwud: xwud allows X users to display in a window an image saved in a
+xwud: specially formatted dump file, such as produced by xwd.
+xwud:
xwud:
-xwud: xwud is part of X11.
xwud:
-xwud: For more information about the X.Org Foundation (the providers of the
-xwud: X.Org implementation of the X Window System), see their website:
xwud:
-xwud: http://www.x.org
xwud:
xwud:
xwud:
diff --git a/source/x/x11/src/get-xf86-video-nouveau.sh b/source/x/x11/src/get-xf86-video-nouveau.sh
index 72d3efd37..9a21febde 100755
--- a/source/x/x11/src/get-xf86-video-nouveau.sh
+++ b/source/x/x11/src/get-xf86-video-nouveau.sh
@@ -1,8 +1,14 @@
# Pull a stable branch + patches
BRANCH=master
-rm -rf xf86-video-nouveau
-git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/
+#rm -rf xf86-video-nouveau
+if [ -d xf86-video-nouveau ]; then
+ cd xf86-video-nouveau
+ git pull -f
+ cd ..
+else
+ git clone git://anongit.freedesktop.org/git/nouveau/xf86-video-nouveau/
+fi
# use master branch
#( cd xf86-video-nouveau
diff --git a/source/x/xaw3d/pull-xaw3d.sh b/source/x/xaw3d/pull-xaw3d.sh
deleted file mode 100755
index 96141a6da..000000000
--- a/source/x/xaw3d/pull-xaw3d.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-rm -rf xaw3d
-git clone git://gitorious.org/xaw3d/xaw3d.git
-( cd xaw3d && rm -rf .git* )
-mv xaw3d xaw3d-$(date +%Y%m%d)git
-tar cf xaw3d-$(date +%Y%m%d)git.tar xaw3d-$(date +%Y%m%d)git
-xz -9 xaw3d-$(date +%Y%m%d)git.tar
-
diff --git a/source/x/xaw3d/slack-desc b/source/x/xaw3d/slack-desc
deleted file mode 100644
index 75ce0e1d5..000000000
--- a/source/x/xaw3d/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------------------------------------------------------|
-xaw3d: xaw3d (3D version of libXaw)
-xaw3d:
-xaw3d: Xaw3d is a set of 3D widgets by Kaleb S. Keithley based on the Athena
-xaw3d: Widget set. The Three-D Athena may be used as a replacement for the
-xaw3d: Athena (Xaw) Widget set -- you may relink almost any Athena Widget
-xaw3d: based application and obtain a three dimensional appearance on some of
-xaw3d: the widgets. You can also replace your shared libXaw with libXaw3d
-xaw3d: and obtain the three dimensional appearance without even relinking.
-xaw3d:
-xaw3d:
-xaw3d:
diff --git a/source/x/xaw3d/xaw3d.SlackBuild b/source/x/xaw3d/xaw3d.SlackBuild
deleted file mode 100755
index 1574d7f39..000000000
--- a/source/x/xaw3d/xaw3d.SlackBuild
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008, 2009, 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.
-
-
-PKGNAM=xaw3d
-VERSION=${VERSION:-20110415git}
-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
-
-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"
-fi
-
-NUMJOBS=${NUMJOBS:-" -j7 "}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-xaw3d
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf $TMP/xaw3d-$VERSION
-tar xvf $CWD/xaw3d-$VERSION.tar.?z* || exit 1
-cd xaw3d-$VERSION/xc || 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 {} \;
-
-cd lib/Xaw3d
-ln -s .. X11
-xmkmf
-make CCOPTIONS="$SLKCFLAGS -I." || exit 1
-make install DESTDIR=$PKG
-
-strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/libXaw3d.so.*
-# Make compat symlinks. For whatever reason, Xaw3d has had more random
-# numbers assigned to it over the years than about anything, so we need
-# to make links that work for at least .6 and .8 in addition to .7.
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
- ln -sf libXaw3d.so.7 libXaw3d.so.8
- ln -sf libXaw3d.so.7 libXaw3d.so.6
-)
-mkdir -p $PKG/usr/doc/Xaw3d-$VERSION
-cp -a README.XAW3D $PKG/usr/doc/Xaw3d-$VERSION
-chmod 644 $PKG/usr/doc/Xaw3d-$VERSION/README.XAW3D
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-# Build the package:
-cd $PKG
-/sbin/makepkg -l y -c y $TMP/xaw3d-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
index d3b965421..0b5b65dc9 100755
--- a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
+++ b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PKGNAM=xdg-user-dirs
-VERSION=${VERSION:-0.13}
+VERSION=${VERSION:-0.14}
BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
@@ -89,6 +89,14 @@ cp -a \
AUTHORS COPYING* INSTALL NEWS README* TODO \
$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
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
diff --git a/source/xap/xfce4-power-manager/doinst.sh b/source/x/xterm/doinst.sh
index 1f8ff67de..1f8ff67de 100644
--- a/source/xap/xfce4-power-manager/doinst.sh
+++ b/source/x/xterm/doinst.sh
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 863ccae40..392d3053a 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -88,12 +88,19 @@ CFLAGS="$SLKCFLAGS" \
--enable-wide-chars \
--enable-88-color \
--enable-256-color \
+ --with-icon-theme=hicolor \
+ --with-icondir=/usr/share/icons \
+ --with-pixmapdir=/usr/share/pixmaps \
--build=$ARCH-slackware-linux
# Build and install:
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
+# Not sure why "make install" doesn't do this:
+mkdir -p $PKG/usr/share/applications
+cp xterm.desktop uxterm.desktop $PKG/usr/share/applications
+
# 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
@@ -129,6 +136,7 @@ cp -a \
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/MPlayer/MPlayer.SlackBuild b/source/xap/MPlayer/MPlayer.SlackBuild
index 17b8b0362..663fe2f8b 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 a73feb270..71686a3c9 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 50274f1f4..20139dff6 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 e904ab8d9..000000000
--- 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 4a6514904..66bb0f907 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 af0004968..c7051217e 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 000000000..e72bbd3f1
--- /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 000000000..ed320388a
--- /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 58bd92592..d6ddca3eb 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 737dae98a..f47aabb6b 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 2be304107..52864abbc 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 000000000..71bea31d6
--- /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 62e425b39..fd08cbc2e 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 57a23d6f5..087da9e3e 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 7906a4731..b04223c75 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 2d2eac94c..000000000
--- 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 77995d921..2d2a9ef5f 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 000000000..b9d001d11
--- /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 863643a43..000000000
--- 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 788a4e43a..c0fb46b0f 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 dbde32bb9..2c0851b4d 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 cadbd7745..7371d160b 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 ba93205e8..9a293b64c 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 330ca4f13..458485851 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 e156f1819..14c071725 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 47cf5eb72..b6203229f 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 4e8ba7071..f6a667688 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 13b249a90..4ceef2337 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 1f300165a..67353af10 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 f2e0a7caa..000000000
--- 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 000000000..b64cef007
--- /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 565d3a0af..cf17f5f34 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 812a7b163..a6f6c65c5 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 366df44bc..000000000
--- 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 000000000..7309b55a1
--- /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 d36fe937f..f0e910c40 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 000000000..6da6f0c0b
--- /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/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
new file mode 100755
index 000000000..702215967
--- /dev/null
+++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# Slackware build script for network-manager-applet
+
+# Copyright 2010, 2011 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.
+
+PKGNAM=network-manager-applet
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --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 $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 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:
+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/network-manager-applet/slack-desc b/source/xap/network-manager-applet/slack-desc
new file mode 100644
index 000000000..ad8c8f7d6
--- /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 0aab423c7..b3bbe857a 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 000000000..5c57a3815
--- /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 c4336adbc..77372ab97 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 000000000..1e313cde0
--- /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 bfefef2eb..5fa20495f 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 d882a6e84..000000000
--- 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 0db8c3bc2..000000000
--- 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 5e1ae2e2e..ba6c67728 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 81d394853..defc62b59 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 000000000..4e240e0cf
--- /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 613393dc5..be9dd725d 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 000000000..0c9900420
--- /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 b929f202f..f5bf09935 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 4550444af..bbdb1f417 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 6b4173e24..afc1bc963 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 656d2ff96..f2435b193 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/windowmaker/WindowMaker.noopensusemenu.diff b/source/xap/windowmaker/WindowMaker.noopensusemenu.diff
new file mode 100644
index 000000000..e68fa85af
--- /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 74462e281..da5ac6792 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 277cc79e4..000000000
--- 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 a6359c4b2..000000000
--- 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 c80edd341..3fdfe6431 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 2c43c1eb2..386588a41 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 d467253f4..49faabba8 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 225142a24..fd2f53fa7 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 cc7b5e1a8..c02a71e5f 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 7d92c3e4d..000000000
--- 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 be64a2da6..000000000
--- 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 6477cd78b..000000000
--- 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 5db73b1e2..000000000
--- 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 6e5b4a9a6..000000000
--- 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 7315ecea5..000000000
--- 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 d88267815..000000000
--- 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 fde47a9e8..000000000
--- 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 206f6607a..000000000
--- 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 56a340608..000000000
--- 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 9c54cf9a7..000000000
--- 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 ccc2b8f15..000000000
--- 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 adb187c10..000000000
--- 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/xfce.SlackBuild b/source/xap/xfce/xfce.SlackBuild
deleted file mode 100755
index aaa38f994..000000000
--- 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/xfractint/xfractint.SlackBuild b/source/xap/xfractint/xfractint.SlackBuild
index 1ae5e6fef..e6b8bb4d3 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 c11275936..97391f39a 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 61650223f..65a18c183 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 000000000..63e577174
--- /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 35a06513c..000000000
--- 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 09ce261f2..c7ced75b1 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 000000000..208c765ad
--- /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 b19b3aca7..6093f21d8 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 1b7117158..b301d081e 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 000000000..bc7bcbd9e
--- /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 57943911c..830c4dd9d 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
diff --git a/source/xfce/Terminal/Terminal.SlackBuild b/source/xfce/Terminal/Terminal.SlackBuild
new file mode 100755
index 000000000..f5335b2e8
--- /dev/null
+++ b/source/xfce/Terminal/Terminal.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# Slackware build script for Xfce Terminal
+
+# Copyright 2010,2011 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.
+
+PKGNAM=Terminal
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j6}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) 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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc/xfce \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || 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
+
+# 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/$PKGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING* HACKING INSTALL NEWS README* THANKS TODO \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/x11/slack-desc/libXTrap b/source/xfce/Terminal/slack-desc
index 51443def8..23121078f 100644
--- a/source/x/x11/slack-desc/libXTrap
+++ b/source/xfce/Terminal/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXTrap: libXTrap
-libXTrap:
-libXTrap: libXTrap is part of X11.
-libXTrap:
-libXTrap: For more information about the X.Org Foundation (the providers of the
-libXTrap: X.Org implementation of the X Window System), see their website:
-libXTrap:
-libXTrap: http://www.x.org
-libXTrap:
-libXTrap:
-libXTrap:
+Terminal: Terminal (Xfce's Terminal Emulator)
+Terminal:
+Terminal: This is the Terminal emulator application. Terminal is a lightweight
+Terminal: and easy to use terminal emulator for the X windowing system, with
+Terminal: some new ideas and features that makes it unique among X terminal
+Terminal: emulators.
+Terminal:
+Terminal:
+Terminal:
+Terminal:
+Terminal:
diff --git a/source/xfce/Thunar/Thunar.SlackBuild b/source/xfce/Thunar/Thunar.SlackBuild
new file mode 100755
index 000000000..54f72b77f
--- /dev/null
+++ b/source/xfce/Thunar/Thunar.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=Thunar
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/Thunar/slack-desc b/source/xfce/Thunar/slack-desc
new file mode 100644
index 000000000..afd93c05a
--- /dev/null
+++ b/source/xfce/Thunar/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------------------------------------------------------|
+Thunar: Thunar (file manager)
+Thunar:
+Thunar: Thunar is a modern file manager for the Xfce Desktop Environment.
+Thunar: Thunar has been designed from the ground up to be fast and
+Thunar: easy-to-use. Its user interface is clean and intuitive, and does not
+Thunar: include any confusing or useless options. Thunar is fast and
+Thunar: responsive with a good start up time and directory load time.
+Thunar:
+Thunar: Homepage: http://thunar.xfce.org
+Thunar:
+Thunar:
diff --git a/source/xfce/exo/exo.SlackBuild b/source/xfce/exo/exo.SlackBuild
new file mode 100755
index 000000000..a3189a584
--- /dev/null
+++ b/source/xfce/exo/exo.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=exo
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/l/wv2/slack-desc b/source/xfce/exo/slack-desc
index e5861a4b6..6bd9c8269 100644
--- a/source/l/wv2/slack-desc
+++ b/source/xfce/exo/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-wv2: wv2 (MS Word document import library)
-wv2:
-wv2: wv2 is a portable MS Word .doc import filter that is used by KWord.
-wv2: Currently, it supports MS Word 6, MS Word 95, MS Word 97, MS Word
-wv2: 2000, and MS Word 2002 (XP) documents. Older versions like Word 2, 3,
-wv2: 4, and 5 aren't supported yet, but might be in the future.
-wv2:
-wv2: wv2's authors are Shaheed Haque, Werner Trobin, and David Faure.
-wv2:
-wv2:
-wv2:
+exo: exo (libexo extension library)
+exo:
+exo: This is libexo, an extension library to Xfce, developed by
+exo: os-cillation. While Xfce comes with quite a few libraries that are
+exo: targeted at desktop development, libexo is targeted at application
+exo: development. It also has some helper applications that are used
+exo: throughout the entire desktop.
+exo:
+exo:
+exo:
+exo:
diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild
new file mode 100755
index 000000000..f60c47f92
--- /dev/null
+++ b/source/xfce/garcon/garcon.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=garcon
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/garcon/slack-desc b/source/xfce/garcon/slack-desc
new file mode 100644
index 000000000..abc2d786a
--- /dev/null
+++ b/source/xfce/garcon/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------------------------------------------------------|
+garcon: garcon (menu implementation for Xfce)
+garcon:
+garcon: This is garcon, a freedesktop.org compliant menu implementation based
+garcon: on GLib and GIO. It was started as a rewrite of the former Xfce menu
+garcon: library called libxfce4menu.
+garcon:
+garcon:
+garcon:
+garcon:
+garcon:
+garcon:
diff --git a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild b/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild
new file mode 100755
index 000000000..8e9454c1c
--- /dev/null
+++ b/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=gtk-xfce-engine
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/x11/slack-desc/xf86-input-fpit b/source/xfce/gtk-xfce-engine/slack-desc
index 51ee433ef..1ccfa128b 100644
--- a/source/x/x11/slack-desc/xf86-input-fpit
+++ b/source/xfce/gtk-xfce-engine/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-fpit: xf86-input-fpit
-xf86-input-fpit:
-xf86-input-fpit: xf86-input-fpit is part of X11.
-xf86-input-fpit:
-xf86-input-fpit: For more information about the X.Org Foundation (the providers of the
-xf86-input-fpit: X.Org implementation of the X Window System), see their website:
-xf86-input-fpit:
-xf86-input-fpit: http://www.x.org
-xf86-input-fpit:
-xf86-input-fpit:
-xf86-input-fpit:
+gtk-xfce-engine: gtk-xfce-engine (Xfce Gtk+ engines)
+gtk-xfce-engine:
+gtk-xfce-engine: The GTK-Xfce-Engine package contains several GTK+-2/3 themes and the
+gtk-xfce-engine: applications and libraries needed to display them. This is useful for
+gtk-xfce-engine: customizing the appearance of your Xfce desktop.
+gtk-xfce-engine:
+gtk-xfce-engine:
+gtk-xfce-engine:
+gtk-xfce-engine:
+gtk-xfce-engine:
+gtk-xfce-engine:
diff --git a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild
new file mode 100755
index 000000000..3762c747d
--- /dev/null
+++ b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild
@@ -0,0 +1,140 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=libxfce4ui
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --with-vendor-info=Slackware \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Add vendor info in /usr/share/xfce4/Slackware
+mkdir -p $PKG/usr/share/xfce4
+echo "http://slackware.com/" > $PKG/usr/share/xfce4/Slackware
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/x11/slack-desc/x11-driver b/source/xfce/libxfce4ui/slack-desc
index 3196549e9..d774e673e 100644
--- a/source/x/x11/slack-desc/x11-driver
+++ b/source/xfce/libxfce4ui/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-x11-driver: x11-driver (input and output drivers for X)
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
-x11-driver:
+libxfce4ui: libxfce4ui (Xfce widget library)
+libxfce4ui:
+libxfce4ui: This is libxfce4ui, the replacement of the old libxfcegui4 library.
+libxfce4ui: It is used to share commonly used Xfce widgets among the Xfce
+libxfce4ui: applications.
+libxfce4ui:
+libxfce4ui:
+libxfce4ui:
+libxfce4ui:
+libxfce4ui:
+libxfce4ui:
diff --git a/source/xfce/libxfce4util/libxfce4util.SlackBuild b/source/xfce/libxfce4util/libxfce4util.SlackBuild
new file mode 100755
index 000000000..8d19530dc
--- /dev/null
+++ b/source/xfce/libxfce4util/libxfce4util.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=libxfce4util
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/x11/slack-desc/xplsprinters b/source/xfce/libxfce4util/slack-desc
index b4201593a..b5c92596b 100644
--- a/source/x/x11/slack-desc/xplsprinters
+++ b/source/xfce/libxfce4util/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xplsprinters: xplsprinters
-xplsprinters:
-xplsprinters: xplsprinters is part of X11.
-xplsprinters:
-xplsprinters: For more information about the X.Org Foundation (the providers of the
-xplsprinters: X.Org implementation of the X Window System), see their website:
-xplsprinters:
-xplsprinters: http://www.x.org
-xplsprinters:
-xplsprinters:
-xplsprinters:
+libxfce4util: libxfce4util (basic utility library for Xfce)
+libxfce4util:
+libxfce4util: Basic utility library for Xfce. This provides useful functions not
+libxfce4util: relating to the handling of the user interface.
+libxfce4util:
+libxfce4util:
+libxfce4util:
+libxfce4util:
+libxfce4util:
+libxfce4util:
+libxfce4util:
diff --git a/source/xfce/libxfcegui4/libxfcegui4.SlackBuild b/source/xfce/libxfcegui4/libxfcegui4.SlackBuild
new file mode 100755
index 000000000..d4af97ff8
--- /dev/null
+++ b/source/xfce/libxfcegui4/libxfcegui4.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=libxfcegui4
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/kde/polkit-kde-1/slack-desc b/source/xfce/libxfcegui4/slack-desc
index 8e0a3ad64..8309460df 100644
--- a/source/kde/polkit-kde-1/slack-desc
+++ b/source/xfce/libxfcegui4/slack-desc
@@ -5,14 +5,15 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler-----------------------------------------------------|
-polkit-kde-1: polkit-kde-1 (KDE polkit authenticator)
-polkit-kde-1:
-polkit-kde-1: This is a polkit authenticator for KDE.
-polkit-kde-1:
-polkit-kde-1:
-polkit-kde-1:
-polkit-kde-1:
-polkit-kde-1:
-polkit-kde-1:
-polkit-kde-1:
+ |-----handy-ruler------------------------------------------------------|
+libxfcegui4: libxfcegui4 (old Xfce widget library)
+libxfcegui4:
+libxfcegui4: This is a widget library for Xfce. It has been replaced by the use
+libxfcegui4: of the libxfce4ui library, but older programs might still need it.
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
+libxfcegui4:
diff --git a/source/xfce/orage/orage.SlackBuild b/source/xfce/orage/orage.SlackBuild
new file mode 100755
index 000000000..9342007ce
--- /dev/null
+++ b/source/xfce/orage/orage.SlackBuild
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+# Slackware build script for orage
+
+# Copyright 2010,2011,2012 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.
+
+PKGNAM=orage
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 {} \;
+
+# Yes, libical's pkgconfig file is incomplete, it seems
+CFLAGS="$SLKCFLAGS -I/usr/include/libical" \
+CXXFLAGS="$SLKCFLAGS -I/usr/include/libical" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || 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
+
+# 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/$PKGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING* INSTALL NEWS README* TODO \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/x11/slack-desc/xtrap b/source/xfce/orage/slack-desc
index bdf77e438..665765d06 100644
--- a/source/x/x11/slack-desc/xtrap
+++ b/source/xfce/orage/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xtrap: xtrap
-xtrap:
-xtrap: xtrap is part of X11.
-xtrap:
-xtrap: For more information about the X.Org Foundation (the providers of the
-xtrap: X.Org implementation of the X Window System), see their website:
-xtrap:
-xtrap: http://www.x.org
-xtrap:
-xtrap:
-xtrap:
+orage: orage (Xfce's calendar)
+orage:
+orage: Orage is a time-managing application for the Xfce desktop environment.
+orage:
+orage:
+orage:
+orage:
+orage:
+orage:
+orage:
+orage:
diff --git a/source/xap/thunar-volman/slack-desc b/source/xfce/thunar-volman/slack-desc
index a5fdf60b8..900d22a44 100644
--- a/source/xap/thunar-volman/slack-desc
+++ b/source/xfce/thunar-volman/slack-desc
@@ -12,8 +12,8 @@ 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:
+thunar-volman:
thunar-volman:
thunar-volman:
diff --git a/source/xap/thunar-volman/thunar-volman.SlackBuild b/source/xfce/thunar-volman/thunar-volman.SlackBuild
index bf14ff9e3..89fd5ab82 100755
--- a/source/xap/thunar-volman/thunar-volman.SlackBuild
+++ b/source/xfce/thunar-volman/thunar-volman.SlackBuild
@@ -1,9 +1,8 @@
#!/bin/sh
# Slackware build script for thunar-volman
-# http://goodies.xfce.org/releases/thunar-volman/
-# Copyright 2007-2009 Robby Workman, Northport, Alabama, USA
+# Copyright 2007-2012 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,14 +23,23 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=thunar-volman
-VERSION=0.3.80
-ARCH=${ARCH:-x86_64}
+PKGNAM=thunar-volman
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -42,14 +50,17 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \) \
@@ -63,22 +74,30 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--enable-debug=no \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
-make || exit 1
-make install DESTDIR=$PKG
+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
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
- AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ AUTHORS COPYING* INSTALL NEWS README* THANKS \
+ $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/${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
cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/tumbler/slack-desc b/source/xfce/tumbler/slack-desc
new file mode 100644
index 000000000..d40670e40
--- /dev/null
+++ b/source/xfce/tumbler/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------------------------------------------------------|
+tumbler: tumbler (thumbnail generator)
+tumbler:
+tumbler: Tumbler is a D-Bus service for applications to request thumbnails
+tumbler: for various URI schemes and MIME types. It is written in an object-
+tumbler: oriented fashion using GLib and GObject. It provides plugin
+tumbler: interfaces for extending the URI schemes and MIME types for which
+tumbler: thumbnails can be generated as well as for replacing the storage
+tumbler: backend that is used to store the thumbnails on disk.
+tumbler:
+tumbler:
+tumbler:
diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild
new file mode 100755
index 000000000..2b1649132
--- /dev/null
+++ b/source/xfce/tumbler/tumbler.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=tumbler
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# 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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfce-build-all.sh b/source/xfce/xfce-build-all.sh
new file mode 100755
index 000000000..0ad32cc74
--- /dev/null
+++ b/source/xfce/xfce-build-all.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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.
+
+# Set to 1 if you'd like to install/upgrade package as they are built.
+# This is recommended.
+INST=1
+
+TMP=${TMP:-/tmp}
+
+for package in \
+ xfce4-dev-tools \
+ libxfce4util \
+ xfconf \
+ libxfce4ui \
+ libxfcegui4 \
+ exo \
+ garcon \
+ tumbler \
+ Thunar \
+ xfce4-panel \
+ xfce4-settings \
+ xfce4-session \
+ xfdesktop \
+ xfwm4 \
+ xfce4-appfinder \
+ gtk-xfce-engine \
+ xfwm4-themes \
+ Terminal \
+ orage \
+ xfce4-mixer \
+ thunar-volman \
+ xfce4-power-manager \
+ xfce4-notifyd \
+ xfce4-volumed \
+ xfce4-clipman-plugin \
+ xfce4-screenshooter \
+ xfce4-systemload-plugin \
+ xfce4-taskmanager \
+ xfce4-weather-plugin \
+ ; do
+ cd $package || exit 1
+ ./${package}.SlackBuild || ( touch /tmp/${package}.failed ; exit 1 ) || exit 1
+ if [ "$INST" = "1" ]; then
+ PACKAGE="$(ls -t $TMP/$(ls ${package}*.xz | rev | cut -f2- -d - | rev)-*txz | head -n 1)"
+ if [ -f $PACKAGE ]; then
+ upgradepkg --install-new --reinstall $PACKAGE
+ else
+ echo "Error: package to upgrade "$PACKAGE" not found in $TMP"
+ exit 1
+ fi
+ fi
+ cd ..
+done
diff --git a/source/xfce/xfce4-appfinder/slack-desc b/source/xfce/xfce4-appfinder/slack-desc
new file mode 100644
index 000000000..ef06f7053
--- /dev/null
+++ b/source/xfce/xfce4-appfinder/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------------------------------------------------------|
+xfce4-appfinder: xfce4-appfinder (Application finder)
+xfce4-appfinder:
+xfce4-appfinder: The Xfce application finder is a tool to find and launch installed
+xfce4-appfinder: applications on your system and execute commands. It can also be used
+xfce4-appfinder: to quickly add launchers to the Xfce Panel by dragging an item from
+xfce4-appfinder: the view and dropping it on the panel.
+xfce4-appfinder:
+xfce4-appfinder:
+xfce4-appfinder:
+xfce4-appfinder:
+xfce4-appfinder:
diff --git a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
new file mode 100755
index 000000000..dffff6897
--- /dev/null
+++ b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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-appfinder
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfce4-clipman-plugin/doinst.sh b/source/xfce/xfce4-clipman-plugin/doinst.sh
new file mode 100644
index 000000000..1f8ff67de
--- /dev/null
+++ b/source/xfce/xfce4-clipman-plugin/doinst.sh
@@ -0,0 +1,10 @@
+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/xfce/xfce4-clipman-plugin/slack-desc b/source/xfce/xfce4-clipman-plugin/slack-desc
new file mode 100644
index 000000000..def918455
--- /dev/null
+++ b/source/xfce/xfce4-clipman-plugin/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------------------------------------------------------|
+xfce4-clipman-plugin: xfce4-clipman-plugin (clipman plugin for the Xfce panel)
+xfce4-clipman-plugin:
+xfce4-clipman-plugin: Clipman allows you to keep several clipboard selections in memory
+xfce4-clipman-plugin: which you can then use to toggle. It can pull the clips from both
+xfce4-clipman-plugin: the selection and the copy buffer, restore your clipboard on login,
+xfce4-clipman-plugin: and prevent an empty clipboard.
+xfce4-clipman-plugin:
+xfce4-clipman-plugin:
+xfce4-clipman-plugin:
+xfce4-clipman-plugin:
+xfce4-clipman-plugin:
diff --git a/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild
new file mode 100755
index 000000000..813c32d9c
--- /dev/null
+++ b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-clipman-plugin
+
+# Copyright 2006-2012 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:
+#
+# 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-clipman-plugin
+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) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --enable-shared=yes \
+ --enable-static=no \
+ --enable-debug=no \
+ --build=$ARCH-slackware-linux || 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* \
+ $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/${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/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url
new file mode 100644
index 000000000..73b59ab18
--- /dev/null
+++ b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/
diff --git a/source/x/x11/slack-desc/xf86-video-i810 b/source/xfce/xfce4-dev-tools/slack-desc
index 99eb5b476..a5d0a4dfc 100644
--- a/source/x/x11/slack-desc/xf86-video-i810
+++ b/source/xfce/xfce4-dev-tools/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-i810: xf86-video-i810
-xf86-video-i810:
-xf86-video-i810: xf86-video-i810 is part of X11.
-xf86-video-i810:
-xf86-video-i810: For more information about the X.Org Foundation (the providers of the
-xf86-video-i810: X.Org implementation of the X Window System), see their website:
-xf86-video-i810:
-xf86-video-i810: http://www.x.org
-xf86-video-i810:
-xf86-video-i810:
-xf86-video-i810:
+xfce4-dev-tools: xfce4-dev-tools (Xfce development tools)
+xfce4-dev-tools:
+xfce4-dev-tools: The Xfce development tools are a collection of tools and macros for
+xfce4-dev-tools: Xfce developers and people that want to build Xfce from Git.
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
+xfce4-dev-tools:
diff --git a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
new file mode 100755
index 000000000..0924180e5
--- /dev/null
+++ b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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-dev-tools
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfce4-mixer/doinst.sh b/source/xfce/xfce4-mixer/doinst.sh
new file mode 100644
index 000000000..9830478e8
--- /dev/null
+++ b/source/xfce/xfce4-mixer/doinst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+ /usr/bin/update-mime-database usr/share/mime >/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/xfce/xfce4-mixer/slack-desc b/source/xfce/xfce4-mixer/slack-desc
new file mode 100644
index 000000000..727418746
--- /dev/null
+++ b/source/xfce/xfce4-mixer/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------------------------------------------------------|
+xfce4-mixer: xfce4-mixer (Sound mixer applet for Xfce)
+xfce4-mixer:
+xfce4-mixer: The xfce4-mixer package contains a volume control application based
+xfce4-mixer: on GStreamer written to conceptually fit into the Xfce desktop
+xfce4-mixer: environment. It also contains a plugin for the Xfce panel which is
+xfce4-mixer: especially designed for use with the mouse wheel.
+xfce4-mixer:
+xfce4-mixer:
+xfce4-mixer:
+xfce4-mixer:
+xfce4-mixer:
diff --git a/source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild b/source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild
new file mode 100755
index 000000000..4787144b4
--- /dev/null
+++ b/source/xfce/xfce4-mixer/xfce4-mixer.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-mixer
+
+# Copyright 2010, 2011 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.
+
+PKGNAM=xfce4-mixer
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc/xfce \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || 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* HACKING INSTALL NEWS README* THANKS TODO \
+ $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/${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/xfce4-notifyd/doinst.sh b/source/xfce/xfce4-notifyd/doinst.sh
index ec1b3d8a2..ec1b3d8a2 100644
--- a/source/xap/xfce4-notifyd/doinst.sh
+++ b/source/xfce/xfce4-notifyd/doinst.sh
diff --git a/source/xap/xfce4-notifyd/slack-desc b/source/xfce/xfce4-notifyd/slack-desc
index 1463db0bd..1463db0bd 100644
--- a/source/xap/xfce4-notifyd/slack-desc
+++ b/source/xfce/xfce4-notifyd/slack-desc
diff --git a/source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
index 2f33dbd88..1a793217f 100755
--- a/source/xap/xfce4-notifyd/xfce4-notifyd.SlackBuild
+++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild
@@ -26,7 +26,7 @@
PKGNAM=xfce4-notifyd
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
@@ -38,6 +38,8 @@ if [ -z "$ARCH" ]; then
esac
fi
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -75,15 +77,31 @@ CFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc/xfce \
--localstatedir=/var \
+ --mandir=/usr/man \
--enable-debug=no \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
-make || exit 1
+make $NUMJOBS || make || exit 1
make install-strip DESTDIR=$PKG || exit 1
+# 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/usr/doc/$PKGNAM-$VERSION
cp -a \
- AUTHORS COPYING INSTALL NEWS README TODO \
+ AUTHORS COPYING* INSTALL NEWS README* TODO \
$PKG/usr/doc/$PKGNAM-$VERSION
# If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/xfce/xfce4-panel/slack-desc b/source/xfce/xfce4-panel/slack-desc
new file mode 100644
index 000000000..0711bf8b0
--- /dev/null
+++ b/source/xfce/xfce4-panel/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------------------------------------------------------|
+xfce4-panel: xfce4-panel (panel for Xfce)
+xfce4-panel:
+xfce4-panel: The Xfce panel is part of the Xfce Desktop Environment and features
+xfce4-panel: program launchers, panel menus, a clock, a desktop switcher, and more.
+xfce4-panel: Many aspects of the panel can be configured through graphical dialogs,
+xfce4-panel: but also by GTK+ style properties and Xfconf settings.
+xfce4-panel:
+xfce4-panel:
+xfce4-panel:
+xfce4-panel:
+xfce4-panel:
diff --git a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild
new file mode 100755
index 000000000..425cc3d33
--- /dev/null
+++ b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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-panel
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfce4-power-manager/doinst.sh b/source/xfce/xfce4-power-manager/doinst.sh
new file mode 100644
index 000000000..1f8ff67de
--- /dev/null
+++ b/source/xfce/xfce4-power-manager/doinst.sh
@@ -0,0 +1,10 @@
+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/xfce/xfce4-power-manager/slack-desc
index d1dd7ec16..8c79d3d78 100644
--- a/source/xap/xfce4-power-manager/slack-desc
+++ b/source/xfce/xfce4-power-manager/slack-desc
@@ -9,8 +9,8 @@
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: suspend and hibernate) easy inside the Xfce Desktop Environment.
+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/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
index 1aa24bde0..37229cd81 100755
--- a/source/xap/xfce4-power-manager/xfce4-power-manager.SlackBuild
+++ b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xfce4-power-manager
-# Copyright 2006-2010 Robby Workman Northport, Alabama, USA
+# Copyright 2006-2012 Robby Workman Northport, Alabama, USA
# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -28,16 +28,16 @@ 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
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -73,26 +73,39 @@ CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc/xfce \
+ --sysconfdir=/etc \
--mandir=/usr/man \
--docdir=/usr/doc/$PKGNAM-$VERSION \
--enable-shared=yes \
--enable-static=no \
--enable-debug=no \
- --disable-network-manager \
- --build=$ARCH-slackware-linux
+ --enable-network-manager \
+ --build=$ARCH-slackware-linux || exit 1
-make || exit 1
-make install DESTDIR=$PKG
+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
-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/usr/doc/$PKGNAM-$VERSION/html
cp -a \
- AUTHORS COPYING NEWS README TODO \
+ 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
diff --git a/source/xfce/xfce4-screenshooter/doinst.sh b/source/xfce/xfce4-screenshooter/doinst.sh
new file mode 100644
index 000000000..1f8ff67de
--- /dev/null
+++ b/source/xfce/xfce4-screenshooter/doinst.sh
@@ -0,0 +1,10 @@
+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/x/x11/slack-desc/xf86-input-hyperpen b/source/xfce/xfce4-screenshooter/slack-desc
index f6d6bda88..83eeaf7b5 100644
--- a/source/x/x11/slack-desc/xf86-input-hyperpen
+++ b/source/xfce/xfce4-screenshooter/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-hyperpen: xf86-input-hyperpen
-xf86-input-hyperpen:
-xf86-input-hyperpen: xf86-input-hyperpen is part of X11.
-xf86-input-hyperpen:
-xf86-input-hyperpen: For more information about the X.Org Foundation (the providers of the
-xf86-input-hyperpen: X.Org implementation of the X Window System), see their website:
-xf86-input-hyperpen:
-xf86-input-hyperpen: http://www.x.org
-xf86-input-hyperpen:
-xf86-input-hyperpen:
-xf86-input-hyperpen:
+xfce4-screenshooter: xfce4-screenshooter (screenshooter plugin for Xfce)
+xfce4-screenshooter:
+xfce4-screenshooter: The screenshooter plugin adds a panel button that allows you to take
+xfce4-screenshooter: screenshots.
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
+xfce4-screenshooter:
diff --git a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild
new file mode 100755
index 000000000..791a78f00
--- /dev/null
+++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild
@@ -0,0 +1,130 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-screenshooter
+
+# Copyright 2006-2012 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.
+
+PKGNAM=xfce4-screenshooter
+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) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc/xfce \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --mandir=/usr/man \
+ --enable-shared=yes \
+ --enable-static=no \
+ --enable-debug=no \
+ --build=$ARCH-slackware-linux || 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
+
+# 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/$PKGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING* INSTALL NEWS README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+if [ -d $PKG/usr/share/doc/xfce4-screenshooter ]; then # --docdir was ignored
+ mv $PKG/usr/share/doc/xfce4-screenshooter/* $PKG/usr/doc/$PKGNAM-$VERSION
+ ( cd $PKG/usr/share ; rmdir -p doc/xfce4-screenshooter )
+fi
+
+# 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/xfce/xfce4-screenshooter/xfce4-screenshooter.url b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url
new file mode 100644
index 000000000..48b2447ed
--- /dev/null
+++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/apps/xfce4-screenshooter/
diff --git a/source/x/x11/slack-desc/libXprintUtil b/source/xfce/xfce4-session/slack-desc
index bcad34155..235feb30c 100644
--- a/source/x/x11/slack-desc/libXprintUtil
+++ b/source/xfce/xfce4-session/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-libXprintUtil: libXprintUtil
-libXprintUtil:
-libXprintUtil: libXprintUtil is part of X11.
-libXprintUtil:
-libXprintUtil: For more information about the X.Org Foundation (the providers of the
-libXprintUtil: X.Org implementation of the X Window System), see their website:
-libXprintUtil:
-libXprintUtil: http://www.x.org
-libXprintUtil:
-libXprintUtil:
-libXprintUtil:
+xfce4-session: xfce4-session (Xfce session manager)
+xfce4-session:
+xfce4-session: Xfce4-session is a session manager for Xfce. Its task is to save the
+xfce4-session: state of your desktop (opened applications and their location) and
+xfce4-session: restore it during a next startup. You can create several different
+xfce4-session: sessions and choose one of them on startup.
+xfce4-session:
+xfce4-session:
+xfce4-session:
+xfce4-session:
+xfce4-session:
diff --git a/source/xfce/xfce4-session/xfce4-session.SlackBuild b/source/xfce/xfce4-session/xfce4-session.SlackBuild
new file mode 100755
index 000000000..081a13786
--- /dev/null
+++ b/source/xfce/xfce4-session/xfce4-session.SlackBuild
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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-session
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/patches/load_systemwide_Xmodmap_file.diff.gz | patch -p1 || 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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --enable-libgnome-keyring \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/x11/slack-desc/xf86-video-nsc b/source/xfce/xfce4-settings/slack-desc
index 1081a9f5f..590a3b3e4 100644
--- a/source/x/x11/slack-desc/xf86-video-nsc
+++ b/source/xfce/xfce4-settings/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-nsc: xf86-video-nsc
-xf86-video-nsc:
-xf86-video-nsc: xf86-video-nsc is part of X11.
-xf86-video-nsc:
-xf86-video-nsc: For more information about the X.Org Foundation (the providers of the
-xf86-video-nsc: X.Org implementation of the X Window System), see their website:
-xf86-video-nsc:
-xf86-video-nsc: http://www.x.org
-xf86-video-nsc:
-xf86-video-nsc:
-xf86-video-nsc:
+xfce4-settings: xfce4-settings (Xfce settings manager)
+xfce4-settings:
+xfce4-settings: xfce4-settings is the Xfce settings manager front-end. It comes with
+xfce4-settings: several different components for configuring application-independent
+xfce4-settings: settings inside xfconf.
+xfce4-settings:
+xfce4-settings:
+xfce4-settings:
+xfce4-settings:
+xfce4-settings:
+xfce4-settings:
diff --git a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
new file mode 100755
index 000000000..6e400455a
--- /dev/null
+++ b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild
@@ -0,0 +1,140 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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-settings
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+zcat $CWD/xfce4-settings.theme.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/xfce4-settings.xft.defaults.diff.gz | patch -p1 --verbose || exit 1
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --enable-pluggable-dialogs \
+ --enable-sound-settings \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfce4-settings/xfce4-settings.theme.diff b/source/xfce/xfce4-settings/xfce4-settings.theme.diff
new file mode 100644
index 000000000..ebdcf88f2
--- /dev/null
+++ b/source/xfce/xfce4-settings/xfce4-settings.theme.diff
@@ -0,0 +1,12 @@
+diff -Nur xfce4-settings-4.10.0.orig/xfsettingsd/xsettings.xml xfce4-settings-4.10.0/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.10.0.orig/xfsettingsd/xsettings.xml 2012-04-28 15:48:30.000000000 -0500
++++ xfce4-settings-4.10.0/xfsettingsd/xsettings.xml 2012-05-02 10:16:35.422408879 -0500
+@@ -7,7 +7,7 @@
+ <channel name="xsettings" version="1.0">
+ <property name="Net" type="empty">
+ <property name="ThemeName" type="empty"/>
+- <property name="IconThemeName" type="empty"/>
++ <property name="IconThemeName" type="string" value="gnome"/>
+ <property name="DoubleClickTime" type="int" value="250"/>
+ <property name="DoubleClickDistance" type="int" value="5"/>
+ <property name="DndDragThreshold" type="int" value="8"/>
diff --git a/source/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff b/source/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff
new file mode 100644
index 000000000..333b615da
--- /dev/null
+++ b/source/xfce/xfce4-settings/xfce4-settings.xft.defaults.diff
@@ -0,0 +1,23 @@
+--- ./xfsettingsd/xsettings.xml.orig 2012-04-28 15:48:30.000000000 -0500
++++ ./xfsettingsd/xsettings.xml 2012-07-19 14:32:25.554643922 -0500
+@@ -17,14 +17,19 @@
+ <property name="EnableEventSounds" type="bool" value="false"/>
+ <property name="EnableInputFeedbackSounds" type="bool" value="false"/>
+ </property>
++<!--
++ Commented out. We should not modify the system text rendering defaults.
++ At least not by default. :-)
++ Feel free to uncomment this block and modify it to suit your own needs.
+ <property name="Xft" type="empty">
+ <property name="DPI" type="empty"/>
+ <property name="Antialias" type="int" value="-1"/>
+ <property name="Hinting" type="int" value="-1"/>
+ <property name="HintStyle" type="string" value="hintnone"/>
+ <property name="RGBA" type="string" value="none"/>
+- <!-- <property name="Lcdfilter" type="string" value="none"/> -->
++ <property name="Lcdfilter" type="string" value="none"/>
+ </property>
++-->
+ <property name="Gtk" type="empty">
+ <property name="CanChangeAccels" type="bool" value="false"/>
+ <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
diff --git a/source/xfce/xfce4-systemload-plugin/slack-desc b/source/xfce/xfce4-systemload-plugin/slack-desc
new file mode 100644
index 000000000..e83e9306d
--- /dev/null
+++ b/source/xfce/xfce4-systemload-plugin/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------------------------------------------------------|
+xfce4-systemload-plugin: xfce4-systemload-plugin (systemload plugin for the Xfce panel)
+xfce4-systemload-plugin:
+xfce4-systemload-plugin: This plugin displays the current system load on the Xfce panel.
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
+xfce4-systemload-plugin:
diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
new file mode 100755
index 000000000..dbe0343ed
--- /dev/null
+++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-systemload-plugin
+
+# Copyright 2006-2012 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.
+
+# Maintained by Ozan Turkyilmaz ozan.turkyilmaz@gmail.com
+
+PKGNAM=xfce4-systemload-plugin
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc/xfce \
+ --enable-shared=yes \
+ --enable-static=no \
+ --enable-debug=no \
+ --build=$ARCH-slackware-linux || 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* \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url
new file mode 100644
index 000000000..17d17c5a2
--- /dev/null
+++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/
diff --git a/source/xfce/xfce4-taskmanager/doinst.sh b/source/xfce/xfce4-taskmanager/doinst.sh
new file mode 100644
index 000000000..4e8ba7071
--- /dev/null
+++ b/source/xfce/xfce4-taskmanager/doinst.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/source/x/x11/slack-desc/xf86-video-impact b/source/xfce/xfce4-taskmanager/slack-desc
index 9990fc3b7..f4e05a135 100644
--- a/source/x/x11/slack-desc/xf86-video-impact
+++ b/source/xfce/xfce4-taskmanager/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-impact: xf86-video-impact
-xf86-video-impact:
-xf86-video-impact: xf86-video-impact is part of X11.
-xf86-video-impact:
-xf86-video-impact: For more information about the X.Org Foundation (the providers of the
-xf86-video-impact: X.Org implementation of the X Window System), see their website:
-xf86-video-impact:
-xf86-video-impact: http://www.x.org
-xf86-video-impact:
-xf86-video-impact:
-xf86-video-impact:
+xfce4-taskmanager: xfce4-taskmanager (running apps / task manager application)
+xfce4-taskmanager:
+xfce4-taskmanager: xfce4-taskmanager shows a list of running apps (similar to the
+xfce4-taskmanager: task manager included with some other operating systems) :)
+xfce4-taskmanager:
+xfce4-taskmanager: The taskmanager is started by running the command 'xfce4-taskmanager'
+xfce4-taskmanager:
+xfce4-taskmanager:
+xfce4-taskmanager:
+xfce4-taskmanager:
+xfce4-taskmanager:
diff --git a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
new file mode 100755
index 000000000..df702f0f6
--- /dev/null
+++ b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
@@ -0,0 +1,105 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-taskmanager
+
+# Copyright 2006-2011 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.
+
+PKGNAM=xfce4-taskmanager
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc/xfce \
+ --enable-shared=yes \
+ --enable-static=no \
+ --enable-debug=no \
+ --build=$ARCH-slackware-linux || 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* \
+ $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/${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/xfce/xfce4-taskmanager/xfce4-taskmanager.url b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.url
new file mode 100644
index 000000000..7cefa665d
--- /dev/null
+++ b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/apps/xfce4-taskmanager
diff --git a/source/xfce/xfce4-volumed/slack-desc b/source/xfce/xfce4-volumed/slack-desc
new file mode 100644
index 000000000..e9266cbca
--- /dev/null
+++ b/source/xfce/xfce4-volumed/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------------------------------------------------------|
+xfce4-volumed: xfce4-volumed (audio volume management daemon)
+xfce4-volumed:
+xfce4-volumed: This daemon is responsible for making the volume up/down and mute
+xfce4-volumed: keys of the keyboard work automatically, and uses the XFCE mixer's
+xfce4-volumed: defined card and track for choosing which track to act on.
+xfce4-volumed:
+xfce4-volumed: It also provides volume change and mute toggle notifications if
+xfce4-volumed: a notification daemon is running (using libnotify).
+xfce4-volumed:
+xfce4-volumed: Homepage: https://launchpad.net/xfce4-volumed
+xfce4-volumed:
diff --git a/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild b/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild
new file mode 100755
index 000000000..147716ea1
--- /dev/null
+++ b/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-volumed
+
+# Copyright 2006-2011 Robby Workman Northport, Alabama, USA
+# Copyright 2009 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-volumed
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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 \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --enable-debug=no \
+ --build=$ARCH-slackware-linux || 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* THANKS \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/x11/slack-desc/xf86-input-jamstudio b/source/xfce/xfce4-weather-plugin/slack-desc
index 70426117f..7d9b0675f 100644
--- a/source/x/x11/slack-desc/xf86-input-jamstudio
+++ b/source/xfce/xfce4-weather-plugin/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-input-jamstudio: xf86-input-jamstudio
-xf86-input-jamstudio:
-xf86-input-jamstudio: xf86-input-jamstudio is part of X11.
-xf86-input-jamstudio:
-xf86-input-jamstudio: For more information about the X.Org Foundation (the providers of the
-xf86-input-jamstudio: X.Org implementation of the X Window System), see their website:
-xf86-input-jamstudio:
-xf86-input-jamstudio: http://www.x.org
-xf86-input-jamstudio:
-xf86-input-jamstudio:
-xf86-input-jamstudio:
+xfce4-weather-plugin: xfce4-weather-plugin (weather plugin for the Xfce panel)
+xfce4-weather-plugin:
+xfce4-weather-plugin: The weather plugin displays current weather conditions and forecasts.
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
+xfce4-weather-plugin:
diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
new file mode 100755
index 000000000..d2d290b52
--- /dev/null
+++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild
@@ -0,0 +1,106 @@
+#!/bin/sh
+
+# Slackware build script for xfce4-weather-plugin
+
+# Copyright 2006-2012 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.
+
+PKGNAM=xfce4-weather-plugin
+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) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc/xfce \
+ --enable-shared=yes \
+ --enable-static=no \
+ --enable-debug=no \
+ --build=$ARCH-slackware-linux || 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
+
+# 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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
new file mode 100644
index 000000000..9ee0ef010
--- /dev/null
+++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/
diff --git a/source/xfce/xfconf/slack-desc b/source/xfce/xfconf/slack-desc
new file mode 100644
index 000000000..a48abb4bb
--- /dev/null
+++ b/source/xfce/xfconf/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------------------------------------------------------|
+xfconf: xfconf (Xfce configuration storage system)
+xfconf:
+xfconf: A daemon and query system for managing the storage and retrieval of
+xfconf: settings for the Xfce Desktop Environment, both graphically as well as
+xfconf: from the command line.
+xfconf:
+xfconf:
+xfconf:
+xfconf:
+xfconf:
+xfconf:
diff --git a/source/xfce/xfconf/xfconf.SlackBuild b/source/xfce/xfconf/xfconf.SlackBuild
new file mode 100755
index 000000000..af252f62f
--- /dev/null
+++ b/source/xfce/xfconf/xfconf.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=xfconf
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/x11/slack-desc/proxymngr b/source/xfce/xfdesktop/slack-desc
index 63a906609..e98b02b86 100644
--- a/source/x/x11/slack-desc/proxymngr
+++ b/source/xfce/xfdesktop/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-proxymngr: proxymngr
-proxymngr:
-proxymngr: proxymngr is part of X11.
-proxymngr:
-proxymngr: For more information about the X.Org Foundation (the providers of the
-proxymngr: X.Org implementation of the X Window System), see their website:
-proxymngr:
-proxymngr: http://www.x.org
-proxymngr:
-proxymngr:
-proxymngr:
+xfdesktop: xfdesktop (Xfce desktop manager)
+xfdesktop:
+xfdesktop: Xfdesktop is a desktop manager for the Xfce Desktop Environment.
+xfdesktop: Desktop in this respect means the root window. The manager handles
+xfdesktop: tasks such as the background image and color, the root menu and window
+xfdesktop: list, minimized application icons, and file icons on the desktop.
+xfdesktop:
+xfdesktop:
+xfdesktop:
+xfdesktop:
+xfdesktop:
diff --git a/source/xfce/xfdesktop/xfdesktop.SlackBuild b/source/xfce/xfdesktop/xfdesktop.SlackBuild
new file mode 100755
index 000000000..15c6e575d
--- /dev/null
+++ b/source/xfce/xfdesktop/xfdesktop.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=xfdesktop
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/x11/slack-desc/applewmproto b/source/xfce/xfwm4-themes/slack-desc
index 4a81b79b0..dca6ee94c 100644
--- a/source/x/x11/slack-desc/applewmproto
+++ b/source/xfce/xfwm4-themes/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-applewmproto: applewmproto
-applewmproto:
-applewmproto: applewmproto is part of X11.
-applewmproto:
-applewmproto: For more information about the X.Org Foundation (the providers of the
-applewmproto: X.Org implementation of the X Window System), see their website:
-applewmproto:
-applewmproto: http://www.x.org
-applewmproto:
-applewmproto:
-applewmproto:
+xfwm4-themes: xfwm4-themes (themes for the Xfce window manager)
+xfwm4-themes:
+xfwm4-themes: This package contains a wide variety of themes for xfwm4, the window
+xfwm4-themes: manager of the Xfce4 project. If the default theme is not to your
+xfwm4-themes: liking, you'll probably find the eyecandy you're looking for here.
+xfwm4-themes:
+xfwm4-themes:
+xfwm4-themes:
+xfwm4-themes:
+xfwm4-themes:
+xfwm4-themes:
diff --git a/source/xfce/xfwm4-themes/xfwm4-themes.SlackBuild b/source/xfce/xfwm4-themes/xfwm4-themes.SlackBuild
new file mode 100755
index 000000000..90748d0e1
--- /dev/null
+++ b/source/xfce/xfwm4-themes/xfwm4-themes.SlackBuild
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=xfwm4-themes
+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:
+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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfwm4/slack-desc b/source/xfce/xfwm4/slack-desc
new file mode 100644
index 000000000..89db3f577
--- /dev/null
+++ b/source/xfce/xfwm4/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------------------------------------------------------|
+xfwm4: xfwm4 (Xfce Window Manager)
+xfwm4:
+xfwm4: This package contains xfwm4 which is the window manager for Xfce4.
+xfwm4: It is designed to run with the rest of Xfce, but it also makes a
+xfwm4: capable window manager for any X11 environment.
+xfwm4:
+xfwm4:
+xfwm4:
+xfwm4:
+xfwm4:
+xfwm4:
diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild
new file mode 100755
index 000000000..7855b84e5
--- /dev/null
+++ b/source/xfce/xfwm4/xfwm4.SlackBuild
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, 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=xfwm4
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+# 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
+
+NUMJOBS=${NUMJOBS:--j6}
+
+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
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+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 {} \;
+
+# Configure:
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --disable-debug \
+ --build=$ARCH-slackware-linux || exit 1
+
+# Build and install:
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+mkdir -p $PKG/etc/X11/xinit
+cat $CWD/xinitrc.xfce > $PKG/etc/X11/xinit/xinitrc.xfce
+chmod 0755 $PKG/etc/X11/xinit/*
+
+# Strip binaries:
+( cd $PKG
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# 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
+
+# We don't want icon caches:
+find $PKG/usr/share/icons -type f -name "icon-theme.cache" -exec rm -f {} \;
+
+# Add a documentation directory. Not all of these files are expected to be
+# present, but listing them ensures that documentation that might appear and
+# disappear from version to version will not be missed.
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS BUGS COMPOSITOR COPYING* FAQ HACKING INSTALL \
+ NEWS NOTES README* THANKS TODO example.gtkrc-2.0 \
+ $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/${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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xfce/xfwm4/xinitrc.xfce b/source/xfce/xfwm4/xinitrc.xfce
new file mode 100644
index 000000000..82c0dd409
--- /dev/null
+++ b/source/xfce/xfwm4/xinitrc.xfce
@@ -0,0 +1,40 @@
+#!/bin/sh
+# xinitrc.xfce - modified to work around xfce4session bug
+# https://bugzilla.xfce.org/show_bug.cgi?id=8841
+
+
+########################################################################
+## Merge in defaults and keymaps ##
+########################################################################
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+if [ -f $sysresources ]; then
+ /usr/bin/xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+ /usr/bin/xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+ /usr/bin/xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+ /usr/bin/xmodmap $usermodmap
+fi
+
+########################################################################
+## Start xfce Desktop Environment ##
+########################################################################
+
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+ exec ck-launch-session dbus-launch --exit-with-session /usr/bin/startxfce4
+else
+ exec dbus-launch --exit-with-session /usr/bin/startxfce4
+fi
+
diff --git a/source/x/x11/slack-desc/xf86-video-vga b/testing/source/xf86-video-ati/slack-desc
index 5a4dde64f..7387c43c1 100644
--- a/source/x/x11/slack-desc/xf86-video-vga
+++ b/testing/source/xf86-video-ati/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-vga: xf86-video-vga
-xf86-video-vga:
-xf86-video-vga: xf86-video-vga is part of X11.
-xf86-video-vga:
-xf86-video-vga: For more information about the X.Org Foundation (the providers of the
-xf86-video-vga: X.Org implementation of the X Window System), see their website:
-xf86-video-vga:
-xf86-video-vga: http://www.x.org
-xf86-video-vga:
-xf86-video-vga:
-xf86-video-vga:
+xf86-video-ati: xf86-video-ati (ATI Radeon video driver for the Xorg X server)
+xf86-video-ati:
+xf86-video-ati: xf86-video-ati is part of X11.
+xf86-video-ati:
+xf86-video-ati: For more information about the X.Org Foundation (the providers of the
+xf86-video-ati: X.Org implementation of the X Window System), see their website:
+xf86-video-ati:
+xf86-video-ati: http://www.x.org
+xf86-video-ati:
+xf86-video-ati:
+xf86-video-ati:
diff --git a/source/x/x11/slack-desc/xf86-video-imstt b/testing/source/xf86-video-intel/slack-desc
index 71614b671..c51417a7c 100644
--- a/source/x/x11/slack-desc/xf86-video-imstt
+++ b/testing/source/xf86-video-intel/slack-desc
@@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-xf86-video-imstt: xf86-video-imstt
-xf86-video-imstt:
-xf86-video-imstt: xf86-video-imstt is part of X11.
-xf86-video-imstt:
-xf86-video-imstt: For more information about the X.Org Foundation (the providers of the
-xf86-video-imstt: X.Org implementation of the X Window System), see their website:
-xf86-video-imstt:
-xf86-video-imstt: http://www.x.org
-xf86-video-imstt:
-xf86-video-imstt:
-xf86-video-imstt:
+xf86-video-intel: xf86-video-intel (X.org graphics driver for Intel graphics)
+xf86-video-intel:
+xf86-video-intel: xf86-video-intel is part of X11.
+xf86-video-intel:
+xf86-video-intel: For more information about the X.Org Foundation (the providers of the
+xf86-video-intel: X.Org implementation of the X Window System), see their website:
+xf86-video-intel:
+xf86-video-intel: http://www.x.org
+xf86-video-intel:
+xf86-video-intel:
+xf86-video-intel: