pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cinnamon cleanup

Module Name:	pkgsrc-wip
Committed By:	jaypatelani <jaypatelani%gmail.com@localhost>
Pushed By:	jaypatelani
Date:		Thu Sep 3 16:00:52 2020 +0530
Changeset:	26e224e99076986e84f87cdcc51ff375ce3f388c

Modified Files:
	cinnamon-control-center/Makefile
	cinnamon-control-center/distinfo
	cinnamon-desktop/Makefile
	cinnamon-desktop/PLIST
	cinnamon-desktop/buildlink3.mk
	cinnamon-desktop/distinfo
	cinnamon-desktop/patches/patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in
	cinnamon-menus/Makefile
	cinnamon-menus/PLIST
	cinnamon-menus/distinfo
	cinnamon-screensaver/Makefile
	cinnamon-screensaver/distinfo
	cinnamon-session/Makefile
	cinnamon-session/distinfo
	cinnamon-settings-daemon/Makefile
	cinnamon-settings-daemon/distinfo
	cinnamon/Makefile
	cinnamon/distinfo
	cjs/Makefile
	cjs/distinfo
	xapps/Makefile
	xapps/distinfo
Added Files:
	xapps/Makefile.bkup
	xapps/patch-files_meson.build.orig.bkup
	xapps/patch-libxapp_meson.build.orig.bkup
	xapps/patch-pygobject_meson.build.orig.bkup
Removed Files:
	xapps/buildlink3.mk
	xapps/patches/patch-files_meson.build
	xapps/patches/patch-libxapp_meson.build
	xapps/patches/patch-pygobject_meson.build

Log Message:
cinnamon cleanup

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=26e224e99076986e84f87cdcc51ff375ce3f388c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cinnamon-control-center/Makefile                   |  2 +-
 cinnamon-control-center/distinfo                   |  8 ++--
 cinnamon-desktop/Makefile                          |  2 +-
 cinnamon-desktop/PLIST                             |  1 -
 cinnamon-desktop/buildlink3.mk                     | 18 ++++++--
 cinnamon-desktop/distinfo                          | 10 ++---
 ..._org.cinnamon.desktop.session.gschema.xml.in.in | 11 +++--
 cinnamon-menus/Makefile                            | 16 ++++---
 cinnamon-menus/PLIST                               |  4 +-
 cinnamon-menus/distinfo                            |  8 ++--
 cinnamon-screensaver/Makefile                      |  2 +-
 cinnamon-screensaver/distinfo                      |  8 ++--
 cinnamon-session/Makefile                          |  2 +-
 cinnamon-session/distinfo                          |  8 ++--
 cinnamon-settings-daemon/Makefile                  |  2 +-
 cinnamon-settings-daemon/distinfo                  |  8 ++--
 cinnamon/Makefile                                  |  2 +-
 cinnamon/distinfo                                  |  8 ++--
 cjs/Makefile                                       |  2 +-
 cjs/distinfo                                       |  8 ++--
 xapps/Makefile                                     | 16 ++-----
 xapps/Makefile.bkup                                | 50 ++++++++++++++++++++++
 xapps/buildlink3.mk                                | 15 -------
 xapps/distinfo                                     | 13 +++---
 xapps/patch-files_meson.build.orig.bkup            | 19 ++++++++
 xapps/patch-libxapp_meson.build.orig.bkup          | 15 +++++++
 xapps/patch-pygobject_meson.build.orig.bkup        | 15 +++++++
 xapps/patches/patch-files_meson.build              | 19 --------
 xapps/patches/patch-libxapp_meson.build            | 15 -------
 xapps/patches/patch-pygobject_meson.build          | 15 -------
 30 files changed, 179 insertions(+), 143 deletions(-)

