From 0a24fb835cac4007388213ad0afb15257b035b14 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 4 May 2012 00:01:57 +0000 Subject: Fri May 4 00:01:56 UTC 2012 --- community/aumix/PKGBUILD | 7 +- community/doublecmd/PKGBUILD | 56 ++++++++++ community/doublecmd/doublecmd.install | 34 +++++++ community/gmic/PKGBUILD | 4 +- community/highlight/PKGBUILD | 6 +- community/i3status/PKGBUILD | 10 +- community/lazarus/ChangeLog | 6 ++ community/lazarus/PKGBUILD | 113 ++++++++++++++++----- community/lazarus/lazarus-ide.install | 34 +++++++ community/myodbc/PKGBUILD | 8 +- community/open-vm-tools-modules/PKGBUILD | 4 +- community/pptpd/PKGBUILD | 10 +- community/puzzles/PKGBUILD | 9 +- community/qt4pas/PKGBUILD | 35 +++++++ community/rekonq/PKGBUILD | 21 ++-- community/wings3d/PKGBUILD | 20 ++-- core/binutils/PKGBUILD | 14 +-- extra/audiofile/PKGBUILD | 6 +- extra/clutter/PKGBUILD | 6 +- extra/dconf/PKGBUILD | 6 +- extra/digikam/PKGBUILD | 14 +-- extra/digikam/digikam-2.5.0-gcc-4.7.0.patch | 63 ++++++++++++ extra/geoip/PKGBUILD | 31 +++--- extra/git/PKGBUILD | 8 +- extra/msmtp/PKGBUILD | 8 +- extra/msmtp/msmtp.install | 2 - extra/opencv/PKGBUILD | 21 ++-- extra/xfce4-screenshooter/PKGBUILD | 24 ++--- extra/xfce4-settings/PKGBUILD | 11 +- .../xfce4-settings/xfce4-settings-xml-4.10.0.patch | 4 +- multilib/jack2-multilib/PKGBUILD | 8 +- testing/glib2/PKGBUILD | 8 +- testing/lvm2/PKGBUILD | 8 +- testing/mdadm/PKGBUILD | 23 +++-- testing/mdadm/mdadm | 31 +++--- testing/mdadm/mdadm_hook | 65 ++++++------ testing/mdadm/mdadm_udev_install | 25 +++-- testing/mkinitcpio-nfs-utils/PKGBUILD | 21 ++++ testing/systemd/PKGBUILD | 7 +- testing/systemd/systemd.install | 20 ++-- testing/v4l-utils/PKGBUILD | 35 +++++++ 41 files changed, 593 insertions(+), 253 deletions(-) create mode 100644 community/doublecmd/PKGBUILD create mode 100644 community/doublecmd/doublecmd.install create mode 100644 community/lazarus/lazarus-ide.install create mode 100644 community/qt4pas/PKGBUILD create mode 100644 extra/digikam/digikam-2.5.0-gcc-4.7.0.patch create mode 100644 testing/mkinitcpio-nfs-utils/PKGBUILD create mode 100644 testing/v4l-utils/PKGBUILD diff --git a/community/aumix/PKGBUILD b/community/aumix/PKGBUILD index a8d4f375d..299af8fac 100644 --- a/community/aumix/PKGBUILD +++ b/community/aumix/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65051 2012-02-20 02:28:41Z spupykin $ +# $Id: PKGBUILD 70215 2012-05-02 12:56:49Z spupykin $ # Maintainer: Sergej Pupykin pkgname=aumix pkgver=2.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="A color text mode sound mixer with GPM support" arch=('i686' 'x86_64') license=('GPL') @@ -32,7 +32,8 @@ build() { make distclean msg "X11+GTK2 build" - ./configure --prefix=/usr --mandir=/usr/share/man --without-gtk1 --without-alsa + ./configure --prefix=/usr --mandir=/usr/share/man --without-gtk1 --without-alsa \ + --without-gpm make make DESTDIR=$pkgdir install install -D -m0644 $srcdir/aumix.desktop $pkgdir/usr/share/applications/aumix.desktop diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD new file mode 100644 index 000000000..1dc0c2a38 --- /dev/null +++ b/community/doublecmd/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 70226 2012-05-02 13:40:27Z idevolder $ +# Maintainer: BlackIkeEagle +# Contributor: (sirocco AT ngs.ru) + +pkgbase=doublecmd +pkgname=('doublecmd-gtk2' 'doublecmd-qt') +pkgver=0.5.4 +_helpver=0.5.1 +pkgrel=2 +url="http://doublecmd.sourceforge.net/" +arch=('i686' 'x86_64') +license=('GPL') +install="$pkgbase.install" +provides=("$pkgbase") +makedepends=('lazarus' 'qt4pas' 'gtk2') +optdepends=('lua: scripting' 'p7zip: support for 7zip archives' 'libunrar: support for rar archives') +source=("http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz" + "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz" +) +sha256sums=('480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7' + 'd9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5') + +build() { + cp -a $pkgbase-$pkgver $pkgbase-gtk + cp -a $pkgbase-$pkgver $pkgbase-qt + + cd "$srcdir/$pkgbase-gtk" + ./build.sh beta gtk2 + + cd "$srcdir/$pkgbase-qt" + ./build.sh beta qt +} + +package_doublecmd-gtk2() { + pkgdesc="twin-panel (commander-style) file manager (GTK)" + depends=('gtk2') + cd "$srcdir/$pkgbase-gtk" + sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh + ./install/linux/install.sh --install-prefix="$pkgdir" + + # install doc + cd "$srcdir/$pkgbase-help-$_helpver" + cp -a * "$pkgdir/usr/share/$pkgbase/doc/" +} + +package_doublecmd-qt() { + pkgdesc="twin-panel (commander-style) file manager (QT)" + depends=('qt4pas') + cd "$srcdir/$pkgbase-qt" + sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh + ./install/linux/install.sh --install-prefix="$pkgdir" + + # install doc + cd "$srcdir/$pkgbase-help-$_helpver" + cp -a * "$pkgdir/usr/share/$pkgbase/doc/" +} diff --git a/community/doublecmd/doublecmd.install b/community/doublecmd/doublecmd.install new file mode 100644 index 000000000..40d56528f --- /dev/null +++ b/community/doublecmd/doublecmd.install @@ -0,0 +1,34 @@ +update_icons() { + + # Setup Menus + if which update-desktop-database + then + update-desktop-database -q /usr/share/applications + fi + + # Setup MIME types + if which update-mime-database + then + update-mime-database /usr/share/mime >/dev/null + fi + + # Setup Icons + touch -c /usr/share/icons/hicolor + if which gtk-update-icon-cache + then + gtk-update-icon-cache -tq /usr/share/icons/hicolor + fi + +} + +post_install() { + update_icons +} + +post_upgrade() { + update_icons +} + +post_remove() { + update_icons +} diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index ecbffa4ab..46d2a241e 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69809 2012-04-23 10:15:19Z spupykin $ +# $Id: PKGBUILD 70246 2012-05-03 01:48:06Z foutrelis $ # Maintainer: Sergej Pupykin # Maintainer: Jan "heftig" Steffens # Contributor: farid @@ -7,7 +7,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') pkgver=1.5.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="image procession framework" arch=('i686' 'x86_64') license=('custom:CeCILL') diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 48ead4c0d..5b97f4f33 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 66907 2012-03-01 10:58:35Z bluewind $ +# $Id: PKGBUILD 70241 2012-05-02 18:03:17Z bluewind $ # Maintainer: Florian Pritz # Contributor: Jan Fader pkgbase=highlight pkgname=(highlight highlight-gui) -pkgver=3.8 +pkgver=3.9 pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64') makedepends=(qt lua boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2) -md5sums=('e15030b5e6115d7b4f7c635246ceec0a') +md5sums=('8b666baaf3638cc4b4f26b84816bc558') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD index 5c17d7fe7..ea08b20a1 100644 --- a/community/i3status/PKGBUILD +++ b/community/i3status/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 68961 2012-04-06 14:39:04Z ttopper $ +# $Id: PKGBUILD 70239 2012-05-02 17:41:16Z ttopper $ # Maintainer: Thorsten Töpper pkgname=i3status -pkgver=2.4 -pkgrel=2 +pkgver=2.5 +pkgrel=1 pkgdesc="Generates status bar to use with dzen2 or xmobar" arch=('i686' 'x86_64') url="http://i3.zekjur.net/i3status/" license=('BSD') groups=('i3') -depends=('wireless_tools' 'confuse' 'alsa-lib') +depends=('wireless_tools' 'confuse' 'alsa-lib' 'yajl') makedepends=('asciidoc') backup=('etc/i3status.conf') install=i3status.install options=('docs') source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2") -md5sums=('5854250c6bd4f2d1def986efc516aeb3') +md5sums=('6c3c1d91fae1dc939a517bc3b853f65f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/lazarus/ChangeLog b/community/lazarus/ChangeLog index 79ed3b287..0a843b0ec 100644 --- a/community/lazarus/ChangeLog +++ b/community/lazarus/ChangeLog @@ -1,3 +1,9 @@ +2012-04-30 BlackIkeEagle + * split pkgbuild + * lazarus (can be used for compiling) + * lazarus-qt (qt ide) + * lazarus-gtk (gtk ide) + 2008-01-21 JJDaNiMoTh * PKGBUILD: moved man pages to /usr/share diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 515f5551c..6b3e8d720 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,52 +1,119 @@ -# $Id: PKGBUILD 67923 2012-03-16 10:10:35Z spupykin $ +# $Id: PKGBUILD 70224 2012-05-02 13:40:21Z idevolder $ # Maintainer: Sergej Pupykin # Contributor: Jens Adam (byte/jra) +# Contributor: BlackIkeEagle -pkgname=lazarus +pkgbase=lazarus +pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') pkgver=0.9.30.4 -pkgrel=1 -pkgdesc='Delphi-like IDE for FreePascal' +pkgrel=2 url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') arch=('i686' 'x86_64') -depends=('fpc' 'fpc-src' 'gtk2') -#makedepends=(rpmextract) +makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2) md5sums=('ebd40cdfdfc4b66d1ced7a0d48d6da84') build() { - cd $srcdir/${pkgname} - make FPC=/usr/bin/fpc clean bigide + cd $srcdir/${pkgbase} + + # build gtk2 ide + make FPC=/usr/bin/fpc LCL_PLATFORM=gtk2 clean bigide + # move gtk binaries + mv lazarus lazarus-gtk2 + mv startlazarus startlazarus-gtk2 + + # build qt ide + make FPC=/usr/bin/fpc LCL_PLATFORM=qt bigide + # move qt binaries + mv lazarus lazarus-qt + mv startlazarus startlazarus-qt } -package() { - cd $srcdir/${pkgname} +package_lazarus() { + pkgdesc='Delphi-like IDE for FreePascal common files' + depends=('fpc' 'fpc-src') + optdepends=( + 'perl: to run some scirpts in the tools directory' + 'gtk2: to compile gtk2 apps' + 'qt4pas: to compile qt apps' + ) + + cd $srcdir/${pkgbase} # skip the 'make install' mess completely and do everything manually mkdir -p $pkgdir/usr/lib/lazarus $pkgdir/usr/bin $pkgdir/usr/share/man/man1 $pkgdir/usr/share/doc - rm -r debian - cp -R . $pkgdir/usr/lib/lazarus + rsync -a \ + --exclude="CVS" --exclude=".cvsignore" \ + --exclude="*.ppw" --exclude="*.ppl" \ + --exclude="*.ow" --exclude="*.a"\ + --exclude="*.rst" --exclude=".#*" \ + --exclude="*.~*" --exclude="*.bak" \ + --exclude="*.orig" --exclude="*.rej" \ + --exclude=".xvpics" --exclude="*.compiled" \ + --exclude="killme*" --exclude=".gdb_hist*" \ + --exclude="debian" --exclude="COPYING*" \ + --exclude="*.app" --exclude="Makefile*" \ + --exclude="tools/install" \ + . "$pkgdir"/usr/lib/lazarus - ln -s /usr/lib/lazarus/lazarus $pkgdir/usr/bin/lazarus - ln -s /usr/lib/lazarus/startlazarus $pkgdir/usr/bin/startlazarus - ln -s /usr/lib/lazarus/lazbuild $pkgdir/usr/bin/lazbuild + #remove some stuff, not needed or for in other package + pushd $pkgdir/usr/lib/lazarus + rm lazarus-* + rm startlazarus-* + popd + ln -s /usr/lib/lazarus/lazbuild $pkgdir/usr/bin/lazbuild cp -R install/man/man1/* $pkgdir/usr/share/man/man1/ - mv $pkgdir/usr/lib/lazarus/docs $pkgdir/usr/share/doc/lazarus + rm -r $pkgdir/usr/lib/lazarus/install + + # license files: /usr/lib/lazarus/COPYING* + install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgbase/COPYING.modifiedLGPL +} + +package_lazarus-gtk2() { + pkgdesc='Delphi-like IDE for FreePascal gtk2 version' + depends=('lazarus' 'desktop-file-utils' 'gtk2') + conflicts=('lazarus-qt') + install='lazarus-ide.install' + + cd $srcdir/${pkgbase} + + # install gtk binaries + install -Dm755 lazarus-gtk2 $pkgdir/usr/lib/lazarus/lazarus + install -Dm755 startlazarus-gtk2 $pkgdir/usr/lib/lazarus/startlazarus + install -dm755 $pkgdir/usr/bin + ln -s /usr/lib/lazarus/lazarus $pkgdir/usr/bin/lazarus + ln -s /usr/lib/lazarus/startlazarus $pkgdir/usr/bin/startlazarus # make 'desktop-file-validate' happy and fix missing .png icon sed -e 's|\(Categories\).*|\1=IDE;Development;|' \ - -e 's|\.png|\.xpm|' -i install/lazarus.desktop + -e 's|\.png|\.xpm|' -i install/lazarus.desktop install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png - rm -r $pkgdir/usr/lib/lazarus/install +} - # license files: /usr/lib/lazarus/COPYING* - install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL +package_lazarus-qt() { + pkgdesc='Delphi-like IDE for FreePascal qt version' + depends=('lazarus' 'qt4pas') + conflicts=('lazarus-gtk2') + install='lazarus-ide.install' + + cd $srcdir/${pkgbase} - # strip - find $pkgdir -perm /ugo+x -type f -exec strip {} \; - find $pkgdir -name \*.so -type f -exec strip {} \; + # install qt binaries + install -Dm755 lazarus-qt $pkgdir/usr/lib/lazarus/lazarus + install -Dm755 startlazarus-qt $pkgdir/usr/lib/lazarus/startlazarus + install -dm755 $pkgdir/usr/bin + ln -s /usr/lib/lazarus/lazarus $pkgdir/usr/bin/lazarus + ln -s /usr/lib/lazarus/startlazarus $pkgdir/usr/bin/startlazarus + + # make 'desktop-file-validate' happy and fix missing .png icon + sed -e 's|\(Categories\).*|\1=IDE;Development;|' \ + -e 's|\.png|\.xpm|' -i install/lazarus.desktop + install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop + install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png } +# vim:set ts=2 sts=2 sw=2 et: diff --git a/community/lazarus/lazarus-ide.install b/community/lazarus/lazarus-ide.install new file mode 100644 index 000000000..40d56528f --- /dev/null +++ b/community/lazarus/lazarus-ide.install @@ -0,0 +1,34 @@ +update_icons() { + + # Setup Menus + if which update-desktop-database + then + update-desktop-database -q /usr/share/applications + fi + + # Setup MIME types + if which update-mime-database + then + update-mime-database /usr/share/mime >/dev/null + fi + + # Setup Icons + touch -c /usr/share/icons/hicolor + if which gtk-update-icon-cache + then + gtk-update-icon-cache -tq /usr/share/icons/hicolor + fi + +} + +post_install() { + update_icons +} + +post_upgrade() { + update_icons +} + +post_remove() { + update_icons +} diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index 97e494a30..76c3667a8 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69979 2012-04-27 16:17:40Z spupykin $ +# $Id: PKGBUILD 70209 2012-05-02 12:44:37Z spupykin $ # Maintainer: Sergej Pupykin pkgname=myodbc -pkgver=5.1.10 +pkgver=5.1.11 pkgrel=1 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64) @@ -10,9 +10,9 @@ url="http://dev.mysql.com/downloads/connector/odbc/" depends=('unixodbc' 'libmysqlclient') license=('GPL') options=('libtool') -source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}-src.tar.gz" +source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz" myconf.h.in) -md5sums=('71d570a7f6839b81d101bf803e4f864a' +md5sums=('1d868f404038bbce6623a28255c8a9f7' '6c99c83e309b18d15ef0f07f0b461241') build() { diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index 6018f1dfb..18ee6807d 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69166 2012-04-09 22:10:54Z spupykin $ +# $Id: PKGBUILD 70211 2012-05-02 12:45:26Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Krzysztof Raczkowski pkgname=open-vm-tools-modules pkgver=2012.03.13 _pkgsubver=651368 -pkgrel=3 +pkgrel=4 pkgdesc="kernel modules for the open source implementation of VMware Tools" arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD index d70039048..59faabd19 100644 --- a/community/pptpd/PKGBUILD +++ b/community/pptpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66163 2012-02-23 02:22:57Z spupykin $ +# $Id: PKGBUILD 70218 2012-05-02 13:03:21Z spupykin $ # Maintainer: Sergej Pupykin pkgname=pptpd pkgver=1.3.4 -pkgrel=5 +pkgrel=6 pkgdesc="Poptop server" arch=(i686 x86_64) url="http://poptop.sourceforge.net/" @@ -28,6 +28,8 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install mkdir -p $pkgdir/etc/ - echo "# Read man pptpd.conf and write your pptpd configuration here" >$pkgdir/etc/pptpd.conf - install -D -m0755 ../pptpd $pkgdir/etc/rc.d/pptpd + echo -e "# Read man pptpd.conf, see samples in /usr/share/doc/pptpd\nand write your pptpd configuration here" >$pkgdir/etc/pptpd.conf + install -Dm0755 ../pptpd $pkgdir/etc/rc.d/pptpd + mkdir -p $pkgdir/usr/share/doc/pptpd + cp -a samples $pkgdir/usr/share/doc/pptpd/ } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index d2fe27e3a..b6a96fe17 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay pkgname=puzzles -pkgver=9445 +pkgver=9455 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64') @@ -11,13 +11,11 @@ url="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" license=('MIT') makedepends=('pkgconfig') depends=('gtk2') -source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz" - 'puzzles-lm.diff') +source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz") build() { cd ${srcdir}/${pkgname}-r${pkgver} - patch -Np1 < ${srcdir}/puzzles-lm.diff ./mkfiles.pl sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile @@ -40,5 +38,4 @@ package() { mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } -md5sums=('fbee267af9c887d229a2035b18ebd4a7' - '41ac7f0d300422da94080e08976132e6') +md5sums=('b1c08158b5ea14f374485cc72b7307f1') diff --git a/community/qt4pas/PKGBUILD b/community/qt4pas/PKGBUILD new file mode 100644 index 000000000..f8711f222 --- /dev/null +++ b/community/qt4pas/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 70222 2012-05-02 13:40:13Z idevolder $ +# Maintainer: BlackIkeEagle +# Contributor: Fabien Wang + +pkgname=qt4pas +pkgver=2.5 +pkgrel=1 +pkgdesc="Free Pascal Qt4 Binding Library" +arch=('i686' 'x86_64') +url="http://users.telenet.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html" +license=('LGPL') +depends=('qtwebkit') +source=("http://users.telenet.be/Jan.Van.hijfte/qtforfpc/V2.5/qt4pas-V2.5_Qt4.5.3.tar.gz") +md5sums=('8249bc17e4167e077d22c7f5fb118bb2') + +build() { + cd "$srcdir/qt4pas-V2.5_Qt4.5.3/" + + sed -ie "s:target\.path = :target\.path = $pkgdir:g" Qt4Pas.pro + + qmake -query + qmake + make +} + +package() { + cd "$srcdir/qt4pas-V2.5_Qt4.5.3/" + make install + + pushd "$pkgdir/usr/lib" + for intflink in 'libqt4intf.so' 'libqt4intf.so.5' 'libqt4intf.so.5.2' 'libqt4intf.so.5.2.1' 'libqt4intf.so.5.2.5'; do + ln -s libQt4Pas.so.5.2.5 $intflink + done + popd +} diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 84ebbed4c..c50418fea 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66942 2012-03-02 15:35:36Z andrea $ +# $Id: PKGBUILD 70235 2012-05-02 17:32:26Z andrea $ # Maintainer: Peter Lewis -# Contributor: Andrea Scarpino +# Maintainer: Andrea Scarpino # Contributor: Panagiotis Papadopoulos pkgname=rekonq -pkgver=0.9.0 +pkgver=0.9.2 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') @@ -13,16 +13,11 @@ license=('GPL') depends=('kdebase-keditbookmarks') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'fix-build.patch') -sha256sums=('2dc4f9b041bba89937c3278f53cbcc61964d3e2e2279dd44000c19902459b6cc' - '3ef9f0e6dc37f479c7cc38d84f6a6366a499f371610df01bcdaff9f4b71d246e') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('5e5ce5fc20f07ac0deb1584404595750') build(){ - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/fix-build.patch - - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -32,6 +27,6 @@ build(){ } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index ead5b9e68..fbd443548 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -5,7 +5,7 @@ pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=6 +pkgrel=7 pkgdesc="3D modeling program" arch=('x86_64' 'i686') url="http://www.wings3d.com/" @@ -18,10 +18,10 @@ replaces=('wings' 'wings-devel') install=$pkgname.install source=("http://downloads.sourceforge.net/wings/$_pkgname-$pkgver.tar.bz2" "$pkgname" - "$pkgname.png") + "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") sha256sums=('51aea431e18935e5634ea673caa945f586db2203855554d8dcab5e9545f2789a' '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' - 'ad49fded5e503131ee0e2e03a6db0974aa60f50e1ec6cd697fcacef126c40f52') + '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') _genericname=('3D Modeler') build() { @@ -43,13 +43,13 @@ package() { cp -r "$srcdir/$_pkgname-$pkgver/$subdir/" "$pkgdir/usr/lib/$pkgname" done - install -D -m 755 "$srcdir/wings3d" "$pkgdir/usr/bin/wings3d" - install -D -m 644 "$srcdir/wings3d.desktop" \ - "$pkgdir/usr/share/applications/wings3d.desktop" - install -D -m 644 "$srcdir/wings3d.png" \ - "$pkgdir/usr/share/pixmaps/wings3d.png" - install -D -m 644 license.terms \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$srcdir" + install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" } # vim:set ts=2 sw=2 et: diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 2630dbb68..233633e31 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 157323 2012-04-27 00:50:16Z allan $ +# $Id: PKGBUILD 158099 2012-05-02 22:27:06Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.22 -pkgrel=6 +pkgrel=7 _date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') @@ -16,10 +16,8 @@ depends=('glibc>=2.15' 'zlib') checkdepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2 - binutils-2.22-ld-13621.patch) -md5sums=('de2ac4298732827f8af706fc24020330' - '86d9445914c9d51bfe575ecbac265be0') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) +md5sums=('de2ac4298732827f8af706fc24020330') mksource() { mkdir ${pkgname}-${_date} @@ -32,10 +30,6 @@ mksource() { } build() { - cd ${srcdir}/binutils - # http://sourceware.org/bugzilla/show_bug.cgi?id=13621 - patch -p1 -i $srcdir/binutils-2.22-ld-13621.patch - cd ${srcdir} mkdir binutils-build && cd binutils-build diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD index 71e00454d..2c92888db 100644 --- a/extra/audiofile/PKGBUILD +++ b/extra/audiofile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148634 2012-02-04 16:08:33Z schiv $ +# $Id: PKGBUILD 158087 2012-05-02 16:52:54Z schiv $ # Maintainer: Ray Rashif # Contributor: dorphell pkgname=audiofile -pkgver=0.3.3 +pkgver=0.3.4 pkgrel=1 pkgdesc="Silicon Graphics Audio File Library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('gcc-libs' 'alsa-lib') options=('!libtool') source=("http://audiofile.68k.org/$pkgname-$pkgver.tar.gz") -md5sums=('64c7a03023b4b181d997ff0b272d29e4') +md5sums=('2ed06d64ee552a2ce490f54351b86ccd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index fd58222d2..61d4f636b 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156722 2012-04-23 09:04:02Z ibiru $ +# $Id: PKGBUILD 158081 2012-05-02 16:38:42Z ibiru $ # Maintainer: Jan de Groot # Contributor: Sergej Pupykin # Contributor: William Rea pkgname=clutter -pkgver=1.10.2 +pkgver=1.10.4 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi') makedepends=('gobject-introspection' 'mesa') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('d5c11b464d1a80eb6b73dbf7a98532917a055068fec3508f2a849c850e70d5b7') +sha256sums=('2f2f03c3f385db402898d2607e72d5ad9be2d14402a900c446273e5ae8be250a') build() { cd "$pkgname-$pkgver" diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index c93f485fe..62cddc3ea 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156734 2012-04-23 09:04:17Z ibiru $ +# $Id: PKGBUILD 158084 2012-05-02 16:51:02Z ibiru $ # Maintainer: Ionut Biru pkgname=dconf -pkgver=0.12.0 +pkgver=0.12.1 pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('vala' 'gtk3') optdepends=('gtk3: for dconf-editor') install=dconf.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9c020e2ff0adb19ff9bc3d73ce15388fb42c52b12ed751bdb59ce53a660461af') +sha256sums=('3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214') build() { cd "$pkgname-$pkgver" diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 8f9780a19..3d5274616 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147976 2012-01-29 10:54:04Z ronald $ +# $Id: PKGBUILD 158119 2012-05-03 02:26:57Z foutrelis $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski @@ -6,7 +6,7 @@ pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') pkgver=2.5.0 -pkgrel=5 +pkgrel=6 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') license=('GPL') @@ -15,10 +15,11 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - "boost148.patch" "libkipi140.patch") + "boost148.patch" "libkipi140.patch" "digikam-2.5.0-gcc-4.7.0.patch") sha1sums=('6cadb838669d1bdcbd6abb677889f7d68d696383' '93853084905b21309c46ce7d585021e76283d429' - '8a8f624fd0ca768a9dcd706405eb6e4944892d87') + '8a8f624fd0ca768a9dcd706405eb6e4944892d87' + '5058831a4f1209468d0249c03f0e243f176f995a') build() { cd "${srcdir}" @@ -27,6 +28,8 @@ build() { patch -Np1 -i ${srcdir}/libkipi140.patch popd + patch -Np0 -i ${srcdir}/digikam-2.5.0-gcc-4.7.0.patch + mkdir build cd build # Use internal lensfun (FS#21816) @@ -52,9 +55,6 @@ package_digikam() { make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/po make DESTDIR="${pkgdir}" install - - # these are in oxygen-icons - rm -rf ${pkgdir}/usr/share/icons } package_libkface() { diff --git a/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch new file mode 100644 index 000000000..535387b92 --- /dev/null +++ b/extra/digikam/digikam-2.5.0-gcc-4.7.0.patch @@ -0,0 +1,63 @@ +--- digikam-2.5.0/core/digikam/album/albummanager.h 2012-01-03 02:32:41.000000000 +0200 ++++ digikam-2.5.0/core/digikam/album/albummanager.h 2012-01-05 03:18:16.291639995 +0200 +@@ -831,7 +831,7 @@ + { + foreach(T* t, list) + { +- append(AlbumPointer(t)); ++ this->append(AlbumPointer(t)); + } + return *this; + } +--- digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-03 02:32:26.000000000 +0200 ++++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h 2012-01-05 03:01:56.965609602 +0200 +@@ -1362,7 +1362,7 @@ + template + void discover_vertex(VertexType u, const GraphType&) const + { +- record(u); ++ this->record(u); + } + }; + +@@ -1373,7 +1373,7 @@ + template + void discover_vertex(VertexType u, const GraphType&) const + { +- record(u); ++ this->record(u); + } + }; + +--- digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp 2012-01-03 02:32:04.000000000 +0200 ++++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp 2012-01-05 01:22:34.009352997 +0200 +@@ -30,6 +30,7 @@ + extern "C" + { + #include ++#include + } + + // C++ includes +--- digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp 2012-01-03 02:31:42.000000000 +0200 ++++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp 2012-01-05 02:35:01.061054821 +0200 +@@ -78,7 +78,7 @@ + public: + WizardPage(KAssistantDialog* dialog, const QString& title) + : QWidget(dialog) { +- setupUi(this); ++ this->setupUi(this); + layout()->setMargin(0); + mPage = dialog->addPage(this, title); + } +--- digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp 2012-01-03 02:31:34.000000000 +0200 ++++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp 2012-01-05 02:17:15.249914790 +0200 +@@ -88,7 +88,7 @@ + WizardPage ( KAssistantDialog* dialog, const QString& title ) + : QWidget ( dialog ) + { +- setupUi ( this ); ++ this->setupUi ( this ); + layout()->setMargin ( 0 ); + mPage = dialog->addPage ( this, title ); + } diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD index d969c256c..8e75a5e94 100644 --- a/extra/geoip/PKGBUILD +++ b/extra/geoip/PKGBUILD @@ -1,36 +1,43 @@ -# $Id: PKGBUILD 136949 2011-09-03 12:23:55Z foutrelis $ +# $Id: PKGBUILD 158109 2012-05-03 01:01:32Z foutrelis $ # Maintainer: Dan McGee # Contributor: Manolis Tzanidakis pkgname=geoip pkgver=1.4.8 -pkgrel=1 +pkgrel=2 pkgdesc="Non-DNS IP-to-country resolver C library & utils" arch=('i686' 'x86_64') url="http://www.maxmind.com/app/c" license=('GPL') -depends=('zlib') +depends=('zlib' 'geoip-database') backup=('etc/geoip/GeoIP.conf') -options=('!libtool') -source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-${pkgver}.tar.gz) -md5sums=('05b7300435336231b556df5ab36f326d') +options=('!libtool' '!emptydirs') +source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz) +sha256sums=('cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4') build() { - cd "${srcdir}/GeoIP-${pkgver}" + cd "$srcdir/GeoIP-$pkgver" - autoreconf -i - ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc/geoip + autoreconf -vi + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --sysconfdir=/etc/geoip make } check() { - cd "${srcdir}/GeoIP-${pkgver}" + cd "$srcdir/GeoIP-$pkgver" make check } package() { - cd "${srcdir}/GeoIP-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/GeoIP-$pkgver" + + make DESTDIR="$pkgdir" install + + # country database is provided by geoip-database + rm "$pkgdir/usr/share/GeoIP/GeoIP.dat" } # vim:set ts=2 sw=2 et: diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index f7a94a648..4aafcb9e9 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155812 2012-04-06 20:25:08Z dan $ +# $Id: PKGBUILD 158077 2012-05-02 14:24:00Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.10 +pkgver=1.7.10.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -99,7 +99,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('501ee8685c148d377950e42c111e01d83fd1d41a' - '5852d1dead0190edeba1803a70fac5d76523a616' +sha1sums=('870361f93fad7999f121bc7bc91a743feda68bdb' + '5bff761bc40a6b3cfe35ba824357dcf611dbd5d2' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index e7839dd35..4cd7b8120 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 154176 2012-03-23 22:05:03Z eric $ +# $Id: PKGBUILD 158094 2012-05-02 20:46:41Z eric $ # Maintainer: Eric Bélanger # Contributor: Ben Mazer pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') -pkgver=1.4.27 -pkgrel=2 +pkgver=1.4.28 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL3') url="http://msmtp.sourceforge.net" makedepends=('texlive-core' 'gsasl' 'libgnome-keyring') source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('e335745133b4729fe84c49f836b4d2fa9281e040') +sha1sums=('3fd44b30e8f4ae071b2a5a205d6007f3465fa970') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/msmtp/msmtp.install b/extra/msmtp/msmtp.install index c4dd76476..294c98486 100644 --- a/extra/msmtp/msmtp.install +++ b/extra/msmtp/msmtp.install @@ -16,5 +16,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 5ae5b7ba7..3172e2686 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 148866 2012-02-05 11:53:22Z ibiru $ +# $Id: PKGBUILD 158091 2012-05-02 18:12:22Z schiv $ # Maintainer: Ray Rashif # Contributor: Tobias Powalowski pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV -pkgver=2.3.1_a -_realver=2.3.1 -pkgrel=4 +pkgver=2.4.0 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -20,8 +19,8 @@ optdepends=('opencv-docs' 'eigen2' 'python2-numpy: Python 2.x interface') options=('!libtool') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2") -md5sums=('82e4b6bfa349777233eea09b075e931e') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2") +md5sums=('1fcda4ed3d0655f033ac30be8bad4882') _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D CMAKE_INSTALL_PREFIX=/usr' @@ -48,7 +47,7 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D USE_FAST_MATH=ON') build() { - cd "$srcdir/$_realname-$_realver" + cd "$srcdir/$_realname-$pkgver" # x64, i.e "Athlon64" and upwards, can use SSE3 [ $CARCH = x86_64 ] && \ @@ -60,12 +59,12 @@ build() { } package_opencv() { - cd "$srcdir/$_realname-$_realver" + cd "$srcdir/$_realname-$pkgver" make DESTDIR="$pkgdir" install # install license file - install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" cd "$pkgdir/usr/share" @@ -96,7 +95,7 @@ package_opencv-docs() { cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" # install license file - install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } @@ -112,7 +111,7 @@ package_opencv-samples() { cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" # install license file - install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \ + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/xfce4-screenshooter/PKGBUILD b/extra/xfce4-screenshooter/PKGBUILD index 947c7ddca..cc80ce3d5 100644 --- a/extra/xfce4-screenshooter/PKGBUILD +++ b/extra/xfce4-screenshooter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157881 2012-04-30 04:21:13Z foutrelis $ +# $Id: PKGBUILD 158096 2012-05-02 22:02:34Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Tobias Kieslich pkgname=xfce4-screenshooter -pkgver=1.8.0 -pkgrel=3 +pkgver=1.8.1 +pkgrel=1 pkgdesc="Plugin that makes screenshots for the Xfce panel" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/applications/xfce4-screenshooter" @@ -14,26 +14,16 @@ depends=('xfce4-panel' 'libsoup' 'hicolor-icon-theme') makedepends=('intltool') install=$pkgname.install options=('!libtool') -source=(http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$pkgver.tar.bz2 - xfce4-screenshooter-1.7.9-dsofix.patch - fs-25873-segfault-in-awesome-wm.patch) +source=(http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$pkgver.tar.bz2) conflicts=('xfce4-screenshooter-plugin') replaces=('xfce4-screenshooter-plugin') -sha256sums=('68748a42ae68c5a8e9ed1c14ec5c741a344ab30b5b325b8812220539548ad83e' - '6902495c0394af19a76e2f90399ca7295e8dfb3ffb29d3b4f3b3a9fb7489c464' - '76cc9127167c9f4a800b01e9d16b85bf3af335d0eb44588d859739aa9d457e38') +sha256sums=('40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/xfce4-screenshooter-1.7.9-dsofix.patch" - - # segfaults trying to capture screenshot of active window in awesome WM - # https://bugs.archlinux.org/task/25873 - # patch by Bruno Ramos @ https://bugzilla.xfce.org/show_bug.cgi?id=8080#c2 - patch -Np1 -i "$srcdir/fs-25873-segfault-in-awesome-wm.patch" - - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD index 725f43548..5953c1240 100644 --- a/extra/xfce4-settings/PKGBUILD +++ b/extra/xfce4-settings/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 157887 2012-04-30 04:21:22Z foutrelis $ +# $Id: PKGBUILD 158103 2012-05-02 23:12:45Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: tobias # Contributor: Corrado Primier pkgname=xfce4-settings pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Settings manager for xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" license=('GPL2') groups=('xfce4') depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier' - 'gnome-icon-theme' 'gtk-engines' 'gtk2-xfce-engine') + 'gnome-icon-theme' 'gtk-engines') makedepends=('intltool') optdepends=('libcanberra: for sound control') source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 xfce4-settings-xml-4.10.0.patch) sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e' - '544d4409bac1cba1c0897317838cf2e24345f6ed4e3bf497a89b38d2643925c1') + '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,7 +27,8 @@ build() { # (taken from Fedora) patch -Np1 -i "$srcdir/xfce4-settings-xml-4.10.0.patch" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-static \ diff --git a/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch b/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch index cb3a4a0d3..c8b6204fc 100644 --- a/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch +++ b/extra/xfce4-settings/xfce4-settings-xml-4.10.0.patch @@ -7,8 +7,8 @@ diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml xfce4-settings-4.9 - - -+ -+ ++ ++ diff --git a/multilib/jack2-multilib/PKGBUILD b/multilib/jack2-multilib/PKGBUILD index 6c45b64d6..d32898b23 100644 --- a/multilib/jack2-multilib/PKGBUILD +++ b/multilib/jack2-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $ +# $Id: PKGBUILD 70231 2012-05-02 16:32:12Z schiv $ # Maintainer: Ray Rashif # Contributor: SpepS @@ -15,7 +15,7 @@ pkgname=('jack2-multilib' 'jack2-dbus-multilib') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.8 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) @@ -107,7 +107,7 @@ package_jack2-multilib() { "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" # should be done by upstream # see http://trac.jackaudio.org/ticket/200 @@ -135,7 +135,7 @@ package_jack2-dbus-multilib() { "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" _mklinks } diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD index fcf2f9c32..88c791eea 100644 --- a/testing/glib2/PKGBUILD +++ b/testing/glib2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157278 2012-04-26 21:34:07Z allan $ +# $Id: PKGBUILD 158079 2012-05-02 16:31:02Z ibiru $ # Maintainer: Jan de Groot pkgname=glib2 -pkgver=2.32.1 -pkgrel=3 +pkgver=2.32.2 +pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) @@ -16,7 +16,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.ta glib2.sh glib2.csh revert-warn-glib-compile-schemas.patch) -sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398' +sha256sums=('b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD index cfca8de86..f64b19f06 100644 --- a/testing/lvm2/PKGBUILD +++ b/testing/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 157920 2012-04-30 05:18:44Z eric $ +# $Id: PKGBUILD 158058 2012-05-02 05:57:42Z eric $ # Maintainer: Eric Bélanger # Maintainer: Thomas Bächler pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.95 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -23,8 +23,8 @@ sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' build() { cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS - ./configure --exec_prefix=/ --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \ - --libdir=/usr/lib --localstatedir=/var --with-udev-prefix=/usr --with-dmeventd-path=/sbin \ + ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ --enable-udev_sync --enable-udev_rules make diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD index a66113877..0749f8128 100644 --- a/testing/mdadm/PKGBUILD +++ b/testing/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156533 2012-04-20 16:54:05Z tpowa $ +# $Id: PKGBUILD 158073 2012-05-02 12:16:04Z tomegun $ # Maintainer: Tobias Powalowski # Contributor: Judd Vinet pkgname=mdadm pkgver=3.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -19,16 +19,7 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm_hook mdadm_udev_install disable-werror.patch) - -install=mdadm.install replaces=('raidtools') -md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f' - '6df172c8f77b280018cf87eb3d313f29' - '00cbed931db4f15b6ce49e3e7d433966' - '9b01e96b6c3c218fb61628c9281fe688' - 'c8c0713f5c7da51822ee6f3911473a1c' - 'cd258e1bf430c02a25f40b4329df9f57' - '4ad87b74a4bc9a34621280abe0e0c3e4') build() { cd $srcdir/$pkgname-$pkgver @@ -50,4 +41,14 @@ package() { install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev # symlink for backward compatibility ln -sf /usr/lib/initcpio/hooks/mdadm $pkgdir/usr/lib/initcpio/hooks/raid + # move /lib/* to /usr/lib/ + mv $pkgdir/lib/udev $pkgdir/usr/lib/ + rm -rf $pkgdir/lib } +md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f' + '8333d405f550317c2bacd5510bf1cb60' + '00cbed931db4f15b6ce49e3e7d433966' + '9b01e96b6c3c218fb61628c9281fe688' + 'fbb5542d9bdf87441a11dd7e7a0a17f8' + '2318b99701dba9b01a6891c62be7bc1c' + '4ad87b74a4bc9a34621280abe0e0c3e4') diff --git a/testing/mdadm/mdadm b/testing/mdadm/mdadm index e196f3642..9bf468e98 100755 --- a/testing/mdadm/mdadm +++ b/testing/mdadm/mdadm @@ -3,28 +3,33 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /sbin/mdadm` -case "$1" in +pidfile=/run/mdadm.pid +if [[ -r $pidfile ]]; then + read -r PID <"$pidfile" + if [[ $PID && ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case $1 in start) stat_busy "Starting mdadm RAID Monitor" - if [ -z "$PID" ]; then - /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else + if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then add_daemon mdadm stat_done + else + stat_fail fi ;; stop) stat_busy "Stopping mdadm RAID Monitor" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else + if [[ $PID ]] && kill "$PID" &>/dev/null; then rm_daemon mdadm stat_done + else + stat_fail fi ;; restart) @@ -33,5 +38,5 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac diff --git a/testing/mdadm/mdadm_hook b/testing/mdadm/mdadm_hook index 7b2dc1ad1..787be5d0c 100755 --- a/testing/mdadm/mdadm_hook +++ b/testing/mdadm/mdadm_hook @@ -1,44 +1,49 @@ -# vim: set ft=sh: -run_hook () -{ - input="$(cat /proc/cmdline)" - mdconfig="/etc/mdadm.conf" +#!/usr/bin/ash + +run_hook() { + local i= mdconfig=/etc/mdadm.conf + # for partitionable raid, we need to load md_mod first! modprobe md_mod 2>/dev/null - # If md is specified on commandline, create config file from those parameters. - if [ "$(echo $input | grep "md=")" ]; then - #Create initial mdadm.conf - # scan all devices in /proc/partitions - echo DEVICE partitions > $mdconfig - for i in $input; do + + if [ -n "$md" ]; then + echo 'DEVICE partitions' >"$mdconfig" + for i in $(cat /proc/cmdline); do case $i in - # raid + # raid md=[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device devices=$array" >> $mdconfig + device=${i%%,*} + device=${device/=/} + array=${i#*,} + echo "ARRAY /dev/$device devices=$array" ;; # partitionable raid md=d[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device devices=$array" >> $mdconfig + device=${i%%,*} + device=${device/=/_} + array=${i#*,} + echo "ARRAY /dev/$device devices=$array" ;; - # raid UUID - md=[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + # raid UUID + md=[0-9]*,[0-9,a-fA-F]*) + device=${i%%,*} + device=${device/=/} + array=${i#*,} + echo "ARRAY /dev/$device UUID=$array" ;; # partitionable raid UUID - md=d[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + md=d[0-9]*,[0-9,a-fA-F]*) + device=${i%%,*} + device=${device/=/_} + array=${i#*,} + echo "ARRAY /dev/$device UUID=$array" ;; - esac - done + esac + done >>"$mdconfig" fi + # assemble everything - [ -e $mdconfig ] && /sbin/mdassemble + [ -s "$mdconfig" ] && /sbin/mdassemble } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/mdadm/mdadm_udev_install b/testing/mdadm/mdadm_udev_install index 9fc161624..be653fc74 100644 --- a/testing/mdadm/mdadm_udev_install +++ b/testing/mdadm/mdadm_udev_install @@ -1,23 +1,22 @@ -# vim: set ft=sh: +#!/bin/bash + +build() { + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-")" -build() -{ - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " - BINARIES="" - FILES="" - SCRIPT="" # check if a custom mdadm.conf exists - if grep -q ^ARRAY /etc/mdadm.conf; then + if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdadm" - add_file "/lib/udev/rules.d/64-md-raid.rules" + + add_binary "mdadm" + add_file "/usr/lib/udev/rules.d/64-md-raid.rules" } -help () -{ -cat< + +pkgname=mkinitcpio-nfs-utils +pkgver=0.3 +pkgrel=2 +pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/" +license=('GPL2') +depends=('glibc') +source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz") +sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939') + +build() { + make -C "$pkgname-$pkgver" +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install +} diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index 2655255a1..3b08e11a8 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157518 2012-04-28 21:41:17Z dreisner $ +# $Id: PKGBUILD 158121 2012-05-03 02:49:53Z dreisner $ # Maintainer: Dave Reisner pkgbase=systemd pkgname=('systemd' 'libsystemd') pkgver=44 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -76,9 +76,8 @@ package_systemd() { chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" # symlink to /bin/systemd for compat and sanity - install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd" + install -dm755 "$pkgdir/bin" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd" # use python2 for systemd-analyze sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install index 822108c0f..0c3e9abee 100644 --- a/testing/systemd/systemd.install +++ b/testing/systemd/systemd.install @@ -29,18 +29,14 @@ post_upgrade() { fi if sd_booted; then - systemctl daemon-reload - systemctl daemon-reexec - fi - - newpkgver=${1%-*} - oldpkgver=${2%-*} - - # catch v31 need for restarting systemd-logind.service - if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then - # but only if systemd is running - if sd_booted; then - systemctl try-restart systemd-logind.service + # we moved the binary in 44-2 to /usr, so a reexec leads to a + # coredump. refuse this reexec and warn the user that they should + # reboot instead. + if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then + echo "warning: refusing to reexec systemd. the system should be rebooted." + else + systemctl daemon-reload + systemctl daemon-reexec fi fi } diff --git a/testing/v4l-utils/PKGBUILD b/testing/v4l-utils/PKGBUILD new file mode 100644 index 000000000..ea035ac40 --- /dev/null +++ b/testing/v4l-utils/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 158069 2012-05-02 11:35:18Z tomegun $ +# Maintainer: Thomas Bächler +pkgname=v4l-utils +pkgver=0.8.8 +pkgrel=1 +pkgdesc="Userspace tools and conversion library for Video 4 Linux" +arch=('i686' 'x86_64') +url="http://freshmeat.net/projects/libv4l" +provides=("libv4l=$pkgver") +replaces=('libv4l') +conflicts=('libv4l') +license=('LGPL') +makedepends=('qt') +optdepends=('qt') +depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') +source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 + http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules + + make PREFIX="/usr" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make install PREFIX="/usr" DESTDIR="${pkgdir}/" + rm -f "${pkgdir}/usr/bin/ivtv-ctl" + mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" + rm -rf "${pkgdir}/lib" +} +md5sums=('40fdda3f4055ed818012d7a7b5ef5be5' + 'cceb1325f35789c95f875b705b3eb373') -- cgit v1.2.3-54-g00ecf