Date: Sat, 25 Feb 2023 20:53:04 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2d87115f8c5e - main - x11/cinnamon: update to 5.4 Message-ID: <202302252053.31PKr4wb087723@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d87115f8c5e79c7b33f526c4ba4e151d63baf4e commit 2d87115f8c5e79c7b33f526c4ba4e151d63baf4e Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2022-12-30 14:07:08 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2023-02-25 20:52:13 +0000 x11/cinnamon: update to 5.4 Components: - lang/cjs to 5.4.1 - misc/cinnamon-translations to 5.4.2 - sysutils/cinnamon-control-center to 5.4.6 - sysutils/cinnamon-settings-daemon to 5.4.4 - x11-fm/nemo to 5.4.2 - x11-wm/muffin to 5.4.5 - x11/cinnamon-desktop to 5.4.2 - x11/cinnamon-menus to 5.4.0 - x11/cinnamon-screensaver to 5.4.2 - x11/cinnamon-session to 5.4.0 - x11/cinnamon to 5.4.9 - x11/py-python-xapp to 2.2.2 - x11/xapp to 2.2.14 5.6 is the latest upstream release; this is a stopgap to reduce delta. Reviewed by: tcberner (desktop) Differential Revision: https://reviews.freebsd.org/D37917 --- lang/cjs/Makefile | 12 +- lang/cjs/distinfo | 8 +- misc/cinnamon-translations/Makefile | 3 +- misc/cinnamon-translations/distinfo | 6 +- misc/cinnamon-translations/pkg-plist | 22 ++ sysutils/cinnamon-control-center/Makefile | 20 +- sysutils/cinnamon-control-center/distinfo | 6 +- .../files/patch-meson.build | 11 + .../files/patch-panels_display_icons_meson.build | 11 + sysutils/cinnamon-control-center/pkg-plist | 7 +- sysutils/cinnamon-settings-daemon/Makefile | 18 +- sysutils/cinnamon-settings-daemon/distinfo | 6 +- .../patch-plugins_xrandr_csd-xrandr-manager.c | 11 - sysutils/cinnamon-settings-daemon/pkg-plist | 37 +-- x11-fm/nemo/Makefile | 17 +- x11-fm/nemo/distinfo | 6 +- x11-fm/nemo/pkg-plist | 22 ++ x11-wm/muffin/Makefile | 72 ++--- x11-wm/muffin/distinfo | 6 +- .../files/patch-clutter_clutter_cally_cally-text.c | 27 ++ x11-wm/muffin/files/patch-uint | 67 ++++ x11-wm/muffin/pkg-plist | 351 ++++++++++----------- x11/cinnamon-desktop/Makefile | 7 +- x11/cinnamon-desktop/distinfo | 6 +- .../files/patch-libcvc_gvc-channel-map.c | 31 ++ x11/cinnamon-desktop/pkg-plist | 2 + x11/cinnamon-menus/Makefile | 2 +- x11/cinnamon-menus/distinfo | 6 +- x11/cinnamon-screensaver/Makefile | 27 +- x11/cinnamon-screensaver/distinfo | 6 +- .../files/cinnamon-screensaver.pam.in | 1 + x11/cinnamon-screensaver/pkg-plist | 11 +- x11/cinnamon-session/Makefile | 14 +- x11/cinnamon-session/distinfo | 6 +- x11/cinnamon-session/pkg-plist | 1 - x11/cinnamon/Makefile | 32 +- x11/cinnamon/distinfo | 8 +- ...sr_share_cinnamon_cinnamon-settings_bin_capi.py | 39 +++ ...sr_share_cinnamon_cinnamon-settings_bin_util.py | 11 + x11/cinnamon/files/patch-src_cinnamon-global.c | 22 ++ x11/cinnamon/files/patch-src_st_meson.build | 19 -- x11/cinnamon/pkg-plist | 48 ++- x11/py-python-xapp/Makefile | 7 +- x11/py-python-xapp/distinfo | 6 +- x11/xapp/Makefile | 2 +- x11/xapp/distinfo | 6 +- 46 files changed, 623 insertions(+), 443 deletions(-) diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile index 9676830c2d1c..776426f2fb2a 100644 --- a/lang/cjs/Makefile +++ b/lang/cjs/Makefile @@ -1,12 +1,14 @@ PORTNAME= cjs -PORTVERSION= 4.8.2 -PORTREVISION= 1 +PORTVERSION= 5.4.1 CATEGORIES= lang gnome DIST_SUBDIR= gnome +PATCH_SITES= https://gitlab.gnome.org/GNOME/gjs/-/commit/ +PATCHFILES= f93880c356108cfdbc8f9ebe318d18f256d7128d.patch:-p1 # https://gitlab.gnome.org/GNOME/gjs/-/issues/514 + MAINTAINER= gnome@FreeBSD.org COMMENT= JavaScript bindings based on gobject-introspection -WWW= http://cinnamon.linuxmint.com +WWW= https://github.com/linuxmint/cjs LICENSE= MIT LGPL20+ LICENSE_COMB= dual @@ -16,8 +18,8 @@ LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LGPL LIB_DEPENDS= libffi.so:devel/libffi \ libmozjs-78.so:lang/spidermonkey78 -USES= compiler:c++14-lang gettext gnome localbase meson pkgconfig \ - python:3.5+,build readline shebangfix xorg +USES= compiler:c++17-lang gettext gnome localbase meson pkgconfig \ + python:build readline shebangfix xorg USE_GNOME= cairo gdkpixbuf2 gtk30 introspection USE_XORG= x11 xext MESON_ARGS= -Dinstalled_tests=false \ diff --git a/lang/cjs/distinfo b/lang/cjs/distinfo index f75743f2f749..9c843f20af8a 100644 --- a/lang/cjs/distinfo +++ b/lang/cjs/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1610463497 -SHA256 (gnome/linuxmint-cjs-4.8.2_GH0.tar.gz) = c3248663e0084dbcee1bf4d1db56966c1321983617dbbec9b1253e50614a3f4e -SIZE (gnome/linuxmint-cjs-4.8.2_GH0.tar.gz) = 600711 +TIMESTAMP = 1677355395 +SHA256 (gnome/linuxmint-cjs-5.4.1_GH0.tar.gz) = 212fa302f15ea955af6dc87fdba3898f751d078df91cb84b0e6615d5a2b84e15 +SIZE (gnome/linuxmint-cjs-5.4.1_GH0.tar.gz) = 794618 +SHA256 (gnome/f93880c356108cfdbc8f9ebe318d18f256d7128d.patch) = 254299e1b39987c53c3c4943fcc3c4e0b00a27442192243e3c7c1589969f2811 +SIZE (gnome/f93880c356108cfdbc8f9ebe318d18f256d7128d.patch) = 1674 diff --git a/misc/cinnamon-translations/Makefile b/misc/cinnamon-translations/Makefile index 241c6d33a603..c2f61eb58e6a 100644 --- a/misc/cinnamon-translations/Makefile +++ b/misc/cinnamon-translations/Makefile @@ -1,10 +1,11 @@ PORTNAME= cinnamon-translations -PORTVERSION= 4.8.3 +PORTVERSION= 5.4.2 CATEGORIES= misc x11 gnome DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Translations for the cinnamon desktop +WWW= https://github.com/linuxmint/cinnamon-translations LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/misc/cinnamon-translations/distinfo b/misc/cinnamon-translations/distinfo index 5ce47718a919..43bb77bcfb14 100644 --- a/misc/cinnamon-translations/distinfo +++ b/misc/cinnamon-translations/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612567721 -SHA256 (gnome/linuxmint-cinnamon-translations-4.8.3_GH0.tar.gz) = 272b4e128b352f8a877bb57eaa4ed85ff72ad1cb25c4c58c8a35d0b093908f93 -SIZE (gnome/linuxmint-cinnamon-translations-4.8.3_GH0.tar.gz) = 12010514 +TIMESTAMP = 1660015818 +SHA256 (gnome/linuxmint-cinnamon-translations-5.4.2_GH0.tar.gz) = ef28ba08f32d1e2c8845d6a41742553b90f1afe8d3766d3d4df5c17ee5d565d3 +SIZE (gnome/linuxmint-cinnamon-translations-5.4.2_GH0.tar.gz) = 12650460 diff --git a/misc/cinnamon-translations/pkg-plist b/misc/cinnamon-translations/pkg-plist index 8ab40b5ca0c4..a8b914a73a8f 100644 --- a/misc/cinnamon-translations/pkg-plist +++ b/misc/cinnamon-translations/pkg-plist @@ -1,3 +1,5 @@ +share/locale/aa/LC_MESSAGES/cinnamon-screensaver.mo +share/locale/aa/LC_MESSAGES/cinnamon.mo share/locale/af/LC_MESSAGES/cinnamon-control-center.mo share/locale/af/LC_MESSAGES/cinnamon-screensaver.mo share/locale/af/LC_MESSAGES/cinnamon-session.mo @@ -19,6 +21,7 @@ share/locale/ar/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/ar/LC_MESSAGES/cinnamon.mo share/locale/ar/LC_MESSAGES/nemo-extensions.mo share/locale/ar/LC_MESSAGES/nemo.mo +share/locale/ary/LC_MESSAGES/cinnamon.mo share/locale/as/LC_MESSAGES/cinnamon-control-center.mo share/locale/as/LC_MESSAGES/cinnamon-screensaver.mo share/locale/as/LC_MESSAGES/cinnamon-session.mo @@ -30,6 +33,13 @@ share/locale/ast/LC_MESSAGES/cinnamon-session.mo share/locale/ast/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/ast/LC_MESSAGES/cinnamon.mo share/locale/ast/LC_MESSAGES/nemo.mo +share/locale/ay/LC_MESSAGES/cinnamon-control-center.mo +share/locale/ay/LC_MESSAGES/cinnamon-screensaver.mo +share/locale/ay/LC_MESSAGES/cinnamon-session.mo +share/locale/ay/LC_MESSAGES/cinnamon-settings-daemon.mo +share/locale/ay/LC_MESSAGES/cinnamon.mo +share/locale/ay/LC_MESSAGES/nemo-extensions.mo +share/locale/ay/LC_MESSAGES/nemo.mo share/locale/az/LC_MESSAGES/cinnamon-control-center.mo share/locale/az/LC_MESSAGES/cinnamon-screensaver.mo share/locale/az/LC_MESSAGES/cinnamon-session.mo @@ -60,6 +70,7 @@ share/locale/bn/LC_MESSAGES/cinnamon-screensaver.mo share/locale/bn/LC_MESSAGES/cinnamon-session.mo share/locale/bn/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/bn/LC_MESSAGES/cinnamon.mo +share/locale/bn/LC_MESSAGES/nemo-extensions.mo share/locale/bn/LC_MESSAGES/nemo.mo share/locale/bn_IN/LC_MESSAGES/cinnamon-control-center.mo share/locale/bn_IN/LC_MESSAGES/cinnamon-screensaver.mo @@ -146,6 +157,7 @@ share/locale/en_AU/LC_MESSAGES/cinnamon.mo share/locale/en_AU/LC_MESSAGES/nemo.mo share/locale/en_CA/LC_MESSAGES/cinnamon-control-center.mo share/locale/en_CA/LC_MESSAGES/cinnamon-screensaver.mo +share/locale/en_CA/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/en_CA/LC_MESSAGES/cinnamon-session.mo share/locale/en_CA/LC_MESSAGES/cinnamon.mo share/locale/en_CA/LC_MESSAGES/nemo.mo @@ -278,6 +290,7 @@ share/locale/hr/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/hr/LC_MESSAGES/cinnamon.mo share/locale/hr/LC_MESSAGES/nemo-extensions.mo share/locale/hr/LC_MESSAGES/nemo.mo +share/locale/hsb/LC_MESSAGES/cinnamon.mo share/locale/hu/LC_MESSAGES/cinnamon-control-center.mo share/locale/hu/LC_MESSAGES/cinnamon-screensaver.mo share/locale/hu/LC_MESSAGES/cinnamon-session.mo @@ -382,11 +395,15 @@ share/locale/ku/LC_MESSAGES/nemo.mo share/locale/ky/LC_MESSAGES/cinnamon-control-center.mo share/locale/ky/LC_MESSAGES/cinnamon.mo share/locale/ky/LC_MESSAGES/nemo.mo +share/locale/la/LC_MESSAGES/cinnamon-control-center.mo share/locale/la/LC_MESSAGES/cinnamon-screensaver.mo +share/locale/la/LC_MESSAGES/cinnamon-session.mo +share/locale/la/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/la/LC_MESSAGES/cinnamon.mo share/locale/la/LC_MESSAGES/nemo-extensions.mo share/locale/la/LC_MESSAGES/nemo.mo share/locale/li/LC_MESSAGES/cinnamon.mo +share/locale/lmo/LC_MESSAGES/cinnamon.mo share/locale/lo/LC_MESSAGES/cinnamon-control-center.mo share/locale/lo/LC_MESSAGES/cinnamon-screensaver.mo share/locale/lo/LC_MESSAGES/cinnamon-session.mo @@ -431,6 +448,7 @@ share/locale/mn/LC_MESSAGES/cinnamon-control-center.mo share/locale/mn/LC_MESSAGES/cinnamon-screensaver.mo share/locale/mn/LC_MESSAGES/cinnamon-session.mo share/locale/mn/LC_MESSAGES/cinnamon-settings-daemon.mo +share/locale/mo/LC_MESSAGES/nemo.mo share/locale/mr/LC_MESSAGES/cinnamon-control-center.mo share/locale/mr/LC_MESSAGES/cinnamon-screensaver.mo share/locale/mr/LC_MESSAGES/cinnamon-session.mo @@ -455,6 +473,7 @@ share/locale/nb/LC_MESSAGES/cinnamon-screensaver.mo share/locale/nb/LC_MESSAGES/cinnamon-session.mo share/locale/nb/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/nb/LC_MESSAGES/cinnamon.mo +share/locale/nb/LC_MESSAGES/nemo-extensions.mo share/locale/nb/LC_MESSAGES/nemo.mo share/locale/nds/LC_MESSAGES/cinnamon-control-center.mo share/locale/nds/LC_MESSAGES/cinnamon-screensaver.mo @@ -491,6 +510,7 @@ share/locale/oc/LC_MESSAGES/cinnamon-screensaver.mo share/locale/oc/LC_MESSAGES/cinnamon-session.mo share/locale/oc/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/oc/LC_MESSAGES/cinnamon.mo +share/locale/oc/LC_MESSAGES/nemo-extensions.mo share/locale/oc/LC_MESSAGES/nemo.mo share/locale/om/LC_MESSAGES/cinnamon-control-center.mo share/locale/om/LC_MESSAGES/cinnamon-screensaver.mo @@ -599,6 +619,7 @@ share/locale/sr/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/sr/LC_MESSAGES/cinnamon.mo share/locale/sr/LC_MESSAGES/nemo-extensions.mo share/locale/sr/LC_MESSAGES/nemo.mo +share/locale/sr@ijekavian/LC_MESSAGES/cinnamon.mo share/locale/sr@ijekavianlatin/LC_MESSAGES/cinnamon.mo share/locale/sr@latin/LC_MESSAGES/cinnamon-control-center.mo share/locale/sr@latin/LC_MESSAGES/cinnamon-screensaver.mo @@ -688,6 +709,7 @@ share/locale/uz/LC_MESSAGES/cinnamon-screensaver.mo share/locale/uz/LC_MESSAGES/cinnamon-session.mo share/locale/uz/LC_MESSAGES/cinnamon-settings-daemon.mo share/locale/uz/LC_MESSAGES/cinnamon.mo +share/locale/uz/LC_MESSAGES/nemo-extensions.mo share/locale/uz/LC_MESSAGES/nemo.mo share/locale/uz@cyrillic/LC_MESSAGES/cinnamon-control-center.mo share/locale/uz@cyrillic/LC_MESSAGES/cinnamon-session.mo diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile index c681b9d1e254..8c51d04fa6bf 100644 --- a/sysutils/cinnamon-control-center/Makefile +++ b/sysutils/cinnamon-control-center/Makefile @@ -1,12 +1,11 @@ PORTNAME= cinnamon-control-center -PORTVERSION= 4.8.2 -PORTREVISION= 2 +PORTVERSION= 5.4.6 CATEGORIES= sysutils gnome DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for Cinnamon -WWW= http://cinnamon.linuxmint.com +WWW= https://github.com/linuxmint/cinnamon-control-center LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -21,13 +20,14 @@ LIB_DEPENDS= libcinnamon-desktop.so:x11/cinnamon-desktop \ libnotify.so:devel/libnotify \ libpolkit-gobject-1.so:sysutils/polkit \ libxklavier.so:x11/libxklavier \ - libharfbuzz.so:print/harfbuzz -RUN_DEPENDS= iso-codes>0:misc/iso-codes \ - cinnamon-settings-daemon>=1.0.0:sysutils/cinnamon-settings-daemon + libharfbuzz.so:print/harfbuzz \ + libupower-glib.so:sysutils/upower \ + libgudev-1.0.so:devel/libgudev +RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= gettext gnome meson pkgconfig python:3.5+,build shebangfix xorg -USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libgnomekbd libxml2 -USE_XORG= x11 xfixes sm +USES= gettext gnome meson pkgconfig python:build shebangfix xorg +USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool libgnomekbd libxml2 +USE_XORG= x11 xfixes xorgproto sm USE_GITHUB= yes GH_ACCOUNT= linuxmint @@ -39,6 +39,8 @@ MESON_ARGS= -Dnetworkmanager=false \ SHEBANG_GLOB= *.py +GLIB_SCHEMAS= org.cinnamon.control-center.display.gschema.xml + OPTIONS_DEFINE= COLORD ONLINEACCOUNTS WACOM OPTIONS_DEFAULT=COLORD ONLINEACCOUNTS WACOM OPTIONS_SUB= yes diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo index 4bde1594df02..2fbdd9028240 100644 --- a/sysutils/cinnamon-control-center/distinfo +++ b/sysutils/cinnamon-control-center/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612595657 -SHA256 (gnome/linuxmint-cinnamon-control-center-4.8.2_GH0.tar.gz) = 407e88fe458af7b25c0dd91d54aad93a72a1464ced285a741ed1ce6249ed61af -SIZE (gnome/linuxmint-cinnamon-control-center-4.8.2_GH0.tar.gz) = 3865765 +TIMESTAMP = 1660021625 +SHA256 (gnome/linuxmint-cinnamon-control-center-5.4.6_GH0.tar.gz) = e20cd4e94b0110b31753f81dd209e88d0dcc350450aa365c7227c5ca8f92e0ac +SIZE (gnome/linuxmint-cinnamon-control-center-5.4.6_GH0.tar.gz) = 3872754 diff --git a/sysutils/cinnamon-control-center/files/patch-meson.build b/sysutils/cinnamon-control-center/files/patch-meson.build new file mode 100644 index 000000000000..37fbd7eb2f28 --- /dev/null +++ b/sysutils/cinnamon-control-center/files/patch-meson.build @@ -0,0 +1,11 @@ +--- meson.build.orig 2022-07-04 07:39:25 UTC ++++ meson.build +@@ -38,7 +38,7 @@ upower_glib_dep = dependency('upower-glib', version: ' + libxklavier = dependency('libxklavier', version: '>=5.1') + upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8') + +-config.set('HAVE_X11_EXTENSIONS_XKB_H', cc.has_header('X11/extensions/XKB.h')) ++config.set('HAVE_X11_EXTENSIONS_XKB_H', dependency('kbproto', required: false).found()) + + ############################################################################### + # This is a hard-dependency for the region and user-accounts panels diff --git a/sysutils/cinnamon-control-center/files/patch-panels_display_icons_meson.build b/sysutils/cinnamon-control-center/files/patch-panels_display_icons_meson.build new file mode 100644 index 000000000000..52a159dc00da --- /dev/null +++ b/sysutils/cinnamon-control-center/files/patch-panels_display_icons_meson.build @@ -0,0 +1,11 @@ +--- panels/display/icons/meson.build.orig 2022-07-04 07:39:25 UTC ++++ panels/display/icons/meson.build +@@ -6,7 +6,7 @@ icon_sizes = [ + 'scalable' + ] + +-foreach size : sizes ++foreach size : icon_sizes + install_subdir(size, + strip_directory: true, + install_dir: get_option('datadir') / 'icons' / 'hicolor' / size / 'apps', diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist index 5461aa3253fe..53e9b46464b5 100644 --- a/sysutils/cinnamon-control-center/pkg-plist +++ b/sysutils/cinnamon-control-center/pkg-plist @@ -13,13 +13,16 @@ lib/libcinnamon-control-center.so.1.0.0 libdata/pkgconfig/libcinnamon-control-center.pc %%COLORD%%share/applications/cinnamon-color-panel.desktop share/applications/cinnamon-display-panel.desktop -share/applications/cinnamon-region-panel.desktop %%WACOM%%share/applications/cinnamon-wacom-panel.desktop +%%COLORD%%%%DATADIR%%/panels/cinnamon-color-panel.desktop +%%DATADIR%%/panels/cinnamon-display-panel.desktop +%%ONLINEACCOUNTS%%%%DATADIR%%/panels/cinnamon-online-accounts.desktop +%%DATADIR%%/panels/cinnamon-region-panel.desktop +%%WACOM%%%%DATADIR%%/panels/cinnamon-wacom-panel.desktop %%DATADIR%%/ui/cinnamon-region-panel-layout-chooser.ui %%DATADIR%%/ui/cinnamon-region-panel-options-dialog.ui %%DATADIR%%/ui/cinnamon-region-panel.ui %%COLORD%%%%DATADIR%%/ui/color.ui -%%DATADIR%%/ui/display-capplet.ui %%DATADIR%%/ui/language-chooser.ui %%ONLINEACCOUNTS%%%%DATADIR%%/ui/online-accounts.ui %%DATADIR%%/ui/shell.ui diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile index 0f3abddeaf25..8277ec7f8de7 100644 --- a/sysutils/cinnamon-settings-daemon/Makefile +++ b/sysutils/cinnamon-settings-daemon/Makefile @@ -1,12 +1,11 @@ PORTNAME= cinnamon-settings-daemon -PORTVERSION= 4.8.5 -PORTREVISION= 2 +PORTVERSION= 5.4.4 CATEGORIES= sysutils gnome DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Cinnamon desktop settings daemon -WWW= http://cinnamon.linuxmint.com/ +WWW= https://github.com/linuxmint/cinnamon-settings-daemon LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi @@ -14,14 +13,11 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= cinnamon-session:x11/cinnamon-session \ - xf86-input-wacom>0:x11-drivers/xf86-input-wacom \ gln:sysutils/coreutils LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libpolkit-gobject-1.so:sysutils/polkit \ libgudev-1.0.so:devel/libgudev \ - libdbus-1.so:devel/dbus \ - libdbus-glib-1.so:devel/dbus-glib \ libcolord.so:graphics/colord \ liblcms2.so:graphics/lcms2 \ libcinnamon-desktop.so:x11/cinnamon-desktop \ @@ -36,9 +32,9 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \ RUN_DEPENDS= cinnamon-session:x11/cinnamon-session USES= compiler:c11 gettext-tools gnome localbase meson pkgconfig \ - python:3.5+,build shebangfix xorg -USE_GNOME= cairo gdkpixbuf2 gtk30 intltool libgnomekbd librsvg2 -USE_XORG= x11 xext xfixes xi xtst + python:build shebangfix xorg +USE_GNOME= cairo dconf gdkpixbuf2 gtk30 intltool libgnomekbd pango +USE_XORG= x11 xext xfixes xi USE_GITHUB= yes GH_ACCOUNT= linuxmint @@ -69,11 +65,13 @@ CUPS_MESON_ENABLED= use_cups CUPS_LIB_DEPENDS= libcups.so:print/cups SMARTCARD_DESC= Smartcard support -SMARTCARD_MESON_ENABLED= enable_smartcard +SMARTCARD_MESON_ENABLED= use_smartcard SMARTCARD_LIB_DEPENDS= libnss3.so:security/nss WACOM_DESC= Tablet support with libwacom +WACOM_MESON_ENABLED= use_wacom WACOM_LIB_DEPENDS= libwacom.so:x11/libwacom +WACOM_USE= gnome=librsvg2 post-patch: # Adhere to our hier(7). diff --git a/sysutils/cinnamon-settings-daemon/distinfo b/sysutils/cinnamon-settings-daemon/distinfo index 602b5ea391a8..4ba7e767eb4d 100644 --- a/sysutils/cinnamon-settings-daemon/distinfo +++ b/sysutils/cinnamon-settings-daemon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612567899 -SHA256 (gnome/linuxmint-cinnamon-settings-daemon-4.8.5_GH0.tar.gz) = f2e770113230e04bb5fe887c33b725ac273dcac912a3825ab6b9c821ce92ff32 -SIZE (gnome/linuxmint-cinnamon-settings-daemon-4.8.5_GH0.tar.gz) = 662123 +TIMESTAMP = 1660020382 +SHA256 (gnome/linuxmint-cinnamon-settings-daemon-5.4.4_GH0.tar.gz) = 65397117ad19419a6bdff38b10231148aca59d57284c6a79f517332eb70debc5 +SIZE (gnome/linuxmint-cinnamon-settings-daemon-5.4.4_GH0.tar.gz) = 573207 diff --git a/sysutils/cinnamon-settings-daemon/files/patch-plugins_xrandr_csd-xrandr-manager.c b/sysutils/cinnamon-settings-daemon/files/patch-plugins_xrandr_csd-xrandr-manager.c deleted file mode 100644 index 38dbe7e15fb9..000000000000 --- a/sysutils/cinnamon-settings-daemon/files/patch-plugins_xrandr_csd-xrandr-manager.c +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/xrandr/csd-xrandr-manager.c.orig 2018-12-29 18:51:26.289097000 +0100 -+++ plugins/xrandr/csd-xrandr-manager.c 2018-12-29 18:54:43.819478000 +0100 -@@ -149,6 +149,8 @@ - static void handle_rotate_windows (CsdXrandrManager *mgr, GnomeRRRotation rotation, guint32 timestamp); - static void rotate_touchscreens (CsdXrandrManager *mgr, GnomeRRRotation rotation); - -+void register_manager_dbus (CsdXrandrManager *manager); -+ - G_DEFINE_TYPE (CsdXrandrManager, csd_xrandr_manager, G_TYPE_OBJECT) - - static gpointer manager_object = NULL; diff --git a/sysutils/cinnamon-settings-daemon/pkg-plist b/sysutils/cinnamon-settings-daemon/pkg-plist index 9c14818e0b55..07ea20b74caf 100644 --- a/sysutils/cinnamon-settings-daemon/pkg-plist +++ b/sysutils/cinnamon-settings-daemon/pkg-plist @@ -1,113 +1,78 @@ -bin/csd-a11y-keyboard bin/csd-a11y-settings bin/csd-automount bin/csd-background bin/csd-backlight-helper bin/csd-clipboard bin/csd-color -bin/csd-cursor bin/csd-datetime-mechanism bin/csd-housekeeping bin/csd-input-helper bin/csd-keyboard -%%WACOM%%bin/csd-list-wacom -bin/csd-locate-pointer bin/csd-media-keys -bin/csd-mouse -bin/csd-orientation bin/csd-power %%CUPS%%bin/csd-print-notifications %%CUPS%%bin/csd-printer bin/csd-screensaver-proxy %%SMARTCARD%%bin/csd-smartcard -bin/csd-sound %%WACOM%%bin/csd-wacom -%%WACOM%%bin/csd-wacom-led-helper -%%WACOM%%bin/csd-wacom-osd -bin/csd-xrandr bin/csd-xsettings -etc/xdg/autostart/cinnamon-settings-daemon-a11y-keyboard.desktop etc/xdg/autostart/cinnamon-settings-daemon-a11y-settings.desktop etc/xdg/autostart/cinnamon-settings-daemon-automount.desktop etc/xdg/autostart/cinnamon-settings-daemon-background.desktop etc/xdg/autostart/cinnamon-settings-daemon-clipboard.desktop etc/xdg/autostart/cinnamon-settings-daemon-color.desktop -etc/xdg/autostart/cinnamon-settings-daemon-cursor.desktop etc/xdg/autostart/cinnamon-settings-daemon-housekeeping.desktop etc/xdg/autostart/cinnamon-settings-daemon-keyboard.desktop etc/xdg/autostart/cinnamon-settings-daemon-media-keys.desktop -etc/xdg/autostart/cinnamon-settings-daemon-mouse.desktop -etc/xdg/autostart/cinnamon-settings-daemon-orientation.desktop etc/xdg/autostart/cinnamon-settings-daemon-power.desktop %%CUPS%%etc/xdg/autostart/cinnamon-settings-daemon-print-notifications.desktop etc/xdg/autostart/cinnamon-settings-daemon-screensaver-proxy.desktop %%SMARTCARD%%etc/xdg/autostart/cinnamon-settings-daemon-smartcard.desktop -etc/xdg/autostart/cinnamon-settings-daemon-sound.desktop %%WACOM%%etc/xdg/autostart/cinnamon-settings-daemon-wacom.desktop -etc/xdg/autostart/cinnamon-settings-daemon-xrandr.desktop etc/xdg/autostart/cinnamon-settings-daemon-xsettings.desktop include/cinnamon-settings-daemon-3.0/cinnamon-settings-daemon/csd-enums.h lib/cinnamon-settings-daemon-3.0/libcsd.so -lib/cinnamon-settings-daemon/csd-a11y-keyboard lib/cinnamon-settings-daemon/csd-a11y-settings lib/cinnamon-settings-daemon/csd-automount lib/cinnamon-settings-daemon/csd-background lib/cinnamon-settings-daemon/csd-backlight-helper lib/cinnamon-settings-daemon/csd-clipboard lib/cinnamon-settings-daemon/csd-color -lib/cinnamon-settings-daemon/csd-cursor lib/cinnamon-settings-daemon/csd-datetime-mechanism lib/cinnamon-settings-daemon/csd-housekeeping lib/cinnamon-settings-daemon/csd-input-helper lib/cinnamon-settings-daemon/csd-keyboard -%%WACOM%%lib/cinnamon-settings-daemon/csd-list-wacom -lib/cinnamon-settings-daemon/csd-locate-pointer lib/cinnamon-settings-daemon/csd-media-keys -lib/cinnamon-settings-daemon/csd-mouse -lib/cinnamon-settings-daemon/csd-orientation lib/cinnamon-settings-daemon/csd-power %%CUPS%%lib/cinnamon-settings-daemon/csd-print-notifications %%CUPS%%lib/cinnamon-settings-daemon/csd-printer lib/cinnamon-settings-daemon/csd-screensaver-proxy %%SMARTCARD%%lib/cinnamon-settings-daemon/csd-smartcard -lib/cinnamon-settings-daemon/csd-sound %%WACOM%%lib/cinnamon-settings-daemon/csd-wacom -%%WACOM%%lib/cinnamon-settings-daemon/csd-wacom-led-helper -%%WACOM%%lib/cinnamon-settings-daemon/csd-wacom-osd -lib/cinnamon-settings-daemon/csd-xrandr lib/cinnamon-settings-daemon/csd-xsettings libdata/pkgconfig/cinnamon-settings-daemon.pc -libexec/csd-a11y-keyboard libexec/csd-a11y-settings libexec/csd-automount libexec/csd-background libexec/csd-backlight-helper libexec/csd-clipboard libexec/csd-color -libexec/csd-cursor libexec/csd-datetime-mechanism libexec/csd-housekeeping libexec/csd-input-helper libexec/csd-keyboard -%%WACOM%%libexec/csd-list-wacom -libexec/csd-locate-pointer libexec/csd-media-keys -libexec/csd-mouse -libexec/csd-orientation libexec/csd-power %%CUPS%%libexec/csd-print-notifications %%CUPS%%libexec/csd-printer libexec/csd-screensaver-proxy %%SMARTCARD%%libexec/csd-smartcard -libexec/csd-sound %%WACOM%%libexec/csd-wacom %%WACOM%%libexec/csd-wacom-led-helper -%%WACOM%%libexec/csd-wacom-osd -libexec/csd-xrandr +%%WACOM%%libexec/csd-wacom-oled-helper libexec/csd-xsettings share/applications/csd-automount.desktop %%DATADIR%%-3.0/input-device-example.sh -%%DATADIR%%/csd-a11y-preferences-dialog.ui %%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-off.png %%DATADIR%%/icons/hicolor/64x64/devices/kbd-capslock-on.png %%DATADIR%%/icons/hicolor/64x64/devices/kbd-numlock-off.png diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile index 54e8b71ba58c..78db65714a28 100644 --- a/x11-fm/nemo/Makefile +++ b/x11-fm/nemo/Makefile @@ -1,12 +1,11 @@ PORTNAME= nemo -PORTVERSION= 4.8.3 -PORTREVISION= 3 +PORTVERSION= 5.4.2 CATEGORIES= x11-fm gnome DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= File manager for the Cinnamon desktop -WWW= http://cinnamon.linuxmint.com/ +WWW= https://github.com/linuxmint/nemo LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi @@ -16,22 +15,22 @@ LICENSE_FILE_LGPL20= ${WRKSRC}/COPYING.LIB BUILD_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas LIB_DEPENDS= libcinnamon-desktop.so:x11/cinnamon-desktop \ - libnotify.so:devel/libnotify \ libxapp.so:x11/xapp RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ gvfs>0:devel/gvfs USES= compiler:c11 desktop-file-utils gettext gnome meson pkgconfig \ - python:3.5+ shared-mime-info shebangfix xorg + python shared-mime-info shebangfix xorg -SHEBANG_FILES= generate_additional_file makepot +SHEBANG_FILES= generate_additional_file makepot search-helpers/nemo-xls-to-txt SHEBANG_GLOB= *.py USE_GITHUB= yes GH_ACCOUNT= linuxmint -USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack introspection libxml2 pango pygobject3 +USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack introspection libgsf \ + libxml2 pango pygobject3 USE_XORG= x11 @@ -59,8 +58,4 @@ EXIF_MESON_TRUE= exif TRACKER_LIB_DEPENDS= libtracker-sparql-2.0.so:sysutils/tracker TRACKER_MESON_TRUE= tracker -post-patch: - # malloc.h is deprecated - @${REINPLACE_CMD} -e "/malloc.h/d" ${WRKSRC}/meson.build - .include <bsd.port.mk> diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo index 603df1ac0d70..ceb098b99dd0 100644 --- a/x11-fm/nemo/distinfo +++ b/x11-fm/nemo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1610468339 -SHA256 (gnome/linuxmint-nemo-4.8.3_GH0.tar.gz) = 791d42c236e9002913c74d32d60683e7973958db8efd7e24eba94394f042c788 -SIZE (gnome/linuxmint-nemo-4.8.3_GH0.tar.gz) = 1464636 +TIMESTAMP = 1660059700 +SHA256 (gnome/linuxmint-nemo-5.4.2_GH0.tar.gz) = 7e92210804ab1b2f4cd1799afb54fc60ff81281901af36bbe99790b3fd5f40c1 +SIZE (gnome/linuxmint-nemo-5.4.2_GH0.tar.gz) = 1495290 diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist index cc92b89e6f4d..8e61fa02da17 100644 --- a/x11-fm/nemo/pkg-plist +++ b/x11-fm/nemo/pkg-plist @@ -2,7 +2,11 @@ bin/nemo bin/nemo-autorun-software bin/nemo-connect-server bin/nemo-desktop +bin/nemo-epub2text +bin/nemo-mso-to-txt bin/nemo-open-with +bin/nemo-ppt-to-txt +bin/nemo-xls-to-txt include/nemo/libnemo-extension/nemo-column-provider.h include/nemo/libnemo-extension/nemo-column.h include/nemo/libnemo-extension/nemo-desktop-preferences.h @@ -25,6 +29,7 @@ libdata/pkgconfig/libnemo-extension.pc libexec/nemo-convert-metadata libexec/nemo-extensions-list man/man1/nemo-connect-server.1.gz +man/man1/nemo-desktop.1.gz man/man1/nemo.1.gz share/applications/nemo-autorun-software.desktop share/applications/nemo-autostart.desktop @@ -58,7 +63,11 @@ share/gir-1.0/Nemo-3.0.gir %%PORTDOCS%%share/gtk-doc/html/libnemo-extension/up-insensitive.png %%PORTDOCS%%share/gtk-doc/html/libnemo-extension/up.png share/gtksourceview-2.0/language-specs/nemo_action.lang +share/gtksourceview-2.0/language-specs/nemo_search_helper.lang share/gtksourceview-3.0/language-specs/nemo_action.lang +share/gtksourceview-3.0/language-specs/nemo_search_helper.lang +share/gtksourceview-4/language-specs/nemo_action.lang +share/gtksourceview-4/language-specs/nemo_search_helper.lang share/icons/hicolor/16x16/actions/menu-bullet.png share/icons/hicolor/16x16/actions/menu-none.png share/icons/hicolor/16x16/actions/menu-sort-down-free.png @@ -92,6 +101,7 @@ share/icons/hicolor/scalable/actions/nemo-auto-arrange-symbolic.svg share/icons/hicolor/scalable/actions/nemo-desktop-scale-symbolic.svg share/icons/hicolor/scalable/actions/nemo-horizontal-layout-symbolic.svg share/icons/hicolor/scalable/actions/nemo-horizontal-layout-wide-symbolic.svg +share/icons/hicolor/scalable/actions/nemo-recursive-search-symbolic.svg share/icons/hicolor/scalable/actions/nemo-vertical-layout-symbolic.svg share/icons/hicolor/scalable/actions/nemo-vertical-layout-wide-symbolic.svg share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg @@ -117,4 +127,16 @@ share/mime/packages/nemo.xml %%DATADIR%%/icons/hicolor/24x24/emblems/emblem-note.png %%DATADIR%%/icons/hicolor/48x48/emblems/emblem-note.png %%DATADIR%%/script-info.md +%%DATADIR%%/search-helpers/exif.nemo_search_helper +%%DATADIR%%/search-helpers/epub2text.nemo_search_helper +%%DATADIR%%/search-helpers/id3.nemo_search_helper +%%DATADIR%%/search-helpers/libreoffice.nemo_search_helper +%%DATADIR%%/search-helpers/mso-doc.nemo_search_helper +%%DATADIR%%/search-helpers/mso-ppt.nemo_search_helper +%%DATADIR%%/search-helpers/mso-xls.nemo_search_helper +%%DATADIR%%/search-helpers/mso.nemo_search_helper +%%DATADIR%%/search-helpers/pdf2txt.nemo_search_helper +%%DATADIR%%/search-helpers/pdftotext.nemo_search_helper +%%DATADIR%%/search-helpers/ps2ascii.nemo_search_helper +%%DATADIR%%/search-helpers/untex.nemo_search_helper share/polkit-1/actions/org.nemo.root.policy diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile index 1436b9a7274f..81ccfb5478a5 100644 --- a/x11-wm/muffin/Makefile +++ b/x11-wm/muffin/Makefile @@ -1,71 +1,57 @@ PORTNAME= muffin -PORTVERSION= 4.8.0 -PORTREVISION= 1 +PORTVERSION= 5.4.5 CATEGORIES= x11-wm gnome DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Compositing window manager forked from Mutter for use with Cinnamon -WWW= http://cinnamon.linuxmint.com/ +WWW= https://github.com/linuxmint/muffin LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= zenity>=3.0.0:x11/zenity \ - gnome-autogen.sh:devel/gnome-common \ - gsettings-desktop-schemas>=3.4.0:devel/gsettings-desktop-schemas \ - gtkdocize:textproc/gtk-doc \ - xkeyboard-config>0:x11/xkeyboard-config -LIB_DEPENDS= libcanberra.so:audio/libcanberra \ - libcanberra-gtk3.so:audio/libcanberra-gtk3 \ - libcinnamon-desktop.so:x11/cinnamon-desktop \ - libdrm.so:graphics/libdrm \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:x11/xkeyboard-config \ + ${LOCALBASE}/include/EGL/eglmesaext.h:graphics/mesa-dri \ + ${LOCALBASE}/include/linux/input.h:devel/evdev-proto +LIB_DEPENDS= libgraphene-1.0.so:graphics/graphene \ + libfribidi.so:converters/fribidi \ libjson-glib-1.0.so:devel/json-glib \ - libstartup-notification-1.so:x11/startup-notification \ - libwacom.so:x11/libwacom \ + libcinnamon-desktop.so:x11/cinnamon-desktop \ libxkbcommon.so:x11/libxkbcommon \ - libharfbuzz.so:print/harfbuzz -RUN_DEPENDS= zenity>=3.0.0:x11/zenity \ - xkeyboard-config>0:x11/xkeyboard-config + libcanberra.so:audio/libcanberra \ + libdbus-1.so:devel/dbus \ + libstartup-notification-1.so:x11/startup-notification \ + libpipewire-0.3.so:multimedia/pipewire \ + libfontconfig.so:x11-fonts/fontconfig +RUN_DEPENDS= xkeyboard-config>0:x11/xkeyboard-config -USES= autoreconf:build compiler:c11 gettext-tools gl gmake gnome \ - libtool localbase pathfix pkgconfig xorg +USES= compiler:c11 gettext-tools gl gnome localbase meson pkgconfig xorg USE_GITHUB= yes GH_ACCOUNT= linuxmint -USE_GNOME= cairo dconf gdkpixbuf2 gnomeprefix glib20 gtk30 intltool \ - introspection - -USE_XORG= ice sm x11 xcb xcomposite xcursor xdamage xext xfixes xi xinerama \ +USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 introspection pango +USE_XORG= ice sm x11 xau xcb xcomposite xcursor xdamage xext xfixes xi xinerama \ xkbfile xrandr xrender xtst - -USE_GL= egl gbm gl +USE_GL= egl gl glesv2 USE_LDCONFIG= yes - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-maintainer-flags=no -INSTALL_TARGET= install-strip +MESON_ARGS= -Dcore_tests=false GLIB_SCHEMAS= org.cinnamon.muffin.gschema.xml -OPTIONS_DEFINE= WAYLAND -OPTIONS_DEFAULT= WAYLAND -OPTIONS_SUB= yes +OPTIONS_DEFINE= TEST UDEV WACOM +OPTIONS_DEFAULT= WACOM -WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto -WAYLAND_LIB_DEPENDS= libinput.so:x11/libinput \ - libudev.so:devel/libudev-devd \ - libwayland-server.so:graphics/wayland -WAYLAND_CONFIGURE_ENABLE= wayland-egl-server +TEST_MESON_TRUE= cogl_tests clutter_tests -post-patch: - @${REINPLACE_CMD} 's/--warn-error//' ${WRKSRC}/src/Makefile.am +UDEV_DESC= Enable udev support when using the X11 backend (EXPERIMENTAL) +UDEV_LIB_DEPENDS= libgudev-1.0.so:devel/libgudev \ + libudev.so:devel/libudev-devd +UDEV_MESON_TRUE= udev -pre-configure: - @cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} autogen.sh +WACOM_DESC= Tablet support with libwacom +WACOM_LIB_DEPENDS= libwacom.so:x11/libwacom +WACOM_MESON_TRUE= libwacom .include <bsd.port.mk> diff --git a/x11-wm/muffin/distinfo b/x11-wm/muffin/distinfo index c55ccdb8e541..cdab002983cf 100644 --- a/x11-wm/muffin/distinfo +++ b/x11-wm/muffin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606817463 -SHA256 (gnome/linuxmint-muffin-4.8.0_GH0.tar.gz) = a4f1cb9ed80b7ea1e51d30b97ea3ae2f196b06fc9fd56c0283e64c9ee1322c18 -SIZE (gnome/linuxmint-muffin-4.8.0_GH0.tar.gz) = 5196236 +TIMESTAMP = 1660022739 +SHA256 (gnome/linuxmint-muffin-5.4.5_GH0.tar.gz) = e02802d72c9d5d0cdd62194528c0aff80a2e6fa5f74b49191332f316516acdb0 +SIZE (gnome/linuxmint-muffin-5.4.5_GH0.tar.gz) = 4513483 diff --git a/x11-wm/muffin/files/patch-clutter_clutter_cally_cally-text.c b/x11-wm/muffin/files/patch-clutter_clutter_cally_cally-text.c new file mode 100644 index 000000000000..85d6558ece56 --- /dev/null +++ b/x11-wm/muffin/files/patch-clutter_clutter_cally_cally-text.c @@ -0,0 +1,27 @@ +From 6d7ab6669583816479d69dba6a83624ff9635392 Mon Sep 17 00:00:00 2001 +From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +Date: Mon, 11 Jan 2021 21:17:51 +0100 +Subject: [PATCH] clutter: Fix build with clang + +Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> +Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1668>; +--- + clutter/clutter/cally/cally-text.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git clutter/clutter/cally/cally-text.c clutter/clutter/cally/cally-text.c +index 2b34f098..b6e8c8b7 100644 +--- clutter/clutter/cally/cally-text.c ++++ clutter/clutter/cally/cally-text.c +@@ -1866,7 +1866,7 @@ static gint + _cally_atk_attribute_lookup_func (gconstpointer data, + gconstpointer user_data) + { +- AtkTextAttribute attr = (AtkTextAttribute) user_data; ++ AtkTextAttribute attr = (AtkTextAttribute) GPOINTER_TO_INT (user_data); + AtkAttribute *at = (AtkAttribute *) data; + if (!g_strcmp0 (at->name, atk_text_attribute_get_name (attr))) + return 0; +-- +2.37.0 + diff --git a/x11-wm/muffin/files/patch-uint b/x11-wm/muffin/files/patch-uint new file mode 100644 index 000000000000..e5954537596e --- /dev/null +++ b/x11-wm/muffin/files/patch-uint @@ -0,0 +1,67 @@ +diff --git src/backends/native/meta-cursor-renderer-native.c src/backends/native/meta-cursor-renderer-native.c +index 578a9a0a..76254485 100644 +--- src/backends/native/meta-cursor-renderer-native.c ++++ src/backends/native/meta-cursor-renderer-native.c +@@ -1165,8 +1165,8 @@ load_cursor_sprite_gbm_buffer_for_gpu (MetaCursorRendererNative *native, + MetaGpuKms *gpu_kms, + MetaCursorSprite *cursor_sprite, + uint8_t *pixels, +- uint width, +- uint height, ++ unsigned int width, ++ unsigned int height, + int rowstride, + uint32_t gbm_format) + { +diff --git src/backends/x11/meta-seat-x11.c src/backends/x11/meta-seat-x11.c +index ff028bfa..9e7421e1 100644 +--- src/backends/x11/meta-seat-x11.c ++++ src/backends/x11/meta-seat-x11.c +@@ -783,7 +783,7 @@ relate_slaves (gpointer key, + _clutter_input_device_add_slave (master, slave); + } + +-static uint ++static unsigned int + device_get_tool_serial (ClutterInputDevice *device) + { + gulong nitems, bytes_after; +diff --git src/core/keybindings-private.h src/core/keybindings-private.h +index 1d42a8c5..54f29061 100644 +--- src/core/keybindings-private.h ++++ src/core/keybindings-private.h +@@ -142,7 +142,7 @@ gboolean meta_keybindings_process_event (MetaDisplay *display, + int meta_keybindings_get_mouse_zoom_modifiers (MetaDisplay *display); + ClutterModifierType meta_display_get_window_grab_modifiers (MetaDisplay *display); + +-uint meta_keybindings_get_ignored_modifier_mask (MetaDisplay *display); ++unsigned int meta_keybindings_get_ignored_modifier_mask (MetaDisplay *display); + + gboolean meta_prefs_add_keybinding (const char *name, + GSettings *settings, +diff --git src/core/keybindings.c src/core/keybindings.c +index ab3ec963..55c8284c 100644 +--- src/core/keybindings.c ++++ src/core/keybindings.c +@@ -3885,7 +3885,7 @@ meta_keybindings_get_mouse_zoom_modifiers (MetaDisplay *display) + return keys->mouse_zoom_modifiers; + } + +-uint ++unsigned int + meta_keybindings_get_ignored_modifier_mask (MetaDisplay *display) + { + MetaKeyBindingManager *keys = &display->key_binding_manager; +diff --git src/core/startup-notification.c src/core/startup-notification.c +index 99c0d9d0..b183674a 100644 +--- src/core/startup-notification.c ++++ src/core/startup-notification.c +@@ -100,7 +100,7 @@ typedef struct { + char *id; + uint64_t timestamp; + int workspace; +- uint completed : 1; ++ unsigned int completed : 1; + } MetaStartupSequencePrivate; + + G_DEFINE_TYPE (MetaStartupNotification, diff --git a/x11-wm/muffin/pkg-plist b/x11-wm/muffin/pkg-plist index 3c2bfc94c17a..89772a0945dd 100644 --- a/x11-wm/muffin/pkg-plist +++ b/x11-wm/muffin/pkg-plist @@ -1,150 +1,116 @@ bin/muffin -bin/muffin-message -bin/muffin-theme-viewer -bin/muffin-window-demo -include/muffin/clutter-0/cally/cally-actor.h -include/muffin/clutter-0/cally/cally-clone.h -include/muffin/clutter-0/cally/cally-factory.h -include/muffin/clutter-0/cally/cally-group.h -include/muffin/clutter-0/cally/cally-main.h -include/muffin/clutter-0/cally/cally-rectangle.h -include/muffin/clutter-0/cally/cally-root.h -include/muffin/clutter-0/cally/cally-stage.h -include/muffin/clutter-0/cally/cally-text.h -include/muffin/clutter-0/cally/cally-texture.h -include/muffin/clutter-0/cally/cally-util.h -include/muffin/clutter-0/cally/cally.h -include/muffin/clutter-0/clutter/clutter-action.h -include/muffin/clutter-0/clutter/clutter-actor-meta.h -include/muffin/clutter-0/clutter/clutter-actor.h -include/muffin/clutter-0/clutter/clutter-align-constraint.h -include/muffin/clutter-0/clutter/clutter-animatable.h -include/muffin/clutter-0/clutter/clutter-autocleanups.h -include/muffin/clutter-0/clutter/clutter-backend.h -include/muffin/clutter-0/clutter/clutter-bin-layout.h -include/muffin/clutter-0/clutter/clutter-bind-constraint.h -include/muffin/clutter-0/clutter/clutter-binding-pool.h -include/muffin/clutter-0/clutter/clutter-blur-effect.h -include/muffin/clutter-0/clutter/clutter-box-layout.h -include/muffin/clutter-0/clutter/clutter-brightness-contrast-effect.h -include/muffin/clutter-0/clutter/clutter-cairo.h -include/muffin/clutter-0/clutter/clutter-canvas.h -include/muffin/clutter-0/clutter/clutter-child-meta.h -include/muffin/clutter-0/clutter/clutter-click-action.h -include/muffin/clutter-0/clutter/clutter-clone.h -include/muffin/clutter-0/clutter/clutter-color-static.h -include/muffin/clutter-0/clutter/clutter-color.h -include/muffin/clutter-0/clutter/clutter-colorize-effect.h -include/muffin/clutter-0/clutter/clutter-config.h -include/muffin/clutter-0/clutter/clutter-constraint.h -include/muffin/clutter-0/clutter/clutter-container.h *** 1236 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302252053.31PKr4wb087723>