diffs:
diff --git a/cinnamon-control-center/Makefile b/cinnamon-control-center/Makefile
index 0bf03c040f..ccdd1038e0 100644
--- a/cinnamon-control-center/Makefile
+++ b/cinnamon-control-center/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-DISTNAME=	cinnamon-control-center-4.0.1
+DISTNAME=	cinnamon-control-center-4.6.2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-control-center
diff --git a/cinnamon-control-center/distinfo b/cinnamon-control-center/distinfo
index 4984f96a67..5415ba4d18 100644
--- a/cinnamon-control-center/distinfo
+++ b/cinnamon-control-center/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-SHA1 (cinnamon-control-center-4.0.1.tar.gz) = 32fc68d87ae9fe4c81473da507abdc88e875c385
-RMD160 (cinnamon-control-center-4.0.1.tar.gz) = 310319edb453e3a2bac38a843115fb1d0367acea
-SHA512 (cinnamon-control-center-4.0.1.tar.gz) = 2b36f9414160ebf98974976b4aae35ad02ec7023117296f5dfde8efa1662e31b28326a71371d61adc2405c3afe3e0428872608dcf7bf8251fdd67ff3381e1ac5
-Size (cinnamon-control-center-4.0.1.tar.gz) = 3872552 bytes
+SHA1 (cinnamon-control-center-4.6.2.tar.gz) = 8dfce649363c5b5d2939238a5f12b8d04188e16b
+RMD160 (cinnamon-control-center-4.6.2.tar.gz) = 0b13c92cff665d2d26f77b307f30adf6a0d009f8
+SHA512 (cinnamon-control-center-4.6.2.tar.gz) = c759c14cc295ba15bde87ad1544d4bdef284d8e3fb8fbee528e9a258aaf83c6f6d76944042230725804ea6c05bd2cb5cbb59cb7507378b952221f381fc47075e
+Size (cinnamon-control-center-4.6.2.tar.gz) = 3877007 bytes
 SHA1 (patch-shell_Makefile.am) = 53c367bb2ff2a10d7963f9faf648a84bfe067443
diff --git a/cinnamon-desktop/Makefile b/cinnamon-desktop/Makefile
index 3d19d033ea..7981d3f9c9 100644
--- a/cinnamon-desktop/Makefile
+++ b/cinnamon-desktop/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
 
-DISTNAME=	cinnamon-desktop-4.0.1
+DISTNAME=	cinnamon-desktop-4.6.4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-desktop
diff --git a/cinnamon-desktop/PLIST b/cinnamon-desktop/PLIST
index cd7cfcaec9..8310fa245a 100644
--- a/cinnamon-desktop/PLIST
+++ b/cinnamon-desktop/PLIST
@@ -1,5 +1,4 @@
 @comment $NetBSD$
-bin/cinnamon-desktop-migrate-mediakeys
 include/cinnamon-desktop/libcinnamon-desktop/cdesktop-enums.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-bg-crossfade.h
 include/cinnamon-desktop/libcinnamon-desktop/gnome-bg.h
diff --git a/cinnamon-desktop/buildlink3.mk b/cinnamon-desktop/buildlink3.mk
index bd1d83ff41..21ffab37aa 100644
--- a/cinnamon-desktop/buildlink3.mk
+++ b/cinnamon-desktop/buildlink3.mk
@@ -1,15 +1,27 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/02/19 17:44:48 jihbed Exp $
+# $NetBSD$
+
 
 BUILDLINK_TREE+=	cinnamon-desktop
 
 .if !defined(CINNAMON_DESKTOP_BUILDLINK3_MK)
 CINNAMON_DESKTOP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.cinnamon-desktop+=	cinnamon-desktop>=3.6.1
-BUILDLINK_PKGSRCDIR.cinnamon-desktop?=		../../wip/cinnamon-desktop
+BUILDLINK_API_DEPENDS.cinnamon-desktop+=	cinnamon-desktop>=4.6.4
+BUILDLINK_PKGSRCDIR.cinnamon-desktop?=	../../wip/cinnamon-desktop
 
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+.include "../../sysutils/accountsservice/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/xkeyboard-config/buildlink3.mk"
 .endif	# CINNAMON_DESKTOP_BUILDLINK3_MK
 
diff --git a/cinnamon-desktop/distinfo b/cinnamon-desktop/distinfo
index 69baed8abd..dccf1e2a03 100644
--- a/cinnamon-desktop/distinfo
+++ b/cinnamon-desktop/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.1 2015/02/19 17:04:55 jihbed Exp $
 
