[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/
@ 2015-11-15 22:30 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2015-11-15 22:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3932f8f1124901173bfaf50ff1dc72715c15b7f3
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 21:42:31 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 22:29:50 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3932f8f1

gnome-extra/cinnamon-control-center: Version bump

Package-Manager: portage-2.2.24

 gnome-extra/cinnamon-control-center/Manifest       |   1 +
 .../cinnamon-control-center-2.8.0.ebuild           | 102 ++++++++++++++++++++
 .../cinnamon-control-center-2.8.0-optional.patch   | 107 +++++++++++++++++++++
 3 files changed, 210 insertions(+)

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 587f3aa..7f2d57b 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,3 +1,4 @@
 DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621
 DIST cinnamon-control-center-2.6.0-pyongyang.tar.xz 32912 SHA256 d26e31c1377abc1c3e47e1c8e78572e0169d21bdfddb920ab839bec4e1bbe8a7 SHA512 3c6d6a970382a8e0429cc78873e4d230d5848f2a6ae4feee4d28db28cb21124f59cd7b4632f3a427f91dd7e497ee32dd3f7ba5139a3c1566264904939007d28e WHIRLPOOL a1a4102ddb13e00414b58352c3eabbd02dc425f2b3a59027a579d9ac78bdd0fd7dcacc8c204ceaeb858944202af72bbfcecabb48aa1e7ddf4ff6ec4e682fb97d
 DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84
+DIST cinnamon-control-center-2.8.0.tar.gz 4090227 SHA256 ce4bca5044a65605c24d77118036394728c9bf4cfc424a4acf0e1f0c190f55bb SHA512 c3e5789dea3527310508bc51d2a7c4f9df8bb295419a6576075cc41471a53f7ca349de4946dc6df198706be1528caff7ad81b5c02619da98cdb7e383398905b1 WHIRLPOOL 32f1f52534e0697605f8dbce528558661e5ef6c8b517d371eceaa1c032a36b5c4232340fc8d66d85044adff09da52cdbd9e950ddcb42829de9012470bb32778b

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.0.ebuild
new file mode 100644
index 0000000..e8fdca9
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups input_devices_wacom"
+KEYWORDS="~amd64 ~x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-1.0:0=
+	>=gnome-extra/cinnamon-menus-1.0:0=
+	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
+	>=gnome-extra/nm-applet-0.9.8
+	media-libs/fontconfig
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-1.1[glib]
+	>=net-misc/modemmanager-0.7
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.4.1:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	x11-libs/libxklavier
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=x11-libs/gtk+-3.8:3
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	x11-themes/gnome-icon-theme
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gnome-base/gnome-common
+
+	app-arch/xz-utils
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# make some panels optional
+	epatch "${FILESDIR}"/${PN}-2.8.0-optional.patch
+
+	epatch_user
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-systemd doesn't do anything in $PN-2.2.5
+	gnome2_src_configure \
+		--disable-static \
+		--enable-documentation \
+		--without-libsocialweb \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable input_devices_wacom wacom)
+}

diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch
new file mode 100644
index 0000000..d5beadf
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.8.0-optional.patch
@@ -0,0 +1,107 @@
+diff --git a/configure.ac b/configure.ac
+index 144bf78..a83e1eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,7 +121,6 @@ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES cinnamon-desktop x11)
+ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ 
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+                   libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
+@@ -197,15 +196,51 @@ if test x"$enable_cups" != x"no" ; then
+   AC_SUBST(CUPS_LIBS)
+ fi
+ 
++build_color=false
++AC_ARG_ENABLE(color,
++       AC_HELP_STRING([--disable-color],
++               [disable color management panel]),
++       [case "${enableval}" in
++               yes) WANT_COLOR=yes ;;
++               no) WANT_COLOR=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++       esac],
++       [WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++       PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
++       build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++       AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ build_wacom=false
+-PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
++AC_ARG_ENABLE(wacom,
++       AC_HELP_STRING([--disable-wacom],
++               [disable wacom management panel]),
++       [case "${enableval}" in
++               yes) WANT_WACOM=yes ;;
++               no) WANT_WACOM=no ;;
++               *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++       esac],
++       [WANT_WACOM=yes]) dnl Default value
++
++if test x$WANT_WACOM = xyes; then
++        PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
+                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
+                   xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+                   cinnamon-desktop
+-                  gtk+-3.0 >= 3.8.0],
+-                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
+-
++                  gtk+-3.0 >= 3.8.0])
++        build_wacom="true"
++        AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
++fi
+ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
++AC_SUBST(WACOM_PANEL_CFLAGS)
++AC_SUBST(WACOM_PANEL_LIBS)
+ 
+ # This is a hard-dependency for the region and user-accounts panels
+ PKG_CHECK_MODULES(ISOCODES, iso-codes)
+@@ -408,6 +443,13 @@ fi
+ #else
+ #	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
+ #fi
++
++if test "x$build_color" = "xtrue"; then
++	AC_MSG_NOTICE([** Colord support (Color management panel)])
++else
++	AC_MSG_NOTICE([   Colord support disabled])
++fi
++
+ if test "x$build_wacom" = "xtrue"; then
+ 	AC_MSG_NOTICE([** Wacom support (Wacom panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 76fbc88..c5c2d1a 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,7 +2,6 @@ NULL =
+ 
+ enabled_panels = \
+ 	common \
+-	color \
+ 	display \
+ 	region \
+ 	universal-access \
+@@ -18,6 +17,12 @@ else
+ disabled_panels += network
+ endif
+ 
++if BUILD_COLOR
++enabled_panels += color
++else
++disabled_panels += color
++endif
++
+ if BUILD_WACOM
+ enabled_panels += wacom
+ else


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/
@ 2015-11-15 22:30 Pacho Ramos
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2015-11-15 22:30 UTC (permalink / raw
  To: gentoo-commits

commit:     d692f30f1421cdb335c5278321dbebb0f06821ea
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 21:43:12 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 22:29:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d692f30f

gnome-extra/cinnamon-control-center: Drop old

Package-Manager: portage-2.2.24

 gnome-extra/cinnamon-control-center/Manifest       |   1 -
 .../cinnamon-control-center-2.4.2-r2.ebuild        | 105 --------------------
 .../cinnamon-control-center-2.4.2-r3.ebuild        | 110 ---------------------
 .../cinnamon-control-center-2.6.0.ebuild           | 100 -------------------
 .../cinnamon-control-center-2.2.5-optional.patch   |  93 -----------------
 ...ntrol-center-2.4.2-networkmanager-version.patch |  46 ---------
 6 files changed, 455 deletions(-)

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 7f2d57b..7d2f6dd 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,4 +1,3 @@
-DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621
 DIST cinnamon-control-center-2.6.0-pyongyang.tar.xz 32912 SHA256 d26e31c1377abc1c3e47e1c8e78572e0169d21bdfddb920ab839bec4e1bbe8a7 SHA512 3c6d6a970382a8e0429cc78873e4d230d5848f2a6ae4feee4d28db28cb21124f59cd7b4632f3a427f91dd7e497ee32dd3f7ba5139a3c1566264904939007d28e WHIRLPOOL a1a4102ddb13e00414b58352c3eabbd02dc425f2b3a59027a579d9ac78bdd0fd7dcacc8c204ceaeb858944202af72bbfcecabb48aa1e7ddf4ff6ec4e682fb97d
 DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84
 DIST cinnamon-control-center-2.8.0.tar.gz 4090227 SHA256 ce4bca5044a65605c24d77118036394728c9bf4cfc424a4acf0e1f0c190f55bb SHA512 c3e5789dea3527310508bc51d2a7c4f9df8bb295419a6576075cc41471a53f7ca349de4946dc6df198706be1528caff7ad81b5c02619da98cdb7e383398905b1 WHIRLPOOL 32f1f52534e0697605f8dbce528558661e5ef6c8b517d371eceaa1c032a36b5c4232340fc8d66d85044adff09da52cdbd9e950ddcb42829de9012470bb32778b

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild
deleted file mode 100644
index af72f34..0000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-1.1[glib]
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=sys-auth/polkit-0.103
-	|| ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.8:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# make some panels optional
-	epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
-
-	# Fix NM version checking, bug #536850
-	epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		--without-libsocialweb \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable input_devices_wacom wacom)
-}

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild
deleted file mode 100644
index c0fc713..0000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-2.6.0-pyongyang.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-1.1[glib]
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=sys-auth/polkit-0.103
-	|| ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.8:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# make some panels optional
-	epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
-
-	# Fix NM version checking, bug #536850
-	epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch
-
-	# North Korea causes build failure
-	cp "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.png panels/datetime/data/ || die
-	epatch "${WORKDIR}"/${PN}-2.6.0-pyongyang/*.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		--without-libsocialweb \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable input_devices_wacom wacom)
-}

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
deleted file mode 100644
index 7b7384f..0000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="~amd64 ~x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-1.1[glib]
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=sys-auth/polkit-0.103
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	x11-themes/gnome-icon-theme
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# make some panels optional
-	epatch "${FILESDIR}"/${PN}-2.6.0-optional.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-static \
-		--enable-documentation \
-		--without-libsocialweb \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable input_devices_wacom wacom)
-}

diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch
deleted file mode 100644
index e6a1f41..0000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b900c53..0656e18 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -123,7 +123,6 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
-                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
- PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
-                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-                   libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
-@@ -182,15 +181,51 @@ if test x"$enable_cups" != x"no" ; then
-   AC_SUBST(CUPS_LIBS)
- fi
- 
-+build_color=false
-+AC_ARG_ENABLE(color,
-+       AC_HELP_STRING([--disable-color],
-+               [disable color management panel]),
-+       [case "${enableval}" in
-+               yes) WANT_COLOR=yes ;;
-+               no) WANT_COLOR=no ;;
-+               *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+       esac],
-+       [WANT_COLOR=yes]) dnl Default value
-+
-+if test x$WANT_COLOR = xyes; then
-+       PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
-+       build_color=true
-+fi
-+if test "x$build_color" = xtrue ; then
-+       AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
- build_wacom=false
--PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
-+AC_ARG_ENABLE(wacom,
-+       AC_HELP_STRING([--disable-wacom],
-+               [disable wacom management panel]),
-+       [case "${enableval}" in
-+               yes) WANT_WACOM=yes ;;
-+               no) WANT_WACOM=no ;;
-+               *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
-+       esac],
-+       [WANT_WACOM=yes]) dnl Default value
-+
-+if test x$WANT_WACOM = xyes; then
-+        PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
-                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
-                   xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-                   cinnamon-desktop
--                  gtk+-3.0 >= 3.8.0],
--                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
--
-+                  gtk+-3.0 >= 3.8.0])
-+        build_wacom="true"
-+        AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
-+fi
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-+AC_SUBST(WACOM_PANEL_CFLAGS)
-+AC_SUBST(WACOM_PANEL_LIBS)
- 
- # This is a hard-dependency for the region and user-accounts panels
- PKG_CHECK_MODULES(ISOCODES, iso-codes)
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index ff8ea98..4a7fba7 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -3,7 +3,6 @@ NULL =
- enabled_panels = \
- 	common \
- 	screen \
--	color \
- 	display \
- 	region \
- 	universal-access \
-@@ -15,6 +14,12 @@ enabled_panels = \
- 
- disabled_panels = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_panels += color
-+else
-+disabled_panels += color
-+endif
-+
- if BUILD_WACOM
- enabled_panels += wacom
- else

diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch
deleted file mode 100644
index 7c2078f..0000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- panels/network/cc-network-panel.c.old	2015-01-17 16:35:04.395520484 +0100
-+++ panels/network/cc-network-panel.c	2015-01-17 16:36:11.706685966 +0100
-@@ -1311,30 +1311,18 @@
- panel_check_network_manager_version (CcNetworkPanel *panel)
- {
-         const gchar *version;
--        gchar **split = NULL;
--        guint major = 0;
--        guint micro = 0;
--        guint minor = 0;
-         gboolean ret = TRUE;
- 
-         /* parse running version */
-         version = nm_client_get_version (panel->priv->client);
--        if (version != NULL) {
--                split = g_strsplit (version, ".", -1);
--                major = atoi (split[0]);
--                minor = atoi (split[1]);
--                micro = atoi (split[2]);
--        }
- 
--        /* is it too new or old */
--        if (major > 0 || minor > 9 || (minor <= 8 && micro < 992)) {
-+        if (version == NULL) {
-                 ret = FALSE;
- 
-                 /* do modal dialog in idle so we don't block startup */
-                 panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
-         }
- 
--        g_strfreev (split);
-         return ret;
- }
- 
-@@ -1381,8 +1369,9 @@
- {
-         gboolean ret;
- 
--        /* is the user compiling against a new version, but running an
--         * old daemon version? */
-+        /* is the user compiling against a new version, but not running
-+         * the daemon? */
-+
-         ret = panel_check_network_manager_version (panel);
-         if (ret) {
-                 manager_running (panel->priv->client, NULL, panel);


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/
@ 2021-01-24 17:31 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2021-01-24 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     e61a5b7671e9209dedad34a3069a0547fc0953dd
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Fri Jan  8 06:48:06 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 17:30:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61a5b76

gnome-extra/cinnamon-control-center: 4.8.2 version bump

Project was converted to meson.

Bug: https://bugs.gentoo.org/757708
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 gnome-extra/cinnamon-control-center/Manifest       |  1 +
 .../cinnamon-control-center-4.8.2.ebuild           | 84 ++++++++++++++++++++++
 .../cinnamon-control-center-4.8.2-build-fix.patch  | 36 ++++++++++
 3 files changed, 121 insertions(+)

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index eaf4c20b158..9ae72fa3a49 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1 +1,2 @@
 DIST cinnamon-control-center-4.6.2.tar.gz 3877007 BLAKE2B f64ebfedc73eb92b96f81fb2743d818ec1602a550130d362eadba4c66a24a0e1f2bdffbe0bf80b23426ab57cead910c78b061b52e4eb82d0e6173d1da2d62749 SHA512 c759c14cc295ba15bde87ad1544d4bdef284d8e3fb8fbee528e9a258aaf83c6f6d76944042230725804ea6c05bd2cb5cbb59cb7507378b952221f381fc47075e
+DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
new file mode 100644
index 00000000000..6faf4e6c0ab
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg virtualx
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/libgnomekbd-3.0.0:0=
+	>=gnome-extra/cinnamon-desktop-4.8:0=
+	>=gnome-extra/cinnamon-menus-4.8:0=
+	media-libs/fontconfig
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5.1
+
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=gnome-extra/cinnamon-settings-daemon-4.8:0=
+		>=x11-libs/libXi-1.2 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-1.2.0
+		>=net-misc/networkmanager-1.2.0:=[modemmanager?]
+
+		modemmanager? ( >=net-misc/modemmanager-0.7 )
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( app-admin/openrc-settingsd )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix build when modemmanager is disabled
+	# https://github.com/linuxmint/cinnamon-control-center/pull/257
+	"${FILESDIR}/${PN}-4.8.2-build-fix.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Donlineaccounts=false
+		$(meson_use colord color)
+		$(meson_use modemmanager)
+		$(meson_use networkmanager)
+		$(meson_use input_devices_wacom wacom)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}

diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
new file mode 100644
index 00000000000..041a5d23e50
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
@@ -0,0 +1,36 @@
+From a9d7d0f7f36bc724ecb65019999fc1c4d671bcba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
+Date: Thu, 31 Dec 2020 10:09:17 +0100
+Subject: [PATCH] Add ifdefs to prevent undefined reference to modem functions
+ in network panel
+
+---
+ panels/network/cc-network-panel.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index 8b28439..38d9842 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -29,7 +29,9 @@
+ #include <NetworkManager.h>
+ 
+ #include "net-device.h"
++#ifdef BUILD_MODEM
+ #include "net-device-mobile.h"
++#endif
+ #include "net-device-wifi.h"
+ #include "net-device-ethernet.h"
+ #include "net-object.h"
+@@ -651,9 +653,11 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
+         case NM_DEVICE_TYPE_ETHERNET:
+                 device_g_type = NET_TYPE_DEVICE_ETHERNET;
+                 break;
++        #ifdef BUILD_MODEM
+         case NM_DEVICE_TYPE_MODEM:
+                 device_g_type = NET_TYPE_DEVICE_MOBILE;
+                 break;
++        #endif
+         case NM_DEVICE_TYPE_WIFI:
+                 device_g_type = NET_TYPE_DEVICE_WIFI;
+                 break;


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/
@ 2022-05-03  3:34 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-05-03  3:34 UTC (permalink / raw
  To: gentoo-commits

commit:     a5f06a4b8a63dcb51935678be595fd1b3ae05517
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue May  3 03:18:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  3 03:33:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f06a4b

gnome-extra/cinnamon-control-center: Fix libnma dependency

Closes: https://bugs.gentoo.org/840317
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../cinnamon-control-center-5.2.1-r1.ebuild        | 105 +++++++++++++++++++++
 .../cinnamon-control-center-5.2.1-fix-libnma.patch |  58 ++++++++++++
 2 files changed, 163 insertions(+)

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild
new file mode 100644
index 000000000000..27ee0069d477
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit meson gnome2-utils python-any-r1 xdg virtualx
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/libgnomekbd-3.0.0:0=
+	>=gnome-extra/cinnamon-desktop-5.2:0=
+	>=gnome-extra/cinnamon-menus-5.2:0=
+	media-libs/fontconfig
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=x11-libs/libnotify-0.7.3:0=
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5.1
+
+	colord? ( >=x11-misc/colord-0.1.14:0= )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=gnome-extra/cinnamon-settings-daemon-5.2:0=
+		>=x11-libs/libXi-1.2 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-1.2.0
+		>=net-libs/libnma-1.8.34
+		>=net-misc/networkmanager-1.2.0:=[modemmanager?]
+
+		modemmanager? ( >=net-misc/modemmanager-0.7 )
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.18.0
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( app-admin/openrc-settingsd )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix >=libnma-1.8.34
+	# https://github.com/linuxmint/cinnamon-control-center/commit/0f4d212874c4fbee18b860963d0a5c7bd54dcfd1
+	"${FILESDIR}"/${PN}-5.2.1-fix-libnma.patch
+)
+
+src_prepare() {
+	default
+	python_fix_shebang meson_install_schemas.py
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord color)
+		$(meson_use modemmanager)
+		$(meson_use networkmanager)
+		$(meson_use gnome-online-accounts onlineaccounts)
+		$(meson_use input_devices_wacom wacom)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}

diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
new file mode 100644
index 000000000000..116c9a3058d3
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch
@@ -0,0 +1,58 @@
+From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 31 Jan 2022 08:56:28 -0500
+Subject: [PATCH] network: Remove old workaround for openvpn widgets.
+
+I can't reproduce the original issue anymore, and NMACertChooser
+is removed in network-manager-openvpn 1.8.34.
+
+Fixes #10616
+
+ref:
+6db4961fd3a002182984d0e71ec364c9befdd93b
+---
+ meson.build                       |  2 --
+ panels/network/cc-network-panel.c | 10 ----------
+ 2 files changed, 12 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index f1f213b..c4d7d86 100644
+--- a/meson.build
++++ b/meson.build
+@@ -56,8 +56,6 @@ else
+   libnma= dependency('', required: false)
+ endif
+ 
+-config.set('HAVE_NMA_18', libnm.version().version_compare('>=1.8.0'))
+-
+ if get_option('modemmanager')
+   if not get_option('networkmanager')
+     error('*** NetworkManager is required by ModemManager ***')
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index a4289de..d1925e4 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -47,10 +47,6 @@
+ #include <libmm-glib.h>
+ #endif
+ 
+-#ifdef HAVE_NMA_18
+-#include <nma-cert-chooser.h>
+-#endif
+-
+ CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel)
+ 
+ #define NETWORK_PANEL_PRIVATE(o) \
+@@ -1244,12 +1240,6 @@ cc_network_panel_init (CcNetworkPanel *panel)
+                 return;
+         }
+ 
+-#ifdef HAVE_NMA_18
+-        /* some newer VPN plugins pre-require internal resources from libnma */
+-        /* this solution is really ugly, but works clean */
+-        gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE));
+-#endif
+-
+         panel->priv->cancellable = g_cancellable_new ();
+ 
+         panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder,


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/
@ 2022-12-24  7:11 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-12-24  7:11 UTC (permalink / raw
  To: gentoo-commits

commit:     005caff7672d4b882ff4aaf9d2987ddada6e614f
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue Dec 20 01:52:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 07:04:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005caff7

gnome-extra/cinnamon-control-center: Fix build when colord flag disabled

Closes: https://bugs.gentoo.org/886259
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../cinnamon-control-center-5.6.0.ebuild           |  6 +++
 ...namon-control-center-5.6.0-fix-icon-build.patch | 57 ++++++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild
index 2d9a5bb44676..0728e8be39a3 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.6.0.ebuild
@@ -69,6 +69,12 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# Fix build when colord flag disabled
+	# https://github.com/linuxmint/cinnamon-control-center/issues/309
+	"${FILESDIR}"/${PN}-5.6.0-fix-icon-build.patch
+)
+
 src_prepare() {
 	default
 	python_fix_shebang meson_install_schemas.py

diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.6.0-fix-icon-build.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.6.0-fix-icon-build.patch
new file mode 100644
index 000000000000..a874152cfe27
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.6.0-fix-icon-build.patch
@@ -0,0 +1,57 @@
+From 65fb97ead94f7d531491ca6e59f2acff0192023f Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Mon, 19 Dec 2022 10:42:00 -0500
+Subject: [PATCH] Fix build when the color panel is disabled.
+
+A typo in the display panel's build was resulting in it using
+the 'sizes' variable defined in the color panel, as its build
+file was being processed first.
+
+When the color panel is disabled, that variable is no longer
+pre-defined, exposing the typo and breaking the build.
+
+Fixes #309.
+---
+ panels/color/icons/meson.build   | 4 ++--
+ panels/display/icons/meson.build | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/panels/color/icons/meson.build b/panels/color/icons/meson.build
+index 1d5680e1..271d894d 100644
+--- a/panels/color/icons/meson.build
++++ b/panels/color/icons/meson.build
+@@ -1,5 +1,5 @@
+ 
+-sizes = [
++color_icon_sizes = [
+   '16x16',
+   '22x22',
+   '24x24',
+@@ -10,7 +10,7 @@ sizes = [
+   'scalable',
+ ]
+ 
+-foreach size : sizes
++foreach size : color_icon_sizes
+   install_subdir(size,
+     strip_directory: true,
+     install_dir: get_option('datadir') / 'icons' / 'hicolor' / size / 'apps',
+diff --git a/panels/display/icons/meson.build b/panels/display/icons/meson.build
+index 3ee26b87..454f608f 100644
+--- a/panels/display/icons/meson.build
++++ b/panels/display/icons/meson.build
+@@ -1,4 +1,4 @@
+-icon_sizes = [
++display_icon_sizes = [
+   '16x16',
+   '22x22',
+   '24x24',
+@@ -6,7 +6,7 @@ icon_sizes = [
+   'scalable'
+ ]
+ 
+-foreach size : sizes
++foreach size : display_icon_sizes
+   install_subdir(size,
+     strip_directory: true,
+     install_dir: get_option('datadir') / 'icons' / 'hicolor' / size / 'apps',


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/
@ 2024-03-17  3:16 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-03-17  3:16 UTC (permalink / raw
  To: gentoo-commits

commit:     20a9ce835b76599fa97c3ae8e743b7ac7ff96890
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 03:15:37 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 03:15:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a9ce83

gnome-extra/cinnamon-control-center: fix modern C issue

Closes: https://bugs.gentoo.org/919085
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../cinnamon-control-center-6.0.0-r1.ebuild        | 123 +++++++++++++++++++++
 .../files/cinnamon-control-center-6.0.0-c99.patch  |  21 ++++
 2 files changed, 144 insertions(+)

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0-r1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0-r1.ebuild
new file mode 100644
index 000000000000..542e240d4060
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-6.0.0-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson gnome2-utils python-any-r1 xdg virtualx
+
+DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"
+SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test wayland"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core:2
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/libgnomekbd-3.0.0:0=
+	>=gnome-extra/cinnamon-desktop-6.0:0=
+	>=gnome-extra/cinnamon-menus-6.0
+	media-libs/fontconfig
+	>=sys-auth/polkit-0.103
+	>=sys-power/upower-0.99.8:=
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.16.0:3[wayland=]
+	>=dev-libs/libgudev-232
+	>=x11-libs/libnotify-0.7.3
+	x11-libs/cairo
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5.1:=
+	x11-libs/pango
+
+	colord? (
+		>=x11-misc/colord-0.1.14:0=
+	)
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7:=
+		>=x11-libs/libXi-1.2
+	)
+	networkmanager? (
+		>=gnome-extra/nm-applet-1.2.0
+		>=net-libs/libnma-1.8.34
+		>=net-misc/networkmanager-1.2.0[modemmanager?]
+
+		modemmanager? (
+			>=net-misc/modemmanager-0.7:=
+		)
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.18.0:=
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+
+	colord? (
+		>=gnome-extra/gnome-color-manager-3
+	)
+	input_devices_wacom? (
+		gnome-extra/cinnamon-settings-daemon[input_devices_wacom]
+	)
+	systemd? (
+		>=sys-apps/systemd-31
+	)
+	!systemd? (
+		app-admin/openrc-settingsd
+	)
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-base/xorg-proto
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix optional wayland
+	# https://github.com/linuxmint/cinnamon-control-center/pull/323
+	"${FILESDIR}/${PN}-6.0.0-fix-optional-wayland.patch"
+	"${FILESDIR}/${PN}-6.0.0-c99.patch"
+)
+
+src_prepare() {
+	default
+	python_fix_shebang meson_install_schemas.py
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord color)
+		$(meson_use modemmanager)
+		$(meson_use networkmanager)
+		$(meson_use gnome-online-accounts onlineaccounts)
+		$(meson_use input_devices_wacom wacom)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}

diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch
new file mode 100644
index 000000000000..b5a73ae3186d
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/919085
+https://github.com/linuxmint/cinnamon-control-center/commit/0361ff2974eb4741f3cd8b6db00dbe1ab56c8a59
+
+From 0361ff2974eb4741f3cd8b6db00dbe1ab56c8a59 Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux@gmail.com>
+Date: Thu, 18 Jan 2024 21:30:28 +0000
+Subject: [PATCH] network: Fix warning about missing cast to GtkWidget* (#324)
+
+Based on https://github.com/GNOME/gnome-control-center/commit/167d11e2107e46b4621cf6fc370c5b191b4b7732
+--- a/panels/network/connection-editor/net-connection-editor.c
++++ b/panels/network/connection-editor/net-connection-editor.c
+@@ -845,7 +845,7 @@ net_connection_editor_new (GtkWindow        *parent_window,
+         editor = g_object_new (NET_TYPE_CONNECTION_EDITOR, NULL);
+ 
+         if (parent_window) {
+-                editor->parent_window = g_object_ref (parent_window);
++                editor->parent_window = GTK_WIDGET (g_object_ref (parent_window));
+                 gtk_window_set_transient_for (GTK_WINDOW (editor->window),
+                                               parent_window);
+         }
+


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-03-17  3:16 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-15 22:30 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-control-center/files/, gnome-extra/cinnamon-control-center/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2024-03-17  3:16 Sam James
2022-12-24  7:11 Sam James
2022-05-03  3:34 Sam James
2021-01-24 17:31 Joonas Niilola
2015-11-15 22:30 Pacho Ramos

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox