summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/calibre/PKGBUILD6
-rwxr-xr-xcommunity/e-modules-extra-svn/PKGBUILD25
-rwxr-xr-xcommunity/e-svn/PKGBUILD4
-rwxr-xr-xcommunity/e_dbus-svn/PKGBUILD4
-rwxr-xr-xcommunity/ecore-svn/PKGBUILD4
-rwxr-xr-xcommunity/edje-svn/PKGBUILD4
-rwxr-xr-xcommunity/eet-svn/PKGBUILD4
-rw-r--r--community/eeze-svn/PKGBUILD2
-rwxr-xr-xcommunity/efreet-svn/PKGBUILD4
-rwxr-xr-xcommunity/eina-svn/PKGBUILD4
-rw-r--r--community/elementary-svn/PKGBUILD2
-rwxr-xr-xcommunity/embryo-svn/PKGBUILD4
-rwxr-xr-xcommunity/evas-svn/PKGBUILD4
-rw-r--r--community/gnome-settings-daemon-updates/PKGBUILD10
-rw-r--r--core/logrotate/PKGBUILD10
-rw-r--r--core/logrotate/logrotate-3.8.0-noasprintf.patch55
-rw-r--r--extra/gdk-pixbuf2/PKGBUILD10
-rw-r--r--extra/mercurial/PKGBUILD6
-rw-r--r--extra/opencv/PKGBUILD30
-rw-r--r--extra/opencv/opencv.install7
-rw-r--r--extra/samba/PKGBUILD34
-rw-r--r--extra/wireshark/PKGBUILD9
22 files changed, 160 insertions, 82 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 237be440e..49082b8df 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54612 2011-08-21 18:35:31Z giovanni $
+# $Id: PKGBUILD 54884 2011-08-27 10:26:35Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Petrov Roman <nwhisper@gmail.com>
# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
pkgname=calibre
-pkgver=0.8.15
+pkgver=0.8.16
pkgrel=1
pkgdesc="Ebook management application"
arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
install=calibre.install
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
desktop_integration.patch)
-md5sums=('0a3375302391a11b4e9abb1c4fbc81de'
+md5sums=('f3a1d015e0e518e9759b4e7714158e4b'
'253ce4fe5d01f8ff76b63cd3825755ea')
build() {
diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD
index 99bea9a22..1a977d7bd 100755
--- a/community/e-modules-extra-svn/PKGBUILD
+++ b/community/e-modules-extra-svn/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=e-modules-extra-svn
-pkgver=61885
+pkgver=62844
pkgrel=1
pkgdesc="Extra gadgets for e17"
arch=('i686' 'x86_64')
@@ -39,15 +39,14 @@ build() {
# fix build issue
sed -i 's|efreet/Efreet.h|efreet-0/Efreet.h|' winlist-ng/src/e_mod_main.h || return 1
-# weather fails to compile on September 7th 2010
-# xkbswitch fails to compile on May 4th 2011
-for i in alarm calendar comp-scale cpu deskshow diskio efm_path efm_pathbar efm_nav\
- empris engage eooorg everything-mpris everything-pidgin everything-places \
- everything-tracker everything-wallpaper everything-websearch \
- execwatch flame forecasts iiirk itask language mail mem \
+for i in alarm calendar comp-scale cpu diskio deskshow \
+ empris engage eooorg everything-aspell everything-mpris \
+ everything-places everything-shotgun \
+ everything-wallpaper everything-websearch \
+ execwatch flame forecasts iiirk itask language mail mem \
moon mpdule net news notification penguins photo places quickaccess \
rain screenshot slideshow snow taskbar tclock tiling uptime \
- winlist-ng winselector wlan; do
+ weather winlist-ng winselector wlan; do
cd $i
./autogen.sh --prefix=/usr
@@ -59,14 +58,14 @@ done
package() {
cd $srcdir/$_svnmod-build
-# weather fails to compile on September 7th 2010
-for i in alarm calendar comp-scale cpu deskshow diskio efm_path efm_pathbar efm_nav\
- empris engage eooorg everything-mpris everything-pidgin everything-places \
- everything-tracker everything-wallpaper everything-websearch \
+for i in alarm calendar comp-scale cpu diskio deskshow \
+ empris engage eooorg everything-aspell everything-mpris \
+ everything-places everything-shotgun \
+ everything-wallpaper everything-websearch \
execwatch flame forecasts iiirk itask language mail mem \
moon mpdule net news notification penguins photo places quickaccess \
rain screenshot slideshow snow taskbar tclock tiling uptime \
- winlist-ng winselector wlan; do
+ weather winlist-ng winselector wlan; do
cd $i
make DESTDIR=$pkgdir install
diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD
index 2eb747ab5..47bd88946 100755
--- a/community/e-svn/PKGBUILD
+++ b/community/e-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53113 2011-07-30 17:03:37Z rvanharen $
+# $Id: PKGBUILD 54908 2011-08-27 14:51:01Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=e-svn
-pkgver=61875
+pkgver=62822
pkgrel=1
pkgdesc="Enlightenment window manager DR17 (aka e17)"
arch=('i686' 'x86_64')
diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD
index ee3da0c6d..5fa4c1f32 100755
--- a/community/e_dbus-svn/PKGBUILD
+++ b/community/e_dbus-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53108 2011-07-30 17:02:51Z rvanharen $
+# $Id: PKGBUILD 54905 2011-08-27 14:49:26Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=e_dbus-svn
-pkgver=61732
+pkgver=61974
pkgrel=1
pkgdesc="dbus abstraction layer for e17"
arch=('i686' 'x86_64')
diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD
index 144506f6d..1f970b620 100755
--- a/community/ecore-svn/PKGBUILD
+++ b/community/ecore-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53062 2011-07-30 16:00:01Z rvanharen $
+# $Id: PKGBUILD 54894 2011-08-27 14:45:17Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=ecore-svn
-pkgver=61897
+pkgver=62785
pkgrel=1
pkgdesc="Ecore is an abstraction layer for e17"
arch=('i686' 'x86_64')
diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD
index 8ec99f997..ad2b036e2 100755
--- a/community/edje-svn/PKGBUILD
+++ b/community/edje-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53098 2011-07-30 17:01:13Z rvanharen $
+# $Id: PKGBUILD 54900 2011-08-27 14:47:46Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=edje-svn
-pkgver=61905
+pkgver=62791
pkgrel=1
pkgdesc="A graphical design and layout library based on Evas"
arch=('i686' 'x86_64')
diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD
index d54c3483e..8c7f85846 100755
--- a/community/eet-svn/PKGBUILD
+++ b/community/eet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53078 2011-07-30 16:57:26Z rvanharen $
+# $Id: PKGBUILD 54890 2011-08-27 14:43:26Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=eet-svn
-pkgver=61920
+pkgver=62590
pkgrel=1
pkgdesc="A data storage and compression library"
arch=('i686' 'x86_64')
diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD
index b3f67e19f..38abf7c37 100644
--- a/community/eeze-svn/PKGBUILD
+++ b/community/eeze-svn/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: bluebugs
pkgname=eeze-svn
-pkgver=61778
+pkgver=62160
pkgrel=1
pkgdesc="A data storage and compression library"
arch=('i686' 'x86_64')
diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD
index 0f6156a65..921a470cc 100755
--- a/community/efreet-svn/PKGBUILD
+++ b/community/efreet-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53103 2011-07-30 17:02:04Z rvanharen $
+# $Id: PKGBUILD 54902 2011-08-27 14:48:35Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=efreet-svn
-pkgver=60978
+pkgver=62616
pkgrel=1
pkgdesc="freedesktop.org specifications for e17"
arch=('i686' 'x86_64')
diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD
index 724099835..9a78eb3c0 100755
--- a/community/eina-svn/PKGBUILD
+++ b/community/eina-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53073 2011-07-30 16:56:37Z rvanharen $
+# $Id: PKGBUILD 54889 2011-08-27 14:42:42Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=eina-svn
-pkgver=61900
+pkgver=62813
pkgrel=1
pkgdesc="E17 file chunk reading/writing library"
arch=('i686' 'x86_64')
diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD
index 33cb6b6a4..6b77a578a 100644
--- a/community/elementary-svn/PKGBUILD
+++ b/community/elementary-svn/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=elementary-svn
-pkgver=61919
+pkgver=62830
pkgrel=1
pkgdesc="Enlightenment's basic widget set"
arch=('i686' 'x86_64')
diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD
index d1ad7817d..2b3046f8f 100755
--- a/community/embryo-svn/PKGBUILD
+++ b/community/embryo-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 46180 2011-05-04 10:06:17Z rvanharen $
+# $Id: PKGBUILD 54898 2011-08-27 14:46:48Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=embryo-svn
-pkgver=58829
+pkgver=62382
pkgrel=1
pkgdesc="implementation of a C like scripting language for e17"
arch=('i686' 'x86_64')
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index f9443d355..f62152dc8 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 53083 2011-07-30 16:58:13Z rvanharen $
+# $Id: PKGBUILD 54892 2011-08-27 14:44:08Z rvanharen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=evas-svn
-pkgver=61914
+pkgver=62798
pkgrel=1
pkgdesc="A hardware-accelerated canvas API for X-Windows"
arch=('i686' 'x86_64')
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index e1c0348e9..8ee5371b0 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 48006 2011-05-26 23:21:11Z jconder $
+# $Id: PKGBUILD 54886 2011-08-27 12:46:49Z jconder $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
_pkgname=gnome-settings-daemon
pkgname=$_pkgname-updates
-pkgver=3.0.2
+pkgver=3.0.3
pkgrel=1
pkgdesc="Updates plugin for the GNOME Settings daemon"
arch=('i686' 'x86_64')
@@ -13,9 +13,9 @@ depends=('gnome-packagekit' "$_pkgname" 'upower')
makedepends=('intltool' 'gtk-doc')
options=('!emptydirs' '!libtool')
install=$_pkgname.install
-source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2"
+source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
'arch.patch')
-sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec'
+sha256sums=('9c6e3bb5c4b3a98ab83a917b7be15578d11831330f7f2deeecfbb625568e3e03'
'91700d5c7c52cb6e15ed46ec61a150af58e073de7332351a1f7863a41042d134')
build() {
@@ -27,6 +27,8 @@ build() {
--libexecdir=/usr/bin \
--disable-static \
--enable-pulse
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make -s
}
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD
index 95a0681bd..901a55b64 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 130804 2011-07-08 03:53:21Z eric $
+# $Id: PKGBUILD 136351 2011-08-27 04:08:31Z allan $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=logrotate
pkgver=3.8.0
-pkgrel=1
+pkgrel=2
pkgdesc="Rotates system logs automatically"
arch=('i686' 'x86_64')
url="https://fedorahosted.org/logrotate/"
@@ -13,15 +13,19 @@ groups=('base')
depends=('popt' 'cron' 'gzip')
backup=('etc/logrotate.conf')
source=(https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz
+ logrotate-3.8.0-noasprintf.patch
logrotate.conf
logrotate.cron.daily)
md5sums=('590f77c13077a4c384dbec7ca9c5f242'
+ '624801859beb9abe7958b6392c854d72'
'462a5f364717461537eb2ae6394ad23e'
'8e23d5d4cc29b1e055b24df87e355cdc')
build() {
cd "$srcdir/${pkgname}-${pkgver}"
-
+
+ patch -Np1 -i "$srcdir"/logrotate-3.8.0-noasprintf.patch
+
sed -i 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\
config.h
sed -i "s|CFLAGS = -Wall|CFLAGS = -Wall $CFLAGS|" Makefile
diff --git a/core/logrotate/logrotate-3.8.0-noasprintf.patch b/core/logrotate/logrotate-3.8.0-noasprintf.patch
new file mode 100644
index 000000000..b9464e230
--- /dev/null
+++ b/core/logrotate/logrotate-3.8.0-noasprintf.patch
@@ -0,0 +1,55 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/config.c logrotate-3.8.0/config.c
+--- logrotate-3.8.0.orig/config.c 2011-06-21 04:12:02.000000000 -0400
++++ logrotate-3.8.0/config.c 2011-07-12 13:47:36.274319050 -0400
+@@ -41,39 +41,6 @@
+ #endif
+ #endif
+
+-#if !defined(asprintf)
+-#include <stdarg.h>
+-
+-int asprintf(char **string_ptr, const char *format, ...)
+-{
+- va_list arg;
+- char *str;
+- int size;
+- int rv;
+-
+- va_start(arg, format);
+- size = vsnprintf(NULL, 0, format, arg);
+- size++;
+- va_start(arg, format);
+- str = malloc(size);
+- if (str == NULL) {
+- va_end(arg);
+- /*
+- * Strictly speaking, GNU asprintf doesn't do this,
+- * but the caller isn't checking the return value.
+- */
+- fprintf(stderr, "failed to allocate memory\\n");
+- exit(1);
+- }
+- rv = vsnprintf(str, size, format, arg);
+- va_end(arg);
+-
+- *string_ptr = str;
+- return (rv);
+-}
+-
+-#endif
+-
+ enum {
+ STATE_DEFAULT = 2,
+ STATE_SKIP_LINE = 4,
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/logrotate.h logrotate-3.8.0/logrotate.h
+--- logrotate-3.8.0.orig/logrotate.h 2011-06-21 04:12:02.000000000 -0400
++++ logrotate-3.8.0/logrotate.h 2011-07-12 13:47:38.949285608 -0400
+@@ -66,8 +66,5 @@ extern int numLogs;
+ extern int debug;
+
+ int readAllConfigPaths(const char **paths);
+-#if !defined(asprintf)
+-int asprintf(char **string_ptr, const char *format, ...);
+-#endif
+
+ #endif
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 1c1cd9e7e..4e225659c 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 129483 2011-06-28 07:59:13Z ibiru $
+# $Id: PKGBUILD 136355 2011-08-27 09:31:43Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gdk-pixbuf2
-pkgver=2.23.5
+pkgver=2.24.0
pkgrel=1
-pkgdesc="An image loading library for gtk2"
+pkgdesc="An image loading library"
arch=('i686' 'x86_64')
url="http://www.gtk.org/"
license=('GPL2')
@@ -11,8 +11,8 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
makedepends=('gtk-doc' 'gobject-introspection')
options=('!libtool')
install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('7a6c3550426f38f6b0eeeb49295654d9e706ce8f1786a4d0932f9d2c0d0bc500')
+source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz)
+sha256sums=('67c11d3aa40441c1cea42c365bf2d6a9a9dd52fae2d359a707ad5e8abb4d28a7')
build() {
cd "${srcdir}/gdk-pixbuf-${pkgver}"
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index d139715da..ba793daa7 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134393 2011-08-03 15:08:59Z giovanni $
+# $Id: PKGBUILD 136368 2011-08-27 23:37:57Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=mercurial
-pkgver=1.9.1
+pkgver=1.9.2
pkgrel=1
pkgdesc="A scalable distributed SCM tool"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
backup=('etc/mercurial/hgrc')
source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz
mercurial.profile)
-md5sums=('601990cc58af8316af4e1ea63e19d1be'
+md5sums=('0bda8040e2626e70d3d1a0654b0b03f2'
'43e1d36564d4c7fbe9a091d3ea370a44')
package() {
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 893bb15dc..f2bf421bf 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 130774 2011-07-07 23:14:56Z foutrelis $
+# $Id: PKGBUILD 136364 2011-08-27 19:56:26Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgbase=opencv
pkgname=('opencv' 'opencv-docs' 'opencv-samples')
_realname=OpenCV
-pkgver=2.3.0
+pkgver=2.3.1
pkgrel=1
pkgdesc="Open Source Computer Vision Library"
arch=('i686' 'x86_64')
@@ -17,10 +17,8 @@ makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
optdepends=('python2-numpy: Python 2.x interface'
'eigen2')
options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2"
- 'pypkgpath_nondebian.patch')
-md5sums=('dea5e9df241ac37f4439da16559e420d'
- 'eb884bad665047276e80556e44043a43')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2")
+md5sums=('827c9f8aa14384c531c73aa165f9b777')
_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
'-D CMAKE_INSTALL_PREFIX=/usr'
@@ -49,9 +47,6 @@ _cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
build() {
cd "$srcdir/$_realname-$pkgver"
- # fix upstream's assumption of "debian-based"
- patch -Np1 -i "$srcdir/pypkgpath_nondebian.patch"
-
# x64, i.e "Athlon64" and upwards, can use SSE3
[ $CARCH = x86_64 ] && \
_cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
@@ -72,18 +67,24 @@ package_opencv() {
install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ cd "$pkgdir/usr/share"
+
+ # prepare FSH-friendly dirs
+ if [ -d OpenCV ]; then
+ mv opencv/samples OpenCV/
+ rm -r opencv
+ mv OpenCV opencv
+ fi
+
# separate docs package; also be -R friendly
- [ -d "$pkgdir/usr/share/opencv/doc" ] && \
- mv "$pkgdir/usr/share/opencv/doc" "$srcdir/opencv-doc"
+ [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
# separate samples package
- [ -d "$pkgdir/usr/share/opencv/samples" ] && \
- mv "$pkgdir/usr/share/opencv/samples" "$srcdir/opencv-samples"
+ [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
}
package_opencv-docs() {
pkgdesc+=" (documentation)"
- #arch=('any')
depends=()
optdepends=()
options=('docs')
@@ -96,7 +97,6 @@ package_opencv-docs() {
package_opencv-samples() {
pkgdesc+=" (samples)"
- #arch=('any')
depends=()
optdepends=()
options=()
diff --git a/extra/opencv/opencv.install b/extra/opencv/opencv.install
index 7709a9cc3..ae3f50d5c 100644
--- a/extra/opencv/opencv.install
+++ b/extra/opencv/opencv.install
@@ -1,8 +1,7 @@
post_install() {
- echo "==> Documentation and samples are in separate packages:"
- echo
- echo "* opencv-docs"
- echo "* opencv-samples"
+ echo " Documentation and samples are in separate packages:"
+ echo " * opencv-docs"
+ echo " * opencv-samples"
}
post_upgrade() {
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 26af8f5e3..8e51af587 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136328 2011-08-26 12:41:22Z tpowa $
+# $Id: PKGBUILD 136362 2011-08-27 15:46:49Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgbase=samba
@@ -8,7 +8,7 @@ pkgver=3.6.0
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
_realver=3.6.0
-pkgrel=4
+pkgrel=6
arch=(i686 x86_64)
url="http://www.samba.org"
license=('GPL3')
@@ -41,6 +41,7 @@ build() {
--with-piddir=/var/run/samba \
--with-logfilebase=/var/log/samba \
--sysconfdir=/etc \
+ --with-dnsupdate \
--with-pam \
--with-pam_smbpass \
--with-pammodulesdir=/lib/security \
@@ -71,8 +72,8 @@ depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprog
ln -sf /usr/lib/$i.so.0 ${pkgdir}/usr/lib/$i.so
done
mkdir ${pkgdir}/usr/lib/libsmb
- ln -sf /usr/lib/libsmb/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
- ln -sf /usr/lib/libsmb/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb/libsmbclient.so
+ ln -sf /usr/lib/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0
+ ln -sf /usr/lib/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb/libsmbclient.so
for i in libndr-krb5pac libndr-standard libndr; do
install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1
ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0
@@ -104,14 +105,21 @@ backup=(etc/logrotate.d/samba
depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc')
optdepends=('python2: for python bindings')
cd ${srcdir}/samba-${_realver}/source3
- mkdir -p ${pkgdir}/etc/samba/private
- chmod 700 ${pkgdir}/etc/samba/private
../buildtools/bin/waf install --destdir=${pkgdir}
+ # fix permission on include files
chmod 644 ${pkgdir}/usr/include/*.h
+ # remove wrong var directory
rm -rf ${pkgdir}/usr/var
+ # create missing directories
+ mkdir -p ${pkgdir}/etc/samba/private
+ chmod 700 ${pkgdir}/etc/samba/private
+ mkdir -p ${pkgdir}/var/{lib,cache}/samba
+ mkdir -p ${pkgdir}/var/nmbd
+ mkdir -p ${pkgdir}/lib/security
+ mkdir -p ${pkgdir}/etc/samba
+ # install config files
install -D -m755 ${startdir}/samba ${pkgdir}/etc/rc.d/samba
install -D -m644 ${startdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba
- mkdir -p ${pkgdir}/etc/samba
cat ../examples/smb.conf.default | \
sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
install -D -m644 ${startdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba
@@ -122,6 +130,13 @@ optdepends=('python2: for python bindings')
sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
# fix logrotate
sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
+ # run various install scripts
+ script/./installman.sh ${pkgdir}/usr/share/man . C
+ script/./installmo.sh ${pkgdir}/usr/share locale .
+ script/./installdat.sh ${pkgdir}/usr/lib samba .
+ chmod 755 script/./installmsg.sh
+ script/./installmsg.sh ${pkgdir}/usr/lib samba .
+ script/./installswat.sh ${pkgdir}/usr/share/samba swat .
# remove conflict files of smbclient
for man in libsmbclient smbspool \
mount.cifs net cifs.upcall; do
@@ -130,6 +145,11 @@ optdepends=('python2: for python bindings')
for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so libtevent.so.0.9.11 libtevent.so.0 libwinbind-client.so; do
rm -f ${pkgdir}/usr/lib/samba/$i
done
+ # move libs to correct place
+ mv ${pkgdir}/usr/lib/pam*.so ${pkgdir}/lib/security
+ mv ${pkgdir}/usr/lib/libnss* ${pkgdir}/lib/
+ ln -sf /lib/libnss_wins.so.2 ${pkgdir}/lib/libnss_wins.so
+ ln -sf /lib/libnss_winbind.so.2 ${pkgdir}/lib/libnss_winbind.so
mv ${pkgdir}/usr/lib/samba/*.so ${pkgdir}/usr/lib
for i in libndr-krb5pac.* libsmbconf.* libndr-standard.* libndr.* libnetapi.* libwbclient.* libsmbclient.*; do
rm -f ${pkgdir}/usr/lib/$i
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index d8572f361..0f4be9c87 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 135814 2011-08-18 15:04:55Z andyrtr $
+# $Id: PKGBUILD 136353 2011-08-27 08:38:05Z ibiru $
# Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
pkgname=(wireshark-cli wireshark-gtk)
pkgbase=wireshark
pkgver=1.6.1
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('GPL2')
-makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua')
+makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua')
url="http://www.wireshark.org/"
options=(!libtool)
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
@@ -15,7 +15,6 @@ md5sums=('dc1e8c9800b64130674b120a183e2308')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
- export CFLAGS="-fno-unit-at-a-time ${CFLAGS}"
./configure \
--prefix=/usr \
@@ -27,7 +26,7 @@ build() {
package_wireshark-cli() {
pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version"
- depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2' 'lua')
+ depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua')
install=wireshark.install
conflicts=(wireshark)