-SHA1 (cinnamon-desktop-4.0.1.tar.gz) = c0a622d805a5823d029fb0c12453f559d0c7d980
-RMD160 (cinnamon-desktop-4.0.1.tar.gz) = afbff554a8e0fab6d3a01acb20b0937b9bfbac47
-SHA512 (cinnamon-desktop-4.0.1.tar.gz) = 68ce970736eac025c5cf73239dccd010d70197011e75258dc234bdbb52346466f51fc211c58d2ce730e63fb6250fa763ccbdf44cc08df7a028a0bea01826ddb4
-Size (cinnamon-desktop-4.0.1.tar.gz) = 489598 bytes
+SHA1 (cinnamon-desktop-4.6.4.tar.gz) = 589fa7fadd9cf63a9763f832e83e97d7fbcbcf21
+RMD160 (cinnamon-desktop-4.6.4.tar.gz) = ea0dccd48779dbda5338b0038f2429f5bf52fe4a
+SHA512 (cinnamon-desktop-4.6.4.tar.gz) = 09a0e521bd97d4eead9e84ca929a04202d3d4ef35e689d84578a534cc00f1be0a22e04c407f7caaaca4bb5b5a837bd1a2893cd727d0045f15ee20938c36fae72
+Size (cinnamon-desktop-4.6.4.tar.gz) = 495195 bytes
 SHA1 (patch-libcinnamon-desktop_cdesktop-enums.h) = de429f814c46e767abc023d2dafada44b90e76e3
-SHA1 (patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in) = 5a7c99cacc2ec7964f07ec762a9e628948b6eeed
+SHA1 (patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in) = ecfc9b2aa147e1895706f2381be770d5de178b25
diff --git a/cinnamon-desktop/patches/patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in b/cinnamon-desktop/patches/patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in
index f5ac870a7a..233074db3a 100644
--- a/cinnamon-desktop/patches/patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in
+++ b/cinnamon-desktop/patches/patch-schemas_org.cinnamon.desktop.session.gschema.xml.in.in
@@ -2,20 +2,19 @@ $NetBSD$
 
 Disable systemd features.
 
---- schemas/org.cinnamon.desktop.session.gschema.xml.in.in.orig	2018-05-06 14:37:39.000000000 +0000
+--- schemas/org.cinnamon.desktop.session.gschema.xml.in.in.orig	2020-09-03 09:37:59.891385447 +0000
 +++ schemas/org.cinnamon.desktop.session.gschema.xml.in.in
-@@ -12,12 +12,12 @@
+@@ -12,11 +12,11 @@
        "gnome" and "gnome-fallback".</description>
      </key>
      <key name="session-manager-uses-logind" type="b">
 -      <default>true</default>
 +      <default>false</default>
-       <_summary>Whether or not cinnamon-session uses logind to suspend/hibernate/shutdown/restart (usually from the shutdown dialog)</_summary>
-       <_description>If true, it uses logind. Otherwise it uses consolekit to shutdown/restart and upower to suspend/hibernate. It is only compatible with upower 0.9 and lower versions (not 0.99 or later).</_description>
+       <_summary>*no longer used*</_summary>
      </key>
      <key name="settings-daemon-uses-logind" type="b">
 -      <default>true</default>
 +      <default>false</default>
-       <_summary>Whether or not cinnamon-settings-daemon uses logind to suspend/hibernate/shutdown (either from media-keys or power-manager)</_summary>
-       <_description>If true, it uses logind for all three actions. Otherwise it uses consolekit for shutdown and upower for suspend/hibernate.</_description>
+       <_summary>*no longer used*</_summary>
      </key>
+   </schema>
diff --git a/cinnamon-menus/Makefile b/cinnamon-menus/Makefile
index 6aef2b778f..f02b28b962 100644
--- a/cinnamon-menus/Makefile
+++ b/cinnamon-menus/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-DISTNAME=	cinnamon-menus-4.0.0
+DISTNAME=	cinnamon-menus-4.6.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-menus
@@ -12,16 +12,18 @@ COMMENT=	Additional UI API for cinnamon
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config automake autoreconf intltool msgfmt
-GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config intltool
+#USE_TOOLS+=	gmake pkg-config automake autoreconf intltool msgfmt
+#GNU_CONFIGURE=	yes
 
-PKGCONFIG_OVERRIDE+=	libmenu/libcinnamon-menu-3.0.pc.in
+#PKGCONFIG_OVERRIDE+=	libmenu/libcinnamon-menu-3.0.pc.in
 
-BUILD_DEPENDS+=	autoconf-archive-[0-9]*:../../devel/autoconf-archive
+#BUILD_DEPENDS+=	autoconf-archive-[0-9]*:../../devel/autoconf-archive
 
-pre-configure:
-	cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
+#pre-configure:
+#	cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
 
