Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-10 08:24:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

Browse Source
This commit is contained in:
Daniele 2011-05-27 15:12:54 +00:00
commit 2afb8d34dc
29 changed files with 385 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acerhk/PKGBUILD
View File

@ -6,12 +6,12 @@
pkgname=acerhk
pkgver=0.5.35
pkgrel=8
pkgrel=9
pkgdesc="Acer hotkey driver"
url="http://www.cakey.de/acerhk/"
arch=('i686') # Unavailable for x86_64
license=('GPL')
depends=('kernel26>=2.6.38rc5')
depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
makedepends=('kernel26-headers')
source=(http://www.cakey.de/acerhk/archives/${pkgname}-${pkgver}.tgz acerhk.rc
2.6.30.patch kernelversion.patch 2.6.36.patch)

29
apache/PKGBUILD
View File

@ -8,7 +8,7 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=apache
pkgver=2.2.16
pkgver=2.2.17
pkgrel=1
pkgdesc='A high performance Unix-based HTTP server'
arch=('i686' 'x86_64')
@ -22,8 +22,8 @@ backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
etc/logrotate.d/httpd)
depends=('openssl' 'zlib' 'apr-util' 'pcre')
optdepends=('lynx: apachectl status')
_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.11-02
source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
_itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
source=(http://archive.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
${_itkurl}/02-rename-prefork-to-itk.patch
${_itkurl}/03-add-mpm-to-build-system.patch
${_itkurl}/04-correct-output-makefile-location.patch
@ -33,21 +33,23 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
${_itkurl}/08-max-clients-per-vhost.patch
${_itkurl}/09-capabilities.patch
${_itkurl}/10-nice.patch
${_itkurl}/11-fix-htaccess-reads-for-persistent-connections.patch
apachectl-confd.patch
apache.conf.d
httpd.logrotate
httpd
arch.layout)
md5sums=('c8ff2a07c884300bc7766a2e7f662d33'
'db42cfcc18ae1c32aaaff2347e35b79d'
'131408ad4dc7b18547b4e062e7e495ab'
'ee488f391054d528547c3a372faa2aa7'
'b202944761b2f0516196488b12504236'
'78fa15f8ca3a284b7d71f942e24e47fb'
'd33e39350e987721d50e6fb8e164ab6b'
'9f7a8935f9cabc7b46d0052906634cef'
'1b28e3363e1b0d05b738a21e7ddd264f'
'd9667fcd2ffecc63e446edd4d6666731'
md5sums=('16eadc59ea6b38af33874d300973202e'
'f1d9d41360908ceb2374da55ae99197a'
'cdfa04985a0efa850976aef01c2a0c40'
'0930d2d0612eb0a53a0d00aea7e8687f'
'3a0c29bb91442c33ea73ebbe072af922'
'0ef4729a6f1ffc848ad0e9b440a66f66'
'940944caa948340b11ddae56adaef89b'
'ce09a987523884de8838f73dc8ec0d19'
'e75b7dd8d8afcd299ba4ab2ab81c11e4'
'ce1ccc21f3ad8625169c8f62913450ac'
'1e5b222edcfbf99a3edc56fcb2074fbe'
'4ac64df6e019edbe137017cba1ff2f51'
'08b3c875f6260644f2f52b4056d656b0'
'6382331e9700ed9e8cc78ea51887b537'
@ -81,6 +83,7 @@ build() {
patch -Np1 -i "${srcdir}/08-max-clients-per-vhost.patch" || return 1
patch -Np1 -i "${srcdir}/09-capabilities.patch" || return 1
patch -Np1 -i "${srcdir}/10-nice.patch" || return 1
patch -Np1 -i "${srcdir}/11-fix-htaccess-reads-for-persistent-connections.patch" || return 1
autoconf || return 1
fi

34
avahi/PKGBUILD
View File

@ -1,18 +1,18 @@
# Maintainer: Phil Miller <philm@chakra-project.org>
pkgname=avahi
pkgver=0.6.25
pkgrel=4
pkgver=0.6.30
pkgrel=1
pkgdesc="A multicast/unicast DNS-SD framework"
arch=('i686' 'x86_64')
url="http://www.avahi.org/"
license=('LGPL')
depends=('dbus>=1.1.20-1' 'libcap>=2.16' 'libdaemon>=0.11' 'gdbm' 'glib2' 'expat')
optdepends=('libglade: avahi-discover-standalone'
optdepends=('qt: qt bindings'
'nss-mdns: NSS support for mDNS'
'pygtk: avahi-discover'
'dbus-python: avahi-discover')
makedepends=('pygtk' 'dbus-python' 'libglade' 'intltool')
'dbus-python: avahi-discover'
'twisted: avahi-bookmarks')
makedepends=('qt' 'dbus-python' 'gobject-introspection' 'intltool')
backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
install=avahi.install
conflicts=('howl' 'mdnsresponder')
@ -24,18 +24,24 @@ source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz gnome-nettool.png a
build() {
cd ${srcdir}/${pkgname}-${pkgver}
sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
patch -Np0 -i "${srcdir}/avahi-daemon-dbus.patch"
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-qt3 \
--disable-qt4 \
--enable-qt4 \
--disable-mono \
--disable-monodoc \
--disable-doxygen-doc \
--disable-xmltoman \
--disable-gtk \
--disable-gtk3 \
--disable-pygtk \
--enable-compat-libdns_sd \
--enable-compat-howl \
--with-distro=archlinux \
--with-distro=none \
--with-avahi-priv-access-group=network \
--enable-autoipd \
--with-autoipd-user=avahi \
@ -46,20 +52,16 @@ build() {
rm -rf ${MONO_SHARED_DIR}
sed -i -e 's/netdev/network/g' ${pkgdir}/etc/dbus-1/system.d/avahi-dbus.conf
# howl and mdnsresponder compatability
cd ${pkgdir}/usr/include
ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h
ln -s avahi-compat-howl howl
cd ${pkgdir}/usr/lib/pkgconfig
ln -s avahi-compat-howl.pc howl.pc
mkdir -p ${pkgdir}/usr/share/pixmaps
install -m 644 ${srcdir}/gnome-nettool.png ${pkgdir}/usr/share/pixmaps/gnome-nettool.png
cd ${pkgdir}
patch -p0 < ${srcdir}/avahi-daemon-dbus.patch || return 1
install -D -m 644 "${srcdir}"/gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png || return 1
}
md5sums=('a83155a6e29e3988f07e5eea3287b21e'
md5sums=('e4db89a2a403ff4c47d66ac66fad1f43'
'42c2905307c7a5dc6ac4b75f4c3d65a3'
'0e1f5900b56fcfa1bffddb4f233f539f')
'9a5053ebfd423dd2909e4b6edfbce169')

19
avahi/avahi-daemon-dbus.patch
View File

@ -1,16 +1,11 @@
--- etc/rc.d/avahi-daemon 2010-02-26 21:10:30.000000000 -0600
+++ etc/rc.d/avahi-daemon 2010-02-26 21:09:44.000000000 -0600
@@ -35,8 +35,11 @@
--- initscript/archlinux/avahi-daemon.in 2010-08-17 22:23:46.510293144 +0200
+++ initscript/archlinux/avahi-daemon.in 2010-08-17 22:46:58.110163026 +0200
@@ -33,6 +35,8 @@
case "$1" in
start)
- stat_busy "Starting $DESC"
- $DAEMON -D > /dev/null 2>&1
+ if ck_daemon dbus; then
+ /etc/rc.d/dbus start
+ fi
+ stat_busy "Starting $DESC"
+ modprobe capability > /dev/null 2>&1 ; $DAEMON -D > /dev/null 2>&1
+ ck_daemon dbus && /etc/rc.d/dbus start
+ modprobe capability &> /dev/null
stat_busy "Starting $DESC"
$DAEMON -D > /dev/null 2>&1
if [ $? -gt 0 ]; then
stat_fail
else

4
cairo/PKGBUILD
View File

@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=cairo
pkgver=1.10.2
pkgrel=2
pkgrel=3
pkgdesc="Cairo vector graphics library"
arch=(i686 x86_64)
license=('LGPL' 'MPL')
@ -24,7 +24,7 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static
--localstatedir=/var --disable-static --enable-tee
make
make DESTDIR="${pkgdir}" install
}

22
catalyst/PKGBUILD
View File

@ -10,12 +10,12 @@ _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=catalyst
pkgver=11.5
pkgrel=1
pkgrel=2
pkgdesc="AMD/ATI Catalyst drivers for kernel26. fglrx kernel module only"
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
depends=('kernel26>=2.6.38' 'kernel26<2.6.39' 'catalyst-utils')
depends=('kernel26>=2.6.39' 'kernel26<2.6.40' 'catalyst-utils')
makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'kernel26-headers')
conflicts=('catalyst-test' 'nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'ati-dri')
install=${pkgname}.install
@ -23,12 +23,14 @@ install=${pkgname}.install
source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
ati_make.sh
makefile_compat.patch
no_bkl.patch)
no_bkl.patch
2.6.39_bkl.patch)
md5sums=('0a407ba5b7302239071a907e36a6934b'
md5sums=('e6efc5477b7da9125945f5047b60b923'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'6a6b2133aa6ef3bcd377731b19c0553a')
'6a6b2133aa6ef3bcd377731b19c0553a'
'eb24250f8e537273bae9dbd79a022d61')
@ -60,7 +62,15 @@ build() {
## makefile patch to choose arch_compat_alloc_user_space or older compat_alloc_user_space
## works only in combination with ati_make.sh script
patch -Np1 -i ../makefile_compat.patch || return 1
patch -Np1 -i ../no_bkl.patch || return 1
if [[ ${_kernver:0:6} < "2.6.39" ]] && [[ `cat /lib/modules/${_kernver}/build/.config | grep -c CONFIG_BKL=y` = 0 ]]; then
patch -Np1 -i ../no_bkl.patch || return 1
fi
if [[ ${_kernver:0:6} == "2.6.39" ]] || [[ ${_kernver:0:6} > "2.6.39" ]]; then
patch -Np1 -i ../no_bkl.patch || return 1
patch -Np1 -i ../2.6.39_bkl.patch || return 1
fi
# if [[ ${_kernver:0:6} == "2.6.37" ]] || [[ ${_kernver:0:6} > "2.6.37" ]]; then
# patch -Np1 -i ../sema_init.patch || return 1

2
catalyst/catalyst.install
View File

@ -1,5 +1,5 @@
KERNEL_VERSION=2.6.38-CHAKRA
KERNEL_VERSION=2.6.39-CHAKRA
whisperer(){

4
cups/PKGBUILD
View File

@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.4.5
pkgver=1.4.6
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
@ -19,7 +19,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-avahi.patch
cups cups.logrotate cups.pam)
#options=('!emptydirs')
md5sums=('50729f6fc46ba54223e0eaf5009f3419'
md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1'
'8ebd390197501ffd709f0ee546937fd5'
'5c85b7d8d2ddd02c2c64955cebbf55ea'
'f861b18f4446c43918c8643dcbbd7f6d'

12
ebook-tools/PKGBUILD
View File

@ -1,9 +1,15 @@
# $Id: PKGBUILD 68030 2010-02-10 14:53:32Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=ebook-tools
pkgver=0.2.1
pkgrel=1
pkgrel=2
pkgdesc="Tools for accessing and converting various ebook file formats"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/ebook-tools"

14
hplip/PKGBUILD
View File

@ -1,9 +1,13 @@
# $Id: PKGBUILD 81454 2010-05-30 16:59:25Z tpowa $
# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=hplip
pkgver=3.11.3
pkgver=3.11.5
pkgrel=1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet."
arch=('i686' 'x86_64')
@ -51,4 +55,4 @@ build() {
# fix sysfs rules
sed -i -e "s|SYSFS|ATTRS|g" -e "s|sysfs|attrs|g" $pkgdir/lib/udev/rules.d/56-hpmud_support.rules || return 1
}
md5sums=('9a2f39cb02214ee0def550defac0d240')
md5sums=('0a3d0f46ec89857b4c0feea6923864f1')

18
icu/PKGBUILD
View File

@ -1,10 +1,14 @@
# $Id: PKGBUILD 79200 2010-05-01 18:07:48Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Art Gramlich <art@gramlich-net.com>
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=icu
pkgver=4.6
pkgrel=1
pkgrel=2
pkgdesc="International Components for Unicode library"
arch=(i686 x86_64)
url="http://www.icu-project.org/"
@ -12,11 +16,15 @@ license=('custom:"icu"')
depends=('gcc-libs' 'sh')
source=(http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
icu.8198.revert.icu5431.patch
)
md5sums=('43e56b71c407be5154de681eaa646a4a')
md5sums=('43e56b71c407be5154de681eaa646a4a'
'685f0c5ff76bc50f930ffb67bbd27eb3')
build() {
cd ${srcdir}/icu/source
# fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
make || return 1
make -j1 DESTDIR=${pkgdir} install || return 1

129
icu/icu.8198.revert.icu5431.patch Normal file
View File

@ -0,0 +1,129 @@
Index: icu/trunk/source/layout/IndicReordering.cpp
===================================================================
--- icu/trunk/source/layout/IndicReordering.cpp (revision 25772)
+++ icu/trunk/source/layout/IndicReordering.cpp (revision 26090)
@@ -126,4 +126,8 @@
FeatureMask fSMFeatures;
+ LEUnicode fPreBaseConsonant;
+ LEUnicode fPreBaseVirama;
+ le_int32 fPBCIndex;
+ FeatureMask fPBCFeatures;
void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)
@@ -172,5 +176,6 @@
fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),
fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),
- fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)
+ fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),
+ fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)
{
// nothing else to do...
@@ -191,4 +196,6 @@
fVMabove = fVMpost = 0;
fSMabove = fSMbelow = 0;
+
+ fPreBaseConsonant = fPreBaseVirama = 0;
}
@@ -386,4 +393,12 @@
}
+ void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)
+ {
+ fPBCIndex = index;
+ fPreBaseConsonant = PBConsonant;
+ fPreBaseVirama = PBVirama;
+ fPBCFeatures = features;
+ }
+
void noteBaseConsonant()
{
@@ -465,4 +480,20 @@
}
+ void writePreBaseConsonant()
+ {
+ // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam. However,
+ // it seems that almost none of the fonts for Malayalam are set up to handle this.
+ // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.
+
+ if (fPreBaseConsonant == 0x0d31) { // RRA
+ fPreBaseConsonant = 0x0d30; // RA
+ }
+
+ if (fPreBaseConsonant != 0) {
+ writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);
+ writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);
+ }
+ }
+
le_int32 getOutputIndex()
{
@@ -723,4 +754,5 @@
}
+
IndicClassTable::CharClass charClass = CC_RESERVED;
IndicClassTable::CharClass nextClass = CC_RESERVED;
@@ -730,7 +762,9 @@
le_bool seenVattu = FALSE;
le_bool seenBelowBaseForm = FALSE;
+ le_bool seenPreBaseForm = FALSE;
le_bool hasNukta = FALSE;
le_bool hasBelowBaseForm = FALSE;
le_bool hasPostBaseForm = FALSE;
+ le_bool hasPreBaseForm = FALSE;
if (postBase < markStart && classTable->isNukta(chars[postBase])) {
@@ -746,12 +780,20 @@
hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;
hasPostBaseForm = IndicClassTable::hasPostBaseForm(charClass) && !hasNukta;
+ hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;
if (IndicClassTable::isConsonant(charClass)) {
if (postBaseLimit == 0 || seenVattu ||
(baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
- !(hasBelowBaseForm || hasPostBaseForm)) {
+ !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {
break;
}
+ // Note any pre-base consonants
+ if ( baseConsonant == lastConsonant && lastConsonant > 0 &&
+ hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {
+ output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);
+ seenPreBaseForm = TRUE;
+
+ }
// consonants with nuktas are never vattus
seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;
@@ -786,10 +828,12 @@
// write any pre-base consonants
+ output.writePreBaseConsonant();
+
le_bool supressVattu = TRUE;
for (i = baseLimit; i < baseConsonant; i += 1) {
LEUnicode ch = chars[i];
- // Don't put 'blwf' on first consonant.
- FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);
+ // Don't put 'pstf' or 'blwf' on anything before the base consonant.
+ FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );
charClass = classTable->getCharClass(ch);
@@ -842,5 +886,5 @@
// write below-base consonants
- if (baseConsonant != lastConsonant) {
+ if (baseConsonant != lastConsonant && !seenPreBaseForm) {
for (i = bcSpan + 1; i < postBase; i += 1) {
output.writeChar(chars[i], i, tagArray1);
@@ -872,5 +916,5 @@
// write post-base consonants
// FIXME: does this put the right tags on post-base consonants?
- if (baseConsonant != lastConsonant) {
+ if (baseConsonant != lastConsonant && !seenPreBaseForm) {
if (postBase <= lastConsonant) {
for (i = postBase; i <= lastConsonant; i += 1) {

4
libjpeg-turbo/PKGBUILD
View File

@ -4,7 +4,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=libjpeg-turbo
pkgver=1.1.0
pkgver=1.1.1
pkgrel=1
pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
arch=('i686' 'x86_64')
@ -15,7 +15,7 @@ provides=('libjpeg=8.0.2')
conflicts=('libjpeg')
options=('!libtool')
source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz)
md5sums=('83e6914a281d649ad289445dc20f9de4')
md5sums=('03b9c1406c7bfdc204313c2917ce6962')
build() {
cd "$srcdir/$pkgname-$pkgver"

21
libzip/PKGBUILD
View File

@ -1,9 +1,14 @@
# $Id: PKGBUILD 77453 2010-04-13 12:26:29Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=libzip
pkgver=0.9.3
pkgver=0.10
pkgrel=1
pkgdesc="A C library for reading, creating, and modifying zip archives"
url="http://www.nih.at/libzip/index.html"
@ -11,11 +16,15 @@ license=('GPL2')
arch=('i686' 'x86_64')
depends=('zlib')
options=('!libtool')
source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('e5fa5d0c5d2ad4c7a0c0fc7f5a1695b9')
source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz"
'fix-headers.patch')
md5sums=('47cdfcbc08c8bea0b52fdee4bf591622'
'249395bd3a426c4c4e993e9d4753e1dd')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i "${srcdir}/fix-headers.patch"
./configure --prefix=/usr
make || return 1
}

15
libzip/fix-headers.patch Normal file
View File

@ -0,0 +1,15 @@
diff -urN libzip-0.10rc1.old/lib/Makefile.am libzip-0.10rc1/lib/Makefile.am
--- libzip-0.10rc1.old/lib/Makefile.am 2011-03-05 01:07:33.921722002 +0100
+++ libzip-0.10rc1/lib/Makefile.am 2011-03-05 20:29:30.349388003 +0100
@@ -2,8 +2,9 @@
lib_LTLIBRARIES = libzip.la
noinst_HEADERS = zipint.h
-include_HEADERS = zip.h
-libinclude_HEADERS = zipconf.h
+include_HEADERS = \
+ zip.h \
+ zipconf.h
# also update CMakeLists.txt when changing version
libzip_la_LDFLAGS=-no-undefined -version-info 2:0

4
madwifi/PKGBUILD
View File

@ -12,12 +12,12 @@ _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=madwifi
pkgver=0.9.4.4133
pkgrel=8
pkgrel=9
pkgdesc="Madwifi drivers for Atheros wireless chipsets. For kernel26"
arch=(i686 x86_64)
license=('GPL')
url="http://madwifi-project.org"
depends=('madwifi-utils' 'kernel26>=2.6.38rc5')
depends=('madwifi-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40')
makedepends=('kernel26-headers' 'sharutils')
install=madwifi-ng.install
# subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi

6
madwifi/madwifi-ng.install
View File

@ -1,14 +1,14 @@
post_install() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.39-CHAKRA'
depmod -ae $KERNEL_VERSION > /dev/null 2>&1
}
post_upgrade() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.39-CHAKRA'
depmod -ae $KERNEL_VERSION > /dev/null 2>&1
}
post_remove() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.39-CHAKRA'
depmod -ae $KERNEL_VERSION > /dev/null 2>&1
}

8
networkmanager/PKGBUILD
View File

@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=networkmanager
pkgver=0.8.2
pkgrel=3
pkgrel=4
pkgdesc="Network Management daemon"
arch=('i686' 'x86_64')
license=('GPL')
@ -20,15 +20,17 @@ optdepends=('modemmanager: for modem management service')
options=('!libtool')
backup=('etc/NetworkManager/nm-system-settings.conf')
source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
nm-system-settings.conf create_dirs.patch)
nm-system-settings.conf create_dirs.patch disable_set_hostname.patch)
sha256sums=('58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1'
'44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
'2961ce4cf3079edbf27927a67573ce85dad2268f610fd123dd781eb5ba764c12')
'2961ce4cf3079edbf27927a67573ce85dad2268f610fd123dd781eb5ba764c12'
'1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553')
build() {
cd "${srcdir}/NetworkManager-${pkgver}"
patch -Np1 -i "${srcdir}/create_dirs.patch"
patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc \

17
networkmanager/disable_set_hostname.patch
View File

@ -1,16 +1,15 @@
diff -Nur NetworkManager-0.8.1.orig/src/nm-policy.c NetworkManager-0.8.1/src/nm-policy.c
--- NetworkManager-0.8.1.orig/src/nm-policy.c 2010-07-21 18:48:36.000000000 -0500
+++ NetworkManager-0.8.1/src/nm-policy.c 2010-08-01 19:48:57.474426178 -0500
@@ -286,7 +286,7 @@
g_free (configured_hostname);
diff -Nur NetworkManager-0.8.2.orig/src/nm-policy.c NetworkManager-0.8.2/src/nm-policy.c
--- NetworkManager-0.8.2.orig/src/nm-policy.c 2010-11-03 12:58:42.000000000 -0700
+++ NetworkManager-0.8.2/src/nm-policy.c 2010-11-23 06:22:32.436707081 -0800
@@ -342,6 +342,7 @@
return;
}
-
+#if 0
/* Try automatically determined hostname from the best device's IP config */
if (!best)
best = get_best_ip4_device (policy->manager, &best_req);
@@ -318,6 +318,7 @@
if (!best4)
best4 = get_best_ip4_device (policy->manager, &best_req4);
@@ -396,6 +397,7 @@
}
}

