aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Duchateau <duchateau.olivier@gmail.com>2025-06-10 13:18:21 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2025-06-10 13:46:21 +0000
commit2a6bbd0020d400a54c400c385a0157e784e28256 (patch)
tree6f951297ea541b0c2b472d6beca1080ea33230ed
parent5cee7b0bb35b8133b27f2369b9c8be89a2965e5e (diff)
x11/gnome-desktop: update to 44.3
Difference with submitted version: readd desktop doc PR: 286697
-rw-r--r--deskutils/gnome-tweaks/files/patch-gnome-tweaks11
-rw-r--r--deskutils/gnome-tweaks/files/patch-gtweak_app.py21
-rw-r--r--deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__appearance.py21
-rw-r--r--deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__startup.py16
-rw-r--r--x11/gnome-desktop/Makefile33
-rw-r--r--x11/gnome-desktop/distinfo6
-rw-r--r--x11/gnome-desktop/pkg-plist15
7 files changed, 87 insertions, 36 deletions
diff --git a/deskutils/gnome-tweaks/files/patch-gnome-tweaks b/deskutils/gnome-tweaks/files/patch-gnome-tweaks
new file mode 100644
index 000000000000..1d9301de3115
--- /dev/null
+++ b/deskutils/gnome-tweaks/files/patch-gnome-tweaks
@@ -0,0 +1,11 @@
+--- gnome-tweaks.orig 2024-04-26 06:06:48 UTC
++++ gnome-tweaks
+@@ -76,7 +76,7 @@ if __name__ == '__main__':
+ parser = optparse.OptionParser(version=VERSION)
+ parser.add_option("-p", "--prefix",
+ help="Installation prefix (for gsettings schema, themes, etc)",
+- metavar="[/, /usr]")
++ metavar="[%%LOCALBASE%%]")
+ parser.add_option("-v", "--verbose", action="store_true",
+ help="Print the names of settings modified")
+ parser.add_option("-d", "--debug", action="store_true",
diff --git a/deskutils/gnome-tweaks/files/patch-gtweak_app.py b/deskutils/gnome-tweaks/files/patch-gtweak_app.py
new file mode 100644
index 000000000000..d148e3856a70
--- /dev/null
+++ b/deskutils/gnome-tweaks/files/patch-gtweak_app.py
@@ -0,0 +1,21 @@
+The URL should be adapted with releases of x11/gnome-shell
+
+--- gtweak/app.py.orig 2024-04-26 06:06:48 UTC
++++ gtweak/app.py
+@@ -23,14 +23,10 @@ class ExtensionNotice(Gtk.MessageDialog):
+ self.set_markup("<b>{0}</b>".format(_("Extensions Has Moved")))
+
+ self.props.secondary_use_markup = True
+- self.props.secondary_text = "{0}\n\n{1}".format(
++ self.props.secondary_text = "{0}\n".format(
+ # Translators: Placeholder will be replaced with "GNOME Extensions" in active link form
+ _("Extensions management has been moved to {0}.").format(
+- '<a href="https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/HEAD/subprojects/extensions-app/README.md">GNOME Extensions</a>',
+- ),
+- # Translators: Placeholder will be replaced with "Flathub" in active link form
+- _("We recommend downloading GNOME Extensions from {0} if your distribution does not include it.").format(
+- '<a href="https://flathub.org/apps/details/org.gnome.Extensions">Flathub</a>'
++ '<a href="https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/HEAD/subprojects/extensions-app/README.md">GNOME Extensions</a>'
+ )
+ )
+
diff --git a/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__appearance.py b/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__appearance.py
new file mode 100644
index 000000000000..567743dc096e
--- /dev/null
+++ b/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__appearance.py
@@ -0,0 +1,21 @@
+x11-themes/gnome-backgrounds 44.x contains .webp images
+x11-themes/gnome-backgrounds 45.x and higher contains .jxl images
+
+--- gtweak/tweaks/tweak_group_appearance.py.orig 2024-04-26 06:06:48 UTC
++++ gtweak/tweaks/tweak_group_appearance.py
+@@ -253,13 +253,13 @@ TWEAK_GROUP = TweakPreferencesPage("appearance", _("Ap
+ _("Default Image"),
+ "org.gnome.desktop.background",
+ "picture-uri",
+- mimetypes=["application/xml", "image/png", "image/jpeg"],
++ mimetypes=["application/xml", "image/svg+xml", "image/png", "image/jpeg", "image/webp", "image/jxl"],
+ ),
+ GSettingsFileChooserButtonTweak(
+ _("Dark Style Image"),
+ "org.gnome.desktop.background",
+ "picture-uri-dark",
+- mimetypes=["application/xml", "image/png", "image/jpeg"],
++ mimetypes=["application/xml", "image/svg+xml", "image/png", "image/jpeg", "image/webp", "image/jxl"],
+ ),
+ GSettingsTweakComboRow(
+ _("Adjustment"), "org.gnome.desktop.background", "picture-options"
diff --git a/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__startup.py b/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__startup.py
index 8e6f662bd102..00c2db0168e8 100644
--- a/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__startup.py
+++ b/deskutils/gnome-tweaks/files/patch-gtweak_tweaks_tweak__group__startup.py
@@ -1,14 +1,14 @@
FreeBSD ps(1) does not have "cmd" display format like in linuxes, but
"args" is equivalent.
---- gtweak/tweaks/tweak_group_startup.py.orig 2015-10-26 16:48:16 UTC
+--- gtweak/tweaks/tweak_group_startup.py.orig 2024-04-26 06:06:48 UTC
+++ gtweak/tweaks/tweak_group_startup.py
-@@ -334,7 +334,7 @@ class AutostartListBoxTweakGroup(ListBox
- exes = []
+@@ -335,7 +335,7 @@ class AutostartTweakGroup(Adw.PreferencesPage, TweakGr
+ exes = set()
cmd = subprocess.Popen([
- 'ps','-e','-w','-w','-U',
-- str(os.getuid()),'-o','cmd'],
-+ str(os.getuid()),'-o','args'],
- stdout=subprocess.PIPE)
+ 'ps', '-e', '-w', '-w', '-U',
+- str(os.getuid()), '-o', 'cmd'],
++ str(os.getuid()), '-o', 'args'],
+ stdout=subprocess.PIPE)
out = cmd.communicate()[0]
- for l in out.split('\n'):
+ for process in out.decode('utf8').split('\n'):
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 7e19cd7098a9..65fe9107dfe2 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,37 +1,40 @@
PORTNAME= gnome-desktop
-PORTVERSION= 44.1
+PORTVERSION= 44.3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Additional UI API for GNOME
-WWW= https://www.gnome.org/
+WWW= https://gitlab.gnome.org/GNOME/gnome-desktop
LICENSE= GPLv2+ LGPL20+
LICENSE_COMB= multi
LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING
LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LIB
-PORTSCOUT= limitw:1,even
-
-BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \
- gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
- xkeyboard-config>=0:x11/xkeyboard-config \
- itstool:textproc/itstool
-RUN_DEPENDS= iso-codes>=0:misc/iso-codes \
- gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
- cantarell-fonts>=0:x11-fonts/cantarell-fonts \
- xkeyboard-config>=0:x11/xkeyboard-config
+BUILD_DEPENDS= iso-codes>0:misc/iso-codes \
+ gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \
+ xkeyboard-config>0:x11/xkeyboard-config
+LIB_DEPENDS= libxkbregistry.so:x11/libxkbcommon \
+ libudev.so:devel/libudev-devd \
+ libgudev-1.0.so:devel/libgudev
+RUN_DEPENDS= iso-codes>0:misc/iso-codes \
+ gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \
+ cantarell-fonts>0:x11-fonts/cantarell-fonts \
+ source-code-pro-ttf>0:x11-fonts/source-code-pro-ttf \
+ xkeyboard-config>0:x11/xkeyboard-config
USES= bison cpe gettext gnome localbase:ldflags meson \
pkgconfig python tar:xz xorg
-USE_GNOME= cairo gdkpixbuf gtk30 gtk40 intltool introspection:build
+USE_GNOME= cairo gdkpixbuf gtk30 gtk40 introspection:build
USE_XORG= x11
USE_LDCONFIG= yes
-MESON_ARGS= -Dudev=disabled \
+MESON_ARGS= -Dudev=enabled \
-Dsystemd=disabled \
- -Dgtk_doc=false
+ -Dgtk_doc=false \
+ -Ddebug_tools=false \
+ -Ddesktop_docs=true
CPE_VENDOR= gnome
.include <bsd.port.mk>
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 304d741d9e0f..f0cd94c70442 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741182583
-SHA256 (gnome/gnome-desktop-44.1.tar.xz) = ae7ca55dc9e08914999741523a17d29ce223915626bd2462a120bf96f47a79ab
-SIZE (gnome/gnome-desktop-44.1.tar.xz) = 766784
+TIMESTAMP = 1748977438
+SHA256 (gnome/gnome-desktop-44.3.tar.xz) = 40efa9aa8d50effed9227a3d70671e32e9dc35e20f331cab3b562975978f4f8d
+SIZE (gnome/gnome-desktop-44.3.tar.xz) = 763284
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index c659951189b2..ec1291cca540 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -32,27 +32,20 @@ lib/girepository-1.0/GnomeDesktop-4.0.typelib
lib/girepository-1.0/GnomeRR-4.0.typelib
lib/libgnome-bg-4.so
lib/libgnome-bg-4.so.2
-lib/libgnome-bg-4.so.2.1.1
+lib/libgnome-bg-4.so.2.1.3
lib/libgnome-desktop-3.so
lib/libgnome-desktop-3.so.20
lib/libgnome-desktop-3.so.20.0.0
lib/libgnome-desktop-4.so
lib/libgnome-desktop-4.so.2
-lib/libgnome-desktop-4.so.2.1.1
+lib/libgnome-desktop-4.so.2.1.3
lib/libgnome-rr-4.so
lib/libgnome-rr-4.so.2
-lib/libgnome-rr-4.so.2.1.1
+lib/libgnome-rr-4.so.2.1.3
libdata/pkgconfig/gnome-bg-4.pc
libdata/pkgconfig/gnome-desktop-3.0.pc
libdata/pkgconfig/gnome-desktop-4.pc
libdata/pkgconfig/gnome-rr-4.pc
-libexec/gnome-desktop-debug/gnome-rr-debug
-libexec/gnome-desktop-debug/test-desktop-thumbnail
-libexec/gnome-desktop-debug/test-idle-monitor
-libexec/gnome-desktop-debug/test-languages
-libexec/gnome-desktop-debug/test-pnp-ids
-libexec/gnome-desktop-debug/test-wall-clock
-libexec/gnome-desktop-debug/test-xkb-info
share/gir-1.0/GnomeBG-4.0.gir
share/gir-1.0/GnomeDesktop-3.0.gir
share/gir-1.0/GnomeDesktop-4.0.gir
@@ -164,6 +157,7 @@ share/locale/et/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/eu/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/fa/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/fi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fil/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/fr/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/fur/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/fy/LC_MESSAGES/gnome-desktop-3.0.mo
@@ -177,6 +171,7 @@ share/locale/hi/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/hr/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/hu/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/hy/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ia/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/id/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/ig/LC_MESSAGES/gnome-desktop-3.0.mo
share/locale/is/LC_MESSAGES/gnome-desktop-3.0.mo