Attachment #237507 for bug #267250

View | Details | Raw Unified | Return to bug 267250
Collapse All | Expand All




PORTNAME=	cinnamon
PORTVERSION=	5.4.12
PORTREVISION=	3
CATEGORIES=	x11 gnome
DIST_SUBDIR=	gnome
GH_TAGNAME=	05c3a2657
PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+=	aa0bf5b13078.patch:-p1 # https://github.com/linuxmint/cinnamon/pull/10606

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Fork of GNOME Shell with layout similar to GNOME 2

		libmuffin.so:x11-wm/muffin \
		libcinnamon-menu-3.so:x11/cinnamon-menus \
		libdbus-1.so:devel/dbus \
		libkeybinder-3.0.so:x11/keybinder-gtk3 \
		libpolkit-agent-1.so:sysutils/polkit \
		libatk-bridge-2.0.so:accessibility/at-spi2-atk \
		libstartup-notification-1.so:x11/startup-notification \
		libsoup-2.4.so:devel/libsoup \
		libxapp.so:x11/xapp
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
		ca_root_nss>0:security/ca_root_nss \
		gnome-themes-extra>3.0.0:x11-themes/gnome-themes-extra \

		${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}python-xapp>0:x11/py-python-xapp@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}python-pam>0:security/py-python-pam@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}tinycss>0:textproc/py-tinycss@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \
		timezonemap>0:misc/timezonemap \
		gnome-backgrounds>0:x11-themes/gnome-backgrounds \
		metacity:x11-wm/metacity \
		tint2:x11/tint \
		gsound>=1.0:audio/gsound

USES=		compiler:c11 cpe gettext gl gnome gstreamer meson perl5 pkgconfig python:3.5+ shebangfix xorg
CPE_VENDOR=	linuxmint
USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool introspection libxml2 pygobject3
USE_XORG=	x11 xfixes


GLIB_SCHEMAS=	org.cinnamon.gschema.xml

OPTIONS_DEFINE=	DOCS CAL NLS RECORDER
OPTIONS_DEFAULT=	DOCS NLS RECORDER
OPTIONS_SUB=	yes

DOCS_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
DOCS_MESON_TRUE=	docs

CAL_DESC=		Install Cinnamon Calendar Server support
CAL_RUN_DEPENDS=	evolution-data-server>=1.2:databases/evolution-data-server

NLS_RUN_DEPENDS=	cinnamon-translations>0:misc/cinnamon-translations

RECORDER_DESC=		Build and install Cinnamon Desktop Recorder
RECORDER_MESON_TRUE=	build_recorder
RECORDER_RUN_DEPENDS=	ffmpeg>0:multimedia/ffmpeg \
			xdotool>0:x11/xdotool \
			xwininfo>0:x11/xwininfo \
			xdpyinfo>0:x11/xdpyinfo

.include <bsd.port.pre.mk>

post-patch:
	@${REINPLACE_CMD} -e '/prefix/s|/usr|${PREFIX}|g ;\
		/datadir/s|/usr|${PREFIX}|g ;\

		@${MV} ${WRKSRC}/files/usr/${i} ${WRKSRC}/files${PREFIX}
.	endfor

	@${REINPLACE_CMD} -e 's|/usr/local/bin/env|/usr/bin/env|'\
		${WRKSRC}/src/data-to-c.pl

.if !empty(SELECTED_OPTIONS:MDOCS) && empty(SELECTED_OPTIONS:MRECORDER)
## ensure gtk-doc has a usable recorder.xml to parse
pre-install:
	@${REINPLACE_CMD} 's@<!--@@' ${WRKSRC}/_build/docs/reference/cinnamon/recorder.xml
	@${REINPLACE_CMD} 's@-->@@' ${WRKSRC}/_build/docs/reference/cinnamon/recorder.xml
.endif

post-install:
	# Ship the GNOME Backgrounds set
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/cinnamon-background-properties

	@${LN} -s ${PREFIX}/share/gnome-background-properties/gnome-backgrounds.xml \
		${STAGEDIR}${PREFIX}/share/cinnamon-background-properties/gnome-backgrounds.xml

post-stage:
	cd ${STAGEDIR}; ${FIND} ${PREFIX:C@^/@@}/share/icons -type f | ${SED} -e 's@^@/@' >> ${TMPPLIST}

add-plist-docs: ${STAGE_COOKIE}
	cd ${STAGEDIR}; ${FIND} ${PREFIX:C@^/@@}/share/gtk-doc/html -mindepth 2 -type f | ${SED} -e 's@^@/@' >> ${TMPPLIST}

