From e7edf49678d9d4b3b1c13c3f878d85f1b20877a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Thu, 1 Apr 2021 20:20:45 -0300 Subject: [PATCH] recipes: xorg/*: Do not try to regenerate the documentation using xmlto MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Note: The fop command is missing in Dragora, currently... Signed-off-by: Matías Fonzo --- recipes/xorg/doc/xorg-docs/recipe | 17 +++++------------ recipes/xorg/lib/libICE/recipe | 3 ++- recipes/xorg/lib/libSM/recipe | 13 +++++++++---- recipes/xorg/lib/libXaw/recipe | 8 +++++--- recipes/xorg/lib/libXdmcp/recipe | 8 +++++--- recipes/xorg/lib/libXext/recipe | 8 +++++--- recipes/xorg/lib/libXi/recipe | 8 +++++--- recipes/xorg/lib/libXmu/recipe | 8 +++++--- recipes/xorg/lib/libXt/recipe | 3 ++- recipes/xorg/lib/libXtst/recipe | 8 +++++--- recipes/xorg/lib/xtrans/recipe | 6 +++--- recipes/xorg/proto/xorgproto/recipe | 26 +++++++++++--------------- recipes/xorg/xserver/recipe | 5 +++-- 13 files changed, 65 insertions(+), 56 deletions(-) diff --git a/recipes/xorg/doc/xorg-docs/recipe b/recipes/xorg/doc/xorg-docs/recipe index ad9dc4e3..72b42a38 100644 --- a/recipes/xorg/doc/xorg-docs/recipe +++ b/recipes/xorg/doc/xorg-docs/recipe @@ -1,7 +1,7 @@ # Build recipe for xorg-docs. # # Copyright (c) 2017 Mateus P. Rodrigues . -# Copyright (c) 2017 Matias Fonzo, . +# Copyright (c) 2017, 2021 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ set -e program=xorg-docs version=1.7.1 arch=noarch -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_doc @@ -53,12 +53,12 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ - $configure_args \ + ./configure $configure_args \ --libdir=/usr/lib${libSuffix} \ --infodir=$infodir \ --mandir=$mandir \ --docdir=$docsdir \ + --without-xmlto \ || true make -j${jobs} V=1 @@ -87,13 +87,6 @@ build() # Copy documentation mkdir -p "${destdir}${docsdir}" - - for file in $docs - do - if test -e $file - then - cp -p $file "${destdir}${docsdir}" - fi - done + cp -p $docs "${destdir}${docsdir}" } diff --git a/recipes/xorg/lib/libICE/recipe b/recipes/xorg/lib/libICE/recipe index b84e46a1..001c9401 100644 --- a/recipes/xorg/lib/libICE/recipe +++ b/recipes/xorg/lib/libICE/recipe @@ -20,7 +20,7 @@ set -e program=libICE version=1.0.10 -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -64,6 +64,7 @@ build() --enable-unix-transport \ --enable-local-transport \ --enable-tcp-transport \ + --without-xmlto \ --build="$(gcc -dumpmachine)" make -j${jobs} V=1 diff --git a/recipes/xorg/lib/libSM/recipe b/recipes/xorg/lib/libSM/recipe index 3e6e0756..a68f8f90 100644 --- a/recipes/xorg/lib/libSM/recipe +++ b/recipes/xorg/lib/libSM/recipe @@ -1,7 +1,7 @@ # Build recipe for libSM. # # Copyright (c) 2017 Mateus P. Rodrigues . -# Copyright (c) 2017-2020 Matias Fonzo . +# Copyright (c) 2017-2021 Matias Fonzo . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ set -e program=libSM version=1.2.3 -release=2 +release=3 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -52,14 +52,19 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ + ./configure CPPFLAGS="$QICPPFLAGS" \ + CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ --docdir=$docsdir \ --enable-shared=yes \ --enable-static=no \ - --enable-ipv6=yes \ + --enable-ipv6 \ + --enable-unix-transport \ + --enable-local-transport \ + --enable-tcp-transport \ + --without-xmlto \ --with-libuuid \ --build="$(gcc -dumpmachine)" diff --git a/recipes/xorg/lib/libXaw/recipe b/recipes/xorg/lib/libXaw/recipe index 2cafa715..305e36cf 100644 --- a/recipes/xorg/lib/libXaw/recipe +++ b/recipes/xorg/lib/libXaw/recipe @@ -1,7 +1,7 @@ # Build recipe for libXaw. # # Copyright (c) 2017 Mateus P. Rodrigues . -# Copyright (c) 2017-2018 Matias Fonzo, . +# Copyright (c) 2017-2018, 2021 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ set -e program=libXaw version=1.0.13 -release=2 +release=3 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -52,13 +52,15 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ + ./configure CPPFLAGS="$QICPPFLAGS" \ + CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ --docdir=$docsdir \ --enable-shared=yes \ --enable-static=no \ + --without-xmlto \ --build="$(gcc -dumpmachine)" make -j${jobs} V=1 diff --git a/recipes/xorg/lib/libXdmcp/recipe b/recipes/xorg/lib/libXdmcp/recipe index 317bede6..1336d968 100644 --- a/recipes/xorg/lib/libXdmcp/recipe +++ b/recipes/xorg/lib/libXdmcp/recipe @@ -1,7 +1,7 @@ # Build recipe for libXdmcp. # # Copyright (c) 2017 Mateus P. Rodrigues . -# Copyright (c) 2017-2019 Matias Fonzo, . +# Copyright (c) 2017-2019, 2021 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ set -e program=libXdmcp version=1.1.3 -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -52,13 +52,15 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ + ./configure CPPFLAGS="$QICPPFLAGS" \ + CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ --docdir=$docsdir \ --enable-shared=yes \ --enable-static=no \ + --without-xmlto \ --build="$(gcc -dumpmachine)" make -j${jobs} V=1 diff --git a/recipes/xorg/lib/libXext/recipe b/recipes/xorg/lib/libXext/recipe index 6e1ca5db..ca6d2b89 100644 --- a/recipes/xorg/lib/libXext/recipe +++ b/recipes/xorg/lib/libXext/recipe @@ -1,7 +1,7 @@ # Build recipe for libXext. # # Copyright (c) 2017 Mateus P. Rodrigues . -# Copyright (c) 2017-2019 Matias Fonzo, . +# Copyright (c) 2017-2019, 2021 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ set -e program=libXext version=1.3.4 -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -52,13 +52,15 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ + ./configure CPPFLAGS="$QICPPFLAGS" \ + CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ --docdir=$docsdir \ --enable-shared=yes \ --enable-static=no \ + --without-xmlto \ --build="$(gcc -dumpmachine)" make -j${jobs} V=1 diff --git a/recipes/xorg/lib/libXi/recipe b/recipes/xorg/lib/libXi/recipe index e8a55c3b..97853201 100644 --- a/recipes/xorg/lib/libXi/recipe +++ b/recipes/xorg/lib/libXi/recipe @@ -1,7 +1,7 @@ # Build recipe for libXi. # # Copyright (c) 2017 Mateus P. Rodrigues . -# Copyright (c) 2017-2019 Matias Fonzo, . +# Copyright (c) 2017-2019, 2021 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ set -e program=libXi version=1.7.10 -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -52,13 +52,15 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ + ./configure CPPFLAGS="$QICPPFLAGS" \ + CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ --docdir=$docsdir \ --enable-shared=yes \ --enable-static=no \ + --without-xmlto \ --build="$(gcc -dumpmachine)" make -j${jobs} V=1 diff --git a/recipes/xorg/lib/libXmu/recipe b/recipes/xorg/lib/libXmu/recipe index af30be9c..de9826e2 100644 --- a/recipes/xorg/lib/libXmu/recipe +++ b/recipes/xorg/lib/libXmu/recipe @@ -1,7 +1,7 @@ # Build recipe for libXmu. # # Copyright (c) 2017 Mateus P. Rodrigues . -# Copyright (c) 2017-2019 Matias Fonzo, . +# Copyright (c) 2017-2019, 2021 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ set -e program=libXmu version=1.1.3 -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -52,13 +52,15 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ + ./configure CPPFLAGS="$QICPPFLAGS" \ + CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ --docdir=$docsdir \ --enable-shared=yes \ --enable-static=no \ + --without-xmlto \ --build="$(gcc -dumpmachine)" make -j${jobs} V=1 diff --git a/recipes/xorg/lib/libXt/recipe b/recipes/xorg/lib/libXt/recipe index 9c6b87af..45e4903d 100644 --- a/recipes/xorg/lib/libXt/recipe +++ b/recipes/xorg/lib/libXt/recipe @@ -20,7 +20,7 @@ set -e program=libXt version=1.2.1 -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -62,6 +62,7 @@ build() --enable-static=no \ --enable-xkb \ --with-appdefaultdir=/etc/X11/app-defaults \ + --without-xmlto \ --build="$(gcc -dumpmachine)" make -j${jobs} V=1 diff --git a/recipes/xorg/lib/libXtst/recipe b/recipes/xorg/lib/libXtst/recipe index 6e416a0f..42a17d0f 100644 --- a/recipes/xorg/lib/libXtst/recipe +++ b/recipes/xorg/lib/libXtst/recipe @@ -1,7 +1,7 @@ # Build recipe for libXtst. # # Copyright (c) 2017 Mateus P. Rodrigues . -# Copyright (c) 2017-2018 Matias Fonzo, . +# Copyright (c) 2017-2018, 2021 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ set -e program=libXtst version=1.2.3 -release=2 +release=3 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -52,13 +52,15 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - ./configure CPPFLAGS="$QICPPFLAGS" CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ + ./configure CPPFLAGS="$QICPPFLAGS" \ + CFLAGS="$QICFLAGS" LDFLAGS="$QILDFLAGS" \ $configure_args \ --libdir=/usr/lib${libSuffix} \ --mandir=$mandir \ --docdir=$docsdir \ --enable-shared=yes \ --enable-static=no \ + --without-xmlto \ --build="$(gcc -dumpmachine)" make -j${jobs} V=1 diff --git a/recipes/xorg/lib/xtrans/recipe b/recipes/xorg/lib/xtrans/recipe index f623e539..dd216839 100644 --- a/recipes/xorg/lib/xtrans/recipe +++ b/recipes/xorg/lib/xtrans/recipe @@ -1,7 +1,7 @@ # Build recipe for xtrans. # # Copyright (c) 2017 Mateus P. Rodrigues . -# Copyright (c) 2017-2019 Matias Fonzo, . +# Copyright (c) 2017-2019, 2021 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ set -e program=xtrans version=1.4.0 arch=noarch -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_lib @@ -55,7 +55,7 @@ build() ./configure $configure_args \ --libdir=/usr/lib${libSuffix} \ - --enable-docs + --without-xmlto make -j${jobs} V=1 make -j${jobs} DESTDIR="$destdir" install diff --git a/recipes/xorg/proto/xorgproto/recipe b/recipes/xorg/proto/xorgproto/recipe index c993e41a..443bcc2b 100644 --- a/recipes/xorg/proto/xorgproto/recipe +++ b/recipes/xorg/proto/xorgproto/recipe @@ -20,7 +20,7 @@ set -e program=xorgproto version=2021.3 -release=1 +release=2 # Define a category for the output of the package name pkgcategory=xorg_proto @@ -57,25 +57,21 @@ build() # Set sane permissions chmod -R u+w,go-w,a+rX-s . - rm -rf BUILD - mkdir BUILD - cd BUILD + ./configure $configure_args \ + --libdir=/usr/lib${libSuffix} \ + --infodir=$infodir \ + --mandir=$mandir \ + --docdir=$docsdir \ + --enable-legacy \ + --without-xmlto \ + || true - meson setup $configure_args \ - --libdir /usr/lib${libSuffix} \ - --mandir $mandir \ - --buildtype=release \ - -Dlegacy=true \ - .. - - ninja -j${jobs} - DESTDIR="$destdir" ninja -j${jobs} install + make -j${jobs} V=1 + make -j${jobs} DESTDIR="$destdir" install # This is provided by 'xorg/lib/libXvMC' currently rm "${destdir}/usr/include/X11/extensions/vldXvMC.h" - cd .. - # Compress and link man pages (if needed) if test -d "${destdir}/$mandir" then diff --git a/recipes/xorg/xserver/recipe b/recipes/xorg/xserver/recipe index b68318c3..3f85f727 100644 --- a/recipes/xorg/xserver/recipe +++ b/recipes/xorg/xserver/recipe @@ -20,7 +20,7 @@ set -e program=xorg-server version=1.20.10 -release=2 +release=3 # Define a category for the output of the package name pkgcategory=xorg_xserver @@ -86,7 +86,8 @@ build() --with-xkb-path=/etc/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --with-os-name="GNU/Linux-Libre" \ - --with-os-vendor="Dragora" + --with-os-vendor="Dragora" \ + --without-xmlto make -j${jobs} V=1 make -j${jobs} DESTDIR="$destdir" install-strip -- 2.11.4.GIT