Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 229bc23c62df
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f99c58c703e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 2, 2021

  1. fribidi, bump version (#6223)

    @Begasus
    Begasus authored Oct 2, 2021
    Copy the full SHA
    7f99c58 View commit details
Showing with 31 additions and 3 deletions.
  1. +31 −3 dev-libs/fribidi/{fribidi-1.0.10.recipe → fribidi-1.0.11.recipe}
34 changes: 31 additions & 3 deletions dev-libs/fribidi/fribidi-1.0.10.recipe → dev-libs/fribidi/fribidi-1.0.11.recipe
View file
Original file line number Diff line number Diff line change
@@ -12,17 +12,23 @@ COPYRIGHT="2004 Sharif FarsiWeb, Inc
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="https://github.com/fribidi/fribidi/releases/download/v$portVersion/fribidi-$portVersion.tar.xz"
CHECKSUM_SHA256="7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01"
CHECKSUM_SHA256="30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d"

ARCHITECTURES="all"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"

commandBinDir=$binDir
commandSuffix=$secondaryArchSuffix
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi

libVersion="0.4.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"

PROVIDES="
fribidi$secondaryArchSuffix = $portVersion
cmd:fribidi$secondaryArchSuffix = $portVersion
lib:libfribidi$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
@@ -37,6 +43,17 @@ REQUIRES_devel="
fribidi$secondaryArchSuffix == $portVersion base
"

if [ -z "$secondaryArchSuffix" ]; then
PROVIDES_tools="
fribidi${secondaryArchSuffix}_tools = $portVersion
cmd:fribidi$commandSuffix = $portVersion
"
REQUIRES_tools="
fribidi$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix
"
fi

BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
@@ -60,7 +77,8 @@ defineDebugInfoPackage fribidi$secondaryArchSuffix \
BUILD()
{
autoreconf -vfi
runConfigure ./configure
runConfigure --omit-dirs binDir ./configure \
--bindir=$commandBinDir
make $jobArgs
}

@@ -70,6 +88,11 @@ INSTALL()

rm $libDir/libfribidi.la

# remove command for secondary architecture
if [ -n "$secondaryArchSuffix" ]; then
rm -rf "$commandBinDir"
fi

prepareInstalledDevelLibs libfribidi
fixPkgconfig

@@ -84,6 +107,11 @@ INSTALL()
packageEntries devel \
"$developDir" \
${maybe_manDir:+"$maybe_manDir"}

if [ -z "$secondaryArchSuffix" ]; then
packageEntries tools \
"$commandBinDir"
fi
}

TEST()