May 2009 - openSUSE Commits - openSUSE Mailing Lists

commit ibmrtpkgs for openSUSE:Factory
by root＠Hilbert.suse.de 07 May '09

07 May '09

Hello community, here is the log from the commit of package ibmrtpkgs for openSUSE:Factory checked in at Thu May 7 02:49:33 CEST 2009. -------- --- ibmrtpkgs/ibmrtpkgs.changes 2009-03-18 20:10:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/ibmrtpkgs/ibmrtpkgs.changes 2009-05-07 02:31:15.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 7 01:03:42 CEST 2009 - alext(a)suse.de + +- Added fix for edac patch from bnc#481626, comment#33. + +------------------------------------------------------------------- +Wed Apr 1 22:04:27 CEST 2009 - alext(a)suse.de + +- Added edac patch from bnc#481626, comment#18. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bnc481626_ibm-prtm-patch_edac.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibmrtpkgs.spec ++++++ --- /var/tmp/diff_new_pack.t10930/_old 2009-05-07 02:49:20.000000000 +0200 +++ /var/tmp/diff_new_pack.t10930/_new 2009-05-07 02:49:20.000000000 +0200 @@ -21,7 +21,7 @@ Url: http://www10.software.ibm.com/developerworks/opensource/linux390 Summary: IBM Utilities for SLERT Version: 2 -Release: 9 +Release: 10 PreReq: %insserv_prereq %fillup_prereq License: GPL v3 only Group: System/Management @@ -39,6 +39,7 @@ Patch11: ibm-prtmd-in-usr_sbin.diff Patch12: ibm-prtmd-ls21-reorder.diff Patch13: correct-nice-for-realtime-bnc464343.patch +Patch14: bnc481626_ibm-prtm-patch_edac.diff AutoReqProv: yes BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,6 +70,7 @@ %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 %build export OPT_FLAGS="$RPM_OPT_FLAGS" @@ -127,6 +129,10 @@ %dir /etc/modprobe.d %changelog +* Thu May 07 2009 alext(a)suse.de +- Added fix for edac patch from bnc#481626, comment#33. +* Wed Apr 01 2009 alext(a)suse.de +- Added edac patch from bnc#481626, comment#18. * Wed Mar 18 2009 alext(a)suse.de - Fixed minor spec file errors for head * Thu Mar 12 2009 alext(a)suse.de @@ -145,7 +151,7 @@ * Mon Nov 24 2008 alext(a)suse.de - Fixed path of rtcheck to be in /sbin - Renamed config.sh to ibmconfig.sh to avoid confusion -* Tue Nov 11 2008 alext(a)suse.de +* Wed Nov 12 2008 alext(a)suse.de - Upgrade ibm-prtm utility for support for LS22 hardware. Patch: ibm-prtm_for_ls22-bnc443830.diff Fixes: bnc#443830 ++++++ bnc481626_ibm-prtm-patch_edac.diff ++++++ Index: ibmrtpkgs-2/ibm-prtm/ibm-prtm =================================================================== --- ibmrtpkgs-2.orig/ibm-prtm/ibm-prtm +++ ibmrtpkgs-2/ibm-prtm/ibm-prtm @@ -49,13 +49,22 @@ start() { fi logger -s -t "$NAME" "BIOS Real-Time module loaded." - + + #k8_edac gets in the way on some machines; remove it and use amd64_edac + if [ `lsmod | grep -c k8_edac ` -ne 0 ]; then + rmmod k8_edac && modprobe amd64_edac + if [ "$?" -ne "0" ]; then + logger -s -t "$NAME" "Please install amd64_edac module!" + exit 1; + fi + fi + for mod in ipmi_si ipmi_msghandler ipmi_devintf do modprobe $mod if [ "$?" -ne "0" ]; then logger -s -t "$NAME" "Please install $mod module!" - exit 1; + exit 1; fi done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 desktop-data-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 07 May '09

07 May '09