4
nvidia-173xx/PKGBUILD
View File

@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=nvidia-173xx
pkgver=173.14.30
pkgrel=1
pkgrel=2
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgdesc="NVIDIA drivers for kernel26, 173xx branch."
@ -17,7 +17,7 @@ arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
[ "$CARCH" = "x86_64" ] && ARCH=x86_64
url="http://www.nvidia.com/"
depends=('kernel26' 'nvidia-173xx-utils')
depends=('kernel26>=2.6.39' 'kernel26<2.6.40' 'nvidia-173xx-utils')
makedepends=('kernel26-headers')
conflicts=('nvidia-96xx' 'nvidia' 'nvidia-173xx')
license=('custom')

4
nvidia-173xx/nvidia.install
View File

@ -1,5 +1,5 @@
post_install() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.39-CHAKRA'
depmod $KERNEL_VERSION
}
@ -9,6 +9,6 @@ post_upgrade() {
}
post_remove() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.39-CHAKRA'
depmod $KERNEL_VERSION
}

6
nvidia-utils/PKGBUILD
View File

@ -5,7 +5,7 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=nvidia-utils
pkgver=270.41.06
pkgver=270.41.19
pkgrel=1
pkgdesc="NVIDIA drivers utilities and libraries."
arch=('i686' 'x86_64')
@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then
ARCH='x86'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('702868c77b13bba46f0fce26ed7a1fb7')
md5sums=('c167e32702f56599bd600add97943312')
elif [ "$CARCH" = "x86_64" ]; then
ARCH='x86_64'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('d62243b91d0dc8f2c4b2ab646b72ca65')
md5sums=('cb518bdd70f356425b8c4a5a48c0ad9c')
fi
source[1]='20-nvidia.conf'

