summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/x
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x')
-rw-r--r--source/x/FTBFSlog14
-rwxr-xr-xsource/x/anthy/anthy.SlackBuild27
-rw-r--r--source/x/anthy/slack-desc8
-rwxr-xr-xsource/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild38
-rw-r--r--source/x/dejavu-fonts-ttf/slack-desc14
-rwxr-xr-xsource/x/fontconfig/fontconfig.SlackBuild50
-rw-r--r--source/x/fontconfig/fontconfig.dejavu.diff75
-rw-r--r--source/x/fontconfig/fontconfig.liberation.diff35
-rw-r--r--source/x/fontconfig/slack-desc6
-rwxr-xr-xsource/x/freeglut/freeglut.SlackBuild95
-rw-r--r--source/x/freeglut/slack-desc8
-rwxr-xr-xsource/x/glew/glew.SlackBuild23
-rw-r--r--source/x/glew/glew.url2
-rw-r--r--source/x/glew/slack-desc6
-rwxr-xr-xsource/x/glu/glu.SlackBuild36
-rw-r--r--source/x/glu/slack-desc6
-rwxr-xr-xsource/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild (renamed from source/x/libva-intel-driver/libva-intel-driver.SlackBuild)25
-rw-r--r--source/x/intel-vaapi-driver/intel-vaapi-driver.url1
-rw-r--r--source/x/intel-vaapi-driver/slack-desc (renamed from source/x/libva-intel-driver/slack-desc)24
-rwxr-xr-xsource/x/libXaw3dXft/libXaw3dXft.SlackBuild22
-rw-r--r--source/x/libXaw3dXft/slack-desc8
-rwxr-xr-xsource/x/libdrm/libdrm.SlackBuild26
-rw-r--r--source/x/libdrm/libdrm.url1
-rw-r--r--source/x/libdrm/slack-desc8
-rwxr-xr-xsource/x/libepoxy/libepoxy.SlackBuild17
-rw-r--r--source/x/libepoxy/slack-desc2
-rwxr-xr-xsource/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild21
-rw-r--r--source/x/liberation-fonts-ttf/slack-desc20
-rwxr-xr-xsource/x/libevdev/libevdev.SlackBuild30
-rw-r--r--source/x/libevdev/slack-desc6
-rwxr-xr-xsource/x/libhangul/libhangul.SlackBuild27
-rw-r--r--source/x/libhangul/slack-desc8
-rwxr-xr-xsource/x/libinput/libinput.SlackBuild120
-rw-r--r--source/x/libinput/libinput.url1
-rw-r--r--source/x/libinput/slack-desc19
-rwxr-xr-xsource/x/libmypaint/libmypaint.SlackBuild136
-rw-r--r--source/x/libmypaint/libmypaint.url1
-rw-r--r--source/x/libmypaint/slack-desc19
-rw-r--r--source/x/libva-intel-driver/libva-intel-driver.url1
-rwxr-xr-xsource/x/libva-utils/libva-utils.SlackBuild113
-rw-r--r--source/x/libva-utils/libva-utils.url1
-rw-r--r--source/x/libva-utils/slack-desc19
-rwxr-xr-xsource/x/libva/libva.SlackBuild26
-rw-r--r--source/x/libva/libva.url2
-rw-r--r--source/x/libva/slack-desc4
-rwxr-xr-xsource/x/libvdpau/libvdpau.SlackBuild22
-rw-r--r--source/x/libvdpau/slack-desc8
-rwxr-xr-xsource/x/libwacom/libwacom.SlackBuild116
-rw-r--r--source/x/libwacom/libwacom.url1
-rw-r--r--source/x/libwacom/slack-desc19
-rwxr-xr-xsource/x/m17n-lib/m17n-lib.SlackBuild88
-rw-r--r--source/x/m17n-lib/slack-desc14
-rw-r--r--source/x/mesa/doinst.sh13
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild77
-rw-r--r--source/x/mesa/mesa.no.mako.diff34
-rw-r--r--source/x/mesa/slack-desc8
-rwxr-xr-xsource/x/motif/motif.SlackBuild25
-rw-r--r--source/x/motif/slack-desc8
-rwxr-xr-xsource/x/mtdev/mtdev.SlackBuild42
-rw-r--r--source/x/mtdev/slack-desc18
-rwxr-xr-xsource/x/mypaint-brushes/mypaint-brushes.SlackBuild138
-rw-r--r--source/x/mypaint-brushes/mypaint-brushes.url1
-rw-r--r--source/x/mypaint-brushes/slack-desc19
-rwxr-xr-xsource/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild26
-rw-r--r--source/x/sazanami-fonts-ttf/slack-desc8
-rwxr-xr-xsource/x/scim-anthy/scim-anthy.SlackBuild20
-rw-r--r--source/x/scim-anthy/slack-desc12
-rwxr-xr-xsource/x/scim-hangul/scim-hangul.SlackBuild16
-rw-r--r--source/x/scim-hangul/slack-desc18
-rwxr-xr-xsource/x/scim-input-pad/scim-input-pad.SlackBuild21
-rw-r--r--source/x/scim-input-pad/slack-desc12
-rwxr-xr-xsource/x/scim-m17n/scim-m17n.SlackBuild16
-rw-r--r--source/x/scim-m17n/slack-desc10
-rwxr-xr-xsource/x/scim-pinyin/scim-pinyin.SlackBuild16
-rw-r--r--source/x/scim-pinyin/slack-desc10
-rwxr-xr-xsource/x/scim-tables/scim-tables.SlackBuild16
-rw-r--r--source/x/scim-tables/slack-desc8
-rw-r--r--source/x/scim/scim-disable-subdir-objects.patch22
-rwxr-xr-xsource/x/scim/scim.SlackBuild56
-rw-r--r--source/x/scim/slack-desc14
-rwxr-xr-xsource/x/sinhala_lklug-font-ttf/sinhala_lklug-font-ttf.SlackBuild53
-rw-r--r--source/x/sinhala_lklug-font-ttf/slack-desc10
-rw-r--r--source/x/tibmachuni-font-ttf/slack-desc8
-rwxr-xr-xsource/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild63
-rw-r--r--source/x/ttf-indic-fonts/slack-desc8
-rwxr-xr-xsource/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild16
-rw-r--r--source/x/ttf-tlwg/doinst.sh11
-rw-r--r--source/x/ttf-tlwg/slack-desc19
-rwxr-xr-xsource/x/ttf-tlwg/ttf-tlwg.SlackBuild82
-rw-r--r--source/x/ttf-tlwg/ttf-tlwg.url3
-rw-r--r--source/x/urw-core35-fonts-otf/doinst.sh11
-rwxr-xr-xsource/x/urw-core35-fonts-otf/get-urw-core35-fonts.sh52
-rw-r--r--source/x/urw-core35-fonts-otf/slack-desc19
-rwxr-xr-xsource/x/urw-core35-fonts-otf/urw-core35-fonts-otf.SlackBuild71
-rwxr-xr-xsource/x/vulkan-sdk/fetch-sources.sh102
-rw-r--r--source/x/vulkan-sdk/slack-desc19
-rwxr-xr-xsource/x/vulkan-sdk/vulkan-sdk.SlackBuild181
-rw-r--r--source/x/vulkan-sdk/vulkan-sdk.url4
-rw-r--r--source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff42
-rw-r--r--source/x/wqy-zenhei-font-ttf/slack-desc12
-rwxr-xr-xsource/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild48
-rw-r--r--source/x/wqy-zenhei-font-ttf/wqy-zenhei.fix.fontconfig.warning.diff31
-rw-r--r--source/x/x11-skel/scripts/xwmconfig24
-rw-r--r--source/x/x11-skel/slack-desc8
-rwxr-xr-xsource/x/x11-skel/x11-skel.SlackBuild19
-rw-r--r--source/x/x11/arch.use.flags2
-rw-r--r--source/x/x11/build/anthy (renamed from source/x/x11/build/libXfont)0
-rw-r--r--source/x/x11/build/beforelight2
-rw-r--r--source/x/x11/build/bigreqsproto1
-rw-r--r--source/x/x11/build/bitmap2
-rw-r--r--source/x/x11/build/compiz2
-rw-r--r--source/x/x11/build/compositeproto1
-rw-r--r--source/x/x11/build/damageproto1
-rw-r--r--source/x/x11/build/dejavu-fonts-ttf1
-rw-r--r--source/x/x11/build/dmxproto1
-rw-r--r--source/x/x11/build/dri2proto2
-rw-r--r--source/x/x11/build/dri3proto2
-rw-r--r--source/x/x11/build/encodings1
-rw-r--r--source/x/x11/build/evieext1
-rw-r--r--source/x/x11/build/fixesproto2
-rw-r--r--source/x/x11/build/font-adobe-100dpi1
-rw-r--r--source/x/x11/build/font-adobe-75dpi1
-rw-r--r--source/x/x11/build/font-adobe-utopia-100dpi1
-rw-r--r--source/x/x11/build/font-adobe-utopia-75dpi1
-rw-r--r--source/x/x11/build/font-adobe-utopia-type11
-rw-r--r--source/x/x11/build/font-alias1
-rw-r--r--source/x/x11/build/font-arabic-misc1
-rw-r--r--source/x/x11/build/font-bh-100dpi1
-rw-r--r--source/x/x11/build/font-bh-75dpi1
-rw-r--r--source/x/x11/build/font-bh-lucidatypewriter-100dpi1
-rw-r--r--source/x/x11/build/font-bh-lucidatypewriter-75dpi1
-rw-r--r--source/x/x11/build/font-bh-ttf1
-rw-r--r--source/x/x11/build/font-bh-type11
-rw-r--r--source/x/x11/build/font-bitstream-100dpi1
-rw-r--r--source/x/x11/build/font-bitstream-75dpi1
-rw-r--r--source/x/x11/build/font-bitstream-speedo1
-rw-r--r--source/x/x11/build/font-bitstream-type11
-rw-r--r--source/x/x11/build/font-cronyx-cyrillic1
-rw-r--r--source/x/x11/build/font-cursor-misc1
-rw-r--r--source/x/x11/build/font-daewoo-misc1
-rw-r--r--source/x/x11/build/font-dec-misc1
-rw-r--r--source/x/x11/build/font-ibm-type11
-rw-r--r--source/x/x11/build/font-isas-misc1
-rw-r--r--source/x/x11/build/font-jis-misc1
-rw-r--r--source/x/x11/build/font-micro-misc1
-rw-r--r--source/x/x11/build/font-misc-cyrillic1
-rw-r--r--source/x/x11/build/font-misc-ethiopic1
-rw-r--r--source/x/x11/build/font-misc-meltho1
-rw-r--r--source/x/x11/build/font-misc-misc1
-rw-r--r--source/x/x11/build/font-mutt-misc1
-rw-r--r--source/x/x11/build/font-schumacher-misc1
-rw-r--r--source/x/x11/build/font-screen-cyrillic1
-rw-r--r--source/x/x11/build/font-sony-misc1
-rw-r--r--source/x/x11/build/font-sun-misc1
-rw-r--r--source/x/x11/build/font-util2
-rw-r--r--source/x/x11/build/font-winitzki-cyrillic1
-rw-r--r--source/x/x11/build/font-xfree86-type11
-rw-r--r--source/x/x11/build/fontcacheproto1
-rw-r--r--source/x/x11/build/fontconfig1
-rw-r--r--source/x/x11/build/fontsproto1
-rw-r--r--source/x/x11/build/fonttosfnt2
-rw-r--r--source/x/x11/build/freeglut1
-rw-r--r--source/x/x11/build/fslsfonts2
-rw-r--r--source/x/x11/build/fstobdf2
-rw-r--r--source/x/x11/build/gccmakedep1
-rw-r--r--source/x/x11/build/glew1
-rw-r--r--source/x/x11/build/glproto1
-rw-r--r--source/x/x11/build/glu1
-rw-r--r--source/x/x11/build/imake2
-rw-r--r--source/x/x11/build/inputproto1
-rw-r--r--source/x/x11/build/intel-gpu-tools2
-rw-r--r--source/x/x11/build/intel-vaapi-driver1
-rw-r--r--source/x/x11/build/kbproto1
-rw-r--r--source/x/x11/build/libFS1
-rw-r--r--source/x/x11/build/libICE2
-rw-r--r--source/x/x11/build/libSM2
-rw-r--r--source/x/x11/build/libXScrnSaver2
-rw-r--r--source/x/x11/build/libXau2
-rw-r--r--source/x/x11/build/libXaw1
-rw-r--r--source/x/x11/build/libXaw3d2
-rw-r--r--source/x/x11/build/libXaw3dXft1
-rw-r--r--source/x/x11/build/libXcm2
-rw-r--r--source/x/x11/build/libXcomposite2
-rw-r--r--source/x/x11/build/libXdamage2
-rw-r--r--source/x/x11/build/libXdmcp2
-rw-r--r--source/x/x11/build/libXevie2
-rw-r--r--source/x/x11/build/libXext2
-rw-r--r--source/x/x11/build/libXfixes1
-rw-r--r--source/x/x11/build/libXfont21
-rw-r--r--source/x/x11/build/libXfontcache2
-rw-r--r--source/x/x11/build/libXft2
-rw-r--r--source/x/x11/build/libXi1
-rw-r--r--source/x/x11/build/libXinerama2
-rw-r--r--source/x/x11/build/libXmu2
-rw-r--r--source/x/x11/build/libXp2
-rw-r--r--source/x/x11/build/libXpresent1
-rw-r--r--source/x/x11/build/libXrandr1
-rw-r--r--source/x/x11/build/libXrender1
-rw-r--r--source/x/x11/build/libXt1
-rw-r--r--source/x/x11/build/libXxf86dga2
-rw-r--r--source/x/x11/build/libXxf86misc2
-rw-r--r--source/x/x11/build/libXxf86vm2
-rw-r--r--source/x/x11/build/libdmx2
-rw-r--r--source/x/x11/build/libdrm1
-rw-r--r--source/x/x11/build/libepoxy1
-rw-r--r--source/x/x11/build/liberation-fonts-ttf1
-rw-r--r--source/x/x11/build/libevdev1
-rw-r--r--source/x/x11/build/libfontenc1
-rw-r--r--source/x/x11/build/libhangul1
-rw-r--r--source/x/x11/build/libinput1
-rw-r--r--source/x/x11/build/libpciaccess1
-rw-r--r--source/x/x11/build/libpthread-stubs1
-rw-r--r--source/x/x11/build/libva1
-rw-r--r--source/x/x11/build/libva-utils1
-rw-r--r--source/x/x11/build/libvdpau1
-rw-r--r--source/x/x11/build/libwacom1
-rw-r--r--source/x/x11/build/libxcb1
-rw-r--r--source/x/x11/build/libxkbfile1
-rw-r--r--source/x/x11/build/lndir2
-rw-r--r--source/x/x11/build/luit2
-rw-r--r--source/x/x11/build/m17n-lib1
-rw-r--r--source/x/x11/build/makedepend2
-rw-r--r--source/x/x11/build/mesa1
-rw-r--r--source/x/x11/build/mkcomposecache2
-rw-r--r--source/x/x11/build/mkfontdir1
-rw-r--r--source/x/x11/build/motif1
-rw-r--r--source/x/x11/build/mtdev1
-rw-r--r--source/x/x11/build/pixman1
-rw-r--r--source/x/x11/build/printproto1
-rw-r--r--source/x/x11/build/randrproto1
-rw-r--r--source/x/x11/build/recordproto1
-rw-r--r--source/x/x11/build/rendercheck1
-rw-r--r--source/x/x11/build/renderproto1
-rw-r--r--source/x/x11/build/resourceproto1
-rw-r--r--source/x/x11/build/rgb2
-rw-r--r--source/x/x11/build/sazanami-fonts-ttf1
-rw-r--r--source/x/x11/build/scim1
-rw-r--r--source/x/x11/build/scim-anthy1
-rw-r--r--source/x/x11/build/scim-hangul1
-rw-r--r--source/x/x11/build/scim-input-pad1
-rw-r--r--source/x/x11/build/scim-m17n1
-rw-r--r--source/x/x11/build/scim-pinyin1
-rw-r--r--source/x/x11/build/scim-tables1
-rw-r--r--source/x/x11/build/scrnsaverproto1
-rw-r--r--source/x/x11/build/setxkbmap1
-rw-r--r--source/x/x11/build/showfont2
-rw-r--r--source/x/x11/build/sinhala_lklug-font-ttf1
-rw-r--r--source/x/x11/build/smproxy1
-rw-r--r--source/x/x11/build/tibmachuni-font-ttf1
-rw-r--r--source/x/x11/build/ttf-indic-fonts1
-rw-r--r--source/x/x11/build/ttf-tlwg1
-rw-r--r--source/x/x11/build/twm1
-rw-r--r--source/x/x11/build/urw-core35-fonts-otf1
-rw-r--r--source/x/x11/build/util-macros1
-rw-r--r--source/x/x11/build/videoproto1
-rw-r--r--source/x/x11/build/vulkan-sdk1
-rw-r--r--source/x/x11/build/wqy-zenhei-font-ttf1
-rw-r--r--source/x/x11/build/x11-skel1
-rw-r--r--source/x/x11/build/x11perf1
-rw-r--r--source/x/x11/build/xbiff2
-rw-r--r--source/x/x11/build/xcalc2
-rw-r--r--source/x/x11/build/xcb-util2
-rw-r--r--source/x/x11/build/xcb-util-errors1
-rw-r--r--source/x/x11/build/xcb-util-image2
-rw-r--r--source/x/x11/build/xcb-util-keysyms2
-rw-r--r--source/x/x11/build/xcb-util-renderutil2
-rw-r--r--source/x/x11/build/xcb-util-wm2
-rw-r--r--source/x/x11/build/xclipboard2
-rw-r--r--source/x/x11/build/xclock2
-rw-r--r--source/x/x11/build/xcm2
-rw-r--r--source/x/x11/build/xcmiscproto1
-rw-r--r--source/x/x11/build/xcmsdb1
-rw-r--r--source/x/x11/build/xcompmgr1
-rw-r--r--source/x/x11/build/xcursor-themes1
-rw-r--r--source/x/x11/build/xcursorgen2
-rw-r--r--source/x/x11/build/xdbedizzy2
-rw-r--r--source/x/x11/build/xdg-user-dirs1
-rw-r--r--source/x/x11/build/xdg-utils1
-rw-r--r--source/x/x11/build/xditview1
-rw-r--r--source/x/x11/build/xdm2
-rw-r--r--source/x/x11/build/xdpyinfo1
-rw-r--r--source/x/x11/build/xdriinfo1
-rw-r--r--source/x/x11/build/xedit2
-rw-r--r--source/x/x11/build/xev1
-rw-r--r--source/x/x11/build/xextproto2
-rw-r--r--source/x/x11/build/xf86-input-acecad2
-rw-r--r--source/x/x11/build/xf86-input-aiptek2
-rw-r--r--source/x/x11/build/xf86-input-evdev1
-rw-r--r--source/x/x11/build/xf86-input-joystick2
-rw-r--r--source/x/x11/build/xf86-input-keyboard2
-rw-r--r--source/x/x11/build/xf86-input-libinput1
-rw-r--r--source/x/x11/build/xf86-input-mouse2
-rw-r--r--source/x/x11/build/xf86-input-penmount2
-rw-r--r--source/x/x11/build/xf86-input-synaptics2
-rw-r--r--source/x/x11/build/xf86-input-vmmouse2
-rw-r--r--source/x/x11/build/xf86-input-void2
-rw-r--r--source/x/x11/build/xf86-input-wacom1
-rw-r--r--source/x/x11/build/xf86-video-amdgpu1
-rw-r--r--source/x/x11/build/xf86-video-apm2
-rw-r--r--source/x/x11/build/xf86-video-ark2
-rw-r--r--source/x/x11/build/xf86-video-ast2
-rw-r--r--source/x/x11/build/xf86-video-ati1
-rw-r--r--source/x/x11/build/xf86-video-chips2
-rw-r--r--source/x/x11/build/xf86-video-cirrus2
-rw-r--r--source/x/x11/build/xf86-video-dummy2
-rw-r--r--source/x/x11/build/xf86-video-geode1
-rw-r--r--source/x/x11/build/xf86-video-glint2
-rw-r--r--source/x/x11/build/xf86-video-i1282
-rw-r--r--source/x/x11/build/xf86-video-intel1
-rw-r--r--source/x/x11/build/xf86-video-mach642
-rw-r--r--source/x/x11/build/xf86-video-modesetting1
-rw-r--r--source/x/x11/build/xf86-video-neomagic2
-rw-r--r--source/x/x11/build/xf86-video-nouveau1
-rw-r--r--source/x/x11/build/xf86-video-nv2
-rw-r--r--source/x/x11/build/xf86-video-omap2
-rw-r--r--source/x/x11/build/xf86-video-openchrome1
-rw-r--r--source/x/x11/build/xf86-video-r1281
-rw-r--r--source/x/x11/build/xf86-video-rendition1
-rw-r--r--source/x/x11/build/xf86-video-s32
-rw-r--r--source/x/x11/build/xf86-video-s3virge2
-rw-r--r--source/x/x11/build/xf86-video-siliconmotion2
-rw-r--r--source/x/x11/build/xf86-video-sisusb2
-rw-r--r--source/x/x11/build/xf86-video-tga2
-rw-r--r--source/x/x11/build/xf86-video-tseng2
-rw-r--r--source/x/x11/build/xf86-video-v4l2
-rw-r--r--source/x/x11/build/xf86-video-vboxvideo1
-rw-r--r--source/x/x11/build/xf86-video-vesa2
-rw-r--r--source/x/x11/build/xf86-video-vmware2
-rw-r--r--source/x/x11/build/xf86-video-voodoo2
-rw-r--r--source/x/x11/build/xf86-video-xgi2
-rw-r--r--source/x/x11/build/xf86-video-xgixp2
-rw-r--r--source/x/x11/build/xf86bigfontproto1
-rw-r--r--source/x/x11/build/xf86dga2
-rw-r--r--source/x/x11/build/xf86dgaproto1
-rw-r--r--source/x/x11/build/xf86driproto1
-rw-r--r--source/x/x11/build/xf86miscproto1
-rw-r--r--source/x/x11/build/xf86vidmodeproto1
-rw-r--r--source/x/x11/build/xfd2
-rw-r--r--source/x/x11/build/xfsinfo2
-rw-r--r--source/x/x11/build/xgamma1
-rw-r--r--source/x/x11/build/xgc1
-rw-r--r--source/x/x11/build/xhost1
-rw-r--r--source/x/x11/build/xineramaproto1
-rw-r--r--source/x/x11/build/xinput1
-rw-r--r--source/x/x11/build/xkbevd1
-rw-r--r--source/x/x11/build/xkbprint1
-rw-r--r--source/x/x11/build/xkbutils2
-rw-r--r--source/x/x11/build/xkeyboard-config1
-rw-r--r--source/x/x11/build/xlogo2
-rw-r--r--source/x/x11/build/xlsatoms1
-rw-r--r--source/x/x11/build/xlsfonts1
-rw-r--r--source/x/x11/build/xmag1
-rw-r--r--source/x/x11/build/xman2
-rw-r--r--source/x/x11/build/xmh1
-rw-r--r--source/x/x11/build/xmodmap1
-rw-r--r--source/x/x11/build/xmore2
-rw-r--r--source/x/x11/build/xorg-cf-files2
-rw-r--r--source/x/x11/build/xorg-docs1
-rw-r--r--source/x/x11/build/xorg-server2
-rw-r--r--source/x/x11/build/xorg-sgml-doctools2
-rw-r--r--source/x/x11/build/xorgproto1
-rw-r--r--source/x/x11/build/xproto1
-rw-r--r--source/x/x11/build/xpyb2
-rw-r--r--source/x/x11/build/xrandr1
-rw-r--r--source/x/x11/build/xscope2
-rw-r--r--source/x/x11/build/xstdcmap2
-rw-r--r--source/x/x11/build/xterm1
-rw-r--r--source/x/x11/build/xtrans1
-rw-r--r--source/x/x11/build/xvidtune2
-rw-r--r--source/x/x11/build/xvinfo1
-rw-r--r--source/x/x11/configure/intel-gpu-tools4
-rw-r--r--source/x/x11/configure/xcb-proto35
-rw-r--r--source/x/x11/configure/xf86-video-intel11
-rw-r--r--source/x/x11/configure/xorg-server6
-rw-r--r--source/x/x11/configure/xorgproto18
-rw-r--r--source/x/x11/make/xcb-proto17
-rw-r--r--source/x/x11/make/xorgproto13
-rw-r--r--source/x/x11/modularize4
-rw-r--r--source/x/x11/noarch1
-rw-r--r--source/x/x11/patch/xf86-input-mouse.patch2
-rw-r--r--source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch42
-rw-r--r--source/x/x11/patch/xf86-video-intel.patch6
-rw-r--r--source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch101
-rw-r--r--source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch49
-rw-r--r--source/x/x11/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch47
-rw-r--r--source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch12
-rw-r--r--source/x/x11/patch/xf86-video-sisusb.patch7
-rw-r--r--source/x/x11/patch/xf86-video-vmware.patch7
-rw-r--r--source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff25
-rw-r--r--source/x/x11/patch/xpyb.patch1
-rw-r--r--source/x/x11/patch/xpyb/xpyb-1.3.1-xcbproto-1.13.patch12
-rw-r--r--source/x/x11/post-install/libxcb.post-install19
-rw-r--r--source/x/x11/post-install/xdm.post-install9
-rw-r--r--source/x/x11/post-install/xf86-input-libinput.post-install51
-rw-r--r--source/x/x11/post-install/xorg-server.post-install15
-rw-r--r--source/x/x11/post-install/xorgproto.post-install5
-rw-r--r--source/x/x11/slack-desc/appres2
-rw-r--r--source/x/x11/slack-desc/bdftopcf2
-rw-r--r--source/x/x11/slack-desc/beforelight6
-rw-r--r--source/x/x11/slack-desc/iceauth2
-rw-r--r--source/x/x11/slack-desc/ico2
-rw-r--r--source/x/x11/slack-desc/imake2
-rw-r--r--source/x/x11/slack-desc/intel-gpu-tools2
-rw-r--r--source/x/x11/slack-desc/libXau8
-rw-r--r--source/x/x11/slack-desc/libXaw3d2
-rw-r--r--source/x/x11/slack-desc/libXcm2
-rw-r--r--source/x/x11/slack-desc/libXfont19
-rw-r--r--source/x/x11/slack-desc/libXfont219
-rw-r--r--source/x/x11/slack-desc/libXmu2
-rw-r--r--source/x/x11/slack-desc/libxcb4
-rw-r--r--source/x/x11/slack-desc/luit2
-rw-r--r--source/x/x11/slack-desc/presentproto2
-rw-r--r--source/x/x11/slack-desc/randrproto2
-rw-r--r--source/x/x11/slack-desc/xbiff2
-rw-r--r--source/x/x11/slack-desc/xclipboard4
-rw-r--r--source/x/x11/slack-desc/xclock2
-rw-r--r--source/x/x11/slack-desc/xcompmgr2
-rw-r--r--source/x/x11/slack-desc/xconsole2
-rw-r--r--source/x/x11/slack-desc/xev4
-rw-r--r--source/x/x11/slack-desc/xf86-input-keyboard2
-rw-r--r--source/x/x11/slack-desc/xf86-input-mouse2
-rw-r--r--source/x/x11/slack-desc/xf86-input-wacom8
-rw-r--r--source/x/x11/slack-desc/xf86-video-vboxvideo19
-rw-r--r--source/x/x11/slack-desc/xf86dgaproto2
-rw-r--r--source/x/x11/slack-desc/xf86miscproto2
-rw-r--r--source/x/x11/slack-desc/xinit4
-rw-r--r--source/x/x11/slack-desc/xkill2
-rw-r--r--source/x/x11/slack-desc/xmessage2
-rw-r--r--source/x/x11/slack-desc/xmh2
-rw-r--r--source/x/x11/slack-desc/xmodmap2
-rw-r--r--source/x/x11/slack-desc/xorg-server4
-rw-r--r--source/x/x11/slack-desc/xorg-server-xnest6
-rw-r--r--source/x/x11/slack-desc/xorg-server-xvfb8
-rw-r--r--source/x/x11/slack-desc/xorg-sgml-doctools2
-rw-r--r--source/x/x11/slack-desc/xorgproto19
-rw-r--r--source/x/x11/slack-desc/xpr4
-rw-r--r--source/x/x11/slack-desc/xpyb4
-rw-r--r--source/x/x11/slack-desc/xrandr4
-rw-r--r--source/x/x11/slack-desc/xstdcmap2
-rw-r--r--source/x/x11/slack-desc/xtrans2
-rw-r--r--source/x/x11/src/xf86-input-wacom.url2
-rwxr-xr-xsource/x/x11/x11.SlackBuild77
-rw-r--r--source/x/xdg-user-dirs/slack-desc8
-rwxr-xr-xsource/x/xdg-user-dirs/xdg-user-dirs.SlackBuild23
-rw-r--r--source/x/xdg-utils/slack-desc10
-rwxr-xr-xsource/x/xdg-utils/xdg-utils.SlackBuild21
-rw-r--r--source/x/xterm/slack-desc6
-rwxr-xr-xsource/x/xterm/xterm.SlackBuild22
448 files changed, 3279 insertions, 991 deletions
diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog
new file mode 100644
index 00000000..0bad13f9
--- /dev/null
+++ b/source/x/FTBFSlog
@@ -0,0 +1,14 @@
+Sun Mar 11 19:26:12 UTC 2018
+ xpyb: patched to fix build with xcbproto-1.13.
++--------------------------+
+Thu Mar 1 20:16:21 UTC 2018
+ motif: touch AUTHORS and NEWS, or automake-1.16 will fail with an error
++--------------------------+
+Mon Feb 12 20:46:07 UTC 2018
+ Fix all packages that fail to build from source:
+ libxshmfence: patch to handle memfd_create() properly for glibc-2.27+
++--------------------------+
+Thu Feb 1 00:46:34 UTC 2018
+ Fix all packages that fail to build from source:
+ scim: Add to CXXFLAGS: -fpermissive -fno-delete-null-pointer-checks -std=gnu++98
+ scim-anthy: Add to CXXFLAGS: -fpermissive -fno-delete-null-pointer-checks -std=gnu++98
diff --git a/source/x/anthy/anthy.SlackBuild b/source/x/anthy/anthy.SlackBuild
index 6436db76..acacc7d0 100755
--- a/source/x/anthy/anthy.SlackBuild
+++ b/source/x/anthy/anthy.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN USA
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
# All rights reserved.
#
@@ -32,25 +32,34 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=anthy
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -63,7 +72,6 @@ else
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -93,11 +101,14 @@ CFLAGS="$SLKCFLAGS" \
--disable-static \
--program-prefix= \
--program-suffix= \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# Add documentation:
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
diff --git a/source/x/anthy/slack-desc b/source/x/anthy/slack-desc
index 1e898a0a..1de00da2 100644
--- a/source/x/anthy/slack-desc
+++ b/source/x/anthy/slack-desc
@@ -1,14 +1,14 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
anthy: anthy (a system for Japanese input method)
anthy:
-anthy: Anthy is a library for Japanese text input. It converts Hiragana text
+anthy: Anthy is a library for Japanese text input. It converts Hiragana text
anthy: to Kana Kanji mixed text.
anthy:
anthy: anthy home: http://anthy.sourceforge.jp/
diff --git a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
index 834523bf..1255dce6 100755
--- a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
+++ b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,30 +20,24 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=dejavu-fonts-ttf
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
ARCH=noarch
-BUILD=1
+BUILD=${BUILD:-3}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$(echo $VERSION | tr - _ )-$ARCH-$BUILD.txz"
+ exit 0
+fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-dejavu-fonts-ttf
-# I suppose we'll be nice and try to fetch this if
-# you know the version you want.
-if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
- if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.bz2 ]; then
- if [ ! -e $CWD/dejavu-fonts-ttf-$VERSION.tar.xz ]; then
- lftpget http://dejavu.sourceforge.net/snapshots/dejavu-fonts-ttf-$VERSION.tar.gz
- fi
- fi
-fi
-if [ -e $CWD/dejavu-fonts-ttf-$VERSION.tar.gz ]; then
- gzip -d $CWD/dejavu-fonts-ttf-$VERSION.tar.gz
- xz -9 $CWD/dejavu-fonts-ttf-$VERSION.tar
-fi
-
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
@@ -61,6 +55,14 @@ find . \
mkdir -p $PKG/usr/share/fonts/TTF/
cp -a ttf/*.ttf $PKG/usr/share/fonts/TTF/
+# Rename the 57-* config files to 61-* config files, so that the font choices
+# do not override the preferred list in 600-latin.conf:
+( cd fontconfig
+ for file in 57-* ; do
+ mv $file 61-$(echo $file | cut -f 2- -d -)
+ done
+)
+# Install config files:
mkdir -p $PKG/etc/fonts/conf.avail
mkdir -p $PKG/etc/fonts/conf.d
( cd fontconfig
diff --git a/source/x/dejavu-fonts-ttf/slack-desc b/source/x/dejavu-fonts-ttf/slack-desc
index a9952b57..dc9d6c1d 100644
--- a/source/x/dejavu-fonts-ttf/slack-desc
+++ b/source/x/dejavu-fonts-ttf/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
dejavu-fonts-ttf: dejavu-fonts-ttf (DejaVu fonts)
dejavu-fonts-ttf:
-dejavu-fonts-ttf: The DejaVu fonts are a font family based on the Bitstream Vera Fonts
-dejavu-fonts-ttf: (http://gnome.org/fonts/). Its purpose is to provide a wider range
-dejavu-fonts-ttf: of characters (see http://dejavu.sf.net for more information) while
+dejavu-fonts-ttf: The DejaVu fonts are a font family based on the Bitstream Vera Fonts.
+dejavu-fonts-ttf: Its purpose is to provide a wider range of characters while
dejavu-fonts-ttf: maintaining the original look and feel.
dejavu-fonts-ttf:
-dejavu-fonts-ttf: DejaVu fonts are based on Bitstream Vera fonts version 1.10.
+dejavu-fonts-ttf: Homepage: http://dejavu-fonts.github.io
+dejavu-fonts-ttf:
dejavu-fonts-ttf:
dejavu-fonts-ttf:
dejavu-fonts-ttf:
diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild
index c93bcc70..c18c4100 100755
--- a/source/x/fontconfig/fontconfig.SlackBuild
+++ b/source/x/fontconfig/fontconfig.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,28 +20,37 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+PKGNAM=fontconfig
VERSION=${VERSION:-$(echo fontconfig-*.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 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-fontconfig
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -60,7 +69,7 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf fontconfig-$VERSION
tar xvf $CWD/fontconfig-$VERSION.tar.?z* || exit 1
-cd fontconfig-$VERSION
+cd fontconfig-$VERSION || exit 1
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -68,16 +77,14 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# The wonderful extended version of the font so generously
-# opened up for free modification and distribution by one
-# for the previously proprietary font founderies, and that
-# Stepan Roh did such a marvelous job on getting the ball
-# rolling with should clearly (IMHO) be the default font:
-zcat $CWD/fontconfig.dejavu.diff.gz | patch -p1 --verbose || exit 1
+# Prefer DejaVu fonts in 60-latin.conf:
+#zcat $CWD/fontconfig.dejavu.diff.gz | patch -p1 --verbose || exit 1
+
+# Prefer Liberation fonts in 60-latin.conf (these work better with hinting):
+zcat $CWD/fontconfig.liberation.diff.gz | patch -p1 --verbose || exit 1
-# Hardcode the default font search path rather than having
-# fontconfig figure it out (and possibly follow symlinks, or
-# index ugly bitmapped fonts):
+# Hardcode the default font search path rather than having fontconfig figure
+# it out (and possibly follow symlinks, or index ugly bitmapped fonts):
zcat $CWD/fontconfig.font.dir.list.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
CFLAGS=$SLKCFLAGS \
@@ -92,12 +99,14 @@ CFLAGS=$SLKCFLAGS \
--with-xmldir=/etc/fonts \
--localstatedir=/var \
--enable-static=no \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
-# Uses a currently non-functional sgml tool, thus '-i':
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# Upstream has changed the default templatedir to /usr/share/fontconfig/conf.avail.
# This change, if accepted, would break any existing font package containing a
# conf.avail directory. The safest thing to do is to keep things in the
@@ -134,7 +143,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
( cd $PKG/etc/fonts/conf.d
for fontconf in \
20-unhint-small-vera.conf \
- 30-urw-aliases.conf \
30-metric-aliases.conf \
40-nonlatin.conf \
45-latin.conf \
@@ -163,6 +171,10 @@ if [ ! $? = 0 ]; then
exit 1
fi
+# This is a really ugly default. If you like it, you'll have to link this
+# one yourself:
+rm -f $PKG/etc/fonts/conf.d/10-hinting-slight.conf
+
# Fix manpages:
if [ -d $PKG/usr/man ]; then
( cd $PKG/usr/man
diff --git a/source/x/fontconfig/fontconfig.dejavu.diff b/source/x/fontconfig/fontconfig.dejavu.diff
index 6edcfd37..a5d4d7bd 100644
--- a/source/x/fontconfig/fontconfig.dejavu.diff
+++ b/source/x/fontconfig/fontconfig.dejavu.diff
@@ -1,94 +1,35 @@
---- ./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 @@
+--- ./conf.d/60-latin.conf.orig 2016-07-10 21:41:05.000000000 -0500
++++ ./conf.d/60-latin.conf 2017-04-30 14:35:21.579089043 -0500
+@@ -4,8 +4,9 @@
<alias>
<family>serif</family>
<prefer>
- <family>Bitstream Vera Serif</family>
<family>DejaVu Serif</family>
++ <family>Liberation Serif</family>
+ <family>Bitstream Vera Serif</family>
<family>Times New Roman</family>
<family>Thorndale AMT</family>
<family>Luxi Serif</family>
-@@ -16,8 +16,8 @@
+@@ -17,8 +18,9 @@
<alias>
<family>sans-serif</family>
<prefer>
- <family>Bitstream Vera Sans</family>
<family>DejaVu Sans</family>
++ <family>Liberation Sans</family>
+ <family>Bitstream Vera Sans</family>
<family>Verdana</family>
<family>Arial</family>
<family>Albany AMT</family>
-@@ -32,8 +32,8 @@
+@@ -34,8 +36,9 @@
<alias>
<family>monospace</family>
<prefer>
- <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>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/fontconfig/fontconfig.liberation.diff b/source/x/fontconfig/fontconfig.liberation.diff
new file mode 100644
index 00000000..b9c9daeb
--- /dev/null
+++ b/source/x/fontconfig/fontconfig.liberation.diff
@@ -0,0 +1,35 @@
+--- ./conf.d/60-latin.conf.orig 2016-07-10 21:41:05.000000000 -0500
++++ ./conf.d/60-latin.conf 2017-04-30 14:18:52.426996569 -0500
+@@ -4,8 +4,9 @@
+ <alias>
+ <family>serif</family>
+ <prefer>
+- <family>Bitstream Vera Serif</family>
++ <family>Liberation Serif</family>
+ <family>DejaVu Serif</family>
++ <family>Bitstream Vera Serif</family>
+ <family>Times New Roman</family>
+ <family>Thorndale AMT</family>
+ <family>Luxi Serif</family>
+@@ -17,8 +18,9 @@
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+- <family>Bitstream Vera Sans</family>
++ <family>Liberation Sans</family>
+ <family>DejaVu Sans</family>
++ <family>Bitstream Vera Sans</family>
+ <family>Verdana</family>
+ <family>Arial</family>
+ <family>Albany AMT</family>
+@@ -34,8 +36,9 @@
+ <alias>
+ <family>monospace</family>
+ <prefer>
+- <family>Bitstream Vera Sans Mono</family>
++ <family>Liberation Mono</family>
+ <family>DejaVu Sans Mono</family>
++ <family>Bitstream Vera Sans Mono</family>
+ <family>Inconsolata</family>
+ <family>Andale Mono</family>
+ <family>Courier New</family>
diff --git a/source/x/fontconfig/slack-desc b/source/x/fontconfig/slack-desc
index 173ba946..26a83258 100644
--- a/source/x/fontconfig/slack-desc
+++ b/source/x/fontconfig/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild
index 0d5ecac2..d60a0bdb 100755
--- a/source/x/freeglut/freeglut.SlackBuild
+++ b/source/x/freeglut/freeglut.SlackBuild
@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for freeglut
# Copyright 2012 Robby Workman, Northport, Alabama, USA
+# Copyright 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,26 +23,39 @@
# 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.1}
-BUILD=${BUILD:-1}
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=freeglut
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j7 "}
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
- case "$( uname -m )" in
- i?86) ARCH=i486 ;;
- arm*) ARCH=arm ;;
- *) ARCH=$( uname -m ) ;;
+ case "$MARCH" in
+ i?86) export ARCH=i586 ;;
+ 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
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -57,9 +71,9 @@ 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
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || 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,15 +81,39 @@ 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 \
- --disable-static \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --build=$ARCH-slackware-linux || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
+cp -a \
+ AUTHORS COPYING* INSTALL NEWS README TODO \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a doc/*.{html,png} $PKG/usr/doc/$PKGNAM-$VERSION/html
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
+
+mkdir -p build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DFREEGLUT_BUILD_DEMOS=ON \
+ -DFREEGLUT_BUILD_SHARED_LIBS=ON \
+ -DFREEGLUT_BUILD_STATIC_LIBS=OFF \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ .. || exit 1
+
+#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
@@ -83,15 +121,8 @@ 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
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/freeglut/slack-desc b/source/x/freeglut/slack-desc
index 9fcda6f5..8b5ba173 100644
--- a/source/x/freeglut/slack-desc
+++ b/source/x/freeglut/slack-desc
@@ -1,15 +1,15 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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: 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.
diff --git a/source/x/glew/glew.SlackBuild b/source/x/glew/glew.SlackBuild
index 3cbad2d8..cae1fd09 100755
--- a/source/x/glew/glew.SlackBuild
+++ b/source/x/glew/glew.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2009, 2010, 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,11 @@
# Slackware build script for glew
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=glew
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
@@ -36,9 +38,16 @@ if [ -z "$ARCH" ]; then
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:--j8}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -74,6 +83,12 @@ TEMPFILE=$(mktemp)
fromdos < config/config.guess > $TEMPFILE
cat $TEMPFILE > config/config.guess ; rm -f $TEMPFILE
+# Fix libdir so that it doesn't include /tmp/package-glew:
+sed -i "s|@libdir@|/usr/lib${LIBDIRSUFFIX}|g" glew.pc.in
+
+# Use lib${LIBDIRSUFFIX} (if needed) in Makefile:
+sed -i "s,/lib,/lib${LIBDIRSUFFIX},g" Makefile
+
make $NUMJOBS OPT="$SLKCFLAGS" || make OPT="$SLKCFLAGS" || exit 1
make install.all GLEW_DEST=$PKG/usr || exit 1
diff --git a/source/x/glew/glew.url b/source/x/glew/glew.url
index 1917f16b..b180f96b 100644
--- a/source/x/glew/glew.url
+++ b/source/x/glew/glew.url
@@ -1,2 +1,2 @@
http://glew.sourceforge.net
-http://downloads.sourceforge.net/glew/glew-1.13.0.tgz
+http://downloads.sourceforge.net/glew/glew-2.1.0.tgz
diff --git a/source/x/glew/slack-desc b/source/x/glew/slack-desc
index 20583fe3..c2f75964 100644
--- a/source/x/glew/slack-desc
+++ b/source/x/glew/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
diff --git a/source/x/glu/glu.SlackBuild b/source/x/glu/glu.SlackBuild
index e5f76982..b77ebe7c 100755
--- a/source/x/glu/glu.SlackBuild
+++ b/source/x/glu/glu.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for glu
@@ -22,26 +22,35 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=glu
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=glu
VERSION=${VERSION:-9.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j7 "}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -57,9 +66,9 @@ 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
+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 \) \
@@ -80,6 +89,9 @@ CXXFLAGS="$SLKCFLAGS" \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
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
@@ -89,4 +101,4 @@ 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/x/glu/slack-desc b/source/x/glu/slack-desc
index 7ede5e95..95b2b7a9 100644
--- a/source/x/glu/slack-desc
+++ b/source/x/glu/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
diff --git a/source/x/libva-intel-driver/libva-intel-driver.SlackBuild b/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild
index 17d51e9a..15ed3265 100755
--- a/source/x/libva-intel-driver/libva-intel-driver.SlackBuild
+++ b/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild
@@ -1,9 +1,7 @@
-#!/bin/sh
-
-# Slackware build script for libva-intel-driver
+#!/bin/bash
# Copyright 2015 Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,9 +21,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PKGNAM=libva-intel-driver
-VERSION=${VERSION:-$(echo libva-intel-driver-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1}
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=intel-vaapi-driver
+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
@@ -35,6 +35,14 @@ if [ -z "$ARCH" ]; then
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:--j6}
if [ "$ARCH" = "i586" ]; then
@@ -51,7 +59,6 @@ else
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -59,7 +66,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find -L . \
diff --git a/source/x/intel-vaapi-driver/intel-vaapi-driver.url b/source/x/intel-vaapi-driver/intel-vaapi-driver.url
new file mode 100644
index 00000000..36b93cc8
--- /dev/null
+++ b/source/x/intel-vaapi-driver/intel-vaapi-driver.url
@@ -0,0 +1 @@
+https://github.com/01org/libva-intel-driver
diff --git a/source/x/libva-intel-driver/slack-desc b/source/x/intel-vaapi-driver/slack-desc
index 25a41391..d3be1bd1 100644
--- a/source/x/libva-intel-driver/slack-desc
+++ b/source/x/intel-vaapi-driver/slack-desc
@@ -2,18 +2,18 @@
# 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
+# 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------------------------------------------------------|
-libva-intel-driver: libva-intel-driver (VA driver for Intel G45 & HD Graphics family)
-libva-intel-driver:
-libva-intel-driver: libva-intel-driver is the VA-API implementation for Intel G45
-libva-intel-driver: chipsets and Intel HD Graphics for Intel Core processor family.
-libva-intel-driver:
-libva-intel-driver: Website: http://www.freedesktop.org/wiki/Software/vaapi
-libva-intel-driver:
-libva-intel-driver:
-libva-intel-driver:
-libva-intel-driver:
-libva-intel-driver:
+intel-vaapi-driver: intel-vaapi-driver (VA driver for Intel G45 & HD Graphics family)
+intel-vaapi-driver:
+intel-vaapi-driver: intel-vaapi-driver is the VA-API implementation for Intel G45
+intel-vaapi-driver: chipsets and Intel HD Graphics for Intel Core processor family.
+intel-vaapi-driver:
+intel-vaapi-driver: Homepage: https://01.org/linuxmedia/vaapi
+intel-vaapi-driver:
+intel-vaapi-driver:
+intel-vaapi-driver:
+intel-vaapi-driver:
+intel-vaapi-driver:
diff --git a/source/x/libXaw3dXft/libXaw3dXft.SlackBuild b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild
index 6f4e54b0..3ac9ab1b 100755
--- a/source/x/libXaw3dXft/libXaw3dXft.SlackBuild
+++ b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015, 2018 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.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=libXaw3dXft
VERSION=${VERSION:-$(echo ${PKGNAM}*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -32,6 +34,14 @@ if [ -z "$ARCH" ]; then
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:--j6}
if [ "$ARCH" = "i586" ]; then
@@ -48,7 +58,6 @@ else
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -80,11 +89,14 @@ CXXFLAGS="$SLKCFLAGS" \
--enable-gray-stipples \
--enable-arrow-scrollbars \
--enable-internationalization \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
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
diff --git a/source/x/libXaw3dXft/slack-desc b/source/x/libXaw3dXft/slack-desc
index a6ef6345..6244e4a6 100644
--- a/source/x/libXaw3dXft/slack-desc
+++ b/source/x/libXaw3dXft/slack-desc
@@ -1,15 +1,15 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
libXaw3dXft: libXaw3dXft (3D enhanced version of the MIT Athena widget set)
libXaw3dXft:
libXaw3dXft: Xaw3dXft is an enhanced version of the MIT Athena Widget set for
-libXaw3dXft: the X Window System. Xaw3dXft adds a three-dimensional look to
+libXaw3dXft: the X Window System. Xaw3dXft adds a three-dimensional look to
libXaw3dXft: applications with minimal or no source code changes.
libXaw3dXft:
libXaw3dXft: You should install Xaw3dXft if you are using applications which
diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild
index bcd40699..2686a6e9 100755
--- a/source/x/libdrm/libdrm.SlackBuild
+++ b/source/x/libdrm/libdrm.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2006-2010, 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2010, 2014, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,8 +20,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=libdrm
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | 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 architecture for build & packaging:
@@ -33,9 +35,16 @@ if [ -z "$ARCH" ]; then
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-${PKGNAM}
@@ -60,8 +69,8 @@ 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
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
# Make sure ownerships and permissions are sane:
chown -R root:root .
@@ -78,12 +87,15 @@ CFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--enable-udev \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
# Build and install:
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# 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
diff --git a/source/x/libdrm/libdrm.url b/source/x/libdrm/libdrm.url
new file mode 100644
index 00000000..79d7b0e9
--- /dev/null
+++ b/source/x/libdrm/libdrm.url
@@ -0,0 +1 @@
+https://dri.freedesktop.org/libdrm/
diff --git a/source/x/libdrm/slack-desc b/source/x/libdrm/slack-desc
index 93530f5a..17523a1a 100644
--- a/source/x/libdrm/slack-desc
+++ b/source/x/libdrm/slack-desc
@@ -1,15 +1,15 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
libdrm: libdrm (A library to support Direct Rendering)
libdrm:
libdrm: This library implements an interface to the kernel's DRM services.
-libdrm: It is used to support hardware accelerated 3-D rendering.
+libdrm: It is used to support hardware accelerated 3D rendering.
libdrm:
libdrm:
libdrm:
diff --git a/source/x/libepoxy/libepoxy.SlackBuild b/source/x/libepoxy/libepoxy.SlackBuild
index cc2d99a6..e47470ef 100755
--- a/source/x/libepoxy/libepoxy.SlackBuild
+++ b/source/x/libepoxy/libepoxy.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for libepoxy
# Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA
-# Copyright 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=libepoxy
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
@@ -37,7 +39,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/x/libepoxy/slack-desc b/source/x/libepoxy/slack-desc
index f1e7a001..7c790af3 100644
--- a/source/x/libepoxy/slack-desc
+++ b/source/x/libepoxy/slack-desc
@@ -2,7 +2,7 @@
# 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
+# 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------------------------------------------------------|
diff --git a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild
index 6d6c4ab7..8f5f8ecd 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
+#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,12 +20,21 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
-VERSION=1.07.4
+PKGNAM=liberation-fonts-ttf
+VERSION=2.00.1
ARCH=noarch
-BUILD=1
+BUILD=${BUILD:-2}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-liberation-fonts-ttf
@@ -48,7 +57,7 @@ cp -a *.ttf $PKG/usr/share/fonts/TTF/
mkdir -p $PKG/usr/doc/liberation-fonts-ttf-$VERSION
cp -a \
- AUTHORS COPYING* License.txt README* TODO \
+ AUTHORS COPYING* License.txt LICENSE README* TODO \
$PKG/usr/doc/liberation-fonts-ttf-$VERSION
# If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/x/liberation-fonts-ttf/slack-desc b/source/x/liberation-fonts-ttf/slack-desc
index 4692800f..78359cbe 100644
--- a/source/x/liberation-fonts-ttf/slack-desc
+++ b/source/x/liberation-fonts-ttf/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
+ |-----handy-ruler------------------------------------------------------|
liberation-fonts-ttf: liberation-fonts-ttf (Liberation TTF Fonts)
liberation-fonts-ttf:
-liberation-fonts-ttf: Liberation is the collective name of three TrueType font
-liberation-fonts-ttf: families: Liberation Sans, Liberation Serif and Liberation
-liberation-fonts-ttf: Mono. These fonts are metric-compatible with Arial, Times
-liberation-fonts-ttf: New Roman, and Courier New respectively.
+liberation-fonts-ttf: Liberation is the collective name of three TrueType font families:
+liberation-fonts-ttf: Liberation Sans, Liberation Serif and Liberation Mono. These fonts are
+liberation-fonts-ttf: metric-compatible with Arial, Times New Roman, and Courier New
+liberation-fonts-ttf: respectively.
liberation-fonts-ttf:
-liberation-fonts-ttf: The fonts were developed by Steve Matteson of Ascender Corp.
-liberation-fonts-ttf: for Red Hat, Inc.
+liberation-fonts-ttf: The fonts were developed by Steve Matteson of Ascender Corp. and
+liberation-fonts-ttf: Pravin Satpute for Red Hat, Inc.
liberation-fonts-ttf:
liberation-fonts-ttf:
diff --git a/source/x/libevdev/libevdev.SlackBuild b/source/x/libevdev/libevdev.SlackBuild
index 625dda20..642fb5e7 100755
--- a/source/x/libevdev/libevdev.SlackBuild
+++ b/source/x/libevdev/libevdev.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for libevdev
# Copyright 2014 Robby Workman, Northport, Alabama, USA
-# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,24 +23,33 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=libevdev
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+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 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -57,7 +66,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find -L . \
@@ -80,6 +89,9 @@ CXXFLAGS="$SLKCFLAGS" \
make || exit 1
make install DESTDIR=$PKG || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
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
diff --git a/source/x/libevdev/slack-desc b/source/x/libevdev/slack-desc
index 74acf529..03442fc1 100644
--- a/source/x/libevdev/slack-desc
+++ b/source/x/libevdev/slack-desc
@@ -2,17 +2,17 @@
# 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
+# 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------------------------------------------------------|
libevdev: libevdev (wrapper library for evdev devices)
libevdev:
-libevdev: libevdev is a wrapper library for evdev devices. It moves the common
+libevdev: libevdev is a wrapper library for evdev devices. It moves the common
libevdev: tasks when dealing with evdev devices into a library and provides a
libevdev: library interface to the callers, thus avoiding erroneous ioctls, etc.
libevdev:
-libevdev: http://www.freedesktop.org/wiki/Software/libevdev/
+libevdev: Homepage: http://www.freedesktop.org/wiki/Software/libevdev/
libevdev:
libevdev:
libevdev:
diff --git a/source/x/libhangul/libhangul.SlackBuild b/source/x/libhangul/libhangul.SlackBuild
index 9394cc07..e60d7ab2 100755
--- a/source/x/libhangul/libhangul.SlackBuild
+++ b/source/x/libhangul/libhangul.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009, 2012 Eric Hameleers , Eindhoven, NL
-# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -34,10 +34,11 @@
# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libhangul
VERSION=${VERSION:-0.1.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -45,7 +46,7 @@ NUMJOBS=${NUMJOBS:-" -j7 "}
MARCH=$( uname -m )
if [ -z "$ARCH" ]; then
case "$MARCH" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
armv7hl) export ARCH=$MARCH ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
@@ -53,8 +54,16 @@ if [ -z "$ARCH" ]; then
esac
fi
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -75,7 +84,6 @@ case "$ARCH" in
*) TARGET=$ARCH-slackware-linux ;;
esac
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -105,11 +113,14 @@ CFLAGS="$SLKCFLAGS" \
--disable-static \
--program-prefix= \
--program-suffix= \
- --build=$TARGET
+ --build=$TARGET || exit 1
make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# Add documentation:
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
diff --git a/source/x/libhangul/slack-desc b/source/x/libhangul/slack-desc
index 49b2eec1..99741078 100644
--- a/source/x/libhangul/slack-desc
+++ b/source/x/libhangul/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
@@ -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://code.google.com/p/libhangul/
+libhangul: Homepage: http://code.google.com/p/libhangul/
libhangul:
libhangul:
libhangul:
diff --git a/source/x/libinput/libinput.SlackBuild b/source/x/libinput/libinput.SlackBuild
new file mode 100755
index 00000000..e4375ba7
--- /dev/null
+++ b/source/x/libinput/libinput.SlackBuild
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# Slackware build script for libinput
+
+# Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2017, 2018 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=libinput
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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=i586 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -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 -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --buildtype=release \
+ -Dudev-dir=/lib/udev \
+ -Ddocumentation=false \
+ -Dtests=false \
+ .. || exit 1
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
+
+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
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ COPYING* README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+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/libinput/libinput.url b/source/x/libinput/libinput.url
new file mode 100644
index 00000000..f50e5e12
--- /dev/null
+++ b/source/x/libinput/libinput.url
@@ -0,0 +1 @@
+http://www.freedesktop.org/software/libinput/
diff --git a/source/x/libinput/slack-desc b/source/x/libinput/slack-desc
new file mode 100644
index 00000000..e1aa57b0
--- /dev/null
+++ b/source/x/libinput/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------------------------------------------------------|
+libinput: libinput (GUI input library)
+libinput:
+libinput: libinput is a library to handle input devices in Wayland compositors
+libinput: and to provide a generic X.Org input driver. It provides device
+libinput: detection, device handling, input device event processing and
+libinput: abstraction so minimize the amount of custom input code compositors
+libinput: need to provide the common set of functionality that users expect.
+libinput:
+libinput: Homepage: http://www.freedesktop.org/wiki/Software/libinput/
+libinput:
+libinput:
diff --git a/source/x/libmypaint/libmypaint.SlackBuild b/source/x/libmypaint/libmypaint.SlackBuild
new file mode 100755
index 00000000..7d587479
--- /dev/null
+++ b/source/x/libmypaint/libmypaint.SlackBuild
@@ -0,0 +1,136 @@
+#!/bin/bash
+
+# Copyright 2018 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=libmypaint
+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=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$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
+
+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, build, and install:
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ --disable-static \
+ --build=$ARCH-slackware-linux || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# 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
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+ ln -s $( readlink $i ).gz $i.gz
+ rm $i
+done
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS* ChangeLog CHANGES COPYING* LICENSE* 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/libmypaint/libmypaint.url b/source/x/libmypaint/libmypaint.url
new file mode 100644
index 00000000..06489af7
--- /dev/null
+++ b/source/x/libmypaint/libmypaint.url
@@ -0,0 +1 @@
+https://github.com/mypaint/libmypaint/releases
diff --git a/source/x/libmypaint/slack-desc b/source/x/libmypaint/slack-desc
new file mode 100644
index 00000000..dffcd7d5
--- /dev/null
+++ b/source/x/libmypaint/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------------------------------------------------------|
+libmypaint: libmypaint (brush engine library)
+libmypaint:
+libmypaint: libmypaint (also known as "brushlib") is a library for making
+libmypaint: brushstrokes which is used by MyPaint, GIMP, and other projects.
+libmypaint:
+libmypaint: Homepage: http://mypaint.org
+libmypaint:
+libmypaint:
+libmypaint:
+libmypaint:
+libmypaint:
diff --git a/source/x/libva-intel-driver/libva-intel-driver.url b/source/x/libva-intel-driver/libva-intel-driver.url
deleted file mode 100644
index 57fcc6bd..00000000
--- a/source/x/libva-intel-driver/libva-intel-driver.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/
diff --git a/source/x/libva-utils/libva-utils.SlackBuild b/source/x/libva-utils/libva-utils.SlackBuild
new file mode 100755
index 00000000..2895949a
--- /dev/null
+++ b/source/x/libva-utils/libva-utils.SlackBuild
@@ -0,0 +1,113 @@
+#!/bin/bash
+
+# Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2015, 2017, 2018 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=libva-utils
+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=i586 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -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.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+
+# These fix a mandatory check for wayland-scanner:
+mkdir -p m4
+autoreconf -fi
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --enable-shared \
+ --disable-static \
+ --enable-dummy-driver \
+ --build=$ARCH-slackware-linux || exit 1
+
+make $NUMJOBS || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
+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/$PKGNAM-$VERSION
+cp -a COPYING* NEWS README* $PKG/usr/doc/$PKGNAM-$VERSION
+
+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/libva-utils/libva-utils.url b/source/x/libva-utils/libva-utils.url
new file mode 100644
index 00000000..8e8e94fa
--- /dev/null
+++ b/source/x/libva-utils/libva-utils.url
@@ -0,0 +1 @@
+https://github.com/01org/libva-utils/releases/download/2.1.0/libva-utils-2.1.0.tar.bz2
diff --git a/source/x/libva-utils/slack-desc b/source/x/libva-utils/slack-desc
new file mode 100644
index 00000000..441cb470
--- /dev/null
+++ b/source/x/libva-utils/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------------------------------------------------------|
+libva-utils: libva-utils (VA-API utilities)
+libva-utils:
+libva-utils: Libva-utils is a collection of utilities for VA-API (VIdeo
+libva-utils: Acceleration API).
+libva-utils:
+libva-utils: Homepage: https://01.org/linuxmedia/vaapi
+libva-utils:
+libva-utils:
+libva-utils:
+libva-utils:
+libva-utils:
diff --git a/source/x/libva/libva.SlackBuild b/source/x/libva/libva.SlackBuild
index 60d68861..1bb62915 100755
--- a/source/x/libva/libva.SlackBuild
+++ b/source/x/libva/libva.SlackBuild
@@ -1,9 +1,7 @@
-#!/bin/sh
-
-# Slackware build script for libva
+#!/bin/bash
# Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA
-# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,9 +21,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=libva
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+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
@@ -35,9 +35,16 @@ if [ -z "$ARCH" ]; then
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -59,7 +66,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find -L . \
@@ -89,6 +96,9 @@ CXXFLAGS="$SLKCFLAGS" \
make $NUMJOBS || exit 1
make install DESTDIR=$PKG || exit 1
+# Don't ship .la files:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
+
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
diff --git a/source/x/libva/libva.url b/source/x/libva/libva.url
index 699f4c43..e03539ee 100644
--- a/source/x/libva/libva.url
+++ b/source/x/libva/libva.url
@@ -1 +1 @@
-http://www.freedesktop.org/software/vaapi/releases/libva/
+https://github.com/01org/libva/releases/download/2.1.0/libva-2.1.0.tar.bz2
diff --git a/source/x/libva/slack-desc b/source/x/libva/slack-desc
index d2e5e6a6..1685ccd8 100644
--- a/source/x/libva/slack-desc
+++ b/source/x/libva/slack-desc
@@ -2,7 +2,7 @@
# 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
+# 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------------------------------------------------------|
@@ -13,7 +13,7 @@ libva: hardware accelerated video decode/encode at various entry-points (VLD,
libva: IDCT, Motion Compensation etc.) for the prevailing coding standards
libva: today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3)
libva:
-libva: Website: http://www.freedesktop.org/wiki/Software/vaapi
+libva: Homepage: https://01.org/linuxmedia/vaapi
libva:
libva:
libva:
diff --git a/source/x/libvdpau/libvdpau.SlackBuild b/source/x/libvdpau/libvdpau.SlackBuild
index e0ee6e00..f44f3644 100755
--- a/source/x/libvdpau/libvdpau.SlackBuild
+++ b/source/x/libvdpau/libvdpau.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for libvdpau
# Copyright 2009-2015 Heinz Wiesinger, Amsterdam, The Netherlands
# Copyright 2012-2013 Edward Koenig, Vancouver, WA, USA
-# Copyright 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2014, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,9 +24,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=libvdpau
VERSION=${VERSION:-$(echo libvdpau-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:--j6}
if [ "$ARCH" = "i586" ]; then
@@ -52,7 +62,6 @@ else
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -79,11 +88,14 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--docdir=/usr/doc/$PKGNAM-$VERSION \
--disable-static \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make install-strip DESTDIR=$PKG || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
mkdir -p $PKG/etc/profile.d
cp -a $CWD/profile.d/vdpau.sh $PKG/etc/profile.d/vdpau.sh.new
cp -a $CWD/profile.d/vdpau.csh $PKG/etc/profile.d/vdpau.csh.new
diff --git a/source/x/libvdpau/slack-desc b/source/x/libvdpau/slack-desc
index a2628b91..e0bc857a 100644
--- a/source/x/libvdpau/slack-desc
+++ b/source/x/libvdpau/slack-desc
@@ -2,7 +2,7 @@
# 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
+# 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------------------------------------------------------|
@@ -10,9 +10,9 @@ libvdpau: libvdpau (VDPAU wrapper library)
libvdpau:
libvdpau: This package contains the libvdpau wrapper library and the
libvdpau: libvdpau_trace debugging library, along with the header files needed
-libvdpau: to build VDPAU applications. To actually use a VDPAU device, you
-libvdpau: need a vendor-specific implementation library, like the one
-libvdpau: shipped with nvidia's binary graphics driver.
+libvdpau: to build VDPAU applications. To actually use a VDPAU device, you need
+libvdpau: a vendor-specific implementation library, like the one shipped with
+libvdpau: Nvidia's binary graphics driver.
libvdpau:
libvdpau: Homepage: http://cgit.freedesktop.org/~aplattner/libvdpau
libvdpau:
diff --git a/source/x/libwacom/libwacom.SlackBuild b/source/x/libwacom/libwacom.SlackBuild
new file mode 100755
index 00000000..e12413d0
--- /dev/null
+++ b/source/x/libwacom/libwacom.SlackBuild
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+# Slackware build script for libwacom
+
+# Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2017, 2018 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=libwacom
+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) ARCH=i586 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -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.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -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 \
+ --disable-static \
+ --build=$ARCH-slackware-linux || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+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
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ COPYING* NEWS README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+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/libwacom/libwacom.url b/source/x/libwacom/libwacom.url
new file mode 100644
index 00000000..94d53d20
--- /dev/null
+++ b/source/x/libwacom/libwacom.url
@@ -0,0 +1 @@
+https://github.com/linuxwacom/libwacom
diff --git a/source/x/libwacom/slack-desc b/source/x/libwacom/slack-desc
new file mode 100644
index 00000000..7f1fa14f
--- /dev/null
+++ b/source/x/libwacom/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------------------------------------------------------|
+libwacom: libwacom (Wacom tablet library)
+libwacom:
+libwacom: libwacom is a library to identify Wacom tablets and their model
+libwacom: specific features. It provides easy access to information such as
+libwacom: "is this a built-in on-screen tablet", "what is the size of this
+libwacom: model", etc.
+libwacom:
+libwacom: Homepage: https://github.com/linuxwacom
+libwacom:
+libwacom:
+libwacom:
diff --git a/source/x/m17n-lib/m17n-lib.SlackBuild b/source/x/m17n-lib/m17n-lib.SlackBuild
index 82cc38ad..67d803b3 100755
--- a/source/x/m17n-lib/m17n-lib.SlackBuild
+++ b/source/x/m17n-lib/m17n-lib.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -32,41 +32,45 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=m17n-lib
SHORTNAM=m17n
-VERSION=${VERSION:-1.6.1}
-DBVERSION=${DBVERSION:-1.6.1}
-# Won't build && are not maintained for current version
-#DOCVERSION=${DOCVERSION:-1.5.5}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.8.0}
+DBVERSION=${DBVERSION:-1.8.0}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
-DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS COPYING ChangeLog NEWS README TODO"
DOCS_DB="ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README"
-DOCS_DOC="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
-SOURCE[0]="$CWD/${PKGNAM}-${VERSION}.tar.xz"
-SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.xz"
-#SOURCE[2]="$CWD/${SHORTNAM}-docs-${DOCVERSION}.tar.xz"
+SOURCE[0]="$CWD/${PKGNAM}-${VERSION}.tar.lz"
+SOURCE[1]="$CWD/${SHORTNAM}-db-${DBVERSION}.tar.lz"
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -74,11 +78,11 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "arm" ]; then
- SLKCFLAGS="-O2 -march=armv4 -mtune=xscale"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
LIBDIRSUFFIX=""
-elif [ "$ARCH" = "armel" ]; then
- SLKCFLAGS="-O2 -march=armv4t"
+else
+ SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
fi
@@ -92,9 +96,7 @@ done
chown -R root:root *
chmod -R u+w,go+r-w,a-s *
-cd ${PKGNAM}-${VERSION}
-# Add the missing internal-flt.h file:
-[ ! -r src/internal-flt.h ] && cp $CWD/internal-flt.h src/
+cd ${PKGNAM}-${VERSION} || exit 1
echo Building ...
CXXFLAGS="$SLKCFLAGS" \
@@ -105,11 +107,11 @@ CFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--sysconfdir=/etc \
--mandir=/usr/man \
- --without-gui \
+ --disable-gui \
--disable-static \
--program-prefix= \
--program-suffix= \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
# If you get errors here, uninstall the present m17n-lib package first:
make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
@@ -127,37 +129,28 @@ CFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--program-prefix= \
--program-suffix= \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
cd ..
-## Compile and install the m17n user documentation:
-#echo "Building the m17n user docs..."
-#cd ${SHORTNAM}-docs-${DOCVERSION}
-#CXXFLAGS="$SLKCFLAGS" \
-#CFLAGS="$SLKCFLAGS" \
-#./configure \
-# --prefix=/usr \
-# --libdir=/usr/lib${LIBDIRSUFFIX} \
-# --localstatedir=/var \
-# --sysconfdir=/etc \
-# --mandir=/usr/man \
-# --program-prefix= \
-# --program-suffix= \
-# --build=$ARCH-slackware-linux
-#make $NUMJOBS || make || exit 1
-#make DESTDIR=$PKG install || exit 1
-#cd ..
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
# Add package documentation:
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/{db,docs}
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/db
cd ${PKGNAM}-${VERSION}
cp -a $DOCS $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:
+cat ChangeLog | head -n 1000 > $PKG/usr/doc/$PKGNAM-$VERSION/ChangeLog
+touch -r ChangeLog $PKG/usr/doc/$PKGNAM-$VERSION/ChangeLog
cd ../${SHORTNAM}-db-${DBVERSION}
cp -a $DOCS_DB $PKG/usr/doc/$PKGNAM-$VERSION/db
-cd ../${SHORTNAM}-docs-${DOCVERSION}
-cp -a $DOCS_DOC $PKG/usr/doc/$PKGNAM-$VERSION/docs
+# 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:
+cat ChangeLog | head -n 1000 > $PKG/usr/doc/$PKGNAM-$VERSION/db/ChangeLog
+touch -r ChangeLog $PKG/usr/doc/$PKGNAM-$VERSION/db/ChangeLog
cd ..
find $PKG/usr/doc -type f -exec chmod 644 {} \;
@@ -179,9 +172,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
# Add a package description:
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-if [ -f $CWD/doinst.sh ]; then
- cat $CWD/doinst.sh >> $PKG/install/doinst.sh
-fi
# Build the package:
cd $PKG
diff --git a/source/x/m17n-lib/slack-desc b/source/x/m17n-lib/slack-desc
index 78164bc0..67a33292 100644
--- a/source/x/m17n-lib/slack-desc
+++ b/source/x/m17n-lib/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
m17n-lib: m17n-lib (application multilingualization library)
m17n-lib:
-m17n-lib: M17n is an abbreviation of Multilingualization. The m17n library
-m17n-lib: implements multilingualization for many applications. The m17n
-m17n-lib: library supports functions to handle M-texts. This package also
+m17n-lib: M17n is an abbreviation of Multilingualization. The m17n library
+m17n-lib: implements multilingualization for many applications. The m17n
+m17n-lib: library supports functions to handle M-texts. This package also
m17n-lib: contains the m17n database.
m17n-lib:
-m17n-lib: m17n-lib home: http://m17n.org/
+m17n-lib: Homepage: http://m17n.nongnu.org
m17n-lib:
m17n-lib:
m17n-lib:
diff --git a/source/x/mesa/doinst.sh b/source/x/mesa/doinst.sh
new file mode 100644
index 00000000..42c4667c
--- /dev/null
+++ b/source/x/mesa/doinst.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+config() {
+ NEW="$1"
+ 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
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+config etc/drirc.new
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index af959695..99fc6399 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,16 +20,18 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=mesa
-VERSION=${VERSION:-11.2.2}
-DEMOVERS=${DEMOVERS:-8.3.0}
+VERSION=${VERSION:-$(echo $PKGNAM-1*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+DEMOVERS=${DEMOVERS:-8.4.0}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
# Be sure this list is up-to-date:
DRI_DRIVERS="i915,i965,nouveau,r200,radeon,swrast"
-GALLIUM_DRIVERS="nouveau,r300,r600,svga,radeonsi,swrast"
+GALLIUM_DRIVERS="nouveau,r300,r600,svga,radeonsi,swrast,virgl"
EGL_PLATFORMS="drm,x11"
if [ -z "$ARCH" ]; then
@@ -40,16 +42,27 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-mesa
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
+ # I've heard some reports as of late 2016 that Vulkan has some issues on
+ # 32-bit, but we'll try it anyway and see if anything is reported:
+ VULKAN=" --with-vulkan-drivers=intel,radeon "
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+ VULKAN=" --with-vulkan-drivers=intel,radeon "
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
@@ -61,7 +74,7 @@ cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-${VERSION}.tar.xz || exit 1
-cd ${PKGNAM}-$VERSION
+cd ${PKGNAM}-$VERSION || exit 1
# Let's kill the warning about operating on a dangling symlink:
rm -f src/gallium/state_trackers/d3d1x/w32api
@@ -76,18 +89,14 @@ find . \
# Apply patches from git (and maybe elsewhere):
# Patches obtained by:
-# git checkout origin/11.2
-# git format-patch 5de088f7da75cc0209ff1602ed70aff14f733e4b # 11.2.2 release
+# git checkout origin/17.2
+# git format-patch 93c2beafc0a7fa2f210b006d22aba61caa71f773 # 17.2.6 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
-# Don't worry if Mako is not present:
-#sed -i "s,AX_CHECK_PYTHON_MAKO_MODULE(\$PYTHON_MAKO_REQUIRED),,g" configure.ac
-zcat $CWD/mesa.no.mako.diff.gz | patch -p1 --verbose || exit 1
-
# This doesn't fully do the trick. See below. ;-)
#./autogen.sh
@@ -108,7 +117,8 @@ CFLAGS="$SLKCFLAGS" \
--with-dri-drivers="$DRI_DRIVERS" \
--with-gallium-drivers="$GALLIUM_DRIVERS" \
--with-egl-platforms="$EGL_PLATFORMS" \
- --enable-gallium-llvm \
+ $VULKAN \
+ --enable-llvm \
--enable-llvm-shared-libs \
--enable-egl \
--enable-texture-float \
@@ -124,7 +134,9 @@ CFLAGS="$SLKCFLAGS" \
--enable-gles1 \
--enable-gles2 \
--enable-vdpau \
- --build=$ARCH-slackware-linux
+ --enable-opencl \
+ --enable-opencl-icd \
+ --build=$ARCH-slackware-linux || exit 1
# This is autodetected anyway:
# --enable-va \
@@ -132,7 +144,14 @@ CFLAGS="$SLKCFLAGS" \
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
-# Now install the demos
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# Install /etc/drirc as a .new file:
+mv $PKG/etc/drirc $PKG/etc/drirc.new
+
+# Now build/install a small subset of the demos:
+export CWD SLKCFLAGS NUMJOBS PKG
( cd $TMP
rm -rf mesa-demos-$DEMOVERS
tar xvf $CWD/mesa-demos-$DEMOVERS.tar.?z* || exit 1
@@ -146,19 +165,20 @@ make install DESTDIR=$PKG || exit 1
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
- --build=$ARCH-slackware-linux
- # Build and install gears and glinfo, as well as a few other demos
- make -C src/demos gears glinfo
- make -C src/xdemos \
- glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
- glxheads glxinfo glxpbdemo glxpixmap
+ --build=$ARCH-slackware-linux || exit 1
+ make $NUMJOBS || exit 1
+ # Install all the demos (including the pointless ones) at first, in a
+ # temporary location:
+ make install DESTDIR=$PKG/cruft || exit 1
+ # Install gears and glinfo, as well as a few other demos:
mkdir -p $PKG/usr/bin
- cp -a src/demos/{gears,glinfo} $PKG/usr/bin
- for i in glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
- glxheads glxinfo glxpbdemo glxpixmap ; do
- cp -a src/xdemos/$i $PKG/usr/bin ;
+ for demo in gears glinfo glthreads glxcontexts glxdemo glxgears \
+ glxgears_fbconfig glxheads glxinfo glxpbdemo glxpixmap ; do
+ mv --verbose $PKG/cruft/usr/bin/$demo $PKG/usr/bin
done
-)
+ # Remove cruft:
+ rm -rf $PKG/cruft
+) || exit 1
# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -175,13 +195,14 @@ fi
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
cp -a \
- docs/COPYING* docs/relnotes/relnotes-${VERSION}*.html docs/README* docs/GL* \
+ docs/COPYING* docs/relnotes/${VERSION}.html docs/README* docs/GL* \
$PKG/usr/doc/$PKGNAM-$VERSION
cp -a docs/*.html $PKG/usr/doc/$PKGNAM-$VERSION/html
rm -f $PKG/usr/doc/$PKGNAM-$VERSION/html/relnotes*.html
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/x/mesa/mesa.no.mako.diff b/source/x/mesa/mesa.no.mako.diff
deleted file mode 100644
index 51358992..00000000
--- a/source/x/mesa/mesa.no.mako.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./configure.ac.orig 2015-04-09 06:28:58.000000000 -0500
-+++ ./configure.ac 2015-04-16 15:33:30.087481982 -0500
-@@ -114,19 +114,19 @@
- fi
- fi
-
--AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
-+dnl AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
-
--if test -z "$PYTHON2"; then
-- if test ! -f "$srcdir/src/util/format_srgb.c"; then
-- AC_MSG_ERROR([Python not found - unable to generate sources])
-- fi
--else
-- if test "x$acv_mako_found" = xno; then
-- if test ! -f "$srcdir/src/mesa/main/format_unpack.c"; then
-- AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found])
-- fi
-- fi
--fi
-+dnl if test -z "$PYTHON2"; then
-+dnl if test ! -f "$srcdir/src/util/format_srgb.c"; then
-+dnl AC_MSG_ERROR([Python not found - unable to generate sources])
-+dnl fi
-+dnl else
-+dnl if test "x$acv_mako_found" = xno; then
-+dnl if test ! -f "$srcdir/src/mesa/main/format_unpack.c"; then
-+dnl AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found])
-+dnl fi
-+dnl fi
-+dnl fi
-
- AC_PROG_INSTALL
-
diff --git a/source/x/mesa/slack-desc b/source/x/mesa/slack-desc
index 113964bd..32a085fb 100644
--- a/source/x/mesa/slack-desc
+++ b/source/x/mesa/slack-desc
@@ -1,15 +1,15 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
mesa: mesa (a 3-D graphics library)
mesa:
mesa: Mesa is a 3-D graphics library with an API very similar to that of
-mesa: another well-known 3-D graphics library. :-) The Mesa libraries are
+mesa: another well-known 3-D graphics library. :-) The Mesa libraries are
mesa: used by X to provide both software and hardware accelerated graphics.
mesa:
mesa: Mesa was written by Brian Paul.
diff --git a/source/x/motif/motif.SlackBuild b/source/x/motif/motif.SlackBuild
index 67df9599..a714faa4 100755
--- a/source/x/motif/motif.SlackBuild
+++ b/source/x/motif/motif.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2014, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2014, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,10 +20,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=motif
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -f 2 -d - | cut -f 1-3 -d .)}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 2 -d - | cut -f 1-3 -d .)}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -36,6 +37,14 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
if [ "$ARCH" = "i486" ]; then
@@ -61,7 +70,6 @@ else
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -70,9 +78,12 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf $PKGNAM-${VERSION}
-tar xvf $CWD/$PKGNAM-${VERSION}.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-${VERSION}.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
+# Silly automake issue requires these files:
+touch AUTHORS NEWS
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -110,7 +121,7 @@ CFLAGS="$SLKCFLAGS" \
--enable-shared \
--program-prefix= \
--program-suffix= \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
# Build and install:
make $NUMJOBS || make || exit 1
diff --git a/source/x/motif/slack-desc b/source/x/motif/slack-desc
index 406c0b3e..9399c715 100644
--- a/source/x/motif/slack-desc
+++ b/source/x/motif/slack-desc
@@ -1,15 +1,15 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
motif: motif (Motif X libraries)
motif:
motif: Motif is the industry standard user interface toolkit for the X Window
-motif: System. Based on the original Motif source code, this version is
+motif: System. Based on the original Motif source code, this version is
motif: licensed under the GNU Lesser Public License v2.1.
motif:
motif: Motif homepage: http://motif.ics.com
diff --git a/source/x/mtdev/mtdev.SlackBuild b/source/x/mtdev/mtdev.SlackBuild
index 08a9421f..1668d103 100755
--- a/source/x/mtdev/mtdev.SlackBuild
+++ b/source/x/mtdev/mtdev.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for mtdev
@@ -22,24 +22,33 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=mtdev
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=mtdev
VERSION=${VERSION:-1.1.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -57,9 +66,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
-cd $PRGNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz
+cd $PKGNAM-$VERSION
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -75,23 +84,26 @@ CXXFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
--build=$ARCH-slackware-linux \
--disable-static
make
make install DESTDIR=$PKG
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
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
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
COPYING ChangeLog INSTALL README \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$VERSION
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/mtdev/slack-desc b/source/x/mtdev/slack-desc
index 0eaaae9e..70ffda1b 100644
--- a/source/x/mtdev/slack-desc
+++ b/source/x/mtdev/slack-desc
@@ -2,18 +2,18 @@
# 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
+# 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: mtdev is a stand-alone library which transforms all variants of kernel
+mtdev: MT events to the slotted type B protocol. The events put into mtdev
+mtdev: may be from any MT device, specifically type A without contact
+mtdev: tracking, type A with contact tracking, or type B with contact
+mtdev: tracking. The bulk of the mtdev code has been out there since 2008 as
+mtdev: part of the Multitouch X Driver. With this package, finger tracking
+mtdev: and seamless MT protocol handling is available under a free license.
+mtdev:
mtdev:
diff --git a/source/x/mypaint-brushes/mypaint-brushes.SlackBuild b/source/x/mypaint-brushes/mypaint-brushes.SlackBuild
new file mode 100755
index 00000000..21f804f1
--- /dev/null
+++ b/source/x/mypaint-brushes/mypaint-brushes.SlackBuild
@@ -0,0 +1,138 @@
+#!/bin/bash
+
+# Copyright 2018 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=mypaint-brushes
+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=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-noarch-$BUILD.txz"
+ exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+if [ "$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
+
+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 {} \;
+
+autoreconf -vif
+
+# Configure, build, and install:
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ --disable-static \
+ --build=$ARCH-slackware-linux || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+# 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
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do
+ ln -s $( readlink $i ).gz $i.gz
+ rm $i
+done
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ AUTHORS* ChangeLog CHANGES COPYING* LICENSE* 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-noarch-$BUILD.txz
+
diff --git a/source/x/mypaint-brushes/mypaint-brushes.url b/source/x/mypaint-brushes/mypaint-brushes.url
new file mode 100644
index 00000000..11c1c2ef
--- /dev/null
+++ b/source/x/mypaint-brushes/mypaint-brushes.url
@@ -0,0 +1 @@
+https://github.com/Jehan/mypaint-brushes
diff --git a/source/x/mypaint-brushes/slack-desc b/source/x/mypaint-brushes/slack-desc
new file mode 100644
index 00000000..745bd9e3
--- /dev/null
+++ b/source/x/mypaint-brushes/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------------------------------------------------------|
+mypaint-brushes: mypaint-brushes (brushes for libmypaint)
+mypaint-brushes:
+mypaint-brushes: Brushes used by MyPaint and other software using libmypaint.
+mypaint-brushes:
+mypaint-brushes: Homepage: https://github.com/Jehan/mypaint-brushes
+mypaint-brushes:
+mypaint-brushes:
+mypaint-brushes:
+mypaint-brushes:
+mypaint-brushes:
+mypaint-brushes:
diff --git a/source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild b/source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild
index a6494a58..daa85256 100755
--- a/source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild
+++ b/source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -32,16 +32,24 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
-PRGNAM=sazanami-fonts-ttf
+PKGNAM=sazanami-fonts-ttf
REALNAM=sazanami
VERSION=${VERSION:-20040629}
ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
@@ -88,8 +96,8 @@ fi
EOT
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a README doc/* $PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
# Add a package description:
@@ -98,5 +106,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/sazanami-fonts-ttf/slack-desc b/source/x/sazanami-fonts-ttf/slack-desc
index 3faf3483..c1fe652e 100644
--- a/source/x/sazanami-fonts-ttf/slack-desc
+++ b/source/x/sazanami-fonts-ttf/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
@@ -11,7 +11,7 @@ sazanami-fonts-ttf:
sazanami-fonts-ttf: The Sazanami fonts contain Hiragana, Katakana, and Kanji/Han
sazanami-fonts-ttf: Ideographs.
sazanami-fonts-ttf:
-sazanami-fonts-ttf: Homepage of efont: http://sourceforge.jp/projects/efont/
+sazanami-fonts-ttf: Homepage: http://sourceforge.jp/projects/efont/
sazanami-fonts-ttf:
sazanami-fonts-ttf:
sazanami-fonts-ttf:
diff --git a/source/x/scim-anthy/scim-anthy.SlackBuild b/source/x/scim-anthy/scim-anthy.SlackBuild
index fba4ad8a..9d87f481 100755
--- a/source/x/scim-anthy/scim-anthy.SlackBuild
+++ b/source/x/scim-anthy/scim-anthy.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -32,11 +32,12 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim-anthy
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -49,6 +50,14 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -60,7 +69,6 @@ elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -81,7 +89,7 @@ find . \
-exec chmod 644 {} \;
echo Building ...
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive -fno-delete-null-pointer-checks -std=gnu++98" \
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -91,7 +99,7 @@ CFLAGS="$SLKCFLAGS" \
--disable-static \
--program-prefix= \
--program-suffix= \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
diff --git a/source/x/scim-anthy/slack-desc b/source/x/scim-anthy/slack-desc
index bb7bad77..996d185f 100644
--- a/source/x/scim-anthy/slack-desc
+++ b/source/x/scim-anthy/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
@@ -10,10 +10,10 @@ scim-anthy: scim-anthy (a SCIM IMEngine module for anthy)
scim-anthy:
scim-anthy: SCIM is Smart Common Input Method platform, it provides a user
scim-anthy: friendly and full featured user interface and development platform to
-scim-anthy: make input method developer's lives easier. Anthy is a system for
-scim-anthy: Japanese input method. It converts Hiragana text to Kana Kanji
+scim-anthy: make input method developer's lives easier. Anthy is a system for
+scim-anthy: Japanese input method. It converts Hiragana text to Kana Kanji
scim-anthy: mixed text.
scim-anthy:
-scim-anthy: scim-anthy home: http://scim-imengine.sourceforge.jp/
+scim-anthy: Homepage: http://scim-imengine.sourceforge.jp/
scim-anthy:
scim-anthy:
diff --git a/source/x/scim-hangul/scim-hangul.SlackBuild b/source/x/scim-hangul/scim-hangul.SlackBuild
index 06da9e2c..af54c219 100755
--- a/source/x/scim-hangul/scim-hangul.SlackBuild
+++ b/source/x/scim-hangul/scim-hangul.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -32,11 +32,12 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim-hangul
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -49,6 +50,14 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -60,7 +69,6 @@ elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/x/scim-hangul/slack-desc b/source/x/scim-hangul/slack-desc
index d1e499c9..51350382 100644
--- a/source/x/scim-hangul/slack-desc
+++ b/source/x/scim-hangul/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
scim-hangul: scim-hangul (SCIM IMengine for Hangul)
scim-hangul:
scim-hangul: Scim-hangul is a SCIM IMEngine module for inputing korean scripts.
-scim-hangul: Scim-hangul is for native speakers, not for foreigners.
-scim-hangul: If you don't want to learn korean keyboard layout, use scim-tables.
-scim-hangul: This engine supports 2 beolsik, 3 beolsik final, 3 beolsik 390,
-scim-hangul: 3 beolsik, no-shift and etc. You can input chinese characters
-scim-hangul: (hanja) with F9 key when you a have preedit string.
+scim-hangul: Scim-hangul is for native speakers, not for foreigners. If you don't
+scim-hangul: want to learn Korean keyboard layout, use scim-tables. This engine
+scim-hangul: supports 2 beolsik, 3 beolsik final, 3 beolsik 390, 3 beolsik,
+scim-hangul: no-shift and etc. You can input Chinese characters (hanja) with F9 key
+scim-hangul: when you a have preedit string.
scim-hangul:
-scim-hangul: scim-hangul home: http://www.scim-im.org/projects/imengines
+scim-hangul: Homepage: http://sourceforge.net/projects/scim
scim-hangul:
diff --git a/source/x/scim-input-pad/scim-input-pad.SlackBuild b/source/x/scim-input-pad/scim-input-pad.SlackBuild
index 3f4b82d3..ee00b7ec 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
+#!/bin/bash
# Copyright 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2009, 2012, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -23,10 +23,11 @@
# SUCH DAMAGE.
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim-input-pad
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
@@ -39,6 +40,14 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
if [ "$ARCH" = "i586" ]; then
@@ -58,7 +67,6 @@ elif [ "$ARCH" = "armel" ]; then
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
rm -rf $PKG
@@ -86,11 +94,14 @@ CXXFLAGS="$SLKCFLAGS" \
--disable-static \
--program-prefix= \
--program-suffix= \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# Fix location of scim-helper-launcher:
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
diff --git a/source/x/scim-input-pad/slack-desc b/source/x/scim-input-pad/slack-desc
index d6275692..cc178761 100644
--- a/source/x/scim-input-pad/slack-desc
+++ b/source/x/scim-input-pad/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
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: This is scim-input-pad, which provides an on-screen input pad to enter
+scim-input-pad: symbols and Chinese characters.
scim-input-pad:
+scim-input-pad: Homepage: http://sourceforge.net/projects/scim
scim-input-pad:
scim-input-pad:
scim-input-pad:
scim-input-pad:
-scim-input-pad: scim home: http://scim-im.org/
scim-input-pad:
diff --git a/source/x/scim-m17n/scim-m17n.SlackBuild b/source/x/scim-m17n/scim-m17n.SlackBuild
index cc4fd9c5..1d96977e 100755
--- a/source/x/scim-m17n/scim-m17n.SlackBuild
+++ b/source/x/scim-m17n/scim-m17n.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -32,10 +32,11 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim-m17n
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
@@ -48,6 +49,14 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
if [ "$ARCH" = "i586" ]; then
@@ -67,7 +76,6 @@ elif [ "$ARCH" = "armel" ]; then
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/x/scim-m17n/slack-desc b/source/x/scim-m17n/slack-desc
index 1c730369..96b9d518 100644
--- a/source/x/scim-m17n/slack-desc
+++ b/source/x/scim-m17n/slack-desc
@@ -1,18 +1,18 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
scim-m17n: scim-m17n (bridge IMengine to support m17n input methods in SCIM)
scim-m17n:
scim-m17n: SCIM is a developing platform to significantly reduce the difficulty
-scim-m17n: of input method development. scim-m17n is a SCIM IMEngine module
+scim-m17n: of input method development. scim-m17n is a SCIM IMEngine module
scim-m17n: which uses the m17n library as the backend.
scim-m17n:
-scim-m17n: scim-m17n home: http://scim-im.org/
+scim-m17n: Homepage: http://sourceforge.net/projects/scim
scim-m17n:
scim-m17n:
scim-m17n:
diff --git a/source/x/scim-pinyin/scim-pinyin.SlackBuild b/source/x/scim-pinyin/scim-pinyin.SlackBuild
index 87fa81d2..00b46166 100755
--- a/source/x/scim-pinyin/scim-pinyin.SlackBuild
+++ b/source/x/scim-pinyin/scim-pinyin.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2007 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -32,11 +32,12 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim-pinyin
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
NUMJOBS=${NUMJOBS:-" -j7 "}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -49,6 +50,14 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -60,7 +69,6 @@ elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
diff --git a/source/x/scim-pinyin/slack-desc b/source/x/scim-pinyin/slack-desc
index 72ba7039..32dc733d 100644
--- a/source/x/scim-pinyin/slack-desc
+++ b/source/x/scim-pinyin/slack-desc
@@ -1,18 +1,18 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
scim-pinyin: scim-pinyin (smart pinyin IM engine)
scim-pinyin:
-scim-pinyin: This package provides a smart pinyin IM engine for SCIM. It includes
+scim-pinyin: This package provides a smart pinyin IM engine for SCIM. It includes
scim-pinyin: the plugin modules and the data files to use the smart pinyin input
scim-pinyin: input method for Chinese.
scim-pinyin:
-scim-pinyin: scim-pinyin home: http://www.scim-im.org/
+scim-pinyin: Homepage: http://sourceforge.net/projects/scim
scim-pinyin:
scim-pinyin:
scim-pinyin:
diff --git a/source/x/scim-tables/scim-tables.SlackBuild b/source/x/scim-tables/scim-tables.SlackBuild
index be6bef8e..fe46f3bf 100755
--- a/source/x/scim-tables/scim-tables.SlackBuild
+++ b/source/x/scim-tables/scim-tables.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2007 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2012, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -32,10 +32,11 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim-tables
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
@@ -48,6 +49,14 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
NUMJOBS=${NUMJOBS:-" -j7 "}
if [ "$ARCH" = "i586" ]; then
@@ -67,7 +76,6 @@ elif [ "$ARCH" = "armel" ]; then
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
rm -rf $PKG
diff --git a/source/x/scim-tables/slack-desc b/source/x/scim-tables/slack-desc
index 04bc7036..963b509a 100644
--- a/source/x/scim-tables/slack-desc
+++ b/source/x/scim-tables/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
@@ -10,7 +10,7 @@ scim-tables: scim-tables (tables IMEngine for scim)
scim-tables:
scim-tables: This is scim-tables IMEngine, which provides many CJK input methods.
scim-tables:
-scim-tables: scim-tables home: http://scim-im.org/
+scim-tables: Homepage: http://sourceforge.net/projects/scim
scim-tables:
scim-tables:
scim-tables:
diff --git a/source/x/scim/scim-disable-subdir-objects.patch b/source/x/scim/scim-disable-subdir-objects.patch
deleted file mode 100644
index f5327df5..00000000
--- a/source/x/scim/scim-disable-subdir-objects.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 88fbabed7dc236642021f8263f1b25bf67c6806e Mon Sep 17 00:00:00 2001
-From: Tz-Huan Huang <tzhuan@gmail.com>
-Date: Fri, 24 Oct 2014 13:12:32 +0800
-Subject: [PATCH] Disable subdir-objects
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3d89eb1..f3901ba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain])
- ###########################################################
-
- # Init automake stuff
--AM_INIT_AUTOMAKE([subdir-objects])
-+AM_INIT_AUTOMAKE([])
- AM_CONFIG_HEADER([config.h])
-
- # Init libtool
diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild
index 53c665cc..8b5227f8 100755
--- a/source/x/scim/scim.SlackBuild
+++ b/source/x/scim/scim.SlackBuild
@@ -1,26 +1,26 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2006, 2007, 2008 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
-# Permission to use, copy, modify, and distribute this software for
-# any purpose with or without fee is hereby granted, provided that
-# the above copyright notice and this permission notice appear in all
-# copies.
+# 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.
#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-# CONTRIBUTORS 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.
# -----------------------------------------------------------------------------
#
# Slackware SlackBuild script
@@ -32,6 +32,7 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=scim
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
@@ -48,6 +49,14 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -67,7 +76,6 @@ fi
NUMJOBS=${NUMJOBS:-" -j7 "}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -79,9 +87,6 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1
cd ${PKGNAM}-${VERSION} || exit 1
-# Upstream patch to fix crashes in gtk3 apps.
-zcat $CWD/scim-disable-subdir-objects.patch.gz | patch -p1 --verbose || exit 1
-
./bootstrap
chown -R root:root .
@@ -93,7 +98,7 @@ find . \
echo Building ...
CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive -fno-delete-null-pointer-checks -std=gnu++98" \
./configure --prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--localstatedir=/var \
@@ -108,11 +113,14 @@ CXXFLAGS="$SLKCFLAGS" \
make $NUMJOBS || make || exit 1
make DESTDIR=$PKG install || exit 1
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# Add a profile script that sets up the environment:
mkdir -p $PKG/etc/profile.d
cat <<EOT > $PKG/etc/profile.d/scim.sh.new
-#!/bin/sh
+#!/bin/bash
# SCIM (Smart Common Input Method platform). This is used to support the
# entering of text in non-US-English languages.
diff --git a/source/x/scim/slack-desc b/source/x/scim/slack-desc
index 066d9f41..931c9a30 100644
--- a/source/x/scim/slack-desc
+++ b/source/x/scim/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
scim: scim (Smart Common Input Method platform)
scim:
-scim: SCIM is an input platform for CJK and other languages.
-scim: It aims to significantly reduce the difficulty of input method
-scim: development.
+scim: SCIM is an input platform for CJK and other languages. It aims to
+scim: significantly reduce the difficulty of input method development.
scim:
scim: See the scim scripts in /etc/profile.d/ for setup info.
scim:
-scim: scim home: http://www.scim-im.org/
+scim: Homepage: http://sourceforge.net/projects/scim
+scim:
scim:
scim:
diff --git a/source/x/sinhala_lklug-font-ttf/sinhala_lklug-font-ttf.SlackBuild b/source/x/sinhala_lklug-font-ttf/sinhala_lklug-font-ttf.SlackBuild
index 0ef5f136..0fc464aa 100755
--- a/source/x/sinhala_lklug-font-ttf/sinhala_lklug-font-ttf.SlackBuild
+++ b/source/x/sinhala_lklug-font-ttf/sinhala_lklug-font-ttf.SlackBuild
@@ -1,26 +1,25 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
-# Permission to use, copy, modify, and distribute this software for
-# any purpose with or without fee is hereby granted, provided that
-# the above copyright notice and this permission notice appear in all
-# copies.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-# CONTRIBUTORS 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.
+# 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.
# -----------------------------------------------------------------------------
#
# Slackware SlackBuild script
@@ -32,16 +31,24 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
-PRGNAM=sinhala_lklug-font-ttf
+PKGNAM=sinhala_lklug-font-ttf
FONTNAM=sinhala_lklug
VERSION=${VERSION:-20060929}
ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
@@ -97,5 +104,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/sinhala_lklug-font-ttf/slack-desc b/source/x/sinhala_lklug-font-ttf/slack-desc
index 0c26563c..4578e725 100644
--- a/source/x/sinhala_lklug-font-ttf/slack-desc
+++ b/source/x/sinhala_lklug-font-ttf/slack-desc
@@ -1,17 +1,17 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
sinhala_lklug-font-ttf: sinhala_lklug-font-ttf (Sinhala Unicode TrueType font)
sinhala_lklug-font-ttf:
-sinhala_lklug-font-ttf: This is a free Sri Lankan 'Sinhala' Unicode font. Its development was
+sinhala_lklug-font-ttf: This is a free Sri Lankan 'Sinhala' Unicode font. Its development was
sinhala_lklug-font-ttf: initiated by the LK LUG in 2003.
sinhala_lklug-font-ttf:
-sinhala_lklug-font-ttf: Development home: http://sinhala.sourceforge.net/
+sinhala_lklug-font-ttf: Homepage: http://sinhala.sourceforge.net/
sinhala_lklug-font-ttf:
sinhala_lklug-font-ttf:
sinhala_lklug-font-ttf:
diff --git a/source/x/tibmachuni-font-ttf/slack-desc b/source/x/tibmachuni-font-ttf/slack-desc
index e32a4216..3f66a2f5 100644
--- a/source/x/tibmachuni-font-ttf/slack-desc
+++ b/source/x/tibmachuni-font-ttf/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
@@ -14,6 +14,6 @@ tibmachuni-font-ttf: Ladakhi in dbu can script with full support for the Sanskri
tibmachuni-font-ttf: combinations found in chos-skad texts.
tibmachuni-font-ttf:
tibmachuni-font-ttf:
-tibmachuni-font-ttf: tibmachuni-font-ttf home: http://thdl.org/
+tibmachuni-font-ttf: Homepage: http://thdl.org/
tibmachuni-font-ttf:
tibmachuni-font-ttf:
diff --git a/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild b/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
index 8b31393f..fa5e16ca 100755
--- a/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
+++ b/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild
@@ -1,26 +1,25 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN USA
+# Copyright 2008, 2009, 2018 Patrick J. Volkerding, Sebeka, MN USA
# All rights reserved.
#
-# Permission to use, copy, modify, and distribute this software for
-# any purpose with or without fee is hereby granted, provided that
-# the above copyright notice and this permission notice appear in all
-# copies.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
#
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
-# CONTRIBUTORS 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.
+# 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.
# -----------------------------------------------------------------------------
#
# Slackware SlackBuild script
@@ -32,15 +31,23 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
-PRGNAM=tibmachuni-font-ttf
+PKGNAM=tibmachuni-font-ttf
VERSION=${VERSION:-1.901b}
ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
@@ -58,9 +65,9 @@ fi
mkdir -p $PKG$FONTDIR
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-mkdir ${PRGNAM}-${VERSION}
-cd ${PRGNAM}-${VERSION}
+rm -rf ${PKGNAM}-${VERSION}
+mkdir ${PKGNAM}-${VERSION}
+cd ${PKGNAM}-${VERSION}
unzip $CWD/TibetanMachineUnicodeFont.zip || exit 1
chown -R root:root .
find . \
@@ -102,10 +109,10 @@ fi
EOT
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
gpl.txt ReadMe.txt \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
# Add a package description:
@@ -114,5 +121,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/ttf-indic-fonts/slack-desc b/source/x/ttf-indic-fonts/slack-desc
index 194bcbb4..9e07f3d2 100644
--- a/source/x/ttf-indic-fonts/slack-desc
+++ b/source/x/ttf-indic-fonts/slack-desc
@@ -1,15 +1,15 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
ttf-indic-fonts: ttf-indic-fonts (Fonts for Indic scripts)
ttf-indic-fonts:
ttf-indic-fonts: This is a collection of free fonts that support some of the more
-ttf-indic-fonts: widely used Indic scripts. Included are TTF fonts for Bengali,
+ttf-indic-fonts: widely used Indic scripts. Included are TTF fonts for Bengali,
ttf-indic-fonts: Devanagari, Gujarati, Kannada, Malayalam, Oriya, Punjabi, Tamil,
ttf-indic-fonts: and Telugu.
ttf-indic-fonts:
diff --git a/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild b/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild
index 338b5edd..249446df 100755
--- a/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild
+++ b/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009, 2013 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
@@ -20,11 +20,21 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=ttf-indic-fonts
VERSION=0.5.14
ARCH=noarch
-BUILD=1
+BUILD=${BUILD:-2}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-ttf-indic-fonts
diff --git a/source/x/ttf-tlwg/doinst.sh b/source/x/ttf-tlwg/doinst.sh
new file mode 100644
index 00000000..bdb05018
--- /dev/null
+++ b/source/x/ttf-tlwg/doinst.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then
+ ( cd /usr/share/fonts/TTF
+ mkfontscale .
+ mkfontdir .
+ )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache -f
+fi
diff --git a/source/x/ttf-tlwg/slack-desc b/source/x/ttf-tlwg/slack-desc
new file mode 100644
index 00000000..0536420d
--- /dev/null
+++ b/source/x/ttf-tlwg/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------------------------------------------------------|
+ttf-tlwg: ttf-tlwg (Thai TTF Fonts)
+ttf-tlwg:
+ttf-tlwg: Fonts-TLWG (formerly ThaiFonts-Scalable) is a collection of Thai
+ttf-tlwg: scalable fonts available in free licenses. Its goal is to provide
+ttf-tlwg: fonts that conform to existing standards and recommendations, so that
+ttf-tlwg: it can be a reference implementation.
+ttf-tlwg:
+ttf-tlwg: Homepage: https://linux.thai.net/projects/fonts-tlwg
+ttf-tlwg:
+ttf-tlwg:
+ttf-tlwg:
diff --git a/source/x/ttf-tlwg/ttf-tlwg.SlackBuild b/source/x/ttf-tlwg/ttf-tlwg.SlackBuild
new file mode 100755
index 00000000..e9c06422
--- /dev/null
+++ b/source/x/ttf-tlwg/ttf-tlwg.SlackBuild
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# Copyright 2018 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=ttf-tlwg
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+ARCH=noarch
+BUILD=${BUILD:-2}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+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.?* || 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 {} \;
+
+mkdir -p $PKG/usr/share/fonts/TTF/
+cp -a *.ttf fonts.* $PKG/usr/share/fonts/TTF/
+mkdir -p $PKG/etc/fonts/conf.{d,avail}
+cp -a etc/fonts/conf.avail/* $PKG/etc/fonts/conf.avail
+( cd $PKG/etc/fonts/conf.d && \
+ ln -sf ../conf.avail/* .
+)
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING* INSTALL LICENSE 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
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-${VERSION}-$ARCH-$BUILD.txz
+
diff --git a/source/x/ttf-tlwg/ttf-tlwg.url b/source/x/ttf-tlwg/ttf-tlwg.url
new file mode 100644
index 00000000..9b1deefc
--- /dev/null
+++ b/source/x/ttf-tlwg/ttf-tlwg.url
@@ -0,0 +1,3 @@
+http://linux.thai.net/pub/thailinux/software/thai-ttf/thai-ttf-0.4.15.tar.gz
+ftp://linux.thai.net/pub/thailinux/software/fonts-tlwg/fonts/
+
diff --git a/source/x/urw-core35-fonts-otf/doinst.sh b/source/x/urw-core35-fonts-otf/doinst.sh
new file mode 100644
index 00000000..0c434b5a
--- /dev/null
+++ b/source/x/urw-core35-fonts-otf/doinst.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Update the X font indexes:
+if [ -x /usr/bin/mkfontdir -o -x /usr/X11R6/bin/mkfontdir ]; then
+ ( cd /usr/share/fonts/OTF
+ mkfontscale .
+ mkfontdir .
+ )
+fi
+if [ -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache -f
+fi
diff --git a/source/x/urw-core35-fonts-otf/get-urw-core35-fonts.sh b/source/x/urw-core35-fonts-otf/get-urw-core35-fonts.sh
new file mode 100755
index 00000000..b2b570a7
--- /dev/null
+++ b/source/x/urw-core35-fonts-otf/get-urw-core35-fonts.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# Copyright 2016, 2017 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.
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf urw-core35-fonts
+
+# Clone repository:
+git clone git://git.ghostscript.com/urw-core35-fonts.git
+
+# checkout $BRANCH:
+( cd urw-core35-fonts
+ git checkout $BRANCH || exit 1
+)
+
+# For now, we will only be packaging the OTF fonts:
+( cd urw-core35-fonts
+ rm -f *.{afm,t1,ttf}
+)
+
+HEADISAT="$( cd urw-core35-fonts && git log -1 --format=%h )"
+DATE="$( cd urw-core35-fonts && git log -1 --format=%ad --date=format:%Y%m%d )"
+# Cleanup. We're not packing up the whole git repo.
+( cd urw-core35-fonts && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv urw-core35-fonts urw-core35-fonts-otf-${DATE}_${HEADISAT}_git
+tar cf urw-core35-fonts-otf-${DATE}_${HEADISAT}_git.tar urw-core35-fonts-otf-${DATE}_${HEADISAT}_git
+xz -9 -f urw-core35-fonts-otf-${DATE}_${HEADISAT}_git.tar
+rm -rf urw-core35-fonts-otf-${DATE}_${HEADISAT}_git
+echo
+echo "OTF fonts from urw-core35-fonts branch $BRANCH with HEAD at $HEADISAT packaged as urw-core35-fonts-otf-${DATE}_${HEADISAT}_git.tar.xz"
+echo
diff --git a/source/x/urw-core35-fonts-otf/slack-desc b/source/x/urw-core35-fonts-otf/slack-desc
new file mode 100644
index 00000000..759333a7
--- /dev/null
+++ b/source/x/urw-core35-fonts-otf/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------------------------------------------------------|
+urw-core35-fonts-otf: urw-core35-fonts-otf (URW++ core35 fonts in OpenType Format)
+urw-core35-fonts-otf:
+urw-core35-fonts-otf: These are the 35 standard URW++ PostScript fonts used by Ghostscript
+urw-core35-fonts-otf: but provided in OpenType Format (OTF) for programs such as LibreOffice
+urw-core35-fonts-otf: which no longer support the Postscript Type 1 font format.
+urw-core35-fonts-otf:
+urw-core35-fonts-otf:
+urw-core35-fonts-otf:
+urw-core35-fonts-otf:
+urw-core35-fonts-otf:
+urw-core35-fonts-otf:
diff --git a/source/x/urw-core35-fonts-otf/urw-core35-fonts-otf.SlackBuild b/source/x/urw-core35-fonts-otf/urw-core35-fonts-otf.SlackBuild
new file mode 100755
index 00000000..fb19026f
--- /dev/null
+++ b/source/x/urw-core35-fonts-otf/urw-core35-fonts-otf.SlackBuild
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# Copyright 2017, 2018 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=urw-core35-fonts-otf
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+ARCH=noarch
+BUILD=${BUILD:-1}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-urw-core35-fonts-otf
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf urw-core35-fonts-otf-$VERSION
+tar xvf $CWD/urw-core35-fonts-otf-$VERSION.tar.?z* || exit 1
+cd urw-core35-fonts-otf-$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 {} \;
+
+mkdir -p $PKG/usr/share/fonts/OTF/
+cp -a *.otf $PKG/usr/share/fonts/OTF/
+
+mkdir -p $PKG/usr/doc/urw-core35-fonts-otf-$VERSION
+for file in * ; do
+ if [ "$(basename $file .otf)" = "$file" ]; then
+ cp -a $file $PKG/usr/doc/urw-core35-fonts-otf-$VERSION
+ fi
+done
+
+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/urw-core35-fonts-otf-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh
new file mode 100755
index 00000000..590849a5
--- /dev/null
+++ b/source/x/vulkan-sdk/fetch-sources.sh
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+# Copyright 2017 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.
+
+# Call this script with the version of the Vulkan-LoaderAndValidationLayers-sdk
+# that you would like to fetch the sources for. This will fetch the SDK from
+# github, and then look at the revisions listed in the external_revisions
+# directory to fetch the proper glslang, SPIRV-Headers, and SPIRV-Tools.
+#
+# Example: VERSION=1.1.70.0 ./fetch-sources.sh
+
+VERSION=${VERSION:-1.1.70.0}
+
+# Remove existing sources:
+rm -rf Vulkan-LoaderAndValidationLayers-sdk* glslang-* SPIRV-Headers-* SPIRV-Tools-*
+
+# Fetch SDK:
+lftpget https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${VERSION}/Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar.gz
+
+GLSLANG_REVISION=$(tar xOf Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar.gz Vulkan-LoaderAndValidationLayers-sdk-${VERSION}/external_revisions/glslang_revision)
+
+git clone https://github.com/KhronosGroup/glslang.git glslang-$GLSLANG_REVISION
+cd glslang-$GLSLANG_REVISION
+git checkout $GLSLANG_REVISION
+SPIRV_TOOLS_REVISION=$(
+python3 - << EOF
+import json
+with open('known_good.json') as f:
+ known_good = json.load(f)
+commits = known_good['commits']
+print(commits[0]['commit'])
+EOF
+)
+SPIRV_HEADERS_REVISION=$(
+python3 - << EOF
+import json
+with open('known_good.json') as f:
+ known_good = json.load(f)
+commits = known_good['commits']
+print(commits[1]['commit'])
+EOF
+)
+# Cleanup. We're not packing up the whole git repo.
+find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null
+cd ..
+tar cf glslang-${GLSLANG_REVISION}.tar glslang-${GLSLANG_REVISION}
+rm -rf glslang-${GLSLANG_REVISION}
+plzip -9 glslang-${GLSLANG_REVISION}.tar
+
+git clone https://github.com/KhronosGroup/SPIRV-Headers.git SPIRV-Headers-${SPIRV_HEADERS_REVISION}
+cd SPIRV-Headers-${SPIRV_HEADERS_REVISION}
+git checkout ${SPIRV_HEADERS_REVISION}
+# Cleanup. We're not packing up the whole git repo.
+find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null
+cd ..
+tar cf SPIRV-Headers-${SPIRV_HEADERS_REVISION}.tar SPIRV-Headers-${SPIRV_HEADERS_REVISION}
+rm -rf SPIRV-Headers-${SPIRV_HEADERS_REVISION}
+plzip -9 SPIRV-Headers-${SPIRV_HEADERS_REVISION}.tar
+
+git clone https://github.com/KhronosGroup/SPIRV-Tools.git SPIRV-Tools-${SPIRV_TOOLS_REVISION}
+cd SPIRV-Tools-${SPIRV_TOOLS_REVISION}
+git checkout ${SPIRV_TOOLS_REVISION}
+# Only purge the .pack, since spirv_tools_commit_id.h needs to query the repo:
+rm -f .git/objects/pack/pack-*.pack
+cd ..
+tar cf SPIRV-Tools-${SPIRV_TOOLS_REVISION}.tar SPIRV-Tools-${SPIRV_TOOLS_REVISION}
+rm -rf SPIRV-Tools-${SPIRV_TOOLS_REVISION}
+plzip -9 SPIRV-Tools-${SPIRV_TOOLS_REVISION}.tar
+
+# Repack Vulkan-LoaderAndValidationLayers-sdk:
+gzip -d Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar.gz
+plzip -9 Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar
+
+# List URLs in vulkan-sdk.url:
+echo "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${VERSION}/Vulkan-LoaderAndValidationLayers-sdk-${VERSION}.tar.gz" > vulkan-sdk.url
+echo "https://github.com/KhronosGroup/glslang/archive/${GLSLANG_REVISION}/glslang-${GLSLANG_REVISION}.tar.gz" >> vulkan-sdk.url
+echo "https://github.com/KhronosGroup/SPIRV-Headers/archive/${SPIRV_HEADERS_REVISION}/SPIRV-Headers-${SPIRV_HEADERS_REVISION}.tar.gz" >> vulkan-sdk.url
+echo "https://github.com/KhronosGroup/SPIRV-Tools/archive/${SPIRV_TOOLS_REVISION}/SPIRV-Tools-${SPIRV_TOOLS_REVISION}.tar.gz" >> vulkan-sdk.url
+
+# Fix timestamps to be correct:
+for file in *.tar.?z ; do
+ TIMESTAMP="$(tar tvf $file | head -1 | cut -b 32-47)"
+ touch -d "$TIMESTAMP" $file
+done
diff --git a/source/x/vulkan-sdk/slack-desc b/source/x/vulkan-sdk/slack-desc
new file mode 100644
index 00000000..1d3eec17
--- /dev/null
+++ b/source/x/vulkan-sdk/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------------------------------------------------------|
+vulkan-sdk: vulkan-sdk (Vulkan ICD Loader and Validation Layers)
+vulkan-sdk:
+vulkan-sdk: Vulkan supports multiple GPUs and multiple global contexts
+vulkan-sdk: (VkInstance). The ICD loader is necessary to support multiple GPUs
+vulkan-sdk: and the VkInstance level Vulkan commands. Additionally, the loader
+vulkan-sdk: manages inserting Vulkan layer libraries, including validation layers
+vulkan-sdk: between the application and the ICD.
+vulkan-sdk:
+vulkan-sdk: Homepage: https://www.khronos.org/vulkan/
+vulkan-sdk:
+vulkan-sdk:
diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
new file mode 100755
index 00000000..2d28da17
--- /dev/null
+++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -0,0 +1,181 @@
+#!/bin/bash
+
+# Slackware build script for vulkan-sdk
+
+# Copyright 2016, 2017 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2016, 2017, 2018 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.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=vulkan-sdk
+VERSION=${VERSION:-$(echo Vulkan-LoaderAndValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+# Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
+if [ -z "$ARCH" ]; then
+ case "$MARCH" in
+ i?86) export ARCH=i586 ;;
+ 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 the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+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
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-vulkan-sdk
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf Vulkan-LoaderAndValidationLayers-sdk-$VERSION
+tar xvf $CWD/Vulkan-LoaderAndValidationLayers-sdk-$VERSION.tar.?z || exit 1
+cd Vulkan-LoaderAndValidationLayers-sdk-$VERSION || exit 1
+
+GLSLANG_VERSION=$(cat external_revisions/glslang_revision | head -n 1)
+SPIRV_HEADERS_VERSION=$(basename SPIRV-Headers-* .tar.?z | rev | cut -d - -f 1 | rev)
+SPIRV_TOOLS_VERSION=$(basename SPIRV-Tools-* .tar.?z | rev | cut -d - -f 1 | rev)
+
+mkdir external
+
+cd external
+ tar xf $CWD/glslang-${GLSLANG_VERSION}.tar.?z || exit 1
+ mv glslang-${GLSLANG_VERSION} glslang
+
+cd glslang/External
+tar xf $CWD/SPIRV-Tools-${SPIRV_TOOLS_VERSION}.tar.?z* || exit 1
+mv SPIRV-Tools-${SPIRV_TOOLS_VERSION} spirv-tools
+
+mkdir -p spirv-tools/external
+cd spirv-tools/external
+ tar xvf $CWD/SPIRV-Headers-${SPIRV_HEADERS_VERSION}.tar.?z* || exit 1
+ mv SPIRV-Headers-${SPIRV_HEADERS_VERSION} spirv-headers
+
+cd $TMP/Vulkan-LoaderAndValidationLayers-sdk-$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 {} \;
+
+mkdir -p external/{glslang,spirv-tools}/build
+mkdir -p build
+mkdir -p build-demos
+
+# Fix LIBDIRSUFFIX
+for i in $(find external -name CMakeLists.txt); do
+ sed -i "s|DESTINATION lib|DESTINATION \${CMAKE_INSTALL_LIBDIR}|" "$i"
+done
+
+cd external/glslang/build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
+ -DCMAKE_BUILD_TYPE=Release \
+ ..
+
+ make $NUMJOBS VERBOSE=1 || make || exit 1
+ make install DESTDIR=$PKG || exit 1
+
+cd -
+
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ -DCMAKE_INSTALL_DATADIR=/share \
+ -DCMAKE_SKIP_RPATH=True \
+ -DBUILD_TESTS=Off \
+ -DBUILD_DEMOS=On \
+ -DBUILD_WSI_XLIB_SUPPORT=On \
+ -DBUILD_WSI_XCB_SUPPORT=On \
+ -DBUILD_WSI_WAYLAND_SUPPORT=Off \
+ -DBUILD_WSI_MIR_SUPPORT=Off \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DGLSLANG_VALIDATOR=../external/glslang/build/StandAlone/glslangValidator \
+ ..
+
+ make $NUMJOBS VERBOSE=1 || make || exit 1
+ make install DESTDIR=$PKG || exit 1
+cd -
+
+mkdir -p $PKG/usr/share/vulkan/{explicit,implicit}_layer.d
+
+mv $PKG/etc/vulkan/explicit_layer.d/*.json $PKG/usr/share/vulkan/explicit_layer.d/
+mv $PKG/usr/bin/smoketest $PKG/usr/bin/vulkan-smoketest
+
+# Use headers from spirv-headers as they are newer than the ones installed by glslang
+for i in spirv.h spirv.hpp spirv.hpp11; do
+ install -m 0644 external/glslang/External/spirv-tools/external/spirv-headers/include/spirv/1.2/$i \
+ $PKG/usr/include/SPIRV/
+done
+
+## I don't know why this is here, so I'm commenting it out. ;-)
+#( cd $PKG/usr/include
+# ln -sf SPIRV spirv
+#)
+
+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/$PKGNAM-$VERSION
+cp -a *.md LICENSE.txt loader/LoaderAndLayerInterface.md \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+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/vulkan-sdk/vulkan-sdk.url b/source/x/vulkan-sdk/vulkan-sdk.url
new file mode 100644
index 00000000..ed3b9659
--- /dev/null
+++ b/source/x/vulkan-sdk/vulkan-sdk.url
@@ -0,0 +1,4 @@
+https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.70.0/Vulkan-LoaderAndValidationLayers-sdk-1.1.70.0.tar.gz
+https://github.com/KhronosGroup/glslang/archive/2651ccaec8/glslang-2651ccaec8.tar.gz
+https://github.com/KhronosGroup/SPIRV-Headers/archive/ce309203d7eceaf908bea8862c27f3e0749f7d00/SPIRV-Headers-ce309203d7eceaf908bea8862c27f3e0749f7d00.tar.gz
+https://github.com/KhronosGroup/SPIRV-Tools/archive/9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8/SPIRV-Tools-9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8.tar.gz
diff --git a/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff b/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
index 6d8fa176..99d6574f 100644
--- a/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
+++ b/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
@@ -1,12 +1,5 @@
-Since this fontconfig change [1], we get warnings in 44-wqy-zenhei.conf
-like this: "Having multiple values in <test> isn't supported and may
-not work as expected" - let's fix that...
-
-[1] http://cgit.freedesktop.org/fontconfig/commit/?id=2837c63876b9b
-
-diff -Nur wqy-zenhei.orig/44-wqy-zenhei.conf wqy-zenhei/44-wqy-zenhei.conf
---- wqy-zenhei.orig/44-wqy-zenhei.conf 2009-05-17 15:25:41.000000000 -0500
-+++ wqy-zenhei/44-wqy-zenhei.conf 2013-02-25 19:00:36.870491434 -0600
+--- ./44-wqy-zenhei.conf.orig 2009-01-09 17:36:40.000000000 -0600
++++ ./44-wqy-zenhei.conf 2017-04-30 16:32:33.135746412 -0500
@@ -6,7 +6,11 @@
<match target="font">
<test qual="any" name="family">
@@ -19,3 +12,34 @@ diff -Nur wqy-zenhei.orig/44-wqy-zenhei.conf wqy-zenhei/44-wqy-zenhei.conf
<string>文泉驛正黑</string>
</test>
<edit name="globaladvance"><bool>false</bool></edit>
+@@ -22,24 +26,27 @@
+ <alias>
+ <family>serif</family>
+ <prefer>
+- <family>Bitstream Vera Serif</family>
++ <family>Liberation Serif</family>
+ <family>DejaVu Serif</family>
++ <family>Bitstream Vera Serif</family>
+ <family>WenQuanYi Zen Hei</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+- <family>Bitstream Vera Sans</family>
++ <family>Liberation Sans</family>
+ <family>DejaVu Sans</family>
++ <family>Bitstream Vera Sans</family>
+ <family>WenQuanYi Zen Hei</family>
+ </prefer>
+ </alias>
+ <alias>
+ <family>monospace</family>
+ <prefer>
+- <family>Bitstream Vera Sans Mono</family>
++ <family>Liberation Sans Mono</family>
+ <family>DejaVu Sans Mono</family>
++ <family>Bitstream Vera Sans Mono</family>
+ <family>WenQuanYi Zen Hei Mono</family>
+ </prefer>
+ </alias>
diff --git a/source/x/wqy-zenhei-font-ttf/slack-desc b/source/x/wqy-zenhei-font-ttf/slack-desc
index cf1f0492..404b141e 100644
--- a/source/x/wqy-zenhei-font-ttf/slack-desc
+++ b/source/x/wqy-zenhei-font-ttf/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
wqy-zenhei-font-ttf: wqy-zenhei-font-ttf (Wen Quan Yi Zen Hei CJK Font)
wqy-zenhei-font-ttf:
wqy-zenhei-font-ttf: The WenQuanYi Zen Hei font is a Chinese (or CJK) outline font with
-wqy-zenhei-font-ttf: Hei Ti style (a sans-serif style) Hanzi glyphs. This font is
+wqy-zenhei-font-ttf: Hei Ti style (a sans-serif style) Hanzi glyphs. This font is
wqy-zenhei-font-ttf: developed for general purpose use of Chinese for formating, printing
-wqy-zenhei-font-ttf: and on-screen display. This font is also targeted at platform
+wqy-zenhei-font-ttf: and on-screen display. This font is also targeted at platform
wqy-zenhei-font-ttf: independence and the utility for document exchange between various
wqy-zenhei-font-ttf: operating systems.
wqy-zenhei-font-ttf:
-wqy-zenhei-font-ttf: wqy-zenhei-font-ttf home: http://wqy.sourceforge.net/en/
+wqy-zenhei-font-ttf: Homepage: http://wqy.sourceforge.net/en/
wqy-zenhei-font-ttf:
diff --git a/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild b/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild
index ee34726b..a61d6f0d 100755
--- a/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild
+++ b/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2008, 2009 Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -32,17 +32,25 @@
#
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
-PRGNAM=wqy-zenhei-font-ttf
+PKGNAM=wqy-zenhei-font-ttf
SRCNAM=wqy-zenhei
VERSION=${VERSION:-0.8.38}
SUB=${SUB:-1}
ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-5}
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-${VERSION}_${SUB}-$ARCH-$BUILD.txz"
+ exit 0
+fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
SOURCE="$CWD/${SRCNAM}-${VERSION}-${SUB}.tar.bz2"
@@ -62,12 +70,13 @@ fi
mkdir -p $PKG$FONTDIR
cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
+rm -rf ${PKGNAM}-${VERSION}
tar -xvf ${SOURCE} || exit 1
-mv ${SRCNAM} ${PRGNAM}-${VERSION} || exit 1
-cd ${PRGNAM}-${VERSION}
+mv ${SRCNAM} ${PKGNAM}-${VERSION} || exit 1
+cd ${PKGNAM}-${VERSION}
zcat $CWD/fixup-fontconfig-file.diff.gz | patch -p1 || exit 1
+zcat $CWD/wqy-zenhei.fix.fontconfig.warning.diff.gz | patch -p1 || exit 1
chown -R root:root .
find . \
@@ -80,17 +89,22 @@ find . \
# fonts, but it is harmless. It's probably safer to leave the cp command the
# way it is in case future versions include any ttf fonts.
# Install font:
-cp *.ttf *.ttc $PKG$FONTDIR/
+cp -a *.ttf *.ttc $PKG$FONTDIR/
+chmod 644 $PKG$FONTDIR/*
+chown root:root $PKG$FONTDIR/*
-# Add the fontconfig file and symlink.
+# Add the fontconfig file and symlink. Renaming this file to 64- to
+# avoid taking priority over the font list in 60-latin.conf.
mkdir -p $PKG/etc/fonts/conf.{d,avail}
-cp 44-wqy-zenhei.conf $PKG/etc/fonts/conf.avail/
+cp -a 44-wqy-zenhei.conf $PKG/etc/fonts/conf.avail/64-wqy-zenhei.conf
( cd $PKG/etc/fonts/conf.d && \
- ln -sf ../conf.avail/44-wqy-zenhei.conf
+ ln -sf ../conf.avail/64-wqy-zenhei.conf
)
# Two more fontconfig files which we do not activate by default:
-cp 66-wqy-zenhei-sharp.conf 66-wqy-zenhei-sharp-no13px.conf \
+cp -a 66-wqy-zenhei-sharp.conf 66-wqy-zenhei-sharp-no13px.conf \
$PKG/etc/fonts/conf.avail/
+chmod 644 $PKG/etc/fonts/conf.avail/*
+chown root:root $PKG/etc/fonts/conf.avail/*
# Add a shell script that can set the Zen Hei default display styles:
mkdir -p $PKG/usr/sbin
@@ -113,10 +127,10 @@ fi
EOT
# Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
AUTHORS COPYING ChangeLog INSTALL README \
- $PKG/usr/doc/$PRGNAM-$VERSION
+ $PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
# Add a package description:
@@ -125,5 +139,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}_${SUB}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}_${SUB}-${ARCH}-${BUILD}.txz
diff --git a/source/x/wqy-zenhei-font-ttf/wqy-zenhei.fix.fontconfig.warning.diff b/source/x/wqy-zenhei-font-ttf/wqy-zenhei.fix.fontconfig.warning.diff
new file mode 100644
index 00000000..25305e05
--- /dev/null
+++ b/source/x/wqy-zenhei-font-ttf/wqy-zenhei.fix.fontconfig.warning.diff
@@ -0,0 +1,31 @@
+--- ./66-wqy-zenhei-sharp-no13px.conf.orig 2009-02-16 12:45:58.000000000 -0600
++++ ./66-wqy-zenhei-sharp-no13px.conf 2018-03-07 17:22:30.603206663 -0600
+@@ -6,8 +6,6 @@
+ <match target="font">
+ <test qual="any" name="family">
+ <string>WenQuanYi Zen Hei</string>
+- <string>文泉驿正黑</string>
+- <string>文泉驛正黑</string>
+ </test>
+ <test compare="more_eq" name="pixelsize"><double>13.5</double></test>
+ <test compare="less" name="pixelsize"><double>14.5</double></test>
+--- ./66-wqy-zenhei-sharp.conf.orig 2009-02-12 23:27:50.000000000 -0600
++++ ./66-wqy-zenhei-sharp.conf 2018-03-07 17:22:43.643207743 -0600
+@@ -5,8 +5,6 @@
+ <match target="font">
+ <test qual="any" name="family">
+ <string>WenQuanYi Zen Hei</string>
+- <string>文泉驿正黑</string>
+- <string>文泉驛正黑</string>
+ </test>
+ <test compare="more_eq" name="pixelsize"><double>12</double></test>
+ <test compare="less_eq" name="pixelsize"><double>16</double></test>
+@@ -19,8 +17,6 @@
+ <match target="font">
+ <test qual="any" name="family">
+ <string>WenQuanYi Zen Hei</string>
+- <string>文泉驿正黑</string>
+- <string>文泉驛正黑</string>
+ </test>
+ <test compare="more_eq" name="pixelsize"><double>13.5</double></test>
+ <test compare="less" name="pixelsize"><double>14.5</double></test>
diff --git a/source/x/x11-skel/scripts/xwmconfig b/source/x/x11-skel/scripts/xwmconfig
index 724242ab..a81232f2 100644
--- a/source/x/x11-skel/scripts/xwmconfig
+++ b/source/x/x11-skel/scripts/xwmconfig
@@ -10,7 +10,7 @@
#
# 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
+# 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;
@@ -67,9 +67,9 @@ cat << EOF > $TMP/tmpscript.sh
#!/bin/sh
dialog $BACKTITLE --title "SELECT DEFAULT WINDOW MANAGER FOR X" $PRESELECT --menu \\
"Please select the default window manager to use with the X Window \\
-System. This will define the style of graphical user interface \\
-the computer uses. KDE and GNOME provide the most features. People \\
-with Windows or MacOS experience will find either one easy to use. \\
+System. This will define the style of graphical user interface \\
+the computer uses. KDE and GNOME provide the most features. People \\
+with Windows or MacOS experience will find either one easy to use. \\
Other window managers are easier on system \\
resources, or provide other unique features." 12 74 0 \\
EOF
@@ -78,9 +78,9 @@ cat << EOF > $TMP/tmpscript.sh
#!/bin/sh
dialog $BACKTITLE --title "SELECT DEFAULT WINDOW MANAGER FOR X" $PRESELECT --menu \\
"Please select the default window manager to use with the X Window \\
-System. This will define the style of graphical user interface \\
-the computer uses. KDE provides the most features, and people \\
-with Windows or MacOS experience will find it easy to use. \\
+System. This will define the style of graphical user interface \\
+the computer uses. KDE provides the most features, and people \\
+with Windows or MacOS experience will find it easy to use. \\
Other window managers are easier on system \\
resources, or provide other unique features." 12 74 0 \\
EOF
@@ -89,9 +89,9 @@ cat << EOF > $TMP/tmpscript.sh
#!/bin/sh
dialog $BACKTITLE --title "SELECT DEFAULT WINDOW MANAGER FOR X" $PRESELECT --menu \\
"Please select the default window manager to use with the X Window \\
-System. This will define the style of graphical user interface \\
-the computer uses. XFce provides the most features, and people \\
-with Windows or MacOS experience will find it easy to use. \\
+System. This will define the style of graphical user interface \\
+the computer uses. XFce provides the most features, and people \\
+with Windows or MacOS experience will find it easy to use. \\
Other window managers are easier on system \\
resources, or provide other unique features." 12 74 0 \\
EOF
@@ -99,7 +99,7 @@ else
cat << EOF > $TMP/tmpscript.sh
dialog $BACKTITLE --title "SELECT DEFAULT WINDOW MANAGER FOR X" $PRESELECT --menu \\
"Please select the default window manager to use with the X Window \\
-System. This will define the style of graphical user interface \\
+System. This will define the style of graphical user interface \\
the computer uses." 12 74 0 \\
EOF
fi
@@ -211,7 +211,7 @@ if [ "$USER" = "root" ]; then
fi
fi
-# Also set up a new $HOME/.xinitrc and $HOME/.xinitrc:
+# Also set up a new $HOME/.xinitrc and $HOME/.xsession:
if [ -r /etc/X11/xinit/$OUTPUT -a ! "$HOME" = "/" ]; then
if [ -r $HOME/.xinitrc ]; then
rm -f $HOME/.xinitrc-backup
diff --git a/source/x/x11-skel/slack-desc b/source/x/x11-skel/slack-desc
index c4d1de4d..303dd986 100644
--- a/source/x/x11-skel/slack-desc
+++ b/source/x/x11-skel/slack-desc
@@ -1,15 +1,15 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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-skel: x11-skel (Miscellaneous things required for X)
x11-skel:
x11-skel: These are some symlinks needed by X11 after moving some files and
-x11-skel: directories to conform with the Linux FHS. For example, the fonts
+x11-skel: directories to conform with the Linux FHS. For example, the fonts
x11-skel: are now in the /usr/share/fonts directory, and this package makes
x11-skel: a symlink to there from /usr/lib/X11/fonts (the default location).
x11-skel: An /etc/xdg directory (the default for XDG_CONFIG_DIRS in the
diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild
index 98381b68..36c83773 100755
--- a/source/x/x11-skel/x11-skel.SlackBuild
+++ b/source/x/x11-skel/x11-skel.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,27 +20,36 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+PKGNAM=x11-skel
VERSION=7.7
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
if [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
else
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-x11-skel
diff --git a/source/x/x11/arch.use.flags b/source/x/x11/arch.use.flags
index 11087c88..eb8fbb71 100644
--- a/source/x/x11/arch.use.flags
+++ b/source/x/x11/arch.use.flags
@@ -2,6 +2,8 @@ if [ "$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 -mtune=i686"
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
elif [ "$ARCH" = "x86_64" ]; then
diff --git a/source/x/x11/build/libXfont b/source/x/x11/build/anthy
index 0cfbf088..0cfbf088 100644
--- a/source/x/x11/build/libXfont
+++ b/source/x/x11/build/anthy
diff --git a/source/x/x11/build/beforelight b/source/x/x11/build/beforelight
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/beforelight
+++ b/source/x/x11/build/beforelight
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/bigreqsproto b/source/x/x11/build/bigreqsproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/bigreqsproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/bitmap b/source/x/x11/build/bitmap
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/bitmap
+++ b/source/x/x11/build/bitmap
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/compiz b/source/x/x11/build/compiz
index b8626c4c..7ed6ff82 100644
--- a/source/x/x11/build/compiz
+++ b/source/x/x11/build/compiz
@@ -1 +1 @@
-4
+5
diff --git a/source/x/x11/build/compositeproto b/source/x/x11/build/compositeproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/compositeproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/damageproto b/source/x/x11/build/damageproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/damageproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/dejavu-fonts-ttf b/source/x/x11/build/dejavu-fonts-ttf
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/dejavu-fonts-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/dmxproto b/source/x/x11/build/dmxproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/dmxproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/dri2proto b/source/x/x11/build/dri2proto
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/dri2proto
+++ b/source/x/x11/build/dri2proto
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/dri3proto b/source/x/x11/build/dri3proto
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/dri3proto
+++ b/source/x/x11/build/dri3proto
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/encodings b/source/x/x11/build/encodings
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/encodings
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/evieext b/source/x/x11/build/evieext
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/evieext
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fixesproto b/source/x/x11/build/fixesproto
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/fixesproto
+++ b/source/x/x11/build/fixesproto
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/font-adobe-100dpi b/source/x/x11/build/font-adobe-100dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-adobe-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-adobe-75dpi b/source/x/x11/build/font-adobe-75dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-adobe-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-adobe-utopia-100dpi b/source/x/x11/build/font-adobe-utopia-100dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-adobe-utopia-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-adobe-utopia-75dpi b/source/x/x11/build/font-adobe-utopia-75dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-adobe-utopia-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-adobe-utopia-type1 b/source/x/x11/build/font-adobe-utopia-type1
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-adobe-utopia-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-alias b/source/x/x11/build/font-alias
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-alias
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-arabic-misc b/source/x/x11/build/font-arabic-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-arabic-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-100dpi b/source/x/x11/build/font-bh-100dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bh-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-75dpi b/source/x/x11/build/font-bh-75dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bh-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-lucidatypewriter-100dpi b/source/x/x11/build/font-bh-lucidatypewriter-100dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bh-lucidatypewriter-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-lucidatypewriter-75dpi b/source/x/x11/build/font-bh-lucidatypewriter-75dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bh-lucidatypewriter-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-ttf b/source/x/x11/build/font-bh-ttf
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bh-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bh-type1 b/source/x/x11/build/font-bh-type1
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bh-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bitstream-100dpi b/source/x/x11/build/font-bitstream-100dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bitstream-100dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bitstream-75dpi b/source/x/x11/build/font-bitstream-75dpi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bitstream-75dpi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bitstream-speedo b/source/x/x11/build/font-bitstream-speedo
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bitstream-speedo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-bitstream-type1 b/source/x/x11/build/font-bitstream-type1
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-bitstream-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-cronyx-cyrillic b/source/x/x11/build/font-cronyx-cyrillic
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-cronyx-cyrillic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-cursor-misc b/source/x/x11/build/font-cursor-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-cursor-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-daewoo-misc b/source/x/x11/build/font-daewoo-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-daewoo-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-dec-misc b/source/x/x11/build/font-dec-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-dec-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-ibm-type1 b/source/x/x11/build/font-ibm-type1
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-ibm-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-isas-misc b/source/x/x11/build/font-isas-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-isas-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-jis-misc b/source/x/x11/build/font-jis-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-jis-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-micro-misc b/source/x/x11/build/font-micro-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-micro-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-misc-cyrillic b/source/x/x11/build/font-misc-cyrillic
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-misc-cyrillic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-misc-ethiopic b/source/x/x11/build/font-misc-ethiopic
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-misc-ethiopic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-misc-meltho b/source/x/x11/build/font-misc-meltho
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-misc-meltho
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-misc-misc b/source/x/x11/build/font-misc-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-misc-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-mutt-misc b/source/x/x11/build/font-mutt-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-mutt-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-schumacher-misc b/source/x/x11/build/font-schumacher-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-schumacher-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-screen-cyrillic b/source/x/x11/build/font-screen-cyrillic
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-screen-cyrillic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-sony-misc b/source/x/x11/build/font-sony-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-sony-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-sun-misc b/source/x/x11/build/font-sun-misc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-sun-misc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-util b/source/x/x11/build/font-util
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/font-util
+++ b/source/x/x11/build/font-util
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/font-winitzki-cyrillic b/source/x/x11/build/font-winitzki-cyrillic
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-winitzki-cyrillic
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/font-xfree86-type1 b/source/x/x11/build/font-xfree86-type1
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/font-xfree86-type1
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fontcacheproto b/source/x/x11/build/fontcacheproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/fontcacheproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fontconfig b/source/x/x11/build/fontconfig
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/fontconfig
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fontsproto b/source/x/x11/build/fontsproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/fontsproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fonttosfnt b/source/x/x11/build/fonttosfnt
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/fonttosfnt
+++ b/source/x/x11/build/fonttosfnt
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/freeglut b/source/x/x11/build/freeglut
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/freeglut
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/fslsfonts b/source/x/x11/build/fslsfonts
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/fslsfonts
+++ b/source/x/x11/build/fslsfonts
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/fstobdf b/source/x/x11/build/fstobdf
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/fstobdf
+++ b/source/x/x11/build/fstobdf
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/gccmakedep b/source/x/x11/build/gccmakedep
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/gccmakedep
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/glew b/source/x/x11/build/glew
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/glew
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/glproto b/source/x/x11/build/glproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/glproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/glu b/source/x/x11/build/glu
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/glu
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/imake b/source/x/x11/build/imake
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/imake
+++ b/source/x/x11/build/imake
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/inputproto b/source/x/x11/build/inputproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/inputproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/intel-gpu-tools b/source/x/x11/build/intel-gpu-tools
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/intel-gpu-tools
+++ b/source/x/x11/build/intel-gpu-tools
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/intel-vaapi-driver b/source/x/x11/build/intel-vaapi-driver
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/intel-vaapi-driver
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/kbproto b/source/x/x11/build/kbproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/kbproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libFS b/source/x/x11/build/libFS
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libFS
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libICE b/source/x/x11/build/libICE
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libICE
+++ b/source/x/x11/build/libICE
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libSM b/source/x/x11/build/libSM
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libSM
+++ b/source/x/x11/build/libSM
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXScrnSaver b/source/x/x11/build/libXScrnSaver
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXScrnSaver
+++ b/source/x/x11/build/libXScrnSaver
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXau b/source/x/x11/build/libXau
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXau
+++ b/source/x/x11/build/libXau
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXaw b/source/x/x11/build/libXaw
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libXaw
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXaw3d b/source/x/x11/build/libXaw3d
index 00750edc..b8626c4c 100644
--- a/source/x/x11/build/libXaw3d
+++ b/source/x/x11/build/libXaw3d
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/libXaw3dXft b/source/x/x11/build/libXaw3dXft
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libXaw3dXft
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXcm b/source/x/x11/build/libXcm
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXcm
+++ b/source/x/x11/build/libXcm
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXcomposite b/source/x/x11/build/libXcomposite
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXcomposite
+++ b/source/x/x11/build/libXcomposite
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXdamage b/source/x/x11/build/libXdamage
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXdamage
+++ b/source/x/x11/build/libXdamage
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXdmcp b/source/x/x11/build/libXdmcp
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXdmcp
+++ b/source/x/x11/build/libXdmcp
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXevie b/source/x/x11/build/libXevie
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXevie
+++ b/source/x/x11/build/libXevie
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXext b/source/x/x11/build/libXext
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXext
+++ b/source/x/x11/build/libXext
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXfixes b/source/x/x11/build/libXfixes
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libXfixes
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXfont2 b/source/x/x11/build/libXfont2
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libXfont2
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXfontcache b/source/x/x11/build/libXfontcache
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXfontcache
+++ b/source/x/x11/build/libXfontcache
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXft b/source/x/x11/build/libXft
index 00750edc..b8626c4c 100644
--- a/source/x/x11/build/libXft
+++ b/source/x/x11/build/libXft
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/libXi b/source/x/x11/build/libXi
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libXi
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXinerama b/source/x/x11/build/libXinerama
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXinerama
+++ b/source/x/x11/build/libXinerama
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXmu b/source/x/x11/build/libXmu
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXmu
+++ b/source/x/x11/build/libXmu
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXp b/source/x/x11/build/libXp
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXp
+++ b/source/x/x11/build/libXp
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXpresent b/source/x/x11/build/libXpresent
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libXpresent
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXrandr b/source/x/x11/build/libXrandr
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libXrandr
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXrender b/source/x/x11/build/libXrender
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libXrender
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXt b/source/x/x11/build/libXt
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libXt
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libXxf86dga b/source/x/x11/build/libXxf86dga
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXxf86dga
+++ b/source/x/x11/build/libXxf86dga
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXxf86misc b/source/x/x11/build/libXxf86misc
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXxf86misc
+++ b/source/x/x11/build/libXxf86misc
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libXxf86vm b/source/x/x11/build/libXxf86vm
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/libXxf86vm
+++ b/source/x/x11/build/libXxf86vm
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/libdmx b/source/x/x11/build/libdmx
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/libdmx
+++ b/source/x/x11/build/libdmx
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/libdrm b/source/x/x11/build/libdrm
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libdrm
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libepoxy b/source/x/x11/build/libepoxy
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libepoxy
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/liberation-fonts-ttf b/source/x/x11/build/liberation-fonts-ttf
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/liberation-fonts-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libevdev b/source/x/x11/build/libevdev
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libevdev
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libfontenc b/source/x/x11/build/libfontenc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libfontenc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libhangul b/source/x/x11/build/libhangul
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libhangul
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libinput b/source/x/x11/build/libinput
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libinput
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libpciaccess b/source/x/x11/build/libpciaccess
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libpciaccess
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libpthread-stubs b/source/x/x11/build/libpthread-stubs
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libpthread-stubs
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libva b/source/x/x11/build/libva
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libva
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libva-utils b/source/x/x11/build/libva-utils
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libva-utils
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libvdpau b/source/x/x11/build/libvdpau
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libvdpau
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libwacom b/source/x/x11/build/libwacom
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libwacom
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libxcb b/source/x/x11/build/libxcb
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libxcb
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/libxkbfile b/source/x/x11/build/libxkbfile
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/libxkbfile
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/lndir b/source/x/x11/build/lndir
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/lndir
+++ b/source/x/x11/build/lndir
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/luit b/source/x/x11/build/luit
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/luit
+++ b/source/x/x11/build/luit
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/m17n-lib b/source/x/x11/build/m17n-lib
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/m17n-lib
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/makedepend b/source/x/x11/build/makedepend
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/makedepend
+++ b/source/x/x11/build/makedepend
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/mesa b/source/x/x11/build/mesa
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/mesa
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/mkcomposecache b/source/x/x11/build/mkcomposecache
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/mkcomposecache
+++ b/source/x/x11/build/mkcomposecache
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/mkfontdir b/source/x/x11/build/mkfontdir
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/mkfontdir
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/motif b/source/x/x11/build/motif
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/motif
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/mtdev b/source/x/x11/build/mtdev
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/mtdev
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/pixman b/source/x/x11/build/pixman
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/pixman
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/printproto b/source/x/x11/build/printproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/printproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/randrproto b/source/x/x11/build/randrproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/randrproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/recordproto b/source/x/x11/build/recordproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/recordproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/rendercheck b/source/x/x11/build/rendercheck
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/rendercheck
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/renderproto b/source/x/x11/build/renderproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/renderproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/resourceproto b/source/x/x11/build/resourceproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/resourceproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/rgb b/source/x/x11/build/rgb
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/rgb
+++ b/source/x/x11/build/rgb
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/sazanami-fonts-ttf b/source/x/x11/build/sazanami-fonts-ttf
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/sazanami-fonts-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim b/source/x/x11/build/scim
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/scim
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-anthy b/source/x/x11/build/scim-anthy
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/scim-anthy
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-hangul b/source/x/x11/build/scim-hangul
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/scim-hangul
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-input-pad b/source/x/x11/build/scim-input-pad
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/scim-input-pad
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-m17n b/source/x/x11/build/scim-m17n
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/scim-m17n
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-pinyin b/source/x/x11/build/scim-pinyin
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/scim-pinyin
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scim-tables b/source/x/x11/build/scim-tables
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/scim-tables
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/scrnsaverproto b/source/x/x11/build/scrnsaverproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/scrnsaverproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/setxkbmap b/source/x/x11/build/setxkbmap
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/setxkbmap
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/showfont b/source/x/x11/build/showfont
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/showfont
+++ b/source/x/x11/build/showfont
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/sinhala_lklug-font-ttf b/source/x/x11/build/sinhala_lklug-font-ttf
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/sinhala_lklug-font-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/smproxy b/source/x/x11/build/smproxy
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/smproxy
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/tibmachuni-font-ttf b/source/x/x11/build/tibmachuni-font-ttf
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/tibmachuni-font-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/ttf-indic-fonts b/source/x/x11/build/ttf-indic-fonts
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/ttf-indic-fonts
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/ttf-tlwg b/source/x/x11/build/ttf-tlwg
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/ttf-tlwg
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/twm b/source/x/x11/build/twm
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/twm
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/urw-core35-fonts-otf b/source/x/x11/build/urw-core35-fonts-otf
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/urw-core35-fonts-otf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/util-macros b/source/x/x11/build/util-macros
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/util-macros
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/videoproto b/source/x/x11/build/videoproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/videoproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/vulkan-sdk b/source/x/x11/build/vulkan-sdk
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/vulkan-sdk
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/wqy-zenhei-font-ttf b/source/x/x11/build/wqy-zenhei-font-ttf
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/wqy-zenhei-font-ttf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/x11-skel b/source/x/x11/build/x11-skel
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/x11-skel
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/x11perf b/source/x/x11/build/x11perf
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/x11perf
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xbiff b/source/x/x11/build/xbiff
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xbiff
+++ b/source/x/x11/build/xbiff
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcalc b/source/x/x11/build/xcalc
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xcalc
+++ b/source/x/x11/build/xcalc
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util b/source/x/x11/build/xcb-util
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xcb-util
+++ b/source/x/x11/build/xcb-util
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util-errors b/source/x/x11/build/xcb-util-errors
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xcb-util-errors
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcb-util-image b/source/x/x11/build/xcb-util-image
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xcb-util-image
+++ b/source/x/x11/build/xcb-util-image
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util-keysyms b/source/x/x11/build/xcb-util-keysyms
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xcb-util-keysyms
+++ b/source/x/x11/build/xcb-util-keysyms
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util-renderutil b/source/x/x11/build/xcb-util-renderutil
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xcb-util-renderutil
+++ b/source/x/x11/build/xcb-util-renderutil
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcb-util-wm b/source/x/x11/build/xcb-util-wm
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xcb-util-wm
+++ b/source/x/x11/build/xcb-util-wm
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xclipboard b/source/x/x11/build/xclipboard
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xclipboard
+++ b/source/x/x11/build/xclipboard
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xclock b/source/x/x11/build/xclock
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xclock
+++ b/source/x/x11/build/xclock
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcm b/source/x/x11/build/xcm
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xcm
+++ b/source/x/x11/build/xcm
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xcmiscproto b/source/x/x11/build/xcmiscproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xcmiscproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcmsdb b/source/x/x11/build/xcmsdb
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xcmsdb
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xcompmgr
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcursor-themes b/source/x/x11/build/xcursor-themes
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xcursor-themes
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xcursorgen b/source/x/x11/build/xcursorgen
index 00750edc..b8626c4c 100644
--- a/source/x/x11/build/xcursorgen
+++ b/source/x/x11/build/xcursorgen
@@ -1 +1 @@
-3
+4
diff --git a/source/x/x11/build/xdbedizzy b/source/x/x11/build/xdbedizzy
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xdbedizzy
+++ b/source/x/x11/build/xdbedizzy
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xdg-user-dirs b/source/x/x11/build/xdg-user-dirs
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xdg-user-dirs
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xdg-utils b/source/x/x11/build/xdg-utils
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xdg-utils
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xditview b/source/x/x11/build/xditview
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xditview
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm
index 1e8b3149..45a4fb75 100644
--- a/source/x/x11/build/xdm
+++ b/source/x/x11/build/xdm
@@ -1 +1 @@
-6
+8
diff --git a/source/x/x11/build/xdpyinfo b/source/x/x11/build/xdpyinfo
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xdpyinfo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xdriinfo b/source/x/x11/build/xdriinfo
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xdriinfo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xedit b/source/x/x11/build/xedit
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xedit
+++ b/source/x/x11/build/xedit
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xev b/source/x/x11/build/xev
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xev
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xextproto b/source/x/x11/build/xextproto
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xextproto
+++ b/source/x/x11/build/xextproto
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-input-acecad b/source/x/x11/build/xf86-input-acecad
index ec635144..48082f72 100644
--- a/source/x/x11/build/xf86-input-acecad
+++ b/source/x/x11/build/xf86-input-acecad
@@ -1 +1 @@
-9
+12
diff --git a/source/x/x11/build/xf86-input-aiptek b/source/x/x11/build/xf86-input-aiptek
index ec635144..b4de3947 100644
--- a/source/x/x11/build/xf86-input-aiptek
+++ b/source/x/x11/build/xf86-input-aiptek
@@ -1 +1 @@
-9
+11
diff --git a/source/x/x11/build/xf86-input-evdev b/source/x/x11/build/xf86-input-evdev
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/source/x/x11/build/xf86-input-evdev
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-input-joystick b/source/x/x11/build/xf86-input-joystick
index ec635144..00750edc 100644
--- a/source/x/x11/build/xf86-input-joystick
+++ b/source/x/x11/build/xf86-input-joystick
@@ -1 +1 @@
-9
+3
diff --git a/source/x/x11/build/xf86-input-keyboard b/source/x/x11/build/xf86-input-keyboard
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-input-keyboard
+++ b/source/x/x11/build/xf86-input-keyboard
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-input-libinput b/source/x/x11/build/xf86-input-libinput
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/source/x/x11/build/xf86-input-libinput
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-input-mouse b/source/x/x11/build/xf86-input-mouse
index b8626c4c..00750edc 100644
--- a/source/x/x11/build/xf86-input-mouse
+++ b/source/x/x11/build/xf86-input-mouse
@@ -1 +1 @@
-4
+3
diff --git a/source/x/x11/build/xf86-input-penmount b/source/x/x11/build/xf86-input-penmount
index ec635144..48082f72 100644
--- a/source/x/x11/build/xf86-input-penmount
+++ b/source/x/x11/build/xf86-input-penmount
@@ -1 +1 @@
-9
+12
diff --git a/source/x/x11/build/xf86-input-synaptics b/source/x/x11/build/xf86-input-synaptics
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-input-synaptics
+++ b/source/x/x11/build/xf86-input-synaptics
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse
index b8626c4c..7f8f011e 100644
--- a/source/x/x11/build/xf86-input-vmmouse
+++ b/source/x/x11/build/xf86-input-vmmouse
@@ -1 +1 @@
-4
+7
diff --git a/source/x/x11/build/xf86-input-void b/source/x/x11/build/xf86-input-void
index ec635144..48082f72 100644
--- a/source/x/x11/build/xf86-input-void
+++ b/source/x/x11/build/xf86-input-void
@@ -1 +1 @@
-9
+12
diff --git a/source/x/x11/build/xf86-input-wacom b/source/x/x11/build/xf86-input-wacom
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/source/x/x11/build/xf86-input-wacom
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-amdgpu b/source/x/x11/build/xf86-video-amdgpu
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/source/x/x11/build/xf86-video-amdgpu
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-apm b/source/x/x11/build/xf86-video-apm
index 45a4fb75..b4de3947 100644
--- a/source/x/x11/build/xf86-video-apm
+++ b/source/x/x11/build/xf86-video-apm
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-ark b/source/x/x11/build/xf86-video-ark
index 45a4fb75..b4de3947 100644
--- a/source/x/x11/build/xf86-video-ark
+++ b/source/x/x11/build/xf86-video-ark
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-ast b/source/x/x11/build/xf86-video-ast
index 0cfbf088..7ed6ff82 100644
--- a/source/x/x11/build/xf86-video-ast
+++ b/source/x/x11/build/xf86-video-ast
@@ -1 +1 @@
-2
+5
diff --git a/source/x/x11/build/xf86-video-ati b/source/x/x11/build/xf86-video-ati
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/source/x/x11/build/xf86-video-ati
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-chips b/source/x/x11/build/xf86-video-chips
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-chips
+++ b/source/x/x11/build/xf86-video-chips
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-cirrus b/source/x/x11/build/xf86-video-cirrus
index 0cfbf088..7ed6ff82 100644
--- a/source/x/x11/build/xf86-video-cirrus
+++ b/source/x/x11/build/xf86-video-cirrus
@@ -1 +1 @@
-2
+5
diff --git a/source/x/x11/build/xf86-video-dummy b/source/x/x11/build/xf86-video-dummy
index 7ed6ff82..00750edc 100644
--- a/source/x/x11/build/xf86-video-dummy
+++ b/source/x/x11/build/xf86-video-dummy
@@ -1 +1 @@
-5
+3
diff --git a/source/x/x11/build/xf86-video-geode b/source/x/x11/build/xf86-video-geode
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86-video-geode
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86-video-glint b/source/x/x11/build/xf86-video-glint
index 45a4fb75..00750edc 100644
--- a/source/x/x11/build/xf86-video-glint
+++ b/source/x/x11/build/xf86-video-glint
@@ -1 +1 @@
-8
+3
diff --git a/source/x/x11/build/xf86-video-i128 b/source/x/x11/build/xf86-video-i128
index 45a4fb75..b4de3947 100644
--- a/source/x/x11/build/xf86-video-i128
+++ b/source/x/x11/build/xf86-video-i128
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-intel b/source/x/x11/build/xf86-video-intel
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/source/x/x11/build/xf86-video-intel
@@ -0,0 +1 @@
+1
diff --git a/source/x/x11/build/xf86-video-mach64 b/source/x/x11/build/xf86-video-mach64
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/xf86-video-mach64
+++ b/source/x/x11/build/xf86-video-mach64
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/xf86-video-modesetting b/source/x/x11/build/xf86-video-modesetting
new file mode 100644
index 00000000..b8626c4c
--- /dev/null
+++ b/source/x/x11/build/xf86-video-modesetting
@@ -0,0 +1 @@
+4
diff --git a/source/x/x11/build/xf86-video-neomagic b/source/x/x11/build/xf86-video-neomagic
index 0cfbf088..7ed6ff82 100644
--- a/source/x/x11/build/xf86-video-neomagic
+++ b/source/x/x11/build/xf86-video-neomagic
@@ -1 +1 @@
-2
+5
diff --git a/source/x/x11/build/xf86-video-nouveau b/source/x/x11/build/xf86-video-nouveau
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/source/x/x11/build/xf86-video-nouveau
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-nv b/source/x/x11/build/xf86-video-nv
index ec635144..00750edc 100644
--- a/source/x/x11/build/xf86-video-nv
+++ b/source/x/x11/build/xf86-video-nv
@@ -1 +1 @@
-9
+3
diff --git a/source/x/x11/build/xf86-video-omap b/source/x/x11/build/xf86-video-omap
index 0cfbf088..7ed6ff82 100644
--- a/source/x/x11/build/xf86-video-omap
+++ b/source/x/x11/build/xf86-video-omap
@@ -1 +1 @@
-2
+5
diff --git a/source/x/x11/build/xf86-video-openchrome b/source/x/x11/build/xf86-video-openchrome
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/source/x/x11/build/xf86-video-openchrome
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-r128 b/source/x/x11/build/xf86-video-r128
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86-video-r128
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86-video-rendition b/source/x/x11/build/xf86-video-rendition
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/source/x/x11/build/xf86-video-rendition
@@ -0,0 +1 @@
+1
diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3
index 45a4fb75..b4de3947 100644
--- a/source/x/x11/build/xf86-video-s3
+++ b/source/x/x11/build/xf86-video-s3
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-s3virge b/source/x/x11/build/xf86-video-s3virge
index 0cfbf088..b8626c4c 100644
--- a/source/x/x11/build/xf86-video-s3virge
+++ b/source/x/x11/build/xf86-video-s3virge
@@ -1 +1 @@
-2
+4
diff --git a/source/x/x11/build/xf86-video-siliconmotion b/source/x/x11/build/xf86-video-siliconmotion
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-siliconmotion
+++ b/source/x/x11/build/xf86-video-siliconmotion
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-sisusb b/source/x/x11/build/xf86-video-sisusb
index 45a4fb75..00750edc 100644
--- a/source/x/x11/build/xf86-video-sisusb
+++ b/source/x/x11/build/xf86-video-sisusb
@@ -1 +1 @@
-8
+3
diff --git a/source/x/x11/build/xf86-video-tga b/source/x/x11/build/xf86-video-tga
index 45a4fb75..b4de3947 100644
--- a/source/x/x11/build/xf86-video-tga
+++ b/source/x/x11/build/xf86-video-tga
@@ -1 +1 @@
-8
+11
diff --git a/source/x/x11/build/xf86-video-tseng b/source/x/x11/build/xf86-video-tseng
index 45a4fb75..f599e28b 100644
--- a/source/x/x11/build/xf86-video-tseng
+++ b/source/x/x11/build/xf86-video-tseng
@@ -1 +1 @@
-8
+10
diff --git a/source/x/x11/build/xf86-video-v4l b/source/x/x11/build/xf86-video-v4l
index b1bd38b6..b6a7d89c 100644
--- a/source/x/x11/build/xf86-video-v4l
+++ b/source/x/x11/build/xf86-video-v4l
@@ -1 +1 @@
-13
+16
diff --git a/source/x/x11/build/xf86-video-vboxvideo b/source/x/x11/build/xf86-video-vboxvideo
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/source/x/x11/build/xf86-video-vboxvideo
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86-video-vesa
+++ b/source/x/x11/build/xf86-video-vesa
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware
index 7f8f011e..d00491fd 100644
--- a/source/x/x11/build/xf86-video-vmware
+++ b/source/x/x11/build/xf86-video-vmware
@@ -1 +1 @@
-7
+1
diff --git a/source/x/x11/build/xf86-video-voodoo b/source/x/x11/build/xf86-video-voodoo
index ec635144..48082f72 100644
--- a/source/x/x11/build/xf86-video-voodoo
+++ b/source/x/x11/build/xf86-video-voodoo
@@ -1 +1 @@
-9
+12
diff --git a/source/x/x11/build/xf86-video-xgi b/source/x/x11/build/xf86-video-xgi
index 0cfbf088..b8626c4c 100644
--- a/source/x/x11/build/xf86-video-xgi
+++ b/source/x/x11/build/xf86-video-xgi
@@ -1 +1 @@
-2
+4
diff --git a/source/x/x11/build/xf86-video-xgixp b/source/x/x11/build/xf86-video-xgixp
index 45a4fb75..f599e28b 100644
--- a/source/x/x11/build/xf86-video-xgixp
+++ b/source/x/x11/build/xf86-video-xgixp
@@ -1 +1 @@
-8
+10
diff --git a/source/x/x11/build/xf86bigfontproto b/source/x/x11/build/xf86bigfontproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86bigfontproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86dga b/source/x/x11/build/xf86dga
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xf86dga
+++ b/source/x/x11/build/xf86dga
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xf86dgaproto b/source/x/x11/build/xf86dgaproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86dgaproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86driproto b/source/x/x11/build/xf86driproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86driproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86miscproto b/source/x/x11/build/xf86miscproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86miscproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xf86vidmodeproto b/source/x/x11/build/xf86vidmodeproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xf86vidmodeproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xfd b/source/x/x11/build/xfd
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xfd
+++ b/source/x/x11/build/xfd
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xfsinfo b/source/x/x11/build/xfsinfo
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xfsinfo
+++ b/source/x/x11/build/xfsinfo
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xgamma b/source/x/x11/build/xgamma
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xgamma
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xgc b/source/x/x11/build/xgc
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xgc
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xhost b/source/x/x11/build/xhost
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xhost
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xineramaproto b/source/x/x11/build/xineramaproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xineramaproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xinput b/source/x/x11/build/xinput
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xinput
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xkbevd b/source/x/x11/build/xkbevd
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xkbevd
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xkbprint b/source/x/x11/build/xkbprint
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xkbprint
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xkbutils b/source/x/x11/build/xkbutils
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xkbutils
+++ b/source/x/x11/build/xkbutils
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xkeyboard-config b/source/x/x11/build/xkeyboard-config
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xkeyboard-config
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xlogo b/source/x/x11/build/xlogo
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xlogo
+++ b/source/x/x11/build/xlogo
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xlsatoms b/source/x/x11/build/xlsatoms
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xlsatoms
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xlsfonts b/source/x/x11/build/xlsfonts
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xlsfonts
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xmag b/source/x/x11/build/xmag
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xmag
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xman b/source/x/x11/build/xman
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xman
+++ b/source/x/x11/build/xman
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xmh b/source/x/x11/build/xmh
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xmh
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xmodmap b/source/x/x11/build/xmodmap
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xmodmap
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xmore b/source/x/x11/build/xmore
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xmore
+++ b/source/x/x11/build/xmore
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xorg-cf-files b/source/x/x11/build/xorg-cf-files
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xorg-cf-files
+++ b/source/x/x11/build/xorg-cf-files
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xorg-docs b/source/x/x11/build/xorg-docs
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xorg-docs
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/build/xorg-sgml-doctools b/source/x/x11/build/xorg-sgml-doctools
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xorg-sgml-doctools
+++ b/source/x/x11/build/xorg-sgml-doctools
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xorgproto b/source/x/x11/build/xorgproto
new file mode 100644
index 00000000..00750edc
--- /dev/null
+++ b/source/x/x11/build/xorgproto
@@ -0,0 +1 @@
+3
diff --git a/source/x/x11/build/xproto b/source/x/x11/build/xproto
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xproto
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xpyb b/source/x/x11/build/xpyb
index 00750edc..7ed6ff82 100644
--- a/source/x/x11/build/xpyb
+++ b/source/x/x11/build/xpyb
@@ -1 +1 @@
-3
+5
diff --git a/source/x/x11/build/xrandr b/source/x/x11/build/xrandr
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xrandr
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xscope b/source/x/x11/build/xscope
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xscope
+++ b/source/x/x11/build/xscope
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xstdcmap b/source/x/x11/build/xstdcmap
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xstdcmap
+++ b/source/x/x11/build/xstdcmap
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xterm b/source/x/x11/build/xterm
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xterm
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xtrans b/source/x/x11/build/xtrans
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xtrans
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/build/xvidtune b/source/x/x11/build/xvidtune
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xvidtune
+++ b/source/x/x11/build/xvidtune
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/build/xvinfo b/source/x/x11/build/xvinfo
new file mode 100644
index 00000000..0cfbf088
--- /dev/null
+++ b/source/x/x11/build/xvinfo
@@ -0,0 +1 @@
+2
diff --git a/source/x/x11/configure/intel-gpu-tools b/source/x/x11/configure/intel-gpu-tools
index d996de5c..a5e0db8a 100644
--- a/source/x/x11/configure/intel-gpu-tools
+++ b/source/x/x11/configure/intel-gpu-tools
@@ -1,6 +1,6 @@
CFLAGS=$SLKCFLAGS \
CXXFLAGS=$SLKCFLAGS \
-./configure \
+./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
@@ -9,5 +9,5 @@ CXXFLAGS=$SLKCFLAGS \
--mandir=/usr/man \
--docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
--disable-static \
- --disable-dumper \
+ --disable-tests \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xcb-proto b/source/x/x11/configure/xcb-proto
new file mode 100644
index 00000000..2df1aaf7
--- /dev/null
+++ b/source/x/x11/configure/xcb-proto
@@ -0,0 +1,35 @@
+mkdir python2 python3
+
+cd python2
+ CFLAGS=$SLKCFLAGS \
+ CXXFLAGS=$SLKCFLAGS \
+ PYTHON=python3 \
+ ../configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+ --with-udev-rules-dir=/lib/udev/rules.d \
+ --disable-static \
+ --build=$ARCH-slackware-linux
+cd -
+
+cd python3
+ CFLAGS=$SLKCFLAGS \
+ CXXFLAGS=$SLKCFLAGS \
+ PYTHON=python \
+ ../configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+ --with-udev-rules-dir=/lib/udev/rules.d \
+ --disable-static \
+ --build=$ARCH-slackware-linux
+cd -
diff --git a/source/x/x11/configure/xf86-video-intel b/source/x/x11/configure/xf86-video-intel
index d744b329..88581a1e 100644
--- a/source/x/x11/configure/xf86-video-intel
+++ b/source/x/x11/configure/xf86-video-intel
@@ -1,5 +1,11 @@
-CFLAGS=$SLKCFLAGS \
-CXXFLAGS=$SLKCFLAGS \
+# xf86-video-intel requires SSE2 instructions on 32-bit x86:
+ALTCFLAGS="$SLKCFLAGS"
+case "$( uname -m )" in
+ i?86) ALTCFLAGS="-O2 -march=i686 -mtune=i686 -msse2" ; PKGARCH=i686 ;;
+esac
+
+CFLAGS="$ALTCFLAGS" \
+CXXFLAGS="$ALTCFLAGS" \
./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -11,4 +17,5 @@ CXXFLAGS=$SLKCFLAGS \
--disable-static \
--enable-kms-only \
--enable-uxa \
+ --with-default-dri=3 \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index 755b565d..1ebd6346 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -6,11 +6,7 @@ BUILD_SERVERS="--enable-xorg \
--enable-glamor \
--enable-kdrive \
--enable-xephyr \
- --enable-xfbdev \
--enable-config-udev \
- --enable-kdrive-evdev \
- --enable-kdrive-kbd \
- --enable-kdrive-mouse \
--disable-config-hal \
--disable-systemd-logind"
@@ -36,7 +32,7 @@ CFLAGS="$SLKCFLAGS" \
--with-int10=x86emu \
--with-default-font-path="${DEF_FONTPATH}" \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
- --with-os-name="Slackware 14.2" \
+ --with-os-name="Slackware 15.0" \
--with-os-vendor="Slackware Linux Project" \
--with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/lib/xkb \
diff --git a/source/x/x11/configure/xorgproto b/source/x/x11/configure/xorgproto
new file mode 100644
index 00000000..f95c810b
--- /dev/null
+++ b/source/x/x11/configure/xorgproto
@@ -0,0 +1,18 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir build
+cd build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir /usr/libexec \
+ --bindir /usr/bin \
+ --sbindir /usr/sbin \
+ --includedir /usr/include \
+ --datadir /usr/share \
+ --mandir /usr/man \
+ --sysconfdir /etc \
+ --localstatedir /var \
+ --buildtype=release \
+ -Dlegacy=true \
+ .. || exit 1
diff --git a/source/x/x11/make/xcb-proto b/source/x/x11/make/xcb-proto
new file mode 100644
index 00000000..a4c380bb
--- /dev/null
+++ b/source/x/x11/make/xcb-proto
@@ -0,0 +1,17 @@
+cd python2
+ if ! make $NUMJOBS ; then
+ touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
+ continue
+ fi
+
+ make install DESTDIR=$PKG
+cd -
+
+cd python3
+ if ! make $NUMJOBS ; then
+ touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
+ continue
+ fi
+
+ make install DESTDIR=$PKG
+cd -
diff --git a/source/x/x11/make/xorgproto b/source/x/x11/make/xorgproto
new file mode 100644
index 00000000..47bfc8e6
--- /dev/null
+++ b/source/x/x11/make/xorgproto
@@ -0,0 +1,13 @@
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+cd build
+ ninja || exit 1
+ DESTDIR=$PKG ninja install || exit 1
+cd ..
+# meson doesn't seem to care about a docdir:
+mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+for docfile in PM_spec compositeproto.txt damageproto.txt dri2proto.txt dri3proto.txt fixesproto.txt presentproto.txt randrproto.txt renderproto.txt resproto.txt xv-protocol-v2.txt ; do
+ cp -a $docfile $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
+ chown root:root $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}/${docfile}
+ chmod 644 $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}/${docfile}
+done
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index 8a28ed93..35ae0636 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -84,6 +84,7 @@ libXevie
libXext
libXfixes
libXfont
+libXfont2
libXfontcache
libXft
libXi
@@ -173,6 +174,7 @@ xf86-input-aiptek
xf86-input-evdev
xf86-input-joystick
xf86-input-keyboard
+xf86-input-libinput
xf86-input-mouse
xf86-input-penmount
xf86-input-synaptics
@@ -214,6 +216,7 @@ xf86-video-tga
xf86-video-trident
xf86-video-tseng
xf86-video-v4l
+xf86-video-vboxvideo
xf86-video-vesa
xf86-video-vmware
xf86-video-voodoo
@@ -259,6 +262,7 @@ xorg-server-xephyr
xorg-server-xnest
xorg-server-xvfb
xorg-sgml-doctools
+xorgproto
xpr
xprop
xproto
diff --git a/source/x/x11/noarch b/source/x/x11/noarch
index 8785ee52..8b8ff18a 100644
--- a/source/x/x11/noarch
+++ b/source/x/x11/noarch
@@ -49,7 +49,6 @@ gccmakedep
glproto
inputproto
kbproto
-libpthread-stubs
mkfontdir
printproto
randrproto
diff --git a/source/x/x11/patch/xf86-input-mouse.patch b/source/x/x11/patch/xf86-input-mouse.patch
new file mode 100644
index 00000000..e54c5190
--- /dev/null
+++ b/source/x/x11/patch/xf86-input-mouse.patch
@@ -0,0 +1,2 @@
+zcat $CWD/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch.gz \
+ | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch b/source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch
new file mode 100644
index 00000000..5726c50a
--- /dev/null
+++ b/source/x/x11/patch/xf86-input-mouse/3c8f243b750a92d5837a449d344ff884dbd02b57.patch
@@ -0,0 +1,42 @@
+From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 16 Feb 2017 09:21:21 -0500
+Subject: Adapt to removal of xf86GetOS
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/mouse.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/mouse.c b/src/mouse.c
+index dae98aa..40d97a9 100644
+--- a/src/mouse.c
++++ b/src/mouse.c
+@@ -794,7 +794,6 @@ InitProtocols(void)
+ {
+ int classes;
+ int i;
+- const char *osname = NULL;
+
+ if (osInfo)
+ return TRUE;
+@@ -821,11 +820,11 @@ InitProtocols(void)
+ mouseProtocols[i].id = PROT_UNSUP;
+
+ /* NetBSD uses PROT_BM for "PS/2". */
+- xf86GetOS(&osname, NULL, NULL, NULL);
+- if (osname && xf86NameCmp(osname, "netbsd") == 0)
+- for (i = 0; mouseProtocols[i].name; i++)
+- if (mouseProtocols[i].id == PROT_PS2)
+- mouseProtocols[i].id = PROT_BM;
++#if defined(__NetBSD__)
++ for (i = 0; mouseProtocols[i].name; i++)
++ if (mouseProtocols[i].id == PROT_PS2)
++ mouseProtocols[i].id = PROT_BM;
++#endif
+
+ return TRUE;
+ }
+--
+cgit v1.1
+
diff --git a/source/x/x11/patch/xf86-video-intel.patch b/source/x/x11/patch/xf86-video-intel.patch
index dab2d0d3..30c63796 100644
--- a/source/x/x11/patch/xf86-video-intel.patch
+++ b/source/x/x11/patch/xf86-video-intel.patch
@@ -1,3 +1,9 @@
# Disable this patch. Latest git should support gen9 properly.
#zcat $CWD/patch/xf86-video-intel/0001-sna-Let-modestting-glamor-handle-gen9.patch.gz \
# | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Some patches from Fedora's SRPM:
+zcat $CWD/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xf86-video-intel/0001-Fix-build-on-i686.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xf86-video-intel/intel-gcc-pr65873.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch
new file mode 100644
index 00000000..ca525ecc
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-F28-and-later.patch
@@ -0,0 +1,101 @@
+From 9c1151b4d65c356f0d25d952fe1a10c89fdb834a Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 5 Mar 2018 11:03:18 -0500
+Subject: [PATCH] Fix build on F28 and later
+
+Newer gcc complains that it doesn't know how to always-inline memcpy():
+
+ /usr/include/bits/string_fortified.h:31:1: error: inlining failed in
+ call to always_inline 'memcpy': target specific option mismatch
+
+This is because we need to wrap our declaration of memcpy() in the
+options we're trying to push at the top of blt.c. So: include compiler.h
+to define sse2, then push options, then include everything else.
+
+However if you do that, the word 'nonnull' collides with the usage in
+<X11/Xfuncproto.h>. I'm too lazy to fix that properly, just expand it to
+the __attribute__ form in the few places we say it.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ src/sna/blt.c | 6 ++++--
+ src/sna/compiler.h | 2 --
+ src/sna/gen6_common.h | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/sna/blt.c b/src/sna/blt.c
+index cb90437a..fb357d35 100644
+--- a/src/sna/blt.c
++++ b/src/sna/blt.c
+@@ -29,13 +29,15 @@
+ #include "config.h"
+ #endif
+
+-#include "sna.h"
+-#include <pixman.h>
++#include "compiler.h"
+
+ #if defined(sse2)
+ #pragma GCC push_options
+ #pragma GCC target("sse2,inline-all-stringops,fpmath=sse")
+ #pragma GCC optimize("Ofast")
++
++#include <pixman.h>
++#include "sna.h"
+ #include <xmmintrin.h>
+
+ #if __x86_64__
+diff --git a/src/sna/compiler.h b/src/sna/compiler.h
+index 0f3775ec..3c176a16 100644
+--- a/src/sna/compiler.h
++++ b/src/sna/compiler.h
+@@ -39,7 +39,6 @@
+ #define pure __attribute__((pure))
+ #define tightly_packed __attribute__((__packed__))
+ #define flatten __attribute__((flatten))
+-#define nonnull __attribute__((nonnull))
+ #define page_aligned __attribute__((aligned(4096)))
+ #else
+ #define likely(expr) (expr)
+@@ -52,7 +51,6 @@
+ #define pure
+ #define tighly_packed
+ #define flatten
+-#define nonnull
+ #define page_aligned
+ #endif
+
+diff --git a/src/sna/gen6_common.h b/src/sna/gen6_common.h
+index b53ec0c9..119a2d5d 100644
+--- a/src/sna/gen6_common.h
++++ b/src/sna/gen6_common.h
+@@ -133,7 +133,7 @@ inline static bool force_blt_ring(struct sna *sna, struct kgem_bo *bo)
+ return false;
+ }
+
+-nonnull inline static bool
++__attribute__((nonnull)) inline static bool
+ prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags)
+ {
+ if (PREFER_RENDER)
+@@ -148,7 +148,7 @@ prefer_blt_ring(struct sna *sna, struct kgem_bo *bo, unsigned flags)
+ return can_switch_to_blt(sna, bo, flags);
+ }
+
+-nonnull inline static bool
++__attribute__((nonnull)) inline static bool
+ prefer_render_ring(struct sna *sna, struct kgem_bo *bo)
+ {
+ if (sna->kgem.ring == KGEM_RENDER)
+@@ -191,7 +191,7 @@ prefer_blt_composite(struct sna *sna, struct sna_composite_op *tmp)
+ return prefer_blt_bo(sna, tmp->src.bo, tmp->dst.bo);
+ }
+
+-nonnull static inline bool
++__attribute__((nonnull)) static inline bool
+ prefer_blt_fill(struct sna *sna, struct kgem_bo *bo, unsigned flags)
+ {
+ if (PREFER_RENDER)
+--
+2.16.2
+
diff --git a/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch
new file mode 100644
index 00000000..0851fbe4
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch
@@ -0,0 +1,49 @@
+From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 6 Mar 2018 12:07:46 -0500
+Subject: [PATCH] Fix build on i686
+
+Presumably this only matters for i686 because amd64 implies sse2, but:
+
+BUILDSTDERR: In file included from gen4_vertex.c:34:
+BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex':
+BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch
+BUILDSTDERR: static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y)
+BUILDSTDERR: ^~~~~~~~~~~~~~
+BUILDSTDERR: gen4_vertex.c:308:25: note: called from here
+BUILDSTDERR: #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */
+BUILDSTDERR: ^~~~~~~~~~~~~~~~~~~~~~~~
+BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX'
+BUILDSTDERR: OUT_VERTEX(dstX, dstY);
+BUILDSTDERR: ^~~~~~~~~~
+
+The bug here appears to be that emit_vertex() is declared 'sse2' but
+vertex_emit_2s is merely always_inline. gcc8 decides that since you said
+always_inline you need to have explicitly cloned it for every
+permutation of targets. Merely saying inline seems to do the job of
+cloning vertex_emit_2s as much as necessary.
+
+So to reiterate: if you say always-inline, it won't, but if you just say
+maybe inline, it will. Thanks gcc, that's helpful.
+
+- ajax
+---
+ src/sna/compiler.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sna/compiler.h b/src/sna/compiler.h
+index 3c176a16..bc447c7a 100644
+--- a/src/sna/compiler.h
++++ b/src/sna/compiler.h
+@@ -32,7 +32,7 @@
+ #define likely(expr) (__builtin_expect (!!(expr), 1))
+ #define unlikely(expr) (__builtin_expect (!!(expr), 0))
+ #define noinline __attribute__((noinline))
+-#define force_inline inline __attribute__((always_inline))
++#define force_inline inline
+ #define fastcall __attribute__((regparm(3)))
+ #define must_check __attribute__((warn_unused_result))
+ #define constant __attribute__((const))
+--
+2.16.2
+
diff --git a/source/x/x11/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch b/source/x/x11/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch
new file mode 100644
index 00000000..cb279a78
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch
@@ -0,0 +1,47 @@
+From 09bf64d69d97172f22fe08eb495bf50f920ae9ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
+Date: Tue, 31 May 2016 11:11:21 +0300
+Subject: [PATCH] sna: Avoid clobbering output physical size with
+ xf86OutputSetEDID()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+---
+ src/sna/sna_display.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 10d33f2..57de410 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -3576,6 +3576,7 @@ sna_output_attach_edid(xf86OutputPtr output)
+ {
+ struct sna *sna = to_sna(output->scrn);
+ struct sna_output *sna_output = output->driver_private;
++ unsigned old_mm_width, old_mm_height;
+ struct drm_mode_get_blob blob;
+ void *old, *raw = NULL;
+ xf86MonPtr mon = NULL;
+@@ -3678,12 +3679,17 @@ skip_read:
+ }
+
+ done:
++ output = sna_output->base;
++ old_mm_width = output->mm_width;
++ old_mm_height = output->mm_height;
+ sna_output_set_parsed_edid(output, mon);
+ if (raw) {
+ sna_output->edid_raw = raw;
+ sna_output->edid_len = blob.length;
+ sna_output->edid_blob_id = blob.blob_id;
+ }
++ output->mm_width = old_mm_width;
++ output->mm_height = old_mm_height;
+ }
+
+ static void
+--
+2.7.4
+
diff --git a/source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch b/source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch
new file mode 100644
index 00000000..ed05bce9
--- /dev/null
+++ b/source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch
@@ -0,0 +1,12 @@
+diff -up xf86-video-intel-20150520/src/sna/compiler.h.jx xf86-video-intel-20150520/src/sna/compiler.h
+--- xf86-video-intel-20150520/src/sna/compiler.h.jx 2015-05-19 07:44:26.000000000 -0400
++++ xf86-video-intel-20150520/src/sna/compiler.h 2015-05-20 12:53:54.797918726 -0400
+@@ -64,7 +64,7 @@
+ #endif
+
+ #if HAS_GCC(4, 6) && defined(__OPTIMIZE__)
+-#define fast __attribute__((optimize("Ofast")))
++#define fast __attribute__((optimize("O3")))
+ #else
+ #define fast
+ #endif
diff --git a/source/x/x11/patch/xf86-video-sisusb.patch b/source/x/x11/patch/xf86-video-sisusb.patch
deleted file mode 100644
index 17d7e829..00000000
--- a/source/x/x11/patch/xf86-video-sisusb.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Remove obsolete references to mibstore.h and miInitializeBackingStore():
-grep -r -l '#include "mibstore.h"' * | while read file ; do
- sed -i "s/#include \"mibstore.h\"//g" $file
-done
-grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
- sed -i "s/miInitializeBackingStore(pScreen);//g" $file
-done
diff --git a/source/x/x11/patch/xf86-video-vmware.patch b/source/x/x11/patch/xf86-video-vmware.patch
deleted file mode 100644
index 17d7e829..00000000
--- a/source/x/x11/patch/xf86-video-vmware.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Remove obsolete references to mibstore.h and miInitializeBackingStore():
-grep -r -l '#include "mibstore.h"' * | while read file ; do
- sed -i "s/#include \"mibstore.h\"//g" $file
-done
-grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
- sed -i "s/miInitializeBackingStore(pScreen);//g" $file
-done
diff --git a/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff b/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
index f51e4628..79223807 100644
--- a/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
+++ b/source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff
@@ -1,19 +1,18 @@
---- ./startx.cpp.orig 2014-09-11 12:31:42.000000000 -0500
-+++ ./startx.cpp 2015-03-29 23:35:06.133875707 -0500
-@@ -192,10 +192,12 @@
+--- ./startx.cpp.orig 2018-03-11 16:07:52.205154560 -0500
++++ ./startx.cpp 2018-03-11 16:09:46.094163992 -0500
+@@ -201,6 +201,7 @@
+ server=$defaultserver
+
+ #ifdef __linux__
++ if [ -x /usr/lib/systemd/systemd -o -x /lib/systemd/systemd ]; then
XCOMM When starting the defaultserver start X on the current tty to avoid
XCOMM the startx session being seen as inactive:
XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
-- tty=$(tty)
-- if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
-- tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
-- vtarg="vt$tty_num"
-+ if [ -x /usr/lib/systemd/systemd -o -x /lib/systemd/systemd ]; then
-+ tty=$(tty)
-+ if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
-+ tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
-+ vtarg="vt$tty_num"
-+ fi
+@@ -209,6 +210,7 @@
+ tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+ vtarg="vt$tty_num -keeptty"
fi
++ fi
#endif
+ XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
diff --git a/source/x/x11/patch/xpyb.patch b/source/x/x11/patch/xpyb.patch
new file mode 100644
index 00000000..30ec5dd8
--- /dev/null
+++ b/source/x/x11/patch/xpyb.patch
@@ -0,0 +1 @@
+zcat $CWD/patch/xpyb/xpyb-1.3.1-xcbproto-1.13.patch.gz | patch -p1 || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xpyb/xpyb-1.3.1-xcbproto-1.13.patch b/source/x/x11/patch/xpyb/xpyb-1.3.1-xcbproto-1.13.patch
new file mode 100644
index 00000000..8227aa05
--- /dev/null
+++ b/source/x/x11/patch/xpyb/xpyb-1.3.1-xcbproto-1.13.patch
@@ -0,0 +1,12 @@
+--- ./src/py_client.py.orig 2012-03-23 16:24:40.000000000 -0500
++++ ./src/py_client.py 2018-03-11 14:24:54.540483549 -0500
+@@ -585,7 +585,8 @@
+ 'union' : py_union,
+ 'request' : py_request,
+ 'event' : py_event,
+- 'error' : py_error
++ 'error' : py_error,
++ 'eventstruct' : lambda *a, **k: None
+ }
+
+ # Boilerplate below this point
diff --git a/source/x/x11/post-install/libxcb.post-install b/source/x/x11/post-install/libxcb.post-install
index 76ac40c0..ebaacfd8 100644
--- a/source/x/x11/post-install/libxcb.post-install
+++ b/source/x/x11/post-install/libxcb.post-install
@@ -31,22 +31,3 @@ rm -rf $PKG/usr/share/doc/libxcb
rmdir $PKG/usr/share/doc
rmdir $PKG/usr/share
-# Older versions of libxcb shipped a poorly libtooled .la file that caused
-# the now-gone libxcb-xlib.so module to be incorrectly linked with many
-# binaries and libraries, and cause the module to be listed (again,
-# incorrectly) in a lot of .la files. Rather than breaking a large amount
-# of existing X programs, we will use this simple trick to allow old binaries
-# to keep running, and new things to compile even if a bogus .la file
-# referencing libxcb-xlib is in the development environment.
-#
-# References to libxcb-xlib will go away as things are recompiled in the
-# future (we've eliminated any remaining references in Slackware itself).
-#
-# It's like letting a sliver work out instead of cutting off the finger.
-
-( cd $PKG/usr/lib
- ln -sf libxcb.so.1 libxcb-xlib.so.0
- ln -sf libxcb-xlib.so.0 libxcb-xlib.so
- ln -sf libxcb.la libxcb-xlib.la
-)
-
diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install
index a8889970..8410a8fa 100644
--- a/source/x/x11/post-install/xdm.post-install
+++ b/source/x/x11/post-install/xdm.post-install
@@ -29,6 +29,15 @@ do
#mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ;
done
+# Change default auth type:
+cat << EOF >> $PKG/etc/X11/xdm/xdm-config.new
+
+! In xdm-config, default to MIT-MAGIC-COOKIE-1 authorization as
+! the XDM-AUTHORIZATION-1 method (which is the default otherwise) is
+! mostly broken (i.e. with SDL2 apps):
+DisplayManager.*.authName: MIT-MAGIC-COOKIE-1
+EOF
+
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-libinput.post-install b/source/x/x11/post-install/xf86-input-libinput.post-install
index baeffe2e..b267c28f 100644
--- a/source/x/x11/post-install/xf86-input-libinput.post-install
+++ b/source/x/x11/post-install/xf86-input-libinput.post-install
@@ -1,4 +1,49 @@
-# Add default configuration file:
-mkdir -p $PKG/usr/share/X11/xorg.conf.d
-cp -a conf/99-libinput.conf $PKG/usr/share/X11/xorg.conf.d/
+# Create the configuration directories for xorg-server 1.9.x
+mkdir -p $PKG/etc/X11/xorg.conf.d $PKG/usr/share/X11/xorg.conf.d
+
+# Create a sample keyboard layout
+# Enable zapping by default
+cat << EOF > $PKG/usr/share/X11/xorg.conf.d/91-keyboard-layout-libinput.conf
+Section "InputClass"
+ Identifier "libinput keyboard catchall"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+ Option "XkbLayout" "us"
+ #Option "XkbVariant" ""
+ Option "XkbOptions" "terminate:ctrl_alt_bksp"
+EndSection
+
+# READ THIS FOR CUSTOM KEYBOARD INFORMATION
+#
+# If you want to add a custom model/layout/variant to X, you will need to COPY
+# this file to /etc/X11/xorg.conf.d/ and edit that copy. After editing it to
+# suit, you will need to restart X.
+#
+# Here's an example of the lines from above:
+#
+# Section "InputClass"
+# Identifier "libinput keyboard catchall"
+# MatchIsKeyboard "on"
+# MatchDevicePath "/dev/input/event*"
+# Driver "libinput"
+# Option "XkbLayout" "us"
+# Option "XkbVariant" "intl"
+# Option "XkbOptions" "compose:rwin,terminate:ctrl_alt_bksp"
+# EndSection
+#
+# Many desktop environments, including KDE and Xfce, have their own methods to
+# configure keyboard layouts and such if you'd like to use them.
+#
+# If you prefer to use the "old" way of configuring keyboards (without input
+# device hotplugging), then you'll need to add the following lines to the
+# ServerFlags section of /etc/X11/xorg.conf:
+# Option "AllowEmptyInput" "false"
+# Option "AutoAddDevices" "false"
+# Option "AutoEnableDevices" "false"
+# Alternatively, you can break this up into separate "stubs" in the xorg.conf.d/
+# directory, but that's your call. Assuming you elect to keep a monolithic
+# /etc/X11/xorg.conf file, you can now edit the Keyboard section as usual.
+
+EOF
diff --git a/source/x/x11/post-install/xorg-server.post-install b/source/x/x11/post-install/xorg-server.post-install
index e21a0f03..dd9e2096 100644
--- a/source/x/x11/post-install/xorg-server.post-install
+++ b/source/x/x11/post-install/xorg-server.post-install
@@ -3,7 +3,7 @@ mkdir -p $PKG/etc/X11/xorg.conf.d $PKG/usr/share/X11/xorg.conf.d
# Create a sample keyboard layout
# Enable zapping by default
-cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout.conf
+cat << EOF > $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout-evdev.conf
Section "InputClass"
Identifier "keyboard-all"
MatchIsKeyboard "on"
@@ -47,6 +47,17 @@ EndSection
EOF
+## Nope, we will not include 91-keyboard-layout-libinput.conf in the
+## xorg-server package. It is better to put it into the xf86-input-libinput
+## package so that if that driver is removed, then X.Org will fall back to
+## using evdev. Perhaps we'll revisit this arrangement when evdev is a little
+## bit more obsolete. :-)
+##
+#sed -e 's,Identifier "keyboard-all",Identifier "libinput keyboard catchall",g' \
+# -e 's,Driver "evdev",Driver "libinput",g' \
+# $PKG/usr/share/X11/xorg.conf.d/90-keyboard-layout-evdev.conf > \
+# $PKG/usr/share/X11/xorg.conf.d/91-keyboard-layout-libinput.conf
+
# Add COPYING file:
mkdir -p $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
cp -a COPYING $PKG/usr/doc/xorg-server-$MODULAR_PACKAGE_VERSION
@@ -57,7 +68,7 @@ rmdir $PKG/var
# While I hate to have X11 take over another generic-sounding
# piece of prime filesystem real estate, this symlink will
-# direct (for now) proprietary X drivers into the corrent
+# direct (for now) proprietary X drivers into the correct
# location:
( cd $PKG/usr/lib
diff --git a/source/x/x11/post-install/xorgproto.post-install b/source/x/x11/post-install/xorgproto.post-install
new file mode 100644
index 00000000..7a3fa975
--- /dev/null
+++ b/source/x/x11/post-install/xorgproto.post-install
@@ -0,0 +1,5 @@
+# These all have the arch specific library path in them, so usr/share is not
+# the right place to keep them:
+mkdir -p $PKG/usr/lib
+mv $PKG/usr/share/pkgconfig $PKG/usr/lib
+rmdir $PKG/usr/share 2> /dev/null
diff --git a/source/x/x11/slack-desc/appres b/source/x/x11/slack-desc/appres
index 001a3f34..116e47c0 100644
--- a/source/x/x11/slack-desc/appres
+++ b/source/x/x11/slack-desc/appres
@@ -10,7 +10,7 @@ appres: appres (X resource inspection utility)
appres:
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: instance names. It can be used to determine which resources a
appres: particular program will load.
appres:
appres:
diff --git a/source/x/x11/slack-desc/bdftopcf b/source/x/x11/slack-desc/bdftopcf
index c9514c16..daf8394e 100644
--- a/source/x/x11/slack-desc/bdftopcf
+++ b/source/x/x11/slack-desc/bdftopcf
@@ -10,7 +10,7 @@ bdftopcf: bdftopcf (font compiler for the X server and font server)
bdftopcf:
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: 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:
diff --git a/source/x/x11/slack-desc/beforelight b/source/x/x11/slack-desc/beforelight
index a2a5f48e..9746b771 100644
--- a/source/x/x11/slack-desc/beforelight
+++ b/source/x/x11/slack-desc/beforelight
@@ -9,10 +9,10 @@
beforelight: beforelight (X11 screensaver)
beforelight:
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: 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: such as screen locking or configurability.
+beforelight:
beforelight:
beforelight:
beforelight:
diff --git a/source/x/x11/slack-desc/iceauth b/source/x/x11/slack-desc/iceauth
index 54f525d6..047077ae 100644
--- a/source/x/x11/slack-desc/iceauth
+++ b/source/x/x11/slack-desc/iceauth
@@ -9,7 +9,7 @@
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: information used in connecting with ICE. It operates very much like
iceauth: the xauth program for X11 connection authentication records.
iceauth:
iceauth:
diff --git a/source/x/x11/slack-desc/ico b/source/x/x11/slack-desc/ico
index b4aeb4a5..75563fef 100644
--- a/source/x/x11/slack-desc/ico
+++ b/source/x/x11/slack-desc/ico
@@ -9,7 +9,7 @@
ico: ico (X11 test client)
ico:
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: 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:
diff --git a/source/x/x11/slack-desc/imake b/source/x/x11/slack-desc/imake
index 53599ebf..23231daa 100644
--- a/source/x/x11/slack-desc/imake
+++ b/source/x/x11/slack-desc/imake
@@ -10,7 +10,7 @@ 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: cleanlinks, mkhtmlindex, and xmkmf.
imake:
imake:
imake:
diff --git a/source/x/x11/slack-desc/intel-gpu-tools b/source/x/x11/slack-desc/intel-gpu-tools
index 3fcee9a3..908475c6 100644
--- a/source/x/x11/slack-desc/intel-gpu-tools
+++ b/source/x/x11/slack-desc/intel-gpu-tools
@@ -9,7 +9,7 @@
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-gpu-tools: Intel DRM driver. There are many macro-level test suites including
+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:
diff --git a/source/x/x11/slack-desc/libXau b/source/x/x11/slack-desc/libXau
index 6e565d76..73db2967 100644
--- a/source/x/x11/slack-desc/libXau
+++ b/source/x/x11/slack-desc/libXau
@@ -8,10 +8,10 @@
|-----handy-ruler------------------------------------------------------|
libXau: libXau (Sample Authorization Protocol for X)
libXau:
-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: 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:
diff --git a/source/x/x11/slack-desc/libXaw3d b/source/x/x11/slack-desc/libXaw3d
index 48f7ddc3..73f4f174 100644
--- a/source/x/x11/slack-desc/libXaw3d
+++ b/source/x/x11/slack-desc/libXaw3d
@@ -9,7 +9,7 @@
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: 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
diff --git a/source/x/x11/slack-desc/libXcm b/source/x/x11/slack-desc/libXcm
index 0516aaf7..7b8edff1 100644
--- a/source/x/x11/slack-desc/libXcm
+++ b/source/x/x11/slack-desc/libXcm
@@ -9,7 +9,7 @@
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: spec. It allows to attach color regions to X windows to communicate
libXcm: with color servers.
libXcm:
libXcm:
diff --git a/source/x/x11/slack-desc/libXfont b/source/x/x11/slack-desc/libXfont
deleted file mode 100644
index d78d6a0e..00000000
--- a/source/x/x11/slack-desc/libXfont
+++ /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------------------------------------------------------|
-libXfont: libXfont (library for legacy X11 font system)
-libXfont:
-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/libXfont2 b/source/x/x11/slack-desc/libXfont2
new file mode 100644
index 00000000..35081973
--- /dev/null
+++ b/source/x/x11/slack-desc/libXfont2
@@ -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------------------------------------------------------|
+libXfont2: libXfont2 (X11 font system library)
+libXfont2:
+libXfont2: libXfont2 provides the core of the new X11 font system, handling the
+libXfont2: index files (fonts.dir, fonts.alias, fonts.scale), the various font
+libXfont2: file formats, and rasterizing them. It is used by the X servers, the
+libXfont2: X Font Server (xfs), and some font utilities (bdftopcf for instance),
+libXfont2: but should not be used by normal X11 clients. X11 clients access fonts
+libXfont2: via either the new API's in libXft, or the legacy API's in libX11.
+libXfont2:
+libXfont2:
+libXfont2:
diff --git a/source/x/x11/slack-desc/libXmu b/source/x/x11/slack-desc/libXmu
index de36044c..d20d9536 100644
--- a/source/x/x11/slack-desc/libXmu
+++ b/source/x/x11/slack-desc/libXmu
@@ -9,7 +9,7 @@
libXmu: libXmu (X miscellaneous utility library)
libXmu:
libXmu: This library contains miscellaneous utilities and is not part of the
-libXmu: Xlib standard. It contains routines which only use public interfaces
+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:
diff --git a/source/x/x11/slack-desc/libxcb b/source/x/x11/slack-desc/libxcb
index 35182210..356370f3 100644
--- a/source/x/x11/slack-desc/libxcb
+++ b/source/x/x11/slack-desc/libxcb
@@ -9,8 +9,8 @@
libxcb: libxcb (X protocol C-language Binding)
libxcb:
libxcb: The XCB library provides an interface to the X Window System protocol
-libxcb: which is fully capable of replacing Xlib. In fact, libX11 makes use
-libxcb: of libxcb as much as possible. :-) Porting to XCB has several
+libxcb: which is fully capable of replacing Xlib. In fact, libX11 makes use
+libxcb: of libxcb as much as possible. :-) Porting to XCB has several
libxcb: advantages such as a smaller memory footprint, latency hiding, direct
libxcb: protocol access, and improved thread support.
libxcb:
diff --git a/source/x/x11/slack-desc/luit b/source/x/x11/slack-desc/luit
index cd9d9664..f2f8b5f4 100644
--- a/source/x/x11/slack-desc/luit
+++ b/source/x/x11/slack-desc/luit
@@ -9,7 +9,7 @@
luit: luit (character encoding convertor for X11 terminals)
luit:
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: 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:
diff --git a/source/x/x11/slack-desc/presentproto b/source/x/x11/slack-desc/presentproto
index 8443306b..1881a9df 100644
--- a/source/x/x11/slack-desc/presentproto
+++ b/source/x/x11/slack-desc/presentproto
@@ -8,7 +8,7 @@
|-----handy-ruler------------------------------------------------------|
presentproto: presentproto (X.Org Present protocol specification)
presentproto:
-presentproto: X.Org Present protocol specification and Xlib/Xserver headers
+presentproto: X.Org Present protocol specification and Xlib/Xserver headers.
presentproto:
presentproto:
presentproto:
diff --git a/source/x/x11/slack-desc/randrproto b/source/x/x11/slack-desc/randrproto
index f97ca095..a1d571db 100644
--- a/source/x/x11/slack-desc/randrproto
+++ b/source/x/x11/slack-desc/randrproto
@@ -8,7 +8,7 @@
|-----handy-ruler------------------------------------------------------|
randrproto: randrproto (C prototypes for RandR)
randrproto:
-randrproto: RandR is the X11 Resize and Rotate Extension
+randrproto: RandR is the X11 Resize and Rotate Extension.
randrproto:
randrproto:
randrproto:
diff --git a/source/x/x11/slack-desc/xbiff b/source/x/x11/slack-desc/xbiff
index 289c9738..699b04fe 100644
--- a/source/x/x11/slack-desc/xbiff
+++ b/source/x/x11/slack-desc/xbiff
@@ -8,7 +8,7 @@
|-----handy-ruler------------------------------------------------------|
xbiff: xbiff (X11 mail notifier)
xbiff:
-xbiff: xbiff provides graphical notification of new e-mail. It only handles
+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:
diff --git a/source/x/x11/slack-desc/xclipboard b/source/x/x11/slack-desc/xclipboard
index fc0bcb45..cfe2d8cf 100644
--- a/source/x/x11/slack-desc/xclipboard
+++ b/source/x/x11/slack-desc/xclipboard
@@ -9,8 +9,8 @@
xclipboard: xclipboard (X11 clipboard utility)
xclipboard:
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: 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:
diff --git a/source/x/x11/slack-desc/xclock b/source/x/x11/slack-desc/xclock
index 39cb9ff1..6d426eba 100644
--- a/source/x/x11/slack-desc/xclock
+++ b/source/x/x11/slack-desc/xclock
@@ -8,7 +8,7 @@
|-----handy-ruler------------------------------------------------------|
xclock: xclock (X11 on-screen clock)
xclock:
-xclock: xclock is the classic X Window System clock utility. It displays the
+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:
diff --git a/source/x/x11/slack-desc/xcompmgr b/source/x/x11/slack-desc/xcompmgr
index f5527a84..dc94fbc9 100644
--- a/source/x/x11/slack-desc/xcompmgr
+++ b/source/x/x11/slack-desc/xcompmgr
@@ -9,7 +9,7 @@
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: XFIXES, DAMAGE, RENDER, and COMPOSITE extensions. It enables basic
xcompmgr: eye-candy effects.
xcompmgr:
xcompmgr:
diff --git a/source/x/x11/slack-desc/xconsole b/source/x/x11/slack-desc/xconsole
index 2a543f2e..431184c0 100644
--- a/source/x/x11/slack-desc/xconsole
+++ b/source/x/x11/slack-desc/xconsole
@@ -9,7 +9,7 @@
xconsole: xconsole (X11 console)
xconsole:
xconsole: xconsole displays in a X11 window the messages which are usually sent
-xconsole: to /dev/console
+xconsole: to /dev/console.
xconsole:
xconsole:
xconsole:
diff --git a/source/x/x11/slack-desc/xev b/source/x/x11/slack-desc/xev
index 4e78a1b6..b291d74b 100644
--- a/source/x/x11/slack-desc/xev
+++ b/source/x/x11/slack-desc/xev
@@ -10,8 +10,8 @@ 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: 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.
diff --git a/source/x/x11/slack-desc/xf86-input-keyboard b/source/x/x11/slack-desc/xf86-input-keyboard
index e72beb41..eb3e6211 100644
--- a/source/x/x11/slack-desc/xf86-input-keyboard
+++ b/source/x/x11/slack-desc/xf86-input-keyboard
@@ -8,7 +8,7 @@
|-----handy-ruler------------------------------------------------------|
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: 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:
diff --git a/source/x/x11/slack-desc/xf86-input-mouse b/source/x/x11/slack-desc/xf86-input-mouse
index 73bd88af..4832ee01 100644
--- a/source/x/x11/slack-desc/xf86-input-mouse
+++ b/source/x/x11/slack-desc/xf86-input-mouse
@@ -8,7 +8,7 @@
|-----handy-ruler------------------------------------------------------|
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: 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:
diff --git a/source/x/x11/slack-desc/xf86-input-wacom b/source/x/x11/slack-desc/xf86-input-wacom
index 86f4ca62..2414a43c 100644
--- a/source/x/x11/slack-desc/xf86-input-wacom
+++ b/source/x/x11/slack-desc/xf86-input-wacom
@@ -9,10 +9,10 @@
xf86-input-wacom: xf86-input-wacom (driver for Wacom tablets)
xf86-input-wacom:
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: tablets.
+xf86-input-wacom:
+xf86-input-wacom: Homepage: https://github.com/linuxwacom/xf86-input-wacom
+xf86-input-wacom:
xf86-input-wacom:
xf86-input-wacom:
xf86-input-wacom:
diff --git a/source/x/x11/slack-desc/xf86-video-vboxvideo b/source/x/x11/slack-desc/xf86-video-vboxvideo
new file mode 100644
index 00000000..df80d0a3
--- /dev/null
+++ b/source/x/x11/slack-desc/xf86-video-vboxvideo
@@ -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------------------------------------------------------|
+xf86-video-vboxvideo: xf86-video-vboxvideo (VirtualBox virtual video card driver)
+xf86-video-vboxvideo:
+xf86-video-vboxvideo: xf86-video-vboxvideo is part of X11.
+xf86-video-vboxvideo:
+xf86-video-vboxvideo: For more information about the X.Org Foundation (the providers of the
+xf86-video-vboxvideo: X.Org implementation of the X Window System), see their website:
+xf86-video-vboxvideo:
+xf86-video-vboxvideo: http://www.x.org
+xf86-video-vboxvideo:
+xf86-video-vboxvideo:
+xf86-video-vboxvideo:
diff --git a/source/x/x11/slack-desc/xf86dgaproto b/source/x/x11/slack-desc/xf86dgaproto
index cbc21ac6..faae89d3 100644
--- a/source/x/x11/slack-desc/xf86dgaproto
+++ b/source/x/x11/slack-desc/xf86dgaproto
@@ -9,7 +9,7 @@
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: in X.Org. It provides direct, framebuffer-like, graphics access.
xf86dgaproto:
xf86dgaproto:
xf86dgaproto:
diff --git a/source/x/x11/slack-desc/xf86miscproto b/source/x/x11/slack-desc/xf86miscproto
index bf1297b1..c410045f 100644
--- a/source/x/x11/slack-desc/xf86miscproto
+++ b/source/x/x11/slack-desc/xf86miscproto
@@ -9,7 +9,7 @@
xf86miscproto: xf86miscproto (C prototypes for XFree86-Misc)
xf86miscproto:
xf86miscproto: This package includes the protocol definitions of the "XFree86-Misc"
-xf86miscproto: extension to the X11 protocol. The "XFree86-Misc" extension is
+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:
diff --git a/source/x/x11/slack-desc/xinit b/source/x/x11/slack-desc/xinit
index c64cd86a..4dd2ff05 100644
--- a/source/x/x11/slack-desc/xinit
+++ b/source/x/x11/slack-desc/xinit
@@ -8,9 +8,9 @@
|-----handy-ruler------------------------------------------------------|
xinit: xinit (scripts to start X11 servers)
xinit:
-xinit: xinit is not intended for naive users. Instead, site administrators
+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: when starting up X. The startx script is one such example.
xinit:
xinit:
xinit:
diff --git a/source/x/x11/slack-desc/xkill b/source/x/x11/slack-desc/xkill
index 66904b44..b9774607 100644
--- a/source/x/x11/slack-desc/xkill
+++ b/source/x/x11/slack-desc/xkill
@@ -9,7 +9,7 @@
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: 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:
diff --git a/source/x/x11/slack-desc/xmessage b/source/x/x11/slack-desc/xmessage
index 233d4aa2..c56e52e6 100644
--- a/source/x/x11/slack-desc/xmessage
+++ b/source/x/x11/slack-desc/xmessage
@@ -9,7 +9,7 @@
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: one of several buttons to answer a question. xmessage can also exit
xmessage: after a specified time.
xmessage:
xmessage:
diff --git a/source/x/x11/slack-desc/xmh b/source/x/x11/slack-desc/xmh
index 8730f1f2..2078f5f6 100644
--- a/source/x/x11/slack-desc/xmh
+++ b/source/x/x11/slack-desc/xmh
@@ -9,7 +9,7 @@
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: Handling System. To actually do things with your mail, it makes
xmh: calls to the MH package.
xmh:
xmh:
diff --git a/source/x/x11/slack-desc/xmodmap b/source/x/x11/slack-desc/xmodmap
index 9397f1c3..d361aabd 100644
--- a/source/x/x11/slack-desc/xmodmap
+++ b/source/x/x11/slack-desc/xmodmap
@@ -10,7 +10,7 @@ xmodmap: xmodmap (X11 keyboard utility)
xmodmap:
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: 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:
diff --git a/source/x/x11/slack-desc/xorg-server b/source/x/x11/slack-desc/xorg-server
index 9d25b405..a67825a6 100644
--- a/source/x/x11/slack-desc/xorg-server
+++ b/source/x/x11/slack-desc/xorg-server
@@ -9,10 +9,10 @@
xorg-server: xorg-server (The Xorg server, the core of the X Window System)
xorg-server:
xorg-server: Xorg is a full featured X server that was originally designed for UNIX
-xorg-server: and UNIX-like operating systems running on Intel x86 hardware. It now
+xorg-server: and UNIX-like operating systems running on Intel x86 hardware. It now
xorg-server: runs on a wider range of hardware and OS platforms. This work was
xorg-server: derived by the X.Org Foundation from the XFree86 Project's XFree86
-xorg-server: 4.4rc2 release. The XFree86 release was originally derived from X386
+xorg-server: 4.4rc2 release. The XFree86 release was originally derived from X386
xorg-server: 1.2 by Thomas Roell which was contributed to X11R5 by Snitily Graphics
xorg-server: Consulting Service.
xorg-server:
diff --git a/source/x/x11/slack-desc/xorg-server-xnest b/source/x/x11/slack-desc/xorg-server-xnest
index 393f93bd..3995fc84 100644
--- a/source/x/x11/slack-desc/xorg-server-xnest
+++ b/source/x/x11/slack-desc/xorg-server-xnest
@@ -9,10 +9,10 @@
xorg-server-xnest: xorg-server-xnest (a nested X server)
xorg-server-xnest:
xorg-server-xnest: Xnest is an experimental nested server for X that acts as both a
-xorg-server-xnest: client and a server. Xnest is a client of the real server which
+xorg-server-xnest: client and a server. Xnest is a client of the real server which
xorg-server-xnest: manages windows and graphics requests on its behalf. Xnest is a
-xorg-server-xnest: server to its own clients. Xnest manages windows and graphics
-xorg-server-xnest: requests on their behalf. To these clients Xnest appears to be a
+xorg-server-xnest: server to its own clients. Xnest manages windows and graphics
+xorg-server-xnest: requests on their behalf. To these clients Xnest appears to be a
xorg-server-xnest: conventional server.
xorg-server-xnest:
xorg-server-xnest:
diff --git a/source/x/x11/slack-desc/xorg-server-xvfb b/source/x/x11/slack-desc/xorg-server-xvfb
index aff9c642..c9a0ae89 100644
--- a/source/x/x11/slack-desc/xorg-server-xvfb
+++ b/source/x/x11/slack-desc/xorg-server-xvfb
@@ -9,11 +9,11 @@
xorg-server-xvfb: xorg-server-xvfb (virtual framebuffer X server)
xorg-server-xvfb:
xorg-server-xvfb: Xvfb is an X server that can run on machines with no display hardware
-xorg-server-xvfb: and no physical input devices. It emulates a dumb framebuffer using
-xorg-server-xvfb: virtual memory. The primary use of this server is intended to be
-xorg-server-xvfb: server testing. The mfb or cfb code for any depth can be exercised
+xorg-server-xvfb: and no physical input devices. It emulates a dumb framebuffer using
+xorg-server-xvfb: virtual memory. The primary use of this server is intended to be
+xorg-server-xvfb: server testing. The mfb or cfb code for any depth can be exercised
xorg-server-xvfb: with this server without the need for real hardware that supports the
-xorg-server-xvfb: desired depths. A secondary use is testing clients against unusual
+xorg-server-xvfb: desired depths. A secondary use is testing clients against unusual
xorg-server-xvfb: depths and screen configurations.
xorg-server-xvfb:
xorg-server-xvfb:
diff --git a/source/x/x11/slack-desc/xorg-sgml-doctools b/source/x/x11/slack-desc/xorg-sgml-doctools
index df867004..6f107294 100644
--- a/source/x/x11/slack-desc/xorg-sgml-doctools
+++ b/source/x/x11/slack-desc/xorg-sgml-doctools
@@ -10,7 +10,7 @@ xorg-sgml-doctools: xorg-sgml-doctools (X.org documentation tools)
xorg-sgml-doctools:
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: 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.
diff --git a/source/x/x11/slack-desc/xorgproto b/source/x/x11/slack-desc/xorgproto
new file mode 100644
index 00000000..7467a11c
--- /dev/null
+++ b/source/x/x11/slack-desc/xorgproto
@@ -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------------------------------------------------------|
+xorgproto: xorgproto (X11 protocol headers)
+xorgproto:
+xorgproto: xorgproto is part of X11.
+xorgproto:
+xorgproto: For more information about the X.Org Foundation (the providers of the
+xorgproto: X.Org implementation of the X Window System), see their website:
+xorgproto:
+xorgproto: http://www.x.org
+xorgproto:
+xorgproto:
+xorgproto:
diff --git a/source/x/x11/slack-desc/xpr b/source/x/x11/slack-desc/xpr
index 45936d40..07ba2d2d 100644
--- a/source/x/x11/slack-desc/xpr
+++ b/source/x/x11/slack-desc/xpr
@@ -8,8 +8,8 @@
|-----handy-ruler------------------------------------------------------|
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 takes as input a window dump file produced by xwd and formats it
+xpr: for output on various types of printers.
xpr:
xpr:
xpr:
diff --git a/source/x/x11/slack-desc/xpyb b/source/x/x11/slack-desc/xpyb
index 4d96cc27..9a41a08b 100644
--- a/source/x/x11/slack-desc/xpyb
+++ b/source/x/x11/slack-desc/xpyb
@@ -8,8 +8,8 @@
|-----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 provides a Python binding to the X Window System protocol via
+xpyb: libxcb.
xpyb:
xpyb:
xpyb:
diff --git a/source/x/x11/slack-desc/xrandr b/source/x/x11/slack-desc/xrandr
index 059fe1b3..8ae2e897 100644
--- a/source/x/x11/slack-desc/xrandr
+++ b/source/x/x11/slack-desc/xrandr
@@ -8,8 +8,8 @@
|-----handy-ruler------------------------------------------------------|
xrandr: xrandr (X11 RandR utility)
xrandr:
-xrandr: Primitive command line interface to X11 Resize, Rotate, and Reflect
-xrandr: (RandR) extension
+xrandr: Primitive command line interface to the X11 Resize, Rotate, and
+xrandr: Reflect (RandR) extensions.
xrandr:
xrandr:
xrandr:
diff --git a/source/x/x11/slack-desc/xstdcmap b/source/x/x11/slack-desc/xstdcmap
index f659e758..9de5b671 100644
--- a/source/x/x11/slack-desc/xstdcmap
+++ b/source/x/x11/slack-desc/xstdcmap
@@ -9,7 +9,7 @@
xstdcmap: xstdcmap (X11 color utility)
xstdcmap:
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: 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.
diff --git a/source/x/x11/slack-desc/xtrans b/source/x/x11/slack-desc/xtrans
index 26c4866a..06274067 100644
--- a/source/x/x11/slack-desc/xtrans
+++ b/source/x/x11/slack-desc/xtrans
@@ -10,7 +10,7 @@ xtrans: xtrans (X network transport library)
xtrans:
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: 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:
diff --git a/source/x/x11/src/xf86-input-wacom.url b/source/x/x11/src/xf86-input-wacom.url
index 6bb92bba..9550a800 100644
--- a/source/x/x11/src/xf86-input-wacom.url
+++ b/source/x/x11/src/xf86-input-wacom.url
@@ -1 +1 @@
-https://sourceforge.net/projects/linuxwacom/files
+https://github.com/linuxwacom/xf86-input-wacom
diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild
index d2d75e4f..ffce8b0a 100755
--- a/source/x/x11/x11.SlackBuild
+++ b/source/x/x11/x11.SlackBuild
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 2007-2014 Patrick J. Volkerding, Sebeka, MN, USA
+#!/bin/bash
+# Copyright 2007-2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,11 +26,11 @@
# ./x11.SlackBuild lib libX11
# Upgrade packages as they are built.
-# Default is to upgrade new packages (UPGRADE_PACKAGES=yes).
-# To install ALL newly built packages (even if they are already installed),
-# use UPGRADE_PACKAGES=always
-# To not upgrade, pass UPGRADE_PACKAGES=no
-UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-yes}
+# Default is to always upgrade newly-built packages (UPGRADE_PACKAGES=always).
+# To install newly built packages only if a package with the exact name is not
+# already installed, use UPGRADE_PACKAGES=yes
+# To not upgrade as packages are built, pass UPGRADE_PACKAGES=no
+UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-always}
pkgbase() {
PKGEXT=$(echo $1 | rev | cut -f 1 -d . | rev)
@@ -55,8 +55,18 @@ pkgbase() {
}
# Set initial variables:
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
+cd $(dirname $0) ; CWD=$(pwd)
+if [ -z "$TMP" ]; then
+ TMP=/tmp
+ # Old default output directory. If $TMP wasn't predefined, we'll default to
+ # using it unless a different value is provided:
+ SLACK_X_BUILD_DIR=${SLACK_X_BUILD_DIR:-/tmp/x11-build}
+else
+ # $TMP already set. We'll also use it for the output directory unless
+ # a different value is provided:
+ SLACK_X_BUILD_DIR=${SLACK_X_BUILD_DIR:-$TMP}
+fi
+mkdir -p $TMP $SLACK_X_BUILD_DIR
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -130,9 +140,6 @@ no_usr_share_doc() {
# Set the compile options for the $ARCH being used:
. $CWD/arch.use.flags
-SLACK_X_BUILD_DIR=$TMP/x11-build
-mkdir -p $SLACK_X_BUILD_DIR
-
# Better have some binaries installed first, as this may not be
# in the "magic order". I built mine by hand through trial-and-error
# before getting this script to work. It wasn't that hard... I think. ;-)
@@ -171,9 +178,11 @@ mkdir -p $SLACK_X_BUILD_DIR
continue
fi
else
- echo
- echo "Building from source ${x_pkg}"
- echo
+ if [ -z "$PRINT_PACKAGE_NAME" ]; then
+ echo
+ echo "Building from source ${x_pkg}"
+ echo
+ fi
fi
if grep -wq "^$PKGNAME" ${CWD}/modularize ; then
# Set $PKG to a private dir for the modular package build:
@@ -185,6 +194,25 @@ mkdir -p $SLACK_X_BUILD_DIR
# Let's figure out the version number on the modular package:
MODULAR_PACKAGE_VERSION=$(echo $x_pkg | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+ # If this variable is passed to the script, nothing will be built.
+ # Instead, a list of packages to be built will be output.
+ if [ ! -z "$PRINT_PACKAGE_NAME" ]; then
+ if [ -r $CWD/build/${PKGNAME} ]; then
+ MODBUILD=$(cat $CWD/build/${PKGNAME})
+ else
+ MODBUILD=$BUILD
+ fi
+ if [ ! "${PKGNAME}" = "xorg-server" ]; then
+ echo "${PKGNAME}-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+ else
+ echo "xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+ echo "xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+ echo "xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+ echo "xorg-server-${MODULAR_PACKAGE_VERSION}-${PKGARCH}-${MODBUILD}.txz"
+ fi
+ continue
+ fi
+
rm -rf $(pkgbase $x_pkg)
tar xf $CWD/src/${x_source_dir}/${x_pkg} || exit 1
cd $(pkgbase $x_pkg) || exit 1
@@ -207,12 +235,18 @@ mkdir -p $SLACK_X_BUILD_DIR
. $CWD/configure/configure
fi
- if ! make $NUMJOBS ; then
- touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
- continue
- fi
+ # Run make, using custom make script if needed:
+ if [ -r $CWD/make/${PKGNAME} ]; then
+ . $CWD/make/${PKGNAME}
+ else
+ # This is the default make && make install routine:
+ if ! make $NUMJOBS ; then
+ touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
+ continue
+ fi
- make install DESTDIR=$PKG
+ make install DESTDIR=$PKG
+ fi
mkdir -p $PKG/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION}
cp -a \
@@ -238,6 +272,9 @@ mkdir -p $SLACK_X_BUILD_DIR
find . | xargs file | grep "current ar archive" | grep ELF | cut -f 1 -d : | xargs strip -g 2> /dev/null
)
+ # Don't ship .la files:
+ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# If there's any special post-install things to do, do them:
if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then
RUNSCRIPT=$(mktemp -p $TMP) || exit 1
diff --git a/source/x/xdg-user-dirs/slack-desc b/source/x/xdg-user-dirs/slack-desc
index 543415cb..8ea42800 100644
--- a/source/x/xdg-user-dirs/slack-desc
+++ b/source/x/xdg-user-dirs/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
@@ -10,7 +10,7 @@ xdg-user-dirs: xdg-user-dirs (manage XDG user directories)
xdg-user-dirs:
xdg-user-dirs: xdg-user-dirs is a tool used by various XDG compliant desktop
xdg-user-dirs: environments to locate user well-known user directories such as
-xdg-user-dirs: the Desktop folder. It also handles localization/translation of the
+xdg-user-dirs: the Desktop folder. It also handles localization/translation of the
xdg-user-dirs: filenames.
xdg-user-dirs:
xdg-user-dirs: Homepage: http://freedesktop.org/wiki/Software/xdg-user-dirs
diff --git a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
index c6cd2332..9bea00aa 100755
--- a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
+++ b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for xdg-user-dirs
# Copyright 2010 Robby Workman, Northport, Alabama, USA
-# Copyright 2014 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2014, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,24 +23,33 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=xdg-user-dirs
VERSION=${VERSION:-0.15}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/source/x/xdg-utils/slack-desc b/source/x/xdg-utils/slack-desc
index ef97cc6d..97568200 100644
--- a/source/x/xdg-utils/slack-desc
+++ b/source/x/xdg-utils/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
xdg-utils: xdg-utils (command line tools that assist applications)
xdg-utils:
xdg-utils: Xdg-utils is a set of command line tools that assist applications
-xdg-utils: with a variety of desktop integration tasks. About half of the
+xdg-utils: with a variety of desktop integration tasks. About half of the
xdg-utils: tools focus on tasks commonly required during the installation of
xdg-utils: a desktop application and the other half focuses on integration
xdg-utils: with the desktop environment while the application is running.
xdg-utils:
-xdg-utils: Homepage: http://portland.freedesktop.org/wiki/
+xdg-utils: Homepage: http://portland.freedesktop.org/wiki/
xdg-utils:
xdg-utils:
diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild
index 43dd6145..078026eb 100755
--- a/source/x/xdg-utils/xdg-utils.SlackBuild
+++ b/source/x/xdg-utils/xdg-utils.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for xdg-utils
# Written by Erik Hanson erik@slackbuilds.org
# Modified for VERSION version by Patrick Volkerding <volkerdi@slackware.com>
-# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,18 +24,25 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xdg-utils
-VERSION=1.1.1
+VERSION=1.1.3
+PKG_VERSION=${VERSION/-/_}
ARCH=noarch
BUILD=${BUILD:-1}
-PKG_VERSION=${VERSION/-/_}
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$PKG_VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
NUMJOBS=${NUMJOBS:-" -j7 "}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -44,7 +51,7 @@ mkdir -p $TMP $PKG
cd $TMP || exit 1
rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
@@ -68,7 +75,7 @@ gzip -9 $PKG/usr/man/man1/*
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
- LICENSE README RELEASE_NOTES TODO \
+ COPYING* LICENSE RE* TODO \
$PKG/usr/doc/$PKGNAM-$VERSION
# If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/x/xterm/slack-desc b/source/x/xterm/slack-desc
index d5bea31d..d864a71e 100644
--- a/source/x/xterm/slack-desc
+++ b/source/x/xterm/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index cc992591..4991aa4e 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2006-2010 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006-2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,9 +20,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xterm
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | 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}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -37,7 +38,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-${PKGNAM}
@@ -55,7 +63,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
cd ${PKGNAM}-$VERSION
if [ -d $CWD/patches ]; then
@@ -88,10 +96,12 @@ CFLAGS="$SLKCFLAGS" \
--enable-wide-chars \
--enable-88-color \
--enable-256-color \
+ --enable-regis-graphics \
+ --enable-sixel-graphics \
--with-icon-theme=hicolor \
--with-icondir=/usr/share/icons \
--with-pixmapdir=/usr/share/pixmaps \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux || exit 1
# Build and install:
make $NUMJOBS || make || exit 1