April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit scim-pinyin for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package scim-pinyin for openSUSE:Factory checked in at Wed Apr 21 01:58:56 CEST 2010. -------- --- scim-pinyin/scim-pinyin.changes 2010-02-23 13:08:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/scim-pinyin/scim-pinyin.changes 2010-04-20 12:45:59.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 20 12:45:35 CEST 2010 - tiwai(a)suse.de + +- disabled build with skim for openSUSE-11.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-pinyin.spec ++++++ --- /var/tmp/diff_new_pack.U9x5Gi/_old 2010-04-21 01:58:51.000000000 +0200 +++ /var/tmp/diff_new_pack.U9x5Gi/_new 2010-04-21 01:58:51.000000000 +0200 @@ -17,11 +17,19 @@ # norootforbuild +%if %suse_version > 1120 +%bcond_with skim +%else +%bcond_without skim +%endif Name: scim-pinyin -BuildRequires: gtk2-devel kdelibs3-devel scim-devel skim +BuildRequires: gcc-c++ gtk2-devel scim-devel +%if %{with skim} +BuildRequires: kdelibs3-devel skim +%endif Version: 0.5.91.20060705 -Release: 266 +Release: 267 License: GPLv2+ Group: System/I18n/Chinese AutoReqProv: on @@ -45,6 +53,8 @@ Intelligent Pinyin input module for Smart Chinese/Common Input Method platform +%if %{with skim} + %package -n scim-pinyin-skim License: GPLv2+ Summary: skim setup module for scim-pinyin @@ -54,6 +64,7 @@ %description -n scim-pinyin-skim skim setup module for scim-pinyin +%endif %prep %define scim_binary_version 1.4.0 @@ -77,18 +88,24 @@ --with-gconf-schema-file-dir=/etc/opt/gnome/gconf/schemas \ --enable-debug make +%if %{with skim} make -C skim +%endif %install export QTDIR=/usr/lib/qt3 export KDEDIR=/opt/kde3 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=${RPM_BUILD_ROOT} install +%if %{with skim} make -C skim DESTDIR=${RPM_BUILD_ROOT} install +%endif unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/%{scim_binary_version}/*/*.la %find_lang scim-pinyin +%if %{with skim} %find_lang skim-scim-pinyin +%endif %clean # %post @@ -111,6 +128,8 @@ %dir %{_datadir}/scim/icons/ %{_datadir}/scim/icons/smart-pinyin.png +%if %{with skim} + %files -n scim-pinyin-skim -f skim-scim-pinyin.lang %defattr(-, root, root) %dir /opt/kde3/share/apps/skim/ @@ -118,5 +137,6 @@ /opt/kde3/share/config.kcfg/* /opt/kde3/share/services/* /opt/kde3/%{_lib}/kde3/* +%endif %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scim-qtimm for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package scim-qtimm for openSUSE:Factory checked in at Wed Apr 21 01:58:42 CEST 2010. -------- --- scim-qtimm/scim-qtimm.changes 2010-02-01 13:30:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/scim-qtimm/scim-qtimm.changes 2010-04-20 14:16:09.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 20 14:15:54 CEST 2010 - tiwai(a)suse.de + +- disable skim (and kde3) for openSUSE-11.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-qtimm.spec ++++++ --- /var/tmp/diff_new_pack.xIfTKj/_old 2010-04-21 01:58:36.000000000 +0200 +++ /var/tmp/diff_new_pack.xIfTKj/_new 2010-04-21 01:58:36.000000000 +0200 @@ -17,9 +17,17 @@ # norootforbuild +%if %suse_version > 1120 +%bcond_with skim +%else +%bcond_without skim +%endif Name: scim-qtimm -BuildRequires: kdelibs3-devel scim-devel skim +BuildRequires: gcc-c++ qt3-devel scim-devel +%if %{with skim} +BuildRequires: kdelibs3-devel skim +%endif License: GPLv2+ Group: System/I18n/Chinese AutoReqProv: on @@ -31,7 +39,7 @@ Supplements: packageand(scim:qt3) Summary: Qt input module plugin for SCIM Version: 0.9.4 -Release: 273 +Release: 274 Url: http://www.scim-im.org/ # CVS repository: # cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim login @@ -60,6 +68,7 @@ %patch4 -p1 %patch5 -p1 chmod -R u+w . +%if %{with skim} rm -f config.cache rm -f configure . /etc/opt/kde3/common_options @@ -68,25 +77,43 @@ %else update_admin --no-unsermake %endif +%endif # hack to build with older distros %if %suse_version < 1100 sed -i -e'/supplements/d' $RPM_SOURCE_DIR/baselibs.conf %endif %build +%if %{with skim} . /etc/opt/kde3/common_options +%endif export QTDIR=/usr/lib/qt3 export KDEDIR=/opt/kde3 +%if %{with skim} ./configure $configkde \ %ifarch x86_64 ppc64 s309x --enable-libsuffix=64 \ %endif --enable-tests \ --enable-scim-debug +%else +%configure \ +%ifarch x86_64 ppc64 s309x + --enable-libsuffix=64 \ +%endif + --enable-tests \ + --enable-scim-debug \ + --disable-skim-support +%endif make %install +export QTDIR=/usr/lib/qt3 +%if %{with skim} . /etc/opt/kde3/common_options +%else +export INSTALL_TARGET=install +%endif export QTDIR=/usr/lib/qt3 make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET mkdir -p $RPM_BUILD_ROOT/%{_bindir} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scim-tables for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package scim-tables for openSUSE:Factory checked in at Wed Apr 21 01:58:39 CEST 2010. -------- --- scim-tables/scim-tables.changes 2008-09-19 19:24:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/scim-tables/scim-tables.changes 2010-04-20 12:57:30.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 20 12:54:20 CEST 2010 - tiwai(a)suse.de + +- disable build of skim for openSUSE-11.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-tables.spec ++++++ --- /var/tmp/diff_new_pack.lCtPXm/_old 2010-04-21 01:58:25.000000000 +0200 +++ /var/tmp/diff_new_pack.lCtPXm/_new 2010-04-21 01:58:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-tables (Version 0.5.8) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -17,12 +17,20 @@ # norootforbuild +%if %suse_version > 1120 +%bcond_with skim +%else +%bcond_without skim +%endif Name: scim-tables -BuildRequires: gtk2-devel kdelibs3-devel scim-devel skim +BuildRequires: gcc-c++ gtk2-devel scim-devel +%if %{with skim} +BuildRequires: kdelibs3-devel skim +%endif Version: 0.5.8 -Release: 1 -License: GPL v2 or later +Release: 2 +License: LGPLv2.1+ Group: System/I18n/Chinese Url: http://www.scim-im.org/ AutoReqProv: on @@ -48,7 +56,7 @@ James Su <suzhe(a)tsinghua.org.cn> %package zh -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: System/I18n/Chinese Requires: %{name} = %{version} Provides: locale(scim-tables:zh) @@ -66,7 +74,7 @@ James Su <suzhe(a)tsinghua.org.cn> %package ja -License: GPL v2 or later +License: GPLv2+ Group: System/I18n/Chinese Requires: %{name} = %{version} Provides: locale(scim-tables:ja) @@ -84,7 +92,7 @@ James Su <suzhe(a)tsinghua.org.cn> %package ko -License: GPL v2 or later +License: GPLv2+ Group: System/I18n/Chinese Requires: %{name} = %{version} Provides: locale(scim-tables:ko) @@ -102,7 +110,7 @@ James Su <suzhe(a)tsinghua.org.cn> %package additional -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: System/I18n/Chinese Requires: %{name} = %{version} Provides: locale(scim-tables:am;ar;bn;gu;hi;kn;ml;ne;pa;ru;ta;te;th;vi) @@ -112,14 +120,10 @@ Input Method data for non-CJK languages, including Russian etc. for the scim-tables input method module. - - -Authors: --------- - James Su <suzhe(a)tsinghua.org.cn> +%if %{with skim} %package -n scim-tables-skim -License: GPL v2 or later +License: GPLv2+ Summary: Skim setup module for scim-tables Group: System/I18n/Chinese Requires: %{name} = %{version} @@ -127,12 +131,7 @@ %description -n scim-tables-skim Skim setup module for scim-tables input method module. - - - -Authors: --------- - James Su <suzhe(a)tsinghua.org.cn> +%endif %prep %define scim_binary_version 1.4.0 @@ -161,7 +160,9 @@ make DESTDIR=${RPM_BUILD_ROOT} install rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/%{scim_binary_version}/*/*.{a,la} %find_lang scim-tables +%if %{with skim} %find_lang skim-scim-tables +%endif %clean @@ -311,6 +312,8 @@ %{_datadir}/scim/icons/Telugu-inscript.png %{_datadir}/scim/icons/Thai.png +%if %{with skim} + %files -n scim-tables-skim -f skim-scim-tables.lang %defattr(-, root, root) %dir /opt/kde3/share/apps/skim/ @@ -318,5 +321,6 @@ /opt/kde3/share/config.kcfg/* /opt/kde3/share/services/* /opt/kde3/%{_lib}/kde3/* +%endif %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit seq24 for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package seq24 for openSUSE:Factory checked in at Wed Apr 21 01:58:08 CEST 2010. -------- --- seq24/seq24.changes 2009-05-11 13:52:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/seq24/seq24.changes 2010-04-20 09:05:24.000000000 +0200 @@ -1,0 +2,28 @@ +Tue Apr 20 06:43:35 UTC 2010 - davejplater(a)gmail.com + +- Update to latest bzr checkout 2010-02-21 +- Summary of changes:- + * Merged constructor initializer lists. + * Merge removal of useless nullity tests + * Cleanup : removed some unused variables, reduced unecessary + big scope of some other variables + * Wrapped reading of single bytes, and removed the + push_front/reverse list browsing insanity. + * Use STL in midifile instead of news/deletes + * Plyphonic Step Edit + * Monophonic Step Edit on Sequence + * Fixed adding notes on the begining when midi record is on + and not playing sequence + * src/perform.cpp: Fixed jack_position_t->bar calculation which + always where 0 or negative while using Hydrogen 0.9.4 at the + same time. + * See /usr/share/doc/packages/seq24/ChangeLog for more changes. + +------------------------------------------------------------------- +Tue Apr 20 03:49:05 UTC 2010 - pth(a)novell.com + +- Determine return type of Gtk::Dialog::get_action_area in + configure and use result in mainwnd.cpp +- Fix Compiler warning. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- seq24-buttonbox.patch seq24-codeclenup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seq24.spec ++++++ --- /var/tmp/diff_new_pack.jwAHEf/_old 2010-04-21 01:58:02.000000000 +0200 +++ /var/tmp/diff_new_pack.jwAHEf/_new 2010-04-21 01:58:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package seq24 (Version 0.9.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,20 +20,18 @@ Name: seq24 BuildRequires: alsa-devel gcc-c++ jack-devel update-desktop-files -%if %suse_version > 1010 BuildRequires: gtkmm2-devel -%else -BuildRequires: gtkmm24-devel -%endif Summary: A Small, Real-Time MIDI Sequencer Version: 0.9.0 -Release: 1 -License: GPL v2 or later +Release: 2 +License: GPLv2+ Group: Productivity/Multimedia/Sound/Midi -Source: %{name}-%{version}.tar.bz2 +Source: http://launchpad.net/seq24/trunk/0.9.0/+download/%{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: seq24.png -Url: http://www.filter24.org/seq24/ +Patch0: seq24-buttonbox.patch +Patch1: seq24-codeclenup.patch +Url: https://launchpad.net/seq24 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,6 +46,8 @@ %prep %setup -q +%patch0 +%patch1 %build autoreconf --force --install ++++++ seq24-0.9.0.tar.bz2 ++++++ ++++ 26904 lines of diff (skipped) ++++++ seq24-buttonbox.patch ++++++ Index: configure.in =================================================================== --- configure.in.orig +++ configure.in @@ -69,6 +69,33 @@ AM_PATH_ALSA(0.9.0) ####AM_PATH_GTKMM(1.2.0) OLD PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.0) + +AC_MSG_CHECKING([for return type of Gtk::Dialog::get_action_area ...]) +AC_LANG_PUSH(C++) +AH_TEMPLATE([BBOX_TYPE], [The return type of Gtk::Dialog::get_action_area]) + +O_CXXFLAGS="$CXXFLAGS" +CXXFLAGS="$CXXFLAGS $pkg_cv_GTKMM_CFLAGS" +AC_COMPILE_IFELSE( +[#include <gtkmm.h> + +void bboxtest() +{ + Gtk::FileChooserDialog dialog("Test", + Gtk::FILE_CHOOSER_ACTION_OPEN); + Gtk::ButtonBox *bb = dialog.get_action_area(); +}], +[ +AC_DEFINE(BBOX_TYPE, ButtonBox) +bbox_type="ButtonBox *" +], +[ +AC_DEFINE(BBOX_TYPE, HButtonBox) +bbox_type="HButtonBox *" +]) +AC_MSG_RESULT([$bbox_type]) +CXXFLAGS="$O_CXXFLAGS" + AC_SUBST(GTKMM_CFLAGS) AC_SUBST(GTKMM_LIBS) Index: src/mainwnd.cpp =================================================================== --- src/mainwnd.cpp.orig +++ src/mainwnd.cpp @@ -595,7 +595,7 @@ mainwnd::file_import_dialog( void ) dialog.set_current_folder(last_used_dir); - HButtonBox *btnbox = dialog.get_action_area(); + BBOX_TYPE *btnbox = dialog.get_action_area(); HBox hbox( false, 2 ); m_adjust_load_offset = manage( new Adjustment( 0, -(c_max_sets - 1), ++++++ seq24-codeclenup.patch ++++++ --- src/optionsfile.cpp +++ src/optionsfile.cpp @@ -69,22 +69,22 @@ optionsfile::parse( perform *a_perf ) &sequence, - &a_perf->get_midi_control_toggle(i)->m_active, - &a_perf->get_midi_control_toggle(i)->m_inverse_active, + (int *)&a_perf->get_midi_control_toggle(i)->m_active, + (int *)&a_perf->get_midi_control_toggle(i)->m_inverse_active, &a_perf->get_midi_control_toggle(i)->m_status, &a_perf->get_midi_control_toggle(i)->m_data, &a_perf->get_midi_control_toggle(i)->m_min_value, &a_perf->get_midi_control_toggle(i)->m_max_value, - &a_perf->get_midi_control_on(i)->m_active, - &a_perf->get_midi_control_on(i)->m_inverse_active, + (int *)&a_perf->get_midi_control_on(i)->m_active, + (int *)&a_perf->get_midi_control_on(i)->m_inverse_active, &a_perf->get_midi_control_on(i)->m_status, &a_perf->get_midi_control_on(i)->m_data, &a_perf->get_midi_control_on(i)->m_min_value, &a_perf->get_midi_control_on(i)->m_max_value, - &a_perf->get_midi_control_off(i)->m_active, - &a_perf->get_midi_control_off(i)->m_inverse_active, + (int *)&a_perf->get_midi_control_off(i)->m_active, + (int *)&a_perf->get_midi_control_off(i)->m_inverse_active, &a_perf->get_midi_control_off(i)->m_status, &a_perf->get_midi_control_off(i)->m_data, &a_perf->get_midi_control_off(i)->m_min_value, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit squid-beta for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package squid-beta for openSUSE:Factory checked in at Wed Apr 21 01:57:50 CEST 2010. -------- --- squid-beta/squid-beta.changes 2009-11-03 20:22:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/squid-beta/squid-beta.changes 2010-04-20 17:40:20.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 20 17:39:24 CEST 2010 - meissner(a)suse.de + +- fixed build with openssl 1.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- squid-beta-fix-build.patch squid-beta-fix-openssl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid-beta.spec ++++++ --- /var/tmp/diff_new_pack.hW5MSR/_old 2010-04-21 01:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hW5MSR/_new 2010-04-21 01:57:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package squid-beta (Version 3.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -22,7 +22,7 @@ BuildRequires: openldap2-devel opensp-devel pam-devel sharutils Summary: Squid V3.0 WWW Proxy Server (new version) Version: 3.0 -Release: 448 +Release: 449 License: GPLv2+ %define ver PRE6 Url: http://www.squid-cache.org @@ -136,6 +136,8 @@ Patch110: squid3-3.0.STABLE1-icap_memset.patch Patch111: squid3-3.0.STABLE1-snmp_strncat.patch Patch112: squid-beta-3.0-strchr.patch +Patch113: squid-beta-fix-openssl.patch +Patch114: squid-beta-fix-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define squidlibdir %{_libdir}/squid %define squidconfdir /etc/squid @@ -269,6 +271,8 @@ %patch110 -p1 %patch111 -p1 %patch112 +%patch113 -p1 +%patch114 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fPIE -fPIC -fno-strict-aliasing" ++++++ squid-beta-fix-build.patch ++++++ Index: squid-3.0.PRE6/src/wccp2.cc =================================================================== --- squid-3.0.PRE6.orig/src/wccp2.cc +++ squid-3.0.PRE6/src/wccp2.cc @@ -1142,6 +1142,7 @@ wccp2HandleUdp(int sock, void *not_used) int num_caches; debugs(80, 6, "wccp2HandleUdp: Called."); + memset (&cache_address, 0, sizeof(cache_address)); commSetSelect(sock, COMM_SELECT_READ, wccp2HandleUdp, NULL, 0); ++++++ squid-beta-fix-openssl.patch ++++++ Index: squid-3.0.PRE6/src/ssl_support.cc =================================================================== --- squid-3.0.PRE6.orig/src/ssl_support.cc +++ squid-3.0.PRE6/src/ssl_support.cc @@ -529,7 +529,7 @@ SSL_CTX * sslCreateServerContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *clientCA, const char *CAfile, const char *CApath, const char *CRLfile, const char *dhfile, const char *context) { int ssl_error; - SSL_METHOD *method; + const SSL_METHOD *method; SSL_CTX *sslContext; long fl = ssl_parse_flags(flags); @@ -726,7 +726,7 @@ SSL_CTX * sslCreateClientContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *CAfile, const char *CApath, const char *CRLfile) { int ssl_error; - SSL_METHOD *method; + const SSL_METHOD *method; SSL_CTX *sslContext; long fl = ssl_parse_flags(flags); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit createrepo for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package createrepo for openSUSE:Factory checked in at Wed Apr 21 01:57:29 CEST 2010. -------- --- createrepo/createrepo.changes 2010-04-12 12:48:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/createrepo/createrepo.changes 2010-04-18 07:29:14.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 18 05:28:00 UTC 2010 - coolo(a)novell.com + +- the code requires python-urlgrabber + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ createrepo.spec ++++++ --- /var/tmp/diff_new_pack.jPsy9J/_old 2010-04-21 01:57:08.000000000 +0200 +++ /var/tmp/diff_new_pack.jPsy9J/_new 2010-04-21 01:57:08.000000000 +0200 @@ -21,7 +21,7 @@ Name: createrepo BuildRequires: python Version: 0.9.8 -Release: 2 +Release: 3 License: GPLv2+ Summary: Creates a Common Metadata Repository Group: System/Packages @@ -39,6 +39,7 @@ Requires: rpm >= 4.1.1 Requires: rpm-python Requires: libxml2-python +Requires: python-urlgrabber %if %{suse_version} > 910 Requires: yum-metadata-parser %endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-gtk for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package yast2-gtk for openSUSE:Factory checked in at Wed Apr 21 01:57:24 CEST 2010. -------- --- yast2-gtk/yast2-gtk.changes 2010-04-19 15:43:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-gtk/yast2-gtk.changes 2010-04-20 16:56:22.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Apr 20 15:53:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.44 +- sw_single: fixed visually disconsonant sub-lines between +the package lists and the repository/pattern ones. + +------------------------------------------------------------------- +Tue Apr 20 14:02:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.43 +- online_update: several fixes, especially in the versions +lists. +- sw_single: bug fix: history window wouldn't function +when closing by pressing Escape. +- sw_single: bug fix: upgrade button wouldn't show up. +- sw_single: show summary lines in gray. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-gtk-2.21.42.tar.bz2 New: ---- yast2-gtk-2.21.44.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.45Bx2T/_old 2010-04-21 01:57:11.000000000 +0200 +++ /var/tmp/diff_new_pack.45Bx2T/_new 2010-04-21 01:57:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-gtk (Version 2.21.42) +# spec file for package yast2-gtk (Version 2.21.44) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,11 +18,11 @@ Name: yast2-gtk -Version: 2.21.42 +Version: 2.21.44 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.21.42.tar.bz2 +Source0: yast2-gtk-2.21.44.tar.bz2 Url: http://en.opensuse.org/YaST2-GTK Summary: YaST2 - GTK+ Graphical User Interface Group: System/YaST ++++++ yast2-gtk-2.21.42.tar.bz2 -> yast2-gtk-2.21.44.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/ChangeLog new/yast2-gtk-2.21.44/ChangeLog --- old/yast2-gtk-2.21.42/ChangeLog 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/ChangeLog 2010-04-20 16:53:30.000000000 +0200 @@ -1,3 +1,44 @@ +2010-04-20 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/ygtkcellrenderertext.h/c: added renderer: extends + gtk-cell-renderer-text so color markup within the "markup" + property is ignored when the row is selected. + + * src/pkg/ygtkpkgfilterview.cc & src/ygtkpkgpatternview.cc: + gray sub-lines. + +2010-04-20 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/ygtkpkgdetailview.cc: show satisfied patches as + installed in the versions list, and set install button + as inactive. + + * src/pkg/ygtkpkglistview.cc: set install check button + inactive for installed patches. + +2010-04-20 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/ygtkcellrendererbutton.c: reverted: don't use the all + column, but only the necessary width. + + * src/pkg/ygtkpkghistorydialog.cc: reverted: show "loading..." + text. + + * src/pkg/ygtkpkghistorydialog.cc: buf fix: window wouldn't + work if closed by other means other than the close button + (like pressing Escape). + + * src/pkg/ygtkpkgcellrenderersidebutton.h/c: re-introduced. + + * src/pkg/ygtkpkglistview.cc: bug fix: use side-button rather + than the previous packing simplifying which wouldn't work + occasionally. + + * src/pkg/ygtkpkglistview.cc: show summary lines as gray. + I had to break the strict gtk data-view model in order + to avoid explicitly setting colors when a row was + selected. + 2010-04-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/ygtkpkgdetailview.cc: several bug fixes with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/VERSION new/yast2-gtk-2.21.44/VERSION --- old/yast2-gtk-2.21.42/VERSION 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/VERSION 2010-04-20 16:53:30.000000000 +0200 @@ -1 +1 @@ -2.21.42 +2.21.44 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/VERSION.cmake new/yast2-gtk-2.21.44/VERSION.cmake --- old/yast2-gtk-2.21.42/VERSION.cmake 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/VERSION.cmake 2010-04-20 16:53:30.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "42") +SET(VERSION_PATCH "44") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/package/yast2-gtk.changes new/yast2-gtk-2.21.44/package/yast2-gtk.changes --- old/yast2-gtk-2.21.42/package/yast2-gtk.changes 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/package/yast2-gtk.changes 2010-04-20 16:53:30.000000000 +0200 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Tue Apr 20 15:53:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.44 +- sw_single: fixed visually disconsonant sub-lines between +the package lists and the repository/pattern ones. + +------------------------------------------------------------------- +Tue Apr 20 14:02:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.43 +- online_update: several fixes, especially in the versions +lists. +- sw_single: bug fix: history window wouldn't function +when closing by pressing Escape. +- sw_single: bug fix: upgrade button wouldn't show up. +- sw_single: show summary lines in gray. + +------------------------------------------------------------------- Mon Apr 19 14:39:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/package/yast2-gtk.spec new/yast2-gtk-2.21.44/package/yast2-gtk.spec --- old/yast2-gtk-2.21.42/package/yast2-gtk.spec 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/package/yast2-gtk.spec 2010-04-20 16:53:30.000000000 +0200 @@ -1,16 +1,16 @@ # -# spec file for package yast2-gtk (Version 2.21.41) +# spec file for package yast2-gtk (Version 2.21.43) # # norootforbuild;, Name: yast2-gtk -Version: 2.21.41 +Version: 2.21.43 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.21.41.tar.bz2 +Source0: yast2-gtk-2.21.43.tar.bz2 Url: http://en.opensuse.org/YaST2-GTK Summary: YaST2 - GTK+ Graphical User Interface Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/CMakeLists.txt new/yast2-gtk-2.21.44/src/pkg/CMakeLists.txt --- old/yast2-gtk-2.21.42/src/pkg/CMakeLists.txt 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/src/pkg/CMakeLists.txt 2010-04-20 16:53:30.000000000 +0200 @@ -20,6 +20,8 @@ yzyppwrapper.cc ygtkcellrendererbutton.c + ygtkcellrenderersidebutton.c + ygtkcellrenderertext.c ygtktreemodel.cc ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkcellrendererbutton.c new/yast2-gtk-2.21.44/src/pkg/ygtkcellrendererbutton.c --- old/yast2-gtk-2.21.42/src/pkg/ygtkcellrendererbutton.c 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkcellrendererbutton.c 2010-04-20 16:53:30.000000000 +0200 @@ -236,15 +236,14 @@ } int text_xoffset, text_yoffset, pixbuf_xoffset, pixbuf_yoffset, pixbuf_width, - pixbuf_height, height; + pixbuf_height, width, height; ygtk_cell_renderer_button_get_size_full (cell, widget, cell_area, - NULL, NULL, NULL, &height, &pixbuf_xoffset, &pixbuf_yoffset, &pixbuf_width, + NULL, NULL, &width, &height, &pixbuf_xoffset, &pixbuf_yoffset, &pixbuf_width, &pixbuf_height, &text_xoffset, &text_yoffset); int x = cell_area->x + OUTER_BORDER + 1; - int width = cell_area->width - OUTER_BORDER*2 - 2; int y = cell_area->y + (cell_area->height - height)/2 + OUTER_BORDER; - height -= OUTER_BORDER*2; + width -= OUTER_BORDER*2; height -= OUTER_BORDER*2; gtk_paint_box (widget->style, window, state, shadow, expose_area, widget, "button", x, y, width, height); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkcellrenderersidebutton.c new/yast2-gtk-2.21.44/src/pkg/ygtkcellrenderersidebutton.c --- old/yast2-gtk-2.21.42/src/pkg/ygtkcellrenderersidebutton.c 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkcellrenderersidebutton.c 2010-04-20 16:53:30.000000000 +0200 @@ -0,0 +1,221 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkCellRendererSideButton widget */ +// check the header file for information about this widget + +#include "ygtkcellrenderersidebutton.h" +#include <gtk/gtk.h> + +enum { + PROP_0, + PROP_ACTIVE, + PROP_STOCK_ID, + PROP_BUTTON_VISIBLE, +}; + +static guint toggle_cell_signal = 0; + +G_DEFINE_TYPE (YGtkCellRendererSideButton, ygtk_cell_renderer_side_button, GTK_TYPE_CELL_RENDERER_TEXT) + +static void ygtk_cell_renderer_side_button_init (YGtkCellRendererSideButton *bcell) +{ GTK_CELL_RENDERER (bcell)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE; } + +static void free_pixbuf (YGtkCellRendererSideButton *cell) +{ + if (cell->stock_id) { + g_free (cell->stock_id); + cell->stock_id = NULL; + } + if (cell->pixbuf) { + g_object_unref (cell->pixbuf); + cell->pixbuf = NULL; + } +} + +static void ensure_pixbuf (YGtkCellRendererSideButton *cell, GtkWidget *widget) +{ + if (!cell->pixbuf && cell->stock_id) + cell->pixbuf = gtk_widget_render_icon (widget, cell->stock_id, GTK_ICON_SIZE_BUTTON, NULL); +} + +static void ygtk_cell_renderer_side_button_finalize (GObject *object) +{ + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (object); + free_pixbuf (bcell); + G_OBJECT_CLASS (ygtk_cell_renderer_side_button_parent_class)->finalize (object); +} + +static void ygtk_cell_renderer_side_button_get_property ( + GObject *object, guint param_id, GValue *value, GParamSpec *pspec) +{ + if (pspec->owner_type == YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON) { + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (object); + switch (param_id) { + case PROP_ACTIVE: + g_value_set_boolean (value, bcell->active); + break; + case PROP_STOCK_ID: + g_value_set_string (value, bcell->stock_id); + break; + case PROP_BUTTON_VISIBLE: + g_value_set_boolean (value, bcell->button_visible); + break; + } + } + else + G_OBJECT_CLASS (ygtk_cell_renderer_side_button_parent_class)->get_property ( + object, param_id, value, pspec); +} + +static void ygtk_cell_renderer_side_button_set_property (GObject *object, + guint param_id, const GValue *value, GParamSpec *pspec) +{ + if (pspec->owner_type == YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON) { + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (object); + switch (param_id) { + case PROP_ACTIVE: + bcell->active = g_value_get_boolean (value); + break; + case PROP_STOCK_ID: + free_pixbuf (bcell); + bcell->stock_id = g_value_dup_string (value); + break; + case PROP_BUTTON_VISIBLE: + bcell->button_visible = g_value_get_boolean (value); + break; + } + } + else + G_OBJECT_CLASS (ygtk_cell_renderer_side_button_parent_class)->set_property ( + object, param_id, value, pspec); +} + +static void ygtk_cell_renderer_side_button_get_size ( + GtkCellRenderer *cell, GtkWidget *widget, GdkRectangle *cell_area, + gint *x_offset, gint *y_offset, gint *width, gint *height) +{ + GTK_CELL_RENDERER_CLASS (ygtk_cell_renderer_side_button_parent_class)->get_size ( + cell, widget, cell_area, x_offset, y_offset, width, height); + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (cell); + if (bcell->button_visible) { + gint icon_width, icon_height; + gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &icon_width, &icon_height); + *width += icon_width + 8 + 4; + } +} + +static void ygtk_cell_renderer_side_button_render ( + GtkCellRenderer *cell, GdkDrawable *window, GtkWidget *widget, + GdkRectangle *background_area, GdkRectangle *cell_area, + GdkRectangle *expose_area, GtkCellRendererState flags) +{ + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (cell); + GdkRectangle text_area = *cell_area; + gint icon_width, icon_height; + if (bcell->button_visible) { + gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &icon_width, &icon_height); + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) + text_area.x += icon_width + 8; + text_area.width -= icon_width + 8 + 4; + } + GTK_CELL_RENDERER_CLASS (ygtk_cell_renderer_side_button_parent_class)->render ( + cell, window, widget, background_area, &text_area, expose_area, flags); + + if (bcell->button_visible) { + GtkStateType state = GTK_STATE_NORMAL; + GtkShadowType shadow = GTK_SHADOW_OUT; + if (!cell->sensitive || GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE) + state = GTK_STATE_INSENSITIVE; + /* else if ((flags & GTK_CELL_RENDERER_PRELIT)) + state = GTK_STATE_PRELIGHT;*/ + if (bcell->active) { + shadow = GTK_SHADOW_IN; + state = GTK_STATE_ACTIVE; + } + + GdkRectangle button_area = *cell_area; + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) + button_area.x = cell_area->x + 2; + else + button_area.x = cell_area->x + cell_area->width - icon_width - 8; + button_area.width = icon_width + 4; + button_area.height = icon_height + 4; + button_area.y = cell_area->y + ((cell_area->height - button_area.height) / 2); + gtk_paint_box (widget->style, window, state, shadow, expose_area, widget, + "button", button_area.x, button_area.y, button_area.width, button_area.height); + + GdkRectangle icon_area = button_area; + icon_area.x += 2; + icon_area.y += 2; + if (bcell->active) { + cell_area->x += 2; + cell_area->y += 2; + } + + ensure_pixbuf (bcell, widget); + cairo_t *cr = gdk_cairo_create (window); + gdk_cairo_set_source_pixbuf (cr, bcell->pixbuf, icon_area.x, icon_area.y); + cairo_rectangle (cr, icon_area.x, icon_area.y, icon_width, icon_height); + cairo_fill (cr); + cairo_destroy (cr); + } +} + +static gboolean ygtk_cell_renderer_side_button_activate ( + GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, + GdkRectangle *background_area, GdkRectangle *cell_area, GtkCellRendererState flags) +{ + YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (cell); + if (bcell->button_visible) { + GdkEventButton *_event = (GdkEventButton *) event; + gint icon_width, icon_height; + gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &icon_width, &icon_height); + int icon_x, x = _event->x - cell_area->x; + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) + icon_x = 2; + else + icon_x = cell_area->width - (icon_width+12); + icon_width += 8; + if (x >= icon_x && x <= icon_x + icon_width) { + g_signal_emit (cell, toggle_cell_signal, 0, path); + return TRUE; + } + } + return FALSE; +} + +GtkCellRenderer *ygtk_cell_renderer_side_button_new (void) +{ return g_object_new (YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, NULL); } + +gboolean ygtk_cell_renderer_side_button_get_active (YGtkCellRendererSideButton *cell) +{ return cell->active; } + +static void ygtk_cell_renderer_side_button_class_init (YGtkCellRendererSideButtonClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + object_class->get_property = ygtk_cell_renderer_side_button_get_property; + object_class->set_property = ygtk_cell_renderer_side_button_set_property; + object_class->finalize = ygtk_cell_renderer_side_button_finalize; + + GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class); + cell_class->get_size = ygtk_cell_renderer_side_button_get_size; + cell_class->render = ygtk_cell_renderer_side_button_render; + cell_class->activate = ygtk_cell_renderer_side_button_activate; + + GParamFlags readwrite_flag = + G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB; + g_object_class_install_property (object_class, PROP_ACTIVE, + g_param_spec_boolean ("active", "Toggle state", "The toggle state of the button", + FALSE, readwrite_flag)); + g_object_class_install_property (object_class, PROP_STOCK_ID, + g_param_spec_string ("stock-id", "Stock ID", "Stock icon to render", NULL, readwrite_flag)); + g_object_class_install_property (object_class, PROP_BUTTON_VISIBLE, + g_param_spec_boolean ("button-visible", "Is Button Visible", "Whether to show side button", TRUE, readwrite_flag)); + + toggle_cell_signal = g_signal_new ("toggled", G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (YGtkCellRendererSideButtonClass, toggled), + NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkcellrenderersidebutton.h new/yast2-gtk-2.21.44/src/pkg/ygtkcellrenderersidebutton.h --- old/yast2-gtk-2.21.42/src/pkg/ygtkcellrenderersidebutton.h 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkcellrenderersidebutton.h 2010-04-20 16:53:30.000000000 +0200 @@ -0,0 +1,50 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* A icon GtkButton next to a GtkLabel. +*/ + +#ifndef YGTK_CELL_RENDERER_SIDE_BUTTON_H +#define YGTK_CELL_RENDERER_SIDE_BUTTON_H + +#include <gtk/gtkcellrenderertext.h> +G_BEGIN_DECLS + +#define YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON (ygtk_cell_renderer_side_button_get_type()) +#define YGTK_CELL_RENDERER_SIDE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, YGtkCellRendererSideButton)) +#define YGTK_CELL_RENDERER_SIDE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, YGtkCellRendererSideButtonClass)) +#define YGTK_IS_CELL_RENDERER_SIDE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON)) +#define YGTK_IS_CELL_RENDERER_SIDE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON)) +#define YGTK_CELL_RENDERER_SIDE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_CELL_RENDERER_SIDE_BUTTON, YGtkCellRendererSideButtonClass)) + +typedef struct YGtkCellRendererSideButton +{ + GtkCellRendererText parent; + + // private: + guint active : 2, button_visible : 2; + gchar *stock_id; + GdkPixbuf *pixbuf; +} YGtkCellRendererSideButton; + +typedef struct YGtkCellRendererSideButtonClass +{ + GtkCellRendererTextClass parent_class; + + void (* toggled) (YGtkCellRendererSideButton *renderer, const gchar *path); +} YGtkCellRendererSideButtonClass; + +GtkCellRenderer *ygtk_cell_renderer_side_button_new (void); +GType ygtk_cell_renderer_side_button_get_type (void) G_GNUC_CONST; + +gboolean ygtk_cell_renderer_side_button_get_active (YGtkCellRendererSideButton *cell); + +G_END_DECLS +#endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkcellrenderertext.c new/yast2-gtk-2.21.44/src/pkg/ygtkcellrenderertext.c --- old/yast2-gtk-2.21.42/src/pkg/ygtkcellrenderertext.c 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkcellrenderertext.c 2010-04-20 16:53:30.000000000 +0200 @@ -0,0 +1,56 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkCellRendererText cell renderer */ +// check the header file for information about this cell renderer + +#include "ygtkcellrenderertext.h" +#include <gtk/gtk.h> +#include <string.h> + +G_DEFINE_TYPE (YGtkCellRendererText, ygtk_cell_renderer_text, GTK_TYPE_CELL_RENDERER_TEXT) + +static void ygtk_cell_renderer_text_init (YGtkCellRendererText *bcell) +{} + +gboolean filter_color_cb (PangoAttribute *attrb, gpointer data) +{ + PangoAttrType type = attrb->klass->type; + return type == PANGO_ATTR_FOREGROUND || type == PANGO_ATTR_BACKGROUND; +} + +static void ygtk_cell_renderer_text_render ( + GtkCellRenderer *cell, GdkDrawable *window, GtkWidget *widget, + GdkRectangle *background_area, GdkRectangle *cell_area, + GdkRectangle *expose_area, GtkCellRendererState flags) +{ + GtkCellRendererText *tcell = GTK_CELL_RENDERER_TEXT (cell); + PangoAttrList *old_extra_attrs = 0, *new_extra_attrs = 0; + if (flags & (GTK_CELL_RENDERER_SELECTED | GTK_CELL_RENDERER_INSENSITIVE)) { + old_extra_attrs = pango_attr_list_copy (tcell->extra_attrs); + new_extra_attrs = tcell->extra_attrs; + + PangoAttrList *t = pango_attr_list_filter (tcell->extra_attrs, + filter_color_cb, NULL); + pango_attr_list_unref (t); + } + + GTK_CELL_RENDERER_CLASS (ygtk_cell_renderer_text_parent_class)->render ( + cell, window, widget, background_area, cell_area, expose_area, flags); + + if (old_extra_attrs) { + tcell->extra_attrs = old_extra_attrs; + pango_attr_list_unref (new_extra_attrs); + } +} + +GtkCellRenderer *ygtk_cell_renderer_text_new (void) +{ return g_object_new (YGTK_TYPE_CELL_RENDERER_TEXT, NULL); } + +static void ygtk_cell_renderer_text_class_init (YGtkCellRendererTextClass *class) +{ + GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class); + cell_class->render = ygtk_cell_renderer_text_render; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkcellrenderertext.h new/yast2-gtk-2.21.44/src/pkg/ygtkcellrenderertext.h --- old/yast2-gtk-2.21.42/src/pkg/ygtkcellrenderertext.h 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkcellrenderertext.h 2010-04-20 16:53:30.000000000 +0200 @@ -0,0 +1,42 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkCellRendererText is a sub-class of GtkCellRendererText that + strips any markup in the cell when the row is selected. +*/ + +#ifndef YGTK_CELL_RENDERER_TEXT_H +#define YGTK_CELL_RENDERER_TEXT_H + +#include <gtk/gtkcellrenderertext.h> +G_BEGIN_DECLS + +#define YGTK_TYPE_CELL_RENDERER_TEXT (ygtk_cell_renderer_text_get_type()) +#define YGTK_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_CELL_RENDERER_TEXT, YGtkCellRendererText)) +#define YGTK_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_CELL_RENDERER_TEXT, YGtkCellRendererTextClass)) +#define YGTK_IS_CELL_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_CELL_RENDERER_TEXT)) +#define YGTK_IS_CELL_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_CELL_RENDERER_TEXT)) +#define YGTK_CELL_RENDERER_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_CELL_TEXT, YGtkCellRendererTextClass)) + +typedef struct YGtkCellRendererText +{ + GtkCellRendererText parent; +} YGtkCellRendererText; + +typedef struct YGtkCellRendererTextClass +{ + GtkCellRendererTextClass parent_class; +} YGtkCellRendererTextClass; + +GtkCellRenderer *ygtk_cell_renderer_text_new (void); +GType ygtk_cell_renderer_text_get_type (void) G_GNUC_CONST; + +G_END_DECLS +#endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkpkgdetailview.cc new/yast2-gtk-2.21.44/src/pkg/ygtkpkgdetailview.cc --- old/yast2-gtk-2.21.42/src/pkg/ygtkpkgdetailview.cc 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkpkgdetailview.cc 2010-04-20 16:53:30.000000000 +0200 @@ -118,7 +118,8 @@ virtual GtkWidget *getWidget() { return text; } - virtual void refreshList (Ypp::List list) {} + virtual void refreshList (Ypp::List list) + { setList (list); } virtual void setList (Ypp::List list) { @@ -440,16 +441,17 @@ void updateButton() { const char *label = 0, *stock = 0; - bool modified = false; + bool modified = false, can_modify = true; if (list.size() == 1) { ZyppSelectable zsel; ZyppResObject zobj; getSelected (&zsel, &zobj); - if (zobj->isSystem()) { + if (zobj->isSystem() || zobj->poolItem().isSatisfied()) { label = _("Remove"); stock = GTK_STOCK_DELETE; modified = zsel->toDelete(); + can_modify = zobj->kind() != zypp::ResKind::patch; } else { ZyppResObject installedObj = zsel->installedObj(); @@ -485,6 +487,7 @@ else if (props.isInstalled()) { label = _("Remove"); stock = GTK_STOCK_DELETE; + can_modify = props.canRemove(); } else if (props.isNotInstalled()) { label = _("Install"); @@ -506,7 +509,7 @@ } else gtk_widget_hide (button); - gtk_widget_set_sensitive (button, !modified); + gtk_widget_set_sensitive (button, !modified && can_modify); modified ? gtk_widget_show (undo_button) : gtk_widget_hide (undo_button); } @@ -527,7 +530,7 @@ radio = addVersion (zsel, *it, radio); for (zypp::ui::Selectable::available_iterator it = zsel->availableBegin(); it != zsel->availableEnd(); it++) - addVersion (zsel, *it, radio); + radio = addVersion (zsel, *it, radio); int n = 0; GList *children = gtk_container_get_children (GTK_CONTAINER (versions_box)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkpkgfilterview.cc new/yast2-gtk-2.21.44/src/pkg/ygtkpkgfilterview.cc --- old/yast2-gtk-2.21.42/src/pkg/ygtkpkgfilterview.cc 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkpkgfilterview.cc 2010-04-20 16:53:30.000000000 +0200 @@ -14,7 +14,7 @@ #include "YGPackageSelector.h" #include <gtk/gtk.h> #include "ygtktreeview.h" -#include "ygtktreemodel.h" +#include "ygtkcellrenderertext.h" // List store abstract @@ -586,7 +586,7 @@ "sensitive", YGtkPkgFilterModel::ENABLED_COLUMN, NULL); ygtk_tree_view_append_column (YGTK_TREE_VIEW (view), column); } - renderer = gtk_cell_renderer_text_new(); + renderer = ygtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes ( NULL, renderer, "markup", YGtkPkgFilterModel::TEXT_COLUMN, "sensitive", YGtkPkgFilterModel::ENABLED_COLUMN, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkpkghistorydialog.cc new/yast2-gtk-2.21.44/src/pkg/ygtkpkghistorydialog.cc --- old/yast2-gtk-2.21.42/src/pkg/ygtkpkghistorydialog.cc 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkpkghistorydialog.cc 2010-04-20 16:53:30.000000000 +0200 @@ -485,7 +485,7 @@ GtkCellRenderer *renderer, *pix_renderer; GtkTreeViewColumn *column; - GtkWidget *log_view = ygtk_tree_view_new (NULL); + GtkWidget *log_view = ygtk_tree_view_new (_("No log entries.")); gtk_tree_view_set_search_column (GTK_TREE_VIEW (log_view), LogListHandler::SHORTCUT_COLUMN); gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (log_view), TRUE); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (log_view), TRUE); @@ -602,6 +602,8 @@ gtk_window_set_default_size (GTK_WINDOW (dialog), 650, 600); g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (response_cb), log_view); + g_signal_connect (G_OBJECT (dialog), "delete-event", + G_CALLBACK (gtk_true), log_view); GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), date_scroll, FALSE, FALSE); @@ -634,6 +636,12 @@ gtk_tree_view_set_model (GTK_TREE_VIEW (date_view), handler.date_handler->getModel()); gtk_tree_view_set_model (GTK_TREE_VIEW (log_view), handler.log_handler->getModel()); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (date_view)); + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first ( + gtk_tree_view_get_model (GTK_TREE_VIEW (date_view)), &iter)) + gtk_tree_selection_select_iter (selection, &iter); + gdk_window_set_cursor (dialog->window, NULL); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkpkglistview.cc new/yast2-gtk-2.21.44/src/pkg/ygtkpkglistview.cc --- old/yast2-gtk-2.21.42/src/pkg/ygtkpkglistview.cc 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkpkglistview.cc 2010-04-20 16:53:30.000000000 +0200 @@ -14,15 +14,19 @@ #include "ygtkpkglistview.h" #include "ygtktreeview.h" #include "ygtktreemodel.h" +#include "ygtkcellrenderertext.h" #include "ygtkcellrendererbutton.h" +#include "ygtkcellrenderersidebutton.h" #include <gtk/gtk.h> #include <string.h> +#define GRAY_COLOR "#727272" + //** Model enum ImplProperty { // booleans - HAS_UPGRADE_PROP = TOTAL_PROPS, TO_UPGRADE_PROP, + HAS_UPGRADE_PROP = TOTAL_PROPS, TO_UPGRADE_PROP, CAN_TOGGLE_INSTALL_PROP, MANUAL_MODIFY_PROP, IS_LOCKED_PROP, // integer XPAD_PROP, @@ -44,7 +48,7 @@ case BACKGROUND_PROP: case REPOSITORY_STOCK_PROP: return G_TYPE_STRING; case INSTALLED_CHECK_PROP: - case HAS_UPGRADE_PROP: case TO_UPGRADE_PROP: + case HAS_UPGRADE_PROP: case TO_UPGRADE_PROP: case CAN_TOGGLE_INSTALL_PROP: case MANUAL_MODIFY_PROP: case IS_LOCKED_PROP: return G_TYPE_BOOLEAN; case XPAD_PROP: @@ -57,6 +61,9 @@ struct YGtkZyppModel : public YGtkTreeModel, Ypp::SelListener { + // we pass GtkTreeView to the model, so we can test for selected rows + // and modify text markup appropriely (trashing the data-view model, heh) + YGtkZyppModel (Ypp::List list) : m_list (list) { addSelListener (this); } @@ -101,10 +108,14 @@ summary = YGUtils::escapeMarkup (summary); highlightMarkupSpan (name, m_keywords); highlightMarkupSpan (summary, m_keywords); - str.reserve (name.size() + summary.size() + 32); + str.reserve (name.size() + summary.size() + 64); str = name; - if (!summary.empty()) - str += "\n" + summary + ""; + if (!summary.empty()) { + str += "\n"; + str += ""; + str += "" + summary + ""; + str += ""; + } g_value_set_string (value, str.c_str()); break; } @@ -216,6 +227,9 @@ case TO_UPGRADE_PROP: g_value_set_boolean (value, sel.hasUpgrade() && sel.toInstall()); break; + case CAN_TOGGLE_INSTALL_PROP: + g_value_set_boolean (value, sel.isInstalled() || sel.canRemove()); + break; case MANUAL_MODIFY_PROP: g_value_set_boolean (value, sel.toModify() && !sel.toModifyAuto()); break; @@ -379,8 +393,7 @@ item = gtk_menu_item_new_with_mnemonic (label); if (tooltip) gtk_widget_set_tooltip_markup (item, tooltip); - if (!sensitive) - gtk_widget_set_sensitive (item, FALSE); + gtk_widget_set_sensitive (item, sensitive); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (callback), pThis); } @@ -413,9 +426,9 @@ if (props.hasUpgrade() && !modified) inner::appendItem (menu, _("_Upgrade"), 0, GTK_STOCK_GO_UP, !locked, inner::install_cb, pThis), empty = false; - if (props.isInstalled() && props.canRemove() && !modified) + if (props.isInstalled() && !modified) inner::appendItem (menu, _("_Remove"), 0, GTK_STOCK_DELETE, - !locked, inner::remove_cb, pThis), empty = false; + !locked && props.canRemove(), inner::remove_cb, pThis), empty = false; if (modified) inner::appendItem (menu, _("_Undo"), 0, GTK_STOCK_UNDO, true, inner::undo_cb, pThis), empty = false; @@ -513,7 +526,6 @@ static void action_button_toggled_cb (YGtkCellRendererButton *renderer, gchar *path_str, YGtkPkgListView *pThis) { -fprintf (stderr, "action\n"); GtkTreeView *view = GTK_TREE_VIEW (pThis->impl->view); GtkTreeModel *model = gtk_tree_view_get_model (view); Ypp::Selectable *sel = ygtk_zypp_model_get_sel (model, path_str); @@ -687,20 +699,7 @@ gtk_tree_view_column_set_title (column, header); GtkCellRenderer *renderer; - - if (property == VERSION_PROP) { - renderer = ygtk_cell_renderer_button_new(); - if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) - gtk_tree_view_column_pack_start (column, renderer, FALSE); - else - gtk_tree_view_column_pack_end (column, renderer, FALSE); - gtk_tree_view_column_set_attributes (column, renderer, - "visible", HAS_UPGRADE_PROP, "active", TO_UPGRADE_PROP, NULL); - g_object_set (G_OBJECT (renderer), "stock-id", GTK_STOCK_GO_UP, NULL); - g_signal_connect (G_OBJECT (renderer), "toggled", - G_CALLBACK (upgrade_toggled_cb), this); - } - else if (property == REPOSITORY_PROP) { + if (property == REPOSITORY_PROP) { renderer = gtk_cell_renderer_pixbuf_new(); if (gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL) gtk_tree_view_column_pack_end (column, renderer, FALSE); @@ -710,7 +709,15 @@ "icon-name", REPOSITORY_STOCK_PROP, NULL); } - renderer = gtk_cell_renderer_text_new(); + if (property == VERSION_PROP) { + renderer = ygtk_cell_renderer_side_button_new(); + g_object_set (G_OBJECT (renderer), "stock-id", GTK_STOCK_GO_UP, NULL); + g_signal_connect (G_OBJECT (renderer), "toggled", + G_CALLBACK (upgrade_toggled_cb), this); + } + else + renderer = ygtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_attributes (column, renderer, "markup", property, "sensitive", IS_LOCKED_PROP, NULL); @@ -726,6 +733,13 @@ ellipsize = PANGO_ELLIPSIZE_MIDDLE; g_object_set (G_OBJECT (renderer), "ellipsize", ellipsize, NULL); + if (property == VERSION_PROP) { + gtk_tree_view_column_add_attribute (column, renderer, + "button-visible", HAS_UPGRADE_PROP); + gtk_tree_view_column_add_attribute (column, renderer, + "active", TO_UPGRADE_PROP); + } + if (size != -1) // on several columns gtk_tree_view_set_rules_hint (view, TRUE); gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); @@ -748,6 +762,9 @@ if (impl->colorModified) gtk_tree_view_column_add_attribute (column, renderer, "cell-background", BACKGROUND_PROP); + if (property == INSTALLED_CHECK_PROP) + gtk_tree_view_column_add_attribute (column, renderer, + "activatable", CAN_TOGGLE_INSTALL_PROP); g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (check_toggled_cb), this); @@ -819,7 +836,7 @@ pango_layout_get_pixel_extents (layout, NULL, &rect); width = MAX (width, rect.width); g_object_unref (G_OBJECT (layout)); - width += 16; + width += 18; if (show_icon) { int icon_width; gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (impl->view), @@ -944,8 +961,11 @@ { std::string name (repo.name()), url, str; url = repo.isSystem() ? _("Local database") : repo.url(); - str.reserve (name.size() + url.size() + 32); - str = name + "\n" + url + ""; + str.reserve (name.size() + url.size() + 64); + str = name + "\n"; + str += ""; + str += "" + url + ""; + str += ""; return str; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/ygtkpkgpatternview.cc new/yast2-gtk-2.21.44/src/pkg/ygtkpkgpatternview.cc --- old/yast2-gtk-2.21.42/src/pkg/ygtkpkgpatternview.cc 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/src/pkg/ygtkpkgpatternview.cc 2010-04-20 16:53:30.000000000 +0200 @@ -10,8 +10,11 @@ #include "YGUtils.h" #include "ygtkpkgpatternview.h" #include "ygtktreeview.h" +#include "ygtkcellrenderertext.h" #include <gtk/gtk.h> +#define GRAY_COLOR "#727272" + enum Column { HAS_CHECK_COLUMN, CHECK_COLUMN, HAS_ICON_COLUMN, ICON_COLUMN, TEXT_COLUMN, TOOLTIP_COLUMN, ORDER_COLUMN, POINTER_COLUMN, TOTAL_COLUMNS @@ -127,7 +130,8 @@ int installed, total; Ypp::Collection (sel).stats (&installed, &total); - gchar *text = g_strdup_printf ("%s\nInstalled %d of %d", + gchar *text = g_strdup_printf ("%s\nInstalled %d of %d", sel.name().c_str(), installed, total); GtkTreeStore *store = GTK_TREE_STORE (model); @@ -405,7 +409,7 @@ if (!reverse) gtk_tree_view_column_pack_start (column, pix_renderer, FALSE); - renderer = gtk_cell_renderer_text_new(); + renderer = ygtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_attributes (column, renderer, "markup", TEXT_COLUMN, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/yzyppwrapper.cc new/yast2-gtk-2.21.44/src/pkg/yzyppwrapper.cc --- old/yast2-gtk-2.21.42/src/pkg/yzyppwrapper.cc 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/src/pkg/yzyppwrapper.cc 2010-04-20 16:53:30.000000000 +0200 @@ -213,8 +213,7 @@ return !m_sel->installedEmpty(); case PATTERN: case PATCH: - return m_sel->candidateObj().isSatisfied() || - m_sel->hasInstalledObj(); + return m_sel->isSatisfied(); case LANGUAGE: return _zyppPool().isRequestedLocale (m_locale); case ALL: break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.42/src/pkg/yzyppwrapper.h new/yast2-gtk-2.21.44/src/pkg/yzyppwrapper.h --- old/yast2-gtk-2.21.42/src/pkg/yzyppwrapper.h 2010-04-19 15:40:03.000000000 +0200 +++ new/yast2-gtk-2.21.44/src/pkg/yzyppwrapper.h 2010-04-20 16:53:30.000000000 +0200 @@ -122,6 +122,8 @@ Size_t size(); Size_t downloadSize(); + bool isInstalled(); + bool operator < (Version &other); bool operator > (Version &other); bool operator == (Version &other); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gwibber for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package gwibber for openSUSE:Factory checked in at Wed Apr 21 01:57:00 CEST 2010. -------- --- GNOME/gwibber/gwibber.changes 2010-04-15 12:17:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/gwibber/gwibber.changes 2010-04-20 15:19:03.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 20 09:40:00 BST 2010 - riggwelter(a)opensuse.org + +- Patch gwibber-bzr724.patch to fix bug where some messages were + missed when the UI is refreshed. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gwibber-bzr724.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwibber.spec ++++++ --- /var/tmp/diff_new_pack.Aw7t8p/_old 2010-04-21 01:56:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Aw7t8p/_new 2010-04-21 01:56:55.000000000 +0200 @@ -20,7 +20,7 @@ Name: gwibber Version: 2.31.1+bzr720 -Release: 1 +Release: 2 License: GPLv2+ Summary: Microblogging Client Url: https://launchpad.net/gwibber @@ -28,6 +28,8 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-UPSTREAM gwibber-stnx.diff lp#420986 Patch0: gwibber-stnx.diff +# PATCH-FIX-UPSTREAM gwibber-bzr724.patch lp:~segphault/gwibber/230-sqlite-backend Revision 724 riggwelter(a)opensuse.org -- Applied upstream without bugzilla entry. +Patch1: gwibber-bzr724.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: python @@ -62,6 +64,7 @@ %prep %setup -q %patch0 -p1 +%patch1 %build python setup.py build ++++++ gwibber-bzr724.patch ++++++ === modified file 'gwibber/microblog/dispatcher.py' --- gwibber/microblog/dispatcher.py 2010-04-15 07:06:48 +0000 +++ gwibber/microblog/dispatcher.py 2010-04-19 17:41:39 +0000 @@ -323,8 +323,6 @@ def loading_complete(self, output): self.refresh_count += 1 - self.LoadingComplete() - log.logger.info("Loading complete: %s - %s", self.refresh_count, [o[0] for o in output]) items = [] for o in output: @@ -334,6 +332,9 @@ with sqlite3.connect(SQLITE_DB_FILENAME) as db: db.executemany("INSERT OR REPLACE INTO messages (%s) VALUES (%s)" % ( ",".join(self.messages.columns), ",".join("?" * len(self.messages.columns))), items) + + self.LoadingComplete() + log.logger.info("Loading complete: %s - %s", self.refresh_count, [o[0] for o in output]) def loading_failed(self, exception, tb): log.logger.error("Loading failed: %s - %s", exception, tb) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libfm for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package libfm for openSUSE:Factory checked in at Wed Apr 21 01:56:56 CEST 2010. -------- --- libfm/libfm.changes 2010-04-19 02:15:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/libfm/libfm.changes 2010-04-20 00:36:34.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 19 21:24:13 UTC 2010 - andrea(a)opensuse.org + +- add workarounds to fix sf#2983540 (bgo#612802, bnc#593094, + bxo#6230 ) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfm.spec ++++++ --- /var/tmp/diff_new_pack.HyIGPm/_old 2010-04-21 01:56:48.000000000 +0200 +++ /var/tmp/diff_new_pack.HyIGPm/_new 2010-04-21 01:56:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libfm (Version 0.1.10beta+git20100419) +# spec file for package libfm (Version 0.1.10beta+git20100420) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: libfm Summary: A glib/gio-based lib used to develop file managers -Version: 0.1.10beta+git20100419 +Version: 0.1.10beta+git20100420 Release: 1 License: GPLv2 Group: Development/Libraries/C and C++ ++++++ libfm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfm/configure.ac new/libfm/configure.ac --- old/libfm/configure.ac 2010-04-19 02:10:11.000000000 +0200 +++ new/libfm/configure.ac 2010-04-19 23:08:28.000000000 +0200 @@ -19,7 +19,8 @@ # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. -AC_CHECK_FUNCS(mmap) +AC_FUNC_MMAP +AC_CHECK_LIB(m, pow) # Large file support AC_ARG_ENABLE([largefile], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfm/po/de.po new/libfm/po/de.po --- old/libfm/po/de.po 2010-04-18 14:54:37.000000000 +0200 +++ new/libfm/po/de.po 2010-04-19 23:08:28.000000000 +0200 @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: libfm 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 02:56+0200\n" +"POT-Creation-Date: 2010-04-19 04:16+0000\n" "PO-Revision-Date: 2010-04-13 20:19+0100\n" "Last-Translator: Lutz Thuns <lOtz1009(a)opensuse.org>\n" "Language-Team: German\n" @@ -172,7 +172,7 @@ #: ../data/ui/file-prop.glade.h:18 msgid "None" -msgstr "" +msgstr "Keine" #: ../data/ui/file-prop.glade.h:19 msgid "Operations that all other users can do" @@ -184,9 +184,7 @@ #: ../data/ui/file-prop.glade.h:21 msgid "Operations that users in the same group as the owner of the file can do" -msgstr "" -"Vorgänge, die die Benutzer in der gleichen Gruppe wie der Besitzer ausführen " -"können" +msgstr "Vorgänge, die die Benutzer in der gleichen Gruppe wie der Besitzer ausführen können" #: ../data/ui/file-prop.glade.h:22 msgid "Read and Write" @@ -240,7 +238,6 @@ msgstr "Vorbereiten..." #: ../data/ui/preferred-apps.glade.h:1 -#, fuzzy msgid "Mail client" msgstr "E-Mail-Client" @@ -269,12 +266,8 @@ msgstr "Installierte Anwendungen" #: ../data/ui/preferred-apps.glade.h:8 -msgid "" -"The preferred Mail Client will be used to compose emails when you click on E-" -"mail addresses." -msgstr "" -"Der bevorzugte Email-Client wird zum Verfassen von Nachrichten benutzt, wenn " -"Sie auf E-Mail Adressen klicken." +msgid "The preferred Mail Client will be used to compose emails when you click on E-mail addresses." +msgstr "Der bevorzugte Email-Client wird zum Verfassen von Nachrichten benutzt, wenn Sie auf E-Mail Adressen klicken." #: ../data/ui/preferred-apps.glade.h:9 msgid "The preferred Web Browser will be used to open hyperlinks." @@ -327,19 +320,19 @@ msgid "Mount Point" msgstr "Einhängepunkt" -#: ../src/base/fm-path.c:435 +#: ../src/base/fm-path.c:436 msgid "Trash Can" msgstr "Papierkorb" -#: ../src/base/fm-path.c:437 +#: ../src/base/fm-path.c:438 msgid "My Computer" msgstr "Mein Computer" -#: ../src/base/fm-path.c:445 ../src/gtk/fm-places-view.c:567 +#: ../src/base/fm-path.c:446 ../src/gtk/fm-places-view.c:567 msgid "Applications" msgstr "Anwendungen" -#: ../src/base/fm-path.c:448 +#: ../src/base/fm-path.c:449 msgid "Network" msgstr "Netzwerk" @@ -402,11 +395,8 @@ # Direkte Anrede: Wollen Sie... ???? #: ../src/gtk/fm-file-properties.c:351 -msgid "" -"Do you want to recursively apply these changes to all files and sub-folders?" -msgstr "" -"Sollen diese Änderungen rekursiv auf alle Dateien und Unterordner angewendet " -"werden?" +msgid "Do you want to recursively apply these changes to all files and sub-folders?" +msgstr "Sollen diese Änderungen rekursiv auf alle Dateien und Unterordner angewendet werden?" #: ../src/gtk/fm-file-properties.c:625 msgid "Files of different types" @@ -426,7 +416,6 @@ # besser: Wechseldatenträger? #: ../src/gtk/fm-places-view.c:134 -#, fuzzy msgid "Eject Removable Media" msgstr "Wechselmedium auswerfen" @@ -483,8 +472,9 @@ msgstr "Entpacken nach..." #: ../src/gtk/fm-dnd-dest.c:449 +#, fuzzy msgid "XDirectSave failed." -msgstr "" +msgstr "XDirectSave fehlgeschlagen." #: ../src/gtk/fm-app-chooser-dlg.c:96 msgid "Use selected application to open files" @@ -528,7 +518,6 @@ # oder doch Systemadministratoren? #: ../src/gtk/fm-gtk-utils.c:385 -#, fuzzy msgid "Only system administrators have the permission to do this." msgstr "Nur Systemverwalter haben die Erlaubnis dies zu tun." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfm/src/gtk/fm-folder-view.c new/libfm/src/gtk/fm-folder-view.c --- old/libfm/src/gtk/fm-folder-view.c 2010-04-11 01:35:45.000000000 +0200 +++ new/libfm/src/gtk/fm-folder-view.c 2010-04-19 23:08:28.000000000 +0200 @@ -77,6 +77,7 @@ static void on_small_icon_size_changed(FmConfig* cfg, FmFolderView* fv); static void on_thumbnail_size_changed(FmConfig* cfg, FmFolderView* fv); +static void cancel_pending_row_activated(FmFolderView* fv); static void fm_folder_view_class_init(FmFolderViewClass *klass) { @@ -247,9 +248,38 @@ item_clicked(fv, path, FM_FV_ACTIVATED); } +static gboolean on_idle_tree_view_row_activated(FmFolderView* fv) +{ + GtkTreePath* path; + if(gtk_tree_row_reference_valid(fv->activated_row_ref)) + { + path = gtk_tree_row_reference_get_path(fv->activated_row_ref); + item_clicked(fv, path, FM_FV_ACTIVATED); + } + gtk_tree_row_reference_free(fv->activated_row_ref); + fv->activated_row_ref = NULL; + fv->row_activated_idle = 0; + return FALSE; +} + static void on_tree_view_row_activated(GtkTreeView* tv, GtkTreePath* path, GtkTreeViewColumn* col, FmFolderView* fv) { - item_clicked(fv, path, FM_FV_ACTIVATED); + /* Due to GTK+ and libexo bugs, here a workaround is needed. + * https://bugzilla.gnome.org/show_bug.cgi?id=612802 + * http://bugzilla.xfce.org/show_bug.cgi?id=6230 + * Gtk+ 2.20+ changed its behavior, which is really bad. + * row-activated signal is now issued in the second button-press events + * rather than double click events. The content of the view and model + * gets changed in row-activated signal handler before button-press-event + * handling is finished, and this breaks button-press handler of ExoTreeView + * and causing some selection-related bugs since select function cannot be reset.*/ + + cancel_pending_row_activated(fv); + if(fv->model) + { + fv->activated_row_ref = gtk_tree_row_reference_new(GTK_TREE_MODEL(fv->model), path); + g_idle_add((GSourceFunc)on_idle_tree_view_row_activated, fv); + } } static void fm_folder_view_init(FmFolderView *self) @@ -304,6 +334,8 @@ g_signal_handlers_disconnect_by_func(fm_config, on_single_click_changed, object); + cancel_pending_row_activated(self); + if(self->icon_size_changed_handler) g_signal_handler_disconnect(fm_config, self->icon_size_changed_handler); @@ -528,6 +560,7 @@ ts = gtk_tree_view_get_selection((GtkTreeView*)fv->view); g_signal_connect(fv->view, "row-activated", G_CALLBACK(on_tree_view_row_activated), fv); g_signal_connect(ts, "changed", G_CALLBACK(on_sel_changed), fv); + /*cancel_pending_row_activated(fv);*/ /* FIXME: is this needed? */ gtk_tree_view_set_model((GtkTreeView*)fv->view, fv->model); gtk_tree_selection_set_mode(ts, fv->sel_mode); for(l = sels;l;l=l->next) @@ -650,6 +683,7 @@ switch(fv->mode) { case FM_FV_LIST_VIEW: + cancel_pending_row_activated(fv); gtk_tree_view_set_model(GTK_TREE_VIEW(fv->view), NULL); break; case FM_FV_ICON_VIEW: @@ -678,6 +712,7 @@ switch(fv->mode) { case FM_FV_LIST_VIEW: + cancel_pending_row_activated(fv); gtk_tree_view_set_model(GTK_TREE_VIEW(fv->view), model); icon_size = fm_config->small_icon_size; fm_folder_model_set_icon_size(model, icon_size); @@ -744,6 +779,7 @@ switch(fv->mode) { case FM_FV_LIST_VIEW: + cancel_pending_row_activated(fv); gtk_tree_view_set_model(GTK_TREE_VIEW(fv->view), NULL); break; case FM_FV_ICON_VIEW: @@ -1081,3 +1117,14 @@ { return FM_FOLDER_MODEL(fv->model)->dir->dir_fi; } + +static void cancel_pending_row_activated(FmFolderView* fv) +{ + if(fv->row_activated_idle) + { + g_source_remove(fv->row_activated_idle); + fv->row_activated_idle = 0; + gtk_tree_row_reference_free(fv->activated_row_ref); + fv->activated_row_ref = NULL; + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libfm/src/gtk/fm-folder-view.h new/libfm/src/gtk/fm-folder-view.h --- old/libfm/src/gtk/fm-folder-view.h 2010-04-10 00:55:09.000000000 +0200 +++ new/libfm/src/gtk/fm-folder-view.h 2010-04-19 23:08:28.000000000 +0200 @@ -85,6 +85,10 @@ FmPath* cwd; FmDndSrc* dnd_src; /* dnd source manager */ FmDndDest* dnd_dest; /* dnd dest manager */ + + /* wordarounds to fix new gtk+ bug introduced in gtk+ 2.20: #612802 */ + GtkTreeRowReference* activated_row_ref; /* for row-activated handler */ + guint row_activated_idle; }; struct _FmFolderViewClass ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-NetAddr-IP for openSUSE:Factory
by root＠hilbert.suse.de 20 Apr '10

