abslibre

Clone
Source Code
GIT

#29 pcr request: mate-menu
Opened 2 years ago by dikasp. Modified 2 years ago
dikasp/abslibre pull-requests2  into  pull-requests

Merge
file modified
+29 -31 
@@ -6,6 +6,7 @@ 
 

  # This package comes from Artix
 

  # Parabola changes:
 

  # - elogind and libelogind: do not provide {lib,}elogind=$pkgver, it's ridiculous
 

+ # - elogind: do not provide systemd-tools, openrc will conflict it
 

  # - libelogind: make libsystemd.so a copy of libelogind.so instead of linking it,
 

  #   so in that way it will provide the correct version according to the
 

  #   architecture (libsystemd.so=0-64 or libsystemd.so=0-32)
 
@@ -14,20 +15,20 @@ 
 

  pkgbase=elogind
 

  pkgname=('elogind' 'libelogind')
 

  pkgver=246.10
 

- pkgrel=2
 

+ pkgrel=1
 

  pkgdesc="The systemd project's logind, extracted to a standalone package"
 

- arch=('x86_64')
 

- arch+=('i686' 'armv7h')
 

+ arch=('x86_64' 'i686' 'armv7h')
 

  url="https://github.com/elogind/elogind"
 

  license=('GPL' 'LGPL2.1')
 

- makedepends=('acl' 'intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus'
 

-             'libseccomp' 'meson' 'kexec-tools' 'openrc' 'libcap')
 

+ conflicts=('systemd-libsystemd')
 

+ makedepends=('intltool' 'libtool' 'gperf' 'gtk-doc' 'polkit' 'dbus'
 

+             'libseccomp' 'meson' 'kexec-tools' 'openrc')
 

  options=('!libtool')
 

  source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz"
 

-         #'elogind.confd' 'elogind.initd'
 

-         'elogind.sv.initd')
 

+         'elogind.confd' 'elogind.initd')
 

  sha256sums=('c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922'
 

-             'b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b')
 

+             '344db76bf8aadfba4363c63aacd93c945a647bd5e425d756cbfd9cb4453afc66'
 

+             '2fc375b3aa61cb63b16c55840acaa69d26b16a01d393ee129d77c804efdac278')
 

  

  build() {
 

      local meson_options=(
 
@@ -38,7 +39,6 @@ 
 

          -Ddefault-hierarchy=hybrid
 

          -Dcgroup-controller=openrc
 

          -Ddefault-kill-user-processes=false
 

-         -Dman=true
 

      )
 

  

      arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}"
 
