Date: Friday, April 30, 2021 @ 17:45:34 Author: heftig Revision: 414109
archrelease: copy trunk to extra-x86_64 Added: gnome-system-monitor/repos/extra-x86_64/PKGBUILD (from rev 414106, gnome-system-monitor/trunk/PKGBUILD) Deleted: gnome-system-monitor/repos/extra-x86_64/PKGBUILD gnome-system-monitor/repos/extra-x86_64/force-hdybar.diff -------------------+ PKGBUILD | 82 ++++++++++++++++++++++++---------------------------- force-hdybar.diff | 41 -------------------------- 2 files changed, 38 insertions(+), 85 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-04-30 17:45:34 UTC (rev 414108) +++ PKGBUILD 2021-04-30 17:45:34 UTC (rev 414109) @@ -1,44 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=gnome-system-monitor -pkgver=40.0 -pkgrel=2 -pkgdesc="View current processes and monitor system state" -url="https://wiki.gnome.org/Apps/SystemMonitor" -arch=(x86_64) -license=(GPL) -depends=(libgtop gtkmm3 librsvg systemd libhandy polkit) -makedepends=(meson yelp-tools git appstream-glib) -groups=(gnome) -_commit=24e810d54e21d7be34be9807d025f77ef0295193 # tags/40.0^0 -source=("git+https://gitlab.gnome.org/GNOME/gnome-system-monitor.git#commit=$_commit" - force-hdybar.diff) -sha256sums=('SKIP' - '411e619160597ea86bbe29ff2e8f8830aa0f51cadbed45dac03c3301a92e4644') - -pkgver() { - cd $pkgname - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd $pkgname - - # https://bugs.archlinux.org/task/70120 - # https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/issues/182 - git apply -3 ../force-hdybar.diff -} - -build() { - arch-meson $pkgname build - meson compile -C build -} - -check() { - meson test -C build --print-errorlogs -} - -package() { - DESTDIR="$pkgdir" meson install -C build -} Copied: gnome-system-monitor/repos/extra-x86_64/PKGBUILD (from rev 414106, gnome-system-monitor/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-04-30 17:45:34 UTC (rev 414109) @@ -0,0 +1,38 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=gnome-system-monitor +pkgver=40.1 +pkgrel=1 +pkgdesc="View current processes and monitor system state" +url="https://wiki.gnome.org/Apps/SystemMonitor" +arch=(x86_64) +license=(GPL) +depends=(libgtop gtkmm3 librsvg systemd libhandy polkit) +makedepends=(meson yelp-tools git appstream-glib) +groups=(gnome) +_commit=d486367183e49e226b6989f59bb469c24e203f5e # tags/40.1^0 +source=("git+https://gitlab.gnome.org/GNOME/gnome-system-monitor.git#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd $pkgname +} + +build() { + arch-meson $pkgname build + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs +} + +package() { + DESTDIR="$pkgdir" meson install -C build +} Deleted: force-hdybar.diff =================================================================== --- force-hdybar.diff 2021-04-30 17:45:34 UTC (rev 414108) +++ force-hdybar.diff 2021-04-30 17:45:34 UTC (rev 414109) @@ -1,41 +0,0 @@ -diff --git i/src/interface.cpp w/src/interface.cpp -index 48b42d0b..65e52682 100644 ---- i/src/interface.cpp -+++ w/src/interface.cpp -@@ -698,36 +698,22 @@ create_main_window (GsmApplication *app) - GdkDisplay *display; - GdkMonitor *monitor; - GdkRectangle monitor_geometry; -- const char* session; - - int width, height, xpos, ypos; - - GtkBuilder *builder = gtk_builder_new(); - gtk_builder_add_from_resource (builder, "/org/gnome/gnome-system-monitor/data/interface.ui", NULL); - gtk_builder_add_from_resource (builder, "/org/gnome/gnome-system-monitor/data/menus.ui", NULL); - gtk_builder_add_from_resource (builder, "/org/gnome/gnome-system-monitor/gtk/help-overlay.ui", NULL); - - main_window = HDY_APPLICATION_WINDOW (gtk_builder_get_object (builder, "main_window")); - gtk_window_set_application (GTK_WINDOW (main_window), app->gobj()); - gtk_widget_set_name (GTK_WIDGET (main_window), "gnome-system-monitor"); - app->main_window = main_window; - - gtk_application_window_set_help_overlay (GTK_APPLICATION_WINDOW (app->main_window), - GTK_SHORTCUTS_WINDOW (gtk_builder_get_object (builder, "help_overlay"))); - -- session = g_getenv ("XDG_CURRENT_DESKTOP"); -- if (session && !strstr (session, "GNOME")){ -- GtkBox *mainbox; -- HdyHeaderBar *headerbar; -- -- mainbox = GTK_BOX (gtk_builder_get_object (builder, "main_box")); -- headerbar = HDY_HEADER_BAR (gtk_builder_get_object (builder, "header_bar")); -- gtk_style_context_remove_class (gtk_widget_get_style_context (GTK_WIDGET (headerbar)), "titlebar"); -- gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL); -- hdy_header_bar_set_show_close_button (headerbar, FALSE); -- gtk_box_pack_start (mainbox, GTK_WIDGET (headerbar), FALSE, FALSE, 0); -- } -- - g_settings_get (app->settings->gobj(), GSM_SETTING_WINDOW_STATE, "(iiii)", - &width, &height, &xpos, &ypos); -