commit tuxpaint for openSUSE:Factory
Hello community, here is the log from the commit of package tuxpaint for openSUSE:Factory checked in at 2012-10-06 08:19:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tuxpaint (Old) and /work/SRC/openSUSE:Factory/.tuxpaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tuxpaint", Maintainer is "sndirsch@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/tuxpaint/tuxpaint.changes 2012-07-23 10:43:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tuxpaint.new/tuxpaint.changes 2012-10-06 18:44:34.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 30 08:42:13 UTC 2012 - pgajdos@suse.com + +- fixed build with libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- tuxpaint-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxpaint.spec ++++++ --- /var/tmp/diff_new_pack.lQydEC/_old 2012-10-06 18:44:35.000000000 +0200 +++ /var/tmp/diff_new_pack.lQydEC/_new 2012-10-06 18:44:35.000000000 +0200 @@ -15,26 +15,29 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: tuxpaint Summary: Drawing Program for Young Children -Url: http://www.newbreedsoftware.com/tuxpaint/ License: GPL-2.0+ Group: Productivity/Graphics/Bitmap Editors +Url: http://www.newbreedsoftware.com/tuxpaint/ Version: 0.9.21 -Release: 1 +Release: 0 Source: %{name}-%{version}.tar.bz2 Patch1: tuxpaint-import-eval.patch Patch2: tuxpaint-de_translation.patch Patch3: tuxpaint-linux_arch_links.patch Patch4: tuxpaint-manpage_fix.patch -BuildRequires: fribidi-devel -BuildRequires: libpng-devel -BuildRequires: libpaper-devel +# libpng15.patch sent to bill@newbreedsoftware.com +Patch5: tuxpaint-libpng15.patch BuildRequires: SDL-devel -BuildRequires: SDL_image-devel -BuildRequires: SDL_ttf-devel > 2.0.8 BuildRequires: SDL_Pango-devel +BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel +BuildRequires: SDL_ttf-devel > 2.0.8 +BuildRequires: fribidi-devel +BuildRequires: libpaper-devel +BuildRequires: libpng-devel BuildRequires: zlib-devel # # openSUSE @@ -93,24 +96,23 @@ %package devel Summary: Devel files of tuxpaint -Requires: fribidi-devel -Requires: libpng-devel -Requires: libpaper-devel +Group: Development/Libraries +Requires: %name = %version Requires: SDL-devel +Requires: SDL_Pango-devel Requires: SDL_image-devel Requires: SDL_mixer-devel Requires: SDL_ttf-devel -Requires: SDL_Pango-devel -Requires: %name = %version +Requires: fribidi-devel +Requires: libpaper-devel +Requires: libpng-devel Requires: zlib-devel %if 0%{?suse_version} -Group: Development/Libraries/Other Requires: gcc-c++ Requires: gettext-devel Requires: librsvg-devel %endif %if 0%{?fedora_version} -Group: Development/Libraries Requires: gettext Requires: librsvg2-devel %endif @@ -133,6 +135,7 @@ %patch3 -p0 %endif %patch4 -p0 +%patch5 -p1 sed -i "s|/usr/lib|%_libdir|g" Makefile find . -name CVS -print0 | xargs -0 rm -rf find docs/ -type f -print0 | xargs -0 sed -i "s| $||g" ++++++ tuxpaint-libpng15.patch ++++++ Index: tuxpaint-0.9.21/src/tuxpaint.c =================================================================== --- tuxpaint-0.9.21.orig/src/tuxpaint.c +++ tuxpaint-0.9.21/src/tuxpaint.c @@ -12898,12 +12898,9 @@ static int do_png_save(FILE * fi, const { png_init_io(png_ptr, fi); - info_ptr->width = surf->w; - info_ptr->height = surf->h; - info_ptr->bit_depth = 8; - info_ptr->color_type = PNG_COLOR_TYPE_RGB; - info_ptr->interlace_type = 1; - info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */ + png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, + PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_DEFAULT, + PNG_FILTER_TYPE_DEFAULT); png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, PNG_sRGB_INTENT_PERCEPTUAL); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de