From f13bc12ff778316743fd5e20783ff5a5a5386c90 Mon Sep 17 00:00:00 2001
From: Petar Petrov <slackalaxy@gmail.com>
Date: Tue, 18 May 2021 17:26:57 +0300
Subject: graphics/fyre: fix build

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/fyre/fix_extern_c.patch | 14 ++++++++++++++
 graphics/fyre/fyre.SlackBuild    | 22 +++++++++++++---------
 graphics/fyre/fyre.info          |  2 +-
 3 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 graphics/fyre/fix_extern_c.patch

(limited to 'graphics/fyre')

diff --git a/graphics/fyre/fix_extern_c.patch b/graphics/fyre/fix_extern_c.patch
new file mode 100644
index 000000000000..a46b14bef662
--- /dev/null
+++ b/graphics/fyre/fix_extern_c.patch
@@ -0,0 +1,14 @@
+diff -pruN old/src/exr.cpp new/src/exr.cpp
+--- old/src/exr.cpp	2006-01-04 02:16:52.000000000 +0200
++++ new/src/exr.cpp	2021-05-04 15:28:09.314813642 +0300
+@@ -22,10 +22,8 @@
+  *
+  */
+ 
+-extern "C" {
+ #include "histogram-imager.h"
+ #include "config.h"
+-}
+ 
+ #include <ImfRgbaFile.h>
+ using namespace Imf;
diff --git a/graphics/fyre/fyre.SlackBuild b/graphics/fyre/fyre.SlackBuild
index fc71e89554d3..c343dc10d56c 100644
--- a/graphics/fyre/fyre.SlackBuild
+++ b/graphics/fyre/fyre.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fyre
 
-# Copyright 2013-2016 Petar Petrov slackalaxy@gmail.com
+# Copyright 2013-2021 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,12 +24,12 @@
 
 PRGNAM=fyre
 VERSION=${VERSION:-1.0.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -64,10 +64,14 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# Seems thiese two includes should not be in a function:
+# https://forum.qt.io/topic/61763/template-with-c-linkage-error/14
+patch -p1 -i $CWD/fix_extern_c.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/graphics/fyre/fyre.info b/graphics/fyre/fyre.info
index cc190c18be8e..dd76380ec7b6 100644
--- a/graphics/fyre/fyre.info
+++ b/graphics/fyre/fyre.info
@@ -1,7 +1,7 @@
 PRGNAM="fyre"
 VERSION="1.0.1"
 HOMEPAGE="http://fyre.navi.cx/"
-DOWNLOAD="http://releases.navi.cx/fyre/fyre-1.0.1.tar.gz"
+DOWNLOAD="http://slackware.uk/sbosrcarch/by-name/graphics/fyre/fyre-1.0.1.tar.gz"
 MD5SUM="44d5830c527325c1ee6fa6ea92b4ba03"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-- 
cgit v1.2.3