From 996f52fac66a857b874d311c093f8e47206f42fb Mon Sep 17 00:00:00 2001 From: sulincix Date: Wed, 16 Oct 2024 14:07:08 +0000 Subject: [PATCH] fixes about broken packages --- dev/perl/perl-uri/ympbuild | 2 +- kde/plasma/plasma-workspace/ympbuild | 12 ++++++------ media/libs/waf/ympbuild | 16 +++++----------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dev/perl/perl-uri/ympbuild b/dev/perl/perl-uri/ympbuild index 912b53de..0143686d 100644 --- a/dev/perl/perl-uri/ympbuild +++ b/dev/perl/perl-uri/ympbuild @@ -26,6 +26,6 @@ build () { } package () { - make install $jobs + make install $jobs DESTDIR="$DESTDIR" } diff --git a/kde/plasma/plasma-workspace/ympbuild b/kde/plasma/plasma-workspace/ympbuild index d4457a44..aaf1da14 100755 --- a/kde/plasma/plasma-workspace/ympbuild +++ b/kde/plasma/plasma-workspace/ympbuild @@ -46,18 +46,18 @@ prepare(){ } setup () { - mkdir build - cd build - cmake .. -G Ninja \ - -DCMAKE_INSTALL_PREFIX=/usr + cmake -B build \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DGLIBC_LOCALE_GEN=OFF \ + -DBUILD_TESTING=OFF } build () { - ninja -C build $jobs + make -C build $jobs } package () { - ninja -C build install $jobs + make -C build install $jobs # fix symlinks rm -f $DESTDIR//usr/bin/lookandfeeltool ln -s plasma-apply-lookandfeel $DESTDIR//usr/bin/lookandfeeltool diff --git a/media/libs/waf/ympbuild b/media/libs/waf/ympbuild index d1a1f34f..e54c26ec 100644 --- a/media/libs/waf/ympbuild +++ b/media/libs/waf/ympbuild @@ -23,16 +23,10 @@ build(){ } package(){ + install -vDm 755 waf -t "$DESTDIR/usr/bin" + install -vDm 644 wscript -t "$DESTDIR/usr/share/$name/" - install -vDm 755 waf -t "$pkgdir/usr/bin" - install -vDm 644 wscript -t "$pkgdir/usr/share/$name/" - - install -vDm 644 waflib/*.py -t "$pkgdir/usr/lib64/python3/site-packages/waf/waflib/" - install -vDm 644 waflib/Tools/*.py -t "$pkgdir/usr/lib64/python3/site-packages/waf/waflib/Tools/" - install -vDm 644 waflib/extras/*.py -t "$pkgdir/usr/lib64/python3site-packages/waf/waflib/extras/" - python3 -m compileall -d "/usr/lib64/python3" "$pkgdir/usr/lib64/python3" - python3 -O -m compileall -d "/usr/lib64/python3" "$pkgdir/usr/lib64/python3/" - #install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$name/" -# install -vDm 644 {README,../building-waf}.md -t "$pkgdir/usr/share/doc/$name/" -echo "" + install -vDm 644 waflib/*.py -t "$DESTDIR/usr/lib64/python3/site-packages/waf/waflib/" + install -vDm 644 waflib/Tools/*.py -t "$DESTDIR/usr/lib64/python3/site-packages/waf/waflib/Tools/" + install -vDm 644 waflib/extras/*.py -t "$DESTDIR/usr/lib64/python3site-packages/waf/waflib/extras/" }