From 81d621273ae9b48441a3aa026b6956bfef98e2e9 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 13 Sep 2023 11:27:04 +0300 Subject: [PATCH] gnome-terminal ver. bump --- desktop/gnome/apps/gnome-terminal/actions.py | 4 ++++ desktop/gnome/apps/gnome-terminal/pspec.xml | 11 +++++++-- desktop/gnome/apps/rygel/actions.py | 6 +++-- desktop/gnome/apps/rygel/pspec.xml | 7 ++++++ desktop/gnome/base/dconf/actions.py | 1 + desktop/gnome/base/dconf/pspec.xml | 7 ++++++ desktop/misc/at-spi2-core/actions.py | 25 ++++++++++---------- desktop/misc/at-spi2-core/pspec.xml | 7 ++++++ 8 files changed, 51 insertions(+), 17 deletions(-) diff --git a/desktop/gnome/apps/gnome-terminal/actions.py b/desktop/gnome/apps/gnome-terminal/actions.py index 378b093605..fdbeae7a4e 100644 --- a/desktop/gnome/apps/gnome-terminal/actions.py +++ b/desktop/gnome/apps/gnome-terminal/actions.py @@ -7,9 +7,11 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import mesontools +from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): + shelltools.system(""" sed -i -r 's:"(/system):"/org/gnome\1:g' src/external.gschema.xml""") mesontools.configure() def build(): @@ -18,4 +20,6 @@ def build(): def install(): mesontools.install() + pisitools.removeDir("/usr/lib/systemd") + pisitools.dodoc("COPYING*", "README*") diff --git a/desktop/gnome/apps/gnome-terminal/pspec.xml b/desktop/gnome/apps/gnome-terminal/pspec.xml index 6ad498391e..4c78186e54 100644 --- a/desktop/gnome/apps/gnome-terminal/pspec.xml +++ b/desktop/gnome/apps/gnome-terminal/pspec.xml @@ -12,8 +12,7 @@ library The GNOME Terminal Emulator GNOME Terminal Emülatörü - https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/3.46.1/gnome-terminal-3.46.1.tar.bz2 - + https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/3.48.2/gnome-terminal-3.48.2.tar.bz2 meson itstool @@ -72,10 +71,18 @@ /usr/share/metainfo /usr/share/doc /usr/share/man + /usr/share/xdg-terminals/org.gnome.Terminal.desktop + + 2023-09-12 + 3.48.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-09-21 3.46.1 diff --git a/desktop/gnome/apps/rygel/actions.py b/desktop/gnome/apps/rygel/actions.py index 9703ee51a2..e51290ea58 100644 --- a/desktop/gnome/apps/rygel/actions.py +++ b/desktop/gnome/apps/rygel/actions.py @@ -10,13 +10,15 @@ def setup(): # Disable tracker 2.0 plugin pisitools.dosed("meson_options.txt", "'tracker',", " ") mesontools.configure("-Dapi-docs=false \ - -Dtests=false \ - -Dexamples=false") + -Dtests=false \ + -Dsystemd-user-units-dir=/tmp \ + -Dexamples=false") def build(): mesontools.build() def install(): mesontools.install() + pisitools.removeDir("/tmp") pisitools.dodoc("AUTHORS", "README*", "NEWS") diff --git a/desktop/gnome/apps/rygel/pspec.xml b/desktop/gnome/apps/rygel/pspec.xml index 35117be177..836b6fe0d1 100644 --- a/desktop/gnome/apps/rygel/pspec.xml +++ b/desktop/gnome/apps/rygel/pspec.xml @@ -87,6 +87,13 @@ + + 2023-09-12 + 0.42.4 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2023-08-02 0.42.4 diff --git a/desktop/gnome/base/dconf/actions.py b/desktop/gnome/base/dconf/actions.py index ebd374791c..c082fdf094 100644 --- a/desktop/gnome/base/dconf/actions.py +++ b/desktop/gnome/base/dconf/actions.py @@ -10,6 +10,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import get def setup(): + shelltools.system("sed -i 's/install_dir: systemd_userunitdir,//' service/meson.build") mesontools.configure("-Dgtk_doc=true") def build(): diff --git a/desktop/gnome/base/dconf/pspec.xml b/desktop/gnome/base/dconf/pspec.xml index 683c6076f6..5083c3b2d8 100644 --- a/desktop/gnome/base/dconf/pspec.xml +++ b/desktop/gnome/base/dconf/pspec.xml @@ -70,6 +70,13 @@ + + 2023-09-12 + 0.40.0 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2021-05-24 0.40.0 diff --git a/desktop/misc/at-spi2-core/actions.py b/desktop/misc/at-spi2-core/actions.py index c30c962f1d..8879c6df5e 100644 --- a/desktop/misc/at-spi2-core/actions.py +++ b/desktop/misc/at-spi2-core/actions.py @@ -7,45 +7,44 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools +from pisi.actionsapi import mesontools from pisi.actionsapi import get def setup(): - shelltools.makedirs("build") - shelltools.cd("build") - options = "meson --prefix=/usr --sysconfdir=/etc \ + options = "--prefix=/usr \ + --sysconfdir=/etc \ --libexec=/usr/libexec/at-spi2 \ -Dintrospection=enabled \ -Ddbus_daemon=/usr/bin/dbus-daemon \ + -Dsystemd_user_dir=/tmp \ + --buildtype=release \ -D docs=true \ " if get.buildTYPE() == "emul32": - options += "--datadir=/usr/emul32 \ + options += " --datadir=/usr/emul32 \ --libexec=/usr/emul32 \ --sysconfdir=/usr/emul32 \ --libdir=lib32 \ -Dintrospection=disabled \ - -D docs=false .." + -D docs=false" - shelltools.system(options) + mesontools.configure(options) def build(): - shelltools.cd("build") - shelltools.system("ninja") + mesontools.build() def install(): - shelltools.cd("build") - shelltools.system("DESTDIR=%s ninja install" % get.installDIR()) - + mesontools.install() if get.buildTYPE() == "emul32": #pisitools.dosed("%s/usr/share/dbus-1/services" % get.installDIR(), "^(Exec=)\/usr/tmp", r"\1/usr/libexec/at-spi2") #pisitools.dosed("%s/usr/share/dbus-1/accessibility-services" % get.installDIR(), "^(Exec=)\/usr/tmp", r"\1/usr/libexec/at-spi2") - pisitools.dosed("%s/usr/lib/systemd/user" % get.installDIR(), "^(ExecStart=)\/usr/emul32", r"\1/usr/libexec/at-spi2") + # pisitools.dosed("%s/usr/lib/systemd/user" % get.installDIR(), "^(ExecStart=)\/usr/emul32", r"\1/usr/libexec/at-spi2") pisitools.removeDir("/usr/emul32") + pisitools.removeDir("/tmp") pisitools.dosym("/usr/libexec/at-spi2/at-spi-bus-launcher", "/usr/lib/at-spi2-core/at-spi-bus-launcher") return - shelltools.cd("..") pisitools.dodoc("NEWS", "README*") diff --git a/desktop/misc/at-spi2-core/pspec.xml b/desktop/misc/at-spi2-core/pspec.xml index af0c6dd8ce..53bf947c2e 100644 --- a/desktop/misc/at-spi2-core/pspec.xml +++ b/desktop/misc/at-spi2-core/pspec.xml @@ -205,6 +205,13 @@ + + 2023-09-11 + 2.48.4 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2023-09-03 2.48.4