8
nvidia/PKGBUILD
View File

@ -8,12 +8,12 @@
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=nvidia
pkgver=270.41.06
pkgver=270.41.19
pkgrel=1
pkgdesc="NVIDIA drivers for kernel26."
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
depends=('kernel26' 'kernel26' "nvidia-utils=${pkgver}")
depends=('kernel26>=2.6.39' 'kernel26<2.6.40' "nvidia-utils=${pkgver}")
makedepends=('kernel26-headers')
conflicts=('nvidia-96xx' 'nvidia-173xx')
license=('custom')
@ -23,12 +23,12 @@ if [ "$CARCH" = "i686" ]; then
ARCH='x86'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('702868c77b13bba46f0fce26ed7a1fb7')
md5sums=('c167e32702f56599bd600add97943312')
elif [ "$CARCH" = "x86_64" ]; then
ARCH='x86_64'
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run")
md5sums=('d62243b91d0dc8f2c4b2ab646b72ca65')
md5sums=('cb518bdd70f356425b8c4a5a48c0ad9c')
fi
build() {

4
nvidia/nvidia.install
View File

@ -1,5 +1,5 @@
post_install() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.39-CHAKRA'
depmod $KERNEL_VERSION
}
@ -9,6 +9,6 @@ post_upgrade() {
}
post_remove() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.39-CHAKRA'
depmod $KERNEL_VERSION
}