20 Apr '10

Hello community, here is the log from the commit of package perl-NetAddr-IP for openSUSE:Factory checked in at Wed Apr 21 01:56:43 CEST 2010. -------- --- perl-NetAddr-IP/perl-NetAddr-IP.changes 2009-05-30 23:07:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-NetAddr-IP/perl-NetAddr-IP.changes 2010-04-21 01:24:42.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Apr 20 23:21:17 UTC 2010 - chris(a)computersalat.de + +- update to 4.027 + * In NetAddr::IP::Util v1.31, + ferret out shell value for Makefile.PL when calling + ./configure for systems where the 'x' bit gets lost + due to bug in Archive::Tar +- cleanup spec + * BuildReq perl + * sort TAGS + * updated Url, description + * removed Provides NetAddr + * macro usage +- added perl-macros + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- NetAddr-IP-4.026.tar.bz2 New: ---- NetAddr-IP-4.027.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-NetAddr-IP.spec ++++++ --- /var/tmp/diff_new_pack.EiXGJ3/_old 2010-04-21 01:56:37.000000000 +0200 +++ /var/tmp/diff_new_pack.EiXGJ3/_new 2010-04-21 01:56:37.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package perl-NetAddr-IP (Version 4.026) +# spec file for package perl-NetAddr-IP (Version 4.027) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,22 +19,25 @@ Name: perl-NetAddr-IP -Summary: NetAddr::IP - Manages IP addresses and subnets -Version: 4.026 +%define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) +Summary: Manages IPv4 and IPv6 addresses and subnets +Version: 4.027 Release: 1 -Url: http://search.cpan.org/perldoc?NetAddr::IP License: Artistic License .. Group: Development/Libraries/Perl -Requires: perl = %{perl_version} -Provides: NetAddr -AutoReqProv: on -Source: NetAddr-IP-%{version}.tar.bz2 -Patch1: NetAddr-IP-%{version}-no-return-in-nonvoid-function.patch -Patch2: NetAddr-IP-%{version}-sequence-point.patch +Url: http://search.cpan.org/dist/NetAddr-IP +Source: %{cpan_name}-%{version}.tar.bz2 +Patch1: %{cpan_name}-4.026-no-return-in-nonvoid-function.patch +Patch2: %{cpan_name}-4.026-sequence-point.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl +%if 0%{?suse_version} < 1120 +BuildRequires: perl-macros +%endif +Requires: perl = %{perl_version} %description -This module is designed as a help for managing (ranges of) IP +This distribution is designed as a help for managing (ranges of) IP addresses. It includes efficient implementations for most common tasks done to subnets or ranges of IP addresses, namely verifying if an address is within a subnet, comparing, looping, splitting subnets into @@ -47,38 +50,27 @@ Luis E. Munoz <luismunoz(a)cpan.org> %prep -%setup -n NetAddr-IP-%{version} +%setup -n %{cpan_name}-%{version} %patch1 %patch2 %build -CFLAGS="%optflags" perl Makefile.PL -make %{?jobs:-j%jobs} +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS -Wall" +%{__make} %{?jobs:-j%jobs} %check -make test +%{__make} test %install %perl_make_install %perl_process_packlist +%perl_gen_filelist %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} -%files +%files -f %{name}.files %defattr(-,root,root) %doc Changes MANIFEST README TODO docs/rfc1884.txt -%dir %{perl_vendorarch}/NetAddr -%dir %{perl_vendorarch}/auto/NetAddr -%dir %{perl_vendorarch}/auto/NetAddr/IP -%{perl_vendorarch}/NetAddr/IP.pm -%{perl_vendorarch}/NetAddr/IP -%{perl_vendorarch}/auto/NetAddr/IP/.packlist -%{perl_vendorarch}/auto/NetAddr/IP -%doc %{_mandir}/man?/NetAddr::IP.3pm.gz -%doc %{_mandir}/man?/NetAddr::IP::Lite.3pm.gz -%doc %{_mandir}/man?/NetAddr::IP::Util.3pm.gz -%doc %{_mandir}/man?/NetAddr::IP::UtilPP.3pm.gz -/var/adm/perl-modules/%{name} %changelog ++++++ NetAddr-IP-4.026.tar.bz2 -> NetAddr-IP-4.027.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetAddr-IP-4.026/Changes new/NetAddr-IP-4.027/Changes --- old/NetAddr-IP-4.026/Changes 2009-03-08 01:36:06.000000000 +0100 +++ new/NetAddr-IP-4.027/Changes 2009-06-09 19:34:59.000000000 +0200 @@ -1,5 +1,11 @@ Revision history for Perl extension NetAddr::IP +4.027 Tue Jun 9 10:31:11 PDT 2009 + In NetAddr::IP::Util v1.31, + ferret out shell value for Makefile.PL when calling + ./configure for systems where the 'x' bit gets lost + due to bug in Archive::Tar + 4.026 Sat Mar 7 16:35:33 PST 2009 make the compiler test check the environment for CC before using Perl's default compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetAddr-IP-4.026/IP.pm new/NetAddr-IP-4.027/IP.pm --- old/NetAddr-IP-4.026/IP.pm 2009-03-08 01:36:28.000000000 +0100 +++ new/NetAddr-IP-4.027/IP.pm 2009-06-09 19:35:18.000000000 +0200 @@ -34,7 +34,7 @@ @ISA = qw(Exporter NetAddr::IP::Lite); -$VERSION = do { sprintf " %d.%03d", (q$Revision: 4.26 $ =~ /\d+/g) }; +$VERSION = do { sprintf " %d.%03d", (q$Revision: 4.27 $ =~ /\d+/g) }; =pod diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetAddr-IP-4.026/Lite/Util/Changes new/NetAddr-IP-4.027/Lite/Util/Changes --- old/NetAddr-IP-4.026/Lite/Util/Changes 2009-03-08 01:35:45.000000000 +0100 +++ new/NetAddr-IP-4.027/Lite/Util/Changes 2009-06-09 19:31:23.000000000 +0200 @@ -1,5 +1,10 @@ Revision history for Perl extension NetAddr::IP::Util +1.31 Tue Jun 9 10:31:11 PDT 2009 + ferret out shell value for Makefile.PL when calling + ./configure for systems where the 'x' bit gets lost + due to bug in Archive::Tar + 1.30 Sat Mar 7 16:35:33 PST 2009 make the compiler test check the environment for CC before using Perl's default compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetAddr-IP-4.026/Lite/Util/Makefile.PL new/NetAddr-IP-4.027/Lite/Util/Makefile.PL --- old/NetAddr-IP-4.026/Lite/Util/Makefile.PL 2009-03-08 01:34:09.000000000 +0100 +++ new/NetAddr-IP-4.027/Lite/Util/Makefile.PL 2009-06-09 19:29:37.000000000 +0200 @@ -82,7 +82,7 @@ delete $makeparms{'C'}; unless (-e './config.h') { - system('./configure'); + system $Config{sh}, 'configure'; } my @LIBS; open(F,'config.h') or die "could not open config.h\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetAddr-IP-4.026/Lite/Util/Util.pm new/NetAddr-IP-4.027/Lite/Util/Util.pm --- old/NetAddr-IP-4.026/Lite/Util/Util.pm 2009-03-08 01:34:27.000000000 +0100 +++ new/NetAddr-IP-4.027/Lite/Util/Util.pm 2009-06-09 19:31:48.000000000 +0200 @@ -13,7 +13,7 @@ @ISA = qw(Exporter DynaLoader); -$VERSION = do { my @r = (q$Revision: 1.30 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; +$VERSION = do { my @r = (q$Revision: 1.31 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; @EXPORT_OK = qw( inet_aton diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/NetAddr-IP-4.026/META.yml new/NetAddr-IP-4.027/META.yml --- old/NetAddr-IP-4.026/META.yml 2009-03-08 01:37:18.000000000 +0100 +++ new/NetAddr-IP-4.027/META.yml 2009-06-09 19:35:47.000000000 +0200 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: NetAddr-IP -version: 4.026 +version: 4.027 abstract: Manages IPv4 and IPv6 addresses and subnets license: ~ author: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0