From 9bd14413378613557f3419555ba784e2b209f913 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 26 Nov 2018 06:38:59 +0100 Subject: ufraw: fix build with gcc7 --- manualPorts/ufraw/.footprint | 11 ++++++++--- manualPorts/ufraw/.md5sum | 1 + manualPorts/ufraw/.signature | 7 ++++--- manualPorts/ufraw/Pkgfile | 6 ++++-- manualPorts/ufraw/ufraw-0.22-gcc7-1.patch | 22 ++++++++++++++++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 manualPorts/ufraw/ufraw-0.22-gcc7-1.patch diff --git a/manualPorts/ufraw/.footprint b/manualPorts/ufraw/.footprint index 491cf40..436ef0b 100644 --- a/manualPorts/ufraw/.footprint +++ b/manualPorts/ufraw/.footprint @@ -2,13 +2,18 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/ufraw -rwxr-xr-x root/root usr/bin/ufraw-batch -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/ufraw.1.gz +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/gimp/ +drwxr-xr-x root/root usr/lib/gimp/2.0/ +drwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/ +-rwxr-xr-x root/root usr/lib/gimp/2.0/plug-ins/ufraw-gimp drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/appdata/ -rw-r--r-- root/root usr/share/appdata/ufraw.appdata.xml drwxr-xr-x root/root usr/share/applications/ -rw-r--r-- root/root usr/share/applications/ufraw.desktop +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/ufraw.1.gz drwxr-xr-x root/root usr/share/pixmaps/ -rw-r--r-- root/root usr/share/pixmaps/ufraw.png diff --git a/manualPorts/ufraw/.md5sum b/manualPorts/ufraw/.md5sum index 325fdb1..135afa9 100644 --- a/manualPorts/ufraw/.md5sum +++ b/manualPorts/ufraw/.md5sum @@ -1 +1,2 @@ +2d03f213c7b4ffeaf857f8519f1e000d ufraw-0.22-gcc7-1.patch c30767cae2c44310f2a3d67d7a76f2c3 ufraw-0.22.tar.gz diff --git a/manualPorts/ufraw/.signature b/manualPorts/ufraw/.signature index cf59afa..a0b3dbe 100644 --- a/manualPorts/ufraw/.signature +++ b/manualPorts/ufraw/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/deepthought.pub -RWQxCptPusLGGul1r86ZV5hGBLh3dWfFJJI/Edkl437YltcGuCT0IlgU/Y/G7EInkH4H3VeicUl8HTaHJoBqwJ1NGQwYmCOLZwI= -SHA256 (Pkgfile) = 14088ffeff58db192b568830927ec09121cd7f4f0e6ee96384224ea650824bb7 -SHA256 (.footprint) = 94c1c59ca736f9bdb787ddf9ae7628b7bcb39a6da998ef4efa6b6b52a0f2a369 +RWQxCptPusLGGmTJIZItf5HHhrK5Rlf2NG1msUUDcN8CXyYeG/+HEyUeGvkQPXkZ6JhL+9NZLKgOg1PdaqyKQ36XEeolaYQ32g4= +SHA256 (Pkgfile) = 8f0c40bf56798bf8cafaa1a0f8f79d445f1ae80bd8543ac64766f1449a2c9f02 +SHA256 (.footprint) = 4d93ca9b652399befb78849ced42882cc75ff62362ba1b35f27c6f0ae2424676 SHA256 (ufraw-0.22.tar.gz) = f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e +SHA256 (ufraw-0.22-gcc7-1.patch) = 562bdf3e920c928f48eda4bab54d1e85c6d8331416632a228d147c76d170151b diff --git a/manualPorts/ufraw/Pkgfile b/manualPorts/ufraw/Pkgfile index 27dd988..d2f909e 100644 --- a/manualPorts/ufraw/Pkgfile +++ b/manualPorts/ufraw/Pkgfile @@ -6,12 +6,14 @@ name=ufraw version=0.22 -release=2 -source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz) +release=3 +source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz ufraw-0.22-gcc7-1.patch) build() { cd $name-$version + patch -p1 -i../ufraw-0.22-gcc7-1.patch + ./configure --prefix=/usr \ --mandir=/usr/share/man \ --with-gimp \ diff --git a/manualPorts/ufraw/ufraw-0.22-gcc7-1.patch b/manualPorts/ufraw/ufraw-0.22-gcc7-1.patch new file mode 100644 index 0000000..ccad6dd --- /dev/null +++ b/manualPorts/ufraw/ufraw-0.22-gcc7-1.patch @@ -0,0 +1,22 @@ +Description: Fixes build failure with gcc-7.1 : + +dcraw.cc:9245:16: error: call of overloaded 'abs(unsigned int&)' is ambiguous + if (abs(i) < abs(c)) { + +This was a speculative change to get it to build - I have no idea what that +particular hunk of ocde does, but this seems to match the current version of +dcraw.c (9.27). + +--- ufraw-0.22/dcraw.cc.orig 2017-05-15 03:52:55.360068631 +0100 ++++ ufraw-0.22/dcraw.cc 2017-05-15 04:06:36.962790098 +0100 +@@ -8766,8 +8766,8 @@ + "Nikon", "Nokia", "Olympus", "Pentax", "Phase One", "Ricoh", + "Samsung", "Sigma", "Sinar", "Sony" }; + char head[32], *cp; +- unsigned fsize, i, c; +- int hlen, flen, zero_fsize=1; ++ unsigned fsize; ++ int hlen, flen, zero_fsize=1, i, c; + struct jhead jh; + + tiff_flip = flip = filters = UINT_MAX; /* unknown */ -- cgit v1.2.3-54-g00ecf