From e6a7080ecc1c03569cf838cd5f0531709a051689 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Wed, 29 Jan 2020 20:56:41 +0300 Subject: revert --- xorg/cairo/build | 5 ++--- xorg/gtk+3/build | 10 ++++------ xorg/libxcb/build | 4 +--- xorg/mesa/build | 2 +- xorg/st/build | 2 +- xorg/xinit/build | 2 +- 6 files changed, 10 insertions(+), 15 deletions(-) (limited to 'xorg') diff --git a/xorg/cairo/build b/xorg/cairo/build index 518c4ca0..92dafa69 100755 --- a/xorg/cairo/build +++ b/xorg/cairo/build @@ -1,9 +1,8 @@ #!/bin/sh -e # Disable building 'cairo-sphinx'. -sed "s/BUILD_SPHINX_TRUE=/BUILD_SPHINX_TRUE='#'/" configure > configure.bak -sed "s/BUILD_SPHINX_FALSE='#'/BUILD_SPHINX_FALSE=/" configure.bak > configure -chmod +x configure +sed -i "s/BUILD_SPHINX_TRUE=/BUILD_SPHINX_TRUE='#'/" configure +sed -i "s/BUILD_SPHINX_FALSE='#'/BUILD_SPHINX_FALSE=/" configure ./configure \ --prefix=/usr \ diff --git a/xorg/gtk+3/build b/xorg/gtk+3/build index 7f49f150..9db3b285 100755 --- a/xorg/gtk+3/build +++ b/xorg/gtk+3/build @@ -1,13 +1,11 @@ #!/bin/sh -e # Remove 'atk-bridge' dependency which removes the 'dbus' dependency. -sed 's/ATK_PACKAGES="atk atk-bridge-2.0"/ATK_PACKAGES="atk"/' \ - configure > configure.bak && mv configure.bak configure -chmod +x configure +sed -i 's/ATK_PACKAGES="atk atk-bridge-2.0"/ATK_PACKAGES="atk"/' \ + configure -sed '//d;/atk_bridge_adaptor_init/d' \ - gtk/a11y/gtkaccessibility.c > sed.bak -mv sed.bak gtk/ally/gtkaccessibility.c +sed -i '//d;/atk_bridge_adaptor_init/d' \ + gtk/a11y/gtkaccessibility.c ./configure \ --prefix=/usr \ diff --git a/xorg/libxcb/build b/xorg/libxcb/build index cbf38ed8..285ad906 100755 --- a/xorg/libxcb/build +++ b/xorg/libxcb/build @@ -1,8 +1,6 @@ #!/bin/sh -e -sed 's/pthread-stubs //' configure > configure.bak -mv configure.bak configure -chmod +x configure +sed -i 's/pthread-stubs //' configure ./configure \ --prefix=/usr diff --git a/xorg/mesa/build b/xorg/mesa/build index e2cecdcf..9a7f79bd 100755 --- a/xorg/mesa/build +++ b/xorg/mesa/build @@ -6,7 +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 > meson.build.bak && mv meson.build.bak 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 343b2ed8..53074cc3 100755 --- a/xorg/st/build +++ b/xorg/st/build @@ -1,6 +1,6 @@ #!/bin/sh -e -sed 's|Liberation Mono|Monospace|g' config.def.h > config.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 6931a024..311b9d59 100755 --- a/xorg/xinit/build +++ b/xorg/xinit/build @@ -7,4 +7,4 @@ make make DESTDIR="$1" install -sed 's/enable_xauth=1/enable_xauth=0/' "$1/usr/bin/startx" > startx.bak && mv startx.bak "$1/usr/bin/startx" +sed -i 's/enable_xauth=1/enable_xauth=0/' "$1/usr/bin/startx" -- cgit v1.2.3