@@ -52,46 +52,44 @@ 
 

  

  package_elogind() {
 

      pkgdesc="The systemd project's logind, extracted to a standalone package"
 

-     provides=("systemd=${pkgver}" 'logind')
 

-     depends=('acl' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev')
 

+     provides=("systemd=${pkgver}")
 

+     depends=('pam' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev')
 

      optdepends=('polkit: polkit support')
 

      backup=('etc/elogind/logind.conf')
 

  

      provides+=("${pkgname}-openrc")
 

-     conflicts=('systemd-udev' "${pkgname}-openrc")
 

+     conflicts+=('systemd-udev' "${pkgname}-openrc")
 

      replaces=("${pkgname}-openrc")
 

  

      DESTDIR="$pkgdir" meson install -C build
 

  

-     ln -sfv libelogind.pc "${pkgdir}"/usr/lib/pkgconfig/libsystemd.pc
 

+     ln -sfv libelogind.pc ${pkgdir}/usr/lib/pkgconfig/libsystemd.pc
 

  

-     install -dm755 "${srcdir}"/_libelogind
 

-     mv -v "${pkgdir}"/usr/lib/libelogind*.so* "${srcdir}"/_libelogind
 

+     install -dm755 ${srcdir}/_libelogind
 

+     mv -v ${pkgdir}/usr/lib/libelogind*.so* ${srcdir}/_libelogind
 

  

-     install -d "${pkgdir}"/{etc,usr/lib}/elogind/{logind,sleep}.conf.d
 

+     # Init scripts
 

+     install -Dm755 ${srcdir}/elogind.initd ${pkgdir}/etc/init.d/elogind
 

+     install -Dm755 ${srcdir}/elogind.confd ${pkgdir}/etc/conf.d/elogind
 

  

-     # Init script
 

-     #install -Dm755 "${srcdir}"/elogind.initd "${pkgdir}"/etc/init.d/elogind
 

-     #install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind
 

-     install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind
 

- 

-     install -d "${pkgdir}"/etc/runlevels/boot
 

-     ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind
 

+     install -d "${pkgdir}/etc/runlevels/boot"
 

+     ln -sf "/etc/init.d/elogind" "${pkgdir}/etc/runlevels/boot/elogind"
 

  }
 

  

  package_libelogind(){
 

      pkgdesc="elogind client libraries"
 

-     provides=('libelogind.so' 'liblogind')
 

-     provides+=("libsystemd=${pkgver}" "systemd-libs=${pkgver}"
 

+     groups=('base-devel')
 

+     provides=('libelogind.so'
 

+              "libsystemd=${pkgver}" "systemd-libs=${pkgver}"
 

               'libsystemd.so')
 

-     conflicts=('libsystemd.so')
 

+     conflicts+=('libsystemd.so')
 

      depends=('libcap' 'libudev')
 

  

-     cd "${pkgbase}-${pkgver}"
 

+     cd ${pkgbase}-${pkgver}
 

  

-     install -dm755 "${pkgdir}"/usr/lib
 

-     mv "${srcdir}"/_libelogind/libelogind*.so* "${pkgdir}"/usr/lib
 

+     install -dm755 ${pkgdir}/usr/lib
 

+     mv ${srcdir}/_libelogind/libelogind*.so* ${pkgdir}/usr/lib
 

  

-     install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so
 

-     ln -sfv libsystemd.so "${pkgdir}"/usr/lib/libsystemd.so.0
 

+     install -m755 ${pkgdir}/usr/lib/libelogind.so ${pkgdir}/usr/lib/libsystemd.so
 

+     ln -sfv libsystemd.so ${pkgdir}/usr/lib/libsystemd.so.0
 

  }

file modified
+45 -75 
@@ -7,29 +7,27 @@ 
 

  # Contributor (Arch): Valentine Sinitsyn <e_val@inbox.ru>
 

  

  pkgbase=networkmanager
 

- pkgname=(networkmanager libnm nm-cloud-setup)
 

- pkgver=1.32.2
 

- pkgrel=1
 

+ pkgname=(networkmanager libnm)
 

+ pkgver=1.30.4
 

+ pkgrel=3
 

  pkgrel+=.nonsystemd1
 

  pkgdesc="Network connection manager and user applications"
 

  url="https://wiki.gnome.org/Projects/NetworkManager"
 

- arch=(x86_64)
 

- arch+=(i686 armv7h)
 

- license=(GPL2)
 

+ arch=(x86_64 i686 armv7h)
 

+ license=(GPL2 LGPL2.1)
 

  _pppver=2.4.9
 

- makedepends=(intltool dhclient dhcpcd iptables-nft gobject-introspection gtk-doc
 

-              "ppp=$_pppver" modemmanager iproute2 nss polkit wpa_supplicant curl
 

-              logind libmm-glib libnewt libndp libteam nftables vala perl-yaml
 

-              python-gobject git vala jansson bluez-libs glib2-docs iwd dnsmasq
 

-              openresolv libpsl audit meson)
 

+ makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
 

+              iproute2 nss polkit wpa_supplicant curl elogind libmm-glib
 

+              libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
 

+              glib2-docs dhcpcd iwd dnsmasq openresolv libpsl audit meson)
 

  checkdepends=(libx11 python-dbus)
 

- _commit=bf1b09702ed442a3efe426c8ceba4ef1e6bb1902  # tags/1.20.6^0
 

+ _commit=a3e45da9f984d58e3b76d6ca064033541d819eca  # tags/1.30.4^0
 

  source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"
 

          NetworkManager.{confd,initd} 10-openrc-status)
 

  sha256sums=('SKIP'
 

              '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd'
 

-             'eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4'
 

-             'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe')
 

+             '861445d46e8863dca26a91018da3dd9fee6a64467a93e7512774dfd88914539d'
 

+             '1535237db113a76261d6f1ce0b24a55e956934b0c1c59e9fd624f621961327b6')
 

  

  pkgver() {
 

    cd NetworkManager
 
@@ -38,53 +36,44 @@ 
 

  

  prepare() {
 

    cd NetworkManager
 

+ 

+   # https://bugs.archlinux.org/task/70710
 

+   git cherry-pick -n 8acad5a20cc61081438294efc634c0e245452e35
 

  }
 

  

  build() {
 

    local meson_args=(
 

-     # system paths
 

      -D dbus_conf_dir=/usr/share/dbus-1/system.d
 

- 

-     # platform
 

      -D dist_version="$pkgver-$pkgrel"
 

      -D session_tracking_consolekit=false
 

      -D suspend_resume=elogind
 

      -D modify_system=true
 

      -D polkit_agent=true
 

      -D selinux=false
 

-     -D systemdsystemunitdir=no
 

-     -D session_tracking=elogind
 

-     -D systemd_journal=false
 

- 

-     # features
 

      -D iwd=true
 

      -D pppd_plugin_dir=/usr/lib/pppd/$_pppver
 

      -D teamdctl=true
 

-     -D nm_cloud_setup=true
 

      -D bluez5_dun=true
 

      -D ebpf=true
 

- 

-     # configuration plugins
 

      -D config_plugins_default=keyfile
 

- 

-     # handlers for resolv.conf
 

-     -D netconfig=no
 

-     -D config_dns_rc_manager_default=symlink
 

- 

-     # miscellaneous
 

      -D vapi=true
 

      -D docs=true
 

      -D more_asserts=no
 

      -D more_logging=false
 

      -D qt=false
 

+     -D systemdsystemunitdir=no
 

+     -D session_tracking=elogind
 

+     -D systemd_journal=false
 

    )
 

  

    arch-meson NetworkManager build "${meson_args[@]}"
 

-   meson compile -C build
 

+   ninja -C build
 

  }
 

  

  check() {
 

-   meson test -C build --print-errorlogs
 

+   # iproute2 bug
 

+   # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/be76d8b624fab99cbd76092ff511e6adc305279c
 

+   meson test -C build --print-errorlogs || :
 

  }
 

  

  _pick() {
 
@@ -99,77 +88,58 @@ 
 

  

  package_networkmanager() {
 

    depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl
 

-            bluez-libs libpsl audit mobile-broadband-provider-info elogind)
 

+            bluez-libs libpsl audit elogind)
 

    optdepends=('dnsmasq: connection sharing'
 

-               'nftables: connection sharing'
 

-               'iptables: connection sharing'
 

                'bluez: Bluetooth support'
 

                'ppp: dialup connection support'
 

                'modemmanager: cellular network support'
 

-               'iwd: wpa_supplicant alternative'
 

-               'dhclient: alternative DHCP client'
 

-               'dhcpcd: alternative DHCP client'
 

-               'openresolv: alternative resolv.conf manager'
 

-               'firewalld: firewall support')
 

+               'iwd: wpa_supplicant alternative')
 

    provides=($pkgname-{elogind,openrc})
 

    replaces=($pkgname-{elogind,openrc})
 

    backup=(etc/NetworkManager/NetworkManager.conf)
 

