From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MZtzv-0004LB-Qf for garchives@archives.gentoo.org; Sat, 08 Aug 2009 22:02:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6058CE05AD; Sat, 8 Aug 2009 22:02:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 205D1E05AD for ; Sat, 8 Aug 2009 22:02:43 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id CB2E56651B for ; Sat, 8 Aug 2009 22:02:42 +0000 (UTC) Received: from eva by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MZtzu-0001mI-C7 for gentoo-commits@lists.gentoo.org; Sat, 08 Aug 2009 22:02:42 +0000 From: "Gilles Dartiguelongue (eva)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, eva@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libwnck/files: libwnck-2.26.2-automagic.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: libwnck-2.26.2-automagic.patch X-VCS-Directories: x11-libs/libwnck/files X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue Content-Type: text/plain; charset=utf8 Message-Id: Sender: Gilles Dartiguelongue Date: Sat, 08 Aug 2009 22:02:42 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f07a2ae9-5dc4-433c-bf13-7dd886da47bd X-Archives-Hash: 6d003515a8ba58b8cbf3760444ef86bf eva 09/08/08 22:02:42 Added: libwnck-2.26.2-automagic.patch Log: Version bump. Make startup-notification non-automagic, bug #278464. Cle= an up old revisions. (Portage version: 2.2_rc33/cvs/Linux x86_64) Revision Changes Path 1.1 x11-libs/libwnck/files/libwnck-2.26.2-automagic.patc= h file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libwnck/f= iles/libwnck-2.26.2-automagic.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/libwnck/f= iles/libwnck-2.26.2-automagic.patch?rev=3D1.1&content-type=3Dtext/plain Index: libwnck-2.26.2-automagic.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >From e02c2e1e79a3687865266bdbd28318b263f9b381 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue 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=3D278464 --- 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) =20 AC_PATH_PROG(PKG_CONFIG, pkg-config) =20 -AC_MSG_CHECKING([if building with libstartup-notification]) -STARTUP_NOTIFICATION_REQUIRED=3D0.4 -if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstart= up-notification-1.0; then - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED(HAVE_STARTUP_NOTIFICATION, 1, [Define if you have l= ibstartup-notification]) - STARTUP_NOTIFICATION_PACKAGE=3Dlibstartup-notification-1.0 -else - AC_MSG_RESULT([no]) - STARTUP_NOTIFICATION_PACKAGE=3D +AC_ARG_ENABLE(startup-notification, + [AC_HELP_STRING([--enable-startup-notification], + [startup notification library @<:@default=3D= auto@:>@])],, + [enable_startup_notification=3Dauto]) + +STARTUP_NOTIFICATION_PACKAGE=3D +if test "$enable_startup_notification" !=3D "no"; then + STARTUP_NOTIFICATION_REQUIRED=3D0.4 + PKG_CHECK_MODULES(STARTUP_NOTIFICATION, + [libstartup-notification-1.0 >=3D $STARTUP_NOTIFICATION_REQUIRED], + [have_sn=3Dyes] + [have_sn=3Dno]) + + if test "$have_sn" =3D "no" -a "$enable_start_notification" =3D "yes"= ; then + AC_MSG_ERROR([startup-notification support required but not found]= ) + fi + + if test "$have_sn" =3D "yes"; then + AC_DEFINE_UNQUOTED(HAVE_STARTUP_NOTIFICATION, 1, [Define if you ha= ve libstartup-notification]) + STARTUP_NOTIFICATION_PACKAGE=3Dlibstartup-notification-1.0 + fi fi AC_SUBST(STARTUP_NOTIFICATION_PACKAGE) =20 --=20 1.6.3.3