+.include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cinnamon-menus/PLIST b/cinnamon-menus/PLIST
index 651abdb39d..7a1187ce16 100644
--- a/cinnamon-menus/PLIST
+++ b/cinnamon-menus/PLIST
@@ -1,6 +1,8 @@
 @comment $NetBSD$
 include/cinnamon-menus-3.0/gmenu-tree.h
 lib/girepository-1.0/CMenu-3.0.typelib
-lib/libcinnamon-menu-3.la
+lib/libcinnamon-menu-3.so
+lib/libcinnamon-menu-3.so.0
+lib/libcinnamon-menu-3.so.0.0.1
 lib/pkgconfig/libcinnamon-menu-3.0.pc
 share/gir-1.0/CMenu-3.0.gir
diff --git a/cinnamon-menus/distinfo b/cinnamon-menus/distinfo
index 03422c27cd..5bddb29f97 100644
--- a/cinnamon-menus/distinfo
+++ b/cinnamon-menus/distinfo
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-SHA1 (cinnamon-menus-4.0.0.tar.gz) = ce3ea0995d5897545f98760eecd1e208adf0296d
-RMD160 (cinnamon-menus-4.0.0.tar.gz) = 017a72accce1f68bdddb159b98ed9c5fad446484
-SHA512 (cinnamon-menus-4.0.0.tar.gz) = 8ada5b351d7d7b09dbdb8f3d6650c03e9a78a5ee729a2f557bd2f49180fe9272889a39309751548d4680794c606294f997ea20aea7e6f6229fb7fbde4b038852
-Size (cinnamon-menus-4.0.0.tar.gz) = 181311 bytes
+SHA1 (cinnamon-menus-4.6.1.tar.gz) = e62508702af38bb01e7dc27cd33eb933adc5b5a6
+RMD160 (cinnamon-menus-4.6.1.tar.gz) = 03a97f943fe21c13c77a941439cb443f63907a3c
+SHA512 (cinnamon-menus-4.6.1.tar.gz) = ef37662d4e1a49494c22481456b5e318039ec8c873e6ffcc0c55f89edbcc918d3bc97664b33007194da268b43884fe5abd08b27ac8bb5e7ba7bcb9928546aee9
+Size (cinnamon-menus-4.6.1.tar.gz) = 96294 bytes
diff --git a/cinnamon-screensaver/Makefile b/cinnamon-screensaver/Makefile
index 7220eb1950..37ee27aa69 100644
--- a/cinnamon-screensaver/Makefile
+++ b/cinnamon-screensaver/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
 
-DISTNAME=	cinnamon-screensaver-4.0.3
+DISTNAME=	cinnamon-screensaver-4.6.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-screensaver
diff --git a/cinnamon-screensaver/distinfo b/cinnamon-screensaver/distinfo
index 1fe82d48ca..4c2a5f9bd1 100644
--- a/cinnamon-screensaver/distinfo
+++ b/cinnamon-screensaver/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1 2015/02/19 17:04:55 jihbed Exp $
 
-SHA1 (cinnamon-screensaver-4.0.3.tar.gz) = 8cb1aad86a61a291065bcf362ed3f10326202181
-RMD160 (cinnamon-screensaver-4.0.3.tar.gz) = 905e1b40e686fe42b9e0490787eaf7022e59a646
-SHA512 (cinnamon-screensaver-4.0.3.tar.gz) = 155eb510e222be15d8699f7ff1aa8f16a03ac7a13931d410b733c772a81ed0fd1e49252d5e1a6c182a3182c23a28f94d808e3ffd8ad1bb30839da1cf179edaef
-Size (cinnamon-screensaver-4.0.3.tar.gz) = 157719 bytes
+SHA1 (cinnamon-screensaver-4.6.0.tar.gz) = f37fcba46559f89f12968fb54f75dd93b10d66f2
+RMD160 (cinnamon-screensaver-4.6.0.tar.gz) = cb498b5d3cbc6cce2ee008e6968a28b83485de8d
+SHA512 (cinnamon-screensaver-4.6.0.tar.gz) = c83a057ff12a22445a155d4f91a45638d922c9b2180a7655f1e34bfd8ddcd31ed901b5b038236fa0e06c6f7986547c34ee8ab61cd216b5bc75f1c202b545c28f
+Size (cinnamon-screensaver-4.6.0.tar.gz) = 141043 bytes
 SHA1 (patch-files_Makefile.in) = 3124d41563de9c5a158a32c3d849bb1538e2fee8
diff --git a/cinnamon-session/Makefile b/cinnamon-session/Makefile
index 9d778fd775..dd739943b5 100644
--- a/cinnamon-session/Makefile
+++ b/cinnamon-session/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-DISTNAME=	cinnamon-session-4.0.0
+DISTNAME=	cinnamon-session-4.6.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-session
diff --git a/cinnamon-session/distinfo b/cinnamon-session/distinfo
index 9bbc24bb8a..431e60e8b7 100644
--- a/cinnamon-session/distinfo
+++ b/cinnamon-session/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-SHA1 (cinnamon-session-4.0.0.tar.gz) = 413e16e545aa5c6e48308531e39456ff6498cc0c
-RMD160 (cinnamon-session-4.0.0.tar.gz) = f414f0f1cc8e4e211e8d62dc7b81fca4e33eeefa
-SHA512 (cinnamon-session-4.0.0.tar.gz) = 7e91bef4e294175fa3333a96d0cb9d06db36c9b5a86d6e52734447ea62d411535760fc46713961a46299ebeb3767a0abd4768279e9f6c176ae882de9b7aedc5e
-Size (cinnamon-session-4.0.0.tar.gz) = 198396 bytes
+SHA1 (cinnamon-session-4.6.1.tar.gz) = 723de04fc4cd6e6ad609c6b3c9bc47084729abac
+RMD160 (cinnamon-session-4.6.1.tar.gz) = 7e15ba7f27785ab752cc25dbd7725e8f107aa86f
+SHA512 (cinnamon-session-4.6.1.tar.gz) = 64c395dc8fe6412f8e4fec8f984327f35fa54e7bab2609063d86e9d910a5cc2448527e211964d5c090fe8399a62842811cf75121aa4697a0bee5bc2870cced76
+Size (cinnamon-session-4.6.1.tar.gz) = 199200 bytes
 SHA1 (patch-cinnamon-session_csm-manager.c) = c0410e4147f428b335958d77fee70778d6baa1ed
diff --git a/cinnamon-settings-daemon/Makefile b/cinnamon-settings-daemon/Makefile
index 167f2db59c..92a44897ac 100644
--- a/cinnamon-settings-daemon/Makefile
+++ b/cinnamon-settings-daemon/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2015/02/19 18:01:20 jihbed Exp $
 
-DISTNAME=	cinnamon-settings-daemon-4.0.3
+DISTNAME=	cinnamon-settings-daemon-4.6.4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cinnamon-settings-daemon
diff --git a/cinnamon-settings-daemon/distinfo b/cinnamon-settings-daemon/distinfo
index 3f11586cb1..bfe742c762 100644
--- a/cinnamon-settings-daemon/distinfo
+++ b/cinnamon-settings-daemon/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.1 2015/02/19 17:04:55 jihbed Exp $
 
-SHA1 (cinnamon-settings-daemon-4.0.3.tar.gz) = 72f8fbaaa317de8dc173fd74a086e090dbf09404
-RMD160 (cinnamon-settings-daemon-4.0.3.tar.gz) = 1d10d4f2facd0d969dc2556d4c70ae57ef4f4288
-SHA512 (cinnamon-settings-daemon-4.0.3.tar.gz) = 68629fb1067096ee735087558e1455d8a2b572491eb9c880ae562e712bde46c31240fa848ffd7a298feafe95b71546b2fa1f4f9b6cdcfb3210a37195d909ef59
-Size (cinnamon-settings-daemon-4.0.3.tar.gz) = 663186 bytes
+SHA1 (cinnamon-settings-daemon-4.6.4.tar.gz) = 70da86dafd1484647187c2a43c1966538a095e2a
+RMD160 (cinnamon-settings-daemon-4.6.4.tar.gz) = 4cb68f51262ad042cd99974432cba7b991c84ccd
+SHA512 (cinnamon-settings-daemon-4.6.4.tar.gz) = 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
+Size (cinnamon-settings-daemon-4.6.4.tar.gz) = 668339 bytes
 SHA1 (patch-configure.ac) = 0ab4cb7368487fae951d68d5bc2a5d6c7f40f4f1
 SHA1 (patch-data_org.cinnamon.settings-daemon.plugins.power.gschema.xml.in.in) = 5da78c10161554521bba6ff19215763ddbe93e25
 SHA1 (patch-files_Makefile.in) = 1a100b728e963ffa354502913ef77b4d023e6acf
diff --git a/cinnamon/Makefile b/cinnamon/Makefile
index 4564afc69d..6365bf2054 100644
--- a/cinnamon/Makefile
+++ b/cinnamon/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-DISTNAME=	cinnamon-3.8.9
+DISTNAME=	cinnamon-4.6.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	Cinnamon
diff --git a/cinnamon/distinfo b/cinnamon/distinfo
index 3dad0cf53c..8529d220d8 100644
--- a/cinnamon/distinfo
+++ b/cinnamon/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (cinnamon-3.8.9.tar.gz) = f7f4b67f4972274634e1beefc36477f6dbfd2109
-RMD160 (cinnamon-3.8.9.tar.gz) = bf4e15b6e8518e8ca1eae05ca9931b6df9cd85a7
-SHA512 (cinnamon-3.8.9.tar.gz) = 3b07daf531819e21037ec0161c462d03bb60e0e059e6dfe5f6ab200858391c9b4a2c033e4a38f9acc83ddbedde8e54ab78a346a71718e5f4b5025061335b7f14
-Size (cinnamon-3.8.9.tar.gz) = 2235921 bytes
+SHA1 (cinnamon-4.6.7.tar.gz) = fdd9493a5856cb33f7212d85583aed8d8b3a4114
+RMD160 (cinnamon-4.6.7.tar.gz) = 7ca215e916ee9ab4b0c470a2da55cba9ba479412
+SHA512 (cinnamon-4.6.7.tar.gz) = 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
+Size (cinnamon-4.6.7.tar.gz) = 2271281 bytes
 SHA1 (patch-configure.ac) = e8b055699a6d98feaa19855cc306720cd444120a
 SHA1 (patch-data_org.cinnamon.gschema.xml.in) = 2b0e12c578cc007232d3ad11813774142244a562
 SHA1 (patch-files_Makefile.in) = 435a12f03baabd1e3ec482d9a5f4f28645a689a2
diff --git a/cjs/Makefile b/cjs/Makefile
index 238446490a..4f7cb02900 100644
--- a/cjs/Makefile
+++ b/cjs/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-DISTNAME=	cjs-4.0.0
+DISTNAME=	cjs-4.6.0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	cjs
diff --git a/cjs/distinfo b/cjs/distinfo
index 015db57d7c..6ff41378d9 100644
--- a/cjs/distinfo
+++ b/cjs/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (cjs-4.0.0.tar.gz) = df439e076c82cf583c67e9528e1a48741ef6c609
-RMD160 (cjs-4.0.0.tar.gz) = 052475166af0944922149346d8a2502a5728614d
-SHA512 (cjs-4.0.0.tar.gz) = 86baaba3721b71b266c560180ba20af43eed0d2b8fc37af0d24c7c0c36252e2af85da928b42260074f236f0bc4d4f4f28d20127021e67f23a22b042a09a3baa7
-Size (cjs-4.0.0.tar.gz) = 459595 bytes
+SHA1 (cjs-4.6.0.tar.gz) = 3d36b8d92da1bf87b847e0fa2e92e688a22871b8
+RMD160 (cjs-4.6.0.tar.gz) = 4da287ec3da76aafe2d4a69a43e1fc5380725a7e
+SHA512 (cjs-4.6.0.tar.gz) = b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
+Size (cjs-4.6.0.tar.gz) = 463060 bytes
diff --git a/xapps/Makefile b/xapps/Makefile
index 9a68a38b20..2eed056c22 100644
--- a/xapps/Makefile
+++ b/xapps/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
 
-DISTNAME=	xapps-1.4.5
+DISTNAME=	xapps-1.8.9
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
 GITHUB_PROJECT=	xapps
@@ -13,22 +13,11 @@ LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
-SUBST_CLASSES=		pypath
-SUBST_STAGE.pypath=	post-patch
-SUBST_FILES.pypath=	pygobject/meson.build files/meson.build
-SUBST_VARS.pypath=	PREFIX PYTHONBIN
-
-PY_PATCHPLIST=	yes
-
 MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libxapp
 
 USE_TOOLS+=	gmake bash pkg-config intltool msgfmt
 
-REPLACE_PYTHON=	schemas/meson_install_schemas.py	\
-		files/usr/bin/pastebin			\
-		files/usr/bin/upload-system-info
-
-REPLACE_BASH=	files/usr/bin/xfce4-set-wallpaper
+#REPLACE_BASH=	files/usr/bin/xfce4-set-wallpaper
 
 pre-install:
 	${CHMOD} +x ${WRKSRC}/schemas/meson_install_schemas.py
