Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

2 files changed, 24 insertions, 3 deletions

diff --git a/community/nvclock/PKGBUILD b/community/nvclock/PKGBUILD
index d3a09a670..ce2f5bbfc 100644
--- a/community/nvclock/PKGBUILD
+++ b/community/nvclock/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 37680 2011-01-16 14:37:03Z lfleischer $
+# $Id: PKGBUILD 63680 2012-02-05 12:06:13Z ibiru $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Markus Meissner <markus@meissna.de>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=nvclock
 pkgver=0.8b4
-pkgrel=2
+pkgrel=3
 pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linuxhardware.org/nvclock/'
@@ -16,16 +16,19 @@ install='nvclock.install'
 options=('!makeflags')
 source=("http://www.linuxhardware.org/${pkgname}/${pkgname}${pkgver}.tar.gz"
         'nvclock-0.8b4-buildfix.patch'
+        'nvclock-0.8b4-linkfix.patch'
         'nvclock.desktop-use-gksu.patch')
 md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11'
          '1da24b50dd6a8c4704fa550a3e1a8b53'
+         'b812646787ea44e693fd2288612f25ad'
          '98fc1995721d0b0e8ff6d448869eee6d')
 
 build(){
   cd "${srcdir}/${pkgname}${pkgver}"
 
-  # build fix from Fedora
+  # build and link fixes from Fedora
   patch -Np1 -i "${srcdir}/nvclock-0.8b4-buildfix.patch"
+  patch -Np1 -i "${srcdir}/nvclock-0.8b4-linkfix.patch"
 
   # Make ".desktop" file use gksu(1).
   patch -Np0 -i "${srcdir}/nvclock.desktop-use-gksu.patch"
diff --git a/community/nvclock/nvclock-0.8b4-linkfix.patch b/community/nvclock/nvclock-0.8b4-linkfix.patch
new file mode 100644
index 000000000..0029d1c74
--- /dev/null
+++ b/community/nvclock/nvclock-0.8b4-linkfix.patch
@@ -0,0 +1,18 @@
+diff -upNr nvclock0.8b4.orign/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in
+--- nvclock0.8b4.orign/src/gtk/Makefile.in	2008-05-11 12:25:46.000000000 +0200
++++ nvclock0.8b4/src/gtk/Makefile.in	2010-02-13 19:56:24.204078277 +0100
+@@ -20,12 +20,12 @@ endif
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+     INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. -I../..
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
++    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -lX11 -lXext -ldl
+     OBJECTS=banner.o gl.o hw.o main.o settings.o
+ else
+     DEPS=$(libbackend)
+     INCLUDES=-I./backend -I./nvcontrol -I.. -I../..
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend
++    LIBS=@GTK_LIBS@ -L../backend -lbackend -lX11 -lXext -ldl
+     OBJECTS=banner.o hw.o main.o settings.o
+ endif
+