From 03dcf4cf1208fa587742ea7ed4e33717df821b70 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 19 Apr 2024 14:03:46 -0700 Subject: [PATCH 1/3] gnome-pannel: update to 3.52.0 --- common/shlibs | 2 +- srcpkgs/gnome-panel/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 531f1431305d49..8b03572fcedd32 100644 --- a/common/shlibs +++ b/common/shlibs @@ -541,7 +541,7 @@ libpsl.so.5 libpsl-0.20.2_1 libsoup-2.4.so.1 libsoup-2.34.0_1 libsoup-3.0.so.0 libsoup3-3.0.0_1 libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1 -libgnome-panel.so.0 gnome-panel-3.37.1_1 +libgnome-panel.so.3 gnome-panel-3.52.0_1 libuninum.so.5 libuninum-2.7_1 libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1 libjavascriptcoregtk-4.0.so.18 webkit2gtk-2.6.2_1 diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 0b69384e394b15..04a2f31c1e0efa 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,7 +1,7 @@ # Template file for 'gnome-panel' pkgname=gnome-panel -version=3.46.0 -revision=2 +version=3.52.0 +revision=1 build_style=gnu-configure configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo" hostmakedepends="gettext-devel glib-devel itstool pkg-config gettext" @@ -13,8 +13,9 @@ short_desc="Panel Application for GNOME flashback" maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomePanel" +changelog="https://gitlab.gnome.org/GNOME/gnome-panel/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-panel/${version%.*}/gnome-panel-${version}.tar.xz" -checksum=cec7a11b70c524b5e8d76d4d7e4d835ee607abda2eb42f4df7619e62eb06aeb1 +checksum=9e29ba8873cde40d40c2934a464f8f43ba2eb1b522b191447caa27dd7853c5d4 gnome-panel-devel_package() { depends="glib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}" @@ -23,6 +24,5 @@ gnome-panel-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/gtk-doc } } From 45dbd569ff69404d9fbc6fa3739c675c5138843c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 19 Apr 2024 14:05:02 -0700 Subject: [PATCH 2/3] metacity: update to 3.52.0. --- srcpkgs/metacity/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template index d864962a6baef8..ddf75848558b2f 100644 --- a/srcpkgs/metacity/template +++ b/srcpkgs/metacity/template @@ -1,6 +1,6 @@ # Template file for 'metacity' pkgname=metacity -version=3.42.0 +version=3.52.0 revision=1 build_style=gnu-configure hostmakedepends="gettext gettext-devel glib-devel itstool pkg-config yelp-tools zenity" @@ -14,5 +14,6 @@ short_desc="Window Manager for the GNOME environment" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/metacity" +changelog="https://gitlab.gnome.org/GNOME/metacity/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d89d679dcfed9b5eef18f06e2dcb33a7ab543d53b358fa89ce65593c231eeebc +checksum=a72438ace6d5903ae79338c6098b1b35ab91c8a97c4323701d3bef1f3eeb191c From 672308f4082a6929455abb3d5bf564bc21684fdb Mon Sep 17 00:00:00 2001 From: oreo639 Date: Fri, 19 Apr 2024 14:06:26 -0700 Subject: [PATCH 3/3] gnome-flashback: update to 3.52.1. --- .../patches/fix-non-systemd.patch | 30 +++++++++++++++++++ srcpkgs/gnome-flashback/template | 9 +++--- 2 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/gnome-flashback/patches/fix-non-systemd.patch diff --git a/srcpkgs/gnome-flashback/patches/fix-non-systemd.patch b/srcpkgs/gnome-flashback/patches/fix-non-systemd.patch new file mode 100644 index 00000000000000..5f190a01ad52f0 --- /dev/null +++ b/srcpkgs/gnome-flashback/patches/fix-non-systemd.patch @@ -0,0 +1,30 @@ +Submitted upstream: https://gitlab.gnome.org/GNOME/gnome-flashback/-/merge_requests/64 + +From eda3cf40edb15788f0d3890d0492a4f3ee5e1291 Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Fri, 19 Apr 2024 16:15:01 -0700 +Subject: [PATCH] sessions: start gnome-flashback in gnome-flashback.session + +This partially reverts 43fbc58d84d9a4f8e4ba74b6029e17a0171c5e4c, and fixes +starting gnome-flashback without systemd init. + +Fixes: #97 +--- + data/sessions/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/sessions/Makefile.am b/data/sessions/Makefile.am +index d35b38a..547118f 100644 +--- a/data/sessions/Makefile.am ++++ b/data/sessions/Makefile.am +@@ -1,6 +1,7 @@ + NULL = + + required_components_common = \ ++ gnome-flashback \ + gnome-panel \ + $(NULL) + +-- +GitLab + diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template index 04602dd2eaeca7..e80b59b438a2bd 100644 --- a/srcpkgs/gnome-flashback/template +++ b/srcpkgs/gnome-flashback/template @@ -1,7 +1,7 @@ # Template file for 'gnome-flashback' pkgname=gnome-flashback -version=3.46.0 -revision=2 +version=3.52.1 +revision=1 build_helper=gir build_style=gnu-configure configure_args="--with-compiz-session --enable-compile-warnings=minimum" @@ -17,8 +17,9 @@ short_desc="GNOME session with similar user experience to the GNOME 2.x series" maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeFlashback" +changelog="https://gitlab.gnome.org/GNOME/gnome-flashback/-/raw/master/NEWS" distfiles="${GNOME_SITE}/gnome-flashback/${version%.*}/gnome-flashback-${version}.tar.xz" -checksum=7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045 +checksum=ba04613cdadb62bda206437c047299e16025cde1bd8095e094aa77769c78603a post_extract() { vsed -i 's/libcompizconfig >= 0\.9\.14\.0/libcompizconfig >= 0.8.16.0/' \ @@ -31,6 +32,4 @@ pre_configure() { post_install() { vinstall ${FILESDIR}/gnome-flashback.pam 644 /etc/pam.d gnome-flashback - vsed -i -e "s/ --systemd//g" \ - ${DESTDIR}/usr/libexec/gnome-flashback-{compiz,metacity} }