diff options
| author | Bartlomiej Palmowski <rotwang@crux.org.pl> | 2010-11-18 12:15:05 +0100 |
|---|---|---|
| committer | Bartlomiej Palmowski <rotwang@crux.org.pl> | 2010-11-18 12:15:05 +0100 |
| commit | 5884699c0a998f8188feedcf4812bb236cc3da56 (patch) | |
| tree | 9ccbc1c008d7ca9fd31ba9a96f4f7ac77a910974 /mtpaint | |
| parent | 26864cb31819b7130e88325a8e84b220439aafc1 (diff) | |
| download | contrib-5884699c0a998f8188feedcf4812bb236cc3da56.tar.gz contrib-5884699c0a998f8188feedcf4812bb236cc3da56.tar.xz | |
mtpaint: fixed dl url, and added patch fixing png linking breakage
Diffstat (limited to 'mtpaint')
| -rw-r--r-- | mtpaint/.md5sum | 1 | ||||
| -rw-r--r-- | mtpaint/Pkgfile | 3 | ||||
| -rw-r--r-- | mtpaint/png_c.diff | 27 |
3 files changed, 30 insertions, 1 deletions
diff --git a/mtpaint/.md5sum b/mtpaint/.md5sum index b1c722bad..09655ffe1 100644 --- a/mtpaint/.md5sum +++ b/mtpaint/.md5sum @@ -1 +1,2 @@ fbe34eb25f96b6092403115f1f6ab387 mtpaint-3.31.tar.bz2 +22c696ba5b99d84b4e741d77649407be png_c.diff diff --git a/mtpaint/Pkgfile b/mtpaint/Pkgfile index 5ebc4458b..97e3f34d3 100644 --- a/mtpaint/Pkgfile +++ b/mtpaint/Pkgfile @@ -8,10 +8,11 @@ name=mtpaint version=3.31 release=1 -source=(http://dfn.download.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2) +source=(http://dl.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2 png_c.diff) build() { cd $name-$version + patch -p1 -i ../png_c.diff ./configure --prefix=/usr gtk2 cflags man make diff --git a/mtpaint/png_c.diff b/mtpaint/png_c.diff new file mode 100644 index 000000000..550f1a703 --- /dev/null +++ b/mtpaint/png_c.diff @@ -0,0 +1,27 @@ +diff -pruN mtpaint-3.31.old//src/png.c mtpaint-3.31/src/png.c +--- mtpaint-3.31.old//src/png.c 2010-11-18 12:03:43.000000000 +0100 ++++ mtpaint-3.31/src/png.c 2010-11-18 12:07:38.000000000 +0100 +@@ -539,7 +539,11 @@ static int load_png(char *file_name, ls_ + if (settings->bpp == 3) + { + png_set_strip_16(png_ptr); ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8(png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#endif + png_set_palette_to_rgb(png_ptr); + png_set_gray_to_rgb(png_ptr); + +@@ -644,7 +648,11 @@ static int load_png(char *file_name, ls_ + png_set_strip_alpha(png_ptr); + png_set_packing(png_ptr); + if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) ++#if PNG_LIBPNG_VER < 10400 + png_set_gray_1_2_4_to_8(png_ptr); ++#else ++ png_set_expand_gray_1_2_4_to_8(png_ptr); ++#endif + for (i = 0; i < height; i++) + { + row_pointers[i] = settings->img[CHN_IMAGE] + i * width; |