From 3fbb45c1a787b56d182337213e6dca56a7aff5f1 Mon Sep 17 00:00:00 2001 From: xiota Date: Tue, 5 Nov 2024 19:44:50 +0000 Subject: [PATCH] feat(pamac-aur): drop --- libpamac-aur/.CI/config | 1 - libpamac-aur/.CI/info | 2 - libpamac-aur/.SRCINFO | 51 ----------------- libpamac-aur/PKGBUILD | 82 ---------------------------- libpamac-aur/fix-appstream-data.hook | 14 ----- libpamac-aur/fix-appstream-data.sh | 10 ---- libpamac-aur/pamac.install | 65 ---------------------- pamac-aur/.CI/config | 1 - pamac-aur/.SRCINFO | 46 ---------------- pamac-aur/PKGBUILD | 75 ------------------------- pamac-aur/pamac.install | 13 ----- 11 files changed, 360 deletions(-) delete mode 100644 libpamac-aur/.CI/config delete mode 100644 libpamac-aur/.CI/info delete mode 100644 libpamac-aur/.SRCINFO delete mode 100644 libpamac-aur/PKGBUILD delete mode 100644 libpamac-aur/fix-appstream-data.hook delete mode 100644 libpamac-aur/fix-appstream-data.sh delete mode 100644 libpamac-aur/pamac.install delete mode 100644 pamac-aur/.CI/config delete mode 100644 pamac-aur/.SRCINFO delete mode 100644 pamac-aur/PKGBUILD delete mode 100644 pamac-aur/pamac.install diff --git a/libpamac-aur/.CI/config b/libpamac-aur/.CI/config deleted file mode 100644 index 66bee9477..000000000 --- a/libpamac-aur/.CI/config +++ /dev/null @@ -1 +0,0 @@ -CI_PKGBUILD_SOURCE=aur diff --git a/libpamac-aur/.CI/info b/libpamac-aur/.CI/info deleted file mode 100644 index eea1b01ad..000000000 --- a/libpamac-aur/.CI/info +++ /dev/null @@ -1,2 +0,0 @@ -REQ_ORIGIN=chaotic -REQ_REASON=request diff --git a/libpamac-aur/.SRCINFO b/libpamac-aur/.SRCINFO deleted file mode 100644 index b7b906d66..000000000 --- a/libpamac-aur/.SRCINFO +++ /dev/null @@ -1,51 +0,0 @@ -pkgbase = libpamac-aur - pkgdesc = Pamac package manager library based on libalpm - pkgver = 11.7.0 - pkgrel = 1 - url = https://github.com/manjaro/libpamac/ - install = pamac.install - arch = i686 - arch = x86_64 - arch = arm - arch = armv6h - arch = armv7h - arch = aarch64 - license = GPL-3.0-or-later - makedepends = gettext - makedepends = itstool - makedepends = vala>=0.46 - makedepends = asciidoc - makedepends = meson - makedepends = ninja - makedepends = gobject-introspection - makedepends = systemd - depends = glib2>=2.42 - depends = json-glib - depends = libsoup3 - depends = dbus-glib - depends = polkit - depends = vte3>=0.38 - depends = libalpm.so=15 - depends = libnotify - depends = pacman>=7.0 - depends = gnutls>=3.4 - depends = appstream - depends = appstream-glib>=0.7.18-1 - depends = archlinux-appstream-data - depends = git - provides = libpamac.so=11 - provides = libpamac-appstream.so=11 - provides = libpamac=11.7.0 - conflicts = libpamac - conflicts = libpamac-all - options = !emptydirs - options = !strip - backup = etc/pamac.conf - source = libpamac-11.7.0-1.zip::https://github.com/manjaro/libpamac//archive/49bfde599ed00c127869a2797b5bb26e28e11c2a.zip - source = fix-appstream-data.sh - source = fix-appstream-data.hook - sha256sums = 6191f2cf6955a0041fbf72449efe000803cc2a81654a6da96653e27fc9d08452 - sha256sums = 6e0c25f0fcb0076ce78845b037e32925fcc3f1cd1670062c48ed35f564a10244 - sha256sums = b5236af02c25cd7de4b2c9c2d0f064dac3c2f54da5cc72bf72fc6236a34bd9c4 - -pkgname = libpamac-aur diff --git a/libpamac-aur/PKGBUILD b/libpamac-aur/PKGBUILD deleted file mode 100644 index 5fc28ace6..000000000 --- a/libpamac-aur/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# Contributor: Zeph -# Maintainer: Zeph -# https://gitlab.manjaro.org/packages/extra/libpamac -ENABLE_FLATPAK=0 -ENABLE_SNAPD=0 - -pkgname=libpamac-aur -pkgver=11.7.0 -pkgrel=1 -_pkgfixver=$pkgver - -_commit='49bfde599ed00c127869a2797b5bb26e28e11c2a' -sha256sums=('6191f2cf6955a0041fbf72449efe000803cc2a81654a6da96653e27fc9d08452' - '6e0c25f0fcb0076ce78845b037e32925fcc3f1cd1670062c48ed35f564a10244' - 'b5236af02c25cd7de4b2c9c2d0f064dac3c2f54da5cc72bf72fc6236a34bd9c4') - -pkgdesc="Pamac package manager library based on libalpm" -arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') -url="https://github.com/manjaro/libpamac/" -license=('GPL-3.0-or-later') -depends=('glib2>=2.42' 'json-glib' 'libsoup3' 'dbus-glib' 'polkit' 'vte3>=0.38' 'libalpm.so=15' - 'libnotify' 'pacman>=7.0' 'gnutls>=3.4' 'appstream' - 'appstream-glib>=0.7.18-1' 'archlinux-appstream-data' 'git') - -makedepends=('gettext' 'itstool' 'vala>=0.46' 'asciidoc' 'meson' 'ninja' 'gobject-introspection' 'systemd') -backup=('etc/pamac.conf') -conflicts=('libpamac' 'libpamac-all') -provides=('libpamac.so=11' 'libpamac-appstream.so=11' "libpamac=$_pkgfixver") -options=(!emptydirs !strip) -install=pamac.install -source=("libpamac-$pkgver-$pkgrel.zip::$url/archive/$_commit.zip" - 'fix-appstream-data.sh' 'fix-appstream-data.hook') - -define_meson='' -if [ "${ENABLE_FLATPAK}" = 1 ]; then - depends+=('flatpak') - define_meson+=' -Denable-flatpak=true' -fi - -if [ "${ENABLE_SNAPD}" = 1 ]; then - depends+=('snapd' 'snapd-glib') - define_meson+=' -Denable-snap=true' -fi - -create_links() { - # create soname links - find "$pkgdir" -type f -name '*.so*' ! -path '*xorg/*' -print0 | while read -d $'\0' _lib; do - _soname=$(dirname "${_lib}")/$(readelf -d "${_lib}" | grep -Po 'SONAME.*: \[\K[^]]*' || true) - _base=$(echo ${_soname} | sed -r 's/(.*)\.so.*/\1.so/') - [[ -e "${_soname}" ]] || ln -s $(basename "${_lib}") "${_soname}" - [[ -e "${_base}" ]] || ln -s $(basename "${_soname}") "${_base}" - done -} - -prepare() { - cd "$srcdir/libpamac-$_commit" - # adjust version string - sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" src/version.vala -} - -build() { - cd "$srcdir/libpamac-$_commit" - mkdir -p builddir - cd builddir - meson setup --buildtype=release \ - -Denable-aur=true -Denable-appstream=true \ - --prefix=/usr \ - --sysconfdir=/etc $define_meson - # build - meson compile -} - -package() { - cd "$srcdir/libpamac-$_commit/builddir" - DESTDIR="$pkgdir" ninja install - # fix appstream issue - install -Dm644 "$srcdir/fix-appstream-data.hook" "$pkgdir/etc/pacman.d/hooks/fix-appstream-data.hook" - install -Dm755 "$srcdir/fix-appstream-data.sh" "$pkgdir/etc/pacman.d/hooks.bin/fix-appstream-data.sh" - create_links - -} -# vim:set ts=2 sw=2 et: diff --git a/libpamac-aur/fix-appstream-data.hook b/libpamac-aur/fix-appstream-data.hook deleted file mode 100644 index 5a94142bf..000000000 --- a/libpamac-aur/fix-appstream-data.hook +++ /dev/null @@ -1,14 +0,0 @@ -[Trigger] -Operation = Install -Operation = Upgrade -Type = Path -Target = usr/share/swcatalog/xmls/*.xml.gz - -# attention: hook name before: update-appstream-cache.hook - -[Action] -Description = fix appstream datas for pamac -When = PostTransaction -Depends = gzip -Exec = /etc/pacman.d/hooks.bin/fix-appstream-data.sh -NeedsTargets diff --git a/libpamac-aur/fix-appstream-data.sh b/libpamac-aur/fix-appstream-data.sh deleted file mode 100644 index 6b0ed4fa9..000000000 --- a/libpamac-aur/fix-appstream-data.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -tmp="/tmp/fix-appstream-data" -while read -r archive; do - if [[ $(zcat "${archive}" | grep -cm1 '') == "1" ]]; then - zcat "${archive}" | sed 's|||g;s|<\/em>||g;' | sed 's|||g;s|<\/code>||g;'| gzip > "${tmp}" - cp "${tmp}" "${archive}" - rm "${tmp}" - echo " archive ${archive} fixed" - fi -done diff --git a/libpamac-aur/pamac.install b/libpamac-aur/pamac.install deleted file mode 100644 index 0cd8672b7..000000000 --- a/libpamac-aur/pamac.install +++ /dev/null @@ -1,65 +0,0 @@ -msg() { - ALL_OFF="\e[1;0m" - BOLD="\e[1;1m" - GREEN="${BOLD}\e[1;32m" - local mesg=$1; shift - printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - -restore_conf() { - PAMAC_NEW="$(date +%m%d%M%S)" - if [ -f "/etc/pamac.conf.pacsave" ]; then - msg "You had an old /etc/pamac.conf.pacsave file. We restore it for you." - msg "You can find your new pamac.conf saved as \`/etc/pamac-new-${PAMAC_NEW}.conf\`" - mv /etc/pamac.conf /etc/pamac-new-${PAMAC_NEW}.conf - mv /etc/pamac.conf.pacsave /etc/pamac.conf - fi -} - -post_install() { - # remove file (#28, #29) - [[ -e /var/tmp/pamac/dbs/sync/refresh_timestamp ]] && rm -f /var/tmp/pamac/dbs/sync/refresh_timestamp - # enable flatpak repo - if [ -f /usr/bin/flatpak ]; then - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - fi - # enable systemd timers - mkdir -p /etc/systemd/system/timers.target.wants - ln -sf /usr/lib/systemd/system/pamac-cleancache.timer /etc/systemd/system/timers.target.wants/pamac-cleancache.timer - # ln -sf /usr/lib/systemd/system/pamac-mirrorlist.timer /etc/systemd/system/timers.target.wants/pamac-mirrorlist.timer - # polkit agent - printf '==> An authentication agent is required\n' - printf ' Cinnamon, Deepin, GNOME, GNOME Flashback, KDE, LXDE, LXQt, MATE and Xfce\n' - printf ' have an authentication agent already.\n' - printf ' See https://wiki.archlinux.org/index.php/Polkit#Authentication_agents\n' - printf ' for other desktop environments.\n' - # restore old conf - restore_conf -} - -post_upgrade() { - # remove file (#28, #29) - [[ -e /var/tmp/pamac/dbs/sync/refresh_timestamp ]] && rm -f /var/tmp/pamac/dbs/sync/refresh_timestamp - - # restore old conf - if [ "$(vercmp $2 7.3.5-3)" -lt 0 ]; then - restore_conf - fi - - if [ "$(vercmp $2 8.0.3-5)" -lt 0 ]; then - # remove wrong placed symlinks - msg "Updating timer symlinks" - [[ -e /etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer ]] && rm -f /etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer - # [[ -e /etc/systemd/system/multi-user.target.wants/pamac-mirrorlist.timer ]] && rm -f /etc/systemd/system/multi-user.target.wants/pamac-mirrorlist.timer - # enable systemd timers - mkdir -p /etc/systemd/system/timers.target.wants - ln -sf /usr/lib/systemd/system/pamac-cleancache.timer /etc/systemd/system/timers.target.wants/pamac-cleancache.timer - # ln -sf /usr/lib/systemd/system/pamac-mirrorlist.timer /etc/systemd/system/timers.target.wants/pamac-mirrorlist.timer - fi -} - -post_remove() { - # disable systemd timers - rm -f /etc/systemd/system/timers.target.wants/pamac-cleancache.timer - # rm -f /etc/systemd/system/timers.target.wants/pamac-mirrorlist.timer -} diff --git a/pamac-aur/.CI/config b/pamac-aur/.CI/config deleted file mode 100644 index 66bee9477..000000000 --- a/pamac-aur/.CI/config +++ /dev/null @@ -1 +0,0 @@ -CI_PKGBUILD_SOURCE=aur diff --git a/pamac-aur/.SRCINFO b/pamac-aur/.SRCINFO deleted file mode 100644 index 5736c298b..000000000 --- a/pamac-aur/.SRCINFO +++ /dev/null @@ -1,46 +0,0 @@ -pkgbase = pamac-aur - pkgdesc = A Gtk frontend, Package Manager based on libalpm with AUR and Appstream support - pkgver = 11.7.2 - pkgrel = 2 - url = https://github.com/manjaro/pamac - install = pamac.install - arch = i686 - arch = x86_64 - arch = arm - arch = armv6h - arch = armv7h - arch = aarch64 - license = GPL-3.0-or-later - makedepends = gettext - makedepends = itstool - makedepends = vala - makedepends = meson - makedepends = ninja - makedepends = gobject-introspection - makedepends = xorgproto - makedepends = asciidoc - makedepends = git - makedepends = systemd - depends = libnotify - depends = libhandy - depends = libadwaita - depends = gtk4 - depends = desktop-file-utils - depends = libpamac-aur>=11.7 - depends = gnutls>=3.4 - depends = git - optdepends = polkit-gnome: needed for authentification in Cinnamon, Gnome - optdepends = lxsession: needed for authentification in Xfce, LXDE etc. - provides = pamac=11.7.2-2 - provides = pamac-cli=11.7.0-2 - conflicts = pamac - conflicts = pamac-tray-appindicator - conflicts = pamac-cli - options = !emptydirs - options = !strip - source = pamac-11.7.2-2.zip::https://github.com/manjaro/pamac/archive/71ced277e5931ccea2433ece291430481a2694ee.zip - source = pamac-cli-11.7.0-2.zip::https://github.com/manjaro/pamac-cli/archive/035e66944ce8633b6362b45ced879f00ba00a09b.zip - sha256sums = ca2995fd9605bf9841cfcf8c6e642932e7fe5016c42eeea21ead6bd2a6d97226 - sha256sums = 98e605a67cf0a72ef74c8521c2ab85aaddb1d95ad075b14fc27bd3165b859694 - -pkgname = pamac-aur diff --git a/pamac-aur/PKGBUILD b/pamac-aur/PKGBUILD deleted file mode 100644 index 96f8796cc..000000000 --- a/pamac-aur/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# Contributor: Zeph -# Maintainer: Zeph -# https://gitlab.manjaro.org/packages/extra/pamac -ENABLE_FAKE_GNOME_SOFTWARE=0 - -pkgname=pamac-aur -pkgver=11.7.2 -pkgrel=2 -_pkgfixver=$pkgver -_pkgfixvercli=11.7.0 - -_commit='71ced277e5931ccea2433ece291430481a2694ee' -_commitcli='035e66944ce8633b6362b45ced879f00ba00a09b' -sha256sums=('ca2995fd9605bf9841cfcf8c6e642932e7fe5016c42eeea21ead6bd2a6d97226' - '98e605a67cf0a72ef74c8521c2ab85aaddb1d95ad075b14fc27bd3165b859694') - -pkgdesc="A Gtk frontend, Package Manager based on libalpm with AUR and Appstream support" -arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') -url="https://github.com/manjaro/pamac" -urlcli="https://github.com/manjaro/pamac-cli" -license=('GPL-3.0-or-later') -depends=('libnotify' 'libhandy' 'libadwaita' 'gtk4' 'desktop-file-utils' 'libpamac-aur>=11.7' 'gnutls>=3.4' 'git') - -optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome' - 'lxsession: needed for authentification in Xfce, LXDE etc.') -makedepends=('gettext' 'itstool' 'vala' 'meson' 'ninja' 'gobject-introspection' 'xorgproto' 'asciidoc' 'git' 'systemd') -conflicts=('pamac' 'pamac-tray-appindicator' 'pamac-cli') -provides=("pamac=$_pkgfixver-$pkgrel" "pamac-cli=$_pkgfixvercli-$pkgrel") -options=(!emptydirs !strip) -install=pamac.install -source=("pamac-$_pkgfixver-$pkgrel.zip::$url/archive/$_commit.zip" - "pamac-cli-$_pkgfixvercli-$pkgrel.zip::$urlcli/archive/$_commitcli.zip") - -define_meson='' -if [ "${ENABLE_FAKE_GNOME_SOFTWARE}" = 1 ]; then - conflicts+=('pamac-gnome-integration' 'pamac-gnome-integration-dev' 'gnome-software') - define_meson+=' -Denable-fake-gnome-software=true' -fi - -_srcdir="pamac-$_commit" -_srcdircli="pamac-cli-$_commitcli" - -prepare() { - cd "${srcdir}/${_srcdir}" - # adjust version string - sed -i -e "s|\"$_pkgfixver\"|\"$pkgver-$pkgrel\"|g" src/version.vala - cd "${srcdir}/${_srcdircli}" - # adjust version string - sed -i -e "s|\"$_pkgfixvercli\"|\"$_pkgfixvercli-$_pkgrelcli\"|g" src/version.vala -} - -build() { - cd "${srcdir}/${_srcdir}" - mkdir -p builddir && cd builddir - meson --buildtype=release \ - --prefix=/usr \ - --sysconfdir=/etc $define_meson - ninja - - cd "${srcdir}/${_srcdircli}" - mkdir -p builddir && cd builddir - meson setup --prefix=/usr --sysconfdir=/etc --buildtype=release - meson compile -} - -package() { - cd "${srcdir}/${_srcdir}/builddir" - DESTDIR="$pkgdir" ninja install - cp -r "$srcdir/pamac-$_commit/data/gnome-shell/pamac-updates@manjaro.org" "$pkgdir/usr/share/gnome-shell/extensions" - cd "${srcdir}/${_srcdircli}/builddir" - meson install --destdir "$pkgdir" - - install -Dm644 "${srcdir}/${_srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -# vim:set ts=2 sw=2 et: diff --git a/pamac-aur/pamac.install b/pamac-aur/pamac.install deleted file mode 100644 index 811374827..000000000 --- a/pamac-aur/pamac.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - # enable pamac extension - printf '==> Enable Pamac Updates Indicator via\n' - printf ' Extensions\n' -} - -post_upgrade() { - if [[ ! "gsettings get org.gnome.shell enabled-extensions | grep 'pamac-updates'" ]]; then - # enable pamac extension - printf '==> Enable Pamac Updates Indicator via\n' - printf ' Extensions\n' - fi -}