diff options
| author | Antti Nykanen <aon@iki.fi> | 2008-09-13 14:17:38 +0000 |
|---|---|---|
| committer | Antti Nykanen <aon@iki.fi> | 2008-09-13 14:17:56 +0000 |
| commit | 74ec2acbed738b29254d4687f9d33bbe6b312862 (patch) | |
| tree | 5d7e9972d8f151bfca5308baf86a6a5553a0090c /netpbm | |
| parent | 44a3bcf5629264e6eda7e84310ce8f9e7a71b603 (diff) | |
| download | opt-74ec2acbed738b29254d4687f9d33bbe6b312862.tar.gz opt-74ec2acbed738b29254d4687f9d33bbe6b312862.tar.xz | |
netpbm: updated to 10.35.51
Diffstat (limited to 'netpbm')
| -rw-r--r-- | netpbm/.md5sum | 3 | ||||
| -rw-r--r-- | netpbm/Pkgfile | 4 | ||||
| -rw-r--r-- | netpbm/netpbm-10.35.51.diff | 28 |
3 files changed, 33 insertions, 2 deletions
diff --git a/netpbm/.md5sum b/netpbm/.md5sum index 27849ab3c..0a63c3bef 100644 --- a/netpbm/.md5sum +++ b/netpbm/.md5sum @@ -1,2 +1,3 @@ 5aa32e99a1e58adbbd28928d1086183e Makefile.config -25c2dcec8ddaabc453b68f4e789fd0e2 netpbm-10.35.49.tar.gz +10495d2d5d88635df58c446a9ee01532 netpbm-10.35.51.diff +26eefdaa769828bd435ebe83b58592c0 netpbm-10.35.51.tar.gz diff --git a/netpbm/Pkgfile b/netpbm/Pkgfile index f9e075d30..f2b8620e5 100644 --- a/netpbm/Pkgfile +++ b/netpbm/Pkgfile @@ -4,15 +4,17 @@ # Depends on: ghostscript name=netpbm -version=10.35.49 +version=10.35.51 release=1 source=(http://crux.nu/~aon/$name/$name-$version.tar.gz + $name-$version.diff Makefile.config) build() { export MAKEFLAGS="$MAKEFLAGS -j1" cd netpbm-$version + patch -p0 -i $SRC/$name-$version.diff sed -e "s|#CFLAGS#|$CFLAGS|" $SRC/Makefile.config > Makefile.config make make pkgdir=$PKG/usr package diff --git a/netpbm/netpbm-10.35.51.diff b/netpbm/netpbm-10.35.51.diff new file mode 100644 index 000000000..f27c7b5eb --- /dev/null +++ b/netpbm/netpbm-10.35.51.diff @@ -0,0 +1,28 @@ +--- editor/pamcomp.c~ 2008-09-13 14:01:30.000000000 +0000 ++++ editor/pamcomp.c 2008-09-13 14:01:47.000000000 +0000 +@@ -325,25 +325,6 @@ validateComputableHeight(int const origi + + + static void +-validateComputableHeight(int const originTop, +- int const overRows) { +- +- if (originTop < 0) { +- if (originTop < -INT_MAX) +- pm_error("Overlay starts too far above the underlay image to be " +- "computable. Overlay can be at most %d rows above " +- "the underlay.", INT_MAX); +- } else { +- if (INT_MAX - originTop <= overRows) +- pm_error("Too many total rows involved to be computable. " +- "You must have a shorter overlay image or compose it " +- "higher on the underlay image."); +- } +-} +- +- +- +-static void + computeOverlayPosition(int const underCols, + int const underRows, + int const overCols, |