@@ -44,6 +33,7 @@ pre-install:
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
 .include "../../x11/libgnomekbd/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xapps/Makefile.bkup b/xapps/Makefile.bkup
new file mode 100644
index 0000000000..a37e69752c
--- /dev/null
+++ b/xapps/Makefile.bkup
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+
+DISTNAME=	xapps-1.8.9
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_GITHUB:=linuxmint/}
+GITHUB_PROJECT=	xapps
+GITHUB_TAG=	${PKGVERSION_NOREV}
+
+MAINTAINER=	youri%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/linuxmint/xapps
+COMMENT=	Components which are common to multiple desktop environments
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
+
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+
+#SUBST_CLASSES=		pypath
+#SUBST_STAGE.pypath=	pre-configure
+#SUBST_FILES.pypath=	pygobject/meson.build files/meson.build
+#SUBST_VARS.pypath=	PREFIX PYTHONBIN
+
+PY_PATCHPLIST=	yes
+
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/output/libxapp
+
+USE_TOOLS+=	gmake bash pkg-config intltool msgfmt
+
+REPLACE_PYTHON=	schemas/meson_install_schemas.py	\
+		files/usr/bin/pastebin			\
+		files/usr/bin/upload-system-info
+
+REPLACE_BASH=	files/usr/bin/xfce4-set-wallpaper
+
+pre-install:
+	${CHMOD} +x ${WRKSRC}/schemas/meson_install_schemas.py
+
+.include "../../devel/meson/build.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/py-gobject3-common/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/vala/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libxklavier/buildlink3.mk"
+.include "../../x11/libgnomekbd/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../lang/python/extension.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/xapps/buildlink3.mk b/xapps/buildlink3.mk
deleted file mode 100644
index 1d96132800..0000000000
--- a/xapps/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=	xapps
-
-.if !defined(XAPPS_BUILDLINK3_MK)
-XAPPS_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.xapps+=	xapps>=1.2.1
-BUILDLINK_PKGSRCDIR.xapps?=	../../wip/xapps
-
-.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/libgnomekbd/buildlink3.mk"
-.endif	# XAPPS_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-xapps
diff --git a/xapps/distinfo b/xapps/distinfo
index 42b67a3c3c..b6d5eb8fc4 100644
--- a/xapps/distinfo
+++ b/xapps/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.1 2015/02/19 21:21:12 jihbed Exp $
+$NetBSD$
 
-SHA1 (xapps-1.4.5.tar.gz) = 8e2c5b9289e7340e910826e12465e3215f8db151
-RMD160 (xapps-1.4.5.tar.gz) = d04250ce5e2874df043fa40835619937f9613e43
-SHA512 (xapps-1.4.5.tar.gz) = 63156e1827af8196e7d3f53674ac1be654ed1baa38c30bfd6e44831d7507de971240569b5bfc6f88fdda4b50c8235e5beaa07ab9c94d1858c3aa02240bcc05f2
-Size (xapps-1.4.5.tar.gz) = 80492 bytes
-SHA1 (patch-files_meson.build) = bbe8ea87eaf7ab7e60060ee3baac49f9f55f1c51
-SHA1 (patch-libxapp_meson.build) = 6746e7a6a211ce61cfc38bbce1f834fa0e2d763d
-SHA1 (patch-pygobject_meson.build) = 2585e921bfef7a6814da46d62e8d36a133b20a9d
+SHA1 (xapps-1.8.9.tar.gz) = 6606621ade027cc81a72c3fa6daa945d763ea01f
+RMD160 (xapps-1.8.9.tar.gz) = 79b0aa92f1fc2423d51fb635fbfaea33f60880de
+SHA512 (xapps-1.8.9.tar.gz) = 95dd1cbf84b59adf6682d9025e0cfa7a414c24d4f584cde87d0cc6ea82c06338de2c320dad8d997e105980782ec5cb23f0def6f6d60ea84be7d74c90d7cd692c
+Size (xapps-1.8.9.tar.gz) = 187789 bytes
diff --git a/xapps/patch-files_meson.build.orig.bkup b/xapps/patch-files_meson.build.orig.bkup
new file mode 100644
index 0000000000..7444e9cbf5
--- /dev/null
+++ b/xapps/patch-files_meson.build.orig.bkup
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Destdir support.
+
+--- files/meson.build.orig	2018-05-06 13:34:47.000000000 +0000
++++ files/meson.build
+@@ -1,7 +1,10 @@
+ message('Copying ./files structure')
+ 
+-install_subdir('usr',
+-    install_dir: '/',
++install_subdir('usr/bin',
++    install_dir: '@PREFIX@',
++)
++install_subdir('usr/share',
++    install_dir: '@PREFIX@',
+ )
+ 
+ 
diff --git a/xapps/patch-libxapp_meson.build.orig.bkup b/xapps/patch-libxapp_meson.build.orig.bkup
new file mode 100644
index 0000000000..83e07e61b9
--- /dev/null
+++ b/xapps/patch-libxapp_meson.build.orig.bkup
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't add non-portable ld arguments.
+
+--- libxapp/meson.build.orig	2018-11-27 18:17:01.000000000 +0000
++++ libxapp/meson.build
+@@ -45,7 +45,7 @@ libxapp = library('xapp',
+     soversion: '1',
+     dependencies: libdeps,
+     c_args: ['-Wno-declaration-after-statement'],
+-    link_args: [ '-Wl,-Bsymbolic', '-Wl,-z,relro', '-Wl,-z,now', '-lm'],
++    link_args: [ '-Wl,-Bsymbolic', '-lm'],
+     install: true
+ )
+ 
diff --git a/xapps/patch-pygobject_meson.build.orig.bkup b/xapps/patch-pygobject_meson.build.orig.bkup
new file mode 100644
index 0000000000..fa75b3b108
--- /dev/null
+++ b/xapps/patch-pygobject_meson.build.orig.bkup
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Adjust python path.
+
+--- pygobject/meson.build.orig	2018-05-06 13:34:47.000000000 +0000
++++ pygobject/meson.build
+@@ -3,7 +3,7 @@ pygobject = dependency('pygobject-3.0',
+     required: true,
+ )
+ 
+-foreach exec : ['python2', 'python3']
++foreach exec : ['@PYTHONBIN@']
+     r = run_command(exec, '-c', 'import gi;print(gi._overridesdir)')
+ 
+     if r.returncode() == 0
diff --git a/xapps/patches/patch-files_meson.build b/xapps/patches/patch-files_meson.build
deleted file mode 100644
index 7444e9cbf5..0000000000
--- a/xapps/patches/patch-files_meson.build
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Destdir support.
-
---- files/meson.build.orig	2018-05-06 13:34:47.000000000 +0000
-+++ files/meson.build
-@@ -1,7 +1,10 @@
- message('Copying ./files structure')
- 
--install_subdir('usr',
--    install_dir: '/',
-+install_subdir('usr/bin',
-+    install_dir: '@PREFIX@',
-+)
-+install_subdir('usr/share',
-+    install_dir: '@PREFIX@',
- )
- 
- 
diff --git a/xapps/patches/patch-libxapp_meson.build b/xapps/patches/patch-libxapp_meson.build
deleted file mode 100644
index 83e07e61b9..0000000000
--- a/xapps/patches/patch-libxapp_meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Don't add non-portable ld arguments.
-
---- libxapp/meson.build.orig	2018-11-27 18:17:01.000000000 +0000
-+++ libxapp/meson.build
-@@ -45,7 +45,7 @@ libxapp = library('xapp',
-     soversion: '1',
-     dependencies: libdeps,
-     c_args: ['-Wno-declaration-after-statement'],
--    link_args: [ '-Wl,-Bsymbolic', '-Wl,-z,relro', '-Wl,-z,now', '-lm'],
-+    link_args: [ '-Wl,-Bsymbolic', '-lm'],
-     install: true
- )
- 
diff --git a/xapps/patches/patch-pygobject_meson.build b/xapps/patches/patch-pygobject_meson.build
deleted file mode 100644
index fa75b3b108..0000000000
--- a/xapps/patches/patch-pygobject_meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Adjust python path.
-
---- pygobject/meson.build.orig	2018-05-06 13:34:47.000000000 +0000
-+++ pygobject/meson.build
-@@ -3,7 +3,7 @@ pygobject = dependency('pygobject-3.0',
-     required: true,
- )
- 
--foreach exec : ['python2', 'python3']
-+foreach exec : ['@PYTHONBIN@']
-     r = run_command(exec, '-c', 'import gi;print(gi._overridesdir)')
- 
-     if r.returncode() == 0
Home | Main Index | Thread Index | Old Index