+   groups=(gnome)
 

  

-   meson install -C build --destdir "$pkgdir"
 

- 

-   cd "$pkgdir"
 

+   DESTDIR="$pkgdir" meson install -C build
 

  

    # /etc/NetworkManager
 

-   install -d etc/NetworkManager/{conf,dnsmasq}.d
 

-   install -dm700 etc/NetworkManager/system-connections
 

-   install -m644 /dev/stdin etc/NetworkManager/NetworkManager.conf <<END
 

+   install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d
 

+   install -dm700 "$pkgdir/etc/NetworkManager/system-connections"
 

+   install -m644 /dev/stdin "$pkgdir/etc/NetworkManager/NetworkManager.conf" <<END
 

  # Configuration file for NetworkManager.
 

  # See "man 5 NetworkManager.conf" for details.
 

  END
 

  

    # packaged configuration
 

-   install -Dm644 /dev/stdin usr/lib/NetworkManager/conf.d/20-connectivity.conf <<END
 

+   install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END
 

  [connectivity]
 

- uri=http://ping.archlinux.org/nm-check.txt
 

+ uri=http://www.archlinux.org/check_network_status.txt
 

  END
 

  

-   shopt -s globstar
 

- 

-   _pick libnm usr/include/libnm
 

-   _pick libnm usr/lib/girepository-1.0/NM-*
 

-   _pick libnm usr/lib/libnm.*
 

-   _pick libnm usr/lib/pkgconfig/libnm.pc
 

-   _pick libnm usr/share/gir-1.0/NM-*
 

-   _pick libnm usr/share/gtk-doc/html/libnm
 

-   _pick libnm usr/share/vala/vapi/libnm.*
 

- 

-   _pick nm-cloud-setup "$pkgdir"/usr/lib/**/*nm-cloud-setup*
 

- #  _pick nm-cloud-setup "$pkgdir"/usr/share/man/*/nm-cloud-setup* (Parabola)
 

- 

-   # Restore empty dir
 

- # mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d" (Parabola)
 

