Merge pull request #33 from slipstream8125/main

build: Modified build.sh to uncomment some packages

PKGBUILDS/albert/PKGBUILD

@@ -3,7 +3,7 @@
 # Contributor: Manuel Schneider  <manuelschneid3r at googles mail>
 
 pkgname=albert
-pkgver=0.26.10
+pkgver=0.26.11
 pkgrel=1
 pkgdesc="A sophisticated standalone keyboard launcher"
 arch=('x86_64')
@@ -60,4 +60,4 @@ package() {
   install -Dm644 "$srcdir/$pkgname/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-sha512sums=('0653265c943e81cee71ca5cd74ccb2f1db11ce6d90fb0a90f09c731249a1a68805ed172a5a93712ab393dd263a5b43da35b9ff5498c702af8e82f83c11cc762a')
+sha512sums=('ed08cc01cba75ebc81ef66016968735285608d47fd569c1d6f4ec3058a14de076eacf0e50f7c1b90229d80f783b07de1dec9e4f1202298290597881bc915f304')

PKGBUILDS/nwg-clipman/PKGBUILD

@@ -0,0 +1,29 @@
+# Maintainer: Piotr Miller <nwg.piotr@gmail.com>
+pkgname=('nwg-clipman')
+pkgver=0.2.2
+pkgrel=1
+pkgdesc="nwg-shell clipboard manager, a GTK3-based GUI for cliphist"
+arch=('any')
+url="https://github.com/nwg-piotr/nwg-clipman"
+license=('MIT')
+provides=('nwg-clipman')
+depends=('python' 'python-gobject' 'gtk3' 'gtk-layer-shell' 'cliphist' 'xdg-utils')
+makedepends=('python-build' 'python-installer' 'python-wheel' 'python-setuptools')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/nwg-piotr/nwg-clipman/archive/v"$pkgver".tar.gz")
+
+md5sums=('da08903398e9c3c5706c7d5f1f7a7840')
+
+build() {
+        cd "${pkgname}-${pkgver}"
+        python -m build --wheel --no-isolation
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  python -m installer --destdir="${pkgdir}" dist/*.whl
+
+  install -D -t "$pkgdir"/usr/share/pixmaps nwg-clipman.svg
+  install -D -t "$pkgdir"/usr/share/applications nwg-clipman.desktop
+  install -D -t "$pkgdir"/usr/share/licenses/"$pkgname" LICENSE
+  install -D -t "$pkgdir"/usr/share/doc/"$pkgname" README.md
+}

PKGBUILDS/octopi/PKGBUILD

@@ -0,0 +1,112 @@
+# Maintainer:
+# Contributor: Mark Wagie <mark dot wagie at proton dot me>
+# Contributor: MatMoul <matmoul at the google email domain which is .com>
+
+_pkgname="octopi"
+pkgname="$_pkgname"
+pkgver=0.16.2
+pkgrel=2
+pkgdesc="A powerful Pacman frontend using Qt libs"
+url="https://github.com/aarnt/octopi"
+license=('GPL-2.0-or-later')
+arch=('x86_64')
+
+depends=(
+  'qtermwidget'
+)
+makedepends=(
+  'cmake'
+  'git'
+  'ninja'
+  'qt6-5compat'
+  'qt6-tools'
+  'vala'
+)
+optdepends=(
+  'inxi: for SysInfo log'
+  'lsb-release: for SysInfo log'
+  'mhwd: for SysInfo log'
+  'pacaur: for AUR support'
+  'pacmanlogviewer: to view pacman log files'
+  'paru: for AUR support'
+  'pikaur: for AUR support'
+  'systemd: for SysInfo log'
+  'trizen: for AUR support'
+  'yay: for AUR support'
+)
+
+conflicts=('alpm_octopi_utils')
+
+_pkgsrc_octopi="$_pkgname-$pkgver"
+_pkgsrc_alpm_utils="alpm_octopi_utils"
+_pkgext="tar.gz"
+source=(
+  "$_pkgsrc_octopi.$_pkgext"::"https://github.com/aarnt/octopi/archive/refs/tags/v$pkgver.$_pkgext"
+  "$_pkgsrc_alpm_utils"::"git+https://github.com/aarnt/alpm_octopi_utils.git"
+)
+sha256sums=(
+  '7a10e68c0eba817d3c5917a392034c9d92dd975f4f2eaf9343b3ae35701e2c93'
+  'SKIP'
+)
+
+prepare() {
+  cd "$_pkgsrc_octopi"
+
+  # Don't hardcode qt-sudo path
+  sed -i 's/usr\/local/usr/g' src/constants.h
+}
+
+_build_alpm_utils() (
+  local _cmake_options=(
+    -B build_alpm
+    -S "$_pkgsrc_alpm_utils"
+    -G Ninja
+    -DCMAKE_BUILD_TYPE=None
+    -DCMAKE_INSTALL_PREFIX='/usr'
+    -Wno-dev
+  )
+
+  cmake "${_cmake_options[@]}"
+  cmake --build build_alpm
+
+  DESTDIR="fakeinstall" cmake --install build_alpm
+)
+
+_build_octopi() (
+  local _cmake_options=(
+    -B build_octopi
+    -S "$_pkgsrc_octopi"
+    -G Ninja
+    -DCMAKE_BUILD_TYPE=None
+    -DCMAKE_INSTALL_PREFIX='/usr'
+    -Dalpm_octopi_utils_DIR="'$srcdir/fakeinstall/usr/lib/cmake/alpm_octopi_utils/'"
+    -Wno-dev
+  )
+
+  cmake "${_cmake_options[@]}"
+  cmake --build build_octopi
+
+  DESTDIR="fakeinstall" cmake --install build_octopi
+)
+
+build() {
+  _build_alpm_utils
+  _build_octopi
+}
+
+package() {
+  depends+=(
+    'pacman'
+    'pacman-contrib'
+    'qt-sudo' # AUR
+  )
+
+  rm -rf "fakeinstall/usr/include/"
+  rm -rf "fakeinstall/usr/lib/cmake/"
+  rm -rf "fakeinstall/usr/lib/pkgconfig/"
+  rm -rf "fakeinstall/usr/share/licenses/"
+  rm -rf "fakeinstall/usr/share/vala/"
+
+  cp --reflink=auto -a fakeinstall/* "$pkgdir/"
+  chmod -R u+rwX,go+rX,go-w "$pkgdir/"
+}

PKGBUILDS/pamac-all/PKGBUILD

@@ -4,11 +4,12 @@
 
 _pkgname=pamac
 pkgname=${_pkgname}-all
-pkgver=11.7.1
+pkgver=11.7.2
+_commit=71ced277e5931ccea2433ece291430481a2694ee
 pkgrel=1
 pkgdesc='A GUI frontend for libalpm (everything in one package - snap, flatpak, appindicator, aur, appstream)'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
-url="https://gitlab.manjaro.org/applications/$_pkgname"
+url="https://github.com/manjaro/$_pkgname"
 license=('GPL3')
 depends=('libnotify' 'libpamac-full' 'libhandy' 'libadwaita' 'pamac-cli')
 optdepends=(
@@ -17,14 +18,19 @@ optdepends=(
 	'polkit-gnome: legacy authentication agent for Gnome'
 	'mate-polkit: authentication agent for Mate'
 	'plymouth: offline upgrades')
-makedepends=('gettext' 'vala' 'meson' 'ninja' 'gobject-introspection')
+makedepends=('asciidoc' 'vala' 'meson' 'gobject-introspection' 'git')
 conflicts=('pamac' 'pamac-gtk' 'pamac-common' 'pamac-aur' 'pamac-aur-git' 'pamac-flatpak' 'pamac-flatpak-gnome')
 provides=("pamac=$pkgver-$pkgrel")
 options=(!emptydirs)
-source=("$url/-/archive/$pkgver/pamac-$pkgver.tar.gz")
-sha256sums=('bdf93f7efde43a1d0fa9ef9cceea409691f1d5e42bbd4fb0f9b3e38e0cd0c22a')
+source=("git+${url}.git#commit=${_commit}")
+sha256sums=('b7166976642b21e9ce22c9f0a0b6a2708ffe4f1c91cf9ec3b52231d2eb13d66e')
 
-_srcdir="$_pkgname-$pkgver"
+_srcdir="$_pkgname"
+
+pkgver() {
+  cd "$_srcdir"
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
 
 prepare() {
 	cd "$_srcdir"

PKGBUILDS/pyprland/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Fabien Devaux <fdev31@gmail.com>
 # Contributor: Fabien Devaux <fdev31@gmail.com>
 pkgname=pyprland
-pkgver=2.4.0
+pkgver=2.4.3
 pkgrel=0
 pkgdesc="Customize your Hyprland with scratchpads, menus, easy monitor layout and other extensions"
 arch=(any)
@@ -17,7 +17,7 @@ backup=()
 options=()
 noextract=()
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/${pkgver}.tar.gz")
-sha256sums=('68f809b74051c091e84bda8f8a52a8a7409197e2595e2e2cc4fdbf99bbe4f127')
+sha256sums=('01f1a8fac6965f4efb0152d315037d7898c59e46477d81589bf4ceb6e90510f6')
 
 build() {
     cd $pkgname-$pkgver

build.sh

@@ -95,18 +95,18 @@ build_and_package() {
         # "libadwaita-without-adwaita-git" 
         # "mkinitcpio-openswap" 
 	"mu" # TODO find a way to not pull in Emacs as a dependency
-        # "nwg-clipman"
+        "nwg-clipman"
         "nwg-dock-hyprland-bin" 
-        # "octopi"
+        "octopi"
         "oh-my-zsh-git"
-        # "pamac-all"
+        "pamac-all"
         "pandoc-bin" 
         "python-clickgen"
-        # "pyprland"
+        "pyprland"
         # #"repoctl"
-        # "rua"
+        "rua"
         "swayfx"
-        # "sway-nvidia"
+        "sway-nvidia"
         "swayosd-git"
         "ventoy-bin" 
         "yay-bin"
@@ -120,20 +120,20 @@ build_and_package() {
     # # # sudo pacman -U $dir/x86_64/ckbcomp-1.227-1-any.pkg.tar.zst --noconfirm
     # # sudo pacman -U $dir/x86_64/repoctl-0.22.2-1-x86_64.pkg.tar.zst --noconfirm
     # cd "$dir"/PKGBUILDS/rockers/
-    # sudo chmod -R 777 ../rockers
-    # sudo -u builder makepkg -cfs --noconfirm # --sign
-    # rm -f **debug**.pkg.tar.zst
-    # rm -rf src/ pkg/
-    # mv *.pkg.tar.zst "$dir"/x86_64/
-    # cd "$dir"/
-
-    # mkdir -p /tmp/litefm && chmod -R 777 /tmp/litefm
-    # cp "$dir"/PKGBUILDS/litefm/PKGBUILD /tmp/litefm
-    # cd /tmp/litefm
-    # rm -f "$dir"/x86_64/**litefm**.pkg.tar.zst
-    # sudo -u builder makepkg -cfs --noconfirm # --sign
-    # mv *.pkg.tar.zst "$dir"/x86_64/
-    # cd "$dir"/
+    sudo chmod -R 777 ../rockers
+    sudo -u builder makepkg -cfs --noconfirm # --sign
+    rm -f **debug**.pkg.tar.zst
+    rm -rf src/ pkg/
+    mv *.pkg.tar.zst "$dir"/x86_64/
+    cd "$dir"/
+
+    mkdir -p /tmp/litefm && chmod -R 777 /tmp/litefm
+    cp "$dir"/PKGBUILDS/litefm/PKGBUILD /tmp/litefm
+    cd /tmp/litefm
+    rm -f "$dir"/x86_64/**litefm**.pkg.tar.zst
+    sudo -u builder makepkg -cfs --noconfirm # --sign
+    mv *.pkg.tar.zst "$dir"/x86_64/
+    cd "$dir"/
 
     mkdir -p /tmp/ckbcomp
     cp "$dir"/PKGBUILDS/ckbcomp/PKGBUILD /tmp/ckbcomp
@@ -183,15 +183,15 @@ build_and_package() {
         "stratos-starship-config"
         )
     for package in "${packages[@]}"; do
-        mkdir -p /tmp/$package
-        cp "$dir"/PKGBUILDS/$package/PKGBUILD /tmp/$package
-        cd /tmp/$package
-        sudo chmod -R 777 /tmp/$package
+        mkdir -p /tmp/"$package"
+        cp "$dir"/PKGBUILDS/"$package"/PKGBUILD /tmp/"$package"
+        cd /tmp/"$package"
+        sudo chmod -R 777 /tmp/"$package"
         sudo -u builder makepkg -cfs --noconfirm
         rm -f **debug**.pkg.tar.zst
-        cp *.pkg.tar.zst $dir/x86_64/
-        cd $dir
-        rm -rf /tmp/$package
+        cp *.pkg.tar.zst "$dir"/x86_64/
+        cd "$dir"
+        rm -rf /tmp/"$package"
     done
 
 }