Hello community, here is the log from the commit of package desktop-data-openSUSE for openSUSE:Factory checked in at Thu May 7 02:49:03 CEST 2009. -------- --- desktop-data-openSUSE/desktop-data-openSUSE.changes 2009-02-05 11:56:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data-openSUSE.changes 2009-05-06 18:21:33.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 6 18:21:16 CEST 2009 - llunak(a)suse.cz + +- remove /opt/kde3 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-data-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.o10131/_old 2009-05-07 02:48:46.000000000 +0200 +++ /var/tmp/diff_new_pack.o10131/_new 2009-05-07 02:48:46.000000000 +0200 @@ -21,7 +21,7 @@ Name: desktop-data-openSUSE BuildRequires: hicolor-icon-theme perl-RPC-XML update-desktop-files xdg-menu xdg-utils Version: 11.2 -Release: 1 +Release: 2 Summary: SUSE Theme Files for KDE and GNOME License: GPL v2 or later Group: System/GUI/Other @@ -208,6 +208,8 @@ %dir /usr/share/gnome-background-properties %changelog +* Wed May 06 2009 llunak(a)suse.cz +- remove /opt/kde3 * Thu Feb 05 2009 stbinner(a)suse.de - bump version to 11.2 - add Oxygen icon set for application menu categories (bnc#439015) @@ -222,7 +224,7 @@ - add more legal Categories to desktop-data-openSUSE (bnc#430979) * Thu Jun 26 2008 stbinner(a)suse.de - bump version to 11.1 -* Fri May 23 2008 hpj(a)suse.de +* Sat May 24 2008 hpj(a)suse.de - Add a /usr/share/icons/default symlink that points to the DMZ cursor theme (bnc#328016). * Fri May 23 2008 stbinner(a)suse.de @@ -314,7 +316,7 @@ - fix typo in wallpaper meta data (#216132) * Mon Oct 02 2006 stbinner(a)suse.de - bump version number to 10.2 -* Fri Sep 08 2006 dmueller(a)suse.de +* Sat Sep 09 2006 dmueller(a)suse.de - fix fillup comment * Fri Sep 01 2006 stbinner(a)suse.de - rename development's "Project Management" to "Design" (#115167) @@ -494,7 +496,7 @@ * Sat Feb 28 2004 adrian(a)suse.de - add SUSE Sans fonts (based on Bitstream Vera with additional latin glyphs) -* Sat Feb 21 2004 adrian(a)suse.de +* Sun Feb 22 2004 adrian(a)suse.de - cleanup more double menu entries - fix Database tags * Wed Feb 18 2004 adrian(a)suse.de ++++++ desktop-data.tar.bz2 ++++++ desktop-data-openSUSE/desktop-data.tar.bz2 /mounts/work_src_done/STABLE/desktop-data-openSUSE/desktop-data.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xsane for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package xsane for openSUSE:Factory checked in at Wed May 6 18:58:48 CEST 2009. -------- --- xsane/xsane.changes 2008-09-04 12:52:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/xsane/xsane.changes 2009-05-06 18:14:14.000000000 +0200 @@ -1,0 +2,10 @@ +Wed May 6 12:52:59 CEST 2009 - sbrabec(a)suse.cz + +- Updated to version 0.996: + * corrected bug in PDF documents + * viewer window does not use full screen without window frame for + large images any more +- Use upstream desktop and icon. +- Use %find_lang. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- scanner_32x32.png xsane-0.995.tar.bz2 xsane.desktop New: ---- xsane-0.996.tar.bz2 xsane-desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsane.spec ++++++ --- /var/tmp/diff_new_pack.AJ4679/_old 2009-05-06 18:58:34.000000000 +0200 +++ /var/tmp/diff_new_pack.AJ4679/_new 2009-05-06 18:58:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xsane (Version 0.995) +# spec file for package xsane (Version 0.996) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -35,17 +35,13 @@ Provides: gimp-2.0-scanner-plugin AutoReqProv: on Summary: A GTK-Based Graphical Scanning Front-End for SANE -Version: 0.995 -Release: 136 +Version: 0.996 +Release: 1 Url: http://www.xsane.org/ # URL for Source0: http://www.xsane.org/download/xsane-0.995.tar.gz Source0: xsane-%{version}.tar.bz2 -# Source1 is the primary source for the suse_update_desktop_file stuff -Source1: %name.desktop -# Source2 is an icon file for xsane (needed by xsane.desktop) -# It is the 32x32 scanner.png from the kdelibs3-3.3.0 package. -# I don't want to have kdelibs3 in neededforbuild because xsane doesn't need KDE stuff for build -Source2: scanner_32x32.png +# PATCH-FIX-UPSTREAM xsane-desktop.patch sbrabec(a)suse.cz -- Fix upstream desktop file. +Patch: %{name}-desktop.patch # Patch100... is SUSE specific stuff: # Patch100 suppresses the disclaimer of warranty and liability dialog # and adds a modification note and adds a openSUSE Bugzilla URL @@ -84,6 +80,11 @@ %prep # Be quiet when unpacking: %setup -q +# zh is not valid locale. In fact it is zh_TW: +mv po/zh.po po/zh_TW.po +mv po/zh.gmo po/zh_TW.gmo +sed -i "s/ zh / zh_TW /" configure.in configure +%patch # Patch100 suppresses the disclaimer of warranty and liability dialog # and adds a modification note and adds a openSUSE Bugzilla URL # to make the change obvious for the user and direct bug reports to us: @@ -98,47 +99,50 @@ %build %{?suse_update_config:%{suse_update_config -f}} # Set our preferred architecture-specific flags for the compiler and linker: -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # See /usr/lib/rpm/suse_macros regarding our RPM macros (e.g. sysconfdir is /etc): -./configure --prefix=%{_prefix} \ - --exec-prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --mandir=%{_mandir} \ +#ACLOCAL="aclocal -I m4" autoreconf -f -i +%configure\ --enable-gimp -make +make %{?jobs:-j%jobs}\ + xsanedocdir=%{_docdir}/%{name} %install -# rpmlint reports: install-no-mkdir-buildroot -# Don't clean the buildroot in install, because that's anyway already done by rpm: -#rm -rf $RPM_BUILD_ROOT -make prefix=$RPM_BUILD_ROOT%{_prefix} \ - exec_prefix=$RPM_BUILD_ROOT%{_prefix} \ - sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - install +make install\ + prefix=$RPM_BUILD_ROOT%{_prefix}\ + bindir=$RPM_BUILD_ROOT%{_bindir}\ + datadir=$RPM_BUILD_ROOT%{_datadir}\ + mandir=$RPM_BUILD_ROOT%{_mandir}\ + desktopappdir=$RPM_BUILD_ROOT%{_datadir}/applications\ + pixmapdir=$RPM_BUILD_ROOT%{_datadir}/pixmaps # Create GIMP plugin link: mkdir -p $RPM_BUILD_ROOT%{_libdir}/gimp/2.0/plug-ins ln -sf %{_bindir}/xsane $RPM_BUILD_ROOT%{_libdir}/gimp/2.0/plug-ins/xsane -# Desktop menue entry stuff: -install -d -m755 $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/scanner_32x32.png -%suse_update_desktop_file -i %{name} Graphics Scanning +%suse_update_desktop_file %{name} +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root) -%doc xsane* +# Exclude xsane.WIN* and xsane,INSTALL: +%doc xsane.[A-HJ-VX-Z]* %{_bindir}/xsane -%{_datadir}/sane/xsane/ -%{_datadir}/locale/*/LC_MESSAGES/xsane.mo -%{_mandir}/man1/xsane.1.gz -%{_libdir}/gimp/2.0/plug-ins/xsane -%{_datadir}/applications/%name.desktop -%{_datadir}/pixmaps/scanner_32x32.png +%{_datadir}/sane/xsane +%doc %{_mandir}/man1/xsane.1* +%{_libdir}/gimp/2.0/plug-ins/* +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/*.xpm %changelog +* Wed May 06 2009 sbrabec(a)suse.cz +- Updated to version 0.996: + * corrected bug in PDF documents + * viewer window does not use full screen without window frame for + large images any more +- Use upstream desktop and icon. +- Use %%find_lang. * Thu Sep 04 2008 jsmeix(a)suse.de - Provide the RPM capability "gimp-2.0-scanner-plugin" which is also provided by the sane-frontends RPM so that the gimp RPM ++++++ xsane-0.995.tar.bz2 -> xsane-0.996.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/configure new/xsane-0.996/configure --- old/xsane-0.995/configure 2007-11-21 19:57:44.000000000 +0100 +++ new/xsane-0.996/configure 2007-12-17 11:18:11.000000000 +0100 @@ -1322,7 +1322,7 @@ # version code: V_MAJOR=0 -V_MINOR=995 +V_MINOR=996 PACKAGE=xsane diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/configure.in new/xsane-0.996/configure.in --- old/xsane-0.995/configure.in 2007-11-21 19:57:18.000000000 +0100 +++ new/xsane-0.996/configure.in 2007-12-17 11:17:50.000000000 +0100 @@ -6,7 +6,7 @@ # version code: V_MAJOR=0 -V_MINOR=995 +V_MINOR=996 PACKAGE=xsane diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/include/config.h new/xsane-0.996/include/config.h --- old/xsane-0.995/include/config.h 2007-03-28 20:01:27.000000000 +0200 +++ new/xsane-0.996/include/config.h 2008-09-21 20:04:28.000000000 +0200 @@ -99,10 +99,10 @@ #define PACKAGE "xsane" /* Define to the version of the distribution. */ -#define VERSION "0.995" +#define VERSION "0.996" /* The concatenation of the strings PACKAGE, "-", and VERSION. */ -#define XSANE_PACKAGE_VERSION "xsane-0.995" +#define XSANE_PACKAGE_VERSION "xsane-0.996" /* Define if you have the __argz_count function. */ #define HAVE___ARGZ_COUNT 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/Makefile.in new/xsane-0.996/Makefile.in --- old/xsane-0.995/Makefile.in 2006-01-01 15:01:36.000000000 +0100 +++ new/xsane-0.996/Makefile.in 2008-03-29 10:36:52.000000000 +0100 @@ -21,6 +21,7 @@ oldincludedir = /usr/include sanedatadir = @datadir@/sane +desktopappdir = @datadir@/applications MKDIR = $(top_srcdir)/mkinstalldirs INSTALL = @INSTALL@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/src/Makefile.in new/xsane-0.996/src/Makefile.in --- old/xsane-0.995/src/Makefile.in 2007-02-24 18:55:46.000000000 +0100 +++ new/xsane-0.996/src/Makefile.in 2008-03-29 10:51:00.000000000 +0100 @@ -23,6 +23,8 @@ configdir = ${sysconfdir}/sane.d sanedatadir = ${datadir}/sane xsanedocdir = ${datadir}/sane/xsane/doc +desktopappdir = @datadir@/applications +pixmapdir = @datadir@/pixmaps MKINSTALLDIRS = @MKINSTALLDIRS@ INSTALL = @INSTALL@ @@ -63,7 +65,7 @@ all: $(PROGRAMS) install: $(PROGRAMS) - $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(datadir) $(DESTDIR)$(sanedatadir) $(DESTDIR)$(xsanedocdir) $(DESTDIR)$(sanedatadir)/xsane + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(datadir) $(DESTDIR)$(sanedatadir) $(DESTDIR)$(xsanedocdir) $(DESTDIR)$(sanedatadir)/xsane $(DESTDIR)$(desktopappdir) $(DESTDIR)$(pixmapdir) @for program in $(BINPROGS); do \ $(INSTALL_PROGRAM) $${program} $(DESTDIR)$(bindir)/$${program}; \ done @@ -73,6 +75,8 @@ $(INSTALL_DATA) $(srcdir)/xsane-logo.xpm $(DESTDIR)$(sanedatadir)/xsane/xsane-logo.xpm $(INSTALL_DATA) $(srcdir)/xsane-gpl.txt $(DESTDIR)$(sanedatadir)/xsane/xsane-gpl.txt $(INSTALL_DATA) $(srcdir)/xsane-eula.txt $(DESTDIR)$(sanedatadir)/xsane/xsane-eula.txt + $(INSTALL_DATA) $(srcdir)/xsane.desktop $(DESTDIR)$(desktopappdir)/xsane.desktop + $(INSTALL_DATA) $(srcdir)/xsane.xpm $(DESTDIR)$(pixmapdir)/xsane.xpm @for logo in *-logo.xpm; do \ echo installing $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \ $(INSTALL_DATA) $(srcdir)/$${logo} $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \ @@ -91,6 +95,10 @@ rm -f $(DESTDIR)$(sanedatadir)/xsane/xsane-calibration.pnm echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/xsane-logo.xpm... rm -f $(DESTDIR)$(sanedatadir)/xsane/xsane-logo.xpm + echo uninstalling $(DESTDIR)$(desktopappdir)/xsane.desktop + rm -f $(DESTDIR)$(desktopappdir)/xsane.desktop + echo uninstalling $(DESTDIR)$(pixmapdir)/xsane.xpm + rm -f $(DESTDIR)$(pixmapdir)/xsane.xpm @for logo in *-logo.xpm; do \ echo uninstalling $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \ rm -f $(DESTDIR)$(sanedatadir)/xsane/$${logo}; \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/src/xsane.c new/xsane-0.996/src/xsane.c --- old/xsane-0.995/src/xsane.c 2007-09-28 17:24:56.000000000 +0200 +++ new/xsane-0.996/src/xsane.c 2008-03-29 09:56:30.000000000 +0100 @@ -2783,7 +2783,7 @@ { DBG(DBG_info ,"deleting %s\n", preferences.medium[selection]->name); - free(preferences.medium[selection]); + // free(preferences.medium[selection]); preferences.medium_definitions--; @@ -2791,6 +2791,7 @@ { preferences.medium[i] = preferences.medium[i+1]; } + preferences.medium = realloc(preferences.medium, preferences.medium_definitions * sizeof(void *)); // NEW if (preferences.medium_nr == selection) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/src/xsane.desktop new/xsane-0.996/src/xsane.desktop --- old/xsane-0.995/src/xsane.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/xsane-0.996/src/xsane.desktop 2008-03-29 10:32:18.000000000 +0100 @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=XSane - Scanning +Comment=Acquire images from a scanner +Exec=xsane +Icon=xsane +Terminal=false +Type=Application +Categories=Application;Graphics diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/src/xsane.h new/xsane-0.996/src/xsane.h --- old/xsane-0.995/src/xsane.h 2007-08-13 09:20:32.000000000 +0200 +++ new/xsane-0.996/src/xsane.h 2007-11-30 19:07:34.000000000 +0100 @@ -91,7 +91,7 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ -#define XSANE_VERSION "0.995" +#define XSANE_VERSION "0.996" #define XSANE_AUTHOR "Oliver Rauch" #define XSANE_COPYRIGHT "Oliver Rauch" #define XSANE_DATE "1998-2007" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/src/xsane-save.c new/xsane-0.996/src/xsane-save.c --- old/xsane-0.995/src/xsane-save.c 2007-05-17 14:53:40.000000000 +0200 +++ new/xsane-0.996/src/xsane-save.c 2008-09-20 22:48:29.000000000 +0200 @@ -2965,7 +2965,7 @@ { int x, y; int bytes_per_line = (image_info->image_width+7)/8; - int ret; + int ret = 0; unsigned char *line; DBG(DBG_proc, "xsane_save_ps_pdf_bw\n"); @@ -3016,6 +3016,7 @@ else { fwrite(line, bytes_per_line, 1, outfile); + ret = 0; } if ((ret != 0) || (ferror(outfile))) @@ -3054,7 +3055,7 @@ static int xsane_save_ps_pdf_gray(FILE *outfile, FILE *imagefile, Image_info *image_info, int ascii85decode, int flatedecode, cmsHTRANSFORM hTransform, int do_transform, GtkProgressBar *progress_bar, int *cancel_save) { int x, y; - int ret; + int ret = 0; unsigned char *line = NULL, *linep = NULL, *line16 = NULL; int bytes_per_line; int bytes_per_line16 = 0; @@ -3249,6 +3250,7 @@ else { fwrite(line, bytes_per_line, 1, outfile); + ret = 0; } if ((ret != 0) || (ferror(outfile))) @@ -3303,7 +3305,7 @@ GtkProgressBar *progress_bar, int *cancel_save) { int x, y; - int ret; + int ret = 0; unsigned char *line = NULL, *linep = NULL, *line16 = NULL; int bytes_per_line; int bytes_per_line16 = 0; @@ -3502,6 +3504,7 @@ else { fwrite(line, bytes_per_line, 1, outfile); + ret = 0; } if ((ret != 0) || (ferror(outfile))) @@ -3866,6 +3869,9 @@ fprintf(outfile, " >>\n"); fprintf(outfile, "endobj\n"); fprintf(outfile, "\n"); + + xref->obj[4] = 0; + xref->obj[5] = 0; } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -4087,7 +4093,14 @@ for (i=1; i <= pages * 2 + 7; i++) { - fprintf(outfile, "%010lu 00000 n \n", xref->obj[i]); + if (xref->obj[i] > 0) + { + fprintf(outfile, "%010lu 00000 n \n", xref->obj[i]); + } + else + { + fprintf(outfile, "%010lu 00000 f \n", 0L); + } } fprintf(outfile, "\n"); @@ -4186,9 +4199,6 @@ xsane_save_pdf_create_document_header(outfile, &xref, 1, flatedecode); - xref.obj[4] = ftell(outfile); - xref.obj[5] = ftell(outfile); - if (apply_ICM_profile && (cms_function == XSANE_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE)) { icc_object = 4; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/src/xsane-scan.c new/xsane-0.996/src/xsane-scan.c --- old/xsane-0.995/src/xsane-scan.c 2007-05-17 14:57:17.000000000 +0200 +++ new/xsane-0.996/src/xsane-scan.c 2007-11-30 21:27:12.000000000 +0100 @@ -1602,6 +1602,7 @@ else { DBG(DBG_info, "Normal end of scan\n"); + xsane.adf_page_counter = 0; xsane_set_sensitivity(TRUE); /* reactivate buttons etc */ sane_cancel(xsane.dev); /* stop scanning */ xsane_update_histogram(TRUE /* update raw */); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/src/xsane-setup.c new/xsane-0.996/src/xsane-setup.c --- old/xsane-0.995/src/xsane-setup.c 2007-08-13 09:20:17.000000000 +0200 +++ new/xsane-0.996/src/xsane-setup.c 2007-12-16 12:39:26.000000000 +0100 @@ -1056,7 +1056,18 @@ DBG(DBG_proc, "xsane_setup_browse_printer_icm_profile_callback\n"); old_printer_icm_profile = gtk_entry_get_text(GTK_ENTRY(xsane_setup.printer_icm_profile_entry)); +#if 0 strncpy(printer_icm_profile, old_printer_icm_profile, sizeof(printer_icm_profile)); +#else + if (strlen(old_printer_icm_profile)) /* if (old_printer_icm_profile[0]=='/') XXX */ + { + strncpy(printer_icm_profile, old_printer_icm_profile, sizeof(printer_icm_profile)); + } + else + { + strncpy(printer_icm_profile, "/", sizeof(printer_icm_profile)); + } +#endif snprintf(windowname, sizeof(windowname), "%s %s", xsane.prog_name, WINDOW_PRINTER_ICM_PROFILE); xsane_back_gtk_get_filename(windowname, printer_icm_profile, sizeof(printer_icm_profile), printer_icm_profile, NULL, NULL, XSANE_FILE_CHOOSER_ACTION_SELECT_OPEN, XSANE_GET_FILENAME_SHOW_NOTHING, XSANE_FILE_FILTER_ALL | XSANE_FILE_FILTER_ICM, XSANE_FILE_FILTER_ICM); @@ -1791,6 +1802,7 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ +#define XSANE_SETUP_FILETYPE_MENU_SIZE 450 static void xsane_filetype_notebook(GtkWidget *notebook) { GtkWidget *setup_vbox, *vbox, *hbox, *button, *label; @@ -1961,6 +1973,7 @@ tiff_compression_option_menu = gtk_option_menu_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, tiff_compression_option_menu, DESC_TIFF_COMPRESSION_16); gtk_box_pack_end(GTK_BOX(hbox), tiff_compression_option_menu, FALSE, FALSE, 2); + gtk_widget_set_size_request(tiff_compression_option_menu, XSANE_SETUP_FILETYPE_MENU_SIZE, -1); gtk_widget_show(tiff_compression_option_menu); gtk_widget_show(hbox); @@ -1996,6 +2009,7 @@ tiff_compression_option_menu = gtk_option_menu_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, tiff_compression_option_menu, DESC_TIFF_COMPRESSION_8); gtk_box_pack_end(GTK_BOX(hbox), tiff_compression_option_menu, FALSE, FALSE, 2); + gtk_widget_set_size_request(tiff_compression_option_menu, XSANE_SETUP_FILETYPE_MENU_SIZE, -1); gtk_widget_show(tiff_compression_option_menu); gtk_widget_show(hbox); @@ -2032,6 +2046,7 @@ tiff_compression_option_menu = gtk_option_menu_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, tiff_compression_option_menu, DESC_TIFF_COMPRESSION_1); gtk_box_pack_end(GTK_BOX(hbox), tiff_compression_option_menu, FALSE, FALSE, 2); + gtk_widget_set_size_request(tiff_compression_option_menu, XSANE_SETUP_FILETYPE_MENU_SIZE, -1); gtk_widget_show(tiff_compression_option_menu); gtk_widget_show(hbox); @@ -2106,6 +2121,7 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ +#define XSANE_SETUP_FAX_ENTRY_SIZE 400 static void xsane_fax_notebook(GtkWidget *notebook) { GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text; @@ -2139,7 +2155,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_COMMAND); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.fax_command); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2158,7 +2174,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_RECEIVER_OPT); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.fax_receiver_option); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2177,7 +2193,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_POSTSCRIPT_OPT); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.fax_postscript_option); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2196,7 +2212,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_NORMAL_OPT); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.fax_normal_option); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2215,7 +2231,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_FINE_OPT); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.fax_fine_option); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2257,7 +2273,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_VIEWER); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.fax_viewer); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2279,7 +2295,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_WIDTH); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); snprintf(buf, sizeof(buf), "%4.3f", preferences.fax_width / preferences.length_unit); gtk_entry_set_text(GTK_ENTRY(text), (char *) buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); @@ -2299,7 +2315,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_HEIGHT); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); snprintf(buf, sizeof(buf), "%4.3f", preferences.fax_height / preferences.length_unit); gtk_entry_set_text(GTK_ENTRY(text), (char *) buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); @@ -2319,7 +2335,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_LEFTOFFSET); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); snprintf(buf, sizeof(buf), "%4.3f", preferences.fax_leftoffset / preferences.length_unit); gtk_entry_set_text(GTK_ENTRY(text), (char *) buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); @@ -2339,7 +2355,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_FAX_BOTTOMOFFSET); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_FAX_ENTRY_SIZE, -1); snprintf(buf, sizeof(buf), "%4.3f", preferences.fax_bottomoffset / preferences.length_unit); gtk_entry_set_text(GTK_ENTRY(text), (char *) buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); @@ -2398,6 +2414,7 @@ } authentication_type; #define AUTHENTICATION_NUMBER 4 +#define XSANE_SETUP_EMAIL_ENTRY_SIZE 400 GtkWidget *setup_vbox, *vbox, *pop3_vbox, *hbox, *button, *label, *text; GtkWidget *authentication_option_menu, *authentication_menu, *authentication_menu_item; @@ -2433,7 +2450,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_EMAIL_FROM); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_EMAIL_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.email_from); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2451,7 +2468,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_EMAIL_REPLY_TO); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_EMAIL_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.email_reply_to); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2472,7 +2489,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_SMTP_SERVER); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_EMAIL_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.email_smtp_server); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2490,7 +2507,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_SMTP_PORT); - gtk_widget_set_size_request(text, 50, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_EMAIL_ENTRY_SIZE, -1); snprintf(buf, sizeof(buf), "%d", preferences.email_smtp_port); gtk_entry_set_text(GTK_ENTRY(text), (char *) buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); @@ -2530,6 +2547,7 @@ authentication_option_menu = gtk_option_menu_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, authentication_option_menu, DESC_EMAIL_AUTHENTICATION); gtk_box_pack_end(GTK_BOX(hbox), authentication_option_menu, FALSE, FALSE, 2); + gtk_widget_set_size_request(authentication_option_menu, XSANE_SETUP_EMAIL_ENTRY_SIZE, -1); gtk_widget_show(authentication_option_menu); gtk_widget_show(hbox); @@ -2562,7 +2580,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_EMAIL_AUTH_USER); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_EMAIL_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.email_auth_user); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2587,7 +2605,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_EMAIL_AUTH_PASS); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_EMAIL_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) password); gtk_entry_set_visibility(GTK_ENTRY(text), 0); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); @@ -2611,7 +2629,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_POP3_SERVER); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_EMAIL_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.email_pop3_server); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2629,7 +2647,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_POP3_PORT); - gtk_widget_set_size_request(text, 50, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_EMAIL_ENTRY_SIZE, -1); snprintf(buf, sizeof(buf), "%d", preferences.email_pop3_port); gtk_entry_set_text(GTK_ENTRY(text), (char *) buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); @@ -2663,6 +2681,7 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ +#define XSANE_SETUP_OCR_ENTRY_SIZE 400 static void xsane_ocr_notebook(GtkWidget *notebook) { GtkWidget *setup_vbox, *vbox, *hbox, *label, *text, *button; @@ -2694,7 +2713,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_OCR_COMMAND); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_OCR_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.ocr_command); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2713,7 +2732,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_OCR_INPUTFILE_OPT); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_OCR_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.ocr_inputfile_option); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2732,7 +2751,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_OCR_OUTPUTFILE_OPT); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_OCR_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.ocr_outputfile_option); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2763,7 +2782,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_OCR_OUTFD_OPT); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_OCR_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.ocr_gui_outfd_option); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2782,7 +2801,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_OCR_PROGRESS_KEYWORD); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_OCR_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.ocr_progress_keyword); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2809,6 +2828,7 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ +#define XSANE_SETUP_DISPLAY_ENTRY_SIZE 400 static void xsane_display_notebook(GtkWidget *notebook) { GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text; @@ -2894,6 +2914,7 @@ gtk_widget_show(label); show_range_mode_option_menu = gtk_option_menu_new(); + gtk_widget_set_size_request(show_range_mode_option_menu, XSANE_SETUP_DISPLAY_ENTRY_SIZE, -1); xsane_back_gtk_set_tooltip(xsane.tooltips, show_range_mode_option_menu, DESC_SHOW_RANGE_MODE); gtk_box_pack_end(GTK_BOX(hbox), show_range_mode_option_menu, FALSE, FALSE, 2); gtk_widget_show(show_range_mode_option_menu); @@ -2934,7 +2955,7 @@ snprintf(buf, sizeof(buf), "%1.2f", preferences.preview_oversampling); text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PREVIEW_OVERSAMPLING); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_DISPLAY_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2957,7 +2978,7 @@ snprintf(buf, sizeof(buf), "%1.2f", preferences.preview_gamma); text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PREVIEW_GAMMA); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_DISPLAY_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2976,7 +2997,7 @@ snprintf(buf, sizeof(buf), "%1.2f", preferences.preview_gamma_red); text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PREVIEW_GAMMA_RED); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_DISPLAY_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -2995,7 +3016,7 @@ snprintf(buf, sizeof(buf), "%1.2f", preferences.preview_gamma_green); text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PREVIEW_GAMMA_GREEN); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_DISPLAY_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -3014,7 +3035,7 @@ snprintf(buf, sizeof(buf), "%1.2f", preferences.preview_gamma_blue); text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PREVIEW_GAMMA_BLUE); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_DISPLAY_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -3047,7 +3068,7 @@ text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_DOC_VIEWER); - gtk_widget_set_size_request(text, 250, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_DISPLAY_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), (char *) preferences.browser); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -3152,6 +3173,7 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ +#define XSANE_SETUP_ENHANCED_ENTRY_SIZE 400 static void xsane_enhance_notebook(GtkWidget *notebook) { GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text; @@ -3241,7 +3263,7 @@ snprintf(buf, sizeof(buf), "%1.2f", xsane.threshold_min); text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PREVIEW_THRESHOLD_MIN); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_ENHANCED_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -3261,7 +3283,7 @@ snprintf(buf, sizeof(buf), "%1.2f", xsane.threshold_max); text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PREVIEW_THRESHOLD_MAX); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_ENHANCED_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -3281,7 +3303,7 @@ snprintf(buf, sizeof(buf), "%1.2f", xsane.threshold_mul); text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PREVIEW_THRESHOLD_MUL); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_ENHANCED_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -3301,7 +3323,7 @@ snprintf(buf, sizeof(buf), "%1.2f", xsane.threshold_off); text = gtk_entry_new(); xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_PREVIEW_THRESHOLD_OFF); - gtk_widget_set_size_request(text, 80, -1); + gtk_widget_set_size_request(text, XSANE_SETUP_ENHANCED_ENTRY_SIZE, -1); gtk_entry_set_text(GTK_ENTRY(text), buf); gtk_box_pack_end(GTK_BOX(hbox), text, FALSE, FALSE, 2); gtk_widget_show(text); @@ -3478,6 +3500,7 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ #ifdef HAVE_LIBLCMS +#define XSANE_SETUP_CMS_ENTRY_SIZE 300 static void xsane_color_management_notebook(GtkWidget *notebook) { GtkWidget *setup_vbox, *vbox, *hbox, *button, *label, *text, *option_menu, *menu, *menu_item; @@ -3592,7 +3615,7 @@ gtk_widget_show(button); text = gtk_entry_new_with_max_length(PATH_MAX); - gtk_widget_set_size_request(text, 250, -1); /* set minimum size */ + gtk_widget_set_size_request(text, XSANE_SETUP_CMS_ENTRY_SIZE, -1); /* set minimum size */ xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_SCANNER_DEFAULT_COLOR_ICM_PROFILE); if (xsane.scanner_default_color_icm_profile) @@ -3622,7 +3645,7 @@ gtk_widget_show(button); text = gtk_entry_new_with_max_length(PATH_MAX); - gtk_widget_set_size_request(text, 250, -1); /* set minimum size */ + gtk_widget_set_size_request(text, XSANE_SETUP_CMS_ENTRY_SIZE, -1); /* set minimum size */ xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_SCANNER_DEFAULT_GRAY_ICM_PROFILE); if (xsane.scanner_default_gray_icm_profile) @@ -3655,7 +3678,7 @@ gtk_widget_show(button); text = gtk_entry_new_with_max_length(PATH_MAX); - gtk_widget_set_size_request(text, 250, -1); /* set minimum size */ + gtk_widget_set_size_request(text, XSANE_SETUP_CMS_ENTRY_SIZE, -1); /* set minimum size */ xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_SCANNER_TRAN_ICM_PROFILE); if (xsane.scanner_tran_icm_profile) @@ -3685,7 +3708,7 @@ gtk_widget_show(button); text = gtk_entry_new_with_max_length(PATH_MAX); - gtk_widget_set_size_request(text, 250, -1); /* set minimum size */ + gtk_widget_set_size_request(text, XSANE_SETUP_CMS_ENTRY_SIZE, -1); /* set minimum size */ xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_SCANNER_TRAN_GRAY_ICM_PROFILE); if (xsane.scanner_tran_gray_icm_profile) @@ -3718,7 +3741,7 @@ gtk_widget_show(button); text = gtk_entry_new_with_max_length(PATH_MAX); - gtk_widget_set_size_request(text, 250, -1); /* set minimum size */ + gtk_widget_set_size_request(text, XSANE_SETUP_CMS_ENTRY_SIZE, -1); /* set minimum size */ xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_DISPLAY_ICM_PROFILE); if (preferences.display_icm_profile) @@ -3749,7 +3772,7 @@ gtk_widget_show(button); text = gtk_entry_new_with_max_length(PATH_MAX); - gtk_widget_set_size_request(text, 250, -1); /* set minimum size */ + gtk_widget_set_size_request(text, XSANE_SETUP_CMS_ENTRY_SIZE, -1); /* set minimum size */ xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_CUSTOM_PROOFING_ICM_PROFILE); if (preferences.custom_proofing_icm_profile) @@ -3782,7 +3805,7 @@ gtk_widget_show(button); text = gtk_entry_new_with_max_length(PATH_MAX); - gtk_widget_set_size_request(text, 250, -1); /* set minimum size */ + gtk_widget_set_size_request(text, XSANE_SETUP_CMS_ENTRY_SIZE, -1); /* set minimum size */ xsane_back_gtk_set_tooltip(xsane.tooltips, text, DESC_WORKING_COLOR_SPACE_ICM_PROFILE); if (preferences.working_color_space_icm_profile) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/src/xsane-viewer.c new/xsane-0.996/src/xsane-viewer.c --- old/xsane-0.995/src/xsane-viewer.c 2007-05-17 14:56:43.000000000 +0200 +++ new/xsane-0.996/src/xsane-viewer.c 2008-09-20 22:30:54.000000000 +0200 @@ -2536,14 +2536,14 @@ width = image_info.image_width * v->zoom + 26; height = image_info.image_height * v->zoom + 136; - if (width > gdk_screen_width()) + if (width >= gdk_screen_width()) { - width = gdk_screen_width(); + width = gdk_screen_width()-1; } - if (height > gdk_screen_height()) + if (height >= gdk_screen_height()) { - height = gdk_screen_height(); + height = gdk_screen_height()-1; } #ifdef HAVE_GTK2 @@ -2756,14 +2756,14 @@ width = image_info.image_width * v->zoom + 26; height = image_info.image_height * v->zoom + 136; - if (width > gdk_screen_width()) + if (width >= gdk_screen_width()) { - width = gdk_screen_width(); + width = gdk_screen_width()-1; } - if (height > gdk_screen_height()) + if (height >= gdk_screen_height()) { - height = gdk_screen_height(); + height = gdk_screen_height()-1; } #ifdef HAVE_GTK2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/src/xsane.xpm new/xsane-0.996/src/xsane.xpm --- old/xsane-0.995/src/xsane.xpm 1970-01-01 01:00:00.000000000 +0100 +++ new/xsane-0.996/src/xsane.xpm 2008-03-29 10:44:25.000000000 +0100 @@ -0,0 +1,236 @@ +/* XPM */ +static char * xsane_32x32_xpm[] = { +"32 32 201 2", +" c None", +". c #020206", +"+ c #3E3A2A", +"@ c #5E5A42", +"# c #9A926E", +"$ c #DED6B2", +"% c #2A36FE", +"& c #161EFA", +"* c #B6AE86", +"= c #323EFE", +"- c #465AFE", +"; c #D2CAA2", +"> c #161612", +", c #3E4AEA", +"' c #C6BE96", +") c #726A52", +"! c #96AAFE", +"~ c #3236D6", +"{ c #7E8AFA", +"] c #7E765A", +"^ c #A2B6FE", +"/ c #A69E7A", +"( c #F2F2DE", +"_ c #322E22", +": c #BEB68E", +"< c #4E4A36", +"[ c #3A3E9A", +"} c #C2D2FE", +"| c #969AE6", +"1 c #EAE6C6", +"2 c #8A8262", +"3 c #6262BA", +"4 c #423E6E", +"5 c #1E2266", +"6 c #AEA67E", +"7 c #CEC69E", +"8 c #E6E2BE", +"9 c #12120E", +"0 c #2E2A1E", +"a c #3646FE", +"b c #86829E", +"c c #968E6A", +"d c #1E22FA", +"e c #C2BA92", +"f c #DEEAFA", +"g c #5A563E", +"h c #566AFE", +"i c #222216", +"j c #D6CEA6", +"k c #464232", +"l c #BAB28A", +"m c #222AFA", +"n c #DEDABA", +"o c #9E9672", +"p c #0E0E0A", +"q c #928A66", +"r c #B2A67E", +"s c #3A4AFE", +"t c #CAC29A", +"u c #363226", +"v c #524E3A", +"w c #222EFA", +"x c #A29A8A", +"y c #DED2AE", +"z c #726E52", +"A c #F6F6F6", +"B c #4E62FE", +"C c #1E1E16", +"D c #867E5E", +"E c #CECAB6", +"F c #3E52FE", +"G c #4E56EA", +"H c #F2EED6", +"I c #C6BA92", +"J c #E6DEBA", +"K c #A29672", +"L c #AAA27A", +"M c #B2AA82", +"N c #C2B68E", +"O c #D2C69E", +"P c #A29A76", +"Q c #5E72FE", +"R c #423E2E", +"S c #7A7256", +"T c #CABE96", +"U c #A2AAFA", +"V c #928666", +"W c #060606", +"X c #1A1612", +"Y c #EAE2CE", +"Z c #BAAE86", +"` c #867A5E", +" . c #CEC29A", +".. c #AEA27E", +"+. c #DAD2AA", +"@. c #D6CAA2", +"#. c #8E8666", +"$. c #BEB28A", +"%. c #262EFA", +"&. c #B6AA82", +"*. c #625A46", +"=. c #D6CEAE", +"-. c #4A4632", +";. c #56523E", +">. c #7E7A62", +",. c #EEE6CE", +"'. c #564E46", +"). c #EAE2C2", +"!. c #BAAE8A", +"~. c #E6DABA", +"{. c #3E362A", +"]. c #4652FE", +"^. c #A69A76", +"/. c #1E1A16", +"(. c #3A3626", +"_. c #625E46", +":. c #C2B692", +"<. c #9A8E6E", +"[. c #968A6A", +"}. c #B6AA86", +"|. c #2632FA", +"1. c #BEB28E", +"2. c #E2DABE", +"3. c #D2C6A6", +"4. c #E2D6B2", +"5. c #FAFAF6", +"6. c #D6CAA6", +"7. c #CABE9A", +"8. c #3242FE", +"9. c #827A5E", +"0. c #26261E", +"a. c #4256FE", +"b. c #1A1A12", +"c. c #AA9E7A", +"d. c #5E5642", +"e. c #2A32FA", +"f. c #EEE6CA", +"g. c #16120E", +"h. c #DACEAA", +"i. c #4A4232", +"j. c #E2DAB6", +"k. c #4A5EFE", +"l. c #A6BAFE", +"m. c #42426A", +"n. c #5266FE", +"o. c #EEEACE", +"p. c #9E9272", +"q. c #524A3A", +"r. c #AEA682", +"s. c #D2C6A2", +"t. c #463E2E", +"u. c #7E7256", +"v. c #DED2B6", +"w. c #E6DEC2", +"x. c #AAA282", +"y. c #EAE2C6", +"z. c #E2D6BA", +"A. c #564E3A", +"B. c #221E16", +"C. c #D6CEAA", +"D. c #E2DABA", +"E. c #8A8266", +"F. c #3A362A", +"G. c #CEC29E", +"H. c #82765A", +"I. c #C6D2FA", +"J. c #26221A", +"K. c #4252FE", +"L. c #665A46", +"M. c #DACEAE", +"N. c #827A66", +"O. c #665E46", +"P. c #3E3A2E", +"Q. c #B6AE8A", +"R. c #BEB692", +"S. c #CEC6A2", +"T. c #928A6A", +"U. c #C6BA96", +"V. c #A29676", +"W. c #AAA27E", +"X. c #DED6B6", +"Y. c #E6DEBE", +"Z. c #A69A7A", +"`. c #968E6E", +" + c #B2A682", +".+ c #423E32", +"++ c #D6CAAA", +"@+ c #E6E2C2", +"#+ c #5A5642", +"$+ c #9E9676", +"%+ c #867E62", +"&+ c #B2AA86", +"*+ c #AA9E7E", +"=+ c #464236", +"-+ c #0E0E0E", +";+ c #DED2B2", +">+ c #DAD2AE", +",+ c #4A4636", +"'+ c #5E5646", +")+ c #161212", +"!+ c #564E3E", +" ", +" W.Y.1 $ T 7.j.j $ C.' I t 6. . ", +" E Y.$ O &.' ; I T I 6 I ; N N T 6 T .r. ", +" 1 X.O 7.I I +N I I e N }.N I T N :.Z N I T !.*+ ", +" 2.I T Z t 7 Z &.: Z }.t Z r I $.T 7 Z &.T $.T t * c u. ", +" 1 C.I N $.e $.I I $.&.1.&.!.&...6 l $.I I 1.$.I $.I N `.< ", +" y.4.7.&+1.N !.$.' ..^.` i.0 J.B./._ R O.p.W.N I Z $.I K $._. ", +" 1 S.I 7 I : N x.;.;.9 [.!.: I t l j e # X ", +" ,.T N W.I T }.. 1 j T Z I W.I N C ", +" J s.I Z I N Z F. j.w.I N I I }.I &.g.", +" +.j.$.r :.&.T Z g M 2 2 ^.I T Z &.N p.W ", +" ;+7 N I $.I I V.) A.%+[.: I I S ", +" ; : I I !.' T / H. ` ..N b. ", +" O ; 1.!.N e 2 !+{. R.O x ).l V T.. ", +" $.Z :.T o /.. ).).$ I @.j ; I &. 1.7 M 0 ", +" Z W.=+)+ o.j.j T Q.1.!.N N : .: `.9.Z e N P ", +" $ D g < (.+ _ _ + < d.] T.W.S N 7 N #.@ ", +" E.C ~.++p.N K k *._ G.7 I `. ", +" 3.q.5 w 4 / 6 s.T e R ", +" v.m.e.].s K.% b R s.O N q ", +" Y.) m |.a.l.n.d , 6./. D.r $.&.0 ", +" M.#+ y.W e.F } 5.I.^ k.@+z z.N I I -.", +" Y ).F. $.. %.h A 5.5.Q m H D D.I Z I < ", +" 1 =.+ y '.= = ! f { B |.@+-+ ( t T N W./.", +" 1 1 e 0. 7 [ - a h |.& | < 8 >+7 T @.#.. ", +" ; j :.c.$+ [.<.3 ~ 8.G U N.. f.y.7 $.:.T ^.9 ", +" j 7.c.&.r... 2 I I V.b.. Y.h.G.Z N T I r..+ ", +" $.r.* t t 6.I &.U.j @.j.j >.j.y.$ n s.$.I ; I 7 P P. ", +" <.^.L ' I N .$.6 t t T @.e }.7 T I 7 $...I N 2 > ", +" E.q P Z Z N N Z Z I !.I N Q.}.N Z Z p.'+F.. ", +" v S p.}.o ..N N I T W.Z.<.L.i W ", +" u F.P.F.,+i.t.(./.p "}; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/xsane.CHANGES new/xsane-0.996/xsane.CHANGES --- old/xsane-0.995/xsane.CHANGES 2007-11-21 20:17:29.000000000 +0100 +++ new/xsane-0.996/xsane.CHANGES 2008-09-20 22:50:07.000000000 +0200 @@ -2997,3 +2997,15 @@ ca cs da de es fi fr hu it ja nl pa pl pt pt_BR ro ru sk sl sr sv tr vi zh zh_CN U N U N N A N N U N N U N N N N N U N U N N N N N 99599 99599 96 99595 99 99595 99 99599 96 96 96 99 99599 99592 99 96 96 992 + +xsane-0.995 -> 0.996: +--------------------- + + - removed bug when deleting medium types: removed free() command, added realloc() + + - xsane_viewer.c: reduced maximum viewer size form gdk_screen_width/gdk_screen_height to + gdk_screen_width-1/gdk_screen_height-1 + + - xsane-save.c: PDF: ICC object 4+5 are initialized with offset 0 + - xsane-save.c: PDF: objects with offset 0 are makred free (f) in xref table + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xsane-0.995/xsane.spec new/xsane-0.996/xsane.spec --- old/xsane-0.995/xsane.spec 2007-11-21 20:20:00.000000000 +0100 +++ new/xsane-0.996/xsane.spec 2008-09-21 20:04:28.000000000 +0200 @@ -1,5 +1,5 @@ %define name xsane -%define version 0.995 +%define version 0.996 %define release 1 %define prefix /usr ++++++ xsane-desktop.patch ++++++ --- src/xsane.desktop +++ src/xsane.desktop @@ -1,9 +1,10 @@ [Desktop Entry] Encoding=UTF-8 -Name=XSane - Scanning +Name=XSane +GenericName=Scanning Comment=Acquire images from a scanner Exec=xsane Icon=xsane Terminal=false Type=Application -Categories=Application;Graphics +Categories=Graphics;Scanning; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-ure for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package OpenOffice_org-ure for openSUSE:Factory checked in at Wed May 6 18:57:34 CEST 2009. -------- --- OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-04-24 13:58:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-04-30 23:09:46.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 19:56:03 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m10-sdk.tar.bz2 ooo310-m10-ure.tar.bz2 New: ---- ooo310-m11-sdk.tar.bz2 ooo310-m11-ure.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-ure.spec ++++++ --- /var/tmp/diff_new_pack.c32598/_old 2009-05-06 18:57:11.000000000 +0200 +++ /var/tmp/diff_new_pack.c32598/_new 2009-05-06 18:57:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-ure (Version 3.0.99.6) +# spec file for package OpenOffice_org-ure (Version 3.0.99.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,16 @@ Name: OpenOffice_org-ure -Version: 3.0.99.6 +Version: 3.0.99.7 Release: 1 -%define ooo_build_version 3.0.99.6 +%define ooo_build_version 3.0.99.7 %define piece ure #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-bootstrap = %version BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m10 +%define ooo_build_tag ooo310-m11 License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite AutoReqProv: on @@ -211,6 +211,9 @@ %defattr(-,root,root) %changelog +* Thu Apr 30 2009 pmladek(a)suse.cz +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) * Fri Apr 24 2009 pmladek(a)suse.cz - updated to the milestone ooo310-m10 - updated ooo-build to version 3.0.99.6 (3.1-beta6) ++++++ ooo310-m10-sdk.tar.bz2 -> ooo310-m11-sdk.tar.bz2 ++++++ ++++++ ooo310-m10-ure.tar.bz2 -> ooo310-m11-ure.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/prj/d.lst new/ooo310-m11-ure/pyuno/prj/d.lst --- old/ooo310-m10-ure/pyuno/prj/d.lst 2008-06-09 15:05:22.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/prj/d.lst 2009-04-22 16:54:40.000000000 +0200 @@ -15,7 +15,7 @@ ..\%__SRC%\bin\pythonloader.py %_DEST%\bin%_EXT%\pyuno\pythonloader.py ..\%__SRC%\bin\uno.py %_DEST%\bin%_EXT%\pyuno\uno.py ..\%__SRC%\bin\pyuno_services.rdb %_DEST%\bin%_EXT%\pyuno_services.rdb -..\%__SRC%\bin\pyuno.dll %_DEST%\bin%_EXT%\pyuno.dll +..\%__SRC%\bin\pyuno.pyd %_DEST%\bin%_EXT%\pyuno.pyd ..\%__SRC%\bin\pythonl*.dll %_DEST%\bin%_EXT%\pythonl*.dll ..\%__SRC%\misc\pyunorc %_DEST%\lib%_EXT%\pyunorc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/makefile.mk new/ooo310-m11-ure/pyuno/source/module/makefile.mk --- old/ooo310-m10-ure/pyuno/source/module/makefile.mk 2008-04-11 12:31:24.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/source/module/makefile.mk 2009-04-22 16:54:40.000000000 +0200 @@ -59,6 +59,7 @@ .ELSE .INCLUDE : pyversion.mk PYUNORC=pyuno.ini +DLLPOST=.pyd .ENDIF .IF "$(SYSTEM_PYTHON)" == "YES" @@ -108,11 +109,23 @@ # --- Targets ------------------------------------------------------ +.IF "$(GUI)$(COM)"=="WNTGCC" +ALLTAR : \ + $(DLLDEST)$/uno.py \ + $(DLLDEST)$/unohelper.py \ + $(PYUNO_MODULE) \ + $(MISC)$/$(PYUNORC) \ + $(LB)$/lib$(TARGET).a + +$(LB)$/lib$(TARGET).a: $(MISC)$/$(TARGET).def + dlltool --dllname $(TARGET)$(DLLPOST) --input-def=$(MISC)$/$(TARGET).def --kill-at --output-lib=$(LB)$/lib$(TARGET).a +.ELSE ALLTAR : \ $(DLLDEST)$/uno.py \ $(DLLDEST)$/unohelper.py \ $(PYUNO_MODULE) \ $(MISC)$/$(PYUNORC) +.ENDIF .INCLUDE : target.mk diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/pyuno_callable.cxx new/ooo310-m11-ure/pyuno/source/module/pyuno_callable.cxx --- old/ooo310-m10-ure/pyuno/source/module/pyuno_callable.cxx 2008-04-11 12:33:22.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/source/module/pyuno_callable.cxx 2009-04-22 16:54:40.000000000 +0200 @@ -245,6 +245,9 @@ NULL, NULL, (destructor)0 +#if PY_VERSION_HEX >= 0x02060000 + , 0 +#endif }; PyRef PyUNO_callable_new ( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/pyuno.cxx new/ooo310-m11-ure/pyuno/source/module/pyuno.cxx --- old/ooo310-m10-ure/pyuno/source/module/pyuno.cxx 2008-04-11 12:32:21.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/source/module/pyuno.cxx 2009-04-22 16:54:40.000000000 +0200 @@ -693,6 +693,9 @@ NULL, NULL, (destructor)0 +#if PY_VERSION_HEX >= 0x02060000 + , 0 +#endif }; PyRef getPyUnoClass( const Runtime &) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/pyuno_runtime.cxx new/ooo310-m11-ure/pyuno/source/module/pyuno_runtime.cxx --- old/ooo310-m10-ure/pyuno/source/module/pyuno_runtime.cxx 2008-04-11 12:35:15.000000000 +0200 +++ new/ooo310-m11-ure/pyuno/source/module/pyuno_runtime.cxx 2009-04-22 16:54:40.000000000 +0200 @@ -119,6 +119,9 @@ NULL, NULL, (destructor)0 +#if PY_VERSION_HEX >= 0x02060000 + , 0 +#endif }; /*---------------------------------------------------------------------- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo310-m10-ure/pyuno/source/module/uno.py new/ooo310-m11-ure/pyuno/source/module/uno.py --- old/ooo310-m10-ure/pyuno/source/module/uno.py 2008-12-11 14:57:12.000000000 +0100 +++ new/ooo310-m11-ure/pyuno/source/module/uno.py 2009-04-22 16:54:40.000000000 +0200 @@ -250,19 +250,16 @@ #--------------------------------------------------------------------------------------- # don't use any functions beyond this point, private section, likely to change #--------------------------------------------------------------------------------------- -def _uno_import( name, *optargs ): +#def _uno_import( name, globals={}, locals={}, fromlist=[], level=-1 ): +def _uno_import( name, *optargs, **kwargs ): try: # print "optargs = " + repr(optargs) - if len(optargs) == 0: - return _g_delegatee( name ) - #print _g_delegatee - return _g_delegatee( name, *optargs ) + return _g_delegatee( name, *optargs, **kwargs ) except ImportError: - if len(optargs) != 3 or not optargs[2]: - raise - globals = optargs[0] - locals = optargs[1] - fromlist = optargs[2] + # process optargs + globals, locals, fromlist = list(optargs)[:3] + [kwargs.get('globals',{}), kwargs.get('locals',{}), kwargs.get('fromlist',[])][len(optargs):] + if not fromlist: + raise modnames = name.split( "." ) mod = None d = sys.modules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-writer for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package OpenOffice_org-writer for openSUSE:Factory checked in at Wed May 6 18:57:28 CEST 2009. -------- --- OpenOffice_org-writer/OpenOffice_org-writer.changes 2009-04-24 13:54:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-writer/OpenOffice_org-writer.changes 2009-04-30 23:09:59.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 19:56:03 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m10-writer.tar.bz2 New: ---- ooo310-m11-writer.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-writer.spec ++++++ --- /var/tmp/diff_new_pack.Lny606/_old 2009-05-06 18:57:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Lny606/_new 2009-05-06 18:57:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-writer (Version 3.0.99.6) +# spec file for package OpenOffice_org-writer (Version 3.0.99.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-writer -Version: 3.0.99.6 +Version: 3.0.99.7 Release: 1 -%define ooo_build_version 3.0.99.6 +%define ooo_build_version 3.0.99.7 %define piece writer #!BuildIgnore: OpenOffice_org #!BuildIgnore: OpenOffice_org-filters-optional @@ -36,7 +36,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m10 +%define ooo_build_tag ooo310-m11 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on @@ -163,6 +163,9 @@ %ooo_prefix/%ooo_home/solver/noarch %changelog +* Thu Apr 30 2009 pmladek(a)suse.cz +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) * Fri Apr 24 2009 pmladek(a)suse.cz - updated to the milestone ooo310-m10 - updated ooo-build to version 3.0.99.6 (3.1-beta6) ++++++ ooo310-m10-writer.tar.bz2 -> ooo310-m11-writer.tar.bz2 ++++++ OpenOffice_org-writer/ooo310-m10-writer.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-writer/ooo310-m11-writer.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-libs-extern for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package OpenOffice_org-libs-extern for openSUSE:Factory checked in at Wed May 6 18:57:01 CEST 2009. -------- --- OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2009-04-24 13:58:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-libs-extern/OpenOffice_org-libs-extern.changes 2009-04-30 23:09:15.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 19:56:03 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m10-libs-extern-sys.tar.bz2 ooo310-m10-libs-extern.tar.bz2 New: ---- ooo310-m11-libs-extern-sys.tar.bz2 ooo310-m11-libs-extern.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.v30364/_old 2009-05-06 18:56:47.000000000 +0200 +++ /var/tmp/diff_new_pack.v30364/_new 2009-05-06 18:56:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-extern (Version 3.0.99.6) +# spec file for package OpenOffice_org-libs-extern (Version 3.0.99.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-libs-extern -Version: 3.0.99.6 +Version: 3.0.99.7 Release: 1 -%define ooo_build_version 3.0.99.6 +%define ooo_build_version 3.0.99.7 %define piece libs-extern #!BuildIgnore: OpenOffice_org # urg, ure dep is now required for cppunit ... @@ -40,7 +40,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m10 +%define ooo_build_tag ooo310-m11 License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite AutoReqProv: on @@ -170,6 +170,9 @@ %ooo_prefix/%ooo_home/solver/noarch %changelog +* Thu Apr 30 2009 pmladek(a)suse.cz +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) * Fri Apr 24 2009 pmladek(a)suse.cz - updated to the milestone ooo310-m10 - updated ooo-build to version 3.0.99.6 (3.1-beta6) ++++++ ooo310-m10-libs-extern-sys.tar.bz2 -> ooo310-m11-libs-extern-sys.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo310-m10-libs-extern-sys.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-extern/ooo310-m11-libs-extern-sys.tar.bz2 differ: byte 11, line 1 ++++++ ooo310-m10-libs-extern.tar.bz2 -> ooo310-m11-libs-extern.tar.bz2 ++++++ OpenOffice_org-libs-extern/ooo310-m10-libs-extern.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-extern/ooo310-m11-libs-extern.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-libs-gui for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package OpenOffice_org-libs-gui for openSUSE:Factory checked in at Wed May 6 18:56:55 CEST 2009. -------- --- OpenOffice_org-libs-gui/OpenOffice_org-libs-gui.changes 2009-04-24 13:54:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-libs-gui/OpenOffice_org-libs-gui.changes 2009-04-30 23:09:32.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 19:56:03 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m10-libs-gui.tar.bz2 New: ---- ooo310-m11-libs-gui.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-gui.spec ++++++ --- /var/tmp/diff_new_pack.s31185/_old 2009-05-06 18:56:50.000000000 +0200 +++ /var/tmp/diff_new_pack.s31185/_new 2009-05-06 18:56:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-gui (Version 3.0.99.6) +# spec file for package OpenOffice_org-libs-gui (Version 3.0.99.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,9 +20,9 @@ %define distro SUSE Name: OpenOffice_org-libs-gui -Version: 3.0.99.6 +Version: 3.0.99.7 Release: 1 -%define ooo_build_version 3.0.99.6 +%define ooo_build_version 3.0.99.7 %define piece libs-gui #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel = %version @@ -39,7 +39,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m10 +%define ooo_build_tag ooo310-m11 License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite AutoReqProv: on @@ -151,6 +151,9 @@ %ooo_prefix/%ooo_home/solver/noarch %changelog +* Thu Apr 30 2009 pmladek(a)suse.cz +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) * Fri Apr 24 2009 pmladek(a)suse.cz - updated to the milestone ooo310-m10 - updated ooo-build to version 3.0.99.6 (3.1-beta6) ++++++ ooo310-m10-libs-gui.tar.bz2 -> ooo310-m11-libs-gui.tar.bz2 ++++++ OpenOffice_org-libs-gui/ooo310-m10-libs-gui.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-gui/ooo310-m11-libs-gui.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-l10n for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package OpenOffice_org-l10n for openSUSE:Factory checked in at Wed May 6 18:56:35 CEST 2009. -------- --- OpenOffice_org-l10n/OpenOffice_org-l10n.changes 2009-04-24 13:54:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-l10n/OpenOffice_org-l10n.changes 2009-04-30 23:07:16.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 30 19:56:03 CEST 2009 - pmladek(a)suse.cz + +- updated to version 3.0.99.7 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-l10n.spec ++++++ --- /var/tmp/diff_new_pack.a25063/_old 2009-05-06 18:55:57.000000000 +0200 +++ /var/tmp/diff_new_pack.a25063/_new 2009-05-06 18:55:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-l10n (Version 3.0.99.6) +# spec file for package OpenOffice_org-l10n (Version 3.0.99.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: OpenOffice_org-l10n -Version: 3.0.99.6 +Version: 3.0.99.7 Release: 1 %define piece l10n -%define ooo_build_version 3.0.99.6 +%define ooo_build_version 3.0.99.7 # test_build_langs: 1 = de and cs # 2 = all supported languages %define test_build_langs 2 @@ -1940,6 +1940,8 @@ #################################################### %changelog +* Thu Apr 30 2009 pmladek(a)suse.cz +- updated to version 3.0.99.7 * Fri Apr 24 2009 pmladek(a)suse.cz - updated to version 3.0.99.6 * Fri Apr 17 2009 pmladek(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-libs-core for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package OpenOffice_org-libs-core for openSUSE:Factory checked in at Wed May 6 18:56:32 CEST 2009. -------- --- OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2009-04-24 13:54:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2009-04-30 23:08:05.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 19:56:03 CEST 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo310-m10-libs-core.tar.bz2 New: ---- ooo310-m11-libs-core.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-core.spec ++++++ --- /var/tmp/diff_new_pack.K26959/_old 2009-05-06 18:56:22.000000000 +0200 +++ /var/tmp/diff_new_pack.K26959/_new 2009-05-06 18:56:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-core (Version 3.0.99.6) +# spec file for package OpenOffice_org-libs-core (Version 3.0.99.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-libs-core -Version: 3.0.99.6 +Version: 3.0.99.7 Release: 1 -%define ooo_build_version 3.0.99.6 +%define ooo_build_version 3.0.99.7 %define piece libs-core # version of the postgresql driver %define postgresql_version 0.7.6 @@ -44,7 +44,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo310-m10 +%define ooo_build_tag ooo310-m11 License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite AutoReqProv: on @@ -259,6 +259,9 @@ %ooo_prefix/%ooo_home/solver/noarch %changelog +* Thu Apr 30 2009 pmladek(a)suse.cz +- updated to the milestone ooo310-m11 (3.1-rc2) +- updated ooo-build to version 3.0.99.7 (3.1-beta7) * Fri Apr 24 2009 pmladek(a)suse.cz - updated to the milestone ooo310-m10 - updated ooo-build to version 3.0.99.6 (3.1-beta6) ++++++ ooo310-m10-libs-core.tar.bz2 -> ooo310-m11-libs-core.tar.bz2 ++++++ OpenOffice_org-libs-core/ooo310-m10-libs-core.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-libs-core/ooo310-m11-libs-core.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-ncurses-pkg for openSUSE:Factory
by root＠Hilbert.suse.de 06 May '09

06 May '09

Hello community, here is the log from the commit of package yast2-ncurses-pkg for openSUSE:Factory checked in at Wed May 6 18:56:17 CEST 2009. -------- --- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2009-02-19 14:51:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2009-05-06 12:44:15.000000000 +0200 @@ -1,0 +2,17 @@ +Wed May 6 12:01:32 CEST 2009 - kmachalkova(a)suse.cz + +- Speeding up scrolling big package lists left/right (bnc#498267) +- 2.18.2 + +------------------------------------------------------------------- +Mon Mar 30 16:04:53 CEST 2009 - kmachalkova(a)suse.cz + +- Do not implicitly search for matching keywords (added a new switch + into search options to include/exclude keywords) (bnc#470069) + +------------------------------------------------------------------- +Thu Mar 19 14:49:36 CET 2009 - gs(a)suse.de + +- Add name of source package to technical details view + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ncurses-pkg-2.18.1.tar.bz2 New: ---- yast2-ncurses-pkg-2.18.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.I25699/_old 2009-05-06 18:56:06.000000000 +0200 +++ /var/tmp/diff_new_pack.I25699/_new 2009-05-06 18:56:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses-pkg (Version 2.18.1) +# spec file for package yast2-ncurses-pkg (Version 2.18.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ncurses-pkg -Version: 2.18.1 +Version: 2.18.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-pkg-2.18.1.tar.bz2 +Source0: yast2-ncurses-pkg-2.18.2.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel @@ -46,7 +46,7 @@ %prep -%setup -n yast2-ncurses-pkg-2.18.1 +%setup -n yast2-ncurses-pkg-2.18.2 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +76,14 @@ %{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so %doc %{prefix}/share/doc/packages/yast2-ncurses-pkg %changelog +* Wed May 06 2009 kmachalkova(a)suse.cz +- Speeding up scrolling big package lists left/right (bnc#498267) +- 2.18.2 +* Mon Mar 30 2009 kmachalkova(a)suse.cz +- Do not implicitly search for matching keywords (added a new switch + into search options to include/exclude keywords) (bnc#470069) +* Thu Mar 19 2009 gs(a)suse.de +- Add name of source package to technical details view * Thu Feb 19 2009 kmachalkova(a)suse.cz - New menu for launching repo manager and YOU configuration - New sub-menu for configuring PKGMGR_ACTION_AT_EXIT sysconfig ++++++ yast2-ncurses-pkg-2.18.1.tar.bz2 -> yast2-ncurses-pkg-2.18.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/configure new/yast2-ncurses-pkg-2.18.2/configure --- old/yast2-ncurses-pkg-2.18.1/configure 2008-10-23 19:21:54.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/configure 2009-05-06 12:42:08.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-ncurses-pkg 2.17.8. +# Generated by GNU Autoconf 2.61 for yast2-ncurses-pkg 2.18.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses-pkg' PACKAGE_TARNAME='yast2-ncurses-pkg' -PACKAGE_VERSION='2.17.8' -PACKAGE_STRING='yast2-ncurses-pkg 2.17.8' +PACKAGE_VERSION='2.18.2' +PACKAGE_STRING='yast2-ncurses-pkg 2.18.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -899,6 +899,9 @@ am__fastdepCC_TRUE am__fastdepCC_FALSE CPP +PKG_CONFIG +Y2CORE_CFLAGS +Y2CORE_LIBS AGENT_LIBADD SED GREP @@ -914,7 +917,6 @@ ac_ct_F77 LIBTOOL ALLOCA -PKG_CONFIG ZYPP_CFLAGS ZYPP_LIBS LIBOBJS @@ -933,10 +935,12 @@ CC CFLAGS CPP +PKG_CONFIG +Y2CORE_CFLAGS +Y2CORE_LIBS CXXCPP F77 FFLAGS -PKG_CONFIG ZYPP_CFLAGS ZYPP_LIBS' @@ -1441,7 +1445,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-ncurses-pkg 2.17.8 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses-pkg 2.18.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1512,7 +1516,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.17.8:";; + short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.18.2:";; esac cat <<\_ACEOF @@ -1550,10 +1554,13 @@ CC C compiler command CFLAGS C compiler flags CPP C preprocessor + PKG_CONFIG path to pkg-config utility + Y2CORE_CFLAGS + C compiler flags for Y2CORE, overriding pkg-config + Y2CORE_LIBS linker flags for Y2CORE, overriding pkg-config CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags - PKG_CONFIG path to pkg-config utility ZYPP_CFLAGS C compiler flags for ZYPP, overriding pkg-config ZYPP_LIBS linker flags for ZYPP, overriding pkg-config @@ -1621,7 +1628,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses-pkg configure 2.17.8 +yast2-ncurses-pkg configure 2.18.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1635,7 +1642,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-ncurses-pkg $as_me 2.17.8, which was +It was created by yast2-ncurses-pkg $as_me 2.18.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2456,7 +2463,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses-pkg' - VERSION='2.17.8' + VERSION='2.18.2' cat >>confdefs.h <<_ACEOF @@ -2684,7 +2691,7 @@ -VERSION="2.17.8" +VERSION="2.18.2" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -4849,8 +4856,247 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2" +# If we have core, get its Y2CORE_CFLAGS. +# When building core itself, it has set Y2CORE_CFLAGS elsewhere already + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf(a)gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf(a)gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + PKG_CONFIG="" + fi + +fi +if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 + ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for Y2CORE" >&5 +echo $ECHO_N "checking for Y2CORE... $ECHO_C" >&6; } + +if test -n "$Y2CORE_CFLAGS"; then + pkg_cv_Y2CORE_CFLAGS="$Y2CORE_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 + ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$Y2CORE_LIBS"; then + pkg_cv_Y2CORE_LIBS="$Y2CORE_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"yast2-core\"") >&5 + ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "yast2-core" 2>&1` + else + Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$Y2CORE_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (yast2-core) were not met: + +$Y2CORE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (yast2-core) were not met: + +$Y2CORE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables Y2CORE_CFLAGS +and Y2CORE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + Y2CORE_CFLAGS=$pkg_cv_Y2CORE_CFLAGS + Y2CORE_LIBS=$pkg_cv_Y2CORE_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : +fi + +fi + +CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} @@ -5570,7 +5816,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5573 "configure"' > conftest.$ac_ext + echo '#line 5819 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7925,11 +8171,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7928: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8174: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7932: \$? = $ac_status" >&5 + echo "$as_me:8178: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8215,11 +8461,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8218: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8464: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8222: \$? = $ac_status" >&5 + echo "$as_me:8468: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8319,11 +8565,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8322: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8568: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8326: \$? = $ac_status" >&5 + echo "$as_me:8572: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10683,7 +10929,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10686 "configure" +#line 10932 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10783,7 +11029,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10786 "configure" +#line 11032 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13184,11 +13430,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13187: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13433: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13191: \$? = $ac_status" >&5 + echo "$as_me:13437: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13288,11 +13534,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13291: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13537: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13295: \$? = $ac_status" >&5 + echo "$as_me:13541: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14871,11 +15117,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14874: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15120: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14878: \$? = $ac_status" >&5 + echo "$as_me:15124: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14975,11 +15221,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14978: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15224: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14982: \$? = $ac_status" >&5 + echo "$as_me:15228: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17182,11 +17428,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17185: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17431: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17189: \$? = $ac_status" >&5 + echo "$as_me:17435: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17472,11 +17718,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17475: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17721: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17479: \$? = $ac_status" >&5 + echo "$as_me:17725: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17576,11 +17822,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17579: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17825: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17583: \$? = $ac_status" >&5 + echo "$as_me:17829: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20928,126 +21174,6 @@ - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf(a)gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf(a)gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - PKG_CONFIG="" - fi - -fi - pkg_failed=no { echo "$as_me:$LINENO: checking for ZYPP" >&5 echo $ECHO_N "checking for ZYPP... $ECHO_C" >&6; } @@ -21588,7 +21714,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses-pkg $as_me 2.17.8, which was +This file was extended by yast2-ncurses-pkg $as_me 2.18.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21641,7 +21767,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ncurses-pkg config.status 2.17.8 +yast2-ncurses-pkg config.status 2.18.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -21993,6 +22119,9 @@ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim CPP!$CPP$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +Y2CORE_CFLAGS!$Y2CORE_CFLAGS$ac_delim +Y2CORE_LIBS!$Y2CORE_LIBS$ac_delim AGENT_LIBADD!$AGENT_LIBADD$ac_delim SED!$SED$ac_delim GREP!$GREP$ac_delim @@ -22008,14 +22137,13 @@ ac_ct_F77!$ac_ct_F77$ac_delim LIBTOOL!$LIBTOOL$ac_delim ALLOCA!$ALLOCA$ac_delim -PKG_CONFIG!$PKG_CONFIG$ac_delim ZYPP_CFLAGS!$ZYPP_CFLAGS$ac_delim ZYPP_LIBS!$ZYPP_LIBS$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/configure.in new/yast2-ncurses-pkg-2.18.2/configure.in --- old/yast2-ncurses-pkg-2.18.1/configure.in 2008-10-23 19:21:39.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/configure.in 2009-05-06 12:41:52.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ncurses-pkg dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.4 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses-pkg, 2.17.8, http://bugs.opensuse.org/, yast2-ncurses-pkg) +AC_INIT(yast2-ncurses-pkg, 2.18.2, http://bugs.opensuse.org/, yast2-ncurses-pkg) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.8" +VERSION="2.18.2" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -144,8 +144,14 @@ AC_PROG_CC AC_PROG_CPP -CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" -CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2" +# If we have core, get its Y2CORE_CFLAGS. +# When building core itself, it has set Y2CORE_CFLAGS elsewhere already +PKG_CHECK_EXISTS([yast2-core],[ + PKG_CHECK_MODULES(Y2CORE, yast2-core) +]) + +CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} AC_SUBST(AGENT_LIBADD) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/doc/autodocs/Makefile.in new/yast2-ncurses-pkg-2.18.2/doc/autodocs/Makefile.in --- old/yast2-ncurses-pkg-2.18.1/doc/autodocs/Makefile.in 2008-10-23 19:21:57.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/doc/autodocs/Makefile.in 2009-05-06 12:42:12.000000000 +0200 @@ -142,6 +142,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/doc/Makefile.in new/yast2-ncurses-pkg-2.18.2/doc/Makefile.in --- old/yast2-ncurses-pkg-2.18.1/doc/Makefile.in 2008-10-23 19:21:57.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/doc/Makefile.in 2009-05-06 12:42:12.000000000 +0200 @@ -125,6 +125,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/Makefile.am new/yast2-ncurses-pkg-2.18.2/Makefile.am --- old/yast2-ncurses-pkg-2.18.1/Makefile.am 2008-10-23 19:21:39.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/Makefile.am 2009-05-06 12:41:52.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/Makefile.in new/yast2-ncurses-pkg-2.18.2/Makefile.in --- old/yast2-ncurses-pkg-2.18.1/Makefile.in 2008-10-23 19:21:57.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/Makefile.in 2009-05-06 12:42:12.000000000 +0200 @@ -161,6 +161,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = $(shell cat $(srcdir)/VERSION) XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ @@ -259,10 +261,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/src/Makefile.in new/yast2-ncurses-pkg-2.18.2/src/Makefile.in --- old/yast2-ncurses-pkg-2.18.1/src/Makefile.in 2009-02-19 14:42:45.000000000 +0100 +++ new/yast2-ncurses-pkg-2.18.2/src/Makefile.in 2009-05-06 12:42:12.000000000 +0200 @@ -162,6 +162,8 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2CORE_CFLAGS = @Y2CORE_CFLAGS@ +Y2CORE_LIBS = @Y2CORE_LIBS@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ZYPP_CFLAGS = @ZYPP_CFLAGS@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/src/NCPkgFilterSearch.cc new/yast2-ncurses-pkg-2.18.2/src/NCPkgFilterSearch.cc --- old/yast2-ncurses-pkg-2.18.1/src/NCPkgFilterSearch.cc 2009-01-06 12:46:34.000000000 +0100 +++ new/yast2-ncurses-pkg-2.18.2/src/NCPkgFilterSearch.cc 2009-03-30 16:02:54.000000000 +0200 @@ -162,6 +162,7 @@ bool NCPkgFilterSearch::fillSearchList( string & expr, bool ignoreCase, bool checkName, + bool checkKeywords, bool checkSummary, bool checkDescr, bool checkProvides, @@ -201,8 +202,6 @@ q.addString( expr ); q.addKind( zypp::ResKind::package ); - //no clue what this means, but it segfaults if it's not here :) - q.addAttribute( zypp::sat::SolvAttr::keywords ); if ( !ignoreCase ) q.setCaseSensitive(); @@ -210,6 +209,8 @@ q.addAttribute( zypp::sat::SolvAttr::name ); if ( checkSummary ) q.addAttribute( zypp::sat::SolvAttr::summary ); + if ( checkKeywords ) + q.addAttribute( zypp::sat::SolvAttr::keywords ); if ( checkDescr ) q.addAttribute( zypp::sat::SolvAttr::description ); if ( checkProvides ) @@ -271,14 +272,14 @@ if ( !packager->isYouMode() ) { // fill the package list with packages matching the search expression - fillSearchList( filter, - getCheckBoxValue( ignoreCase ), - settings->doCheckName(), - settings->doCheckSummary(), - settings->doCheckDescr(), - settings->doCheckProvides(), - settings->doCheckRequires() - ); + fillSearchList( filter, getCheckBoxValue( ignoreCase ), + settings->doCheckName(), + settings->doCheckSummary(), + settings->doCheckKeywords(), + settings->doCheckDescr(), + settings->doCheckProvides(), + settings->doCheckRequires() + ); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/src/NCPkgFilterSearch.h new/yast2-ncurses-pkg-2.18.2/src/NCPkgFilterSearch.h --- old/yast2-ncurses-pkg-2.18.1/src/NCPkgFilterSearch.h 2008-07-23 16:55:22.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/src/NCPkgFilterSearch.h 2009-03-30 16:02:54.000000000 +0200 @@ -83,6 +83,7 @@ bool fillSearchList( string & expr, bool ignoreCase, bool checkName, + bool checkKeywords, bool checkSummary, bool checkDescr, bool checkProvides, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/src/NCPkgPackageDetails.cc new/yast2-ncurses-pkg-2.18.2/src/NCPkgPackageDetails.cc --- old/yast2-ncurses-pkg-2.18.1/src/NCPkgPackageDetails.cc 2008-10-23 19:14:29.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/src/NCPkgPackageDetails.cc 2009-03-30 16:02:54.000000000 +0200 @@ -169,6 +169,13 @@ text += package->group (); text += "<br>"; + // name of the source package + text += "<b>" + _("Source Package: ") + "</b>"; + text += package->sourcePkgName(); + text += "-"; + text += package->sourcePkgEdition().asString(); + text += "<br>"; + //authors, in one line text += NCPkgStrings::Authors(); list<string> authors = package->authors(); // zypp::Package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/src/NCPkgSearchSettings.cc new/yast2-ncurses-pkg-2.18.2/src/NCPkgSearchSettings.cc --- old/yast2-ncurses-pkg-2.18.1/src/NCPkgSearchSettings.cc 2008-06-25 14:07:49.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/src/NCPkgSearchSettings.cc 2009-03-30 16:02:54.000000000 +0200 @@ -40,6 +40,8 @@ items.push_back (checkName); checkSummary = new YItem ( _( "Summary" ), true); items.push_back (checkSummary); + checkKeywords = new YItem ( _( "Keywords" )); + items.push_back (checkKeywords); checkDescr = new YItem ( _( "Description (time-consuming)" )); items.push_back (checkDescr); checkProvides = new YItem ( _( "Provides" )); @@ -58,6 +60,10 @@ { return checkSummary->selected(); } +bool NCPkgSearchSettings::doCheckKeywords() +{ + return checkKeywords->selected(); +} bool NCPkgSearchSettings::doCheckDescr() { return checkDescr->selected(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/src/NCPkgSearchSettings.h new/yast2-ncurses-pkg-2.18.2/src/NCPkgSearchSettings.h --- old/yast2-ncurses-pkg-2.18.1/src/NCPkgSearchSettings.h 2008-06-25 14:04:52.000000000 +0200 +++ new/yast2-ncurses-pkg-2.18.2/src/NCPkgSearchSettings.h 2009-03-30 16:02:54.000000000 +0200 @@ -35,6 +35,7 @@ YItemCollection items; YItem *checkName; YItem *checkSummary; + YItem *checkKeywords; YItem *checkDescr; YItem *checkProvides; YItem *checkRequires; @@ -47,6 +48,7 @@ bool doCheckName(); bool doCheckSummary(); + bool doCheckKeywords(); bool doCheckDescr(); bool doCheckProvides(); bool doCheckRequires(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/src/NCPkgTable.cc new/yast2-ncurses-pkg-2.18.2/src/NCPkgTable.cc --- old/yast2-ncurses-pkg-2.18.1/src/NCPkgTable.cc 2009-01-20 17:55:21.000000000 +0100 +++ new/yast2-ncurses-pkg-2.18.2/src/NCPkgTable.cc 2009-05-06 12:01:10.000000000 +0200 @@ -797,9 +797,16 @@ NCTable::wHandleInput( key); break; } - default: { + case '-': + case '+': + case '>': + case '<': + case '!': + case '*': { // set the new status changeObjStatus( key ); + } + default: { break; } } @@ -1141,27 +1148,38 @@ switch (mode) { case I_Descr: - packager->InfoText()->longDescription( pkgPtr ); + if ( packager->InfoText() ) + packager->InfoText()->longDescription( pkgPtr ); break; case I_Technical: - packager->InfoText()->technicalData( pkgPtr, slbPtr ); + if ( packager->InfoText() ) + packager->InfoText()->technicalData( pkgPtr, slbPtr ); break; case I_Files: - packager->InfoText()->fileList( slbPtr ); + if ( packager->InfoText() ) + packager->InfoText()->fileList( slbPtr ); break; case I_Deps: - packager->InfoText()->dependencyList( pkgPtr, slbPtr ); + if ( packager->InfoText() ) + packager->InfoText()->dependencyList( pkgPtr, slbPtr ); break; case I_Versions: - packager->VersionsList()->fillAvailableList( slbPtr ); + if ( packager->VersionsList() ) + packager->VersionsList()->fillAvailableList( slbPtr ); break; case I_PatchDescr: - packager->InfoText()->patchDescription( pkgPtr, slbPtr ); + if ( packager->InfoText() ) + packager->InfoText()->patchDescription( pkgPtr, slbPtr ); + break; case I_PatchPkgs: - packager->fillPatchPackages( packager->PatchPkgs(), pkgPtr ); + if ( packager->PatchPkgs() ) + packager->fillPatchPackages( packager->PatchPkgs(), pkgPtr ); + break; case I_PatchPkgsVersions: - packager->fillPatchPackages( packager->PatchPkgsVersions(), pkgPtr, true ); - default: + if ( packager->PatchPkgsVersions() ) + packager->fillPatchPackages( packager->PatchPkgsVersions(), pkgPtr, true ); break; + // Intentionally omitting 'default' branch so the compiler can + // catch unhandled enum states } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.18.1/VERSION new/yast2-ncurses-pkg-2.18.2/VERSION --- old/yast2-ncurses-pkg-2.18.1/VERSION 2009-02-19 13:33:56.000000000 +0100 +++ new/yast2-ncurses-pkg-2.18.2/VERSION 2009-05-06 12:09:58.000000000 +0200 @@ -1 +1 @@ -2.18.1 +2.18.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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