.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)b/x11/cinnamon/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1612598797	1	TIMESTAMP = 1666330246
2	SHA256 (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 00f82253f44c694c379e29959aa6e57b4878b722df1f08d68f9466272ef64893	2	SHA256 (gnome/linuxmint-cinnamon-5.4.12-05c3a2657_GH0.tar.gz) = 38aae8ad9a0aca1f550c153d0c661e7ffdabec4a2dacb0a3f9f9aa71b5f7fdf5
3	SIZE (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 2378117	3	SIZE (gnome/linuxmint-cinnamon-5.4.12-05c3a2657_GH0.tar.gz) = 2473136
4	SHA256 (gnome/aa0bf5b13078.patch) = 82e482496063ab479759b9561f56b18a72578c32af7fbc1237d8566d39a63227
5	SIZE (gnome/aa0bf5b13078.patch) = 1573




--- files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js.orig	2022-05-19 19:33:27.000000000 +0000
+++ files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js	2022-05-20 21:09:31.926387000 +0000
@@ -152,14 +152,16 @@
         const layouts = [];
         if (this._xappController) {
             const groups = this._xappController.get_all_names();
-            for (let i = 0; i < groups.length; i++) {
-                layouts.push({
-                    display_name: groups[i],
-                    flag_name: this._xappController.get_icon_name_for_group(i),
-                    layout_dupe_id: this._xappController.get_flag_id_for_group(i),
-                    short_name: this._xappController.get_short_group_label_for_group(i),
-                    variant_name: this._xappController.get_variant_label_for_group(i),
-                });
+            if (groups) {
+                for (let i = 0; i < groups.length; i++) {
+                    layouts.push({
+                        display_name: groups[i],
+                        flag_name: this._xappController.get_icon_name_for_group(i),
+                        layout_dupe_id: this._xappController.get_flag_id_for_group(i),
+                        short_name: this._xappController.get_short_group_label_for_group(i),
+                        variant_name: this._xappController.get_variant_label_for_group(i),
+                    });
+                }
             }
         }
         this._layouts = layouts;




--- files/usr/share/cinnamon/cinnamon-settings/bin/capi.py.orig	2022-05-19 19:33:27.000000000 +0000
+++ files/usr/share/cinnamon/cinnamon-settings/bin/capi.py	2022-05-20 21:38:27.004116000 +0000
@@ -15,9 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see http://www.gnu.org/licenses/
 
-import platform
 import os
-import sysconfig
+import sys
 
 from gi.repository import Gio, GObject
 
@@ -26,32 +25,12 @@
     def __init__(self):
         self.extension_point = Gio.io_extension_point_register ("cinnamon-control-center-1")
         self.modules = []
-
-        architecture = platform.machine()
-        # get the arch-specific triplet, e.g. 'x86_64-linux-gnu' or 'arm-linux-gnueabihf'
-        # see also: https://wiki.debian.org/Python/MultiArch
-        triplet = sysconfig.get_config_var('MULTIARCH')
-        paths = ["/usr/lib", f"/usr/lib/{triplet}"]
-
-        # On x86 archs, iterate through multiple paths
-        # For instance, on a Mint i686 box, the path is actually /usr/lib/i386-linux-gnu
-        x86archs = ["i386", "i486", "i586", "i686"]
-        if architecture in x86archs:
-            for arch in x86archs:
-                paths += ["/usr/lib/%s" % arch]
-        elif architecture == "x86_64":
-            paths += ["/usr/lib/x86_64", "/usr/lib64"]
-        else:
-            paths += ["/usr/lib/%s" % architecture]
-
-        for path in paths:
-            if not os.path.islink(path):
-                path = os.path.join(path, "cinnamon-control-center-1/panels")
-                if os.path.exists(path):
-                    try:
-                        self.modules = self.modules + Gio.io_modules_load_all_in_directory(path)
-                    except Exception as e:
-                        print("capi failed to load multiarch modules from %s: " % path, e)
+        pfx = sys.prefix
+        path = os.path.join(pfx, "lib/cinnamon-control-center-1/panels")
+        try:
+            self.modules = self.modules + Gio.io_modules_load_all_in_directory(path)
+        except Exception as e:
+            print("capi failed to load multiarch modules from %s: " % path, e)
 
     def get_c_widget(self, mod_id):
         extension = self.extension_point.get_extension_by_name(mod_id)

Added Link Here

(-)b/x11/cinnamon/files/patch-files_usr_share_cinnamon_cinnamon-settings_bin_util.py (+11 lines)
1	--- files/usr/share/cinnamon/cinnamon-settings/bin/util.py.orig 2022-05-19 19:33:27.000000000 +0000
2	+++ files/usr/share/cinnamon/cinnamon-settings/bin/util.py 2022-05-20 16:20:33.175687000 +0000
3	@@ -6,7 +6,7 @@
4
5	new_path = []
6	for path in sys.path:
7	- if path.startswith(("/usr/local", os.path.expanduser("~/.local"))):
8	+ if path.startswith(os.path.expanduser("~/.local")):
9	continue
10	new_path.append(path)
11




--- src/cinnamon-global.c.orig	2022-09-15 15:57:01 UTC
+++ src/cinnamon-global.c
@@ -2,6 +2,8 @@
 
 #include "config.h"
 
+#include <sys/types.h>
+#include <sys/sysctl.h>
 #include <fcntl.h>
 
 #include "cinnamon-global-private.h"
@@ -1606,4 +1608,4 @@ cinnamon_global_alloc_leak (CinnamonGlobal *global, gi
                                       "xxxxxxxxxxxxxxxxxxxxxxxx"
         );
     }
-}
\ No newline at end of file
+}




Attempt to fix parallel build

In file included from ../src/main.c:25:
In file included from ../src/cinnamon-global-private.h:28:
In file included from src/st/st.h:7:
../src/st/st-box-layout-child.h:24:10: fatal error: 'st-enum-types.h' file not found
#include "st-enum-types.h"
         ^~~~~~~~~~~~~~~~~

--- src/st/meson.build.orig	2021-04-06 04:24:56 UTC
+++ src/st/meson.build
@@ -189,6 +189,7 @@ libst = library(
 st_dep = declare_dependency(
     include_directories: include_directories('.', 'croco'),
     dependencies: libst_deps,
+    sources: st_enum_types[1],
     link_with: libst,
     link_args: ['-Wl,-Bsymbolic', '-Wl,-z,relro', '-Wl,-z,now'],
 )

Lines 1-6 Link Here

(-)b/x11/cinnamon/pkg-plist (-273 / +28 lines)
1	bin/cinnamon	1	bin/cinnamon
		2	bin/cinnamon-calendar-server
		3	bin/cinnamon-close-dialog
2	bin/cinnamon-desktop-editor	4	bin/cinnamon-desktop-editor
		5	bin/cinnamon-dbus-command
		6	bin/cinnamon-display-changes-dialog
3	bin/cinnamon-file-dialog	7	bin/cinnamon-file-dialog
		8	bin/cinnamon-hover-click
4	bin/cinnamon-install-spice	9	bin/cinnamon-install-spice
5	bin/cinnamon-json-makepot	10	bin/cinnamon-json-makepot
6	bin/cinnamon-killer-daemon	11	bin/cinnamon-killer-daemon
Lines 14-19 bin/cinnamon-session-cinnamon2d Link Here
14	bin/cinnamon-settings	19	bin/cinnamon-settings
15	bin/cinnamon-settings-users	20	bin/cinnamon-settings-users
16	bin/cinnamon-slideshow	21	bin/cinnamon-slideshow
		22	bin/cinnamon-spice-updater
17	bin/cinnamon-subprocess-wrapper	23	bin/cinnamon-subprocess-wrapper
18	bin/cinnamon-xlet-makepot	24	bin/cinnamon-xlet-makepot
19	bin/cinnamon2d	25	bin/cinnamon2d
Lines 24-40 lib/cinnamon/Cinnamon-0.1.typelib Link Here
24	lib/cinnamon/St-1.0.typelib	30	lib/cinnamon/St-1.0.typelib
25	lib/cinnamon/libcinnamon.so	31	lib/cinnamon/libcinnamon.so
26	lib/cinnamon/libst.so	32	lib/cinnamon/libst.so
		33	libexec/cinnamon-calendar-server.py
27	libexec/cinnamon-hotplug-sniffer	34	libexec/cinnamon-hotplug-sniffer
28	libexec/cinnamon-perf-helper	35	libexec/cinnamon-perf-helper
29	man/man1/cinnamon-launcher.1.gz	36	man/man1/cinnamon-launcher.1.gz
30	man/man1/cinnamon-looking-glass.1.gz	37	man/man1/cinnamon-looking-glass.1.gz
31	man/man1/cinnamon-menu-editor.1.gz	38	man/man1/cinnamon-menu-editor.1.gz
32	man/man1/cinnamon-screensaver-lock-dialog.1.gz	39	man/man1/cinnamon-screensaver-lock-dialog.1.gz
		40	man/man1/cinnamon-session-cinnamon.1.gz
		41	man/man1/cinnamon-session-cinnamon2d.1.gz
33	man/man1/cinnamon-settings.1.gz	42	man/man1/cinnamon-settings.1.gz
34	man/man1/cinnamon.1.gz	43	man/man1/cinnamon.1.gz
35	man/man1/cinnamon2d.1.gz	44	man/man1/cinnamon2d.1.gz
36	man/man1/gnome-session-cinnamon.1.gz
37	man/man1/gnome-session-cinnamon2d.1.gz
38	share/applications/cinnamon-killer-daemon.desktop	45	share/applications/cinnamon-killer-daemon.desktop
39	share/applications/cinnamon-menu-editor.desktop	46	share/applications/cinnamon-menu-editor.desktop
40	share/applications/cinnamon-onscreen-keyboard.desktop	47	share/applications/cinnamon-onscreen-keyboard.desktop
Lines 70-75 share/applications/cinnamon-settings-workspaces.desktop Link Here
70	share/applications/cinnamon-settings.desktop	77	share/applications/cinnamon-settings.desktop
71	share/applications/cinnamon.desktop	78	share/applications/cinnamon.desktop
72	share/applications/cinnamon2d.desktop	79	share/applications/cinnamon2d.desktop
		80	%%PYTHON_SITELIBDIR%%/cinnamon/__init__.py
		81	%%PYTHON_SITELIBDIR%%/cinnamon/harvester.py
		82	%%PYTHON_SITELIBDIR%%/cinnamon/logger.py
		83	%%PYTHON_SITELIBDIR%%/cinnamon/proxygsettings.py
		84	%%PYTHON_SITELIBDIR%%/cinnamon/updates.py
73	%%DATADIR%%-background-properties/adwaita.xml	85	%%DATADIR%%-background-properties/adwaita.xml
74	%%DATADIR%%-background-properties/gnome-backgrounds.xml	86	%%DATADIR%%-background-properties/gnome-backgrounds.xml
75	%%DATADIR%%-session/sessions/cinnamon.session	87	%%DATADIR%%-session/sessions/cinnamon.session
Lines 78-83 share/applications/cinnamon2d.desktop Link Here
78	%%DATADIR%%/applets/a11y@cinnamon.org/metadata.json	90	%%DATADIR%%/applets/a11y@cinnamon.org/metadata.json
79	%%DATADIR%%/applets/calendar@cinnamon.org/applet.js	91	%%DATADIR%%/applets/calendar@cinnamon.org/applet.js
80	%%DATADIR%%/applets/calendar@cinnamon.org/calendar.js	92	%%DATADIR%%/applets/calendar@cinnamon.org/calendar.js
		93	%%DATADIR%%/applets/calendar@cinnamon.org/eventView.js
81	%%DATADIR%%/applets/calendar@cinnamon.org/metadata.json	94	%%DATADIR%%/applets/calendar@cinnamon.org/metadata.json
82	%%DATADIR%%/applets/calendar@cinnamon.org/settings-schema.json	95	%%DATADIR%%/applets/calendar@cinnamon.org/settings-schema.json
83	%%DATADIR%%/applets/expo@cinnamon.org/applet.js	96	%%DATADIR%%/applets/expo@cinnamon.org/applet.js
Lines 120-126 share/applications/cinnamon2d.desktop Link Here
120	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-excellent-secure-symbolic.svg	133	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-excellent-secure-symbolic.svg
121	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-good-secure-symbolic.svg	134	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-good-secure-symbolic.svg
122	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-none-secure-symbolic.svg	135	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-none-secure-symbolic.svg
123	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-ok-secure-symbolic.svg	136	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-ok-secure-symbolic.svg
124	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-weak-secure-symbolic.svg	137	%%DATADIR%%/applets/network@cinnamon.org/icons/network-wireless-signal-weak-secure-symbolic.svg
125	%%DATADIR%%/applets/network@cinnamon.org/metadata.json	138	%%DATADIR%%/applets/network@cinnamon.org/metadata.json
126	%%DATADIR%%/applets/network@cinnamon.org/settings-schema.json	139	%%DATADIR%%/applets/network@cinnamon.org/settings-schema.json
Lines 207-213 share/applications/cinnamon2d.desktop Link Here
207	%%DATADIR%%/bumpmaps/frost.png	220	%%DATADIR%%/bumpmaps/frost.png
208	%%DATADIR%%/bumpmaps/hex.png	221	%%DATADIR%%/bumpmaps/hex.png
209	%%DATADIR%%/bumpmaps/lizard.png	222	%%DATADIR%%/bumpmaps/lizard.png
210	%%DATADIR%%/cinnamon-dbus-command
211	%%DATADIR%%/cinnamon-desktop-editor/cinnamon-desktop-editor.py	223	%%DATADIR%%/cinnamon-desktop-editor/cinnamon-desktop-editor.py
212	%%DATADIR%%/cinnamon-desktop-editor/directory-editor.ui	224	%%DATADIR%%/cinnamon-desktop-editor/directory-editor.ui
213	%%DATADIR%%/cinnamon-desktop-editor/launcher-editor.ui	225	%%DATADIR%%/cinnamon-desktop-editor/launcher-editor.ui
Lines 246-251 share/applications/cinnamon2d.desktop Link Here
246	%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.glade	258	%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.glade
247	%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.py	259	%%DATADIR%%/cinnamon-settings/bin/scrollbar-test-widget.py
248	%%DATADIR%%/cinnamon-settings/bin/tweenEquations.py	260	%%DATADIR%%/cinnamon-settings/bin/tweenEquations.py
		261	%%DATADIR%%/cinnamon-settings/bin/util.py
249	%%DATADIR%%/cinnamon-settings/cinnamon-online-accounts-info.ui	262	%%DATADIR%%/cinnamon-settings/cinnamon-online-accounts-info.ui
250	%%DATADIR%%/cinnamon-settings/cinnamon-settings.py	263	%%DATADIR%%/cinnamon-settings/cinnamon-settings.py
251	%%DATADIR%%/cinnamon-settings/cinnamon-settings.ui	264	%%DATADIR%%/cinnamon-settings/cinnamon-settings.ui
Lines 290-296 share/applications/cinnamon2d.desktop Link Here
290	%%DATADIR%%/desklets/launcher@cinnamon.org/editorDialog.ui	303	%%DATADIR%%/desklets/launcher@cinnamon.org/editorDialog.ui
291	%%DATADIR%%/desklets/launcher@cinnamon.org/metadata.json	304	%%DATADIR%%/desklets/launcher@cinnamon.org/metadata.json
292	%%DATADIR%%/desklets/photoframe@cinnamon.org/desklet.js	305	%%DATADIR%%/desklets/photoframe@cinnamon.org/desklet.js
293	%%DATADIR%%/desklets/photoframe@cinnamon.org/icon.png
294	%%DATADIR%%/desklets/photoframe@cinnamon.org/metadata.json	306	%%DATADIR%%/desklets/photoframe@cinnamon.org/metadata.json
295	%%DATADIR%%/desklets/photoframe@cinnamon.org/settings-schema.json	307	%%DATADIR%%/desklets/photoframe@cinnamon.org/settings-schema.json
296	%%DATADIR%%/desklets/photoframe@cinnamon.org/stylesheet.css	308	%%DATADIR%%/desklets/photoframe@cinnamon.org/stylesheet.css
Lines 335-344 share/applications/cinnamon2d.desktop Link Here
335	%%DATADIR%%/js/misc/gnomeSession.js	347	%%DATADIR%%/js/misc/gnomeSession.js
336	%%DATADIR%%/js/misc/gridNavigator.js	348	%%DATADIR%%/js/misc/gridNavigator.js
337	%%DATADIR%%/js/misc/history.js	349	%%DATADIR%%/js/misc/history.js
		350	%%DATADIR%%/js/misc/inputMethod.js
338	%%DATADIR%%/js/misc/interfaces.js	351	%%DATADIR%%/js/misc/interfaces.js
		352	%%DATADIR%%/js/ui/locatePointer.js
339	%%DATADIR%%/js/misc/modemManager.js	353	%%DATADIR%%/js/misc/modemManager.js
340	%%DATADIR%%/js/misc/params.js	354	%%DATADIR%%/js/misc/params.js
341	%%DATADIR%%/js/misc/pointerTracker.js	355	%%DATADIR%%/js/misc/pointerTracker.js
		356	%%DATADIR%%/js/ui/ripples.js
		357	%%RECORDER%%%%DATADIR%%/js/ui/screenRecorder.js
342	%%DATADIR%%/js/misc/screenSaver.js	358	%%DATADIR%%/js/misc/screenSaver.js
343	%%DATADIR%%/js/misc/signalManager.js	359	%%DATADIR%%/js/misc/signalManager.js
344	%%DATADIR%%/js/misc/state.js	360	%%DATADIR%%/js/misc/state.js
Lines 373-379 share/applications/cinnamon2d.desktop Link Here
373	%%DATADIR%%/js/ui/flashspot.js	389	%%DATADIR%%/js/ui/flashspot.js
374	%%DATADIR%%/js/ui/hotCorner.js	390	%%DATADIR%%/js/ui/hotCorner.js
375	%%DATADIR%%/js/ui/keybindings.js	391	%%DATADIR%%/js/ui/keybindings.js
376	%%DATADIR%%/js/ui/keyboard.js
377	%%DATADIR%%/js/ui/layout.js	392	%%DATADIR%%/js/ui/layout.js
378	%%DATADIR%%/js/ui/lightbox.js	393	%%DATADIR%%/js/ui/lightbox.js
379	%%DATADIR%%/js/ui/lookingGlass.js	394	%%DATADIR%%/js/ui/lookingGlass.js
Lines 391-396 share/applications/cinnamon2d.desktop Link Here
391	%%DATADIR%%/js/ui/popupMenu.js	406	%%DATADIR%%/js/ui/popupMenu.js
392	%%DATADIR%%/js/ui/radioButton.js	407	%%DATADIR%%/js/ui/radioButton.js
393	%%DATADIR%%/js/ui/runDialog.js	408	%%DATADIR%%/js/ui/runDialog.js
		409	%%DATADIR%%/js/ui/screenshot.js
394	%%DATADIR%%/js/ui/search.js	410	%%DATADIR%%/js/ui/search.js
395	%%DATADIR%%/js/ui/searchProviderManager.js	411	%%DATADIR%%/js/ui/searchProviderManager.js
396	%%DATADIR%%/js/ui/separator.js	412	%%DATADIR%%/js/ui/separator.js
Lines 404-412 share/applications/cinnamon2d.desktop Link Here
404	%%DATADIR%%/js/ui/themeManager.js	420	%%DATADIR%%/js/ui/themeManager.js
405	%%DATADIR%%/js/ui/tooltips.js	421	%%DATADIR%%/js/ui/tooltips.js
406	%%DATADIR%%/js/ui/tweener.js	422	%%DATADIR%%/js/ui/tweener.js
		423	%%DATADIR%%/js/ui/virtualKeyboard.js
407	%%DATADIR%%/js/ui/windowAttentionHandler.js	424	%%DATADIR%%/js/ui/windowAttentionHandler.js
408	%%DATADIR%%/js/ui/windowEffects.js
409	%%DATADIR%%/js/ui/windowManager.js	425	%%DATADIR%%/js/ui/windowManager.js
		426	%%DATADIR%%/js/ui/windowMenu.js
		427	%%DATADIR%%/js/ui/wmGtkDialogs.js
410	%%DATADIR%%/js/ui/workspace.js	428	%%DATADIR%%/js/ui/workspace.js
411	%%DATADIR%%/js/ui/workspacesView.js	429	%%DATADIR%%/js/ui/workspacesView.js
412	%%DATADIR%%/js/ui/xdndHandler.js	430	%%DATADIR%%/js/ui/xdndHandler.js
Lines 419-425 share/applications/cinnamon2d.desktop Link Here
419	%%DATADIR%%/theme/add-workspace.png	437	%%DATADIR%%/theme/add-workspace.png
420	%%DATADIR%%/theme/calendar-arrow-left.svg	438	%%DATADIR%%/theme/calendar-arrow-left.svg
421	%%DATADIR%%/theme/calendar-arrow-right.svg	439	%%DATADIR%%/theme/calendar-arrow-right.svg
		440	%%DATADIR%%/theme/calendar-selected.svg
422	%%DATADIR%%/theme/calendar-today.svg	441	%%DATADIR%%/theme/calendar-today.svg
		442	%%DATADIR%%/theme/calendar-today-selected.svg
423	%%DATADIR%%/theme/checkbox-off.svg	443	%%DATADIR%%/theme/checkbox-off.svg
424	%%DATADIR%%/theme/checkbox.svg	444	%%DATADIR%%/theme/checkbox.svg
425	%%DATADIR%%/theme/cinnamon.css	445	%%DATADIR%%/theme/cinnamon.css
Lines 467-472 share/applications/cinnamon2d.desktop Link Here
467	%%DATADIR%%/thumbnails/metacity-1/Simple.png	487	%%DATADIR%%/thumbnails/metacity-1/Simple.png
468	%%DATADIR%%/thumbnails/metacity-1/unknown.png	488	%%DATADIR%%/thumbnails/metacity-1/unknown.png
469	%%DATADIR%%/thumbnails/wallclock.png	489	%%DATADIR%%/thumbnails/wallclock.png
		490	share/dbus-1/services/org.cinnamon.CalendarServer.service
470	share/dbus-1/services/org.Cinnamon.HotplugSniffer.service	491	share/dbus-1/services/org.Cinnamon.HotplugSniffer.service
471	share/dbus-1/services/org.Cinnamon.Melange.service	492	share/dbus-1/services/org.Cinnamon.Melange.service
472	share/dbus-1/services/org.Cinnamon.Slideshow.service	493	share/dbus-1/services/org.Cinnamon.Slideshow.service
Lines 491-762 share/desktop-directories/cinnamon-system-tools.directory Link Here
491	share/desktop-directories/cinnamon-system.directory	512	share/desktop-directories/cinnamon-system.directory
492	share/desktop-directories/cinnamon-utility-accessibility.directory	513	share/desktop-directories/cinnamon-utility-accessibility.directory
493	share/desktop-directories/cinnamon-utility.directory	514	share/desktop-directories/cinnamon-utility.directory
494	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-docInfo-section.html
495	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-docInfo.html
496	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-SignalManager.html
497	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-signalManager-section.html
498	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-state-section.html
499	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-state.html
500	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util-section.html
501	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-misc-util.html
502	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-Applet.html
503	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-AppletContextMenu.html
504	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-AppletPopupMenu.html
505	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-IconApplet.html
506	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-MenuItem.html
507	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextApplet.html
508	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-TextIconApplet.html
509	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-applet-section.html
510	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager-section.html
511	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-appletManager.html
512	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-boxpointer-section.html
513	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-boxpointer.html
514	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-DBusClient.html
515	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-DbusMenuItem.html
516	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-PropertyStore.html
517	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dbusMenu-section.html
518	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-desklet-Desklet.html
519	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-desklet-section.html
520	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-deskletManager-DeskletContainer.html
521	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-deskletManager-section.html
522	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-deskletManager.html
523	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dnd-section.html
524	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-dnd.html
525	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-extension-section.html
526	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-extension.html
527	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-layout-LayoutManager.html
528	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-layout-section.html
529	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-lightbox-section.html
530	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-lightbox.html
531	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-magnifierDBus-section.html
532	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-magnifierDBus.html
533	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-main-section.html
534	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-main.html
535	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-messageTray-Notification.html
536	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-messageTray-section.html
537	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-ConfirmDialog.html
538	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-InfoOSD.html
539	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-ModalDialog.html
540	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-NotifyDialog.html
541	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-modalDialog-section.html
542	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-Panel.html
543	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-PanelDummy.html
544	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-PanelManager.html
545	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel-section.html
546	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-panel.html
547	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupIconMenuItem.html
548	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupIndicatorMenuItem.html
549	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenu.html
550	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuAbstractItem.html
551	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuBase.html
552	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuFactory.html
553	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupMenuSection.html
554	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-PopupSubMenu.html
555	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-popupMenu-section.html
556	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-runDialog-section.html
557	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-runDialog.html
558	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-search-section.html
559	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-search.html
560	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-AppletSettings.html
561	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-DeskletSettings.html
562	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-ExtensionSettings.html
563	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-XletSettingsBase.html
564	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings-section.html
565	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-settings.html
566	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-PanelItemTooltip.html
567	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-Tooltip.html
568	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-TooltipBase.html
569	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tooltips-section.html
570	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tweener-ClutterFrameTicker.html
571	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tweener-section.html
572	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js-ui-tweener.html
573	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/cinnamon-js.devhelp2
574	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/home.png
575	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/index.html
576	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/left-insensitive.png
577	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/left.png
578	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/pt01.html
579	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/pt02.html
580	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/right-insensitive.png
581	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/right.png
582	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/style.css
583	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/up-insensitive.png
584	%%PORTDOCS%%share/gtk-doc/html/cinnamon-js/up.png
585	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StBin.html
586	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StBoxLayout.html
587	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StButton.html
588	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StDrawingArea.html
589	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StEntry.html
590	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StIcon.html
591	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StLabel.html
592	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StScrollView.html
593	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StScrollable.html
594	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StTable.html
595	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StTextureCache.html
596	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StTheme.html
597	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StThemeContext.html
598	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StThemeNode.html
599	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StWidget.html
600	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/StWidgetAccessible.html
601	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/annotation-glossary.html
602	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/api-index-full.html
603	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/base.html
604	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/cinnamon-st.devhelp2
605	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/containers.html
606	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/deprecated-api-index.html
607	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/home.png
608	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/index.html
609	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/left-insensitive.png
610	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/left.png
611	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/object-tree.html
612	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/pt01.html
613	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/right-insensitive.png
614	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/right.png
615	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/style.css
616	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/styling.html
617	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/up-insensitive.png
618	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/up.png
619	%%PORTDOCS%%share/gtk-doc/html/cinnamon-st/widgets.html
620	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/building.html
621	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/cinnamon-tutorials.devhelp2
622	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/cjs.html
623	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/documentation.html
624	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/documenting-source.html
625	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/documenting-tutorial.html
626	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/extension-system.html
627	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/home.png
628	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/importer.html
629	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/index.html
630	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/left-insensitive.png
631	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/left.png
632	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/right-insensitive.png
633	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/right.png
634	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/settings.png
635	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/style.css
636	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/up-insensitive.png
637	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/up.png
638	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/using-documentation.html
639	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/write-applet.html
640	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/xlet-settings-ref.html
641	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/xlet-settings.html
642	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/xlet-translating.html
643	%%PORTDOCS%%share/gtk-doc/html/cinnamon-tutorials/xlet-versioning.html
644	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonApp.html
645	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonAppSystem.html
646	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonEmbeddedWindow.html
647	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonGenericContainer.html
648	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonGlobal.html
649	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonGtkEmbed.html
650	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonRecorder.html
651	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonSlicer.html
652	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonStack.html
653	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonTrayIcon.html
654	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonTrayManager.html
655	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonWM.html
656	%%PORTDOCS%%share/gtk-doc/html/cinnamon/CinnamonWindowTracker.html
657	%%PORTDOCS%%share/gtk-doc/html/cinnamon/annotation-glossary.html
658	%%PORTDOCS%%share/gtk-doc/html/cinnamon/api-index-full.html
659	%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch01.html
660	%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch02.html
661	%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch03.html
662	%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch04.html
663	%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch05.html
664	%%PORTDOCS%%share/gtk-doc/html/cinnamon/ch06.html
665	%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon-cinnamon-util.html
666	%%PORTDOCS%%share/gtk-doc/html/cinnamon/cinnamon.devhelp2
667	%%PORTDOCS%%share/gtk-doc/html/cinnamon/deprecated-api-index.html
668	%%PORTDOCS%%share/gtk-doc/html/cinnamon/home.png
669	%%PORTDOCS%%share/gtk-doc/html/cinnamon/index.html
670	%%PORTDOCS%%share/gtk-doc/html/cinnamon/left-insensitive.png
671	%%PORTDOCS%%share/gtk-doc/html/cinnamon/left.png
672	%%PORTDOCS%%share/gtk-doc/html/cinnamon/object-tree.html
673	%%PORTDOCS%%share/gtk-doc/html/cinnamon/right-insensitive.png
674	%%PORTDOCS%%share/gtk-doc/html/cinnamon/right.png
675	%%PORTDOCS%%share/gtk-doc/html/cinnamon/style.css
676	%%PORTDOCS%%share/gtk-doc/html/cinnamon/up-insensitive.png
677	%%PORTDOCS%%share/gtk-doc/html/cinnamon/up.png
678	share/icons/hicolor/scalable/actions/caps-lock-off-symbolic.svg
679	share/icons/hicolor/scalable/actions/caps-lock-symbolic.svg
680	share/icons/hicolor/scalable/actions/list-edit-symbolic.svg
681	share/icons/hicolor/scalable/actions/num-lock-off-symbolic.svg
682	share/icons/hicolor/scalable/actions/num-lock-symbolic.svg
683	share/icons/hicolor/scalable/actions/pan-down-symbolic.svg
684	share/icons/hicolor/scalable/actions/pan-end-symbolic-rtl.svg
685	share/icons/hicolor/scalable/actions/pan-end-symbolic.svg
686	share/icons/hicolor/scalable/actions/pan-start-symbolic-rtl.svg
687	share/icons/hicolor/scalable/actions/pan-start-symbolic.svg
688	share/icons/hicolor/scalable/actions/pan-up-symbolic.svg
689	share/icons/hicolor/scalable/apps/cinnamon-panel-launcher.svg
690	share/icons/hicolor/scalable/apps/cinnamon-symbolic.svg
691	share/icons/hicolor/scalable/apps/cinnamon-virtual-keyboard.svg
692	share/icons/hicolor/scalable/apps/cinnamon.svg
693	share/icons/hicolor/scalable/apps/removable-drives.svg
694	share/icons/hicolor/scalable/categories/cs-applets.svg
695	share/icons/hicolor/scalable/categories/cs-backgrounds-symbolic.svg
696	share/icons/hicolor/scalable/categories/cs-backgrounds.svg
697	share/icons/hicolor/scalable/categories/cs-bluetooth.svg
698	share/icons/hicolor/scalable/categories/cs-cat-admin.svg
699	share/icons/hicolor/scalable/categories/cs-cat-appearance.svg
700	share/icons/hicolor/scalable/categories/cs-cat-hardware.svg
701	share/icons/hicolor/scalable/categories/cs-cat-prefs.svg
702	share/icons/hicolor/scalable/categories/cs-color.svg
703	share/icons/hicolor/scalable/categories/cs-date-time.svg
704	share/icons/hicolor/scalable/categories/cs-default-applications.svg
705	share/icons/hicolor/scalable/categories/cs-desklets-symbolic.svg
706	share/icons/hicolor/scalable/categories/cs-desklets.svg
707	share/icons/hicolor/scalable/categories/cs-desktop-effects.svg
708	share/icons/hicolor/scalable/categories/cs-desktop.svg
709	share/icons/hicolor/scalable/categories/cs-details.svg
710	share/icons/hicolor/scalable/categories/cs-display.svg
711	share/icons/hicolor/scalable/categories/cs-drivers.svg
712	share/icons/hicolor/scalable/categories/cs-extensions.svg
713	share/icons/hicolor/scalable/categories/cs-firewall.svg
714	share/icons/hicolor/scalable/categories/cs-fonts.svg
715	share/icons/hicolor/scalable/categories/cs-general.svg
716	share/icons/hicolor/scalable/categories/cs-input-method.svg
717	share/icons/hicolor/scalable/categories/cs-keyboard.svg
718	share/icons/hicolor/scalable/categories/cs-language.svg
719	share/icons/hicolor/scalable/categories/cs-login.svg
720	share/icons/hicolor/scalable/categories/cs-mouse.svg
721	share/icons/hicolor/scalable/categories/cs-network.svg
722	share/icons/hicolor/scalable/categories/cs-notifications.svg
723	share/icons/hicolor/scalable/categories/cs-online-accounts.svg
724	share/icons/hicolor/scalable/categories/cs-overview.svg
725	share/icons/hicolor/scalable/categories/cs-panel.svg
726	share/icons/hicolor/scalable/categories/cs-power.svg
727	share/icons/hicolor/scalable/categories/cs-printer.svg
728	share/icons/hicolor/scalable/categories/cs-privacy.svg
729	share/icons/hicolor/scalable/categories/cs-region.svg
730	share/icons/hicolor/scalable/categories/cs-screen.svg
731	share/icons/hicolor/scalable/categories/cs-screensaver.svg
732	share/icons/hicolor/scalable/categories/cs-sound.svg
733	share/icons/hicolor/scalable/categories/cs-sources.svg
734	share/icons/hicolor/scalable/categories/cs-startup-programs.svg
735	share/icons/hicolor/scalable/categories/cs-tablet.svg
736	share/icons/hicolor/scalable/categories/cs-themes.svg
737	share/icons/hicolor/scalable/categories/cs-tiling.svg
738	share/icons/hicolor/scalable/categories/cs-universal-access.svg
739	share/icons/hicolor/scalable/categories/cs-user-accounts.svg
740	share/icons/hicolor/scalable/categories/cs-user.svg
741	share/icons/hicolor/scalable/categories/cs-windows.svg
742	share/icons/hicolor/scalable/categories/cs-workspaces.svg
743	share/icons/hicolor/scalable/devices/audio-speaker-center-back.svg
744	share/icons/hicolor/scalable/devices/audio-speaker-center.svg
745	share/icons/hicolor/scalable/devices/audio-speaker-left-back.svg
746	share/icons/hicolor/scalable/devices/audio-speaker-left-side.svg
747	share/icons/hicolor/scalable/devices/audio-speaker-left.svg
748	share/icons/hicolor/scalable/devices/audio-speaker-right-back.svg
749	share/icons/hicolor/scalable/devices/audio-speaker-right-side.svg
750	share/icons/hicolor/scalable/devices/audio-speaker-right.svg
751	share/icons/hicolor/scalable/devices/audio-subwoofer.svg
752	share/icons/hicolor/scalable/devices/bluetooth.svg
753	share/icons/hicolor/scalable/devices/cpu-symbolic.svg
754	share/icons/hicolor/scalable/emblems/cs-xlet-danger.svg
755	share/icons/hicolor/scalable/emblems/cs-xlet-error.svg
756	share/icons/hicolor/scalable/emblems/cs-xlet-installed.svg
757	share/icons/hicolor/scalable/emblems/cs-xlet-running.svg
758	share/icons/hicolor/scalable/emblems/cs-xlet-system.svg
759	share/icons/hicolor/scalable/emblems/cs-xlet-update.svg
760	share/polkit-1/actions/org.cinnamon.settings-users.policy	515	share/polkit-1/actions/org.cinnamon.settings-users.policy
761	share/xsessions/cinnamon.desktop	516	share/xsessions/cinnamon.desktop
762	share/xsessions/cinnamon2d.desktop	517	share/xsessions/cinnamon2d.desktop

Return to bug 267250

Lines 1-11 Link Here

(-)b/x11/cinnamon/Makefile (-11 / +40 lines)
1	PORTNAME= cinnamon	1	PORTNAME= cinnamon
2	PORTVERSION= 4.8.6	2	PORTVERSION= 5.4.12
3	PORTREVISION= 3
4	CATEGORIES= x11 gnome	3	CATEGORIES= x11 gnome
5	DIST_SUBDIR= gnome	4	DIST_SUBDIR= gnome
6		5	GH_TAGNAME= 05c3a2657
7	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
8	PATCHFILES+= aa0bf5b13078.patch:-p1 # https://github.com/linuxmint/cinnamon/pull/10606
9		6
10	MAINTAINER= gnome@FreeBSD.org	7	MAINTAINER= gnome@FreeBSD.org
11	COMMENT= Fork of GNOME Shell with layout similar to GNOME 2	8	COMMENT= Fork of GNOME Shell with layout similar to GNOME 2
Lines 19-28 LIB_DEPENDS= libcjs.so:lang/cjs \ Link Here
19	libmuffin.so:x11-wm/muffin \	16	libmuffin.so:x11-wm/muffin \
20	libcinnamon-menu-3.so:x11/cinnamon-menus \	17	libcinnamon-menu-3.so:x11/cinnamon-menus \
21	libdbus-1.so:devel/dbus \	18	libdbus-1.so:devel/dbus \
		19	libkeybinder-3.0.so:x11/keybinder-gtk3 \
22	libpolkit-agent-1.so:sysutils/polkit \	20	libpolkit-agent-1.so:sysutils/polkit \
23	libatk-bridge-2.0.so:accessibility/at-spi2-atk \	21	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
24	libstartup-notification-1.so:x11/startup-notification \	22	libstartup-notification-1.so:x11/startup-notification \
25	libsoup-2.4.so:devel/libsoup	23	libsoup-2.4.so:devel/libsoup \
		24	libxapp.so:x11/xapp
26	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \	25	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
27	ca_root_nss>0:security/ca_root_nss \	26	ca_root_nss>0:security/ca_root_nss \
28	gnome-themes-extra>3.0.0:x11-themes/gnome-themes-extra \	27	gnome-themes-extra>3.0.0:x11-themes/gnome-themes-extra \
Lines 36-50 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ Link Here
36	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \	35	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
37	${PYTHON_PKGNAMEPREFIX}python-xapp>0:x11/py-python-xapp@${PY_FLAVOR} \	36	${PYTHON_PKGNAMEPREFIX}python-xapp>0:x11/py-python-xapp@${PY_FLAVOR} \
38	${PYTHON_PKGNAMEPREFIX}python-pam>0:security/py-python-pam@${PY_FLAVOR} \	37	${PYTHON_PKGNAMEPREFIX}python-pam>0:security/py-python-pam@${PY_FLAVOR} \
		38	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
39	${PYTHON_PKGNAMEPREFIX}tinycss>0:textproc/py-tinycss@${PY_FLAVOR} \	39	${PYTHON_PKGNAMEPREFIX}tinycss>0:textproc/py-tinycss@${PY_FLAVOR} \
40	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \	40	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
41	${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \	41	${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \
42	timezonemap>0:misc/timezonemap \	42	timezonemap>0:misc/timezonemap \
43	gnome-backgrounds>0:x11-themes/gnome-backgrounds \	43	gnome-backgrounds>0:x11-themes/gnome-backgrounds \
44	metacity:x11-wm/metacity \	44	metacity:x11-wm/metacity \
45	tint2:x11/tint	45	tint2:x11/tint \
		46	gsound>=1.0:audio/gsound
46		47
47	USES= compiler:c11 cpe gettext gl gnome gstreamer meson pkgconfig python:3.5+ shebangfix xorg	48	USES= compiler:c11 cpe gettext gl gnome gstreamer meson perl5 pkgconfig python:3.5+ shebangfix xorg
48	CPE_VENDOR= linuxmint	49	CPE_VENDOR= linuxmint
49	USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool introspection libxml2 pygobject3	50	USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool introspection libxml2 pygobject3
50	USE_XORG= x11 xfixes	51	USE_XORG= x11 xfixes
Lines 63-77 MESON_ARGS= -Ddisable_networkmanager=true Link Here
63		64
64	GLIB_SCHEMAS= org.cinnamon.gschema.xml	65	GLIB_SCHEMAS= org.cinnamon.gschema.xml
65		66
66	OPTIONS_DEFINE= DOCS NLS	67	OPTIONS_DEFINE= DOCS CAL NLS RECORDER
67	OPTIONS_DEFAULT= DOCS NLS	68	OPTIONS_DEFAULT= DOCS NLS RECORDER
68	OPTIONS_SUB= yes	69	OPTIONS_SUB= yes
69		70
70	DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc	71	DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc
71	DOCS_MESON_TRUE= docs	72	DOCS_MESON_TRUE= docs
72		73
		74	CAL_DESC= Install Cinnamon Calendar Server support
		75	CAL_RUN_DEPENDS= evolution-data-server>=1.2:databases/evolution-data-server
		76
73	NLS_RUN_DEPENDS= cinnamon-translations>0:misc/cinnamon-translations	77	NLS_RUN_DEPENDS= cinnamon-translations>0:misc/cinnamon-translations
74		78
		79	RECORDER_DESC= Build and install Cinnamon Desktop Recorder
		80	RECORDER_MESON_TRUE= build_recorder
		81	RECORDER_RUN_DEPENDS= ffmpeg>0:multimedia/ffmpeg \
		82	xdotool>0:x11/xdotool \
		83	xwininfo>0:x11/xwininfo \
		84	xdpyinfo>0:x11/xdpyinfo
		85
		86	.include <bsd.port.pre.mk>
		87
75	post-patch:	88	post-patch:
76	@${REINPLACE_CMD} -e '/prefix/s\|/usr\|${PREFIX}\|g ;\	89	@${REINPLACE_CMD} -e '/prefix/s\|/usr\|${PREFIX}\|g ;\
77	/datadir/s\|/usr\|${PREFIX}\|g ;\	90	/datadir/s\|/usr\|${PREFIX}\|g ;\
Lines 109-114 post-patch: Link Here
109	@${MV} ${WRKSRC}/files/usr/${i} ${WRKSRC}/files${PREFIX}	122	@${MV} ${WRKSRC}/files/usr/${i} ${WRKSRC}/files${PREFIX}
110	. endfor	123	. endfor
111		124
		125	@${REINPLACE_CMD} -e 's\|/usr/local/bin/env\|/usr/bin/env\|'\
		126	${WRKSRC}/src/data-to-c.pl
		127
		128	.if !empty(SELECTED_OPTIONS:MDOCS) && empty(SELECTED_OPTIONS:MRECORDER)
		129	## ensure gtk-doc has a usable recorder.xml to parse
		130	pre-install:
		131	@${REINPLACE_CMD} 's@<!--@@' ${WRKSRC}/_build/docs/reference/cinnamon/recorder.xml
		132	@${REINPLACE_CMD} 's@-->@@' ${WRKSRC}/_build/docs/reference/cinnamon/recorder.xml
		133	.endif
		134
112	post-install:	135	post-install:
113	# Ship the GNOME Backgrounds set	136	# Ship the GNOME Backgrounds set
114	@${MKDIR} ${STAGEDIR}${PREFIX}/share/cinnamon-background-properties	137	@${MKDIR} ${STAGEDIR}${PREFIX}/share/cinnamon-background-properties
Lines 117-120 post-install: Link Here
117	@${LN} -s ${PREFIX}/share/gnome-background-properties/gnome-backgrounds.xml \	140	@${LN} -s ${PREFIX}/share/gnome-background-properties/gnome-backgrounds.xml \
118	${STAGEDIR}${PREFIX}/share/cinnamon-background-properties/gnome-backgrounds.xml	141	${STAGEDIR}${PREFIX}/share/cinnamon-background-properties/gnome-backgrounds.xml
119		142
120	.include <bsd.port.mk>	143	post-stage:
		144	cd ${STAGEDIR}; ${FIND} ${PREFIX:C@^/@@}/share/icons -type f \| ${SED} -e 's@^@/@' >> ${TMPPLIST}
		145
		146	add-plist-docs: ${STAGE_COOKIE}
		147	cd ${STAGEDIR}; ${FIND} ${PREFIX:C@^/@@}/share/gtk-doc/html -mindepth 2 -type f \| ${SED} -e 's@^@/@' >> ${TMPPLIST}
		148
		149	.include <bsd.port.post.mk>

Added Link Here

(-)b/x11/cinnamon/files/patch-files_usr_share_cinnamon_applets_keyboard@cinnamon.org_applet.js (+27 lines)
1	--- files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js.orig 2022-05-19 19:33:27.000000000 +0000
2	+++ files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js 2022-05-20 21:09:31.926387000 +0000
3	@@ -152,14 +152,16 @@
4	const layouts = [];
5	if (this._xappController) {
6	const groups = this._xappController.get_all_names();
7	- for (let i = 0; i < groups.length; i++) {
8	- layouts.push({
9	- display_name: groups[i],
10	- flag_name: this._xappController.get_icon_name_for_group(i),
11	- layout_dupe_id: this._xappController.get_flag_id_for_group(i),
12	- short_name: this._xappController.get_short_group_label_for_group(i),
13	- variant_name: this._xappController.get_variant_label_for_group(i),
14	- });
15	+ if (groups) {
16	+ for (let i = 0; i < groups.length; i++) {
17	+ layouts.push({
18	+ display_name: groups[i],
19	+ flag_name: this._xappController.get_icon_name_for_group(i),
20	+ layout_dupe_id: this._xappController.get_flag_id_for_group(i),
21	+ short_name: this._xappController.get_short_group_label_for_group(i),
22	+ variant_name: this._xappController.get_variant_label_for_group(i),
23	+ });
24	+ }
25	}
26	}
27	this._layouts = layouts;

Added Link Here

(-)b/x11/cinnamon/files/patch-src_cinnamon-global.c (+18 lines)
1	--- src/cinnamon-global.c.orig 2022-09-15 15:57:01 UTC
2	+++ src/cinnamon-global.c
3	@@ -2,6 +2,8 @@
4
5	#include "config.h"
6
7	+#include <sys/types.h>
8	+#include <sys/sysctl.h>
9	#include <fcntl.h>
10
11	#include "cinnamon-global-private.h"
12	@@ -1606,4 +1608,4 @@ cinnamon_global_alloc_leak (CinnamonGlobal *global, gi
13	"xxxxxxxxxxxxxxxxxxxxxxxx"
14	);
15	}
16	-}
17	\ No newline at end of file
18	+}

Removed Link Here

(-)a/x11/cinnamon/files/patch-src_st_meson.build (-19 lines)
1	Attempt to fix parallel build
2
3	In file included from ../src/main.c:25:
4	In file included from ../src/cinnamon-global-private.h:28:
5	In file included from src/st/st.h:7:
6	../src/st/st-box-layout-child.h:24:10: fatal error: 'st-enum-types.h' file not found
7	#include "st-enum-types.h"
8	^~~~~~~~~~~~~~~~~
9
10	--- src/st/meson.build.orig 2021-04-06 04:24:56 UTC
11	+++ src/st/meson.build
12	@@ -189,6 +189,7 @@ libst = library(
13	st_dep = declare_dependency(
14	include_directories: include_directories('.', 'croco'),
15	dependencies: libst_deps,
16	+ sources: st_enum_types[1],
17	link_with: libst,
18	link_args: ['-Wl,-Bsymbolic', '-Wl,-z,relro', '-Wl,-z,now'],
19	)