From c23c984ec308ebc71d05260eecbfb99723e83bd9 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Fri, 14 Apr 2023 10:29:01 +0300 Subject: [PATCH] upg cmake consolekit2 qt5-base --- cmake/PKGBUILD | 26 +++++++++------- cmake/PKGBUILD-arch | 4 +-- cmake/config | 70 ++++++++++++++++++++++++++++++++++++++++++ cmake/deps | 1 + consolekit2/PKGBUILD | 14 +++++---- qt5-base/PKGBUILD | 9 +++--- qt5-base/PKGBUILD-arch | 4 +-- 7 files changed, 102 insertions(+), 26 deletions(-) create mode 100644 cmake/config diff --git a/cmake/PKGBUILD b/cmake/PKGBUILD index 4b30900..740fde4 100644 --- a/cmake/PKGBUILD +++ b/cmake/PKGBUILD @@ -6,29 +6,34 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=cmake -pkgver=3.26.1 +pkgver=3.26.3 pkgrel=01 -pkgdesc='A cross-platform open-source make system' +pkgdesc='A cross-platform open-source make system w/o zstd or qt-gui ' url="https://www.cmake.org/" depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libuv' 'rhash') -makedepends=( 'python-sphinx' 'emacs-git') +makedepends=('python-sphinx' 'emacs-git' python-sphinx-autoapi) # without autoapi build fails at sphinx html documents optdepends=('qt6-base: cmake-gui') source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") build() { cd ${pkgname}-${pkgver} -# export CXXFLAGS+=" ${CPPFLAGS}" ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ --datadir=/share/cmake \ - --sphinx-man \ - --sphinx-html \ + --system-liblzma \ + --no-system-zstd \ + --no-qt-gui \ --system-libs \ --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) make } -# --qt-gui \ + +# --sphinx-man \ I removed this to avoid error at sphinx html docs +# export CXXFLAGS+=" ${CPPFLAGS}" # used in the past +# --qt-gui \ # qt6-base dependency is needed for the gui +# --sphinx-html \ Build stops unable to find sphinx module to build html docs +# it still fails and there are no valid options for --no-sphinx-html .. package() { cd ${pkgname}-${pkgver} @@ -45,7 +50,6 @@ arch=(x86_64) license=('custom') -sha256sums=(f29964290ad3ced782a1e58ca9fda394a82406a647e24d6afd4e6c32e42c412f) # cmake-3.26.1.tar.gz - -## d53f1df64880c7bb40164ee1f11c286d3f38ff3e57efcb7a9e17f38f3fe13448 cmake-3.26.1-01-x86_64.pkg.tar.lz - +sha256sums=(bbd8d39217509d163cb544a40d6428ac666ddc83e22905d3e52c925781f0f659) # cmake-3.26.3.tar.gz + +## 1cf0b1cf05abed2f2c17e16213bea4b298830184900c56b35e3b88fb0de3815c cmake-3.26.3-01-x86_64.pkg.tar.lz diff --git a/cmake/PKGBUILD-arch b/cmake/PKGBUILD-arch index 67518f3..2832fb7 100644 --- a/cmake/PKGBUILD-arch +++ b/cmake/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Pierre Schmitz pkgname=cmake -pkgver=3.26.1 +pkgver=3.26.3 pkgrel=1 pkgdesc='A cross-platform open-source make system' arch=('x86_64') @@ -13,7 +13,7 @@ depends=('curl' 'libarchive' 'hicolor-icon-theme' 'jsoncpp' 'libjsoncpp.so' 'lib makedepends=('qt6-base' 'python-sphinx' 'emacs') optdepends=('qt6-base: cmake-gui') source=("https://www.cmake.org/files/v${pkgver%.*}/${pkgname}-${pkgver}.tar.gz") -sha512sums=('e631e4f2277a640015a3c3a2690f0ff68577c4d04d2c39bda0b04afc142df4514b7a813c34e3f245c229ee0d6dcaf667a0f6fd8d76785ea2ff61f5295ae85ada') +sha512sums=('b09447318512b91c772e36c764049789224032c6c650289a94f6311f999ca104b617bf2dced57b723da23472f015549affabd9c8c076857490c47a1aee7eb7a0') build() { cd ${pkgname}-${pkgver} diff --git a/cmake/config b/cmake/config new file mode 100644 index 0000000..74d86db --- /dev/null +++ b/cmake/config @@ -0,0 +1,70 @@ + +Usage: /media/buildbot/src/pkg/jobextra/cmake/src/cmake-3.26.3/bootstrap [...] [-- ...] +Options: [defaults in brackets after descriptions] +Configuration: + --help print this message + --version only print version information + --verbose display more information + --parallel=n bootstrap cmake in parallel, where n is + number of nodes [1] + --generator= generator to use (MSYS Makefiles, Unix Makefiles, + or Ninja) + --enable-ccache Enable ccache when building cmake + --init=FILE load FILE as script to populate cache + --system-libs use all system-installed third-party libraries + (for use only by package maintainers) + --no-system-libs use all cmake-provided third-party libraries + (default) + --system-curl use system-installed curl library + --no-system-curl use cmake-provided curl library (default) + --system-expat use system-installed expat library + --no-system-expat use cmake-provided expat library (default) + --system-jsoncpp use system-installed jsoncpp library + --no-system-jsoncpp use cmake-provided jsoncpp library (default) + --system-zlib use system-installed zlib library + --no-system-zlib use cmake-provided zlib library (default) + --system-bzip2 use system-installed bzip2 library + --no-system-bzip2 use cmake-provided bzip2 library (default) + --system-liblzma use system-installed liblzma library + --no-system-liblzma use cmake-provided liblzma library (default) + --system-nghttp2 use system-installed nghttp2 library + --no-system-nghttp2 use cmake-provided nghttp2 library (default) + --system-zstd use system-installed zstd library + --no-system-zstd use cmake-provided zstd library (default) + --system-libarchive use system-installed libarchive library + --no-system-libarchive use cmake-provided libarchive library (default) + --system-librhash use system-installed librhash library + --no-system-librhash use cmake-provided librhash library (default) + --system-libuv use system-installed libuv library + --no-system-libuv use cmake-provided libuv library (default) + + --bootstrap-system-libuv use system-installed libuv library for bootstrap + --bootstrap-system-jsoncpp use system-installed jsoncpp library for bootstrap + --bootstrap-system-librhash use system-installed librhash library for bootstrap + + --qt-gui build the Qt-based GUI (requires Qt >= 4.2) + --no-qt-gui do not build the Qt-based GUI (default) + --qt-qmake= use as the qmake executable to find Qt + + --sphinx-info build Info manual with Sphinx + --sphinx-man build man pages with Sphinx + --sphinx-html build html help with Sphinx + --sphinx-qthelp build qch help with Sphinx + --sphinx-latexpdf build PDF with Sphinx using LaTeX + --sphinx-build= use as the sphinx-build executable + --sphinx-flags= pass to sphinx-build executable + +Directory and file names: + --prefix=PREFIX install files in tree rooted at PREFIX + [/usr/local] + --bindir=DIR install binaries in PREFIX/DIR + [bin] + --datadir=DIR install data files in PREFIX/DIR + [share/cmake-3.26] + --docdir=DIR install documentation files in PREFIX/DIR + [doc/cmake-3.26] + --mandir=DIR install man pages files in PREFIX/DIR/manN + [man] + --xdgdatadir=DIR install XDG specific files in PREFIX/DIR + [share] + diff --git a/cmake/deps b/cmake/deps index 1b31142..c9a16da 100644 --- a/cmake/deps +++ b/cmake/deps @@ -4,5 +4,6 @@ libuv rhash python-sphinx emacs-git +python-sphinx-autoapi diff --git a/consolekit2/PKGBUILD b/consolekit2/PKGBUILD index 4716760..106c221 100644 --- a/consolekit2/PKGBUILD +++ b/consolekit2/PKGBUILD @@ -7,10 +7,9 @@ pkgname=consolekit2 pkgver=1.2.5 -pkgrel=01 +pkgrel=02 pkgdesc="A framework for defining and tracking users, login sessions, and seats" url="https://github.com/ConsoleKit2/ConsoleKit2" -arch=(x86_64) target=tag track="$pkgver" source=("$pkgname::git+$url#$target=$track" @@ -19,11 +18,14 @@ source=("$pkgname::git+$url#$target=$track" pam-foreground-compat.ck tmpfiles.conf trust_runtime_admin_policy.patch -# set_good_hpr_command.patch + set_good_hpr_command.patch keep_runtime_dir.patch) options=(libtool) depends=( dbus glib2 libx11 polkit eudev zlib popt) -optdepends=('pm-utils: support for suspend/hibernate') +optdepends=('pm-utils: support for suspend/hibernate') # note below +# in Joborun we have adopted zzz from Void that works on runit and s6 +# to hibernate. In all tests it is 100% safe, but hardware differences +# may present a challenge, so test first with work saved. makedepends=(xmlto docbook-xsl gtk-doc pam) provides=(consolekit consolekit2) replaces=(consolekit) @@ -106,8 +108,8 @@ sha256sums=(SKIP 7a727be018e26eb7b67df02d3dc493eaa3dafea412801d6bf4b55b4a83c9df7c # pam-foreground-compat.ck 778552dc12b3c235bde200e476d4262da0c135f3f6f8b3e975a87881d1f154d1 # tmpfiles.conf 8e4a486794ef176af3f753c3c1077e0b69a0dc5332bb3277726a7bd2cccb8e1d # trust_runtime_admin_policy.patch -# 780e09ccff9aca92f698e70cccd2079e3916d4b3feff27c373d6ddfe95ce6431 # set_good_hpr_command.patch + 780e09ccff9aca92f698e70cccd2079e3916d4b3feff27c373d6ddfe95ce6431 # set_good_hpr_command.patch 5c4340496a6370bf424135f368c5b42d1e99efbc72cc0538b102754adcc6b887) # keep_runtime_dir.patch -## 6496b47a97069557c9c0ed8bf12b397d3d160f7376dad86b259d588b75b5ed39 consolekit2-1.2.5-01-x86_64.pkg.tar.lz +## 50b854169f909eb45d879f93541dbf9456de71decfb59fb92cac064b4b8a7037 consolekit2-1.2.5-02-x86_64.pkg.tar.lz diff --git a/qt5-base/PKGBUILD b/qt5-base/PKGBUILD index 1c93676..8150d49 100644 --- a/qt5-base/PKGBUILD +++ b/qt5-base/PKGBUILD @@ -8,8 +8,8 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) _basever=5.15.9 -pkgver=5.15.9+kde+r150 -_commit=d3b21bc8b70eaa1af848371dc1d34c4617c1f73c +pkgver=5.15.9+kde+r151 +_commit=84152777a48af444a902bbf4df8b38146171c20d pkgrel=01 url='https://www.qt.io' pkgdesc='A cross-platform application and UI framework' @@ -125,6 +125,5 @@ sha256sums=(SKIP 5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch 4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch -## 1a5ba914d69747fbbea2faaeef0d39cffc97f8158466266396cae6b4450f14ea qt5-base-5.15.9+kde+r150-01-x86_64.pkg.tar.lz -## affecc32d7034a49463054106fc0f3284726a478023b36f6b02347447f962a80 qt5-xcb-private-headers-5.15.9+kde+r150-01-x86_64.pkg.tar.lz - +## fd32c5951b7d2e5092441b4801d0ebd377b6eca69cdd47866b212ae28ab1221a qt5-base-5.15.9+kde+r151-01-x86_64.pkg.tar.lz +## 9da1f2876955f236ce44ac8d793bc145bffc29aeaeb9be1e8728c03c46200f66 qt5-xcb-private-headers-5.15.9+kde+r151-01-x86_64.pkg.tar.lz diff --git a/qt5-base/PKGBUILD-arch b/qt5-base/PKGBUILD-arch index df9f558..8f8c24e 100644 --- a/qt5-base/PKGBUILD-arch +++ b/qt5-base/PKGBUILD-arch @@ -4,9 +4,9 @@ pkgbase=qt5-base pkgname=(qt5-base qt5-xcb-private-headers) _basever=5.15.9 -pkgver=5.15.9+kde+r150 +pkgver=5.15.9+kde+r151 pkgrel=1 -_commit=d3b21bc8b70eaa1af848371dc1d34c4617c1f73c +_commit=84152777a48af444a902bbf4df8b38146171c20d arch=('x86_64') url='https://www.qt.io' license=('GPL3' 'LGPL3' 'FDL' 'custom')