[weasel-commit] Source: libwnck=2.26.2-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Thu, 28 Jan 2010 09:09:03 -0500
================================
libwnck:source=2.26.2-2 (previous: 2.26.2-1)
cvc rdiff libwnck -1 /weasel.rpath.org@wgl:3-devel/2.26.2-2
================================
2.26.2-2 Filip Brcic (brcha@xxxxxxx) Thu Jan 28 09:08:50 2010
fixed recipe and metadata
libwnck-2.26.2-automagic.patch: new
--- /dev/null
+++ libwnck-2.26.2-automagic.patch
@@ -0,0 +59 @@
+From e02c2e1e79a3687865266bdbd28318b263f9b381 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@xxxxxxxxxx>
+Date: Sat, 8 Aug 2009 23:34:01 +0200
+Subject: [PATCH] Make startup-notification non-automagic
+
+See description at http://www.gentoo.org/proj/en/qa/automagic.xml
+
+This patch makes startup-notification properly switchable at configure
+time while retaining auto-detection capability.
+
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=278464
+---
+ configure.in | 30 +++++++++++++++++++++---------
+ 1 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 731ac3f..75fad2d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -82,15 +82,27 @@ AC_SUBST(wncklocaledir)
+
+ AC_PATH_PROG(PKG_CONFIG, pkg-config)
+
+-AC_MSG_CHECKING([if building with libstartup-notification])
+-STARTUP_NOTIFICATION_REQUIRED=0.4
+-if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED
libstartup-notification-1.0; then
+- AC_MSG_RESULT([yes])
+- AC_DEFINE_UNQUOTED(HAVE_STARTUP_NOTIFICATION, 1, [Define if you have
libstartup-notification])
+- STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
+-else
+- AC_MSG_RESULT([no])
+- STARTUP_NOTIFICATION_PACKAGE=
++AC_ARG_ENABLE(startup-notification,
++ [AC_HELP_STRING([--enable-startup-notification],
++ [startup notification library
@<:@default=auto@:>@])],,
++ [enable_startup_notification=auto])
++
++STARTUP_NOTIFICATION_PACKAGE=
++if test "$enable_startup_notification" != "no"; then
++ STARTUP_NOTIFICATION_REQUIRED=0.4
++ PKG_CHECK_MODULES(STARTUP_NOTIFICATION,
++ [libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_REQUIRED],
++ [have_sn=yes]
++ [have_sn=no])
++
++ if test "$have_sn" = "no" -a "$enable_start_notification" = "yes"; then
++ AC_MSG_ERROR([startup-notification support required but not found])
++ fi
++
++ if test "$have_sn" = "yes"; then
++ AC_DEFINE_UNQUOTED(HAVE_STARTUP_NOTIFICATION, 1, [Define if you have
libstartup-notification])
++ STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
++ fi
+ fi
+ AC_SUBST(STARTUP_NOTIFICATION_PACKAGE)
+
+--
+1.6.3.3
+
libwnck-2.26.2-fix-glib-mkenums.diff: new
--- /dev/null
+++ libwnck-2.26.2-fix-glib-mkenums.diff
@@ -0,0 +20 @@
+diff --git a/libwnck/Makefile.am b/libwnck/Makefile.am
+index 9b6e8a8..1d3c0d8 100644
+--- a/libwnck/Makefile.am
++++ b/libwnck/Makefile.am
+@@ -129,13 +129,13 @@ wnck-enum-types.c: $(wnck_headers) wnck-enum-types.h
+ $(AM_V_GEN)glib-mkenums \
+ --fhead "#include <libwnck/libwnck.h>\n" \
+ --fprod "\n/* enumerations from \"@filename@\" */" \
+- --vhead "static const GEnumValue _@enum_name@_values[] = {" \
++ --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
+ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+ --vtail " { 0, NULL, NULL }\n};\n\n" \
+ --vtail "GType\n@enum_name@_get_type (void)\n{\n" \
+ --vtail " static GType type = 0;\n\n" \
+ --vtail " if (!type)\n" \
+- --vtail " type = g_enum_register_static (\"@EnumName@\",
_@enum_name@_values);\n\n" \
++ --vtail " type = g_@type@_register_static (\"@EnumName@\",
_@enum_name@_values);\n\n" \
+ --vtail " return type;\n}\n\n" \
+ $(wnck_headers) > $@
+
libwnck.recipe: changed
Index: libwnck.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- libwnck.recipe /weasel.rpath.org@wgl:3-devel/2.26.2-1
+++ libwnck.recipe /weasel.rpath.org@wgl:3-devel/2.26.2-2
@@ -1,7 +1,6 @@
#
-# Copyright (c) 2004-2007 rPath, Inc.
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
#
loadSuperClass('gnomepackage')
@@ -9,10 +8,32 @@
name = 'libwnck'
version = '2.26.2'
- buildRequires = [ 'startup-notification:devel', 'atk:devel', 'glib:devel',
- 'pango:devel', 'cairo:devel', 'fontconfig:devel',
- 'freetype:devel', 'libpng:devel', 'intltool:runtime',
- 'gettext:runtime', 'perl:runtime',
- 'libXres:devel', ]
+ buildRequires = [
+ 'libXres:devel', 'intltool:runtime', 'startup-notification:devel',
+ ]
- buildMultiarch = True
+ shortDesc = 'A window navigation construction kit'
+ url = 'http://www.gnome.org/'
+ licenses = [ 'LGPL-2' ]
+ categories = [ 'Gnome' ]
+
+ extraConfig = (
+ ' --disable-static'
+ ' --enable-startup-notification'
+ )
+
+ patches = [
+ 'libwnck-2.26.2-automagic.patch',
+ 'libwnck-2.26.2-fix-glib-mkenums.diff',
+ ]
+
+ def unpack(r):
+ GnomePackageRecipe.unpack(r)
+
+ r.Remove('libwnck/wnck-enum-types.h')
+
+ r.addAction('intltoolize --force --copy --automake')
+
+ r.Remove('m4/lt*', 'm4/libtool.m4')
+
+ r.Autoreconf(m4Dir='m4')
Committed by: brcha
Other related posts:
