November 2014 - openSUSE Commits - openSUSE Mailing Lists

commit vlc for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package vlc for openSUSE:Factory checked in at 2014-11-24 11:19:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlc (Old) and /work/SRC/openSUSE:Factory/.vlc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vlc" Changes: -------- --- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2014-10-11 22:41:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vlc.new/vlc.changes 2014-11-24 11:19:03.000000000 +0100 @@ -1,0 +2,18 @@ +Sun Nov 9 16:06:10 UTC 2014 - seife+obs(a)b1-systems.com + +- fix skins2 defaut.vlt generation with newer tar defaults (and + remove the embedded build date from it on the way) + vlc-2.1.5-fix-skins2-default-skin-creation.patch +- remove buildhost hostname from the binary to avoid republishing + +------------------------------------------------------------------- +Thu Oct 30 06:08:06 UTC 2014 - olaf(a)aepfle.de + +- Convert BuildRequires from foo-devel to pkgconfig(foo) + +------------------------------------------------------------------- +Fri Oct 24 07:47:58 UTC 2014 - dimstar(a)opensuse.org + +- First attempts on enabling build for SLE-12. + +------------------------------------------------------------------- New: ---- vlc-2.1.5-fix-skins2-default-skin-creation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlc.spec ++++++ --- /var/tmp/diff_new_pack.g3RKh1/_old 2014-11-24 11:19:05.000000000 +0100 +++ /var/tmp/diff_new_pack.g3RKh1/_new 2014-11-24 11:19:05.000000000 +0100 @@ -41,107 +41,133 @@ Release: 0 Url: http://www.videolan.org/ Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE vlc-2.1.5-fix-skins2-default-skin-creation.patch -- see description in patch header +Patch1: vlc-2.1.5-fix-skins2-default-skin-creation.patch Patch3: 0001-no-return-in-non-void.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: Mesa-devel BuildRequires: aalib-devel -BuildRequires: alsa-devel >= 1.0.24 -BuildRequires: avahi-devel BuildRequires: fdupes -BuildRequires: flac-devel +BuildRequires: pkgconfig(alsa) >= 1.0.24 +BuildRequires: pkgconfig(avahi-client) >= 0.6 +BuildRequires: pkgconfig(flac) %if %{with fluidsynth} -BuildRequires: fluidsynth-devel +BuildRequires: pkgconfig(fluidsynth) >= 1.1.2 %endif %if 0%{?suse_version} >= 1220 -BuildRequires: freerdp-devel +BuildRequires: pkgconfig(freerdp) >= 1.0.1 %endif -BuildRequires: freetype2-devel -BuildRequires: fribidi-devel BuildRequires: gdk-pixbuf-devel BuildRequires: gettext-devel BuildRequires: git -BuildRequires: gnome-vfs2-devel +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(gnome-vfs-2.0) %if 0%{?suse_version} >= 1220 -BuildRequires: gnutls-devel >= 3.0.20 +BuildRequires: pkgconfig(gnutls) >= 3.0.20 %endif -BuildRequires: gtk2-devel -BuildRequires: libSDL-devel +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(sdl) >= 1.2.10 %if 0%{?suse_version} >= 1140 -BuildRequires: libSDL_image-devel +BuildRequires: pkgconfig(SDL_image) >= 1.2.10 %endif -BuildRequires: libass-devel -BuildRequires: libavc1394-devel -BuildRequires: libbluray-devel -BuildRequires: libcaca-devel -BuildRequires: libcddb-devel -BuildRequires: libcdio-devel +BuildRequires: pkgconfig(caca) >= 0.99.beta14 +BuildRequires: pkgconfig(libass) >= 0.9.8 +BuildRequires: pkgconfig(libavc1394) >= 0.5.3 +BuildRequires: pkgconfig(libbluray) >= 0.2.1 +BuildRequires: pkgconfig(libcddb) >= 0.9.5 +%if 0%{?suse_version} != 1315 BuildRequires: libkde4-devel -%if 0%{?suse_version} >= 1230 -BuildRequires: libchromaprint-devel +%endif +%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 +BuildRequires: pkgconfig(libchromaprint) >= 0.6.0 %endif %if 0%{?suse_version} >= 1140 -BuildRequires: libdc1394-devel >= 2.1.0 +BuildRequires: pkgconfig(libdc1394-2) >= 2.1.0 %endif -BuildRequires: libdvbpsi-devel < 1.0 -BuildRequires: libdvdnav-devel -BuildRequires: libdvdread-devel BuildRequires: libgcrypt-devel -BuildRequires: libidn-devel -BuildRequires: libjack-devel >= 1.9.7 -BuildRequires: libkate-devel BuildRequires: libmatroska-devel -BuildRequires: libmodplug-devel -%if 0%{?suse_version} > 1230 +BuildRequires: pkgconfig(dvdnav) +BuildRequires: pkgconfig(dvdread) +BuildRequires: pkgconfig(jack) >= 1.9.7 +BuildRequires: pkgconfig(kate) >= 0.3.0 +BuildRequires: pkgconfig(libdvbpsi) < 1.0 +BuildRequires: pkgconfig(libidn) +BuildRequires: pkgconfig(libmodplug) > 0.8.8 +%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315 BuildRequires: libmlt6-modules %endif %if 0%{?suse_version} >= 1140 -BuildRequires: libmtp-devel >= 1.0.0 +BuildRequires: pkgconfig(libmtp) >= 1.0.0 %endif -BuildRequires: libnotify-devel -BuildRequires: libogg-devel -BuildRequires: libopus-devel BuildRequires: libproxy-devel -BuildRequires: libraw1394-devel -BuildRequires: librsvg-devel -BuildRequires: libsamplerate-devel -BuildRequires: libshout-devel -BuildRequires: libsmbclient-devel -BuildRequires: libssh2-devel -BuildRequires: libtag-devel -BuildRequires: libtheora-devel BuildRequires: libtool -BuildRequires: libudev-devel -BuildRequires: libupnp-devel BuildRequires: libv4l-devel -BuildRequires: libva-devel +BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libraw1394) >= 2.0.1 +BuildRequires: pkgconfig(librsvg-2.0) >= 2.9.0 +BuildRequires: pkgconfig(libssh2) +BuildRequires: pkgconfig(libudev) >= 142 +BuildRequires: pkgconfig(libupnp) +BuildRequires: pkgconfig(libva) +BuildRequires: pkgconfig(libva-x11) +BuildRequires: pkgconfig(ogg) >= 1.0 +BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(samplerate) +BuildRequires: pkgconfig(shout) >= 2.1 +BuildRequires: pkgconfig(smbclient) +BuildRequires: pkgconfig(taglib) >= 1.6.1 +BuildRequires: pkgconfig(theoradec) >= 1.0 +BuildRequires: pkgconfig(theoraenc) %if 0%{?suse_version} >= 1310 -BuildRequires: LibVNCServer-devel +BuildRequires: pkgconfig(libvncclient) >= 0.9.9 %endif -BuildRequires: libvorbis-devel -BuildRequires: libxml2-devel BuildRequires: lirc-devel -BuildRequires: live555-devel -BuildRequires: lua-devel -%if 0%{?suse_version} >= 1140 -BuildRequires: opencv-devel +BuildRequires: pkgconfig(libxml-2.0) >= 2.5 +BuildRequires: pkgconfig(live555) +BuildRequires: pkgconfig(lua) >= 5.1 +BuildRequires: pkgconfig(vorbis) >= 1.1 +BuildRequires: pkgconfig(vorbisenc) >= 1.1 +%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 +BuildRequires: pkgconfig(opencv) > 2.0 %endif BuildRequires: pcre-devel %if 0%{?suse_version} >= 1220 -BuildRequires: projectM-devel +BuildRequires: pkgconfig(libprojectM) >= 2.0.0 %endif BuildRequires: pulseaudio-devel -BuildRequires: schroedinger-devel BuildRequires: slang-devel -BuildRequires: speex-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(schroedinger-1.0) >= 1.0.10 +BuildRequires: pkgconfig(speex) >= 1.0.5 +BuildRequires: pkgconfig(speexdsp) +%if 0%{?suse_version} != 1315 BuildRequires: vcdimager-devel -%if 0%{?suse_version} >= 1220 -BuildRequires: xcb-util-keysyms-devel +BuildRequires: pkgconfig(libcdio) >= 0.78.2 +BuildRequires: pkgconfig(libiso9660) >= 0.72 +BuildRequires: pkgconfig(libvcdinfo) >= 0.7.22 +%endif +%if 0%{?suse_version} >= 1140 +BuildRequires: pkgconfig(xcb) >= 1.6 +BuildRequires: pkgconfig(xcb-composite) +BuildRequires: pkgconfig(xcb-keysyms) >= 0.3.4 +BuildRequires: pkgconfig(xcb-randr) >= 1.3 +BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(xcb-xv) >= 1.1.90.1 +BuildRequires: pkgconfig(xproto) %endif BuildRequires: xosd-devel -BuildRequires: zvbi-devel +BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(QtGui) >= 4.6.0 +BuildRequires: pkgconfig(dbus-1) >= 1.0.0 BuildRequires: pkgconfig(dirac) >= 0.10.0 +BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(libgme) +BuildRequires: pkgconfig(libpulse) >= 0.9.22 +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xinerama) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28 # This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations # and can favor one over the other. %if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} @@ -159,15 +185,18 @@ %if 0%{?BUILD_ORIG} BuildRequires: faad2-devel BuildRequires: liba52-devel -BuildRequires: libdca-devel BuildRequires: libfaac-devel -BuildRequires: libffmpeg-devel BuildRequires: libmad-devel -BuildRequires: libmpeg2-devel -BuildRequires: libtwolame-devel -BuildRequires: libvdpau-devel -BuildRequires: libx264-devel BuildRequires: libxvidcore-devel +BuildRequires: pkgconfig(libavcodec) >= 53.34.0 +BuildRequires: pkgconfig(libavformat) >= 53.21.0 +BuildRequires: pkgconfig(libavutil) >= 51.22.0 +BuildRequires: pkgconfig(libdca) >= 0.0.5 +BuildRequires: pkgconfig(libmpeg2) > 0.3.2 +BuildRequires: pkgconfig(libpostproc) +BuildRequires: pkgconfig(twolame) +BuildRequires: pkgconfig(vdpau) +BuildRequires: pkgconfig(x264) >= 0.86 %endif Requires: %{name}-noX = %{version}-%{release} @@ -270,6 +299,7 @@ %prep %setup -q +%patch1 -p1 %patch3 -p1 rm -rf contrib # fix builddate info @@ -362,8 +392,10 @@ --enable-taglib \ --enable-theora \ --enable-v4l2 \ +%if 0%{?suse_version} != 1315 --enable-vcd \ --enable-vcdx \ +%endif --enable-vorbis \ --enable-waveout \ %if 0%{?suse_version} >= 1140 @@ -378,6 +410,8 @@ --enable-xvideo \ --with-default-font=/usr/share/fonts/truetype/FreeSerifBold.ttf \ --with-default-monospace-font=/usr/share/fonts/truetype/FreeMono.ttf +# we don't need no VLC_COMPILE_HOST `hostname -f` in the binary... +sed -i -e 's/^#define VLC_COMPILE_HOST.*/#define VLC_COMPILE_HOST "obs-build"/' config.h make %{?_smp_mflags} V=1 %install @@ -616,7 +650,9 @@ %{_libdir}/vlc/plugins/access/libtimecode_plugin.so %{_libdir}/vlc/plugins/access/libv4l2_plugin.so %{_libdir}/vlc/plugins/access/libvcd_plugin.so +%if 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/access/libvcdx_plugin.so +%endif %if 0%{?suse_version} >= 1310 %{_libdir}/vlc/plugins/access/liblibvnc_plugin.so %endif @@ -758,7 +794,7 @@ %{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so %{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so %{_libdir}/vlc/plugins/misc/libexport_plugin.so -%if 0%{?suse_version} >= 1230 +%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/misc/libfingerprinter_plugin.so %endif %if 0%{?suse_version} >= 1220 @@ -821,7 +857,7 @@ %{_libdir}/vlc/plugins/stream_filter/libsmooth_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so -%if 0%{?suse_version} >= 1230 +%if 0%{?suse_version} >= 1230 && 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so %endif %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so @@ -882,7 +918,7 @@ %{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so -%if 0%{?suse_version} >= 1140 +%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so %endif @@ -933,8 +969,8 @@ %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so %{_libdir}/vlc/plugins/codec/libtwolame_plugin.so %{_libdir}/vlc/plugins/codec/libx264_plugin.so -%{_libdir}/vlc/plugins/codec/libvaapi_plugin.so %{_libdir}/vlc/plugins/codec/libvdpau_plugin.so +%{_libdir}/vlc/plugins/codec/libvaapi_plugin.so %{_libdir}/vlc/plugins/demux/libavformat_plugin.so %{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so %endif ++++++ vlc-2.1.5-fix-skins2-default-skin-creation.patch ++++++ Author: Stefan Seyfried <seife+obs(a)b1-systems.com> New tar defaults create PAX archives which have two problems: * VLC cannot read them * they contain atime and thus the build time Avoid this by passign "--format=ustar" to tar when creating skins2/default.vlt Index: b/share/Makefile.am =================================================================== --- a/share/Makefile.am +++ b/share/Makefile.am @@ -79,7 +79,7 @@ skins2/default.vlt: $(skins2_default_vlt mkdir -p skins2 (cd "$(srcdir)/skins2"; find default -print0 | \ LC_ALL=C sort -z | \ - tar cvv --exclude .svn --no-recursion --null -T -) | \ + tar cvv --format=ustar --exclude .svn --no-recursion --null -T -) | \ gzip -n > skins2/default.vlt # Index: b/share/Makefile.in =================================================================== --- a/share/Makefile.in +++ b/share/Makefile.in @@ -1757,7 +1757,7 @@ skins2/default.vlt: $(skins2_default_vlt mkdir -p skins2 (cd "$(srcdir)/skins2"; find default -print0 | \ LC_ALL=C sort -z | \ - tar cvv --exclude .svn --no-recursion --null -T -) | \ + tar cvv --format=ustar --exclude .svn --no-recursion --null -T -) | \ gzip -n > skins2/default.vlt .lua.luac: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libassuan for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package libassuan for openSUSE:Factory checked in at 2014-11-24 11:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libassuan (Old) and /work/SRC/openSUSE:Factory/.libassuan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libassuan" Changes: -------- --- /work/SRC/openSUSE:Factory/libassuan/libassuan.changes 2014-08-25 11:03:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libassuan.new/libassuan.changes 2014-11-24 11:18:47.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Nov 8 20:19:39 UTC 2014 - andreas.stieger(a)gmx.de + +- update to 2.1.3: + + Performance fix for a platform other than GNU/Linux + +------------------------------------------------------------------- Old: ---- libassuan-2.1.2.tar.bz2 libassuan-2.1.2.tar.bz2.sig New: ---- libassuan-2.1.3.tar.bz2 libassuan-2.1.3.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libassuan.spec ++++++ --- /var/tmp/diff_new_pack.h4iNLf/_old 2014-11-24 11:18:48.000000000 +0100 +++ /var/tmp/diff_new_pack.h4iNLf/_new 2014-11-24 11:18:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: libassuan -Version: 2.1.2 +Version: 2.1.3 Release: 0 Summary: IPC library used by GnuPG version 2 License: GPL-3.0+ and LGPL-2.1+ ++++++ libassuan-2.1.2.tar.bz2 -> libassuan-2.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/ChangeLog new/libassuan-2.1.3/ChangeLog --- old/libassuan-2.1.2/ChangeLog 2014-08-17 13:52:07.000000000 +0200 +++ new/libassuan-2.1.3/ChangeLog 2014-11-07 18:06:06.000000000 +0100 @@ -1,3 +1,14 @@ +2014-11-07 Werner Koch <wk(a)gnupg.org> + + Release 2.1.3. + * configure.ac: Set LT version to C4/A4/R3. + + w32: Remove I/O delays due to our 100ms delay after an EAGAIN. + * src/system-w32.c (__assuan_read): Retry using select. Map + WSAECONNRESET to EPIPE. + (__assuan_write): Retry using select. + * src/assuan-buffer.c (readline) [W32]: Return EOF instead of EPIPE. + 2014-08-17 Werner Koch <wk(a)gnupg.org> Release 2.1.2. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/NEWS new/libassuan-2.1.3/NEWS --- old/libassuan-2.1.2/NEWS 2014-08-17 13:47:17.000000000 +0200 +++ new/libassuan-2.1.3/NEWS 2014-11-07 18:01:12.000000000 +0100 @@ -1,3 +1,9 @@ +Noteworthy changes in version 2.1.3 (2014-11-07) [C4/A4/R3] +------------------------------------------------ + + * Performance fix for Windows. + + Noteworthy changes in version 2.1.2 (2014-08-17) [C4/A4/R2] ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/VERSION new/libassuan-2.1.3/VERSION --- old/libassuan-2.1.2/VERSION 2014-08-17 13:52:08.000000000 +0200 +++ new/libassuan-2.1.3/VERSION 2014-11-07 18:06:06.000000000 +0100 @@ -1 +1 @@ -2.1.2 +2.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/configure new/libassuan-2.1.3/configure --- old/libassuan-2.1.2/configure 2014-08-17 13:51:35.000000000 +0200 +++ new/libassuan-2.1.3/configure 2014-11-07 18:05:30.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libassuan 2.1.2. +# Generated by GNU Autoconf 2.69 for libassuan 2.1.3. # # Report bugs to <http://bugs.gnupg.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libassuan' PACKAGE_TARNAME='libassuan' -PACKAGE_VERSION='2.1.2' -PACKAGE_STRING='libassuan 2.1.2' +PACKAGE_VERSION='2.1.3' +PACKAGE_STRING='libassuan 2.1.3' PACKAGE_BUGREPORT='http://bugs.gnupg.org' PACKAGE_URL='' @@ -1347,7 +1347,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libassuan 2.1.2 to adapt to many kinds of systems. +\`configure' configures libassuan 2.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1417,7 +1417,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libassuan 2.1.2:";; + short | recursive ) echo "Configuration of libassuan 2.1.3:";; esac cat <<\_ACEOF @@ -1527,7 +1527,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libassuan configure 2.1.2 +libassuan configure 2.1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2107,7 +2107,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libassuan $as_me 2.1.2, which was +It was created by libassuan $as_me 2.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2464,7 +2464,7 @@ # LIBASSUAN_LT_CURRENT=4 LIBASSUAN_LT_AGE=4 -LIBASSUAN_LT_REVISION=2 +LIBASSUAN_LT_REVISION=3 # If the API is changed in an incompatible way: increment the next counter. LIBASSUAN_CONFIG_API_VERSION=2 @@ -2944,7 +2944,7 @@ # Define the identity of the package. PACKAGE='libassuan' - VERSION='2.1.2' + VERSION='2.1.3' cat >>confdefs.h <<_ACEOF @@ -4604,7 +4604,7 @@ #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF -VERSION_NUMBER=0x020102 +VERSION_NUMBER=0x020103 @@ -13446,7 +13446,7 @@ # # Provide information about the build. # -BUILD_REVISION="a5d7f49" +BUILD_REVISION="3003c5d" cat >>confdefs.h <<_ACEOF @@ -13455,7 +13455,7 @@ BUILD_FILEVERSION=`echo "$VERSION" | sed 's/$[0-9.]*$.*/\1./;s/\./,/g'` -BUILD_FILEVERSION="${BUILD_FILEVERSION}42455" +BUILD_FILEVERSION="${BUILD_FILEVERSION}12291" BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date` @@ -15153,7 +15153,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libassuan $as_me 2.1.2, which was +This file was extended by libassuan $as_me 2.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15219,7 +15219,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libassuan config.status 2.1.2 +libassuan config.status 2.1.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17216,6 +17216,6 @@ echo " Libassuan v${VERSION} has been configured as follows: - Revision: a5d7f49 (42455) + Revision: 3003c5d (12291) Platform: $host " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/configure.ac new/libassuan-2.1.3/configure.ac --- old/libassuan-2.1.2/configure.ac 2014-08-17 13:47:24.000000000 +0200 +++ new/libassuan-2.1.3/configure.ac 2014-11-07 18:01:43.000000000 +0100 @@ -31,7 +31,7 @@ m4_define([mym4_package],[libassuan]) m4_define([mym4_major], [2]) m4_define([mym4_minor], [1]) -m4_define([mym4_micro], [2]) +m4_define([mym4_micro], [3]) # To start a new development series, i.e a new major or minor number # you need to mark an arbitrary commit before the first beta release @@ -60,7 +60,7 @@ # LIBASSUAN_LT_CURRENT=4 LIBASSUAN_LT_AGE=4 -LIBASSUAN_LT_REVISION=2 +LIBASSUAN_LT_REVISION=3 # If the API is changed in an incompatible way: increment the next counter. LIBASSUAN_CONFIG_API_VERSION=2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/doc/assuan.info new/libassuan-2.1.3/doc/assuan.info --- old/libassuan-2.1.2/doc/assuan.info 2014-08-17 13:52:07.000000000 +0200 +++ new/libassuan-2.1.3/doc/assuan.info 2014-11-07 18:06:06.000000000 +0100 @@ -7,8 +7,8 @@ END-INFO-DIR-ENTRY This file documents the use and the internals of Assuan. - This is Edition 2.1.2, last updated 15 March 2013, of `The -`Developing with Assuan' Manual', for Version 2.1.2. + This is Edition 2.1.3, last updated 15 March 2013, of `The +`Developing with Assuan' Manual', for Version 2.1.3. Published by the Free Software Foundation 51 Franklin Street, Fifth Floor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/doc/stamp-vti new/libassuan-2.1.3/doc/stamp-vti --- old/libassuan-2.1.2/doc/stamp-vti 2014-08-17 13:52:07.000000000 +0200 +++ new/libassuan-2.1.3/doc/stamp-vti 2014-11-07 18:06:06.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 15 March 2013 @set UPDATED-MONTH March 2013 -@set EDITION 2.1.2 -@set VERSION 2.1.2 +@set EDITION 2.1.3 +@set VERSION 2.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/doc/version.texi new/libassuan-2.1.3/doc/version.texi --- old/libassuan-2.1.2/doc/version.texi 2014-08-17 13:52:07.000000000 +0200 +++ new/libassuan-2.1.3/doc/version.texi 2014-11-07 18:06:06.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 15 March 2013 @set UPDATED-MONTH March 2013 -@set EDITION 2.1.2 -@set VERSION 2.1.2 +@set EDITION 2.1.3 +@set VERSION 2.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/src/assuan-buffer.c new/libassuan-2.1.3/src/assuan-buffer.c --- old/libassuan-2.1.2/src/assuan-buffer.c 2013-03-15 20:26:09.000000000 +0100 +++ new/libassuan-2.1.3/src/assuan-buffer.c 2014-11-07 17:12:45.000000000 +0100 @@ -80,6 +80,15 @@ { if (errno == EINTR) continue; +#ifdef HAVE_W32_SYSTEM + if (errno == EPIPE) + { + /* Under Windows we get EPIPE (actually ECONNRESET) + after termination of the client. Assume an EOF. */ + *r_eof = 1; + break; /* allow incomplete lines */ + } +#endif /*HAVE_W32_SYSTEM*/ return -1; /* read error */ } else if (!n) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libassuan-2.1.2/src/system-w32.c new/libassuan-2.1.3/src/system-w32.c --- old/libassuan-2.1.2/src/system-w32.c 2013-03-15 20:26:09.000000000 +0100 +++ new/libassuan-2.1.3/src/system-w32.c 2014-11-07 16:40:32.000000000 +0100 @@ -197,9 +197,27 @@ if (is_socket (fd)) { + int tries = 3; + + again: + ec = 0; res = recv (HANDLE2SOCKET (fd), buffer, size, 0); if (res == -1) ec = WSAGetLastError (); + if (ec == WSAEWOULDBLOCK && tries--) + { + /* EAGAIN: Use select to wait for resources and try again. + We do this 3 times and then give up. The higher level + layer then needs to take care of EAGAIN. No need to + specify a timeout - the socket is not expected to be in + blocking mode. */ + fd_set fds; + + FD_ZERO (&fds); + FD_SET (HANDLE2SOCKET (fd), &fds); + select (0, &fds, NULL, NULL, NULL); + goto again; + } } else { @@ -224,6 +242,7 @@ gpg_err_set_errno (EAGAIN); break; + case WSAECONNRESET: /* Due to the use of recv. */ case ERROR_BROKEN_PIPE: gpg_err_set_errno (EPIPE); break; @@ -247,9 +266,27 @@ if (is_socket (fd)) { + int tries = 3; + + again: + ec = 0; res = send (HANDLE2SOCKET (fd), buffer, size, 0); if (res == -1) ec = WSAGetLastError (); + if (ec == WSAEWOULDBLOCK && tries--) + { + /* EAGAIN: Use select to wait for resources and try again. + We do this 3 times and then give up. The higher level + layer then needs to take care of EAGAIN. No need to + specify a timeout - the socket is not expected to be in + blocking mode. */ + fd_set fds; + + FD_ZERO (&fds); + FD_SET (HANDLE2SOCKET (fd), &fds); + select (0, NULL, &fds, NULL, NULL); + goto again; + } } else { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mono-core for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package mono-core for openSUSE:Factory checked in at 2014-11-24 11:18:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mono-core (Old) and /work/SRC/openSUSE:Factory/.mono-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mono-core" Changes: -------- --- /work/SRC/openSUSE:Factory/mono-core/mono-core.changes 2014-09-23 10:42:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mono-core.new/mono-core.changes 2014-11-24 11:18:44.000000000 +0100 @@ -1,0 +2,74 @@ +Fri Nov 7 19:59:41 UTC 2014 - meissner(a)suse.com + +- libmono-2_0-1 has a hard dependency on libmonoboehm-2_0-1, + require it bnc#904460 + +------------------------------------------------------------------- +Mon Oct 27 00:02:10 UTC 2014 - i(a)marguerite.su + +- fix build for factory x86_64 + * add mono-3.x-keyboards.resources-cp_r.patch + * resources/keyboards.resources exists on x86_64, so cp won't work + should add -r argument +- drop mono-core-target-4.0.patch + * runtime 4.0 is no more, now mono-nunit should use 4.5 +- add patch mono-nunit-default-runtime-4.5.patch + * use runtime 4.5 for mono-nunit by default + +------------------------------------------------------------------- +Sat Oct 4 18:46:11 UTC 2014 - mailaender(a)opensuse.org + +- Removed upstreamed mono-core-parallel-build.diff patch +- Updated to 3.10.0 + + Implemented System.IO.Compression.FileSystem. + + Uri now implements the .NET 4.5 behavior, it can be reverted to the old behavior in the same way by setting the System.Uri::s_IriParsing static field to false. + + Remove unnecessary locking from core metadata parsing functions. + + Avoid cache thrashing of locals array when looping over enumerator. + + Fix support for unaligned offsets in the store_membase_imm opcodes. bxc#23267. + + Fix the lookup of nested types which have a namespace. bxc#21653. + + Increase some opcode sizes. bxc#23026. + + Always pass the imt arg to interface calls in gsharedvt methods. bxc#22624. + + Store the epilog length in MonoArchEHJitInfo instead of encoding it in jinfo->unwind_desc, since the latter can overflow for methods with large epilogs. bxc#22685. + + Add a mono_thread_detach_if_exiting () public api function which can be called by embedding code to detach the runtime if the code is running from a pthread dtor. bxc#21164. + + Fix yet another native types problem. bxc#22053. + + Fix the leaking of mach ports introduced by 98bbf8512aec0fa01b4426583280f6d231d22187. bxc#22068. + + Add support for constrained calls with vtype return types in gsharedvt code. bxc#22109. + + Fix the PLATFORM_GNU check so it works with gnueabi etc. as well. bxc#21520. + + Don’t make runtime invoke signatures generic. bxc#21973. + + Allow v8..v15 in unwind info on arm64. Fixes part of #21615. + + Fix Process.PrivateMemorySize64 etc. on ios. bxc#21882. + + Fix enum->int casts in gsharedvt code. bxc#21893. + + Don’t assert when loading a generic methodspec with 0 arity. bxc#19097. + + Avoid asserting when a cattr cannot be loaded. bxc#21653. + + Avoid making generic calls from gsharedvt methods normally, go through the rgctx infrastructure instead. bxc#21677. + + Fix Uri UserInfo parsing. Fixes 23246. + + Update RequestMessage.RequestUri.AbsoluteUri after redirect. bxc#22383. + + Fixes XContainer attempt to create a XNode from a null value. bxc#20151. + + Changed XObject OnChanged and OnChanging to use Owner. When XObject.Owner is not a XElement XObject.Parent returns null and the owner would not be notified of changing and changed events. bxc#18772. + + Process XslLiteralElements with only child attributes as empty ones. bxc#14751. + + ‘finally’ protect ClientRuntimeChannel.Begin/EndProcess(). bxc#22179. + + WebClient.OpenWrite() must get the response on close. bxc#10163. + + Fix WebClient.UploadValuesTaskAsync(); bxc#20359. + + Improve System.Security.Claims. bxc#22282. + + Fixed serialization of XmlNode field with attribute XmlAnyElement. bxc#3211. + + Handle String::Format with escaped closing }. bxc#22114 + + Add a missing check to TypeBuilder.CreateType (). bxc#22059. + + Xml Serialization of Base class w/o a parameterless constructor. Removed validation code that did not allowed serialization of base classes without a parameterless constructor. bxc#6913. + + Fixed XmlSerializer to handle attribute XmlSchemePrivider.IsAny. XmlSerializer no longer outputs a root element with class name when the class has the attribute + XmlSchemeProvider and IsAny is true. bxc#11916 + + Test that DeflateStream.Read does read an empty stream. Covers #19313. + + Reseting all private key values to null is required because a new import may not overwrite existing values. bxc#18482. + + Handle quoted filename value. bxc#21960. + + Dispose XmlReader using correct value. bxc#21771. + + Don’t use `1 naming for compiler generated second level and deeper nested types. bxc#22893. + + Extend missing type check to type lookups. bxc#20933. + + Fix copy and paste error in constraints checker. bxc#22131. + + Speed up nullable tokenizer. bxc#20195. + + Coalescing operator if the lhs of a null is a integer type that is larger than the integer type on the rhs. bxc#22054. + + Check for duplicate destructors. bxc#21983. + + Switch statement with constant block at first label. bxc#21805. + + Decimal constants modulo folding. bxc#21743. + + Update codegen for boolean loads. bxc#21685. + + Workaround for issues with CreateItem task where metadata are not generated due to up-to-data inputs. bxc#23022. + + Add KeepDuplicates etc. to 4.0 as internal. bxc#20961. + +------------------------------------------------------------------- Old: ---- mono-3.8.0.tar.bz2 mono-core-parallel-build.diff mono-core-target-4.0.patch New: ---- mono-3.10.0.tar.bz2 mono-3.x-keyboards.resources-cp_r.patch mono-nunit-default-runtime-4.5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-core.spec ++++++ --- /var/tmp/diff_new_pack.jEk4Ls/_old 2014-11-24 11:18:47.000000000 +0100 +++ /var/tmp/diff_new_pack.jEk4Ls/_new 2014-11-24 11:18:47.000000000 +0100 @@ -21,7 +21,7 @@ %define sgen yes Name: mono-core -Version: 3.8.0 +Version: 3.10.0 Release: 0 Summary: Cross-platform, Open Source, .NET development framework License: LGPL-2.1 and MIT and MS-PL @@ -29,16 +29,17 @@ Url: http://www.mono-project.com Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2 Source1: mono-core.rpmlintrc -# PATCH-FIX-UPSTREAM mono-core-target-4.0.patch dimstar(a)opensuse.org -- Use runtime 4.0 as default for cairo and nunit -- https://github.com/mono/mono/pull/1209 -Patch5: mono-core-target-4.0.patch -# PATCH-FIX-UPSTREAM -- ro(a)suse.de -- https://github.com/mono/mono/pull/1210 -Patch6: mono-core-parallel-build.diff +# PATCH-FIX-UPSTREAM Use runtime 4.5 as default for nunit +Patch5: mono-nunit-default-runtime-4.5.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch7: mono-core-ppc64le.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch8: mono-core-ppc64le-swr11r12.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch9: mono-core-ppc64le-callreg.diff +# PATCH-FIX-UPSTREAM resources/keyboards.resources exists on x86_64, +# so cp won't work, should add -r argument +Patch10: mono-3.x-keyboards.resources-cp_r.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -98,12 +99,12 @@ %prep %setup -q -n mono-%{version} %patch5 -p1 -%patch6 -p1 %ifarch ppc64 %patch7 -p1 %patch8 -p1 %patch9 -p1 %endif +%patch10 -p1 %build ./autogen.sh @@ -413,6 +414,7 @@ Summary: A Library for embedding Mono in your Application License: LGPL-2.1 Group: Development/Libraries/C and C++ +Requires: libmonoboehm-2_0-1 %description -n libmono-2_0-1 The Mono Project is an open development initiative that is working to ++++++ mono-3.8.0.tar.bz2 -> mono-3.10.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/mono-core/mono-3.8.0.tar.bz2 /work/SRC/openSUSE:Factory/.mono-core.new/mono-3.10.0.tar.bz2 differ: char 11, line 1 ++++++ mono-3.x-keyboards.resources-cp_r.patch ++++++ Index: mono-3.10.0/mcs/class/Managed.Windows.Forms/Makefile =================================================================== --- mono-3.10.0.orig/mcs/class/Managed.Windows.Forms/Makefile +++ mono-3.10.0/mcs/class/Managed.Windows.Forms/Makefile @@ -122,11 +122,11 @@ TEST_HARNESS_EXCLUDES_ONDOTNET = -exclud $(the_lib): $(RESOURCES) $(RESX_RESOURCES): %.resources: %.resx - $(RESGEN) $< || cp $@.prebuilt $@ + $(RESGEN) $< || cp -r $@.prebuilt $@ $(LIBRARY): $(CUR_RESOURCES) $(PREBUILT): %.prebuilt: % - cp $* $@ + cp -r $* $@ dist-default: $(PREBUILT) ++++++ mono-nunit-default-runtime-4.5.patch ++++++ Index: mono-3.10.0/data/mono-nunit.pc.in =================================================================== --- mono-3.10.0.orig/data/mono-nunit.pc.in +++ mono-3.10.0/data/mono-nunit.pc.in @@ -6,4 +6,4 @@ libdir=${exec_prefix}/lib Name: Mono NUnit Description: Mono's version of NUnit Version: @VERSION@ -Libs: -r:${libdir}/mono/2.0/nunit.core.dll -r:${libdir}/mono/2.0/nunit.core.interfaces.dll -r:${libdir}/mono/2.0/nunit.core.extensions.dll -r:${libdir}/mono/2.0/nunit.framework.dll -r:${libdir}/mono/2.0/nunit.framework.extensions.dll -r:${libdir}/mono/2.0/nunit.mocks.dll -r:${libdir}/mono/2.0/nunit.util.dll -r:${libdir}/mono/2.0/nunit-console-runner.dll +Libs: -r:${libdir}/mono/4.5/nunit.core.dll -r:${libdir}/mono/4.5/nunit.core.interfaces.dll -r:${libdir}/mono/4.5/nunit.core.extensions.dll -r:${libdir}/mono/4.5/nunit.framework.dll -r:${libdir}/mono/4.5/nunit.framework.extensions.dll -r:${libdir}/mono/4.5/nunit.mocks.dll -r:${libdir}/mono/4.5/nunit.util.dll -r:${libdir}/mono/4.5/nunit-console-runner.dll -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libzhuyin for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package libzhuyin for openSUSE:Factory checked in at 2014-11-24 11:18:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzhuyin (Old) and /work/SRC/openSUSE:Factory/.libzhuyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzhuyin" Changes: -------- --- /work/SRC/openSUSE:Factory/libzhuyin/libzhuyin.changes 2014-07-18 06:41:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzhuyin.new/libzhuyin.changes 2014-11-24 11:18:40.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Oct 23 15:14:20 UTC 2014 - hillwood(a)linuxfans.org + +- Update to 0.9.99.2014929 + * bump so version + * add function zhuyin_get_zhuyin_key_rest_offset +- Drop libzhuyin-tools, upstream have dropped it. + +------------------------------------------------------------------- Old: ---- libzhuyin-0.9.99.20140619.tar.gz model8.text.tar.gz New: ---- libzhuyin-0.9.99.20140929.tar.gz model9.text.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzhuyin.spec ++++++ --- /var/tmp/diff_new_pack.UZUofA/_old 2014-11-24 11:18:42.000000000 +0100 +++ /var/tmp/diff_new_pack.UZUofA/_new 2014-11-24 11:18:42.000000000 +0100 @@ -15,51 +15,42 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libzhuyin -Version: 0.9.99.20140619 +Version: 0.9.99.20140929 Release: 0 -License: GPL-2.0 Summary: Library to deal with zhuyin -Url: https://github.com/libzhuyin/libzhuyin +License: GPL-2.0 Group: System/I18n/Chinese +Url: https://github.com/libzhuyin/libzhuyin Source: %{name}-%{version}.tar.gz -Source1: http://downloads.sourceforge.net/libzhuyin/models/model8.text.tar.gz +Source1: http://downloads.sourceforge.net/libzhuyin/models/model9.text.tar.gz # PATCH-FIX-UPSTREAM marguerite(a)opensuse.org - no download when build Patch: libzhuyin-no-download.patch # PATCH-FIX-UPSTREAM marguerite(a)opensuse.org # it will use current date eg. /usr/include/libzhuyin-0.9.99.20140716 # Don't do this Patch1: libzhuyin-no-random-version-number-includedir.patch +BuildRequires: db-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: gnome-common BuildRequires: libtool -BuildRequires: db-devel +Obsoletes: libzhuyin-tools < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The libzhuyin project aims to provide the algorithms core for intelligent sentence-based Chinese zhuyin input methods. -%package tools -Summary: Tools for libzhuyin -Group: System/I18n/Chinese -Requires(post): update-alternatives -Requires(postun): update-alternatives - -%description tools -The libzhuyin project aims to provide the algorithms core -for intelligent sentence-based Chinese zhuyin input methods. - -This package provides the tools used to make data files. -%package -n libzhuyin5 +%package -n libzhuyin6 Summary: Runtime libraries for libzhuyin Group: System/Libraries Requires: libzhuyin-data -%description -n libzhuyin5 +%description -n libzhuyin6 The libzhuyin project aims to provide the algorithms core for intelligent sentence-based Chinese zhuyin input methods. @@ -78,8 +69,8 @@ %package devel Summary: Development headers for libzhuyin Group: Development/Libraries/C and C++ -Requires: libzhuyin5 = %{version} -Requires: libzhuyin-tools = %{version} +#Requires: libzhuyin-tools = %{version} +Requires: libzhuyin6 = %{version} %description devel The libzhuyin project aims to provide the algorithms core @@ -93,7 +84,7 @@ %patch1 -p1 cp -r %{SOURCE1} data pushd data &> /dev/null -tar -xf model8.text.tar.gz +tar -xf model9.text.tar.gz popd &> /dev/null ./autogen.sh @@ -104,45 +95,21 @@ %install %make_install -# update-alternatives -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -for alt in gen_binary_files gen_unigram import_interpolation ; do - mv %{buildroot}%{_bindir}/${alt} %{buildroot}%{_bindir}/${alt}-zhuyin - mv %{buildroot}%{_mandir}/man1/${alt}.1 %{buildroot}%{_mandir}/man1/${alt}-zhuyin.1 - touch %{buildroot}%{_sysconfdir}/alternatives/${alt} - touch %{buildroot}%{_sysconfdir}/alternatives/${alt}.1.gz - ln -sf %{_sysconfdir}/alternatives/${alt} %{buildroot}%{_bindir}/${alt} - ln -sf %{_sysconfdir}/alternatives/${alt}.1.gz %{buildroot}%{_mandir}/man1/ -done rm -rf %{buildroot}%{_libdir}/%{name}.{a,la} %fdupes %{buildroot} -%post -n libzhuyin5 -p /sbin/ldconfig +%post -n libzhuyin6 -p /sbin/ldconfig -%postun -n libzhuyin5 -p /sbin/ldconfig +%postun -n libzhuyin6 -p /sbin/ldconfig -%post tools -update-alternatives \ - --install %{_bindir}/gen_binary_files gen_binary_files %{_bindir}/gen_binary_files-zhuyin 30 \ - --slave %{_bindir}/gen_unigram gen_unigram %{_bindir}/gen_unigram-zhuyin \ - --slave %{_bindir}/import_interpolation import_interpolation %{_bindir}/import_interpolation-zhuyin \ - --slave %{_mandir}/man1/gen_binary_files.1.gz gen_binary_files.1.gz %{_mandir}/man1/gen_binary_files-zhuyin.1.gz \ - --slave %{_mandir}/man1/gen_unigram.1.gz gen_unigram.1.gz %{_mandir}/man1/gen_unigram-zhuyin.1.gz \ - --slave %{_mandir}/man1/import_interpolation.1.gz import_interpolation.1.gz %{_mandir}/man1/import_interpolation-zhuyin.1.gz - -%postun tools -if [ $1 -eq 0 ] ; then - update-alternatives --remove gen_binary_files %{_bindir}/gen_binary_files-zhuyin -fi -%files -n libzhuyin5 +%files -n libzhuyin6 %defattr(-,root,root) %doc AUTHORS ChangeLog README COPYING %dir %{_libdir}/%{name} -%{_libdir}/libzhuyin.so.5 -%{_libdir}/libzhuyin.so.5.0.0 +%{_libdir}/libzhuyin.so.* %{_mandir}/man1/%{name}.1.gz %files data @@ -155,25 +122,5 @@ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%files tools -%defattr(-,root,root) -%{_bindir}/gen_binary_files -%{_bindir}/gen_unigram -%{_bindir}/import_interpolation -%{_bindir}/gen_binary_files-zhuyin -%{_bindir}/gen_unigram-zhuyin -%{_bindir}/import_interpolation-zhuyin -%{_mandir}/man1/gen_binary_files.1.gz -%{_mandir}/man1/gen_unigram.1.gz -%{_mandir}/man1/import_interpolation.1.gz -%{_mandir}/man1/gen_binary_files-zhuyin.1.gz -%{_mandir}/man1/gen_unigram-zhuyin.1.gz -%{_mandir}/man1/import_interpolation-zhuyin.1.gz -%ghost %{_sysconfdir}/alternatives/gen_binary_files -%ghost %{_sysconfdir}/alternatives/gen_unigram -%ghost %{_sysconfdir}/alternatives/import_interpolation -%ghost %{_sysconfdir}/alternatives/gen_binary_files.1.gz -%ghost %{_sysconfdir}/alternatives/gen_unigram.1.gz -%ghost %{_sysconfdir}/alternatives/import_interpolation.1.gz %changelog ++++++ libzhuyin-0.9.99.20140619.tar.gz -> libzhuyin-0.9.99.20140929.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/configure.ac new/libzhuyin-0.9.99.20140929/configure.ac --- old/libzhuyin-0.9.99.20140619/configure.ac 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/configure.ac 2014-09-10 05:24:28.000000000 +0200 @@ -10,7 +10,7 @@ m4_define(libzhuyin_maybe_datestamp, m4_esyscmd([if test x]libzhuyin_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) -m4_define([libzhuyin_abi_current], [5]) +m4_define([libzhuyin_abi_current], [6]) m4_define([libzhuyin_abi_revision], [0]) m4_define([libzhuyin_version], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/data/CMakeLists.txt new/libzhuyin-0.9.99.20140929/data/CMakeLists.txt --- old/libzhuyin-0.9.99.20140619/data/CMakeLists.txt 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/data/CMakeLists.txt 2014-09-10 05:24:28.000000000 +0200 @@ -46,9 +46,9 @@ COMMENT "Downloading textual model data..." COMMAND - wget http://downloads.sourceforge.net/libpinyin/models/model8.text.tar.gz + wget http://downloads.sourceforge.net/libpinyin/models/model9.text.tar.gz COMMAND - tar xvf model8.text.tar.gz -C ${CMAKE_SOURCE_DIR}/data + tar xvf model9.text.tar.gz -C ${CMAKE_SOURCE_DIR}/data ) add_custom_command( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/data/Makefile.am new/libzhuyin-0.9.99.20140929/data/Makefile.am --- old/libzhuyin-0.9.99.20140619/data/Makefile.am 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/data/Makefile.am 2014-09-10 05:24:28.000000000 +0200 @@ -43,11 +43,11 @@ CLEANFILES = $(binary_model_data) interpolation2.text: - wget http://downloads.sourceforge.net/libzhuyin/models/model8.text.tar.gz - tar xvf model8.text.tar.gz -C $(top_srcdir)/data + wget http://downloads.sourceforge.net/libzhuyin/models/model9.text.tar.gz + tar xvf model9.text.tar.gz -C $(top_srcdir)/data -$(tablefiles): interpolation2.text +$(tablefiles) table.conf: interpolation2.text bigram.db: $(textual_model_data) $(RM) $(binary_model_data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/data/table.conf new/libzhuyin-0.9.99.20140929/data/table.conf --- old/libzhuyin-0.9.99.20140619/data/table.conf 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/data/table.conf 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -binary format version:3 -model data version:8 -lambda parameter:0.446223 - -14 NULL NULL network.bin USER_FILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/doc/Makefile.am new/libzhuyin-0.9.99.20140929/doc/Makefile.am --- old/libzhuyin-0.9.99.20140619/doc/Makefile.am 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/doc/Makefile.am 2014-09-10 05:24:28.000000000 +0200 @@ -16,9 +16,6 @@ ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -man_MANS = libzhuyin.1 \ - gen_binary_files.1 \ - import_interpolation.1 \ - gen_unigram.1 +man_MANS = libzhuyin.1 EXTRA_DIST = $(man_MANS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/doc/gen_binary_files.1 new/libzhuyin-0.9.99.20140929/doc/gen_binary_files.1 --- old/libzhuyin-0.9.99.20140619/doc/gen_binary_files.1 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/doc/gen_binary_files.1 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -.so man1/libzhuyin.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/doc/gen_unigram.1 new/libzhuyin-0.9.99.20140929/doc/gen_unigram.1 --- old/libzhuyin-0.9.99.20140619/doc/gen_unigram.1 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/doc/gen_unigram.1 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -.so man1/libzhuyin.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/doc/import_interpolation.1 new/libzhuyin-0.9.99.20140929/doc/import_interpolation.1 --- old/libzhuyin-0.9.99.20140619/doc/import_interpolation.1 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/doc/import_interpolation.1 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -.so man1/libzhuyin.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/doc/libzhuyin.1 new/libzhuyin-0.9.99.20140929/doc/libzhuyin.1 --- old/libzhuyin-0.9.99.20140619/doc/libzhuyin.1 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/doc/libzhuyin.1 2014-09-10 05:24:28.000000000 +0200 @@ -13,10 +13,10 @@ .SH USAGE .HP -gen_binary_files --table-dir <DIRNAME> +gen_binary_files \-\-table\-dir <DIRNAME> .RS .HP -.B --table-dir +.B \-\-table\-dir Read textual format files from the <DIRNAME> directory. .RE .HP @@ -25,12 +25,10 @@ gen_unigram .SH EXAMPLE -Download the model.text.tar.gz, and extracts all files into a folder, then run the commands below to generate the binary model data. +Download the model.text.tar.gz, and extracts all files into the data sub-directory, then run the commands below to generate the binary model data. .RS -rm gb_char.bin gbk_char.bin phrase_index.bin pinyin_index.bin bigram.db - -gen_binary_files --table-dir ../data +gen_binary_files \-\-table\-dir ../data import_interpolation < ../data/interpolation.text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/src/libzhuyin.ver new/libzhuyin-0.9.99.20140929/src/libzhuyin.ver --- old/libzhuyin-0.9.99.20140619/src/libzhuyin.ver 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/src/libzhuyin.ver 2014-09-10 05:24:28.000000000 +0200 @@ -46,6 +46,7 @@ zhuyin_get_zhuyin_key_rest; zhuyin_get_zhuyin_key_rest_positions; zhuyin_get_zhuyin_key_rest_length; + zhuyin_get_zhuyin_key_rest_offset; zhuyin_get_raw_full_pinyin; zhuyin_get_n_phrase; zhuyin_get_phrase_token; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/src/zhuyin.cpp new/libzhuyin-0.9.99.20140929/src/zhuyin.cpp --- old/libzhuyin-0.9.99.20140619/src/zhuyin.cpp 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/src/zhuyin.cpp 2014-09-10 05:24:28.000000000 +0200 @@ -1449,6 +1449,7 @@ bool zhuyin_reset(zhuyin_instance_t * instance){ g_free(instance->m_raw_full_pinyin); instance->m_raw_full_pinyin = NULL; + instance->m_parsed_len = 0; g_array_set_size(instance->m_prefixes, 0); g_array_set_size(instance->m_pinyin_keys, 0); @@ -1629,7 +1630,8 @@ bool zhuyin_get_zhuyin_key_rest(zhuyin_instance_t * instance, guint index, ChewingKeyRest ** key_rest) { - ChewingKeyRestVector & pinyin_key_rests = instance->m_pinyin_key_rests; + ChewingKeyRestVector & pinyin_key_rests = + instance->m_pinyin_key_rests; *key_rest = NULL; @@ -1660,6 +1662,41 @@ return true; } +bool zhuyin_get_zhuyin_key_rest_offset(zhuyin_instance_t * instance, + guint16 cursor, + guint16 * offset) { + assert (cursor <= instance->m_parsed_len); + + *offset = 0; + + guint len = 0; + assert (instance->m_pinyin_keys->len == + instance->m_pinyin_key_rests->len); + len = instance->m_pinyin_key_rests->len; + + ChewingKeyRestVector & pinyin_key_rests = + instance->m_pinyin_key_rests; + + guint inner_cursor = len; + + guint16 prev_end = 0, cur_end; + for (size_t i = 0; i < len; ++i) { + ChewingKeyRest *pos = NULL; + pos = &g_array_index(pinyin_key_rests, ChewingKeyRest, i); + cur_end = pos->m_raw_end; + + if (prev_end <= cursor && cursor < cur_end) + inner_cursor = i; + + prev_end = cur_end; + } + + assert (inner_cursor >= 0); + *offset = inner_cursor; + + return true; +} + bool zhuyin_get_raw_full_pinyin(zhuyin_instance_t * instance, const gchar ** utf8_str) { *utf8_str = instance->m_raw_full_pinyin; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/src/zhuyin.h new/libzhuyin-0.9.99.20140929/src/zhuyin.h --- old/libzhuyin-0.9.99.20140619/src/zhuyin.h 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/src/zhuyin.h 2014-09-10 05:24:28.000000000 +0200 @@ -619,7 +619,7 @@ * @length: the length of the corresponding pinyin key. * @returns: whether the get operation is successful. * - * Get the length of the corresponding pinyin key. + * Get the length of the corresponding zhuyin key. * */ bool zhuyin_get_zhuyin_key_rest_length(zhuyin_instance_t * instance, @@ -627,6 +627,20 @@ guint16 * length); /** + * zhuyin_get_zhuyin_key_rest_offset: + * @instance: the zhuyin instance. + * @cursor: the cursor. + * @offset: the offset in the zhuyin array. + * @returns: whether the get operation is successful. + * + * Get the offset in the zhuyin key array. + * + */ +bool zhuyin_get_zhuyin_key_rest_offset(zhuyin_instance_t * instance, + guint16 cursor, + guint16 * offset); + +/** * zhuyin_get_raw_full_pinyin: * @instance: the zhuyin instance. * @utf8_str: the modified raw full pinyin after choose candidate. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/utils/storage/Makefile.am new/libzhuyin-0.9.99.20140929/utils/storage/Makefile.am --- old/libzhuyin-0.9.99.20140619/utils/storage/Makefile.am 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/utils/storage/Makefile.am 2014-09-10 05:24:28.000000000 +0200 @@ -24,10 +24,9 @@ LDADD = ../../src/libzhuyin_internal.la @GLIB2_LIBS@ -bin_PROGRAMS = gen_binary_files \ - import_interpolation - -noinst_PROGRAMS = export_interpolation \ +noinst_PROGRAMS = gen_binary_files \ + import_interpolation \ + export_interpolation \ gen_zhuyin_table gen_binary_files_SOURCES = gen_binary_files.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzhuyin-0.9.99.20140619/utils/training/Makefile.am new/libzhuyin-0.9.99.20140929/utils/training/Makefile.am --- old/libzhuyin-0.9.99.20140619/utils/training/Makefile.am 2014-04-30 09:06:56.000000000 +0200 +++ new/libzhuyin-0.9.99.20140929/utils/training/Makefile.am 2014-09-10 05:24:28.000000000 +0200 @@ -28,9 +28,8 @@ noinst_HEADERS = k_mixture_model.h -bin_PROGRAMS = gen_unigram - noinst_PROGRAMS = gen_ngram \ + gen_unigram \ gen_deleted_ngram \ gen_k_mixture_model \ estimate_interpolation \ ++++++ libzhuyin-no-download.patch ++++++ --- /var/tmp/diff_new_pack.UZUofA/_old 2014-11-24 11:18:42.000000000 +0100 +++ /var/tmp/diff_new_pack.UZUofA/_new 2014-11-24 11:18:42.000000000 +0100 @@ -1,8 +1,7 @@ -Index: libzhuyin-0.9.94/data/CMakeLists.txt -=================================================================== ---- libzhuyin-0.9.94.orig/data/CMakeLists.txt -+++ libzhuyin-0.9.94/data/CMakeLists.txt -@@ -40,19 +40,6 @@ add_custom_target( +diff -Nur libzhuyin-0.9.99.20140929/data/CMakeLists.txt libzhuyin-0.9.99.20140929-new/data/CMakeLists.txt +--- libzhuyin-0.9.99.20140929/data/CMakeLists.txt 2014-09-10 11:24:28.000000000 +0800 ++++ libzhuyin-0.9.99.20140929-new/data/CMakeLists.txt 2014-11-02 16:41:47.520559990 +0800 +@@ -40,19 +40,6 @@ add_custom_command( OUTPUT @@ -12,9 +11,9 @@ - COMMENT - "Downloading textual model data..." - COMMAND -- wget http://downloads.sourceforge.net/libpinyin/models/model8.text.tar.gz +- wget http://downloads.sourceforge.net/libpinyin/models/model9.text.tar.gz - COMMAND -- tar xvf model8.text.tar.gz -C ${CMAKE_SOURCE_DIR}/data +- tar xvf model9.text.tar.gz -C ${CMAKE_SOURCE_DIR}/data -) - -add_custom_command( @@ -22,19 +21,17 @@ gb_char.bin gbk_char.bin phrase_index.bin -Index: libzhuyin-0.9.94/data/Makefile.am -=================================================================== ---- libzhuyin-0.9.94.orig/data/Makefile.am -+++ libzhuyin-0.9.94/data/Makefile.am -@@ -42,11 +42,6 @@ libzhuyin_dbdir = $(libdir)/libzhuyin/d +diff -Nur libzhuyin-0.9.99.20140929/data/Makefile.am libzhuyin-0.9.99.20140929-new/data/Makefile.am +--- libzhuyin-0.9.99.20140929/data/Makefile.am 2014-09-10 11:24:28.000000000 +0800 ++++ libzhuyin-0.9.99.20140929-new/data/Makefile.am 2014-11-02 16:43:22.870563252 +0800 +@@ -42,10 +42,6 @@ CLEANFILES = $(binary_model_data) -interpolation2.text: -- wget http://downloads.sourceforge.net/libzhuyin/models/model8.text.tar.gz -- tar xvf model8.text.tar.gz -C $(top_srcdir)/data +- wget http://downloads.sourceforge.net/libzhuyin/models/model9.text.tar.gz +- tar xvf model9.text.tar.gz -C $(top_srcdir)/data - -- - $(tablefiles): interpolation2.text - bigram.db: $(textual_model_data) + $(tablefiles) table.conf: interpolation2.text + ++++++ model8.text.tar.gz -> model9.text.tar.gz ++++++ /work/SRC/openSUSE:Factory/libzhuyin/model8.text.tar.gz /work/SRC/openSUSE:Factory/.libzhuyin.new/model9.text.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-ffi for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package rubygem-ffi for openSUSE:Factory checked in at 2014-11-24 11:18:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-ffi (Old) and /work/SRC/openSUSE:Factory/.rubygem-ffi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-ffi" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-ffi/rubygem-ffi.changes 2014-02-12 21:03:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-ffi.new/rubygem-ffi.changes 2014-11-24 11:18:39.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Nov 21 21:44:46 UTC 2014 - opensuse_buildservice(a)ojkastl.de + +- manual dependency libffi-devel and rpmlintrc now in gem2rpm.yml + +------------------------------------------------------------------- +Fri Nov 21 21:18:30 UTC 2014 - opensuse_buildservice(a)ojkastl.de + +- adapted to new packaging scheme, regenerated spec with gem2rpm, readded libffi-devel + +------------------------------------------------------------------- +Fri Nov 21 21:10:45 UTC 2014 - opensuse_buildservice(a)ojkastl.de + +- update to version 1.9.6 + +------------------------------------------------------------------- +Tue Jul 22 08:52:18 UTC 2014 - dmacvicar(a)suse.de + +- remove rdoc buildrequires to build with older + rubies including rdoc. It is still pulled otherwise + +------------------------------------------------------------------- Old: ---- ffi-1.9.3.gem New: ---- ffi-1.9.6.gem gem2rpm.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-ffi.spec ++++++ --- /var/tmp/diff_new_pack.zpMY0S/_old 2014-11-24 11:18:40.000000000 +0100 +++ /var/tmp/diff_new_pack.zpMY0S/_new 2014-11-24 11:18:40.000000000 +0100 @@ -16,76 +16,47 @@ # +# +# This file was generated with a gem2rpm.yml and not just plain gem2rpm. +# All sections marked as MANUAL, license headers, summaries and descriptions +# can be maintained in that file. Please consult this file before editing any +# of those fields +# + Name: rubygem-ffi -Version: 1.9.3 +Version: 1.9.6 Release: 0 %define mod_name ffi %define mod_full_name %{mod_name}-%{version} - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ruby-macros >= 3 -Requires: ruby >= 1.8.7 -BuildRequires: ruby >= 1.8.7 -BuildRequires: ruby-devel -BuildRequires: rubygem(rdoc) > 3.10 # MANUAL BuildRequires: libffi-devel +# /MANUAL +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: %{rubydevel >= 1.8.7} +BuildRequires: %{rubygem gem2rpm} +BuildRequires: %{rubygem rdoc > 3.10} +BuildRequires: ruby-macros >= 5 Url: http://wiki.github.com/ffi/ffi Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source1: rubygem-ffi-rpmlintrc +Source2: gem2rpm.yml Summary: Ruby FFI License: BSD-3-Clause Group: Development/Languages/Ruby %description -Ruby FFI library - -%package doc -Summary: RDoc documentation for %{mod_name} -Group: Development/Languages/Ruby -Requires: %{name} = %{version} - -%description doc -Documentation generated at gem installation time. -Usually in RDoc and RI formats. - -%package testsuite -Summary: Test suite for %{mod_name} -Group: Development/Languages/Ruby -Requires: %{name} = %{version} - -%description testsuite -Test::Unit or RSpec files, useful for developers. +Ruby FFI library. %prep -#gem_unpack -#if you need patches, apply them here and replace the # with a % sign in the surrounding lines -#gem_build %build %install -%gem_install -f +%gem_install \ + --doc-files="COPYING LICENSE README.md" \ + -f %gem_cleanup -mkdir -p %{buildroot}%{_docdir}/%{name} -ln -s %{gem_base}/gems/%{mod_full_name}/LICENSE %buildroot/%{_docdir}/%{name}/LICENSE -ln -s %{gem_base}/gems/%{mod_full_name}/COPYING %buildroot/%{_docdir}/%{name}/COPYING -ln -s %{gem_base}/gems/%{mod_full_name}/README.md %buildroot/%{_docdir}/%{name}/README.md - -%files -%defattr(-,root,root,-) -%{_docdir}/%{name} -%{gem_base}/cache/%{mod_full_name}.gem -%{gem_base}/gems/%{mod_full_name}/ -%{gem_extensions}/%{mod_full_name} -%exclude %{gem_base}/gems/%{mod_full_name}/spec -%{gem_base}/specifications/%{mod_full_name}.gemspec - -%files doc -%defattr(-,root,root,-) -%doc %{gem_base}/doc - -%files testsuite -%defattr(-,root,root,-) -%{gem_base}/gems/%{mod_full_name}/spec + +%gem_packages %changelog ++++++ ffi-1.9.3.gem -> ffi-1.9.6.gem ++++++ ++++ 7189 lines of diff (skipped) ++++++ gem2rpm.yml ++++++ # --- # ## used by gem2rpm # :summary: this is a custom summary # ## used by gem2rpm # :description: |- # this is a custom description # # it can be multiline # ## used by gem2rpm :license: BSD-3-Clause # ## used by gem2rpm and gem_packages # :version_suffix: -x_y # ## used by gem2rpm and gem_packages # :disable_docs: true # ## used by gem2rpm # :disable_automatic_rdoc_dep: true # ## used by gem2rpm :preamble: |- BuildRequires: libffi-devel # Requires: foobar # ## used by gem2rpm # :patches: # foo.patch: -p1 # bar.patch: # ## used by gem2rpm :sources: - rubygem-ffi-rpmlintrc # - bar.desktop # :gem_install_args: '....' # ## used by gem2rpm # :pre_install: |- # %if 0%{?use_system_libev} # export USE_VENDORED_LIBEV="no" # %endif # ## used by gem2rpm # :post_install: |- # # delete custom files here or do other fancy stuff # install -D -m 0644 %{S:1} %{buildroot}%{_bindir}/gem2rpm-opensuse # ## used by gem2rpm # :testsuite_command: |- # (pushd %{buildroot}%{gem_base}/gems/%{mod_full_name} && rake test) # ## used by gem2rpm # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem2rpm # :scripts: # :post: |- # /bin/echo foo # ## used by gem_packages # :main: # :preamble: |- # Requires: util-linux # Recommends: pwgen # :filelist: |- # /usr/bin/gem2rpm-opensuse # ## used by gem_packages # :custom: # apache: # :preamble: |- # Requires: ..... # :filelist: |- # /etc/apache2/conf.d/passenger.conf # :summary: Custom summary is optional # :description: |- # Custom description is optional # # bar # :post: |- # /bin/echo foo # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit git for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2014-11-24 11:18:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2014-11-03 13:11:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2014-11-24 11:18:37.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 18 12:08:41 UTC 2014 - novell(a)mirell.de + +- Add git-credential-gnome-keyring subpackage for GNOME keyring + credential storage support + +------------------------------------------------------------------- +Mon Nov 17 11:12:39 UTC 2014 - bwiedemann(a)suse.com + +- Allow snapshot generation in apparmor profile (bnc#905707) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.xTcKXT/_old 2014-11-24 11:18:38.000000000 +0100 +++ /var/tmp/diff_new_pack.xTcKXT/_new 2014-11-24 11:18:38.000000000 +0100 @@ -19,6 +19,12 @@ %define gitexecdir %_libexecdir/git %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services +%if 0%{?suse_version} >= 1210 +%bcond_without git_gnome_keyring +%else +%bcond_with git_gnome_keyring +%endif + Name: git Version: 2.1.3 Release: 0 @@ -50,6 +56,9 @@ BuildRequires: fdupes BuildRequires: libcurl-devel BuildRequires: libexpat-devel +%if %{with git_gnome_keyring} +BuildRequires: libgnome-keyring-devel +%endif BuildRequires: libopenssl-devel BuildRequires: pcre-devel BuildRequires: perl-Error @@ -128,6 +137,17 @@ %description cvs Tools for importing CVS repositories to the Git version control system. +%if %{with git_gnome_keyring} +%package credential-gnome-keyring +Summary: Git credential backend using the GNOME keyring as storage +Group: Development/Tools/Version Control +Requires: git-core = %{version} +Requires: gnome-keyring + +%description credential-gnome-keyring +A Git credential backend which uses the GNOME keyring as storage. +%endif + %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools/Version Control @@ -233,6 +253,9 @@ ./.make all %{?_smp_mflags} %{!?_without_docs: ./.make doc} +%if %{with git_gnome_keyring} +./.make -C contrib/credential/gnome-keyring +%endif ./.make -C contrib/subtree/ %install @@ -272,6 +295,10 @@ find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh install -m 644 -D contrib/completion/git-prompt.sh $RPM_BUILD_ROOT/etc/bash_completion.d/git-prompt.sh +# contrib/credential +%if %{with git_gnome_keyring} +install -m 755 -D contrib/credential/gnome-keyring/git-credential-gnome-keyring $RPM_BUILD_ROOT/%{gitexecdir}/git-credential-gnome-keyring +%endif # process tcsh completion (cd contrib/completion mkdir -p $RPM_BUILD_ROOT/usr/share/tcsh @@ -348,6 +375,12 @@ %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } +%if %{with git_gnome_keyring} +%files credential-gnome-keyring +%defattr(-,root,root) +%{gitexecdir}/git-credential-gnome-keyring +%endif + %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt ++++++ usr.share.git-web.gitweb.cgi ++++++ --- /var/tmp/diff_new_pack.xTcKXT/_old 2014-11-24 11:18:38.000000000 +0100 +++ /var/tmp/diff_new_pack.xTcKXT/_new 2014-11-24 11:18:38.000000000 +0100 @@ -8,6 +8,10 @@ #include <abstractions/perl> /bin/bash rix, + /bin/tar rix, + /usr/bin/gzip rix, + /usr/bin/bzip2 rix, + /usr/bin/zip rix, /dev/tty rw, /etc/gitweb.conf r, /etc/mime.types r, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaThunderbird for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2014-11-24 11:18:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2014-11-07 09:05:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2014-11-24 11:18:34.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 16 21:22:00 UTC 2014 - Led <ledest(a)gmail.com> + +- fix bashism in mozilla.sh script + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla.sh.in ++++++ --- /var/tmp/diff_new_pack.Mfqpa0/_old 2014-11-24 11:18:37.000000000 +0100 +++ /var/tmp/diff_new_pack.Mfqpa0/_new 2014-11-24 11:18:37.000000000 +0100 @@ -131,7 +131,8 @@ if [ $moz_debug -eq 1 ]; then tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; } trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 - echo -e "set args ${1+"$@"}\nrun" > $tmpfile + echo "set args ${1+"$@"}" > $tmpfile + echo "run" >> $tmpfile echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile" exec $moz_debugger "$MOZ_PROGRAM" -x $tmpfile else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit netpbm for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checked in at 2014-11-24 11:18:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netpbm (Old) and /work/SRC/openSUSE:Factory/.netpbm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netpbm" Changes: -------- --- /work/SRC/openSUSE:Factory/netpbm/netpbm.changes 2014-09-10 07:27:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.netpbm.new/netpbm.changes 2014-11-24 11:18:28.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Nov 19 09:11:12 UTC 2014 - pgajdos(a)suse.com + +- updated to 10.68.1 + * pnmconvol: add -bias . + * Remove pnmcomp, install a pnmcomp symlink for pamcomp. + * Fix incorrect option parsing when there are multiple common + options (e.g. -plain -quiet). + * cameratopam: fix buffer overflow. + * cameratopam: fix incorrect output. + * ppmtopict: Fix unconditional crash. + +------------------------------------------------------------------- Old: ---- netpbm-10.67.4-documentation.tar.bz2 netpbm-10.67.4-nohpcdtoppm-noppmtompeg.tar.bz2 New: ---- netpbm-10.68.1-documentation.tar.bz2 netpbm-10.68.1-nohpcdtoppm-noppmtompeg.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.dn7l0G/_old 2014-11-24 11:18:32.000000000 +0100 +++ /var/tmp/diff_new_pack.dn7l0G/_new 2014-11-24 11:18:32.000000000 +0100 @@ -17,11 +17,11 @@ %define libmaj 11 -%define libmin 67 +%define libmin 68 %define libver %{libmaj}.%{libmin} Name: netpbm -Version: 10.67.4 +Version: 10.68.1 Release: 0 Summary: A Powerful Graphics Conversion Package License: BSD-3-Clause and GPL-2.0+ and IJG and MIT and SUSE-Public-Domain ++++++ netpbm-10.67.4-documentation.tar.bz2 -> netpbm-10.68.1-documentation.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/anytopnm.html new/netpbm.sourceforge.net/doc/anytopnm.html --- old/netpbm.sourceforge.net/doc/anytopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/anytopnm.html 2014-11-15 04:18:45.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Anytopnm User Manual</TITLE></HEAD> <BODY> <H1>anytopnm</H1> -Updated: 05 September 2006 +Updated: 15 November 2014 <A HREF="#index">Table Of Contents</A> @@ -13,6 +13,7 @@ anytopnm [file] + <H2 id="description">DESCRIPTION</H2> This program is part of <a href="index.html">Netpbm</a>. @@ -53,6 +54,16 @@ If file is - or not given, anytopnm takes its input from Standard Input. +Many image formats are capable of representing multiple images. In +most cases, anytopnm converts these to multi-image Netpbm images, +but for some formats, anytopnm converts only the first image and +ignores the rest. + +In the case of a multi-image GIF input, anytopnm converts all the +images starting with Netpbm 10.69 (December 2014), but only the first in +earlier releases. + + <H2 id="seealso">SEE ALSO</H2> <A HREF="pamfile.html">pamfile</A>, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/avstopam.html new/netpbm.sourceforge.net/doc/avstopam.html --- old/netpbm.sourceforge.net/doc/avstopam.html 2013-02-20 04:30:32.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/avstopam.html 2014-09-10 18:49:39.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <title>Avstopam User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/extendedopacity.html new/netpbm.sourceforge.net/doc/extendedopacity.html --- old/netpbm.sourceforge.net/doc/extendedopacity.html 2013-02-20 04:30:32.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/extendedopacity.html 2014-09-10 18:45:15.000000000 +0200 @@ -154,9 +154,9 @@ P. Haeberli and D. Voorhies. <cite>Image Processing by Linear Interpolation and Extrapolation</cite>. IRIS Universe Magazine No. 28, Silicon Graphics, Aug, 1994. - -<a href=../index.html#interp> -<img src=gobot.gif alt="" width=564 height=25 border=0></a> - + + +<img src=gobot.gif alt="" width=564 height=25 border=0> + </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/giftopnm.html new/netpbm.sourceforge.net/doc/giftopnm.html --- old/netpbm.sourceforge.net/doc/giftopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/giftopnm.html 2014-11-15 04:42:13.000000000 +0100 @@ -53,18 +53,19 @@ <DT>--alphaout=alpha-filename <DD>giftopnm creates a PBM file containing the transparency -information from the input image. This "alpha image" is the same -dimensions as the input image, and each pixel of the alpha image tells whether -the corresponding pixel of the input image is transparent. Black means -transparent; white means opaque. If you don't specify --alphaout, -giftopnm does not generate an alpha file, and if the input image has an -alpha channel, giftopnm simply discards it. +information from the input image. This transparency image is the same +dimensions as the input image, and each pixel of the transparency image tells +whether the corresponding pixel of the input image is transparent. Black +means transparent; white means opaque. If you don't +specify --alphaout, giftopnm does not generate a transparency +file, and if the input image has a transparency channel, giftopnm simply +discards it. If you specify - as the filename, giftopnm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. See <A HREF="pamcomp.html">pamcomp</A> for one way to use -the alpha output file. +the transparency output file. <DT>-verbose diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ilbmtoppm.html new/netpbm.sourceforge.net/doc/ilbmtoppm.html --- old/netpbm.sourceforge.net/doc/ilbmtoppm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ilbmtoppm.html 2014-11-12 04:54:39.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Ilbmtoppm User Manual</TITLE></HEAD> <BODY> <H1>ilbmtoppm</H1> -Updated: 04 October 1993 +Updated: 12 November 2014 <A HREF="#index">Table Of Contents</A> @@ -26,6 +26,7 @@ [-verbose] [ILBMfile] + <H2 id="description">DESCRIPTION</H2> This program is part of <a href="index.html">Netpbm</a>. @@ -55,6 +56,13 @@ <DL COMPACT> +<dt>-transparent color +<dd>This is the color that should "show through" in places where +the image is transparent. + +color is like the <a href="libppm.html#colorname">argument of +the ppm_parsecolor() library routine</a>. + <DT>-verbose <DD>Give some information about the ILBM file. @@ -70,6 +78,16 @@ these flags are not set in the CAMG chunk (or if there is no CAMG chunk). +<dt>-maskfile filename + +<dd>This names a file for ilbmtoppm to create with the image's +transparency mask. The mask file is a PBM image which maps to the input image +with white pixels representing transparent pixels in the image and black +pixels representing opaque pixels. + +If you don't specfy this, or the image does not contain transparency +information, ilbmtoppm does not create a mask file. + <dt>-cmaponly <dd>With this option, ilbmtoppm generates a PPM of the ILBM's color @@ -79,7 +97,6 @@ ILBM is a pure color map stream (it has a bitmap header with an nplanes value of zero or has no BODY chunk. - <DT>-adjustcolors <DD>If all colors in the CMAP have a value of less then 16, ilbmtoppm @@ -88,6 +105,7 @@ </DL> + <H2 id="limitations">LIMITATIONS</H2> The multipalette PCHG BigLineChanges and Huffman decompression code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/palmtopnm.html new/netpbm.sourceforge.net/doc/palmtopnm.html --- old/netpbm.sourceforge.net/doc/palmtopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/palmtopnm.html 2014-11-15 04:41:10.000000000 +0100 @@ -104,7 +104,7 @@ <H2 id="limitations">LIMITATIONS</H2> -You cannot generate an alpha mask if the Palm Bitmap has a +You cannot generate a transparency mask if the Palm Bitmap has a transparent color. However, you can still do this with ppmcolormask with a Netpbm pipe similar to: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pam.html new/netpbm.sourceforge.net/doc/pam.html --- old/netpbm.sourceforge.net/doc/pam.html 2013-11-28 00:17:59.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pam.html 2014-11-15 04:41:04.000000000 +0100 @@ -249,7 +249,7 @@ contains transparency information. In that variation, the tuple type has "_ALPHA" added to it (e.g. "RGB_ALPHA") and one more plane. The highest numbered plane is the opacity plane (sometimes -called an alpha plane or transparency plane). +called an transparency plane or transparency plane). In this kind of image, the color represented by a pixel is actually a combination of an explicitly specified foreground color and a background diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pambackground.html new/netpbm.sourceforge.net/doc/pambackground.html --- old/netpbm.sourceforge.net/doc/pambackground.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pambackground.html 2014-11-09 19:02:50.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pambackground User Manual</TITLE></HEAD> <BODY> <H1>pambackground</H1> -Updated: 31 December 2006 +Updated: 09 November 2014 <A HREF="#index">Table Of Contents</A> @@ -28,19 +28,18 @@ This program is part of <a href="index.html">Netpbm</a>. -pambackground reads a PNM or PAM image as input. -It generates as output a PAM image that identifies the background area -of the image (a mask). - -To identify the background, pambackground assumes the image -is a foreground image, smaller than the total image size, placed over -a single-color background. It assumes that foreground image is solid --- it does not have holes through which the background can be seen. -So in specific, pambackground first identifies the background -color, then finds all contiguous pixels of that color in regions -touching any edge of the image. Think of it as starting at each of -the four edges and moving inward as far as possible until it hits -pixels of another color (the foreground image). +pambackground reads a PNM or PAM image as input. It generates as +output a PAM image that identifies the background area of the image (a mask). + +To identify the background, pambackground assumes the image is a +foreground image, smaller than the total image size, placed over a +single-color background. It assumes that foreground image is solid -- it does +not have holes through which the background can be seen. So in +specific, pambackground first identifies the background color, then +finds all contiguous pixels of that color in regions touching any edge of the +image. Think of it as starting at each of the four edges and moving inward +and spreading out as far as possible until it hits pixels of another color +(the foreground image). pambackground identifies the background color as follows: If any 3 corners of the image are the same color, that's the background @@ -60,11 +59,19 @@ 20% of "SkyBlue" to SkyBlue, then run pambackground on it. -In Release 10.37, pambackground does not really -do what is promised above. It can't see places where the background -appears in the middle of a row (think of the sky between two buildings). -From Release 10.38 forward, it snakes through whatever passages it has to -to find all the background. +A more convenient means of dealing with a multi-shade background is +to use pnmquant to produce a version of the image with a very small +number of colors. The background would likely then be all one color. + +If the pnmquant and ppmchange methods above do not +adequately distinguish foreground colors from background colors, you can +try a more elaborate method using pnmremap. +If you can manually create a palette with +one color to which all the background pixels are similar, and other colors +to which the foreground pixels are similar, you can use it as input to +pnmremap to create a smarter version of what you get with the +pnmquant or ppmchange methods, so that pambackground is +more likely to separate background from foreground as your eye does. The PAM that pambackground creates has a single plane, with a maxval of 1. The sample value 1 means background; 0 means @@ -81,12 +88,12 @@ could replace the entire background (or foreground) of your image with something else. -Another common use is to make an image with the background -transparent (in some image format that has a concept of transparency; -not Netpbm formats) so that image can be overlaid onto another image -later. Netpbm's converters to image formats that have transparency -(e.g. PNG) let you use the mask that pambackground generates -to identify the transparent areas for the output. +Another common use is to make an image with the background transparent (in +some image format that has a concept of transparency) so that image can be +overlaid onto another image later. Netpbm's converters to image formats that +have transparency (e.g. PNG) let you use the mask that pambackground +generates to identify the transparent areas for the output. You can create +a PAM image with transparency with pamstack. To simply make a mask of all the areas of a specified color, use ppmcolormask. If you have a unique background color (one that @@ -94,6 +101,7 @@ a background mask in cases that pambackground cannot: where there are see-through holes in the foreground image. + <H2 id="options">OPTIONS</H2> <dl> @@ -104,12 +112,33 @@ </dl> +<h2 id="examples">EXAMPLES</h2> + + +<pre> +<kbd> + $ pambackground test.ppm | pnminvert >/tmp/bgmask.pgm + $ pamcomp -alpha=bgmask.pgm test.ppm wallpaper.ppm >output.ppm +</kbd> +</pre> + +<pre> +<kbd> + $ pnmquant 5 test.pgm | pambackground test.ppm >/tmp/bgmask.pam +</kbd> +</pre> + + <H2 id="seealso">SEE ALSO</H2> <A HREF="ppmcolormask.html">ppmcolormask</A>, <A HREF="pamcomp.html">pamcomp</A>, +<A HREF="ppmchange.html">ppmchange</A>, +<A HREF="pnmquant.html">pnmquant</A>, +<A HREF="pnmremap.html">pnmremap</A>, <A HREF="pamtopnm.html">pamtopnm</A>, <A HREF="pgmtopgm.html">pgmtopgm</A>, +<A HREF="pamstack.html">pamstack</A>, <A HREF="pnm.html">pnm</A>, <A HREF="pam.html">pam</A>, @@ -123,6 +152,7 @@ <LI><A HREF="#synopsis">SYNOPSIS</A> <LI><A HREF="#description">DESCRIPTION</A> <LI><A HREF="#options">OPTIONS</A> +<LI><A HREF="#examples">OPTIONS</A> <LI><A HREF="#seealso">SEE ALSO</A> </UL> </BODY> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamcomp.html new/netpbm.sourceforge.net/doc/pamcomp.html --- old/netpbm.sourceforge.net/doc/pamcomp.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamcomp.html 2014-11-15 04:40:49.000000000 +0100 @@ -51,21 +51,21 @@ beneath it. If you add the -alpha option, then pamcomp uses the -image in file alpha-pgmfile as an alpha mask, which means it +image in file alpha-pgmfile as a transparency mask, which means it determines the level of transparency of each point in the overlay -image. The alpha mask must have the same dimensions as the overlay -image. In places where the alpha mask defines the overlay image to be +image. The transparency mask must have the same dimensions as the overlay +image. In places where the transparency mask defines the overlay image to be opaque, the composite output contains only the contents of the overlay image; the underlying image is totally blocked out. In places where -the alpha mask defines the overlay image to be transparent, the +the transparency mask defines the overlay image to be transparent, the composite output contains none of the overlay image; the underlying -image shows through completely. In places where the alpha mask shows +image shows through completely. In places where the transparency mask shows a value in between opaque and transparent (translucence), the composite image contains a mixture of the overlay image and the underlying image and the level of translucence determines how much of each. -The alpha mask is a PGM file in which a white pixel represents +The transparency mask is a PGM file in which a white pixel represents opaqueness and a black pixel transparency. Anything in between is translucent. (Like any Netpbm program, pamcomp will see a PBM file as if it is PGM). @@ -73,17 +73,17 @@ If the overlay image is a PAM image of tuple type RGB_ALPHA or GRAYSCALE_ALPHA, then the overlay image contains transparency information itself and pamcomp uses it the same way as the -alpha mask described above. If you supply both an overlay image that -has transparency information and an alpha mask, pamcomp +transparency mask described above. If you supply both an overlay image that +has transparency information and a transparency mask, pamcomp multiplies the two opacities to get the opacity of the overlay pixel. Before Netpbm 10.25 (October 2004), pamcomp did not recognize the transparency information in a PAM image -- it just ignored it. So people had -to make appropriate alpha masks in order to have a non-opaque overlay. Some +to make appropriate transparency masks in order to have a non-opaque overlay. Some Netpbm programs that convert from image formats that contain transparency information are not able to create RGB_ALPHA or GRAYSCALE_ALPHA PAM output, so you have to use the old method -- extract the transparency information from -the original into a separate alpha mask and use that as input to +the original into a separate transparency mask and use that as input to pamcomp. The output image is always of the same dimensions as the underlying @@ -187,17 +187,17 @@ <DT>-alpha=alpha-pgmfile <DD> -This option names a file that contains the alpha mask. If you don't -specify this option, there is no alpha mask, which is equivalent to -having an alpha mask specify total opaqueness everywhere. +This option names a file that contains the transparency mask. If you don't +specify this option, there is no transparency mask, which is equivalent to +having a transparency mask specify total opaqueness everywhere. -You can specify - as the value of this option and the alpha +You can specify - as the value of this option and the transparency mask will come from Standard Input. If you do this, don't specify Standard Input as the source of any other input image. <DT>-invert <DD> -This option inverts the sense of the values in the alpha mask, which +This option inverts the sense of the values in the transparency mask, which effectively switches the roles of the overlay image and the underlying image in places where the two intersect. @@ -209,8 +209,8 @@ 1.0 meaning the overlay image is totally opaque and 0.0 meaning it is totally transparent. The default is 1.0. -If you specify an alpha mask (the -alpha option), -pamcomp uses the product of the opacity indicated by the alpha +If you specify a transparency mask (the -alpha option), +pamcomp uses the product of the opacity indicated by the transparency mask (as modified by the -invert option, as a fraction, and this opacity value. The -invert option does not apply to this opacity value. @@ -261,10 +261,10 @@ <dd>This option indicates that the inputs are not true Netpbm images but rather a non-gamma-adjusted variation. This is relevant only when -you mix pixels, using the -opacity option or an alpha mask +you mix pixels, using the -opacity option or a transparency mask (the -alpha option). -The alpha mask and -opacity values indicate a fraction of +The transparency mask and -opacity values indicate a fraction of the light intensity of a pixel. But the PNM and PNM-equivalent PAM image formats represent intensities with gamma-adjusted numbers that are not linearly proportional to intensity. So pamcomp, by @@ -310,7 +310,7 @@ <A HREF="ppmcolormask.html">ppmcolormask</A> and <A HREF="pbmmask.html">pbmmask</A>, and <a href="pambackground.html">pambackground</a> can help with -generating an alpha mask. +generating a transparency mask. <A HREF="pnmcomp.html">pnmcomp</A> is an older program that runs faster, but has less function. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamcrater.html new/netpbm.sourceforge.net/doc/pamcrater.html --- old/netpbm.sourceforge.net/doc/pamcrater.html 2014-09-04 04:32:25.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pamcrater.html 2014-11-03 18:16:11.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pamcrater User Manual</TITLE></HEAD> <BODY> <H1>pamcrater</H1> -Updated: 04 September 2014 +Updated: 03 November 2014 <A HREF="#index">Table Of Contents</A> @@ -37,9 +37,9 @@ This program is part of <a href="index.html">Netpbm</a>. -pamcrater creates a PAM image which is a terrain map of cratered -terrain. The terrain is as if a given number of impacts into a surface create -craters with random position and size. +pamcrater creates a PAM image which is a terrain map (not a visual +image) of cratered terrain. The terrain is as if a given number of impacts +into a surface create craters with random position and size. The size distribution of the craters is based on a power law which results in many more small craters than large ones. The number of craters of a given @@ -74,6 +74,8 @@ Larger craters should really use this profile, including the central peak, and totally obliterate the pre-existing terrain. +The maxval of the PAM image is always 65535. + The randomness in the image is limited before Netpbm 10.37 (December 2006) -- if you run the program twice in the same second, you may get identical output. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pammosaicknit.html new/netpbm.sourceforge.net/doc/pammosaicknit.html --- old/netpbm.sourceforge.net/doc/pammosaicknit.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pammosaicknit.html 2014-09-10 21:39:22.000000000 +0200 @@ -1,5 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Pammosaicknit User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pampaintspill.html new/netpbm.sourceforge.net/doc/pampaintspill.html --- old/netpbm.sourceforge.net/doc/pampaintspill.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pampaintspill.html 2014-09-10 18:46:46.000000000 +0200 @@ -121,10 +121,8 @@ <h2 id="copyright">COPYRIGHT</h2> -Copyright © 2010 Scott Pakin, <a href= -"mailto:scott+pbm@pakin.org">scott+pbm(a)pakin.org</a>. - -<hr /> +Copyright © 2010 Scott Pakin, +<a href="mailto:scott+pbm@pakin.org">scott+pbm(a)pakin.org</a>. <h2 id="index">Table Of Contents</h2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamrgbatopng.html new/netpbm.sourceforge.net/doc/pamrgbatopng.html --- old/netpbm.sourceforge.net/doc/pamrgbatopng.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamrgbatopng.html 2014-11-15 04:25:35.000000000 +0100 @@ -27,7 +27,7 @@ tuple type (a color visual image with transparency) and produces an equivalent PNG image as output. -The input image if from the file named by the pamfile argument, +The input image is from the file named by the pamfile argument, or Standard Input if you don't specify pamfile. The output goes to Standard Output. @@ -41,7 +41,7 @@ it considerably less convenient to use. (But note that pnmtopng takes PAM images, even with RGB_ALPHA -tuple type just fine -- it just ignores the alpha plane). +tuple type just fine -- it just ignores the transparency plane). Netpbm's strategic direction is to add to pnmtopng all the capabilities of pamrgbatopng and retire pamrgbatopng. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamthreshold.html new/netpbm.sourceforge.net/doc/pamthreshold.html --- old/netpbm.sourceforge.net/doc/pamthreshold.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamthreshold.html 2014-11-15 04:39:04.000000000 +0100 @@ -37,12 +37,12 @@ The input should be a PGM image or a PAM image of tuple type GRAYSCALE or GRAYSCALE_ALPHA. However, pamthreshold doesn't check; it just thresholds the first channel as if it were grayscale samples and -if there is a second channel, processes it as if it is an alpha -(transparency) channel. So if you feed it e.g. a PPM image, it will +if there is a second channel, processes it as if it is a transparency +(alpha) channel. So if you feed it e.g. a PPM image, it will work but produce probably useless results. The output is a PAM with tuple type BLACKANDWHITE or -BLACKANDWHITE_ALPHA, depending on whether the input has an alpha +BLACKANDWHITE_ALPHA, depending on whether the input has a transparency channel. You can turn this into a PBM (if you need to use it with an older program that doesn't understand PAM, or you can't afford the 8X amount of space that PAM uses for the image) with @@ -50,14 +50,14 @@ The output is to Standard Output. -When the input has an alpha channel, pamthreshold includes -an alpha channel in the output. Since the output has maxval 1, the -alpha channel can indicate only fully transparent or fully opaque. +When the input has a transparency channel, pamthreshold includes +a transparency channel in the output. Since the output has maxval 1, the +transparency channel can indicate only fully transparent or fully opaque. pamthreshold make it fully transparent where the input is more than half transparent and fully opaque where it isn't. -The alpha function was new in Netpbm 10.43 (June 2008). Before -that, pamthreshold ignores any alpha channel in the input. +The transparency function was new in Netpbm 10.43 (June 2008). Before +that, pamthreshold ignores any transparency channel in the input. Another way to convert a grayscale image to black and white is to dither. Dithering is using clustered black and white pixels such that diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtoavs.html new/netpbm.sourceforge.net/doc/pamtoavs.html --- old/netpbm.sourceforge.net/doc/pamtoavs.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtoavs.html 2014-09-10 18:49:35.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <title>Pamtoavs User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtogif.html new/netpbm.sourceforge.net/doc/pamtogif.html --- old/netpbm.sourceforge.net/doc/pamtogif.html 2013-12-08 00:58:33.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtogif.html 2014-11-15 04:38:27.000000000 +0100 @@ -64,7 +64,9 @@ The GIF format is not capable of representing an image with more than 256 colors in it (it contains a color map with a maximum size of 256). If the image you want to convert has more colors than that (ppmhist -can tell you), you can use pnmquant to reduce it to 256. +can tell you), you can use pnmquant to reduce it to 256. Or +use the more complex but faster method described under the -mapfile +option. If your input image is a PAM with transparency information, ppmtogif uses one entry in the GIF colormap specifically for the transparent pixels, @@ -121,10 +123,29 @@ The map file's depth must match the number of color components in the input (which is not necessarily the same as the input's depth -- -the input might have an alpha plane in addition). If your map file +the input might have a transparency plane in addition). If your map file does not, or it might not, run your input through pnmremap using the same map file so that it does. +You can use -mapfile to speed up conversion of an image where you +already have a map file because of earlier processing of your image. For +example, it is common to start with an image that has more than 256 colors +and remap its colors to a set of 256 colors so that pamgtogif can +convert it (a GIF can have only 256 colors; pamtogif without +-mapfile fails on any image that has more than that) with +pnmquant. When you do this, pnmquant generates a palette to do +the color quantization, then pamtogif generates an identical palette +from the quantized image. You can save computation by generating the palette +once: + +<pre> +<kbd> + $ pnmcolormap 256 myimage.ppm >/tmp/colormap.ppm + $ pamtogif myimage.ppm -mapfile=/tmp/colormap.ppm >output.gif +</kbd> +</pre> + + <DT>-transparent=color <DD> @@ -161,9 +182,9 @@ a transparency (alpha) plane, so one used this option to supply a transparency plane as a separate PGM file. - This option names a PGM file that contains an alpha mask for the + This option names a PGM file that contains a transparency mask for the image. pamtogif creates fully transparent pixels wherever the -alpha mask indicates transparency greater than 50%. The color of +transparency mask indicates transparency greater than 50%. The color of those pixels is that specified by the -alphacolor option, or black by default. @@ -172,7 +193,7 @@ marks that colormap entry as transparent and uses that colormap index in the output image to create a transparent pixel. - The alpha image must be the same dimensions as the input + The transparency image must be the same dimensions as the input image, but may have any maxval. White means opaque and black means transparent. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtooctaveimg.html new/netpbm.sourceforge.net/doc/pamtooctaveimg.html --- old/netpbm.sourceforge.net/doc/pamtooctaveimg.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtooctaveimg.html 2014-09-10 18:49:28.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <title>Pamtooctaveimg User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtosrf.html new/netpbm.sourceforge.net/doc/pamtosrf.html --- old/netpbm.sourceforge.net/doc/pamtosrf.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtosrf.html 2014-09-10 18:49:23.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <title>Pamtosrf User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtotga.html new/netpbm.sourceforge.net/doc/pamtotga.html --- old/netpbm.sourceforge.net/doc/pamtotga.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtotga.html 2014-11-15 04:37:55.000000000 +0100 @@ -32,9 +32,9 @@ produces a TrueVision Targa file as output. The PAM image may be either a BLACKANDWHITE, GRAYSCALE, RGB, or RGB_ALPHA image. -To create a TGA image with transparency (i.e. with an alpha mask), +To create a TGA image with transparency (i.e. with a transparency mask), use RGB_ALPHA PAM input. Some Netpbm programs that generate images with -alpha masks generate them in that format. For another way to create +transparency masks generate them in that format. For another way to create the proper input stream, see <a href="pamstack.html">pamstack</a>. It is unclear that anything except pamtotga knows about TGAs @@ -102,11 +102,11 @@ That was always a misnomer, though, because a PPM class program would not be able to tell the difference between PGM and PPM input (it would all look like PPM), and thus could not choose the output Targa image type based on the type -of the input. Netpbm 10.6 also added the ability to handle an alpha channel, -so it became a PAM class program. +of the input. Netpbm 10.6 also added the ability to handle a transparency +channel, so it became a PAM class program. In Netpbm 10.15 (April 2003), the program became the first in the -Netpbm package to recognize an alpha channel in a PAM. It recognized +Netpbm package to recognize a transparency channel in a PAM. It recognized tuple type "RGBA". But when this kind of PAM image was later added to the PAM specification, it was specified with tuple type "RGB_ALPHA". So in Netpbm 10-26 (January 2005), pamtotga diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtouil.html new/netpbm.sourceforge.net/doc/pamtouil.html --- old/netpbm.sourceforge.net/doc/pamtouil.html 2013-05-29 03:34:18.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pamtouil.html 2014-11-15 04:37:22.000000000 +0100 @@ -8,7 +8,7 @@ <A NAME="lbAB"> </A> <H2>NAME</H2> -pamtouil - convert a PNM or PNM/alpha image into a Motif UIL icon file +pamtouil - convert a PNM or PNM/transparency image into a Motif UIL icon file <A NAME="lbAC"> </A> <H2>SYNOPSIS</H2> @@ -25,11 +25,11 @@ This program is part of <a href="index.html">Netpbm</a>. -pamtouil reads a PNM or PAM image as input and produces a -Motif UIL icon file as output. If the input is PAM, it may be either -a regular grayscale or color image or grayscale+alpha or color+alpha. -Where the alpha channel is present, pamtouil renders pixels -that are more than half transparent as transparent in the output. +pamtouil reads a PNM or PAM image as input and produces a Motif UIL +icon file as output. If the input is PAM, it may be either a regular +grayscale or color image or grayscale+transparency or color+transparency. +Where the transparency channel is present, pamtouil renders pixels that +are more than half transparent as transparent in the output. In the UIL's colormap, pamtouil uses the color names from the RGB database -- the same one <a href="ppmmake.html">ppmmake</a> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtowinicon.html new/netpbm.sourceforge.net/doc/pamtowinicon.html --- old/netpbm.sourceforge.net/doc/pamtowinicon.html 2013-09-03 22:01:15.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pamtowinicon.html 2014-11-15 04:37:00.000000000 +0100 @@ -85,10 +85,11 @@ <TABLE summary="Image type based on number of channels" border=1 align="center"> <TR><TH>channels</TH><TH>image</TH></TR> <TR><TD>1</TD><TD>fully opaque grayscale image</TD></TR> -<TR><TD>2</TD><TD>grayscale image with alpha channel</TD></TR> +<TR><TD>2</TD><TD>grayscale image with transparency channel</TD></TR> <TR><TD>3</TD><TD>fully opaque color image</TD></TR> -<TR><TD>4</TD><TD>color image with alpha channel</TD></TR> -<TR><TD>5</TD><TD>color image with alpha channel and additional AND mask</TD></TR> +<TR><TD>4</TD><TD>color image with transparency channel</TD></TR> +<TR><TD>5</TD><TD>color image with transparency channel and additional AND +mask</TD></TR> </TABLE> The tuple types of the PAMs are irrelevant. @@ -98,13 +99,13 @@ The so-called ‘AND mask’ is a special feature of Microsoft Windows icons. It is required for all BMP encoded images. At the -first sight, the AND mask is a 1-bit alpha channel, but it is also +first sight, the AND mask is a 1-bit transparency channel, but it is also used for e.g. shading the icon while dragging. See <A HREF="winicon.html">Windows Icons</A> for details. If there is no explicit AND mask, but transparency data in the input image, pamtowinicon sets the AND mask to opaque where the -sample in the alpha channel is below maxval, and to transparent +sample in the transparency channel is below maxval, and to transparent elsewhere. If no transparency data is present in the input image, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pbmtext.html new/netpbm.sourceforge.net/doc/pbmtext.html --- old/netpbm.sourceforge.net/doc/pbmtext.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pbmtext.html 2014-11-15 04:36:37.000000000 +0100 @@ -159,10 +159,10 @@ If you want to overlay colored text instead of black, just use ppmchange to change all black pixels to the color of your choice before overlaying the text image. But still use the original -black and white image for the alpha mask. +black and white image for the transparency mask. If you want the text at an angle, use pnmrotate on the text -image (and alpha mask) before overlaying. +image (and transparency mask) before overlaying. <h2 id="fonts">FONTS</h2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pngtopam.html new/netpbm.sourceforge.net/doc/pngtopam.html --- old/netpbm.sourceforge.net/doc/pngtopam.html 2013-12-23 01:08:35.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pngtopam.html 2014-11-15 04:36:15.000000000 +0100 @@ -64,7 +64,7 @@ <DT>-alphapam <DD>Produce a single output image containing the main image (foreground) -and the alpha channel or transparency mask. This image is in the PAM +and the transparency channel or transparency mask. This image is in the PAM format with tuple type of either GRAYSCALE_ALPHA (which has a depth of 2 channels) or RGB_ALPHA (which has a depth of 4 channels). @@ -80,7 +80,7 @@ <DT>-alpha -<DD>Output the alpha channel or transparency mask of the image. The +<DD>Output the transparency channel or transparency mask of the image. The result is either a PBM file or a PGM file, depending on whether different levels of transparency appear. @@ -92,7 +92,7 @@ <DT>-mix -<DD>Compose the image with the transparency or alpha mask against a +<DD>Compose the image with the transparency or transparency mask against a background. The background color is determined by the bKGD chunk in the PNG, except that you can override it with -background. If the PNG has no bKGD chunk and you don't specify -background, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pngtopnm.html new/netpbm.sourceforge.net/doc/pngtopnm.html --- old/netpbm.sourceforge.net/doc/pngtopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pngtopnm.html 2014-11-15 04:35:45.000000000 +0100 @@ -35,7 +35,7 @@ href="pngtopam.html">pngtopam</a>, introduced with Netpbm 10.44 (September 2008). pngtopam is backward compatible with pngtopnm, plus adds many additional functions, including the -ability to produce a PAM image that includes an alpha (transparency) +ability to produce a PAM image that includes a transparency (alpha) channel. Starting in Release 10.48, pngtopnm is just an alias for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnminterp.html new/netpbm.sourceforge.net/doc/pnminterp.html --- old/netpbm.sourceforge.net/doc/pnminterp.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnminterp.html 2014-11-15 04:35:36.000000000 +0100 @@ -14,7 +14,7 @@ <a href="pamstretch.html">pamstretch</a>. pamstretch is backward compatible with pnminterp, but -also recognizes PAM input, including that with an alpha channel. +also recognizes PAM input, including that with a transparency channel. </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmmargin.html new/netpbm.sourceforge.net/doc/pnmmargin.html --- old/netpbm.sourceforge.net/doc/pnmmargin.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnmmargin.html 2014-11-12 04:41:20.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pnmmargin User Manual</TITLE></HEAD> <BODY> <H1>pnmmargin</H1> -Updated: 20 March 2009 +Updated: 12 November 2014 <A HREF="#index">Table Of Contents</A> @@ -22,11 +22,22 @@ pnmmargin adds a border around a PNM image. + +<H2 id="arguments">ARGUMENTS</H2> + +pnmfile is the name of the input file. If you don't specify this +argument, pnmmargin reads the input image from its Standard Input. + + <H2 id="options">OPTIONS</H2> You can specify the border color with the -white, --black, and -color options. If no color is specified, -the program makes a guess. +-black, and -color options. If you don't specify a color, the +program makes a guess. + +The value of -color is like the +<a href="libppm.html#colorname">argument of the ppm_parsecolor() +library routine</a>. To remove a border of a specified size from an image, use pamcut. pnmcrop also removes borders, but determines by itself @@ -41,6 +52,7 @@ pnmpad does essentially the same thing, but gives you more control over the individual margins and does only black and white margins. + <H2 id="seealso">SEE ALSO</H2> <A HREF="pamcut.html">pamcut</A> @@ -58,6 +70,7 @@ <UL> <LI><A HREF="#synopsis">SYNOPSIS</A> <LI><A HREF="#description">DESCRIPTION</A> +<LI><A HREF="#arguments">ARGUMENTS</A> <LI><A HREF="#options">OPTIONS</A> <LI><A HREF="#seealso">SEE ALSO</A> <LI><A HREF="#author">AUTHOR</A> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmpaste.html new/netpbm.sourceforge.net/doc/pnmpaste.html --- old/netpbm.sourceforge.net/doc/pnmpaste.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnmpaste.html 2014-11-15 04:35:23.000000000 +0100 @@ -51,7 +51,7 @@ pamcomp is a more general tool, except that it lacks the "or," "and," and "xor" functions. -pamcomp allows you to specify an alpha mask in order to have +pamcomp allows you to specify a transparency mask in order to have only part of the inserted image get inserted. So the inserted pixels need not be a rectangle. You can also have the inserted image be translucent, so the resulting image is a mixture of the inserted image diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmremap.html new/netpbm.sourceforge.net/doc/pnmremap.html --- old/netpbm.sourceforge.net/doc/pnmremap.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnmremap.html 2014-11-14 05:04:42.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pnmremap User Manual</TITLE></HEAD> <BODY> <H1>pnmremap</H1> -Updated: 03 June 2009 +Updated: 13 November 2014 <A HREF="#index">Table Of Contents</A> @@ -24,7 +24,7 @@ [-verbose] -[-missingcolor=color] +[-missingcolor=colorspec] [pnmfile] @@ -250,13 +250,17 @@ If you specify -firstisdefault, the maxval of your input must match the maxval of your palette image. -<DT>-missingcolor=color +<DT>-missingcolor=colorspec <DD>This specifies the default color for pnmremap to map to a color in the input image that isn't in the palette. color may or may not be in the palette image; it is part of the palette regardless. +colorspec is as described for +the <a href="libppm.html#colorname">argument of the ppm_parsecolor() +library routine</a>. + If you specify -missingcolor, the maxval of your input must match the maxval of your palette image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmtopalm.html new/netpbm.sourceforge.net/doc/pnmtopalm.html --- old/netpbm.sourceforge.net/doc/pnmtopalm.html 2013-05-29 03:34:18.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pnmtopalm.html 2014-11-14 05:18:00.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pnmtopalm User Manual</TITLE></HEAD> <BODY> <H1>pnmtopalm</H1> -Updated: 05 October 2003 +Updated: 14 November 2014 <A HREF="#index">Table Of Contents</A> @@ -21,7 +21,7 @@ [-colormap] -[-transparent=color] +[-transparent=colorspec] [-density=N] @@ -187,16 +187,16 @@ not recommended by Palm, for efficiency reasons. Otherwise, pnmtopalm uses the default Palm colormap for color output. -<DT>-transparent=color +<DT>-transparent=colorspec <DD> +Marks one particular color as fully transparent. -Marks one particular color as fully transparent. The format -to specify the color is either (when for example orange) -"1.0,0.5,0.0", where the values are floats between zero and -one, or with the syntax "#RGB", "#RRGGBB" or -"#RRRRGGGGBBBB" where R, G and B are hexadecimal numbers. -Transparency works only on Palm OS 3.5 and higher. +colorspec is as described for the +<a href="libppm.html#colorname">argument of the ppm_parsecolor() +library routine</a>. + +Transparency works only on Palm OS 3.5 and higher. <DT>-scanline-compression <DD> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmtopng.html new/netpbm.sourceforge.net/doc/pnmtopng.html --- old/netpbm.sourceforge.net/doc/pnmtopng.html 2013-04-24 00:25:04.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pnmtopng.html 2014-11-15 04:35:16.000000000 +0100 @@ -144,12 +144,12 @@ Creates an interlaced PNG file (Adam7). <DT>-alpha=filename -<DD> This specifies the transparency (alpha channel) of the image. -You supply the alpha channel as a standard PGM alpha mask (see the <a -href="pgm.html">PGM</a> specification. pnmtopng does not -necessarily represents the transparency information as an alpha channel in -the PNG format. If it can represent the transparency information through -a palette, it will do so in order to make a smaller PNG file. +<DD> This specifies the transparency (alpha) channel of the image. You supply +the transparency channel as a standard PGM transparency mask (see +the <a href="pgm.html">PGM</a> specification. pnmtopng does not +necessarily represents the transparency information as a transparency channel +in the PNG format. If it can represent the transparency information through a +palette, it will do so in order to make a smaller PNG file. pnmtopng even sorts the palette so it can omit the opaque colors from the transparency part of the palette and save space for the palette. @@ -183,7 +183,7 @@ <DT>-background=color <DD> Causes pnmtopng to create a background color chunk in the PNG output -which can be used for subsequent alpha channel or transparent color +which can be used for subsequent transparency channel or transparent color conversions. Specify color the same as for -transparent. <DT>-palette=palettefile @@ -440,11 +440,11 @@ <DT>-force <DD> -When you specify this, pnmtopng limits its optimizations. -The resulting PNG output is as similar to the Netpbm input as possible. -For example, the PNG output will not be paletted and the alpha channel -will be represented as a full alpha channel even if the information could -be represented more succinctly with a transparency chunk. +When you specify this, pnmtopng limits its optimizations. The +resulting PNG output is as similar to the Netpbm input as possible. For +example, the PNG output will not be paletted and the transparency channel will +be represented as a full transparency channel even if the information could be +represented more succinctly with a transparency chunk. <DT>-libversion diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmtorle.html new/netpbm.sourceforge.net/doc/pnmtorle.html --- old/netpbm.sourceforge.net/doc/pnmtorle.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnmtorle.html 2014-11-15 04:34:28.000000000 +0100 @@ -27,7 +27,7 @@ This program is part of <a href="index.html">Netpbm</a>. This program converts Netpbm image files into Utah RLE image files. -You can include an alpha mask. If the input is a multiple image file, +You can include a transparency mask. If the input is a multiple image file, the output consists of several concatenated RLE images. The RLE file will contain either a three channel color image (24 @@ -58,10 +58,10 @@ <DT>-a <DD> -This option causes pnmtorle to include an alpha channel in the output -image. The alpha channel is based on the image: Wherever a pixel -is black, the corresponding alpha value is transparent. Everywhere -else, the alpha value is fully opaque. +This option causes pnmtorle to include an transparency channel in the +output image. The transparency channel is based on the image: Wherever a +pixel is black, the corresponding trasparency value is transparent. +Everywhere else, the transparency value is fully opaque. <DT>-o outfile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmcolormask.html new/netpbm.sourceforge.net/doc/ppmcolormask.html --- old/netpbm.sourceforge.net/doc/ppmcolormask.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmcolormask.html 2014-11-15 04:34:01.000000000 +0100 @@ -43,11 +43,11 @@ color indicated by the -color option, and white everywhere else. -The output of ppmcolormask is useful as an alpha mask input -to pamcomp. Note that you can generate such an alpha mask -automatically as you convert to PNG format with <A -HREF="pnmtopng.html">pnmtopng</A>. Use its -transparent -option. +The output of ppmcolormask is useful as a transparency mask input +to pamcomp. Note that you don't need ppmcolormask and +pamcomp if you are ultimately converting to PNG with +pnmtopng because the -transparent option on pnmtopng does +the same thing. ppmfile is the input file. If you don't specify ppmfile, the input is from Standard Input. @@ -112,6 +112,7 @@ <A HREF="pgmtoppm.html">pgmtoppm</A>, <A HREF="pamcomp.html">pamcomp</A>, <A HREF="pbmmask.html">pbmmask</A>, +<A HREF="pnmtopng.html">pbmmask</A>, <A HREF="ppm.html">ppm</A> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmdraw.html new/netpbm.sourceforge.net/doc/ppmdraw.html --- old/netpbm.sourceforge.net/doc/ppmdraw.html 2014-03-18 02:30:21.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmdraw.html 2014-11-14 05:06:32.000000000 +0100 @@ -150,6 +150,10 @@ in which subsequent drawing commands draw. Before the first setcolor, the current color is white. +There is one argument. It specifies the color as described for the +<a href="libppm.html#colorname">argument of the ppm_parsecolor() +library routine</a>. + <dt>setfont <dd>This sets the "current font", which determines the font diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmmix.html new/netpbm.sourceforge.net/doc/ppmmix.html --- old/netpbm.sourceforge.net/doc/ppmmix.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmmix.html 2014-11-15 04:33:53.000000000 +0100 @@ -40,7 +40,7 @@ pamcomp is a more general alternative. It allows you to mix images of different size and to have the fade factor vary throughout -the image (through the use of an alpha mask). It does not have the +the image (through the use of a transparency mask). It does not have the same-maxval and same-type restrictions. It mixes light intensity, not brightness. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmrainbow.html new/netpbm.sourceforge.net/doc/ppmrainbow.html --- old/netpbm.sourceforge.net/doc/ppmrainbow.html 2013-02-20 04:30:32.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmrainbow.html 2014-11-15 04:33:46.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Ppmrainbow User Manual</TITLE></HEAD> <BODY> <H1>ppmrainbow</H1> -Updated: 09 December 2009 +Updated: 12 November 2014 <A HREF="#index">Table Of Contents</A> @@ -25,16 +25,13 @@ This program is part of <a href="index.html">Netpbm</a>. ppmrainbow generates a PPM image that fades from one color to -another to another from left to right, like a rainbow. The colors are -those you specify on the command line, in that order. The first color -is added again on the right end of the image unless you specify the --norepeat option. +another to another from left to right, like a rainbow. If you want a vertical or other non-horizontal rainbow, run the output through pnmrotate or pamflip. One use for such a rainbow is to compose it with another image -under an alpha mask in order to add a rainbow area to another image. +under a transparency mask in order to add a rainbow area to another image. In fact, you can make rainbow-colored text by using pbmtext, pamcomp, and ppmrainbow. @@ -43,6 +40,21 @@ If you just want an image containing all the possible colors (for some kind of processing; not to look at), see pamseq. + +<h2 id="arguments">ARGUMENTS</h2> + +color ... is the list of colors, in order from left to right, +to go into the rainbow. + +The first color is added again on the right end of the image unless you +specify the -norepeat option. This means you can concatenate multiple +copies (tile, as with pnmtile) to make a continuous larger image. + +color is as described for +the <a href="libppm.html#colorname">argument of the ppm_parsecolor() +library routine</a>. + + <H2 id="options">OPTIONS</H2> All options can be abbreviated to their shortest unique prefix. @@ -70,8 +82,7 @@ <dd>This option makes ppmrainbow end the rainbow with the last color you specify. Without this option, ppmrainbow adds the first color you specify to the right end of the rainbow as if you had -repeated it. (I don't understand the point of this default behavior; -it exists today just for backward compatibility). +repeated it. <DT>-tmpdir @@ -111,6 +122,7 @@ <UL> <LI><A HREF="#synopsis">SYNOPSIS</A> <LI><A HREF="#description">DESCRIPTION</A> +<LI><A HREF="#options">ARGUMENTS</A> <LI><A HREF="#options">OPTIONS</A> <LI><A HREF="#seealso">SEE ALSO</A> <LI><A HREF="#author">AUTHOR</A> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmrough.html new/netpbm.sourceforge.net/doc/ppmrough.html --- old/netpbm.sourceforge.net/doc/ppmrough.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmrough.html 2014-11-15 04:33:40.000000000 +0100 @@ -25,9 +25,9 @@ [-height pixels] -[-bg rgb:##/##/##] +[-bg colorspec] -[-fg rgb:##/##/##] +[-fg colorspec] [-var pixels] @@ -78,7 +78,7 @@ option. You could use ppmrough with ppmtopgm to create a PGM -alpha mask and use it to roughen up the edges of another image. +transparency mask and use it to roughen up the edges of another image. <H2 id="options">OPTIONS</H2> @@ -111,15 +111,17 @@ <DD>Specifies the height of the image (default: 100). -<DT>-bg=color +<DT>-bg=colorspec -<DD>Background color. Specify this the same way you specify a color with - ppmmake. Default is black. +<DD>Background color. colorspec is as described for the +<a href="libppm.html#colorname">argument of the ppm_parsecolor() +library routine</a>. Default is black. <DT>-fg=color -<DD>Foreground color. Specify this the same way you specify a color with - ppmmake. Default is white. +<DD>Foreground color. colorspec is as described for the +<a href="libppm.html#colorname">argument of the ppm_parsecolor() +library routine</a>. Default is white. <DT>-var=pixels diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmtotga.html new/netpbm.sourceforge.net/doc/ppmtotga.html --- old/netpbm.sourceforge.net/doc/ppmtotga.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmtotga.html 2014-11-15 04:33:27.000000000 +0100 @@ -14,7 +14,7 @@ <a href="pamtotga.html">pamtotga</a>. pamtotga is backward compatible with ppmtotga, but -also recognizes PAM input, including that with an alpha channel. +also recognizes PAM input, including that with a transparency channel. </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmtowinicon.html new/netpbm.sourceforge.net/doc/ppmtowinicon.html --- old/netpbm.sourceforge.net/doc/ppmtowinicon.html 2013-04-15 01:59:57.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/ppmtowinicon.html 2014-11-15 04:33:20.000000000 +0100 @@ -62,7 +62,7 @@ as with any Netpbm program, you can use a PBM image for the transparency mask and ppmtowinicon will treat it like a PGM. -The and mask is like an alpha mask, except for what it signifies in +The and mask is like a transparency mask, except for what it signifies in the "not opaque" areas. In the usual case, the foreground image is black in those areas, and in that case the areas are fully transparent -- the background shows through the icon. But in general, a not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmtoxpm.html new/netpbm.sourceforge.net/doc/ppmtoxpm.html --- old/netpbm.sourceforge.net/doc/ppmtoxpm.html 2013-12-08 01:05:33.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmtoxpm.html 2014-11-15 04:33:03.000000000 +0100 @@ -62,17 +62,16 @@ All color codes in an image are the same length, and ppmtoxpm tries to make it as short as possible. That length is, of course, determined by the number of colors in the image. -ppmtoxpm counts the colors in the image, excluding those that -will be transparent in the output because of your alpha mask, and chooses -a color code length accordingly. There are 92 printable characters -that can be used in a color code. Therefore, if you have 92 or fewer -colors, your color codes will be one character. If you have more than -92 but not more than 92 * 92, your color codes will be two characters. -And so on. +ppmtoxpm counts the colors in the image, excluding those that will be +transparent in the output because of your transparency mask, and chooses a +color code length accordingly. There are 92 printable characters that can be +used in a color code. Therefore, if you have 92 or fewer colors, your color +codes will be one character. If you have more than 92 but not more than 92 * +92, your color codes will be two characters. And so on. -There's one exception to the above: If you specify an alpha mask +There's one exception to the above: If you specify a transparency mask (the -alpha option, one unique color code represents -"transparent." This is true even if the alpha mask doesn't +"transparent." This is true even if the transparency mask doesn't actually produce any transparent pixels. So subtract one from the number of possible colors if you use -alpha. @@ -114,15 +113,15 @@ <DT>-alphamask=pgmfile -<DD> This option names a PGM file to use as an alpha (transparency) +<DD> This option names a PGM file to use as a transparency (alpha) mask. The file must contain an image the same dimensions as the input image. ppmtoxpm marks as transparent any pixel whose position -in the alpha mask image is at most half white. +in the transparency mask image is at most half white. If you don't specify -alphamask, ppmtoxpm makes all pixels in the output opaque. -ppmcolormask is one way to generate an alpha mask file. You +ppmcolormask is one way to generate a transparency mask file. You might also generate it by extracting transparency information from an XPM file with the -alphaout option to xpmtoppm. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/rlatopam.html new/netpbm.sourceforge.net/doc/rlatopam.html --- old/netpbm.sourceforge.net/doc/rlatopam.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/rlatopam.html 2014-11-15 04:32:21.000000000 +0100 @@ -22,7 +22,7 @@ rlatopam converts an Alias RLA (run-length encoded type A) or RPF (rich pixel format) image to a PAM image file. The output PAM -file can be grayscale or RGB, with or without an alpha channel. +file can be grayscale or RGB, with or without a transparency channel. rlafile is the file name of the input file. If you omit this parameter, rlatopam reads the image from Standard Input. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/rletopnm.html new/netpbm.sourceforge.net/doc/rletopnm.html --- old/netpbm.sourceforge.net/doc/rletopnm.html 2013-02-20 04:30:32.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/rletopnm.html 2014-11-15 04:32:04.000000000 +0100 @@ -45,18 +45,18 @@ <DD> rletopnm creates a PGM (portable graymap) file containing the -alpha channel values in the input image. If the input image doesn't -contain an alpha channel, the alpha-filename file contains all -zero (transparent) alpha values. If you don't specify ---alphaout, rletopnm does not generate an alpha file, -and if the input image has an alpha channel, rletopnm simply +transparency channel values in the input image. If the input image doesn't +contain an transparency channel, the alpha-filename file contains all +zero (transparent) transparency values. If you don't specify +--alphaout, rletopnm does not generate a transparency file, +and if the input image has a transparency channel, rletopnm simply discards it. If you specify - as the filename, rletopnm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. See <A HREF="pamcomp.html">pamcomp</A> for one way to use -the alpha output file. +the transparency output file. <DT>--verbose @@ -93,8 +93,8 @@ </pre> <li>Convert RLE file dart.rle to PPM format as dart.ppm. Store the -alpha channel of dart.rle as dartalpha.pgm (if dart.rle doesn't have -an alpha channel, store a fully transparent alpha mask as +transparency channel of dart.rle as dartalpha.pgm (if dart.rle doesn't have +a transparency channel, store a fully transparent transparency mask as dartalpha.pgm): <pre> @@ -129,12 +129,11 @@ Modifications by Eric Haines to support raw and plain formats. -Modifications by Bryan Henderson to create alpha files and use +Modifications by Bryan Henderson to create transparency files and use mnemonic options. <HR> -<A NAME="index"> </A> -<H2>Table Of Contents</H2> +<H2 id="index">Table Of Contents</H2> <UL> <LI><A HREF="#synopsis">SYNOPSIS</A> <LI><A HREF="#description">DESCRIPTION</A> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/sgitopnm.html new/netpbm.sourceforge.net/doc/sgitopnm.html --- old/netpbm.sourceforge.net/doc/sgitopnm.html 2014-04-25 04:52:00.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/sgitopnm.html 2014-11-15 04:30:09.000000000 +0100 @@ -57,7 +57,7 @@ image or, if the input has 1 or 2 channels, extracts the first channel as a PGM image. -A 2-channel image is grayscale plus alpha (transparency), so you can get +A 2-channel image is grayscale plus transparency, so you can get the transparency information with -channel=2. You could then combine them into a PAM image of tuple type GRAYSCALE_ALPHA with pamstack. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/srftopam.html new/netpbm.sourceforge.net/doc/srftopam.html --- old/netpbm.sourceforge.net/doc/srftopam.html 2013-05-29 03:34:19.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/srftopam.html 2014-09-10 18:49:18.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <title>Srftopam User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/tgatoppm.html new/netpbm.sourceforge.net/doc/tgatoppm.html --- old/netpbm.sourceforge.net/doc/tgatoppm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/tgatoppm.html 2014-11-15 04:29:51.000000000 +0100 @@ -34,18 +34,18 @@ <DT>--alphaout=alpha-filename -<DD>tgatoppm creates a PGM image containing the alpha channel +<DD>tgatoppm creates a PGM image containing the transparency channel values in the input image. If the input image doesn't contain an -alpha channel, the alpha-filename file contains all zero -(transparent) alpha values. If you don't specify --alphaout, +transparency channel, the alpha-filename file contains all zero +(transparent) transparency values. If you don't specify --alphaout, tgatoppm does not generate an alpha file, and if the input -image has an alpha channel, tgatoppm simply discards it. +image has a transparency channel, tgatoppm simply discards it. If you specify - as the filename, tgatoppm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. See <A HREF="pamcomp.html">pamcomp</A> for one way to use -the alpha output file. +the transparency output file. <DT>--headerdump diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/tifftopnm.html new/netpbm.sourceforge.net/doc/tifftopnm.html --- old/netpbm.sourceforge.net/doc/tifftopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/tifftopnm.html 2014-11-15 04:29:19.000000000 +0100 @@ -53,7 +53,7 @@ This program cannot read every possible TIFF file -- there are myriad variations of the TIFF format. However, it does understand -monochrome and gray scale, RGB, RGBA (red/green/blue with alpha +monochrome and gray scale, RGB, RGBA (red/green/blue with transparency channel), CMYK (Cyan-Magenta-Yellow-Black ink color separation), and color palette TIFF files. An RGB file can have either single plane (interleaved) color or multiple plane format. The program reads 1-8 @@ -109,18 +109,18 @@ <DT>-alphaout=alpha-filename <DD>tifftopnm creates a PGM file containing the alpha channel -values in the input image. If the input image doesn't contain an -alpha channel, the alpha-filename file contains all zero -(transparent) alpha values. If you don't specify -alphaout, +values in the input image. If the input image doesn't contain a +transparency channel, the alpha-filename file contains all zero +(transparent) transparency values. If you don't specify -alphaout, -tifftopnm does not generate an alpha file, and if the input -image has an alpha channel, tifftopnm simply discards it. +tifftopnm does not generate a transparency file, and if the input +image has an transparency channel, tifftopnm simply discards it. If you specify - as the filename, tifftopnm -writes the alpha output to Standard Output and discards the image. +writes the transparency output to Standard Output and discards the image. See <A HREF="pamcomp.html">pamcomp</A> for one way to use -the alpha output file. +the transparency output file. <DT>-respectfillorder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/winicon.html new/netpbm.sourceforge.net/doc/winicon.html --- old/netpbm.sourceforge.net/doc/winicon.html 2013-09-03 22:02:48.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/winicon.html 2014-11-15 04:28:40.000000000 +0100 @@ -56,13 +56,13 @@ the image is usually black and sometimes white, but a color other than black and white will hardly give predictable results. -Since Windows XP, there may also be an 8-bit alpha channel in 32-bpp BMP -encoded icon images. The AND mask, however, is still required and used +Since Windows XP, there may also be an 8-bit transparency channel in 32-bpp +BMP encoded icon images. The AND mask, however, is still required and used e.g. for generating shadows. PNG encoded images don't contain AND masks. While rendering a PNG encoded -image, Windows constructs an AND mask on the fly from the alpha channel, if -present. +image, Windows constructs an AND mask on the fly from the transparency +channel, if present. <H3 id="evolution">Evolution of Windows Icons</H3> @@ -76,7 +76,7 @@ <LI>Windows 4.0 (a.k.a. Windows95) added support for 32-bpp images and resolutions up to 256 by 256. <LI>NT 5.1 (a.k.a. Windows XP) added support for the 8-bit -alpha channel in the unused bits of 32-bpp images. +transparency channel in the unused bits of 32-bpp images. <LI>NT 6.0 (a.k.a. Windows Vista) added support for PNG encoded images </UL> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/winicontopam.html new/netpbm.sourceforge.net/doc/winicontopam.html --- old/netpbm.sourceforge.net/doc/winicontopam.html 2013-05-13 02:29:51.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/winicontopam.html 2014-11-15 04:28:21.000000000 +0100 @@ -31,9 +31,9 @@ winicontopam reads a Microsoft Windows icon file and converts it to one or more RGB_ALPHA Netpbm PAM files. -The alpha channel is copied from the 8-bit transparency data from the icon, -if present. If no 8-bit transparency data is available, the alpha channel is -constructed from the so-called ‘AND mask’. +The transparency channel is copied from the 8-bit transparency data from +the icon, if present. If no 8-bit transparency data is available, the +transparency channel is constructed from the so-called ‘AND mask’. The output goes to Standard Output. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ximtoppm.html new/netpbm.sourceforge.net/doc/ximtoppm.html --- old/netpbm.sourceforge.net/doc/ximtoppm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ximtoppm.html 2014-11-15 04:28:09.000000000 +0100 @@ -36,23 +36,23 @@ <DL COMPACT> <DT>--alphaout=alpha-filename -<DD>ximtoppm creates a PGM file containing the alpha channel -values in the input image. If the input image doesn't contain an -alpha channel, the alpha-filename file contains all zero -(transparent) alpha values. If you don't specify --alphaout, -ximtoppm does not generate an alpha file, and if the input -image has an alpha channel, ximtoppm simply discards it. +<DD>ximtoppm creates a PGM file containing the transparency channel +values in the input image. If the input image doesn't contain a +transparency channel, the alpha-filename file contains all zero +(transparent) transparency values. If you don't specify --alphaout, +ximtoppm does not generate a transparency file, and if the input +image has a transparency channel, ximtoppm simply discards it. If you specify - as the filename, ximtoppm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. Actually, an Xim image can contain an arbitrary fourth channel -- -it need not be an Alpha channel. ximtoppm extracts any fourth -channel it finds as described above; it doesn't matter if it is an -alpha channel or not. +it need not be a transparency channel. ximtoppm extracts any fourth +channel it finds as described above; it doesn't matter if it is a +transparency channel or not. See <A HREF="pamcomp.html">pamcomp</A> for one way to use -the alpha output file. +the transparency output file. </DL> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/xpmtoppm.html new/netpbm.sourceforge.net/doc/xpmtoppm.html --- old/netpbm.sourceforge.net/doc/xpmtoppm.html 2013-05-29 03:34:19.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/xpmtoppm.html 2014-11-15 04:27:04.000000000 +0100 @@ -34,16 +34,16 @@ <DD>xpmtoppm creates a PBM file containing the transparency mask for the image. If the input image doesn't contain transparency information, the alpha-filename file contains all white -(opaque) alpha values. If you don't specify --alphaout, -xpmtoppm does not generate an alpha file, and if the input +(opaque) transparency values. If you don't specify --alphaout, +xpmtoppm does not generate a transparency file, and if the input image has transparency information, xpmtoppm simply discards it. If you specify - as the filename, xpmtoppm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. See <A HREF="pamcomp.html">pamcomp</A> for one way to use -the alpha output file. +the transparency output file. xpmtoppm can't handle a line longer than 8K characters in the XPM input. If an input line exceeds this limit, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/getting_netpbm.php new/netpbm.sourceforge.net/getting_netpbm.php --- old/netpbm.sourceforge.net/getting_netpbm.php 2014-09-08 09:56:05.000000000 +0200 +++ new/netpbm.sourceforge.net/getting_netpbm.php 2014-11-18 17:13:09.000000000 +0100 @@ -365,7 +365,7 @@ </address> -This page was generated on 08 Sep 2014. +This page was generated on 18 Nov 2014. </body> </html> ++++++ netpbm-10.67.4-nohpcdtoppm-noppmtompeg.tar.bz2 -> netpbm-10.68.1-nohpcdtoppm-noppmtompeg.tar.bz2 ++++++ ++++ 8058 lines of diff (skipped) ++++++ netpbm-security-code.patch ++++++ ++++ 919 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/netpbm/netpbm-security-code.patch ++++ and /work/SRC/openSUSE:Factory/.netpbm.new/netpbm-security-code.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ntfs-3g_ntfsprogs for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package ntfs-3g_ntfsprogs for openSUSE:Factory checked in at 2014-11-24 11:17:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntfs-3g_ntfsprogs (Old) and /work/SRC/openSUSE:Factory/.ntfs-3g_ntfsprogs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ntfs-3g_ntfsprogs" Changes: -------- --- /work/SRC/openSUSE:Factory/ntfs-3g_ntfsprogs/ntfs-3g_ntfsprogs.changes 2014-04-26 17:01:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ntfs-3g_ntfsprogs.new/ntfs-3g_ntfsprogs.changes 2014-11-24 11:18:27.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Nov 18 22:18:43 UTC 2014 - crrodriguez(a)opensuse.org + +- Enable ACL support +- Buildrequire libuuid-devel and hwinfo-devel, silences build warning + about the need of that libraries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntfs-3g_ntfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.YmPVpk/_old 2014-11-24 11:18:28.000000000 +0100 +++ /var/tmp/diff_new_pack.YmPVpk/_new 2014-11-24 11:18:28.000000000 +0100 @@ -33,6 +33,8 @@ %else BuildRequires: pkgconfig(fuse) >= 2.6.0 %endif +BuildRequires: hwinfo-devel +BuildRequires: libuuid-devel BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -108,7 +110,7 @@ # export CFLAGS="$RPM_OPT_FLAGS -Wformat -Wformat-security -W -Wno-sign-compare" %configure --exec-prefix=/ --disable-static --with-pic --disable-ldconfig \ - --with-fuse=external + --with-fuse=external --enable-posix-acls make %{?_smp_mflags} %install -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yodl for openSUSE:Factory
by root＠hilbert.suse.de 24 Nov '14

