diff options
Diffstat (limited to '~lukeshu')
26 files changed, 1037 insertions, 67 deletions
diff --git a/~lukeshu/.gitignore b/~lukeshu/.gitignore new file mode 100644 index 000000000..db32297d9 --- /dev/null +++ b/~lukeshu/.gitignore @@ -0,0 +1,6 @@ +# probably source downloads +*.tar.gz +*.tar.xz +*.tar.bz2 +*.tgz +*.zip diff --git a/~lukeshu/android-udev/.gitignore b/~lukeshu/android-udev/.gitignore new file mode 100644 index 000000000..290a3baa3 --- /dev/null +++ b/~lukeshu/android-udev/.gitignore @@ -0,0 +1 @@ +aur
\ No newline at end of file diff --git a/~lukeshu/android-udev/51-android.rules b/~lukeshu/android-udev/51-android.rules index c52379309..51f80cf54 100644 --- a/~lukeshu/android-udev/51-android.rules +++ b/~lukeshu/android-udev/51-android.rules @@ -1,24 +1,23 @@ # Acer SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", GROUP="adbusers" -# ICONIA TAB A500 +# Iconia Tab A500 SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3325", SYMLINK+="android_fastboot" +# Liquid +SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3202" +SUBSYSTEM=="usb", ATTR{idVendor}=="0502", ATTR{idProduct}=="3203", SYMLINK+="android_adb" # Archos SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", MODE="0666", GROUP="adbusers" # 43 SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1417", SYMLINK+="android_fastboot" # 101 SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="1411", SYMLINK+="android_fastboot" # Asus -SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers" - -# Blade -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", GROUP="adbusers" # Dell SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", GROUP="adbusers" @@ -32,13 +31,15 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", GROUP="adbusers" # Google SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", GROUP="adbusers" # NEXUS S -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e21", +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e21", SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e22", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e20", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e20", SYMLINK+="android_fastboot" # Nexus One -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e11", +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e11", SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="4e12", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" +# Generic and unspecified debug interface +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" # HTC SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="adbusers" @@ -46,14 +47,17 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", GROUP="adbusers" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0cb2", SYMLINK+="android_fastboot" # Desire (Bravo) -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c87", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" +# Desire HD +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca2", SYMLINK+="android_adb" +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Desire Z SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_fastboot" # Evo Shift -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ca5", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # HD2 @@ -61,36 +65,37 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="and SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot" # Hero H2000 SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_fastboot" -# Hero (GSM) -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0001", SYMLINK+="android_fastboot" +# Hero (GSM), Desire +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c99", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Hero (CDMA) -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9a", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Incredible -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c9e", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Incredible rev 0002 -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +# Evo 4G, Incredible rev 0002 +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c8d", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # MyTouch 4G -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c96", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Slide -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0e03", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" -# Tatoo +# Tatoo, Dream, ADP1 , G1, Magic +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c01" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c02", SYMLINK+="android_fastboot" # Vision -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0ff9", SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0c91", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", ATTR{idProduct}=="0fff", SYMLINK+="android_fastboot" # Wildfire @@ -122,8 +127,14 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", GROUP="adbusers" # LG SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", GROUP="adbusers" -# LG (Swift) GT540 -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", ATTR{idProduct}=="d00d", SYMLINK+="android_fastboot" +# Ally, Vortex, P500 +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618f" +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="618e", SYMLINK+="android_adb" +# Optimus One +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61c5", SYMLINK+="android_adb" +# Swift GT540 +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", ATTR{idProduct}=="61b4", SYMLINK+="android_adb" + # Motorola SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="adbusers" @@ -131,14 +142,14 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", GROUP="adbusers" SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="2d66" # Defy/MB525 SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="428c" -# Droid +# Droid SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="41db" # -- Xoom ID 1 -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8",SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8",SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_adb" +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a8", SYMLINK+="android_fastboot" # -- Xoom ID 2 -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9",SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9",SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_adb" +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", ATTR{idProduct}=="70a9", SYMLINK+="android_fastboot" # NEC SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", GROUP="adbusers" @@ -178,15 +189,16 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="and SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68a9", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1" # Galaxy i7500 SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_fastboot" +SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6640", SYMLINK+="android_fastboot" # Galaxy S SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685d", MODE="0666" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68c3", MODE="0666" # Galaxy Tab SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_fastboot" -# Galaxy Tab 10.1 +SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6877", SYMLINK+="android_fastboot" +# Galaxy Tab 10.1, i9100 S2 +SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_adb" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685e", SYMLINK+="android_fastboot" SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6860", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1" @@ -196,6 +208,18 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", GROUP="adbusers" # Sony Ericsson SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", GROUP="adbusers" +# Xperia X10 mini +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3137" +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2137", SYMLINK+="android_adb" +# Xperia X10 mini pro +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3138" +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2138", SYMLINK+="android_adb" +# Xperia X8 +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="3149" +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="2149", SYMLINK+="android_adb" +# Xperia X12 +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="e14f" +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", ATTR{idProduct}=="614f", SYMLINK+="android_adb" # Toshiba SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="adbusers" @@ -203,6 +227,6 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", GROUP="adbusers" # ZTE SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", GROUP="adbusers" # Blade -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353", +SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1353", SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1351", SYMLINK+="android_adb" -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", ATTR{idProduct}=="1354", SYMLINK+="android_fastboot" + diff --git a/~lukeshu/android-udev/Makefile b/~lukeshu/android-udev/Makefile new file mode 100644 index 000000000..f20930c66 --- /dev/null +++ b/~lukeshu/android-udev/Makefile @@ -0,0 +1,39 @@ +#!/usr/bin/make -f +# Use this script to update the package from AUR. +# This script depends on: +# - coreutils +# - pacman +# - sed +# - wget + +default: PHONY all +all: PHONY 51-android.rules PKGBUILD + +name=android-udev + +aur: + mkdir $@ +aur/%.tar.gz: | aur + cd aur && wget http://aur.archlinux.org/packages/$*/$*.tar.gz +aur/%: aur/%.tar.gz + cd aur && tar xzf $(notdir $<) +aur/$(name)/%: aur/$(name).tar.gz | aur/$(name) + test -f $@ && touch $@ + +51-android.rules: aur/$(name)/51-android.rules + sed -r 's/\s+$$//' < $< > $@ + +PKGBUILD: aur/$(name)/PKGBUILD 51-android.rules + # Update pkg{ver,rel} + ver=`grep -m1 pkgver= $<` ; sed -i "s/pkgver=.*/$$ver/" $@ + rel=`grep -m1 pkgrel= $<`.1; sed -i "s/pkgrel=.*/$$rel/" $@ + # Update md5sums + sed -i '/md5sums/,$$d' $@ + makepkg -g >> $@ + +clean: PHONY + rm -rf aur +maintainerclean: PHONY clean + rm -f 51-android.rules + +.PHONY: PHONY FORCE diff --git a/~lukeshu/android-udev/PKGBUILD b/~lukeshu/android-udev/PKGBUILD index dabb611c9..6900b46da 100644 --- a/~lukeshu/android-udev/PKGBUILD +++ b/~lukeshu/android-udev/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: marlock pkgname=android-udev -pkgver=0.7 -pkgrel=3.1 +pkgver=0.8 +pkgrel=1.1 pkgdesc='Udev rules to for Android devices.' arch=('any') url="http://developer.android.com/guide/developing/device.html" @@ -15,8 +15,8 @@ conflicts=('udev-android-rules') install='android-udev.install' package() { - install -d $pkgdir/etc/udev/rules.d - install -m644 $srcdir/51-android.rules $pkgdir/etc/udev/rules.d/51-android.rules + install -d "$pkgdir/etc/udev/rules.d" + install -m644 "$srcdir/51-android.rules" "$pkgdir/etc/udev/rules.d/51-android.rules" } -md5sums=('bfcd8d0e4c5bdeed0973e102a656e1eb') +md5sums=('909eb7629683efae838c6e9d65966b3b') diff --git a/~lukeshu/emacs24/PKGBUILD b/~lukeshu/emacs24/PKGBUILD new file mode 100644 index 000000000..00f90b16a --- /dev/null +++ b/~lukeshu/emacs24/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 137977 2011-09-13 15:26:07Z juergen $ +# Maintainer: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> +pkgname=emacs24-bzr +_majorver=24.0.92 +pkgver=106675 +pkgrel=4 +pkgdesc="The extensible, customizable, self-documenting real-time display editor" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/emacs/emacs.html" +license=('GPL3') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') +install=emacs.install +source=(emacs.desktop) +md5sums=() + +_bzrtrunk=bzr://bzr.savannah.gnu.org/emacs/trunk +_bzrmod=$pkgname + +build() { + cd "$srcdir" + msg "Connecting to Bazaar server...." + + if [[ -d "$_bzrmod" ]]; then + cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" + msg "The local files are updated." + else + bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver" + fi + + msg "Bazaar checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_bzrmod-$_majorver" + cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-$_majorver" + + cd "$srcdir"/$pkgname-$_majorver + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --localstatedir=/var --with-x-toolkit=gtk --with-xft + make +} + +package() { + provides=("emacs=${_majorver}a") + + cd "$srcdir"/$pkgname-$_majorver + make DESTDIR="$pkgdir" install + + # remove conflict with ctags package + mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} + mv "$pkgdir"/usr/share/man/man1/{ctags,ctags.emacs}.1.gz + # fix all the 777 perms on directories + find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \; + # fix user/root permissions on usr/share files + find "$pkgdir"/usr/share/emacs/$_majorver -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 + + # fix FS#9253 + mkdir -p "$pkgdir"/usr/share/pixmaps + ln -s $pkgdir../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png + + # This is done down here to help future-proof the above + rm "$pkgdir"/usr/bin/emacs + mv "$pkgdir"/usr/share/man/man1/emacs{,-$_majorver}.1.gz + for prog in ctags.emacs ebrowse emacsclient etags grep-changelog rcs-checkin; do + mv "$pkgdir"/usr/bin/$prog{,-$_majorver} + mv "$pkgdir"/usr/share/man/man1/$prog{,-24}.1.gz + done + mv "$pkgdir"/usr/share/applications/emacs{,24}.desktop + mv "$pkgdir"/usr/share/emacs/site-lisp/subdirs{,.emacs24}.el + rm "$pkgdir"/usr/share/info/dir + for file in "$pkgdir"/usr/share/pixmaps/emacs-icon.png `find "$pkgdir"/usr/share/{icons,info} -type f`; do + mv "$file" "`echo "$file"|sed 's/\..*/-24&/'`" + done + ln -s "$_majorver" "$pkgdir"/usr/share/emacs/24 + rm "$pkgdir"/var/games/emacs/* +} diff --git a/~lukeshu/emacs24/emacs.install b/~lukeshu/emacs24/emacs.install new file mode 100644 index 000000000..d84f1de14 --- /dev/null +++ b/~lukeshu/emacs24/emacs.install @@ -0,0 +1,32 @@ +ICON_PATH=usr/share/icons/hicolor +INFO_DIR=usr/share/info + +INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse +ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake +forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode +org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail +speedbar tramp url vip viper widget 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.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.gz ${INFO_DIR}/dir 2> /dev/null + done +} diff --git a/~lukeshu/git-svn-abandon-git/PKGBUILD b/~lukeshu/git-svn-abandon-git/PKGBUILD new file mode 100644 index 000000000..51cd83817 --- /dev/null +++ b/~lukeshu/git-svn-abandon-git/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=git-svn-abandon +pkgname=$_pkgname-git +provides=($_pkgname) +conflicts=($_pkgname) +pkgver=20111224 +pkgrel=1 +pkgdesc="" +arch=('any') +url="http://blog.woobling.org/2009/06/git-svn-abandon.html" +license=('MIT') +depends=('git') +makedepends=('git' 'python-markdown') + +_gitroot=https://github.com/nothingmuch/git-svn-abandon.git +_gitname=$_pkgname + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + # + # BUILD HERE + # + markdown README.mkdn > README.html +} + +package() { + cd "$srcdir/$_gitname-build" + install -d "$pkgdir/usr/lib/git-core" + install -m755 git-* "$pkgdir/usr/lib/git-core" + + install -D -m644 README.mkdn "$pkgdir/usr/doc/git-svn-abandon/README.md" + install -D -m644 README.html "$pkgdir/usr/doc/git-svn-abandon/README.html" + install -D -m644 LICENSE "$pkgdir/usr/licenses/git-svn-abandon/LICENSE" +} diff --git a/~lukeshu/make-graph/PKGBUILD b/~lukeshu/make-graph/PKGBUILD new file mode 100644 index 000000000..f7f7cd0b1 --- /dev/null +++ b/~lukeshu/make-graph/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 138004 2011-09-14 05:05:12Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +_pkgname=make +pkgname=$_pkgname-graph +pkgver=3.82 +pkgrel=4.1 +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +pkgdesc="GNU make utility to maintain groups of programs, with patch to dump a Graphviz dependency graph." +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/make" +license=('GPL3') +groups=('base-devel') +depends=('glibc' 'sh') +install=$_pkgname.install +source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2 + bug30612.patch + bug30723.patch + make-3.82-sort-blank.patch + make-3.82-makeflags.patch) +md5sums=('1a11100f3c63fcf5753818e59d63088f' + 'c8f496b22191f9fb9420ab14c1a19a47' + '662e6450e19a5acdaa5c9fcb8ad78dea' + '7d01a99f389d8f08dec93ed479071ee4' + 'bc12ad4d0c6e6c0e72d9fb61054f446b') + +source+=('make-graph.patch') +md5sums+=('c1f1d652004a36c69b1f7f42a6849356') +depends+=('graphviz') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + + # http://savannah.gnu.org/bugs/?30612 + patch -Np1 -i $srcdir/bug30612.patch + + # http://savannah.gnu.org/bugs/?30723 + patch -Np1 -i $srcdir/bug30723.patch + + # https://bugs.archlinux.org/task/22733 (fix from Fedora) + patch -Np1 -i $srcdir/make-3.82-sort-blank.patch + + # https://savannah.gnu.org/support/index.php?107487 + # https://savannah.gnu.org/bugs/?33873 + patch -Np0 -i $srcdir/make-3.82-makeflags.patch + + # https://savannah.gnu.org/patch/?7447 + patch -Np1 -i $srcdir/make-graph.patch + + ./configure --prefix=/usr + make +} + +check() { + cd ${srcdir}/${_pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/~lukeshu/make-graph/bug30612.patch b/~lukeshu/make-graph/bug30612.patch new file mode 100644 index 000000000..fb843bcd9 --- /dev/null +++ b/~lukeshu/make-graph/bug30612.patch @@ -0,0 +1,66 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 +@@ -1,3 +1,4 @@ ++ + /* Argument parsing and main program of GNU Make. + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +@@ -1138,7 +1139,7 @@ + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif +diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c +--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 ++++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 +@@ -3028,7 +3028,7 @@ + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3084,19 @@ + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3152,7 +3152,11 @@ + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; ++ + + /* Find and set the new end. Massage names if necessary. */ + while (1) diff --git a/~lukeshu/make-graph/bug30723.patch b/~lukeshu/make-graph/bug30723.patch new file mode 100644 index 000000000..84e7ebe7a --- /dev/null +++ b/~lukeshu/make-graph/bug30723.patch @@ -0,0 +1,12 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 +@@ -2093,7 +2093,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) diff --git a/~lukeshu/make-graph/make-3.82-makeflags.patch b/~lukeshu/make-graph/make-3.82-makeflags.patch new file mode 100644 index 000000000..3cba3c402 --- /dev/null +++ b/~lukeshu/make-graph/make-3.82-makeflags.patch @@ -0,0 +1,36 @@ +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +diff -u -r1.246 main.c +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 27 Jul 2011 22:03:12 -0000 +@@ -2091,10 +2095,16 @@ + + /* Reset makeflags in case they were changed. */ + { ++ if (master_job_slots) ++ { ++ assert (job_slots == default_job_slots); ++ job_slots = master_job_slots; ++ } + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); + putenv (allocated_variable_expand (p)); ++ job_slots = default_job_slots; + } + + if (ISDB (DB_BASIC)) +@@ -2825,9 +2852,11 @@ + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ ++#if 0 + else if (cs->c == 'j') + /* Special case for `-j'. */ + ADD_FLAG ("1", 1); ++#endif + else + { + char *buf = alloca (30); diff --git a/~lukeshu/make-graph/make-3.82-sort-blank.patch b/~lukeshu/make-graph/make-3.82-sort-blank.patch new file mode 100644 index 000000000..2e73f5b7c --- /dev/null +++ b/~lukeshu/make-graph/make-3.82-sort-blank.patch @@ -0,0 +1,17 @@ +diff -urp make-3.82/function.c make-3.82-pm/function.c +--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 ++++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 +@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c + { + char c = *(t++); + +- if (! isspace ((unsigned char)c)) ++ if (! isblank ((unsigned char)c)) + continue; + + ++wordi; + +- while (isspace ((unsigned char)*t)) ++ while (isblank ((unsigned char)*t)) + ++t; + } diff --git a/~lukeshu/make-graph/make-graph.patch b/~lukeshu/make-graph/make-graph.patch new file mode 100644 index 000000000..083db55e4 --- /dev/null +++ b/~lukeshu/make-graph/make-graph.patch @@ -0,0 +1,273 @@ +diff -ur make-3.82/file.c make-wch/file.c +--- make-3.82/file.c 2010-07-12 21:20:39.000000000 -0400 ++++ make-wch/file.c 2010-08-19 23:28:20.162660391 -0400 +@@ -1021,6 +1021,129 @@ + hash_print_stats (&files, stdout); + } + ++/* Dump the dependency graph to a Graphviz file (on stdout) */ ++ ++void ++print_graph_prereqs (const char *filename, const struct dep *deps) ++{ ++ const struct dep *ood = 0; ++ ++ /* Print all normal dependencies; note any order-only deps. */ ++ for (; deps != 0; deps = deps->next) ++ if (! deps->ignore_mtime) ++ printf (" \"%s\" -> \"%s\";\n", filename, dep_name (deps)); ++ ++ /* Print order-only deps, if we have any. */ ++ if (ood) ++ { ++ for (ood = ood->next; ood != 0; ood = ood->next) ++ if (ood->ignore_mtime) ++ printf (" %s -> %s [style=dotted];\n", filename, dep_name (ood)); ++ /* XXX: we need to distinguish these some how. ++ * Is dotting them the right way? */ ++ } ++} ++ ++static void ++print_graph_file (const void *item) ++{ ++ const struct file *f = item; ++ ++ int built_in_special_target=( ++ (0==strcmp(f->name,".PHONY")) ++ || (0==strcmp(f->name,".SUFFIXES")) ++ || (0==strcmp(f->name,".DEFAULT")) ++ || (0==strcmp(f->name,".PRECIOUS")) ++ || (0==strcmp(f->name,".INTERMEDIATE")) ++ || (0==strcmp(f->name,".SECONDARY")) ++ || (0==strcmp(f->name,".SECONDEXPANSION")) ++ || (0==strcmp(f->name,".DELETE_ON_ERROR")) ++ || (0==strcmp(f->name,".IGNORE")) ++ || (0==strcmp(f->name,".LOW_RESOLUTION_TIME")) ++ || (0==strcmp(f->name,".SILENT")) ++ || (0==strcmp(f->name,".EXPORT_ALL_VARIABLES")) ++ || (0==strcmp(f->name,".NOTPARALLEL")) ++ || (0==strcmp(f->name,".ONESHELL")) ++ || (0==strcmp(f->name,".POSIX")) ++ ); ++ if ((f->is_target) && (!built_in_special_target)) ++ { ++ printf (" \"%s\" [", f->name); ++ /* XXX some of these should be attached to the nodes in some way; ++ * though I'm not sure what style changes should be made for which ones. ++ * ~ LukeShu ++ if (f->double_colon) puts (_("// Double-colon rule.")); ++ if (f->precious) puts (_("// Precious file (prerequisite of .PRECIOUS).")); ++ */if (f->phony) puts (_(" color=blue "));/* ++ if (f->cmd_target) puts (_("// Command line target.")); ++ if (f->dontcare) puts (_("// A default, MAKEFILES, or -include/sinclude makefile.")); ++ if (f->tried_implicit) puts (_("// Implicit rule search has been done.")); ++ else puts (_("// Implicit rule search has not been done.")); ++ if (f->stem != 0) printf (_("// Implicit/static pattern stem: `%s'\n"), f->stem); ++ if (f->intermediate) puts (_("// File is an intermediate prerequisite.")); ++ if (f->also_make != 0) ++ { ++ const struct dep *d; ++ fputs (_("# Also makes:"), stdout); ++ for (d = f->also_make; d != 0; d = d->next) ++ printf (" %s\n", dep_name (d)); ++ } ++ if (f->last_mtime == UNKNOWN_MTIME) puts (_("// Modification time never checked.")); ++ else if (f->last_mtime == NONEXISTENT_MTIME) puts (_("// File does not exist.")); ++ else if (f->last_mtime == OLD_MTIME) puts (_("// File is very old.")); ++ else ++ { ++ char buf[FILE_TIMESTAMP_PRINT_LEN_BOUND + 1]; ++ file_timestamp_sprintf (buf, f->last_mtime); ++ printf (_("// Last modified %s\n"), buf); ++ } ++ if (f->updated) puts (_("// File has been updated.")); ++ else puts (_("// File has not been updated.")); ++ switch (f->command_state) ++ { ++ case cs_running: puts (_("// Update: Running (THIS IS A BUG).")); break; ++ case cs_deps_running: puts (_("// Update: Dependencies running (THIS IS A BUG).")); break; ++ case cs_not_started: ++ case cs_finished: ++ switch (f->update_status) ++ { ++ case -1: break; ++ case 0: puts (_("// Update: Successfully")); break; ++ case 1: assert (question_flag); ++ puts (_("// Update: Needs to be (-q is set)")); break; ++ case 2: puts (_("// Update: Failed")); break; ++ default: puts (_("// Update: Invalid `update_status' value)); ++ fflush (stdout); ++ fflush (stderr); ++ abort (); ++ } ++ break; ++ default: puts (_("// Update: Invalid `command_state' value")); ++ fflush (stdout); ++ fflush (stderr); ++ abort (); ++ } ++ if (f->variables != 0) print_file_variables (f); ++ if (f->cmds != 0) print_commands (f->cmds); ++ */ ++ puts("];"); ++ print_graph_prereqs (f->name, f->deps); ++ } ++ ++ if (f->prev) ++ print_graph_file ((const void *) f->prev); ++} ++ ++void ++print_graph (void) ++{ ++ printf ("%sgraph make%i {\n", ++ (makelevel==0)?"di":"sub", ++ getpid()); ++ hash_map (&files, print_graph_file); ++ puts ("}"); ++} ++ + /* Verify the integrity of the data base of files. */ + + #define VERIFY_CACHED(_p,_n) \ +diff -ur make-3.82/filedef.h make-wch/filedef.h +--- make-3.82/filedef.h 2010-07-12 21:20:39.000000000 -0400 ++++ make-wch/filedef.h 2010-08-19 21:09:34.314660209 -0400 +@@ -116,6 +116,7 @@ + char *build_target_list (char *old_list); + void print_prereqs (const struct dep *deps); + void print_file_data_base (void); ++void print_graph (void); + + #if FILE_TIMESTAMP_HI_RES + # define FILE_TIMESTAMP_STAT_MODTIME(fname, st) \ +diff -ur make-3.82/main.c make-wch/main.c +--- make-3.82/main.c 2010-07-19 03:10:53.000000000 -0400 ++++ make-wch/main.c 2010-08-21 22:32:56.818417305 -0400 +@@ -175,6 +175,11 @@ + + int print_data_base_flag = 0; + ++/* Nonzero means don't remake anything, just print the dependency graph ++ that results from reading the makefile (-g). */ ++ ++int print_graph_flag = 0; ++ + /* Nonzero means don't remake anything; just return a nonzero status + if the specified targets are not up to date (-q). */ + +@@ -321,6 +326,9 @@ + -f FILE, --file=FILE, --makefile=FILE\n\ + Read FILE as a makefile.\n"), + N_("\ ++ -g, --graph Print make's internal dependency graph\n\ ++ in Graphviz format, without remaking makefiles.\n"), ++ N_("\ + -h, --help Print this message and exit.\n"), + N_("\ + -i, --ignore-errors Ignore errors from recipes.\n"), +@@ -385,6 +393,7 @@ + #endif + { 'e', flag, &env_overrides, 1, 1, 0, 0, 0, "environment-overrides", }, + { 'f', filename, &makefiles, 0, 0, 0, 0, 0, "file" }, ++ { 'g', flag, &print_graph_flag, 1, 1, 0, 0, 0, "graph" }, + { 'h', flag, &print_usage_flag, 0, 0, 0, 0, 0, "help" }, + { 'i', flag, &ignore_errors_flag, 1, 1, 0, 0, 0, "ignore-errors" }, + { 'I', filename, &include_directories, 1, 1, 0, 0, 0, +@@ -1946,7 +1955,10 @@ + define_makeflags (1, 1); + + rebuilding_makefiles = 1; +- status = update_goal_chain (read_makefiles); ++ if (print_graph_flag) ++ status = -1; ++ else ++ status = update_goal_chain (read_makefiles); + rebuilding_makefiles = 0; + + switch (status) +@@ -2278,33 +2290,37 @@ + + { + int status; ++ if (print_graph_flag) ++ status=0; ++ else ++ { ++ switch (update_goal_chain (goals)) ++ { ++ case -1: ++ /* Nothing happened. */ ++ case 0: ++ /* Updated successfully. */ ++ status = makefile_status; ++ break; ++ case 1: ++ /* We are under -q and would run some commands. */ ++ status = MAKE_TROUBLE; ++ break; ++ case 2: ++ /* Updating failed. POSIX.2 specifies exit status >1 for this; ++ but in VMS, there is only success and failure. */ ++ status = MAKE_FAILURE; ++ break; ++ default: ++ abort (); ++ } + +- switch (update_goal_chain (goals)) +- { +- case -1: +- /* Nothing happened. */ +- case 0: +- /* Updated successfully. */ +- status = makefile_status; +- break; +- case 1: +- /* We are under -q and would run some commands. */ +- status = MAKE_TROUBLE; +- break; +- case 2: +- /* Updating failed. POSIX.2 specifies exit status >1 for this; +- but in VMS, there is only success and failure. */ +- status = MAKE_FAILURE; +- break; +- default: +- abort (); +- } +- +- /* If we detected some clock skew, generate one last warning */ +- if (clock_skew_detected) +- error (NILF, +- _("warning: Clock skew detected. Your build may be incomplete.")); +- ++ /* If we detected some clock skew, generate one last warning */ ++ if (clock_skew_detected) ++ error (NILF, ++ _("warning: Clock skew detected. Your build may be incomplete.")); ++ } ++ + /* Exit. */ + die (status); + } +@@ -3042,7 +3058,7 @@ + { + static int printed_version = 0; + +- char *precede = print_data_base_flag ? "# " : ""; ++ char *precede = (print_data_base_flag||print_graph_flag) ? "# " : ""; + + if (printed_version) + /* Do it only once. */ +@@ -3188,6 +3204,10 @@ + if (print_data_base_flag) + print_data_base (); + ++ ++ if (print_graph_flag) ++ print_graph (); ++ + verify_file_data_base (); + + clean_jobserver (status); diff --git a/~lukeshu/make-graph/make.install b/~lukeshu/make-graph/make.install new file mode 100644 index 000000000..6cf8b0dc4 --- /dev/null +++ b/~lukeshu/make-graph/make.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(make.info make.info-1 make.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/~lukeshu/openni-unstable/PKGBUILD b/~lukeshu/openni-unstable/PKGBUILD index 32020d726..19d1575a1 100644 --- a/~lukeshu/openni-unstable/PKGBUILD +++ b/~lukeshu/openni-unstable/PKGBUILD @@ -21,24 +21,23 @@ pkgname=( openni$_suf-java-samples openni$_suf-java-samples-source ) -pkgver=1.3.4.6 -pkgrel=4 +pkgver=1.4.0.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.openni.org/" license=('GPL') makedepends=('git' 'doxygen' 'graphviz') +options+=('!strip') source=() md5sums=() __gitroot="git://github.com/OpenNI/OpenNI.git" _gitname="openni" -#_gitbranch="unstable" -#_gitbranch="master" _gitbranch="Unstable-$pkgver" _os='Linux' case "${CARCH}" in -'x86_64') _arch=x86;; +'x86_64') _arch=x64;; 'i686') _arch=x86;; 'arm') _arch=Arm;; # untested *) _arch=UNSUPPORTED_ARCH;; @@ -51,27 +50,32 @@ build() { cd "${srcdir}" msg "Connecting to GIT server...." - if [ -d ${_gitname} ] ; then + #if [ -d ${_gitname} ] ; then cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${__gitroot} ${_gitname} - cd ${_gitname} - fi + # git checkout master + # git pull origin + # msg "The local files are updated." + #else + # git clone ${__gitroot} ${_gitname} + # cd ${_gitname} + #fi git checkout ${_gitbranch} cd .. msg "GIT checkout done or server timeout" - msg "Starting make..." + msg "Starting build..." - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" + #rm -rf "${srcdir}/${_gitname}-build" + #git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" cd "${srcdir}/${_gitname}-build" # PATCH sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker" + + for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do + echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile" + done + echo ' abs_core: $(ALL_MODULES) $(ALL_UTILS) abs_core_samples: $(CORE_SAMPLES) @@ -87,7 +91,9 @@ abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) make -j1 \ abs_core abs_core_samples \ abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 + abs_mono abs_mono_samples + cd "../Bin/${_arch}-Release" + ln NiViewer Sample-NiViewer cd '../../../Source/DoxyGen' mkdir html @@ -117,7 +123,7 @@ package_openni-unstable-docs() { package_openni-unstable-core() { pkgdesc="OpenNI core libraries" depends=('libusb' 'freeglut') - install="openni.install" + install="openni-core.install" provides=('openni-core') conflicts=('openni-core') @@ -144,6 +150,8 @@ package_openni-unstable-core() { cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build" install -d "${pkgdir}/usr/share" cp -r Common "${pkgdir}/usr/share/common" + + install -d "${pkgdir}/var/lib/ni" } package_openni-unstable-java() { @@ -164,6 +172,7 @@ package_openni-unstable-java() { package_openni-unstable-mono() { pkgdesc="OpenNI mono wrapper" depends=("openni$_suf" 'mono') + install="openni-mono.install" provides=('openni-mono') conflicts=('openni-mono') @@ -183,14 +192,16 @@ _install_sample_source() { install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" } -# Leave out NiViewer, it's set up wrong CORE_SAMPLES=' AudioSample BackRecorder CRead ConvertXToONI + HandTracker RecordSynthetic SimpleCreate + UserSelection + Viewer SimpleRead SimpleViewer UserTracker' MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' @@ -204,9 +215,8 @@ package_openni-unstable-core-samples() { cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" + install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" done } package_openni-unstable-core-samples-source() { @@ -214,7 +224,6 @@ package_openni-unstable-core-samples-source() { depends=("openni$_suf-core") provides=('openni-core-samples-source') conflicts=('openni-core-samples-source') - options+=('!strip') cd "${srcdir}/${_gitname}-build" for sample in Viewer $CORE_SAMPLES; do @@ -246,7 +255,6 @@ package_openni-unstable-java-samples-source() { depends=("openni$_suf-java") provides=('openni-java-samples-source') conflicts=('openni-java-samples-source') - options+=('!strip') cd "${srcdir}/${_gitname}-build" for sample in $JAVA_SAMPLES; do @@ -278,7 +286,6 @@ package_openni-unstable-mono-samples-source() { depends=("openni$_suf-mono") provides=('openni-mono-samples-source') conflicts=('openni-mono-samples-source') - options+=('!strip') cd "${srcdir}/${_gitname}-build" for sample in $MONO_SAMPLES; do diff --git a/~lukeshu/openni-unstable/openni.install b/~lukeshu/openni-unstable/openni-core.install index 8470f4512..8470f4512 100644 --- a/~lukeshu/openni-unstable/openni.install +++ b/~lukeshu/openni-unstable/openni-core.install diff --git a/~lukeshu/openni-unstable/openni-mono.install b/~lukeshu/openni-unstable/openni-mono.install new file mode 100644 index 000000000..72a6fb23d --- /dev/null +++ b/~lukeshu/openni-unstable/openni-mono.install @@ -0,0 +1,7 @@ +post_install() { + gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr +} + +post_remove() { + gacutil -u OpenNI.net -gacdir /usr +} diff --git a/~lukeshu/redo/PKGBUILD b/~lukeshu/redo/PKGBUILD new file mode 100644 index 000000000..95e75dd0e --- /dev/null +++ b/~lukeshu/redo/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=redo +pkgver=0.06 +pkgrel=1 +pkgdesc="A competitor to make based on essays by DJB.") +arch=('any') +url="https://github.com/apenwarr/$pkgname" +license=('GPL2') +depends=('python2') +source=("$pkgname-$pkgver.tar.gz::https://github.com/apenwarr/$pkgname/tarball/$pkgname-$pkgver") + +build() { + cd "$srcdir/apenwarr-$pkgname-"* + + # Make everything use python2 + sed -i 's@^#!/usr/bin/python$@#!/usr/bin/python2@' *.py + sed -i 's@/usr/bin/env python@/usr/bin/env python2@' Documentation/md2man.py + sed -i -e 's@^python @python2 @' \ + -e 's@/usr/bin/python$@/usr/bin/python2@' \ + install.do + + make +} + +check() { + cd "$srcdir/apenwarr-$pkgname-"* + make test +} + +package() { + cd "$srcdir/apenwarr-$pkgname-"* + make install DESTDIR="$pkgdir" +} + +md5sums=('0faa0e98f3d60fdcdea826dad59923c8') diff --git a/~lukeshu/stow/PKGBUILD b/~lukeshu/stow/PKGBUILD new file mode 100644 index 000000000..24a2dcb1c --- /dev/null +++ b/~lukeshu/stow/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=stow +pkgver=2.1.2 +pkgrel=1 +pkgdesc="A program for managing the installation of software packages, keeping them separate while making them appear to be installed in the same place." +arch=(any) +url="https://www.gnu.org/software/$pkgname/" +license=('GPL2') +depends=('perl>=5.6.1') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +md5sums=('82857e43531cf6936aed99ef3b86b446') diff --git a/~lukeshu/svn-graph-branches/PKGBUILD b/~lukeshu/svn-graph-branches/PKGBUILD new file mode 100644 index 000000000..63568e50c --- /dev/null +++ b/~lukeshu/svn-graph-branches/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=svn-graph-branches +pkgver=0.10 +pkgrel=1 +pkgdesc="Parses the Subversion log of a repository to generate a graph of the important events of the project." +arch=('any') +url="https://code.google.com/p/svn-graph-branches/" +license=('GPL') +depends=('subversion' 'graphviz' 'java-environment') +makedepends=('sharutils') +source=(https://svn-graph-branches.googlecode.com/files/$pkgname-$pkgver.tar.gz) +sha1sums=('c8b85b57b7725bc869f792334505d36d527e1dea') + +build() { + cd "$srcdir/$pkgname-$pkgver" + export CLASSPATH=`pwd` + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/~lukeshu/terminal-colors/.gitignore b/~lukeshu/terminal-colors/.gitignore new file mode 100644 index 000000000..8ba0d861a --- /dev/null +++ b/~lukeshu/terminal-colors/.gitignore @@ -0,0 +1 @@ +terminal-colors.py diff --git a/~lukeshu/terminal-colors/PKGBUILD b/~lukeshu/terminal-colors/PKGBUILD new file mode 100644 index 000000000..662e5b5ef --- /dev/null +++ b/~lukeshu/terminal-colors/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=terminal-colors +pkgver=1.3 +pkgrel=1 +pkgdesc="Displays charts for 256/88/16 terminal color modes. Also supports converting between 256/88 color values." +arch=('any') +url="http://zhar.net/projects/shell/" +license=('GPL3') +depends=('python2') +source=("terminal-colors.py::http://zhar.net/projects/shell/terminal-colors") + +build() { + cd "$srcdir" + sed 's@/usr/bin/env python$@/usr/bin/env python2@' < terminal-colors.py > terminal-colors +} + +package() { + cd "$srcdir" + install -D -m755 terminal-colors "$pkgdir/usr/bin/terminal-colors" +} + +md5sums=('30e3ab6cde416df110110244ce40eb94') diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD new file mode 100644 index 000000000..5ef2c1c56 --- /dev/null +++ b/~lukeshu/thingutils-git/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=thingutils +pkgname=$_pkgname-git +provides=($_pkgname) +conflicts=($_pkgname) +pkgver=20111224 +pkgrel=1 +pkgdesc="" +arch=('any') +url="https://gitorious.org/thingutils" +license=('MIT') +depends=( + 'php' # roll, urldecode + 'bash' # daemon, newegg, sysfiles + 'emacs' # emacsmail, emacsterm, e + 'wget' # whatismyip + 'findutils' # maildups, whatismyip + 'sysstat' # sysfiles + 'offlineimap' # offlineimap-runner + 'wdiff' # chardiff +) +makedepends=('git') + +_gitroot=https://git.gitorious.org/thingutils/thingutils.git +_gitname=$_pkgname + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + # + # BUILD HERE + # + make prefix=/usr +} + +package() { + cd "$srcdir/$_gitname-build" + make install prefix=/usr DESTDIR="$pkgdir" +} diff --git a/~lukeshu/wdiff/PKGBUILD b/~lukeshu/wdiff/PKGBUILD new file mode 100644 index 000000000..6092b3d76 --- /dev/null +++ b/~lukeshu/wdiff/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=wdiff +pkgver=1.1.0 +pkgrel=1 +pkgdesc="A front end to diff for comparing files on a word per word basis." +arch=('i686' 'x86_64') +url="https://www.gnu.org/software/$pkgname/" +license=('GPL3') +depends=('diffutils') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +md5sums=('aa4dd87a9140a96ee85d2502673d19f3') diff --git a/~lukeshu/xml2rfc/PKGBUILD b/~lukeshu/xml2rfc/PKGBUILD new file mode 100644 index 000000000..b52ab21a8 --- /dev/null +++ b/~lukeshu/xml2rfc/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=xml2rfc +pkgver=1.36 +pkgrel=1 +pkgdesc="A tool to parse RFC 2629 XML files, and render them to TXT, PDF, HTML, and other formats." +arch=('any') +url="http://xml.resource.org/" +license=('custom:BSD-3') +depends=('tcl>=8') +optdepends=('tk: for xml2sgml and graphical xml2rfc') +makedepends=('java-environment') +source=("http://xml.resource.org/authoring/$pkgname-$pkgver.tgz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + install -d "$pkgdir/usr/share/doc/$pkgname" + install -m644 README.* draft-mrose-writing-rfcs.* example.* "$pkgdir/usr/share/doc/$pkgname" + + install -d "$pkgdir/usr/share/$pkgname" + install -m644 rfc2629.* "$pkgdir/usr/share/$pkgname" + + install -D -m755 xml2rfc.tcl "$pkgdir/usr/bin/xml2rfc" + install -D -m755 xml2sgml.tcl "$pkgdir/usr/bin/xml2sgml" +} + +md5sums=('f96aa187e2ef86affe2843b556556b60') |