July 2009 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-qt for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package yast2-qt for openSUSE:Factory checked in at Wed Jul 29 17:33:08 CEST 2009. -------- --- yast2-qt/yast2-qt.changes 2009-03-12 21:55:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2009-07-29 12:55:43.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 29 12:45:08 CEST 2009 - kmachalkova(a)suse.cz + +- Use YIconLoader to search for icons (add icon search path, use + findIcon in IconButton widget) (FaTe #306356) +- V 2.18.7 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-qt-2.18.6.tar.bz2 New: ---- yast2-qt-2.18.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.upEcG6/_old 2009-07-29 17:32:49.000000000 +0200 +++ /var/tmp/diff_new_pack.upEcG6/_new 2009-07-29 17:32:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt (Version 2.18.6) +# spec file for package yast2-qt (Version 2.18.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ Name: yast2-qt -Version: 2.18.6 +Version: 2.18.7 Release: 1 -License: GPL v2 or later -Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.18.6.tar.bz2 +Source0: yast2-qt-2.18.7.tar.bz2 +Group: System/YaST +License: GPL v2 or later BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libdrm-devel @@ -37,8 +37,9 @@ BuildRequires: cmake Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-libyui-devel >= 2.18.7 -Requires: yast2-libyui >= 2.18.7 +#YIconLoader +BuildRequires: yast2-libyui-devel >= 2.18.8 +Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt @@ -53,15 +54,8 @@ One of several user interfaces available for YaST2, based on Qt and the X Window System. - - -Authors: --------- - Mathias Kettner <kettner(a)suse.de> - Stefan Hundhammer <sh(a)suse.de> - %package devel -License: YaST License +License: GPL v2 or later Summary: Development package for graphical YaST2 user interfaces Group: Development/Libraries/YaST Requires: yast2-qt = %{version} @@ -79,12 +73,6 @@ for YaST2 and dynamically link those against the YaST2 Qt user interface rather than loading the respective plug-ins. - - -Authors: --------- - yast-devel(a)opensuse.org - %prep %setup ++++++ yast2-qt-2.18.6.tar.bz2 -> yast2-qt-2.18.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/VERSION.cmake new/yast2-qt-2.18.7/VERSION.cmake --- old/yast2-qt-2.18.6/VERSION.cmake 2009-03-12 21:55:39.000000000 +0100 +++ new/yast2-qt-2.18.7/VERSION.cmake 2009-07-29 12:52:55.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/package/yast2-qt.changes new/yast2-qt-2.18.7/package/yast2-qt.changes --- old/yast2-qt-2.18.6/package/yast2-qt.changes 2009-03-12 21:55:39.000000000 +0100 +++ new/yast2-qt-2.18.7/package/yast2-qt.changes 2009-07-29 12:52:55.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 29 12:45:08 CEST 2009 - kmachalkova(a)suse.cz + +- Use YIconLoader to search for icons (add icon search path, use + findIcon in IconButton widget) (FaTe #306356) +- V 2.18.7 + +------------------------------------------------------------------- Wed Mar 11 15:30:46 CET 2009 - kmachalkova(a)suse.cz - Added tooltips to BarGraph widget (duplicate segment text in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/src/YQApplication.cc new/yast2-qt-2.18.7/src/YQApplication.cc --- old/yast2-qt-2.18.6/src/YQApplication.cc 2009-03-12 21:55:39.000000000 +0100 +++ new/yast2-qt-2.18.7/src/YQApplication.cc 2009-07-29 12:52:55.000000000 +0200 @@ -63,7 +63,9 @@ { yuiDebug() << "YQApplication constructor start" << endl; - setIconBasePath( ICONDIR "/icons/22x22/apps/" ); + //setIconBasePath( ICONDIR "/icons/22x22/apps/" ); + // the above works too, but let's try it the icon-loader way - FaTE #306356 + iconLoader()->addIconSearchPath( ICONDIR "/icons/" ); loadPredefinedQtTranslations(); yuiDebug() << "YQApplication constructor end" << endl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/src/YQBarGraph.cc new/yast2-qt-2.18.7/src/YQBarGraph.cc --- old/yast2-qt-2.18.6/src/YQBarGraph.cc 2009-03-12 21:55:39.000000000 +0100 +++ new/yast2-qt-2.18.7/src/YQBarGraph.cc 2009-07-29 12:52:55.000000000 +0200 @@ -96,6 +96,8 @@ int x_off = YQBarGraphOuterMargin; int y_off = YQBarGraphOuterMargin; int valueTotal = 0; + QFontMetrics fm = painter.fontMetrics(); + toolTips.clear(); for ( int i=0; i < segments(); i++ ) @@ -108,6 +110,7 @@ { const YBarGraphSegment & seg = segment(i); int segWidth = ( (long) totalWidth * seg.value() ) / valueTotal; + int stringWidth = 0; if ( i == segments()-1 ) { @@ -155,14 +158,21 @@ if ( txt.contains( "%1" ) ) txt = txt.arg( seg.value() ); // substitute variable - painter.drawText( x_off + YQBarGraphLabelHorizontalMargin, + stringWidth = fm.size(0,txt).width(); + + // draw the text only if it fits the current segment width ... + if (stringWidth < segWidth) + { + painter.drawText( x_off + YQBarGraphLabelHorizontalMargin, y_off + YQBarGraphLabelVerticalMargin, segWidth - 2 * YQBarGraphLabelHorizontalMargin + 1, segHeight - 2 * YQBarGraphLabelVerticalMargin + 1, Qt::AlignCenter, txt ); + } - + // ... but always make it available via tooltip toolTips.insert(make_pair( x_off, txt)); + // Prepare for the next segment x_off += segWidth; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/src/YQGenericButton.cc new/yast2-qt-2.18.7/src/YQGenericButton.cc --- old/yast2-qt-2.18.6/src/YQGenericButton.cc 2009-03-12 21:55:39.000000000 +0100 +++ new/yast2-qt-2.18.7/src/YQGenericButton.cc 2009-07-29 12:52:55.000000000 +0200 @@ -121,7 +121,8 @@ return; } - qIconName = QString( ICONDIR ) + "/" + qIconName; + // Search for the icon - FaTE #306356 + qIconName = fromUTF8( YQUI::yqApp()->iconLoader()->findIcon( iconName ) ); QPixmap icon( qIconName ); if ( icon.isNull() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.18.6/yast2-qt.spec.in new/yast2-qt-2.18.7/yast2-qt.spec.in --- old/yast2-qt-2.18.6/yast2-qt.spec.in 2009-03-12 21:55:39.000000000 +0100 +++ new/yast2-qt-2.18.7/yast2-qt.spec.in 2009-07-29 12:52:55.000000000 +0200 @@ -2,6 +2,8 @@ @HEADER@ +Group: System/YaST +License: GPL v2 or later BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libdrm-devel @@ -14,10 +16,11 @@ BuildRequires: update-desktop-files BuildRequires: cmake -Summary: - +Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-libyui-devel >= 2.18.7 -Requires: yast2-libyui >= 2.18.7 +#YIconLoader +BuildRequires: yast2-libyui-devel >= 2.18.8 +Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt @@ -29,16 +32,26 @@ Recommends: yast2-qt-pkg %description -- +One of several user interfaces available for YaST2, based on Qt and the +X Window System. %package devel -Summary: - -Group: Development/Libraries +Summary: Development package for graphical YaST2 user interfaces +Group: Development/Libraries/YaST Requires: yast2-qt = %{version} Requires: yast2-libyui-devel %description devel -- +Shared libs for the YaST2 Qt user interface. + +This is not necessary for developing YaST2 scripts (YCP) -- the YaST2 +main program (y2bignfat) will load those components on demand as +plug-ins. Those plug-ins, however, are available within the base +package (yast2-ui-qt). + +You only need this package if you really wish to develop new binaries +for YaST2 and dynamically link those against the YaST2 Qt user +interface rather than loading the respective plug-ins. %prep %setup ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-libyui for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package yast2-libyui for openSUSE:Factory checked in at Wed Jul 29 17:32:35 CEST 2009. -------- --- yast2-libyui/yast2-libyui.changes 2009-03-06 10:40:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-libyui/yast2-libyui.changes 2009-07-28 17:39:49.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Jul 28 17:22:58 CEST 2009 - kmachalkova(a)suse.cz + +- Search for icons in several possible directories (using + /usr/share/icons/hicolor as fallback) - holds for everything + derived from SelectionWidget (FaTE #306356) +- V 2.18.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-libyui-2.18.7.tar.bz2 New: ---- yast2-libyui-2.18.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-libyui.spec ++++++ --- /var/tmp/diff_new_pack.8FXvTJ/_old 2009-07-29 17:32:08.000000000 +0200 +++ /var/tmp/diff_new_pack.8FXvTJ/_new 2009-07-29 17:32:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-libyui (Version 2.18.7) +# spec file for package yast2-libyui (Version 2.18.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: yast2-libyui -Version: 2.18.7 +Version: 2.18.8 Release: 1 -License: GPL v2 or later -Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-libyui-2.18.7.tar.bz2 +Source0: yast2-libyui-2.18.8.tar.bz2 Prefix: /usr +Group: System/YaST +License: GPL v2 or later Source1: yast2-libyui-rpmlintrc BuildRequires: gcc-c++ BuildRequires: yast2-devtools @@ -47,17 +47,11 @@ This can be used independently of YaST2 for generic (C++) applications. This package has very few dependencies. - - -Authors: --------- - Stefan Hundhammer <sh(a)suse.de> - %package devel License: GPL v2 or later Requires: yast2-libyui = %version -Group: System/YaST -Summary: YaST2 - Development Package for User Interface Engine +Group: Development/Libraries +Summary: YaST2 - User Interface Engine Requires: glibc-devel Requires: libstdc++-devel Requires: boost-devel @@ -70,14 +64,8 @@ This can be used independently of YaST2 for generic (C++) applications. This package has very few dependencies. - - -Authors: --------- - Stefan Hundhammer <sh(a)suse.de> - %prep -%setup -n yast2-libyui-2.18.7 +%setup -n yast2-libyui-2.18.8 %build %{prefix}/bin/y2tool y2autoconf @@ -87,7 +75,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" ++++++ yast2-libyui-2.18.7.tar.bz2 -> yast2-libyui-2.18.8.tar.bz2 ++++++ ++++ 16688 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-fonts for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package xorg-x11-fonts for openSUSE:Factory checked in at Wed Jul 29 17:32:17 CEST 2009. -------- --- xorg-x11-fonts/xorg-x11-fonts.changes 2008-09-11 14:20:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-fonts/xorg-x11-fonts.changes 2009-07-27 23:01:40.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 27 22:54:54 CEST 2009 - sndirsch(a)suse.de + +- removed duplicate fonts (bnc #524236) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- font-misc-cyrillic.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-fonts.spec ++++++ --- /var/tmp/diff_new_pack.Wm5HnS/_old 2009-07-29 17:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Wm5HnS/_new 2009-07-29 17:31:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-fonts (Version 7.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,8 @@ BuildRequires: fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 1 -License: X11/MIT +Release: 4 +License: MIT License (or similar) BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Fonts @@ -71,6 +71,7 @@ Source36: font-alias-X11R7.0-1.0.1.tar.bz2 Patch: encodings.diff Patch1: font-misc-ethiopic.diff +Patch2: font-misc-cyrillic.diff %description This package contains fonts maintained and shipped with X.Org. @@ -78,7 +79,7 @@ %package core -License: X11/MIT +License: MIT License (or similar) Summary: Core Fonts for X.Org Group: System/X11/Fonts PreReq: fonts-config @@ -101,6 +102,10 @@ pushd font-misc-ethiopic-* %patch1 popd +pushd font-misc-cyrillic-* +%patch2 +rm {koi7x14,koi8x13,koi9x15,koi9x18}.bdf +popd %build for dir in encodings-* $(ls | grep -v -e encodings -e alias) font-alias-* ; do ++++++ font-misc-cyrillic.diff ++++++ diff -u -r ../font-misc-cyrillic-X11R7.0-1.0.0.orig//Makefile.am ./Makefile.am --- ../font-misc-cyrillic-X11R7.0-1.0.0.orig//Makefile.am 2009-07-27 22:41:40.448056013 +0200 +++ ./Makefile.am 2009-07-27 22:44:55.924839012 +0200 @@ -27,14 +27,10 @@ koi6x13 \ koi6x9 \ koi7x14b \ - koi7x14 \ - koi8x13 \ koi8x16b \ koi8x16 \ koi9x15b \ - koi9x15 \ - koi9x18b \ - koi9x18 + koi9x18b BDF_FILES = $(FONT_FILES:%=%.bdf) PCF_FILES = $(FONT_FILES:%=%.pcf.gz) diff -u -r ../font-misc-cyrillic-X11R7.0-1.0.0.orig//Makefile.in ./Makefile.in --- ../font-misc-cyrillic-X11R7.0-1.0.0.orig//Makefile.in 2009-07-27 22:41:40.592062483 +0200 +++ ./Makefile.in 2009-07-27 22:44:48.604510107 +0200 @@ -123,14 +123,10 @@ koi6x13 \ koi6x9 \ koi7x14b \ - koi7x14 \ - koi8x13 \ koi8x16b \ koi8x16 \ koi9x15b \ - koi9x15 \ - koi9x18b \ - koi9x18 + koi9x18b BDF_FILES = $(FONT_FILES:%=%.bdf) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 trustedgrub for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package trustedgrub for openSUSE:Factory checked in at Wed Jul 29 17:31:36 CEST 2009. -------- --- trustedgrub/trustedgrub.changes 2008-12-02 16:55:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/trustedgrub/trustedgrub.changes 2009-07-29 14:19:24.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 29 14:19:12 CEST 2009 - meissner(a)suse.de + +- fix build by returning 0 in the stub checker functions. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trustedgrub.spec ++++++ --- /var/tmp/diff_new_pack.3lYF2c/_old 2009-07-29 17:31:25.000000000 +0200 +++ /var/tmp/diff_new_pack.3lYF2c/_new 2009-07-29 17:31:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package trustedgrub (Version 1.1.3) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ License: GPL v2 or later Group: System/Boot Version: 1.1.3 -Release: 8 +Release: 9 Source0: TrustedGRUB-%{version}.tgz Source2: grubonce Source3: grub-install ++++++ trustedgrub-compile-fixes ++++++ --- /var/tmp/diff_new_pack.3lYF2c/_old 2009-07-29 17:31:26.000000000 +0200 +++ /var/tmp/diff_new_pack.3lYF2c/_new 2009-07-29 17:31:26.000000000 +0200 @@ -26,3 +26,23 @@ filepos += len; return len; } +--- TrustedGRUB-1.1.3/grub/asmstub.c 2009/07/29 12:15:53 1.1 ++++ TrustedGRUB-1.1.3/grub/asmstub.c 2009/07/29 12:18:13 +@@ -269,14 +269,17 @@ + + long tcg_check_tpm (void) + { ++ return 0; + } + + long check_for_tpm (void) + { ++ return 0; + } + + long tpm_present (void) + { ++ return 0; + } + + void tcg_hash_extend_pcr (void) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gettext-runtime for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package gettext-runtime for openSUSE:Factory checked in at Wed Jul 29 17:31:26 CEST 2009. -------- --- gettext-runtime/gettext-csharp.changes 2009-01-14 09:25:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/gettext-runtime/gettext-csharp.changes 2009-07-27 13:19:34.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 27 12:52:23 CEST 2009 - rguenther(a)suse.de + +- Remove rather than %exclude not packaged files + +------------------------------------------------------------------- --- gettext-runtime/gettext-java.changes 2009-01-14 09:25:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/gettext-runtime/gettext-java.changes 2009-07-27 13:19:36.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 27 12:52:06 CEST 2009 - rguenther(a)suse.de + +- Remove rather than %exclude not packaged files. + +------------------------------------------------------------------- --- gettext-runtime/gettext-runtime.changes 2009-02-07 18:33:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/gettext-runtime/gettext-runtime.changes 2009-07-23 16:25:04.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 23 16:23:44 CEST 2009 - ke(a)suse.de + +- Synch po-mode.el with version from gettext CVS; for details, see the + beginning of po-mode-cvs-2009-07-23.patch. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- po-mode-cvs-2009-07-23.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gettext-csharp.spec ++++++ --- /var/tmp/diff_new_pack.OubuSf/_old 2009-07-29 17:23:14.000000000 +0200 +++ /var/tmp/diff_new_pack.OubuSf/_new 2009-07-29 17:23:14.000000000 +0200 @@ -26,7 +26,7 @@ Group: Development/Tools/Other AutoReqProv: on Version: 0.17 -Release: 96 +Release: 97 Summary: Native Language Support (NLS) for C# PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -122,6 +122,15 @@ mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} mv examples $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} mv csharpdoc $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +# exclude files packaged via other spec files +rm -Rf $RPM_BUILD_ROOT/%_bindir +rm -f $RPM_BUILD_ROOT/%_libdir/lib* +rm -f $RPM_BUILD_ROOT/%_libdir/gettext/hostname +rm -f $RPM_BUILD_ROOT/%_libdir/gettext/project-id +rm -f $RPM_BUILD_ROOT/%_libdir/gettext/urlget +rm -f $RPM_BUILD_ROOT/%_libdir/gettext/user-email +rm -Rf $RPM_BUILD_ROOT/%_includedir +rm -f $RPM_BUILD_ROOT/%_libdir/preloadable_libintl.so %clean rm -rf $RPM_BUILD_ROOT @@ -129,14 +138,6 @@ %files %defattr(-,root,root) %doc %{_defaultdocdir}/%{name} -%exclude %_bindir -%exclude %_libdir/lib* -%exclude %_libdir/gettext/hostname -%exclude %_libdir/gettext/project-id -%exclude %_libdir/gettext/urlget -%exclude %_libdir/gettext/user-email -%exclude %_includedir -%exclude %_libdir/preloadable_libintl.so %_libdir/GNU.Gettext.dll %_libdir/gettext/msgfmt.net.exe %_libdir/gettext/msgunfmt.net.exe ++++++ gettext-java.spec ++++++ --- /var/tmp/diff_new_pack.OubuSf/_old 2009-07-29 17:23:14.000000000 +0200 +++ /var/tmp/diff_new_pack.OubuSf/_new 2009-07-29 17:23:14.000000000 +0200 @@ -25,7 +25,7 @@ Group: Development/Tools/Other AutoReqProv: on Version: 0.17 -Release: 108 +Release: 109 Summary: Java Support for Native Language Support (NLS) PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -129,6 +129,13 @@ END } ls -l $RPM_BUILD_ROOT/%_datadir +# exclude files packaged via other spec files +rm -rf $RPM_BUILD_ROOT/%_prefix/bin +rm -f $RPM_BUILD_ROOT/%_libdir/lib* +rm -f $RPM_BUILD_ROOT/%_libdir/gettext/hostname +rm -f $RPM_BUILD_ROOT/%_libdir/gettext/project-id +rm -f $RPM_BUILD_ROOT/%_libdir/gettext/urlget +rm -f $RPM_BUILD_ROOT/%_libdir/gettext/user-email %clean rm -rf $RPM_BUILD_ROOT @@ -136,12 +143,6 @@ %files %defattr(-,root,root) %{_defaultdocdir}/%{name} -%exclude %_prefix/bin -%exclude %_libdir/lib* -%exclude %_libdir/gettext/hostname -%exclude %_libdir/gettext/project-id -%exclude %_libdir/gettext/urlget -%exclude %_libdir/gettext/user-email %_libdir/gettext/gnu.gettext.DumpResource %_libdir/gettext/gnu.gettext.GetURL ++++++ gettext-runtime.spec ++++++ --- /var/tmp/diff_new_pack.OubuSf/_old 2009-07-29 17:23:15.000000000 +0200 +++ /var/tmp/diff_new_pack.OubuSf/_new 2009-07-29 17:23:15.000000000 +0200 @@ -21,12 +21,12 @@ Name: gettext-runtime %define pacname gettext Version: 0.17 -Release: 63 +Release: 64 BuildRequires: gcc-c++ perl-libintl-perl tcl # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable: #BuildRequires: fdupes Url: http://www.gnu.org/software/gettext/ -License: GPL v3 or later; LGPL v2.0 or later +License: GPL v3 or later ; LGPL v2.0 or later Group: Development/Tools/Other # bug437293 %ifarch ppc64 @@ -55,6 +55,7 @@ Patch10: gettext-open_missing_mode.patch Patch11: gettext-typo_to_segfault.patch Patch12: gettext-0.17-no-autoconf-tests.diff +Patch13: po-mode-cvs-2009-07-23.patch %description This package contains the intl library as well as tools that ease the @@ -114,6 +115,7 @@ %patch10 %patch11 %patch12 +%patch13 -p1 pushd gettext-tools/misc tar xfz archive.tar.gz find . -name gettext.m4,v -print0 | xargs -0 perl -spi -e 's/$int$ /$long$ /g' ++++++ po-mode-cvs-2009-07-23.patch ++++++ 2008-08-13 Sven Joachim <svenjoac(a)gmx.de> * po-mode.el (po-check-file-header): Use forward-line with negative argument instead of previous-line. (po-add-attribute): Use forward-line instead of next-line. 2008-05-25 Bruno Haible <bruno(a)clisp.org> * po-mode.el (po-replace-revision-date): Return nil. Patch by Kobayashi Noritada <nori1(a)dolphin.c.u-tokyo.ac.jp>. 2008-05-07 Bruno Haible <bruno(a)clisp.org> * po-mode.el (po-team-name-to-code): Add Beja. Remove Adangme, Banda, Batak. Update Scottish Gaelic, Central Khmer, Romansh. 2008-05-07 Bruno Haible <bruno(a)clisp.org> Fix editing of plural forms. * po-mode.el (po-mode-version-string): Bump to 2.11. (po-any-msgstr-block-regexp): Must start with msgstr or msgstr[0]; needed for re-search-backward. (po-get-msgstr-flavor): Set the point to po-start-of-msgstr-form, not to the beginning of the line. Reported by St�phane Raimbault <stephane.raimbault(a)gmail.com>. 2007-12-02 Bruno Haible <bruno(a)clisp.org> * po-mode.el: Use modern backquote syntax. Report and patch by Agustin Martin <agmartin(a)debian.org> via Santiago Vila <sanvila(a)unex.es>. --- gettext-0.17/gettext-tools/misc/po-mode.el 2007-10-18 01:27:56.000000000 +0200 +++ gettext/gettext-tools/misc/po-mode.el 2008-08-14 10:34:09.000000000 +0200 @@ -1,28 +1,26 @@ ;;; po-mode.el -- major mode for GNU gettext PO files -;; Copyright (C) 1995-1999, 2000-2002, 2005-2007 Free Software Foundation, Inc. +;; Copyright (C) 1995-1999, 2000-2002, 2005-2008 Free Software Foundation, Inc. -;; Authors: Fran�ois Pinard <pinard(a)iro.umontreal.ca> +;; Authors: François Pinard <pinard(a)iro.umontreal.ca> ;; Greg McGary <gkm(a)magilla.cichlid.com> ;; Keywords: i18n gettext ;; Created: 1995 ;; This file is part of GNU gettext. -;; GNU gettext is free software; you can redistribute it and/or modify +;; This program is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. +;; the Free Software Foundation; either version 3 of the License, or +;; (at your option) any later version. -;; GNU gettext is distributed in the hope that it will be useful, +;; This program is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with this program. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: @@ -64,7 +62,7 @@ ;;; Code: -(defconst po-mode-version-string "2.1" "\ +(defconst po-mode-version-string "2.11" "\ Version number of this version of po-mode.el.") ;;; Emacs portability matters - part I. @@ -101,7 +99,7 @@ (defmacro defgroup (&rest args) nil) (defmacro defcustom (var value doc &rest args) - (` (defvar (, var) (, value) (, doc)))))) + `(defvar ,var ,value ,doc)))) ;;; Customisation. @@ -188,7 +186,6 @@ ("(Afan) Oromo" . "om") ("Abkhazian" . "ab") ("Achinese" . "ace") - ("Adangme" . "ad") ("Afar" . "aa") ("Afrikaans" . "af") ("Akan" . "ak") @@ -208,10 +205,9 @@ ("Balinese" . "ban") ("Baluchi" . "bal") ("Bambara" . "bm") - ("Banda" . "bad") ("Bashkir" . "ba") ("Basque" . "eu") - ("Batak" . "btk") + ("Beja" . "bej") ("Belarusian" . "be") ("Bemba" . "bem") ("Bengali" . "bn") @@ -228,6 +224,7 @@ ("Burmese" . "my") ("Catalan" . "ca") ("Cebuano" . "ceb") + ("Central Khmer" . "km") ("Chamorro" . "ch") ("Chechen" . "ce") ("Chinese" . "zh") @@ -302,7 +299,7 @@ ("Kashmiri" . "ks") ("Kashubian" . "csb") ("Kazakh" . "kk") - ("Khmer" . "km") + ("Khmer" . "km") ; old name ("Kikuyu" . "ki") ("Kimbundu" . "kmb") ("Kinyarwanda" . "rw") @@ -369,7 +366,7 @@ ("Old English" . "ang") ("Oriya" . "or") ("Ossetian" . "os") - ("P�ez" . "pbb") + ("Páez" . "pbb") ("Pali" . "pi") ("Pampanga" . "pam") ("Pangasinan" . "pag") @@ -380,8 +377,9 @@ ("Punjabi" . "pa") ("Quechua" . "qu") ("Rajasthani" . "raj") - ("Rhaeto-Roman" . "rm") + ("Rhaeto-Roman" . "rm") ; old name ("Romanian" . "ro") + ("Romansh" . "rm") ("Russian" . "ru") ("Samoan" . "sm") ("Sango" . "sg") @@ -389,7 +387,8 @@ ("Santali" . "sat") ("Sardinian" . "sc") ("Sasak" . "sas") - ("Scots" . "gd") + ("Scots" . "gd") ; old name + ("Scottish Gaelic" . "gd") ("Serbian" . "sr") ("Serer" . "srr") ("Sesotho" . "st") @@ -1011,7 +1010,7 @@ "Regexp matching a whole msgid field, whether obsolete or not.") (defvar po-any-msgstr-block-regexp - "^\$#~[ \t]*\$?msgstr.*\n\$\\(#~[ \t]*\$?\".*\n\\)*\$\\(#~[ \t]*\$?msgstr\\[[0-9]\\].*\n\$\\(#~[ \t]*\$?\".*\n\\)*\\)*" + "^\$#~[ \t]*\$?msgstr\$[ \t]\\|\\[0\\]\$.*\n\$\\(#~[ \t]*\$?\".*\n\\)*\$\\(#~[ \t]*\$?msgstr\\[[0-9]\\].*\n\$\\(#~[ \t]*\$?\".*\n\\)*\\)*" "Regexp matching a whole msgstr or msgstr[] field, whether obsolete or not.") (defvar po-any-msgstr-form-regexp @@ -1343,7 +1342,7 @@ (progn ;; There is at least one entry. (goto-char (match-beginning 0)) - (previous-line 1) + (forward-line -1) (setq end-of-header (match-end 0)) (if (looking-at "msgid \"\"\n") ;; There is indeed a PO file header. @@ -1353,7 +1352,7 @@ ;; This is an oldish header. Replace it all. (goto-char end-of-header) (while (> (point) (point-min)) - (previous-line 1) + (forward-line -1) (insert "#~ ") (beginning-of-line)) (beginning-of-line) @@ -1392,7 +1391,9 @@ zone "\\n\"") t t)))) (message "")) - (message (_"PO-Revision-Date should be adjusted...")))) + (message (_"PO-Revision-Date should be adjusted..."))) + ;; Return nil to indicate that the buffer has not yet been saved. + nil) ;;; Handling span of entry, entry type and entry attributes. @@ -1497,7 +1498,7 @@ (insert ", " name))) (skip-chars-forward "\n") (while (eq (following-char) ?#) - (next-line 1)) + (forward-line 1)) (insert "#, " name "\n"))))) (defun po-delete-attribute (name) @@ -1893,7 +1894,7 @@ (defun po-get-msgstr-flavor () "Helper function to detect msgstr and msgstr[] variants." - (beginning-of-line) + (goto-char po-start-of-msgstr-form) (re-search-forward "^\$#~[ \t]*\$?\$msgstr\\(\\[[0-9]\\]\$?\\)") (match-string 2)) @@ -3450,6 +3451,7 @@ ;; Hey Emacs! ;; Local Variables: ;; indent-tabs-mode: nil +;; coding: utf-8 ;; End: ;;; po-mode.el ends here ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 freetype2 for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package freetype2 for openSUSE:Factory checked in at Wed Jul 29 17:21:51 CEST 2009. -------- --- freetype2/freetype2.changes 2009-07-07 10:30:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/freetype2/freetype2.changes 2009-07-27 15:45:38.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Jul 27 15:01:04 CEST 2009 - tiwai(a)suse.de + +- updated to version 2.3.9: + * see URLs below + http://www.freetype.org/index2.html#release-freetype-2.3.9 + http://sourceforge.net/project/shownotes.php?group_id=3157&release_id=653641 +- updated to version 2.3.9: + * see URLs below + http://www.freetype.org/index2.html#release-freetype-2.3.9 + http://sourceforge.net/project/shownotes.php?group_id=3157&release_id=667610 +- fix builds with older distros + +------------------------------------------------------------------- --- freetype2/ft2demos.changes 2009-05-06 18:38:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/freetype2/ft2demos.changes 2009-07-27 15:45:38.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Jul 27 15:05:32 CEST 2009 - tiwai(a)suse.de + +- updated to version 2.3.9: + * see URLs below + http://www.freetype.org/index2.html#release-freetype-2.3.9 + http://sourceforge.net/project/shownotes.php?group_id=3157&release_id=653641 +- updated to version 2.3.9: + * see URLs below + http://www.freetype.org/index2.html#release-freetype-2.3.9 + http://sourceforge.net/project/shownotes.php?group_id=3157&release_id=667610 +- fix builds with older distros + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bnc441638-bc-enabling-fix-from-cvs.patch freetype-2.3.7.tar.bz2 freetype-doc-2.3.7.tar.bz2 ft2demos-2.3.7.tar.bz2 uninitialized-variable.patch New: ---- freetype-2.3.9.tar.bz2 freetype-doc-2.3.9.tar.bz2 ft2demos-2.3.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetype2.spec ++++++ --- /var/tmp/diff_new_pack.NkhnF4/_old 2009-07-29 17:20:47.000000000 +0200 +++ /var/tmp/diff_new_pack.NkhnF4/_new 2009-07-29 17:20:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package freetype2 (Version 2.3.7) +# spec file for package freetype2 (Version 2.3.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Obsoletes: freetype2-64bit %endif # -Version: 2.3.7 -Release: 27 +Version: 2.3.9 +Release: 1 Url: http://www.freetype.org Summary: A TrueType Font Library # CVS repository: @@ -45,9 +45,7 @@ Patch5: revert-fix-bytecode.patch Patch8: bugzilla-159166-reduce-embolden-distance.patch Patch9: fix-build.patch -Patch10: uninitialized-variable.patch Patch308961: bugzilla-308961-cmex-workaround.patch -Patch441638: bnc441638-bc-enabling-fix-from-cvs.patch Patch11: bnc485889-overflow1.patch Patch12: bnc485889-overflow2.patch Patch13: bnc485889-overflow3.patch @@ -111,9 +109,7 @@ #%patch5 -p 1 #%patch8 -p 1 %patch9 -p 1 -%patch10 -p 1 %patch308961 -p 1 -%patch441638 -p 1 %patch11 -p 1 %patch12 -p 1 %patch13 -p 1 @@ -132,7 +128,9 @@ cp /usr/share/automake*/config.{guess,sub} builds/unix %build +%if %suse_version > 1110 sh ./autogen.sh +%endif export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing " ln -s /usr/bin/libtool ./builds/unix/libtool make setup CFG="--prefix=/usr --libdir=%{_libdir} --with-zlib" ++++++ ft2demos.spec ++++++ --- /var/tmp/diff_new_pack.NkhnF4/_old 2009-07-29 17:20:47.000000000 +0200 +++ /var/tmp/diff_new_pack.NkhnF4/_new 2009-07-29 17:20:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ft2demos (Version 2.3.7) +# spec file for package ft2demos (Version 2.3.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,8 @@ %if %suse_version > 1000 Supplements: fonts-config %endif -Version: 2.3.7 -Release: 34 +Version: 2.3.9 +Release: 1 %define freetype_version %{version} Url: http://www.freetype.org Summary: Freetype2 Utilities and Demo Programs @@ -47,7 +47,6 @@ Patch8: bugzilla-159166-reduce-embolden-distance.patch Patch9: fix-build.patch Patch308961: bugzilla-308961-cmex-workaround.patch -Patch441638: bnc441638-bc-enabling-fix-from-cvs.patch Patch11: bnc485889-overflow1.patch Patch12: bnc485889-overflow2.patch Patch13: bnc485889-overflow3.patch @@ -87,7 +86,6 @@ #%patch8 -p 1 %patch9 -p 1 %patch308961 -p 1 -%patch441638 -p 1 %patch11 -p 1 %patch12 -p 1 %patch13 -p 1 @@ -112,7 +110,9 @@ cp /usr/share/automake*/config.{guess,sub} builds/unix %build +%if %suse_version > 1110 sh ./autogen.sh +%endif export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing " ln -s /usr/bin/libtool ./builds/unix/libtool make setup CFG="--prefix=/usr --libdir=%{_libdir} --with-zlib" ++++++ freetype-2.3.7.tar.bz2 -> freetype-2.3.9.tar.bz2 ++++++ ++++ 63175 lines of diff (skipped) ++++++ freetype-doc-2.3.7.tar.bz2 -> freetype-doc-2.3.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.3.7/docs/design/design-5.html new/freetype-2.3.9/docs/design/design-5.html --- old/freetype-2.3.7/docs/design/design-5.html 2007-02-06 12:10:51.000000000 +0100 +++ new/freetype-2.3.9/docs/design/design-5.html 2009-03-11 06:53:53.000000000 +0100 @@ -343,7 +343,7 @@ </tr> <tr valign=top> <td> - <tt>module_requires</tt> + <tt>module_interface</tt> </td> <td> <p>Most modules support one or more "interfaces", i.e. tables of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.3.7/docs/tutorial/example2.cpp new/freetype-2.3.9/docs/tutorial/example2.cpp --- old/freetype-2.3.7/docs/tutorial/example2.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/freetype-2.3.9/docs/tutorial/example2.cpp 2009-03-07 09:10:06.000000000 +0100 @@ -0,0 +1,400 @@ +// example2.cpp + +// This file demonstrates how to render a coloured glyph with a differently +// coloured outline. +// +// Written Feb. 2009 by Erik M�ller, +// with slight modifications by Werner Lemberg +// +// Public domain. +// +// Eric uses similar code in real applications; see +// +// http://www.timetrap.se +// http://www.emberwind.se +// +// for more. + +#include <ft2build.h> +#include FT_FREETYPE_H +#include FT_STROKER_H + +#include <vector> +#include <fstream> +#include <iostream> + + +#ifdef _MSC_VER +#define MIN __min +#define MAX __max +#else +#define MIN std::min +#define MAX std::max +#endif + + +// Define some fixed size types. + +typedef unsigned char uint8; +typedef unsigned short uint16; +typedef unsigned int uint32; + + +// Try to figure out what endian this machine is using. Note that the test +// below might fail for cross compilation; additionally, multi-byte +// characters are implementation-defined in C preprocessors. + +#if (('1234' >> 24) == '1') +#elif (('4321' >> 24) == '1') + #define BIG_ENDIAN +#else + #error "Couldn't determine the endianness!" +#endif + + +// A simple 32-bit pixel. + +union Pixel32 +{ + Pixel32() + : integer(0) { } + Pixel32(uint8 bi, uint8 gi, uint8 ri, uint8 ai = 255) + { + b = bi; + g = gi; + r = ri; + a = ai; + } + + uint32 integer; + + struct + { +#ifdef BIG_ENDIAN + uint8 a, r, g, b; +#else // BIG_ENDIAN + uint8 b, g, r, a; +#endif // BIG_ENDIAN + }; +}; + + +struct Vec2 +{ + Vec2() { } + Vec2(float a, float b) + : x(a), y(b) { } + + float x, y; +}; + + +struct Rect +{ + Rect() { } + Rect(float left, float top, float right, float bottom) + : xmin(left), xmax(right), ymin(top), ymax(bottom) { } + + void Include(const Vec2 &r) + { + xmin = MIN(xmin, r.x); + ymin = MIN(ymin, r.y); + xmax = MAX(xmax, r.x); + ymax = MAX(ymax, r.y); + } + + float Width() const { return xmax - xmin + 1; } + float Height() const { return ymax - ymin + 1; } + + float xmin, xmax, ymin, ymax; +}; + + +// TGA Header struct to make it simple to dump a TGA to disc. + +#if defined(_MSC_VER) || defined(__GNUC__) +#pragma pack(push, 1) +#pragma pack(1) // Dont pad the following struct. +#endif + +struct TGAHeader +{ + uint8 idLength, // Length of optional identification sequence. + paletteType, // Is a palette present? (1=yes) + imageType; // Image data type (0=none, 1=indexed, 2=rgb, + // 3=grey, +8=rle packed). + uint16 firstPaletteEntry, // First palette index, if present. + numPaletteEntries; // Number of palette entries, if present. + uint8 paletteBits; // Number of bits per palette entry. + uint16 x, // Horiz. pixel coord. of lower left of image. + y, // Vert. pixel coord. of lower left of image. + width, // Image width in pixels. + height; // Image height in pixels. + uint8 depth, // Image color depth (bits per pixel). + descriptor; // Image attribute flags. +}; + +#if defined(_MSC_VER) || defined(__GNUC__) +#pragma pack(pop) +#endif + + +bool +WriteTGA(const std::string &filename, + const Pixel32 *pxl, + uint16 width, + uint16 height) +{ + std::ofstream file(filename.c_str(), std::ios::binary); + if (file) + { + TGAHeader header; + memset(&header, 0, sizeof(TGAHeader)); + header.imageType = 2; + header.width = width; + header.height = height; + header.depth = 32; + header.descriptor = 0x20; + + file.write((const char *)&header, sizeof(TGAHeader)); + file.write((const char *)pxl, sizeof(Pixel32) * width * height); + + return true; + } + return false; +} + + +// A horizontal pixel span generated by the FreeType renderer. + +struct Span +{ + Span() { } + Span(int _x, int _y, int _width, int _coverage) + : x(_x), y(_y), width(_width), coverage(_coverage) { } + + int x, y, width, coverage; +}; + +typedef std::vector<Span> Spans; + + +// Each time the renderer calls us back we just push another span entry on +// our list. + +void +RasterCallback(const int y, + const int count, + const FT_Span * const spans, + void * const user) +{ + Spans *sptr = (Spans *)user; + for (int i = 0; i < count; ++i) + sptr->push_back(Span(spans[i].x, y, spans[i].len, spans[i].coverage)); +} + + +// Set up the raster parameters and render the outline. + +void +RenderSpans(FT_Library &library, + FT_Outline * const outline, + Spans *spans) +{ + FT_Raster_Params params; + memset(&params, 0, sizeof(params)); + params.flags = FT_RASTER_FLAG_AA | FT_RASTER_FLAG_DIRECT; + params.gray_spans = RasterCallback; + params.user = spans; + + FT_Outline_Render(library, outline, &params); +} + + +// Render the specified character as a colored glyph with a colored outline +// and dump it to a TGA. + +void +WriteGlyphAsTGA(FT_Library &library, + const std::string &fileName, + wchar_t ch, + FT_Face &face, + int size, + const Pixel32 &fontCol, + const Pixel32 outlineCol, + float outlineWidth) +{ + // Set the size to use. + if (FT_Set_Char_Size(face, size << 6, size << 6, 90, 90) == 0) + { + // Load the glyph we are looking for. + FT_UInt gindex = FT_Get_Char_Index(face, ch); + if (FT_Load_Glyph(face, gindex, FT_LOAD_NO_BITMAP) == 0) + { + // Need an outline for this to work. + if (face->glyph->format == FT_GLYPH_FORMAT_OUTLINE) + { + // Render the basic glyph to a span list. + Spans spans; + RenderSpans(library, &face->glyph->outline, &spans); + + // Next we need the spans for the outline. + Spans outlineSpans; + + // Set up a stroker. + FT_Stroker stroker; + FT_Stroker_New(library, &stroker); + FT_Stroker_Set(stroker, + (int)(outlineWidth * 64), + FT_STROKER_LINECAP_ROUND, + FT_STROKER_LINEJOIN_ROUND, + 0); + + FT_Glyph glyph; + if (FT_Get_Glyph(face->glyph, &glyph) == 0) + { + FT_Glyph_StrokeBorder(&glyph, stroker, 0, 1); + // Again, this needs to be an outline to work. + if (glyph->format == FT_GLYPH_FORMAT_OUTLINE) + { + // Render the outline spans to the span list + FT_Outline *o = + &reinterpret_cast<FT_OutlineGlyph>(glyph)->outline; + RenderSpans(library, o, &outlineSpans); + } + + // Clean up afterwards. + FT_Stroker_Done(stroker); + FT_Done_Glyph(glyph); + + // Now we need to put it all together. + if (!spans.empty()) + { + // Figure out what the bounding rect is for both the span lists. + Rect rect(spans.front().x, + spans.front().y, + spans.front().x, + spans.front().y); + for (Spans::iterator s = spans.begin(); + s != spans.end(); ++s) + { + rect.Include(Vec2(s->x, s->y)); + rect.Include(Vec2(s->x + s->width - 1, s->y)); + } + for (Spans::iterator s = outlineSpans.begin(); + s != outlineSpans.end(); ++s) + { + rect.Include(Vec2(s->x, s->y)); + rect.Include(Vec2(s->x + s->width - 1, s->y)); + } + +#if 0 + // This is unused in this test but you would need this to draw + // more than one glyph. + float bearingX = face->glyph->metrics.horiBearingX >> 6; + float bearingY = face->glyph->metrics.horiBearingY >> 6; + float advance = face->glyph->advance.x >> 6; +#endif + + // Get some metrics of our image. + int imgWidth = rect.Width(), + imgHeight = rect.Height(), + imgSize = imgWidth * imgHeight; + + // Allocate data for our image and clear it out to transparent. + Pixel32 *pxl = new Pixel32[imgSize]; + memset(pxl, 0, sizeof(Pixel32) * imgSize); + + // Loop over the outline spans and just draw them into the + // image. + for (Spans::iterator s = outlineSpans.begin(); + s != outlineSpans.end(); ++s) + for (int w = 0; w < s->width; ++w) + pxl[(int)((imgHeight - 1 - (s->y - rect.ymin)) * imgWidth + + s->x - rect.xmin + w)] = + Pixel32(outlineCol.r, outlineCol.g, outlineCol.b, + s->coverage); + + // Then loop over the regular glyph spans and blend them into + // the image. + for (Spans::iterator s = spans.begin(); + s != spans.end(); ++s) + for (int w = 0; w < s->width; ++w) + { + Pixel32 &dst = + pxl[(int)((imgHeight - 1 - (s->y - rect.ymin)) * imgWidth + + s->x - rect.xmin + w)]; + Pixel32 src = Pixel32(fontCol.r, fontCol.g, fontCol.b, + s->coverage); + dst.r = (int)(dst.r + ((src.r - dst.r) * src.a) / 255.0f); + dst.g = (int)(dst.g + ((src.g - dst.g) * src.a) / 255.0f); + dst.b = (int)(dst.b + ((src.b - dst.b) * src.a) / 255.0f); + dst.a = MIN(255, dst.a + src.a); + } + + // Dump the image to disk. + WriteTGA(fileName, pxl, imgWidth, imgHeight); + + delete [] pxl; + } + } + } + } + } +} + + +int +main(int argc, + char **argv) +{ + if (argc != 3) + { + std::cerr << "Render letter `B' of given font as a TGA image.\n"; + std::cerr << "\n"; + std::cerr << "usage: example2 <font> <TGA-file>\n"; + return 1; + } + + // Initialize FreeType. + FT_Library library; + FT_Init_FreeType(&library); + + // Open up a font file. + std::ifstream fontFile(argv[1], std::ios::binary); + if (fontFile) + { + // Read the entire file to a memory buffer. + fontFile.seekg(0, std::ios::end); + std::fstream::pos_type fontFileSize = fontFile.tellg(); + fontFile.seekg(0); + unsigned char *fontBuffer = new unsigned char[fontFileSize]; + fontFile.read((char *)fontBuffer, fontFileSize); + + // Create a face from a memory buffer. Be sure not to delete the memory + // buffer until you are done using that font as FreeType will reference + // it directly. + FT_Face face; + FT_New_Memory_Face(library, fontBuffer, fontFileSize, 0, &face); + + // Dump out a single glyph to a tga. + WriteGlyphAsTGA(library, + argv[2], + L'B', + face, + 100, + Pixel32(255, 90, 30), + Pixel32(255, 255, 255), + 3.0f); + + // Now that we are done it is safe to delete the memory. + delete [] fontBuffer; + } + + // Clean up the library + FT_Done_FreeType(library); + + return 1; +} + +/* EOF */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.3.7/docs/tutorial/step2.html new/freetype-2.3.9/docs/tutorial/step2.html --- old/freetype-2.3.7/docs/tutorial/step2.html 2007-02-06 12:12:12.000000000 +0100 +++ new/freetype-2.3.9/docs/tutorial/step2.html 2009-03-07 09:41:58.000000000 +0100 @@ -47,9 +47,9 @@ </h1> <h3 align=center> - © 2003, 2006, 2007 David Turner + © 2009 David Turner (<a href="mailto:david@freetype.org">david(a)freetype.org</a>)<br> - © 2003, 2006, 2007 The FreeType Development Team + © 2009 The FreeType Development Team (<a href="http://www.freetype.org">www.freetype.org</a>) </h3> @@ -63,8 +63,8 @@ Introduction </h2> - <p>This is the second section of the FreeType 2 tutorial. It describes - how to</p> + <p>This is the second section of the FreeType 2 tutorial. It + describes how to</p> <ul> <li>retrieve glyph metrics</li> @@ -99,7 +99,7 @@ <p>Individual glyph metrics can be accessed by first loading the glyph in a face's glyph slot, then accessing them through the <tt>face->glyph->metrics</tt> structure, whose type is <a -[A href="../reference/ft2-base_interface.html#FT_Glyph_Metrics"> + href="../reference/ft2-base_interface.html#FT_Glyph_Metrics"> <tt>FT_Glyph_Metrics</tt></a>. We will discuss this in more detail below; for now, we only note that it contains the following fields:</p> @@ -279,7 +279,7 @@ and even perform additional transformations and measures on it before converting it to a bitmap.</p> - <p>The FreeType 2 API has a specific extension which is capable of + <p>The FreeType 2 API has a specific extension which is capable of dealing with glyph images in a flexible and generic way. To use it, you first need to include the <a href="../reference/ft2-header_file_macros.html#FT_GLYPH_H"> @@ -465,7 +465,7 @@ <p>You may need to convert the glyph object to a bitmap once you have conveniently cached or transformed it. This can be done easily with the <a href="../reference/ft2-glyph_management.html"> - <tt>FT_Glyph_To_Bitmap</tt></a> function. It is in charge of + <tt>FT_Glyph_To_Bitmap</tt></a> function. It is in charge of converting any glyph object into a bitmap, as in:</p> <div class="pre"> @@ -605,12 +605,11 @@ </tr> <tr valign=top> <td> - <tt>global_bbox</tt> + <tt>bbox</tt> </td> <td> <p>The global bounding box is defined as the largest rectangle - that can enclose all the glyphs in a font face. It is defined for - horizontal layouts only.</p> + that can enclose all the glyphs in a font face.</p> </td> </tr> <tr valign=top> @@ -624,7 +623,7 @@ differently. For some, it represents the ascent of all capital latin characters (without accents), for others it is the ascent of the highest accented character, and finally, other formats define - it as being equal to <tt>global_bbox.yMax</tt>.</p> + it as being equal to <tt>bbox.yMax</tt>.</p> </td> </tr> <tr valign=top> @@ -638,20 +637,20 @@ differently. For some, it represents the descent of all capital latin characters (without accents), for others it is the ascent of the lowest accented character, and finally, other formats define - it as being equal to <tt>global_bbox.yMin</tt>. This field is + it as being equal to <tt>bbox.yMin</tt>. This field is negative for values below the baseline.</p> </td> </tr> <tr valign=top> <td> - <tt>text_height</tt> + <tt>height</tt> </td> <td> - <p>This field is simply used to compute a default line spacing - (i.e., the baseline-to-baseline distance) when writing text with - this font. Note that it usually is larger than the sum of the - ascender and descender taken as absolute values. There is also no - guarantee that no glyphs extend above or below subsequent + <p>This field is simply used to compute a <i>default</i> line + spacing (i.e., the baseline-to-baseline distance) when writing + text with this font. Note that it usually is larger than the sum + of the ascender and descender taken as absolute values. There is + also no guarantee that no glyphs extend above or below subsequent baselines when using this distance.</p> </td> </tr> @@ -672,8 +671,7 @@ </td> <td> <p>Same as <tt>max_advance_width</tt> but for vertical text - layout. It is only available in fonts providing vertical glyph - metrics.</p> + layout.</p> </td> </tr> <tr valign=top> @@ -683,7 +681,7 @@ <td> <p>When displaying or rendering underlined text, this value corresponds to the vertical position, relative to the baseline, of - the underline bar. It is negative if it is below the + the underline bar's center. It is negative if it is below the baseline.</p> </td> </tr> @@ -712,7 +710,7 @@ the <tt>face->size->metrics</tt> structure.</p> <p>Note that these values correspond to scaled versions of the design - global metrics, <em>with no rounding/grid-fitting performed</em>. + global metrics, <em>with no rounding or grid-fitting performed</em>. They are also completely independent of any hinting process. In other words, don't rely on them to get exact metrics at the pixel level. They are expressed in 26.6 pixel format.</p> @@ -1347,7 +1345,7 @@ ... load glyph sequence ... - ... setup "matrix" and "delta" ... + ... set up "matrix" and "delta" ... <span class="comment">/* transform glyphs */</span> for ( n = 0; n < num_glyphs; n++ ) @@ -1656,17 +1654,17 @@ <p>The next section will deal with FreeType 2 internals (like modules, vector outlines, font drivers, renderers), as well as a few font format specific issues (mainly, how to access certain TrueType or - Type 1 tables). [This section has not been written yet.]</p> + Type 1 tables).</p> </td></tr> </table> </center> <h3 align=center> - <a href="step1.html">FreeType 2 Tutorial Step 1</a> + <a href="step3.html">FreeType 2 Tutorial Step 3</a> </h3> -<p><font size=-3>Last update: 06-Feb-2007</font></p> +<p><font size=-3>Last update: 07-Mar-2009</font></p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/freetype-2.3.7/docs/tutorial/step3.html new/freetype-2.3.9/docs/tutorial/step3.html --- old/freetype-2.3.7/docs/tutorial/step3.html 1970-01-01 01:00:00.000000000 +0100 +++ new/freetype-2.3.9/docs/tutorial/step3.html 2009-03-07 09:45:05.000000000 +0100 @@ -0,0 +1,96 @@ +<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN" +"http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <style type="text/css"> + body { font-family: Verdana, Geneva, Arial, Helvetica, serif; + color: #000000; + background: #FFFFFF; } + + p { text-align: justify; } + h1 { text-align: center; } + li { text-align: justify; } + td { padding: 0 0.5em 0 0.5em; } + + a:link { color: #0000EF; } + a:visited { color: #51188E; } + a:hover { color: #FF0000; } + + div.pre { font-family: monospace; + text-align: left; + white-space: pre; + color: blue; } + + div.example { font-family: monospace; + text-align: left; + white-space: pre; + color: purple; } + + span.comment { color: gray; } + </style> + <meta http-equiv="Content-Type" + content="text/html; charset=iso-8859-1"> + <meta name="Author" + content="David Turner"> + <title>FreeType 2 Tutorial</title> +</head> + +<body text="#000000" + bgcolor="#FFFFFF" + link="#0000EF" + vlink="#51188E" + alink="#FF0000"> + +<h1 align=center> + FreeType 2 Tutorial<br> + Step 3 — handling internals +</h1> + +<h3 align=center> + © 2009 Werner Lemberg + (<a href="mailto:wl@gnu.org">wl(a)gnu.org</a>)<br> + © 2009 The FreeType Development Team + (<a href="http://www.freetype.org">www.freetype.org</a>) +</h3> + +<center> +<table width="70%"> +<tr><td> + + <hr> + + <h2> + Introduction + </h2> + + <p>This is the third section of the FreeType 2 tutorial. It + describes how to deal with various internals of the library like</p> + + <ul> + <li>the module interface</li> + <li>functions for manipulating vector outlines</li> + <li>font driver issues</li> + <li>interaction with renderers using callbacks</li> + <li>accessing font specific data, for example PostScript font + dictionaries and TrueType tables</li> + </ul> + + <p>None of these items have been written yet. However, <a + href="mailto:erik@timetrap.se">Erik M�ller</a> contributed a very nice C++ + example which shows renderer callbacks in action to draw a coloured glyph + with a differently coloured outline.</p> + + <p>The source code can be found <a href="example2.cpp">here</a>.</p> + +</td></tr> +</table> +</center> + +<h3 align=center> + <a href="step1.html">FreeType 2 Tutorial Step 1</a> +</h3> + +<p><font size=-3>Last update: 07-Mar-2009</font></p> + +</body> +</html> ++++++ ft2demos-2.3.7.tar.bz2 -> ft2demos-2.3.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/ChangeLog new/ft2demos-2.3.9/ChangeLog --- old/ft2demos-2.3.7/ChangeLog 2008-06-29 09:42:49.000000000 +0200 +++ new/ft2demos-2.3.9/ChangeLog 2009-03-12 10:54:50.000000000 +0100 @@ -1,3 +1,81 @@ +2009-03-12 Werner Lemberg <wl(a)gnu.org> + + * Version 2.3.9 released. + ========================= + + + Tag sources with `VER-2-3-9'. + + * README: Updated. + +2009-03-10 Werner Lemberg <wl(a)gnu.org> + + * src/common.c (CONST): New macro, defined depending on __STDC__. + Use it where necessary. + +2009-03-10 Werner Lemberg <wl(a)gnu.org> + + Fix C++ compilation. + + * src/ftbench.c (test_load_advances): Use cast. + * src/ftgrid.c: Protect `extern' declarations with `extern "C"'. + +2009-03-03 Werner Lemberg <wl(a)gnu.org> + + Fix signedness issues. + + * src/ftcommon.c (FTDemo_String_Set): Fix signedness. + Update callers. + Include `common.h'. + Use __STDC__ macro. + * src/ftcommon.h (FTDemo_String_Set): Fix signedness. + + * src/common.h, src/common.c: Use __STDC__ macro. + +2009-03-03 David Turner <david(a)freetype.org> + + Add utf-8 support to ftview. Fixes Savannah BUG #18225. + + * src/common.h, src/common.c: Add `utf8_next' function. + * src/ftcommon.c (FTDemo_String_Set), src/ftview.c (Render_Text): + Use `utf8_next'. + +2009-01-14 Werner Lemberg <wl(a)gnu.org> + + + * Version 2.3.8 released. + ========================= + + + Tag sources with `VER-2-3-8'. + + * README: Updated. + +2009-01-07 Werner Lemberg <wl(a)gnu.org> + + ftdiff: Add `a' key to toggle global advance width. + + * src/ftdiff.c (ColumnStateRec): Add `use_global_advance_width' + field. + (render_state_init): Updated. + (render_state_draw): Control FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH. + Update screen output. + (event_help): Document `a' key. + Sort output. + (process_keys): Handle `a' key. + Sort entries in `case' block. + +2008-12-05 Werner Lemberg <wl(a)gnu.org> + + * src/ftbench.c: Remove #if FT_ADVANCES_H ... conditionals. + +2008-09-02 David Turner <david(a)freetype.org> + + * src/ftbench.c: Include FT_ADVANCES_H. + (FT_BENCH_LOAD_ADVANCES): New enumeration value. + (test_load_advances): New function. + (main) <FT_BENCH_LOAD_ADVANCES>: New case. + 2008-06-29 Werner Lemberg <wl(a)gnu.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/README new/ft2demos-2.3.9/README --- old/ft2demos-2.3.7/README 2008-06-29 09:43:02.000000000 +0200 +++ new/ft2demos-2.3.9/README 2009-03-12 10:54:38.000000000 +0100 @@ -8,8 +8,8 @@ downloaded one of the stable FreeType 2 source packages from our server, you most probably have to rename its directory, for example: - mv freetype-2.3.7 freetype2 on Unix - rename freetype-2.3.7 freetype2 on Windows + mv freetype-2.3.9 freetype2 on Unix + rename freetype-2.3.9 freetype2 on Windows WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/src/common.c new/ft2demos-2.3.9/src/common.c --- old/ft2demos-2.3.7/src/common.c 2005-11-30 09:41:34.000000000 +0100 +++ new/ft2demos-2.3.9/src/common.c 2009-03-11 16:58:39.000000000 +0100 @@ -8,7 +8,7 @@ * mleisher(a)crl.nmsu.edu (Mark Leisher) * 10 October 1997 * - * Last update 2005-11-30. + * Last update 2009-03-11. */ #include "common.h" @@ -18,6 +18,12 @@ #include <stdlib.h> #include <string.h> +#ifdef __STDC__ +#define CONST const +#else +#define CONST +#endif + /* * Externals visible to programs. */ @@ -32,13 +38,8 @@ */ static int cmdac; -#ifdef __STDC__ - static const char* cmdname; - static char* const* cmdav; -#else - static char* cmdname; - static char** cmdav; -#endif + static CONST char* cmdname; + static char* CONST* cmdav; int #ifdef __STDC__ @@ -51,13 +52,8 @@ #endif { int opt; -#ifdef __STDC__ - const char* p; - const char* pp; -#else - char* p; - char* pp; -#endif + CONST char* p; + CONST char* pp; /* * If there is no pattern, indicate the parsing is done. @@ -190,13 +186,8 @@ char* name; #endif { -#ifdef __STDC__ - const char* base; - const char* current; -#else - char* base; - char* current; -#endif + CONST char* base; + CONST char* current; char c; base = name; @@ -221,11 +212,12 @@ } + void #ifdef __STDC__ - void Panic( const char* fmt, ... ) + Panic( const char* fmt, ... ) #else - void Panic( fmt ) - const char* fmt; + Panic( fmt ) + char* fmt; #endif { va_list ap; @@ -239,4 +231,63 @@ } + extern int +#ifdef __STDC__ + utf8_next( const char** pcursor, + const char* end ) +#else + utf8_next( pcursor, end ) + char** pcursor; + char* end; +#endif + { + CONST unsigned char* p = (CONST unsigned char*)*pcursor; + int ch; + + + if ( (CONST char*)p >= end ) /* end of stream */ + return -1; + + ch = *p++; + if ( ch >= 0x80 ) + { + int len; + + + if ( ch < 0xc0 ) /* malformed data */ + goto BAD_DATA; + else if ( ch < 0xe0 ) + { + len = 1; + ch &= 0x1f; + } + else if ( ch < 0xf0 ) + { + len = 2; + ch &= 0x0f; + } + else + { + len = 3; + ch &= 0x07; + } + + while ( len > 0 ) + { + if ( (CONST char*)p >= end || ( p[0] & 0xc0 ) != 0x80 ) + goto BAD_DATA; + + ch = ( ch << 6 ) | ( p[0] & 0x3f ); + p += 1; + len -= 1; + } + } + + *pcursor = (CONST char*) p; + return ch; + + BAD_DATA: + return -1; + } + /* End */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/src/common.h new/ft2demos-2.3.9/src/common.h --- old/ft2demos-2.3.7/src/common.h 2002-01-25 17:04:51.000000000 +0100 +++ new/ft2demos-2.3.9/src/common.h 2009-03-03 23:59:36.000000000 +0100 @@ -42,12 +42,25 @@ ); /* print a message and exit */ - extern void Panic ( + extern void Panic( #ifdef __STDC__ const char* fmt, ... #endif ); + /* read the next UTF-8 code from `*pcursor' and + * returns its value. `end' is the limit of the + * input string. + * + * return -1 if the end of the input string is + * reached, or in case of malformed data + */ + extern int utf8_next( +#ifdef __STDC__ + const char** pcursor, + const char* end +#endif + ); #ifdef __cplusplus } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/src/ftbench.c new/ft2demos-2.3.9/src/ftbench.c --- old/ft2demos-2.3.7/src/ftbench.c 2007-02-12 23:09:07.000000000 +0100 +++ new/ft2demos-2.3.9/src/ftbench.c 2009-03-11 06:38:11.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2006 by */ +/* Copyright 2002, 2003, 2004, 2005, 2006, 2009 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* ftbench: bench some common FreeType call paths */ @@ -21,7 +21,7 @@ #include FT_CACHE_IMAGE_H #include FT_CACHE_SMALL_BITMAPS_H #include FT_SYNTHESIS_H - +#include FT_ADVANCES_H #ifdef UNIX #include <sys/time.h> @@ -74,6 +74,7 @@ enum { FT_BENCH_LOAD_GLYPH, + FT_BENCH_LOAD_ADVANCES, FT_BENCH_RENDER, FT_BENCH_GET_GLYPH, FT_BENCH_GET_CBOX, @@ -225,6 +226,31 @@ int +test_load_advances( btimer_t* timer, + FT_Face face, + void* user_data ) +{ + int done = 0; + FT_Fixed* advances; + FT_ULong flags = *((FT_ULong*)user_data); + + + advances = (FT_Fixed *)calloc( sizeof ( FT_Fixed ), face->num_glyphs ); + + TIMER_START( timer ); + + FT_Get_Advances( face, 0, face->num_glyphs, flags, advances ); + done += face->num_glyphs; + + TIMER_STOP( timer ); + + free( advances ); + + return done; +} + + +int test_render( btimer_t* timer, FT_Face face, void* user_data ) @@ -735,7 +761,8 @@ for ( i = 0; i < N_FT_BENCH; i++ ) { - btest_t test; + btest_t test; + FT_ULong flags; if ( !TEST( 'a' + i ) ) @@ -766,6 +793,19 @@ benchmark( face, &test, max_iter, max_time ); } break; + case FT_BENCH_LOAD_ADVANCES: + test.user_data = &flags; + + test.title = "Load_Advances (Normal)"; + test.bench = test_load_advances; + flags = FT_LOAD_DEFAULT; + benchmark( face, &test, max_iter, max_time ); + + test.title = "Load_Advances (Fast)"; + test.bench = test_load_advances; + flags = FT_LOAD_TARGET_LIGHT; + benchmark( face, &test, max_iter, max_time ); + break; case FT_BENCH_RENDER: test.title = "Render"; test.bench = test_render; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/src/ftcommon.c new/ft2demos-2.3.9/src/ftcommon.c --- old/ft2demos-2.3.7/src/ftcommon.c 2008-05-13 12:18:24.000000000 +0200 +++ new/ft2demos-2.3.9/src/ftcommon.c 2009-03-04 00:18:17.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 2005, 2006, 2007, 2008 by */ +/* Copyright 2005, 2006, 2007, 2008, 2009 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -19,6 +19,7 @@ #include FT_BITMAP_H +#include "common.h" #include "ftcommon.h" #include <stdio.h> @@ -1018,58 +1019,27 @@ void - FTDemo_String_Set( FTDemo_Handle* handle, - const unsigned char* string ) + FTDemo_String_Set( FTDemo_Handle* handle, + const char* string ) { - const unsigned char* p = string; - unsigned long codepoint; - unsigned char in_code; - int expect; - PGlyph glyph = handle->string; + const char* p = string; + const char* end = p + strlen( string ); + unsigned long codepoint; + int ch; + int expect; + PGlyph glyph = handle->string; handle->string_length = 0; codepoint = expect = 0; - while ( *p ) + for (;;) { - in_code = *p++ ; - - if ( in_code >= 0xC0 ) - { - if ( in_code < 0xE0 ) /* U+0080 - U+07FF */ - { - expect = 1; - codepoint = in_code & 0x1F; - } - else if ( in_code < 0xF0 ) /* U+0800 - U+FFFF */ - { - expect = 2; - codepoint = in_code & 0x0F; - } - else if ( in_code < 0xF8 ) /* U+10000 - U+10FFFF */ - { - expect = 3; - codepoint = in_code & 0x07; - } - continue; - } - else if ( in_code >= 0x80 ) - { - --expect; - - if ( expect >= 0 ) - { - codepoint <<= 6; - codepoint += in_code & 0x3F; - } - if ( expect > 0 ) - continue; + ch = utf8_next( &p, end ); + if ( ch < 0 ) + break; - expect = 0; - } - else /* ASCII, U+0000 - U+007F */ - codepoint = in_code; + codepoint = ch; if ( handle->encoding != FT_ENCODING_NONE ) glyph->glyph_index = FTDemo_Get_Index( handle, codepoint ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/src/ftcommon.h new/ft2demos-2.3.9/src/ftcommon.h --- old/ft2demos-2.3.7/src/ftcommon.h 2007-05-29 00:19:24.000000000 +0200 +++ new/ft2demos-2.3.9/src/ftcommon.h 2009-03-04 00:17:52.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 2005, 2006 by */ +/* Copyright 2005, 2006, 2009 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -309,8 +309,8 @@ /* set the string to be drawn */ void - FTDemo_String_Set( FTDemo_Handle* handle, - const unsigned char* string ); + FTDemo_String_Set( FTDemo_Handle* handle, + const char* string ); /* draw a string centered at (center_x, center_y) -- */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/src/ftdiff.c new/ft2demos-2.3.9/src/ftdiff.c --- old/ft2demos-2.3.7/src/ftdiff.c 2008-05-18 23:52:18.000000000 +0200 +++ new/ft2demos-2.3.9/src/ftdiff.c 2009-01-07 09:16:41.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 2007, 2008 by */ +/* Copyright 2007, 2008, 2009 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -145,6 +145,7 @@ int use_kerning; int use_deltas; int use_lcd_filter; + int use_global_advance_width; FT_LcdFilter lcd_filter; HintMode hint_mode; DisplayMode disp_mode; @@ -197,16 +198,17 @@ state->char_size = 16; state->display = display[0]; - state->columns[0].use_kerning = 1; - state->columns[0].use_deltas = 1; - state->columns[0].use_lcd_filter = 1; - state->columns[0].lcd_filter = FT_LCD_FILTER_DEFAULT; - state->columns[0].hint_mode = HINT_MODE_BYTECODE; + state->columns[0].use_kerning = 1; + state->columns[0].use_deltas = 1; + state->columns[0].use_lcd_filter = 1; + state->columns[0].use_global_advance_width = 1; + state->columns[0].lcd_filter = FT_LCD_FILTER_DEFAULT; + state->columns[0].hint_mode = HINT_MODE_BYTECODE; - state->columns[1] = state->columns[0]; + state->columns[1] = state->columns[0]; state->columns[1].hint_mode = HINT_MODE_AUTOHINT; - state->columns[2] = state->columns[0]; + state->columns[2] = state->columns[0]; state->columns[2].hint_mode = HINT_MODE_UNHINTED; state->col = 2; @@ -440,6 +442,9 @@ if ( rmode == HINT_MODE_UNHINTED ) load_flags |= FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP; + if ( !column->use_global_advance_width ) + load_flags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + for ( ; *p; p++ ) { FT_UInt gindex; @@ -589,10 +594,13 @@ } state->display.disp_text( disp, left, bottom + 15, msg ); - sprintf(temp, "%s / %s", - column->use_kerning ? "kerning" : "no kerning", - column->use_deltas ? "deltas" : "no deltas" ); - msg = column->use_kerning ? "use kerning" : "no kerning"; + sprintf(temp, "%s %s %s", + column->use_kerning ? "+kern" + : "-kern", + column->use_deltas ? "+delta" + : "-delta", + column->use_global_advance_width ? "+advance" + : "-advance" ); state->display.disp_text( disp, left, bottom + 25, temp ); if ( state->col == idx ) @@ -795,11 +803,12 @@ grWriteln( " v : decrease gamma by 0.1" ); grLn(); grWriteln( " 1-3 : change currently selected column" ); - grWriteln( " k : toggle kerning" ); + grWriteln( " a : toggle `ignore global advance width flag" ); grWriteln( " d : toggle lsb/rsb deltas" ); grWriteln( " h : toggle hinting mode" ); - grWriteln( " r : toggle rendering mode" ); + grWriteln( " k : toggle kerning" ); grWriteln( " l : change LCD filter type" ); + grWriteln( " r : toggle rendering mode" ); grWriteln( " Up : increase pointsize by 0.5 unit" ); grWriteln( " Down : decrease pointsize by 0.5 unit" ); grWriteln( " Page Up : increase pointsize by 5 units" ); @@ -880,11 +889,43 @@ sprintf( state->message0, "column %d selected", state->col + 1 ); break; - case grKEY( 'k' ): - column->use_kerning = !column->use_kerning; - state->message = column->use_kerning - ? (char *)"using kerning" - : (char *)"ignoring kerning"; + case grKeyUp: + event_change_size( state, +0.5 ); + break; + + case grKeyDown: + event_change_size( state, -0.5 ); + break; + + case grKeyPageUp: + event_change_size( state, +5. ); + break; + + case grKeyPageDown: + event_change_size( state, -5. ); + break; + + case grKEY( '1' ): + state->col = 0; + state->message = (char *)"column 1 selected"; + break; + + case grKEY( '2' ): + state->col = 1; + state->message = (char *)"column 2 selected"; + break; + + case grKEY( '3' ): + state->col = 2; + state->message = (char *)"column 3 selected"; + break; + + case grKEY( 'a' ): + column->use_global_advance_width + = !column->use_global_advance_width; + state->message = column->use_global_advance_width + ? (char *)"using global advance width" + : (char *)"ignoring global advance width"; break; case grKEY( 'd' ): @@ -894,6 +935,25 @@ : (char *)"ignoring rsb/lsb deltas"; break; + case grKEY( 'g' ): + event_change_gamma( state, +0.1 ); + break; + + case grKEY( 'h' ): + column->hint_mode = + (HintMode)( ( column->hint_mode + 1 ) % HINT_MODE_MAX ); + state->message = state->message0; + sprintf( state->message0, "column %d is %s", + state->col + 1, render_mode_names[column->hint_mode] ); + break; + + case grKEY( 'k' ): + column->use_kerning = !column->use_kerning; + state->message = column->use_kerning + ? (char *)"using kerning" + : (char *)"ignoring kerning"; + break; + case grKEY( 'l' ): switch ( column->lcd_filter ) { @@ -922,27 +982,12 @@ } break; - case grKEY( '1' ): - state->col = 0; - state->message = (char *)"column 1 selected"; - break; - - case grKEY( '2' ): - state->col = 1; - state->message = (char *)"column 2 selected"; - break; - - case grKEY( '3' ): - state->col = 2; - state->message = (char *)"column 3 selected"; + case grKEY( 'n' ): + render_state_set_file( state, state->face_index + 1 ); break; - case grKEY( 'h' ): - column->hint_mode = - (HintMode)( ( column->hint_mode + 1 ) % HINT_MODE_MAX ); - state->message = state->message0; - sprintf( state->message0, "column %d is %s", - state->col + 1, render_mode_names[column->hint_mode] ); + case grKEY( 'p' ): + render_state_set_file( state, state->face_index - 1 ); break; case grKEY( 'r' ): @@ -953,38 +998,10 @@ : "gray rendering" ); break; - case grKEY( 'n' ): - render_state_set_file( state, state->face_index + 1 ); - break; - - case grKEY( 'p' ): - render_state_set_file( state, state->face_index - 1 ); - break; - - case grKEY( 'g' ): - event_change_gamma( state, +0.1 ); - break; - case grKEY( 'v' ): event_change_gamma( state, -0.1 ); break; - case grKeyUp: - event_change_size( state, +0.5 ); - break; - - case grKeyDown: - event_change_size( state, -0.5 ); - break; - - case grKeyPageUp: - event_change_size( state, +5. ); - break; - - case grKeyPageDown: - event_change_size( state, -5. ); - break; - default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/src/ftgrid.c new/ft2demos-2.3.9/src/ftgrid.c --- old/ft2demos-2.3.7/src/ftgrid.c 2007-07-07 08:08:12.000000000 +0200 +++ new/ft2demos-2.3.9/src/ftgrid.c 2009-03-11 06:42:57.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 1996-2000, 2003, 2004, 2005, 2006, 2007 by */ +/* Copyright 1996-2000, 2003, 2004, 2005, 2006, 2007, 2009 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -52,9 +52,15 @@ int _af_debug_disable_blue_hints; AF_GlyphHints _af_debug_hints; +#ifdef __cplusplus + extern "C" { +#endif extern void af_glyph_hints_dump_segments( AF_GlyphHints hints ); extern void af_glyph_hints_dump_points( AF_GlyphHints hints ); extern void af_glyph_hints_dump_edges( AF_GlyphHints hints ); +#ifdef __cplusplus + } +#endif typedef struct status_ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/src/ftstring.c new/ft2demos-2.3.9/src/ftstring.c --- old/ft2demos-2.3.7/src/ftstring.c 2007-05-11 22:41:30.000000000 +0200 +++ new/ft2demos-2.3.9/src/ftstring.c 2009-03-04 00:15:19.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 1996-2002, 2003, 2004, 2005, 2006, 2007 by */ +/* Copyright 1996-2002, 2003, 2004, 2005, 2006, 2007, 2009 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -135,7 +135,7 @@ FTDemo_Set_Current_Charsize( handle, status.ptsize, status.res ); FTDemo_Update_Current_Flags( handle ); - FTDemo_String_Set( handle, (unsigned char*)Text ); + FTDemo_String_Set( handle, Text ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ft2demos-2.3.7/src/ftview.c new/ft2demos-2.3.9/src/ftview.c --- old/ft2demos-2.3.7/src/ftview.c 2007-12-29 22:50:11.000000000 +0100 +++ new/ft2demos-2.3.9/src/ftview.c 2009-03-04 00:06:59.000000000 +0100 @@ -2,7 +2,7 @@ /* */ /* The FreeType project -- a free and portable quality TrueType renderer. */ /* */ -/* Copyright 1996-2000, 2003, 2004, 2005, 2006, 2007 by */ +/* Copyright 1996-2000, 2003, 2004, 2005, 2006, 2007, 2009 by */ /* D. Turner, R.Wilhelm, and W. Lemberg */ /* */ /* */ @@ -409,7 +409,8 @@ int i; FT_Size size; - const unsigned char* p; + const char* p; + const char* pEnd; num_indices = num_indices; /* pacify compiler */ @@ -425,20 +426,25 @@ i = first_index; - p = Text; + p = (const char*)Text; + pEnd = p + strlen( (const char*)Text ); - while ( i > 0 && *p ) + while ( i > 0 ) { - p++; + utf8_next( &p, pEnd ); i--; } - while ( *p && num_indices != 0 ) + while ( num_indices != 0 ) { FT_UInt gindex; + int ch; + ch = utf8_next( &p, pEnd ); + if ( ch < 0 ) + break; - gindex = FTDemo_Get_Index( handle, *p ); + gindex = FTDemo_Get_Index( handle, ch ); error = FTDemo_Draw_Index( handle, display, gindex, &x, &y ); if ( error ) @@ -458,8 +464,6 @@ } } - p++; - if ( num_indices > 0 ) num_indices -= 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 cups for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at Wed Jul 29 17:20:24 CEST 2009. -------- --- cups/cups.changes 2009-07-10 12:41:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/cups/cups.changes 2009-07-28 10:25:43.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jul 28 10:08:12 CEST 2009 - jsmeix(a)suse.de + +- Upgraded to CUPS 1.3.11: + * The scheduler and cupsfilter utility would crash with + certain MIME .types rules (CUPS STR #3159). + * cups-1.3.10-fix-DNS-rebinding-protection.patch + (Novell/Suse Bugzilla bnc#516511 and CUPS STR #3238) + is obsolete since CUPS 1.3.11 because it is fixed + in the source (it is fixed via CUPS STR #3164). + * For a complete list see the CHANGES.txt file. + +------------------------------------------------------------------- @@ -25 +37 @@ - instead of our fork of the Xpdf source code which was in + instead of the CUPS fork of the Xpdf source code which was in @@ -54 +66 @@ - In particular cups-1.1.21-umlaut_printer.patch can no longer + In particular cups-1.1.21rc2-usermode.patch can no longer calling whatdependson for head-i586 Old: ---- cups-1.3.10-fix-DNS-rebinding-protection.patch cups-1.3.10-source.tar.bz2 New: ---- cups-1.3.11-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.bNTfpT/_old 2009-07-29 17:19:49.000000000 +0200 +++ /var/tmp/diff_new_pack.bNTfpT/_new 2009-07-29 17:19:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package cups (Version 1.3.10) +# spec file for package cups (Version 1.3.11) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ License: GPL v2 or later Group: Hardware/Printing Summary: The Common UNIX Printing System -Version: 1.3.10 -Release: 2 +Version: 1.3.11 +Release: 1 Requires: cups-libs = %{version}, cups-client = %{version} Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters Requires: util-linux /usr/bin/pdftops @@ -103,14 +103,8 @@ # since CUPS 1.3.10 because it is fixed in the source. # Patch27 cups-1.3.9-cupsImageReadTiff.patch is obsolete # since CUPS 1.3.10 because it is fixed in the source. -# Patch28 fixes a regression of the CUPS 1.3.10 DNS rebinding protection -# which lets "lpoptions -h localhost -p <queue_name> -l" fail -# with "lpoptions: Unable to get PPD file for lj1220: Bad Request" -# and in /var/log/cups/error_log there is the warning -# W ... Request from "localhost" using invalid Host: field "::1" -# but "::1" is the IPv6 loopback IP address for "localhost" -# (Novell/Suse Bugzilla bnc#489624 comment#19 and bnc#516511): -Patch28: cups-1.3.10-fix-DNS-rebinding-protection.patch +# Patch28 cups-1.3.10-fix-DNS-rebinding-protection.patch is obsolete +# since CUPS 1.3.11 because it is fixed in the source. # Patch100 cups-1.1.23-testpage.patch is finally removed # since CUPS 1.3.10 because it was made for CUPS 1.1 and # it was no longer applied since CUPS 1.2 in Suse Linux 10.3 and @@ -218,8 +212,6 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 -# Patch28 fixes a regression of the DNS rebinding protection: -%patch28 if [ -f /.buildenv ]; then . /.buildenv test -z "$BUILD_DISTRIBUTION_NAME" && BUILD_DISTRIBUTION_NAME="%{?distribution}" ++++++ cups-1.3.10-source.tar.bz2 -> cups-1.3.11-source.tar.bz2 ++++++ ++++ 1650 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bash for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at Wed Jul 29 17:18:46 CEST 2009. -------- --- bash/bash.changes 2009-07-02 15:05:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/bash/bash.changes 2009-07-28 13:19:55.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 28 13:19:20 CEST 2009 - werner(a)suse.de + +- Update to newest patch level 28 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bash-4.0.24-globstar-nulldir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.cSo5Gg/_old 2009-07-29 17:17:59.000000000 +0200 +++ /var/tmp/diff_new_pack.cSo5Gg/_new 2009-07-29 17:17:59.000000000 +0200 @@ -28,7 +28,7 @@ Suggests: command-not-found AutoReqProv: on Version: 4.0 -Release: 13 +Release: 14 Summary: The GNU Bourne-Again Shell Url: http://www.gnu.org/software/bash/bash.html Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.bz2 @@ -60,7 +60,6 @@ Patch23: readline-5.2-conf.patch Patch30: readline-6.0-destdir.patch Patch40: bash-4.0.10-typo.patch -Patch41: bash-4.0.24-globstar-nulldir.patch Patch42: bash-4.0.24-acl.dif Patch43: bash-4.0.24-memleak-read.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,7 +90,7 @@ Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.0 -Release: 13 +Release: 14 AutoReqProv: on %description -n bash-doc @@ -111,7 +110,7 @@ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.0 -Release: 2 +Release: 3 AutoReqProv: on %description -n bash-devel @@ -131,7 +130,7 @@ Summary: Loadable bash builtins Group: System/Shells Version: 4.0 -Release: 2 +Release: 3 AutoReqProv: on %description -n bash-loadables @@ -200,7 +199,7 @@ Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.0 -Release: 13 +Release: 14 Recommends: readline-doc = %{version} # bug437293 %ifarch ppc64 @@ -229,7 +228,7 @@ Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.0 -Release: 13 +Release: 14 Requires: libreadline6 = %{version} Requires: ncurses-devel Recommends: readline-doc = %{version} @@ -258,7 +257,7 @@ Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.0 -Release: 13 +Release: 14 AutoReqProv: on %description -n readline-doc @@ -298,7 +297,6 @@ %patch22 -p0 -b .wrap %patch23 -p0 -b .conf %patch40 -p0 -b .typo -%patch41 -p0 -b .globstar %patch42 -p0 -b .acl %patch43 -p0 -b .leak %patch0 -p0 ++++++ bash-4.0-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.0-patches/bash40-025 new/bash-4.0-patches/bash40-025 --- old/bash-4.0-patches/bash40-025 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.0-patches/bash40-025 2009-07-22 15:27:30.000000000 +0200 @@ -0,0 +1,104 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.0 +Patch-ID: bash40-025 + +Bug-Reported-by: Matt Zyzik <matt.zyzik(a)nyu.edu> +Bug-Reference-ID: <20090519011418.GA21431(a)ice.filescope.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00044.html + +Bug-Description: + +bash40-024 introduced a regression for constructs like **/*.cs; that +expansion would no longer include matching files in the current directory. +This patch undoes portions of bash40-024 and fixes the original problem +in a different way. + +Patch: + +*** ../bash-4.0-patched/lib/glob/glob.c 2009-05-22 12:32:26.000000000 -0400 +--- lib/glob/glob.c 2009-05-22 12:35:55.000000000 -0400 +*************** +*** 666,672 **** + } + +! /* compat: if GX_ALLDIRS, add the passed directory also, but don't add an +! empty directory name. */ +! if (add_current && (flags & GX_NULLDIR) == 0) + { + sdlen = strlen (dir); +--- 666,673 ---- + } + +! /* compat: if GX_ADDCURDIR, add the passed directory also. Add an empty +! directory name as a placeholder if GX_NULLDIR (in which case the passed +! directory name is "."). */ +! if (add_current) + { + sdlen = strlen (dir); +*************** +*** 680,684 **** + nextlink->next = lastlink; + lastlink = nextlink; +! bcopy (dir, nextname, sdlen + 1); + ++count; + } +--- 681,688 ---- + nextlink->next = lastlink; + lastlink = nextlink; +! if (flags & GX_NULLDIR) +! nextname[0] = '\0'; +! else +! bcopy (dir, nextname, sdlen + 1); + ++count; + } +*************** +*** 1008,1016 **** + /* Just return what glob_vector () returns appended to the + directory name. */ + dflags = flags & ~GX_MARKDIRS; + if (directory_len == 0) + dflags |= GX_NULLDIR; + if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0') +! dflags |= GX_ALLDIRS|GX_ADDCURDIR; + temp_results = glob_vector (filename, + (directory_len == 0 ? "." : directory_name), +--- 1012,1033 ---- + /* Just return what glob_vector () returns appended to the + directory name. */ ++ /* If flags & GX_ALLDIRS, we're called recursively */ + dflags = flags & ~GX_MARKDIRS; + if (directory_len == 0) + dflags |= GX_NULLDIR; + if ((flags & GX_GLOBSTAR) && filename[0] == '*' && filename[1] == '*' && filename[2] == '\0') +! { +! dflags |= GX_ALLDIRS|GX_ADDCURDIR; +! #if 0 +! /* If we want all directories (dflags & GX_ALLDIRS) and we're not +! being called recursively as something like `echo **/*.o' +! ((flags & GX_ALLDIRS) == 0), we want to prevent glob_vector from +! adding a null directory name to the front of the temp_results +! array. We turn off ADDCURDIR if not called recursively and +! dlen == 0 */ +! #endif +! if (directory_len == 0 && (flags & GX_ALLDIRS) == 0) +! dflags &= ~GX_ADDCURDIR; +! } + temp_results = glob_vector (filename, + (directory_len == 0 ? "." : directory_name), +*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 +--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 24 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.0-patches/bash40-026 new/bash-4.0-patches/bash40-026 --- old/bash-4.0-patches/bash40-026 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.0-patches/bash40-026 2009-07-22 15:27:30.000000000 +0200 @@ -0,0 +1,56 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.0 +Patch-ID: bash40-026 + +Bug-Reported-by: Sergei Steshenko <sergstesh(a)yahoo.com> +Bug-Reference-ID: <670181.38883.qm(a)web35204.mail.mud.yahoo.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00059.html + +Bug-Description: + +A forgotten line in externs.h caused compilation errors to occur on some +systems (e.g., Cygwin). + +Patch: + +*** ../bash-4.0-patched/externs.h 2009-01-18 18:29:29.000000000 -0500 +--- externs.h 2009-06-02 09:05:40.000000000 -0400 +*************** +*** 193,196 **** +--- 193,198 ---- + + /* Declarations for functions defined in lib/sh/fpurge.c */ ++ ++ #if defined NEED_FPURGE_DECL + #if !HAVE_DECL_FPURGE + +*************** +*** 201,205 **** + + #endif /* HAVE_DECL_FPURGE */ +! + + /* Declarations for functions defined in lib/sh/getcwd.c */ +--- 203,207 ---- + + #endif /* HAVE_DECL_FPURGE */ +! #endif /* NEED_FPURGE_DECL */ + + /* Declarations for functions defined in lib/sh/getcwd.c */ +*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 +--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 25 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 26 + + #endif /* _PATCHLEVEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.0-patches/bash40-027 new/bash-4.0-patches/bash40-027 --- old/bash-4.0-patches/bash40-027 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.0-patches/bash40-027 2009-07-22 15:27:31.000000000 +0200 @@ -0,0 +1,67 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.0 +Patch-ID: bash40-027 + +Bug-Reported-by: jim(a)jim.sh +Bug-Reference-ID: <200905262140.n4QLeO4X030664(a)psychosis.jim.sh> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00074.html + +Bug-Description: + +There are occasional cursor positioning errors when using readline's +horizontal scroll mode. + +Patch: + +*** ../bash-4.0-patched/lib/readline/display.c 2009-05-22 12:32:25.000000000 -0400 +--- lib/readline/display.c 2009-05-29 23:32:20.000000000 -0400 +*************** +*** 1190,1196 **** + line[t - 1] = '>'; + +! if (!rl_display_fixed || forced_display || lmargin != last_lmargin) + { + forced_display = 0; + update_line (&visible_line[last_lmargin], + &invisible_line[lmargin], +--- 1192,1200 ---- + line[t - 1] = '>'; + +! if (rl_display_fixed == 0 || forced_display || lmargin != last_lmargin) + { + forced_display = 0; ++ o_cpos = _rl_last_c_pos; ++ cpos_adjusted = 0; + update_line (&visible_line[last_lmargin], + &invisible_line[lmargin], +*************** +*** 1200,1203 **** +--- 1204,1214 ---- + 0); + ++ if ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) && ++ cpos_adjusted == 0 && ++ _rl_last_c_pos != o_cpos && ++ _rl_last_c_pos > wrap_offset && ++ o_cpos < prompt_last_invisible) ++ _rl_last_c_pos -= prompt_invis_chars_first_line; /* XXX - was wrap_offset */ ++ + /* If the visible new line is shorter than the old, but the number + of invisible characters is greater, and we are at the end of +*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 +--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 26 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 27 + + #endif /* _PATCHLEVEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.0-patches/bash40-028 new/bash-4.0-patches/bash40-028 --- old/bash-4.0-patches/bash40-028 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.0-patches/bash40-028 2009-07-22 15:27:31.000000000 +0200 @@ -0,0 +1,172 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.0 +Patch-ID: bash40-028 + +Bug-Reported-by: martin f krafft <madduck(a)debian.org> +Bug-Reference-ID: <4A4E39E7.5080807(a)debian.org> +Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519165 + http://lists.gnu.org/archive/html/bug-bash/2009-07/msg00011.html + +Bug-Description: + +bash-4.0 reverted to the historical shell behavior of raising an error +when $@ or $* was expanded after `set -u' had been executed and there +were no positional parameters. The Posix working group has since +clarified the standard's position on the issue, and $@ and $* are now the +only variables, parameters, or special parameters that do not raise an +error when unset if set -u is enabled. + +Patch: + +*** ../bash-4.0-patched/subst.c Mon Mar 23 11:34:55 2009 +--- subst.c Wed Jun 17 18:12:18 2009 +*************** +*** 6768,6778 **** + + case RBRACE: +! if (var_is_set == 0 && unbound_vars_is_error) + { + err_unboundvar (name); + FREE (value); + FREE (temp); + free (name); +- last_command_exit_value = EXECUTION_FAILURE; + return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); + } +--- 6794,6804 ---- + + case RBRACE: +! if (var_is_set == 0 && unbound_vars_is_error && ((name[0] != '@' && name[0] != '*') || name[1])) + { ++ last_command_exit_value = EXECUTION_FAILURE; + err_unboundvar (name); + FREE (value); + FREE (temp); + free (name); + return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); + } +*************** +*** 6991,6994 **** +--- 7017,7029 ---- + list = list_rest_of_args (); + ++ #if 0 ++ /* According to austin-group posix proposal by Geoff Clare in ++ <20090505091501.GA10097(a)squonk.masqnet> of 5 May 2009: ++ ++ "The shell shall write a message to standard error and ++ immediately exit when it tries to expand an unset parameter ++ other than the '@' and '*' special parameters." ++ */ ++ + if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0) + { +*************** +*** 6996,7003 **** + uerror[1] = '*'; + uerror[2] = '\0'; +- err_unboundvar (uerror); + last_command_exit_value = EXECUTION_FAILURE; + return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); + } + + /* If there are no command-line arguments, this should just +--- 7031,7039 ---- + uerror[1] = '*'; + uerror[2] = '\0'; + last_command_exit_value = EXECUTION_FAILURE; ++ err_unboundvar (uerror); + return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); + } ++ #endif + + /* If there are no command-line arguments, this should just +*************** +*** 7053,7056 **** +--- 7089,7101 ---- + list = list_rest_of_args (); + ++ #if 0 ++ /* According to austin-group posix proposal by Geoff Clare in ++ <20090505091501.GA10097(a)squonk.masqnet> of 5 May 2009: ++ ++ "The shell shall write a message to standard error and ++ immediately exit when it tries to expand an unset parameter ++ other than the '@' and '*' special parameters." ++ */ ++ + if (list == 0 && unbound_vars_is_error && (pflags & PF_IGNUNBOUND) == 0) + { +*************** +*** 7058,7065 **** + uerror[1] = '@'; + uerror[2] = '\0'; +- err_unboundvar (uerror); + last_command_exit_value = EXECUTION_FAILURE; + return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); + } + + /* We want to flag the fact that we saw this. We can't turn +--- 7103,7111 ---- + uerror[1] = '@'; + uerror[2] = '\0'; + last_command_exit_value = EXECUTION_FAILURE; ++ err_unboundvar (uerror); + return (interactive_shell ? &expand_wdesc_error : &expand_wdesc_fatal); + } ++ #endif + + /* We want to flag the fact that we saw this. We can't turn +*** ../bash-4.0-patched/doc/bash.1 Wed Feb 18 15:13:56 2009 +--- doc/bash.1 Wed Jun 17 08:51:19 2009 +*************** +*** 8258,8264 **** + .TP 8 + .B \-u +! Treat unset variables as an error when performing + parameter expansion. If expansion is attempted on an +! unset variable, the shell prints an error message, and, + if not interactive, exits with a non-zero status. + .TP 8 +--- 8274,8281 ---- + .TP 8 + .B \-u +! Treat unset variables and parameters other than the special +! parameters "@" and "*" as an error when performing + parameter expansion. If expansion is attempted on an +! unset variable or parameter, the shell prints an error message, and, + if not interactive, exits with a non-zero status. + .TP 8 +*** ../bash-4.0-patched/doc/bashref.texi Wed Feb 18 15:14:43 2009 +--- doc/bashref.texi Wed Jun 17 08:50:46 2009 +*************** +*** 4139,4143 **** + + @item -u +! Treat unset variables as an error when performing parameter expansion. + An error message will be written to the standard error, and a non-interactive + shell will exit. +--- 4151,4156 ---- + + @item -u +! Treat unset variables and parameters other than the special parameters +! @samp{@@} or @samp{*} as an error when performing parameter expansion. + An error message will be written to the standard error, and a non-interactive + shell will exit. +*** ../bash-4.0/patchlevel.h 2009-01-04 14:32:40.000000000 -0500 +--- patchlevel.h 2009-02-22 16:11:31.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 27 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 28 + + #endif /* _PATCHLEVEL_H_ */ ++++++ readline-6.0-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/readline-6.0-patches/readline60-004 new/readline-6.0-patches/readline60-004 --- old/readline-6.0-patches/readline60-004 1970-01-01 01:00:00.000000000 +0100 +++ new/readline-6.0-patches/readline60-004 2009-07-28 00:01:10.000000000 +0200 @@ -0,0 +1,63 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.0 +Patch-ID: readline60-004 + +Bug-Reported-by: jim(a)jim.sh +Bug-Reference-ID: <200905262140.n4QLeO4X030664(a)psychosis.jim.sh> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00074.html + +Bug-Description: + +There are occasional cursor positioning errors when using readline's +horizontal scroll mode. + +Patch: + +*** ../readline-6.0-patched/display.c 2009-05-22 12:32:25.000000000 -0400 +--- display.c 2009-05-29 23:32:20.000000000 -0400 +*************** +*** 1190,1196 **** + line[t - 1] = '>'; + +! if (!rl_display_fixed || forced_display || lmargin != last_lmargin) + { + forced_display = 0; + update_line (&visible_line[last_lmargin], + &invisible_line[lmargin], +--- 1192,1200 ---- + line[t - 1] = '>'; + +! if (rl_display_fixed == 0 || forced_display || lmargin != last_lmargin) + { + forced_display = 0; ++ o_cpos = _rl_last_c_pos; ++ cpos_adjusted = 0; + update_line (&visible_line[last_lmargin], + &invisible_line[lmargin], +*************** +*** 1200,1203 **** +--- 1204,1214 ---- + 0); + ++ if ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) && ++ cpos_adjusted == 0 && ++ _rl_last_c_pos != o_cpos && ++ _rl_last_c_pos > wrap_offset && ++ o_cpos < prompt_last_invisible) ++ _rl_last_c_pos -= prompt_invis_chars_first_line; /* XXX - was wrap_offset */ ++ + /* If the visible new line is shorter than the old, but the number + of invisible characters is greater, and we are at the end of +*** ../readline-6.0/patchlevel 2008-11-18 11:01:14.000000000 -0500 +--- patchlevel 2009-05-09 12:01:06.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 3 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpm for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at Wed Jul 29 17:17:18 CEST 2009. -------- --- rpm/rpm.changes 2009-07-24 11:48:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2009-07-27 18:18:10.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Jul 27 18:02:37 CEST 2009 - rguenther(a)suse.de + +- add description to debuginfo packages + +------------------------------------------------------------------- +Mon Jul 27 15:46:36 CEST 2009 - rguenther(a)suse.de + +- do not strip .debug suffix during debug-link generation +- do not add requires based on private ELF flags [bnc#524681] +- remove requires on debuginfo from debugsource package + +------------------------------------------------------------------- +Sat Jul 25 12:04:11 CEST 2009 - rguenther(a)suse.de + +- fix debuginfo package generation for binaries without build-id + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- debuglink.diff elfflagreqprov.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.bBApxR/_old 2009-07-29 17:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.bBApxR/_new 2009-07-29 17:15:23.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2.3 -Release: 44 +Release: 45 Requires: rpm = %{version} %py_requires Source99: rpm.spec ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.bBApxR/_old 2009-07-29 17:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.bBApxR/_new 2009-07-29 17:15:23.000000000 +0200 @@ -27,7 +27,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2.3 -Release: 44 +Release: 45 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -102,6 +102,8 @@ Patch69: buildidprov.diff Patch70: xz.diff Patch71: debugsubpkg.diff +Patch72: debuglink.diff +Patch73: elfflagreqprov.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -188,6 +190,8 @@ %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 %patch71 -p1 +%patch72 -p1 +%patch73 -p1 chmod 755 scripts/find-supplements{,.ksyms} chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms chmod 755 scripts/firmware.prov @@ -339,7 +343,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 492 +Release: 493 # bug437293 %ifarch ppc64 Obsoletes: popt-64bit @@ -367,7 +371,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 492 +Release: 493 Requires: popt = 1.7 Requires: glibc-devel # bug437293 ++++++ debuglink.diff ++++++ Index: rpm-4.4.2.3/scripts/find-debuginfo.sh =================================================================== --- rpm-4.4.2.3.orig/scripts/find-debuginfo.sh 2009-07-27 12:06:41.000000000 +0200 +++ rpm-4.4.2.3/scripts/find-debuginfo.sh 2009-07-27 12:08:05.000000000 +0200 @@ -185,7 +185,8 @@ make_id_link() get_debugfn() { dn=$(dirname "${1#$RPM_BUILD_ROOT}") - bn=$(basename "$1" .debug).debug +# Do not strip existing .debug suffixes + bn=$(basename "$1").debug debugdn=${debugdir}${dn} debugfn=${debugdn}/${bn} ++++++ debugsubpkg.diff ++++++ --- /var/tmp/diff_new_pack.bBApxR/_old 2009-07-29 17:15:24.000000000 +0200 +++ /var/tmp/diff_new_pack.bBApxR/_new 2009-07-29 17:15:24.000000000 +0200 @@ -1,7 +1,7 @@ Index: rpm-4.4.2.3/build/files.c =================================================================== ---- rpm-4.4.2.3.orig/build/files.c 2009-07-24 11:38:22.000000000 +0200 -+++ rpm-4.4.2.3/build/files.c 2009-07-24 11:38:30.000000000 +0200 +--- rpm-4.4.2.3.orig/build/files.c 2009-07-27 17:59:07.000000000 +0200 ++++ rpm-4.4.2.3/build/files.c 2009-07-27 18:02:00.000000000 +0200 @@ -28,6 +28,10 @@ #define _RPMTE_INTERNAL #include "rpmte.h" @@ -159,7 +159,7 @@ if (pkg->fileList == NULL) continue; -@@ -2508,6 +2638,106 @@ int processBinaryFiles(Spec spec, int in +@@ -2508,6 +2638,116 @@ int processBinaryFiles(Spec spec, int in if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test))) res = rc; @@ -179,6 +179,7 @@ + char tmp[1024]; + const char *name; + StringBuf files = NULL; ++ int seen_build_id = 0; + + /* Check if the current package has files with debug info + and record them. */ @@ -207,7 +208,6 @@ + files = newStringBuf(); + appendStringBuf(files, "%defattr(-,root,root)\n"); + appendStringBuf(files, "%dir /usr/lib/debug\n"); -+ appendStringBuf(files, "%dir /usr/lib/debug/.build-id\n"); + } + /* Add the files main debug-info file. */ + snprintf (tmp, 1024, "/usr/lib/debug/%s.debug\n", base); @@ -223,6 +223,11 @@ + if (getELFBuildId (name, &build_id, &build_id_size) == -1) + continue; + ++ /* If we see build-id links for the first time add the ++ directory. */ ++ if (!seen_build_id) ++ appendStringBuf(files, "%dir /usr/lib/debug/.build-id\n"); ++ + /* From the build-id construct the two links pointing back + to the debug information file and the binary. */ + snprintf (tmp, 1024, "/usr/lib/debug/.build-id/%02x/", @@ -249,6 +254,11 @@ + snprintf (tmp, 1024, "Debug information for package %s", name); + headerAddEntry (dbg->header, RPMTAG_SUMMARY, RPM_STRING_TYPE, + tmp, 1); ++ snprintf (tmp, 1024, "This package provides debug information for package %s.\n" ++ "Debug information is useful when developing applications that use this\n" ++ "package or when debugging this package.", name); ++ headerAddEntry (dbg->header, RPMTAG_DESCRIPTION, RPM_STRING_TYPE, ++ tmp, 1); + headerAddEntry (dbg->header, RPMTAG_GROUP, RPM_STRING_TYPE, + "Development/Debug", 1); + /* Inherit other tags from parent. */ @@ -268,9 +278,9 @@ } Index: rpm-4.4.2.3/macros.in =================================================================== ---- rpm-4.4.2.3.orig/macros.in 2009-07-24 11:38:22.000000000 +0200 -+++ rpm-4.4.2.3/macros.in 2009-07-24 11:38:22.000000000 +0200 -@@ -173,19 +173,6 @@ +--- rpm-4.4.2.3.orig/macros.in 2009-07-27 17:59:07.000000000 +0200 ++++ rpm-4.4.2.3/macros.in 2009-07-27 17:59:07.000000000 +0200 +@@ -173,24 +173,10 @@ # Template for debug information sub-package. %debug_package \ %global __debug_package 1\ @@ -290,10 +300,15 @@ %package debugsource\ Summary: Debug sources for package %{name}\ Group: Development/Debug\ + AutoReqProv: 0\ +-Requires: %{name}-debuginfo = %{version}-%{release}\ + %description debugsource\ + This package provides debug sources for package %{name}.\ + Debug sources are useful when developing applications that use this\ Index: rpm-4.4.2.3/scripts/find-debuginfo.sh =================================================================== ---- rpm-4.4.2.3.orig/scripts/find-debuginfo.sh 2009-07-24 11:38:22.000000000 +0200 -+++ rpm-4.4.2.3/scripts/find-debuginfo.sh 2009-07-24 11:38:22.000000000 +0200 +--- rpm-4.4.2.3.orig/scripts/find-debuginfo.sh 2009-07-27 17:59:06.000000000 +0200 ++++ rpm-4.4.2.3/scripts/find-debuginfo.sh 2009-07-27 17:59:10.000000000 +0200 @@ -274,19 +274,11 @@ while read nlinks inum f; do fi done || exit ++++++ elfflagreqprov.diff ++++++ Index: rpm-4.4.2.3/autodeps/linux.req =================================================================== --- rpm-4.4.2.3.orig/autodeps/linux.req 2009-07-24 11:38:21.000000000 +0200 +++ rpm-4.4.2.3/autodeps/linux.req 2009-07-27 15:45:17.000000000 +0200 @@ -110,6 +110,7 @@ for f in "${liblist[@]}" "${exelist[@]}" } } /^Version References:$/ { START=2; } + /^private flags/ { START=3; } (START==2) && /required from/ { sub(/:/, "", $3); LIBNAME=$3; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 postgresql for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jul '09

29 Jul '09

Hello community, here is the log from the commit of package postgresql for openSUSE:Factory checked in at Wed Jul 29 17:16:55 CEST 2009. -------- --- postgresql/postgresql.changes 2009-05-06 17:59:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/postgresql/postgresql.changes 2009-07-27 20:27:56.000000000 +0200 @@ -1,0 +2,46 @@ +Mon Jul 27 20:24:35 CEST 2009 - poeml(a)suse.de + +- postgresql-8.4.0-sle10-timestamptz.patch added, and applied + _only_ on SLE10. It fixes a build failure due to a test case that + seems to be confused by daylight saving time in the time zone + that the test expects its result (PDT vs. PST). Since this + failure happened only on SLE10, I assume that the test case isn't + broken, and some peculiarity on that (rather old now) platform is + to blame (possibly too old timezone files). Also, the testcase is + checking correctness when converting timezones > 32 bit, which + actually seems to work. + +------------------------------------------------------------------- +Wed Jul 15 21:10:36 CEST 2009 - poeml(a)suse.de + +- replace "ident sameuser" with "ident" as auth method for the + initdb call in the init script, because the former doesn't work + with PostgreSQL 8.4. With the generated pg_hba.conf, PostgreSQL + failed to start. Added note to the upgrade READMEs. [bnc#522375] + +------------------------------------------------------------------- +Tue Jul 7 15:56:49 CEST 2009 - max(a)suse.de + +- New major release: 8.4.0 +- Improvements include: + * Windowing Functions + * Common Table Expressions and Recursive Queries + * Default and variadic parameters for functions + * Parallel Restore + * Column Permissions + * Per-database locale settings + * Improved hash indexes + * Improved join performance for EXISTS and NOT EXISTS queries + * Easier-to-use Warm Standby + * Automatic sizing of the Free Space Map + * Visibility Map (greatly reduces vacuum overhead for + slowly-changing tables) + * Version-aware psql (backslash commands work against older + servers) + * Support SSL certificates for user authentication + * Per-function runtime statistics + * Easy editing of functions in psql + * New contrib modules: pg_stat_statements, auto_explain, citext, + btree_gin + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- postgresql-8.3.7.tar.bz2 New: ---- postgresql-8.4.0-sle10-timestamptz.patch postgresql-8.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgresql-pl.spec ++++++ --- /var/tmp/diff_new_pack.nMwP2a/_old 2009-07-29 17:15:41.000000000 +0200 +++ /var/tmp/diff_new_pack.nMwP2a/_new 2009-07-29 17:15:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package postgresql-pl (Version 8.3.7) +# spec file for package postgresql-pl (Version 8.4.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,10 +23,10 @@ BuildRequires: ncurses-devel BuildRequires: python-devel tcl-devel Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL -Version: 8.3.7 +Version: 8.4.0 Release: 1 %define pg_minor_version %(echo %version | cut -f1-2 -d.) -License: BSD 3-Clause +License: BSD 3-clause (or similar) Group: Productivity/Databases/Servers Source0: postgresql-%version.tar.bz2 NoSource: 0 @@ -59,7 +59,7 @@ Jan Wieck <JanWieck(a)Yahoo.com> %package -n postgresql-plperl -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: The PL/Tcl, PL/Perl, and PL/Python procedural languages for PostgreSQL Group: Productivity/Databases/Servers Requires: perl @@ -87,7 +87,7 @@ etc. %package -n postgresql-plpython -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: The PL/Python Procedural Languages for PostgreSQL Group: Productivity/Databases/Servers Obsoletes: postgresql-pl @@ -119,7 +119,7 @@ Jan Wieck <JanWieck(a)Yahoo.com> %package -n postgresql-pltcl -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: PL/Tcl Procedural Language for PostgreSQL Group: Productivity/Databases/Tools Obsoletes: postgresql-pl @@ -201,15 +201,18 @@ %_libdir/postgresql/pltcl.so %_datadir/postgresql %_bindir/pltcl* +%_datadir/locale/*/*/pltcl-*.mo %files -n postgresql-plperl %defattr(-,root,root) %dir %_libdir/postgresql %_libdir/postgresql/plperl.so +%_datadir/locale/*/*/plperl-*.mo %files -n postgresql-plpython %defattr(-,root,root) %dir %_libdir/postgresql %_libdir/postgresql/plpython.so +%_datadir/locale/*/*/plpython-*.mo %changelog ++++++ postgresql.spec ++++++ --- /var/tmp/diff_new_pack.nMwP2a/_old 2009-07-29 17:15:41.000000000 +0200 +++ /var/tmp/diff_new_pack.nMwP2a/_new 2009-07-29 17:15:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package postgresql (Version 8.3.7) +# spec file for package postgresql (Version 8.4.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,10 +22,10 @@ BuildRequires: openldap2-devel openssl-devel pam-devel readline-devel zlib-devel BuildRequires: ncurses-devel Summary: Basic Clients and Utilities for PostgreSQL -Version: 8.3.7 +Version: 8.4.0 Release: 1 %define pg_minor_version %(echo %version | cut -f1-2 -d.) -License: BSD 3-Clause +License: BSD 3-clause (or similar) Group: Productivity/Databases/Tools Source0: postgresql-%version.tar.bz2 Source2: postgresql-README.SuSE.de @@ -38,6 +38,7 @@ Source99: postgresql-pl.spec Patch1: postgresql-8.3-conf.patch Patch2: postgresql-regress.patch +Patch3: postgresql-8.4.0-sle10-timestamptz.patch PreReq: postgresql-libs = %pg_minor_version Url: http://www.postgresql.org/ Provides: postgresql = %pg_minor_version @@ -66,7 +67,7 @@ Jan Wieck <JanWieck(a)Yahoo.com> %package libs -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: Shared Libraries Required for PostgreSQL Clients Group: Productivity/Databases/Clients # bug437293 @@ -99,7 +100,7 @@ Jan Wieck <JanWieck(a)Yahoo.com> %package server -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: The Programs Needed to Create and Run a PostgreSQL Server Group: Productivity/Databases/Servers PreReq: %insserv_prereq %fillup_prereq @@ -110,7 +111,7 @@ Provides: postgresql-server = %pg_minor_version %package docs -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: HTML Documentation for PostgreSQL Group: Productivity/Databases/Tools @@ -136,7 +137,7 @@ Jan Wieck <JanWieck(a)Yahoo.com> %package contrib -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: Contributed Extensions and Additions to PostgreSQL Group: Productivity/Databases/Tools Requires: postgresql-server = %pg_minor_version @@ -185,7 +186,7 @@ Jan Wieck <JanWieck(a)Yahoo.com> %package devel -License: BSD 3-Clause +License: BSD 3-clause (or similar) Summary: PostgreSQL development header files and libraries Group: Productivity/Databases/Tools Requires: postgresql-libs = %pg_minor_version @@ -216,6 +217,10 @@ %setup -q %patch1 %patch2 +# apply the following patch only on SLE10 +%if %suse_version == 1010 +%patch3 -p1 +%endif %build export CFLAGS="%optflags $SP" @@ -228,7 +233,7 @@ --includedir=%_includedir/pgsql \ --datadir=%_datadir/postgresql \ --mandir=%_mandir \ - --with-docdir=%_docdir \ + --docdir=%_docdir \ --disable-rpath \ --enable-nls \ --enable-thread-safety \ @@ -294,7 +299,7 @@ %buildroot/var/lib/pgsql/.bash_profile # Backup directory for old version binaries install -d %buildroot%_libdir/postgresql/backup -cp doc/FAQ doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* COPYRIGHT \ +cp doc/FAQ* doc/KNOWN_BUGS doc/MISSING_FEATURES doc/README* COPYRIGHT \ README HISTORY doc/bug.template %buildroot%_docdir/postgresql cp -a %SOURCE2 %buildroot%_docdir/postgresql/README.SuSE.de cp -a %SOURCE3 %buildroot%_docdir/postgresql/README.SuSE.en @@ -354,9 +359,9 @@ %dir %_docdir/postgresql %_docdir/postgresql/[[:upper:]]* %_docdir/postgresql/bug.template -%_datadir/locale/*/*/pg_dump.mo -%_datadir/locale/*/*/pgscripts.mo -%_datadir/locale/*/*/psql.mo +%_datadir/locale/*/*/pg_dump-*.mo +%_datadir/locale/*/*/pgscripts-*.mo +%_datadir/locale/*/*/psql-*.mo # command line tools %_bindir/createdb %doc %_mandir/man1/createdb.1* @@ -403,7 +408,8 @@ %files libs %defattr(-,root,root) %_libdir/lib*.so.* -%_datadir/locale/*/*/libpq.mo +%_datadir/locale/*/*/libpq*.mo +%_datadir/locale/*/*/ecpglib*-*.mo %files server %defattr(-,root,root) @@ -420,8 +426,6 @@ %_datadir/postgresql/tsearch_data %_bindir/initdb %doc %_mandir/man1/initdb.1* -%_bindir/ipcclean -%doc %_mandir/man1/ipcclean.1* %_bindir/pg_ctl %doc %_mandir/man1/pg_ctl.1* %_bindir/pg_controldata @@ -435,11 +439,12 @@ %dir %_datadir/postgresql %_datadir/postgresql/timezone* %_datadir/postgresql/*.* -%_datadir/locale/*/*/initdb.mo -%_datadir/locale/*/*/postgres.mo -%_datadir/locale/*/*/pg_controldata.mo -%_datadir/locale/*/*/pg_ctl.mo -%_datadir/locale/*/*/pg_resetxlog.mo +%_datadir/locale/*/*/initdb-*.mo +%_datadir/locale/*/*/postgres-*.mo +%_datadir/locale/*/*/pg_controldata-*.mo +%_datadir/locale/*/*/pg_ctl-*.mo +%_datadir/locale/*/*/pg_resetxlog-*.mo +%_datadir/locale/*/*/plpgsql-*.mo %_libdir/postgresql/*_and_*.so %attr(750,postgres,postgres) %dir /var/lib/pgsql %attr(700,postgres,postgres) %dir /var/lib/pgsql/data @@ -454,7 +459,8 @@ %_libdir/lib*.so %_libdir/libpgport.a %_libdir/postgresql/pgxs -%_datadir/locale/*/*/pg_config.mo +%_datadir/locale/*/*/pg_config-*.mo +%_datadir/locale/*/*/ecpg-*.mo %doc %_mandir/man1/ecpg.1* %doc %_mandir/man1/pg_config.1* ++++++ postgresql-8.4.0-sle10-timestamptz.patch ++++++ Only for SLE10. On other platforms, the test works. poeml, Mon Jul 27 19:12:40 CEST 2009 diff -uNr postgresql-8.4.0.orig/src/test/regress/expected/timestamptz.out postgresql-8.4.0/src/test/regress/expected/timestamptz.out --- postgresql-8.4.0.orig/src/test/regress/expected/timestamptz.out 2009-03-22 02:12:32.000000000 +0100 +++ postgresql-8.4.0/src/test/regress/expected/timestamptz.out 2009-07-27 19:11:39.280087000 +0200 @@ -153,7 +153,7 @@ SELECT '20500710 173201 Europe/Helsinki'::timestamptz; -- DST timestamptz ------------------------------ - Sun Jul 10 07:32:01 2050 PDT + Sun Jul 10 07:32:01 2050 PST (1 row) SELECT '20500110 173201 Europe/Helsinki'::timestamptz; -- non-DST @@ -165,7 +165,7 @@ SELECT '205000-07-10 17:32:01 Europe/Helsinki'::timestamptz; -- DST timestamptz -------------------------------- - Thu Jul 10 07:32:01 205000 PDT + Thu Jul 10 07:32:01 205000 PST (1 row) SELECT '205000-01-10 17:32:01 Europe/Helsinki'::timestamptz; -- non-DST ++++++ postgresql-8.3.7.tar.bz2 -> postgresql-8.4.0.tar.bz2 ++++++ postgresql/postgresql-8.3.7.tar.bz2 /mounts/work_src_done/STABLE/postgresql/postgresql-8.4.0.tar.bz2 differ: char 11, line 1 ++++++ postgresql-README.SuSE.de ++++++ --- /var/tmp/diff_new_pack.nMwP2a/_old 2009-07-29 17:15:41.000000000 +0200 +++ /var/tmp/diff_new_pack.nMwP2a/_new 2009-07-29 17:15:41.000000000 +0200 @@ -16,6 +16,8 @@ angehalten werden (als root: "rcpostgresql stop"). Eventuell müssen zusätzlich noch einige Konfigurationsdateien aus /var/lib/pgsql/data gesichert werden, z.B. pg_hba.conf und postgresql.conf . +Achtung: seit Version 8.4 muss in pg_hba.conf "ident sameuser" durch +"ident" ersetzt werden. Danach können Sie die bisherigen Datenbankdateien löschen ++++++ postgresql-README.SuSE.en ++++++ --- /var/tmp/diff_new_pack.nMwP2a/_old 2009-07-29 17:15:41.000000000 +0200 +++ /var/tmp/diff_new_pack.nMwP2a/_new 2009-07-29 17:15:41.000000000 +0200 @@ -15,6 +15,8 @@ "rcpostgresql stop"). Further configuration files in /var/lib/pgsql/data, including pg_hba.conf and postgresql.conf, may need to be backed up as well. +Note: since version 8.4, "ident sameuser" needs to be replaced with +"ident" in pg_hba.conf. Afterwards, delete the previous database files ++++++ postgresql-init ++++++ --- /var/tmp/diff_new_pack.nMwP2a/_old 2009-07-29 17:15:41.000000000 +0200 +++ /var/tmp/diff_new_pack.nMwP2a/_new 2009-07-29 17:15:41.000000000 +0200 @@ -112,7 +112,7 @@ LANG=${POSTGRES_LANG:-$RC_LANG} INITDB=/usr/bin/initdb install -d -o postgres -g postgres -m 700 ${DATADIR} && su - postgres -c \ - "$INITDB --locale=$LANG --auth=\"ident sameuser\" $DATADIR &> initlog" || + "$INITDB --locale=$LANG --auth=\"ident\" $DATADIR &> initlog" || rc_failed rc_status -v rc_status || { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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