diff options
| author | Mattias Andrée <m@maandree.se> | 2024-10-08 20:28:25 +0200 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2024-10-08 20:28:25 +0200 |
| commit | 472e769077880733441136516ce8f71be35939f1 (patch) | |
| tree | 424589dfda6ca797b08e6c58b57c4476a8c1dbc2 | |
| parent | Update e-mail (diff) | |
| download | aur-packages-472e769077880733441136516ce8f71be35939f1.tar.gz aur-packages-472e769077880733441136516ce8f71be35939f1.tar.bz2 aur-packages-472e769077880733441136516ce8f71be35939f1.tar.xz | |
Remove some old packages
Signed-off-by: Mattias Andrée <m@maandree.se>
91 files changed, 0 insertions, 4278 deletions
diff --git a/blender-plugin-vectex/64bit.patch b/blender-plugin-vectex/64bit.patch deleted file mode 100644 index 29fb433..0000000 --- a/blender-plugin-vectex/64bit.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- Makefile 2008-02-25 02:05:56.000000000 +0000 -+++ Makefile_modified 2008-05-09 21:00:18.000000000 +0100 -@@ -8,7 +8,7 @@ - expat: expat-1.95.8/.libs/libexpat.a - - expat-1.95.8/.libs/libexpat.a: -- cd expat-1.95.8; ./configure; make -+ cd expat-1.95.8; CFLAGS="$(CFLAGS) -fPIC" ./configure; make - - INC=-fPIC -shared -O -ansi -Iblender -Iagg-2.5/include -Iexpat-1.95.8/lib - # -DDEBUG ---- agg-2.5/src/Makefile 2006-10-09 05:07:22.000000000 +0100 -+++ agg-2.5/src/Makefile_modified 2008-05-09 21:01:16.000000000 +0100 -@@ -53,7 +53,7 @@ - rm -rf ctrl/SunWS_cache - - %.o: %.cpp -- $(CXX) -c $(CXXFLAGS) $*.cpp -o $@ -+ $(CXX) -fPIC -c $(CXXFLAGS) $*.cpp -o $@ - - %.o: %.c -- $(C) -c $(CXXFLAGS) $*.c -o $@ -+ $(C) -fPIC -c $(CXXFLAGS) $*.c -o $@ diff --git a/blender-plugin-vectex/PKGBUILD b/blender-plugin-vectex/PKGBUILD deleted file mode 100644 index 0b78884..0000000 --- a/blender-plugin-vectex/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -pkgname=blender-plugin-vectex -pkgver=0.9 -pkgrel=3 -pkgdesc="Vectex is a SVG vector texture plugin for Blender" -url="http://code.google.com/p/vectex/" -license=("GPL") -arch=('i686' 'x86_64') -depends=('blender') -makedepends=() -source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/vectex/vectex-${pkgver}-fix.tar.bz2" '64bit.patch') -sha256sums=('6da59482f658f35fb676eb632d1653b6038d8b57ef3121c47e6446805fa15750' - '2e9f86abb9125ccc6d9f41f8751a7eefc32a1183b69bc7868ddb4c5c9820d11f') - -build() { - cd "$srcdir/vectex-$pkgver" - - if [ "${CARCH}" == "x86_64" ]; then - patch -p0 < $startdir/src/64bit.patch - fi - - msg "Starting build process." - MAKEFLAGS= make || return 1 -} - -package() { - cd "$srcdir/vectex-$pkgver" - install -D -m755 vectex.so "$pkgdir/usr/share/blender/plugins/texture/vectex.so" -} - diff --git a/blender-plugin-vectex/upload b/blender-plugin-vectex/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/blender-plugin-vectex/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/blender-plugin-vectex/watch b/blender-plugin-vectex/watch deleted file mode 100755 index 7972b5c..0000000 --- a/blender-plugin-vectex/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'index.html' ] && rm 'index.html' -wget http://code.google.com/p/vectex/ >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep release < index.html | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'blender-plugin-vectex' - fi - rm index.html -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'blender-plugin-vectex (unfetchable)' -fi - diff --git a/consolekit-git/.gitignore b/consolekit-git/.gitignore deleted file mode 100644 index c2e6534..0000000 --- a/consolekit-git/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ConsoleKit/ diff --git a/consolekit-git/PKGBUILD b/consolekit-git/PKGBUILD deleted file mode 100644 index bb80d0d..0000000 --- a/consolekit-git/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -# Previous maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: onestep_ua <onestep@ukr.net> - -pkgname=consolekit-git -pkgver=395.af75e10 -pkgrel=1 -epoch=1 -pkgdesc="A framework for defining and tracking users, login sessions, and seats" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/ConsoleKit" -license=('GPL') -depends=('polkit' 'zlib' 'libx11' 'dbus-glib') -makedepends=('git' 'pkgconfig' 'xmlto' 'docbook-xsl') -replaces=('consolekit') -provides=('consolekit') -conflicts=('consolekit') -options=(!libtool) -source=(git+git://anongit.freedesktop.org/ConsoleKit \ - pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf) -md5sums=('SKIP' - 'a8a4de71d9b0549b8143e5f6c2a36fc7' - '6fefa451d9fe2fc6d6269629d3529793' - '8c5a8059db515d40fae1379daf084094') - -pkgver() { - cd "$srcdir/ConsoleKit" - echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) -} - -build() { - cd "$srcdir/ConsoleKit" - - ./autogen.sh --prefix=/usr \ - --sbindir=/usr/bin \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/ConsoleKit \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --enable-pam-module \ - --with-pam-module-dir=/usr/lib/security \ - --enable-docbook-docs \ - --enable-udev-acl - make -} - -package() { - cd "$srcdir/ConsoleKit" - make DESTDIR="$pkgdir" install - install -m755 "$srcdir/pam-foreground-compat.ck" "$pkgdir/usr/lib/ConsoleKit/run-session.d/" - - # install the logrotate config - install -D -m644 "$srcdir/consolekit.logrotate" "$pkgdir/etc/logrotate.d/consolekit" - - install -D -m644 "$srcdir/consolekit.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/consolekit.conf" - - rm -rf "$pkgdir/var/run" -} diff --git a/consolekit-git/consolekit.logrotate b/consolekit-git/consolekit.logrotate deleted file mode 100644 index 7c5346e..0000000 --- a/consolekit-git/consolekit.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/ConsoleKit/history { - missingok - notifempty - delaycompress -} diff --git a/consolekit-git/consolekit.tmpfiles.conf b/consolekit-git/consolekit.tmpfiles.conf deleted file mode 100644 index 4ec1251..0000000 --- a/consolekit-git/consolekit.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/ConsoleKit 0755 - - - diff --git a/consolekit-git/pam-foreground-compat.ck b/consolekit-git/pam-foreground-compat.ck deleted file mode 100644 index 7f6b122..0000000 --- a/consolekit-git/pam-foreground-compat.ck +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -TAGDIR=/var/run/console - -[ -n "$CK_SESSION_USER_UID" ] || exit 1 - -TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`" - -if [ "$1" = "session_added" ]; then - mkdir -p "$TAGDIR" - echo "$CK_SESSION_ID" >> "$TAGFILE" -fi - -if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then - sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE" - [ -s "$TAGFILE" ] || rm -f "$TAGFILE" -fi diff --git a/consolekit-git/upload b/consolekit-git/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/consolekit-git/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/consolekit-git/watch b/consolekit-git/watch deleted file mode 100755 index d57693b..0000000 --- a/consolekit-git/watch +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -wget 'http://cgit.freedesktop.org/ConsoleKit' -O - 2>/dev/null | grep -Po '\.tar.+>ConsoleKit-.+\.tar' | head -n 1 > release - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum release > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'consolekit-git' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'consolekit-git (unfetchable)' -fi - diff --git a/dash-pipe/PKGBUILD b/dash-pipe/PKGBUILD deleted file mode 100644 index b1527f3..0000000 --- a/dash-pipe/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> - -pkgname=dashpipe -pkgver=1.0.3 -pkgrel=1 -pkgdesc="A utility for ponifying and deponifying text" -arch=('any') -url="http://github.com/DanielOaks/$pkgname/" -license=('MIT') -depends=('perl') -makedepends=('git') -source=("https://github.com/DanielOaks/dashpipe/archive/v${pkgver}.tar.gz") -sha256sums=('c8ed2242113bb5cd867ed934fe0f9745666c289711e70bb54a3c5903e04e3553') - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - diff --git a/dash-pipe/upload b/dash-pipe/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/dash-pipe/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/dash-pipe/watch b/dash-pipe/watch deleted file mode 100755 index 2acc27b..0000000 --- a/dash-pipe/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f release ] && rm release - -wget 'https://github.com/DanielOaks/dashpipe/releases' -O release >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep -Po 'href="[^"]*\.tar\.gz"' < release | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'dashpipe' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'dashpipe (unfetchable)' -fi - diff --git a/dooble-common/PKGBUILD b/dooble-common/PKGBUILD deleted file mode 100644 index cf18109..0000000 --- a/dooble-common/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> - -pkgname=dooble-common -pkgver=1.56c -pkgrel=1 -pkgdesc='Common files for package variants for Dooble' -url='http://dooble.sourceforge.net/' -arch=('any') -license=('custom:3-clause BSD') -depends=() -makedepends=('qt5-tools') -source=("dooble-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz?r=") -sha256sums=('03b5bb0460aa8f4f731a47b70c571942a186fb0e7c4b74f546cef356be0afe6a') - - -build() -{ - cd "$srcdir/dooble.d/Version 1.x/" - lupdate dooble.pro - lrelease dooble.pro -} - -package() -{ - cd "$srcdir/dooble.d/Version 1.x/" - - mkdir -p -- "${pkgdir}/usr/share/dooble/Translations" - mv Translations/*.qm -- "${pkgdir}/usr/share/dooble/Translations" - cd '../Version 2.x' - mv Icons Images Tab -- "${pkgdir}/usr/share/dooble" - cd - - - for s in 16x16 48x48 64x64; do - mkdir -p -- "${pkgdir}/usr/share/icons/hicolor/${s}" - ln -s "../../../dooble/Icons/${s}/dooble.png" -- "${pkgdir}/usr/share/icons/hicolor/${s}/dooble.png" - done -} - diff --git a/dooble-common/upload b/dooble-common/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/dooble-common/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/dooble-qt4/PKGBUILD b/dooble-qt4/PKGBUILD deleted file mode 100644 index 3ee7b8d..0000000 --- a/dooble-qt4/PKGBUILD +++ /dev/null @@ -1,92 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> - -pkgname=dooble-qt4 -pkgver=1.56c -pkgrel=2 -pkgdesc='A safe WebKit Web browser' -url='http://dooble.sourceforge.net/' -arch=('i686' 'x86_64') -license=('custom:3-clause BSD') -depends=('qtwebkit' 'libspoton>=2015.06.17' "dooble-common=${pkgver}") -makedepends=('qtwebkit' 'sed' 'coreutils') -source=("dooble-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz?r=") -sha256sums=('03b5bb0460aa8f4f731a47b70c571942a186fb0e7c4b74f546cef356be0afe6a') - -# Dependency (from ldd output) tree: -# qtwebkit -# qt4 -# openssl (via ca-certificates) -# libsm (via libxt via libxmu via xorg-xset via xdg-utils) -# libice -# libutil-linux (via util-linux) -# libjpeg (via libtiff) -# libxrender (via libxrandr) -# sqlite -# fontconfig -# expat -# glibc -# freetype2 -# bzip2 -# zlib -# sh -# libpng -# harfbuzz -# glib2 -# pcre -# libffi -# graphite -# gcc-libs -# gstreamer0.10-base -# gstreamer0.10 -# libxml2 -# xz -# orc -# mesa-libgl (as libgl) -# mesa -# libdrm -# libxxf86vm -# libxext -# libxdamage -# libxfixes -# libx11 -# libxcb -# libxdmcp -# libxau -# libxshmfence -# libsystemd (via systemd) -# libgcrypt -# libgpg-error - - -build() -{ - cd "$srcdir/dooble.d/Version 1.x/" - sed -i 's_-Werror__g' dooble.pro - qmake-qt4 -o Makefile dooble.pro - make distclean - qmake-qt4 -o Makefile dooble.pro - make -} - -package() -{ - cd "$srcdir/dooble.d/Version 1.x/" - install -Dm755 Dooble -- "${pkgdir}/usr/lib/${pkgname}/Dooble" - install -Dm755 dooble.sh -- "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 dooble.desktop -- "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - - msg "Editing files for the file system adaption" - - sed -i s_"/usr/local/dooble/"_"/usr/lib/${pkgname}/"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i s_"/usr/local/dooble"_"/usr/share/dooble"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i s_"\./Dooble"_"../../lib/${pkgname}/Dooble"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i /LD_LIBRARY_PATH/d -- "${pkgdir}/usr/bin/${pkgname}" - - sed -i s_'/usr/local/dooble/Lib\x00'_'/usr/lib\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'_g \ - -- "${pkgdir}/usr/lib/${pkgname}/Dooble" # The replacements's length must match the pattern's length - - sed -i s_'/usr/local/dooble/dooble.sh'_"/usr/bin/${pkgname}"_g \ - -- "${pkgdir}/usr/share/applications/${pkgname}.desktop" -} - diff --git a/dooble-qt4/upload b/dooble-qt4/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/dooble-qt4/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/dooble/PKGBUILD b/dooble/PKGBUILD deleted file mode 100644 index a7b237d..0000000 --- a/dooble/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> - -pkgname=dooble -pkgver=1.56c -pkgrel=2 -pkgdesc='A safe WebKit Web browser' -url='http://dooble.sourceforge.net/' -arch=('i686' 'x86_64') -license=('custom:3-clause BSD') -depends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'libspoton>=2015.06.17' "dooble-common=${pkgver}") -makedepends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'qt5-tools' 'sed' 'coreutils') -source=("dooble-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz?r=") -sha256sums=('03b5bb0460aa8f4f731a47b70c571942a186fb0e7c4b74f546cef356be0afe6a') - -# Dependency (from ldd output) tree: -# libpng -# qt5-base -# icu -# gcc-libs -# libjpeg-turbo -# sqlite -# mesa-libgl -# mesa -# libdrm -# libxdamage -# libxxf86vm -# libxrender -# qt5-webkit -# libxcomposite -# libxfixes -# libx11 -# libxcb -# libxdmcp & libxau -# glibc -# libxext -# libxslt -# libgcrypt -# libgpg-error -# libxml2 -# xz -# zlib -# qt5-sensors & qt5-location -# qt5-declarative -# gstreamer0.10-base -# gstreamer0.10 -# glib2 -# libffi -# pcre -# orc -# openssl - - - -build() -{ - cd "$srcdir/dooble.d/Version 1.x/" - sed -i 's_-Werror__g' dooble.qt5.pro - sed -i 's_-lspoton_-lspoton -lQt5PrintSupport_g' dooble.qt5.pro - qmake-qt5 -o Makefile dooble.qt5.pro - make distclean - qmake-qt5 -o Makefile dooble.qt5.pro - sed -i '/^INCPATH/s:=:= -I/usr/include/qt/QtWidgets:' Makefile - sed -i '/^INCPATH/s:=:= -I/usr/include/qt/QtWebKitWidgets:' Makefile - sed -i '/^INCPATH/s:=:= -I/usr/include/qt/QtPrintSupport:' Makefile - sed -i '/#include/s:QtGui/\([^>]*\)QAction:\1:' Include/*.h - make -} - -package() -{ - cd "$srcdir/dooble.d/Version 1.x/" - install -Dm755 Dooble -- "${pkgdir}/usr/lib/${pkgname}/Dooble" - install -Dm755 dooble.sh -- "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 dooble.desktop -- "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - - msg "Editing files for the file system adaption" - - sed -i s_"/usr/local/dooble/"_"/usr/lib/${pkgname}/"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i s_"/usr/local/dooble"_"/usr/share/dooble"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i s_"\./Dooble"_"../../lib/${pkgname}/Dooble"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i /LD_LIBRARY_PATH/d -- "${pkgdir}/usr/bin/${pkgname}" - - sed -i s_'/usr/local/dooble/Lib\x00'_'/usr/lib\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'_g \ - -- "${pkgdir}/usr/lib/${pkgname}/Dooble" # The replacements's length must match the pattern's length - - sed -i s_'/usr/local/dooble/dooble.sh'_"/usr/bin/${pkgname}"_g \ - -- "${pkgdir}/usr/share/applications/${pkgname}.desktop" -} - diff --git a/dooble/notes b/dooble/notes deleted file mode 100644 index a19a1d8..0000000 --- a/dooble/notes +++ /dev/null @@ -1,11 +0,0 @@ -options=(!emptydir) ## or do: ls -1 /dev/shm | grep -v '^usr$' | xargs rm -r - -svn co https://dooble.svn.sourceforge.net/svnroot/dooble dooble -cd dooble/trunk/browser/ -sed -i 's_-Werror__g' dooble.pro -qmake-qt4 -o Makefile dooble.pro -make -make INSTALL_ROOT="$pkgdir" install - -make dependencies: qt4 svn - diff --git a/dooble/upload b/dooble/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/dooble/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/dooble/watch b/dooble/watch deleted file mode 100755 index 103c735..0000000 --- a/dooble/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'index.html' ] && rm 'index.html' -wget http://dooble.sourceforge.net/ -O index.html >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep 'Dooble [[:digit:]\.]\+' < index.html | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'dooble' - fi - rm index.html -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'dooble (unfetchable)' -fi - diff --git a/emacs-find-recursive/PKGBUILD b/emacs-find-recursive/PKGBUILD deleted file mode 100644 index 10d191d..0000000 --- a/emacs-find-recursive/PKGBUILD +++ /dev/null @@ -1,18 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -# Contributor: Hauke Wesselmann <hauke@h-dawg.de> -pkgname=emacs-find-recursive -pkgver=20010326 -pkgrel=2 -pkgdesc="Emacs extension that lets you find files recursively in a directory" -arch=('any') -url="http://www.webweavertech.com/ovidiu/emacs/" -license=('GPL2') -depends=('emacs') -source=(http://www.webweavertech.com/ovidiu/emacs/find-recursive.txt) -md5sums=('468fcc4848e4adf54af4fdbe78581b95') - -package () -{ - cd $startdir/src/ - install -Dm644 $startdir/src/find-recursive.txt $startdir/pkg/usr/share/emacs/site-lisp/find-recursive.el -} diff --git a/emacs-find-recursive/upload b/emacs-find-recursive/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/emacs-find-recursive/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/emacs-find-recursive/watch b/emacs-find-recursive/watch deleted file mode 100755 index 5b7b121..0000000 --- a/emacs-find-recursive/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f find-recursive.el ] && rm find-recursive.el - -wget 'http://www.webweavertech.com/ovidiu/emacs/find-recursive.txt' -O find-recursive.el >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum find-recursive.el > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'emacs-find-recursive' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'emacs-find-recursive (unfetchable)' -fi - diff --git a/emacs-gtk2/PKGBUILD b/emacs-gtk2/PKGBUILD deleted file mode 100644 index ddd8427..0000000 --- a/emacs-gtk2/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -# Official Arch Linux package repository [gtk3 version] maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Official Arch Linux package repository [gtk3 version] contributor: Renchi Raju <renchi@green.tam.uiuc.edu> - -_pkgname=emacs -pkgname=$_pkgname-gtk2 -pkgver=24.5 -pkgrel=1 -pkgdesc="The extensible, customizable, self-documenting real-time display editor. GTK2 version" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'imagemagick>=6.8.4.7') -install=emacs-gtk2.install -source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz) -sha256sums=(dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e) -provides=('emacs') -conflicts=('emacs') - -build() { - cd "$srcdir"/emacs-$pkgver - export ac_cv_lib_gif_EGifPutExtensionLast=yes - ./configure --without-gif \ - --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --with-x-toolkit=gtk2 --with-xft \ - --without-gconf - make -} - -package() { - cd "$srcdir"/$_pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # fix file conflicts - mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} || true - mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} || true - rm "$pkgdir"/usr/share/info/info.info.gz || true - - # fix user/root permissions on usr/share files - find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \; - - # fix perms on /var/games - chmod 775 "$pkgdir"/var/games - chmod 775 "$pkgdir"/var/games/emacs - chmod 664 "$pkgdir"/var/games/emacs/* - chown -R root:games "$pkgdir"/var/games -} diff --git a/emacs-gtk2/emacs-24.3-giflib5.patch b/emacs-gtk2/emacs-24.3-giflib5.patch deleted file mode 100644 index b8571ab..0000000 --- a/emacs-gtk2/emacs-24.3-giflib5.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/image.c -+++ src/image.c 2013-05-21 15:49:41.945819346 +0000 -@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image - } - - /* Open the GIF file. */ -+#if GIFLIB_MAJOR < 5 - gif = fn_DGifOpenFileName (SSDATA (file)); -+#else -+ gif = fn_DGifOpenFileName (SSDATA (file), NULL); -+#endif - if (gif == NULL) - { - image_error ("Cannot open `%s'", file, Qnil); -@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image - memsrc.len = SBYTES (specified_data); - memsrc.index = 0; - -+#if GIFLIB_MAJOR < 5 - gif = fn_DGifOpen (&memsrc, gif_read_from_memory); -+#else -+ gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL); -+#endif - if (!gif) - { - image_error ("Cannot open memory source `%s'", img->spec, Qnil); diff --git a/emacs-gtk2/emacs-gtk2.install b/emacs-gtk2/emacs-gtk2.install deleted file mode 100644 index 2ef379e..0000000 --- a/emacs-gtk2/emacs-gtk2.install +++ /dev/null @@ -1,33 +0,0 @@ -ICON_PATH=usr/share/icons/hicolor -INFO_DIR=usr/share/info - -INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse -ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake -forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode -org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail -speedbar srecode tramp url vip viper widget wisent woman) - - -post_install() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null - done -} diff --git a/emacs-gtk2/upload b/emacs-gtk2/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/emacs-gtk2/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/emacs-gtk2/watch b/emacs-gtk2/watch deleted file mode 100755 index fe196c5..0000000 --- a/emacs-gtk2/watch +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -[ -f 'PKGBUILD?h=packages%2Femacs' ] && rm 'PKGBUILD?h=packages%2Femacs' -[ -f 'emacs.install?h=packages%2Femacs' ] && rm 'emacs.install?h=packages%2Femacs' - -wget 'https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/emacs' >/dev/null 2>/dev/null -wget 'https://projects.archlinux.org/svntogit/packages.git/plain/trunk/emacs.install?h=packages/emacs' >/dev/null 2>/dev/null - -mv 'PKGBUILD?h=packages%2Femacs' PKGBUILD.upstream.new -mv 'emacs.install?h=packages%2Femacs' emacs.install.upstream.new - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep ^pkg < PKGBUILD.upstream.new | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - diff PKGBUILD.upstream.{old,new} > PKGBUILD.upstream.diff - diff emacs.install.upstream.{old,new} > emacs.install.upstream.diff - mv PKGBUILD.upstream.{new,old} - mv emacs.install.upstream.{new,old} - echo 'emacs-gtk2' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'emacs-gtk2 (unfetchable)' -fi - diff --git a/featherweight/PKGBUILD b/featherweight/PKGBUILD deleted file mode 100644 index f2bb34a..0000000 --- a/featherweight/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> - -pkgname=featherweight -pkgver=1428444876 -pkgrel=2 -pkgdesc="A lightweight news syndication aggregator for your terminal shell" -url="https://github.com/GNU-Pony/featherweight" -arch=(any) -license=(GPL3) -depends=(python3 coreutils wget pytagomacs html2text-with-utf8) -makedepends=(make coreutils python3 zip texinfo) -install=featherweight.install -source=("${url}/archive/${pkgver}.tar.gz") -sha256sums=(17e8031bec3a68171acc182d925a684b53a2f28c9275362b5592510c07fe2c3b) - - -build() { - cd "${srcdir}/featherweight-${pkgver}" - make PREFIX=/usr PY_MAJOR=3 PY_MINOR=4 -} - -package() { - cd "${srcdir}/featherweight-${pkgver}" - make PREFIX=/usr PY_MAJOR=3 PY_MINOR=4 DESTDIR="${pkgdir}" install - - _dir="${pkgdir}/usr/share/licenses/${pkgname}" - ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" -} - diff --git a/featherweight/featherweight.install b/featherweight/featherweight.install deleted file mode 100644 index dff7792..0000000 --- a/featherweight/featherweight.install +++ /dev/null @@ -1,20 +0,0 @@ -_file="featherweight" - -infodir="usr/share/info" -file="${_file}.info" - - -post_install() { - [[ -x "usr/bin/install-info" ]] || return 0 - install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null -} - -post_upgrade() { - post_install "$1" -} - -pre_remove() { - [[ -x "usr/bin/install-info" ]] || return 0 - install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null -} - diff --git a/featherweight/upload b/featherweight/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/featherweight/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/gimp-plugin-image-reg/PKGBUILD b/gimp-plugin-image-reg/PKGBUILD deleted file mode 100644 index 447e508..0000000 --- a/gimp-plugin-image-reg/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -pkgname=gimp-plugin-image-reg -_srcname=gimp-image-reg -pkgver=0.5.5 -pkgrel=2 -pkgdesc="Image registration plugin for the GIMP" -arch=('i686' 'x86_64') -url="http://registry.gimp.org/node/24248" -license=('GPL3') -depends=('gimp') -makedepends=('intltool' 'gettext') -source=(http://downloads.sourceforge.net/${_srcname}/${_srcname}-${pkgver}.tar.gz) -md5sums=('405b87140880de18d695173ee6b08981') - -build() { - cd "$srcdir/${_srcname}-${pkgver}" - sed -i 's#^GIMP_PLUGIN_BINDIR=.*$#&\nGIMP_PLUGIN_BINDIR="/usr/lib/gimp/2.0/plug-ins"#' ./configure - LIBS='-lm' ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/${_srcname}-${pkgver}" - make DESTDIR="$pkgdir/" PLUGINDIR=/usr/lib/gimp/2.0 install -} - diff --git a/gimp-plugin-image-reg/upload b/gimp-plugin-image-reg/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/gimp-plugin-image-reg/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/gtk3-nobroadway-nowayland-nocolord/.gitignore b/gtk3-nobroadway-nowayland-nocolord/.gitignore deleted file mode 100644 index cd85985..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/.gitignore +++ /dev/null @@ -1 +0,0 @@ -gtk+ diff --git a/gtk3-nobroadway-nowayland-nocolord/PKGBUILD b/gtk3-nobroadway-nowayland-nocolord/PKGBUILD deleted file mode 100644 index 5348080..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -# Maintainer of the gtk3 package: Ionut Biru <ibiru@archlinux.org> -# Maintainer of the gtk3 package: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gtk3-nobroadway-nowayland-nocolord -pkgver=3.22.4 -pkgrel=1 -pkgdesc="GObject-based multi-platform GUI toolkit" -arch=(i686 x86_64) -url="http://www.gtk.org/" -depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf - libxcomposite libxdamage pango shared-mime-info at-spi2-atk libxkbcommon - adwaita-icon-theme json-glib librsvg gtk-update-icon-cache mesa) -makedepends=(gobject-introspection libcanberra gtk-doc git rest libcups) -optdepends=('libcanberra: gtk3-widget-factory demo' - 'gtk3-print-backends: printing') -install=gtk3.install -license=(LGPL) -conflicts=(gtk3) -provides=("gtk3=$pkgver") -_commit=4569bb372f838a9a68c9b134ef18865abe77001c # tags/3.22.4^0 -source=("git://git.gnome.org/gtk+#commit=$_commit" - settings.ini - gtk-query-immodules-3.0.hook) -sha256sums=('SKIP' - '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' - 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845') - -pkgver() { - cd gtk+ - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd gtk+ - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd gtk+ - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-schemas-compile=no \ - --enable-x11-backend \ - --enable-broadway-backend=no \ - --enable-wayland-backend=no \ - --enable-mir-backend=no \ - --enable-colord=no \ - --enable-gtk-doc=no \ - --enable-gtk-doc-html=no \ - --enable-gtk-doc-pdf=no \ - --enable-man=no - - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd gtk+ - make DESTDIR="$pkgdir" install - - install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini" - install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook" - - # split this out to use with gtk2 too - rm "$pkgdir/usr/bin/gtk-update-icon-cache" - - cd "$pkgdir" - for _f in usr/lib/*/*/printbackends/*; do - case $_f in - *-file.so|*-lpr.so) continue;; - esac - - mkdir -p "$srcdir/print-backends/${_f%/*}" - mv "$_f" "$srcdir/print-backends/$_f" - done -} - diff --git a/gtk3-nobroadway-nowayland-nocolord/gtk-query-immodules-3.0.hook b/gtk3-nobroadway-nowayland-nocolord/gtk-query-immodules-3.0.hook deleted file mode 100644 index c7703cf..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/gtk-query-immodules-3.0.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so - -[Action] -Description = Probing GTK3 input method modules... -When = PostTransaction -Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache diff --git a/gtk3-nobroadway-nowayland-nocolord/gtk3.install b/gtk3-nobroadway-nowayland-nocolord/gtk3.install deleted file mode 100644 index f57b1bf..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/gtk3.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - /usr/bin/gtk-query-immodules-3.0 --update-cache - /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas - /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache -} - -post_remove() { - /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas - /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} diff --git a/gtk3-nobroadway-nowayland-nocolord/settings.ini b/gtk3-nobroadway-nowayland-nocolord/settings.ini deleted file mode 100644 index 921d1dd..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/settings.ini +++ /dev/null @@ -1,4 +0,0 @@ -[Settings] -gtk-icon-theme-name = Adwaita -gtk-theme-name = Adwaita -gtk-font-name = Cantarell 11 diff --git a/gtk3-nobroadway-nowayland-nocolord/upload b/gtk3-nobroadway-nowayland-nocolord/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/gtk3-print-backends-nocolord/.gitignore b/gtk3-print-backends-nocolord/.gitignore deleted file mode 100644 index 81f5f55..0000000 --- a/gtk3-print-backends-nocolord/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -gtk+ -print-backends diff --git a/gtk3-print-backends-nocolord/PKGBUILD b/gtk3-print-backends-nocolord/PKGBUILD deleted file mode 100644 index 9f5e6f5..0000000 --- a/gtk3-print-backends-nocolord/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -# Maintainer of the gtk3-print-backends package: Ionut Biru <ibiru@archlinux.org> -# Maintainer of the gtk3-print-backends package: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gtk3-print-backends-nocolord -pkgver=3.22.4 -pkgrel=1 -pkgdesc="Print backends for GTK3" -arch=(i686 x86_64) -url="http://www.gtk.org/" -depends=(gtk3 rest libcups) -makedepends=(gobject-introspection libcanberra git rest libcups) -license=(LGPL) -_commit=4569bb372f838a9a68c9b134ef18865abe77001c # tags/3.22.4^0 -source=("git://git.gnome.org/gtk+#commit=$_commit") -sha256sums=('SKIP') - -pkgver() { - cd gtk+ - git describe --tags | sed 's/-/+/g' -} - -prepare() { - mkdir -p print-backends - cd gtk+ - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd gtk+ - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-schemas-compile \ - --enable-x11-backend \ - --disable-broadway-backend \ - --disable-wayland-backend \ - --disable-gtk-doc \ - --disable-colord - - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd gtk+ - make DESTDIR="$pkgdir" install - - # split this out to use with gtk2 too - rm "$pkgdir/usr/bin/gtk-update-icon-cache" - - cd "$pkgdir" - for _f in usr/lib/*/*/printbackends/*; do - case $_f in - *-file.so|*-lpr.so) continue;; - esac - - mkdir -p "$srcdir/print-backends/${_f%/*}" - mv "$_f" "$srcdir/print-backends/$_f" - done - - cd "$srcdir/" - rm -rf "$pkgdir"/* - mv print-backends/* "$pkgdir" -} diff --git a/gtk3-print-backends-nocolord/upload b/gtk3-print-backends-nocolord/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/gtk3-print-backends-nocolord/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/javagnutar/PKGBUILD b/javagnutar/PKGBUILD deleted file mode 100644 index 1ce3471..0000000 --- a/javagnutar/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> - -pkgname=javagnutar -pkgver=1.1.4 -pkgrel=1 -pkgdesc="Java library for GNU Tar archives" -arch=('any') -url="http://code.google.com/p/javagnutar/" -license=('Apache') -depends=('java-runtime>=1.5') -makedepends=('unzip' 'wget') - -_url="http://javagnutar.googlecode.com/files/javagnutar-1.1.4.zip" - -build() { - cd "$srcdir" - wget "$_url" - unzip javagnutar-1.1.4.zip -} - -package() { - cd "$srcdir/" - install -d "$pkgdir/usr/lib/" - install -m 755 activation.jar "$pkgdir/usr/lib/" - install -m 755 javagnutar.jar "$pkgdir/usr/lib/" -} diff --git a/javagnutar/upload b/javagnutar/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/javagnutar/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/javagnutar/watch b/javagnutar/watch deleted file mode 100755 index fe43565..0000000 --- a/javagnutar/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'index.html' ] && rm 'index.html' -wget http://code.google.com/p/javagnutar/ >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep \\.zip < index.html | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'javagnutar' - fi - rm index.html -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'javagnutar (unfetchable)' -fi - diff --git a/latex-fitch-uoo/.gitignore b/latex-fitch-uoo/.gitignore deleted file mode 100644 index dd1f40a..0000000 --- a/latex-fitch-uoo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -fitch diff --git a/latex-fitch-uoo/PKGBUILD b/latex-fitch-uoo/PKGBUILD deleted file mode 100644 index 14a4b2a..0000000 --- a/latex-fitch-uoo/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> - -pkgname=latex-fitch-uoo -pkgver=0.5 -pkgrel=1 -pkgdesc="LaTeX macros for Fitch style natural deduction" -arch=('any') -url="https://www.mathstat.dal.ca/~selinger/fitch" -license=('GPL') -depends=('texlive-core') -install=fitch.install -source=('https://www.mathstat.dal.ca/~selinger/fitch/fitch-0.5.tgz') -sha256sums=('0d3173a63420eb5b9981b9c7db0bad0b24278272a666cc31e0c7af8a14ecc4af') - -package() { - cd "${srcdir}/fitch-${pkgver}" - install -Dm644 fitch.sty "${pkgdir}/usr/share/texmf-dist/tex/latex/fitch" - install -Dm644 fitchdoc.ps "${pkgdir}/usr/share/doc/latex-fitch-uoo.ps" - ## You can change .ps to .pdf if you prefer PDF over PostScript. -} - diff --git a/latex-fitch-uoo/fitch.install b/latex-fitch-uoo/fitch.install deleted file mode 100644 index e1c1d5e..0000000 --- a/latex-fitch-uoo/fitch.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} - -post_remove() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} diff --git a/latex-fitch-uoo/upload b/latex-fitch-uoo/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/latex-fitch-uoo/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/latex-fitch-uoo/watch b/latex-fitch-uoo/watch deleted file mode 100755 index f9ce5ed..0000000 --- a/latex-fitch-uoo/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f fitch ] && rm fitch - -wget 'http://www.mathstat.dal.ca/~selinger/fitch' -O fitch >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum fitch > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'latex-fitch-uoo' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'latex-fitch-uoo (unfetchable)' -fi - diff --git a/latex-fitch/PKGBUILD b/latex-fitch/PKGBUILD deleted file mode 100644 index 9071ba0..0000000 --- a/latex-fitch/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -# Contributor: Lawrence Lee <valheru@facticius.net> - -pkgname=latex-fitch -pkgver=1.6 -pkgrel=2 -pkgdesc="A LaTeX package for Fitch-style proofs" -arch=('any') -url="http://folk.uio.no/johanw/FitchSty.html" -license=('GPL') -depends=('tetex') -install=fitch.install -#source=(http://folk.uio.no/johanw/fitch.sty) -source=(fitch.sty) -md5sums=('d62bdd0267c217d6017baef950b9205a') - -package() { - install -Dm644 "${srcdir}/fitch.sty" "${pkgdir}/usr/share/texmf-dist/tex/latex/fitch" -} diff --git a/latex-fitch/fitch b/latex-fitch/fitch deleted file mode 100644 index 963010e..0000000 --- a/latex-fitch/fitch +++ /dev/null @@ -1,112 +0,0 @@ -% $Id: fitch.sty,v 1.6 2003/06/28 16:53:00 johanw Exp $ - -% Macros for Fitch-style formal proofs -% Johan W. Klüwer, June 10, 2001 - - -\RequirePackage{mdwtab,latexsym,amsmath,amsfonts,ifthen} - - -% Line height in proofs -\newlength{\fitchlineht} -\setlength{\fitchlineht}{1.5\baselineskip} -% Horizontal indent between proof levels -\newlength{\fitchindent} -\setlength{\fitchindent}{1em} -% Indent to comment -\newlength{\fitchcomind} -\setlength{\fitchcomind}{2em} -% Line number width -\newlength{\fitchnumwd} -\setlength{\fitchnumwd}{1em} - -% Altered from mdwtab.sty: shorter vline, for start of subproof -\makeatletter -\newcommand\fvline[1][\arrayrulewidth]{\vrule\@height.5\fitchlineht\@width#1\relax} -\makeatother -% Ordinary vertical line -\newcommand{\fa}{\vline\hspace*{\fitchindent}} -% Vertical line, shorter: Use at start of (sub)proof -\newcommand{\fb}{\fvline\hspace*{\fitchindent}} -% Hypothesis -\newcommand{\fh}{\fvline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Hypothesis, with longer vert line: for >1 hypothesis -\newcommand{\fj}{\vline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Modal subproof: takes argument = operator -\newcommand{\fitchmodal}[1]{% - \makebox[0pt][r]{${}^{#1}$\,}\fvline\hspace*{\fitchindent}} -\newcommand{\fn}{\fitchmodal{\Box}}% Box subproof -\newcommand{\fp}{\fitchmodal{\Diamond}}% Diamond subproof -% Modal subproof with hypothesis in first line (as in Fitch) -\newcommand{\fitchmodalh}[1]{% - \makebox[0pt][r]{${}^{#1}$\,}% - \fvline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Rule: formula introduction marker. \fr with line, \fs without line -\newcommand{\fr}{% - \makebox[0pt][r]{${\rhd}$\,\,}\vline\hspace*{\fitchindent}} -\newcommand{\fs}{% - \makebox[0pt][r]{${\rhd}$\,\,}} -% Box around argument, like new variable in ql -\newcommand{\fw}[1]{\fbox{\footnotesize $#1$}} - -% -\newcounter{fitchcounter} -\setcounter{fitchcounter}{0} -%To avoid starting from 1, \setboolean{resetfitchcounter}{false} -\newboolean{resetfitchcounter} -\setboolean{resetfitchcounter}{true} -%To avoid increasing numbers, \setboolean{increasefitchcounter}{false} -\newboolean{increasefitchcounter} -\setboolean{increasefitchcounter}{true} -%\formatfitchcounter can be altered if need be, though only once per proof -\newcommand{\formatfitchcounter}[1]{\arabic{#1}} -%Typeset the counter -\newcommand{\fitchcounter}{% - \ifthenelse{\boolean{increasefitchcounter}}{\addtocounter{fitchcounter}{1}}{} - \formatfitchcounter{fitchcounter}} - -%A line with a special number -- a tag, e.g. \ftag{\vdots}{} -\newcommand{\ftag}[2]{\multicolumn{1}% - {!{\makebox[\fitchnumwd][r]{#1}\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}}% - {#2}} - -\newenvironment{fitchnum}% -{\ifthenelse{\boolean{resetfitchcounter}}{\setcounter{fitchcounter}{0}}{} - \begin{tabular}{!{\makebox[\fitchnumwd][r]{\fitchcounter }\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}l}}% -{\end{tabular}} - -\newenvironment{fitchunum}% -{\begin{tabular}{!{\makebox[\fitchnumwd][r]{}\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}l}}% -{\end{tabular}} - -\newenvironment{fitch}{\renewcommand{\arraystretch}{1.5} - \begin{fitchnum}}{\end{fitchnum}} -\newenvironment{fitch*}{\renewcommand{\arraystretch}{1.5} - \begin{fitchunum}}{\end{fitchunum}} - -% The following is useful for giving a numbered formula, then the proof. -\newenvironment{flem}[2]% -{\begin{eqnarray} - \label{#2}\\ - &\begin{fitch}}% - {\end{fitch}\notag\end{eqnarray}} - -%To write comment field for two consecutive lines, with brace -\newcommand{\ftwocom}[1]{% - \parbox[t]{3cm}{ - \raisebox{-.6\baselineskip}[\baselineskip][0pt]{% - $\left. - \begin{aligned} - \,\\ \, - \end{aligned} - \right\}$\quad #1} - }} diff --git a/latex-fitch/fitch.install b/latex-fitch/fitch.install deleted file mode 100644 index e1c1d5e..0000000 --- a/latex-fitch/fitch.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} - -post_remove() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} diff --git a/latex-fitch/source/PKGBUILD b/latex-fitch/source/PKGBUILD deleted file mode 100644 index 7275bee..0000000 --- a/latex-fitch/source/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Contributor: Lawrence Lee <valheru@facticius.net> - -pkgname=latex-fitch -pkgver=1.6 -pkgrel=2 -pkgdesc="A LaTeX package for Fitch-style proofs" -arch=('any') -url="http://folk.uio.no/johanw/FitchSty.html" -license=('GPL') -depends=('tetex') -install=fitch.install -# source=(http://folk.uio.no/johanw/fitch.sty) -source=(fitch.sty) -md5sums=('d62bdd0267c217d6017baef950b9205a') - -package() { - install -Dm644 "${srcdir}/fitch.sty" "${pkgdir}/usr/share/texmf-dist/tex/latex/fitch" -} diff --git a/latex-fitch/source/fitch.install b/latex-fitch/source/fitch.install deleted file mode 100644 index e1c1d5e..0000000 --- a/latex-fitch/source/fitch.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} - -post_remove() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} diff --git a/latex-fitch/source/fitch.sty b/latex-fitch/source/fitch.sty deleted file mode 100644 index 963010e..0000000 --- a/latex-fitch/source/fitch.sty +++ /dev/null @@ -1,112 +0,0 @@ -% $Id: fitch.sty,v 1.6 2003/06/28 16:53:00 johanw Exp $ - -% Macros for Fitch-style formal proofs -% Johan W. Klüwer, June 10, 2001 - - -\RequirePackage{mdwtab,latexsym,amsmath,amsfonts,ifthen} - - -% Line height in proofs -\newlength{\fitchlineht} -\setlength{\fitchlineht}{1.5\baselineskip} -% Horizontal indent between proof levels -\newlength{\fitchindent} -\setlength{\fitchindent}{1em} -% Indent to comment -\newlength{\fitchcomind} -\setlength{\fitchcomind}{2em} -% Line number width -\newlength{\fitchnumwd} -\setlength{\fitchnumwd}{1em} - -% Altered from mdwtab.sty: shorter vline, for start of subproof -\makeatletter -\newcommand\fvline[1][\arrayrulewidth]{\vrule\@height.5\fitchlineht\@width#1\relax} -\makeatother -% Ordinary vertical line -\newcommand{\fa}{\vline\hspace*{\fitchindent}} -% Vertical line, shorter: Use at start of (sub)proof -\newcommand{\fb}{\fvline\hspace*{\fitchindent}} -% Hypothesis -\newcommand{\fh}{\fvline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Hypothesis, with longer vert line: for >1 hypothesis -\newcommand{\fj}{\vline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Modal subproof: takes argument = operator -\newcommand{\fitchmodal}[1]{% - \makebox[0pt][r]{${}^{#1}$\,}\fvline\hspace*{\fitchindent}} -\newcommand{\fn}{\fitchmodal{\Box}}% Box subproof -\newcommand{\fp}{\fitchmodal{\Diamond}}% Diamond subproof -% Modal subproof with hypothesis in first line (as in Fitch) -\newcommand{\fitchmodalh}[1]{% - \makebox[0pt][r]{${}^{#1}$\,}% - \fvline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Rule: formula introduction marker. \fr with line, \fs without line -\newcommand{\fr}{% - \makebox[0pt][r]{${\rhd}$\,\,}\vline\hspace*{\fitchindent}} -\newcommand{\fs}{% - \makebox[0pt][r]{${\rhd}$\,\,}} -% Box around argument, like new variable in ql -\newcommand{\fw}[1]{\fbox{\footnotesize $#1$}} - -% -\newcounter{fitchcounter} -\setcounter{fitchcounter}{0} -%To avoid starting from 1, \setboolean{resetfitchcounter}{false} -\newboolean{resetfitchcounter} -\setboolean{resetfitchcounter}{true} -%To avoid increasing numbers, \setboolean{increasefitchcounter}{false} -\newboolean{increasefitchcounter} -\setboolean{increasefitchcounter}{true} -%\formatfitchcounter can be altered if need be, though only once per proof -\newcommand{\formatfitchcounter}[1]{\arabic{#1}} -%Typeset the counter -\newcommand{\fitchcounter}{% - \ifthenelse{\boolean{increasefitchcounter}}{\addtocounter{fitchcounter}{1}}{} - \formatfitchcounter{fitchcounter}} - -%A line with a special number -- a tag, e.g. \ftag{\vdots}{} -\newcommand{\ftag}[2]{\multicolumn{1}% - {!{\makebox[\fitchnumwd][r]{#1}\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}}% - {#2}} - -\newenvironment{fitchnum}% -{\ifthenelse{\boolean{resetfitchcounter}}{\setcounter{fitchcounter}{0}}{} - \begin{tabular}{!{\makebox[\fitchnumwd][r]{\fitchcounter }\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}l}}% -{\end{tabular}} - -\newenvironment{fitchunum}% -{\begin{tabular}{!{\makebox[\fitchnumwd][r]{}\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}l}}% -{\end{tabular}} - -\newenvironment{fitch}{\renewcommand{\arraystretch}{1.5} - \begin{fitchnum}}{\end{fitchnum}} -\newenvironment{fitch*}{\renewcommand{\arraystretch}{1.5} - \begin{fitchunum}}{\end{fitchunum}} - -% The following is useful for giving a numbered formula, then the proof. -\newenvironment{flem}[2]% -{\begin{eqnarray} - \label{#2}\\ - &\begin{fitch}}% - {\end{fitch}\notag\end{eqnarray}} - -%To write comment field for two consecutive lines, with brace -\newcommand{\ftwocom}[1]{% - \parbox[t]{3cm}{ - \raisebox{-.6\baselineskip}[\baselineskip][0pt]{% - $\left. - \begin{aligned} - \,\\ \, - \end{aligned} - \right\}$\quad #1} - }} diff --git a/latex-fitch/upload b/latex-fitch/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/latex-fitch/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/latex-fitch/watch b/latex-fitch/watch deleted file mode 100755 index 9c62075..0000000 --- a/latex-fitch/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f fitch.sty.new ] && rm fitch.sty.new - -wget 'http://folk.uio.no/johanw/fitch.sty' -O fitch.sty.new >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum fitch.sty.new > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'latex-fitch' '('"$(cat sum)"')' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'latex-fitch (unfetchable)' -fi - diff --git a/lib32-libjson/PKGBUILD b/lib32-libjson/PKGBUILD deleted file mode 100644 index e2becb5..0000000 --- a/lib32-libjson/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> - -_pkgbasename=libjson -pkgname=lib32-$_pkgbasename -pkgver='0.8' -pkgrel='1' -pkgdesc="Small C library and small codebase that packs an efficient parser and a configurable printer (32-bit version)" -arch=('x86_64') -url="https://projects.snarc.org/libjson/" -license=('LGPL') -depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib) -options=(!libtool !makeflags) -source=("https://projects.snarc.org/libjson/download/libjson-${pkgver}.tar.gz") -sha256sums=('4f0e717a8edc6ede5c4d900d810165ca91f033b2863989daaeaf1b3fe5ea0ad6') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - sed -i s:/lib:/lib32:g Makefile - make CC="gcc -m32" CFLAGS:='-Wall -Os -fPIC' -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make CC="gcc -m32" CFLAGS:='-Wall -Os -fPIC' DESTDIR="${pkgdir}" install - rm -r "${pkgdir}/usr/bin" - rm -r "${pkgdir}/usr/include" -} - diff --git a/lib32-libjson/upload b/lib32-libjson/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/lib32-libjson/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/libgksu-colormap-fix/PKGBUILD b/libgksu-colormap-fix/PKGBUILD deleted file mode 100644 index a3b14ad..0000000 --- a/libgksu-colormap-fix/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -# Maintainer of the libgksu package: Jan de Groot <jgc@archlinux.org> - -_pkgname=libgksu -pkgname=libgksu-colormap-fix -pkgver=2.0.12 -pkgrel=6 -pkgdesc="gksu authorization library (with libgksu-rgba-fix.diff patch)" -arch=(i686 x86_64) -url="http://www.nongnu.org/gksu/index.html" -license=(GPL) -depends=('gconf' 'gtk2' 'libgnome-keyring' 'libgtop' 'startup-notification') -makedepends=('intltool' 'gtk-doc') -options=('!emptydirs') -conflicts=(libgksu) -provides=("libgksu=$pkgver") -install=libgksu.install -source=(http://people.debian.org/~kov/gksu/${_pkgname}-${pkgver}.tar.gz - libgksu-2.0.0-fbsd.patch - libgksu-2.0.12-automake-1.11.2.patch - libgksu-2.0.12-fix-make-3.82.patch - libgksu-2.0.12-notests.patch - libgksu-2.0.12-revert-forkpty.patch - libgksu-2.0.7-libs.patch - libgksu-2.0.7-polinguas.patch - libgksu-rgba-fix.diff) -md5sums=('c7154c8806f791c10e7626ff123049d3' - '063a2b45d8e7cbba898d1db413242da0' - '2eeb34ad9b5bf29e8e2ebf8c8a5a28b6' - 'afeaf5caab03d793258d62d60a9bf0f0' - '4179d0487d6032e56b8a925010694c0a' - 'aebbe57e5286c654e27cf714cf3b704a' - '58d3a4a9d2ac741951720043ea3f7b5f' - '0b5c3d5d9b32cb3e65d9f0bfbcb11a76' - '7599049c7a3a2395d9bff4e31ea46385') - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libgksu-2.0.0-fbsd.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.7-libs.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.7-polinguas.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.12-revert-forkpty.patch" - patch -Np0 -i "${srcdir}/libgksu-2.0.12-fix-make-3.82.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.12-notests.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.12-automake-1.11.2.patch" - - patch -Np0 -i "${srcdir}/libgksu-rgba-fix.diff" - - touch NEWS README - - intltoolize --force --copy --automake - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static --disable-schemas-install - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - rm -f ${pkgdir}/usr/lib/*.a - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${_pkgname}.schemas" --domain libgksu ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/libgksu-colormap-fix/libgksu-2.0.0-fbsd.patch b/libgksu-colormap-fix/libgksu-2.0.0-fbsd.patch deleted file mode 100644 index 5c007be..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.0-fbsd.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c ---- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400 -+++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500 -@@ -23,7 +23,12 @@ - #include <unistd.h> - #include <string.h> - #include <fcntl.h> -+#ifdef __FreeBSD__ -+#include <libutil.h> -+#include <termios.h> -+#else - #include <pty.h> -+#endif - #include <pwd.h> - #include <sys/types.h> - #include <sys/wait.h> -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am ---- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - - EXTRA_DIST = libgksu.ver -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in ---- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500 -@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config -- - gksu_run_helper_SOURCES = gksu-run-helper.c - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - EXTRA_DIST = libgksu.ver - all: all-am - -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am ---- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in ---- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500 -@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - all: all-am - - .SUFFIXES: diff --git a/libgksu-colormap-fix/libgksu-2.0.12-automake-1.11.2.patch b/libgksu-colormap-fix/libgksu-2.0.12-automake-1.11.2.patch deleted file mode 100644 index 0f22166..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.12-automake-1.11.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -Due to the following change, pkglib_PROGRAMS is invalid: - http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf - -https://savannah.nongnu.org/bugs/index.php?35241 -https://bugs.gentoo.org/show_bug.cgi?id=397411 - ---- - libgksu/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am -index 49362f9..3cb1090 100644 ---- a/libgksu/Makefile.am -+++ b/libgksu/Makefile.am -@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} - pkgconfigdir = ${libdir}/pkgconfig - pkgconfig_DATA = libgksu2.pc - --pkglibdir = ${libdir}/${PACKAGE} --pkglib_PROGRAMS = gksu-run-helper -+gksulibdir = ${libdir}/${PACKAGE} -+gksulib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - diff --git a/libgksu-colormap-fix/libgksu-2.0.12-fix-make-3.82.patch b/libgksu-colormap-fix/libgksu-2.0.12-fix-make-3.82.patch deleted file mode 100644 index 0a7c5f1..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.12-fix-make-3.82.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500 -+++ Makefile.am 2010-08-22 16:11:55.289599110 -0500 -@@ -17,11 +17,11 @@ - - if GCONF_SCHEMAS_INSTALL - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -- for p in $(schemas_DATA) ; do \ -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -- done \ -- fi -+ if test -z "$(DESTDIR)" ; then \ -+ for p in $(schemas_DATA) ; do \ -+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -+ done \ -+ fi - else - install-data-local: - endif diff --git a/libgksu-colormap-fix/libgksu-2.0.12-notests.patch b/libgksu-colormap-fix/libgksu-2.0.12-notests.patch deleted file mode 100644 index 3787ef6..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.12-notests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libgksu-2.0.12/libgksu/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksu/Makefile.am -+++ libgksu-2.0.12/libgksu/Makefile.am -@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` - gksu_run_helper_SOURCES = gksu-run-helper.c - --noinst_PROGRAMS = test-gksu -+EXTRA_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la - test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -Index: libgksu-2.0.12/libgksuui/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksuui/Makefile.am -+++ libgksu-2.0.12/libgksuui/Makefile.am -@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - --noinst_PROGRAMS = test-gksuui -+EXTRA_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la - test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` diff --git a/libgksu-colormap-fix/libgksu-2.0.12-revert-forkpty.patch b/libgksu-colormap-fix/libgksu-2.0.12-revert-forkpty.patch deleted file mode 100644 index 2c3a8cc..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.12-revert-forkpty.patch +++ /dev/null @@ -1,359 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c ---- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400 -+++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500 -@@ -1,7 +1,6 @@ - /* - * Gksu -- a library providing access to su functionality - * Copyright (C) 2004-2009 Gustavo Noronha Silva -- * Portions Copyright (C) 2009 VMware, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -56,9 +55,6 @@ - static void - gksu_context_launch_complete (GksuContext *context); - --static void --read_line (int fd, gchar *buffer, int n); -- - GType - gksu_error_get_type (void) - { -@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context, - for (i = 0 ; cmd[i] != NULL ; i++) - g_free (cmd[i]); - g_free(cmd); -- -- _exit(1); - } - else if (pid == -1) - { -@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context, - /* drop the \n echoed on password entry if su did request - a password */ - if (password_needed) -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); - } -@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context, - { - int retval = 0; - -- /* Red Hat's su shows the full path to su in its error messages. */ -- if (!strncmp (buf, "su:", 3) || -- !strncmp (buf, "/bin/su:", 7)) -+ if (!strncmp (buf, "su", 2)) - { - gchar **strings; - -@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context, - } - - strings = g_strsplit (buf, ":", 2); -- -- /* Red Hat and Fedora use 'incorrect password'. */ -- if (strings[1] && -- (g_str_has_prefix(strings[1], " Authentication failure") || -- g_str_has_prefix(strings[1], " incorrect password"))) -+ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23)) - { - if (used_gnome_keyring) - g_set_error (error, gksu_quark, -@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context, - { - char **cmd; - char buffer[256] = {0}; -- char *child_stderr = NULL; -- /* This command is used to gain a token */ -- char *const verifycmd[] = -- { -- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL -- }; - int argcount = 8; - int i, j; - -@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context, - - pid_t pid; - int status; -- FILE *fdfile = NULL; -- int fdpty = -1; -+ FILE *infile, *outfile; -+ int parent_pipe[2]; /* For talking to the parent */ -+ int child_pipe[2]; /* For talking to the child */ - - context->sudo_mode = TRUE; - -@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context, - cmd[argcount] = g_strdup("-S"); - argcount++; - -- /* Make sudo noninteractive (we should already have a token) */ -- cmd[argcount] = g_strdup("-n"); -- argcount++; -- - /* Make sudo use next arg as prompt */ - cmd[argcount] = g_strdup("-p"); - argcount++; -@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]); - } - -- pid = forkpty(&fdpty, NULL, NULL, NULL); -- if (pid == 0) -+ if ((pipe(parent_pipe)) == -1) - { -- // Child -- setsid(); // make us session leader -- -- execv(verifycmd[0], verifycmd); -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -- _("Failed to exec new process: %s"), -+ if ((pipe(child_pipe)) == -1) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), - strerror(errno)); - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -- else if (pid == -1) -+ -+ pid = fork(); -+ if (pid == -1) - { - g_set_error (error, gksu_quark, GKSU_ERROR_FORK, - _("Failed to fork new process: %s"), -@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context, - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -+ else if (pid == 0) -+ { -+ // Child -+ setsid(); // make us session leader -+ close(child_pipe[1]); -+ dup2(child_pipe[0], STDIN_FILENO); -+ dup2(parent_pipe[1], STDERR_FILENO); - -+ execv(cmd[0], cmd); -+ -+ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -+ _("Failed to exec new process: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - else - { - gint counter = 0; - gchar *cmdline = NULL; -- struct termios tio; - - // Parent -- fdfile = fdopen(fdpty, "w+"); -+ close(parent_pipe[1]); - -- /* make sure we notice that ECHO is turned off, if it gets -- turned off */ -- tcgetattr (fdpty, &tio); -- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++) -- { -- usleep (1000); -- tcgetattr (fdpty, &tio); -- } -+ infile = fdopen(parent_pipe[0], "r"); -+ if (!infile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- fcntl (fdpty, F_SETFL, O_NONBLOCK); -+ outfile = fdopen(child_pipe[1], "w"); -+ if (!outfile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } -+ -+ /* -+ we are expecting to receive a GNOME_SUDO_PASS -+ if we don't there are two possibilities: an error -+ or a password is not needed -+ */ -+ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK); - - { /* no matter if we can read, since we're using - O_NONBLOCK; this is just to avoid the prompt -@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context, - struct timeval tv; - - FD_ZERO(&rfds); -- FD_SET(fdpty, &rfds); -+ FD_SET(parent_pipe[0], &rfds); - tv.tv_sec = 1; - tv.tv_usec = 0; - -- select (fdpty + 1, &rfds, NULL, NULL, &tv); -+ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv); - } - - /* Try hard to find the prompt; it may happen that we're -@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context, - if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0) - break; - -- read_line (fdpty, buffer, 256); -+ read_line (parent_pipe[0], buffer, 256); - - if (context->debug) - fprintf (stderr, "buffer: -%s-\n", buffer); -@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context, - - usleep (1000); - -- write (fdpty, password, strlen(password) + 1); -- write (fdpty, "\n", 1); -+ fprintf (outfile, "%s\n", password); -+ fclose (outfile); - - nullify_password (password); - -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ /* turn NONBLOCK off */ -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - /* ignore the first newline that comes right after sudo receives - the password */ -- fgets (buffer, 255, fdfile); -- /* this is the status we are interested in */ -- fgets (buffer, 255, fdfile); -+ fgets (buffer, 255, infile); -+ /* this is the status we are interessted in */ -+ fgets (buffer, 255, infile); - } - else - { -@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n"); - - /* turn NONBLOCK off, also if have no prompt */ -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - - should_display = gconf_client_get_bool (context->gconf_client, - BASE_PATH "display-no-pass-info", NULL); -@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "%s", buffer); - } - -- if (g_str_has_prefix (buffer, "Sorry, try again.")) -+ if (!strcmp (buffer, "Sorry, try again.\n")) - g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS, - _("Wrong password.")); -+ else if (!strncmp (buffer, "Sorry, user ", 12)) -+ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -+ _("The underlying authorization mechanism (sudo) " -+ "does not allow you to run this program. Contact " -+ "the system administrator.")); - else - { - gchar *haystack = buffer; -@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- /* If we have an error, let's just stop sudo right there. */ -- if (error) -- close(fdpty); -- - cmdline = g_strdup("sudo"); - /* wait for the child process to end or become something other - than sudo */ -@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context, - if (context->sn_context) - gksu_context_launch_complete (context); - -+ while (read (parent_pipe[0], buffer, 255) > 0) -+ { -+ fprintf (stderr, "%s", buffer); -+ bzero(buffer, 256); -+ } -+ - /* if the process is still active waitpid() on it */ - if (pid_exited != pid) - waitpid(pid, &status, 0); - sudo_reset_xauth (context, xauth, xauth_env); - -- /* -- * Did token acquisition succeed? If so, spawn sudo in -- * non-interactive mode. It should either succeed or die -- * immediately if you're not allowed to run the command. -- */ -- if (WEXITSTATUS(status) == 0) -- { -- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL, -- NULL, &child_stderr, &status, -- error); -- } -- - if (exit_status) - { - if (WIFEXITED(status)) { -@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context, - - if (WEXITSTATUS(status)) - { -- if (g_str_has_prefix(child_stderr, "Sorry, user ")) -- { -- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -- _("The underlying authorization mechanism (sudo) " -- "does not allow you to run this program. Contact " -- "the system administrator.")); -- } - if(cmdline) - { - /* sudo already exec()ed something else, don't report -@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context, - if (!g_str_has_suffix (cmdline, "sudo")) - { - g_free (cmdline); -- g_free (child_stderr); - return FALSE; - } - g_free (cmdline); -@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- fprintf(stderr, child_stderr); -- g_free(child_stderr); -- - /* if error is set we have found an error condition */ -- return (error == NULL); -+ if (error) -+ return FALSE; -+ -+ return TRUE; - } - - /** diff --git a/libgksu-colormap-fix/libgksu-2.0.7-libs.patch b/libgksu-colormap-fix/libgksu-2.0.7-libs.patch deleted file mode 100644 index b9fb77f..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.7-libs.patch +++ /dev/null @@ -1,76 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25362 -# https://bugs.gentoo.org/show_bug.cgi?id=226837 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 22:15:30.000000000 +0100 -+++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100 -@@ -43,6 +43,9 @@ - PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0]) - PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0]) - -+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) -+ - # Checks for library functions. - ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN" - -diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am ---- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100 -@@ -3,7 +3,7 @@ - AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" - - bin_PROGRAMS = gksu-properties --gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS} -+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS} - gksu_properties_SOURCES = gksu-properties.c - - gladedir = ${prefix}/share/${PACKAGE} -diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am ---- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100 -@@ -8,8 +8,8 @@ - # major -> breaks backward compatibility (changes to existing ABI) - # minor -> keeps compatibility (additions to the API) - # micro -> no change to the API/ABI --libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la --libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 - if USE_VERSION_SCRIPT - libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver - endif -@@ -24,12 +24,11 @@ - - pkglibdir = ${libdir}/${PACKAGE} - pkglib_PROGRAMS = gksu-run-helper --gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` -+gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c --test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS} - - EXTRA_DIST = libgksu.ver -diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am ---- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100 -@@ -4,12 +4,13 @@ - - noinst_LTLIBRARIES = libgksuui1.0.la - libgksuui1_0_la_SOURCES = gksuui-dialog.c --libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0` -+libgksuui1_0_la_LDFLAGS = -Wl,-O1 -+libgksuui1_0_la_LIBADD = ${GTK_LIBS} - - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c --test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS} -+ diff --git a/libgksu-colormap-fix/libgksu-2.0.7-polinguas.patch b/libgksu-colormap-fix/libgksu-2.0.7-polinguas.patch deleted file mode 100644 index e423af1..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.7-polinguas.patch +++ /dev/null @@ -1,40 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25360 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 21:50:57.000000000 +0100 -+++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100 -@@ -50,7 +50,7 @@ - GETTEXT_PACKAGE=AC_PACKAGE_NAME - AC_SUBST(GETTEXT_PACKAGE) - --IT_PROG_INTLTOOL -+IT_PROG_INTLTOOL([0.35.5]) - AM_GLIB_GNU_GETTEXT - - ################################################## -diff -Nura a/po/LINGUAS b/po/LINGUAS ---- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100 -@@ -0,0 +1,23 @@ -+# please keep this list sorted alphabetically -+# http://live.gnome.org/GnomeGoals/PoLinguas -+# -+ca -+cs -+da -+de -+es -+eu -+fr -+hu -+it -+ko -+lt -+pl -+pt_BR -+ro -+ru -+sk -+sv -+nb -+nl -+zh_CN diff --git a/libgksu-colormap-fix/libgksu-rgba-fix.diff b/libgksu-colormap-fix/libgksu-rgba-fix.diff deleted file mode 100644 index 8ae52f1..0000000 --- a/libgksu-colormap-fix/libgksu-rgba-fix.diff +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'libgksu/libgksu.c' ---- libgksu/libgksu.c 2009-12-16 16:50:08 +0000 -+++ libgksu/libgksu.c 2009-12-16 17:27:57 +0000 -@@ -478,7 +478,7 @@ - attr.height = 4; - attr.wclass = GDK_INPUT_OUTPUT; - attr.visual = gdk_screen_get_system_visual (fadeout->screen); -- attr.colormap = gdk_screen_get_default_colormap (fadeout->screen); -+ attr.colormap = gdk_screen_get_system_colormap (fadeout->screen); - attr.override_redirect = TRUE; - attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_NOREDIR; - - diff --git a/libgksu-colormap-fix/libgksu.install b/libgksu-colormap-fix/libgksu.install deleted file mode 100644 index 89cf0cf..0000000 --- a/libgksu-colormap-fix/libgksu.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=libgksu - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --install ${pkgname} -} diff --git a/libgksu-colormap-fix/upload b/libgksu-colormap-fix/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/libgksu-colormap-fix/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/xorg-server-hwcursor-gamma/.gitignore b/xorg-server-hwcursor-gamma/.gitignore deleted file mode 100644 index 903de3e..0000000 --- a/xorg-server-hwcursor-gamma/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -!/CVE-2013-6424.diff -!/xvfb-run.1 -!/revert-udev-changes.diff diff --git a/xorg-server-hwcursor-gamma/0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch b/xorg-server-hwcursor-gamma/0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch deleted file mode 100644 index 5eeb826..0000000 --- a/xorg-server-hwcursor-gamma/0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e63b5656a6509ece2d5ffb1fb962911519163988 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com> -Date: Tue, 15 Apr 2014 02:45:25 +0200 -Subject: [PATCH 1/3] When an cursor is set, it is adjusted to use the gamma - ramps of the CRTC:s that it is loaded on. - -This could be improved to be done in -`crtc->funcs->load_cursor_argb` with more -accurate adjustments. But I was not able to -find where `crtc->funcs->load_cursor_argb` -is implement. - -Additionally, `xf86_reload_cursors` should be -called when the gamma settings changes. This -way the cursor's colours are adjusted to use -the gamma settings directly when the gamma -is modified rather than the next time its -image changes. ---- - hw/xfree86/modes/xf86Cursors.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c -index 2b0db34..3cb499f 100644 ---- a/hw/xfree86/modes/xf86Cursors.c -+++ b/hw/xfree86/modes/xf86Cursors.c -@@ -242,6 +242,12 @@ xf86_crtc_convert_cursor_to_argb(xf86CrtcPtr crtc, unsigned char *src) - } - else - bits = 0; -+ if (crtc->gamma_red && crtc->gamma_size == 256) { -+ bits = (bits & 0xFF000000) | -+ ((crtc->gamma_red[(bits >> 16) & 255] >> 8) << 16) | -+ (crtc->gamma_green[(bits >> 8) & 255] & 0xFF00) | -+ (crtc->gamma_blue[bits & 255] >> 8); -+ } - cursor_image[y * cursor_info->MaxWidth + x] = bits; - } - crtc->funcs->load_cursor_argb(crtc, cursor_image); -@@ -541,6 +547,12 @@ xf86_crtc_load_cursor_argb(xf86CrtcPtr crtc, CursorPtr cursor) - bits = cursor_source[yin * source_width + xin]; - else - bits = 0; -+ if (crtc->gamma_red && crtc->gamma_size == 256) { -+ bits = (bits & 0xFF000000) | -+ ((crtc->gamma_red[(bits >> 16) & 255] >> 8) << 16) | -+ (crtc->gamma_green[(bits >> 8) & 255] & 0xFF00) | -+ (crtc->gamma_blue[bits & 255] >> 8); -+ } - cursor_image[y * image_width + x] = bits; - } - --- -1.9.2 - diff --git a/xorg-server-hwcursor-gamma/0002-Fix-for-full-and-semi-transparency-under-negative-im.patch b/xorg-server-hwcursor-gamma/0002-Fix-for-full-and-semi-transparency-under-negative-im.patch deleted file mode 100644 index 3a41a81..0000000 --- a/xorg-server-hwcursor-gamma/0002-Fix-for-full-and-semi-transparency-under-negative-im.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 7b34ab1dbeb4a1e29d7475af65f42e1cb6f60de8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com> -Date: Sat, 19 Apr 2014 19:36:05 +0200 -Subject: [PATCH 2/3] Fix for full and semi-transparency under negative image. - ---- - hw/xfree86/modes/xf86Cursors.c | 49 +++++++++++++++++++++++++++++++----------- - 1 file changed, 37 insertions(+), 12 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c -index 3cb499f..5afd740 100644 ---- a/hw/xfree86/modes/xf86Cursors.c -+++ b/hw/xfree86/modes/xf86Cursors.c -@@ -209,6 +209,41 @@ set_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask) - } - - /* -+ * Remap a cursor pixel according to the gamma ramps -+ */ -+static CARD32 -+cursor_gamma_correct(xf86CrtcPtr crtc, CARD32 bits) -+{ -+ float alpha; -+ CARD32 old_red, new_red; -+ CARD32 old_green, new_green; -+ CARD32 old_blue, new_blue; -+ -+ if (!(crtc->gamma_red && crtc->gamma_size == 256)) -+ return bits; -+ -+ alpha = (float)((bits >> 24) & 255) / 255.f; -+ -+ old_red = (bits >> 16) & 255; -+ old_green = (bits >> 8) & 255; -+ old_blue = (bits >> 0) & 255; -+ -+ new_red = (crtc->gamma_red [old_red ]) >> 8; -+ new_green = (crtc->gamma_green[old_green]) >> 8; -+ new_blue = (crtc->gamma_blue [old_blue ]) >> 8; -+ -+ new_red = new_red * alpha + old_red * (1 - alpha); -+ new_green = new_green * alpha + old_green * (1 - alpha); -+ new_blue = new_blue * alpha + old_blue * (1 - alpha); -+ -+ new_red = new_red < 0 ? 0 : new_red > 255 ? 255 : new_red; -+ new_green = new_green < 0 ? 0 : new_green > 255 ? 255 : new_green; -+ new_blue = new_blue < 0 ? 0 : new_blue > 255 ? 255 : new_blue; -+ -+ return (bits & 0xFF000000) | (new_red << 16) | (new_green << 8) | (new_blue << 0); -+} -+ -+/* - * Load a two color cursor into a driver that supports only ARGB cursors - */ - static void -@@ -242,12 +277,7 @@ xf86_crtc_convert_cursor_to_argb(xf86CrtcPtr crtc, unsigned char *src) - } - else - bits = 0; -- if (crtc->gamma_red && crtc->gamma_size == 256) { -- bits = (bits & 0xFF000000) | -- ((crtc->gamma_red[(bits >> 16) & 255] >> 8) << 16) | -- (crtc->gamma_green[(bits >> 8) & 255] & 0xFF00) | -- (crtc->gamma_blue[bits & 255] >> 8); -- } -+ bits = cursor_gamma_correct(crtc, bits); - cursor_image[y * cursor_info->MaxWidth + x] = bits; - } - crtc->funcs->load_cursor_argb(crtc, cursor_image); -@@ -547,12 +577,7 @@ xf86_crtc_load_cursor_argb(xf86CrtcPtr crtc, CursorPtr cursor) - bits = cursor_source[yin * source_width + xin]; - else - bits = 0; -- if (crtc->gamma_red && crtc->gamma_size == 256) { -- bits = (bits & 0xFF000000) | -- ((crtc->gamma_red[(bits >> 16) & 255] >> 8) << 16) | -- (crtc->gamma_green[(bits >> 8) & 255] & 0xFF00) | -- (crtc->gamma_blue[bits & 255] >> 8); -- } -+ bits = cursor_gamma_correct(crtc, bits); - cursor_image[y * image_width + x] = bits; - } - --- -1.9.2 - diff --git a/xorg-server-hwcursor-gamma/0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch b/xorg-server-hwcursor-gamma/0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch deleted file mode 100644 index 35875ec..0000000 --- a/xorg-server-hwcursor-gamma/0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b167a4d01048fc624fdf95faffa74099e5bd8efb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com> -Date: Mon, 21 Apr 2014 01:05:35 +0200 -Subject: [PATCH 3/3] Use Harms's suggest: do not use inline if. And fix - signness issue: CARD32 is unsigned, which results in that if a value because - less than zero it would be incorrectly corrected to be 255 rather than 0. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Mattias Andrée <maandree@operamail.com> ---- - hw/xfree86/modes/xf86Cursors.c | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c -index 5afd740..b18b7e6 100644 ---- a/hw/xfree86/modes/xf86Cursors.c -+++ b/hw/xfree86/modes/xf86Cursors.c -@@ -214,10 +214,10 @@ set_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask) - static CARD32 - cursor_gamma_correct(xf86CrtcPtr crtc, CARD32 bits) - { -- float alpha; -- CARD32 old_red, new_red; -- CARD32 old_green, new_green; -- CARD32 old_blue, new_blue; -+ float alpha; -+ int32_t old_red, new_red; -+ int32_t old_green, new_green; -+ int32_t old_blue, new_blue; - - if (!(crtc->gamma_red && crtc->gamma_size == 256)) - return bits; -@@ -236,9 +236,13 @@ cursor_gamma_correct(xf86CrtcPtr crtc, CARD32 bits) - new_green = new_green * alpha + old_green * (1 - alpha); - new_blue = new_blue * alpha + old_blue * (1 - alpha); - -- new_red = new_red < 0 ? 0 : new_red > 255 ? 255 : new_red; -- new_green = new_green < 0 ? 0 : new_green > 255 ? 255 : new_green; -- new_blue = new_blue < 0 ? 0 : new_blue > 255 ? 255 : new_blue; -+ /* Make sure the floating point operations did not yeild invalid results. */ -+ if (new_red < 0x00) new_red = 0x00; -+ if (new_red > 0xFF) new_red = 0xFF; -+ if (new_green < 0x00) new_green = 0x00; -+ if (new_green > 0xFF) new_green = 0xFF; -+ if (new_blue < 0x00) new_blue = 0x00; -+ if (new_blue > 0xFF) new_blue = 0xFF; - - return (bits & 0xFF000000) | (new_red << 16) | (new_green << 8) | (new_blue << 0); - } --- -1.9.2 - diff --git a/xorg-server-hwcursor-gamma/PKGBUILD b/xorg-server-hwcursor-gamma/PKGBUILD deleted file mode 100644 index 564c316..0000000 --- a/xorg-server-hwcursor-gamma/PKGBUILD +++ /dev/null @@ -1,136 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -# Maintainer of the xorg-server package: AndyRTR <andyrtr@archlinux.org> -# Maintainer of the xorg-server package: Jan de Groot <jgc@archlinux.org> - -_pkgname=xorg-server -pkgname=xorg-server-hwcursor-gamma -epoch=2 -pkgver=1.19.6 -pkgrel=2 # 1.19.6+13+gd0d1a694f-1 in the xorg-server package -pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors" -depends=(libepoxy libxdmcp libxfont2 libpciaccess libdrm pixman libgcrypt libxau xorg-server-common libxshmfence libgl xf86-input-libinput) -provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=23' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server') -conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting') -replaces=('glamor-egl' 'xf86-video-modesetting') -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' - 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' - 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 'renderproto' 'libpciaccess' 'libxv' - 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' - 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' - 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' - 'libxshmfence' 'libunwind') -source=(https://xorg.freedesktop.org/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2 - nvidia-add-modulepath-support.patch - xserver-autobind-hotplug.patch - xvfb-run - xvfb-run.1 - 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch - 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch - 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch) -sha256sums=('a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197' - '914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8' - 'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - 'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055' - 'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0' - '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081') - -prepare() { - cd "${_pkgname}-${pkgver}" - - #msg2 'Apply hardware cursors gamma adjustments patches' - #patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch - #patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch - #patch -Np1 -i ../0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch - - # merged upstream in trunk - msg2 'apply nvidia patch' - patch -Np1 -i ../nvidia-add-modulepath-support.patch - - # patch from Fedora, not yet merged - msg2 'apply fedora patch' - patch -Np1 -i ../xserver-autobind-hotplug.patch - - autoreconf -vfi -} - -build() { - # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf - # With them, module fail to load with undefined symbol. - # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845 - export CFLAGS="${CFLAGS/-fno-plt}" - export CXXFLAGS="${CXXFLAGS/-fno-plt}" - export LDFLAGS="${LDFLAGS/,-z,now}" - - cd "${_pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-libunwind \ - --enable-xorg \ - --enable-xephyr \ - --enable-glamor \ - --disable-xwayland \ - --enable-kdrive \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-config-udev \ - --disable-systemd-logind \ - --disable-suid-wrapper \ - --enable-install-setuid \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --libexecdir=/usr/lib/xorg-server \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts \ - --with-sha1=libgcrypt \ - --without-systemd-daemon - -# --without-dtrace \ -# --disable-linux-acpi --disable-linux-apm \ - - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \ - -i hw/Makefile -} - -package() { - cd "${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # distro specific files must be installed in /usr/share/X11/xorg.conf.d - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - diff --git a/xorg-server-hwcursor-gamma/PKGBUILD.old b/xorg-server-hwcursor-gamma/PKGBUILD.old deleted file mode 100644 index c3bb4a9..0000000 --- a/xorg-server-hwcursor-gamma/PKGBUILD.old +++ /dev/null @@ -1,133 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Maintainer of the xorg-server package: AndyRTR <andyrtr@archlinux.org> -# Maintainer of the xorg-server package: Jan de Groot <jgc@archlinux.org> - -_pkgname=xorg-server -pkgname=xorg-server-hwcursor-gamma -pkgver=1.18.2 -pkgrel=1 # 4 in xorg-server -pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors" -depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common libxshmfence libgl xf86-input-evdev) -provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=20' 'X-ABI-XINPUT_VERSION=22.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server') -conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting') -replaces=('glamor-egl' 'xf86-video-modesetting') -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' - 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' - 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' - 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' - 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' - 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' - 'libxshmfence' 'libunwind') -source=(${url}/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2 - xvfb-run - xvfb-run.1 - 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch - 0001-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch - 0001-present-Only-requeue-for-next-MSC-after-flip-failure.patch - 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch - 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch - 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch) -sha256sums=('022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '10c66c10f4f71930e2ac3f6e07881e228ca88542af449d2c69c7744ec87335df' - '72755a652e72144e3f28c8fa959b4a6df5def838db3cde5077a626e97baab591' - '70c84bf1f7cbc818692fb56f57c8b8ef2ea057bc05380b2f797ecba742b7ce31' - 'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055' - 'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0' - '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081') - -prepare() { - cd "${_pkgname}-${pkgver}" - - msg2 'Fix red tint in Firefox' - patch -Np1 -i ../0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch - - msg2 'Fix flooding of Xorg log file' - patch -Np1 -i ../0001-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch - - msg2 'Fix FS#48549' - patch -Np1 -i ../0001-present-Only-requeue-for-next-MSC-after-flip-failure.patch - - msg2 'Apply hardware cursors gamma adjustments patches' - patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch - patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch - patch -Np1 -i ../0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch -} - -build() { - cd "${_pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-libunwind \ - --enable-xorg \ - --enable-xephyr \ - --enable-glamor \ - --disable-xwayland \ - --enable-kdrive \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-config-udev \ - --disable-systemd-logind \ - --disable-suid-wrapper \ - --enable-install-setuid \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --libexecdir=/usr/lib/xorg-server \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts \ - --with-sha1=libgcrypt \ - --without-systemd-daemon - -# --without-dtrace \ -# --disable-linux-acpi --disable-linux-apm \ - - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \ - -i hw/Makefile -} - -package() { - cd "${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # distro specific files must be installed in /usr/share/X11/xorg.conf.d - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - diff --git a/xorg-server-hwcursor-gamma/nvidia-add-modulepath-support.patch b/xorg-server-hwcursor-gamma/nvidia-add-modulepath-support.patch deleted file mode 100644 index 584b91c..0000000 --- a/xorg-server-hwcursor-gamma/nvidia-add-modulepath-support.patch +++ /dev/null @@ -1,851 +0,0 @@ -From c17e544b271ced65483692103d39ed1188d4ca25 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Tue, 27 Sep 2016 14:30:10 +0200 -Subject: [PATCH xserver v2 5/7] xfree86: Remove redundant ServerIsNotSeat0 - check from xf86CallDriverProbe - -If foundScreen is TRUE, then all the code below the removed if -will not execute until we reach the return foundScreen; at the -end, so this entire if block is redundant. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86Bus.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c -index 5b93940..27c6b1b 100644 ---- a/hw/xfree86/common/xf86Bus.c -+++ b/hw/xfree86/common/xf86Bus.c -@@ -82,8 +82,6 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only) - if (!xf86DoConfigure && drv->platformProbe != NULL) { - foundScreen = xf86platformProbeDev(drv); - } -- if (ServerIsNotSeat0() && foundScreen) -- return foundScreen; - #endif - - #ifdef XSERVER_LIBPCIACCESS --- -2.9.3 - -From 74bc0fff3a6ca233e56b3fb2971bca97b5a4f8b5 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Fri, 30 Sep 2016 11:59:04 +0200 -Subject: [PATCH xserver v2 6/7] xfree86: Make adding unclaimed devices as GPU - devices a separate step - -This is primarily a preparation patch for fixing the xserver exiting with -a "no screens found" error even though there are supported video cards, -due to the server not recognizing any card as the primary card. - -This also fixes the (mostly theoretical) case of a platformBus capable -driver adding a device as GPUscreen before a driver which only supports -the old PCI probe method gets a chance to claim it as a normal screen. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86Bus.c | 4 ++++ - hw/xfree86/common/xf86platformBus.c | 15 +++++++++++++++ - hw/xfree86/common/xf86platformBus.h | 6 ++++++ - 3 files changed, 25 insertions(+) - -diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c -index 27c6b1b..a3a9898 100644 ---- a/hw/xfree86/common/xf86Bus.c -+++ b/hw/xfree86/common/xf86Bus.c -@@ -125,6 +125,10 @@ xf86BusConfig(void) - xf86CallDriverProbe(xf86DriverList[i], FALSE); - } - -+ for (i = 0; i < xf86NumDrivers; i++) { -+ xf86platformAddGPUDevices(xf86DriverList[i]); -+ } -+ - /* If nothing was detected, return now */ - if (xf86NumScreens == 0) { - xf86Msg(X_ERROR, "No devices detected.\n"); -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 39fb1dd..8dd0d5d 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -475,6 +475,21 @@ xf86platformProbeDev(DriverPtr drvp) - isGPUDevice(devList[i]) ? PLATFORM_PROBE_GPU_SCREEN : 0); - } - -+ return foundScreen; -+} -+ -+int -+xf86platformAddGPUDevices(DriverPtr drvp) -+{ -+ Bool foundScreen = FALSE; -+ GDevPtr *devList; -+ int j; -+ -+ if (!drvp->platformProbe) -+ return FALSE; -+ -+ xf86MatchDevice(drvp->driverName, &devList); -+ - /* if autoaddgpu devices is enabled then go find any unclaimed platform - * devices and add them as GPU screens */ - if (xf86Info.autoAddGPU) { -diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h -index a7335b9..0f5c0ef 100644 ---- a/hw/xfree86/common/xf86platformBus.h -+++ b/hw/xfree86/common/xf86platformBus.h -@@ -41,6 +41,7 @@ struct xf86_platform_device { - #ifdef XSERVER_PLATFORM_BUS - int xf86platformProbe(void); - int xf86platformProbeDev(DriverPtr drvp); -+int xf86platformAddGPUDevices(DriverPtr drvp); - - extern int xf86_num_platform_devices; - extern struct xf86_platform_device *xf86_platform_devices; -@@ -156,6 +157,11 @@ xf86PlatformMatchDriver(char *matches[], int nmatches); - - extern void xf86platformVTProbe(void); - extern void xf86platformPrimary(void); -+ -+#else -+ -+static inline int xf86platformAddGPUDevices(DriverPtr drvp) { return FALSE; } -+ - #endif - - #endif --- -2.9.3 - -From 02bcb6f189c4ad8b2e73ce99cfa3c10f0c244a88 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Fri, 30 Sep 2016 12:29:09 +0200 -Subject: [PATCH xserver v2 7/7] xfree86: Try harder to find atleast 1 non GPU - Screen - -If we did not find any non GPU Screens, try again ignoring the notion -of any video devices being the primary device. This fixes Xorg exiting -with a "no screens found" error when using virtio-vga in a -virtual-machine and when using a device driven by simpledrm. - -This is a somewhat ugly solution, but it is the best I can come up with -without major surgery to the bus and probe code. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86.h | 1 + - hw/xfree86/common/xf86Bus.c | 26 +++++++++++++++++++++++--- - hw/xfree86/common/xf86Globals.c | 1 + - hw/xfree86/common/xf86pciBus.c | 4 ++++ - hw/xfree86/common/xf86platformBus.c | 4 ++++ - 5 files changed, 33 insertions(+), 3 deletions(-) - -diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h -index e54c811..f724688 100644 ---- a/hw/xfree86/common/xf86.h -+++ b/hw/xfree86/common/xf86.h -@@ -55,6 +55,7 @@ - extern _X_EXPORT int xf86DoConfigure; - extern _X_EXPORT int xf86DoShowOptions; - extern _X_EXPORT Bool xf86DoConfigurePass1; -+extern _X_EXPORT Bool xf86ProbeIgnorePrimary; - extern _X_EXPORT Bool xorgHWAccess; - - extern _X_EXPORT DevPrivateKeyRec xf86ScreenKeyRec; -diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c -index a3a9898..9836803 100644 ---- a/hw/xfree86/common/xf86Bus.c -+++ b/hw/xfree86/common/xf86Bus.c -@@ -117,14 +117,34 @@ xf86BusConfig(void) - int i, j; - - /* -- * Now call each of the Probe functions. Each successful probe will -- * result in an extra entry added to the xf86Screens[] list for each -- * instance of the hardware found. -+ * 3 step probe to (hopefully) ensure that we always find at least 1 -+ * (non GPU) screen: -+ * -+ * 1. Call each drivers probe function normally, -+ * Each successful probe will result in an extra entry added to the -+ * xf86Screens[] list for each instance of the hardware found. - */ - for (i = 0; i < xf86NumDrivers; i++) { - xf86CallDriverProbe(xf86DriverList[i], FALSE); - } - -+ /* -+ * 2. If no Screens were found, call each drivers probe function with -+ * ignorePrimary = TRUE, to ensure that we do actually get a -+ * Screen if there is atleast one supported video card. -+ */ -+ if (xf86NumScreens == 0) { -+ xf86ProbeIgnorePrimary = TRUE; -+ for (i = 0; i < xf86NumDrivers && xf86NumScreens == 0; i++) { -+ xf86CallDriverProbe(xf86DriverList[i], FALSE); -+ } -+ xf86ProbeIgnorePrimary = FALSE; -+ } -+ -+ /* -+ * 3. Call xf86platformAddGPUDevices() to add any additional video cards as -+ * GPUScreens (GPUScreens are only supported by platformBus drivers). -+ */ - for (i = 0; i < xf86NumDrivers; i++) { - xf86platformAddGPUDevices(xf86DriverList[i]); - } -diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c -index 07cfabf..e962b75 100644 ---- a/hw/xfree86/common/xf86Globals.c -+++ b/hw/xfree86/common/xf86Globals.c -@@ -152,6 +152,7 @@ XF86ConfigPtr xf86configptr = NULL; - Bool xf86Resetting = FALSE; - Bool xf86Initialising = FALSE; - Bool xf86DoConfigure = FALSE; -+Bool xf86ProbeIgnorePrimary = FALSE; - Bool xf86DoShowOptions = FALSE; - DriverPtr *xf86DriverList = NULL; - int xf86NumDrivers = 0; -diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 8158c2b..9adfee5 100644 ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c -@@ -352,6 +352,10 @@ xf86ComparePciBusString(const char *busID, int bus, int device, int func) - Bool - xf86IsPrimaryPci(struct pci_device *pPci) - { -+ /* Add max. 1 screen for the IgnorePrimary fallback path */ -+ if (xf86ProbeIgnorePrimary && xf86NumScreens == 0) -+ return TRUE; -+ - if (primaryBus.type == BUS_PCI) - return pPci == primaryBus.id.pci; - #ifdef XSERVER_PLATFORM_BUS -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 8dd0d5d..063e81c 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -114,6 +114,10 @@ xf86_find_platform_device_by_devnum(int major, int minor) - static Bool - xf86IsPrimaryPlatform(struct xf86_platform_device *plat) - { -+ /* Add max. 1 screen for the IgnorePrimary fallback path */ -+ if (xf86ProbeIgnorePrimary && xf86NumScreens == 0) -+ return TRUE; -+ - if (primaryBus.type == BUS_PLATFORM) - return plat == primaryBus.id.plat; - #ifdef XSERVER_LIBPCIACCESS --- -2.9.3 - -From c57c1e53ea3d76ebba5b2a23b7260817d3e6b921 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:12 +0100 -Subject: [PATCH xserver 1/6] xfree86: Free devlist returned by xf86MatchDevice - -xf86MatchDevice returns a dynamically allocated list of GDevPtr-s, -free this when we're done with it. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 063e81c..16d934f 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -479,6 +479,8 @@ xf86platformProbeDev(DriverPtr drvp) - isGPUDevice(devList[i]) ? PLATFORM_PROBE_GPU_SCREEN : 0); - } - -+ free(devList); -+ - return foundScreen; - } - -@@ -505,6 +507,8 @@ xf86platformAddGPUDevices(DriverPtr drvp) - } - } - -+ free(devList); -+ - return foundScreen; - } - --- -2.9.3 - -From 08b84d72878e43401e99059c3c926dfa42a360c3 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:13 +0100 -Subject: [PATCH xserver 2/6] xfree86: Make OutputClassMatches take a - xf86_platform_device - -Make OutputClassMatches directly take a xf86_platform_device as argument, -rather then an index into xf86_platform_devices. This makes things -easier for callers which already have a xf86_platform_device pointer. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 16d934f..25a9040 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -214,9 +214,10 @@ MatchToken(const char *value, struct xorg_list *patterns, - } - - static Bool --OutputClassMatches(const XF86ConfOutputClassPtr oclass, int index) -+OutputClassMatches(const XF86ConfOutputClassPtr oclass, -+ struct xf86_platform_device *dev) - { -- char *driver = xf86_platform_odev_attributes(index)->driver; -+ char *driver = dev->attribs->driver; - - if (!MatchToken(driver, &oclass->match_driver, strcmp)) - return FALSE; -@@ -234,7 +235,7 @@ xf86OutputClassDriverList(int index, char *matches[], int nmatches) - return 0; - - for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { -- if (OutputClassMatches(cl, index)) { -+ if (OutputClassMatches(cl, &xf86_platform_devices[index])) { - char *path = xf86_platform_odev_attributes(index)->path; - - xf86Msg(X_INFO, "Applying OutputClass \"%s\" to %s\n", --- -2.9.3 - -From 9cd3cc75269d9196898487b5712ee47b8291e077 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:14 +0100 -Subject: [PATCH xserver 3/6] xfree86: Add options support for OutputClass - Options - -Add support for setting options in OutputClass Sections and having these -applied to any matching output devices. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86Option.c | 5 ++++- - hw/xfree86/common/xf86platformBus.c | 42 +++++++++++++++++++++++++++++++++++++ - hw/xfree86/common/xf86platformBus.h | 2 ++ - hw/xfree86/man/xorg.conf.man | 10 +++++++++ - hw/xfree86/parser/OutputClass.c | 6 ++++++ - hw/xfree86/parser/xf86Parser.h | 1 + - 6 files changed, 65 insertions(+), 1 deletion(-) - -diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c -index 0e8bc1f..929724d 100644 ---- a/hw/xfree86/common/xf86Option.c -+++ b/hw/xfree86/common/xf86Option.c -@@ -44,6 +44,7 @@ - #include "xf86Xinput.h" - #include "xf86Optrec.h" - #include "xf86Parser.h" -+#include "xf86platformBus.h" /* For OutputClass functions */ - #include "optionstr.h" - - static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options, -@@ -64,7 +65,7 @@ static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options, - * - * The order of precedence for options is: - * -- * extraOpts, display, confScreen, monitor, device -+ * extraOpts, display, confScreen, monitor, device, outputClassOptions - */ - - void -@@ -79,6 +80,8 @@ xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts) - pScrn->options = NULL; - - for (i = pScrn->numEntities - 1; i >= 0; i--) { -+ xf86MergeOutputClassOptions(pScrn->entityList[i], &pScrn->options); -+ - device = xf86GetDevFromEntity(pScrn->entityList[i], - pScrn->entityInstanceList[i]); - if (device && device->options) { -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 25a9040..a698c6c 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -310,6 +310,48 @@ xf86platformProbe(void) - return 0; - } - -+void -+xf86MergeOutputClassOptions(int entityIndex, void **options) -+{ -+ const EntityPtr entity = xf86Entities[entityIndex]; -+ struct xf86_platform_device *dev = NULL; -+ XF86ConfOutputClassPtr cl; -+ XF86OptionPtr classopts; -+ int i = 0; -+ -+ switch (entity->bus.type) { -+ case BUS_PLATFORM: -+ dev = entity->bus.id.plat; -+ break; -+ case BUS_PCI: -+ for (i = 0; i < xf86_num_platform_devices; i++) { -+ if (MATCH_PCI_DEVICES(xf86_platform_devices[i].pdev, -+ entity->bus.id.pci)) { -+ dev = &xf86_platform_devices[i]; -+ break; -+ } -+ } -+ break; -+ default: -+ xf86Msg(X_DEBUG, "xf86MergeOutputClassOptions unsupported bus type %d\n", -+ entity->bus.type); -+ } -+ -+ if (!dev) -+ return; -+ -+ for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { -+ if (!OutputClassMatches(cl, dev) || !cl->option_lst) -+ continue; -+ -+ xf86Msg(X_INFO, "Applying OutputClass \"%s\" options to %s\n", -+ cl->identifier, dev->attribs->path); -+ -+ classopts = xf86optionListDup(cl->option_lst); -+ *options = xf86optionListMerge(*options, classopts); -+ } -+} -+ - static int - xf86ClaimPlatformSlot(struct xf86_platform_device * d, DriverPtr drvp, - int chipset, GDevPtr dev, Bool active) -diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h -index 0f5c0ef..70d9ec8 100644 ---- a/hw/xfree86/common/xf86platformBus.h -+++ b/hw/xfree86/common/xf86platformBus.h -@@ -42,6 +42,7 @@ struct xf86_platform_device { - int xf86platformProbe(void); - int xf86platformProbeDev(DriverPtr drvp); - int xf86platformAddGPUDevices(DriverPtr drvp); -+void xf86MergeOutputClassOptions(int entityIndex, void **options); - - extern int xf86_num_platform_devices; - extern struct xf86_platform_device *xf86_platform_devices; -@@ -161,6 +162,7 @@ extern void xf86platformPrimary(void); - #else - - static inline int xf86platformAddGPUDevices(DriverPtr drvp) { return FALSE; } -+static inline void xf86MergeOutputClassOptions(int index, void **options) {} - - #endif - -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 7d0c524..8928a53 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -1280,6 +1280,16 @@ For example: - Check the case-sensitive string - .RI \*q matchdriver \*q - against the kernel driver of the device. -+.PP -+When an output device has been matched to the -+.B OutputClass -+section, any -+.B Option -+entries are applied to the device. See the -+.B Device -+section below for a description of the remaining -+.B Option -+entries. - .SH "DEVICE SECTION" - The config file may have multiple - .B Device -diff --git a/hw/xfree86/parser/OutputClass.c b/hw/xfree86/parser/OutputClass.c -index 8064e0c..f813ee6 100644 ---- a/hw/xfree86/parser/OutputClass.c -+++ b/hw/xfree86/parser/OutputClass.c -@@ -36,6 +36,7 @@ static const xf86ConfigSymTabRec OutputClassTab[] = { - {ENDSECTION, "endsection"}, - {IDENTIFIER, "identifier"}, - {DRIVER, "driver"}, -+ {OPTION, "option"}, - {MATCH_DRIVER, "matchdriver"}, - {-1, ""}, - }; -@@ -60,6 +61,8 @@ xf86freeOutputClassList(XF86ConfOutputClassPtr ptr) - free(group); - } - -+ xf86optionListFree(ptr->option_lst); -+ - prev = ptr; - ptr = ptr->list.next; - free(prev); -@@ -112,6 +115,9 @@ xf86parseOutputClassSection(void) - else - ptr->driver = xf86_lex_val.str; - break; -+ case OPTION: -+ ptr->option_lst = xf86parseOption(ptr->option_lst); -+ break; - case MATCH_DRIVER: - if (xf86getSubToken(&(ptr->comment)) != STRING) - Error(QUOTE_MSG, "MatchDriver"); -diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h -index 9c4b403..897edab 100644 ---- a/hw/xfree86/parser/xf86Parser.h -+++ b/hw/xfree86/parser/xf86Parser.h -@@ -338,6 +338,7 @@ typedef struct { - char *identifier; - char *driver; - struct xorg_list match_driver; -+ XF86OptionPtr option_lst; - char *comment; - } XF86ConfOutputClassRec, *XF86ConfOutputClassPtr; - --- -2.9.3 - -From ab1a65b7755d081b41188104b21f4d21eaa3187b Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:15 +0100 -Subject: [PATCH xserver 4/6] xfree86: xf86platformProbe: split finding - pci-info and setting primary GPU - -This is a preparation patch for allowing an OutputClass section to -override the default primary GPU device selection. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index a698c6c..39b3248 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -145,16 +145,9 @@ platform_find_pci_info(struct xf86_platform_device *pd, char *busid) - - iter = pci_slot_match_iterator_create(&devmatch); - info = pci_device_next(iter); -- if (info) { -+ if (info) - pd->pdev = info; -- pci_device_probe(info); -- if (pci_device_is_boot_vga(info)) { -- primaryBus.type = BUS_PLATFORM; -- primaryBus.id.plat = pd; -- } -- } - pci_iterator_destroy(iter); -- - } - - static Bool -@@ -307,6 +300,20 @@ xf86platformProbe(void) - platform_find_pci_info(&xf86_platform_devices[i], busid); - } - } -+ -+ for (i = 0; i < xf86_num_platform_devices; i++) { -+ struct xf86_platform_device *dev = &xf86_platform_devices[i]; -+ -+ if (!dev->pdev) -+ continue; -+ -+ pci_device_probe(dev->pdev); -+ if (pci_device_is_boot_vga(dev->pdev)) { -+ primaryBus.type = BUS_PLATFORM; -+ primaryBus.id.plat = dev; -+ } -+ } -+ - return 0; - } - --- -2.9.3 - -From d75ffcdbf8c1e3c8e0d46debcd533a9f2560f0a8 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:16 +0100 -Subject: [PATCH xserver 5/6] xfree86: Allow overriding primary GPU detection - from an OutputClass section - -Allow using: - -Option "PrimaryGPU" "yes" - -In an OutputClass section to override the default primary GPU device -selection which selects the GPU used as output by the firmware. - -If multiple output devices match an OutputClass section with -the PrimaryGPU option set, the first one enumerated becomes the -primary GPU. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 19 +++++++++++++++++++ - hw/xfree86/man/xorg.conf.man | 12 +++++++++++- - 2 files changed, 30 insertions(+), 1 deletion(-) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 39b3248..fc17d15 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -286,6 +286,7 @@ xf86platformProbe(void) - { - int i; - Bool pci = TRUE; -+ XF86ConfOutputClassPtr cl; - - config_odev_probe(xf86PlatformDeviceProbe); - -@@ -301,6 +302,24 @@ xf86platformProbe(void) - } - } - -+ /* First see if there is an OutputClass match marking a device as primary */ -+ for (i = 0; i < xf86_num_platform_devices; i++) { -+ struct xf86_platform_device *dev = &xf86_platform_devices[i]; -+ for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { -+ if (!OutputClassMatches(cl, dev)) -+ continue; -+ -+ if (xf86CheckBoolOption(cl->option_lst, "PrimaryGPU", FALSE)) { -+ xf86Msg(X_CONFIG, "OutputClass \"%s\" setting %s as PrimaryGPU\n", -+ cl->identifier, dev->attribs->path); -+ primaryBus.type = BUS_PLATFORM; -+ primaryBus.id.plat = dev; -+ return 0; -+ } -+ } -+ } -+ -+ /* Then check for pci_device_is_boot_vga() */ - for (i = 0; i < xf86_num_platform_devices; i++) { - struct xf86_platform_device *dev = &xf86_platform_devices[i]; - -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 8928a53..79b71a8 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -1285,11 +1285,21 @@ When an output device has been matched to the - .B OutputClass - section, any - .B Option --entries are applied to the device. See the -+entries are applied to the device. One -+.B OutputClass -+specific -+.B Option -+is recognized. See the - .B Device - section below for a description of the remaining - .B Option - entries. -+.TP 7 -+.BI "Option \*qPrimaryGPU\*q \*q" boolean \*q -+This option specifies that the matched device should be treated as the -+primary GPU, replacing the selection of the GPU used as output by the -+firmware. If multiple output devices match an OutputClass section with -+the PrimaryGPU option set, the first one enumerated becomes the primary GPU. - .SH "DEVICE SECTION" - The config file may have multiple - .B Device --- -2.9.3 - -From b5dffbbac193aa640ffcfa0a431c21b862854e53 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:17 +0100 -Subject: [PATCH xserver 6/6] xfree86: Add ModulePath support for OutputClass - config Sections - -Allow OutputClass config snippets to modify the module-path. - -Note that any specified ModulePaths will be pre-pended to the normal -ModulePath. The idea behind this is that any output hardware specific -modules should have preference over the normal modules. - -One use-case for this is the nvidia binary driver, this allows a -config snippet like this: - -Section "OutputClass" - MatchDriver "nvidia" - Modulepath "/usr/lib64/nvidia/modules" -EndSection - -To get the nvidia glx specific glx module loaded, but only when the -nvidia kernel driver is loaded. - -Together with the glvnd work done recently, this allows the nouveau -+ mesa and nvidia-binary userspace stacks to co-exist on the same -system without any ldconfig / xorg.conf tweaking and the xserver will -automatically do the right thing depending on which kernel driver -(nouveau or nvidia) is loaded. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 23 +++++++++++++++++++++++ - hw/xfree86/loader/loadmod.c | 1 + - hw/xfree86/man/xorg.conf.man | 16 ++++++++++++++++ - hw/xfree86/parser/OutputClass.c | 15 +++++++++++++++ - hw/xfree86/parser/xf86Parser.h | 1 + - 5 files changed, 56 insertions(+) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index fc17d15..0b5795f 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -40,6 +40,7 @@ - #include "hotplug.h" - #include "systemd-logind.h" - -+#include "loaderProcs.h" - #include "xf86.h" - #include "xf86_OSproc.h" - #include "xf86Priv.h" -@@ -287,6 +288,7 @@ xf86platformProbe(void) - int i; - Bool pci = TRUE; - XF86ConfOutputClassPtr cl; -+ char *old_path, *path = NULL; - - config_odev_probe(xf86PlatformDeviceProbe); - -@@ -300,8 +302,29 @@ xf86platformProbe(void) - if (pci && (strncmp(busid, "pci:", 4) == 0)) { - platform_find_pci_info(&xf86_platform_devices[i], busid); - } -+ -+ /* -+ * Deal with OutputClass ModulePath directives, these must be -+ * processed before we do any module loading. -+ */ -+ for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { -+ if (!OutputClassMatches(cl, &xf86_platform_devices[i])) -+ continue; -+ -+ if (cl->modulepath && xf86ModPathFrom != X_CMDLINE) { -+ old_path = path; -+ XNFasprintf(&path, "%s,%s", cl->modulepath, -+ path ? path : xf86ModulePath); -+ free(old_path); -+ xf86Msg(X_CONFIG, "OutputClass \"%s\" ModulePath extended to \"%s\"\n", -+ cl->identifier, path); -+ LoaderSetPath(path); -+ } -+ } - } - -+ free(path); -+ - /* First see if there is an OutputClass match marking a device as primary */ - for (i = 0; i < xf86_num_platform_devices; i++) { - struct xf86_platform_device *dev = &xf86_platform_devices[i]; -diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c -index 8bf6836..940f5fc 100644 ---- a/hw/xfree86/loader/loadmod.c -+++ b/hw/xfree86/loader/loadmod.c -@@ -184,6 +184,7 @@ LoaderSetPath(const char *path) - if (!path) - return; - -+ FreeStringList(defaultPathList); - defaultPathList = InitPathList(path); - } - -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 79b71a8..00ebf56 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -1300,6 +1300,22 @@ This option specifies that the matched device should be treated as the - primary GPU, replacing the selection of the GPU used as output by the - firmware. If multiple output devices match an OutputClass section with - the PrimaryGPU option set, the first one enumerated becomes the primary GPU. -+.PP -+A -+.B OutputClass -+Section may contain -+.B ModulePath -+entries. When an output device matches an -+.B OutputClass -+section, any -+.B ModulePath -+entries in that -+.B OutputClass -+are pre-pended to the search path for loadable Xorg server modules. See -+.B ModulePath -+in the -+.B Files -+section for more info. - .SH "DEVICE SECTION" - The config file may have multiple - .B Device -diff --git a/hw/xfree86/parser/OutputClass.c b/hw/xfree86/parser/OutputClass.c -index f813ee6..01b348f 100644 ---- a/hw/xfree86/parser/OutputClass.c -+++ b/hw/xfree86/parser/OutputClass.c -@@ -36,6 +36,7 @@ static const xf86ConfigSymTabRec OutputClassTab[] = { - {ENDSECTION, "endsection"}, - {IDENTIFIER, "identifier"}, - {DRIVER, "driver"}, -+ {MODULEPATH, "modulepath"}, - {OPTION, "option"}, - {MATCH_DRIVER, "matchdriver"}, - {-1, ""}, -@@ -53,6 +54,7 @@ xf86freeOutputClassList(XF86ConfOutputClassPtr ptr) - TestFree(ptr->identifier); - TestFree(ptr->comment); - TestFree(ptr->driver); -+ TestFree(ptr->modulepath); - - xorg_list_for_each_entry_safe(group, next, &ptr->match_driver, entry) { - xorg_list_del(&group->entry); -@@ -115,6 +117,19 @@ xf86parseOutputClassSection(void) - else - ptr->driver = xf86_lex_val.str; - break; -+ case MODULEPATH: -+ if (xf86getSubToken(&(ptr->comment)) != STRING) -+ Error(QUOTE_MSG, "ModulePath"); -+ if (ptr->modulepath) { -+ char *path; -+ XNFasprintf(&path, "%s,%s", ptr->modulepath, xf86_lex_val.str); -+ free(xf86_lex_val.str); -+ free(ptr->modulepath); -+ ptr->modulepath = path; -+ } else { -+ ptr->modulepath = xf86_lex_val.str; -+ } -+ break; - case OPTION: - ptr->option_lst = xf86parseOption(ptr->option_lst); - break; -diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h -index 897edab..e014048 100644 ---- a/hw/xfree86/parser/xf86Parser.h -+++ b/hw/xfree86/parser/xf86Parser.h -@@ -337,6 +337,7 @@ typedef struct { - GenericListRec list; - char *identifier; - char *driver; -+ char *modulepath; - struct xorg_list match_driver; - XF86OptionPtr option_lst; - char *comment; --- -2.9.3 - diff --git a/xorg-server-hwcursor-gamma/upload b/xorg-server-hwcursor-gamma/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/xorg-server-hwcursor-gamma/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/xorg-server-hwcursor-gamma/watch b/xorg-server-hwcursor-gamma/watch deleted file mode 100755 index ec1e783..0000000 --- a/xorg-server-hwcursor-gamma/watch +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -[ -f 'PKGBUILD?h=packages%2Fxorg-server' ] && rm 'PKGBUILD?h=packages%2Fxorg-server' - -wget 'https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/xorg-server' >/dev/null 2>/dev/null - -mv 'PKGBUILD?h=packages%2Fxorg-server' PKGBUILD.upstream.new - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep ^pkg < PKGBUILD.upstream.new | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - diff PKGBUILD.upstream.{old,new} > PKGBUILD.upstream.diff - mv PKGBUILD.upstream.{new,old} - echo 'xorg-server-hwcursor-gamma' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'xorg-server-hwcursor-gamma (unfetchable)' -fi - diff --git a/xorg-server-hwcursor-gamma/xserver-autobind-hotplug.patch b/xorg-server-hwcursor-gamma/xserver-autobind-hotplug.patch deleted file mode 100644 index 8025cbd..0000000 --- a/xorg-server-hwcursor-gamma/xserver-autobind-hotplug.patch +++ /dev/null @@ -1,302 +0,0 @@ -From 4471df41ea6e94834a2b10643ca7fcd69682d276 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Fri, 17 Aug 2012 09:49:24 +1000 -Subject: [PATCH xserver v3] autobind GPUs to the screen - -This is a modified version of a patch we've been carry-ing in Fedora and -RHEL for years now. This patch automatically adds secondary GPUs to the -master as output sink / offload source making e.g. the use of -slave-outputs just work, with requiring the user to manually run -"xrandr --setprovideroutputsource" before he can hookup an external -monitor to his hybrid graphics laptop. - -There is one problem with this patch, which is why it was not upstreamed -before. What to do when a secondary GPU gets detected really is a policy -decission (e.g. one may want to autobind PCI GPUs but not USB ones) and -as such should be under control of the Desktop Environment. - -Unconditionally adding autobinding support to the xserver will result -in races between the DE dealing with the hotplug of a secondary GPU -and the server itself dealing with it. - -However we've waited for years for any Desktop Environments to actually -start doing some sort of autoconfiguration of secondary GPUs and there -is still not a single DE dealing with this, so I believe that it is -time to upstream this now. - -To avoid potential future problems if any DEs get support for doing -secondary GPU configuration themselves, the new autobind functionality -is made optional. Since no DEs currently support doing this themselves it -is enabled by default. When DEs grow support for doing this themselves -they can disable the servers autobinding through the servers cmdline or a -xorg.conf snippet. - -Signed-off-by: Dave Airlie <airlied@gmail.com> -[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream] -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- -Changes in v2: --Make the default enabled instead of installing a xorg.conf - snippet which enables it unconditionally -Changes in v3: --Handle GPUScreen autoconfig in randr/rrprovider.c, looking at - rrScrPriv->provider, rather then in hw/xfree86/modes/xf86Crtc.c - looking at xf86CrtcConfig->provider. This fixes the autoconfig not - working with the nvidia binary driver ---- - hw/xfree86/common/xf86Config.c | 19 +++++++++++++++++++ - hw/xfree86/common/xf86Globals.c | 2 ++ - hw/xfree86/common/xf86Init.c | 20 ++++++++++++++++++++ - hw/xfree86/common/xf86Priv.h | 1 + - hw/xfree86/common/xf86Privstr.h | 1 + - hw/xfree86/common/xf86platformBus.c | 4 ++++ - hw/xfree86/man/Xorg.man | 7 +++++++ - hw/xfree86/man/xorg.conf.man | 6 ++++++ - randr/randrstr.h | 3 +++ - randr/rrprovider.c | 22 ++++++++++++++++++++++ - 10 files changed, 85 insertions(+) - -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 21daf1a..df3ca50 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -719,6 +719,7 @@ typedef enum { - FLAG_DRI2, - FLAG_USE_SIGIO, - FLAG_AUTO_ADD_GPU, -+ FLAG_AUTO_BIND_GPU, - FLAG_MAX_CLIENTS, - FLAG_IGLX, - } FlagValues; -@@ -778,6 +779,8 @@ static OptionInfoRec FlagOptions[] = { - {0}, FALSE}, - {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN, - {0}, FALSE}, -+ {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN, -+ {0}, FALSE}, - {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER, - {0}, FALSE }, - {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN, -@@ -857,6 +860,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) - } - xf86Msg(from, "%sutomatically adding GPU devices\n", - xf86Info.autoAddGPU ? "A" : "Not a"); -+ -+ if (xf86AutoBindGPUDisabled) { -+ xf86Info.autoBindGPU = FALSE; -+ from = X_CMDLINE; -+ } -+ else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) { -+ xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU, -+ &xf86Info.autoBindGPU); -+ from = X_CONFIG; -+ } -+ else { -+ from = X_DEFAULT; -+ } -+ xf86Msg(from, "%sutomatically binding GPU devices\n", -+ xf86Info.autoBindGPU ? "A" : "Not a"); -+ - /* - * Set things up based on the config file information. Some of these - * settings may be overridden later when the command line options are -diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c -index e962b75..0d1e31b 100644 ---- a/hw/xfree86/common/xf86Globals.c -+++ b/hw/xfree86/common/xf86Globals.c -@@ -136,6 +136,7 @@ xf86InfoRec xf86Info = { - #else - .autoAddGPU = FALSE, - #endif -+ .autoBindGPU = TRUE, - }; - - const char *xf86ConfigFile = NULL; -@@ -197,6 +198,7 @@ Bool xf86FlipPixels = FALSE; - Gamma xf86Gamma = { 0.0, 0.0, 0.0 }; - - Bool xf86AllowMouseOpenFail = FALSE; -+Bool xf86AutoBindGPUDisabled = FALSE; - - #ifdef XF86VIDMODE - Bool xf86VidModeDisabled = FALSE; -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index a544b65..b0cba3d 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -76,6 +76,7 @@ - #include "xf86DDC.h" - #include "xf86Xinput.h" - #include "xf86InPriv.h" -+#include "xf86Crtc.h" - #include "picturestr.h" - - #include "xf86Bus.h" -@@ -298,6 +299,19 @@ xf86PrivsElevated(void) - } - - static void -+xf86AutoConfigOutputDevices(void) -+{ -+ int i; -+ -+ if (!xf86Info.autoBindGPU) -+ return; -+ -+ for (i = 0; i < xf86NumGPUScreens; i++) -+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), -+ xf86ScrnToScreen(xf86Screens[0])); -+} -+ -+static void - InstallSignalHandlers(void) - { - /* -@@ -871,6 +885,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) - for (i = 0; i < xf86NumGPUScreens; i++) - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); - -+ xf86AutoConfigOutputDevices(); -+ - xf86VGAarbiterWrapFunctions(); - if (sigio_blocked) - input_unlock(); -@@ -1389,6 +1405,10 @@ ddxProcessArgument(int argc, char **argv, int i) - xf86Info.iglxFrom = X_CMDLINE; - return 0; - } -+ if (!strcmp(argv[i], "-noautoBindGPU")) { -+ xf86AutoBindGPUDisabled = TRUE; -+ return 1; -+ } - - /* OS-specific processing */ - return xf86ProcessArgument(argc, argv, i); -diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h -index c1f8a18..9a3d0df 100644 ---- a/hw/xfree86/common/xf86Priv.h -+++ b/hw/xfree86/common/xf86Priv.h -@@ -46,6 +46,7 @@ - extern _X_EXPORT const char *xf86ConfigFile; - extern _X_EXPORT const char *xf86ConfigDir; - extern _X_EXPORT Bool xf86AllowMouseOpenFail; -+extern _X_EXPORT Bool xf86AutoBindGPUDisabled; - - #ifdef XF86VIDMODE - extern _X_EXPORT Bool xf86VidModeDisabled; -diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h -index c29b3cc..4c5f54b 100644 ---- a/hw/xfree86/common/xf86Privstr.h -+++ b/hw/xfree86/common/xf86Privstr.h -@@ -102,6 +102,7 @@ typedef struct { - MessageType dri2From; - - Bool autoAddGPU; -+ Bool autoBindGPU; - } xf86InfoRec, *xf86InfoPtr; - - #ifdef DPMSExtension -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 063e81c..42789ca 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -48,6 +48,7 @@ - #include "Pci.h" - #include "xf86platformBus.h" - #include "xf86Config.h" -+#include "xf86Crtc.h" - - #include "randrstr.h" - int platformSlotClaimed; -@@ -579,6 +580,9 @@ xf86platformAddDevice(int index) - } - /* attach unbound to 0 protocol screen */ - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); -+ if (xf86Info.autoBindGPU) -+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), -+ xf86ScrnToScreen(xf86Screens[0])); - - RRResourcesChanged(xf86Screens[0]->pScreen); - RRTellChanged(xf86Screens[0]->pScreen); -diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man -index def9bfc..8df6b7d 100644 ---- a/hw/xfree86/man/Xorg.man -+++ b/hw/xfree86/man/Xorg.man -@@ -283,6 +283,13 @@ is a comma separated list of directories to search for - server modules. This option is only available when the server is run - as root (i.e, with real-uid 0). - .TP 8 -+.B \-noautoBindGPU -+Disable automatically setting secondary GPUs up as output sinks and offload -+sources. This is equivalent to setting the -+.B AutoBindGPU -+xorg.conf(__filemansuffix__) file option. To -+.B false. -+.TP 8 - .B \-nosilk - Disable Silken Mouse support. - .TP 8 -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 7d0c524..3e596e4 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -673,6 +673,12 @@ Enabled by default. - If this option is disabled, then no GPU devices will be added from the udev - backend. Enabled by default. (May need to be disabled to setup Xinerama). - .TP 7 -+.BI "Option \*qAutoBindGPU\*q \*q" boolean \*q -+If enabled then secondary GPUs will be automatically set up as output-sinks and -+offload-sources. Making e.g. laptop outputs connected only to the secondary -+GPU directly available for use without needing to run -+"xrandr --setprovideroutputsource". Enabled by default. -+.TP 7 - .BI "Option \*qLog\*q \*q" string \*q - This option controls whether the log is flushed and/or synced to disk after - each message. -diff --git a/randr/randrstr.h b/randr/randrstr.h -index 706e9a7..66999d5 100644 ---- a/randr/randrstr.h -+++ b/randr/randrstr.h -@@ -976,6 +976,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p); - extern _X_EXPORT void - RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider); - -+extern _X_EXPORT void -+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen); -+ - /* rrproviderproperty.c */ - - extern _X_EXPORT void -diff --git a/randr/rrprovider.c b/randr/rrprovider.c -index f9df67e..abc5685 100644 ---- a/randr/rrprovider.c -+++ b/randr/rrprovider.c -@@ -482,3 +482,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider) - - WriteEventsToClient(client, 1, (xEvent *) &pe); - } -+ -+void -+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen) -+{ -+ rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); -+ rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen); -+ RRProviderPtr provider = pScrPriv->provider; -+ RRProviderPtr master_provider = masterPriv->provider; -+ -+ if (!provider || !master_provider) -+ return; -+ -+ if ((provider->capabilities & RR_Capability_SinkOutput) && -+ (master_provider->capabilities & RR_Capability_SourceOutput)) { -+ pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider); -+ RRInitPrimeSyncProps(pScreen); -+ } -+ -+ if ((provider->capabilities & RR_Capability_SourceOffload) && -+ (master_provider->capabilities & RR_Capability_SinkOffload)) -+ pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider); -+} --- -2.9.3 - diff --git a/xorg-server-hwcursor-gamma/xvfb-run b/xorg-server-hwcursor-gamma/xvfb-run deleted file mode 100644 index 4c2f4e0..0000000 --- a/xorg-server-hwcursor-gamma/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/xorg-server-hwcursor-gamma/xvfb-run.1 b/xorg-server-hwcursor-gamma/xvfb-run.1 deleted file mode 100644 index 137d3a1..0000000 --- a/xorg-server-hwcursor-gamma/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/xtux/.gitignore b/xtux/.gitignore deleted file mode 100644 index 027271b..0000000 --- a/xtux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -files diff --git a/xtux/PKGBUILD b/xtux/PKGBUILD deleted file mode 100644 index f80473d..0000000 --- a/xtux/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> -# Previous maintainer: Anton Bazhenov <anton.bazhenov at gmail> - -pkgname=xtux -pkgver=20030306 -pkgrel=1 -pkgdesc="A Gauntlet-style arcade game for X11 with multiplayer mode" -arch=('i686' 'x86_64') -url="http://xtux.sourceforge.net/" -license=('GPL') -depends=('libxpm') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-src-${pkgver}.tar.gz" - "${pkgname}.patch" - "${pkgname}.desktop") -md5sums=('6ca5d3b48c30411d1a64b4316d5cf6a9' - 'd04e19ea067837eda0f1ce066d9c8f3a' - '504541ae6fadcb6d56387aedda475979') - -build() { - cd "${srcdir}/${pkgname}" - patch -Np1 -i "../${pkgname}.patch" - make -} - -package() { - cd "${srcdir}/${pkgname}" - - # Install binaries - mkdir -p "${pkgdir}/usr/bin" - install -m755 "${pkgname}" tux_serv "${pkgdir}/usr/bin" - - # Install data files - mkdir -p "${pkgdir}/usr/share/${pkgname}" - cp -r data/* "${pkgdir}/usr/share/${pkgname}" - - # Install pixmap and .desktop file - install -Dm644 data/images/icon.xpm "${pkgdir}/usr/share/pixmaps/${pkgname}.xpm" - install -Dm644 "../${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - # Install documentation - mkdir -p "${pkgdir}/usr/share/doc/${pkgname}" - install -m644 AUTHORS CHANGELOG README* "${pkgdir}/usr/share/doc/${pkgname}" -} diff --git a/xtux/upload b/xtux/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/xtux/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/xtux/watch b/xtux/watch deleted file mode 100755 index ef4c624..0000000 --- a/xtux/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'files' ] && rm 'files' -wget http://sourceforge.net/projects/xtux/files -O files >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep 'Download xtux-src-' < files | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'xtux' - fi - rm files -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'xtux (unfetchable)' -fi - diff --git a/xtux/xtux.desktop b/xtux/xtux.desktop deleted file mode 100644 index 4c5d17b..0000000 --- a/xtux/xtux.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=XTux -Comment=A Gauntlet-style arcade game for X11 with multiplayer mode -Exec=xtux -Icon=xtux.xpm -Terminal=false -Categories=Game;ActionGame; diff --git a/xtux/xtux.patch b/xtux/xtux.patch deleted file mode 100644 index 2ace5e9..0000000 --- a/xtux/xtux.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- xtux.orig/Makefile 2003-02-04 20:59:01.000000000 +0500 -+++ xtux/Makefile 2012-02-26 16:31:00.092498256 +0600 -@@ -5,7 +5,7 @@ - #============================================================# - - #Change this to where you want to put the data directory. --DATADIR = `pwd`/data -+DATADIR = /usr/share/xtux - #Eg you might want to put the data files here...... - #DATADIR = /usr/share/games/xtux - ---- xtux.orig/src/client/win.h 2003-03-05 20:20:04.000000000 +0500 -+++ xtux/src/client/win.h 2012-02-26 15:59:09.479154124 +0600 -@@ -11,9 +11,9 @@ - #define DEF_WIN_H 384 - - /* Font names */ --#define MED_FONT_18 "-adobe-helvetica-medium-r-*-*-18-*-*-*-*-*-*-*" --#define BOLD_FONT_14 "-*-helvetica-bold-r-*-*-14-*-*-*-*-*-iso8859-*" --#define BOLD_FONT_24 "-*-helvetica-bold-r-*-*-24-*-*-*-*-*-iso8859-*" -+#define MED_FONT_18 "-*-*-medium-r-*-*-18-*-*-*-*-*-*-*" -+#define BOLD_FONT_14 "-*-*-bold-r-*-*-14-*-*-*-*-*-iso8859-*" -+#define BOLD_FONT_24 "-*-*-bold-r-*-*-24-*-*-*-*-*-iso8859-*" - - typedef struct { - Display *d; ---- xtux.orig/src/client/menu.c 2003-03-05 19:54:17.000000000 +0500 -+++ xtux/src/client/menu.c 2012-02-26 19:52:47.701065955 +0600 -@@ -726,7 +726,7 @@ - for( i=0 ; i<3 ; i++ ) - close(i); /* Close STD-IN, -OUT, -ERR */ - -- system("./tux_serv -e"); -+ system("tux_serv -e"); - /* execlp( "./tux_serv", "-e" ); - perror("execlp"); */ - exit(-1); |