From f761f589d8be9ddb0be8e6614235a8e3c4d6b6f2 Mon Sep 17 00:00:00 2001
From: David Brochero <davidfbg00@gmail.com>
Date: Fri, 13 Dec 2024 16:13:52 -0300
Subject: [PATCH] ref: move aarch version to a separate pr

---
 packagelist                                   |  1 -
 packages/zen-browser-bin/.SRCINFO             | 49 -----------
 .../zen-browser-bin/zen-browser-bin.pacscript | 85 -------------------
 packages/zen-browser-generic-bin/.SRCINFO     |  2 +-
 .../zen-browser-generic-bin.pacscript         |  2 +-
 packages/zen-browser-specific-bin/.SRCINFO    |  2 +-
 .../zen-browser-specific-bin.pacscript        |  2 +-
 srclist                                       | 54 +-----------
 8 files changed, 6 insertions(+), 191 deletions(-)
 delete mode 100644 packages/zen-browser-bin/.SRCINFO
 delete mode 100644 packages/zen-browser-bin/zen-browser-bin.pacscript

diff --git a/packagelist b/packagelist
index 38d265c7d4..8bc1e46025 100644
--- a/packagelist
+++ b/packagelist
@@ -649,7 +649,6 @@ yt-dlp
 zap
 zed-editor-preview-bin
 zed-editor-stable-bin
-zen-browser-bin
 zen-browser-generic-bin
 zen-browser-specific-bin
 zentile-bin