+ ### Split libnm
 

+   _pick libnm "$pkgdir"/usr/include/libnm
 

+   _pick libnm "$pkgdir"/usr/lib/girepository-1.0/NM-*
 

+   _pick libnm "$pkgdir"/usr/lib/libnm.*
 

+   _pick libnm "$pkgdir"/usr/lib/pkgconfig/libnm.pc
 

+   _pick libnm "$pkgdir"/usr/share/gir-1.0/NM-*
 

+   _pick libnm "$pkgdir"/usr/share/gtk-doc/html/libnm
 

+   _pick libnm "$pkgdir"/usr/share/vala/vapi/libnm.*
 

  

    # Init script
 

    install -Dm755 ${srcdir}/NetworkManager.confd ${pkgdir}/etc/conf.d/NetworkManager
 

    install -Dm755 ${srcdir}/NetworkManager.initd ${pkgdir}/etc/init.d/NetworkManager
 

    install -Dm755 "${srcdir}/10-openrc-status" "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status"
 

  

+   sed -e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g' \
 

+       -e 's|/var/run|/run|g' \
 

+       -e 's|/usr/sbin|/usr/bin|g' \
 

+       -e 's|use consolekit|use consolekit elogind|' \
 

+       -i ${pkgdir}/etc/init.d/NetworkManager
 

  }
 

  

  package_libnm() {
 

    pkgdesc="NetworkManager client library"
 

-   depends=(glib2 nss util-linux-libs jansson libelogind)
 

-   license=(LGPL)
 

-   provides=(libnm.so)
 

- 

+   depends=(glib2 nss libutil-linux jansson libelogind)
 

    mv libnm/* "$pkgdir"
 

  }
 

  

- package_nm-cloud-setup() {
 

-   pkgdesc="Automatically configure NetworkManager in cloud"
 

-   depends=(networkmanager)
 

- 

-   mv nm-cloud-setup/* "$pkgdir"
 

- }
 

- 

  # vim:set sw=2 et:

file modified
+5 -28 
@@ -9,42 +9,28 @@ 
 

  pkgbase=openrc
 

  pkgname=('openrc' 'openrc-bash-completions' 'openrc-zsh-completions'
 

           'openrc-init' 'openrc-sysvinit' 'openrc-net')
 

- pkgver=0.42.1
 

- pkgrel=7
 

+ pkgver=0.43.3
 

+ pkgrel=1
 

  pkgdesc="Gentoo's universal init system"
 

  arch=('x86_64' 'i686' 'armv7h')
 

  url="https://github.com/OpenRC/openrc"
 

  license=('BSD2')
 

  source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
 

-         "revert.patch::${url}/commit/1801561c2d36c330df7fd02c7508f503a61ff5ba.patch"
 

          "${pkgbase}.logrotate"
 

          'openrc-hook'
 

          '30-openrc-upgrade.hook'
 

          '30-sysctl.hook'
 

          'sysctl.conf'
 

          '30-binfmt.hook'
 

-         'kmod-static-nodes.initd'
 

-         gcc-10-fix.patch::${url}/commit/375ef42393f3dc6edbaa2cb70c79b2366072db38.patch
 

-         supervise-daemon-fix.patch::${url}/commit/6deda13754f1b60245945e953cce8d97e40e86fc.patch
 

-         openrc-shutdown-fix.patch::${url}/commit/fd852865e06a74ecf8b77ff534fa8053e020160f.patch
 

-         posix-compliant-grep.patch::${url}/commit/a7e7fd2b37a7666f26c2d4de9386b2d04f583b41.patch
 

-         binfmt-fix.patch::${url}/commit/eb610859519292c6164c4ba601d22e642c306beb.patch
 

-         cgroup2-verify.patch::${url}/commit/87cfad3d6cd619c6090e8209092448ae68279b0c.patch)
 

- sha256sums=('91a01ca6d930a0688fb91338209985de57cac7aa2d37feddacb78fd3d95308e2'
 

-             '5211012d0e1bdfc1a32113cee5a2eec3a2be4b3549f88216cdecbadd6ca46d81'
 

+         'kmod-static-nodes.initd')
 

+ sha256sums=('968e81743a1de7a2348590b3b3286d6af5baf96da28fa1e6364e24f8203fc3b6'
 

              '0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c'
 

              '7de1e65f48ba31fc015cfb77be167b41aabdf0f20cb6617ecf3f4c3ca434c9e8'
 

              'a3fda2186e023ae60c0e0d3806ffeb95effe675acea03cdfd0bf30e8f1c188d4'
 

              '28ec075d30096bd54499e994f76f8526460474f1e4c33607045c1a71b0684263'
 

              '860d5b9ae60e13633bd94023c222fa1ef918a02db3ce2e3255cdd6bb9eef047e'
 

              '28aa413fd78bca98bb23294eeb3f49149825a2c2f97a7ee10039385f5e8e50e9'
 

-             '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571'
 

-             'addb1bf115b811fba3d120f5c68535ec07f32a55e570b661f1e5575f74327bac'
 

-             '654dada5ffe56d6ae10d0ea4f9cb62c8c6c39a5398cd02561419a8bbf3f686b7'
 

-             '5576a8b6c9fbe79ede027ed053f922da60d1cbe818803677f5aa5532f98ffac4'
 

-             '46f6e809aabb629212a739af7f5177930e9c4a7f2adfdfc59911d778d3716ec9'
 

-             '7e5d7dc888327ef99637fa7207ac9470d72cc37198ddd7ba2cdf72d10a1c7031'
 

-             '41c6598da76bcdcdc8d9349f559bc6b587a6f6dec55bf7c79669af2b28af43e1')
 

+             '3ecbe7761b92a123a5a3d395ec3d9e090b0dfba7910a5987b4a2298c20a7e571')
 

  

  _args=(
 

      BRANDING='Parabola GNU/Linux-libre'
 
@@ -64,15 +50,6 @@ 
 

  prepare(){
 

      cd "${srcdir}/${pkgbase}-${pkgver}"
 

      sed -i 's:0444:0644:' mk/sys.mk
 

-     patch -Np 1 -i ../gcc-10-fix.patch
 

-     patch -Np 1 -i ../supervise-daemon-fix.patch
 

-     patch -Np 1 -i ../openrc-shutdown-fix.patch
 

-     patch -Np 1 -i ../posix-compliant-grep.patch
 

-     patch -Np 1 -i ../binfmt-fix.patch
 

-     patch -Np 1 -i ../cgroup2-verify.patch
 

- 

-     # make bootmisc work with sysvinit too
 

-     patch -RNp1 -i ../revert.patch
 

  }
 

  

  check(){

file added
+19 
@@ -0,0 +1,19 @@ 
 

+ # Maintainer: Frederic Bezies <fredbezies at gmail dot com>
 

+ # Contributor: Balló György <ballogyor+arch at gmail dot com>
 

+ # Maintainer (parabola): dikasp <dikasetyaprayogi@gmail.com>
 

+ 

+ pkgname=mate-menu
 

+ pkgver=20.04.3
 

+ pkgrel=1.parabola1
 

+ pkgdesc="Advanced menu for MATE Panel, a fork of MintMenu, without nonfree and non privacy recommendation"
 

+ arch=('any')
 

+ url="https://github.com/dikasetyaprayogi/mate-menu"
 

+ license=('GPL')
 

+ depends=('mate-panel' 'python-configobj' 'python-gobject' 'python-pyinotify' 'python-xdg' 'python-xlib' 'xdg-utils' 'python-setproctitle' 'mate-menus' 'python-cairo')
 

+ makedepends=('python-distutils-extra' 'python-setuptools')
 

+ source=("https://github.com/dikasetyaprayogi/mate-menu/releases/download/${pkgver}/mate-menu-$pkgver-$pkgrel.tar.gz")
 

+ sha256sums=('05c02795a7640b9706ab860e664829bb9c9e766a76f1ac940b034eb2e65512e0')
 

+ 

+ package() {
 

+   python setup.py install --root="$pkgdir" --optimize=1
 

+ }

file added
+11 
@@ -0,0 +1,11 @@ 
 

+ post_install() {
 

+   glib-compile-schemas usr/share/glib-2.0/schemas
 

+ }
 

+ 

+ post_upgrade() {
 

+   post_install
 

+ }
 

+ 

+ post_remove() {
 

+   post_install
 

+ }

a modern menu applet/addons for mate desktop (parabola rebranded)

im maintained it to be sure its free
removed nonprivacy search engine from the original
removed nonfree app names from the original

tested build passed and working fine

rebased onto 1b1a815
2 years ago
Metadata
None
No Tags
Changes Summary 5
+29 -31
file changed
nonsystemd/elogind/PKGBUILD
+45 -75
file changed
nonsystemd/networkmanager/PKGBUILD
+5 -28
file changed
nonsystemd/openrc/PKGBUILD
+19
file added
pcr/mate-menu/PKGBUILD
+11
file added
pcr/mate-menu/mate-menu.install
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.