mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 07:07:12 +08:00
libmtp, libgpod, libimobiledevice wicd updates for /usr/lib move, vlc rebuild, usbmuxd correction
This commit is contained in:
abveritas
parent
b1acbd8040
commit
70dd770483
@ -4,17 +4,17 @@
|
||||
# maintainer abveritas@chakra-project.org
|
||||
|
||||
pkgname=libgpod
|
||||
pkgver=0.8.0
|
||||
pkgrel=8
|
||||
pkgver=0.8.2
|
||||
pkgrel=1
|
||||
pkgdesc="libgpod is a shared library to access the contents of an iPod"
|
||||
arch=(i686 x86_64)
|
||||
license=('LGPL')
|
||||
depends=('mutagen' 'sg3_utils>=1.27' 'libimobiledevice>=1.1.0' 'gdk-pixbuf2')
|
||||
makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject')
|
||||
url="http://www.gtkpod.org/libgpod.html"
|
||||
source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.gz)
|
||||
source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
|
||||
options=(!libtool)
|
||||
md5sums=('6660f74cc53293dcc847407aa5f672ce')
|
||||
md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
@ -1,32 +1,29 @@
|
||||
#
|
||||
# Chakra 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
|
||||
# maintainer abveritas@chakra-project.org
|
||||
|
||||
pkgname=libimobiledevice
|
||||
pkgver=1.1.0
|
||||
pkgver=1.1.1
|
||||
pkgrel=1
|
||||
pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
|
||||
url="http://libimobiledevice.org/"
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL2' 'LGPL2.1')
|
||||
depends=('gnutls' 'glib2' 'libplist' 'usbmuxd')
|
||||
depends=('gnutls' 'glib2' 'libplist' 'usbmuxd' 'libgcrypt')
|
||||
makedepends=('swig' 'python2')
|
||||
options=('!libtool')
|
||||
source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2
|
||||
swig-version-check.patch)
|
||||
md5sums=('b38bb70a41538a2ad593b0779651a636'
|
||||
md5sums=('cdc13037e822d9ac2e109536701d153a'
|
||||
'8bb215e36fe0e08a72332c108c7842cc')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
# SWIG version check is wrong (still not fixed upstream)
|
||||
patch -p1 -i "$srcdir"/swig-version-check.patch
|
||||
./configure --prefix=/usr
|
||||
|
||||
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libexecdir=/usr/lib/usbmuxd
|
||||
make
|
||||
}
|
||||
|
||||
|
||||
@ -1,27 +1,28 @@
|
||||
# $Id: PKGBUILD 67200 2010-02-04 14:57:41Z ibiru $
|
||||
# Contributor: damir <damir@archlinux.org>
|
||||
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
|
||||
#
|
||||
# Chakra Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer abveritas@chakra-project.org
|
||||
|
||||
pkgname=libmtp
|
||||
pkgver=1.0.2
|
||||
pkgrel=2
|
||||
pkgdesc="library implementation of the Media Transfer Protocol"
|
||||
pkgver=1.1.3
|
||||
pkgrel=1
|
||||
pkgdesc="Library implementation of the Media Transfer Protocol"
|
||||
arch=("i686" "x86_64")
|
||||
url="http://libmtp.sourceforge.net"
|
||||
license=("LGPL")
|
||||
depends=("libusb-compat")
|
||||
#makedepends=('doxygen')
|
||||
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
|
||||
md5sums=('cdc1cc6afa6be287ff6bc331e71bdc47')
|
||||
license=('LGPL')
|
||||
depends=('libusb' 'libgcrypt')
|
||||
options=('!libtool')
|
||||
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
|
||||
md5sums=('11529eedaf0e1fc00cdd6119eec525f0')
|
||||
|
||||
build() {
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
./configure --prefix=/usr
|
||||
make || return 1
|
||||
make DESTDIR=$pkgdir install
|
||||
install -D -m0644 libmtp.rules \
|
||||
$pkgdir/lib/udev/rules.d/52-libmtp.rules
|
||||
install -D -m0644 libmtp.fdi \
|
||||
$pkgdir/usr/share/hal/fdi/information/20thirdparty/libmtp.fdi
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
./configure --prefix=/usr --with-udev=/usr/lib/udev
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
pkgname=usbmuxd
|
||||
pkgver=1.0.7
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="USB Multiplex Daemon"
|
||||
url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -20,7 +20,7 @@ md5sums=('6f431541f3177fa06aa6df9ceecb2da0'
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -p1 -i "${srcdir}/usbmuxd-udevuser.patch"
|
||||
#patch -p1 -i "${srcdir}/usbmuxd-udevuser.patch"
|
||||
mkdir build
|
||||
cd build
|
||||
cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
|
||||
@ -31,6 +31,18 @@ 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
|
||||
|
||||
cd ${pkgdir}/usr/lib/
|
||||
ln -sfv libusbmuxd.so.${pkgver} libusbmuxd.so.1
|
||||
|
||||
# udev moved to /usr/lib
|
||||
mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
|
||||
rmdir "${pkgdir}/lib"
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
pkgname='vlc'
|
||||
pkgver=2.0.1
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.videolan.org/vlc/"
|
||||
license=('GPL')
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
#
|
||||
|
||||
pkgname=wicd
|
||||
pkgver=1.7.2.3
|
||||
pkgver=1.7.2.4
|
||||
pkgrel=1
|
||||
pkgdesc="New and alternative wireless/wired network management utility"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -19,38 +19,41 @@ install=wicd.install
|
||||
source=(https://launchpad.net/wicd/1.7/$pkgver/+download/$pkgname-$pkgver.tar.gz
|
||||
wicd-daemon
|
||||
wicd.desktop
|
||||
wicd-scripts-execution.patch
|
||||
deepcopy+python27-fixes.patch
|
||||
net-tools.patch)
|
||||
dbus_string_fix.patch)
|
||||
categories=('network')
|
||||
options=('emptydirs')
|
||||
backup=('etc/wicd/encryption/templates/active')
|
||||
md5sums=('9c7b2eaa9048aaf5cd0cbc17fb84a68b'
|
||||
md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
|
||||
'f40e5f59998d0829707a7c9976afa8f8'
|
||||
'326df163a5732d38741371baa4fce9e5'
|
||||
'f4c377a25aa077cb76955124adfcc03f'
|
||||
'4f94d05b28aa2ae1cc37b29ef069fe51'
|
||||
'f18c4adf741bf3b1a55b4a6bc772f485')
|
||||
'1d28a46ef05a972cd5a69530f5b53856')
|
||||
|
||||
build() {
|
||||
cd $srcdir/$pkgbase-$pkgver
|
||||
# patch -p0 <$srcdir/wicd-scripts-execution.patch
|
||||
# patch -p1 -i $srcdir/deepcopy+python27-fixes.patch
|
||||
# patch -p0 -i $srcdir/net-tools.patch
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
|
||||
patch -p0 < $srcdir/dbus_string_fix.patch
|
||||
|
||||
find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
|
||||
export PYTHON=python2
|
||||
|
||||
python2 setup.py configure --no-install-init \
|
||||
--resume=/usr/share/wicd/scripts/ \
|
||||
--resume=/usr/share/wicd/scripts/ \
|
||||
--suspend=/usr/share/wicd/scripts/ \
|
||||
--verbose \
|
||||
--python=/usr/bin/python2
|
||||
--python=/usr/bin/python2 \
|
||||
--lib=/usr/lib \
|
||||
--systemd=/usr/lib/systemd/system
|
||||
|
||||
mkdir -p translations/ast/LC_MESSAGES
|
||||
msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
python2 setup.py install --optimize=1 --root=$pkgdir
|
||||
|
||||
# Add custom rc.d script
|
||||
install -Dm755 $srcdir/wicd-daemon $pkgdir/etc/rc.d/wicd
|
||||
#install -Dm644 $srcdir/wicd.desktop $pkgdir/usr/share/applications/wicd.desktop
|
||||
|
||||
cd build/lib/wicd
|
||||
for i in *.py; do
|
||||
|
||||
15
wicd/dbus_string_fix.patch
Normal file
15
wicd/dbus_string_fix.patch
Normal file
@ -0,0 +1,15 @@
|
||||
=== modified file 'wicd/misc.py'
|
||||
--- wicd/misc.py 2012-04-30 19:20:47 +0000
|
||||
+++ wicd/misc.py 2012-05-03 16:01:49 +0000
|
||||
@@ -430,7 +430,10 @@
|
||||
""" Sanitize property names to be used in config-files. """
|
||||
allowed = string.ascii_letters + '_' + string.digits
|
||||
table = string.maketrans(allowed, ' ' * len(allowed))
|
||||
- return s.translate(None, table)
|
||||
+
|
||||
+ # s is a dbus.String -- since we don't allow unicode property keys,
|
||||
+ # make it simple.
|
||||
+ return str(s).translate(None, table)
|
||||
|
||||
def sanitize_escaped(s):
|
||||
""" Sanitize double-escaped unicode strings. """
|
||||
Loading…
Reference in New Issue
Block a user