*/*: switch CMake buildtype to None (MR 1311)

This switch has happened in the Alpine repos quite a while ago and most
of the pmOS packages were using it already too, so let's switch over the
last ones as well.

This also cleans up the APKBUILDs where necessary
This commit is contained in:
Bart Ribbers 2020-06-16 00:03:09 +02:00 committed by Antoine Fontaine
parent 88073cd686
commit 356e7ecb77
No known key found for this signature in database
GPG key ID: 61E75844405615F5
9 changed files with 55 additions and 70 deletions

View file

@ -1,7 +1,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=kquicksyntaxhighlighter
pkgver=0_git20181209
pkgrel=1
pkgrel=2
_commit="eae18069e0acab42f9dfdef2339b22bb77b44640"
pkgdesc="QtQuick bindings for KF5SyntaxHightlighting framework"
arch="all !armhf"
@ -13,23 +13,16 @@ makedepends="extra-cmake-modules qt5-qtdeclarative-dev syntax-highlighting-dev"
source="$pkgname-$_commit.tar.gz::https://cgit.kde.org/scratch/hein/kquicksyntaxhighlighter.git/snapshot/$_commit.tar.gz"
builddir="$srcdir/$_commit"
prepare() {
default_prepare
mkdir "$builddir"/build
}
build() {
cd "$builddir"/build
cmake "$builddir" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib
make
make -C build
}
package() {
cd "$builddir"/build
DESTDIR="$pkgdir" make install
DESTDIR="$pkgdir" make -C build install
}
sha512sums="1e752efa6bc8cad5852ffc022436646e24f36d1c1532b96ba0d7f917a1460d73eb2591f5b392b89fcc41ed0c4fefcb1dac45e145c1e5dd3d80ca46dff54058fc kquicksyntaxhighlighter-eae18069e0acab42f9dfdef2339b22bb77b44640.tar.gz"

View file

@ -2,39 +2,26 @@
pkgname=plasma-videoplayer
_pkgname=videoplayer
pkgver=0.3_git20190505
pkgrel=0
pkgrel=1
_commit="efd715ef60ab321035ab44ddca36a95a8aad176f"
pkgdesc="Video Player for Plasma Mobile"
url="https://invent.kde.org/jbbgameich/videoplayer"
arch="all"
license="LGPL-2.1-or-later"
makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev plasma-framework-dev kdeclarative-dev ki18n-dev kdbusaddons-dev"
source="$pkgname-$_commit.tar.gz::https://invent.kde.org/jbbgameich/videoplayer/-/archive/$_commit/videoplayer-$_commit.tar.gz"
source="https://invent.kde.org/jbbgameich/videoplayer/-/archive/$_commit/videoplayer-$_commit.tar.gz"
options="!check" # No tests
builddir="$srcdir/$_pkgname-$_commit"
prepare() {
default_prepare
mkdir "$builddir"/build
}
build() {
cd "$builddir"/build
cmake "$builddir" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib
make
}
check() {
cd "$builddir"/build
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
make -C build
}
package() {
cd "$builddir"/build
DESTDIR="$pkgdir" make install
DESTDIR="$pkgdir" make -C build install
}
sha512sums="fbd4d320264ae820f3e7f64b41df93a3242ec47d5ad05a241f293926509bdd8799eb90295fe18cbd4ac80c4f7ab87c29b53528c671023ddcd9c42ccbafc99ca7 plasma-videoplayer-efd715ef60ab321035ab44ddca36a95a8aad176f.tar.gz"
sha512sums="fbd4d320264ae820f3e7f64b41df93a3242ec47d5ad05a241f293926509bdd8799eb90295fe18cbd4ac80c4f7ab87c29b53528c671023ddcd9c42ccbafc99ca7 videoplayer-efd715ef60ab321035ab44ddca36a95a8aad176f.tar.gz"

View file

@ -1,21 +1,22 @@
# Maintainer: Bhushan Shah <bshah@kde.org>
pkgname=apitrace
pkgver=9.0
pkgrel=0
pkgrel=1
pkgdesc="Tools for tracing OpenGL, Direct3D, and other graphics APIs"
arch="all"
url="http://apitrace.github.io/"
license="MIT"
depends_dev="mesa-dev zlib-dev libpng-dev libx11-dev linux-headers qt5-qtbase-dev"
makedepends="$depends_dev cmake python3"
source="$pkgname-$pkgver.tar.gz::https://github.com/apitrace/apitrace/archive/$pkgver.tar.gz
0001-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch"
source="https://github.com/apitrace/apitrace/archive/$pkgver/apitrace-$pkgver.tar.gz
0001-Support-libc-that-don-t-have-RTLD_DEEPBIND.patch
"
subpackages="$pkgname-doc"
options="!check" # Tests fail under QEMU
build() {
cmake -B "$builddir"/build \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib
make -C build

View file

@ -1,27 +1,27 @@
pkgname=heimdall
pkgver=1.4.2
pkgrel=4
pkgrel=5
pkgdesc="Flasher for Samsung Galaxy S devices"
url="https://gitlab.com/BenjaminDobell/Heimdall"
arch="all"
license="MIT"
makedepends="libusb-dev cmake"
source="
https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v$pkgver/Heimdall-v$pkgver.tar.gz
source="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v$pkgver/Heimdall-v$pkgver.tar.gz
heimdall_flash_kernel.sh
heimdall_wait_for_device.sh
"
options="!check"
"
options="!check" # No tests
builddir="$srcdir/Heimdall-v$pkgver"
build() {
cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build \
-DCMAKE_BUILD_TYPE=None \
-DDISABLE_FRONTEND=ON
make
cmake --build build
}
package() {
cd build
for i in bin/heimdall "$srcdir"/heimdall_flash_kernel.sh "$srcdir"/heimdall_wait_for_device.sh; do
install -Dm755 "$i" "$pkgdir"/usr/bin/"$(basename "$i")"
done

View file

@ -1,7 +1,7 @@
# Maintainer: Bhushan Shah <bshah@kde.org>
pkgname=telepathy-ofono
pkgver=0_git20190805
pkgrel=2
pkgrel=3
_commit="817b61d214ad2be4f74d3facb4c090ac751faf5b"
pkgdesc="Telepathy oFono connection manager"
url="https://github.com/TelepathyIM/telepathy-ofono"
@ -9,21 +9,21 @@ arch="all"
license="LGPL-2.1-or-later"
depends="ofono"
makedepends="cmake qt5-qtbase-dev libphonenumber-dev telepathy-qt-dev sqlite-dev telepathy-mission-control-dev libofono-qt-dev"
source="$pkgname-$_commit.tar.gz::https://github.com/TelepathyIM/telepathy-ofono/archive/$_commit.tar.gz"
options="!check" # no tests
source="https://github.com/TelepathyIM/telepathy-ofono/archive/$_commiti/telepathy-ofono-$_comit.tar.gz"
options="!check" # No tests
builddir="$srcdir/$pkgname-$_commit"
build() {
cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DOFONO_ON_RING=ON
make
make -C build
}
package() {
DESTDIR="$pkgdir" make install
DESTDIR="$pkgdir" make -C build install
}
sha512sums="946fa6f2af52f192fb4ad7bb130d28c9e4c698a10a1982a1ac4be69d4043621a5edd111a860d84bd7666778b388653167d28bae87e9e13a14c1fe5c1ff0685ad telepathy-ofono-817b61d214ad2be4f74d3facb4c090ac751faf5b.tar.gz"

View file

@ -1,7 +1,7 @@
# Maintainer: Bhushan Shah <bshah@kde.org>
pkgname=telephony-service
pkgver=0_git20200218
pkgrel=1
pkgrel=2
# uses git sha from integration branch, since changes are still pending to be merged
_commit="aa9e19d766c8dfcc23ab0531ade02054d4fd8492"
pkgdesc="Telephony service"
@ -10,23 +10,23 @@ arch="all !armhf" # armhf blocked by qt5-qtmultimedia -> qt5-qtdeclarative
license="GPL-3.0-only"
depends="ofono"
makedepends="cmake qt5-qtbase-dev qt5-qtpim-dev libphonenumber-dev telepathy-qt-dev sqlite-dev telepathy-mission-control-dev libofono-qt-dev qt5-qtpim-dev qt5-qtfeedback-dev libnotify-dev qt5-qtmultimedia-dev pulseaudio-dev glib-dev coreutils lcov gcovr dconf"
source="$pkgname-$_commit.tar.gz::https://github.com/ubports/telephony-service/archive/$_commit.tar.gz
source="https://github.com/ubports/telephony-service/archive/$_commit/telephony-service-$_commit.tar.gz
telephony-service-handler.desktop"
options="!check" # no tests
options="!check" # No tests
builddir="$srcdir/$pkgname-$_commit"
build() {
cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DSKIP_QML_TESTS=ON \
-DWANT_UI_SERVICES=OFF
make
make -C build
}
package() {
DESTDIR="$pkgdir" make install
DESTDIR="$pkgdir" make -C build install
install -Dm644 "$srcdir"/telephony-service-handler.desktop \
"$pkgdir"/etc/xdg/autostart/telephony-service-handler.desktop

View file

@ -1,7 +1,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=uuu
pkgver=1.3
pkgrel=1
pkgrel=2
_commit="8bb3f0169778e5ae9ed498ba5652d65eccc77cff"
pkgdesc="Purism fork of the Universal Update Utility: Freescale/NXP I.MX Chip image deploy tools"
url="https://source.puri.sm/Librem5/mfgtools"
@ -9,27 +9,27 @@ arch="x86_64"
license="BSD-3-Clause"
depends="libusb-compat"
makedepends="cmake libzip-dev libusb-dev bzip2-dev"
source="$pkgname-$_commit.tar.gz::https://source.puri.sm/Librem5/mfgtools/-/archive/$_commit.tar.gz
source="https://source.puri.sm/Librem5/mfgtools/-/archive/$_commit/uuu-$_commit.tar.gz
ignore-git-version.patch"
options="!check"
builddir="$srcdir/mfgtools-$_commit"
build() {
cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
cmake -B build \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr
mkdir -p "$builddir"/libuuu/gen
echo "#define GIT_VERSION \"lib$pkgver\"" > "$builddir"/libuuu/gen/gitversion.h.tmp
mkdir -p build/libuuu/gen
echo "#define GIT_VERSION \"lib$pkgver\"" > build/libuuu/gen/gitversion.h.tmp
make
make -C build
}
package() {
echo "#define GIT_VERSION \"lib$pkgver\"" > "$builddir"/libuuu/gen/gitversion.h.tmp
echo "#define GIT_VERSION \"lib$pkgver\"" > build/libuuu/gen/gitversion.h.tmp
make DESTDIR="$pkgdir" install
make DESTDIR="$pkgdir" -C build install
}
sha512sums="f3c004d4e712123d3c2ae2e4a08e3dfd64ed9b065edb05aa0e4d7c6a5d9b1b6ea7d5190b6709c522ba7a5a3e9c978aefc3865a2e16c5696b8024a9584e3ab2a5 uuu-8bb3f0169778e5ae9ed498ba5652d65eccc77cff.tar.gz
b6ab9acadd46360fca1944b3abe93c3eafdafd3343e32350fed47426c7858b59bb49554deb6c8e249984878276a9f288546702267f4dc3774918dfdf2a61ed83 ignore-git-version.patch"
fd9c8c09eab958ba997bd94a6b4e08920f4f587d2d42106e383a5421f063360d9da138cf07f36231147636dbcde3d20f1225f8a01058f654d099418133546b50 ignore-git-version.patch"

View file

@ -1,3 +1,7 @@
Since the package build happens in the pmaports git repo, this check doesn't give the correct result and we should disable it.
This is not an upstreamable fix as it just removes the check rather than replacing it with something more proper.
diff --git a/libuuu/gen_ver.sh b/libuuu/gen_ver.sh
index d4e8c1ba..8f416322 100755
--- a/libuuu/gen_ver.sh

View file

@ -1,7 +1,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-nano
pkgver=5.19.0_git20200605
pkgrel=0
pkgrel=1
_commit="3cd021537cbf4f24842f38698b54faab5b7d997f"
pkgdesc="A minimal Plasma shell package intended for embedded devices"
arch="all !armhf"