#46 updpkg: libre/openmw 0.47.0 & dependencies
Opened 2 years ago by morris. Modified 2 years ago
morris/abslibre openmw-0-47-0  into  pull-requests

file modified
+25 -19
@@ -2,24 +2,26 @@ 

  # Contributor (Arch): Sandy Carter <bwrsandman@gmail.com>

  # Contributor: André Silva <emulatorman@hyperbola.info>

  pkgname=openmw

- pkgver=0.45.0

+ pkgver=0.47.0

  pkgrel=1

  pkgrel+=.parabola1

  pkgdesc="Open-source engine reimplementation for the role-playing game Morrowind"

- pkgdesc+=", without without downloader/installer wizard"

+ pkgdesc+=", without downloader/installer wizard"

  arch=('x86_64')

- arch+=('i686')

  url="http://www.openmw.org"

  license=('GPL3' 'MIT' 'custom')

- depends=('openal' 'openscenegraph34' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt')

+ depends=('openal' 'openscenegraph' 'mygui' 'bullet' 'qt5-base' 'ffmpeg' 'sdl2' 'unshield' 'libxt' 'boost-libs' 'recastnavigation' 'bullet-double')

  makedepends=('cmake' 'boost' 'doxygen' 'ninja')

- source=("https://github.com/OpenMW/openmw/archive/openmw-${pkgver}.tar.gz"

-         disable_wizard.patch)

- sha256sums=('b63cf971f406ef5f28019f65e9e2bd9641a227459ede45d147562917f67e1c64'

-             'bb60055d501186cada01e151551a3db5c1d67c3ae6584a2799eef0e273ba14eb')

+ source=("https://github.com/OpenMW/openmw/archive/refs/tags/openmw-${pkgver}.tar.gz"

+ 	"https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch"

+ 	"disable_wizard.patch")

+ sha512sums=('517e650d0054cdba8d38de05ed3975b0fcf8de32fda59c8df7c34b973e5390efa0dd9ec79babdfdaa79dee7aa8a75009776f62fad91b9aa9aa28016c5032652b'

+             '37dfc5611523bf158fe2b6c19bdc11ebd0a70837943183b16b1ec36e06df37c7e089586935753c7442720349d5a7e356dc4f11e79666af0c4d5146f8f64d4853'

+             '98d2db21ab7362840f02bd8651914b11443c9d6d539fd0976e6580809bf16b80f3f907e332a3ae18db97e4f3ee12bdb7e1faf322bfaae6bf08efd64863c14081')

  

  prepare() {

-   mkdir build

+   mkdir -p "${pkgname}-${pkgname}-${pkgver}/build"

+   cd "${pkgname}-${pkgname}-${pkgver}"

  

    # this patch could be upstreamed

    #   when the user is missing game data (the default case),
@@ -27,22 +29,26 @@ 

    #   even though it could have detected that the wizard was not compiled (BUILD_WIZARD=OFF)

    #   then if the user presses the wizard button,

    #   it fails with a GUI warning about the non-existing wizard

-   cd "$srcdir"/$pkgname-$pkgname-$pkgver

-   patch -p1 < "$srcdir"/disable_wizard.patch

+   patch -p1 < ${srcdir}/disable_wizard.patch

+ 

+   # Assume SIGSTKSZ is not a constant

+   patch -Np1 -i "$srcdir"/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch

  }

  

  build() {

-   cd build

-   cmake "../$pkgname-$pkgname-$pkgver" \

+   cd "${pkgname}-${pkgname}-${pkgver}/build"

+   

+   #export PKG_CONFIG_LIBDIR=/usr/lib/ffmpeg4.4/pkgconfig

+ 

+   cmake .. \

      -DCMAKE_INSTALL_PREFIX=/usr \

      -DCMAKE_BUILD_TYPE=Release \

-     -DDESIRED_QT_VERSION=5 \

-     -DBUILD_ESSIMPORTER=OFF \

-     -DBUILD_WIZARD=OFF \

-     -GNinja

-   ninja

+     -DOPENMW_USE_SYSTEM_RECASTNAVIGATION=ON \

+     -DBUILD_WIZARD=OFF

+   make

  }

  

  package() {

-   DESTDIR="$pkgdir" ninja -C build install

+   cd "${pkgname}-${pkgname}-${pkgver}/build"

+   DESTDIR="${pkgdir}" make install

  }

@@ -1,8 +1,7 @@ 

- diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt

- index bfc08a7..031f989 100644

- --- a/apps/launcher/CMakeLists.txt

- +++ b/apps/launcher/CMakeLists.txt

- @@ -119,4 +119,8 @@ if (BUILD_WITH_CODE_COVERAGE)

+ diff --unified --recursive --text openmw-openmw-0.47.0.orig/apps/launcher/CMakeLists.txt openmw-openmw-0.47.0.new/apps/launcher/CMakeLists.txt

+ --- openmw-openmw-0.47.0.orig/apps/launcher/CMakeLists.txt	2021-10-10 17:17:03.000000000 +0100

+ +++ openmw-openmw-0.47.0.new/apps/launcher/CMakeLists.txt	2022-05-07 11:35:12.730905488 +0100

+ @@ -109,4 +109,8 @@

     target_link_libraries(openmw-launcher gcov)

   endif()

   
@@ -12,24 +11,21 @@ 

  +else()

  +  add_definitions(-DBUILD_WIZARD_ENABLED=0)

  +endif()

- diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp

- index 2982a30..4d286c7 100644

- --- a/apps/launcher/maindialog.cpp

- +++ b/apps/launcher/maindialog.cpp

- @@ -148,7 +148,7 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()

-  {

+ diff --unified --recursive --text openmw-openmw-0.47.0.orig/apps/launcher/maindialog.cpp openmw-openmw-0.47.0.new/apps/launcher/maindialog.cpp

+ --- openmw-openmw-0.47.0.orig/apps/launcher/maindialog.cpp	2021-10-10 17:17:03.000000000 +0100

+ +++ openmw-openmw-0.47.0.new/apps/launcher/maindialog.cpp	2022-05-07 11:35:00.070905557 +0100

+ @@ -155,6 +155,7 @@

       if (!setupLauncherSettings())

           return FirstRunDialogResultFailure;

- -

+  

  +if (BUILD_WIZARD_ENABLED) // parabola patch - disable wizard

       if (mLauncherSettings.value(QString("General/firstrun"), QString("true")) == QLatin1String("true"))

       {

           QMessageBox msgBox;

- @@ -385,7 +385,7 @@ bool Launcher::MainDialog::setupGameData()

+ @@ -402,6 +403,7 @@

+  

+          Q_UNUSED(skipButton); // Suppress compiler unused warning

   

-          QAbstractButton *wizardButton =

-                  msgBox.addButton(tr("Run &Installation Wizard..."), QMessageBox::ActionRole);

- -

  +if (!BUILD_WIZARD_ENABLED) msgBox.removeButton(wizardButton) ; // parabola patch - disable wizard

           msgBox.exec();

   

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

  }

@@ -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 modified
+40 -33
@@ -1,64 +1,71 @@ 

  # Maintainer: David P. <megver83@parabola.nu>

- # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>

+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>

+ # Contributor: Jan de Groot <jgc@archlinux.org>

  

  pkgname=polkit

- pkgver=0.118

- pkgrel=1

+ pkgver=0.120

+ pkgrel=3

  pkgrel+=.nonsystemd1

  pkgdesc="Application development toolkit for controlling system-wide privileges"

- arch=(x86_64 i686 armv7h)

+ arch=(x86_64)

+ arch+=(i686 armv7h)

  license=(LGPL)

  url="https://www.freedesktop.org/wiki/Software/polkit/"

- depends=(glib2 pam expat elogind js78)

- makedepends=(intltool gtk-doc gobject-introspection git autoconf-archive)

+ depends=(glib2 pam expat systemd js78)

+ depends=( ${depends[*]/systemd/elogind})

+ makedepends=(meson gtk-doc gobject-introspection git)

+ checkdepends=(python-dbusmock)

  backup=(etc/pam.d/polkit-1)

  provides=(polkit-elogind)

  replaces=(polkit-elogind polkit-consolekit)

- _commit=ff4c2144f0fb1325275887d9e254117fcd8a1b52 # git tag 0.118

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

-         '99-parabola.rules'

-         'elogind-configure-fix.patch')

- sha256sums=('SKIP'

-             'd28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb'

-             'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b')

+ _commit=92b910ce2273daf6a76038f6bd764fa6958d4e8e  # tags/0.120

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

+ source+=('99-parabola.rules'

+          'elogind-configure-fix.patch'

+          'meson-0.61.diff')

+ sha256sums=('SKIP')

+ sha256sums=('d28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb'

+             'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b'

+             '45d08bbb76e1e22ca8e698df04652b7aceaded34f9b76ce6b68152fb26b0de8d')

  

  pkgver() {

-   cd $pkgname

+   cd polkit

    git describe --tags | sed 's/-/+/g'

  }

  

  prepare() {

-   cd $pkgname

+   cd polkit

    patch -Np 1 -i ${srcdir}/elogind-configure-fix.patch

-   NOCONFIGURE=1 ./autogen.sh

- }

- 

- build() {

-   cd $pkgname

  

-   ./configure --prefix=/usr --sysconfdir=/etc \

-       --localstatedir=/var --libexecdir=/usr/lib \

-       --enable-libsystemd-login=no --disable-static \

-       --enable-libelogind=yes --with-systemdsystemunitdir=no \

-       --enable-gtk-doc --with-os-type=redhat

+   # CVE-2021-4034

+   git cherry-pick -n a2bf5c9c83b6ae46cbd5c779d3055bff81ded683

  

-   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool

+   # Fix build with Meson 0.61.0

+   git apply -3 ../meson-0.61.diff

+ }

  

-   make

+ build() {

+   arch-meson polkit build \

+     --prefix=/usr \

+     -D session_tracking=libelogind \

+     -D systemdsystemunitdir=no \

+     -D os_type=redhat \

+     -D examples=true \

+     -D tests=true \

+     -D gtk_doc=true \

+     -D man=true

+   meson compile -C build

  }

  

  check() {

-   cd $pkgname

-   make -k check || :

+   meson test -C build --print-errorlogs -t 3

  }

  

  package() {

-   cd $pkgname

-   make DESTDIR="$pkgdir" install \

-       dbusconfdir=/usr/share/dbus-1/system.d \

-       rulesdir=/usr/share/polkit-1/rules.d

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

  

    install -d -o root -g 102 -m 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d

+   mv "$pkgdir"/{etc,usr/share}/polkit-1/rules.d/50-default.rules

  

    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" <<END

  u polkitd 102 "PolicyKit daemon"

@@ -0,0 +1,24 @@ 

+ diff --git i/actions/meson.build w/actions/meson.build

+ index 2abaaf3..1e3f370 100644

+ --- i/actions/meson.build

+ +++ w/actions/meson.build

+ @@ -1,7 +1,6 @@

+  policy = 'org.freedesktop.policykit.policy'

+  

+  i18n.merge_file(

+ -  policy,

+    input: policy + '.in',

+    output: '@BASENAME@',

+    po_dir: po_dir,

+ diff --git i/src/examples/meson.build w/src/examples/meson.build

+ index c6305ab..8c18de5 100644

+ --- i/src/examples/meson.build

+ +++ w/src/examples/meson.build

+ @@ -1,7 +1,6 @@

+  policy = 'org.freedesktop.policykit.examples.pkexec.policy'

+  

+  i18n.merge_file(

+ -  policy,

+    input: policy + '.in',

+    output: '@BASENAME@',

+    po_dir: po_dir,

@@ -0,0 +1,99 @@ 

+ # Maintainer: Morris Zuss <morris@vlen.org>

+ # Contributor: Sven-Hendrik Haase <svenstaro@archlinux.org>

+ # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>

+ 

+ pkgbase=bullet-double

+ pkgname=('bullet-double' 'bullet-double-docs' 'python-pybullet-double')

+ pkgver=3.24

+ pkgrel=1

+ pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation"

+ pkgdesc+=", with double precision support"

+ arch=('x86_64' 'i686')

+ url="http://www.bulletphysics.com/Bullet/"

+ license=("ZLIB")

+ makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'glu' 'python' 'python-numpy' 'python-setuptools' 'ninja')

+ source=("$pkgname-$pkgver.tar.gz::https://github.com/bulletphysics/bullet3/archive/refs/tags/${pkgver}.tar.gz"

+         bullet3_examplebrowser.sh)

+ sha512sums=('0f8cf009e50853b2ff461414893f09f752774dac3fb51ba158ef670865b61140a13567cadbf7b19d643d24d6207a23f825773edb86234591f83bd19e3fb3d054'

+             '8741ad94b6c46c226d89aebc8ab06d8a11bac3c04d3f0a2bf7a7524792a3375aa7bf7d295410b16fbeb4c348a31057b4570acdebe9bbaea251f44daca8d9fe81')

+ 

+ prepare() {

+   cd bullet3-${pkgver}

+   sed -i '/SET_TARGET_PROPERTIES(pybullet PROPERTIES PREFIX/d' examples/pybullet/CMakeLists.txt

+ }

+ 

+ build() {

+   cd bullet3-${pkgver}

+ 

+   cmake \

+       -Bbuild \

+       -GNinja \

+       -DCMAKE_INSTALL_PREFIX=/usr \

+       -DBUILD_SHARED_LIBS=1 \

+       -DINSTALL_LIBS=1 \

+       -DINSTALL_EXTRA_LIBS=1 \

+       -DBUILD_PYBULLET=ON \

+       -DBUILD_PYBULLET_NUMPY=ON \

+       -DBUILD_OPENGL3_DEMOS=ON \

+       -DCMAKE_BUILD_TYPE=Release \

+       -DCMAKE_SKIP_RPATH=YES \

+       -DUSE_DOUBLE_PRECISION=ON

+ 

+   ninja -C build

+ 

+   python setup.py build

+   doxygen

+ }

+ 

+ package_bullet-double() {

+   optdepends=('glu: for the example browser'

+               'python: python bindings'

+               'python-numpy: python bindings'

+               'bullet-docs: documentation')

+   provides=('bullet')

+   conflicts=('bullet')

+ 

+   cd bullet3-${pkgver}

+ 

+   DESTDIR="${pkgdir}" ninja -C build install

+ 

+   cd build

+ 

+   install -Dm755 examples/ExampleBrowser/libBulletExampleBrowserLib.so.${pkgver} "${pkgdir}"/usr/lib/libBulletExampleBrowserLib.so.${pkgver}

+   install -Dm755 examples/OpenGLWindow/libOpenGLWindow.so "${pkgdir}"/usr/lib/libOpenGLWindow.so

+   install -Dm755 examples/ThirdPartyLibs/Gwen/libgwen.so "${pkgdir}"/usr/lib/libgwen.so

+   install -Dm755 examples/ThirdPartyLibs/BussIK/libBussIK.so "${pkgdir}"/usr/lib/libBussIK.so

+   install -Dm755 "${srcdir}"/bullet3_examplebrowser.sh "${pkgdir}"/usr/bin/bullet3_examplebrowser

+   install -Dm755 examples/ExampleBrowser/App_ExampleBrowser "${pkgdir}"/opt/bullet/App_ExampleBrowser

+   cp -r data "${pkgdir}"/opt/bullet/

+ 

+   install -Dm644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgbase}/LICENSE

+ }

+ 

+ package_python-pybullet-double() {

+   pkgdesc="Bullet Python bindings"

+   depends+=('bullet' 'gcc-libs')

+   provides=('python-pybullet')  

+   conflicts=('python-pybullet')

+ 

+   cd bullet3-${pkgver}

+ 

+   install -Dm755 build/examples/pybullet/libpybullet.so.${pkgver} "${pkgdir}"/usr/lib/libpybullet.so.${pkgver}

+   python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build

+ 

+   install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE

+ }

+ 

+ package_bullet-double-docs() {

+   pkgdesc="Documentation for bullet"

+   provides=('bullet-docs')  

+   conflicts=('bullet-docs')

+   cd bullet3-${pkgver}

+ 

+   # install docs

+   install -Dm644 docs/GPU_rigidbody_using_OpenCL.pdf "${pkgdir}"/usr/share/doc/bullet/GPU_rigidbody_using_OpenCL.pdf

+   install -Dm644 docs/Bullet_User_Manual.pdf "${pkgdir}"/usr/share/doc/bullet/Bullet_User_Manual.pdf

+   install -Dm644 docs/BulletQuickstart.pdf "${pkgdir}"/usr/share/doc/bullet/BulletQuickstart.pdf

+   cp -r html "${pkgdir}"/usr/share/doc/bullet/html

+ }

+ # vim: sw=2 ts=2 et:

@@ -0,0 +1,4 @@ 

+ #!/usr/bin/env sh

+ 

+ cd /opt/bullet

+ ./App_ExampleBrowser

@@ -0,0 +1,35 @@ 

+ # Maintainer: Morris Zuss <morris@vlen.org>

+ 

+ pkgname=recastnavigation

+ pkgver=1.5.1

+ pkgrel=1

+ pkgdesc="Navigation-mesh Toolset for Games"

+ arch=(x86_64 i686)

+ url="https://github.com/recastnavigation/recastnavigation"

+ license=(ZLIB)

+ depends=(glut sdl2)

+ makedepends=(cmake git)

+ source=("git+https://github.com/recastnavigation/recastnavigation.git")

+ sha512sums=("SKIP")

+ 

+ prepare() {

+   mkdir -p "${pkgname}/build"

+   cd "${pkgname}"

+ }

+ 

+ build() {

+   cd "${pkgname}/build"

+   cmake .. \

+     -DCMAKE_INSTALL_PREFIX=/usr \

+     -DBUILD_SHARED_LIBS=ON \

+     -DRECASTNAVIGATION_DEMO=OFF \

+     -DRECASTNAVIGATION_TESTS=OFF \

+     -DRECASTNAVIGATION_EXAMPLES=OFF

+   make

+ }

+ 

+ package() {

+   cd "${pkgname}/build"

+   DESTDIR="${pkgdir}" make install

+   install -Dm644 ../License.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"

+ }

Updated OpenMW to the latest version, which requires additional dependencies. Resolves issue #2970

OpenMW

Upgraded to v0.47.0 and modified patch to get it past the wizard dialog

New package: recastnavigation

In order to compile OpenMW, it needs recastnavigation, otherwise OpenMW will try to download and compile it within the build() process which fails because no internet access allowed.
Released under the ZLib license.

New package: bullet-double

Openmw requires double precision support which this package fulfills. The current bullet package comes from Arch repos but hasn't been built with double precision because of performance reasons.
Released under the ZLib license.

Both new packages don't build on arm for me, I get the following error when compiling: semop(1): encountered an error: Function not implemented

I've lumped this altogether because it doesn't seem like openmw will run without these additional packages. Both new packages are relatively low maintenance with very few releases.

rebased onto dee3845

2 years ago