diff --git a/packages/zen-browser-bin/.SRCINFO b/packages/zen-browser-bin/.SRCINFO
deleted file mode 100644
index 4df8b7b871..0000000000
--- a/packages/zen-browser-bin/.SRCINFO
+++ /dev/null
@@ -1,49 +0,0 @@
-pkgbase = zen-browser-bin
-	gives = zen-browser
-	pkgver = 1.0.2-b.1
-	pkgrel = 1
-	pkgdesc = Experience tranquillity while browsing the web without people tracking you!
-	url = https://zen-browser.app/
-	arch = amd64
-	arch = arm64
-	license = MPL-2.0
-	maintainer = D-Brox <davidfbg00@gmail.com>
-	repology = project: zen-browser
-	pacdeps_amd64 = zen-browser-specific-bin
-	source_amd64 = https://github.com/zen-browser
-	depends_arm64 = libasound2
-	depends_arm64 = libatk1.0-0
-	depends_arm64 = libc6
-	depends_arm64 = libcairo-gobject2
-	depends_arm64 = libcairo2
-	depends_arm64 = libdbus-1-3
-	depends_arm64 = libevent-2.1-7
-	depends_arm64 = libffi8
-	depends_arm64 = libfontconfig1
-	depends_arm64 = libfreetype6
-	depends_arm64 = libgcc-s1
-	depends_arm64 = libgdk-pixbuf-2.0-0
-	depends_arm64 = libglib2.0-0
-	depends_arm64 = libgtk-3-0
-	depends_arm64 = libnspr4
-	depends_arm64 = libnss3
-	depends_arm64 = libpango-1.0-0
-	depends_arm64 = libstdc++6
-	depends_arm64 = libvpx9
-	depends_arm64 = libx11-6
-	depends_arm64 = libx11-xcb1
-	depends_arm64 = libxcb-shm0
-	depends_arm64 = libxcb1
-	depends_arm64 = libxcomposite1
-	depends_arm64 = libxdamage1
-	depends_arm64 = libxext6
-	depends_arm64 = libxfixes3
-	depends_arm64 = libxrandr2
-	depends_arm64 = zlib1g
-	depends_arm64 = fontconfig
-	depends_arm64 = procps
-	depends_arm64 = debianutils
-	source_arm64 = zen-browser-1.0.2-b.1.tar.bz2::https://github.com/zen-browser/desktop/releases/download/1.0.2-b.1/zen.linux-aarch64.tar.bz2
-	sha256sums_arm64 = 631e09f73339674c5f90fd0589d199788ff81bb2076d31b32323e895c20e896d
-
-pkgname = zen-browser-bin
diff --git a/packages/zen-browser-bin/zen-browser-bin.pacscript b/packages/zen-browser-bin/zen-browser-bin.pacscript
deleted file mode 100644
index 5b9e5c8cbd..0000000000
--- a/packages/zen-browser-bin/zen-browser-bin.pacscript
+++ /dev/null
@@ -1,85 +0,0 @@
-pkgname="zen-browser-bin"
-gives="zen-browser"
-pkgver="1.0.2-b.1"
-pkgrel=1
-pkgdesc="Experience tranquillity while browsing the web without people tracking you!"
-url="https://zen-browser.app/"
-license=("MPL-2.0")
-repology=("project: zen-browser")
-arch=("amd64" "arm64")
-maintainer=("D-Brox <davidfbg00@gmail.com>")
-
-# Meta package on amd64, autoselect
-if grep -q avx /proc/cpuinfo; then
-  pacdeps_amd64=('zen-browser-specific-bin')
-else
-  pacdeps_amd64=('zen-browser-generic-bin')
-fi
-source_amd64=('https://github.com/zen-browser') # Dummy source for meta package
-
-# Normal package on arm64
-source_arm64=("zen-browser-${pkgver}.tar.bz2::https://github.com/zen-browser/desktop/releases/download/${pkgver}/zen.linux-aarch64.tar.bz2")
-sha256sums_arm64=('631e09f73339674c5f90fd0589d199788ff81bb2076d31b32323e895c20e896d')
-depends_arm64=("libasound2" "libatk1.0-0" "libc6" "libcairo-gobject2" "libcairo2" "libdbus-1-3" "libevent-2.1-7" "libffi8" "libfontconfig1" "libfreetype6" "libgcc-s1" "libgdk-pixbuf-2.0-0" "libglib2.0-0" "libgtk-3-0" "libnspr4" "libnss3" "libpango-1.0-0" "libstdc++6" "libvpx9" "libx11-6" "libx11-xcb1" "libxcb-shm0" "libxcb1" "libxcomposite1" "libxdamage1" "libxext6" "libxfixes3" "libxrandr2" "zlib1g" "fontconfig" "procps" "debianutils")
-
-package_arm64() {
-  cd "${srcdir}"
-
-  # Zen
-  mkdir -p "${pkgdir}/usr/lib/zen-browser"
-  cp -r zen/* "${pkgdir}/usr/lib/zen-browser"
-  chmod +x "${pkgdir}/usr/lib/zen-browser/zen"
-  chmod +x "${pkgdir}/usr/lib/zen-browser/zen-bin"
-
-  # Desktop entry
-  mkdir -p "${pkgdir}/usr/share/applications/"
-  echo '[Desktop Entry]
-Name=Zen Browser
-Comment=Experience tranquillity while browsing the web without people tracking you!
-Exec=/usr/lib/zen-browser/zen-bin %u
-X-MultipleArgs=false
-Terminal=false
-Type=Application
-Icon=zen-browser
-Categories=Network;WebBrowser;
-MimeType=application/json;application/pdf;application/rdf+xml;application/rss+xml;application/x-xpinstall;application/xhtml+xml;application/xml;audio/flac;audio/ogg;audio/webm;image/avif;image/gif;image/jpeg;image/png;image/svg+xml;image/webp;text/html;text/xml;video/ogg;video/webm;x-scheme-handler/chrome;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/mailto;
-StartupWMClass=zen-beta
-StartupNotify=true
-Keywords=Internet;WWW;Browser;Web;Explorer;
-Actions=new-window;new-private-window;profilemanager;
-
-[Desktop Action new-window]
-Name=Open a New Window
-Exec=/usr/lib/zen-browser/zen-bin %u
-
-[Desktop Action new-private-window]
-Name=Open a New Private Window
-Exec=/usr/lib/zen-browser/zen-bin --private-window %u
-
-[Desktop Action profilemanager]
-Name=Open the Profile Manager
-Exec=/usr/lib/zen-browser/zen-bin --ProfileManager %u' | tee "${pkgdir}/usr/share/applications/zen-browser.desktop" > /dev/null
-
-  # Executable
-  mkdir -p "${pkgdir}"/usr/bin
-  # shellcheck disable=SC2016
-  echo '#!/usr/bin/bash
-[[ -z $MOZ_DISABLE_WAYLAND ]] && { [[ $XDG_CURRENT_DESKTOP == "GNOME" ]] && [[ -n $WAYLAND_DISPLAY ]] || [[ $XDG_SESSION_TYPE == "wayland" ]]; } && export MOZ_ENABLE_WAYLAND=1 && export MOZ_DBUS_REMOTE=1
-exec /usr/lib/zen-browser/zen-bin "$@"' | tee "${pkgdir}/usr/bin/zen-browser" > /dev/null
-  chmod +x "${pkgdir}/usr/bin/zen-browser"
-
-  # Icons
-  for i in 16x16 32x32 48x48 64x64 128x128; do
-    mkdir -p "${pkgdir}/usr/share/icons/hicolor/${i}/apps/"
-    ln -s "/usr/lib/zen-browser/browser/chrome/icons/default/default${i/x*/}.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${i}/apps/zen-browser.png"
-  done
-
-  # Policies
-  mkdir -p "${pkgdir}/usr/lib/zen-browser/distribution"
-  echo '{
-    "policies": {
-        "DisableAppUpdate": true
-    }
-}' | tee "${pkgdir}/usr/lib/zen-browser/distribution/policies.json" > /dev/null
-}
diff --git a/packages/zen-browser-generic-bin/.SRCINFO b/packages/zen-browser-generic-bin/.SRCINFO
index 6855acd66b..ac26333838 100644
--- a/packages/zen-browser-generic-bin/.SRCINFO
+++ b/packages/zen-browser-generic-bin/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = zen-browser-generic-bin
-	gives = zen-browser-generic
+	gives = zen-browser
 	pkgver = 1.0.2-b.1
 	pkgrel = 1
 	pkgdesc = Experience tranquillity while browsing the web without people tracking you!
