Skip to content

Commit

Permalink
x11/cinnamon: update to 5.4
Browse files Browse the repository at this point in the history
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
  • Loading branch information
vishwin committed Feb 25, 2023
1 parent 09e88c0 commit 2d87115
Show file tree
Hide file tree
Showing 46 changed files with 623 additions and 443 deletions.
12 changes: 7 additions & 5 deletions lang/cjs/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 \
Expand Down
8 changes: 5 additions & 3 deletions lang/cjs/distinfo
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion misc/cinnamon-translations/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions misc/cinnamon-translations/distinfo
Original file line number Diff line number Diff line change
@@ -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
22 changes: 22 additions & 0 deletions misc/cinnamon-translations/pkg-plist
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 11 additions & 9 deletions sysutils/cinnamon-control-center/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions sysutils/cinnamon-control-center/distinfo
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions sysutils/cinnamon-control-center/files/patch-meson.build
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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',
7 changes: 5 additions & 2 deletions sysutils/cinnamon-control-center/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 8 additions & 10 deletions sysutils/cinnamon-settings-daemon/Makefile
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
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
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 \
Expand All @@ -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
Expand Down Expand Up @@ -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).
Expand Down
6 changes: 3 additions & 3 deletions sysutils/cinnamon-settings-daemon/distinfo
Original file line number Diff line number Diff line change
@@ -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

This file was deleted.

0 comments on commit 2d87115

Please sign in to comment.