haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Backport fixes from release branch.

Browse Source 
- imagemagick: patch was broken, update to latest version and fix.
- libvpx: version 1.0.0 does not build with gcc5
- tiff: remaining .la files
- libtorrent-rasterbar: missing require
- gcc 5.4: missing provides
This commit is contained in:
Adrien Destugues
2016-11-02 11:11:29 +01:00
parent ef0e4104b6
commit 8f4d53938c
6 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media-gfx/imagemagick/imagemagick-6.9.4.1.recipe → media-gfx/imagemagick/imagemagick-6.9.6.3.recipe
View File

@@ -6,12 +6,12 @@ SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear \
and transform images, adjust image colors, apply various special effects, or \
draw text, lines, polygons, ellipses and Bézier curves."
HOMEPAGE="http://www.imagemagick.org"
COPYRIGHT="1999-2014 ImageMagick Studio LLC"
COPYRIGHT="1999-2016 ImageMagick Studio LLC"
LICENSE="IMAGEMAGICK"
REVISION="1"
SOURCE_URI="http://www.imagemagick.org/download/ImageMagick-6.9.4-1.tar.xz"
CHECKSUM_SHA256="2ea0fef839cd5d6f134502b7cf7ee0e57a3f230b19771515d4aa44354f4c6b3b"
SOURCE_DIR="ImageMagick-6.9.4-1"
SOURCE_URI="http://www.imagemagick.org/download/releases/ImageMagick-6.9.6-3.tar.xz"
CHECKSUM_SHA256="c34c16d345e2d158bf9c8cf486d0c559e6c9831c31a50f4bb4cb6cd8ea413656"
SOURCE_DIR="ImageMagick-6.9.6-3"
PATCHES="imagemagick-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -48,6 +48,7 @@ REQUIRES="
lib:libpng16
lib:libtiff
lib:libwebp
lib:libxml2
lib:libz
"
@@ -102,6 +103,7 @@ GLOBAL_WRITABLE_FILES="
settings/ImageMagick-6/type-dejavu.xml keep-old
settings/ImageMagick-6/type-ghostscript.xml keep-old
settings/ImageMagick-6/type-windows.xml keep-old
settings/ImageMagick-6/type-apple.xml keep-old
settings/ImageMagick-6/type.xml keep-old
"

31
media-gfx/imagemagick/patches/imagemagick-6.9.4.1.patchset → media-gfx/imagemagick/patches/imagemagick-6.9.6.3.patchset
View File