24 Nov '14

Hello community, here is the log from the commit of package yodl for openSUSE:Factory checked in at 2014-11-24 11:17:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yodl (Old) and /work/SRC/openSUSE:Factory/.yodl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yodl" Changes: -------- --- /work/SRC/openSUSE:Factory/yodl/yodl.changes 2013-11-28 16:54:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yodl.new/yodl.changes 2014-11-24 11:18:25.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 18 15:23:27 UTC 2014 - pgajdos(a)suse.com + +- updated to 3.04: + * The redef() and redefinemacro() descriptions missed the name of the macro + to be redefined: they require 3 instead of 2 args. + * The yodlverbinsert program is now C++, and supports -a: process all lines + and -n: prefix lines by numbers. Yodlverbinsert ignores initial and + trailing blank lines. + * Removed some compiler warnings. + +------------------------------------------------------------------- Old: ---- yodl_3.03.0.orig.tar.gz New: ---- yodl_3.04.00.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yodl.spec ++++++ --- /var/tmp/diff_new_pack.lETnSD/_old 2014-11-24 11:18:26.000000000 +0100 +++ /var/tmp/diff_new_pack.lETnSD/_new 2014-11-24 11:18:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yodl # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,6 +19,7 @@ Name: yodl BuildRequires: bison BuildRequires: flex +BuildRequires: gcc-c++ BuildRequires: grep BuildRequires: icmake BuildRequires: sed @@ -31,7 +32,7 @@ %else BuildRequires: texlive-bin %endif -Version: 3.03.0 +Version: 3.04.00 Release: 0 Summary: Yet One-other Document Language License: GPL-3.0 ++++++ yodl_3.03.0.orig.tar.gz -> yodl_3.04.00.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/INSTALL.im new/yodl-3.04.00/INSTALL.im --- old/yodl-3.03.0/INSTALL.im 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/INSTALL.im 2014-09-20 19:49:46.000000000 +0200 @@ -55,6 +55,9 @@ // particular version can be used. The distributed definition uses the // `default' compiler version. +string CXX; + // CXX specifies the C++ compiler to use. + //#define PROFILE "-pg" // Uncomment the above #define to construct a binary program that can be // used with the gprof profiler. When specified, no stripping is performed @@ -74,5 +77,9 @@ STD_INCLUDE = BASE + "/share/yodl"; COMPILER = "gcc"; + CXX = "g++"; } + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/VERSION new/yodl-3.04.00/VERSION --- old/yodl-3.03.0/VERSION 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/VERSION 2014-09-20 20:13:50.000000000 +0200 @@ -1,2 +1,2 @@ -#define VERSION "3.03.0" -#define YEARS "1996-2013" +#define VERSION "3.04.00" +#define YEARS "1996-2014" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/changelog new/yodl-3.04.00/changelog --- old/yodl-3.03.0/changelog 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/changelog 2014-09-24 20:01:57.000000000 +0200 @@ -1,3 +1,19 @@ +yodl (3.04.00) + + * The redef() and redefinemacro() descriptions missed the name of the macro + to be redefined: they require 3 instead of 2 args. + +* The yodlverbinsert program is now C++, and supports -a: process all lines + and -n: prefix lines by numbers. Yodlverbinsert ignores initial and + trailing blank lines. + + * Removed some compiler warnings, among which a strange statement in + parser/pbeginnested.cc, where pp->d_insert was assigned a value within + the condition of a conditional assignment. See the difference between the + git-commit at Tue Sep 23 09:45:29 2014 +0200 and the next commit. + + -- Frank B. Brokken <f.b.brokken(a)rug.nl> Wed, 24 Sep 2014 20:01:42 +0200 + yodl (3.03.0) * Reorganized the macro-construction because of a persistent xlatin1.tex bug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/icmake/program new/yodl-3.04.00/icmake/program --- old/yodl-3.03.0/icmake/program 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/icmake/program 2014-09-20 20:08:50.000000000 +0200 @@ -24,8 +24,10 @@ void _programYodlverbinsert() { - run(COMPILER + " -o " + g_install + BIN + "/yodlverbinsert " + g_copt + - " src/verbinsert/verbinsert.c " + g_lopt); + if ("src/verbinsert/verbinsert.cc" younger + g_install + BIN + "/yodlverbinsert") + run(CXX + " --std=c++11 -o " + g_install + BIN + "/yodlverbinsert " + + g_copt + " src/verbinsert/verbinsert.cc " + g_lopt); } void program(string target) @@ -41,7 +43,16 @@ g_install + BIN + "/yodl2whatever " + g_install); - if (target == "yodlstriproff" || target == "yodl2whatever") + if (target == "programs" || target == "yodlverbinsert") + _programYodlverbinsert(); + + if ( + target == "yodlstriproff" + || + target == "yodl2whatever" + || + target == "yodlverbinsert" + ) return; compileRSS(); @@ -52,9 +63,6 @@ if (target == "programs" || target == "yodlpost") _programYodlpost(); - if (target == "programs" || target == "yodlverbinsert") - _programYodlverbinsert(); - } void programExit(string target, string strip) // build one program, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/icmake/sf new/yodl-3.04.00/icmake/sf --- old/yodl-3.03.0/icmake/sf 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/icmake/sf 2013-10-09 17:29:48.000000000 +0200 @@ -4,7 +4,7 @@ manualMayExit(path, 0); // create the manual using the new progs putenv("YODL_BIN=" + g_cwd + g_install + BIN); - run("yodl2html -o ../sf/index.html -I.:tmp/install/usr/share/yodl " + run("yodl2html -o ../sf/index.html -I.:tmp/wip/macros " "../sf/index.yo"); exit(0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/icmake/stdcompile new/yodl-3.04.00/icmake/stdcompile --- old/yodl-3.03.0/icmake/stdcompile 2013-10-09 14:21:36.000000000 +0200 +++ new/yodl-3.04.00/icmake/stdcompile 2013-10-09 17:29:48.000000000 +0200 @@ -22,9 +22,3 @@ // make the library _static_library(oDstDir + "/*.o", library); } - - - - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/macros/rawmacros/redef.raw new/yodl-3.04.00/macros/rawmacros/redef.raw --- old/yodl-3.03.0/macros/rawmacros/redef.raw 2012-05-27 11:03:00.000000000 +0200 +++ new/yodl-3.04.00/macros/rawmacros/redef.raw 2014-08-26 11:51:11.000000000 +0200 @@ -1,5 +1,5 @@ <STARTDOC> -macro(redef(nrofargs)(redefinition)) +macro(redef(macro)(nrofargs)(redefinition)) (Defines macro tt(macro) to expand to tt(redefinition). Similar to tt(def), but any pre-existing definition is overruled. Use tt(ARG)em(x) in the redefinition part to indicate where the arguments should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/macros/rawmacros/redefinemacro.raw new/yodl-3.04.00/macros/rawmacros/redefinemacro.raw --- old/yodl-3.03.0/macros/rawmacros/redefinemacro.raw 2012-05-27 11:03:00.000000000 +0200 +++ new/yodl-3.04.00/macros/rawmacros/redefinemacro.raw 2014-08-26 11:51:07.000000000 +0200 @@ -1,5 +1,5 @@ <STARTDOC> -macro(redefinemacro(nrofargs)(redefinition)) +macro(redefinemacro(macro)(nrofargs)(redefinition)) (Defines macro tt(macro) to expand to tt(redefinition). Similar to tt(def), but any pre-existing definition is overruled. Use tt(ARG)em(x) in the redefinition part to indicate where the arguments should diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/man/yodlverbinsert.in new/yodl-3.04.00/man/yodlverbinsert.in --- old/yodl-3.03.0/man/yodlverbinsert.in 2012-05-27 11:03:00.000000000 +0200 +++ new/yodl-3.04.00/man/yodlverbinsert.in 2014-09-23 20:44:08.000000000 +0200 @@ -26,7 +26,7 @@ manpagename(yodlverbinsert)(Generate verb-sections from parts of a file) manpagesynopsis() - bf(yodlverbinsert) [OPTIONS] tt(marker file) + bf(yodlverbinsert) [OPTIONS] tt([marker] file) manpagedescription() @@ -40,6 +40,8 @@ and the inserted file contents. Furthermore, an additional empty line may be inserted before the first line that is actually inserted. + Blank lines at the beginning and end of files are ignored. + itemization( it() tt(marker)nl() The argument tt(marker) must start in tt(file)'s first column en must @@ -65,29 +67,34 @@ documents. Conversion, however is simple but can be avoided altogether if Yodl's tt(-L) (tt(--legacy-include)) option is used. - manpageoptions() The default values of options are listed with each of the options between square brackets. The defaults were chosen so that vic() performs the behavior of an earlier version of this program, which was not distributed with bf(Yodl). itemization( + it() bf(-a)nl() + Process all lines of tt(file) (except initial and trailing blank +lines). The argument tt(marker) must not be specified. + it() bf(-n)nl() + Immediately following the indentation: lines are prefixed by numbers, +occupying 2 columns, followed by a colon and a blank. it() bf(-N)nl() Do not write a newline immediately following tt(verb)-statement's open-parenthesis. By default it is written, causing an additional line to be inserted before the first line that's actually inserted from a file. - it() bf(-s) tt(spaces) [0]nl() + it() bf(-s) tt(nSpaces) [0]nl() start each line that is written into the tt(verb)-section with -tt(spaces) additional blanks. - it() bf(-S) tt(spaces) [8]nl() - prefix the tt(verb) of the tt(verb)-section by -tt(spaces) additional blanks. - it() bf(-t) tt(tabs) [0]nl() +tt(nSpaces) additional blanks. + it() bf(-S) tt(nSpaces) [8]nl() + prefix the tt(verb) of the tt(verb)-section by tt(nSpaces) additional +blanks. + it() bf(-t) tt(nTabs) [0]nl() start each line that is written into the tt(verb)-section with -tt(tabs) additional tab characters. If both tt(-s) and tt(-t) are specified, +tt(nTabs) additional tab characters. If both tt(-s) and tt(-t) are specified, the tabs are inserted first. - it() bf(-T) tt(tabs) [0]nl() - prefix the tt(verb) of the tt(verb)-section by tt(tabs) additional tab -characters. If both tt(-S) and tt(-T) are specified, the tabs are inserted + it() bf(-T) tt(nTabs) [0]nl() + prefix the tt(verb) of the tt(verb)-section by tt(nTabs) additional +tab characters. If both tt(-S) and tt(-T) are specified, the tabs are inserted first. ) @@ -114,22 +121,18 @@ Then the following commands write the shown output to the program's standard output: itemization( - it() tt(verbinclude //one demo)nl() + it() tt(yodlverbinsert //one demo)nl() verb( verb( one 1 - ) ) - it() tt(verbinclude -N //one demo)nl() + it() tt(yodlverbinsert -N //one demo)nl() verb( verb(one 1 - ) ) - it() tt(verbinclude -s4 '/*two*/' demo)nl() + it() tt(yodlverbinsert -n -s4 '/*two*/' demo)nl() verb( verb( - - two - + 1: two ) ) ) @@ -143,8 +146,7 @@ bf(yodlletter)(7), bf(yodlmacros)(7), bf(yodlmanpage)(7), - bf(yodlpost)(1), - bf(yodlverbinsert)(1). + bf(yodlpost)(1) manpagebugs() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/scripts/createmacros new/yodl-3.04.00/scripts/createmacros --- old/yodl-3.03.0/scripts/createmacros 1970-01-01 01:00:00.000000000 +0100 +++ new/yodl-3.04.00/scripts/createmacros 2013-10-09 17:29:23.000000000 +0200 @@ -0,0 +1,36 @@ +#!/bin/bash + +# This file creates the std.<format>.yo files, e.g. std.latex.yo + +if [ "$#" == "0" ] ; then + echo provide WIP path, destination path and requested format + exit 1 +fi + +WIP=$1/macros +DST=$2 +FMT=$3 +LOCAL=$4 + +echo "1:$WIP 2:$DST 3:$FMT 4:$LOCAL" >> /tmp/yodllog + + +echo " +INCWSLEVEL() + +DEFINESYMBOL($FMT)() +" > $WIP + +for x in macros/rawmacros/*.raw +do + scripts/macroseparator.pl $FMT $x >> $WIP +done + +echo "DECWSLEVEL()" >> $WIP + +scripts/configreplacements $WIP $DST/std.$FMT.yo $LOCAL + + + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/src/file/fileextension.c new/yodl-3.04.00/src/file/fileextension.c --- old/yodl-3.03.0/src/file/fileextension.c 2012-05-27 11:03:01.000000000 +0200 +++ new/yodl-3.04.00/src/file/fileextension.c 2014-09-24 19:56:26.000000000 +0200 @@ -2,7 +2,7 @@ char *file_extension(char const *path) { - register char *ext = f_dotExtension(path); + register char const *ext = f_dotExtension(path); return !ext++ || strlen(ext) == 0 ? /* none found: return 0 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/src/parser/pbeginnested.c new/yodl-3.04.00/src/parser/pbeginnested.c --- old/yodl-3.03.0/src/parser/pbeginnested.c 2012-05-27 11:03:01.000000000 +0200 +++ new/yodl-3.04.00/src/parser/pbeginnested.c 2014-09-24 19:55:07.000000000 +0200 @@ -31,7 +31,7 @@ pp->d_string_ptr = string_new(0); pp->d_insert = - pp->d_insert = chartab_isActive() ? + chartab_isActive() ? p_insert_chartab_string : p_insert_no_chartab_string; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/src/verbinsert/verbinsert.c new/yodl-3.04.00/src/verbinsert/verbinsert.c --- old/yodl-3.03.0/src/verbinsert/verbinsert.c 2012-05-27 11:03:01.000000000 +0200 +++ new/yodl-3.04.00/src/verbinsert/verbinsert.c 2014-09-23 16:04:03.000000000 +0200 @@ -64,6 +64,7 @@ int endLabelFound = 0; int labelFound = 0; int verbOpened = 0; + int nrPrefix = 0; size_t labelsize = 0; size_t spaces = 0; size_t tabs = 0; @@ -100,6 +101,10 @@ verbendl = ""; continue; + case 'n': + nrPrefix = 1; + continue; + case -1: break; @@ -178,7 +183,12 @@ verbOpened = 1; printf("%sverb(%s", vindent, verbendl); } - printf("%s%s", indent, line); + + if ( + if (nrPrefix == 0) + printf("%s%s", indent, line); + else + printf("%s%2d: %s", indent, nrPrefix++, line); } free(line); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yodl-3.03.0/src/verbinsert/verbinsert.cc new/yodl-3.04.00/src/verbinsert/verbinsert.cc --- old/yodl-3.03.0/src/verbinsert/verbinsert.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yodl-3.04.00/src/verbinsert/verbinsert.cc 2014-09-23 21:16:48.000000000 +0200 @@ -0,0 +1,195 @@ +#include <iostream> +#include <fstream> +#include <iomanip> +#include <string> +#include <unistd.h> + +using namespace std; + +int main(int argc, char **argv) +{ + string progName(argv[0]); + + switch (size_t pos = progName.rfind('/')) + { + case string::npos: + progName.erase(0, pos); + break; + } + + size_t nrPrefix = 0; + + string indent; + string vindent; + + char const *verbendl = "\n"; + bool all = false; + bool labelFound = false; + + while (true) + { + int c; + switch(c = getopt(argc, argv, "anNs:S:T:t:v:V:")) + { + case 'a': + all = true; + labelFound = true; + continue; + + case 's': + indent.append(stoul(optarg), ' '); + continue; + + case 't': + indent.insert(0, stoul(optarg), '\t'); + continue; + + case 'S': + vindent.append(stoul(optarg), ' '); + continue; + + case 'T': + vindent.insert(0, stoul(optarg), '\t'); + continue; + + case 'N': + verbendl = ""; + continue; + + case 'n': + nrPrefix = 1; + continue; + + case -1: + break; + + default: + return 1; + } + break; /* only at case -1 */ + } + + if (argc - optind < 2 - all) + { + cerr << "usage: " << progName << + "[-a] [-N] [-n] [-s<nr>] [-t<nr>] [-S<nr>] [-T<nr>] marker file\n" + "See also: `man yodlverbinsert'\n"; + + return 0; + } + + argv += optind - all; + + string label; + char const *endlabel; + + if (not all) + { + label = argv[0]; + endlabel = (label[1] == '/') ? "//=" : "/**/"; + } + + ifstream input(argv[1]); + + if (!input) + { + cerr << "Can't read " << argv[1] << '\n'; + return 1; + } + + bool endLabelFound = false; + bool verbOpened = false; + size_t nEmptyLines = 0; + bool topLines = true; + + while (true) + { + string line; + + if (not getline(input, line)) + break; + + if ( + line.find(label) == 0 && + ( + line.length() == label.size() + || + isspace(label[label.size()]) + ) + ) + { + if (not all) + { + if (label == endlabel) // at endlabel: done + { + endLabelFound = true; + break; + } + + labelFound = true; + label = endlabel; // now search endlabel + continue; + } + } + + if (labelFound) + { + if (not verbOpened) + { + verbOpened = true; + cout << vindent << "verb(" << verbendl; + } + + // blank line + if (line.find_first_not_of(" \t") == string::npos) + { + ++nEmptyLines; + continue; + } + + if (nEmptyLines != 0) + { + if (not topLines) + { + for (size_t count = 0; count != nEmptyLines; ++count) + { + if (nrPrefix == 0) + cout << '\n'; + else + cout << indent << setw(2) << nrPrefix++ << ":\n"; + } + } + nEmptyLines = 0; + } + + topLines = false; + + if (nrPrefix == 0) + cout << indent << line << '\n'; + else + cout << indent << setw(2) << nrPrefix++ << ": " << + line << '\n'; + } + } + + if (not all) + { + if (not labelFound) + { + cerr << progName << ": label section not found\n"; + return 1; + } + + if (not endLabelFound) + { + cerr << progName << ": label section not ended\n"; + return 1; + } + } + + cout << ")\n"; // terminate verb(... by ) +} + + + + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0