26
ocaml/PKGBUILD
View File

@ -1,8 +1,14 @@
# $Id: PKGBUILD 66794 2010-02-01 14:58:30Z giovanni $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=ocaml
pkgver=3.11.2
pkgver=3.12.0
pkgrel=1
pkgdesc="A functional language with OO extensions"
arch=('i686' 'x86_64')
@ -11,19 +17,23 @@ url="http://caml.inria.fr/"
depends=('gdbm')
makedepends=('tk' 'ncurses>=5.6-7' 'libx11')
optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
source=(http://caml.inria.fr/distrib/ocaml-3.11/$pkgname-$pkgver.tar.gz)
source=(http://caml.inria.fr/distrib/ocaml-3.12/$pkgname-$pkgver.tar.gz
fix-ocaml-binutils-2.21.patch)
options=('!makeflags' '!emptydirs')
build() {
cd $srcdir/$pkgname-$pkgver
patch -Np1 -i "${srcdir}/fix-ocaml-binutils-2.21.patch"
./configure -prefix /usr
make world.opt || return 1
make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man install || return 1
# Save >10MB with this one, makepkg only strips debug symbols.
find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
#find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
# install license
install -D -m 644 $startdir/src/$pkgname-$pkgver/LICENSE $startdir/pkg/usr/share/licenses/ocaml/LICENSE
# install license
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
}
md5sums=('9d0611245122ffbc8263735cae1da7fb')
md5sums=('3ba7cc65123c3579f14e7c726d3ee782'
'8c664a0a346424ea2ec6fc6f713170c6')

66
ocaml/fix-ocaml-binutils-2.21.patch Normal file
View File

@ -0,0 +1,66 @@
From: Stephane Glondu <steph@glondu.net>
Date: Tue, 8 Mar 2011 21:17:40 +0100
Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bug: http://caml.inria.fr/mantis/view.php?id=5237
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
Authors: Eric Cooper, spiralvoice
Reviewed-by: Stéphane Glondu <steph@glondu.net>
---
asmcomp/amd64/emit.mlp | 13 +++++++------
asmcomp/i386/emit.mlp | 6 +++---
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
index 4a3f844..525c6e6 100644
--- a/asmcomp/amd64/emit.mlp
+++ b/asmcomp/amd64/emit.mlp
@@ -679,17 +679,18 @@ let fundecl fundecl =
emit_all true fundecl.fun_body;
List.iter emit_call_gc !call_gc_sites;
emit_call_bound_errors ();
+ begin match Config.system with
+ "linux" | "gnu" ->
+ ` .type {emit_symbol fundecl.fun_name},@function\n`;
+ ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
+ | _ -> ()
+ end;
if !float_constants <> [] then begin
if macosx
then ` .literal8\n`
else ` .section .rodata.cst8,\"a\",@progbits\n`;
List.iter emit_float_constant !float_constants
- end;
- match Config.system with
- "linux" | "gnu" ->
- ` .type {emit_symbol fundecl.fun_name},@function\n`;
- ` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
- | _ -> ()
+ end
(* Emission of data *)
diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
index 2992f29..0b1252c 100644
--- a/asmcomp/i386/emit.mlp
+++ b/asmcomp/i386/emit.mlp
@@ -905,12 +905,12 @@ let fundecl fundecl =
emit_all true fundecl.fun_body;
List.iter emit_call_gc !call_gc_sites;
emit_call_bound_errors ();
- List.iter emit_float_constant !float_constants;
- match Config.system with
+ begin match Config.system with
"linux_elf" | "bsd_elf" | "gnu" ->
` .type {emit_symbol fundecl.fun_name},@function\n`;
` .size {emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
- | _ -> ()
+ | _ -> () end;
+ List.iter emit_float_constant !float_constants
(* Emission of data *)
--

6
rtl8192se/PKGBUILD
View File

@ -12,10 +12,10 @@ _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=rtl8192se
pkgver=2.6.0018.1025.2010
pkgrel=4
pkgrel=5
pkgdesc="Drivers for Realtek 8192SE wireless chipset"
license="GPL"
depends=('kernel26-headers' 'kernel26>=2.6.38rc5')
depends=('kernel26-headers' 'kernel26>=2.6.39' 'kernel26<2.6.40')
source=("http://www.nd.edu/~pbui/scratch/aur/${pkgname}_linux_${pkgver}.tar.gz")
arch=('i686' 'x86_64')
url="http://www.realtek.com.tw/"
@ -28,7 +28,7 @@ build() {
#sed -i 's/-DENABLE_LPS//' HAL/rtl8192/*/Makefile || return 1
sed \
-e 's/$(shell uname -r)/2.6.38-CHAKRA/g' \
-e 's/$(shell uname -r)/2.6.39-CHAKRA/g' \
-i Makefile
make || return 1

4
xcursor-themes/PKGBUILD
View File

@ -2,7 +2,7 @@
#Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xcursor-themes
pkgver=1.0.2
pkgver=1.0.3
pkgrel=1
pkgdesc="X.org Cursor themes"
arch=(any)
@ -10,7 +10,7 @@ url="http://xorg.freedesktop.org/"
license=('MIT')
makedepends=('pkgconfig' 'xorg-apps')
source=(${url}/releases/individual/data/${pkgname}-${pkgver}.tar.bz2 LICENSE)
md5sums=('e8929a1bb4d98d1a3991fd340d0b5f09'
md5sums=('ba21aad0b353f1881f5069e423a44587'
'31eccf56949504b5ce33110068948cf2')
build() {

12
zip/PKGBUILD
View File

@ -1,9 +1,15 @@
# $Id: PKGBUILD 37029 2009-04-30 04:02:57Z eric $
# Maintainer: dorphell <dorphell@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=zip
pkgver=3.0
pkgrel=1.1
pkgrel=2
pkgdesc="Creates PKZIP-compatible .zip files"
arch=(i686 x86_64)
url="http://www.info-zip.org/pub/infozip/Zip.html"