* [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
@ 2021-01-01 14:43 sgn
2021-01-02 2:37 ` [PR REVIEW] " ericonr
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: sgn @ 2021-01-01 14:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages freetype-fix-config
https://github.com/void-linux/void-packages/pull/27599
freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
A patch file from https://github.com/void-linux/void-packages/pull/27599.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freetype-fix-config-27599.patch --]
[-- Type: text/x-diff, Size: 2583 bytes --]
From ad65e619c4cc51b350b71b260d031c3ad3d31de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in
freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
---
common/hooks/pre-configure/02-script-wrapper.sh | 9 ++++++++-
srcpkgs/freetype/template | 10 ++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..c3a0326027b 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
done
}
+link_wrapper() {
+ local wrapper="$1"
+ [ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+ [ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+ ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
hook() {
export PATH="$XBPS_WRAPPERDIR:$PATH"
@@ -186,9 +193,9 @@ hook() {
pkgconfig_wrapper
vapigen_wrapper
valac_wrapper
+ link_wrapper freetype-config
generic_wrapper icu-config
generic_wrapper libgcrypt-config
- generic_wrapper freetype-config
generic_wrapper sdl-config
generic_wrapper sdl2-config
generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..12a15e8ce69 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
# Template file for 'freetype'
pkgname=freetype
version=2.10.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
@@ -16,10 +16,16 @@ checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
post_install() {
vlicense docs/LICENSE.TXT
vlicense docs/FTL.TXT
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s/${XBPS_CROSS_TRIPLET}-pkg-config/pkg-config/" \
+ $DESTDIR/usr/bin/freetype-config
+ fi
}
freetype-devel_package() {
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ # depends on pkg-config unconditionally to simplify our wrappers
+ depends="${makedepends} pkg-config
+ ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
for f in bin include share; do
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
2021-01-01 14:43 [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config sgn
@ 2021-01-02 2:37 ` ericonr
2021-01-03 9:23 ` sgn
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-01-02 2:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27599#discussion_r550833920
Comment:
`vsed`?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
2021-01-01 14:43 [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config sgn
2021-01-02 2:37 ` [PR REVIEW] " ericonr
@ 2021-01-03 9:23 ` sgn
2021-01-03 13:06 ` [PR PATCH] [Updated] " sgn
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-01-03 9:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/27599#discussion_r550979863
Comment:
I think `sed` is fine in `post_install`. :shrug:
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
2021-01-01 14:43 [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config sgn
2021-01-02 2:37 ` [PR REVIEW] " ericonr
2021-01-03 9:23 ` sgn
@ 2021-01-03 13:06 ` sgn
2021-01-03 13:17 ` sgn
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-01-03 13:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages freetype-fix-config
https://github.com/void-linux/void-packages/pull/27599
freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
A patch file from https://github.com/void-linux/void-packages/pull/27599.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freetype-fix-config-27599.patch --]
[-- Type: text/x-diff, Size: 9061 bytes --]
From e141f445f90c14d3ca258fd2c7ff17d71741daf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 1/7] freetype: clean XBPS_CROSS_TRIPLET reference in
freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
---
common/hooks/pre-configure/02-script-wrapper.sh | 15 ++++++++++++++-
srcpkgs/freetype/template | 6 +++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..9ca195d5a58 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
done
}
+link_wrapper() {
+ local wrapper="$1"
+ [ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+ [ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+ ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
hook() {
export PATH="$XBPS_WRAPPERDIR:$PATH"
@@ -186,9 +193,15 @@ hook() {
pkgconfig_wrapper
vapigen_wrapper
valac_wrapper
+
+ if [ -x /usr/bin/pkg-config ]; then
+ link_wrapper freetype-config
+ else
+ generic_wrapper freetype-config
+ fi
+
generic_wrapper icu-config
generic_wrapper libgcrypt-config
- generic_wrapper freetype-config
generic_wrapper sdl-config
generic_wrapper sdl2-config
generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..ba4c6ad900c 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
# Template file for 'freetype'
pkgname=freetype
version=2.10.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://www.freetype.org/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
+post_patch() {
+ vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
+}
+
post_install() {
vlicense docs/LICENSE.TXT
vlicense docs/FTL.TXT
From 3bd5af6f8132f803cdeb2a4ea6dc1123a5225d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 2/7] SDL_ttf: remove unnecessary CFLAGS
---
srcpkgs/SDL_ttf/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index 72293431f32..294116bd0a7 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -13,8 +13,6 @@ homepage="http://www.libsdl.org/projects/${pkgname}"
distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
SDL_ttf-devel_package() {
depends="freetype-devel SDL-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 0a80351556d238872ca21a2bb79eb03ba8f6d868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 3/7] libopenshot-audio: remove unnecessary CXXFLAGS
---
srcpkgs/libopenshot-audio/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template
index d9a6a719734..56c330eafcf 100644
--- a/srcpkgs/libopenshot-audio/template
+++ b/srcpkgs/libopenshot-audio/template
@@ -13,8 +13,6 @@ homepage="https://github.com/OpenShot/libopenshot-audio"
distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz"
checksum=937ff4f1c2dfb8ab5d56ad85beacaa29dfd5a79af0d9cf647386034fe9882309
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
CXXFLAGS+=" -latomic "
From b69b6d63b3a01d65d827f5057e98b712ba61b33d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 4/7] tumbler: remove unnecessary CFLAGS
---
srcpkgs/tumbler/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index fe37a85871a..dcdd7cfd40e 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -14,8 +14,6 @@ homepage="https://xfce.org/"
distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
tumbler-devel_package() {
depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 30908f05821eb1fbafa271d6d4c2fd3ded89bf80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:47:18 +0700
Subject: [PATCH 5/7] wmx: simply template
---
srcpkgs/wmx/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wmx/template b/srcpkgs/wmx/template
index 32cd09e57b9..6e24a5419bb 100644
--- a/srcpkgs/wmx/template
+++ b/srcpkgs/wmx/template
@@ -1,15 +1,14 @@
# Template file for 'wmx'
pkgname=wmx
version=8
-revision=3
+revision=4
build_style=gnu-configure
-make_build_args="LDFLAGS+=-lXft LDFLAGS+=-lfontconfig
- CXXFLAGS+=-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel freetype-devel
- libXft-devel fontconfig-devel libXcomposite-devel"
+hostmakedepends="pkg-config"
+makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel
+ freetype-devel libXft-devel fontconfig-devel libXcomposite-devel"
short_desc="Simple window manager for X"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
homepage="http://www.all-day-breakfast.com/wmx"
distfiles="http://www.all-day-breakfast.com/wmx/wmx-${version}.tar.gz"
checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
@@ -17,4 +16,8 @@ checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
do_install() {
vbin wmx
vinstall ${FILESDIR}/wmx.desktop 644 usr/share/xsessions
+ vlicense README
+ vlicense README.contrib
+ sed -ne '4,13p' Rotated.C >LICENSE.xvertext
+ vlicense LICENSE.xvertext
}
From e37a67b35b2c7bfde1bcbf064797959221c01096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:57:25 +0700
Subject: [PATCH 6/7] slim: simplify template
---
srcpkgs/slim/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index b86c951e188..b7382cac308 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -3,8 +3,7 @@ pkgname=slim
version=1.3.6
revision=13
build_style=cmake
-configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes
- -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2"
+configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes"
conf_files="/etc/slim.conf /etc/pam.d/slim"
hostmakedepends="pkg-config"
makedepends="libpng-devel freetype-devel libjpeg-turbo-devel libXrandr-devel
@@ -21,11 +20,8 @@ case "$XBPS_TARGET_MACHINE" in
*-musl) CXXFLAGS="-DNEEDS_BASENAME";;
esac
-pre_configure() {
- sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
-}
post_install() {
vsv slim
vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
- rm -rf ${DESTDIR}/usr/lib/systemd
+ rm -rf ${DESTDIR}/lib/systemd
}
From 46a2faae4bee687031184d818a72a1f6aaafebc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:57:44 +0700
Subject: [PATCH 7/7] texlive: remove freetype2-config hacks
---
srcpkgs/texlive/template | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index f416e853534..42d7bfcdf45 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -172,16 +172,6 @@ post_patch() {
popd
}
-pre_configure() {
- if [ "$CROSS_BUILD" ] ; then
- # For some reason, when cross-building, the configure script has this path
- # for freetype2 include:
- # /usr/x86_64-linux-musl/usr/x86_64-linux-musl/usr/include/freetype2.
- # It shouldn't have two /usr/x86_64-linux-musl's, add it to CPPFLAGS.
- CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
- fi
-}
-
pre_build() {
if [ -n "$build_option_luajit" ] ; then
export HOST_CC="${_luajit_host_cc}"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
2021-01-01 14:43 [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config sgn
` (2 preceding siblings ...)
2021-01-03 13:06 ` [PR PATCH] [Updated] " sgn
@ 2021-01-03 13:17 ` sgn
2021-01-03 13:18 ` sgn
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-01-03 13:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages freetype-fix-config
https://github.com/void-linux/void-packages/pull/27599
freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
A patch file from https://github.com/void-linux/void-packages/pull/27599.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freetype-fix-config-27599.patch --]
[-- Type: text/x-diff, Size: 9307 bytes --]
From e141f445f90c14d3ca258fd2c7ff17d71741daf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 1/7] freetype: clean XBPS_CROSS_TRIPLET reference in
freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
---
common/hooks/pre-configure/02-script-wrapper.sh | 15 ++++++++++++++-
srcpkgs/freetype/template | 6 +++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..9ca195d5a58 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
done
}
+link_wrapper() {
+ local wrapper="$1"
+ [ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+ [ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+ ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
hook() {
export PATH="$XBPS_WRAPPERDIR:$PATH"
@@ -186,9 +193,15 @@ hook() {
pkgconfig_wrapper
vapigen_wrapper
valac_wrapper
+
+ if [ -x /usr/bin/pkg-config ]; then
+ link_wrapper freetype-config
+ else
+ generic_wrapper freetype-config
+ fi
+
generic_wrapper icu-config
generic_wrapper libgcrypt-config
- generic_wrapper freetype-config
generic_wrapper sdl-config
generic_wrapper sdl2-config
generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..ba4c6ad900c 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
# Template file for 'freetype'
pkgname=freetype
version=2.10.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://www.freetype.org/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
+post_patch() {
+ vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
+}
+
post_install() {
vlicense docs/LICENSE.TXT
vlicense docs/FTL.TXT
From fae3d0fc03e27121a281551ebcffce23aaf22921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 2/7] SDL_ttf: remove unnecessary CFLAGS
---
srcpkgs/SDL_ttf/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index 72293431f32..5bbe29a5ee9 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -8,12 +8,14 @@ hostmakedepends="pkg-config"
makedepends="freetype-devel SDL-devel libSM-devel"
short_desc="Use TrueType fonts in your SDL applications"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
+license="Zlib"
homepage="http://www.libsdl.org/projects/${pkgname}"
distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
+post_install() {
+ vlicense COPYING
+}
SDL_ttf-devel_package() {
depends="freetype-devel SDL-devel ${sourcepkg}>=${version}_${revision}"
From 978f47a16b285dc482b52ac112f947ad0b034fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 3/7] libopenshot-audio: remove unnecessary CXXFLAGS
---
srcpkgs/libopenshot-audio/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template
index d9a6a719734..56c330eafcf 100644
--- a/srcpkgs/libopenshot-audio/template
+++ b/srcpkgs/libopenshot-audio/template
@@ -13,8 +13,6 @@ homepage="https://github.com/OpenShot/libopenshot-audio"
distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz"
checksum=937ff4f1c2dfb8ab5d56ad85beacaa29dfd5a79af0d9cf647386034fe9882309
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
CXXFLAGS+=" -latomic "
From d01ca9018b3116cb2aedb3f161f16c283190cab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 4/7] tumbler: remove unnecessary CFLAGS
---
srcpkgs/tumbler/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index fe37a85871a..dcdd7cfd40e 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -14,8 +14,6 @@ homepage="https://xfce.org/"
distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
tumbler-devel_package() {
depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From ecfc55e491884e1d6e72be10235c718b50c54798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:47:18 +0700
Subject: [PATCH 5/7] wmx: simply template
---
srcpkgs/wmx/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wmx/template b/srcpkgs/wmx/template
index 32cd09e57b9..6e24a5419bb 100644
--- a/srcpkgs/wmx/template
+++ b/srcpkgs/wmx/template
@@ -1,15 +1,14 @@
# Template file for 'wmx'
pkgname=wmx
version=8
-revision=3
+revision=4
build_style=gnu-configure
-make_build_args="LDFLAGS+=-lXft LDFLAGS+=-lfontconfig
- CXXFLAGS+=-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel freetype-devel
- libXft-devel fontconfig-devel libXcomposite-devel"
+hostmakedepends="pkg-config"
+makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel
+ freetype-devel libXft-devel fontconfig-devel libXcomposite-devel"
short_desc="Simple window manager for X"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
homepage="http://www.all-day-breakfast.com/wmx"
distfiles="http://www.all-day-breakfast.com/wmx/wmx-${version}.tar.gz"
checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
@@ -17,4 +16,8 @@ checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
do_install() {
vbin wmx
vinstall ${FILESDIR}/wmx.desktop 644 usr/share/xsessions
+ vlicense README
+ vlicense README.contrib
+ sed -ne '4,13p' Rotated.C >LICENSE.xvertext
+ vlicense LICENSE.xvertext
}
From 1d3aad126af126bc54c829f2d20c27588249d70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:57:25 +0700
Subject: [PATCH 6/7] slim: simplify template
---
srcpkgs/slim/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index b86c951e188..b7382cac308 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -3,8 +3,7 @@ pkgname=slim
version=1.3.6
revision=13
build_style=cmake
-configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes
- -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2"
+configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes"
conf_files="/etc/slim.conf /etc/pam.d/slim"
hostmakedepends="pkg-config"
makedepends="libpng-devel freetype-devel libjpeg-turbo-devel libXrandr-devel
@@ -21,11 +20,8 @@ case "$XBPS_TARGET_MACHINE" in
*-musl) CXXFLAGS="-DNEEDS_BASENAME";;
esac
-pre_configure() {
- sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
-}
post_install() {
vsv slim
vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
- rm -rf ${DESTDIR}/usr/lib/systemd
+ rm -rf ${DESTDIR}/lib/systemd
}
From 39875421d74e4deecb1b7d0620c907a92b174930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:57:44 +0700
Subject: [PATCH 7/7] texlive: remove freetype2-config hacks
---
srcpkgs/texlive/template | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index f416e853534..42d7bfcdf45 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -172,16 +172,6 @@ post_patch() {
popd
}
-pre_configure() {
- if [ "$CROSS_BUILD" ] ; then
- # For some reason, when cross-building, the configure script has this path
- # for freetype2 include:
- # /usr/x86_64-linux-musl/usr/x86_64-linux-musl/usr/include/freetype2.
- # It shouldn't have two /usr/x86_64-linux-musl's, add it to CPPFLAGS.
- CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
- fi
-}
-
pre_build() {
if [ -n "$build_option_luajit" ] ; then
export HOST_CC="${_luajit_host_cc}"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
2021-01-01 14:43 [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config sgn
` (3 preceding siblings ...)
2021-01-03 13:17 ` sgn
@ 2021-01-03 13:18 ` sgn
2021-01-03 13:24 ` sgn
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-01-03 13:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages freetype-fix-config
https://github.com/void-linux/void-packages/pull/27599
freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
A patch file from https://github.com/void-linux/void-packages/pull/27599.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freetype-fix-config-27599.patch --]
[-- Type: text/x-diff, Size: 9360 bytes --]
From e141f445f90c14d3ca258fd2c7ff17d71741daf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 1/7] freetype: clean XBPS_CROSS_TRIPLET reference in
freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
---
common/hooks/pre-configure/02-script-wrapper.sh | 15 ++++++++++++++-
srcpkgs/freetype/template | 6 +++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..9ca195d5a58 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
done
}
+link_wrapper() {
+ local wrapper="$1"
+ [ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+ [ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+ ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
hook() {
export PATH="$XBPS_WRAPPERDIR:$PATH"
@@ -186,9 +193,15 @@ hook() {
pkgconfig_wrapper
vapigen_wrapper
valac_wrapper
+
+ if [ -x /usr/bin/pkg-config ]; then
+ link_wrapper freetype-config
+ else
+ generic_wrapper freetype-config
+ fi
+
generic_wrapper icu-config
generic_wrapper libgcrypt-config
- generic_wrapper freetype-config
generic_wrapper sdl-config
generic_wrapper sdl2-config
generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..ba4c6ad900c 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
# Template file for 'freetype'
pkgname=freetype
version=2.10.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://www.freetype.org/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
+post_patch() {
+ vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
+}
+
post_install() {
vlicense docs/LICENSE.TXT
vlicense docs/FTL.TXT
From cc37ad7a3945ced1c5c341e76bd3cb6168303f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 2/7] SDL_ttf: remove unnecessary CFLAGS
---
srcpkgs/SDL_ttf/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index 72293431f32..cdb46016a72 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -8,12 +8,14 @@ hostmakedepends="pkg-config"
makedepends="freetype-devel SDL-devel libSM-devel"
short_desc="Use TrueType fonts in your SDL applications"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://www.libsdl.org/projects/${pkgname}"
+license="Zlib"
+homepage="http://www.libsdl.org/projects/SDL_ttf"
distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
+post_install() {
+ vlicense COPYING
+}
SDL_ttf-devel_package() {
depends="freetype-devel SDL-devel ${sourcepkg}>=${version}_${revision}"
From 57933e9e909dd8d6a8a044675d82f090c62005db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 3/7] libopenshot-audio: remove unnecessary CXXFLAGS
---
srcpkgs/libopenshot-audio/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template
index d9a6a719734..56c330eafcf 100644
--- a/srcpkgs/libopenshot-audio/template
+++ b/srcpkgs/libopenshot-audio/template
@@ -13,8 +13,6 @@ homepage="https://github.com/OpenShot/libopenshot-audio"
distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz"
checksum=937ff4f1c2dfb8ab5d56ad85beacaa29dfd5a79af0d9cf647386034fe9882309
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
CXXFLAGS+=" -latomic "
From 33313a8c7913769f04a8d9c840bd844c9d3c74cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 4/7] tumbler: remove unnecessary CFLAGS
---
srcpkgs/tumbler/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index fe37a85871a..dcdd7cfd40e 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -14,8 +14,6 @@ homepage="https://xfce.org/"
distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
tumbler-devel_package() {
depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From 2e7e1bc7159c81d119ae190c80d0a7a2dad91492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:47:18 +0700
Subject: [PATCH 5/7] wmx: simply template
---
srcpkgs/wmx/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wmx/template b/srcpkgs/wmx/template
index 32cd09e57b9..6e24a5419bb 100644
--- a/srcpkgs/wmx/template
+++ b/srcpkgs/wmx/template
@@ -1,15 +1,14 @@
# Template file for 'wmx'
pkgname=wmx
version=8
-revision=3
+revision=4
build_style=gnu-configure
-make_build_args="LDFLAGS+=-lXft LDFLAGS+=-lfontconfig
- CXXFLAGS+=-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel freetype-devel
- libXft-devel fontconfig-devel libXcomposite-devel"
+hostmakedepends="pkg-config"
+makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel
+ freetype-devel libXft-devel fontconfig-devel libXcomposite-devel"
short_desc="Simple window manager for X"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
homepage="http://www.all-day-breakfast.com/wmx"
distfiles="http://www.all-day-breakfast.com/wmx/wmx-${version}.tar.gz"
checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
@@ -17,4 +16,8 @@ checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
do_install() {
vbin wmx
vinstall ${FILESDIR}/wmx.desktop 644 usr/share/xsessions
+ vlicense README
+ vlicense README.contrib
+ sed -ne '4,13p' Rotated.C >LICENSE.xvertext
+ vlicense LICENSE.xvertext
}
From 468c8c427f5d73b4872e67e3f0402e2bb60a1130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:57:25 +0700
Subject: [PATCH 6/7] slim: simplify template
---
srcpkgs/slim/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index b86c951e188..b7382cac308 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -3,8 +3,7 @@ pkgname=slim
version=1.3.6
revision=13
build_style=cmake
-configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes
- -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2"
+configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes"
conf_files="/etc/slim.conf /etc/pam.d/slim"
hostmakedepends="pkg-config"
makedepends="libpng-devel freetype-devel libjpeg-turbo-devel libXrandr-devel
@@ -21,11 +20,8 @@ case "$XBPS_TARGET_MACHINE" in
*-musl) CXXFLAGS="-DNEEDS_BASENAME";;
esac
-pre_configure() {
- sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
-}
post_install() {
vsv slim
vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
- rm -rf ${DESTDIR}/usr/lib/systemd
+ rm -rf ${DESTDIR}/lib/systemd
}
From 08435e1448653916cb50fa5c53207d9864ea933f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:57:44 +0700
Subject: [PATCH 7/7] texlive: remove freetype2-config hacks
---
srcpkgs/texlive/template | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index f416e853534..42d7bfcdf45 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -172,16 +172,6 @@ post_patch() {
popd
}
-pre_configure() {
- if [ "$CROSS_BUILD" ] ; then
- # For some reason, when cross-building, the configure script has this path
- # for freetype2 include:
- # /usr/x86_64-linux-musl/usr/x86_64-linux-musl/usr/include/freetype2.
- # It shouldn't have two /usr/x86_64-linux-musl's, add it to CPPFLAGS.
- CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
- fi
-}
-
pre_build() {
if [ -n "$build_option_luajit" ] ; then
export HOST_CC="${_luajit_host_cc}"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
2021-01-01 14:43 [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config sgn
` (4 preceding siblings ...)
2021-01-03 13:18 ` sgn
@ 2021-01-03 13:24 ` sgn
2021-01-03 23:28 ` [PR REVIEW] " sgn
2021-01-04 23:41 ` [PR PATCH] [Merged]: " sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-01-03 13:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages freetype-fix-config
https://github.com/void-linux/void-packages/pull/27599
freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
A patch file from https://github.com/void-linux/void-packages/pull/27599.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-freetype-fix-config-27599.patch --]
[-- Type: text/x-diff, Size: 9514 bytes --]
From 71806d9542a31a6f411fe89404fb5480ba27e344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 1/7] freetype: clean XBPS_CROSS_TRIPLET reference in
freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
---
common/hooks/pre-configure/02-script-wrapper.sh | 15 ++++++++++++++-
srcpkgs/freetype/template | 6 +++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..9ca195d5a58 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
done
}
+link_wrapper() {
+ local wrapper="$1"
+ [ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+ [ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+ ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
hook() {
export PATH="$XBPS_WRAPPERDIR:$PATH"
@@ -186,9 +193,15 @@ hook() {
pkgconfig_wrapper
vapigen_wrapper
valac_wrapper
+
+ if [ -x /usr/bin/pkg-config ]; then
+ link_wrapper freetype-config
+ else
+ generic_wrapper freetype-config
+ fi
+
generic_wrapper icu-config
generic_wrapper libgcrypt-config
- generic_wrapper freetype-config
generic_wrapper sdl-config
generic_wrapper sdl2-config
generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..ba4c6ad900c 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
# Template file for 'freetype'
pkgname=freetype
version=2.10.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://www.freetype.org/"
distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
+post_patch() {
+ vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
+}
+
post_install() {
vlicense docs/LICENSE.TXT
vlicense docs/FTL.TXT
From 3af0f3c63b2b97e8021ec265dba97fe6e6750464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 2/7] SDL_ttf: remove unnecessary CFLAGS
---
srcpkgs/SDL_ttf/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template
index 72293431f32..a6856a297bc 100644
--- a/srcpkgs/SDL_ttf/template
+++ b/srcpkgs/SDL_ttf/template
@@ -1,19 +1,21 @@
# Template file for 'SDL_ttf'
pkgname=SDL_ttf
version=2.0.11
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config"
makedepends="freetype-devel SDL-devel libSM-devel"
short_desc="Use TrueType fonts in your SDL applications"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://www.libsdl.org/projects/${pkgname}"
+license="Zlib"
+homepage="http://www.libsdl.org/projects/SDL_ttf"
distfiles="${homepage}/release/${pkgname}-${version}.tar.gz"
checksum=724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
+post_install() {
+ vlicense COPYING
+}
SDL_ttf-devel_package() {
depends="freetype-devel SDL-devel ${sourcepkg}>=${version}_${revision}"
From f7f9643b1fdf352610a283ccca247f51c7ed648c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 3/7] libopenshot-audio: remove unnecessary CXXFLAGS
---
srcpkgs/libopenshot-audio/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template
index d9a6a719734..56c330eafcf 100644
--- a/srcpkgs/libopenshot-audio/template
+++ b/srcpkgs/libopenshot-audio/template
@@ -13,8 +13,6 @@ homepage="https://github.com/OpenShot/libopenshot-audio"
distfiles="https://github.com/OpenShot/libopenshot-audio/archive/v${version}.tar.gz"
checksum=937ff4f1c2dfb8ab5d56ad85beacaa29dfd5a79af0d9cf647386034fe9882309
-CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
CXXFLAGS+=" -latomic "
From b285be112ed06d8a3675cd6b5c5aba06a517eca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:25:37 +0700
Subject: [PATCH 4/7] tumbler: remove unnecessary CFLAGS
---
srcpkgs/tumbler/template | 2 --
1 file changed, 2 deletions(-)
diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index fe37a85871a..dcdd7cfd40e 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -14,8 +14,6 @@ homepage="https://xfce.org/"
distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-
tumbler-devel_package() {
depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From e80df74313c38595b146164b6489ecaa86a26321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:47:18 +0700
Subject: [PATCH 5/7] wmx: simply template
---
srcpkgs/wmx/template | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/wmx/template b/srcpkgs/wmx/template
index 32cd09e57b9..6e24a5419bb 100644
--- a/srcpkgs/wmx/template
+++ b/srcpkgs/wmx/template
@@ -1,15 +1,14 @@
# Template file for 'wmx'
pkgname=wmx
version=8
-revision=3
+revision=4
build_style=gnu-configure
-make_build_args="LDFLAGS+=-lXft LDFLAGS+=-lfontconfig
- CXXFLAGS+=-I${XBPS_CROSS_BASE}/usr/include/freetype2"
-makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel freetype-devel
- libXft-devel fontconfig-devel libXcomposite-devel"
+hostmakedepends="pkg-config"
+makedepends="libX11-devel libXext-devel libXmu-devel libXpm-devel
+ freetype-devel libXft-devel fontconfig-devel libXcomposite-devel"
short_desc="Simple window manager for X"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="BSD"
+license="BSD-2-Clause"
homepage="http://www.all-day-breakfast.com/wmx"
distfiles="http://www.all-day-breakfast.com/wmx/wmx-${version}.tar.gz"
checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
@@ -17,4 +16,8 @@ checksum=7316090e59fa8988219d6819e426870c6d8c0739818d77e8770e8108ddf0aedd
do_install() {
vbin wmx
vinstall ${FILESDIR}/wmx.desktop 644 usr/share/xsessions
+ vlicense README
+ vlicense README.contrib
+ sed -ne '4,13p' Rotated.C >LICENSE.xvertext
+ vlicense LICENSE.xvertext
}
From b4d22496ebdbe808f9aeb0c1f9fe60ff40f542ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:57:25 +0700
Subject: [PATCH 6/7] slim: simplify template
---
srcpkgs/slim/template | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template
index b86c951e188..b7382cac308 100644
--- a/srcpkgs/slim/template
+++ b/srcpkgs/slim/template
@@ -3,8 +3,7 @@ pkgname=slim
version=1.3.6
revision=13
build_style=cmake
-configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes
- -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2"
+configure_args="-DUSE_CONSOLEKIT=no -DUSE_PAM=yes"
conf_files="/etc/slim.conf /etc/pam.d/slim"
hostmakedepends="pkg-config"
makedepends="libpng-devel freetype-devel libjpeg-turbo-devel libXrandr-devel
@@ -21,11 +20,8 @@ case "$XBPS_TARGET_MACHINE" in
*-musl) CXXFLAGS="-DNEEDS_BASENAME";;
esac
-pre_configure() {
- sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
-}
post_install() {
vsv slim
vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim
- rm -rf ${DESTDIR}/usr/lib/systemd
+ rm -rf ${DESTDIR}/lib/systemd
}
From 230cde8aa5d3b2ba5595563eaafb3d586a0c9ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 3 Jan 2021 19:57:44 +0700
Subject: [PATCH 7/7] texlive: remove freetype2-config hacks
---
srcpkgs/texlive/template | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index f416e853534..42d7bfcdf45 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -172,16 +172,6 @@ post_patch() {
popd
}
-pre_configure() {
- if [ "$CROSS_BUILD" ] ; then
- # For some reason, when cross-building, the configure script has this path
- # for freetype2 include:
- # /usr/x86_64-linux-musl/usr/x86_64-linux-musl/usr/include/freetype2.
- # It shouldn't have two /usr/x86_64-linux-musl's, add it to CPPFLAGS.
- CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
- fi
-}
-
pre_build() {
if [ -n "$build_option_luajit" ] ; then
export HOST_CC="${_luajit_host_cc}"
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR REVIEW] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
2021-01-01 14:43 [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config sgn
` (5 preceding siblings ...)
2021-01-03 13:24 ` sgn
@ 2021-01-03 23:28 ` sgn
2021-01-04 23:41 ` [PR PATCH] [Merged]: " sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-01-03 23:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/27599#discussion_r551068585
Comment:
I ended up `sed` in `post_patch` instead.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
2021-01-01 14:43 [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config sgn
` (6 preceding siblings ...)
2021-01-03 23:28 ` [PR REVIEW] " sgn
@ 2021-01-04 23:41 ` sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2021-01-04 23:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
There's a merged pull request on the void-packages repository
freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config
https://github.com/void-linux/void-packages/pull/27599
Description:
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-01-04 23:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-01 14:43 [PR PATCH] freetype: clean XBPS_CROSS_TRIPLET reference in freetype-config sgn
2021-01-02 2:37 ` [PR REVIEW] " ericonr
2021-01-03 9:23 ` sgn
2021-01-03 13:06 ` [PR PATCH] [Updated] " sgn
2021-01-03 13:17 ` sgn
2021-01-03 13:18 ` sgn
2021-01-03 13:24 ` sgn
2021-01-03 23:28 ` [PR REVIEW] " sgn
2021-01-04 23:41 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).