mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-05 21:47:13 +08:00
Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing
This commit is contained in:
commit
6ae4e619a2
2
.gitignore
vendored
2
.gitignore
vendored
@ -42,4 +42,4 @@ user.conf
|
||||
*.tar.*
|
||||
*.log
|
||||
*.log*
|
||||
!*.logrotate
|
||||
|
||||
|
@ -3,31 +3,38 @@
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
#
|
||||
|
||||
pkgname=dbus-glib
|
||||
pkgver=0.94
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="GLib bindings for DBUS"
|
||||
arch=(i686 x86_64)
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL')
|
||||
url="http://www.freedesktop.org/wiki/Software/DBusBindings"
|
||||
depends=('dbus-core' 'glib2')
|
||||
makedepends=('pkgconfig')
|
||||
options=('!libtool' '!emptydirs')
|
||||
source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
|
||||
fix_network_manager.patch)
|
||||
source=("http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
|
||||
'fix_network_manager.patch')
|
||||
md5sums=('e1f1506a6f4941e67bffd614b1ad5af6'
|
||||
'2a3598342dd25722d452e7beaf21b5f3')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
patch -Np1 -i "${srcdir}/fix_network_manager.patch"
|
||||
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
|
||||
--enable-static=no --enable-bash-completion=no
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--enable-static=no \
|
||||
--enable-bash-completion=no
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
@ -1,9 +1,10 @@
|
||||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
# launches a session dbus instance
|
||||
|
||||
dbuslaunch="`which dbus-launch 2>/dev/null`"
|
||||
if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
|
||||
eval `$dbuslaunch --sh-syntax --exit-with-session`
|
||||
dbuslaunch="$(which dbus-launch 2>/dev/null)"
|
||||
|
||||
if [ -x "${dbuslaunch}" ] && [ -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
|
||||
eval $("${dbuslaunch}" --sh-syntax --exit-with-session)
|
||||
fi
|
||||
|
||||
|
@ -6,25 +6,35 @@
|
||||
#
|
||||
pkgname=dbus
|
||||
pkgver=1.4.14
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Freedesktop.org message bus system"
|
||||
url="http://www.freedesktop.org/Software/dbus"
|
||||
arch=(i686 x86_64)
|
||||
license=('GPL' 'custom')
|
||||
depends=("dbus-core>=${pkgver}" 'libx11')
|
||||
source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
|
||||
30-dbus)
|
||||
source=("http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
|
||||
'30-dbus')
|
||||
md5sums=('ae6de2562a57516cfabaf56903375ba9'
|
||||
'd14e59575f04e55d21a04907b6fd9f3c')
|
||||
'd1c8e6ed22a59762773dd81363ffacd8')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
|
||||
--libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
|
||||
--with-system-pid-file=/var/run/dbus.pid \
|
||||
--disable-verbose-mode --disable-static \
|
||||
--enable-inotify --disable-dnotify \
|
||||
--disable-tests --disable-asserts
|
||||
|
||||
ECHO="echo" ./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--libexecdir=/usr/lib/dbus-1.0 \
|
||||
--with-dbus-user=81 \
|
||||
--with-system-pid-file=/var/run/dbus.pid \
|
||||
--disable-verbose-mode \
|
||||
--disable-static \
|
||||
--enable-inotify \
|
||||
--disable-dnotify \
|
||||
--disable-tests \
|
||||
--disable-asserts \
|
||||
--with-x \
|
||||
--enable-x11-autolaunch
|
||||
|
||||
make -C tools dbus-launch
|
||||
}
|
||||
|
||||
@ -40,4 +50,6 @@ package() {
|
||||
|
||||
install -d -m755 "${pkgdir}/usr/share/licenses/dbus"
|
||||
install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/"
|
||||
}
|
||||
}
|
||||
|
||||
# vim:set ts=2 sw=2 et:
|
||||
|
@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=hwinfo
|
||||
pkgver=19.0
|
||||
pkgrel=3
|
||||
pkgrel=5
|
||||
pkgdesc="A simple program that lists results from the hardware detection library."
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.opensuse.org"
|
||||
@ -17,27 +17,35 @@ license=('GPL2')
|
||||
depends=('perl' 'libx86emu')
|
||||
makedepends=('sysfsutils' 'rpmextract' 'flex')
|
||||
options=('!emptydirs')
|
||||
source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-4.1.src.rpm"
|
||||
source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-4.2.src.rpm"
|
||||
"kbd.patch")
|
||||
|
||||
build() {
|
||||
cd "${srcdir}"
|
||||
|
||||
msg2 "Extracting source rpm..."
|
||||
rpmextract.sh "${pkgname}-${pkgver}-4.1.src.rpm"
|
||||
rpmextract.sh "${pkgname}-${pkgver}-4.2.src.rpm"
|
||||
tar -xjf ${pkgname}-${pkgver}.tar.bz2
|
||||
cd "${pkgname}-${pkgver}"
|
||||
msg2 "Patching..."
|
||||
patch -p0 < ../kbd.patch
|
||||
patch -p0 < ../kbd.patch
|
||||
msg2 "Compiling..."
|
||||
|
||||
# Fix Makefile using /usr/lib64 instead of /usr/lib - it broke x86_64, possibly i686 too.
|
||||
# Comment if this fix breaks it.
|
||||
sed -i 's_usr/lib64_usr/lib_' src/hd/Makefile
|
||||
make -j1
|
||||
#sed -i 's_usr/lib64_usr/lib_' src/hd/Makefile
|
||||
|
||||
#Added this from ARCH, to fix the above issue:
|
||||
make -j1 CFLAGS+="-fPIC -I${srcdir}/${pkgname}-${pkgver}/src/hd" LIBDIR=/usr/lib
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR=${pkgdir} install
|
||||
|
||||
#Added this from ARCH, to fix the same issue as stated earlier:
|
||||
make LIBDIR=/usr/lib DESTDIR=${pkgdir} install
|
||||
# disabled the following line to add the one above
|
||||
# make DESTDIR=${pkgdir} install
|
||||
}
|
||||
md5sums=('32873044be2a193357fc177f0fb0f2e3'
|
||||
md5sums=('a9173a198cacd834fb596c47d163e0fd'
|
||||
'1500ecfa26f6aaf4d7967eea74e86e5d')
|
||||
|
@ -4,35 +4,46 @@
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=ntfs-3g
|
||||
_realname=ntfs-3g_ntfsprogs
|
||||
pkgver=2011.4.12
|
||||
pkgbase=ntfs-3g_ntfsprogs
|
||||
pkgname=('ntfs-3g' 'ntfsprogs')
|
||||
pkgver=2012.1.15
|
||||
pkgrel=1
|
||||
pkgdesc="Stable read and write NTFS driver"
|
||||
url="http://www.tuxera.com"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL2')
|
||||
depends=('glibc')
|
||||
depends=('glibc' 'fuse')
|
||||
makedepends=('pkgconfig')
|
||||
options=('!libtool')
|
||||
conflicts=('ntfsprogs')
|
||||
provides=("ntfsprogs=${pkgver}")
|
||||
source=(http://www.tuxera.com/opensource/${_realname}-${pkgver}.tgz
|
||||
source=(http://tuxera.com/opensource/${pkgbase}-${pkgver}.tgz
|
||||
25-ntfs-config-write-policy.fdi)
|
||||
sha1sums=('a4340ae611a3f26089f7d5601a86a5847517bff7'
|
||||
sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb'
|
||||
'200029f2999a2c284fd30ae25734abf6459c3501')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${_realname}-${pkgver}"
|
||||
cd "${srcdir}/${pkgbase}-${pkgver}"
|
||||
ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
|
||||
--with-fuse=internal --disable-static --disable-gnome-vfs \
|
||||
--with-fuse=external --disable-static \
|
||||
--mandir=/usr/share/man
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${_realname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
package_ntfs-3g() {
|
||||
pkgdesc="Stable read and write NTFS driver"
|
||||
|
||||
for DIR in src libntfs-3g include; do
|
||||
cd "${srcdir}/${pkgbase}-${pkgver}/${DIR}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
done
|
||||
|
||||
ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs"
|
||||
install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor"
|
||||
install -m644 "${srcdir}/25-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/"
|
||||
}
|
||||
|
||||
package_ntfsprogs() {
|
||||
pkgdesc="NTFS filesystem utilities"
|
||||
depends=('util-linux' 'ntfs-3g')
|
||||
|
||||
cd "${srcdir}/${pkgbase}-${pkgver}/ntfsprogs"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
|
@ -8,7 +8,7 @@
|
||||
_kernver="2.6.35-CHAKRA-LTS"
|
||||
|
||||
pkgname=nvidia-lts
|
||||
pkgver=290.10
|
||||
pkgver=295.09
|
||||
pkgrel=1
|
||||
pkgdesc="NVIDIA drivers for kernel26."
|
||||
arch=('i686' 'x86_64')
|
||||
@ -28,7 +28,7 @@ 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=('cebfba9a7e91716a06c66bb5b38d9661')
|
||||
md5sums=('d3746ccbfdffed6dc984703c5163a0e9')
|
||||
fi
|
||||
|
||||
build() {
|
||||
|
@ -6,8 +6,8 @@
|
||||
|
||||
pkgbase=nvidia-utils
|
||||
pkgname=('nvidia-utils' 'opencl-nvidia' 'libcl' 'nvidia-settings')
|
||||
pkgver=290.10
|
||||
pkgrel=4
|
||||
pkgver=295.09
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.nvidia.com/"
|
||||
license=('custom')
|
||||
@ -22,7 +22,7 @@ options=('!strip')
|
||||
[ "$CARCH" = "x86_64" ] && {
|
||||
ARCH='x86_64'
|
||||
_pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32"
|
||||
md5sums=('cebfba9a7e91716a06c66bb5b38d9661')
|
||||
md5sums=('d3746ccbfdffed6dc984703c5163a0e9')
|
||||
}
|
||||
|
||||
source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run"
|
||||
@ -46,7 +46,7 @@ build() {
|
||||
|
||||
package_libcl() {
|
||||
pkgdesc="OpenCL library and ICD loader from NVIDIA"
|
||||
pkgver=1.1
|
||||
pkgver=1.1.5
|
||||
|
||||
cd "${srcdir}/${_pkg}"
|
||||
|
||||
|
@ -8,8 +8,8 @@
|
||||
_kernver=$(pacman -Q linux | cut -c7-9 | sed 's/linux //g')-CHAKRA
|
||||
|
||||
pkgname=nvidia
|
||||
pkgver=290.10
|
||||
pkgrel=2
|
||||
pkgver=295.09
|
||||
pkgrel=1
|
||||
pkgdesc="NVIDIA drivers for linux."
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.nvidia.com/"
|
||||
@ -28,7 +28,7 @@ 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=('cebfba9a7e91716a06c66bb5b38d9661')
|
||||
md5sums=('d3746ccbfdffed6dc984703c5163a0e9')
|
||||
fi
|
||||
|
||||
build() {
|
||||
|
11
qt/PKGBUILD
11
qt/PKGBUILD
@ -7,7 +7,7 @@
|
||||
pkgbase=qt
|
||||
pkgname=('qt' 'qt-private-headers')
|
||||
pkgver=4.8.0
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
arch=('i686' 'x86_64')
|
||||
url='http://qt.nokia.com/'
|
||||
license=('GPL3' 'LGPL')
|
||||
@ -19,12 +19,14 @@ options=('!libtool')
|
||||
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
|
||||
source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
|
||||
'assistant.desktop' 'designer.desktop' 'linguist.desktop'
|
||||
'qtconfig.desktop')
|
||||
'qtconfig.desktop'
|
||||
"http://chakra-linux.org/sources/qt/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch")
|
||||
md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
|
||||
'fc211414130ab2764132e7370f8e5caa'
|
||||
'85179f5e0437514f8639957e1d8baf62'
|
||||
'f11852b97583610f3dbb669ebc3e21bc'
|
||||
'6b771c8a81dd90b45e8a79afa0e5bbfd')
|
||||
'6b771c8a81dd90b45e8a79afa0e5bbfd'
|
||||
'7bc255a36733d0fbc80c1902ade4beca')
|
||||
|
||||
# source PKGBUILD && _create-kdeqt-patch
|
||||
_create-kdeqt-patch() {
|
||||
@ -53,6 +55,9 @@ build() {
|
||||
# sed -i -e 's/^.*kde-qt .*/ echo " kde-qt '${kdeqtver}'"/' $startdir/qt.install
|
||||
# fi
|
||||
|
||||
#KDE sound-notification work-around
|
||||
patch -Np1 -i ${srcdir}/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch
|
||||
|
||||
export QT4DIR="${srcdir}"/${_pkgfqn}
|
||||
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user