Date: Friday, September 16, 2022 @ 13:28:22
  Author: arodseth
Revision: 1304318

upgpkg: ladybird 20220916-1

Modified:
  ladybird/trunk/PKGBUILD

----------+
 PKGBUILD |   45 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-09-16 12:34:53 UTC (rev 1304317)
+++ PKGBUILD    2022-09-16 13:28:22 UTC (rev 1304318)
@@ -1,17 +1,18 @@
 # Maintainer: Alexander F. Rødseth <[email protected]>
 # Contributor: Brian <[email protected]>
 
-pkgname=ladybird
-pkgver=20220912
-pkgrel=2
+pkgbase=ladybird
+pkgname=(ladybird serenity-wallpapers)
+pkgver=20220916
+pkgrel=1
 pkgdesc='Web browser built from scratch using the SerenityOS LibWeb engine'
 arch=(x86_64)
-url='https://github.com/awesomekling/ladybird'
+url='https://github.com/SerenityOS/ladybird'
 license=(BSD)
-depends=(brotli less libgl python qt6-base qt6-wayland)
+depends=(less libgl python qt6-base qt6-wayland)
 makedepends=(cmake gendesk git ninja qt6-tools unzip)
 options=(!lto)
-source=("git+$url#commit=954dbd3f5da429d0282435f7d98a86dc7b16417b" # 2022-09-12
+source=("git+$url#commit=2ebaaf5e5ce1c954e8c3e6bfb0c17cc0e412e1b6" # 2022-09-16
         ladybird.sh)
 b2sums=('SKIP'
         
'8a1124ade2b98ab0b8ef2e03616bdbe4340f16dd493283fccb5f69cb74fc172a936da1f5ea3d346e70792deb56e239170fcae2201d7e8a075d1f82750711b6c3')
@@ -25,21 +26,39 @@
   cmake \
     -B build \
     -D CMAKE_BUILD_TYPE=Release \
-    -G Ninja
+    -G Ninja \
+    -W no-dev
   cmake --build build
   ninja -C build
 }
 
-package() {
-  install -d "$pkgdir/usr/"{lib/$pkgname,share/serenity}
+package_ladybird() {
   install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
   install -Dm644 $pkgname.desktop 
"$pkgdir/usr/share/applications/$pkgname.desktop"
   install -Dm644 $pkgname.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm644 $pkgname/LICENSE.md 
"$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+
   cd $pkgname/build
+
+  # package the executable
   install -Dm755 $pkgname "$pkgdir/usr/share/serenity/Base/bin/$pkgname"
-  # TODO: package this more elegantly, and without unneeded files
-  cp -R _deps/lagom-build/*.so* "$pkgdir/usr/lib/"
-  cp -R serenity/* "$pkgdir/usr/share/serenity/"
-  find "$pkgdir/usr/share/serenity" -regex ".*\.\(cpp\|h\)" -type f -delete
+
+  # package shared libraries
+  for f in _deps/lagom-build/*.so; do
+    install -Dm644 "$f" -t "$pkgdir/usr/lib"
+  done
+
+  # package resources needed by the browser
+  cp -R serenity/Base/res "$pkgdir/usr/share/serenity/Base/"
+  rm -r "$pkgdir/usr/share/serenity/Base/res/wallpapers"
 }
+
+package_serenity-wallpapers() {
+  pkgdesc='SerenityOS wallpapers'
+  arch=(any)
+  depends=()
+
+  install -d "$pkgdir/usr/share/backgrounds"
+  cp -R $pkgbase/build/serenity/Base/res/wallpapers 
"$pkgdir/usr/share/backgrounds/serenity"
+  install -Dm644 $pkgbase/LICENSE.md 
"$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+}

Reply via email to