Hello community,
here is the log from the commit of package bigboard for openSUSE:Factory
checked in at Fri Feb 6 21:17:21 CET 2009.
--------
--- GNOME/bigboard/bigboard.changes 2008-09-30 22:46:12.000000000 +0200
+++ bigboard/bigboard.changes 2008-12-29 02:45:43.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Dec 29 12:44:20 EST 2008 - mboman@suse.de
+
+- Update to version 0.6.4:
+ + No NEWS file supplied
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
bigboard-0.6.2.tar.bz2
New:
----
bigboard-0.6.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bigboard.spec ++++++
--- /var/tmp/diff_new_pack.gN9321/_old 2009-02-06 21:16:26.000000000 +0100
+++ /var/tmp/diff_new_pack.gN9321/_new 2009-02-06 21:16:26.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package bigboard (Version 0.6.2)
+# spec file for package bigboard (Version 0.6.4)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -41,7 +41,7 @@
Requires: python-gdata
Requires: python-gnome
Requires: python-hippo-canvas
-Version: 0.6.2
+Version: 0.6.4
Release: 1
Summary: An experimental new sidebar for the Online Desktop
Group: System/GUI/GNOME
@@ -92,6 +92,9 @@
%{_sysconfdir}/gconf/schemas/*.schemas
%changelog
+* Mon Dec 29 2008 mboman@suse.de
+- Update to version 0.6.4:
+ + No NEWS file supplied
* Fri Sep 12 2008 maw@suse.de
- Update to version 0.6.2:
+ Autodetect whether shutdown icon is called gnome-shutdown or
++++++ bigboard-0.6.2.tar.bz2 -> bigboard-0.6.4.tar.bz2 ++++++
++++ 29842 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/google.py new/bigboard-0.6.4/bigboard/google.py
--- old/bigboard-0.6.2/bigboard/google.py 2008-09-02 23:07:28.000000000 +0200
+++ new/bigboard-0.6.4/bigboard/google.py 2008-10-28 15:49:55.000000000 +0100
@@ -578,6 +578,13 @@
except dbus.DBusException, e:
_logger.error("onlineaccounts DBus service not available, can't refresh googles")
return
+
+ try:
+ __onlineaccounts_proxy.EnsureAccountType("google", "Google", "Gmail or Google Apps for Your Domain email", "http://gmail.com")
+ except dbus.DBusException, e:
+ _logger.error(e.message)
+ return
+
gaccount_paths = __onlineaccounts_proxy.GetEnabledAccountsWithTypes(['google'])
new_googles = {}
for g_path in gaccount_paths:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/google_stock.py new/bigboard-0.6.4/bigboard/google_stock.py
--- old/bigboard-0.6.2/bigboard/google_stock.py 2008-09-02 23:07:28.000000000 +0200
+++ new/bigboard-0.6.4/bigboard/google_stock.py 2008-10-28 15:49:55.000000000 +0100
@@ -43,6 +43,12 @@
_logger.error("onlineaccounts DBus service not available, can't get google accounts")
return
+ try:
+ self.__onlineaccounts_proxy.EnsureAccountType("google", "Google", "Gmail or Google Apps for Your Domain email", "http://gmail.com")
+ except dbus.DBusException, e:
+ _logger.error(e.message)
+ return
+
all_google_account_paths = self.__onlineaccounts_proxy.GetEnabledAccountsWithTypes(["google"])
for a_path in all_google_account_paths:
self.__on_account_added(a_path)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/stocks/self/portfoliomanager.py new/bigboard-0.6.4/bigboard/stocks/self/portfoliomanager.py
--- old/bigboard-0.6.2/bigboard/stocks/self/portfoliomanager.py 2008-09-02 23:07:28.000000000 +0200
+++ new/bigboard-0.6.4/bigboard/stocks/self/portfoliomanager.py 2008-10-28 15:49:54.000000000 +0100
@@ -293,9 +293,14 @@
def __on_open_accounts_dialog(self):
try:
onlineaccounts_proxy = dbus.SessionBus().get_object('org.gnome.OnlineAccounts', '/onlineaccounts')
- onlineaccounts_proxy.OpenAccountsDialog(gtk.get_current_event_time())
except dbus.DBusException, e:
_logger.error("onlineaccounts DBus service not available, can't open accounts dialog")
+
+ try:
+ onlineaccounts_proxy.OpenAccountsDialog(gtk.get_current_event_time())
+ except dbus.DBusException, e:
+ _logger.error(e.message)
+
self.__hide_reset()
def __on_google_gadget_add(self, but):
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/stocks/self/SelfStock.py new/bigboard-0.6.4/bigboard/stocks/self/SelfStock.py
--- old/bigboard-0.6.2/bigboard/stocks/self/SelfStock.py 2008-09-03 18:23:03.000000000 +0200
+++ new/bigboard-0.6.4/bigboard/stocks/self/SelfStock.py 2008-10-28 21:39:49.000000000 +0100
@@ -57,6 +57,7 @@
self.connect("activated", lambda s2: self.__launch_browser())
self.set_clickable(True)
self.set_acct(acct)
+ self.set_property("tooltip", self.__acct.link)
def set_acct(self, acct):
if self.__acct:
@@ -399,7 +400,7 @@
def __do_logout(self):
self._panel.action_taken()
- self.__get_session_manager().Logout(0)
+ self.__get_session_manager().Logout(dbus.UInt32(0))
def __do_shutdown(self):
self._panel.action_taken()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/bigboard/stocks/twitter/TwitterStock.py new/bigboard-0.6.4/bigboard/stocks/twitter/TwitterStock.py
--- old/bigboard-0.6.2/bigboard/stocks/twitter/TwitterStock.py 2008-09-02 23:07:28.000000000 +0200
+++ new/bigboard-0.6.4/bigboard/stocks/twitter/TwitterStock.py 2008-10-28 15:49:55.000000000 +0100
@@ -110,6 +110,12 @@
except dbus.DBusException, e:
_logger.error("onlineaccounts DBus service not available, can't get twitter accounts")
return
+
+ try:
+ self.__onlineaccounts_proxy.EnsureAccountType(TYPE_TWITTER, "Twitter", "Twitter username", "http://twitter.com")
+ except dbus.DBusException, e:
+ _logger.error(e.message)
+ return
all_twitter_account_paths = self.__onlineaccounts_proxy.GetEnabledAccountsWithTypes([TYPE_TWITTER])
for a_path in all_twitter_account_paths:
@@ -123,8 +129,7 @@
self.__connections.add(self.__onlineaccounts_proxy, id)
def _on_delisted(self):
- if self.__twitter_account:
- self.__on_account_removed(self.__twitter_account.GetObjectPath())
+ self.__remove_current_account()
self.__connections.disconnect_all()
def get_content(self, size):
@@ -144,8 +149,7 @@
_logger.debug("in __on_account_added for %s %s" % (str(acct), acct.GetUsername()))
- if self.__twitter_account:
- self.__on_account_removed(self.__twitter_account.GetObjectPath())
+ self.__remove_current_account()
self.__twitter_account = acct
self.__twitter_account_changed_signal_match = \
@@ -153,10 +157,9 @@
self.__on_twitter_account_changed()
@log_except(_logger)
- def __on_account_removed(self, acct_path):
- _logger.debug("in __on_account_removed")
- if self.__twitter_account and self.__twitter_account.GetObjectPath() == acct_path:
- _logger.debug("in __on_account_removed for %s", acct_path)
+ def __remove_current_account(self):
+ if self.__twitter_account:
+ _logger.debug("in __remove_current_account for %s", self.__twitter_account.GetObjectPath())
self.__twitter_account_changed_signal_match.remove()
self.__twitter_account_changed_signal_match = None
self.__twitter_account = None
@@ -165,6 +168,18 @@
self.__box.append(self.__login_button)
@log_except(_logger)
+ def __on_account_removed(self, acct_path):
+ _logger.debug("in __on_account_removed")
+ if self.__twitter_account and self.__twitter_account.GetObjectPath() == acct_path:
+ self.__remove_current_account()
+
+ # try getting some other Twitter account in case there is another one out there
+ # that is enabled
+ all_twitter_account_paths = self.__onlineaccounts_proxy.GetEnabledAccountsWithTypes([TYPE_TWITTER])
+ for a_path in all_twitter_account_paths:
+ self.__on_account_added(a_path)
+
+ @log_except(_logger)
def __on_twitter_account_changed(self):
_logger.debug("will change stuff")
username = self.__twitter_account.GetUsername()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/configure.ac new/bigboard-0.6.4/configure.ac
--- old/bigboard-0.6.2/configure.ac 2008-09-09 00:09:53.000000000 +0200
+++ new/bigboard-0.6.4/configure.ac 2008-10-28 23:05:56.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT(bigboard, 0.6.2, feedback@mugshot.org)
+AC_INIT(bigboard, 0.6.4, feedback@mugshot.org)
AC_CONFIG_SRCDIR(main.py)
AC_CONFIG_MACRO_DIR([m4])
@@ -165,7 +165,7 @@
AC_SUBST(BIGBOARD_APPLET_LIBS)
AC_SUBST(BIGBOARD_APPLET_CFLAGS)
-PKG_CHECK_MODULES(EMPATHY, libmissioncontrol libempathy libempathy-gtk pygobject-2.0)
+PKG_CHECK_MODULES(EMPATHY, libmissioncontrol libempathy libempathy-gtk pygobject-2.0 gtk+-2.0 libxml-2.0)
AC_PATH_PROG(GCONFTOOL, gconftool-2)
AM_GCONF_SOURCE_2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/m4/intltool.m4 new/bigboard-0.6.4/m4/intltool.m4
--- old/bigboard-0.6.2/m4/intltool.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/bigboard-0.6.4/m4/intltool.m4 2008-10-28 16:24:22.000000000 +0100
@@ -0,0 +1,200 @@
+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
+## Copyright (C) 2001 Eazel, Inc.
+## Author: Maciej Stachowiak
+## Kenneth Christiansen
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+##
+## As a special exception to the GNU General Public License, if you
+## distribute this file as part of a program that contains a
+## configuration script generated by Autoconf, you may include it under
+## the same distribution terms that you use for the rest of that program.
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 40 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+ 1.[01234])
+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+ ;;
+ *)
+ ;;
+esac
+
+if test -n "$1"; then
+ AC_MSG_CHECKING([for intltool >= $1])
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ ]
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+AC_SUBST(INTLTOOL_DESKTOP_RULE)
+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+AC_SUBST(INTLTOOL_KEYS_RULE)
+AC_SUBST(INTLTOOL_PROP_RULE)
+AC_SUBST(INTLTOOL_OAF_RULE)
+AC_SUBST(INTLTOOL_PONG_RULE)
+AC_SUBST(INTLTOOL_SERVER_RULE)
+AC_SUBST(INTLTOOL_SHEET_RULE)
+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+AC_SUBST(INTLTOOL_UI_RULE)
+AC_SUBST(INTLTOOL_XAM_RULE)
+AC_SUBST(INTLTOOL_KBD_RULE)
+AC_SUBST(INTLTOOL_XML_RULE)
+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+AC_SUBST(INTLTOOL_CAVES_RULE)
+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+AC_SUBST(INTLTOOL_THEME_RULE)
+AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, [perl])
+if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found; required for intltool])
+fi
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+ AC_MSG_ERROR([perl 5.x required for intltool])
+fi
+if test "x$2" != "xno-xml"; then
+ AC_MSG_CHECKING([for XML::Parser])
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+ AC_MSG_RESULT([ok])
+ else
+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+ fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
+ [DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
+ dnl GNU format message catalog is always supported,
+ dnl since both are added to the libc all together.
+ dnl Hence, we'd like to go with DATADIRNAME=share
+ dnl in this case.
+ AC_CHECK_FUNC(bind_textdomain_codeset,
+ [DATADIRNAME=share], [DATADIRNAME=lib])
+ ;;
+ *)
+ [DATADIRNAME=lib]
+ ;;
+ esac])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+ fi
+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+ >"$1/stamp-it.tmp"
+ [sed '/^#/d
+ s/^[[].*] *//
+ /^[ ]*$/d
+ '"s|^| $ac_top_srcdir/|" \
+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+ ]
+ [sed '/^POTFILES =/,/[^\\]$/ {
+ /^POTFILES =/!d
+ r $1/POTFILES
+ }
+ ' "$1/Makefile.in" >"$1/Makefile"]
+ rm -f "$1/Makefile.tmp"
+ mv "$1/stamp-it.tmp" "$1/stamp-it"
+ ])
+])dnl
+])
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/main.py new/bigboard-0.6.4/main.py
--- old/bigboard-0.6.2/main.py 2008-06-28 01:59:19.000000000 +0200
+++ new/bigboard-0.6.4/main.py 2008-10-28 16:07:17.000000000 +0100
@@ -37,6 +37,7 @@
# TODO: figure out an algorithm for removing pixbufs from the cache
_surfacecache = {}
+_emptysurface = None
_mtimecache = {}
def _get_mtime(filename):
try:
@@ -62,19 +63,33 @@
try:
if img_name.find(os.sep) >= 0:
pixbuf = gtk.gdk.pixbuf_new_from_file(img_name)
- _logger.debug("loaded from file '%s': %s" % (img_name,pixbuf))
+ _logger.debug("loaded from file '%s': %s", img_name, pixbuf)
if pixbuf:
_mtimecache[img_name] = _get_mtime(img_name)
else:
theme = gtk.icon_theme_get_default()
pixbuf = theme.load_icon(img_name, 60, gtk.ICON_LOOKUP_USE_BUILTIN)
- _logger.debug("loaded from icon theme '%s': %s" % (img_name,pixbuf))
- except gobject.GError:
- return None
-
- surface = hippo.cairo_surface_from_gdk_pixbuf(pixbuf)
+ _logger.debug("loaded from icon theme '%s': %s", img_name,pixbuf)
+ except gobject.GError, e:
+ _logger.error("Failed to load icon: '%s'", e.message)
+ pixbuf = None
+
+ if pixbuf:
+ surface = hippo.cairo_surface_from_gdk_pixbuf(pixbuf)
+ _surfacecache[img_name] = surface
+
+ if not surface:
+ # Returning None will cause a crash, return a 1x1 transparent pixmap
+ global _emptysurface
+ if not _emptysurface:
+ _emptysurface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 1, 1)
+ cr = cairo.Context(_emptysurface)
+ cr.set_operator(cairo.OPERATOR_CLEAR)
+ cr.paint()
+ surface = _emptysurface
+ # Cache negative result
_surfacecache[img_name] = surface
-
+
return surface
def on_name_lost(*args):
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bigboard-0.6.2/po/Makefile.in.in new/bigboard-0.6.4/po/Makefile.in.in
--- old/bigboard-0.6.2/po/Makefile.in.in 2008-06-21 20:04:54.000000000 +0200
+++ new/bigboard-0.6.4/po/Makefile.in.in 2008-10-28 16:24:22.000000000 +0100
@@ -54,16 +54,16 @@
ALL_LINGUAS = @ALL_LINGUAS@
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
POTFILES = \
# This comment gets stripped out
@@ -101,7 +101,6 @@
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
- $(mkdir_p) $(DESTDIR)$(itlocaledir)
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org