@@ -1,4 +1,4 @@
From d02c6270afd73d4d6dc405b08ead2b3a1dc3cc88 Mon Sep 17 00:00:00 2001
From e4541a48e8b683254cb9eff6aa57ac518256ae88 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 26 Oct 2014 17:46:46 +0100
Subject: Make gcc2 happy.
@@ -933,7 +933,7 @@ index 97f621d..08c0316 100644
void Magick::Image::throwImageException(void) const
diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index d72535a..6f27fa5 100644
index d72535a..be07b26 100644
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -105,9 +105,9 @@ void Magick::Options::backgroundTexture(const std::string &backgroundTexture_)
@@ -966,6 +966,15 @@ index d72535a..6f27fa5 100644
}
void Magick::Options::fontFamily(const std::string &family_)
@@ -323,7 +323,7 @@ std::string Magick::Options::fontFamily(void) const
if (_drawInfo->family)
return(std::string(_drawInfo->family));
- return(std::string());
+ return std::string();
}
void Magick::Options::fontPointsize(double pointSize_)
@@ -374,7 +374,7 @@ std::string Magick::Options::format(void) const
if ((magick_info != 0) && (*magick_info->description != '\0'))
return(std::string(magick_info->description));
@@ -1070,10 +1079,10 @@ index 08ae27f..5428bc9 100644
MagickCore::ImageInfo *Magick::ReadOptions::imageInfo(void)
--
2.2.2
2.7.0
From 69d12afe6f20ee70b14265d1260df081374ff62a Mon Sep 17 00:00:00 2001
From 4fb7038056af587bc073761822b4a1bc87a9c7e0 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 26 Oct 2014 17:47:29 +0100
Subject: Don't reset LIBRARY_PATH.
@@ -1082,10 +1091,10 @@ Using a variable named LIBRARY_PATH is not a good idea on Haiku. Just
rename it.
diff --git a/configure.ac b/configure.ac
index bdce73d..0ff7103 100644
index cf556a0..9eb18c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2865,15 +2865,15 @@ AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where ex
@@ -2883,15 +2883,15 @@ AC_DEFINE_UNQUOTED(EXECUTABLE_PATH,"$DEFINE_EXECUTABLE_PATH",[Directory where ex
AC_SUBST(EXECUTABLE_PATH)
# Path to ImageMagick lib
@@ -1101,12 +1110,12 @@ index bdce73d..0ff7103 100644
esac
-AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_LIBRARY_PATH",[Directory where architecture-dependent files live.])
-AC_SUBST(LIBRARY_PATH)
+AC_DEFINE_UNQUOTED(XLIBRARY_PATH,"$DEFINE_XLIBRARY_PATH",[Directory where architecture-dependent files live.])
+AC_DEFINE_UNQUOTED(LIBRARY_PATH,"$DEFINE_XLIBRARY_PATH",[Directory where architecture-dependent files live.])
+AC_SUBST(XLIBRARY_PATH)
#
# path to local binaries
@@ -2890,7 +2890,7 @@ AC_SUBST(LIB_BIN_DIR)
@@ -2908,7 +2908,7 @@ AC_SUBST(LIB_BIN_DIR)
LIB_BIN_DIR_RELATIVE_PATH=$LIB_BIN_DIR
AC_SUBST(LIB_BIN_DIR_RELATIVE_PATH)
@@ -1115,7 +1124,7 @@ index bdce73d..0ff7103 100644
AC_SUBST(LIB_BIN_DIR_PATH)
#
@@ -2910,7 +2910,7 @@ AC_SUBST(MODULES_DIRNAME)
@@ -2928,7 +2928,7 @@ AC_SUBST(MODULES_DIRNAME)
MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
AC_SUBST(MODULES_RELATIVE_PATH)
@@ -1124,7 +1133,7 @@ index bdce73d..0ff7103 100644
AC_SUBST(MODULES_PATH)
#
@@ -3003,7 +3003,7 @@ AC_SUBST(SHAREARCH_DIRNAME)
@@ -3021,7 +3021,7 @@ AC_SUBST(SHAREARCH_DIRNAME)
SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
AC_SUBST(SHAREARCH_RELATIVE_PATH)
@@ -1134,5 +1143,5 @@ index bdce73d..0ff7103 100644
#
--
2.2.2
2.7.0

4
media-libs/libvpx/libvpx-1.0.0.recipe
View File

@@ -17,8 +17,8 @@ CHECKSUM_SHA256="07cedb0a19a44e6d81d75f52eea864f59ef10c6c725cb860431bec6641eafe2
SOURCE_DIR="libvpx-v1.0.0"
PATCHES="libvpx-1.0.0.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
ARCHITECTURES="x86_gcc2 !x86 !x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 !x86"
PROVIDES="
libvpx$secondaryArchSuffix = $portVersion

1
media-libs/tiff/tiff4-4.0.6.recipe
View File

@@ -113,6 +113,7 @@ INSTALL()
prepareInstalledDevelLibs libtiff libtiffxx
fixPkgconfig
rm -f $developLibDir/*.la
# devel package
packageEntries devel \

1
net-libs/libtorrent-rasterbar/libtorrent_rasterbar-1.0.9.recipe
View File

@@ -28,6 +28,7 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_atomic$secondaryArchSuffix
lib:libboost_chrono$secondaryArchSuffix
lib:libboost_date_time$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix

10
sys-devel/gcc/gcc-5.4.0_2016_06_04.recipe
View File

@@ -288,10 +288,12 @@ INSTALL()
### Sub Packages ##########################################
packageEntries "syslibs" \
$relativeLibDir/libatomic.so \
$relativeLibDir/libatomic.so.$libatomicSoVersion \
$relativeLibDir/libatomic.so.$libatomicLibVersion \
$relativeLibDir/libgcc_s.so \
$relativeLibDir/libgcc_s.so.$libgccSoVersion \
$relativeLibDir/libgomp.so \
$relativeLibDir/libgomp.so.$libgompSoVersion \
$relativeLibDir/libgomp.so.$libgompLibVersion \
$relativeLibDir/libstdc++.so \
@@ -343,5 +345,13 @@ required by Haiku's build system when building Haiku."
PROVIDES_syslibs_devel="
gcc${secondaryArchSuffix}_syslibs_devel = $portVersion compat >= 5
devel:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion
devel:libgcc_kernel$secondaryArchSuffix = $portVersion compat >= 4
devel:libgcc$secondaryArchSuffix = $portVersion compat >= 4
devel:libgcc_eh$secondaryArchSuffix = $portVersion compat >= 4
devel:libgomp$secondaryArchSuffix = $libgompLibVersion compat >= $libgompSoVersion
devel:libstdc++$secondaryArchSuffix = $portVersion compat >= 4
devel:libsupc++$secondaryArchSuffix = $portVersion compat >= 4
devel:libsupc++_kernel$secondaryArchSuffix = $portVersion compat >= 4
"
REQUIRES_syslibs_devel=""