diff --git a/x11/budgie-desktop/Makefile b/x11/budgie-desktop/Makefile index 30549ba2c009..5adf2f0be2d7 100644 --- a/x11/budgie-desktop/Makefile +++ b/x11/budgie-desktop/Makefile @@ -1,94 +1,90 @@ PORTNAME= budgie-desktop -DISTVERSION= 10.8 +DISTVERSION= 10.8.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= x11 budgie MASTER_SITES= BUDGIE -PATCH_SITES= https://github.com/BuddiesOfBudgie/budgie-desktop/commit/ -PATCHFILES= 980b72e1651b53fd9f11e2c87dd4ea029896c858.patch:-p1 - MAINTAINER= duchateau.olivier@gmail.com COMMENT= Modern and familiar desktop environment WWW= https://github.com/BuddiesOfBudgie/budgie-desktop LICENSE_COMB= multi LICENSE= GPLv2 LGPL21 BUILD_DEPENDS= gnome-settings-daemon>0:sysutils/gnome-settings-daemon \ gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ sassc:textproc/sassc \ zenity>0:x11/zenity LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \ libpeas-1.0.so:devel/libpeas \ libuuid.so:misc/e2fsprogs-libuuid \ libnotify.so:devel/libnotify \ libaccountsservice.so:sysutils/accountsservice \ libpulse.so:audio/pulseaudio \ libasound.so:audio/alsa-lib \ libgraphene-1.0.so:graphics/graphene \ libupower-glib.so:sysutils/upower \ libibus-1.0.so:textproc/ibus \ libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libgee-0.8.so:devel/libgee RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ gnome-session>0:x11/gnome-session \ consolekit2>0:sysutils/consolekit2 \ zenity>0:x11/zenity \ xdotool>0:x11/xdotool USES= budgie gettext gnome gstreamer meson pkgconfig tar:xz \ vala:build xorg USE_BUDGIE= libmagpie screensaver:build USE_GNOME= cairo gdkpixbuf2 glib20 gnomedesktop3 gnomemenus3 \ gtk30 intltool introspection libwnck3 USE_GSTREAMER= libgstreamer USE_XORG= x11 xcomposite MESON_ARGS= -Dwith-gtk-doc=false \ -Dwith-bluetooth=false \ -Dwith-hibernate=false \ -Dwith-libuuid-time-safe=false # If zenity >= 3.90 → build against Gtk4 (new API) MESON_ARGS+= -Duse-old-zenity=true GLIB_SCHEMAS= 20_buddiesofbudgie.budgie-desktop.notifications.gschema.override \ 20_solus-project.budgie.wm.gschema.override \ com.solus-project.budgie-menu.gschema.xml \ com.solus-project.budgie-panel.gschema.xml \ com.solus-project.budgie.raven.gschema.xml \ com.solus-project.budgie.wm.gschema.xml \ com.solus-project.clock.gschema.xml \ com.solus-project.icon-tasklist.gschema.xml \ com.solus-project.places-indicator.gschema.xml \ com.solus-project.spacer.gschema.xml \ com.solus-project.status.gschema.xml \ com.solus-project.trash.gschema.xml \ com.solus-project.tray.gschema.xml \ com.solus-project.workspaces.gschema.xml \ org.buddiesofbudgie.budgie-desktop.raven.widget.Calendar.gschema.xml \ org.buddiesofbudgie.budgie-desktop.raven.widget.SoundInput.gschema.xml \ org.buddiesofbudgie.budgie-desktop.raven.widget.SoundOutput.gschema.xml \ org.buddiesofbudgie.budgie-desktop.raven.widget.UsageMonitor.gschema.xml \ org.buddiesofbudgie.budgie-desktop.screenshot.gschema.xml \ 25_org.buddiesofbudgie-default-settings.gschema.override .include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif post-extract: ${CP} ${FILESDIR}/25_org.buddiesofbudgie-default-settings.gschema.override \ ${WRKSRC}/data post-patch: ${REINPLACE_CMD} -i "" -e 's|%%PREFIX%%|${LOCALBASE}|g' \ ${WRKSRC}/src/wm/20_solus-project.budgie.wm.gschema.override ${REINPLACE_CMD} -i "" -e 's|start-here|view-grid|' \ ${WRKSRC}/src/panel/applets/budgie-menu/com.solus-project.budgie-menu.gschema.xml .include diff --git a/x11/budgie-desktop/distinfo b/x11/budgie-desktop/distinfo index e160c80592fd..d732966de3cd 100644 --- a/x11/budgie-desktop/distinfo +++ b/x11/budgie-desktop/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1693665825 -SHA256 (budgie/budgie-desktop-v10.8.tar.xz) = b8406a60a74390421278486b242369017806716e87ea911424091e63febd2619 -SIZE (budgie/budgie-desktop-v10.8.tar.xz) = 3009908 -SHA256 (budgie/980b72e1651b53fd9f11e2c87dd4ea029896c858.patch) = fb197da25d9db6df601e7275e7ba52509d23b39ea7b1d30da82ec1e5bd7142fb -SIZE (budgie/980b72e1651b53fd9f11e2c87dd4ea029896c858.patch) = 1502 +TIMESTAMP = 1696264666 +SHA256 (budgie/budgie-desktop-v10.8.1.tar.xz) = b12d4b5bc3da3363c766535cf8e8e64003afac46f84d040ad7d7d996090f2ca7 +SIZE (budgie/budgie-desktop-v10.8.1.tar.xz) = 3185112 diff --git a/x11/budgie-desktop/files/patch-data_meson.build b/x11/budgie-desktop/files/patch-data_meson.build index 49018a110065..126e475b7604 100644 --- a/x11/budgie-desktop/files/patch-data_meson.build +++ b/x11/budgie-desktop/files/patch-data_meson.build @@ -1,11 +1,19 @@ ---- data/meson.build.orig 2023-02-19 16:48:41 UTC +--- data/meson.build.orig 2023-09-30 15:44:12 UTC +++ data/meson.build -@@ -15,3 +15,8 @@ install_data( - version_file, +@@ -16,7 +16,13 @@ install_data( install_dir: join_paths(datadir, 'budgie') ) -+ + +-install_data( +- 'budgie-portals.conf', +- install_dir: join_paths(datadir, 'xdg-desktop-portal') +# Our own settings +install_data('25_org.buddiesofbudgie-default-settings.gschema.override', + install_dir: join_paths(datadir, 'glib-2.0', 'schemas') -+) + ) ++ ++# It requires, x11/xdg-desktop-portal-gtk > 1.17.x ++#install_data( ++# 'budgie-portals.conf', ++# install_dir: join_paths(datadir, 'xdg-desktop-portal') ++#) diff --git a/x11/budgie-desktop/files/patch-meson.build b/x11/budgie-desktop/files/patch-meson.build new file mode 100644 index 000000000000..dc7bc1e0d710 --- /dev/null +++ b/x11/budgie-desktop/files/patch-meson.build @@ -0,0 +1,24 @@ +--- meson.build.orig 2023-09-30 15:44:12 UTC ++++ meson.build +@@ -67,12 +67,6 @@ cdata = configuration_data() + # Inspired by https://github.com/GNOME/recipes/blob/master/meson.build + package_version = meson.project_version() + +-if fs.exists('.git') +- git = find_program('git') +- git_version = run_command('git', ['rev-parse', 'HEAD'], check: true) +- package_version += ' (git-'+git_version.stdout().strip()+')' +-endif +- + cdata.set_quoted('PACKAGE_VERSION', package_version) + + # Make gettext work +@@ -154,7 +148,7 @@ if xdg_appdir == '' + if with_stateless == true + xdg_appdir = join_paths(datadir, 'xdg', 'autostart') + else +- xdg_appdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart') ++ xdg_appdir = join_paths(confdir, 'xdg', 'autostart') + endif + endif +