From 4dd92a6b661a2b2628742db70067aa0529ae7d34 Mon Sep 17 00:00:00 2001 From: Msnuel Date: Fri, 26 Apr 2013 18:51:06 +0000 Subject: [PATCH 001/110] Rebuild against new glibc --- valgrind/PKGBUILD | 23 ++++++++++----- valgrind/valgrind-3.8.1-glibc-2.17.patch | 37 ++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 valgrind/valgrind-3.8.1-glibc-2.17.patch diff --git a/valgrind/PKGBUILD b/valgrind/PKGBUILD index fb63d08d4..0024d647a 100644 --- a/valgrind/PKGBUILD +++ b/valgrind/PKGBUILD @@ -1,24 +1,31 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# # maintainer: Manuel Tortosa pkgname=valgrind pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to help find memory-management problems in programs" arch=('x86_64') license=('GPL') url="http://valgrind.org/" -depends=('glibc>=2.15' 'glibc<2.16' 'perl') +depends=('glibc>=2.17' 'glibc<2.18' 'perl') makedepends=('gdb') options=('!emptydirs') -source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2) -md5sums=('288758010b271119a0ffc0183f1d6e38') +source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 + valgrind-3.8.1-glibc-2.17.patch) +md5sums=('288758010b271119a0ffc0183f1d6e38' + 'e87c34f9f9ce0040d141b3bd57842b5c') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit + + patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.17.patch + + if [ "${CARCH}" = "x86_64" ]; then + ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit + else + ./configure --prefix=/usr --mandir=/usr/share/man + fi + make } diff --git a/valgrind/valgrind-3.8.1-glibc-2.17.patch b/valgrind/valgrind-3.8.1-glibc-2.17.patch new file mode 100644 index 000000000..bfeb9486d --- /dev/null +++ b/valgrind/valgrind-3.8.1-glibc-2.17.patch @@ -0,0 +1,37 @@ +diff -Naur valgrind-3.8.1-orig/configure valgrind-3.8.1/configure +--- valgrind-3.8.1-orig/configure 2012-09-19 05:19:23.000000000 +1000 ++++ valgrind-3.8.1/configure 2012-12-27 08:11:36.645429011 +1000 +@@ -6612,6 +6612,24 @@ + + # DEFAULT_SUPP set by kernel version check above. + ;; ++ 2.17) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5 ++$as_echo "2.17 family" >&6; } ++ ++$as_echo "#define GLIBC_2_17 1" >>confdefs.h ++ ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; ++ darwin) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 ++$as_echo "Darwin" >&6; } ++ ++$as_echo "#define DARWIN_LIBC 1" >>confdefs.h ++ ++ # DEFAULT_SUPP set by kernel version check above. ++ ;; + bionic) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Bionic" >&5 + $as_echo "Bionic" >&6; } +@@ -6624,7 +6642,7 @@ + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 + $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } +- as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5 ++ as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5 + as_fn_error "or Darwin libc" "$LINENO" 5 + ;; + esac From be70ca30fb050cc288754e3c7864e4fe34185ba9 Mon Sep 17 00:00:00 2001 From: Msnuel Date: Fri, 26 Apr 2013 19:14:51 +0000 Subject: [PATCH 002/110] I like to have this stripped, remove tcp_wrappers linkage --- pulseaudio/PKGBUILD | 99 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 23 deletions(-) diff --git a/pulseaudio/PKGBUILD b/pulseaudio/PKGBUILD index ee2dee975..891aeda41 100644 --- a/pulseaudio/PKGBUILD +++ b/pulseaudio/PKGBUILD @@ -1,27 +1,17 @@ -# Maintainer: abveritas@chakra-project.org +# Maintainer: Manuel Tortosa -pkgname=pulseaudio +pkgbase=pulseaudio +pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=3.0 -pkgrel=6 +pkgrel=7 arch=('x86_64') url="http://pulseaudio.org/" license=('GPL' 'LGPL') -depends=('dbus-core' 'xcb-util' 'libasyncns' 'libcap' 'libxtst' 'libsm' - 'libsamplerate' 'json-c' 'rtkit' 'libltdl' 'speex' 'tdb' - 'fftw' 'orc' 'webrtc-audio-processing' 'systemd>=195' 'sbc') makedepends=('attr' 'libltdl' 'avahi' 'bluez' 'intltool' 'jack' 'lirc-utils' 'openssl' 'libsndfile' 'pkgconfig' 'sh') -optdepends=('avahi: zeroconf support' - 'bluez: bluetooth support' - 'jack: jack support' - 'lirc-utils: infra-red support' - 'openssl: RAOP support') backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install="pulseaudio.install" -provides=("libpulse=${pkgver}") -replaces=('libpulse') -conflicts=('libpulse') options=(!emptydirs !libtool !makeflags) #source=("http://freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.xz") source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}.tar.xz" @@ -30,7 +20,7 @@ md5sums=('10049e1fa0577be38ba04d8bab159fd1' 'f4640b454d74e2ebc1e8399e50d62807') build() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgbase}" # Bugfix: mix the right numbers of streams # http://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=179cacfc6620839cc9c4399e3f0a995bc499145f @@ -48,19 +38,82 @@ build() { make } -package() { - cd "${srcdir}/${pkgname}" - make DESTDIR="${pkgdir}" install +package_pulseaudio() { + depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc + libsamplerate webrtc-audio-processing sbc) + optdepends=('avahi: zeroconf support' + 'bluez: bluetooth support' + 'jack: jack support' + 'lirc-utils: infra-red support' + 'openssl: RAOP support' + 'pyqt: Equalizer GUI (qpaeq)') + backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) + install=pulseaudio.install + + cd $pkgbase + make -j1 DESTDIR="$pkgdir" install + + # Disable autospawn by default + sed -e '/autospawn/iautospawn=no' \ + -i "$pkgdir/etc/pulse/client.conf" + + # Speed up pulseaudio shutdown + # Lower resample quality, saves CPU + sed -e '/exit-idle-time/iexit-idle-time=0' \ + -e '/resample-method/iresample-method=speex-float-0' \ + -i "$pkgdir/etc/pulse/daemon.conf" # Disable cork-request module, can result in e.g. media players unpausing # when there's a Skype call incoming sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ - -i "${pkgdir}/usr/bin/start-pulseaudio-x11" + -i "$pkgdir/usr/bin/start-pulseaudio-x11" + + # Make ConsoleKit optional + sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ + -i "$pkgdir/etc/pulse/default.pa" # Python fix - sed -i '1s:python$:&2:' "${pkgdir}/usr/bin/qpaeq" + sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" - rm "${pkgdir}/etc/dbus-1/system.d/pulseaudio-system.conf" - rm "${pkgdir}/etc/xdg/autostart/pulseaudio.desktop" - rm "${pkgdir}/etc/xdg/autostart/pulseaudio-kde.desktop" + rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" + + # cap is handled in .install + chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper" + +### Split libpulse + + mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{bin,lib/pulseaudio,share/man/man{1,5}}} + + mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf + + mv "$pkgdir"/usr/bin/pa{cat,ctl,dsp,mon,play,rec,record} \ + "$srcdir/libpulse/usr/bin" + + mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \ + "$srcdir/libpulse/usr/lib" + + mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \ + "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \ + "$srcdir/libpulse/usr/lib/pulseaudio" + + mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake + mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig + + mv {"$pkgdir","$srcdir/libpulse"}/usr/include + + mv "$pkgdir"/usr/share/man/man1/pa{cat,ctl,dsp,play}.1 \ + "$srcdir/libpulse/usr/share/man/man1" + + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala +} + +package_libpulse() { + pkgdesc="$pkgdesc (client library)" + depends=(dbus libasyncns libcap libxtst libsm libsndfile json-c) + optdepends=('alsa-plugins: ALSA support' + 'avahi: zeroconf support') + backup=(etc/pulse/client.conf) + + mv "$srcdir"/libpulse/* "$pkgdir" } From c591339bcc717b4af8198783d50eddd8ec0d95ad Mon Sep 17 00:00:00 2001 From: "Adrian Chaves Fernandez (Gallaecio)" Date: Fri, 26 Apr 2013 21:44:02 +0000 Subject: [PATCH 003/110] Rebuilt testdisk against latest ntfs-3g --- testdisk/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testdisk/PKGBUILD b/testdisk/PKGBUILD index ec079524f..c88388ec3 100644 --- a/testdisk/PKGBUILD +++ b/testdisk/PKGBUILD @@ -5,7 +5,7 @@ pkgname=testdisk pkgver=6.13 -pkgrel=3 +pkgrel=4 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool" arch=('x86_64') url="http://www.cgsecurity.org/index.html?testdisk.html" From 2ce768de83ad12b98c38b8b80a4a4513a0fe249f Mon Sep 17 00:00:00 2001 From: "Adrian Chaves Fernandez (Gallaecio)" Date: Fri, 26 Apr 2013 22:09:53 +0000 Subject: [PATCH 004/110] Rebuilt octave against the latest openmpi --- octave/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octave/PKGBUILD b/octave/PKGBUILD index 65a6edd0c..3e1b9e8cc 100644 --- a/octave/PKGBUILD +++ b/octave/PKGBUILD @@ -5,7 +5,7 @@ pkgname=octave pkgver=3.6.4 -pkgrel=2 +pkgrel=3 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('x86_64') url="http://www.octave.org" From 858ac01f0787e9796b7143cdda5e320642de16ac Mon Sep 17 00:00:00 2001 From: Fabian <0inkane@googlemail.com> Date: Sat, 27 Apr 2013 10:40:28 +0000 Subject: [PATCH 005/110] rebuild clang for new tc --- llvm/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/PKGBUILD b/llvm/PKGBUILD index bc6a8ce17..42c32900a 100644 --- a/llvm/PKGBUILD +++ b/llvm/PKGBUILD @@ -6,8 +6,8 @@ pkgbase="llvm" pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=3.2 -_gcc_ver=4.7.2 -pkgrel=2 +_gcc_ver=4.8.0 +pkgrel=3 arch=('x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') From 5fe4332aa79eb96c7d96728e67b6e54f9b35d135 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 28 Apr 2013 11:22:01 +0000 Subject: [PATCH 006/110] Add aubio --- aubio/PKGBUILD | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 aubio/PKGBUILD diff --git a/aubio/PKGBUILD b/aubio/PKGBUILD new file mode 100644 index 000000000..45becb397 --- /dev/null +++ b/aubio/PKGBUILD @@ -0,0 +1,19 @@ +pkgname=aubio +pkgver=0.3.2 +pkgrel=1 +pkgdesc="A library for audio labelling" +arch=('x86_64') +url="http://aubio.piem.org/" +license=('GPL') +depends=('libsamplerate' 'fftw' 'jack-audio-connection-kit') +options=('!libtool') +source=(http://aubio.piem.org/pub/${pkgname}-${pkgver}.tar.gz) +md5sums=('ffc3e5e4880fec67064f043252263a44') + +build() { + cd ${startdir}/src/${pkgname}-${pkgver} + export LDFLAGS='-lm' + ./configure --prefix=/usr + make || return 1 + make DESTDIR=${startdir}/pkg install +} From 8a697034afd271397a0d8ecfd17119c2147edac3 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 28 Apr 2013 11:29:18 +0000 Subject: [PATCH 007/110] Add sord and serd --- serd/PKGBUILD | 33 +++++++++++++++++++++++++++++++++ sord/PKGBUILD | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 serd/PKGBUILD create mode 100644 sord/PKGBUILD diff --git a/serd/PKGBUILD b/serd/PKGBUILD new file mode 100644 index 000000000..d9a1cda42 --- /dev/null +++ b/serd/PKGBUILD @@ -0,0 +1,33 @@ +pkgname=serd +pkgver=0.18.2 +pkgrel=1 +pkgdesc="A lightweight C library for RDF syntax which supports reading and +writing Turtle and NTriples." +arch=('x86_64') +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('glibc') +makedepends=('python2') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('0569c21860b2ed2744e42884069a40a2') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove ldconfig + sed -i "/ldconfig/d" wscript + + python2 ./waf configure --prefix=/usr \ + --mandir=/usr/share/man + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir" python2 ./waf install + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + diff --git a/sord/PKGBUILD b/sord/PKGBUILD new file mode 100644 index 000000000..a80839d14 --- /dev/null +++ b/sord/PKGBUILD @@ -0,0 +1,32 @@ +pkgname=sord +pkgver=0.10.4 +pkgrel=1 +pkgdesc="A lightweight C library for storing RDF data in memory." +arch=('x86_64') +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('serd' 'pcre') +makedepends=('python2') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('9353e5b5e26c926c1a8c0e43fa577f31') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove ldconfig + sed -i "/ldconfig/d" wscript + + python2 ./waf configure --prefix=/usr \ + --mandir=/usr/share/man + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir" python2 ./waf install + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + From ad628fe1fd1990d186f4615ce62abb8dbd795098 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 28 Apr 2013 11:41:45 +0000 Subject: [PATCH 008/110] Add straton --- lv2/PKGBUILD | 31 +++++++++++++++++++++++++++ lv2core/PKGBUILD | 46 ----------------------------------------- lv2core/lv2core.install | 13 ------------ sord/PKGBUILD | 4 ++-- straton/PKGBUILD | 31 +++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 61 deletions(-) create mode 100644 lv2/PKGBUILD delete mode 100644 lv2core/PKGBUILD delete mode 100644 lv2core/lv2core.install create mode 100644 straton/PKGBUILD diff --git a/lv2/PKGBUILD b/lv2/PKGBUILD new file mode 100644 index 000000000..d498a41d4 --- /dev/null +++ b/lv2/PKGBUILD @@ -0,0 +1,31 @@ +pkgname=lv2 +pkgver=1.4.0 +pkgrel=1 +pkgdesc="Successor to the LADSPA audio plug-in standard" +url="http://lv2plug.in/" +license=('LGPL' 'custom') +arch=('i686' 'x86_64') +makedepends=('python2' 'libsndfile' 'gtk2') +optdepends=('libsndfile: lv2-eg-sampler' + 'gtk2: lv2-eg-sampler') +provides=('lv2core') +conflicts=('lv2core') +replaces=('lv2core') +source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2") +md5sums=('b7fb567fbfadae14ecd4f422fa24d41e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf configure --prefix=/usr + python2 waf build $MAKEFLAGS +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/lv2core/PKGBUILD b/lv2core/PKGBUILD deleted file mode 100644 index 76daf8360..000000000 --- a/lv2core/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=lv2core -pkgver=4.0 -pkgrel=1 -pkgdesc="LV2: Successor to the LADSPA audio plug-in standard" -url="http://lv2plug.in/" -license=('LGPL' 'custom') -arch=('i686' 'x86_64') -makedepends=('python2') -provides=('lv2') -install=$pkgname.install -source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2") -md5sums=('5097d964f3559a1ecec2d2fc822ef53a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - python2 waf configure --prefix=/usr - python2 waf build $MAKEFLAGS -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - python waf install --destdir="$pkgdir" - - # do the work of lv2config to own symlinks; - # - generate lv2 headers - # - see FS#23514 - _ns=$(grep '^|\1|') - _name=${_ns/*\/} - _path="$pkgdir/usr/include/lv2/${_ns%/*}" - install -d "$_path" - ln -s "/usr/lib/lv2/$_name.lv2" "$_path/$_name" - - install -Dm644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} diff --git a/lv2core/lv2core.install b/lv2core/lv2core.install deleted file mode 100644 index bf7e6cb9d..000000000 --- a/lv2core/lv2core.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - \ldconfig -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: \ No newline at end of file diff --git a/sord/PKGBUILD b/sord/PKGBUILD index a80839d14..c8bec4c4e 100644 --- a/sord/PKGBUILD +++ b/sord/PKGBUILD @@ -1,5 +1,5 @@ pkgname=sord -pkgver=0.10.4 +pkgver=0.12.0 pkgrel=1 pkgdesc="A lightweight C library for storing RDF data in memory." arch=('x86_64') @@ -8,7 +8,7 @@ license=('custom:ISC') depends=('serd' 'pcre') makedepends=('python2') source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('9353e5b5e26c926c1a8c0e43fa577f31') +md5sums=('0c045bd0a7a2d70974ed7287bb61f891') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/straton/PKGBUILD b/straton/PKGBUILD new file mode 100644 index 000000000..722b00f9c --- /dev/null +++ b/straton/PKGBUILD @@ -0,0 +1,31 @@ +pkgname=sratom +pkgver=0.4.2 +pkgrel=1 +pkgdesc="An LV2 Atom RDF serialisation library" +arch=('i686' 'x86_64') +url="http://drobilla.net/software/sratom/" +license=('custom:ISC') +depends=('lv2' 'sord>=0.12.0') +makedepends=('python2') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('5bb7e4bc4198e19f388ac51239007f25') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove ldconfig --speps + sed -i '/ldconfig/d' wscript + + python2 waf configure --prefix=/usr + python2 waf build $MAKEFLAGS +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} From 077c4afa88f479f12fc91535790e9cc7a591f861 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 28 Apr 2013 11:46:14 +0000 Subject: [PATCH 009/110] Add lilv --- lilv/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 lilv/PKGBUILD diff --git a/lilv/PKGBUILD b/lilv/PKGBUILD new file mode 100644 index 000000000..e8bc733f2 --- /dev/null +++ b/lilv/PKGBUILD @@ -0,0 +1,39 @@ +pkgname=lilv +pkgver=0.14.4 +pkgrel=1 +pkgdesc="A library to make the use of LV2 plugins as simple as possible for +applications." +arch=('x86_64') +url="http://drobilla.net/software/$pkgname/" +license=('custom:ISC') +depends=('python2' 'sratom' 'jack') +makedepends=('swig') +optdepends=('bash-completion: auto-complete words') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('891595410eeb68322cf875286f96fccf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + export PYTHON="/usr/bin/python2" + + # remove ldconfig + sed -i "/ldconfig/d" wscript + + python2 ./waf configure --prefix=/usr \ + --mandir=/usr/share/man \ + --configdir=/etc \ + --dyn-manifest \ + --bindings + python2 ./waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + DESTDIR="$pkgdir" python2 ./waf install + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + From 8485ac9e725ea4f112fd5ba1502a019aca313f93 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 28 Apr 2013 11:53:12 +0000 Subject: [PATCH 010/110] Add suil --- suil/PKGBUILD | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 suil/PKGBUILD diff --git a/suil/PKGBUILD b/suil/PKGBUILD new file mode 100644 index 000000000..b4e2eb12e --- /dev/null +++ b/suil/PKGBUILD @@ -0,0 +1,33 @@ +pkgname=suil +pkgver=0.6.12 +pkgrel=1 +pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs" +arch=('x86_64') +url="http://drobilla.net/software/suil/" +license=('custom:ISC') +depends=('lv2') +makedepends=('python2' 'qt' 'gtk2') +optdepends=('qt: Qt 4.x UI wrapping support' + 'gtk2: GTK+ 2.x UI wrapping support') +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") +md5sums=('528d4a0a37e6c9d5a4547ac36f7bd9e6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # remove ldconfig --speps + sed -i "/ldconfig/d" wscript + + python2 waf configure --prefix=/usr + python2 waf +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + # license + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} From 21ea9a1f7a8dc2eb5b873aa9a2b60d1c630570a6 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 28 Apr 2013 12:28:19 +0000 Subject: [PATCH 011/110] Update --- lilv/PKGBUILD | 52 +++++++++++++++++++++++++++-------------------- lilv/lilvmm.patch | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 lilv/lilvmm.patch diff --git a/lilv/PKGBUILD b/lilv/PKGBUILD index e8bc733f2..a8bfebe24 100644 --- a/lilv/PKGBUILD +++ b/lilv/PKGBUILD @@ -1,39 +1,47 @@ pkgname=lilv -pkgver=0.14.4 +pkgver=0.16.0 pkgrel=1 -pkgdesc="A library to make the use of LV2 plugins as simple as possible for -applications." +pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications" arch=('x86_64') -url="http://drobilla.net/software/$pkgname/" +url="http://drobilla.net/software/lilv/" license=('custom:ISC') -depends=('python2' 'sratom' 'jack') +depends=('python2' 'sratom>=0.4.2' 'jack') makedepends=('swig') optdepends=('bash-completion: auto-complete words') -source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2") -md5sums=('891595410eeb68322cf875286f96fccf') - +source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2" + 'lilvmm.patch') +md5sums=('12eb71f2b5b8a68e15c1c816896bcb9f' + 'd34207f8ca3586650ad7c50284ffb3e0') + build() { cd "$srcdir/$pkgname-$pkgver" - + + # fix UI API error + # backport of http://dev.drobilla.net/changeset/5092 + patch -Np2 -i "$srcdir/lilvmm.patch" + + # pick up python2 even when python3 exists + # (the build system has flaky support for python3) export PYTHON="/usr/bin/python2" - - # remove ldconfig + + # remove ldconfig --speps sed -i "/ldconfig/d" wscript - - python2 ./waf configure --prefix=/usr \ - --mandir=/usr/share/man \ - --configdir=/etc \ - --dyn-manifest \ - --bindings - python2 ./waf + + python2 waf configure --prefix=/usr \ + --configdir=/etc \ + --dyn-manifest \ + --bindings + + python2 waf build $MAKEFLAGS } - + package() { cd "$srcdir/$pkgname-$pkgver" - DESTDIR="$pkgdir" python2 ./waf install - + + python2 waf install --destdir="$pkgdir" + # license install -Dm644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } - + diff --git a/lilv/lilvmm.patch b/lilv/lilvmm.patch new file mode 100644 index 000000000..410aac5e3 --- /dev/null +++ b/lilv/lilvmm.patch @@ -0,0 +1,40 @@ +Index: trunk/lilv/lilv/lilvmm.hpp +=================================================================== +--- trunk/lilv/lilv/lilvmm.hpp (revision 4975) ++++ trunk/lilv/lilv/lilvmm.hpp (revision 5092) +@@ -48,4 +48,9 @@ + inline RT name(T1 a1, T2 a2) { \ + return lilv_ ## prefix ## _ ## name(me, a1, a2); \ ++ } ++ ++#define LILV_WRAP3(RT, prefix, name, T1, a1, T2, a2, T3, a3) \ ++ inline RT name(T1 a1, T2 a2, T3 a3) { \ ++ return lilv_ ## prefix ## _ ## name(me, a1, a2, a3); \ + } + +@@ -138,4 +143,25 @@ + LILV_WRAP1(bool, nodes, contains, const Node, node); + LILV_WRAP0(Node, nodes, get_first); ++}; ++ ++struct UI { ++ inline UI(const LilvUI* c_obj) : me(c_obj) {} ++ LILV_WRAP_CONVERSION(const LilvUI); ++ ++ LILV_WRAP0(const LilvNode*, ui, get_uri); ++ LILV_WRAP0(const LilvNode*, ui, get_bundle_uri); ++ LILV_WRAP0(const LilvNode*, ui, get_binary_uri); ++ LILV_WRAP0(const LilvNodes*, ui, get_classes); ++ /*LILV_WRAP3(bool, ui, is_supported, ++ LilvUISupportedFunc, supported_func, ++ const LilvNode*, container_type, ++ const LilvNode**, ui_type);*/ ++ LILV_WRAP1(bool, ui, is_a, const LilvNode*, class_uri); ++ ++ const LilvUI* me; ++}; ++ ++struct UIs { ++ LILV_WRAP_COLL(UIs, UI, uis); + }; + From a0f634f11ec10f00560928cb1f651b5b2682b986 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 28 Apr 2013 15:20:59 +0000 Subject: [PATCH 012/110] Add libsmf --- libsmf/PKGBUILD | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 libsmf/PKGBUILD diff --git a/libsmf/PKGBUILD b/libsmf/PKGBUILD new file mode 100644 index 000000000..03db11408 --- /dev/null +++ b/libsmf/PKGBUILD @@ -0,0 +1,24 @@ +pkgname=libsmf +pkgver=1.3 +pkgrel=1 +pkgdesc='A BSD-licensed C library for handling SMF ("*.mid") files.' +arch=('x86_64') +url="http://sourceforge.net/projects/libsmf/" +license=('BSD') +depends=('glib2' 'readline') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/libsmf/libsmf/$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('eb698f1bc0bad9d5bce4c10386347486') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-static=no + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} From 14cee93ac5d79b38f7f2aea88edf054ed5533b4b Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 29 Apr 2013 22:17:48 +0000 Subject: [PATCH 013/110] Fix configs --- mozilla-common/PKGBUILD | 6 +++--- mozilla-common/mozilla-common.csh | 2 +- mozilla-common/mozilla-common.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla-common/PKGBUILD b/mozilla-common/PKGBUILD index 5f7368761..1c7c6f2fd 100644 --- a/mozilla-common/PKGBUILD +++ b/mozilla-common/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mozilla-common pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Common Initialization Profile for Mozilla.org products" arch=(i686 x86_64) license=('GPL') @@ -11,8 +11,8 @@ url="http://www.mozilla.org/" install=mozilla-common.install source=(mozilla-common.sh mozilla-common.csh) -md5sums=('39451f6fe87d3cb224e140322c55eb27' - '924887e41bd96db37029f479befe40cf') +md5sums=('71f2d354cbea1b3b8227b83751f12a85' + '0a1f9fe0add8ee76fe5413cb073aa538') build() { install -m755 -d "${pkgdir}/etc/profile.d" diff --git a/mozilla-common/mozilla-common.csh b/mozilla-common/mozilla-common.csh index 09e49c783..884b94cb5 100755 --- a/mozilla-common/mozilla-common.csh +++ b/mozilla-common/mozilla-common.csh @@ -1 +1 @@ -setenv MOZ_PLUGIN_PATH "/usr/lib/mozilla/plugins" +setenv MOZ_PLUGIN_PATH "/usr/lib/mozilla/plugins:/etc/usr/lib/mozilla/plugins" diff --git a/mozilla-common/mozilla-common.sh b/mozilla-common/mozilla-common.sh index 132b5731e..2c1f29e66 100755 --- a/mozilla-common/mozilla-common.sh +++ b/mozilla-common/mozilla-common.sh @@ -1 +1 @@ -export MOZ_PLUGIN_PATH="/usr/lib/mozilla/plugins" +export MOZ_PLUGIN_PATH="/usr/lib/mozilla/plugins:/extra/usr/lib/mozilla/plugins" From af18b0cc2e3125a2cf22d2bad413d7d0902bb998 Mon Sep 17 00:00:00 2001 From: Manuel Date: Tue, 30 Apr 2013 18:09:17 +0000 Subject: [PATCH 014/110] Move to /extra --- flashplugin/PKGBUILD | 39 --------------------------------- flashplugin/flashplugin.install | 14 ------------ flashplugin/mms.cfg | 3 --- 3 files changed, 56 deletions(-) delete mode 100644 flashplugin/PKGBUILD delete mode 100644 flashplugin/flashplugin.install delete mode 100644 flashplugin/mms.cfg diff --git a/flashplugin/PKGBUILD b/flashplugin/PKGBUILD deleted file mode 100644 index ae7bc7701..000000000 --- a/flashplugin/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# maintainer abveritas@chakra-project.org - -pkgname=flashplugin -_licensefile='PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf' -pkgver=11.2.202.275 -pkgrel=1 -pkgdesc='Adobe Flash Player' -url='http://labs.adobe.com/technologies/flashplatformruntimes/flashplayer11/' -arch=('x86_64') -depends=('mozilla-common' 'libxt' 'libxpm' 'gtk2' 'nss' 'curl') -optdepends=('libvdpau: GPU acceleration on Nvidia card') -conflicts=('flashplugin') -provides=('flashplayer' 'flashplugin') -license=('custom') -options=(!strip) -install='flashplugin.install' -backup=('etc/adobe/mms.cfg') -source=("http://fpdownload.macromedia.com/get/flashplayer/pdc/$pkgver/install_flash_player_11_linux.x86_64.tar.gz" - "http://www.adobe.com/products/eulas/pdfs/${_licensefile}" - 'mms.cfg') - -md5sums=('d0a35620a3e54f6fa9e4c64b7c3d095f' - '94ca2aecb409abfe36494d1a7ec7591d' - 'dcd4454dc4aa8116b4d7a6c3ba159ea4') - -package () { - cd ${srcdir} - install -Dm755 libflashplayer.so "${pkgdir}/usr/lib/mozilla/plugins/libflashplayer.so" - install -Dm755 usr/lib64/kde4/kcm_adobe_flash_player.so "${pkgdir}/usr/lib/kde4/kcm_adobe_flash_player.so" - install -Dm755 usr/bin/flash-player-properties "${pkgdir}/usr/bin/flash-player-properties" - for i in 16x16 22x22 24x24 32x32 48x48; do - install -Dm644 usr/share/icons/hicolor/${i}/apps/flash-player-properties.png \ - "${pkgdir}/usr/share/icons/hicolor/${i}/apps/flash-player-properties.png" - done - install -Dm644 usr/share/applications/flash-player-properties.desktop "${pkgdir}/usr/share/applications/flash-player-properties.desktop" - install -Dm644 usr/share/kde4/services/kcm_adobe_flash_player.desktop "${pkgdir}/usr/share/kde4/services/kcm_adobe_flash_player.desktop" - install -Dm644 "${_licensefile}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf" - install -Dm644 ${srcdir}/mms.cfg "${pkgdir}/etc/adobe/mms.cfg" -} diff --git a/flashplugin/flashplugin.install b/flashplugin/flashplugin.install deleted file mode 100644 index 8018fcba2..000000000 --- a/flashplugin/flashplugin.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo " >> " - echo " >> If you have an NVIDIA card that supports libvdpau or Broadcom Crystal HD chips," - echo " >> uncomment EnableLinuxHWVideoDecode=1 from /etc/adobe/mms.cfg." - echo " >> If you run into problems, please contact nVidia or Broadcom along with your system config info / driver version." - echo " >> " -} - -post_upgrade() { - if [ "$(vercmp $2 10.2.152.27-2)" -lt 0 ]; then - post_install $1 - fi -} diff --git a/flashplugin/mms.cfg b/flashplugin/mms.cfg deleted file mode 100644 index df3dfafd4..000000000 --- a/flashplugin/mms.cfg +++ /dev/null @@ -1,3 +0,0 @@ -#Hardware video decoding -EnableLinuxHWVideoDecode=0 - From 06aad8172c69c77b2d12d8340c2a29a7ab16c9f5 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 11:21:43 +0000 Subject: [PATCH 015/110] New kernel --- nvidia-utils/PKGBUILD | 14 ++++---------- nvidia/PKGBUILD | 17 +++++++++-------- nvidia/nvidia.install | 6 +++--- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/nvidia-utils/PKGBUILD b/nvidia-utils/PKGBUILD index e943dcdd9..512ce16bb 100644 --- a/nvidia-utils/PKGBUILD +++ b/nvidia-utils/PKGBUILD @@ -6,22 +6,19 @@ pkgbase=nvidia-utils pkgname=('nvidia-utils' 'opencl-nvidia' 'libcl' 'nvidia-settings') # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 3xx.xx -pkgver=313.26 +pkgver=313.30 pkgrel=1 arch=('x86_64') url="http://www.nvidia.com/" license=('custom') options=('!strip') -[ "$CARCH" = "x86_64" ] && { - ARCH='x86_64' - _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" - md5sums=('2d35124fa5a4b009f170fe893b5d07e3') -} +ARCH='x86_64' +_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run" 'nvidia-restore-settings.desktop') -md5sums=("${md5sums[@]}" +md5sums=('e5f147fbcdcad71472b4ddeccf259bd7' '9237516792da7b6df32f8c7e8a98f475') create_links() { @@ -40,7 +37,6 @@ build() { package_libcl() { pkgdesc="OpenCL library and ICD loader from NVIDIA" - pkgver=1.1.9.8 cd "${srcdir}/${_pkg}" @@ -133,5 +129,3 @@ package_nvidia-settings() { # are automatically reloaded at each login install -D -m644 "${srcdir}/nvidia-restore-settings.desktop" "${pkgdir}/usr/share/autostart/nvidia-restore-settings.desktop" } - -# vim:set ts=2 sw=2 et: diff --git a/nvidia/PKGBUILD b/nvidia/PKGBUILD index 1977823dc..925c7ac54 100644 --- a/nvidia/PKGBUILD +++ b/nvidia/PKGBUILD @@ -3,23 +3,24 @@ # # maintainer abveritas@chakra-project.org -_extramodules=extramodules-3.7-CHAKRA +_extramodules=extramodules-3.8-CHAKRA _kver=$(cat /lib/modules/${_extramodules}/version) pkgname=('nvidia' 'chd-nvidia') -pkgver=313.26 +pkgver=313.30 pkgrel=1 arch=('x86_64') url="http://www.nvidia.com/" -makedepends=('linux-headers' 'linux>=3.7' 'linux<3.8' "nvidia-utils=${pkgver}") +makedepends=('linux-headers' 'linux>=3.8' 'linux<3.9' "nvidia-utils=${pkgver}") license=('custom') source=("https://gitorious.org/chakra/chakra-hardware-detection/blobs/raw/master/hwdb/nvidia_supported") -md5sums=('62d0cdb856cfae64753c0f3acf729d47') - _ARCH='x86_64' - _pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run") - md5sums+=('2d35124fa5a4b009f170fe893b5d07e3') +_ARCH='x86_64' +_pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32" +source+=("ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run") + +md5sums=('62d0cdb856cfae64753c0f3acf729d47' + 'e5f147fbcdcad71472b4ddeccf259bd7') build() { cd "${srcdir}" diff --git a/nvidia/nvidia.install b/nvidia/nvidia.install index 3e0e7a6d5..c98426d2d 100644 --- a/nvidia/nvidia.install +++ b/nvidia/nvidia.install @@ -1,11 +1,11 @@ post_install() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo -e '\e[31;46m WARNING' echo -e '\e[31;46m If your card is from the 7xxx series or earlier, switch to nvidia-304xx' @@ -14,7 +14,7 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } From 2dcbcd85ce4b62cb861410b68eb3994b78ca0426 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 12:00:15 +0000 Subject: [PATCH 016/110] Udpate and rebuild against new kernel --- madwifi/PKGBUILD | 9 ++++---- nvidia-304xx-utils/PKGBUILD | 14 ++++-------- nvidia-304xx/PKGBUILD | 29 ++++++++--------------- nvidia-304xx/conftest_new.diff | 11 --------- nvidia-304xx/nvidia.install | 6 ++--- nvidia-304xx/uapi-3.7.patch | 42 ---------------------------------- nvidia/PKGBUILD | 2 +- 7 files changed, 23 insertions(+), 90 deletions(-) delete mode 100644 nvidia-304xx/conftest_new.diff delete mode 100644 nvidia-304xx/uapi-3.7.patch diff --git a/madwifi/PKGBUILD b/madwifi/PKGBUILD index 469fb7bab..7a8aef609 100644 --- a/madwifi/PKGBUILD +++ b/madwifi/PKGBUILD @@ -1,24 +1,23 @@ # # Chakra Packages for Chakra, part of chakra-project.org # -# maintainer abveritas@chakra-project.org -_extramodules=extramodules-3.7-CHAKRA +_extramodules=extramodules-3.8-CHAKRA _kver="$(cat /lib/modules/${_extramodules}/version)" pkgname=madwifi pkgver=0.9.4.4173 _ver=0.9.4-r4173-20111008 -pkgrel=13 +pkgrel=14 pkgdesc="Madwifi drivers for Atheros wireless chipsets" arch=('x86_64') license=('GPL') url="http://madwifi-project.org" -depends=('madwifi-utils' 'linux>=3.7' 'linux<3.8') +depends=('madwifi-utils' 'linux>=3.8' 'linux<3.9') makedepends=('linux-headers' 'sharutils') install=madwifi-ng.install # subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi -source=(http://chakra-linux.org/sources/madwifi/madwifi-${pkgver}.tar.gz) +source=(http://chakra.sourceforge.net/sources/madwifi/madwifi-${pkgver}.tar.gz) #http://downloads.sourceforge.net/madwifi/madwifi-${pkgver}.tar.gz) md5sums=('18cd1c574e0fa66eb4396f92f0700a7e') groups=("linux-modules") diff --git a/nvidia-304xx-utils/PKGBUILD b/nvidia-304xx-utils/PKGBUILD index d2d60e75a..c7ae3cf23 100644 --- a/nvidia-304xx-utils/PKGBUILD +++ b/nvidia-304xx-utils/PKGBUILD @@ -6,22 +6,18 @@ pkgbase=nvidia-304xx-utils pkgname=('nvidia-304xx-utils' 'nvidia-304xx-settings') # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 3xx.xx -pkgver=304.64 -pkgrel=3 +pkgver=304.88 +pkgrel=1 arch=('x86_64') url="http://www.nvidia.com/" license=('custom') options=('!strip') -[ "$CARCH" = "x86_64" ] && { - ARCH='x86_64' - _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" - md5sums=('76007ed4b72afd334e26377b646f5f7e') -} - +ARCH='x86_64' +_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run" 'nvidia-restore-settings.desktop') -md5sums=("${md5sums[@]}" +md5sums=('35e0c7d30de795cccb6b95bda991fb77' '9237516792da7b6df32f8c7e8a98f475') create_links() { diff --git a/nvidia-304xx/PKGBUILD b/nvidia-304xx/PKGBUILD index e388e7fa8..adc2db568 100644 --- a/nvidia-304xx/PKGBUILD +++ b/nvidia-304xx/PKGBUILD @@ -1,43 +1,34 @@ # # Chakra Packages for Chakra, part of chakra-project.org # -# maintainer abveritas@chakra-project.org -_extramodules=extramodules-3.7-CHAKRA +_extramodules=extramodules-3.8-CHAKRA _kver=$(cat /lib/modules/${_extramodules}/version) pkgname=('nvidia-304xx' 'chd-nvidia-304xx') -pkgver=304.64 -pkgrel=3 +pkgver=304.88 +pkgrel=1 arch=('x86_64') url="http://www.nvidia.com/" -makedepends=('linux-headers' 'linux>=3.7' 'linux<3.8' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers' 'linux>=3.8' 'linux<3.9' "nvidia-304xx-utils=${pkgver}") license=('custom') -source=("https://gitorious.org/chakra/chakra-hardware-detection/blobs/raw/master/hwdb/nvidia_supported" - 'uapi-3.7.patch' - 'conftest_new.diff') +source=("https://gitorious.org/chakra/chakra-hardware-detection/blobs/raw/master/hwdb/nvidia_supported") +_ARCH='x86_64' +_pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32" +source+=("ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run") md5sums=('62d0cdb856cfae64753c0f3acf729d47' - '42f2ad1cf9b48b1da8ed82200a045a8a' - 'd33b6506540aa3c52272b6b655d52647') - - _ARCH='x86_64' - _pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run") - md5sums+=('76007ed4b72afd334e26377b646f5f7e') + '35e0c7d30de795cccb6b95bda991fb77') build() { cd "${srcdir}" sh "${_pkg}.run" --extract-only - patch -p1 -i "${srcdir}/conftest_new.diff" cd "${_pkg}/kernel" - patch -p0 -i "${srcdir}/uapi-3.7.patch" - make SYSSRC=/lib/modules/"${_kver}/build" module } package_nvidia-304xx() { pkgdesc="NVIDIA drivers for linux." - depends=('linux>=3.7' 'linux<3.8' "nvidia-304xx-utils=${pkgver}") + depends=('linux>=3.8' 'linux<3.9' "nvidia-304xx-utils=${pkgver}") conflicts=('nvidia-96xx' 'nvidia-173xx' 'nvidia') install=nvidia.install diff --git a/nvidia-304xx/conftest_new.diff b/nvidia-304xx/conftest_new.diff deleted file mode 100644 index f3b6ada10..000000000 --- a/nvidia-304xx/conftest_new.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/NVIDIA-Linux-x86_64-304.64-no-compat32/kernel/conftest.sh 2013-02-04 15:10:20.669633666 -0500 -+++ b/NVIDIA-Linux-x86_64-304.64-no-compat32/kernel/conftest.sh 2013-02-04 15:10:34.283334673 -0500 -@@ -1717,7 +1717,7 @@ - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - - if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then -+ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 - fi diff --git a/nvidia-304xx/nvidia.install b/nvidia-304xx/nvidia.install index a2ed92679..2c85ae7e4 100644 --- a/nvidia-304xx/nvidia.install +++ b/nvidia-304xx/nvidia.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia-304xx/uapi-3.7.patch b/nvidia-304xx/uapi-3.7.patch deleted file mode 100644 index f695abcf4..000000000 --- a/nvidia-304xx/uapi-3.7.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- conftest.sh.dist 2012-10-11 19:18:22.704848496 -0400 -+++ conftest.sh 2012-10-12 20:35:55.707213868 -0400 -@@ -20,6 +20,7 @@ - ISYSTEM=`$CC -print-file-name=include 2> /dev/null` - SOURCES=$4 - HEADERS=$SOURCES/include -+HEADERSA=$SOURCES/include/uapi - OUTPUT=$5 - XEN_PRESENT=1 - -@@ -118,7 +119,7 @@ - fi - fi - -- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" -+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS" - - test_xen - -@@ -146,10 +147,10 @@ - fi - fi - -- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" -+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS" - - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated" -+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi" - elif [ "$ARCH" = "arm" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated" - fi ---- nv-mmap.c.dist 2012-08-08 22:52:53.000000000 -0400 -+++ nv-mmap.c 2012-08-14 23:52:41.257235863 -0400 -@@ -450,7 +450,7 @@ - NV_PRINT_AT(NV_DBG_MEMINFO, at); - nv_vm_list_page_count(&at->page_table[i], pages); - -- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED); -+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP)); - - #if defined(VM_DRIVER_PAGES) diff --git a/nvidia/PKGBUILD b/nvidia/PKGBUILD index 925c7ac54..4ad871839 100644 --- a/nvidia/PKGBUILD +++ b/nvidia/PKGBUILD @@ -32,7 +32,7 @@ build() { package_nvidia() { pkgdesc="NVIDIA drivers for linux." - depends=('linux>=3.7' 'linux<3.8' "nvidia-utils=${pkgver}") + depends=('linux>=3.8' 'linux<3.9' "nvidia-utils=${pkgver}") conflicts=('nvidia-96xx' 'nvidia-173xx' 'nvidia-304xx') install=nvidia.install From 600a91b3ea2d0cc08a1531c64fa257ccc21691dc Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 13:28:56 +0000 Subject: [PATCH 017/110] Update and rebuild against new kernel --- nvidia-173xx-utils/PKGBUILD | 4 ++-- nvidia-173xx/PKGBUILD | 10 ++++------ nvidia-173xx/nvidia.install | 6 +++--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/nvidia-173xx-utils/PKGBUILD b/nvidia-173xx-utils/PKGBUILD index 034f92092..6e83b5285 100644 --- a/nvidia-173xx-utils/PKGBUILD +++ b/nvidia-173xx-utils/PKGBUILD @@ -4,7 +4,7 @@ # maintainer abveritas@chakra-project.org pkgname=nvidia-173xx-utils -pkgver=173.14.36 +pkgver=173.14.37 pkgrel=1 pkgdesc="NVIDIA drivers utilities and libraries, 173xx branch." arch=('x86_64') @@ -18,7 +18,7 @@ license=('custom') install=nvidia.install options=(!strip) source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run") -md5sums=('c341612429c2885980103b40542cb2b2') +md5sums=('761fec0664e715df35cdb64cd4b087f4') package() { cd $srcdir diff --git a/nvidia-173xx/PKGBUILD b/nvidia-173xx/PKGBUILD index cba6204d0..2f7c6ed47 100644 --- a/nvidia-173xx/PKGBUILD +++ b/nvidia-173xx/PKGBUILD @@ -1,14 +1,12 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org -_extramodules=extramodules-3.7-CHAKRA +_extramodules=extramodules-3.8-CHAKRA _kver="$(cat /lib/modules/${_extramodules}/version)" pkgname=(nvidia-173xx chd-nvidia-173xx) -pkgver=173.14.36 -pkgrel=2 +pkgver=173.14.37 +pkgrel=1 arch=('x86_64') ARCH=x86_64 url="http://www.nvidia.com/" @@ -16,7 +14,7 @@ makedepends=('linux-headers') license=('custom') source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run" "https://gitorious.org/chakra/chakra-hardware-detection/blobs/raw/master/hwdb/nvidia_supported") -md5sums=('c341612429c2885980103b40542cb2b2' +md5sums=('761fec0664e715df35cdb64cd4b087f4' '62d0cdb856cfae64753c0f3acf729d47') build() { diff --git a/nvidia-173xx/nvidia.install b/nvidia-173xx/nvidia.install index a2ed92679..2c85ae7e4 100644 --- a/nvidia-173xx/nvidia.install +++ b/nvidia-173xx/nvidia.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } From 387d7b98f3356c5c07bd1ee5bd44afdca9050687 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 17:18:08 +0000 Subject: [PATCH 018/110] Update --- madwifi/PKGBUILD | 8 ++++---- madwifi/madwifi-ng.install | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/madwifi/PKGBUILD b/madwifi/PKGBUILD index 7a8aef609..401de6565 100644 --- a/madwifi/PKGBUILD +++ b/madwifi/PKGBUILD @@ -6,8 +6,7 @@ _extramodules=extramodules-3.8-CHAKRA _kver="$(cat /lib/modules/${_extramodules}/version)" pkgname=madwifi -pkgver=0.9.4.4173 -_ver=0.9.4-r4173-20111008 +pkgver=0.9.4.4182 pkgrel=14 pkgdesc="Madwifi drivers for Atheros wireless chipsets" arch=('x86_64') @@ -24,7 +23,7 @@ groups=("linux-modules") build() { - cd madwifi-$_ver + cd madwifi-$pkgver # kernel 3.2 abi change sed -i -e "s/.ndo_set_multicast_list/.ndo_set_rx_mode/" ath/if_ath.c @@ -33,12 +32,13 @@ build() sed -i 's/-Werror//' Makefile.inc sed -i 's/\[4-9\]\\\./[0-9]-/' Makefile + make KERNELPATH=/lib/modules/${_kver}/build KERNELRELEASE=${_kver} modules } package() { - cd madwifi-$_ver + cd madwifi-$pkgver make KERNELPATH=/lib/modules/${_kver}/build KERNELRELEASE=${_kver} modules \ DESTDIR="${pkgdir}" KERNELRELEASE=${_kver} install-modules sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/*.install diff --git a/madwifi/madwifi-ng.install b/madwifi/madwifi-ng.install index b10bb437e..bcd7dc073 100644 --- a/madwifi/madwifi-ng.install +++ b/madwifi/madwifi-ng.install @@ -5,7 +5,7 @@ post_install() post_upgrade() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } From 6735c4351e6b57fd9fbb8f8de683624d1efc13b4 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 17:21:47 +0000 Subject: [PATCH 019/110] Fix md5sums and pkgrel --- madwifi/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/madwifi/PKGBUILD b/madwifi/PKGBUILD index 401de6565..18470226e 100644 --- a/madwifi/PKGBUILD +++ b/madwifi/PKGBUILD @@ -7,7 +7,7 @@ _kver="$(cat /lib/modules/${_extramodules}/version)" pkgname=madwifi pkgver=0.9.4.4182 -pkgrel=14 +pkgrel=1 pkgdesc="Madwifi drivers for Atheros wireless chipsets" arch=('x86_64') license=('GPL') @@ -18,7 +18,7 @@ install=madwifi-ng.install # subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi source=(http://chakra.sourceforge.net/sources/madwifi/madwifi-${pkgver}.tar.gz) #http://downloads.sourceforge.net/madwifi/madwifi-${pkgver}.tar.gz) -md5sums=('18cd1c574e0fa66eb4396f92f0700a7e') +md5sums=('8cc9cb67ec2fd7c4a71b6725a764c171') groups=("linux-modules") build() From e42cb73e4bda83600afc1b22887cc69608e1c431 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 17:27:12 +0000 Subject: [PATCH 020/110] Cleanup --- acerhk/2.6.30.patch | 72 ---------------------- acerhk/2.6.36.patch | 21 ------- acerhk/5100.patch | 122 ------------------------------------- acerhk/ChangeLog | 68 --------------------- acerhk/PKGBUILD | 49 --------------- acerhk/acerhk.install | 19 ------ acerhk/acerhk.rc | 32 ---------- acerhk/flag.patch | 38 ------------ acerhk/kernelversion.patch | 12 ---- acerhk/medion.patch | 48 --------------- 10 files changed, 481 deletions(-) delete mode 100644 acerhk/2.6.30.patch delete mode 100644 acerhk/2.6.36.patch delete mode 100644 acerhk/5100.patch delete mode 100644 acerhk/ChangeLog delete mode 100644 acerhk/PKGBUILD delete mode 100644 acerhk/acerhk.install delete mode 100644 acerhk/acerhk.rc delete mode 100644 acerhk/flag.patch delete mode 100644 acerhk/kernelversion.patch delete mode 100644 acerhk/medion.patch diff --git a/acerhk/2.6.30.patch b/acerhk/2.6.30.patch deleted file mode 100644 index eec5a5cf3..000000000 --- a/acerhk/2.6.30.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/acerhk.c -+++ b/acerhk.c -@@ -2668,7 +2668,9 @@ static int acerhk_proc_init(void) - printk(KERN_INFO"acerhk: could not create /proc/driver/acerhk\n"); - } - else { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - proc_acer_dir->owner = THIS_MODULE; -+#endif - /* now create several files, first general info ... */ - entry = create_proc_read_entry("info", - 0444, proc_acer_dir, acerhk_proc_info, NULL); -@@ -2677,7 +2679,9 @@ static int acerhk_proc_init(void) - remove_proc_entry("driver/acerhk", NULL); - retval = 0; - } else { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - /* ... last pressed key ... */ - entry = create_proc_read_entry("key", - 0444, proc_acer_dir, acerhk_proc_key, NULL); -@@ -2687,7 +2691,9 @@ static int acerhk_proc_init(void) - remove_proc_entry("driver/acerhk", NULL); - retval = 0; - } else { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - /* ... and led control file */ - entry = create_proc_entry("led", 0222, proc_acer_dir); - if (entry == NULL) { -@@ -2699,7 +2705,9 @@ static int acerhk_proc_init(void) - } - else { - entry->write_proc = acerhk_proc_led; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - /* ... and wireless led controll file */ - entry = create_proc_entry("wirelessled", 0222, proc_acer_dir); - if (entry == NULL) { -@@ -2712,7 +2720,9 @@ static int acerhk_proc_init(void) - } - else { - entry->write_proc = acerhk_proc_wirelessled; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - /* ... and bluetooth led controll file */ - entry = create_proc_entry("blueled", 0222, proc_acer_dir); - if (entry == NULL) { -@@ -2725,7 +2735,9 @@ static int acerhk_proc_init(void) - retval = 0; - } else { - entry->write_proc = acerhk_proc_blueled; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - retval = 1; - #ifdef ACERDEBUG - /* add extra file for debugging purposes */ -@@ -2742,7 +2754,9 @@ static int acerhk_proc_init(void) - } - else { - entry->write_proc = acerhk_proc_debug; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30) - entry->owner = THIS_MODULE; -+#endif - retval = 1; - } - #endif diff --git a/acerhk/2.6.36.patch b/acerhk/2.6.36.patch deleted file mode 100644 index f3c54090b..000000000 --- a/acerhk/2.6.36.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- acerhk.c.orig 2010-10-22 23:33:34.195981177 +0200 -+++ acerhk.c 2010-10-22 23:39:16.349277070 +0200 -@@ -2793,8 +2793,7 @@ static void acerhk_proc_cleanup(void) - - /* {{{ file operations */ - --static int acerhk_ioctl( struct inode *inode, struct file *file, -- unsigned int cmd, unsigned long arg ) -+static long acerhk_unlocked_ioctl(struct file *file,unsigned int cmd, unsigned long arg ) - { - int retval; - switch( cmd ) { -@@ -2904,7 +2903,7 @@ static int acerhk_resume(struct platform - - static struct file_operations acerhk_fops = { - owner: THIS_MODULE, -- ioctl: acerhk_ioctl, -+ unlocked_ioctl: acerhk_unlocked_ioctl, - open: acerhk_open, - #ifdef ACERDEBUG - write: acerhk_write, diff --git a/acerhk/5100.patch b/acerhk/5100.patch deleted file mode 100644 index a30ede0b0..000000000 --- a/acerhk/5100.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff -bBur acerhk-0.5.35-old/acerhk.c acerhk-0.5.35/acerhk.c ---- acerhk-0.5.35-old/acerhk.c 2007-02-10 17:46:23.000000000 +0200 -+++ acerhk-0.5.35/acerhk.c 2007-04-28 19:18:49.000000000 +0300 -@@ -550,6 +550,7 @@ - */ - static asmlinkage void call_bios_6xx(struct register_buffer *buf) - { -+#ifndef __x86_64__ - if (bios_routine) { - local_irq_disable(); - __asm__ __volatile__( -@@ -578,10 +579,12 @@ - ); - local_irq_enable(); - } -+#endif - } - - static asmlinkage void call_bios_52x(struct register_buffer *buf) - { -+#ifndef __x86_64__ - if (bios_routine) { - local_irq_disable(); - __asm__ __volatile__( -@@ -611,6 +614,7 @@ - ); - local_irq_enable(); - } -+#endif - } - - #define PRINT_BUFFER(x) \ -@@ -783,7 +787,8 @@ - unsigned char c = 0; - - spin_lock_irqsave (&rtc_lock, flags); --#ifndef DUMMYHW -+/* #ifndef DUMMYHW */ -+#if !(defined(DUMMYHW) || defined(__x86_64__)) - if (cmos_index) - c = CMOS_READ(cmos_index); - else if (verbose > 3) -@@ -867,9 +872,9 @@ - - static struct proc_dir_entry *proc_acer_dir; - --static unsigned int __init find_hk_area(void) -+static unsigned long __init find_hk_area(void) - { -- int offset, sig; -+ long offset, sig; - unsigned int fkt; - fkt = 0; - sig = -1; /* offset to signature in io area */ -@@ -887,9 +892,9 @@ - fkt = readl(reg1 + sig + 5); - /* adjust fkt to address of mapped IO area */ - if (fkt >= 0xf0000) -- fkt = (unsigned int)reg1 + fkt - 0xf0000; -+ fkt = (unsigned long)reg1 + fkt - 0xf0000; - else if (fkt >= 0xe0000) -- fkt = (unsigned int)reg1 + fkt - 0xe0000; -+ fkt = (unsigned long)reg1 + fkt - 0xe0000; - else - fkt = 0; - } -@@ -1144,6 +1149,7 @@ - case 2000: - case 2010: - case 2020: -+ case 5100: - /* Aspire 13xx series laptops use dritek hardware, no - acerhk-mapping needed - VolUp and VolDown are managed as normal keys -@@ -1458,6 +1464,7 @@ - case 1800: - case 2010: - case 2020: -+ case 5100: - /* Dritek EC, bluetooth, wifi, mail */ - acerhk_type = TM_dritek; - acerhk_model_features = TM_F_MAIL_LED_EC2 | TM_F_WLAN_EC2 | TM_F_BLUE_EC2; -@@ -1792,6 +1799,8 @@ - break; - case '2': series = 5020; break; - } -+ } else if (str[8] == '1' && str[9] == '0') { -+ series = 5100; - } else { - if (verbose > 1) - printk(KERN_INFO"acerhk: model string indicates unknown Aspire 5xxx series\n"); -@@ -2117,7 +2126,8 @@ - /* polling timer handler */ - static void acerhk_poll_event(unsigned long save_size) - { --#ifndef DUMMYHW -+/* #ifndef DUMMYHW */ -+#if !(defined(DUMMYHW) || defined(__x86_64__)) - unsigned int max = MAX_POLLING_LOOPS; - /* make sure not to loop more then 32 times */ - if (!max || max > 32) -@@ -2139,7 +2149,8 @@ - { - if (acerhk_blueled_blinking != -1) { - acerhk_blueled_blinking = !acerhk_blueled_blinking; --#ifndef DUMMYHW -+/* #ifndef DUMMYHW */ -+#if !(defined(DUMMYHW) || defined(__x86_64__)) - wbutton_fct_1(acerhk_blueled_blinking); - #endif - acerhk_timer_blinking.expires = jiffies + acerhk_blueled_blinking_delay; -@@ -2904,7 +2915,8 @@ - /* attach to input system */ - init_input(); - memset(acerhk_model_string, 0x00, ACERHK_MODEL_STRLEN); --#ifdef DUMMYHW -+/* #ifdef DUMMYHW */ -+#if !(defined(DUMMYHW) || defined(__x86_64__)) - acerhk_model_addr = (void*)0x12345678; - /* copy the string, but not more than 15 characters */ - strncpy(acerhk_model_string, "TravelmateDummy", ACERHK_MODEL_STRLEN-1); - diff --git a/acerhk/ChangeLog b/acerhk/ChangeLog deleted file mode 100644 index fc6157610..000000000 --- a/acerhk/ChangeLog +++ /dev/null @@ -1,68 +0,0 @@ -2010-04-09 Chris Brannon - - * Release bump: 17 - - * PKGBUILD: updated for the 2.6.33 kernel. - - * Added kernelversion.patch, since the location of utsrelease.h - changed with the 2.6.33 kernel. - -2010-01-11 Chris Brannon - - * Release bump: 17 - - * PKGBUILD: fixed _kernver - -2010-01-09 Chris Brannon - - * Release bump: 16 - - * PKGBUILD: updated for the 2.6.32 kernel - -2009-10-10 Corrado Primier - - * Release bump: 15 - - * PKGBUILD: updated for the 2.6.31 kernel - - * acerhk.install: changed modprobe.conf path - -2009-06-24 Corrado Primier - - * Release bump: 14 - - * PKGBUILD: updated for the 2.6.30 kernel, added compilation patch - - * 2.6.30.patch: added - -2009-04-09 Corrado Primier - - * Release bump: 13 - - * PKGBUILD: updated for the 2.6.29 kernel - -2009-01-16 Corrado Primier - - * Release bump: 12 - - * PKGBUILD: updated for the 2.6.28 kernel - -2008-10-16 Corrado Primier - - * Release bump: 11 - - * PKGBUILD: updated for the 2.6.27 kernel - -2008-08-12 Corrado Primier - - * Release bump: 10 - - * PKGBUILD: updated for the 2.6.26 kernel, moved to $srcdir/$pkgdir - -2008-05-27 Corrado Primier - - * Release bump: 9 - - * PKGBUILD: updated for the 2.6.25 kernel - - * ChangeLog: added diff --git a/acerhk/PKGBUILD b/acerhk/PKGBUILD deleted file mode 100644 index 387268644..000000000 --- a/acerhk/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -pkgname=acerhk -pkgver=0.5.35 -pkgrel=11 -pkgdesc="Acer hotkey driver" -url="http://www.cakey.de/acerhk/" -arch=('i686') # Unavailable for x86_64 -license=('GPL') -depends=('linux>=3.0' 'linux<3.1') -makedepends=('linux-headers') -source=(http://www.cakey.de/acerhk/archives/${pkgname}-${pkgver}.tgz acerhk.rc - 2.6.30.patch kernelversion.patch 2.6.36.patch flag.patch medion.patch) -install=acerhk.install -# Find the kernel name inside the chroot -_kernver=`pacman -Q linux | cut -c7-9 | sed 's/linux //g'`-CHAKRA - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/CFLAGS/EXTRA_CFLAGS/' Makefile - sed \ - -e 's~#include ~~g' \ - -i acerhk.c - patch -Np1 -i "${srcdir}/2.6.30.patch" - patch -Np0 -i "${srcdir}/2.6.36.patch" - patch -N -p1 < "$srcdir/kernelversion.patch" - patch -Np1 -i "${srcdir}/flag.patch" - patch -Np0 -i "${srcdir}/medion.patch" - - # Set KERNELSRC. The makefile tries to autodetect it with uname, - # but that is unreliable. - make KERNELSRC="/lib/modules/${_kernver}/build" acerhk.ko - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/acerhk.ko" \ - "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/block/acerhk.ko" - install -Dm755 "${srcdir}/acerhk.rc" "${pkgdir}/etc/rc.d/acerhk" -} - -# vim:set ts=2 sw=2 et: -md5sums=('05255919f312cb76af473a760c284433' - '935584b3e4bfbb3af8460558e5b98bb5' - '2a0bc99e5b12e25096441df4d53d7df7' - 'fd2ef062ecbc9d670e1b42aa5866d32d' - 'd257a4e9223ebfde48b9608805df9c99' - '7918e52ac88eb68a011bbf06482c35f6' - '05b5f9454276f67a87fa894b7bee8b0a') diff --git a/acerhk/acerhk.install b/acerhk/acerhk.install deleted file mode 100644 index 252358194..000000000 --- a/acerhk/acerhk.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - cat << EOM - >>> PLEASE ADD PROPER OPTIONS IN /etc/modprobe.d/modprobe.conf IF NEEDED - >>> e.g. for Series 290: - >>> echo "options acerhk force_series=290 usedritek=1 verbose=0" >> /etc/modprobe.conf -EOM - depmod -a -} - - -post_upgrade() { - depmod -a -} - -post_remove() { - depmod -a -} - -# vim:set ts=2 sw=2 et: diff --git a/acerhk/acerhk.rc b/acerhk/acerhk.rc deleted file mode 100644 index b4679cfbe..000000000 --- a/acerhk/acerhk.rc +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting Acer Hotkey Wireless LED" - if [ ! -f /proc/driver/acerhk/wirelessled ]; then - stat_fail - else - echo 1 > /proc/driver/acerhk/wirelessled - stat_done - fi - ;; - stop) - stat_busy "Stopping Acer Hotkey Wireless LED" - if [ ! -f /proc/driver/acerhk/wirelessled ]; then - stat_fail - else - echo 0 > /proc/driver/acerhk/wirelessled - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac diff --git a/acerhk/flag.patch b/acerhk/flag.patch deleted file mode 100644 index a7805104a..000000000 --- a/acerhk/flag.patch +++ /dev/null @@ -1,38 +0,0 @@ -## Description: add some description -## Origin/Author: add some origin or author -## Bug: bug URL -Index: acerhk-0.5.35/Makefile -=================================================================== ---- acerhk-0.5.35.orig/Makefile 2011-05-16 23:30:09.000000000 +0200 -+++ acerhk-0.5.35/Makefile 2011-05-16 23:26:38.000000000 +0200 -@@ -14,7 +14,7 @@ - CONFIG_ACERHK?=m - obj-$(CONFIG_ACERHK) += acerhk.o - --EXTRA_CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -+EXTRA_CFLAGS+=-c -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe - INCLUDE=-I$(KERNELSRC)/include - - ifeq ($(KERNELMAJOR), 2.6) -Index: acerhk-0.5.35/acerhk.c -=================================================================== ---- acerhk-0.5.35.orig/acerhk.c 2011-05-16 23:30:09.000000000 +0200 -+++ acerhk-0.5.35/acerhk.c 2011-05-16 23:28:38.000000000 +0200 -@@ -576,7 +576,7 @@ - "popa\n\t" - : - :"m" (bios_routine), "m" (buf) -- :"%eax", "%ebx", "%ecx", "%edx", "%edi", "%esi", "%ebp" -+ :"%eax", "%ebx", "%ecx", "%edx", "%edi", "%esi" - ); - local_irq_enable(); - } -@@ -611,7 +611,7 @@ - "popa\n\t" - : - :"m" (bios_routine), "m" (preg400), "m" (buf) -- :"%eax", "%ebx", "%ecx", "%edx", "%edi", "%esi", "%ebp" -+ :"%eax", "%ebx", "%ecx", "%edx", "%edi", "%esi" - ); - local_irq_enable(); - } diff --git a/acerhk/kernelversion.patch b/acerhk/kernelversion.patch deleted file mode 100644 index 033c94989..000000000 --- a/acerhk/kernelversion.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur acerhk-0.5.35/Makefile acerhk-0.5.35-new/Makefile ---- acerhk-0.5.35/Makefile 2006-08-16 11:11:08.000000000 -0500 -+++ acerhk-0.5.35-new/Makefile 2010-04-09 15:59:40.000000000 -0500 -@@ -3,7 +3,7 @@ - #KERNELSRC=/usr/src/linux - KERNELSRC?=/lib/modules/`uname -r`/build - # Starting with 2.6.18, the kernel version is in utsrelease.h instead of version.h, accomodate both cases --KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/linux/utsrelease.h)) -+KERNELVERSION=$(shell awk -F\" '/REL/ {print $$2}' $(shell grep -s -l REL $(KERNELSRC)/include/linux/version.h $(KERNELSRC)/include/generated/utsrelease.h)) - KERNELMAJOR=$(shell echo $(KERNELVERSION)|head -c3) - - # next line is for kernel 2.6, if you integrate the driver in the kernel tree diff --git a/acerhk/medion.patch b/acerhk/medion.patch deleted file mode 100644 index b996aede1..000000000 --- a/acerhk/medion.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- acerhk.c.orig 2007-02-10 16:46:23.000000000 +0100 -+++ acerhk.c 2010-05-02 15:16:41.000000000 +0200 -@@ -1231,6 +1231,17 @@ - acerhk_key2name[5] = k_display; /* FN+F3 (Display switch) */ - acerhk_key2name[6] = k_res; /* FN+F4 (Display ein/ausschalten) */ - break; -+ case 97600: -+ /* Medion MD97600, 7 keys, no setup */ -+ acerhk_key2name[1] = k_help; /* FN+F1 (Help) */ -+ acerhk_key2name[2] = k_none; -+ acerhk_key2name[5] = k_display; /* FN+F3 (Display switch) */ -+ acerhk_key2name[6] = k_res; /* FN+F4 (Display ein/ausschalten) */ -+ acerhk_key2name[17] = k_p1; -+ acerhk_key2name[18] = k_p2; -+ acerhk_key2name[19] = k_p3; -+ acerhk_key2name[48] = k_wireless; -+ break; - case 42200: - /* Medion MD42200, 7 keys, no setup */ - acerhk_key2name[2] = k_none; -@@ -1313,6 +1324,14 @@ - acerhk_model_features = 0x00f00000; - acerhk_type = TM_new; - break; -+ case 97600: -+ /* has WLAN button */ -+ /* The MD97600 seems to require TM_F_CONNECT at least -+ once after cold boot, otherwise enabling the WLAN -+ radio does not work */ -+ acerhk_model_features = TM_F_WBUTTON | TM_F_CONNECT; -+ acerhk_type = TM_new; -+ break; - case 42200: /* Medion MD42200 */ - /* has WLAN button, should call connect() */ - acerhk_model_features = TM_F_WBUTTON | TM_F_CONNECT; -@@ -1862,7 +1881,11 @@ - } - else if (strncmp(str, "MEDIONPC", 8) == 0) { - uint medionmodel; -- if ((medionmodel = COLUSSI("WIM 2040", 4, reg1, AREA_SIZE)) >= 0) { -+ if ((medionmodel = COLUSSI("WIM 2090", 8, reg1, AREA_SIZE)) >= 0) { -+ printk(KERN_INFO"acerhk: found Medion model string:'%s'\n", (char*)reg1+medionmodel); -+ series = 97600; -+ } -+ else if ((medionmodel = COLUSSI("WIM 2040", 4, reg1, AREA_SIZE)) >= 0) { - printk(KERN_INFO"acerhk: found Medion model string:'%s'\n", (char*)reg1+medionmodel); - series = 96500; - } else { From 57ee578694f91987efe5fb942b579d1a328f3cf9 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 17:30:32 +0000 Subject: [PATCH 021/110] Cleanup --- nvidia-96xx-utils/PKGBUILD | 70 ------------------------ nvidia-96xx-utils/nvidia.install | 6 --- nvidia-96xx/PKGBUILD | 57 -------------------- nvidia-96xx/nvidia.install | 15 ------ nvidia-96xx/nvidia_supported | 91 -------------------------------- 5 files changed, 239 deletions(-) delete mode 100644 nvidia-96xx-utils/PKGBUILD delete mode 100644 nvidia-96xx-utils/nvidia.install delete mode 100644 nvidia-96xx/PKGBUILD delete mode 100644 nvidia-96xx/nvidia.install delete mode 100755 nvidia-96xx/nvidia_supported diff --git a/nvidia-96xx-utils/PKGBUILD b/nvidia-96xx-utils/PKGBUILD deleted file mode 100644 index 6808ed23f..000000000 --- a/nvidia-96xx-utils/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -pkgname=nvidia-96xx-utils -pkgver=96.43.20 -pkgrel=2 -pkgdesc="NVIDIA drivers utilities and libraries, 96xx branch." -arch=('i686' 'x86_64') -[ "$CARCH" = "i686" ] && ARCH=x86 -[ "$CARCH" = "x86_64" ] && ARCH=x86_64 -url="http://www.nvidia.com/" -depends=('xorg-server') -optdepends=('gtk2: nvidia-settings' 'pkgconfig: nvidia-xconfig') -conflicts=('libgl') -provides=('libgl') -license=('custom') -install=nvidia.install -options=(!strip) -source=("http://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run") -md5sums=('875cc011385ea26ab5edd54a9b65a003') -[ "$CARCH" = "x86_64" ] && md5sums=('df3c87005487bdf54a6c5b783ff373db') - -build() { - cd $srcdir - sh NVIDIA-Linux-${ARCH}-${pkgver}-pkg0.run --extract-only - cd NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/ - - mkdir -p $pkgdir/usr/{lib,bin,share/applications,share/pixmaps,share/man/man1} - mkdir -p $pkgdir/usr/lib/xorg/modules/{extensions,drivers} - mkdir -p $pkgdir/usr/share/licenses/nvidia-96xx/ - - install lib/{libGLcore,libGL,libnvidia-cfg,tls/libnvidia-tls}.so.${pkgver} \ - $pkgdir/usr/lib/ - install -m644 share/man/man1/* $pkgdir/usr/share/man/man1/ - rm $pkgdir/usr/share/man/man1/nvidia-installer.1.gz - install X11R6/lib/libXv* $pkgdir/usr/lib/ - install -m644 share/applications/nvidia-settings.desktop $pkgdir/usr/share/applications/ - # fix nvidia .desktop file - sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i $pkgdir/usr/share/applications/nvidia-settings.desktop - install -m644 share/pixmaps/nvidia-settings.png $pkgdir/usr/share/pixmaps/ - install X11R6/lib/modules/drivers/nvidia_drv.so $pkgdir/usr/lib/xorg/modules/drivers - install X11R6/lib/modules/extensions/libglx.so.$pkgver $pkgdir/usr/lib/xorg/modules/extensions - install -m755 bin/nvidia-{settings,xconfig,bug-report.sh} $pkgdir/usr/bin/ - cd $pkgdir/usr/lib/ - ln -s libGL.so.$pkgver libGL.so - ln -s libGL.so.$pkgver libGL.so.1 - ln -s libGLcore.so.$pkgver libGLcore.so.1 - ln -s libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1 - ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1 - ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1 - - cd $pkgdir/usr/lib/xorg/modules/extensions - ln -s libglx.so.$pkgver libglx.so - - install -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/LICENSE $pkgdir/usr/share/licenses/nvidia-96xx/ - ln -s nvidia-96xx $startdir/pkg/usr/share/licenses/nvidia-96xx-utils - - install -D -m644 $srcdir/NVIDIA-Linux-${ARCH}-${pkgver}-pkg0/usr/share/doc/README.txt $pkgdir/usr/share/doc/nvidia-96xx/README - - find $pkgdir/usr -type d -exec chmod 755 {} \; - - # Blacklist nouveau since 2.6.33 - #mkdir -p $pkgdir/etc/modprobe.d/ || return 1 - #echo "blacklist nouveau" >> $pkgdir/etc/modprobe.d/nouveau_blacklist.conf || return 1 -} - - diff --git a/nvidia-96xx-utils/nvidia.install b/nvidia-96xx-utils/nvidia.install deleted file mode 100644 index 0a878a73d..000000000 --- a/nvidia-96xx-utils/nvidia.install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { - echo By using this package you accept the NVIDIA license, - echo which has been installed in /usr/share/licenses/nvidia/LICENSE - echo If you do not accept this license, you must remove the package immediately. - echo Dont forget to update your /etc/X11/xorg.conf -} diff --git a/nvidia-96xx/PKGBUILD b/nvidia-96xx/PKGBUILD deleted file mode 100644 index b4ec26992..000000000 --- a/nvidia-96xx/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# Find the kernel name inside the chroot -_extramodules=extramodules-`pacman -Q linux | cut -c7-9 | sed 's/linux //g'`-CHAKRA -_kver="$(cat /lib/modules/${_extramodules}/version)" - -pkgname=(nvidia-96xx chd-nvidia-96xx) -pkgver=96.43.20 -pkgrel=9 -arch=('i686' 'x86_64') -[ "$CARCH" = "i686" ] && ARCH=x86 -[ "$CARCH" = "x86_64" ] && ARCH=x86_64 -url="http://www.nvidia.com/" -makedepends=('linux-headers') -license=('custom') -install=nvidia.install -source=("http://download.nvidia.com/XFree86/Linux-$ARCH/${pkgver}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run" - "nvidia_supported") -md5sums=('875cc011385ea26ab5edd54a9b65a003') -[ "$CARCH" = "x86_64" ] && md5sums=('df3c87005487bdf54a6c5b783ff373db') -md5sums+=('62d0cdb856cfae64753c0f3acf729d47') - -build() { - sh "NVIDIA-Linux-$ARCH-${pkgver}-pkg0.run" --extract-only - cd "NVIDIA-Linux-$ARCH-${pkgver}-pkg0/usr/src/nv/" - ln -s Makefile.kbuild Makefile - make SYSSRC=/lib/modules/${_kver}/build module -} - -package_nvidia-96xx() { -pkgdesc="NVIDIA drivers for kernel26, 96xx branch." -depends=('linux>=3.2' 'linux<3.3' 'nvidia-96xx-utils') -conflicts=('nvidia' 'nvidia-173xx') - - cd "NVIDIA-Linux-$ARCH-${pkgver}-pkg0/usr/src/nv/" - mkdir -p $pkgdir//lib/modules/${_extramodules} - install -m644 nvidia.ko $pkgdir/lib/modules/${_extramodules} - install -d -m755 "${pkgdir}/etc/modprobe.d" - echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" - gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko" -} - -package_chd-nvidia-96xx() { - pkgdesc="CHD ids for nvidia $pkgver" - arch=('any') - - cd "${srcdir}/NVIDIA-Linux-$ARCH-${pkgver}-pkg0/usr/src/nv/" - - install -dm755 "${pkgdir}/opt/chakra/hwdb" - sh -e "${srcdir}/nvidia_supported" ../../share/doc/README.txt nv-kernel.o \ - > "${pkgdir}/opt/chakra/hwdb/hw_nvidia173xx_hwdb" -} diff --git a/nvidia-96xx/nvidia.install b/nvidia-96xx/nvidia.install deleted file mode 100644 index bb9e7a257..000000000 --- a/nvidia-96xx/nvidia.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.2-CHAKRA' - depmod $(cat /lib/modules/$EXTRAMODULES/version) - echo 'In order to use nvidia module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.2-CHAKRA' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.2-CHAKRA' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} \ No newline at end of file diff --git a/nvidia-96xx/nvidia_supported b/nvidia-96xx/nvidia_supported deleted file mode 100755 index 57b3ac56b..000000000 --- a/nvidia-96xx/nvidia_supported +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -set -e - -# This is a nasty kluge, but it seems to work. Better check the output when -# upgrading to a new release of the nvidia driver, though. -# To make it somehwat work, until someone knows a better way, copy /usr/share/doc/nvidia/README -# to the same dir as this script, then run. - -if [ "$#" -ne 2 ]; then - >&2 printf 'USAGE: %s README.txt nv-kernel.o\n' "$0" - exit 1 -fi - -device_ids() { - local readme="$1"; shift - local object="$1"; shift - - local ret=1 - - local symbols="$(mktemp)" - local readme_list="$(mktemp)" - local object_list="$(mktemp)" - local diff="$(mktemp)" - - sed -nr '/^Appendix .\. Supported NVIDIA /,/legacy/ { - s/.* 0x([0-9a-fA-F]{4})( .*|$)/\1/p - }' "$readme" | tr A-F a-f | sort | uniq >"$readme_list" - - local readme_length="$(grep -Ec . "$readme_list")" - - objdump --section=.rodata --syms "$object" | - sed -nr '/SYMBOL TABLE/,/^$/ { - s/^([0-9a-f]+)\s+l\s+O\s+\S+\s+([0-9a-f]+)\s+\S+.*/\2 \1/p - }' | - sort -nr >"$symbols" # The list is probably among the larger symbols. - - while read length start; do - [ "$((0x$length))" -gt 0 ] || continue - - objdump --section=.rodata --full-contents \ - --start-address="0x$start" \ - --stop-address="$((0x$start+0x$length))" "$object" | - sed -nr 's/^ [0-9a-f]+ ([0-9a-f]{2})([0-9a-f]{2}).*/\2\1/p' | - sort | uniq | (grep -vx 0000 || :) >"$object_list" - - local object_length="$(grep -Ec . "$object_list")" - - diff -u "$readme_list" "$object_list" | tail -n +3 >"$diff" - local num_deletions="$(grep -Ec '^-' "$diff")" - local num_additions="$(grep -Ec '^\+' "$diff")" - - # Some thresholds for now. - if [ "$num_deletions" -eq 0 ] && - [ "$num_additions" -le "$(($readme_length*3/2))" ]; then - >&2 printf 'DEBUG: readme:%d object:%d deletions:%d additions:%d\n' \ - "$readme_length" "$object_length" "$num_deletions" "$num_additions" - ret=0 - break - fi - done <"$symbols" - - if [ "$ret" -eq 0 ]; then - printf '%s\n' '# List generated by nvidia_supported. Do not edit manually.' - - while read id; do - printf '%s\n' \ - "0x$id" - done <"$object_list" - - else - >&2 printf '%s\n' 'Failed to find the list. Using README.txt to get the list' - - # We failed to extract the ids from the blob. Use the ones in README.txt - # as a fallback - printf '%s\n' '# List generated by nvidia_supported. Do not edit manually.' - while read id; do - printf '%s\n' \ - "0x$id" - done <"$readme_list" - - ret=0 - fi - - rm -f "$symbols" "$readme_list" "$object_list" "$diff" - - return "$ret" -} - -device_ids "$@" - -# vim:set et sw=2 sts=2: From bea2c4e831083ba150298095ccd53f59b263ea97 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 17:41:41 +0000 Subject: [PATCH 022/110] Update --- catalyst-utils/PKGBUILD | 204 +++++++++--------- .../arch-fglrx-authatieventsd.patch | 40 ++++ catalyst-utils/atieventsd.sh | 41 ++++ 3 files changed, 178 insertions(+), 107 deletions(-) create mode 100644 catalyst-utils/arch-fglrx-authatieventsd.patch create mode 100644 catalyst-utils/atieventsd.sh diff --git a/catalyst-utils/PKGBUILD b/catalyst-utils/PKGBUILD index 4e74baf8c..667e72c05 100644 --- a/catalyst-utils/PKGBUILD +++ b/catalyst-utils/PKGBUILD @@ -1,11 +1,10 @@ # # Chakra Packages for Chakra, part of chakra-project.org # -# maintainer abveritas@chakra-project.org pkgname=catalyst-utils # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 1x.x -pkgver=13.1 +pkgver=13.4 pkgrel=1 _amdver=9.012 pkgdesc="AMD/ATI Catalyst drivers utilities and libraries." @@ -20,152 +19,143 @@ provides=('libgl' "libatical=${pkgver}") install=${pkgname}.install source=( - http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-linux-x86.x86_64.zip + http://www2.ati.com/drivers/linux/amd-catalyst-${pkgver}-linux-x86.x86_64.zip catalyst.sh - amdcccle.desktop + atieventsd.sh atieventsd.service catalyst.conf + arch-fglrx-authatieventsd.patch hw_ati_legacy_hwdb) -md5sums=('b5d9de9b000448dcc2a9eb74a889116d' +md5sums=('558bd1b31173b06b25da647a7112e734' 'bdafe749e046bfddee2d1c5e90eabd83' - '4efa8414a8fe9eeb50da38b5522ef81d' - 'bccf181a981ff429fe66f6ca5c3ea75a' - '3e19c2285c76f4cb92108435a1e9c302' + 'f729bf913613f49b0b9759c246058a87' + 'bccf181a981ff429fe66f6ca5c3ea75a' + '3e19c2285c76f4cb92108435a1e9c302' + '4ec9ba4440ec5a320ed3987c1d3b417d' 'e88b99bb50f38bc96c880407b36b45a8') + + build() { - ## Unpack archive - /bin/sh ./amd-driver-installer-catalyst-${pkgver}-linux-x86.x86_64.run --extract archive_files + /bin/sh ./amd-catalyst-13.4-linux-x86.x86_64.run --extract archive_files } package() { ## Install userspace tools and libraries # Create directories - install -m755 -d "${pkgdir}/etc/ati" - install -m755 -d "${pkgdir}/etc/profile.d" - install -m755 -d "${pkgdir}/etc/acpi/events" - install -m755 -d "${pkgdir}/etc/security/console.apps" - install -m755 -d "${pkgdir}/etc/OpenCL/vendors" # since 11.11 + install -m755 -d ${pkgdir}/etc/ati + install -m755 -d ${pkgdir}/etc/rc.d + install -m755 -d ${pkgdir}/etc/profile.d + install -m755 -d ${pkgdir}/etc/acpi/events + install -m755 -d ${pkgdir}/etc/security/console.apps + install -m755 -d ${pkgdir}/etc/OpenCL/vendors - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/dri" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/drivers" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx" # since 11.4 - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/linux" - install -m755 -d "${pkgdir}/usr/lib/dri" - install -m755 -d "${pkgdir}/usr/lib/fglrx" # since 11.4 - install -m755 -d "${pkgdir}/usr/lib/systemd/system" # since 12.12 + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/drivers + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/extensions + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/extensions/fglrx + install -m755 -d ${pkgdir}/usr/lib/xorg/modules/linux + install -m755 -d ${pkgdir}/usr/lib/dri + install -m755 -d ${pkgdir}/usr/lib/fglrx + install -m755 -d ${pkgdir}/usr/lib/systemd/system - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/sbin" + install -m755 -d ${pkgdir}/usr/bin + install -m755 -d ${pkgdir}/usr/sbin - install -m755 -d "${pkgdir}/usr/include/X11/extensions" - install -m755 -d "${pkgdir}/usr/include/GL" + install -m755 -d ${pkgdir}/usr/include/GL - install -m755 -d "${pkgdir}/usr/share/applications" - install -m755 -d "${pkgdir}/usr/share/ati/amdcccle" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m755 -d "${pkgdir}/usr/share/man/man8" - install -m755 -d "${pkgdir}/usr/share/pixmaps" + install -m755 -d ${pkgdir}/usr/share/applications + install -m755 -d ${pkgdir}/usr/share/ati/amdcccle + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} + install -m755 -d ${pkgdir}/usr/share/man/man8 + install -m755 -d ${pkgdir}/usr/share/pixmaps # X.org driver - cd "${srcdir}/archive_files/xpic_64a/usr/X11R6/lib64/modules" || return 1 + cd ${srcdir}/archive_files/xpic_64a/usr/X11R6/lib64/modules - # *.a added in 11.2, and removed in 11.3... - #install -m644 *.a "${pkgdir}/usr/lib/xorg/modules/" || return 1 - install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/" || return 1 - install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/" || return 1 - install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" || return 1 - #install -m755 extensions/libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/" || return 1 #before 11.4 - install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so" || return 1 # since 11.5 - ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" # since 11.4 - #install -m755 extensions/libdri.so "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.ati" || return 1 + install -m755 *.so ${pkgdir}/usr/lib/xorg/modules + install -m755 drivers/*.so ${pkgdir}/usr/lib/xorg/modules/drivers + install -m755 linux/*.so ${pkgdir}/usr/lib/xorg/modules/linux + install -m755 extensions/fglrx/fglrx-libglx.so ${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so + ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so ${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so # Controlcenter / libraries - cd "${srcdir}/archive_files/arch/x86_64/usr" || return 1 - _lib=lib64 + cd ${srcdir}/archive_files/arch/x86_64/usr + _lib=lib64 - install -m755 X11R6/bin/* "${pkgdir}/usr/bin/" || return 1 - install -m755 sbin/* "${pkgdir}/usr/sbin/" || return 1 - #install -m755 X11R6/${_lib}/*.so* "${pkgdir}/usr/lib/" || return #before 11.4 - install -m755 X11R6/${_lib}/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx" || return 1 # since 11.5 - ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx/libGL.so.1.2" # since 11.4 - ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/fglrx-libGL.so.1.2" # since 11.4 - ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1.2" # since 11.4 - ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" # since 11.4 - ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" # since 11.4 - install -m755 X11R6/${_lib}/libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/" || return 1 # since 11.4 - ln -snf libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1" # since 11.4 - ln -snf libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so" # since 11.4 - install -m755 X11R6/${_lib}/libatiadlxx.so "${pkgdir}/usr/lib/" || return 1 # since 11.4 - install -m755 X11R6/${_lib}/libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/" || return 1 # since 11.4 - install -m755 X11R6/${_lib}/libXvBAW.so.1.0 "${pkgdir}/usr/lib/" || return 1 # since 11.4 - ln -snf libXvBAW.so.1.0 "${pkgdir}/usr/lib/libXvBAW.so.1" # since 11.4 - ln -snf libXvBAW.so.1.0 "${pkgdir}/usr/lib/libXvBAW.so" # since 11.4 - install -m644 X11R6/${_lib}/*.a "${pkgdir}/usr/lib/" || return 1 # really needed? - install -m644 X11R6/${_lib}/*.cap "${pkgdir}/usr/lib/" || return 1 - install -m755 X11R6/${_lib}/modules/dri/*.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1 - install -m755 ${_lib}/*.so* "${pkgdir}/usr/lib/" || return 1 + install -m755 X11R6/bin/* ${pkgdir}/usr/bin + install -m755 sbin/* ${pkgdir}/usr/sbin + install -m755 X11R6/${_lib}/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx + ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx/libGL.so.1.2 + ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/fglrx-libGL.so.1.2 + ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so.1.2 + ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so.1 + ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 ${pkgdir}/usr/lib/libGL.so + install -m755 X11R6/${_lib}/libAMDXvBA.so.1.0 ${pkgdir}/usr/lib + ln -snf libAMDXvBA.so.1.0 ${pkgdir}/usr/lib/libAMDXvBA.so.1 + ln -snf libAMDXvBA.so.1.0 ${pkgdir}/usr/lib/libAMDXvBA.so + install -m755 X11R6/${_lib}/libatiadlxx.so ${pkgdir}/usr/lib + install -m755 X11R6/${_lib}/libfglrx_dm.so.1.0 ${pkgdir}/usr/lib + install -m755 X11R6/${_lib}/libXvBAW.so.1.0 ${pkgdir}/usr/lib + ln -snf libXvBAW.so.1.0 ${pkgdir}/usr/lib/libXvBAW.so.1 + ln -snf libXvBAW.so.1.0 ${pkgdir}/usr/lib/libXvBAW.so + install -m644 X11R6/${_lib}/*.a ${pkgdir}/usr/lib + install -m644 X11R6/${_lib}/*.cap ${pkgdir}/usr/lib + install -m755 X11R6/${_lib}/modules/dri/*.so ${pkgdir}/usr/lib/xorg/modules/dri + install -m755 ${_lib}/*.so* ${pkgdir}/usr/lib ## QT libs (only 2 files) - un-comment 2 lines below if you don't want to install qt package -# install -m755 -d "${pkgdir}/usr/share/ati/${_lib}" -# install -m755 share/ati/${_lib}/*.so* "${pkgdir}/usr/share/ati/${_lib}/" || return 1 +# install -m755 -d ${pkgdir}/usr/share/ati/${_lib} +# install -m755 share/ati/${_lib}/*.so* ${pkgdir}/usr/share/ati/${_lib} ln -snf /usr/lib/xorg/modules/dri/fglrx_dri.so ${pkgdir}/usr/lib/dri/fglrx_dri.so - ln -snf libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1" - ln -snf libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so" - ln -snf libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1" - ln -snf libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so" - ln -snf libOpenCL.so.1 "${pkgdir}/usr/lib/libOpenCL.so" # since 11.11 + ln -snf libfglrx_dm.so.1.0 ${pkgdir}/usr/lib/libfglrx_dm.so.1 + ln -snf libfglrx_dm.so.1.0 ${pkgdir}/usr/lib/libfglrx_dm.so + ln -snf libatiuki.so.1.0 ${pkgdir}/usr/lib/libatiuki.so.1 + ln -snf libatiuki.so.1.0 ${pkgdir}/usr/lib/libatiuki.so + ln -snf libOpenCL.so.1 ${pkgdir}/usr/lib/libOpenCL.so - cd "${srcdir}"/archive_files/common - install -m644 etc/ati/* "${pkgdir}/etc/ati/" || return 1 - chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh" || return 1 + cd ${srcdir}/archive_files/common + patch -Np2 -i ${srcdir}/arch-fglrx-authatieventsd.patch + install -m644 etc/ati/* ${pkgdir}/etc/ati + chmod 755 ${pkgdir}/etc/ati/authatieventsd.sh - #security provided with 10.9, is it working fine? - install -m644 etc/security/console.apps/amdcccle-su "${pkgdir}/etc/security/console.apps/" || return 1 + install -m644 etc/security/console.apps/amdcccle-su ${pkgdir}/etc/security/console.apps - # *.h removed in 11.3... - #install -m644 usr/X11R6/include/X11/extensions/*.h "${pkgdir}/usr/include/X11/extensions/" || return 1 - install -m755 usr/X11R6/bin/* "${pkgdir}/usr/bin/" || return 1 - install -m644 usr/include/GL/*.h "${pkgdir}/usr/include/GL/" || return 1 - install -m755 usr/sbin/*.sh "${pkgdir}/usr/sbin/" || return 1 - install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/" || return 1 - install -m644 usr/share/icons/*.xpm "${pkgdir}/usr/share/pixmaps/" || return 1 - install -m644 usr/share/man/man8/*.8 "${pkgdir}/usr/share/man/man8/" || return 1 - install -m644 "${srcdir}/amdcccle.desktop" "${pkgdir}/usr/share/applications/" || return 1 + install -m755 usr/X11R6/bin/* ${pkgdir}/usr/bin + install -m644 usr/include/GL/*.h ${pkgdir}/usr/include/GL + install -m755 usr/sbin/*.sh ${pkgdir}/usr/sbin + install -m644 usr/share/ati/amdcccle/* ${pkgdir}/usr/share/ati/amdcccle + install -m644 usr/share/icons/*.xpm ${pkgdir}/usr/share/pixmaps + install -m644 usr/share/man/man8/*.8 ${pkgdir}/usr/share/man/man8 + install -m644 usr/share/applications/*.desktop ${pkgdir}/usr/share/applications # ACPI example files - install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/" || return 1 - sed -i -e 's/usr\/X11R6/usr/g' "${pkgdir}/etc/acpi/ati-powermode.sh" || return 1 - install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/" || return 1 + install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh ${pkgdir}/etc/acpi + sed -i -e "s/usr\/X11R6/usr/g" ${pkgdir}/etc/acpi/ati-powermode.sh + install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* ${pkgdir}/etc/acpi/events # Add ATI Events Daemon launcher - install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/" || return + install -m755 ${srcdir}/atieventsd.sh ${pkgdir}/etc/rc.d/atieventsd + install -m644 ${srcdir}/atieventsd.service ${pkgdir}/usr/lib/systemd/system # thanks to cerebral, we dont need that damned symlink - install -m755 "${srcdir}/catalyst.sh" "${pkgdir}/etc/profile.d/" || return 1 + install -m755 ${srcdir}/catalyst.sh ${pkgdir}/etc/profile.d # License - install -m644 "${srcdir}/archive_files/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 - install -m644 "${srcdir}/archive_files/common/usr/share/doc/amdcccle/ccc_copyrights.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt" - + install -m644 ${srcdir}/archive_files/LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 ${srcdir}/archive_files/common/usr/share/doc/amdcccle/ccc_copyrights.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt + # since 11.11 : opencl files - cd "${srcdir}/archive_files/arch/x86_64" || return 1 - _arc=64 + cd ${srcdir}/archive_files/arch/x86_64 + _arc=64 - - # since 11.11: amd's vendor file for it's opencl library - install -m644 etc/OpenCL/vendors/amdocl${_arc}.icd "${pkgdir}/etc/OpenCL/vendors/" || return 1 - - # since 11.11: clinfo binary - install -m755 usr/bin/clinfo "${pkgdir}/usr/bin/" || return 1 - - # since 12.12: - install -m755 -d "${pkgdir}/etc/modules-load.d" - install -m644 "${srcdir}/catalyst.conf" "${pkgdir}/etc/modules-load.d/" || return 1 + install -m644 etc/OpenCL/vendors/amdocl${_arc}.icd ${pkgdir}/etc/OpenCL/vendors + install -m755 usr/bin/clinfo ${pkgdir}/usr/bin + install -m755 -d ${pkgdir}/etc/modules-load.d + install -m644 ${srcdir}/catalyst.conf ${pkgdir}/etc/modules-load.d # hwdb install -m644 "${srcdir}/hw_ati_legacy_hwdb" "${pkgdir}/usr/share/applications/hw_ati_legacy_hwdb" diff --git a/catalyst-utils/arch-fglrx-authatieventsd.patch b/catalyst-utils/arch-fglrx-authatieventsd.patch new file mode 100644 index 000000000..07b77b744 --- /dev/null +++ b/catalyst-utils/arch-fglrx-authatieventsd.patch @@ -0,0 +1,40 @@ +--- 12.8/common/etc/ati/authatieventsd.sh 2012-08-09 22:44:34.000000000 +0200 ++++ 12.8/common/etc/ati/authatieventsd.sh 2012-10-10 16:57:38.000000000 +0200 +@@ -32,9 +32,9 @@ + # vary depending upon whether X was started via xdm/kdm, gdm or startx, so + # check each one in turn. + +- # Check xdm/kdm ++ # Check xdm + +- XDM_AUTH_MASK=/var/lib/xdm/authdir/authfiles/A$1* ++ XDM_AUTH_MASK=/var/lib/xdm/authfiles/A$1* + XDM_AUTH_FILE=`ls -t $XDM_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file + if [ -n "$XDM_AUTH_FILE" ]; then + SERVER_AUTH_FILE=$XDM_AUTH_FILE +@@ -42,12 +42,22 @@ + return 0 + fi + +- # Check gdm ++ # Check kdm + +- GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth ++ KDM_AUTH_MASK=/var/run/xauth/A$1* ++ KDM_AUTH_FILE=`ls -t $KDM_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file ++ if [ -n "$KDM_AUTH_FILE" ]; then ++ SERVER_AUTH_FILE=$KDM_AUTH_FILE ++ DISP_SEARCH_STRING="#ffff#" ++ return 0 ++ fi ++ ++ # Check gdm 3 ++ ++ GDM_AUTH_FILE=/var/run/gdm/auth-for-gdm-*/database + if [ -e $GDM_AUTH_FILE ]; then + SERVER_AUTH_FILE=$GDM_AUTH_FILE +- DISP_SEARCH_STRING="$1" ++ DISP_SEARCH_STRING="unix$1" + return 0 + fi + diff --git a/catalyst-utils/atieventsd.sh b/catalyst-utils/atieventsd.sh new file mode 100644 index 000000000..16bd9a4fa --- /dev/null +++ b/catalyst-utils/atieventsd.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +ATID_PID=`pidof -o %PPID /usr/sbin/atieventsd` + +case "$1" in + start) + rc=0 + stat_busy "Starting ATI Events Daemon" + [ -z "$ATID_PID" ] && /usr/sbin/atieventsd + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + else + add_daemon atieventsd + stat_done + fi + ;; + stop) + rc=0 + stat_busy "Stopping ATI Events Daemon" + kill $ATID_PID &>/dev/null + rc=$(($rc+$?)) + if [ $rc -gt 0 ]; then + stat_fail + else + rm_daemon atieventsd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 From 0e2f41e80a9c11ac5df8eea3d5c178f239fcfeae Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 18:05:59 +0000 Subject: [PATCH 023/110] Update --- catalyst/PKGBUILD | 25 +++---- catalyst/arch-fglrx-3.7.patch | 132 ---------------------------------- catalyst/catalyst.install | 8 +-- 3 files changed, 14 insertions(+), 151 deletions(-) delete mode 100644 catalyst/arch-fglrx-3.7.patch diff --git a/catalyst/PKGBUILD b/catalyst/PKGBUILD index b12ed5ea3..d3bc9f598 100644 --- a/catalyst/PKGBUILD +++ b/catalyst/PKGBUILD @@ -3,32 +3,29 @@ # # maintainer abveritas[at]chakra-project[dot]org> -_kernver="3.7.6-2-CHAKRA" +_kernver="3.8.8-1-CHAKRA" pkgname=(catalyst chd-catalyst) -pkgver=13.1 -pkgrel=4 +pkgver=13.4 +pkgrel=1 _amdver=9.01 arch=('x86_64') url="http://www.amd.com/us/Pages/AMDHomePage.aspx" license=('custom') -makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers' 'linux>=3.7' 'linux<=3.8' 'catalyst-utils') +makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers' 'linux>=3.8' 'linux<=3.9' "catalyst-utils=${pkgver}") -source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-linux-x86.x86_64.zip +source=(http://www2.ati.com/drivers/linux/amd-catalyst-${pkgver}-linux-x86.x86_64.zip ati_make.sh makefile_compat.patch fglrx_supported switchlibglx - switchlibGL - arch-fglrx-3.7.patch) - -md5sums=('b5d9de9b000448dcc2a9eb74a889116d' + switchlibGL) +md5sums=('558bd1b31173b06b25da647a7112e734' '660396540b0ceaff71d6155c986734de' '3e1b82bd69774ea808da69c983d6a43b' '8bd182de340d6ed8b2dfcedfd3e5a389' '99032d919ede27884b5c3e87ab110a96' - '99032d919ede27884b5c3e87ab110a96' - 'ff60c162b46e21e9810a722718023451') + '99032d919ede27884b5c3e87ab110a96') build() { @@ -39,7 +36,7 @@ build() { msg "Unpacking archive ..." - /bin/sh ./amd-driver-installer-catalyst-${pkgver}-linux-x86.x86_64.run --extract archive_files + /bin/sh ./amd-catalyst-13.4-linux-x86.x86_64.run --extract archive_files BUILDARCH=x86_64 _archdir=x86_64 @@ -52,8 +49,6 @@ build() { # works only in combination with ati_make.sh script patch -p1 -i ../makefile_compat.patch - patch -p1 -i ../arch-fglrx-3.7.patch - cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod" cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" . cp 2.6.x/Makefile . @@ -69,7 +64,7 @@ build() { package_catalyst() { pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only" screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg" - depends=('linux>=3.7' 'linux<3.8' 'catalyst-utils') + depends=('linux>=3.8' 'linux<3.9' 'catalyst-utils') conflicts=('nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'catalyst-legacy') install=catalyst.install diff --git a/catalyst/arch-fglrx-3.7.patch b/catalyst/arch-fglrx-3.7.patch deleted file mode 100644 index 47cd425aa..000000000 --- a/catalyst/arch-fglrx-3.7.patch +++ /dev/null @@ -1,132 +0,0 @@ ---- 12.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-09-26 15:04:28.000000000 +0200 -+++ 12.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-10-16 20:30:42.146523753 +0200 -@@ -3892,7 +3892,11 @@ - KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); - return -EAGAIN; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_ops; - break; - -@@ -3922,14 +3926,22 @@ - KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); - return -EAGAIN; - } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_ops; - } - break; - #endif - - case __KE_SHM: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_shm_ops; - break; - -@@ -3937,7 +3949,11 @@ - - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - - //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */ - //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ -@@ -3946,14 +3962,22 @@ - - case __KE_CTX: - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ - vma->vm_ops = &vm_ctx_ops; - break; - - case __KE_PCI_BQS: - pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ - vma->vm_ops = &vm_pci_bq_ops; - break; -@@ -3984,9 +4008,17 @@ - return -EAGAIN; - } - #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; - #else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - #endif - vma->vm_ops = &vm_ops; - } -@@ -4015,9 +4047,17 @@ - return -EAGAIN; - } - #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; - #else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ -+#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - #endif - vma->vm_ops = &vm_agp_bq_ops; - } -@@ -4025,7 +4065,11 @@ - #endif /* __AGP__BUILTIN__ */ - - case __KE_KMAP: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_SHM | VM_RESERVED; -+#else -+ vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_kmap_ops; - if (readonly && (vma->vm_flags & VM_WRITE)) - { -@@ -4046,7 +4090,11 @@ - #endif - // fall through - case __KE_GART_CACHEABLE: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) - vma->vm_flags |= VM_RESERVED; -+#else -+ vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ - vma->vm_ops = &vm_gart_ops; - break; - default: diff --git a/catalyst/catalyst.install b/catalyst/catalyst.install index 10dbb1deb..bdd42ec33 100644 --- a/catalyst/catalyst.install +++ b/catalyst/catalyst.install @@ -1,5 +1,5 @@ -KERNEL_VERSION=3.7.6-2-CHAKRA +KERNEL_VERSION=3.8.8-1-CHAKRA remove_hook(){ @@ -11,18 +11,18 @@ remove_hook(){ } post_install() { - EXTRAMODULES=extramodules-3.7-CHAKRA + EXTRAMODULES=extramodules-3.8-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_upgrade() { remove_hook - EXTRAMODULES=extramodules-3.7-CHAKRA + EXTRAMODULES=extramodules-3.8-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES=extramodules-3.7-CHAKRA + EXTRAMODULES=extramodules-3.8-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } From 8bfddddd72c13f8239737654b1627e052854ebd0 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 18:57:21 +0000 Subject: [PATCH 024/110] FIx catalyst-legacy against kernel 3.8 --- catalyst-legacy/PKGBUILD | 8 ++-- ...h-fglrx-3.7.patch => arch-fglrx-3.8.patch} | 48 +++++++++---------- catalyst-legacy/catalyst.install | 8 ++-- catalyst-legacy/kcl_acpi.patch | 16 +++++++ 4 files changed, 49 insertions(+), 31 deletions(-) rename catalyst-legacy/{arch-fglrx-3.7.patch => arch-fglrx-3.8.patch} (75%) create mode 100644 catalyst-legacy/kcl_acpi.patch diff --git a/catalyst-legacy/PKGBUILD b/catalyst-legacy/PKGBUILD index bb861c723..1a01ba411 100644 --- a/catalyst-legacy/PKGBUILD +++ b/catalyst-legacy/PKGBUILD @@ -3,7 +3,7 @@ # # maintainer abveritas[at]chakra-project[dot]org> -_kernver="3.7.6-2-CHAKRA" +_kernver="3.8.8-1-CHAKRA" pkgname=('catalyst-legacy' 'chd-catalyst-legacy') pkgver=13.1 @@ -18,7 +18,8 @@ source=("http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-${pkgv 'makefile_compat.patch' 'fglrx_supported' '3.5-do_mmap.patch' - 'arch-fglrx-3.7.patch') + 'arch-fglrx-3.8.patch' + 'kcl_acpi.patch') md5sums=('c07fd1332abe4c742a9a0d0e0d0a90de' '660396540b0ceaff71d6155c986734de' @@ -50,7 +51,8 @@ build() { patch -p1 -i ../makefile_compat.patch # kernel fixes patch -p1 -i ../3.5-do_mmap.patch - patch -p1 -i ../arch-fglrx-3.7.patch + patch -p1 -i ../arch-fglrx-3.8.patch + patch -p1 -i ../kcl_acpi.patch cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod" cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" . diff --git a/catalyst-legacy/arch-fglrx-3.7.patch b/catalyst-legacy/arch-fglrx-3.8.patch similarity index 75% rename from catalyst-legacy/arch-fglrx-3.7.patch rename to catalyst-legacy/arch-fglrx-3.8.patch index 47cd425aa..c56f21af7 100644 --- a/catalyst-legacy/arch-fglrx-3.7.patch +++ b/catalyst-legacy/arch-fglrx-3.8.patch @@ -4,11 +4,11 @@ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); return -EAGAIN; } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ vma->vm_ops = &vm_ops; break; @@ -16,22 +16,22 @@ KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n"); return -EAGAIN; } -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ vma->vm_ops = &vm_ops; } break; #endif case __KE_SHM: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ vma->vm_ops = &vm_shm_ops; break; @@ -39,11 +39,11 @@ pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_RESERVED; +#else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ //vma->vm_flags |= VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */ //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ @@ -51,22 +51,22 @@ case __KE_CTX: pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ vma->vm_ops = &vm_ctx_ops; break; case __KE_PCI_BQS: pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */ vma->vm_ops = &vm_pci_bq_ops; break; @@ -74,17 +74,17 @@ return -EAGAIN; } #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_RESERVED; #else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ +#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ #endif vma->vm_ops = &vm_ops; } @@ -92,17 +92,17 @@ return -EAGAIN; } #ifdef __x86_64__ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_RESERVED; #else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ +#else -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */ +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */ -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ #endif vma->vm_ops = &vm_agp_bq_ops; } @@ -110,11 +110,11 @@ #endif /* __AGP__BUILTIN__ */ case __KE_KMAP: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_SHM | VM_RESERVED; +#else + vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ vma->vm_ops = &vm_kmap_ops; if (readonly && (vma->vm_flags & VM_WRITE)) { @@ -122,11 +122,11 @@ #endif // fall through case __KE_GART_CACHEABLE: -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) vma->vm_flags |= VM_RESERVED; +#else + vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) */ vma->vm_ops = &vm_gart_ops; break; default: diff --git a/catalyst-legacy/catalyst.install b/catalyst-legacy/catalyst.install index 10dbb1deb..bdd42ec33 100644 --- a/catalyst-legacy/catalyst.install +++ b/catalyst-legacy/catalyst.install @@ -1,5 +1,5 @@ -KERNEL_VERSION=3.7.6-2-CHAKRA +KERNEL_VERSION=3.8.8-1-CHAKRA remove_hook(){ @@ -11,18 +11,18 @@ remove_hook(){ } post_install() { - EXTRAMODULES=extramodules-3.7-CHAKRA + EXTRAMODULES=extramodules-3.8-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_upgrade() { remove_hook - EXTRAMODULES=extramodules-3.7-CHAKRA + EXTRAMODULES=extramodules-3.8-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES=extramodules-3.7-CHAKRA + EXTRAMODULES=extramodules-3.8-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/catalyst-legacy/kcl_acpi.patch b/catalyst-legacy/kcl_acpi.patch new file mode 100644 index 000000000..4ad4a7969 --- /dev/null +++ b/catalyst-legacy/kcl_acpi.patch @@ -0,0 +1,16 @@ +# diff -u common/lib/modules/fglrx/build_mod/kcl.acpi.c common/lib/modules/fglrx/build_mod/kcl.acpi.ckcl_acpi.c_20130221 common/lib/modules/fglrx/build_mod/kcl.acpi.c +kcl_acpi.c +--- kcl_acpi.c_20130221 2012-03-24 05:38:48.000000000 +0900 ++++ kcl_acpi.c 2013-02-21 20:20:12.000000000 +0900 +@@ -776,7 +776,11 @@ + { + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) ++ pInfo->video_handle = ACPI_HANDLE(&pInfo->pcidev->dev); ++ #else + pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle; ++ #endif + #else + pInfo->video_handle = pInfo->pcidev->dev.firmware_data; + #endif From 0adf0d47a1661b656cb3dde5447a495d66bfeadd Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 18:59:01 +0000 Subject: [PATCH 025/110] Fix md5sums --- catalyst-legacy/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst-legacy/PKGBUILD b/catalyst-legacy/PKGBUILD index 1a01ba411..86e5df26b 100644 --- a/catalyst-legacy/PKGBUILD +++ b/catalyst-legacy/PKGBUILD @@ -7,7 +7,7 @@ _kernver="3.8.8-1-CHAKRA" pkgname=('catalyst-legacy' 'chd-catalyst-legacy') pkgver=13.1 -pkgrel=4 +pkgrel=5 arch=('x86_64') url="http://www.ati.amd.com" license=('custom') @@ -20,13 +20,13 @@ source=("http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-${pkgv '3.5-do_mmap.patch' 'arch-fglrx-3.8.patch' 'kcl_acpi.patch') - md5sums=('c07fd1332abe4c742a9a0d0e0d0a90de' '660396540b0ceaff71d6155c986734de' '3e1b82bd69774ea808da69c983d6a43b' '9adef6e20662d5e486e15bc5ec40751f' '83b8d2063458cc9e8b6679567b280e36' - 'ff60c162b46e21e9810a722718023451') + 'cff482b58c9090a66cb82159a2170654' + '37c100cc9e5cc5e8233a72d5e53487ff') build() { From 765dbaff5c57899fb95e54c30206707d7130cd36 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 1 May 2013 19:07:00 +0000 Subject: [PATCH 026/110] Update bumblebee --- nvidia-bumblebee/PKGBUILD | 12 ++++++------ nvidia-bumblebee/nvidia.install | 6 +++--- nvidia-utils-bumblebee/PKGBUILD | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nvidia-bumblebee/PKGBUILD b/nvidia-bumblebee/PKGBUILD index d5819388b..2d3545352 100644 --- a/nvidia-bumblebee/PKGBUILD +++ b/nvidia-bumblebee/PKGBUILD @@ -4,22 +4,22 @@ # Contributions from AUR: https://aur.archlinux.org/packages/nvidia-bumblebee/ pkgname=nvidia-bumblebee -pkgver=313.26 +pkgver=313.30 pkgrel=1 -_kernver='3.7.6-2-CHAKRA' -_extramodules='extramodules-3.7-CHAKRA' +_kernver='3.8.8-1-CHAKRA' +_extramodules='extramodules-3.8-CHAKRA' pkgdesc="NVIDIA drivers for linux. Packaged for Bumblebee" arch=('x86_64') url="http://www.nvidia.com/" -depends=('linux>3.7' 'linux<3.8' "nvidia-utils-bumblebee") +depends=('linux>3.8' 'linux<3.9' "nvidia-utils-bumblebee") provides=("nvidia=${pkgver}") -makedepends=('linux-headers>3.7' 'linux-headers<3.8') +makedepends=('linux-headers>3.8' 'linux-headers<3.9') conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx' 'nvidia-304xx' 'dkms-nvidia') license=('custom') install=nvidia.install options=(!strip) source=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('2d35124fa5a4b009f170fe893b5d07e3') +md5sums=('e5f147fbcdcad71472b4ddeccf259bd7') build() { cd "${srcdir}" diff --git a/nvidia-bumblebee/nvidia.install b/nvidia-bumblebee/nvidia.install index 0a96da0ad..c341abef7 100644 --- a/nvidia-bumblebee/nvidia.install +++ b/nvidia-bumblebee/nvidia.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) #echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.8-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia-utils-bumblebee/PKGBUILD b/nvidia-utils-bumblebee/PKGBUILD index b319802e1..3a7f5ff23 100644 --- a/nvidia-utils-bumblebee/PKGBUILD +++ b/nvidia-utils-bumblebee/PKGBUILD @@ -5,7 +5,7 @@ pkgname=nvidia-utils-bumblebee -pkgver=313.26 +pkgver=313.30 pkgrel=1 pkgdesc="NVIDIA drivers utilities and libraries. Repacked and installed in different folder to be used simultaneously with libgl." arch=('x86_64') @@ -17,7 +17,7 @@ provides=("nvidia-utils=$pkgver" 'nvidia-settings') license=('custom') install=nvidia.install source=("ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums=('2d35124fa5a4b009f170fe893b5d07e3') +md5sums=('e5f147fbcdcad71472b4ddeccf259bd7') create_links() { From 429f90b02cd83ba219c02c3a1447df64814002a2 Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 3 May 2013 11:04:35 +0000 Subject: [PATCH 027/110] Update libpng12 --- libpng12/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libpng12/PKGBUILD b/libpng12/PKGBUILD index 337404ad0..ad485067c 100644 --- a/libpng12/PKGBUILD +++ b/libpng12/PKGBUILD @@ -5,7 +5,7 @@ pkgname=libpng12 _realname=libpng -pkgver=1.2.43 +pkgver=1.2.50 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64') @@ -14,9 +14,9 @@ license=('custom') depends=('zlib' 'perl') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${_realname}/${_realname}-${pkgver}.tar.bz2" - "http://littlesvr.ca/apng/diff/libpng-1.2.43-apng.patch") -md5sums=('976909556e6613804d810405c1f72ce6' - '0152337e035e9c767ca92521e3127502') + "http://downloads.sourceforge.net/sourceforge/${_realname}-apng/${_realname}-${pkgver}-apng.patch.gz") +md5sums=('717caa58e9c71a80820eb38c4f4d6ec3' + '3d3d078b031b23a9e1d95f9822185740') build() { @@ -24,7 +24,7 @@ build() { # Add animated PNG (apng) support # see http://hp.vector.co.jp/authors/VA013651/freeSoftware/apng.html - patch -Np0 -i "${srcdir}/libpng-1.2.43-apng.patch" || return 1 + patch -Np1 -i "${srcdir}/libpng-${pkgver}-apng.patch" || return 1 libtoolize --force --copy || return 1 aclocal || return 1 @@ -42,4 +42,4 @@ build() { # only libs needed rm -rf ${pkgdir}/usr/lib/{libpng.so,libpng.a,pkgconfig} rm -rf ${pkgdir}/usr/{include,share,bin} -} \ No newline at end of file +} From ba7a9a91ffd10472a48eadaf542822d6d8b50779 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 4 May 2013 10:59:21 +0000 Subject: [PATCH 028/110] Update m17n --- catalyst-legacy/PKGBUILD | 10 +++---- catalyst-legacy/catalyst.install | 8 ++--- catalyst-legacy/kcl_acpi.patch | 6 ++-- catalyst/PKGBUILD | 10 +++---- catalyst/catalyst.install | 8 ++--- m17n-db/PKGBUILD | 35 +++++++++------------- m17n-lib/PKGBUILD | 37 ++++++++++------------- m17n-lib/locale.patch | 50 -------------------------------- madwifi/PKGBUILD | 6 ++-- madwifi/madwifi-ng.install | 2 +- nvidia-173xx/PKGBUILD | 4 +-- nvidia-173xx/nvidia.install | 6 ++-- nvidia-304xx/PKGBUILD | 5 ++-- nvidia-304xx/nvidia.install | 6 ++-- nvidia-bumblebee/PKGBUILD | 6 ++-- nvidia-utils/PKGBUILD | 2 -- nvidia/PKGBUILD | 8 ++--- nvidia/nvidia.install | 6 ++-- 18 files changed, 73 insertions(+), 142 deletions(-) delete mode 100644 m17n-lib/locale.patch diff --git a/catalyst-legacy/PKGBUILD b/catalyst-legacy/PKGBUILD index 86e5df26b..7307f79f8 100644 --- a/catalyst-legacy/PKGBUILD +++ b/catalyst-legacy/PKGBUILD @@ -1,13 +1,11 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dot]org> -_kernver="3.8.8-1-CHAKRA" +_kernver="3.9.0-1-CHAKRA" pkgname=('catalyst-legacy' 'chd-catalyst-legacy') pkgver=13.1 -pkgrel=5 +pkgrel=6 arch=('x86_64') url="http://www.ati.amd.com" license=('custom') @@ -52,7 +50,7 @@ build() { # kernel fixes patch -p1 -i ../3.5-do_mmap.patch patch -p1 -i ../arch-fglrx-3.8.patch - patch -p1 -i ../kcl_acpi.patch + patch -p0 -i ../kcl_acpi.patch cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod" cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" . @@ -69,7 +67,7 @@ build() { package_catalyst-legacy() { pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only" screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg" - depends=('linux>=3.7' 'linux<3.8' 'catalyst-legacy-utils') + depends=('linux>=3.9' 'linux<3.10' 'catalyst-legacy-utils') conflicts=('catalyst-test' 'nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'catalyst') install=catalyst.install diff --git a/catalyst-legacy/catalyst.install b/catalyst-legacy/catalyst.install index bdd42ec33..92e2a75f3 100644 --- a/catalyst-legacy/catalyst.install +++ b/catalyst-legacy/catalyst.install @@ -1,5 +1,5 @@ -KERNEL_VERSION=3.8.8-1-CHAKRA +KERNEL_VERSION=3.9.0-1-CHAKRA remove_hook(){ @@ -11,18 +11,18 @@ remove_hook(){ } post_install() { - EXTRAMODULES=extramodules-3.8-CHAKRA + EXTRAMODULES=extramodules-3.9-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_upgrade() { remove_hook - EXTRAMODULES=extramodules-3.8-CHAKRA + EXTRAMODULES=extramodules-3.9-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES=extramodules-3.8-CHAKRA + EXTRAMODULES=extramodules-3.9-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/catalyst-legacy/kcl_acpi.patch b/catalyst-legacy/kcl_acpi.patch index 4ad4a7969..6792283a7 100644 --- a/catalyst-legacy/kcl_acpi.patch +++ b/catalyst-legacy/kcl_acpi.patch @@ -1,7 +1,7 @@ -# diff -u common/lib/modules/fglrx/build_mod/kcl.acpi.c common/lib/modules/fglrx/build_mod/kcl.acpi.ckcl_acpi.c_20130221 common/lib/modules/fglrx/build_mod/kcl.acpi.c +# diff -u kcl.acpi.c kcl.acpi.ckcl_acpi.c_20130221 kcl.acpi.c kcl_acpi.c ---- kcl_acpi.c_20130221 2012-03-24 05:38:48.000000000 +0900 -+++ kcl_acpi.c 2013-02-21 20:20:12.000000000 +0900 +--- common/lib/modules/fglrx/build_mod/kcl_acpi.c_20130221 2012-03-24 05:38:48.000000000 +0900 ++++ common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-02-21 20:20:12.000000000 +0900 @@ -776,7 +776,11 @@ { #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) diff --git a/catalyst/PKGBUILD b/catalyst/PKGBUILD index d3bc9f598..54dc45e47 100644 --- a/catalyst/PKGBUILD +++ b/catalyst/PKGBUILD @@ -3,16 +3,16 @@ # # maintainer abveritas[at]chakra-project[dot]org> -_kernver="3.8.8-1-CHAKRA" +_kernver="3.9.0-1-CHAKRA" pkgname=(catalyst chd-catalyst) pkgver=13.4 -pkgrel=1 -_amdver=9.01 +pkgrel=2 +_amdver=12.104 arch=('x86_64') url="http://www.amd.com/us/Pages/AMDHomePage.aspx" license=('custom') -makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers' 'linux>=3.8' 'linux<=3.9' "catalyst-utils=${pkgver}") +makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers' 'linux>=3.9' 'linux<=3.10' "catalyst-utils=${pkgver}") source=(http://www2.ati.com/drivers/linux/amd-catalyst-${pkgver}-linux-x86.x86_64.zip ati_make.sh @@ -64,7 +64,7 @@ build() { package_catalyst() { pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only" screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg" - depends=('linux>=3.8' 'linux<3.9' 'catalyst-utils') + depends=('linux>=3.9' 'linux<3.10' 'catalyst-utils') conflicts=('nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'catalyst-legacy') install=catalyst.install diff --git a/catalyst/catalyst.install b/catalyst/catalyst.install index bdd42ec33..92e2a75f3 100644 --- a/catalyst/catalyst.install +++ b/catalyst/catalyst.install @@ -1,5 +1,5 @@ -KERNEL_VERSION=3.8.8-1-CHAKRA +KERNEL_VERSION=3.9.0-1-CHAKRA remove_hook(){ @@ -11,18 +11,18 @@ remove_hook(){ } post_install() { - EXTRAMODULES=extramodules-3.8-CHAKRA + EXTRAMODULES=extramodules-3.9-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_upgrade() { remove_hook - EXTRAMODULES=extramodules-3.8-CHAKRA + EXTRAMODULES=extramodules-3.9-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES=extramodules-3.8-CHAKRA + EXTRAMODULES=extramodules-3.9-CHAKRA depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/m17n-db/PKGBUILD b/m17n-db/PKGBUILD index e9ab69c31..8c5b7ac40 100644 --- a/m17n-db/PKGBUILD +++ b/m17n-db/PKGBUILD @@ -1,32 +1,25 @@ # # Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=m17n-db -pkgver=1.6.2 +pkgver=1.6.4 pkgrel=1 -pkgdesc="A multilingual text processing library (database)" -arch=('i686' 'x86_64') -url="http://www.m17n.org/m17n-lib/" +pkgdesc='Multilingual text processing library (database)' +url='http://www.nongnu.org/m17n/' +arch=('x86_64') license=('GPL') depends=('glibc') # not because of compiling, but because of /usr/share/i18n/charmaps/ files that glibc provides -source=(http://www.m17n.org/m17n-lib-download/$pkgname-$pkgver.tar.gz) -sha1sums=('086a8a0b98909dd08bd80b55819d2842052b69bd') - +source=("http://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz") +sha1sums=('756fd10b8d7fe66a14350443f307bcf95347c695') + build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } - + package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=$pkgdir install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } - - + diff --git a/m17n-lib/PKGBUILD b/m17n-lib/PKGBUILD index 563cc2aeb..417869d6a 100644 --- a/m17n-lib/PKGBUILD +++ b/m17n-lib/PKGBUILD @@ -1,34 +1,27 @@ # # Platform Packages for Chakra, part of chakra-project.org # -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=m17n-lib -pkgver=1.6.2 +pkgver=1.6.4 pkgrel=1 -pkgdesc="A multilingual text processing library (runtimes)" +pkgdesc='Multilingual text processing library (runtimes)' +url='http://www.nongnu.org/m17n/' arch=('i686' 'x86_64') -url="http://www.m17n.org/m17n-lib/" license=('GPL') -depends=('libxft' 'm17n-db>=1.5.4' 'fribidi' 'libxml2' 'gd' 'ispell' 'anthy' 'libotf') -options=('!libtool' '!makeflags') -source=(http://www.m17n.org/m17n-lib-download/$pkgname-$pkgver.tar.gz locale.patch) -sha1sums=('9b9ada79357dd56c90c64cd36845c5537c363d79' - '1aa281bf8074518a98817528478fd88dcb85a991') - +depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf') +optdepends=('anthy: to use the anthy input method') +options=('!makeflags' '!libtool' '!emptydirs') +source=("http://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz") +sha1sums=('83f2fc4facfd70a580bb95d9381eac7472d85171') + build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ../locale.patch # cf. FS#20482 - ./configure --prefix=/usr - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-static=no + make } - + package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } - diff --git a/m17n-lib/locale.patch b/m17n-lib/locale.patch deleted file mode 100644 index a9e2d7f22..000000000 --- a/m17n-lib/locale.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- old/src/locale.c 2010/03/19 11:59:43 1.12 -+++ new/src/locale.c 2010/11/05 11:20:41 1.13 -@@ -86,34 +86,24 @@ - MLocale *mlocale_monetary, *mlocale_numeric, ; - #endif - --/** Parse locale name NAME and return a newly created MLocale object. -- If the locale is not supported by the system, return NULL. */ -+/** Parse locale name NAME and return a newly created MLocale object. */ - - static MLocale * - make_locale (const char *name) - { -- char *current, *new, *str; -+ char *str; - int len; - MLocale *locale; - char c; - -- str = setlocale (LC_CTYPE, NULL); -- len = strlen (str) + 1; -- current = alloca (len); -- memcpy (current, str, len); -- -- if (! (new = setlocale (LC_CTYPE, name))) -- return NULL; -- -- - M17N_OBJECT (locale, NULL, MERROR_LOCALE); -- locale->name = msymbol (new); -+ locale->name = msymbol (name); - msymbol_put (locale->name, M_locale, (void *) locale); - M17N_OBJECT_UNREF (locale); - -- len = strlen (new) + 1; -+ len = strlen (name) + 1; - str = alloca (len); -- memcpy (str, new, len); -+ memcpy (str, name, len); - - c = '\0'; - while (1) -@@ -162,8 +152,6 @@ - } - else - locale->coding = Mcoding_us_ascii; -- -- setlocale (LC_CTYPE, current); - return locale; - } diff --git a/madwifi/PKGBUILD b/madwifi/PKGBUILD index 18470226e..771aa9c2e 100644 --- a/madwifi/PKGBUILD +++ b/madwifi/PKGBUILD @@ -2,17 +2,17 @@ # Chakra Packages for Chakra, part of chakra-project.org # -_extramodules=extramodules-3.8-CHAKRA +_extramodules=extramodules-3.9-CHAKRA _kver="$(cat /lib/modules/${_extramodules}/version)" pkgname=madwifi pkgver=0.9.4.4182 -pkgrel=1 +pkgrel=2 pkgdesc="Madwifi drivers for Atheros wireless chipsets" arch=('x86_64') license=('GPL') url="http://madwifi-project.org" -depends=('madwifi-utils' 'linux>=3.8' 'linux<3.9') +depends=('madwifi-utils' 'linux>=3.9' 'linux<3.10') makedepends=('linux-headers' 'sharutils') install=madwifi-ng.install # subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi diff --git a/madwifi/madwifi-ng.install b/madwifi/madwifi-ng.install index bcd7dc073..fc941d7c7 100644 --- a/madwifi/madwifi-ng.install +++ b/madwifi/madwifi-ng.install @@ -5,7 +5,7 @@ post_install() post_upgrade() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia-173xx/PKGBUILD b/nvidia-173xx/PKGBUILD index 2f7c6ed47..c0226eb19 100644 --- a/nvidia-173xx/PKGBUILD +++ b/nvidia-173xx/PKGBUILD @@ -1,7 +1,7 @@ # # Chakra Packages for Chakra, part of chakra-project.org -_extramodules=extramodules-3.8-CHAKRA +_extramodules=extramodules-3.9-CHAKRA _kver="$(cat /lib/modules/${_extramodules}/version)" pkgname=(nvidia-173xx chd-nvidia-173xx) @@ -30,7 +30,7 @@ build() { package_nvidia-173xx() { pkgdesc="Legacy NVIDIA drivers for linux." - depends=('linux>=3.7' 'linux<3.8' 'nvidia-173xx-utils') + depends=('linux>=3.9' 'linux<3.10' 'nvidia-173xx-utils') conflicts=('nvidia-96xx' 'nvidia') install=nvidia.install diff --git a/nvidia-173xx/nvidia.install b/nvidia-173xx/nvidia.install index 2c85ae7e4..87fb39062 100644 --- a/nvidia-173xx/nvidia.install +++ b/nvidia-173xx/nvidia.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia-304xx/PKGBUILD b/nvidia-304xx/PKGBUILD index adc2db568..5b3504861 100644 --- a/nvidia-304xx/PKGBUILD +++ b/nvidia-304xx/PKGBUILD @@ -1,8 +1,7 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# -_extramodules=extramodules-3.8-CHAKRA +_extramodules=extramodules-3.9-CHAKRA _kver=$(cat /lib/modules/${_extramodules}/version) pkgname=('nvidia-304xx' 'chd-nvidia-304xx') @@ -10,7 +9,7 @@ pkgver=304.88 pkgrel=1 arch=('x86_64') url="http://www.nvidia.com/" -makedepends=('linux-headers' 'linux>=3.8' 'linux<3.9' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers' 'linux>=3.9' 'linux<3.10' "nvidia-304xx-utils=${pkgver}") license=('custom') source=("https://gitorious.org/chakra/chakra-hardware-detection/blobs/raw/master/hwdb/nvidia_supported") _ARCH='x86_64' diff --git a/nvidia-304xx/nvidia.install b/nvidia-304xx/nvidia.install index 2c85ae7e4..87fb39062 100644 --- a/nvidia-304xx/nvidia.install +++ b/nvidia-304xx/nvidia.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia-bumblebee/PKGBUILD b/nvidia-bumblebee/PKGBUILD index 2d3545352..1289bd86d 100644 --- a/nvidia-bumblebee/PKGBUILD +++ b/nvidia-bumblebee/PKGBUILD @@ -6,14 +6,14 @@ pkgname=nvidia-bumblebee pkgver=313.30 pkgrel=1 -_kernver='3.8.8-1-CHAKRA' +_kernver='3.9.0-1-CHAKRA' _extramodules='extramodules-3.8-CHAKRA' pkgdesc="NVIDIA drivers for linux. Packaged for Bumblebee" arch=('x86_64') url="http://www.nvidia.com/" -depends=('linux>3.8' 'linux<3.9' "nvidia-utils-bumblebee") +depends=('linux>3.9' 'linux<3.10' "nvidia-utils-bumblebee") provides=("nvidia=${pkgver}") -makedepends=('linux-headers>3.8' 'linux-headers<3.9') +makedepends=('linux-headers>3.9' 'linux-headers<3.10') conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx' 'nvidia-304xx' 'dkms-nvidia') license=('custom') install=nvidia.install diff --git a/nvidia-utils/PKGBUILD b/nvidia-utils/PKGBUILD index 512ce16bb..1e3ab999f 100644 --- a/nvidia-utils/PKGBUILD +++ b/nvidia-utils/PKGBUILD @@ -1,7 +1,5 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org pkgbase=nvidia-utils pkgname=('nvidia-utils' 'opencl-nvidia' 'libcl' 'nvidia-settings') diff --git a/nvidia/PKGBUILD b/nvidia/PKGBUILD index 4ad871839..0e23f02c3 100644 --- a/nvidia/PKGBUILD +++ b/nvidia/PKGBUILD @@ -3,15 +3,15 @@ # # maintainer abveritas@chakra-project.org -_extramodules=extramodules-3.8-CHAKRA +_extramodules=extramodules-3.9-CHAKRA _kver=$(cat /lib/modules/${_extramodules}/version) pkgname=('nvidia' 'chd-nvidia') pkgver=313.30 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="http://www.nvidia.com/" -makedepends=('linux-headers' 'linux>=3.8' 'linux<3.9' "nvidia-utils=${pkgver}") +makedepends=('linux-headers' 'linux>=3.9' 'linux<3.10' "nvidia-utils=${pkgver}") license=('custom') source=("https://gitorious.org/chakra/chakra-hardware-detection/blobs/raw/master/hwdb/nvidia_supported") @@ -32,7 +32,7 @@ build() { package_nvidia() { pkgdesc="NVIDIA drivers for linux." - depends=('linux>=3.8' 'linux<3.9' "nvidia-utils=${pkgver}") + depends=('linux>=3.9' 'linux<3.10' "nvidia-utils=${pkgver}") conflicts=('nvidia-96xx' 'nvidia-173xx' 'nvidia-304xx') install=nvidia.install diff --git a/nvidia/nvidia.install b/nvidia/nvidia.install index c98426d2d..0a6f3997e 100644 --- a/nvidia/nvidia.install +++ b/nvidia/nvidia.install @@ -1,11 +1,11 @@ post_install() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo -e '\e[31;46m WARNING' echo -e '\e[31;46m If your card is from the 7xxx series or earlier, switch to nvidia-304xx' @@ -14,7 +14,7 @@ post_upgrade() { } post_remove() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } From 4d66a1b05bac92134176c059f3600be62287058d Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 4 May 2013 11:03:22 +0000 Subject: [PATCH 029/110] Add m17n-contrib --- m17n-contrib/PKGBUILD | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 m17n-contrib/PKGBUILD diff --git a/m17n-contrib/PKGBUILD b/m17n-contrib/PKGBUILD new file mode 100644 index 000000000..1a99c49a5 --- /dev/null +++ b/m17n-contrib/PKGBUILD @@ -0,0 +1,16 @@ +pkgname=m17n-contrib +pkgver=1.1.12 +pkgrel=1 +pkgdesc="Contributions (input methods) for m17n" +url="http://www.nongnu.org/m17n" +arch=('any') +license=('GPL') +depends=('gawk' 'm17n-db' 'm17n-lib') +source=(http://pkgs.fedoraproject.org/repo/pkgs/m17n-contrib/m17n-contrib-1.1.12.tar.gz/fb7c35194e8940cf3ca381f5b111434c/$pkgname-$pkgver.tar.gz) +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install +} +md5sums=('fb7c35194e8940cf3ca381f5b111434c') From d6dc4eb6c73635978fa850125958456f75b82df8 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 4 May 2013 15:06:19 +0000 Subject: [PATCH 030/110] Remove tcp_wrappers support --- net-snmp/PKGBUILD | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net-snmp/PKGBUILD b/net-snmp/PKGBUILD index cd9e2aad9..56d0b2a11 100644 --- a/net-snmp/PKGBUILD +++ b/net-snmp/PKGBUILD @@ -1,12 +1,9 @@ # # Platform Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dot]org> -# contributor Michael Haesel pkgname=net-snmp pkgver=5.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('x86_64') url="http://www.net-snmp.org/" @@ -40,7 +37,7 @@ build() { --mandir=/usr/share/man \ --enable-ucd-snmp-compatibility \ --enable-ipv6 \ - --with-libwrap \ + --without-libwrap \ --with-python-modules \ --with-default-snmp-version="3" \ --with-sys-contact="root@localhost" \ From afc97e02dd96cbbdc202756eb7f6aa7a24977c2d Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 4 May 2013 17:05:41 +0000 Subject: [PATCH 031/110] Try to fix pulse --- pulseaudio/PKGBUILD | 61 +++++++++++++++++++------------------ pulseaudio/pulseaudio.xinit | 12 ++++++++ 2 files changed, 43 insertions(+), 30 deletions(-) create mode 100644 pulseaudio/pulseaudio.xinit diff --git a/pulseaudio/PKGBUILD b/pulseaudio/PKGBUILD index 891aeda41..c596db8e7 100644 --- a/pulseaudio/PKGBUILD +++ b/pulseaudio/PKGBUILD @@ -3,37 +3,36 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=3.0 -pkgrel=7 -arch=('x86_64') -url="http://pulseaudio.org/" -license=('GPL' 'LGPL') -makedepends=('attr' 'libltdl' 'avahi' 'bluez' 'intltool' 'jack' 'lirc-utils' 'openssl' - 'libsndfile' 'pkgconfig' 'sh') -backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) -install="pulseaudio.install" -options=(!emptydirs !libtool !makeflags) -#source=("http://freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.xz") -source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}.tar.xz" - "mixer.patch") -md5sums=('10049e1fa0577be38ba04d8bab159fd1' - 'f4640b454d74e2ebc1e8399e50d62807') +pkgver=3.99.1 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/PulseAudio" +license=(GPL LGPL) +makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit + speex tdb systemd dbus avahi bluez intltool jack sbc + lirc-utils openssl fftw orc json-c webrtc-audio-processing + check) +options=(!emptydirs !libtool) +source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz + pulseaudio.xinit) +sha256sums=('01266830d73316364075ac81a2d67e9098332533fdf9273057e6324c7bbef9c5' + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { - cd "${srcdir}/${pkgbase}" - - # Bugfix: mix the right numbers of streams - # http://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=179cacfc6620839cc9c4399e3f0a995bc499145f - patch -p1 -i "${srcdir}/mixer.patch" + cd $pkgbase-$pkgver - ./autogen.sh --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --with-udev-rules-dir=/usr/lib/udev/rules.d \ - --with-database=tdb \ - --disable-rpath \ - --disable-default-build-tests + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --with-udev-rules-dir=/usr/lib/udev/rules.d \ + --with-database=tdb \ + --disable-tcpwrap \ + --disable-rpath \ + --disable-default-build-tests + + # fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } @@ -46,11 +45,11 @@ package_pulseaudio() { 'jack: jack support' 'lirc-utils: infra-red support' 'openssl: RAOP support' - 'pyqt: Equalizer GUI (qpaeq)') + 'python2-pyqt: Equalizer GUI (qpaeq)') backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install=pulseaudio.install - cd $pkgbase + cd $pkgbase-$pkgver make -j1 DESTDIR="$pkgdir" install # Disable autospawn by default @@ -75,6 +74,8 @@ package_pulseaudio() { # Python fix sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" + install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" + rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" # cap is handled in .install diff --git a/pulseaudio/pulseaudio.xinit b/pulseaudio/pulseaudio.xinit new file mode 100644 index 000000000..2d30c0943 --- /dev/null +++ b/pulseaudio/pulseaudio.xinit @@ -0,0 +1,12 @@ +#!/bin/bash + +case "$DESKTOP_SESSION" in + gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart + ;; + *) + # Extra checks in case DESKTOP_SESSION is not set correctly + if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then + /usr/bin/start-pulseaudio-x11 + fi + ;; +esac From d2ccaec044d6f49dcec30b9c3b4e6904c9dcb9cb Mon Sep 17 00:00:00 2001 From: AlmAck Date: Sat, 4 May 2013 21:45:51 +0200 Subject: [PATCH 032/110] code cleanup, removed 'check' because not needed (flag --disable-default-build-tests set) --- pulseaudio/PKGBUILD | 9 ++++----- pulseaudio/mixer.patch | 13 ------------- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 pulseaudio/mixer.patch diff --git a/pulseaudio/PKGBUILD b/pulseaudio/PKGBUILD index c596db8e7..143238a7c 100644 --- a/pulseaudio/PKGBUILD +++ b/pulseaudio/PKGBUILD @@ -4,14 +4,13 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=3.99.1 -pkgrel=1 -arch=(i686 x86_64) +pkgrel=2 +arch=('x86_64') url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit speex tdb systemd dbus avahi bluez intltool jack sbc - lirc-utils openssl fftw orc json-c webrtc-audio-processing - check) + lirc-utils openssl fftw orc json-c webrtc-audio-processing) options=(!emptydirs !libtool) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz pulseaudio.xinit) @@ -45,7 +44,7 @@ package_pulseaudio() { 'jack: jack support' 'lirc-utils: infra-red support' 'openssl: RAOP support' - 'python2-pyqt: Equalizer GUI (qpaeq)') + 'pyqt4-python2: Equalizer GUI (qpaeq)') backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install=pulseaudio.install diff --git a/pulseaudio/mixer.patch b/pulseaudio/mixer.patch deleted file mode 100644 index c959a8c3e..000000000 --- a/pulseaudio/mixer.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c -index 786ed75..6ff6831 100644 ---- a/src/pulsecore/mix.c -+++ b/src/pulsecore/mix.c -@@ -249,7 +249,7 @@ static void pa_mix_s16ne_c(pa_mix_info streams[], unsigned nstreams, unsigned ch - else if (nstreams == 2) - pa_mix2_s16ne(streams, channels, data, length); - else if (channels == 2) -- pa_mix_ch2_s16ne(streams, channels, data, length); -+ pa_mix_ch2_s16ne(streams, nstreams, data, length); - else - pa_mix_generic_s16ne(streams, nstreams, channels, data, length); - } From 3aee46e64fe5a74d57be0320b8d6cec9ae8833fc Mon Sep 17 00:00:00 2001 From: AlmAck Date: Sat, 4 May 2013 22:26:53 +0200 Subject: [PATCH 033/110] pulseaudio: removed unnecessary -j1 from make install --- pulseaudio/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pulseaudio/PKGBUILD b/pulseaudio/PKGBUILD index 143238a7c..304590562 100644 --- a/pulseaudio/PKGBUILD +++ b/pulseaudio/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=3.99.1 -pkgrel=2 +pkgrel=3 arch=('x86_64') url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -49,7 +49,7 @@ package_pulseaudio() { install=pulseaudio.install cd $pkgbase-$pkgver - make -j1 DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install # Disable autospawn by default sed -e '/autospawn/iautospawn=no' \ From 22ee4445e49ba8289d9cb986a245fc75fdeacf6b Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 5 May 2013 18:16:28 +0000 Subject: [PATCH 034/110] Remove scim --- scim-anthy/PKGBUILD | 28 ------------ scim-chewing/PKGBUILD | 34 -------------- scim-hangul/PKGBUILD | 32 ------------- .../scim-hangul-0.3.2-fix-gcc43-build.patch | 22 --------- scim-m17n/PKGBUILD | 31 ------------- scim-pinyin/PKGBUILD | 38 ---------------- ...yin-0.5.91-cannot-build-against-scim-1.4.7 | 3 -- scim-pinyin/scim-pinyin-0.5.91-gcc43.patch | 44 ------------------ scim-tables/PKGBUILD | 31 ------------- scim-uim/PKGBUILD | 30 ------------- scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch | 10 ----- scim-uim/uim-1.5.5-header.diff | 13 ------ scim/PKGBUILD | 45 ------------------- scim/scim-1.4.9-2.patch | 11 ----- scim/scim.install | 13 ------ 15 files changed, 385 deletions(-) delete mode 100644 scim-anthy/PKGBUILD delete mode 100644 scim-chewing/PKGBUILD delete mode 100644 scim-hangul/PKGBUILD delete mode 100644 scim-hangul/scim-hangul-0.3.2-fix-gcc43-build.patch delete mode 100644 scim-m17n/PKGBUILD delete mode 100644 scim-pinyin/PKGBUILD delete mode 100644 scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7 delete mode 100644 scim-pinyin/scim-pinyin-0.5.91-gcc43.patch delete mode 100644 scim-tables/PKGBUILD delete mode 100644 scim-uim/PKGBUILD delete mode 100644 scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch delete mode 100644 scim-uim/uim-1.5.5-header.diff delete mode 100644 scim/PKGBUILD delete mode 100644 scim/scim-1.4.9-2.patch delete mode 100644 scim/scim.install diff --git a/scim-anthy/PKGBUILD b/scim-anthy/PKGBUILD deleted file mode 100644 index 703ef524f..000000000 --- a/scim-anthy/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=scim-anthy -pkgver=1.2.7 -pkgrel=2 -_filecode=37309 -pkgdesc="Japanese Anthy input method module for SCIM" -arch=("i686" "x86_64") -url="http://sourceforge.jp/projects/scim-imengine/" -license=('GPL') -depends=('scim' 'anthy') -options=('!libtool') -source=(http://osdn.dl.sourceforge.jp/scim-imengine/$_filecode/$pkgname-$pkgver.tar.gz) -md5sums=('8d06bfd46839c771401b9f176be8818f') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 -} diff --git a/scim-chewing/PKGBUILD b/scim-chewing/PKGBUILD deleted file mode 100644 index f9ac5bf65..000000000 --- a/scim-chewing/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=scim-chewing -pkgver=0.3.4 -pkgrel=1 -pkgdesc="SCIM Smart Chewing input method engine" -arch=(i686 x86_64) -url="http://chewing.csie.net/" -license=("GPL") -depends=('scim>=1.4.8' 'libchewing>=0.3.2') -makedepends=('intltool') -options=('!libtool') -source=(http://chewing.csie.net/download/scim/$pkgname-$pkgver.tar.bz2) -sha1sums=('f6c8d16f19f17449ee169f1ca787350353e93b05') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - - diff --git a/scim-hangul/PKGBUILD b/scim-hangul/PKGBUILD deleted file mode 100644 index 7b374b4ff..000000000 --- a/scim-hangul/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=scim-hangul -pkgver=0.3.2 -pkgrel=3 -pkgdesc="SCIM 한글 (hangul) input method engine for Korean language" -arch=("i686" "x86_64") -url="http://www.scim-im.org/" -license=("GPL") -depends=('libhangul>=0.0.7' 'scim>=1.4.7') -source=("http://heanet.dl.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver-fix-gcc43-build.patch") -options=("!libtool") - -build() { - cd $startdir/src - patch -Np0 -i $pkgname-$pkgver-fix-gcc43-build.patch || return 1 - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --enable-skim-support - make || return 1 - make DESTDIR=$startdir/pkg install -} - - -md5sums=('882460f47dd3211f94c80ed894ad05cb' - '0a9784bba2bca5f74a9897ef2a286543') diff --git a/scim-hangul/scim-hangul-0.3.2-fix-gcc43-build.patch b/scim-hangul/scim-hangul-0.3.2-fix-gcc43-build.patch deleted file mode 100644 index 4d33471d9..000000000 --- a/scim-hangul/scim-hangul-0.3.2-fix-gcc43-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur scim-hangul-0.3.2-orig/src/scim_hangul_imengine.cpp scim-hangul-0.3.2/src/scim_hangul_imengine.cpp ---- scim-hangul-0.3.2-orig/src/scim_hangul_imengine.cpp 2008-03-26 09:33:43.000000000 +0100 -+++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp 2008-03-26 09:34:41.000000000 +0100 -@@ -33,6 +33,7 @@ - #include - #endif - -+#include - #include - #include "scim_hangul_imengine.h" - -diff -Naur scim-hangul-0.3.2-orig/src/scim_hangul_imengine_setup.cpp scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp ---- scim-hangul-0.3.2-orig/src/scim_hangul_imengine_setup.cpp 2008-03-26 09:33:43.000000000 +0100 -+++ scim-hangul-0.3.2/src/scim_hangul_imengine_setup.cpp 2008-03-26 09:34:53.000000000 +0100 -@@ -34,6 +34,7 @@ - #include - #endif - -+#include - #include - #include - diff --git a/scim-m17n/PKGBUILD b/scim-m17n/PKGBUILD deleted file mode 100644 index 13b71de9e..000000000 --- a/scim-m17n/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=scim-m17n -pkgver=0.2.3 -pkgrel=3 -pkgdesc="SCIM Input method using m17n library" -arch=(i686 x86_64) -url="http://www.scim-im.org/" -license=('GPL') -depends=('scim' 'm17n-lib') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz) -md5sums=('179a009b262e0aa0aba786f37e4345ed') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-static=no - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/scim-pinyin/PKGBUILD b/scim-pinyin/PKGBUILD deleted file mode 100644 index 0bb09f84e..000000000 --- a/scim-pinyin/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=scim-pinyin -pkgver=0.5.91 -pkgrel=6 -pkgdesc="Chinese 拼音 (PinYin) input for SCIM" -arch=('i686' 'x86_64') -url="http://www.scim-im.org/" -license=GPL -depends=('scim>=1.4.7') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz - scim-pinyin-0.5.91-gcc43.patch) -md5sums=('fb96d3545090d7681ea03edaced4eccb' - 'ef84582d9bac7ac250d2d64cf260ad39') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/scim-pinyin-0.5.91-gcc43.patch - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static - make || return 1 -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} - - diff --git a/scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7 b/scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7 deleted file mode 100644 index 30a556acf..000000000 --- a/scim-pinyin/scim-pinyin-0.5.91-cannot-build-against-scim-1.4.7 +++ /dev/null @@ -1,3 +0,0 @@ -if /bin/sh ../libtool --silent --tag=CXX --mode=compile g++ -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I../src -I/opt/kde/include -I/opt/qt/include -I. -I/opt/kde/include/skim -I/usr/include/scim-1.0 -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -march=i686 -mtune=generic -O2 -pipe -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common -MT smartpinyinui.lo -MD -MP -MF ".deps/smartpinyinui.Tpo" -c -o smartpinyinui.lo smartpinyinui.cpp; \ - then mv -f ".deps/smartpinyinui.Tpo" ".deps/smartpinyinui.Plo"; else rm -f ".deps/smartpinyinui.Tpo"; exit 1; fi -smartpinyinui.cpp:26:36: error: skimeditshortcutbutton.h: No such file or directory diff --git a/scim-pinyin/scim-pinyin-0.5.91-gcc43.patch b/scim-pinyin/scim-pinyin-0.5.91-gcc43.patch deleted file mode 100644 index 91a948d5d..000000000 --- a/scim-pinyin/scim-pinyin-0.5.91-gcc43.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp ---- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 2008-02-25 16:27:05.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_phrase.cpp 2008-02-25 16:26:41.000000000 +0800 -@@ -28,6 +28,7 @@ - #define SCIM_PHRASE_MAX_RELATION 1000 - - #include -+#include - #include "scim_pinyin_private.h" - #include "scim_phrase.h" - -diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp ---- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 2008-02-25 16:27:55.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_special_table.cpp 2008-02-25 16:28:08.000000000 +0800 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "scim_pinyin_private.h" - #include "scim_special_table.h" - -diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp ---- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 2008-02-25 16:26:10.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp 2008-02-25 16:26:26.000000000 +0800 -@@ -29,6 +29,7 @@ - #define Uses_SCIM_LOOKUP_TABLE - - #include -+#include - #include "scim_pinyin.h" - - // Internal functions -diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp ---- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 2008-02-25 16:27:15.000000000 +0800 -+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp 2008-02-25 16:27:28.000000000 +0800 -@@ -27,6 +27,7 @@ - #define Uses_SCIM_LOOKUP_TABLE - - #include -+#include - #include "scim_pinyin_private.h" - #include "scim_phrase.h" - #include "scim_pinyin.h" diff --git a/scim-tables/PKGBUILD b/scim-tables/PKGBUILD deleted file mode 100644 index bfd57a4dc..000000000 --- a/scim-tables/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=scim-tables -pkgver=0.5.9 -pkgrel=2 -pkgdesc="SCIM multi language input method engine (including CJK)" -arch=('i686' 'x86_64') -url="http://www.scim-im.org/" -license=('GPL') -depends=('scim') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz) -md5sums=('ef7d54966d0b07b1db49358213558065') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-static=no - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/scim-uim/PKGBUILD b/scim-uim/PKGBUILD deleted file mode 100644 index 38ab26536..000000000 --- a/scim-uim/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=scim-uim -pkgver=0.2.0 -pkgrel=4 -pkgdesc="UIM bridging input engine for SCIM" -arch=(i686 x86_64) -url="http://www.scim-im.org/" -license=('GPL') -depends=('scim>=1.4.8' 'uim>=1.5.5') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/scim/$pkgname-$pkgver.tar.gz scim-uim-0.2.0-fix-gcc43-build.patch uim-1.5.5-header.diff) -md5sums=('3841556bc0e5a94b1a268751432712d3' '969da6727ec7cffc7d5a5de98eeb1f6b'\ - 'c85f4dfe17b0e8d1be3368423b970259') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -p1 < ../scim-uim-0.2.0-fix-gcc43-build.patch || return 1 - patch -p1 < ../uim-1.5.5-header.diff || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 -} diff --git a/scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch b/scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch deleted file mode 100644 index d142fd7b7..000000000 --- a/scim-uim/scim-uim-0.2.0-fix-gcc43-build.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- scim-uim-0.2.0/src/scim_uim_imengine.cpp 2007-04-10 07:43:59.000000000 +0200 -+++ scim-uim-0.2.0/src/scim_uim_imengine.cpp.gcc43buildfixed 2008-03-23 10:53:23.000000000 +0100 -@@ -32,6 +32,7 @@ - #include - #endif - -+#include - #include - #include "scim_uim_imengine.h" - #include diff --git a/scim-uim/uim-1.5.5-header.diff b/scim-uim/uim-1.5.5-header.diff deleted file mode 100644 index 0e6565827..000000000 --- a/scim-uim/uim-1.5.5-header.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- scim-uim-0.2.0.orig/src/scim_uim_imengine.cpp -+++ scim-uim-0.2.0/src/scim_uim_imengine.cpp -@@ -34,7 +34,8 @@ - - #include - #include "scim_uim_imengine.h" --#include -+#include -+#include - - #define scim_module_init uim_LTX_scim_module_init - #define scim_module_exit uim_LTX_scim_module_exit - diff --git a/scim/PKGBUILD b/scim/PKGBUILD deleted file mode 100644 index 6ade65ac6..000000000 --- a/scim/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=scim -pkgver=1.4.10 -pkgrel=2 -pkgdesc="A Input Method development platform" -arch=("i686" "x86_64") -url="http://www.scim-im.org/projects/scim" -license=('GPL') -depends=('gtk2' 'gcc-libs') -makedepends=('intltool') -backup=('etc/scim/config' 'etc/scim/global') -options=('!libtool') -install=scim.install -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_$pkgver.tar.gz) -sha1sums=('bf33a6ceb199453fed909a61f54e971653fe5abf') - -install=scim.install - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./bootstrap - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-static \ - --with-gnu-ld \ - --with-x \ - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/scim/scim-1.4.9-2.patch b/scim/scim-1.4.9-2.patch deleted file mode 100644 index 78265b34f..000000000 --- a/scim/scim-1.4.9-2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/ltdl.cpp -+++ b/src/ltdl.cpp -@@ -3361,7 +3361,7 @@ lt_dlopenext ( - { - lt_dlhandle handle = 0; - char * tmp = 0; -- char * ext = 0; -+ const char * ext = 0; - size_t len; - int errors = 0; - diff --git a/scim/scim.install b/scim/scim.install deleted file mode 100644 index 405061cb4..000000000 --- a/scim/scim.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - echo -n 'updating gtk.immodules... ' - /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - echo 'done.' -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} From 2602686badac8b0fb37f17661224f2cbc57a89e3 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 5 May 2013 22:33:05 +0000 Subject: [PATCH 035/110] Removed packages moved to extra --- gtk3/PKGBUILD | 49 ------------------- gtk3/gtk3.install | 15 ------ gtk3/settings.ini | 2 - nvidia-304xx-utils/PKGBUILD | 30 ++---------- nvidia-utils/PKGBUILD | 26 ++-------- nvidia-utils/nvidia-restore-settings.desktop | 9 ---- pygtk/PKGBUILD | 35 -------------- pygtk/python27.patch | 50 -------------------- 8 files changed, 7 insertions(+), 209 deletions(-) delete mode 100644 gtk3/PKGBUILD delete mode 100644 gtk3/gtk3.install delete mode 100644 gtk3/settings.ini delete mode 100644 nvidia-utils/nvidia-restore-settings.desktop delete mode 100644 pygtk/PKGBUILD delete mode 100644 pygtk/python27.patch diff --git a/gtk3/PKGBUILD b/gtk3/PKGBUILD deleted file mode 100644 index fdbfceb0e..000000000 --- a/gtk3/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org - -pkgname=gtk3 -pkgver=3.6.4 -pkgmin="${pkgver%.*}" -pkgrel=1 -pkgdesc="The GTK+ Toolkit (v3)" -arch=('x86_64') -url="http://www.gtk.org/" -install="gtk3.install" -depends=('cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' - 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' - 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk') -makedepends=('gobject-introspection') -options=('!libtool' '!docs') -backup=(etc/gtk-3.0/settings.ini) -license=('LGPL') -source=("http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgmin}/gtk+-${pkgver}.tar.xz" - 'settings.ini') -md5sums=('123d3dc6fc659539a308017934235b3e' - '085ece008fa3a0b7a72e9fe3dda3631a') - -build() { - cd "${srcdir}/gtk+-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-gtk2-dependency \ - --disable-schemas-compile - - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package() { - cd "${srcdir}/gtk+-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/settings.ini" \ - "${pkgdir}/etc/gtk-3.0/settings.ini" -} - -# vim:set ts=2 sw=2 et: diff --git a/gtk3/gtk3.install b/gtk3/gtk3.install deleted file mode 100644 index cd8965d1f..000000000 --- a/gtk3/gtk3.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - usr/bin/gtk-query-immodules-3.0 --update-cache - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -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 -} diff --git a/gtk3/settings.ini b/gtk3/settings.ini deleted file mode 100644 index 039000d38..000000000 --- a/gtk3/settings.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Settings] -gtk-fallback-icon-theme = gnome diff --git a/nvidia-304xx-utils/PKGBUILD b/nvidia-304xx-utils/PKGBUILD index c7ae3cf23..ac312862a 100644 --- a/nvidia-304xx-utils/PKGBUILD +++ b/nvidia-304xx-utils/PKGBUILD @@ -4,7 +4,7 @@ # maintainer abveritas@chakra-project.org pkgbase=nvidia-304xx-utils -pkgname=('nvidia-304xx-utils' 'nvidia-304xx-settings') +pkgname=('nvidia-304xx-utils') # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 3xx.xx pkgver=304.88 pkgrel=1 @@ -15,10 +15,8 @@ options=('!strip') ARCH='x86_64' _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" -source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run" - 'nvidia-restore-settings.desktop') -md5sums=('35e0c7d30de795cccb6b95bda991fb77' - '9237516792da7b6df32f8c7e8a98f475') +source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run") +md5sums=('35e0c7d30de795cccb6b95bda991fb77') create_links() { # create soname links @@ -34,7 +32,7 @@ build() { sh "${_pkg}.run" --extract-only } -package_nvidia-304xx-utils() { +package() { pkgdesc="NVIDIA drivers utilities and libraries." depends=('xorg-server' 'libxvmc') optdepends=('gtk2: nvidia-settings' 'pkg-config: nvidia-xconfig' @@ -85,23 +83,3 @@ package_nvidia-304xx-utils() { create_links } -package_nvidia-304xx-settings() { - pkgdesc="Gtk Graphical User Interface for nVidia" - depends=('nvidia-304xx-utils' 'gtk2' 'pangox-compat') - conflicts=('nvidia-settings') - - cd "${srcdir}/${_pkg}" - - - install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings" - install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz" - install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" - install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png" - sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop" - - # Install the autostart .desktop file, so that parameters saved through nvidia-settings - # are automatically reloaded at each login - install -D -m644 "${srcdir}/nvidia-restore-settings.desktop" "${pkgdir}/usr/share/autostart/nvidia-restore-settings.desktop" -} - -# vim:set ts=2 sw=2 et: diff --git a/nvidia-utils/PKGBUILD b/nvidia-utils/PKGBUILD index 1e3ab999f..ae130cee3 100644 --- a/nvidia-utils/PKGBUILD +++ b/nvidia-utils/PKGBUILD @@ -2,7 +2,7 @@ # Chakra Packages for Chakra, part of chakra-project.org pkgbase=nvidia-utils -pkgname=('nvidia-utils' 'opencl-nvidia' 'libcl' 'nvidia-settings') +pkgname=('nvidia-utils' 'opencl-nvidia' 'libcl') # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 3xx.xx pkgver=313.30 pkgrel=1 @@ -14,10 +14,8 @@ options=('!strip') ARCH='x86_64' _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" -source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run" - 'nvidia-restore-settings.desktop') -md5sums=('e5f147fbcdcad71472b4ddeccf259bd7' - '9237516792da7b6df32f8c7e8a98f475') +source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run") +md5sums=('e5f147fbcdcad71472b4ddeccf259bd7') create_links() { # create soname links @@ -109,21 +107,3 @@ package_nvidia-utils() { create_links } - -package_nvidia-settings() { - pkgdesc="Gtk Graphical User Interface for nVidia" - depends=('nvidia-utils' 'gtk2' 'pangox-compat') - - cd "${srcdir}/${_pkg}" - - - install -D -m755 nvidia-settings "${pkgdir}/usr/bin/nvidia-settings" - install -D -m644 nvidia-settings.1.gz "${pkgdir}/usr/share/man/man1/nvidia-settings.1.gz" - install -D -m644 nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" - install -D -m644 nvidia-settings.png "${pkgdir}/usr/share/pixmaps/nvidia-settings.png" - sed -e 's:__UTILS_PATH__:/usr/bin:' -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' -i "${pkgdir}/usr/share/applications/nvidia-settings.desktop" - - # Install the autostart .desktop file, so that parameters saved through nvidia-settings - # are automatically reloaded at each login - install -D -m644 "${srcdir}/nvidia-restore-settings.desktop" "${pkgdir}/usr/share/autostart/nvidia-restore-settings.desktop" -} diff --git a/nvidia-utils/nvidia-restore-settings.desktop b/nvidia-utils/nvidia-restore-settings.desktop deleted file mode 100644 index 75d432371..000000000 --- a/nvidia-utils/nvidia-restore-settings.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Exec=nvidia-settings --load-config-only -TryExec=/usr/bin/nvidia-settings -Name=Restore the video card and monitor parameters previously set in NVIDIA Settings -Name[it]=Ripristina i parametri di scheda video e monitor precedentemente salvati in NVIDIA Settings -Type=Service -X-DBUS-StartupType=none -X-KDE-autostart-phase=1 -X-KDE-StartupNotify=false diff --git a/pygtk/PKGBUILD b/pygtk/PKGBUILD deleted file mode 100644 index 5900d6629..000000000 --- a/pygtk/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dot]org> - -pkgname=pygtk -pkgver=2.22.0 -pkgrel=5 -pkgdesc="Python bindings for the GTK widget set" -arch=('x86_64') -license=('LGPL') -depends=('libglade' 'python2-cairo>=1.10.0' 'python2-gobject>=2.28.6') -makedepends=('python-numpy') -optdepends=('python-numpy') -options=('!libtool') -url="http://www.pygtk.org/" -source=("http://ftp.gnome.org/pub/gnome/sources/pygtk/2.22/${pkgname}-${pkgver}.tar.bz2" - 'python27.patch') -sha256sums=('4acf0ef2bde8574913c40ee4a43d9c4f43bb77b577b67147271b534501a54cc8' - '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #https://bugzilla.gnome.org/show_bug.cgi?id=623965 - patch -p1 -i "${srcdir}/python27.patch" - PYTHON=python2 ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py - install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" -} diff --git a/pygtk/python27.patch b/pygtk/python27.patch deleted file mode 100644 index 9bbe2b5ae..000000000 --- a/pygtk/python27.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c -index c0e1493..aa8cf10 100644 ---- a/gtk/gtkmodule.c -+++ b/gtk/gtkmodule.c -@@ -227,8 +227,12 @@ init_gtk(void) - pygtk_add_stock_items(d); - - /* extension API */ -- PyDict_SetItemString(d, "_PyGtk_API", -- o=PyCObject_FromVoidPtr(&functions, NULL)); -+#if PY_VERSION_HEX >= 0x02070000 -+ o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL); -+#else -+ o = PyCObject_FromVoidPtr(&functions, NULL); -+#endif -+ PyDict_SetItemString(d, "_PyGtk_API", o); - Py_DECREF(o); - - PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning", -diff --git a/gtk/pygtk.h b/gtk/pygtk.h -index 573c3b9..e4c680f 100644 ---- a/gtk/pygtk.h -+++ b/gtk/pygtk.h -@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; - - - /* a function to initialise the pygtk functions */ -+ -+/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */ -+#if PY_VERSION_HEX >= 0x02070000 -+#define init_pygtk() G_STMT_START { \ -+ void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \ -+ if (!capsule) { \ -+ return; \ -+ } \ -+ _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \ -+} G_STMT_END -+#else /* PY_VERSION_HEX */ -+/* Python 2.6 and earlier use the CObject API */ - #define init_pygtk() G_STMT_START { \ - PyObject *pygtk = PyImport_ImportModule("gtk"); \ - if (pygtk != NULL) { \ -@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API; - return; \ - } \ - } G_STMT_END -+#endif /* PY_VERSION_HEX */ - - #endif - From e134158cffafff0371f39590c2374229b542c872 Mon Sep 17 00:00:00 2001 From: manu tortosa Date: Tue, 7 May 2013 00:25:14 +0200 Subject: [PATCH 036/110] Remove dconf --- dconf/PKGBUILD | 32 -------------------------------- dconf/dconf.install | 12 ------------ 2 files changed, 44 deletions(-) delete mode 100644 dconf/PKGBUILD delete mode 100644 dconf/dconf.install diff --git a/dconf/PKGBUILD b/dconf/PKGBUILD deleted file mode 100644 index c3d14e632..000000000 --- a/dconf/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org - -pkgname=dconf -pkgver=0.12.0 -pkgrel=1 -pkgdesc="A low-level configuration system." -arch=('x86_64') -url="http://live.gnome.org/dconf" -license=('LGPL2.1') -depends=('glib2') -makedepends=('vala' 'gobject-introspection') -install=dconf.install -source=("http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz") -md5sums=('6aec9d37fca1614cd672bc5b2215c9f3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/dconf --disable-editor - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: \ No newline at end of file diff --git a/dconf/dconf.install b/dconf/dconf.install deleted file mode 100644 index 74b745bcb..000000000 --- a/dconf/dconf.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade(){ - post_install -} - -post_remove() { - post_install -} \ No newline at end of file From 8181696e526a0330247eb6d8afefad80e2836d45 Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 6 May 2013 22:38:29 +0000 Subject: [PATCH 037/110] Disable dconf support in at-spi2-atk --- at-spi2-atk/PKGBUILD | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/at-spi2-atk/PKGBUILD b/at-spi2-atk/PKGBUILD index de91b2d63..35fea5979 100644 --- a/at-spi2-atk/PKGBUILD +++ b/at-spi2-atk/PKGBUILD @@ -1,17 +1,15 @@ # # Platform Packages for Chakra, part of chakra-project.org # -# maintainer abveritas@chakra-project.org -# contributor Ionut Biru pkgname=at-spi2-atk pkgver=2.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('x86_64') url="http://www.gnome.org" license=('GPL2') -depends=('at-spi2-core' 'libx11' 'atk' 'dconf') +depends=('at-spi2-core' 'libx11' 'atk') makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') @@ -25,7 +23,7 @@ build() { autoreconf --force --install ./configure --prefix=/usr --sysconfdir=/etc \ - --disable-schemas-compile + --disable-schemas-compile make } From c9481364c6ea671bb3329e1dfddeac53ba857f1e Mon Sep 17 00:00:00 2001 From: Manuel Date: Tue, 7 May 2013 20:27:12 +0000 Subject: [PATCH 038/110] Remove dconf dependency --- telepathy-logger/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telepathy-logger/PKGBUILD b/telepathy-logger/PKGBUILD index e01d145ba..ec272af1f 100644 --- a/telepathy-logger/PKGBUILD +++ b/telepathy-logger/PKGBUILD @@ -2,12 +2,12 @@ pkgname=telepathy-logger pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Telepathy framework logging daemon" arch=('x86_64') url="http://telepathy.freedesktop.org/wiki/Logger" license=('LGPL2.1') -depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf') +depends=('telepathy-glib' 'sqlite3' 'libxml2') makedepends=('intltool' 'gobject-introspection' 'libxslt') install=${pkgname}.install options=('!libtool') From c3598d1c20491ddc546661494caddf5f814bf5d0 Mon Sep 17 00:00:00 2001 From: Manuel Date: Tue, 7 May 2013 21:07:58 +0000 Subject: [PATCH 039/110] Remove /var/run --- avahi/PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/avahi/PKGBUILD b/avahi/PKGBUILD index fd8749f9a..78ddbb974 100644 --- a/avahi/PKGBUILD +++ b/avahi/PKGBUILD @@ -5,7 +5,7 @@ pkgname=avahi pkgver=0.6.31 -pkgrel=7 +pkgrel=8 pkgdesc="A multicast/unicast DNS-SD framework" arch=('x86_64') url="http://www.avahi.org/" @@ -67,5 +67,8 @@ package() { # howl and mdnsresponder compatability (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) + + # Provided by filesystem + rm ${pkgdir}/var -rfv } From 403e64d06078dca81db505cf17efd68e2b12c3ec Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 10 May 2013 17:22:39 +0000 Subject: [PATCH 040/110] Update a bunch of python packages which were not updated since 2011 --- python-jinja/PKGBUILD | 9 ++++++--- python-markupsafe/PKGBUILD | 9 ++++++--- python-pygments/PKGBUILD | 12 ++++++------ python-sphinx/PKGBUILD | 11 +++++++---- {cx_freeze => python2-cx_freeze}/FreezePython.sh | 0 {cx_freeze => python2-cx_freeze}/PKGBUILD | 15 ++++++++------- 6 files changed, 33 insertions(+), 23 deletions(-) rename {cx_freeze => python2-cx_freeze}/FreezePython.sh (100%) rename {cx_freeze => python2-cx_freeze}/PKGBUILD (78%) diff --git a/python-jinja/PKGBUILD b/python-jinja/PKGBUILD index b1e2fd27a..8e36fe09c 100644 --- a/python-jinja/PKGBUILD +++ b/python-jinja/PKGBUILD @@ -1,7 +1,7 @@ # Moved from CCR - PKGBUILD by Renan Biegelmeyer (RenanBS) -pkgname=python-jinja -pkgver=2.5.5 +pkgname=python2-jinja +pkgver=2.6 pkgrel=1 pkgdesc="A simple pythonic template language written in Python" arch=('any') @@ -9,8 +9,11 @@ url="http://jinja.pocoo.org/2/" license=('BSD') depends=('python-markupsafe' 'setuptools' ) makedepends=('python') +replaces=('python-jinja') +provides=('python-jinja') +conflicts=('python-jinja') source=(http://pypi.python.org/packages/source/J/Jinja2/Jinja2-$pkgver.tar.gz) -md5sums=('83b20c1eeb31f49d8e6392efae91b7d5') +md5sums=('1c49a8825c993bfdcf55bb36897d28a2') build() { diff --git a/python-markupsafe/PKGBUILD b/python-markupsafe/PKGBUILD index 9edb7c37f..c6e993417 100644 --- a/python-markupsafe/PKGBUILD +++ b/python-markupsafe/PKGBUILD @@ -1,8 +1,8 @@ # Moved from CCR - PKGBUILD by Renan Biegelmeyer (RenanBS) -pkgname=python-pygments -pkgver=1.4 +pkgname=python2-pygments +pkgver=1.6 pkgrel=1 pkgdesc="Python syntax highlighter" arch=('any') url="http://pygments.org/" license=('BSD') depends=('setuptools') -provides=('pygments') -conflicts=('pygments') -replaces=('pygments') +provides=('pygments' 'python-pygments') +conflicts=('pygments' 'python-pygments') +replaces=('pygments' 'python-pygments') source=(http://pypi.python.org/packages/source/P/Pygments/Pygments-$pkgver.tar.gz) -md5sums=('d77ac8c93a7fb27545f2522abe9cc462') +md5sums=('a18feedf6ffd0b0cc8c8b0fbdb2027b1') build() { diff --git a/python-sphinx/PKGBUILD b/python-sphinx/PKGBUILD index 8182b3b66..b3d6b1b9f 100644 --- a/python-sphinx/PKGBUILD +++ b/python-sphinx/PKGBUILD @@ -1,8 +1,8 @@ # Moved from CCR - PKGBUILD by Renan Biegelmeyer (RenanBS) -pkgname=python-sphinx -pkgver=1.0.7 -pkgrel=2 +pkgname=python2-sphinx +pkgver=1.1.3 +pkgrel=1 pkgdesc="Python documentation generator" arch=('any') url="http://sphinx.pocoo.org/" @@ -10,8 +10,11 @@ license=('GPL') depends=('setuptools' 'python-pygments' 'docutils' 'python-jinja') optdepends=('texlive-latexextra: for generation of PDF documentation' 'texlive-latex3: for generation of PDF documentation') +replaces=('python-sphinx') +provides=('python-sphinx') +conflicts=('python-sphinx') source=(http://pypi.python.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz) -md5sums=('42c722d48e52d4888193965dd473adb5') +md5sums=('8f55a6d4f87fc6d528120c5d1f983e98') build() { diff --git a/cx_freeze/FreezePython.sh b/python2-cx_freeze/FreezePython.sh similarity index 100% rename from cx_freeze/FreezePython.sh rename to python2-cx_freeze/FreezePython.sh diff --git a/cx_freeze/PKGBUILD b/python2-cx_freeze/PKGBUILD similarity index 78% rename from cx_freeze/PKGBUILD rename to python2-cx_freeze/PKGBUILD index 4ab383e7c..f95187af7 100644 --- a/cx_freeze/PKGBUILD +++ b/python2-cx_freeze/PKGBUILD @@ -4,19 +4,21 @@ # maintainer (i686): Phil Miller # maintainer (x86_64): Manuel Tortosa -pkgname=cx_freeze +pkgname=python2-cx_freeze _tarname=cx_Freeze -pkgver=4.2.3 +pkgver=4.3.1 pkgrel=1 pkgdesc="A set of utilities for freezing Python scripts into executables" arch=('i686' 'x86_64') -url="http://www.python.net/crew/atuining/cx_Freeze/" +url="http://cx-freeze.sourceforge.net/" license=('custom') depends=('python2') -provides=('cxfreeze') +provides=('cxfreeze' 'cx_freeze') +replaces=('cx_freeze') +conflicts=('cx_freeze') source=("http://downloads.sourceforge.net/cx-freeze/$_tarname-$pkgver.tar.gz" 'FreezePython.sh') -md5sums=('a524cfd23de5d37e0ec9400ba1ccd6ad' +md5sums=('8ac023e544679d796a66b51e568a9604' '5cc60d1644eba12a57c22cc1348a4afd') package() { @@ -27,5 +29,4 @@ package() { install -d "$pkgdir"/usr/share/cx-freeze/{bases,initscripts} install -m755 source/bases/* "$pkgdir/usr/share/cx-freeze/bases" install -m644 initscripts/* "$pkgdir/usr/share/cx-freeze/initscripts" - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/cx_freeze/COPYING" -} \ No newline at end of file +} From 6d18218837044ab228179d83f4dce7ed6d8166db Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 11 May 2013 16:34:59 +0000 Subject: [PATCH 041/110] Stip files --- hugin-tools/PKGBUILD | 8 +++++--- python2-gobject3/PKGBUILD | 7 +++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/hugin-tools/PKGBUILD b/hugin-tools/PKGBUILD index 70db40c4f..05399b83a 100644 --- a/hugin-tools/PKGBUILD +++ b/hugin-tools/PKGBUILD @@ -1,12 +1,10 @@ # # Platform Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dot]org> pkgname=hugin-tools _pkgname=hugin pkgver=2012.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Hugin libs and tools to be used by Kipi-plugins" arch=('x86_64') url="http://hugin.sourceforge.net/" @@ -42,5 +40,9 @@ build() { package() { cd "${srcdir}/build" make DESTDIR="${pkgdir}" install + + # Remove frontend files rm -f "${pkgdir}"/usr/share/applications/pto_gen.desktop + rm -rf "${pkgdir}"/usr/share/man + rm -rf "${pkgdir}"/usr/share/locale } diff --git a/python2-gobject3/PKGBUILD b/python2-gobject3/PKGBUILD index 3683a12fa..7ae4c8c45 100644 --- a/python2-gobject3/PKGBUILD +++ b/python2-gobject3/PKGBUILD @@ -1,12 +1,11 @@ # # Platform Packages for Chakra, part of chakra-project.org # -# maintainer: abveritas@chakra-project.org pkgname=python2-gobject3 pkgbase=pygobject -pkgver=3.2.1 -pkgrel=2 +pkgver=3.8.1 +pkgrel=1 pkgdesc="Python2 bindings for GObject, including all introspection files" arch=('x86_64') url="https://live.gnome.org/PyGObject" @@ -14,7 +13,7 @@ license=('LGPL') depends=('python2' 'python2-cairo' 'gobject-introspection') source=("http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/pygobject-$pkgver.tar.xz") options=('!libtool') -md5sums=('3f6e63de5aa422710c268b249e2244bf') +md5sums=('88265ec145e31a50b66386fcdeb91ce6') build() { cd "$pkgbase-$pkgver" From 2bd1e816ad351507b52e0a27bd571e593f1ed14e Mon Sep 17 00:00:00 2001 From: Lukas Date: Sat, 11 May 2013 23:00:00 +0000 Subject: [PATCH 042/110] Update libpng12 and fribidi --- fribidi/PKGBUILD | 6 +++--- libpng12/PKGBUILD | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fribidi/PKGBUILD b/fribidi/PKGBUILD index 536f4816a..2a2811323 100644 --- a/fribidi/PKGBUILD +++ b/fribidi/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Nezmer pkgname=fribidi -pkgver=0.19.2 +pkgver=0.19.5 pkgrel=1 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ license=('LGPL') url="http://fribidi.org" depends=('glibc') options=('!libtool') -source=(http://fribidi.org/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('626db17d2d99b43615ad9d12500f568a') +source=(http://fribidi.org/download/${pkgname}-${pkgver}.tar.bz2) +md5sums=('925bafb97afee8a2fc2d0470c072a155') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libpng12/PKGBUILD b/libpng12/PKGBUILD index ad485067c..a67ba7c7d 100644 --- a/libpng12/PKGBUILD +++ b/libpng12/PKGBUILD @@ -6,7 +6,7 @@ pkgname=libpng12 _realname=libpng pkgver=1.2.50 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64') url="http://www.libpng.org/pub/png/libpng.html" @@ -39,7 +39,8 @@ build() { #make ECHO=echo PNGLIB="-L${pkgdir}/usr/lib -lpng" -f makefile.std png2pnm pnm2png #install -m755 png2pnm pnm2png "${pkgdir}/usr/bin/" #install -D -m644 ../../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 - # only libs needed + # only libs and includes needed rm -rf ${pkgdir}/usr/lib/{libpng.so,libpng.a,pkgconfig} - rm -rf ${pkgdir}/usr/{include,share,bin} + rm -rf ${pkgdir}/usr/include/{png.h,pngconf.h} + rm -rf ${pkgdir}/usr/{share,bin} } From 8a43aefb87feb9495ef8ce30070722ad23092295 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Sun, 12 May 2013 01:10:13 +0200 Subject: [PATCH 043/110] mercurial updated to version 2.6 --- mercurial/PKGBUILD | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/mercurial/PKGBUILD b/mercurial/PKGBUILD index f83b89642..f2688535d 100644 --- a/mercurial/PKGBUILD +++ b/mercurial/PKGBUILD @@ -1,26 +1,28 @@ # # Chakra Packages for Chakra, part of chakra-project.org # -# maintainer abveritas@chakra-project.org pkgname=mercurial -pkgver=2.2.3 +pkgver=2.6 pkgrel=1 pkgdesc="A scalable distributed SCM tool" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.selenic.com/mercurial" license=('GPL') depends=('python2') optdepends=('tk: for the hgk GUI') source=("http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('f4c70af3892d964b83b2718bde44c2f8' +md5sums=('d012d8bb5f85369d3b6a630a80667170' '43e1d36564d4c7fbe9a091d3ea370a44') build() { cd "${srcdir}/${pkgname}-${pkgver}" python2 setup.py install --root="${pkgdir}" --optimize=1 + sed -i -e 's#env python#env python2#' \ + "${pkgdir}"/usr/lib/python2.7/site-packages/mercurial/lsprof.py + install -d ${pkgdir}/usr/share/man/{man1,man5} install -m644 doc/hg.1 "${pkgdir}/usr/share/man/man1" install -m644 doc/{hgrc.5,hgignore.5} "${pkgdir}/usr/share/man/man5" @@ -36,4 +38,8 @@ build() { # set some variables install -m755 -d ${pkgdir}/etc/profile.d install -m755 ${srcdir}/mercurial.profile "${pkgdir}/etc/profile.d/mercurial.sh" + + # install configuration file + install -m755 -d ${pkgdir}/etc/mercurial + install -m644 contrib/sample.hgrc "${pkgdir}/etc/mercurial/hgrc" } From 9a7d7f87816032ffcc1e3970abbe4bef2359e806 Mon Sep 17 00:00:00 2001 From: Lukas Date: Sun, 12 May 2013 12:17:09 +0000 Subject: [PATCH 044/110] Update libmikmod to new 3.2.0 --- libmikmod/PKGBUILD | 28 +++++++++------------------- sdl_mixer/PKGBUILD | 2 +- sdl_sound/PKGBUILD | 2 +- 3 files changed, 11 insertions(+), 21 deletions(-) diff --git a/libmikmod/PKGBUILD b/libmikmod/PKGBUILD index 048559010..487899ed6 100644 --- a/libmikmod/PKGBUILD +++ b/libmikmod/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Tom Newsom pkgname=libmikmod -pkgver=3.1.12 -pkgrel=3 +pkgver=3.2.0 +pkgrel=1 pkgdesc="A portable sound library" license=('GPL' 'LGPL') url="http://sourceforge.net/projects/mikmod/" @@ -12,28 +12,18 @@ arch=('i686' 'x86_64') depends=('glibc') options=('!libtool') install=$pkgname.install -source=(http://downloads.sourceforge.net/mikmod/${pkgname}-${pkgver}.tar.gz - libmikmod-3.1.12-64bit-fix.diff - libmikmod-3.1.12-exitcrash-fix.diff - libmikmod-3.1.12-loopingvolume-fix.diff - libmikmod-3.1.12-md_sngchn-fix.diff - libmikmod-CVE-2009-0179.patch) -md5sums=('9f3c740298260d5f88981fc0d51f6f16' - 'dc7ffd8d6d355e9d6ec671b7f2b2adc7' - '03a4f5bfcecddf5f515672d6d477b7f7' - 'a837fd876cbd2ac27419b802504489db' - '076d39de19de36b880ed90297f1ee0d1' - 'fa91f4bc17164be32bec0ea7a73f2aaa') +source=(http://mikmod.shlomifish.org/files/${pkgname}-${pkgver}.tar.gz) +md5sums=('96e9820d72a41fe27ff304071739696c') build() { cd $srcdir/$pkgname-$pkgver # patches from sdl_mixer-1.2.11 source - patch -Np1 -i $srcdir/libmikmod-3.1.12-64bit-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-exitcrash-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-md_sngchn-fix.diff - patch -Np1 -i $srcdir/libmikmod-CVE-2009-0179.patch + #patch -Np1 -i $srcdir/libmikmod-3.1.12-64bit-fix.diff + #patch -Np1 -i $srcdir/libmikmod-3.1.12-exitcrash-fix.diff + #patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff + #patch -Np1 -i $srcdir/libmikmod-3.1.12-md_sngchn-fix.diff + #patch -Np1 -i $srcdir/libmikmod-CVE-2009-0179.patch ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info make || return 1 diff --git a/sdl_mixer/PKGBUILD b/sdl_mixer/PKGBUILD index 9e8053594..d29ece155 100644 --- a/sdl_mixer/PKGBUILD +++ b/sdl_mixer/PKGBUILD @@ -2,7 +2,7 @@ pkgname=sdl_mixer pkgver=1.2.12 -pkgrel=7 +pkgrel=8 pkgdesc="A simple multi-channel audio mixer" arch=('x86_64') url="http://www.libsdl.org/projects/SDL_mixer/" diff --git a/sdl_sound/PKGBUILD b/sdl_sound/PKGBUILD index fffc02087..946784ff2 100644 --- a/sdl_sound/PKGBUILD +++ b/sdl_sound/PKGBUILD @@ -2,7 +2,7 @@ pkgname=sdl_sound pkgver=1.0.3 -pkgrel=13 +pkgrel=14 pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3" arch=('x86_64') url="http://icculus.org/SDL_sound/" From 62e6a0e04fe4c75aabbd289333a9d17b9ce4c627 Mon Sep 17 00:00:00 2001 From: Lukas Date: Sun, 12 May 2013 12:29:48 +0000 Subject: [PATCH 045/110] New patches for libmikmod --- libmikmod/PKGBUILD | 17 +-- libmikmod/libmikmod-3.1.12-64bit-fix.diff | 47 -------- libmikmod/libmikmod-3.1.12-exitcrash-fix.diff | 21 ---- libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff | 112 ------------------ libmikmod/libmikmod-3.2.0-64bit-fix.diff | 12 ++ libmikmod/libmikmod-CVE-2009-0179.patch | 33 ------ 6 files changed, 21 insertions(+), 221 deletions(-) delete mode 100644 libmikmod/libmikmod-3.1.12-64bit-fix.diff delete mode 100644 libmikmod/libmikmod-3.1.12-exitcrash-fix.diff delete mode 100644 libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff create mode 100644 libmikmod/libmikmod-3.2.0-64bit-fix.diff delete mode 100644 libmikmod/libmikmod-CVE-2009-0179.patch diff --git a/libmikmod/PKGBUILD b/libmikmod/PKGBUILD index 487899ed6..0dc29cc0a 100644 --- a/libmikmod/PKGBUILD +++ b/libmikmod/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libmikmod pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A portable sound library" license=('GPL' 'LGPL') url="http://sourceforge.net/projects/mikmod/" @@ -12,18 +12,19 @@ arch=('i686' 'x86_64') depends=('glibc') options=('!libtool') install=$pkgname.install -source=(http://mikmod.shlomifish.org/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('96e9820d72a41fe27ff304071739696c') +source=(http://mikmod.shlomifish.org/files/${pkgname}-${pkgver}.tar.gz + libmikmod-3.2.0-64bit-fix.diff + libmikmod-3.1.12-loopingvolume-fix.diff) +md5sums=('96e9820d72a41fe27ff304071739696c' + '0bb09aac6e83e0a7fd6535961b3cff4c' + 'a837fd876cbd2ac27419b802504489db') build() { cd $srcdir/$pkgname-$pkgver # patches from sdl_mixer-1.2.11 source - #patch -Np1 -i $srcdir/libmikmod-3.1.12-64bit-fix.diff - #patch -Np1 -i $srcdir/libmikmod-3.1.12-exitcrash-fix.diff - #patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff - #patch -Np1 -i $srcdir/libmikmod-3.1.12-md_sngchn-fix.diff - #patch -Np1 -i $srcdir/libmikmod-CVE-2009-0179.patch + patch -Np1 -i $srcdir/libmikmod-3.2.0-64bit-fix.diff + patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info make || return 1 diff --git a/libmikmod/libmikmod-3.1.12-64bit-fix.diff b/libmikmod/libmikmod-3.1.12-64bit-fix.diff deleted file mode 100644 index cd7800881..000000000 --- a/libmikmod/libmikmod-3.1.12-64bit-fix.diff +++ /dev/null @@ -1,47 +0,0 @@ -Date: Sun, 04 Jul 2004 11:53:23 +0200 -From: Josselin Mouette -Subject: Re: sdl 64bit problem [PATCH] - -Le sam, 03/07/2004 � 18:20 +0200, Hans-Frieder Vogt a �crit : -> Hi list, -> -> I found the problem that lead to the distorted sound in tuxracer on AMD64. It -> may have also been the cause for the other reported sound problems with SDL. -> The problem is not in SDL, but in SDL-mixer. -> There, music files (*.it, and probably others as well) are incorrectly read on -> all 64 bit architectures but Alpha, due to an incorrect data type definition. -> The attached patch should solve the problem for all 64 bit architectures on -> Linux, since at least cpp defines _LP64 and __LP64__ for them. -> _LP64 indicates that long ints and pointers are 64 bits, but integers are 32 -> bits. -> I am not sure whether the usage of _LP64 is also standard for the commercial -> compilers, and for other Unixes, but at least Solaris 9 defines _LP64 in the -> 64 bit environment as well. -> -> Josselin, -> could you include this patch into your next debian packages? - -diff -ru libmikmod-3.1.12.orig/include/mikmod.h.in libmikmod-3.1.12/include/mikmod.h.in ---- libmikmod-3.1.12.orig/include/mikmod.h.in 2007-12-15 01:24:19.000000000 -0800 -+++ libmikmod-3.1.12/include/mikmod.h.in 2009-10-05 00:18:56.000000000 -0700 -@@ -85,7 +85,7 @@ - - @DOES_NOT_HAVE_SIGNED@ - --#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - /* 64 bit architectures */ - - typedef signed char SBYTE; /* 1 byte, signed */ -diff -ru libmikmod-3.1.12.orig/include/mikmod_internals.h libmikmod-3.1.12/include/mikmod_internals.h ---- libmikmod-3.1.12.orig/include/mikmod_internals.h 2007-12-15 04:24:51.000000000 -0800 -+++ libmikmod-3.1.12/include/mikmod_internals.h 2009-10-05 00:19:15.000000000 -0700 -@@ -50,7 +50,7 @@ - /*========== More type definitions */ - - /* SLONGLONG: 64bit, signed */ --#if defined (__arch64__) || defined(__alpha) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - typedef long SLONGLONG; - #define NATIVE_64BIT_INT - #elif defined(__WATCOMC__) diff --git a/libmikmod/libmikmod-3.1.12-exitcrash-fix.diff b/libmikmod/libmikmod-3.1.12-exitcrash-fix.diff deleted file mode 100644 index fe62892b5..000000000 --- a/libmikmod/libmikmod-3.1.12-exitcrash-fix.diff +++ /dev/null @@ -1,21 +0,0 @@ -Date: 15 Apr 2002 11:01:19 +0200 -From: Guillaume Cottenceau - -Unfortunately, I should have double checked that the following -fix (authored by Dave Goehrig , not me), -was really in the CVS... it's not, as of stable 1.2.3 at least. -Please include it, it fixes a segfault on exiting a program which -disabled MOD music during its execution. - -diff -ru libmikmod-3.1.12.orig/playercode/virtch_common.c libmikmod-3.1.12/playercode/virtch_common.c ---- libmikmod-3.1.12.orig/playercode/virtch_common.c 2007-12-15 01:26:53.000000000 -0800 -+++ libmikmod-3.1.12/playercode/virtch_common.c 2009-10-05 00:37:12.000000000 -0700 -@@ -347,7 +347,7 @@ - - void VC1_SampleUnload(SWORD handle) - { -- if (handlenumvoices ? md_sngchn : (mod)->numvoices) -+ - #define HIGH_OCTAVE 2 /* number of above-range octaves */ - - static UWORD oldperiods[OCTAVE*2]={ -@@ -248,14 +250,14 @@ - MP_VOICE *a; - ULONG t,k,tvol,pp; - -- for (t=0;tvoice[t].main.kick==KICK_ABSENT)|| - (mod->voice[t].main.kick==KICK_ENV))&& - Voice_Stopped_internal(t)) - return t; - - tvol=0xffffffUL;t=-1;a=mod->voice; -- for (k=0;kmain.s) - return k; -@@ -2249,12 +2251,12 @@ - - switch (dat) { - case 0x0: /* past note cut */ -- for (t=0;tvoice[t].master==a) - mod->voice[t].main.fadevol=0; - break; - case 0x1: /* past note off */ -- for (t=0;tvoice[t].master==a) { - mod->voice[t].main.keyoff|=KEY_OFF; - if ((!(mod->voice[t].venv.flg & EF_ON))|| -@@ -2263,7 +2265,7 @@ - } - break; - case 0x2: /* past note fade */ -- for (t=0;tvoice[t].master==a) - mod->voice[t].main.keyoff|=KEY_FADE; - break; -@@ -2318,7 +2320,7 @@ - SAMPLE *s; - - mod->totalchn=mod->realchn=0; -- for (channel=0;channelvoice[channel]; - i=aout->main.i; - s=aout->main.s; -@@ -2736,7 +2738,7 @@ - if (a->dct!=DCT_OFF) { - int t; - -- for (t=0;tvoice[t].masterchn==channel)&& - (a->main.sample==mod->voice[t].main.sample)) { -@@ -2978,6 +2980,11 @@ - if (!(mod->voice=(MP_VOICE*)_mm_calloc(md_sngchn,sizeof(MP_VOICE)))) - return 1; - -+ /* mod->numvoices was used during loading to clamp md_sngchn. -+ After loading it's used to remember how big mod->voice is. -+ */ -+ mod->numvoices = md_sngchn; -+ - Player_Init_internal(mod); - return 0; - } -@@ -3086,7 +3093,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;tvoice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3111,7 +3118,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;tvoice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3138,7 +3145,7 @@ - pf->sngpos=pos; - pf->vbtick=pf->sngspd; - -- for (t=0;tvoice[t].main.i=NULL; - pf->voice[t].main.s=NULL; diff --git a/libmikmod/libmikmod-3.2.0-64bit-fix.diff b/libmikmod/libmikmod-3.2.0-64bit-fix.diff new file mode 100644 index 000000000..c965f9ab7 --- /dev/null +++ b/libmikmod/libmikmod-3.2.0-64bit-fix.diff @@ -0,0 +1,12 @@ +diff -u -r libmikmod-3.2.0-orig/include/mikmod.h libmikmod-3.2.0/include/mikmod.h +--- libmikmod-3.2.0-orig/include/mikmod.h 2012-06-01 15:15:42.000000000 +0200 ++++ libmikmod-3.2.0/include/mikmod.h 2012-10-03 20:03:48.173576199 +0200 +@@ -85,7 +85,7 @@ + + + +-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) ++#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) || defined(_LP64) + /* 64 bit architectures */ + + typedef signed char SBYTE; /* 1 byte, signed */ diff --git a/libmikmod/libmikmod-CVE-2009-0179.patch b/libmikmod/libmikmod-CVE-2009-0179.patch deleted file mode 100644 index 0c47e6545..000000000 --- a/libmikmod/libmikmod-CVE-2009-0179.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c ---- libmikmod-3.1.11.orig/loaders/load_xm.c 2004-01-21 18:43:53.000000000 +0100 -+++ libmikmod-3.1.11/loaders/load_xm.c 2008-04-16 04:30:45.000000000 +0200 -@@ -622,7 +622,8 @@ - /* read the remainder of the header */ - for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader); - -- if(_mm_eof(modreader)) { -+ /* last instrument is at the end of file in version 0x0104 */ -+ if(_mm_eof(modreader) && (mh->version<0x0104 || tInit || l->Init()) { - _mm_rewind(modreader); - ok = l->Load(curious); -- /* propagate inflags=flags for in-module samples */ -- for (t = 0; t < of.numsmp; t++) -- if (of.samples[t].inflags == 0) -- of.samples[t].inflags = of.samples[t].flags; -+ if (ok) { -+ /* propagate inflags=flags for in-module samples */ -+ for (t = 0; t < of.numsmp; t++) -+ if (of.samples[t].inflags == 0) -+ of.samples[t].inflags = of.samples[t].flags; -+ } - } else - ok = 0; - From 7fc1d436f1ebb535cd8dd9d6b4819f74527e8f7f Mon Sep 17 00:00:00 2001 From: "Adrian Chaves Fernandez (Gallaecio)" Date: Sat, 18 May 2013 11:00:50 +0000 Subject: [PATCH 046/110] OpenAL 1.15.1 --- openal/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openal/PKGBUILD b/openal/PKGBUILD index e69d355dd..53030f40d 100644 --- a/openal/PKGBUILD +++ b/openal/PKGBUILD @@ -7,7 +7,7 @@ # Contributer: Jason Chu pkgname=openal -pkgver=1.14 +pkgver=1.15.1 pkgrel=1 pkgdesc="OpenAL is a cross-platform 3D audio library for use with OpenGL" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ depends=('glibc') makedepends=('alsa-lib' 'sdl' 'cmake' 'libpulse') options=('!libtool') source=(http://kcat.strangesoft.net/$pkgname-releases/$pkgname-soft-${pkgver}.tar.bz2) -md5sums=('3d8b86c21a2f87a2a5e60f78f3b3f03d') +md5sums=('ea83dec3b9655a27d28e7bc7cae9cd71') build() { cd ${srcdir}/${pkgname}-soft-${pkgver}/build From 719a0780beb6743b7f130ac746a04a1d69d56856 Mon Sep 17 00:00:00 2001 From: "Adrian Chaves Fernandez (Gallaecio)" Date: Sat, 18 May 2013 11:08:15 +0000 Subject: [PATCH 047/110] Rebuilts for the new OpenAL version. --- alure/PKGBUILD | 2 +- freealut/PKGBUILD | 2 +- mplayer/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alure/PKGBUILD b/alure/PKGBUILD index f93a13d25..19ebf6b98 100644 --- a/alure/PKGBUILD +++ b/alure/PKGBUILD @@ -5,7 +5,7 @@ pkgname=alure pkgver=1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Utility library to help manage common tasks with OpenAL applications." arch=('i686' 'x86_64') url="http://kcat.strangesoft.net/alure.html" diff --git a/freealut/PKGBUILD b/freealut/PKGBUILD index f910673c5..b3c1032c4 100644 --- a/freealut/PKGBUILD +++ b/freealut/PKGBUILD @@ -8,7 +8,7 @@ pkgname=freealut pkgver=1.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="OpenAL Utility Toolkit (ALUT)" arch=('i686' 'x86_64') url="http://www.openal.org" diff --git a/mplayer/PKGBUILD b/mplayer/PKGBUILD index 6e32e5c9c..460700696 100644 --- a/mplayer/PKGBUILD +++ b/mplayer/PKGBUILD @@ -2,7 +2,7 @@ pkgname=mplayer pkgver=36027 -pkgrel=1 +pkgrel=2 pkgdesc="Multimedia player." arch=('x86_64') depends=('a52dec' 'aalib' 'alsa-lib' 'bzip2' 'cdparanoia' 'directfb' 'enca' 'faac' 'faad2' From ab1563d0390d8d1e541b38c90523cf1dbbe1986b Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 18 May 2013 17:09:14 +0000 Subject: [PATCH 048/110] Array of fixes --- hugin-tools/PKGBUILD | 2 +- libgpod/PKGBUILD | 4 ++-- libimobiledevice/PKGBUILD | 2 +- usbmuxd/PKGBUILD | 40 +++++++++++++++++---------------------- usbmuxd/describe.sh | 5 +++++ usbmuxd/usbmuxd.service | 2 +- 6 files changed, 27 insertions(+), 28 deletions(-) create mode 100755 usbmuxd/describe.sh diff --git a/hugin-tools/PKGBUILD b/hugin-tools/PKGBUILD index 05399b83a..92c2d49d2 100644 --- a/hugin-tools/PKGBUILD +++ b/hugin-tools/PKGBUILD @@ -42,7 +42,7 @@ package() { make DESTDIR="${pkgdir}" install # Remove frontend files - rm -f "${pkgdir}"/usr/share/applications/pto_gen.desktop + rm -rf "${pkgdir}"/usr/share/applications rm -rf "${pkgdir}"/usr/share/man rm -rf "${pkgdir}"/usr/share/locale } diff --git a/libgpod/PKGBUILD b/libgpod/PKGBUILD index f1b2cd595..888eb9d36 100644 --- a/libgpod/PKGBUILD +++ b/libgpod/PKGBUILD @@ -6,8 +6,8 @@ pkgrel=3 pkgdesc="libgpod is a shared library to access the contents of an iPod" arch=('x86_64') license=('LGPL') -depends=('mutagen' 'sg3_utils>=1.27' 'libimobiledevice' 'gdk-pixbuf2') -makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject') +depends=('mutagen' 'sg3_utils' 'libplist' 'libimobiledevice' 'gdk-pixbuf2') +makedepends=('intltool' 'swig' 'docbook-xsl' 'python2-gobject') url="http://www.gtkpod.org/libgpod.html" source=("http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2") options=(!libtool) diff --git a/libimobiledevice/PKGBUILD b/libimobiledevice/PKGBUILD index 02d9c4c3a..4cc0a4469 100644 --- a/libimobiledevice/PKGBUILD +++ b/libimobiledevice/PKGBUILD @@ -8,7 +8,7 @@ url="http://libimobiledevice.org/" arch=('x86_64') license=('GPL2' 'LGPL2.1') depends=('gnutls' 'glib2' 'libplist' 'usbmuxd' 'libgcrypt') -makedepends=('swig' 'python2') +makedepends=('python2') options=('!libtool') source=("http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") md5sums=('d9debdcf71508dee2c85b60b28ccddd4') diff --git a/usbmuxd/PKGBUILD b/usbmuxd/PKGBUILD index 4916ceaaa..731a25b3c 100644 --- a/usbmuxd/PKGBUILD +++ b/usbmuxd/PKGBUILD @@ -1,28 +1,34 @@ # # Platform Packages for Chakra, part of chakra-project.org # -# maintainer abveritas[at]chakra-project[dot]org> pkgname=usbmuxd pkgver=1.0.8 -pkgrel=2 +pkgrel=6 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" -arch=('x86_64') +arch=('i686' 'x86_64') license=('GPL2' 'GPL3' 'LGPL2.1') depends=('libusb' 'libplist') makedepends=('cmake') install=usbmuxd.install source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2" - 'usbmuxd.service' - '85-usbmuxd.rules') + 'usbmuxd.service' + '85-usbmuxd.rules' + 'describe.sh') md5sums=('87fd27773a84e97ac6e2dc28b08d682e' - '099ab951e94be0803f5706f90dc63054' - 'dc4b2893651149eccbf7b2c8467cd288') + 'dae0660f972510a6483992b5b81e1b5a' + 'dc4b2893651149eccbf7b2c8467cd288' + 'cee8939dde34ab17ba0832bc53611541') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - echo "${pkgver}" > version.tag + + echo "${pkgver}" > version.tag + rm "${srcdir}/${pkgname}-${pkgver}/Modules/describe.sh" + cp "${srcdir}/describe.sh" "${srcdir}/${pkgname}-${pkgver}/Modules/describe.sh" + mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX="" @@ -33,23 +39,11 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install - # Fix dirty versioning - if [ -e ${pkgdir}/usr/lib/libusbmuxd.so.-dirty ] ; then - sed -i -e "s~-dirty~${pkgver}~g" ${pkgdir}/usr/lib/pkgconfig/libusbmuxd.pc - mv ${pkgdir}/usr/lib/libusbmuxd.so.-dirty ${pkgdir}/usr/lib/libusbmuxd.so.${pkgver} - elif [ -e ${pkgdir}/usr/lib/libusbmuxd.so.UNKNOWN ] ; then - sed -i -e "s~-UNKNOWN~${pkgver}~g" ${pkgdir}/usr/lib/pkgconfig/libusbmuxd.pc - mv ${pkgdir}/usr/lib/libusbmuxd.so.UNKNOWN ${pkgdir}/usr/lib/libusbmuxd.so.${pkgver} - fi - - # install systemd service file - install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service - - # udev moved to /usr/lib + # fix udev dir being hardcoded mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" rmdir "${pkgdir}/lib" - + # install systemd service file + install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service # use udev rule that works with systemd install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ } - diff --git a/usbmuxd/describe.sh b/usbmuxd/describe.sh new file mode 100755 index 000000000..665b178e7 --- /dev/null +++ b/usbmuxd/describe.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +if [ -e version.tag ]; then + /bin/echo -n `cat version.tag` +fi diff --git a/usbmuxd/usbmuxd.service b/usbmuxd/usbmuxd.service index 7863a7d9e..fbebf65b9 100644 --- a/usbmuxd/usbmuxd.service +++ b/usbmuxd/usbmuxd.service @@ -2,4 +2,4 @@ Description=iOS USB Muxer [Service] -ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux \ No newline at end of file +ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux From 0009ee8bd62f6140077c0c468bccdd229638c5c0 Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 20 May 2013 17:37:21 +0000 Subject: [PATCH 049/110] New kernel --- catalyst-legacy/PKGBUILD | 4 ++-- catalyst-legacy/catalyst.install | 2 +- catalyst-utils/PKGBUILD | 6 +++--- catalyst/PKGBUILD | 4 +--- catalyst/catalyst.install | 2 +- madwifi/PKGBUILD | 3 +-- nvidia-bumblebee/PKGBUILD | 4 ++-- nvidia-bumblebee/nvidia.install | 6 +++--- nvidia/PKGBUILD | 2 -- nvidia/conftest_new.diff | 11 ----------- 10 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 nvidia/conftest_new.diff diff --git a/catalyst-legacy/PKGBUILD b/catalyst-legacy/PKGBUILD index 7307f79f8..e6152a56d 100644 --- a/catalyst-legacy/PKGBUILD +++ b/catalyst-legacy/PKGBUILD @@ -1,7 +1,7 @@ # # Chakra Packages for Chakra, part of chakra-project.org -_kernver="3.9.0-1-CHAKRA" +_kernver="3.9.2-1-CHAKRA" pkgname=('catalyst-legacy' 'chd-catalyst-legacy') pkgver=13.1 @@ -24,7 +24,7 @@ md5sums=('c07fd1332abe4c742a9a0d0e0d0a90de' '9adef6e20662d5e486e15bc5ec40751f' '83b8d2063458cc9e8b6679567b280e36' 'cff482b58c9090a66cb82159a2170654' - '37c100cc9e5cc5e8233a72d5e53487ff') + 'cbb8c2f388a8ad617656c412e3a6690f') build() { diff --git a/catalyst-legacy/catalyst.install b/catalyst-legacy/catalyst.install index 92e2a75f3..18a5d0557 100644 --- a/catalyst-legacy/catalyst.install +++ b/catalyst-legacy/catalyst.install @@ -1,5 +1,5 @@ -KERNEL_VERSION=3.9.0-1-CHAKRA +KERNEL_VERSION=3.9.2-1-CHAKRA remove_hook(){ diff --git a/catalyst-utils/PKGBUILD b/catalyst-utils/PKGBUILD index 667e72c05..566a79e18 100644 --- a/catalyst-utils/PKGBUILD +++ b/catalyst-utils/PKGBUILD @@ -6,7 +6,7 @@ pkgname=catalyst-utils # Edit chakra-hardware-detection/hooks/hwdetect_7_graphics on version jump from 1x.x pkgver=13.4 pkgrel=1 -_amdver=9.012 +_amdver=12.104 pkgdesc="AMD/ATI Catalyst drivers utilities and libraries." arch=('x86_64') url="http://www.amd.com/us/Pages/AMDHomePage.aspx" @@ -14,8 +14,8 @@ license=('custom') depends=('xorg-server>=1.11.0' 'xorg-server<1.13.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'libxinerama') optdepends=('qt: to run ATi Catalyst Control Center (amdcccle)' 'libxxf86vm: to run ATi Catalyst Control Center (amdcccle)') -conflicts=('catalyst-test' 'nvidia-utils' 'libgl' 'catalystpxp-utils' 'catalyst-legacy-utils') -provides=('libgl' "libatical=${pkgver}") +conflicts=('catalyst-test' 'nvidia-utils' 'libgl' 'libcl' 'catalystpxp-utils' 'catalyst-legacy-utils') +provides=('libgl' 'libcl' "libatical=${pkgver}") install=${pkgname}.install source=( diff --git a/catalyst/PKGBUILD b/catalyst/PKGBUILD index 54dc45e47..4b6460898 100644 --- a/catalyst/PKGBUILD +++ b/catalyst/PKGBUILD @@ -1,9 +1,7 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas[at]chakra-project[dot]org> -_kernver="3.9.0-1-CHAKRA" +_kernver="3.9.2-1-CHAKRA" pkgname=(catalyst chd-catalyst) pkgver=13.4 diff --git a/catalyst/catalyst.install b/catalyst/catalyst.install index 92e2a75f3..18a5d0557 100644 --- a/catalyst/catalyst.install +++ b/catalyst/catalyst.install @@ -1,5 +1,5 @@ -KERNEL_VERSION=3.9.0-1-CHAKRA +KERNEL_VERSION=3.9.2-1-CHAKRA remove_hook(){ diff --git a/madwifi/PKGBUILD b/madwifi/PKGBUILD index 771aa9c2e..6731cdd61 100644 --- a/madwifi/PKGBUILD +++ b/madwifi/PKGBUILD @@ -1,6 +1,5 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# _extramodules=extramodules-3.9-CHAKRA _kver="$(cat /lib/modules/${_extramodules}/version)" @@ -13,7 +12,7 @@ arch=('x86_64') license=('GPL') url="http://madwifi-project.org" depends=('madwifi-utils' 'linux>=3.9' 'linux<3.10') -makedepends=('linux-headers' 'sharutils') +makedepends=('linux-headers' 'sharutils' 'subversion') install=madwifi-ng.install # subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi source=(http://chakra.sourceforge.net/sources/madwifi/madwifi-${pkgver}.tar.gz) diff --git a/nvidia-bumblebee/PKGBUILD b/nvidia-bumblebee/PKGBUILD index 1289bd86d..d76d88a28 100644 --- a/nvidia-bumblebee/PKGBUILD +++ b/nvidia-bumblebee/PKGBUILD @@ -6,8 +6,8 @@ pkgname=nvidia-bumblebee pkgver=313.30 pkgrel=1 -_kernver='3.9.0-1-CHAKRA' -_extramodules='extramodules-3.8-CHAKRA' +_kernver='3.9.2-1-CHAKRA' +_extramodules='extramodules-3.9-CHAKRA' pkgdesc="NVIDIA drivers for linux. Packaged for Bumblebee" arch=('x86_64') url="http://www.nvidia.com/" diff --git a/nvidia-bumblebee/nvidia.install b/nvidia-bumblebee/nvidia.install index c341abef7..27d988f15 100644 --- a/nvidia-bumblebee/nvidia.install +++ b/nvidia-bumblebee/nvidia.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) #echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.8-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/nvidia/PKGBUILD b/nvidia/PKGBUILD index 0e23f02c3..8fdb91a61 100644 --- a/nvidia/PKGBUILD +++ b/nvidia/PKGBUILD @@ -1,7 +1,5 @@ # # Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org _extramodules=extramodules-3.9-CHAKRA _kver=$(cat /lib/modules/${_extramodules}/version) diff --git a/nvidia/conftest_new.diff b/nvidia/conftest_new.diff deleted file mode 100644 index b75666521..000000000 --- a/nvidia/conftest_new.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh 2013-02-04 15:10:20.669633666 -0500 -+++ b/NVIDIA-Linux-x86_64-313.18-no-compat32/kernel/conftest.sh 2013-02-04 15:10:34.283334673 -0500 -@@ -1701,7 +1701,7 @@ - SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3) - - if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \ -- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then -+ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then - SELECTED_MAKEFILE=Makefile.kbuild - RET=0 - fi From 0ce7ac0d1a31e2c3282bf63a028a3ed1dbcf4900 Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 20 May 2013 20:50:15 +0000 Subject: [PATCH 050/110] Fix missing folder --- pango/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pango/PKGBUILD b/pango/PKGBUILD index c05beb8f2..510eb2535 100644 --- a/pango/PKGBUILD +++ b/pango/PKGBUILD @@ -4,7 +4,7 @@ pkgname=pango pkgver=1.32.5 -pkgrel=1 +pkgrel=2 pkgdesc="A library for layout and rendering of text" arch=('x86_64') license=('LGPL') @@ -27,4 +27,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc/pango" } From d73a12ac1123f9de194ccc35d1c6d3bf0e05a518 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 21 May 2013 20:55:33 +0000 Subject: [PATCH 051/110] Add swh-plugins from ccr --- swh-plugins/PKGBUILD | 39 ++++++++++++++++++++++++++++++++ swh-plugins/mbeq_crash_fix.patch | 39 ++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 swh-plugins/PKGBUILD create mode 100644 swh-plugins/mbeq_crash_fix.patch diff --git a/swh-plugins/PKGBUILD b/swh-plugins/PKGBUILD new file mode 100644 index 000000000..b65ed6aa0 --- /dev/null +++ b/swh-plugins/PKGBUILD @@ -0,0 +1,39 @@ +pkgname=swh-plugins +pkgver=0.4.15 +pkgrel=1 +pkgdesc="Steve Harris' LADSPA plug-ins suite" +arch=('i686' 'x86_64') +url="http://plugin.org.uk/" +license=('GPL') +depends=('fftw' 'ladspa') +makedepends=('libxml2' 'perlxml') +groups=('ladspa-plugins') +source=("http://plugin.org.uk/releases/$pkgver/$pkgname-$pkgver.tar.gz" + 'mbeq_crash_fix.patch') +md5sums=('2fbdccef2462ea553901acd429fa3573' + 'a60422c8dea95bee6f9adcdc70dff7e0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Arch64 fix; + # -fPIC seems to be the only option + if [ "$CARCH" = 'x86_64' ]; then + export CFLAGS="$CFLAGS -fPIC" + export CXXFLAGS="$CFLAGS" + fi + + # fix Firefox crash on x64 when + # plugin is in use by ALSA; + # see https://bugs.archlinux.org/task/24579 + patch -Np1 -i "$srcdir/mbeq_crash_fix.patch" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/swh-plugins/mbeq_crash_fix.patch b/swh-plugins/mbeq_crash_fix.patch new file mode 100644 index 000000000..37ddd33a9 --- /dev/null +++ b/swh-plugins/mbeq_crash_fix.patch @@ -0,0 +1,39 @@ +diff -Nru swh-plugins-0.4.15.orig/mbeq_1197.c swh-plugins-0.4.15/mbeq_1197.c +--- swh-plugins-0.4.15.orig/mbeq_1197.c 2006-08-09 01:49:15.000000000 +1000 ++++ swh-plugins-0.4.15/mbeq_1197.c 2011-06-05 10:57:17.929107102 +1000 +@@ -457,7 +457,8 @@ + #endif + + // Multiply the bins magnitudes by the coeficients +- for (i = 0; i < FFT_LENGTH/2; i++) { ++ comp[0] *= coefs[0]; ++ for (i = 1; i < FFT_LENGTH/2; i++) { + comp[i] *= coefs[i]; + comp[FFT_LENGTH-i] *= coefs[i]; + } +diff -Nru swh-plugins-0.4.15.orig/mbeq_1197.so.c swh-plugins-0.4.15/mbeq_1197.so.c +--- swh-plugins-0.4.15.orig/mbeq_1197.so.c 2003-10-22 02:13:40.000000000 +1000 ++++ swh-plugins-0.4.15/mbeq_1197.so.c 2011-06-05 10:57:52.265774336 +1000 +@@ -446,7 +446,8 @@ + #endif + + // Multiply the bins magnitudes by the coeficients +- for (i = 0; i < FFT_LENGTH/2; i++) { ++ comp[0] *= coefs[0]; ++ for (i = 1; i < FFT_LENGTH/2; i++) { + comp[i] *= coefs[i]; + comp[FFT_LENGTH-i] *= coefs[i]; + } +diff -Nru swh-plugins-0.4.15.orig/mbeq_1197.xml swh-plugins-0.4.15/mbeq_1197.xml +--- swh-plugins-0.4.15.orig/mbeq_1197.xml 2005-06-01 19:51:58.000000000 +1000 ++++ swh-plugins-0.4.15/mbeq_1197.xml 2011-06-05 10:57:39.335774121 +1000 +@@ -171,7 +171,8 @@ + #endif + + // Multiply the bins magnitudes by the coeficients +- for (i = 0; i < FFT_LENGTH/2; i++) { ++ comp[0] *= coefs[0]; ++ for (i = 1; i < FFT_LENGTH/2; i++) { + comp[i] *= coefs[i]; + comp[FFT_LENGTH-i] *= coefs[i]; + } From 67ecef148f19c03c51531a61dc29e7f1b3cfb57a Mon Sep 17 00:00:00 2001 From: AlmAck Date: Tue, 21 May 2013 23:22:18 +0200 Subject: [PATCH 052/110] pulseaudio rebuild, autospawn reverted to true, added tscher=0 to prevent no or bad audio on vlc and skype, removed .desktop files because pulseaudio starts automatically --- pulseaudio/PKGBUILD | 22 ++++++++++++---------- pulseaudio/pulseaudio.install | 4 ++-- pulseaudio/pulseaudio.xinit | 12 ------------ 3 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 pulseaudio/pulseaudio.xinit diff --git a/pulseaudio/PKGBUILD b/pulseaudio/PKGBUILD index 304590562..fd466ec2d 100644 --- a/pulseaudio/PKGBUILD +++ b/pulseaudio/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=3.99.1 -pkgrel=3 +pkgrel=4 arch=('x86_64') url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -12,10 +12,9 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit speex tdb systemd dbus avahi bluez intltool jack sbc lirc-utils openssl fftw orc json-c webrtc-audio-processing) options=(!emptydirs !libtool) -source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - pulseaudio.xinit) -sha256sums=('01266830d73316364075ac81a2d67e9098332533fdf9273057e6324c7bbef9c5' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') +source=(http://cgit.freedesktop.org/pulseaudio/pulseaudio/snapshot/pulseaudio-c0a4f811234c0aa75533f9ddc8d68b7af6a9ff63.tar.gz) +# original: http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz +sha256sums=('7308618c6c064c1dbde3e0bde400e6533d17b9467795c1681d8f230a4f4f641c') build() { cd $pkgbase-$pkgver @@ -51,10 +50,6 @@ package_pulseaudio() { cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install - # Disable autospawn by default - sed -e '/autospawn/iautospawn=no' \ - -i "$pkgdir/etc/pulse/client.conf" - # Speed up pulseaudio shutdown # Lower resample quality, saves CPU sed -e '/exit-idle-time/iexit-idle-time=0' \ @@ -73,8 +68,15 @@ package_pulseaudio() { # Python fix sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" - install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" + rm "${pkgdir}/etc/xdg/autostart/pulseaudio.desktop" + rm "${pkgdir}/etc/xdg/autostart/pulseaudio-kde.desktop" + # Delay of sound notification workaround, needs to be removed once fixed in systemd + sed -e 's/load-module module-udev-detect/load-module module-udev-detect tsched=0/' \ + -i "${pkgdir}/etc/pulse/default.pa" + + # Used only for SystemWide no needed for us + # http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" # cap is handled in .install diff --git a/pulseaudio/pulseaudio.install b/pulseaudio/pulseaudio.install index de2434283..6b5c31857 100755 --- a/pulseaudio/pulseaudio.install +++ b/pulseaudio/pulseaudio.install @@ -1,8 +1,8 @@ post_upgrade() { echo -e '\e[31;46m WARNING \e[0m' - echo 'If you have per-user copies of configuration files in ~/.pulse/,' + echo 'If you have per-user copies of configuration files in ~/.config/pulse/,' echo 'make sure you keep them in sync with changes to the packaged files in /etc/pulse/.' echo 'Otherwise, PulseAudio may refuse to start due to configuration errors.' - echo 'Deleting ~/.pulse/ is another option to avoid these configuration errors.' + echo 'Deleting ~/.config/pulse/ is another option to avoid these configuration errors.' } diff --git a/pulseaudio/pulseaudio.xinit b/pulseaudio/pulseaudio.xinit deleted file mode 100644 index 2d30c0943..000000000 --- a/pulseaudio/pulseaudio.xinit +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -case "$DESKTOP_SESSION" in - gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart - ;; - *) - # Extra checks in case DESKTOP_SESSION is not set correctly - if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then - /usr/bin/start-pulseaudio-x11 - fi - ;; -esac From 13430203ef727580e6c7f451163408b42723ed86 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Wed, 22 May 2013 09:46:20 +0000 Subject: [PATCH 053/110] bbswitch update --- bbswitch/PKGBUILD | 22 ++++++++++------------ bbswitch/bbswitch.install | 6 +++--- bumblebee/PKGBUILD | 13 +++++++++---- primus/PKGBUILD | 12 +++++------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/bbswitch/PKGBUILD b/bbswitch/PKGBUILD index 56bc61dd5..22f28da8e 100644 --- a/bbswitch/PKGBUILD +++ b/bbswitch/PKGBUILD @@ -1,28 +1,26 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org +# maintainer tetris4@gmail.com +# contributions from: https://www.archlinux.org/packages/community/x86_64/bbswitch/ -_extramodules=extramodules-3.7-CHAKRA +_extramodules=extramodules-3.9-CHAKRA _kver="$(cat /lib/modules/${_extramodules}/version)" pkgname=bbswitch -pkgver=0.5 -pkgrel=6 +pkgver=0.6 +pkgrel=1 pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops" arch=('x86_64') url=("http://github.com/Bumblebee-Project/bbswitch") license=('GPL') provides=('bbswitch') install=bbswitch.install -depends=('linux>=3.7' 'linux<3.8') +depends=('linux>=3.9' 'linux<3.10') makedepends=('linux' 'linux-headers') -source=("https://github.com/downloads/Bumblebee-Project/bbswitch/${pkgname}-${pkgver}.tar.gz") -md5sums=('5e0e6eb9c5e8c10db56e5b349b43bba7') +source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz") +md5sums=('c5496e3225c8e70d02a24bfd8a50faf6') build() { cd ${srcdir}/${pkgname}-${pkgver} - make + make KDIR=/usr/src/linux-${_kver} } package() { @@ -31,9 +29,9 @@ package() { # KDIR is necessary even when cleaning #make KDIR=/usr/src/linux-${_kver} clean - make KDIR=/usr/src/linux-${_kver} mkdir -p $pkgdir//lib/modules/${_extramodules} install -D -m644 bbswitch.ko $pkgdir/lib/modules/${_extramodules} gzip "${pkgdir}/lib/modules/${_extramodules}/bbswitch.ko" + #automatically update bbswitch.install sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/bbswitch.install" } diff --git a/bbswitch/bbswitch.install b/bbswitch/bbswitch.install index a2ed92679..87fb39062 100644 --- a/bbswitch/bbswitch.install +++ b/bbswitch/bbswitch.install @@ -1,15 +1,15 @@ post_install() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) echo 'In order to use nvidia module, reboot the system.' } post_upgrade() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/bumblebee/PKGBUILD b/bumblebee/PKGBUILD index 71d3588dd..63073f081 100644 --- a/bumblebee/PKGBUILD +++ b/bumblebee/PKGBUILD @@ -3,18 +3,20 @@ # Contributions from AUR: https://aur.archlinux.org/packages/bumblebee/ pkgname=bumblebee -pkgver=3.1 +pkgver=3.2.1 pkgrel=1 pkgdesc="Bumblebee brings Optimus Support for Linux Through VirtualGL. You need to install proper drivers separately. Can be used with Nouveau or Nvidia" arch=('x86_64') -depends=('virtualgl' 'libbsd' 'glib2') +depends=('virtualgl' 'glib2') +makedepends=('help2man') optdepends=('xf86-video-nouveau: Nouveau driver' 'nouveau-dri: 3D acceleration features fo Nouveau' 'mesa: 3D acceleration features fo Nouveau' 'bbswitch: switch on/off discrete card' 'nvidia-utils-bumblebee: Nvidia utils not breaking LibGL' 'nvidia: Nvidia kernel driver' 'lib32-virtualgl: run 32bit applications with optirun' - 'primus: alternative back-end for optirun') + 'primus: alternative back-end for optirun' + 'lib32-primus: alternative back-end for optirun' ) url="http://www.Bumblebee-Project.org" license=("GPL3") install='bumblebee.install' @@ -23,7 +25,7 @@ backup=('etc/bumblebee/bumblebee.conf' 'etc/bumblebee/xorg.conf.nouveau' 'etc/bumblebee/xorg.conf.nvidia') source=("http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz") -md5sums=('de515ef51b1e0714c2f1b2a95f83e77e') +md5sums=('30974e677bb13e8a3825fd6f3e7d3b24') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -32,6 +34,8 @@ build() { CONF_LDPATH_NVIDIA=/usr/lib/nvidia-bumblebee:/usr/lib32/nvidia-bumblebee \ CONF_MODPATH_NVIDIA=/usr/lib/nvidia-bumblebee/xorg/,/usr/lib/xorg/modules \ --prefix=/usr \ + --with-udev-rules=/usr/lib/udev/rules.d/ \ + --without-pidfile \ --sysconfdir=/etc make } @@ -42,6 +46,7 @@ package() { # Install systemd unit install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" + # Make bash_completion work mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun" } diff --git a/primus/PKGBUILD b/primus/PKGBUILD index c6f70451c..64bd7a0a5 100644 --- a/primus/PKGBUILD +++ b/primus/PKGBUILD @@ -1,22 +1,20 @@ -# Platform Packages for Chakra # Maintainer: Neophytos Kolokotronis # Contributions from AUR: https://aur.archlinux.org/packages/primus-git/ pkgname=primus -pkgver=20130225 -pkgrel=2 +pkgver=20130522 +pkgrel=1 pkgdesc="Faster OpenGL offloading for Bumblebee (git sources)" arch=('x86_64') url="https://github.com/amonakov/primus" license=('custom:ISC') -depends=('bumblebee' 'mesa' 'nvidia-utils-bumblebee') +depends=('bumblebee') makedepends=('git') provides=('primus') -conflicts=('primus') source=("${pkgname}-${pkgver}.tar.xz") -md5sums=('a14c23f09dcb94265ae5e9379b02d064') +md5sums=('2fc8e98a02a0b20fb46e7797ee058bd9') -# create tarball: source PKGBUILD && mksource +# run this first to create the tarball: source PKGBUILD && mksource mksource() { if [ "${1}" = "" ] ; then From d22012efd0410e80f4bb216d8ce80890d2c46030 Mon Sep 17 00:00:00 2001 From: Manuel Date: Wed, 22 May 2013 19:02:53 +0000 Subject: [PATCH 054/110] Remove this ugly versionning --- pango/PKGBUILD | 6 ++---- perl-archive-zip/PKGBUILD | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pango/PKGBUILD b/pango/PKGBUILD index 510eb2535..3c2cb95b2 100644 --- a/pango/PKGBUILD +++ b/pango/PKGBUILD @@ -1,16 +1,14 @@ # Platform Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org pkgname=pango pkgver=1.32.5 -pkgrel=2 +pkgrel=3 pkgdesc="A library for layout and rendering of text" arch=('x86_64') license=('LGPL') depends=('cairo' 'libxft' 'libthai' 'harfbuzz') makedepends=('gobject-introspection' 'libxt' 'fontconfig') -options=('!libtool' '!emptydirs') +options=('!libtool') install=pango.install source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.xz") url="http://www.pango.org/" diff --git a/perl-archive-zip/PKGBUILD b/perl-archive-zip/PKGBUILD index 46e162ee3..aab1110db 100644 --- a/perl-archive-zip/PKGBUILD +++ b/perl-archive-zip/PKGBUILD @@ -2,25 +2,25 @@ pkgname=perl-archive-zip _realname=Archive-Zip -pkgver=1.31_02 -pkgrel=2 +pkgver=1.31 +pkgrel=1 pkgdesc="Provide a perl interface to ZIP archive files" arch=(any) license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.14.2') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${_realname}-${pkgver}.tar.gz) +source=(http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${_realname}-${pkgver}_02.tar.gz) md5sums=('357725f70a98aa361598ac595af9599f') build() { - cd ${srcdir}/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver}_02 # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } package() { - cd ${srcdir}/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${pkgver}_02 make install DESTDIR=${pkgdir} } From 9b3d6f680aa211d92621614d92367c8266ced8b9 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Thu, 23 May 2013 23:50:27 +0200 Subject: [PATCH 055/110] pulseaudio updated to version 3.99.2 moved the bash-completion directory from /etc to /usr/share --- pulseaudio/PKGBUILD | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pulseaudio/PKGBUILD b/pulseaudio/PKGBUILD index fd466ec2d..d461b6fea 100644 --- a/pulseaudio/PKGBUILD +++ b/pulseaudio/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=3.99.1 -pkgrel=4 +pkgver=3.99.2 +pkgrel=1 arch=('x86_64') url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -12,9 +12,8 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit speex tdb systemd dbus avahi bluez intltool jack sbc lirc-utils openssl fftw orc json-c webrtc-audio-processing) options=(!emptydirs !libtool) -source=(http://cgit.freedesktop.org/pulseaudio/pulseaudio/snapshot/pulseaudio-c0a4f811234c0aa75533f9ddc8d68b7af6a9ff63.tar.gz) -# original: http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz -sha256sums=('7308618c6c064c1dbde3e0bde400e6533d17b9467795c1681d8f230a4f4f641c') +source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz) +sha256sums=('165dc52760377af939d06b49a170ef65c4b844b22020b57c69c9bd6fe56c781c') build() { cd $pkgbase-$pkgver @@ -48,8 +47,12 @@ package_pulseaudio() { install=pulseaudio.install cd $pkgbase-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install \ + bashcompletiondir=/usr/share/bash-completion/completions + install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ + "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" + # Speed up pulseaudio shutdown # Lower resample quality, saves CPU sed -e '/exit-idle-time/iexit-idle-time=0' \ From bb5da015023e11e6de9f22cb9d04d2d159122be6 Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 24 May 2013 18:33:21 +0000 Subject: [PATCH 056/110] Update --- hplip/PKGBUILD | 107 +++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 48 deletions(-) diff --git a/hplip/PKGBUILD b/hplip/PKGBUILD index 479a86d60..d8cce4b42 100644 --- a/hplip/PKGBUILD +++ b/hplip/PKGBUILD @@ -3,10 +3,8 @@ # maintainer abveritas@chakra-project.org pkgname=hplip -pkgver=3.13.3 -# incase a or b is used in hplip rls: -_pkgver=3.13.3 -pkgrel=2 +pkgver=3.13.5 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet." arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -21,42 +19,54 @@ optdepends=('cups: for printing support' 'pyqt: for running hp-toolbox' 'python2-gobject: for running hp-toolbox') options=('!libtool') -install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.gz" - "cups-1.6-buildfix.diff") -sha1sums=('e571cfac1a30c947b3526de691cbe3cf31590bfb' - '7a3b476eb8bcecb4988eadc26924b053a3ed4fbb') +install=hplip.install +source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} + cups-1.6-buildfix.diff + hp-mkuri.patch + hplip_typo.patch) +md5sums=('f0c406f06f191a120f7d283b69ff10e8' + 'SKIP' + 'ef64578c6cb3ce252dbdcb0f1c2f4a47' + '0bd7779fdbc4d7a9386df04dce2cb8d4' + 'b3dd33a538ed8a3774f3c22f13e0a549') build() { - cd "${srcdir}/${pkgname}-${_pkgver}" + cd "$srcdir/$pkgname-$pkgver" - # fix build with cups 1.6 - FC hplip-ipp-accessors.patch - patch -p1 -i ${srcdir}/cups-1.6-buildfix.diff + # fix build with cups 1.6 - FC hplip-ipp-accessors.patch + patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff" + + # fix linking libnotify, FS#34283 + patch -Np0 -i ${srcdir}/hp-mkuri.patch - export PYTHON=python2 - find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py logcapture.py base/magic.py - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py - sed -i 's|python ./print.py|python2 ./print.py|' scan.py - sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py - sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py - sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py - sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py + # fix typo preventing FW to load + patch -Np0 -i ${srcdir}/hplip_typo.patch + + export PYTHON=python2 + + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py makeuri.py logcapture.py base/magic.py + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py + sed -i 's|python ./print.py|python2 ./print.py|' scan.py + sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py + sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py + sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py + sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py + + # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip + # The hpcups driver does not use foomatic-rip + local i + for i in ppd/hpijs/*.ppd.gz ; do + rm -f ${i}.temp + gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ + gzip > ${i}.temp || return 1 + mv ${i}.temp ${i} + done + + export AUTOMAKE='automake --foreign' + autoreconf --force --install - # from Gentoo - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip - local i - for i in ppd/hpijs/*.ppd.gz ; do - rm -f ${i}.temp - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \ - gzip > ${i}.temp || return 1 - mv ${i}.temp ${i} - done - - export AUTOMAKE='automake --foreign' - autoreconf --force --install - - ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --enable-qt4 \ --disable-foomatic-rip-hplip-install \ --enable-foomatic-ppd-install \ @@ -67,23 +77,24 @@ build() { --enable-hpijs-install \ --enable-foomatic-drv-install \ --enable-pp-build \ - --enable-udev-acl-rules - make + --enable-udev-acl-rules #--help + + make } package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - - make rulesdir=/usr/lib/udev/rules.d DESTDIR="${pkgdir}/" install - + cd "$srcdir/$pkgname-${pkgver/.a/a}" + make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install + # remove config provided by sane and autostart of hp-daemon - rm -rf "${pkgdir}"/etc/{sane.d,xdg} + rm -rf "$pkgdir"/etc/{sane.d,xdg} - # remove HAL .fdi file - rm -rf "${pkgdir}"/usr/share/hal - - # remove rc + # remove HAL .fdi file because HAL is no longer used + rm -rf "$pkgdir"/usr/share/hal + + # log dir should not be world writeable + chmod 775 "$pkgdir"/var/log/hp{,/tmp} + + # remove rc script rm -rf "$pkgdir"/etc/init.d - - sed -i "s:\$attrs:\$attr:g" $pkgdir/usr/lib/udev/rules.d/56-hpmud_support.rules } From f865107ead488f2572e55c7e1c97af6937cf4101 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Sat, 25 May 2013 21:57:34 +0200 Subject: [PATCH 057/110] pulseaudio, fix kde integration --- pulseaudio/PKGBUILD | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/pulseaudio/PKGBUILD b/pulseaudio/PKGBUILD index d461b6fea..a1e20ddcb 100644 --- a/pulseaudio/PKGBUILD +++ b/pulseaudio/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=3.99.2 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -52,31 +52,35 @@ package_pulseaudio() { install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" + + # Disable cork-request module, can result in e.g. media players unpausing + # when there's a Skype call incoming + sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ + -i "$pkgdir/usr/bin/start-pulseaudio-x11" + + # Python fix + sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" + #### daemon.conf #### # Speed up pulseaudio shutdown # Lower resample quality, saves CPU sed -e '/exit-idle-time/iexit-idle-time=0' \ -e '/resample-method/iresample-method=speex-float-0' \ -i "$pkgdir/etc/pulse/daemon.conf" - # Disable cork-request module, can result in e.g. media players unpausing - # when there's a Skype call incoming - sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ - -i "$pkgdir/usr/bin/start-pulseaudio-x11" - - # Make ConsoleKit optional - sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ - -i "$pkgdir/etc/pulse/default.pa" - - # Python fix - sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" - - rm "${pkgdir}/etc/xdg/autostart/pulseaudio.desktop" - rm "${pkgdir}/etc/xdg/autostart/pulseaudio-kde.desktop" - + #### default.pa #### # Delay of sound notification workaround, needs to be removed once fixed in systemd sed -e 's/load-module module-udev-detect/load-module module-udev-detect tsched=0/' \ -i "${pkgdir}/etc/pulse/default.pa" + + # Enable the pulse support in KDE by default + # http://www.freedesktop.org/wiki/Software/PulseAudio/Desktops/KDE/ + sed -e '$ a\\n### Enable the routing system employed in KDE to work at a lower level.\nload-module module-device-manager do_routing=1' \ + -i "${pkgdir}/etc/pulse/default.pa" + + # The modules loaded by this script are integrated in default.pa + rm "${pkgdir}/etc/xdg/autostart/pulseaudio.desktop" + rm "${pkgdir}/etc/xdg/autostart/pulseaudio-kde.desktop" # Used only for SystemWide no needed for us # http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ From 0382f64f133106e604eb1221cdbf617684e67164 Mon Sep 17 00:00:00 2001 From: manu tortosa Date: Sun, 26 May 2013 10:21:31 +0200 Subject: [PATCH 058/110] Move to core --- chrpath/PKGBUILD | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 chrpath/PKGBUILD diff --git a/chrpath/PKGBUILD b/chrpath/PKGBUILD deleted file mode 100644 index a3801f65c..000000000 --- a/chrpath/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org - -pkgname=chrpath -pkgver=0.13 -pkgrel=1 -pkgdesc="Allows you to modify the dynamic library load path" -arch=('x86_64') -url="http://directory.fsf.org/project/chrpath/" -license=('GPL2') -depends=('glibc') -source=("http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('b73072a8fbba277558c50364b65bb407') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - - make DESTDIR="${pkgdir}" docdir=/usr/share/doc/chrpath install -} From 8f376c1cab02b7d7454f2d9276942b159a8162df Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 26 May 2013 08:40:03 +0000 Subject: [PATCH 059/110] Remove iptables units --- systemd-units/PKGBUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/systemd-units/PKGBUILD b/systemd-units/PKGBUILD index be81617ae..910f95267 100644 --- a/systemd-units/PKGBUILD +++ b/systemd-units/PKGBUILD @@ -1,8 +1,6 @@ - - pkgname=systemd-units pkgver=20120528 -pkgrel=16 +pkgrel=17 pkgdesc="Chakra GNU/Linux specific Systemd unit files" arch=('x86_64') url="http://github.com/falconindy/systemd-arch-units" @@ -10,7 +8,7 @@ license=('MIT') depends=('systemd>=44') groups=('systemd') install=systemd-units.install -source=("http://chakra-linux.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz") +source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz") md5sums=('1bef86deec263d52032114ee696323b2') @@ -62,4 +60,9 @@ package() { rm "$pkgdir"/usr/lib/systemd/system/gpsd.service rm "$pkgdir"/usr/lib/systemd/system/gpsd.socket rm "$pkgdir"/usr/lib/systemd/system/pdnsd.service + + # iptables + rm "$pkgdir"/usr/lib/systemd/scripts/iptables-flush + rm "$pkgdir"/usr/lib/systemd/system/iptables.service + rm "$pkgdir"/usr/lib/systemd/system/ip6tables.service } From 1a6ea126fb8e10799289e7c6c7b5beb1713cad6b Mon Sep 17 00:00:00 2001 From: "Adrian Chaves Fernandez (Gallaecio)" Date: Sun, 26 May 2013 10:43:16 +0000 Subject: [PATCH 060/110] Rebuilt pth --- pth/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pth/PKGBUILD b/pth/PKGBUILD index 3075d939b..9583824ee 100644 --- a/pth/PKGBUILD +++ b/pth/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pth pkgver=2.0.7 -pkgrel=3 +pkgrel=4 pkgdesc="The GNU Portable Threads." arch=('i686' 'x86_64') url="http://www.gnu.org/software/pth/" From 40957950e2537ab17ab02cf19231de41219aaaa2 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 26 May 2013 17:38:00 +0000 Subject: [PATCH 061/110] Fix depends --- nvidia-304xx/PKGBUILD | 4 ++-- systemd-units/PKGBUILD | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nvidia-304xx/PKGBUILD b/nvidia-304xx/PKGBUILD index 5b3504861..891f26d2d 100644 --- a/nvidia-304xx/PKGBUILD +++ b/nvidia-304xx/PKGBUILD @@ -6,7 +6,7 @@ _kver=$(cat /lib/modules/${_extramodules}/version) pkgname=('nvidia-304xx' 'chd-nvidia-304xx') pkgver=304.88 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="http://www.nvidia.com/" makedepends=('linux-headers' 'linux>=3.9' 'linux<3.10' "nvidia-304xx-utils=${pkgver}") @@ -27,7 +27,7 @@ build() { package_nvidia-304xx() { pkgdesc="NVIDIA drivers for linux." - depends=('linux>=3.8' 'linux<3.9' "nvidia-304xx-utils=${pkgver}") + depends=('linux>=3.9' 'linux<3.10' "nvidia-304xx-utils=${pkgver}") conflicts=('nvidia-96xx' 'nvidia-173xx' 'nvidia') install=nvidia.install diff --git a/systemd-units/PKGBUILD b/systemd-units/PKGBUILD index 910f95267..8ce2d4c24 100644 --- a/systemd-units/PKGBUILD +++ b/systemd-units/PKGBUILD @@ -1,24 +1,24 @@ pkgname=systemd-units pkgver=20120528 -pkgrel=17 +pkgrel=18 pkgdesc="Chakra GNU/Linux specific Systemd unit files" arch=('x86_64') url="http://github.com/falconindy/systemd-arch-units" license=('MIT') -depends=('systemd>=44') +depends=('systemd>=201') groups=('systemd') install=systemd-units.install source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz") md5sums=('1bef86deec263d52032114ee696323b2') - package() { cd "$srcdir/${pkgname}-${pkgver}" make DESTDIR="$pkgdir" install sed -i 's/udev-settle/systemd-&/' "$pkgdir"/usr/lib/systemd/system/{lvm,dmraid}.service + rm "$pkgdir"/usr/lib/systemd/system/bluetooth.service rm "$pkgdir"/usr/lib/systemd/system/cups.service rm "$pkgdir"/usr/lib/systemd/system/ntpd.service @@ -60,6 +60,7 @@ package() { rm "$pkgdir"/usr/lib/systemd/system/gpsd.service rm "$pkgdir"/usr/lib/systemd/system/gpsd.socket rm "$pkgdir"/usr/lib/systemd/system/pdnsd.service + rm "$pkgdir"/usr/lib/systemd/system/fam.service # iptables rm "$pkgdir"/usr/lib/systemd/scripts/iptables-flush From d4b377b95a371fa2bb366bd804339bf9ea27a292 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 26 May 2013 17:41:45 +0000 Subject: [PATCH 062/110] Add cronie --- cronie/PKGBUILD | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ cronie/cron.deny | 1 + cronie/pam.d | 10 +++++++ cronie/service | 11 ++++++++ 4 files changed, 90 insertions(+) create mode 100644 cronie/PKGBUILD create mode 100644 cronie/cron.deny create mode 100644 cronie/pam.d create mode 100644 cronie/service diff --git a/cronie/PKGBUILD b/cronie/PKGBUILD new file mode 100644 index 000000000..31b4327f2 --- /dev/null +++ b/cronie/PKGBUILD @@ -0,0 +1,68 @@ +pkgname="cronie" +pkgver=1.4.9 +pkgrel=4 +pkgdesc='Daemon that runs specified programs at scheduled times and related tools' +url='https://fedorahosted.org/cronie/' +license=('custom:BSD') +arch=('x86_64') +depends=('pam' 'bash' 'run-parts') +optdepends=('pm-utils: defer anacron on battery power' + 'smtp-server: send job output via email' + 'smtp-forwarder: forward job output to email server') + +source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'cron.deny' + 'service' + 'pam.d') +sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4' + '0f279b8fb820340267d578dc85511c980715f91e' + 'de455f11a310e64d6930390e57726ed70f3295d0' + '5eff7fb31f6bc0a924243ff046704726cf20c221') + +backup=('etc/anacrontab' + 'etc/pam.d/crond' + 'etc/cron.deny') + +conflicts=('cron') +provides=('cron') +groups=('base') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --sbindir=/usr/bin \ + --enable-anacron \ + --with-inotify \ + --with-pam \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + chmod u+s "${pkgdir}"/usr/bin/crontab + install -d "${pkgdir}"/var/spool/{ana,}cron + install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} + + install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond + install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service + + install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab + install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly + install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING +} diff --git a/cronie/cron.deny b/cronie/cron.deny new file mode 100644 index 000000000..06e685cc8 --- /dev/null +++ b/cronie/cron.deny @@ -0,0 +1 @@ +# without this file, only users listed in /etc/cron.allow can use crontab diff --git a/cronie/pam.d b/cronie/pam.d new file mode 100644 index 000000000..9a254ebc0 --- /dev/null +++ b/cronie/pam.d @@ -0,0 +1,10 @@ +auth required pam_unix.so +auth required pam_env.so + +account required pam_access.so +account required pam_unix.so +account required pam_time.so + +session required pam_loginuid.so +session required pam_limits.so +session required pam_unix.so diff --git a/cronie/service b/cronie/service new file mode 100644 index 000000000..cc671f7b6 --- /dev/null +++ b/cronie/service @@ -0,0 +1,11 @@ +[Unit] +Description=Periodic Command Scheduler + +[Service] +ExecStart=/usr/bin/crond -n +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +Restart=always + +[Install] +WantedBy=multi-user.target From f7dcefb2ed0500d4db610448e2f823e37a3f206e Mon Sep 17 00:00:00 2001 From: Manuel Date: Sun, 26 May 2013 18:36:23 +0000 Subject: [PATCH 063/110] Add missing folder --- networkmanager/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/networkmanager/PKGBUILD b/networkmanager/PKGBUILD index 0836bc22d..441f1c8ba 100644 --- a/networkmanager/PKGBUILD +++ b/networkmanager/PKGBUILD @@ -6,7 +6,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.8.0 -pkgrel=4 +pkgrel=5 pkgdesc="Network Management daemon" arch=('x86_64') license=('GPL') @@ -65,6 +65,7 @@ package() { make DESTDIR="$pkgdir" install install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" - + install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d" + rm -r "$pkgdir/var/run" } From 9842b85d8cee82082fe2d8834f658dd50fa44a09 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Mon, 27 May 2013 00:11:12 +0200 Subject: [PATCH 064/110] m17n-contrib updated to version 1.1.14 --- m17n-contrib/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/m17n-contrib/PKGBUILD b/m17n-contrib/PKGBUILD index 1a99c49a5..bbde3f870 100644 --- a/m17n-contrib/PKGBUILD +++ b/m17n-contrib/PKGBUILD @@ -1,16 +1,16 @@ pkgname=m17n-contrib -pkgver=1.1.12 +pkgver=1.1.14 pkgrel=1 pkgdesc="Contributions (input methods) for m17n" url="http://www.nongnu.org/m17n" arch=('any') license=('GPL') depends=('gawk' 'm17n-db' 'm17n-lib') -source=(http://pkgs.fedoraproject.org/repo/pkgs/m17n-contrib/m17n-contrib-1.1.12.tar.gz/fb7c35194e8940cf3ca381f5b111434c/$pkgname-$pkgver.tar.gz) +source=("http://download.savannah.gnu.org/releases/m17n/$pkgname-$pkgver.tar.gz") build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr make make DESTDIR=$pkgdir install } -md5sums=('fb7c35194e8940cf3ca381f5b111434c') +md5sums=('ae8c8b57604144a3d40afe54d5a912a3') From f69bce0ed50dac1f2e5ce481a8d33fba3f522ec6 Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 27 May 2013 19:33:14 +0000 Subject: [PATCH 065/110] Remove rdate --- rdate/PKGBUILD | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 rdate/PKGBUILD diff --git a/rdate/PKGBUILD b/rdate/PKGBUILD deleted file mode 100644 index 1890fa01d..000000000 --- a/rdate/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -pkgname=rdate -pkgver=1.5 -pkgrel=1 -pkgdesc="Retrieves the date and time from other machines" -arch=(i686 x86_64) -url="http://users.ecs.soton.ac.uk/njh/rdate/" -license=('GPL') -depends=('glibc') -source=(http://users.ecs.soton.ac.uk/njh/rdate/$pkgname-$pkgver.tar.gz) -md5sums=('0a4f612480777fdf25264ac03c57eae6') -sha256sums=('6e800053eaac2b21ff4486ec42f0aca7214941c7e5fceedd593fa0be99b9227d') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install -} From d2d54c36f0e558ffe48865f5beeca2ae7f8a9578 Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 27 May 2013 22:15:07 +0000 Subject: [PATCH 066/110] Remove kio_gopher from git in platform (is already added in desktop) --- kio_gopher/PKGBUILD | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 kio_gopher/PKGBUILD diff --git a/kio_gopher/PKGBUILD b/kio_gopher/PKGBUILD deleted file mode 100644 index fe24336e5..000000000 --- a/kio_gopher/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -pkgname=kio_gopher -pkgver=0.1.3 -_kdever=4.4.0 -pkgrel=1 -pkgdesc="A Kioslave for the Gopher protocol" -arch=('i686' 'x86_64') -url="http://kgopher.berlios.de" -license=('GPL') -depends=('kdelibs') -makedepends=('pkgconfig' 'cmake' 'automoc4') -options=('docs') -source=("http://download.kde.org/stable/extragear/${pkgname}-${pkgver}-kde${_kdever}.tar.bz2") -md5sums=('5b4b82aa8502736fc48e2c45ea0569f2') - -build() { - cd $srcdir - mkdir build - cd build - cmake ../${pkgname}-${pkgver}-kde${_kdever} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make - make DESTDIR=$pkgdir install -} \ No newline at end of file From 98b59b3e5b566b27ed9e04d3a218b5e126a10074 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Tue, 28 May 2013 20:32:35 +0000 Subject: [PATCH 067/110] bbswitch 0.7 --- bbswitch/PKGBUILD | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bbswitch/PKGBUILD b/bbswitch/PKGBUILD index 22f28da8e..0bc2eefe4 100644 --- a/bbswitch/PKGBUILD +++ b/bbswitch/PKGBUILD @@ -5,18 +5,17 @@ _extramodules=extramodules-3.9-CHAKRA _kver="$(cat /lib/modules/${_extramodules}/version)" pkgname=bbswitch -pkgver=0.6 +pkgver=0.7 pkgrel=1 pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops" arch=('x86_64') url=("http://github.com/Bumblebee-Project/bbswitch") license=('GPL') -provides=('bbswitch') install=bbswitch.install depends=('linux>=3.9' 'linux<3.10') makedepends=('linux' 'linux-headers') source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz") -md5sums=('c5496e3225c8e70d02a24bfd8a50faf6') +md5sums=('b9df5ea40109ef9766448a0577c798e6') build() { cd ${srcdir}/${pkgname}-${pkgver} From 7eea7b5a7649bf6780b9c7c12eaa04218183857a Mon Sep 17 00:00:00 2001 From: AlmAck Date: Wed, 29 May 2013 00:13:36 +0200 Subject: [PATCH 068/110] pulseaudio rebuild, load module-x11-bell to prevent kde message notifing when "bell" is played --- pulseaudio/PKGBUILD | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pulseaudio/PKGBUILD b/pulseaudio/PKGBUILD index a1e20ddcb..6965ecf84 100644 --- a/pulseaudio/PKGBUILD +++ b/pulseaudio/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=3.99.2 -pkgrel=2 +pkgrel=3 arch=('x86_64') url="http://www.freedesktop.org/wiki/Software/PulseAudio" license=(GPL LGPL) @@ -55,9 +55,22 @@ package_pulseaudio() { # Disable cork-request module, can result in e.g. media players unpausing # when there's a Skype call incoming + # https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1004607 sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ -i "$pkgdir/usr/bin/start-pulseaudio-x11" + # PulseAudio is started automatically wit autosawn=yes (default value) + sed -e 's|/usr/bin/pulseaudio --start "$@"|#&|' \ + -i "$pkgdir/usr/bin/start-pulseaudio-x11" + sed -e 's|/usr/bin/pulseaudio --start "$@"|#&|' \ + -i "$pkgdir/usr/bin/start-pulseaudio-kde" + + # Avoid kde to show the "remove unused sound devices" if bell sound is executed by an application + sed -e '27i\ /usr/bin/pactl load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null' \ + -i "$pkgdir/usr/bin/start-pulseaudio-x11" + sed -e '29i\ /usr/bin/pactl load-module module-x11-bell "display=$DISPLAY" "sample=bell.ogg" > /dev/null' \ + -i "$pkgdir/usr/bin/start-pulseaudio-kde" + # Python fix sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" @@ -65,7 +78,7 @@ package_pulseaudio() { # Speed up pulseaudio shutdown # Lower resample quality, saves CPU sed -e '/exit-idle-time/iexit-idle-time=0' \ - -e '/resample-method/iresample-method=speex-float-0' \ + -e '/resample-method/iresample-method=speex-float-1' \ -i "$pkgdir/etc/pulse/daemon.conf" #### default.pa #### @@ -73,15 +86,6 @@ package_pulseaudio() { sed -e 's/load-module module-udev-detect/load-module module-udev-detect tsched=0/' \ -i "${pkgdir}/etc/pulse/default.pa" - # Enable the pulse support in KDE by default - # http://www.freedesktop.org/wiki/Software/PulseAudio/Desktops/KDE/ - sed -e '$ a\\n### Enable the routing system employed in KDE to work at a lower level.\nload-module module-device-manager do_routing=1' \ - -i "${pkgdir}/etc/pulse/default.pa" - - # The modules loaded by this script are integrated in default.pa - rm "${pkgdir}/etc/xdg/autostart/pulseaudio.desktop" - rm "${pkgdir}/etc/xdg/autostart/pulseaudio-kde.desktop" - # Used only for SystemWide no needed for us # http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" From fe38338bdef80e858e4f2bbe5b295bac4731dec8 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Wed, 29 May 2013 22:16:00 +0200 Subject: [PATCH 069/110] r8168 and lirc-utils ported to kernel 3.9-CHAKRA --- lirc-utils/PKGBUILD | 15 ++++--- lirc-utils/linux-3.8.patch | 80 +++++++++++++++++++++++++++++++++++ lirc-utils/lirc-utils.install | 2 +- r8168/PKGBUILD | 15 ++++--- r8168/linux-3.8.patch | 48 +++++++++++++++++++++ r8168/r8168.install | 2 +- 6 files changed, 149 insertions(+), 13 deletions(-) create mode 100644 lirc-utils/linux-3.8.patch create mode 100644 r8168/linux-3.8.patch diff --git a/lirc-utils/PKGBUILD b/lirc-utils/PKGBUILD index f91f9acfb..3f38f5df7 100644 --- a/lirc-utils/PKGBUILD +++ b/lirc-utils/PKGBUILD @@ -5,14 +5,14 @@ pkgname=lirc-utils pkgver=0.9.0 -pkgrel=12 +pkgrel=13 pkgdesc="Linux Infrared Remote Control utils" arch=('x86_64') url="http://www.lirc.org/" license=('GPL') _kernver='3.7.6-2' depends=('alsa-lib' 'libx11' 'libftdi' 'linux') -makedepends=('help2man' 'linux-headers' 'python2') +makedepends=('help2man' 'linux-headers>=3.9' 'linux-headers<3.10' 'python2') optdepends=('python2: pronto2lirc utility') replaces=('lirc+pctv') backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') @@ -23,6 +23,7 @@ source=(http://sourceforge.net/projects/lirc/files/LIRC/$pkgver/lirc-$pkgver.tar lircd-handle-large-config.patch lirc_atiusb-kfifo.patch kernel-2.6.39.patch + linux-3.8.patch lirc.logrotate lircd.conf irexec.conf lirc.service lircm.service irexec.service lirc.tmpfiles) md5sums=('b232aef26f23fe33ea8305d276637086' @@ -30,6 +31,7 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '1014f2ea03a557c673c9084118676111' '86e6894acde723ebc8a2284512283f17' '087a7d102e1c96bf1179f38db2b0b237' + '9ee196bd03ea44af5a752fb0cc6ca96a' '3deb02604b37811d41816e9b4385fcc3' '5b1f8c9cd788a39a6283f93302ce5c6e' 'f0c0ac930326168035f0c8e24357ae55' @@ -41,10 +43,11 @@ md5sums=('b232aef26f23fe33ea8305d276637086' build() { # configure cd "${srcdir}/lirc-$pkgver" - patch -p1 -i ""${srcdir}"/lirc_wpc8769l.patch" - patch -p1 -i ""${srcdir}"/lircd-handle-large-config.patch" - patch -p1 -i ""${srcdir}"/lirc_atiusb-kfifo.patch" - patch -p1 -i ""${srcdir}"/kernel-2.6.39.patch" + patch -p1 -i "${srcdir}/lirc_wpc8769l.patch" + patch -p1 -i "${srcdir}/lircd-handle-large-config.patch" + patch -p1 -i "${srcdir}/lirc_atiusb-kfifo.patch" + patch -p1 -i "${srcdir}/kernel-2.6.39.patch" + patch -p1 -i "${srcdir}/linux-3.8.patch" # Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+ sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am diff --git a/lirc-utils/linux-3.8.patch b/lirc-utils/linux-3.8.patch new file mode 100644 index 000000000..7b6378a83 --- /dev/null +++ b/lirc-utils/linux-3.8.patch @@ -0,0 +1,80 @@ +diff -upr lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c lirc-0.9.0/drivers/lirc_serial/lirc_serial.c +--- lirc-0.9.0.orig/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:36:25.000000000 +0200 ++++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-02-21 02:39:55.000000000 +0200 +@@ -1103,12 +1103,12 @@ static struct lirc_driver driver = { + + static struct platform_device *lirc_serial_dev; + +-static int __devinit lirc_serial_probe(struct platform_device *dev) ++static int lirc_serial_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_serial_remove(struct platform_device *dev) ++static int lirc_serial_remove(struct platform_device *dev) + { + return 0; + } +@@ -1159,7 +1159,7 @@ static int lirc_serial_resume(struct pla + + static struct platform_driver lirc_serial_driver = { + .probe = lirc_serial_probe, +- .remove = __devexit_p(lirc_serial_remove), ++ .remove = lirc_serial_remove, + .suspend = lirc_serial_suspend, + .resume = lirc_serial_resume, + .driver = { +diff -upr lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c lirc-0.9.0/drivers/lirc_sir/lirc_sir.c +--- lirc-0.9.0.orig/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:36:25.000000000 +0200 ++++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-02-21 02:38:24.000000000 +0200 +@@ -1290,19 +1290,19 @@ static int init_lirc_sir(void) + return 0; + } + +-static int __devinit lirc_sir_probe(struct platform_device *dev) ++static int lirc_sir_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_sir_remove(struct platform_device *dev) ++static int lirc_sir_remove(struct platform_device *dev) + { + return 0; + } + + static struct platform_driver lirc_sir_driver = { + .probe = lirc_sir_probe, +- .remove = __devexit_p(lirc_sir_remove), ++ .remove = lirc_sir_remove, + .driver = { + .name = "lirc_sir", + .owner = THIS_MODULE, +diff -upr lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c +--- lirc-0.9.0.orig/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:36:25.000000000 +0200 ++++ lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-02-21 02:39:39.000000000 +0200 +@@ -930,12 +930,12 @@ static int wpc8769l_acpi_detect(void) + #ifdef MODULE + static struct platform_device *lirc_wpc8769l_platform_dev; + +-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) ++static int lirc_wpc8769l_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) ++static int lirc_wpc8769l_remove(struct platform_device *dev) + { + return 0; + } +@@ -963,7 +963,7 @@ static int lirc_wpc8769l_resume(struct p + + static struct platform_driver lirc_wpc8769l_platform_driver = { + .probe = lirc_wpc8769l_probe, +- .remove = __devexit_p(lirc_wpc8769l_remove), ++ .remove = lirc_wpc8769l_remove, + .suspend = lirc_wpc8769l_suspend, + .resume = lirc_wpc8769l_resume, + .driver = { diff --git a/lirc-utils/lirc-utils.install b/lirc-utils/lirc-utils.install index 5a857aee5..3301fbb5b 100644 --- a/lirc-utils/lirc-utils.install +++ b/lirc-utils/lirc-utils.install @@ -1,4 +1,4 @@ -EXTRAMODULES='extramodules-3.7-CHAKRA' +EXTRAMODULES='extramodules-3.9-CHAKRA' post_install() { systemd-tmpfiles --create lirc.conf diff --git a/r8168/PKGBUILD b/r8168/PKGBUILD index 14e25013c..3bbfce695 100644 --- a/r8168/PKGBUILD +++ b/r8168/PKGBUILD @@ -5,22 +5,27 @@ pkgname=r8168 pkgver=8.032.00 -pkgrel=4 +pkgrel=5 pkgdesc="A kernel module for Realtek 8168 network cards" url="http://www.realtek.com.tw" license=("GPL") arch=('x86_64') -depends=('glibc' 'linux>=3.7' 'linux<3.8') +depends=('glibc' 'linux>=3.9' 'linux<3.10') makedepends=('linux-headers') -source=("http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2") +source=("http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2" + 'linux-3.8.patch') install=$pkgname.install -md5sums=('942ce02459a181093f77bb4d5cc75d45') +md5sums=('942ce02459a181093f77bb4d5cc75d45' + '2ce81d361a32fe69bc325924267c13d3') -_extramodules=extramodules-3.7-CHAKRA +_extramodules=extramodules-3.9-CHAKRA _kernver="$(cat /lib/modules/$_extramodules/version || true)" build() { cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/linux-3.8.patch" + make -C /lib/modules/$_kernver/build \ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ diff --git a/r8168/linux-3.8.patch b/r8168/linux-3.8.patch new file mode 100644 index 000000000..96106237c --- /dev/null +++ b/r8168/linux-3.8.patch @@ -0,0 +1,48 @@ +diff -upr r8168-8.035.00.orig/src/r8168_n.c r8168-8.035.00/src/r8168_n.c +--- r8168-8.035.00.orig/src/r8168_n.c 2013-02-21 03:31:04.000000000 +0200 ++++ r8168-8.035.00/src/r8168_n.c 2013-02-21 03:31:56.000000000 +0200 +@@ -14541,7 +14541,7 @@ rtl8168_phy_power_down (struct net_devic + spin_unlock_irqrestore(&tp->phy_lock, flags); + } + +-static int __devinit ++static int + rtl8168_init_board(struct pci_dev *pdev, + struct net_device **dev_out, + void __iomem **ioaddr_out) +@@ -14711,7 +14711,7 @@ err_out: + goto out; + } + +-static void __devinit ++static void + rtl8168_init_sequence(struct rtl8168_private *tp) + { + void __iomem *ioaddr = tp->mmio_addr; +@@ -14964,7 +14964,7 @@ static const struct net_device_ops rtl81 + }; + #endif + +-static int __devinit ++static int + rtl8168_init_one(struct pci_dev *pdev, + const struct pci_device_id *ent) + { +@@ -15128,7 +15128,7 @@ rtl8168_init_one(struct pci_dev *pdev, + return 0; + } + +-static void __devexit ++static void + rtl8168_remove_one(struct pci_dev *pdev) + { + struct net_device *dev = pci_get_drvdata(pdev); +@@ -17649,7 +17649,7 @@ static struct pci_driver rtl8168_pci_dri + .name = MODULENAME, + .id_table = rtl8168_pci_tbl, + .probe = rtl8168_init_one, +- .remove = __devexit_p(rtl8168_remove_one), ++ .remove = rtl8168_remove_one, + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,11) + .shutdown = rtl8168_shutdown, + #endif diff --git a/r8168/r8168.install b/r8168/r8168.install index 256ee8b78..f02624a12 100644 --- a/r8168/r8168.install +++ b/r8168/r8168.install @@ -1,5 +1,5 @@ rebuild_module_dependencies() { - EXTRAMODULES='extramodules-3.7-CHAKRA' + EXTRAMODULES='extramodules-3.9-CHAKRA' depmod $(cat /lib/modules/$EXTRAMODULES/version) } From 837085bf6b98cbaa06c9467a0750cc105546cda8 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Wed, 29 May 2013 21:46:43 +0000 Subject: [PATCH 070/110] qscintilla-python2 fix in provides line --- qscintilla/PKGBUILD | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/qscintilla/PKGBUILD b/qscintilla/PKGBUILD index 7fa730059..f197d6684 100644 --- a/qscintilla/PKGBUILD +++ b/qscintilla/PKGBUILD @@ -1,23 +1,17 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# # maintainer abveritas[at]chakra-project[dot]org> pkgbase=qscintilla pkgname=("qscintilla" "qscintilla-python2" "qscintilla-python3" "qscintilla-python-common") pkgver=2.7.1 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('x86_64') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" makedepends=("pyqt4-python2" "pyqt4-python3" "chrpath" "sip-python2" "sip-python3") source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" - "configure.py-objdir-support.diff" - "qscintilla-2.7.1-designer.patch" - ) + "configure.py-objdir-support.diff") md5sums=('da8939b5679a075e30c6632e54dc5abf' - 'f80fe4b5d979fc9d0c7c54d156647aa9' - 'a613e224fb3420f9f6be3a49d24b580c') + 'f80fe4b5d979fc9d0c7c54d156647aa9') build() { cd $srcdir/QScintilla-gpl-$pkgver @@ -72,7 +66,7 @@ package_qscintilla-python2() { pkgdesc="Python bindings for QScintilla2 (for Python 2)" conflicts=('python-qscintilla') replaces=('python-qscintilla') - provides=('python-qscintilla=${pkgver}') + provides=("python-qscintilla=${pkgver}") depends=('qscintilla' 'qscintilla-python-common' 'pyqt4-python2') cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" From 4e94eb67374194232dcd9596a84cf13e55e9e0fd Mon Sep 17 00:00:00 2001 From: Neophytos Date: Thu, 30 May 2013 09:11:30 +0000 Subject: [PATCH 071/110] nvidia-lts 313.30 --- nvidia-lts/PKGBUILD | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/nvidia-lts/PKGBUILD b/nvidia-lts/PKGBUILD index 1f230285d..3d8e9d862 100644 --- a/nvidia-lts/PKGBUILD +++ b/nvidia-lts/PKGBUILD @@ -1,6 +1,3 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# # maintainer abveritas@chakra-project.org # Find the kernel name inside the chroot @@ -8,7 +5,7 @@ _extramodules=extramodules-`pacman -Q linux-lts | cut -c11-13 | sed 's/linux-lts _kver="$(cat /lib/modules/${_extramodules}/version)" pkgname=nvidia-lts -pkgver=313.26 +pkgver=313.30 pkgrel=1 pkgdesc="NVIDIA drivers for linux." arch=('x86_64') @@ -22,7 +19,7 @@ install=nvidia.install _ARCH='x86_64' _pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32" source=("http://us.download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run") - md5sums=('2d35124fa5a4b009f170fe893b5d07e3') + md5sums=('e5f147fbcdcad71472b4ddeccf259bd7') build() { cd "${srcdir}" From 8e2135e74b68972405b5a8d124d7c9ab06db3a07 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Thu, 30 May 2013 11:21:42 +0000 Subject: [PATCH 072/110] python2-pip dependency fix --- python2-pip/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python2-pip/PKGBUILD b/python2-pip/PKGBUILD index ef7b3fd4e..bea85f83e 100644 --- a/python2-pip/PKGBUILD +++ b/python2-pip/PKGBUILD @@ -3,12 +3,12 @@ pkgname=python2-pip pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="An easy_install replacement for installing pypi python packages" url="http://www.pip-installer.org/" arch=('x86_64') license=('MIT') -makedepends=('python2' 'python2-distribute') +depends=('python2' 'python2-distribute') conflicts=('python-pip') replaces=('python-pip') provides=('python-pip') From da8caa08158a28d2810049c574370d5371d7e347 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 31 May 2013 11:15:32 +0000 Subject: [PATCH 073/110] vlc 2.0.7 --- vlc/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vlc/PKGBUILD b/vlc/PKGBUILD index 19952f240..fa40ff233 100644 --- a/vlc/PKGBUILD +++ b/vlc/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: abveritas@chakra-project.org pkgname=vlc -pkgver=2.0.6 +pkgver=2.0.7 pkgrel=1 arch=('x86_64') url="http://www.videolan.org/vlc/" @@ -39,7 +39,7 @@ categories=('multimedia') options=('!libtool') install="vlc.install" source=("http://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz") -sha1sums=('2ce21c949275702452bb1327febf6e98748a7972') +sha1sums=('d3dc6605cc296806ada16b5f9b819705c9cc1319') build() { cd "${srcdir}/${pkgname}-${pkgver}" From 0f2b82a9494bcb3b3f82958011353311c9975b49 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Sun, 2 Jun 2013 20:41:22 +0200 Subject: [PATCH 074/110] mercurial updated to version 2.6.2 --- mercurial/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mercurial/PKGBUILD b/mercurial/PKGBUILD index f2688535d..e7a862b58 100644 --- a/mercurial/PKGBUILD +++ b/mercurial/PKGBUILD @@ -3,7 +3,7 @@ # pkgname=mercurial -pkgver=2.6 +pkgver=2.6.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('x86_64') @@ -13,7 +13,7 @@ depends=('python2') optdepends=('tk: for the hgk GUI') source=("http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('d012d8bb5f85369d3b6a630a80667170' +md5sums=('55f6ea5982cf87836113376174826e8c' '43e1d36564d4c7fbe9a091d3ea370a44') build() { From 42de4113aa5069c612fc71c86c217be96157a8fd Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 3 Jun 2013 11:34:46 +0000 Subject: [PATCH 075/110] fontsproto 2.1.2 --- fontsproto/PKGBUILD | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/fontsproto/PKGBUILD b/fontsproto/PKGBUILD index 52aac5d53..cf59c3248 100644 --- a/fontsproto/PKGBUILD +++ b/fontsproto/PKGBUILD @@ -1,14 +1,7 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +# maintainer: Neophytos Kolokotronis pkgname=fontsproto -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="X11 font extension wire protocol" arch=(any) @@ -16,13 +9,17 @@ url="http://xorg.freedesktop.org/" license=('custom') makedepends=('xorg-util-macros') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('77ab428ad4ad7cf0294a72a2201d665c4edf5fb1') +sha1sums=('538f0880faa6981cb1a348ced93dc715c42840f7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } From 1026b723e8edcad7f81015ab8035bf5214ce7744 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 3 Jun 2013 11:34:59 +0000 Subject: [PATCH 076/110] terminus-font 4.38 --- terminus-font/PKGBUILD | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/terminus-font/PKGBUILD b/terminus-font/PKGBUILD index 6e14def0d..a9cd550d4 100644 --- a/terminus-font/PKGBUILD +++ b/terminus-font/PKGBUILD @@ -1,27 +1,32 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +# maintainer: Neophytos Kolokotronis +# contributions from Arch: https://www.archlinux.org/packages/community/any/terminus-font/ pkgname=terminus-font -pkgver=4.32 +pkgver=4.38 pkgrel=1 pkgdesc="A superb, monospace bitmap font (for X11 and console)" -depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig) -replaces=(xserver-terminus-fonts) -arch=(i686 x86_64) +depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig') +arch=('x86_64') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz") url="http://sourceforge.net/projects/terminus-font/" install=terminus-font.install license=('GPL-2') +md5sums=('a8e792fe6e84c86ed2b6ed3e2a12ba66') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --x11dir=/usr/share/fonts/local/ --psfdir=/usr/share/kbd/consolefonts/ - make DESTDIR=$startdir/pkg install + cd "${srcdir}/${pkgname}-${pkgver}" + + sh ./configure --prefix=/usr \ + --x11dir=/usr/share/fonts/local \ + --psfdir=/usr/share/kbd/consolefonts + make +} + +package() { + make -C "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install + + install -Dm644 "$srcdir/$pkgname-$pkgver/75-yes-terminus.conf" \ + "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/OFL.TXT" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('9b74047edcc236a7d4af8abf966c3e7c') From ebd17105a3438b22e4b28d8d1dc61b31e5e240e7 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 3 Jun 2013 11:47:47 +0000 Subject: [PATCH 077/110] perl-archive-zip 1.31.4 --- perl-archive-zip/PKGBUILD | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/perl-archive-zip/PKGBUILD b/perl-archive-zip/PKGBUILD index aab1110db..2148f674a 100644 --- a/perl-archive-zip/PKGBUILD +++ b/perl-archive-zip/PKGBUILD @@ -1,26 +1,27 @@ -# Platform packages for Chakra +# maintainer: Neophytos Kolokotronis pkgname=perl-archive-zip _realname=Archive-Zip -pkgver=1.31 +pkgver=1.31.4 +_pkgver=1.31_04 pkgrel=1 pkgdesc="Provide a perl interface to ZIP archive files" arch=(any) license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.14.2') +depends=('perl') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${_realname}-${pkgver}_02.tar.gz) -md5sums=('357725f70a98aa361598ac595af9599f') +source=(http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/${_realname}-${_pkgver}.tar.gz) +md5sums=('491adb57024059e74767bb56040c2ecb') build() { - cd ${srcdir}/${_realname}-${pkgver}_02 + cd ${srcdir}/${_realname}-${_pkgver} # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make } package() { - cd ${srcdir}/${_realname}-${pkgver}_02 + cd ${srcdir}/${_realname}-${_pkgver} make install DESTDIR=${pkgdir} } From 65b3bd94f4c6a7cf939c7730350fad22fcb33723 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 3 Jun 2013 11:48:11 +0000 Subject: [PATCH 078/110] perl-capture-tiny 0.22 --- perl-capture-tiny/.PKGBUILD.kate-swp | Bin 0 -> 74 bytes perl-capture-tiny/PKGBUILD | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 perl-capture-tiny/.PKGBUILD.kate-swp diff --git a/perl-capture-tiny/.PKGBUILD.kate-swp b/perl-capture-tiny/.PKGBUILD.kate-swp new file mode 100644 index 0000000000000000000000000000000000000000..c807464ee7a7b84ed3b8788b28d3238f5b5ee055 GIT binary patch literal 74 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?WSuuL{IO-waNv@kJEPBAevOHMX1OG`9M YH8C`4E6-7VgzCkV9av`0GOW;I{*Lx literal 0 HcmV?d00001 diff --git a/perl-capture-tiny/PKGBUILD b/perl-capture-tiny/PKGBUILD index b8e57f7b0..ef79406cd 100644 --- a/perl-capture-tiny/PKGBUILD +++ b/perl-capture-tiny/PKGBUILD @@ -1,8 +1,8 @@ -# Platform packages for Chakra +# maintainer: Neophytos Kolokotronis pkgname=perl-capture-tiny _realname=Capture-Tiny -pkgver=0.15 +pkgver=0.22 pkgrel=1 pkgdesc="Capture STDOUT and STDERR from Perl, XS or external programs" arch=(any) @@ -11,7 +11,7 @@ depends=(perl) url="http://search.cpan.org/dist/Capture-Tiny" options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/$_realname-$pkgver.tar.gz") -md5sums=('7e9a7b8f0ad8134759599a78585d26a6') +md5sums=('f270ee3682aabf10747592f6c05ef7ba') build() { cd "$srcdir/$_realname-$pkgver" From a93d27333635216223e0e2f9b6709309eeb0a249 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 3 Jun 2013 11:49:54 +0000 Subject: [PATCH 079/110] perl-alien-sdl 1.440 --- perl-alien-sdl/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/perl-alien-sdl/PKGBUILD b/perl-alien-sdl/PKGBUILD index bab5ac70f..f312ec0b3 100644 --- a/perl-alien-sdl/PKGBUILD +++ b/perl-alien-sdl/PKGBUILD @@ -1,18 +1,18 @@ -# Platform Packages for Chakra, part of chakra-project.org +# maintainer: Neophytos Kolokotronis pkgname=perl-alien-sdl _realname=Alien-SDL -pkgver=1.430 -pkgrel=2 +pkgver=1.440 +pkgrel=1 pkgdesc="Building, finding and using SDL binaries" -arch=(i686 x86_64) +arch=('x86_64') license=(PerlArtistic GPL) url="http://search.cpan.org/dist/Alien-SDL/" depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny) makedepends=(perl-file-which perl-text-patch) options=(!emptydirs) source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz) -md5sums=('9d7774212fb4e1c46325746c953a808b') +md5sums=('ad665d058d186e673114024ba10dfa09') package() { cd "$srcdir/$_realname-$pkgver" From 98d31014b40d8038b79b7b0c93e842c232624820 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 3 Jun 2013 12:11:18 +0000 Subject: [PATCH 080/110] libparserutils 0.1.2, libwapcaplet 0.2.0, libcss 0.2.0 --- libcss/PKGBUILD | 35 +++++++++++++++++++---------------- libparserutils/PKGBUILD | 30 +++++++++++++++--------------- libwapcaplet/PKGBUILD | 32 ++++++++++++++++---------------- 3 files changed, 50 insertions(+), 47 deletions(-) diff --git a/libcss/PKGBUILD b/libcss/PKGBUILD index b53136e92..80c07e89d 100644 --- a/libcss/PKGBUILD +++ b/libcss/PKGBUILD @@ -1,27 +1,30 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - +# maintainer: Neophytos Kolokotronis +# contributions from Arch: https://www.archlinux.org/packages/community/x86_64/libcss/ + pkgname=libcss -pkgver=0.0.2 +pkgver=0.2.0 pkgrel=1 pkgdesc="A CSS parser and selection engine." -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.netsurf-browser.org/projects/libcss/" license=('MIT') depends=('libparserutils' 'libwapcaplet') -source=(http://www.netsurf-browser.org/projects/releases/libcss-${pkgver}-src.tar.gz) -md5sums=('3bbdd853a2f52db7ab0e2ea3597e62fa') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/libcss-$pkgver-src.tar.gz") +sha256sums=('31b08f6f2259366ccad8b455440f364dc33e7dc78cdb0cf4905da56d5372f613') build() { - cd ${srcdir}/${pkgname}-${pkgver} - make + cd "$srcdir/$pkgname-$pkgver" + + export CFLAGS="-Wno-error=unused-but-set-variable" + make PREFIX=/usr COMPONENT_TYPE="lib-shared" + make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make PREFIX=/usr DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} \ No newline at end of file + cd "$srcdir/$pkgname-$pkgver" + + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/libparserutils/PKGBUILD b/libparserutils/PKGBUILD index 1c496d2d5..4179d91bd 100644 --- a/libparserutils/PKGBUILD +++ b/libparserutils/PKGBUILD @@ -1,28 +1,28 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - +# maintainer: Neophytos Kolokotronis +# contributions from Arch: https://www.archlinux.org/packages/community/x86_64/libparserutils/ + pkgname=libparserutils -pkgver=0.0.2 +pkgver=0.1.2 pkgrel=1 pkgdesc="Library for building efficient parsers" arch=('i686' 'x86_64') url="http://www.netsurf-browser.org/projects/libparserutils" license=('MIT') -source=("http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('5b2e4ddeebe451cc801ccd6e7da06f87') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +md5sums=('11c2b4ff17406b57dcb718d4fad022bb') build() { cd ${srcdir}/${pkgname}-${pkgver} - - make PREFIX=/usr + sed 's:-Wall::' -i Makefile + make PREFIX=/usr COMPONENT_TYPE="lib-shared" + make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - make install PREFIX=/usr DESTDIR=${pkgdir} - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} \ No newline at end of file + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/libwapcaplet/PKGBUILD b/libwapcaplet/PKGBUILD index a58536920..59fb9bd27 100644 --- a/libwapcaplet/PKGBUILD +++ b/libwapcaplet/PKGBUILD @@ -1,28 +1,28 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer: Neophytos Kolokotronis +# contributions from Arch: https://www.archlinux.org/packages/community/x86_64/libwapcaplet/ pkgname=libwapcaplet -pkgver=0.0.2 +pkgver=0.2.0 pkgrel=1 pkgdesc="A string internment library with rapid string comparison." arch=('i686' 'x86_64') url="http://www.netsurf-browser.org/projects/libwapcaplet/" license=('MIT') -source=(http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz) -md5sums=('c73b5ff5fce55819cc698e8cb486d5eb') +makedepends=('netsurf-buildsystem') +source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz") +sha256sums=('5fb49841ba335b0c7a1420d92c3a60480df63696c50353c02724aa8c6b45cb24') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - make || return 1 + cd "$srcdir/$pkgname-$pkgver" + + make PREFIX=/usr COMPONENT_TYPE="lib-shared" + make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make PREFIX=/usr DESTDIR=${pkgdir} install || return 1 - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} \ No newline at end of file + cd "$srcdir/$pkgname-$pkgver" + + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} From 40122259c20b747a4b18bad5cee7f749b4a411ad Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 3 Jun 2013 12:19:12 +0000 Subject: [PATCH 081/110] perl-class-inspector 1.28 --- perl-class-inspector/PKGBUILD | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/perl-class-inspector/PKGBUILD b/perl-class-inspector/PKGBUILD index a5e55436d..cceb44c7b 100644 --- a/perl-class-inspector/PKGBUILD +++ b/perl-class-inspector/PKGBUILD @@ -1,17 +1,16 @@ -# Platform packages for Chakra +# maintainer: Neophytos Kolokotronis pkgname=perl-class-inspector -pkgver=1.27 +pkgver=1.28 pkgrel=1 pkgdesc="Get information about a class and its structure" arch=(any) license=(PerlArtistic GPL) options=(!emptydirs) -depends=('perl>=5.6.0') +depends=('perl') url=http://search.cpan.org/dist/Class-Inspector source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Class-Inspector-${pkgver}.tar.gz") -md5sums=('52e6391cae3c2abdfcd1d450b42bba7e') -sha512sums=('e16786d32c695863b474036c494efa5ee2ea84f5c460e49fa58bb645c0332810796ddb81865f30e1c942a697556af9e26b47a4dc4300c10da37fde499f9507d8') +md5sums=('7ab3ca22d3147236dddfb58f2366ad22') _distdir="${srcdir}/Class-Inspector-${pkgver}" build() { From 13f4d95a71c175fb11827890b2265f7619765f0c Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 3 Jun 2013 13:16:51 +0000 Subject: [PATCH 082/110] opengtl 0.9.18 & libqtgtl 0.9.3 --- libqtgtl/PKGBUILD | 12 ++++-------- opengtl/PKGBUILD | 15 ++++++++------- opengtl/opengtl-0.9.18-memcpy.patch | 11 +++++++++++ 3 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 opengtl/opengtl-0.9.18-memcpy.patch diff --git a/libqtgtl/PKGBUILD b/libqtgtl/PKGBUILD index bbb1b95a2..08275fb2a 100644 --- a/libqtgtl/PKGBUILD +++ b/libqtgtl/PKGBUILD @@ -1,11 +1,7 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org -# contributor Andries Radu +# Neophytos Kolokotronis pkgname=libqtgtl -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=1 pkgdesc="Qt bindings to OpenGTL" url="http://www.opengtl.org" @@ -14,7 +10,7 @@ depends=('llvm' 'opengtl') license=('GPL') makedepends=('cmake') source=(http://download.opengtl.org/libQtGTL-${pkgver}.tar.bz2) -md5sums=('671d32f92bfe7713eade62cd80101622') +md5sums=('1e9fd96332db22da01ab6d83568e396e') build() { cd $srcdir @@ -27,4 +23,4 @@ package() { cd $srcdir/build make DESTDIR=${pkgdir} install rm -r $srcdir/build -} \ No newline at end of file +} diff --git a/opengtl/PKGBUILD b/opengtl/PKGBUILD index da84a3236..bdddf8e0c 100644 --- a/opengtl/PKGBUILD +++ b/opengtl/PKGBUILD @@ -1,10 +1,8 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer abveritas@chakra-project.org +# maintainer: Neophytos Kolokotronis +# contributions from Arch: https://www.archlinux.org/packages/extra/x86_64/opengtl/ pkgname=opengtl -pkgver=0.9.16 +pkgver=0.9.18 pkgrel=1 pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" @@ -13,12 +11,15 @@ license=('GPL') depends=('gcc-libs' 'llvm') makedepends=('cmake' 'libpng') optdepends=('libpng: for using the png extension') -source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2) -sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048') +source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2 + opengtl-0.9.18-memcpy.patch) +sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8' + '934f2d3b0452b0505d0b4a39f2f9022ea490be12eda77d46caf0d66eabef59f3') build() { cd "${srcdir}" mkdir build + patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-memcpy.patch" cd build cmake ../OpenGTL-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/opengtl/opengtl-0.9.18-memcpy.patch b/opengtl/opengtl-0.9.18-memcpy.patch new file mode 100644 index 000000000..9570321e6 --- /dev/null +++ b/opengtl/opengtl-0.9.18-memcpy.patch @@ -0,0 +1,11 @@ +diff -r 99a2017746c0 Extensions/PngDC/PngDC.cpp +--- a/Extensions/PngDC/PngDC.cpp Wed Jan 30 05:28:12 2013 +1100 ++++ b/Extensions/PngDC/PngDC.cpp Tue Apr 16 01:59:10 2013 +1000 +@@ -20,6 +20,7 @@ + #include "PngDC.h" + + #include ++#include + + #include + \ No newline at end of file From 0bd627efd24db7c06af885076b1d0ef1ad9333ac Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 3 Jun 2013 13:18:07 +0000 Subject: [PATCH 083/110] added netsurf-buildsystem, a dependency of libparserutils --- netsurf-buildsystem/PKGBUILD | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 netsurf-buildsystem/PKGBUILD diff --git a/netsurf-buildsystem/PKGBUILD b/netsurf-buildsystem/PKGBUILD new file mode 100644 index 000000000..9f336afa0 --- /dev/null +++ b/netsurf-buildsystem/PKGBUILD @@ -0,0 +1,28 @@ +# maintainer: Neophytos Kolokotronis +# contributions from Arch: https://www.archlinux.org/packages/community/x86_64/netsurf-buildsystem/ + +pkgname=netsurf-buildsystem +pkgver=1.0 +pkgrel=1 +pkgdesc='The Netsurf buildsystem' +arch=('x86_64') +url='http://www.netsurf-browser.org/' +license=('MIT') +source=("http://download.netsurf-browser.org/libs/releases/buildsystem-$pkgver.tar.gz") +sha256sums=('4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146') + +build() { + cd "$srcdir/buildsystem-$pkgver" + + sed -i 's:-Werror::' Makefile + make PREFIX=/usr COMPONENT_TYPE='lib-shared' + make PREFIX=/usr COMPONENT_TYPE='lib-static' +} + +package() { + cd "$srcdir/buildsystem-$pkgver" + + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-shared' + make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-static' + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} From 4ab90d97ab5edb3d3df30af81ad66e6d37679342 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Tue, 4 Jun 2013 08:44:53 +0000 Subject: [PATCH 084/110] hyphen 2.8.6 --- hyphen/PKGBUILD | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/hyphen/PKGBUILD b/hyphen/PKGBUILD index 30bec8fe0..a20683287 100644 --- a/hyphen/PKGBUILD +++ b/hyphen/PKGBUILD @@ -1,21 +1,16 @@ -# -# Chakra Packages, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer: Neophytos Kolokotronis pkgbase=hyphen pkgname=('hyphen' 'hyphen-en') -pkgver=2.7.1 +pkgver=2.8.6 pkgrel=1 -arch=('i686' 'x86_64') +arch=('x86_64') url="http://hunspell.sf.net" license=('GPL' 'LGPL' 'MPL') -groups=() makedepends=('glibc' 'perl') options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz) -md5sums=('48a9f787f43a09c0a9b7b00cd1fddbbf') +md5sums=('ee527b48ef1a7e95ee803a1f7c283c56') build() { cd "$srcdir/$pkgname-$pkgver" @@ -44,7 +39,7 @@ package_hyphen-en() { # arch=('any') optdepends=('hyphen: offers hyphenation library functions') - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/${pkgbase}-${pkgver}" make DESTDIR="$pkgdir/" install-hyphDATA pushd ${pkgdir}/usr/share/hyphen/ From 2c76192bf9d43d5aa361d817da5c49c6ab118ca6 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Tue, 4 Jun 2013 08:56:12 +0000 Subject: [PATCH 085/110] libmythes 1.2.3 --- libmythes/PKGBUILD | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libmythes/PKGBUILD b/libmythes/PKGBUILD index e23312edb..71a72beb5 100644 --- a/libmythes/PKGBUILD +++ b/libmythes/PKGBUILD @@ -1,21 +1,17 @@ -# -# Chakra Packages, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer: Neophytos Kolokotronis pkgname=libmythes -pkgver=1.2.1 +pkgver=1.2.3 pkgrel=1 pkgdesc="a simple thesaurus" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://hunspell.sourceforge.net/ " license=('custom') -depends=('glibc' 'perl') -options=('force' '!libtool') +depends=('glibc' 'perl' 'hunspell') +options=('!libtool') provides=('mythes') source=(http://downloads.sourceforge.net/hunspell/${pkgname/lib/}-${pkgver}.tar.gz) -md5sums=('54b310488dda6929cf31ae859928c945') +md5sums=('46e92b68e31e858512b680b3b61dc4c1') build() { cd ${srcdir}/${pkgname/lib/}-$pkgver From a160df0fb17d41a2e5d504b5c1686b7fad357102 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Tue, 4 Jun 2013 09:26:35 +0000 Subject: [PATCH 086/110] bigreqsproto 1.1.2 --- bigreqsproto/PKGBUILD | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/bigreqsproto/PKGBUILD b/bigreqsproto/PKGBUILD index 75ebe7b35..0e8c81102 100644 --- a/bigreqsproto/PKGBUILD +++ b/bigreqsproto/PKGBUILD @@ -1,28 +1,25 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +# maintaienr: Neophytos Kolokotronis pkgname=bigreqsproto -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="X11 Big Requests extension wire protocol" arch=(any) url="http://xorg.freedesktop.org/" license=('custom:OpenGroup') source=(http://xorg.freedesktop.org/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('2db1d1e98958eee4d6cae0f68dbd03b2ec1018ce') +sha1sums=('ef1765eeb5e9e38d080225fe6a64ed7cd2984b46') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } From 323e88770002e60499b8f9cef72e9f79444b0815 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Tue, 4 Jun 2013 09:27:01 +0000 Subject: [PATCH 087/110] libproxy 0.4.11 --- libproxy/PKGBUILD | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libproxy/PKGBUILD b/libproxy/PKGBUILD index dc4f0c70f..516346c4a 100644 --- a/libproxy/PKGBUILD +++ b/libproxy/PKGBUILD @@ -1,14 +1,10 @@ -# -# KDE SC Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer: Neophytos Kolokotronis pkgname=libproxy -pkgver=0.4.6 -pkgrel=2 +pkgver=0.4.11 +pkgrel=1 pkgdesc="A library that provides automatic proxy configuration management" -arch=(i686 x86_64) +arch=('x86_64') license=('LGPL') depends=('gcc-libs') optdepends=('kdelibs: KDE configuration module' @@ -19,7 +15,7 @@ makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl') url="http://libproxy.googlecode.com" source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('199c6b120baf1f7258a55f38d5ec74f5') +md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84') build() { cd "${srcdir}/${pkgname}-${pkgver}" From 131b5695c987fd511c462735ababa919b93edb2e Mon Sep 17 00:00:00 2001 From: Neophytos Date: Tue, 4 Jun 2013 09:27:16 +0000 Subject: [PATCH 088/110] nasm 2.10.07 --- nasm/PKGBUILD | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nasm/PKGBUILD b/nasm/PKGBUILD index 9211aab25..9d090127a 100644 --- a/nasm/PKGBUILD +++ b/nasm/PKGBUILD @@ -1,10 +1,7 @@ -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer: Neophytos Kolokotronis pkgname=nasm -pkgver=2.09.08 +pkgver=2.10.07 pkgrel=1 pkgdesc="80x86 assembler designed for portability and modularity" url="http://www.nasm.us" @@ -14,14 +11,17 @@ depends=('glibc') makedepends=('ghostscript') install=nasm.install source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6abfa388a74ee47e163fdb30ecfd40f9') +md5sums=('af1cd6669f5e98148cd5ec42dee90f19') build() { cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} - ./configure --prefix=/usr || return 1 - make || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make INSTALLROOT="${pkgdir}" install install_rdf install -d "${pkgdir}/usr/share/info" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nasm/LICENSE" || return 1 + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/nasm/LICENSE" } From 5a102fcb6ff4a86ffe9203b3713e19ce2a0630f5 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Tue, 4 Jun 2013 09:27:32 +0000 Subject: [PATCH 089/110] libsysactivity 0.6.4 --- libsysactivity/PKGBUILD | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/libsysactivity/PKGBUILD b/libsysactivity/PKGBUILD index e8ddfa285..ab1910a61 100644 --- a/libsysactivity/PKGBUILD +++ b/libsysactivity/PKGBUILD @@ -1,26 +1,21 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer: Neophytos Kolokotronis pkgname=libsysactivity -pkgver=0.6.1 -pkgrel=2 +pkgver=0.6.4 +pkgrel=1 pkgdesc="A lightweight library that retrieves statistics of the system's activity in a portable and thread safe way." url="http://sourceforge.net/projects/libsysactivity/" license=('LGPL') arch=('i686' 'x86_64') depends=('glibc') makedepends=('cmake') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz cmakelist.patch) -md5sums=('a81fc993489dafd5308347b3a48525a5' - 'af299470d092281bd54b4a67505211d8') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('ff608ad4b1e589f03b5b1aa664fecfd8') build(){ cd ${srcdir} cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i "${srcdir}/cmakelist.patch" || return 1 + # patch -Np0 -i "${srcdir}/cmakelist.patch" || return 1 mkdir ${srcdir}/build cd ${srcdir}/build cmake ${srcdir}/libsysactivity-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release @@ -30,4 +25,4 @@ build(){ package() { cd ${srcdir}/build make DESTDIR="${pkgdir}" install -} \ No newline at end of file +} From 19b32b00c9e2ab2d2f3ce161faa2b966307f60a6 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Fri, 7 Jun 2013 22:49:46 +0200 Subject: [PATCH 090/110] uim moved to ccr --- uim/PKGBUILD | 38 -------------------------------------- uim/install | 13 ------------- 2 files changed, 51 deletions(-) delete mode 100644 uim/PKGBUILD delete mode 100644 uim/install diff --git a/uim/PKGBUILD b/uim/PKGBUILD deleted file mode 100644 index d8e2f5211..000000000 --- a/uim/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf - -pkgname=uim -pkgver=1.7.0 -pkgrel=2 -pkgdesc='Multilingual input method library' -arch=('i686' 'x86_64') -url='http://code.google.com/p/uim/' -license=('custom:BSD') -depends=('gtk2' 'libxft' 'ncurses' 'anthy' 'm17n-lib') -makedepends=('intltool' 'gettext') -options=('!libtool') -source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('b79ed80c2557e804e6d3d2771a213a29cd932a73') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/uim \ - --with-anthy-utf8 - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} diff --git a/uim/install b/uim/install deleted file mode 100644 index ffed34d01..000000000 --- a/uim/install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - echo -n "updating gtk.immodules... " - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - echo "done." -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} From c54fd482d490fd246cad6a9d02b1c85d06185b3d Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 7 Jun 2013 21:37:04 +0000 Subject: [PATCH 091/110] Updates and fixes --- perl-dbi/PKGBUILD | 8 +-- perl-digest-sha1/PKGBUILD | 4 +- perl-html-parser/PKGBUILD | 6 +- perl-net-ip/PKGBUILD | 8 +-- perl-net-ssleay/PKGBUILD | 4 +- spamassassin/PKGBUILD | 26 ++++---- spamassassin/perl-5.18-fixes.patch | 97 ++++++++++++++++++++++++++++++ spamassassin/spamassassin.service | 2 +- 8 files changed, 127 insertions(+), 28 deletions(-) create mode 100644 spamassassin/perl-5.18-fixes.patch diff --git a/perl-dbi/PKGBUILD b/perl-dbi/PKGBUILD index aec82973c..87e918dfb 100644 --- a/perl-dbi/PKGBUILD +++ b/perl-dbi/PKGBUILD @@ -5,16 +5,16 @@ pkgname=perl-dbi _realname=DBI -pkgver=1.618 +pkgver=1.627 pkgrel=1 pkgdesc="Database independent interface for Perl" -arch=('i686' 'x86_64') +arch=('x86_64') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.14.2') +depends=('perl>=5.18.0') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('5ad29b56f7457f22bd1ca1c871b30719') +md5sums=('aab49be51b0f4867a1894145b023d2c5') build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/perl-digest-sha1/PKGBUILD b/perl-digest-sha1/PKGBUILD index a5a0ac462..71bac1c06 100644 --- a/perl-digest-sha1/PKGBUILD +++ b/perl-digest-sha1/PKGBUILD @@ -6,9 +6,9 @@ pkgname=perl-digest-sha1 _realname=Digest-SHA1 pkgver=2.13 -pkgrel=2 +pkgrel=3 pkgdesc="Perl interface to the SHA-1 Algorithm" -arch=(i686 x86_64) +arch=(x86_64) license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl>=5.14.2') diff --git a/perl-html-parser/PKGBUILD b/perl-html-parser/PKGBUILD index bb6e9c83c..e7836e79f 100644 --- a/perl-html-parser/PKGBUILD +++ b/perl-html-parser/PKGBUILD @@ -5,16 +5,16 @@ pkgname=perl-html-parser _realname=HTML-Parser -pkgver=3.69 +pkgver=3.71 pkgrel=1 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-html-tagset' 'perl>=5.12.1') +depends=('perl-html-tagset' 'perl>=5.18.0') options=(!emptydirs) source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('d22cc6468ce670a56034be907e4e7c54') +md5sums=('9128a45893097dfa3bf03301b19c5efe') build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/perl-net-ip/PKGBUILD b/perl-net-ip/PKGBUILD index e1e952e7b..8cf93aa8c 100644 --- a/perl-net-ip/PKGBUILD +++ b/perl-net-ip/PKGBUILD @@ -2,16 +2,16 @@ pkgname=perl-net-ip _realname=Net-IP -pkgver=1.25 -pkgrel=6 +pkgver=1.26 +pkgrel=1 pkgdesc="Perl Module: Easy manipulation of IPv4 and IPv6 addresses" arch=('any') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('perl>=5.10.0') +depends=('perl>=5.18.0') options=(!emptydirs) source=(http://www.cpan.org/authors/id/M/MA/MANU/${_realname}-${pkgver}.tar.gz) -md5sums=('a49c0b02a9b793ff60191cdafc0c202e') +md5sums=('3a98e3ac45d69ea38a63a7e678bd716d') build() { cd ${srcdir}/${_realname}-${pkgver} diff --git a/perl-net-ssleay/PKGBUILD b/perl-net-ssleay/PKGBUILD index 1ce1fdb84..8e9228ed4 100644 --- a/perl-net-ssleay/PKGBUILD +++ b/perl-net-ssleay/PKGBUILD @@ -5,7 +5,7 @@ pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.50 +pkgver=1.54 pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('x86_64') @@ -16,7 +16,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('5e239c5aae70dece79fcd6a4307fc53e') +md5sums=('26e758fff1c90cb00e9358fea7e1e22f') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/spamassassin/PKGBUILD b/spamassassin/PKGBUILD index 08d4aab3f..45e7b91c1 100644 --- a/spamassassin/PKGBUILD +++ b/spamassassin/PKGBUILD @@ -5,16 +5,15 @@ pkgname=spamassassin pkgver=3.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="A mail filter to identify spam." arch=('x86_64') license=('APACHE') url="http://spamassassin.apache.org" -depends=('perl>=5.14.2' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \ - 'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \ - 'perl-libwww' 'perl-io-zlib' 'perl-mail-spf' 'perl-mail-dkim' \ - 'perl-archive-tar' 'perl-io-socket-inet6' 'zlib' 're2c') -makedepends=('razor' 'perl-dbi') +depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl' + 'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http' + 'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-net-ssleay') +makedepends=('razor' 'perl-dbi') optdepends=('razor: to identify collaborately-flagged spam') backup=('etc/mail/spamassassin/local.cf' 'etc/mail/spamassassin/init.pre' @@ -25,19 +24,23 @@ backup=('etc/mail/spamassassin/local.cf' install="${pkgname}.install" options=('!emptydirs') source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" - 'spamd.conf.d' 'spamassassin.service') - + 'spamassassin.service' + 'perl-5.18-fixes.patch') md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' - 'af501c6b0bb937a2775b747cc4b6d150' - 'ded3e012a4d502df001f2d97c495cc4e') + 'b8dcea016fb73b074b941e832cfae5c9' + '6cf63928eeeaea25967c2ffd875d106a') build() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + patch -p0 -d lib -i "$srcdir/perl-5.18-fixes.patch" + + cd "${srcdir}/Mail-SpamAssassin-${pkgver}" + # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \ CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no - make + make } check() { @@ -56,6 +59,5 @@ package() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd" install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service" } diff --git a/spamassassin/perl-5.18-fixes.patch b/spamassassin/perl-5.18-fixes.patch new file mode 100644 index 000000000..74277fc8b --- /dev/null +++ b/spamassassin/perl-5.18-fixes.patch @@ -0,0 +1,97 @@ +--- Mail/SpamAssassin/AsyncLoop.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/AsyncLoop.pm 2013-05-29 01:37:58.000000000 +0200 +@@ -361,5 +361,12 @@ + $now = time; # capture new timestamp, after possible sleep in 'select' + +- while (my($key,$ent) = each %$pending) { ++ # A callback routine may generate another DNS query, which may insert ++ # an entry into the %$pending hash thus invalidating the each() context. ++ # So, make sure that callbacks are not called while the each() context ++ # is open, or avoid using each(). [Bug 6937] ++ # ++ # while (my($key,$ent) = each %$pending) { ++ foreach my $key (keys %$pending) { ++ my $ent = $pending->{$key}; + my $id = $ent->{id}; + if (defined $ent->{poll_callback}) { # call a "poll_callback" if exists +@@ -449,5 +456,6 @@ + my $foundcnt = 0; + my $now = time; +- while (my($key,$ent) = each %$pending) { ++ foreach my $key (keys %$pending) { ++ my $ent = $pending->{$key}; + dbg("async: aborting after %.3f s, %s: %s", + $now - $ent->{start_time}, +--- Mail/SpamAssassin/Conf/Parser.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/Conf/Parser.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -1249,5 +1249,5 @@ + my $mods = ''; + local ($1,$2); +- if ($re =~ s/^m{//) { ++ if ($re =~ s/^m\{//) { + $re =~ s/}([a-z]*)$//; $mods = $1; + } +--- Mail/SpamAssassin/DnsResolver.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/DnsResolver.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -441,8 +441,14 @@ + if (!defined($timeout) || $timeout > 0) + { $timer = $self->{main}->time_method("poll_dns_idle") } ++ $! = 0; + ($nfound, $timeleft) = select($rout=$rin, undef, undef, $timeout); + } + if (!defined $nfound || $nfound < 0) { +- warn "dns: select failed: $!"; ++ if ($!) { warn "dns: select failed: $!\n" } ++ else { info("dns: select interrupted") } ++ return; ++ } elsif (!$nfound) { ++ if (!defined $timeout) { warn("dns: select returned empty-handed\n") } ++ elsif ($timeout > 0) { dbg("dns: select timed out %.3f s", $timeout) } + return; + } +--- Mail/SpamAssassin/Message.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/Message.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -567,5 +567,5 @@ + # bug 5557: windows requires tmp file be closed before it can be rm'd + if (ref $part->{'raw'} eq 'GLOB') { +- close($part->{'raw'}) or die "error closing input file: $!"; ++ close($part->{'raw'}) or warn "error closing input file: $!"; + } + +--- Mail/SpamAssassin/PerMsgStatus.pm~ 2011-06-07 01:59:17.000000000 +0200 ++++ Mail/SpamAssassin/PerMsgStatus.pm 2013-05-29 01:32:06.000000000 +0200 +@@ -421,6 +421,6 @@ + } + +- # ignore tests with 0 score in this scoreset +- next if ($scores->{$test} == 0); ++ # ignore tests with 0 score (or undefined) in this scoreset ++ next if !$scores->{$test}; + + # Go ahead and add points to the proper locations +@@ -1253,11 +1253,10 @@ + my $line = ''; + foreach my $test (sort @{$self->{test_names_hit}}) { +- if (!$line) { +- $line .= $test . "=" . $self->{conf}->{scores}->{$test}; +- } else { +- $line .= $arg . $test . "=" . $self->{conf}->{scores}->{$test}; +- } ++ my $score = $self->{conf}->{scores}->{$test}; ++ $score = '0' if !defined $score; ++ $line .= $arg if $line ne ''; ++ $line .= $test . "=" . $score; + } +- $line ? $line : 'none'; ++ $line ne '' ? $line : 'none'; + }, + +--- Mail/SpamAssassin/Util.pm~ 2013-05-29 01:29:59.000000000 +0200 ++++ Mail/SpamAssassin/Util.pm 2013-05-29 01:33:16.000000000 +0200 +@@ -1588,5 +1588,5 @@ + return undef; # invalid + } +- elsif ($re =~ s/^m{//) { # m{foo/bar} ++ elsif ($re =~ s/^m\{//) { # m{foo/bar} + $delim = '}'; + } diff --git a/spamassassin/spamassassin.service b/spamassassin/spamassassin.service index 2ccfa5b11..e9c9c07fd 100644 --- a/spamassassin/spamassassin.service +++ b/spamassassin/spamassassin.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/var/run/spamd.pid -ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c +ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c -c -x --virtual-config-dir=/var/lib/spamassassin -u nobody StandardOutput=syslog StandardError=syslog Restart=always From 476a18ee73ecb89698caa58848e1f88e4728d642 Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 7 Jun 2013 22:44:07 +0000 Subject: [PATCH 092/110] Update/fix --- perl-io-socket-inet6/PKGBUILD | 40 +++++++++++++++++++++++++++++++++++ perl-socket6/PKGBUILD | 6 +++--- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 perl-io-socket-inet6/PKGBUILD diff --git a/perl-io-socket-inet6/PKGBUILD b/perl-io-socket-inet6/PKGBUILD new file mode 100644 index 000000000..f8d94db59 --- /dev/null +++ b/perl-io-socket-inet6/PKGBUILD @@ -0,0 +1,40 @@ +pkgname='perl-io-socket-inet6' +pkgver=2.70 +pkgrel=1 +pkgdesc="Object interface for AF_INET|AF_INET6 domain sockets" +arch=('any') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl-socket6>=0.12') +makedepends=() +url='http://search.cpan.org/dist/IO-Socket-INET6' +source=("http://search.cpan.org/CPAN/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-$pkgver.tar.gz") +md5sums=('c443e394ec9d128a3d8dca77f8e14426') +sha512sums=('2dbbc35de49d1cee1b8f0f50bd4afda57beb066286269beecb1699ddf06a9837f50a989e790c79eba76409d93a8beffdfae3d7b4add30181a973e1a0ee17ef0c') +_distdir="IO-Socket-INET6-$pkgver" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor" \ + PERL_MB_OPT="--installdirs vendor" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} diff --git a/perl-socket6/PKGBUILD b/perl-socket6/PKGBUILD index 74319326c..9a27c0293 100644 --- a/perl-socket6/PKGBUILD +++ b/perl-socket6/PKGBUILD @@ -1,10 +1,10 @@ # Platform packages for Chakra pkgname='perl-socket6' -pkgver='0.23' -pkgrel='1' +pkgver=0.23 +pkgrel=2 pkgdesc="getaddrinfo/getnameinfo support module" -arch=('i686' 'x86_64') +arch=('x86_64') license=('PerlArtistic' 'GPL') options=('!emptydirs') depends=('perl') From 8a7350a36ca8dc28474f6121b164e730a87e6d4c Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 7 Jun 2013 22:52:23 +0000 Subject: [PATCH 093/110] Update --- razor/PKGBUILD | 8 ++++---- spamassassin/spamd.conf.d | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 spamassassin/spamd.conf.d diff --git a/razor/PKGBUILD b/razor/PKGBUILD index d81ed4645..ce05d4c19 100644 --- a/razor/PKGBUILD +++ b/razor/PKGBUILD @@ -1,15 +1,15 @@ # Platform packages for Chakra pkgname=razor -pkgver=2.84 -pkgrel=3 +pkgver=2.85 +pkgrel=1 pkgdesc="A distributed, collaborative, spam detection and filtering network" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://razor.sourceforge.net" license=('PerlArtistic') depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl>=5.14.2') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2") -md5sums=('8b9a11a6ce020383c32c45d1530d77c2') +md5sums=('014d08db40187cb1316482191566b012') options=('!emptydirs') build() { diff --git a/spamassassin/spamd.conf.d b/spamassassin/spamd.conf.d deleted file mode 100644 index 4295e0073..000000000 --- a/spamassassin/spamd.conf.d +++ /dev/null @@ -1 +0,0 @@ -SPAMD_OPTS="-c" From 8ecb2b05c0b71094eb06eece4157c990f44225de Mon Sep 17 00:00:00 2001 From: AlmAck Date: Sat, 8 Jun 2013 23:55:21 +0200 Subject: [PATCH 094/110] mlt 0.9.0 --- mlt/PKGBUILD | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mlt/PKGBUILD b/mlt/PKGBUILD index a29d0425b..51b7fab07 100644 --- a/mlt/PKGBUILD +++ b/mlt/PKGBUILD @@ -2,8 +2,8 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.8.8 -pkgrel=3 +pkgver=0.9.0 +pkgrel=1 pkgdesc="An open s3ource multimedia framework" arch=('x86_64') url="http://www.mltframework.org" @@ -13,13 +13,12 @@ depends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'ffmpeg' optdepends=('jack') makedepends=('subversion') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('06de4052cffd6760c468d7da9557edae') +md5sums=('1cd2d73f3ffe77a43980e99aaa4ea06c') build() { # mlt cd "${srcdir}/mlt-${pkgver}" - msg "SSE2=$SSE2" ./configure --prefix=/usr \ --enable-gpl \ --enable-gpl3 \ @@ -27,7 +26,7 @@ build() { --qimage-includedir=/usr/include/Qt \ --avformat-vdpau \ --disable-gtk2 \ - --avformat-swscale $SSE2 + --avformat-swscale make # mlt python bindings From b40ad7882e4aa6b5d552f5a7d188e4a925657ff6 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 14 Jun 2013 19:45:22 +0000 Subject: [PATCH 095/110] pinentry 0.8.3 --- pinentry/PKGBUILD | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pinentry/PKGBUILD b/pinentry/PKGBUILD index f3ace26a3..bb3e381c7 100644 --- a/pinentry/PKGBUILD +++ b/pinentry/PKGBUILD @@ -1,11 +1,7 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer: Neophytos Kolokotronis pkgname=pinentry -pkgver=0.8.1 +pkgver=0.8.3 pkgrel=1 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" arch=('i686' 'x86_64') @@ -14,7 +10,8 @@ url="http://www.gnupg.org/aegypten2" depends=('ncurses' 'libcap>=2.16') makedepends=('qt') optdepends=('qt: for qt4 backend') -source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz) +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('2ae681cbca0d9fb774b2c90b11ebf56c') build() { cd $startdir/src/$pkgname-$pkgver @@ -29,9 +26,12 @@ build() { --disable-pinentry-qt \ --enable-pinentry-qt4 \ --enable-fallback-curses - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm ${pkgdir}/usr/share/info/dir || return 1 - rm ${pkgdir}/usr/bin/pinentry || return 1 + make +} + +package() { + cd $startdir/src/$pkgname-$pkgver + make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/share/info/dir + rm ${pkgdir}/usr/bin/pinentry } -md5sums=('81f99904daee5331eb6738408bb024b6') From a0a67a5f9775f97271d27c04ef1c2a0415e80a1d Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 14 Jun 2013 19:49:41 +0000 Subject: [PATCH 096/110] libzip 0.11.1 --- libzip/PKGBUILD | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/libzip/PKGBUILD b/libzip/PKGBUILD index 10cb1cfdd..5274ead90 100644 --- a/libzip/PKGBUILD +++ b/libzip/PKGBUILD @@ -1,24 +1,17 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +#maintainer: Neophytos Kolokotronis pkgname=libzip -pkgver=0.10 +pkgver=0.11.1 pkgrel=1 pkgdesc="A C library for reading, creating, and modifying zip archives" url="http://www.nih.at/libzip/index.html" license=('GPL2') -arch=('i686' 'x86_64') +arch=('x86_64') depends=('zlib') options=('!libtool') source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'fix-headers.patch') -md5sums=('47cdfcbc08c8bea0b52fdee4bf591622' +md5sums=('bf50518665f4ebcce623c7dcdc2f422d' '249395bd3a426c4c4e993e9d4753e1dd') build() { @@ -26,10 +19,10 @@ build() { patch -p1 -i "${srcdir}/fix-headers.patch" ./configure --prefix=/usr - make || return 1 + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } From 1297f3fc0c7a9efad50918db3d9d7d43e56920ae Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 14 Jun 2013 19:57:34 +0000 Subject: [PATCH 097/110] pinentry minor fix --- pinentry/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pinentry/PKGBUILD b/pinentry/PKGBUILD index bb3e381c7..3081c629b 100644 --- a/pinentry/PKGBUILD +++ b/pinentry/PKGBUILD @@ -4,7 +4,7 @@ pkgname=pinentry pkgver=0.8.3 pkgrel=1 pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" -arch=('i686' 'x86_64') +arch=('x86_64') license=('GPL') url="http://www.gnupg.org/aegypten2" depends=('ncurses' 'libcap>=2.16') From a117187b50a1cdcdb771f20170c553a9782a774a Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 14 Jun 2013 20:27:18 +0000 Subject: [PATCH 098/110] nbd 3.3 --- nbd/PKGBUILD | 40 ++++++++++++++++++++++++---------------- nbd/config | 33 +++++++++++++++++++++++++++++++++ nbd/nbd.install | 13 +++++++++++++ nbd/nbd.service | 10 ++++++++++ 4 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 nbd/config create mode 100644 nbd/nbd.install create mode 100644 nbd/nbd.service diff --git a/nbd/PKGBUILD b/nbd/PKGBUILD index e6aadaca9..0e497238a 100644 --- a/nbd/PKGBUILD +++ b/nbd/PKGBUILD @@ -1,29 +1,37 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer: Neophytos Kolokotronis +# contributions from Arch: https://www.archlinux.org/packages/community/x86_64/nbd/ pkgname=nbd -pkgver=2.9.21a +pkgver=3.3 pkgrel=1 pkgdesc="Tools for network block devices, allowing you to use remote block devices over TCP/IP." -arch=('i686' 'x86_64') +arch=('x86_64') url="http://nbd.sourceforge.net" license=('GPL') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nbd.conf.d nbd) +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" + 'config' 'nbd.service') +backup=('etc/nbd-server/config') depends=('glib2') -md5sums=('4028c77d52a13f16be5e9bf3d3bab27d' - '6d746f377a28b92dd2c80f01176cb811' - 'ab9c431881f5e3c98a8f6c04016f0e00') - +install=nbd.install +md5sums=('cde8fe6e870b8a7459f12e5dcf572d86' + '2c43761cd261c9b002601bb78f7500a3' + '59a2a7c119919d8f9b384b5a783af62a') + build(){ cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + + ./configure --prefix=/usr --sysconfdir=/etc --enable-syslog + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}"/nbd.conf.d "${pkgdir}"/etc/conf.d/nbd - install -D -m755 "${srcdir}"/nbd "${pkgdir}"/etc/rc.d/nbd + install -D -m644 "${srcdir}"/config "${pkgdir}"/etc/nbd-server/config + install -D -m644 "${srcdir}"/nbd.service "${pkgdir}"/usr/lib/systemd/system/nbd.service + + install -D -m644 README "${pkgdir}"/usr/share/doc/nbd/README } diff --git a/nbd/config b/nbd/config new file mode 100644 index 000000000..8a7bfbbd8 --- /dev/null +++ b/nbd/config @@ -0,0 +1,33 @@ +[generic] + # The [generic] section is required, even if nothing is specified + # there. + # When either of these options are specified, nbd-server drops + # privileges to the given user and group after opening ports, but + # _before_ opening files. + user = nbd + group = nbd + # Since version 2.9.17, nbd-server will do exports on a name + # basis (the used name is the name of the section in which the + # export is specified). This however required an incompatible + # protocol change. To enable backwards-compatible port-based + # exports, uncomment the following line: + # oldstyle = true +[export1] + exportname = /export/nbd/export1-file + # The following line will be ignored unless the + # "oldstyle = true" line in the generic section above is + # enabled. + #port = 12345 + authfile = /export/nbd/export1-authfile + timeout = 30 + filesize = 10000000 + readonly = false + multifile = false + copyonwrite = false + prerun = dd if=/dev/zero of=%s bs=1k count=500 + postrun = rm -f %s +[otherexport] + exportname = /export/nbd/experiment + # The other options are all optional, except this one in case + # the oldstyle option is used in [generic]: + # port = 12346 \ No newline at end of file diff --git a/nbd/nbd.install b/nbd/nbd.install new file mode 100644 index 000000000..661f7fe02 --- /dev/null +++ b/nbd/nbd.install @@ -0,0 +1,13 @@ +post_install() { + getent group "nbd" &>/dev/null || groupadd -r -g 44 nbd 1>/dev/null + getent passwd "nbd" &>/dev/null || useradd -r -u 44 -g nbd -d "/var/empty" -s "/bin/false" nbd 1>/dev/null +} + +post_upgrade() { + post_install +} + +pre_remove() { + getent passwd "nbd" &>/dev/null && userdel nbd 1>/dev/null + getent group "nbd" &>/dev/null && groupdel nbd 1>/dev/null +} \ No newline at end of file diff --git a/nbd/nbd.service b/nbd/nbd.service new file mode 100644 index 000000000..ccc020ece --- /dev/null +++ b/nbd/nbd.service @@ -0,0 +1,10 @@ +[Unit] +Description=Network Block Device Server +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/nbd-server + +[Install] +WantedBy=multi-user.target \ No newline at end of file From 7500e41b840bfe5bdb6ae9360ce048a7869932e2 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 14 Jun 2013 20:37:05 +0000 Subject: [PATCH 099/110] nbd obsolete files removed --- nbd/nbd | 40 ---------------------------------------- nbd/nbd.conf.d | 8 -------- 2 files changed, 48 deletions(-) delete mode 100644 nbd/nbd delete mode 100644 nbd/nbd.conf.d diff --git a/nbd/nbd b/nbd/nbd deleted file mode 100644 index b2643196b..000000000 --- a/nbd/nbd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/nbd - -PIDFILE="/var/run/nbd-server.$NBD_PORT.pid" -PID=`cat $PIDFILE 2>/dev/null` -case "$1" in - start) - stat_busy "Starting Network Block Device Server" - if [ "$PID" = "" ]; then - /usr/bin/nbd-server $NBD_PORT $NBD_DEV $NBD_ARGS - fi - if [ "$PID" != "" -o $? -gt 0 ]; then - stat_fail - else - add_daemon nbd - stat_done - fi - ;; - stop) - stat_busy "Stopping Network Block Device Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - rm -f $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nbd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/nbd/nbd.conf.d b/nbd/nbd.conf.d deleted file mode 100644 index d89ca09b1..000000000 --- a/nbd/nbd.conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# -# Configuration for network block device (nbd) daemon -# - -NBD_PORT=2000 -NBD_DEV="/srv/http/sysrcd.dat" -NBD_ARGS="-r" - From 3283ba565ee5f11ae1ab4f5d345e025d25216935 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 14 Jun 2013 20:39:21 +0000 Subject: [PATCH 100/110] astyle 2.03 --- astyle/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/astyle/PKGBUILD b/astyle/PKGBUILD index a5914bf2e..4ff14241e 100644 --- a/astyle/PKGBUILD +++ b/astyle/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Giuseppe Calà pkgname=astyle -pkgver=2.01 +pkgver=2.03 pkgrel=1 pkgdesc="Artistic Style is a source code indenter, formatter, and beautifier for the C, C++, C# and Java programming languages." -arch=('i686' 'x86_64') +arch=('x86_64') url="http://astyle.sourceforge.net/ " license=('LGPL') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${pkgver}_linux.tar.gz) -md5sums=('e85b31972c532373a4054842e2149b34') +md5sums=('ba84eaa8564155babd4ba1458d4eaa11') build() { cd ${srcdir}/${pkgname}/build/gcc From 34ca87587a92fb43c6f9668f8f53d4fe40d56cde Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 14 Jun 2013 20:58:41 +0000 Subject: [PATCH 101/110] libzip rebuild with a fix --- libzip/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libzip/PKGBUILD b/libzip/PKGBUILD index 5274ead90..2cfe7d523 100644 --- a/libzip/PKGBUILD +++ b/libzip/PKGBUILD @@ -1,8 +1,9 @@ #maintainer: Neophytos Kolokotronis +#contributions from Arch: https://www.archlinux.org/packages/extra/x86_64/libzip/ pkgname=libzip pkgver=0.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="A C library for reading, creating, and modifying zip archives" url="http://www.nih.at/libzip/index.html" license=('GPL2') @@ -16,8 +17,8 @@ md5sums=('bf50518665f4ebcce623c7dcdc2f422d' build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/fix-headers.patch" + autoreconf -i ./configure --prefix=/usr make } @@ -25,4 +26,5 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } From 74d91ca7a26501480e36c4b05cf554b6a27b6bbc Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 14 Jun 2013 21:00:19 +0000 Subject: [PATCH 102/110] added convertlit and libtommath as dependencies of ebook-tools --- convertlit/PKGBUILD | 29 ++++++++++++++ libtommath/PKGBUILD | 30 ++++++++++++++ libtommath/libtommath-0.42.0-makefile.patch | 44 +++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 convertlit/PKGBUILD create mode 100644 libtommath/PKGBUILD create mode 100644 libtommath/libtommath-0.42.0-makefile.patch diff --git a/convertlit/PKGBUILD b/convertlit/PKGBUILD new file mode 100644 index 000000000..298485961 --- /dev/null +++ b/convertlit/PKGBUILD @@ -0,0 +1,29 @@ +# maintainer: Neophytos Kolokotronis +# contributions from Arch: https://www.archlinux.org/packages/extra/x86_64/convertlit/ + +pkgname=convertlit +pkgver=1.8 +pkgrel=1 +pkgdesc="An extractor/converter for .LIT eBooks" +arch=('x86_64') +url="http://www.convertlit.com/" +license=('GPL') +depends=('glibc') +makedepends=('libtommath') +source=("http://www.convertlit.com/clit18src.zip") +md5sums=('d691d4729485fe5d73e3f0937d8fb42e') + +build() { + cd ${srcdir}/lib + make + + cd ../clit18 + sed -i 's|../libtommath-0.30/|/usr/lib/|' Makefile + make +} + +package() { + cd ${srcdir}/clit18 + + install -Dm755 clit "$pkgdir/usr/bin/clit" +} diff --git a/libtommath/PKGBUILD b/libtommath/PKGBUILD new file mode 100644 index 000000000..6c82eccaa --- /dev/null +++ b/libtommath/PKGBUILD @@ -0,0 +1,30 @@ +#Maintainer: Neophytos Kolokotronis +#Contributions from Arch: https://www.archlinux.org/packages/community/x86_64/libtommath/ + +pkgname=libtommath +pkgver=0.42.0 +pkgrel=1 +pkgdesc="Highly optimized and portable routines for integer based number theoretic applications" +url="http://www.libtom.org/" +license=('custom') +arch=('x86_64') +source=("http://libtom.org/files/ltm-${pkgver}.tar.bz2" + 'libtommath-0.42.0-makefile.patch') +md5sums=('7380da904b020301be7045cb3a89039b' + 'd50c26fdc5aa87e6acfd4adc20557ff4') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 -i ${srcdir}/libtommath-0.42.0-makefile.patch + + make -f makefile.shared IGNORE_SPEED=1 +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir INSTALL_GROUP=root install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + chmod 644 ${pkgdir}/usr/lib/libtommath.a +} diff --git a/libtommath/libtommath-0.42.0-makefile.patch b/libtommath/libtommath-0.42.0-makefile.patch new file mode 100644 index 000000000..d98456e5b --- /dev/null +++ b/libtommath/libtommath-0.42.0-makefile.patch @@ -0,0 +1,44 @@ +--- a/makefile.shared ++++ b/makefile.shared +@@ -3,7 +3,7 @@ + #Tom St Denis + VERSION=0:41 + +-CC = libtool --mode=compile --tag=CC gcc ++LTCOMPILE = libtool --mode=compile --tag=CC $(CC) + + CFLAGS += -I./ -Wall -W -Wshadow -Wsign-compare + +@@ -82,21 +82,24 @@ + + objs: $(OBJECTS) + ++.c.o: ++ $(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $< ++ + $(LIBNAME): $(OBJECTS) +- libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) ++ libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) + + install: $(LIBNAME) +- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) ++ install -d $(DESTDIR)$(LIBPATH) + libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME) +- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) +- install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) ++ install -d $(DESTDIR)$(INCPATH) ++ install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH) + + test: $(LIBNAME) demo/demo.o +- gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o +- libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S) ++ $(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o ++ libtool --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S) + + mtest: test +- cd mtest ; gcc $(CFLAGS) mtest.c -o mtest ++ cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest + + timing: $(LIBNAME) +- gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest ++ libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest From 28ea11c9eb299ca14be831a4ca8965abb090f37d Mon Sep 17 00:00:00 2001 From: Neophytos Date: Fri, 14 Jun 2013 21:00:45 +0000 Subject: [PATCH 103/110] ebook-tools 0.2.2 --- ebook-tools/PKGBUILD | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/ebook-tools/PKGBUILD b/ebook-tools/PKGBUILD index 3c1328be9..207d6d656 100644 --- a/ebook-tools/PKGBUILD +++ b/ebook-tools/PKGBUILD @@ -1,23 +1,16 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +#maintainer: Neophytos Kolokotronis pkgname=ebook-tools -pkgver=0.2.1 -pkgrel=2 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Tools for accessing and converting various ebook file formats" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://sourceforge.net/projects/ebook-tools" license=('custom') -depends=('libzip' 'libxml2') +depends=('libzip' 'libxml2' 'convertlit') makedepends=('pkgconfig' 'cmake') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('cabbd2ef9148a61ca5f6e60ca63e6045') +md5sums=('67bce67ceb72dcc3578d6a81ef92b29b') build() { cd $srcdir @@ -26,8 +19,12 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -D ${srcdir}/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install + + install -D ${srcdir}/${pkgname}-${pkgver}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } From 3f3f345a2dc47ac6abe2fdf69d0dc5b92c3bf91a Mon Sep 17 00:00:00 2001 From: Neophytos Date: Sun, 16 Jun 2013 10:35:39 +0000 Subject: [PATCH 104/110] man-db 2.6.3 --- man-db/PKGBUILD | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/man-db/PKGBUILD b/man-db/PKGBUILD index b40359c5a..fe16f2db6 100644 --- a/man-db/PKGBUILD +++ b/man-db/PKGBUILD @@ -1,14 +1,10 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +#maintainer: Neophytos Kolokotronis pkgname=man-db -pkgver=2.6.0.2 +pkgver=2.6.3 pkgrel=1 pkgdesc="A utility for reading man pages" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.nongnu.org/man-db/" license=('GPL' 'LGPL') depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline') @@ -19,18 +15,14 @@ conflicts=('man') provides=('man') replaces=('man') install=${pkgname}.install -source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz - 1361_1360.diff - #http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz +source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz convert-mans man-db.cron.daily) -md5sums=('2b41c96efec032d2b74ccbf2e401f93e' - '9a816cf0f9a1c2594491bbdba53fe64a' +md5sums=('a593a095599ae97bcacf8d038659a146' '2b7662a7d5b33fe91f9f3e034361a2f6' 'd30c39ae47560304471b5461719e0f03') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i $srcdir/1361_1360.diff ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ --with-sections="1 n l 8 3 0 2 5 4 9 6 7" From 206c0ab22fe704c3f1fc052d2f9806feac16c46c Mon Sep 17 00:00:00 2001 From: Samir Date: Sun, 16 Jun 2013 15:10:49 +0000 Subject: [PATCH 105/110] update rxvt-unicode --- rxvt-unicode/01-fix-tabber-perl-ext.patch | 12 +++ rxvt-unicode/PKGBUILD | 96 ++++++++++-------- rxvt-unicode/popup-menu-hang.diff | 24 ----- rxvt-unicode/rxvt-unicode.png | Bin 1513 -> 0 bytes rxvt-unicode/urxvt-tabbed.desktop | 9 ++ .../{rxvt-unicode.desktop => urxvt.desktop} | 7 +- rxvt-unicode/urxvtc.desktop | 9 ++ 7 files changed, 89 insertions(+), 68 deletions(-) create mode 100644 rxvt-unicode/01-fix-tabber-perl-ext.patch delete mode 100644 rxvt-unicode/popup-menu-hang.diff delete mode 100644 rxvt-unicode/rxvt-unicode.png create mode 100644 rxvt-unicode/urxvt-tabbed.desktop rename rxvt-unicode/{rxvt-unicode.desktop => urxvt.desktop} (52%) create mode 100644 rxvt-unicode/urxvtc.desktop diff --git a/rxvt-unicode/01-fix-tabber-perl-ext.patch b/rxvt-unicode/01-fix-tabber-perl-ext.patch new file mode 100644 index 000000000..adb140bcc --- /dev/null +++ b/rxvt-unicode/01-fix-tabber-perl-ext.patch @@ -0,0 +1,12 @@ +# https://bugs.archlinux.org/task/35420 +--- a/src/perl/tabbed 2012-09-12 17:32:04.000000000 +0900 ++++ b/src/perl/tabbed 2013-05-24 13:04:37.000000000 +0900 +@@ -402,7 +402,7 @@ + # simply proxies all interesting calls back to the tabbed class. + + { +- for my $hook qw(start destroy key_press property_notify) { ++ for my $hook (qw(start destroy key_press property_notify)) { + eval qq{ + sub on_$hook { + my \$parent = \$_[0]{term}{parent} diff --git a/rxvt-unicode/PKGBUILD b/rxvt-unicode/PKGBUILD index a5c482926..ec217fbea 100644 --- a/rxvt-unicode/PKGBUILD +++ b/rxvt-unicode/PKGBUILD @@ -5,63 +5,79 @@ # maintainer (x86_64): Manuel Tortosa pkgname=rxvt-unicode -pkgver=9.15 -pkgrel=3 +pkgver=9.18 +pkgrel=1 pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt)." -arch=('i686' 'x86_64') -depends=('gcc-libs' 'libxft' 'libxpm') -makedepends=('ncurses' 'perl>=5.10.0' 'pkgconfig') +arch=('x86_64') +depends=('libxft' 'perl' 'startup-notification') optdepends=('perl: lots of utilities' - 'gtk2: urxvt-tabbed') + 'gtk2: urxvt-tabbed' + 'gtk2-perl: to use the urxvt-tabbed') url="http://software.schmorp.de/pkg/rxvt-unicode.html" license=("GPL") source=("http://dist.schmorp.de/rxvt-unicode/${pkgname}-${pkgver}.tar.bz2" - "${pkgname}.desktop" - "${pkgname}.png" - 'popup-menu-hang.diff') -md5sums=('15595aa326167ac5eb68c28d95432faf' '5bfefa1b41c2b81ca18f2ef847330543'\ - '84328cada91751df07324d95f8be4d1b' 'aead33ba3b08eeb251fb0c1427a4a024') + "urxvt.desktop" + "urxvtc.desktop" + "urxvt-tabbed.desktop" + "01-fix-tabber-perl-ext.patch") +md5sums=('963ccc748fe5bca925e7b92c0404d68b' + '4a041e3baa87991c415468e12bc6bcc9' + 'fac55f0a8404c86dad3e702146762332' + '8a5599197568c63720e282b9722a7990' + '0c26ae7022a128e68981577785358b63') + +prepare() { + patch -p1 -d $pkgname-$pkgver < 01-fix-tabber-perl-ext.patch +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/popup-menu-hang.diff" || return 1 - - ./configure --prefix=/usr \ - --with-terminfo=/usr/share/terminfo \ - --enable-font-styles \ - --enable-xim \ - --enable-keepscrolling \ - --enable-selectionscrolling \ - --enable-smart-resize \ - --enable-xpm-background \ - --enable-transparency \ - --enable-utmp \ - --enable-wtmp \ - --enable-lastlog \ - --enable-xft \ - --enable-startup-notification \ - --enable-text-blink \ - --enable-pointer-blank \ - --disable-frills || return 1 - make || return 1 + ./configure \ + --prefix=/usr \ + --with-terminfo=/usr/share/terminfo \ + --enable-256-color \ + --enable-combining \ + --enable-fading \ + --enable-font-styles \ + --enable-iso14755 \ + --enable-keepscrolling \ + --enable-lastlog \ + --enable-mousewheel \ + --enable-next-scroll \ + --enable-perl \ + --enable-pointer-blank \ + --enable-rxwt-scroll \ + --enable-selectionscrolling \ + --enable-slipwheeling \ + --enable-smart-resize \ + --enable-startup-notification \ + --enable-transparency \ + --enable-utmp \ + --enable-wtmp \ + --enable-xft \ + --enable-xim \ + --enable-xterm-scroll \ + --enable-pixbuf \ + --disable-frills + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -d "${pkgdir}/usr/share/terminfo" export TERMINFO="${pkgdir}/usr/share/terminfo" - make DESTDIR="${pkgdir}" install || return 1 + install -d "$TERMINFO" + make DESTDIR="${pkgdir}" install # install the tabbing wrapper ( requires gtk2-perl! ) - sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed || return 1 - install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed" || return 1 + sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed + install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed" - # install freedesktop menu and icon ( icon from cvs checkout ) - install -Dm644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm644 "${srcdir}/${pkgname}.png" \ - "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + cd "${srcdir}" + # install freedesktop menu + for _f in urxvt urxvtc urxvt-tabbed; do + install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop" + done # remove the terminfo files: we will provide them in the ncurses package, # so that, e.g., you can install ncurses on a remote server and correctly diff --git a/rxvt-unicode/popup-menu-hang.diff b/rxvt-unicode/popup-menu-hang.diff deleted file mode 100644 index 09bb3c64b..000000000 --- a/rxvt-unicode/popup-menu-hang.diff +++ /dev/null @@ -1,24 +0,0 @@ -Index: src/perl/urxvt-popup -=================================================================== -RCS file: /schmorpforge/rxvt-unicode/src/perl/urxvt-popup,v -retrieving revision 1.15 -diff -u -r1.15 urxvt-popup ---- src/perl/urxvt-popup 24 Dec 2007 08:21:40 -0000 1.15 -+++ src/perl/urxvt-popup 2 Aug 2009 08:22:52 -0000 -@@ -120,7 +120,7 @@ - $self->refresh; - - # might fail, but try anyways -- $self->grab ($self->{data}{event}{time}, 1) -+ $self->grab ($self->{data}{event}{time}) - and $self->allow_events_async; - - on_button_press $self, $self->{data}{event} if $self->{data}{event}{button}; -@@ -132,7 +132,7 @@ - my ($self, $event) = @_; - - # should definitely not fail -- $self->grab ($self->{data}{event}{time}, 1) -+ $self->grab ($self->{data}{event}{time}) - and $self->allow_events_async; - } diff --git a/rxvt-unicode/rxvt-unicode.png b/rxvt-unicode/rxvt-unicode.png deleted file mode 100644 index 0738a7840938bc90adc38c7ef33841e54f64252c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1513 zcmVGszbmVl7j*PuOJtLFA6Mv6j21}O?6Dv;j_#M=mRSP(xe5f9gUDu4K> zLgwoXp67PS+>Iusn#+x^F6}FiUzU9W0P%Q)dv`DOP-OrM!busOZoVZlAR9r`M%uB>N6K zzHR;8+_m_FKv5JXz8w$R<;Rt60xeA6n&!q2H_&rB4@+hniCqNh>-9Yq6@H#TQDh1a zmJm^aRoi>4#~#)?BxZh^Vf@-S`Pn@2b8#G}6|dogPNM%(LW)WxFUP4owTbNP!aH0D zz;PUE&ust_7gQ8Q>6<{|UV-Ub(ims?BA4V>oYzB?5OMk)#)x$R?gRmsoh$&6*ljAgJEt-eTvH)*MR35+kD{K~k$){wb2qrYS!vGyUT<0F@^d^qfvQn|$-49o?SLb1>@sDTcb zJXQjwVu?brfVtq;Bj$pMGN_Ol%LHSzVU7BFo$>5=V42+;P$(7%g+hcvp+g_3?Fcz* zFSjH~{>U?Njq>Aikh}m=qbWSE`RQchz0h|M9|rrmN>WSqbhnR+Kzp3*hPhzAS6=w! zUFiQqK+owxVfQg%S2YTy;@$+DH3wx-Ig<0cUnDLhNR6gQjiwm6G7{Xy0|M3}OieS;&m} z?R4AYR%{>^lnLg7*>_EU)Ci7IbD`C#4TH1h6G^s;QLIIasmUpnK?U=^i8`eAqwB*G z=!N#3*K;~mtBNsabd=a9jf20;<@EQ;m?uu)q!(|$uvuAN3ED#Q-vE!LlsGE%DoKuo zz|I|_7m`}?Kyye@3GcOs`^Lq7Zj;WY@w{WQz)@V{YtL&;T%W+P9NgD?ybFEoSXy4f z-EdI`ThH^KMhpo51}2@AP`*$)-jhO0&z81a*E#&;r#QtaPH~D;oFM)K&H@oxr~k7s P00000NkvXXu0mjf6*R}J diff --git a/rxvt-unicode/urxvt-tabbed.desktop b/rxvt-unicode/urxvt-tabbed.desktop new file mode 100644 index 000000000..172006b4a --- /dev/null +++ b/rxvt-unicode/urxvt-tabbed.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=urxvt (tabbed) +Comment=An unicode capable and tabbed rxvt clone +Exec=urxvt-tabbed +Icon=utilities-terminal +Terminal=false +Type=Application +Categories=System;TerminalEmulator; diff --git a/rxvt-unicode/rxvt-unicode.desktop b/rxvt-unicode/urxvt.desktop similarity index 52% rename from rxvt-unicode/rxvt-unicode.desktop rename to rxvt-unicode/urxvt.desktop index 436e8d119..0534a09b8 100644 --- a/rxvt-unicode/rxvt-unicode.desktop +++ b/rxvt-unicode/urxvt.desktop @@ -1,10 +1,9 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 -Name=rxvt-unicode +Name=urxvt Comment=An Unicode capable rxvt clone Exec=urxvt -Icon=rxvt-unicode +Icon=utilities-terminal Terminal=false Type=Application -Categories=Application;System;TerminalEmulator; +Categories=System;TerminalEmulator; diff --git a/rxvt-unicode/urxvtc.desktop b/rxvt-unicode/urxvtc.desktop new file mode 100644 index 000000000..3a2df410f --- /dev/null +++ b/rxvt-unicode/urxvtc.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=urxvt (client) +Comment=An unicode capable rxvt clone client for urxvtd +Exec=urxvtc +Icon=utilities-terminal +Terminal=false +Type=Application +Categories=System;TerminalEmulator; From d73c936880ba6034253dc7fbe2d5f7a1530a9a40 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Wed, 19 Jun 2013 11:14:33 +0000 Subject: [PATCH 106/110] diffstat 1.57 --- diffstat/PKGBUILD | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/diffstat/PKGBUILD b/diffstat/PKGBUILD index dae50f5b3..65ab99478 100644 --- a/diffstat/PKGBUILD +++ b/diffstat/PKGBUILD @@ -1,32 +1,26 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +#maintainer: Neophytos Kolokotronis pkgname=diffstat -pkgver=1.54 +pkgver=1.57 pkgrel=1 pkgdesc="Display a histogram of diff changes" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://invisible-island.net/diffstat" depends=('glibc') license=('GPL') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz) -md5sums=('af08bef2eb37050ceb0c4fddedb2ee36') +md5sums=('a70ae35e479ab91da7eb6023a4e9240a') build () { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --mandir=/usr/share/man - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir}/ install || return 1 -} \ No newline at end of file + make DESTDIR=${pkgdir}/ install + install -Dm644 package/debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} From 03f21985f2612b6bf91c5487507e9000436c6cca Mon Sep 17 00:00:00 2001 From: Neophytos Date: Wed, 19 Jun 2013 11:14:45 +0000 Subject: [PATCH 107/110] quilt 0.60 --- quilt/PKGBUILD | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/quilt/PKGBUILD b/quilt/PKGBUILD index a0bdb950b..2e54a465c 100644 --- a/quilt/PKGBUILD +++ b/quilt/PKGBUILD @@ -1,28 +1,27 @@ -# -# Platform Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - +#maintainer: Neophytos Kolokotronis +#contributions from Arch: https://www.archlinux.org/packages/community/any/quilt/ pkgname=quilt -pkgver=0.50 +pkgver=0.60 pkgrel=1 pkgdesc='Manage a series of patches by keeping track of the changes each patch makes' -arch=('i686' 'x86_64') +arch=('x86_64') url='http://savannah.nongnu.org/projects/quilt' license=('GPL2') depends=('diffstat' 'gawk' 'patch' 'diffutils' 'gettext') source=("http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz") -md5sums=('ff5e1e041363c3af3c8fda4b968c9d1d') +md5sums=('058a08a9b626bdec9ec8c519dc92158c') build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man --without-rpmbuild make } package() { cd ${pkgname}-${pkgver} make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install + # move bash completion in right place + install -d -m 755 "$pkgdir/usr/share/bash-completion" + mv "$pkgdir/etc/bash_completion.d" "$pkgdir/usr/share/bash-completion/completions" } From acd8097e36433c302bc4c8e21d5bbe8950f9a138 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Wed, 19 Jun 2013 11:19:39 +0000 Subject: [PATCH 108/110] osso 20130619 --- osso/PKGBUILD | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/osso/PKGBUILD b/osso/PKGBUILD index b0837afa4..3894e4b3a 100644 --- a/osso/PKGBUILD +++ b/osso/PKGBUILD @@ -1,24 +1,14 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf +#maintainer: Neophytos Kolokotronis pkgname=osso -pkgver=20110826 +pkgver=20130619 pkgrel=1 pkgdesc="qt oss sound mixer" url="http://github.com/antico/osso/tree/master" -arch=('i686' 'x86_64') +arch=('x86_64') license=('GPL') depends=('qt' 'oss') makedepends=('git') -conflicts=() -replaces=() -backup=() _gitroot="git://github.com/antico/osso.git" _gitname="osso" @@ -40,12 +30,13 @@ build() { cd $srcdir/osso/ - qmake || return 1 + qmake make +} +package() { + cd $srcdir/osso/ mkdir -p $pkgdir/usr/ mkdir -p $pkgdir/usr/bin/ cp -a $srcdir/osso/osso $pkgdir/usr/bin/ - #make DESTDIR=${pkgdir} install || return 1 - -} \ No newline at end of file +} From 46b4b4fa2e5349af0c23ffe14f587fb779b75fd7 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Wed, 19 Jun 2013 11:29:50 +0000 Subject: [PATCH 109/110] soundfont-fluidr3 20130619 --- soundfont-fluidr3/PKGBUILD | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 soundfont-fluidr3/PKGBUILD diff --git a/soundfont-fluidr3/PKGBUILD b/soundfont-fluidr3/PKGBUILD new file mode 100644 index 000000000..d7f37a65e --- /dev/null +++ b/soundfont-fluidr3/PKGBUILD @@ -0,0 +1,20 @@ +#maintainer: Neophytos Kolokotronis + +pkgname=soundfont-fluidr3 +pkgver=20130619 +pkgrel=7 +pkgdesc="Large MIDI soundfont for timidity++ and other midi players" +arch=('x86_64') +license="custom" +url="http://www.hammersound.net" +groups=('soundfonts') +source=('http://chakra-project.org/sources/fluidr3/FluidR3.tar.gz') +md5sums=('d99e473868f4c8712bfb4f4ac124d302') + + +package() { + mkdir -p /$startdir/pkg/usr/share/soundfonts/fluidr3 + + cd $startdir/src + install -D -m644 FluidR3GM.SF2 FluidR3-Readme.doc $startdir/pkg/usr/share/soundfonts/fluidr3/ +} From 50c60fab510f56cab8914da6ced0b2a504f6d65c Mon Sep 17 00:00:00 2001 From: Neophytos Date: Wed, 19 Jun 2013 14:17:17 +0000 Subject: [PATCH 110/110] soundfont-fluidr3 deleted, no need to update --- soundfont-fluidr3/PKGBUILD | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 soundfont-fluidr3/PKGBUILD diff --git a/soundfont-fluidr3/PKGBUILD b/soundfont-fluidr3/PKGBUILD deleted file mode 100644 index d7f37a65e..000000000 --- a/soundfont-fluidr3/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -#maintainer: Neophytos Kolokotronis - -pkgname=soundfont-fluidr3 -pkgver=20130619 -pkgrel=7 -pkgdesc="Large MIDI soundfont for timidity++ and other midi players" -arch=('x86_64') -license="custom" -url="http://www.hammersound.net" -groups=('soundfonts') -source=('http://chakra-project.org/sources/fluidr3/FluidR3.tar.gz') -md5sums=('d99e473868f4c8712bfb4f4ac124d302') - - -package() { - mkdir -p /$startdir/pkg/usr/share/soundfonts/fluidr3 - - cd $startdir/src - install -D -m644 FluidR3GM.SF2 FluidR3-Readme.doc $startdir/pkg/usr/share/soundfonts/fluidr3/ -}