[arch-commits] Commit in cheese/trunk (3 files)

[Ionut Biru]

    Date: Thursday, March 10, 2011 @ 07:13:45
  Author: ibiru
Revision: 113646

upgpkg: cheese 2.91.91-1
update to 2.91.91

Added:
  cheese/trunk/wrong_requirements.patch
Modified:
  cheese/trunk/PKGBUILD
  cheese/trunk/cheese.install

--------------------------+
 PKGBUILD                 |   22 +++++++++++++---------
 cheese.install           |   12 +++++-------
 wrong_requirements.patch |   29 +++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-10 11:53:39 UTC (rev 113645)
+++ PKGBUILD	2011-03-10 12:13:45 UTC (rev 113646)
@@ -2,29 +2,33 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=cheese
-pkgver=2.32.0
+pkgver=2.91.91
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gnome-desktop>=2.32.0' 'gstreamer0.10-base-plugins>=0.10.30' 'gstreamer0.10-good-plugins>=0.10.24' 'librsvg>=2.32.0' 'gnome-icon-theme>=2.31.0' 'libcanberra>=0.25')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool')
+depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'clutter-gst' 'clutter-gtk' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme')
+makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'gtk-doc' 'gnome-common')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8debc47113d9889247f411d256a8eca0d8da49e5ab5909c200923945b8d5e087')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2
+        wrong_requirements.patch)
+sha256sums=('8f34469cb9cd09d9edb163a0f014c8ed9764645698e3c07f75534c20bc7c70df'
+            '58ecf6764585619d9708bf4bd3cb47f3a1caab3fbd7437905aba0407ac65b877')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/wrong_requirements.patch"
+  gnome-autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib \
       --disable-scrollkeeper --disable-static
   make
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
 
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain cheese ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

Modified: cheese.install
===================================================================
--- cheese.install	2011-03-10 11:53:39 UTC (rev 113645)
+++ cheese.install	2011-03-10 12:13:45 UTC (rev 113646)
@@ -1,22 +1,20 @@
 pkgname=cheese
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  glib-compile-schemas usr/share/glib-2.0/schemas
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+   if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
+       usr/sbin/gconfpkg --uninstall gedit
+   fi
 }
 
 post_upgrade() {
   post_install $1
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install $1
 }

Added: wrong_requirements.patch
===================================================================
--- wrong_requirements.patch	                        (rev 0)
+++ wrong_requirements.patch	2011-03-10 12:13:45 UTC (rev 113646)
@@ -0,0 +1,29 @@
+diff -Nur cheese-2.91.91.old//configure.ac cheese-2.91.91/configure.ac
+--- cheese-2.91.91.old//configure.ac	2011-03-09 14:11:23.000000000 -0800
++++ cheese-2.91.91/configure.ac	2011-03-10 03:58:36.946700755 -0800
+@@ -81,18 +81,18 @@
+ #*******************************************************************************
+ 
+ 
+-GLIB_REQUIRED=2.29.0
+-GOBJECT_REQUIRED=2.29.0
+-GIO_REQUIRED=2.29.0
++GLIB_REQUIRED=2.28.0
++GOBJECT_REQUIRED=2.28.0
++GIO_REQUIRED=2.28.0
+ GTK_REQUIRED=2.99.4
+ GDK_REQUIRED=2.99.4
+ LIBGNOMEDESKTOP_REQUIRED=2.91.6
+-GSTREAMER_REQUIRED=0.10.32.1
++GSTREAMER_REQUIRED=0.10.32
+ CAIRO_REQUIRED=1.10.0
+-PANGOCAIRO_REQUIRED=1.29.0
+-LIBRSVG_REQUIRED=2.33.0
++PANGOCAIRO_REQUIRED=1.28.0
++LIBRSVG_REQUIRED=2.32.0
+ CLUTTER_REQUIRED=1.6.1
+-CLUTTERGTK_REQUIRED=0.91.9
++CLUTTERGTK_REQUIRED=0.91.8
+ CLUTTERGST_REQUIRED=1.0.0
+ GEE_REQUIRED=0.6.0
+ LIBCANBERRA_REQUIRED=0.26