From d8efedbe02d148008f6bc96bd6fcbffc096e0c28 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 29 Jan 2020 19:42:59 +0200 Subject: [PATCH] repo: Revert sed changes --- xorg/intel-media-driver/build | 3 +-- xorg/libxcb/build | 3 +-- xorg/mesa/build | 3 +-- xorg/st/build | 3 +-- xorg/xinit/build | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/xorg/intel-media-driver/build b/xorg/intel-media-driver/build index 5cef8fa6..2fa64ab5 100755 --- a/xorg/intel-media-driver/build +++ b/xorg/intel-media-driver/build @@ -2,8 +2,7 @@ export DESTDIR="$1" -sed 's/SHARED/STATIC/' gmmlib/Source/GmmLib/CMakeLists.txt > _ -mv -f _ gmmlib/Source/GmmLib/CMakeLists.txt +sed -i 's/SHARED/STATIC/' gmmlib/Source/GmmLib/CMakeLists.txt cd media diff --git a/xorg/libxcb/build b/xorg/libxcb/build index f5e6f94f..285ad906 100755 --- a/xorg/libxcb/build +++ b/xorg/libxcb/build @@ -1,7 +1,6 @@ #!/bin/sh -e -sed 's/pthread-stubs //' configure > _ -mv -f _ configure +sed -i 's/pthread-stubs //' configure ./configure \ --prefix=/usr diff --git a/xorg/mesa/build b/xorg/mesa/build index 1333157d..9a7f79bd 100755 --- a/xorg/mesa/build +++ b/xorg/mesa/build @@ -6,8 +6,7 @@ export CFLAGS="-DGLX_X86_READONLY_TEXT $CFLAGS" # Fix issues with musl and firefox. # https://bugs.freedesktop.org/show_bug.cgi?id=35268 # https://github.com/mesa3d/mesa/commit/9f37c9903b87f86a533bfaffa72f0ecb285b02b2 -sed "/pre_args += '-DUSE_ELF_TLS'/d" meson.build > _ -mv -f _ meson.build +sed -i "/pre_args += '-DUSE_ELF_TLS'/d" meson.build meson \ --prefix=/usr \ diff --git a/xorg/st/build b/xorg/st/build index 5d15e0cf..53074cc3 100755 --- a/xorg/st/build +++ b/xorg/st/build @@ -1,7 +1,6 @@ #!/bin/sh -e -sed 's/Liberation Mono/Monospace/g' config.def.h > _ -mv -f _ config.def.h +sed -i 's|Liberation Mono|Monospace|g' config.def.h make make PREFIX=/usr DESTDIR="$1" install diff --git a/xorg/xinit/build b/xorg/xinit/build index b500f0d3..311b9d59 100755 --- a/xorg/xinit/build +++ b/xorg/xinit/build @@ -7,5 +7,4 @@ make make DESTDIR="$1" install -sed 's/enable_xauth=1/enable_xauth=0/' "$1/usr/bin/startx" > _ -mv -f _ "$1/usr/bin/startx" +sed -i 's/enable_xauth=1/enable_xauth=0/' "$1/usr/bin/startx"