Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/comix/PKGBUILD
	community/geany/PKGBUILD
	community/gnome-do-docklets/PKGBUILD
	community/gnome-do-plugins/PKGBUILD
	community/gnome-system-tools/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gtweakui/PKGBUILD
	community/hwinfo/PKGBUILD
	community/kungfu/PKGBUILD
	community/liboauth/PKGBUILD
	community/liboobs/PKGBUILD
	community/lua-lzlib/PKGBUILD
	community/mcdp/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-runtime/PKGBUILD
	community/mplayer2/PKGBUILD
	community/pdf2svg/PKGBUILD
	community/perl-data-dumper/PKGBUILD
	community/perl-digest-md5/PKGBUILD
	community/perl-perlio-eol/PKGBUILD
	community/perl-xml-libxslt/PKGBUILD
	community/python-cherrypy/PKGBUILD
	community/python-pexpect/PKGBUILD
	community/python-pyro/PKGBUILD
	community/python2-cherrypy/PKGBUILD
	community/rexima/PKGBUILD
	community/shp2svg/PKGBUILD
	community/system-tools-backends/PKGBUILD
	community/tracker/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bridge-utils/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/beagle/PKGBUILD
	extra/bug-buddy/PKGBUILD
	extra/dssi/PKGBUILD
	extra/evolution-sharp/PKGBUILD
	extra/evolution-webcal/PKGBUILD
	extra/feh/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gnome-mag/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gok/PKGBUILD
	extra/gpsd/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/keytouch-editor/PKGBUILD
	extra/keytouch/PKGBUILD
	extra/koffice/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libbeagle/PKGBUILD
	extra/libffi/PKGBUILD
	extra/libgnomeuimm/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/m17n-lib/PKGBUILD
	extra/mtr/PKGBUILD
	extra/openbabel/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xf86-input-synaptics/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-xinit/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	libre/icecat/PKGBUILD
	libre/linux-libre/PKGBUILD
	multilib/lib32-ncurses/PKGBUILD
	multilib/lib32-openssl/PKGBUILD
	multilib/lib32-talloc/PKGBUILD
	multilib/wine/PKGBUILD

3 files changed, 8 insertions, 35 deletions

diff --git a/community/ogmrip/PKGBUILD b/community/ogmrip/PKGBUILD
index 2f523f47e..59464ecff 100644
--- a/community/ogmrip/PKGBUILD
+++ b/community/ogmrip/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 54604 2011-08-21 13:02:10Z jelle $
+# $Id: PKGBUILD 56646 2011-10-09 12:12:21Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Daenyth
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
 
 pkgname=ogmrip
-pkgver=0.13.6
-pkgrel=3
+pkgver=0.13.7
+pkgrel=2
 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ogmrip.sourceforge.net/"
@@ -25,16 +25,12 @@ optdepends=('faac: support for the AAC audio codec'
             'tesseract: support for the SRT subtitle format')
 options=('!libtool' '!makeflags')
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        ogmrip-0.13.6-libnotify-0.7.patch)
-md5sums=('e094c49cdf758883293dd44513fb37e8'
-         'a7f2c64c9f1d96664d29200e461bb36e')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('362060e4c1944f020f9a491d9a8af53cd3bf4f94d4f5beb8d3d855ebf17d9c2a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  patch -Np0 -i "$srcdir/ogmrip-0.13.6-libnotify-0.7.patch"
-
   ./configure --prefix=/usr --sysconfdir=/usr/share
   make
 }
diff --git a/community/ogmrip/ogmrip-0.13.6-libnotify-0.7.patch b/community/ogmrip/ogmrip-0.13.6-libnotify-0.7.patch
deleted file mode 100644
index 64cfbf0ff..000000000
--- a/community/ogmrip/ogmrip-0.13.6-libnotify-0.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/ogmrip-progress-dialog.c
-+++ src/ogmrip-progress-dialog.c
-@@ -32,6 +32,9 @@
- 
- #ifdef HAVE_LIBNOTIFY_SUPPORT
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif /* HAVE_LIBNOTIFY_SUPPORT */
- 
- #define OGMRIP_PROGRESS_DIALOG_GET_PRIVATE(o) \
-@@ -418,8 +421,12 @@
-   g_signal_connect_swapped (dialog->priv->status_icon, "popup_menu",
-       G_CALLBACK (ogmrip_progress_dialog_status_icon_popup_menu), dialog);
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+  /* notify_notification_new_with_status_icon was removed */
-+#else
-   dialog->priv->notification = notify_notification_new_with_status_icon ("Dummy", "Dummy",
-       OGMRIP_DATA_DIR G_DIR_SEPARATOR_S OGMRIP_ICON_FILE, dialog->priv->status_icon);
-+#endif
-   g_signal_connect (dialog, "window-state-event",
-       G_CALLBACK (ogmrip_progress_dialog_state_changed), NULL);
- 
diff --git a/community/ogmrip/ogmrip.changelog b/community/ogmrip/ogmrip.changelog
index 79aca2bba..922355602 100644
--- a/community/ogmrip/ogmrip.changelog
+++ b/community/ogmrip/ogmrip.changelog
@@ -1,6 +1,8 @@
+2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* ogmrip O.13.7-1
+
 2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* ogmrip O.13.6-1
-	* new upstream release
 
 2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* Update to major release O.13.5