[arch-commits] Commit in gnome-applets/trunk (4 files)

Tue Apr 9 09:52:22 UTC 2013

Date: Tuesday, April 9, 2013 @ 11:52:22
  Author: bgyorgy
Revision: 87952

upgpkg: gnome-applets 3.5.92-2

Rebuild for GNOME 3.8
- disable gweather applet
- enable mixer applet
- enable cpupower integration

Added:
  gnome-applets/trunk/disable-gweather-applet.patch
  gnome-applets/trunk/fix-autoconf.patch
  gnome-applets/trunk/gnome-applets-cpupower.patch
Modified:
  gnome-applets/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   59 +++++++++++++++++++++++++++-------------
 disable-gweather-applet.patch |   12 ++++++++
 fix-autoconf.patch            |   12 ++++++++
 gnome-applets-cpupower.patch  |   12 ++++++++
 4 files changed, 76 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2013-04-09 07:27:57 UTC (rev 87951)
+++ PKGBUILD	2013-04-09 09:52:22 UTC (rev 87952)
@@ -1,35 +1,56 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-applets
 pkgver=3.5.92
-pkgrel=1
-pkgdesc="GNOME Applets"
-arch=(i686 x86_64)
+pkgrel=2
+pkgdesc="Small applications for the GNOME panel"
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager')
-options=(!emptydirs)
+depends=('cpupower' 'gucharmap' 'gstreamer0.10-base' 'gnome-panel' 'libgtop')
+makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'networkmanager' 'rarian')
 url="http://www.gnome.org"
-install=gnome-applets.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83')
+install=$pkgname.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        gnome-applets-cpupower.patch
+        disable-gweather-applet.patch
+        fix-autoconf.patch)
+sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83'
+            '942276d7cc18224d9f5b1b57314746ad4d713ee0dcf4aedb25fa72e92db75e65'
+            '47f6b477c0f76ebb1e8ffc6fe9bd2fac9ac7f511f059cf4bb2687f8425bfb4a8'
+            '0acd58aee458345e378d5f77256e04b13e3a4c06b166aac390a92309b864e8a4')
 
 build() {
   cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --disable-schemas-install \
-      --without-hal
+
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' invest-applet/invest/*
+
+  # Use cpupower instead of cpufreq
+  patch -Np1 -i "$srcdir/gnome-applets-cpupower.patch"
+
+  # Disable gweather applet, because it's not compatible with libgweather 3.8
+  patch -Np1 -i "$srcdir/disable-gweather-applet.patch"
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-autoconf.patch"
+
+  # Turn off some unneeded warnings
+  CFLAGS="$CFLAGS -Wno-missing-prototypes"
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+              --disable-static --disable-schemas-install --disable-scrollkeeper \
+              --enable-mixer-applet \
+              PYTHON=/usr/bin/python2
   make
 }
 
 package() {
   cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-applets-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+  mkdir -m755 -p "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -r "$pkgdir"/etc/gconf
 }

Added: disable-gweather-applet.patch
===================================================================
--- disable-gweather-applet.patch	                        (rev 0)
+++ disable-gweather-applet.patch	2013-04-09 09:52:22 UTC (rev 87952)
@@ -0,0 +1,12 @@
+diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
+--- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
++++ gnome-applets-3.5.92/configure.in	2013-04-09 10:39:54.214243015 +0200
+@@ -251,7 +251,7 @@
+ 
+  dnl -- check for libgweather (required for gweather applet) ------------------
+ build_libgweather_applets=false
+-PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED,
++PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED gweather-3.0 <= 3.7,
+ 	          build_libgweather_applets=true,
+ 		  AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
+ AC_SUBST(LIBGWEATHER_CFLAGS)

Added: fix-autoconf.patch
===================================================================
--- fix-autoconf.patch	                        (rev 0)
+++ fix-autoconf.patch	2013-04-09 09:52:22 UTC (rev 87952)
@@ -0,0 +1,12 @@
+diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in
+--- gnome-applets-3.5.92.orig/configure.in	2012-09-20 03:07:34.000000000 +0200
++++ gnome-applets-3.5.92/configure.in	2013-04-09 09:48:48.427334056 +0200
+@@ -4,7 +4,7 @@
+ AC_INIT(gnome-applets, 3.5.92)
+ AC_PREREQ(2.59)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
+ AC_CONFIG_MACRO_DIR(m4)
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

Added: gnome-applets-cpupower.patch
===================================================================
--- gnome-applets-cpupower.patch	                        (rev 0)
+++ gnome-applets-cpupower.patch	2013-04-09 09:52:22 UTC (rev 87952)
@@ -0,0 +1,12 @@
+diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in
+--- gnome-applets-3.1.90/configure.in.cpupower	2011-08-31 18:49:00.628945807 -0400
++++ gnome-applets-3.1.90/configure.in	2011-08-31 18:49:17.397946966 -0400
+@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr
+ LIBCPUFREQ_LIBS=
+ if test "x$have_libcpufreq" = "xyes"; then
+    AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
+-   LIBCPUFREQ_LIBS=-lcpufreq
++   LIBCPUFREQ_LIBS=-lcpupower
+ fi
+ AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+ AC_SUBST(LIBCPUFREQ_LIBS)