diff --git a/packages/zen-browser-generic-bin/zen-browser-generic-bin.pacscript b/packages/zen-browser-generic-bin/zen-browser-generic-bin.pacscript
index d4bb569455..7ddd7d2e71 100644
--- a/packages/zen-browser-generic-bin/zen-browser-generic-bin.pacscript
+++ b/packages/zen-browser-generic-bin/zen-browser-generic-bin.pacscript
@@ -1,5 +1,5 @@
 pkgname="zen-browser-generic-bin"
-gives="zen-browser-generic"
+gives="zen-browser"
 conflicts=("zen-browser-specific")
 pkgver="1.0.2-b.1"
 pkgrel=1
diff --git a/packages/zen-browser-specific-bin/.SRCINFO b/packages/zen-browser-specific-bin/.SRCINFO
index 67dd8b1f6d..f756c94137 100644
--- a/packages/zen-browser-specific-bin/.SRCINFO
+++ b/packages/zen-browser-specific-bin/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = zen-browser-specific-bin
-	gives = zen-browser-specific
+	gives = zen-browser
 	pkgver = 1.0.2-b.1
 	pkgrel = 1
 	pkgdesc = Experience tranquillity while browsing the web without people tracking you!
diff --git a/packages/zen-browser-specific-bin/zen-browser-specific-bin.pacscript b/packages/zen-browser-specific-bin/zen-browser-specific-bin.pacscript
index dc27d29b8f..847c072071 100644
--- a/packages/zen-browser-specific-bin/zen-browser-specific-bin.pacscript
+++ b/packages/zen-browser-specific-bin/zen-browser-specific-bin.pacscript
@@ -1,5 +1,5 @@
 pkgname="zen-browser-specific-bin"
-gives="zen-browser-specific"
+gives="zen-browser"
 conflicts=("zen-browser-generic")
 pkgver="1.0.2-b.1"
 pkgrel=1
diff --git a/srclist b/srclist
index 99ce17cead..98dc0304dc 100644
--- a/srclist
+++ b/srclist
@@ -13169,58 +13169,8 @@ pkgbase = zed-editor-stable-bin
 
 pkgname = zed-editor-stable-bin
 ---
-pkgbase = zen-browser-bin
-	gives = zen-browser
-	pkgver = 1.0.2-b.1
-	pkgrel = 1
-	pkgdesc = Experience tranquillity while browsing the web without people tracking you!
-	url = https://zen-browser.app/
-	arch = amd64
-	arch = arm64
-	license = MPL-2.0
-	maintainer = D-Brox <davidfbg00@gmail.com>
-	repology = project: zen-browser
-	pacdeps_amd64 = zen-browser-specific-bin
-	source_amd64 = https://github.com/zen-browser
-	depends_arm64 = libasound2
-	depends_arm64 = libatk1.0-0
-	depends_arm64 = libc6
-	depends_arm64 = libcairo-gobject2
-	depends_arm64 = libcairo2
-	depends_arm64 = libdbus-1-3
-	depends_arm64 = libevent-2.1-7
-	depends_arm64 = libffi8
-	depends_arm64 = libfontconfig1
-	depends_arm64 = libfreetype6
-	depends_arm64 = libgcc-s1
-	depends_arm64 = libgdk-pixbuf-2.0-0
-	depends_arm64 = libglib2.0-0
-	depends_arm64 = libgtk-3-0
-	depends_arm64 = libnspr4
-	depends_arm64 = libnss3
-	depends_arm64 = libpango-1.0-0
-	depends_arm64 = libstdc++6
-	depends_arm64 = libvpx9
-	depends_arm64 = libx11-6
-	depends_arm64 = libx11-xcb1
-	depends_arm64 = libxcb-shm0
-	depends_arm64 = libxcb1
-	depends_arm64 = libxcomposite1
-	depends_arm64 = libxdamage1
-	depends_arm64 = libxext6
-	depends_arm64 = libxfixes3
-	depends_arm64 = libxrandr2
-	depends_arm64 = zlib1g
-	depends_arm64 = fontconfig
-	depends_arm64 = procps
-	depends_arm64 = debianutils
-	source_arm64 = zen-browser-1.0.2-b.1.tar.bz2::https://github.com/zen-browser/desktop/releases/download/1.0.2-b.1/zen.linux-aarch64.tar.bz2
-	sha256sums_arm64 = 631e09f73339674c5f90fd0589d199788ff81bb2076d31b32323e895c20e896d
-
-pkgname = zen-browser-bin
----
 pkgbase = zen-browser-generic-bin
-	gives = zen-browser-generic
+	gives = zen-browser
 	pkgver = 1.0.2-b.1
 	pkgrel = 1
 	pkgdesc = Experience tranquillity while browsing the web without people tracking you!
@@ -13263,7 +13213,7 @@ pkgbase = zen-browser-generic-bin
 pkgname = zen-browser-generic-bin
 ---
 pkgbase = zen-browser-specific-bin
-	gives = zen-browser-specific
+	gives = zen-browser
 	pkgver = 1.0.2-b.1
 	pkgrel = 1
 	pkgdesc = Experience tranquillity while browsing the web without people tracking you!