public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/files/, gnome-extra/cinnamon-screensaver/
@ 2016-01-30 12:57 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2016-01-30 12:57 UTC (permalink / raw
  To: gentoo-commits

commit:     b1a9d2da1e140c1b420a99d1f459ef170220cec0
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 12:36:51 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 12:57:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a9d2da

gnome-extra/cinnamon-screensaver: Ensure webkit-gtk:4.0 is used (#566572 by Perfect Gentleman)

Package-Manager: portage-2.2.27

 .../cinnamon-screensaver-2.8.0-r1.ebuild           | 107 +++++++++++++++++++++
 .../files/cinnamon-screensaver-2.8.0-webkit4.patch |  11 +++
 2 files changed, 118 insertions(+)

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
new file mode 100644
index 0000000..fd41717
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc pam systemd"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
+	epatch "${FILESDIR}"/${PN}-2.8.0-webkit4.patch #566572
+
+	# Fix xscreensaver paths for gentoo
+	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr/$(get_libdir)/misc/xscreensaver/#" \
+		-i data/screensavers/xscreensaver@cinnamon.org/main || die
+
+	python_fix_shebang data/screensavers
+
+	epatch_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	gnome2_src_configure \
+		$(use_enable doc docbook-docs) \
+		$(use_enable pam locking) \
+		$(use_enable systemd logind) \
+		--with-mit-ext \
+		--with-pam-prefix=/etc \
+		--with-xf86gamma-ext \
+		--with-kbd-layout-indicator
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+}

diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
new file mode 100644
index 0000000..831f9fd
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
@@ -0,0 +1,11 @@
+--- configure.ac~	2015-10-16 17:06:50.000000000 +0200
++++ configure.ac	2016-01-30 13:33:07.595401835 +0100
+@@ -58,7 +58,7 @@
+         gtk+-3.0 >= $GTK_REQUIRED_VERSION
+         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+         cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)
+-PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-3.0],, [PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])])
++PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])
+ AC_SUBST(CINNAMON_SCREENSAVER_CFLAGS)
+ AC_SUBST(CINNAMON_SCREENSAVER_LIBS)
+ 


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

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/files/, gnome-extra/cinnamon-screensaver/
@ 2016-06-25 16:53 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2016-06-25 16:53 UTC (permalink / raw
  To: gentoo-commits

commit:     18e77c5d17b5f13700754fbc5a155890f3a0b5fd
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 15:29:49 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 16:26:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e77c5d

gnome-extra/cinnamon-screensaver: Version bump

Package-Manager: portage-2.3.0_rc1

 gnome-extra/cinnamon-screensaver/Manifest          |   1 +
 .../cinnamon-screensaver-3.0.1.ebuild              | 105 +++++++++++++++++++++
 .../files/cinnamon-screensaver-2.8.0-webkit4.patch |   4 +-
 ...nnamon-screensaver-3.0.1-automagic-logind.patch |  21 +++++
 4 files changed, 129 insertions(+), 2 deletions(-)

diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 8e27e02..3a921d5 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1 +1,2 @@
 DIST cinnamon-screensaver-2.8.0.tar.gz 146275 SHA256 595c787bdc9d3a7189d603fe065475e39ac09f957de2da8423b685ade1441036 SHA512 438ce35145d29b2cee8bb2f07191e0aeb5803e21a67ddd0a4bb13e113ac12e2e1be6b8780c657a67e9c27f8cb09aaec1e261f478432aa9fdbd1f21229294df6d WHIRLPOOL 61a2af9bdfcc4be850ff4455782f00048d12ee1d1f36cd35acdc498e4054d450946a064db8b09b6c6000b897af21cfa0a3acc699eefdef437a699e454e252dcc
+DIST cinnamon-screensaver-3.0.1.tar.gz 147036 SHA256 de32ab1852b605835ea0ca41f248d18b32d7805d479eb6fd5877d4de92dbb784 SHA512 d9ad3f5c09d35388811387e3a7d1a8637d59390c4f797dedc4f6ff97cff631deb009d1cd1288317ca119f5db6456c05fd99c87c135595b2b1f07882892447427 WHIRLPOOL 6b4094cff650234933d82248fc671e399956bc435d1c47aa3b6869f2ba7c3eaaf9d973e05d29f1c274b269b6be62beca0ff0b3babc3804a73d62b9329be568f2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
new file mode 100644
index 0000000..a8c339a
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools gnome2 multilib python-single-r1
+
+DESCRIPTION="Screensaver for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc pam systemd"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=x11-libs/gtk+-3.1.4:3[introspection]
+	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	>=gnome-base/libgnomekbd-3.6
+	>=dev-libs/dbus-glib-0.78
+
+	net-libs/webkit-gtk:4[introspection]
+
+	sys-apps/dbus
+	x11-libs/libxklavier
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	x11-themes/adwaita-icon-theme
+
+	${PYTHON_DEPS}
+
+	pam? ( virtual/pam )
+	systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="
+	!~gnome-extra/cinnamon-1.8.8.1
+	!systemd? ( sys-auth/consolekit )
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4 )
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-3.0.1-automagic-logind.patch
+	eapply "${FILESDIR}"/${PN}-2.8.0-webkit4.patch #566572
+
+	# Fix xscreensaver paths for gentoo
+	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr/$(get_libdir)/misc/xscreensaver/#" \
+		-i data/screensavers/xscreensaver@cinnamon.org/main || die
+
+	python_fix_shebang data/screensavers
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug ' ') \
+		$(use_enable doc docbook-docs) \
+		$(use_enable pam locking) \
+		$(use_enable systemd logind) \
+		--with-mit-ext \
+		--with-pam-prefix=/etc \
+		--with-xf86gamma-ext \
+		--with-kbd-layout-indicator
+	# Do not use --without-console-kit, it would provide no benefit: there is
+	# no build-time or run-time check for consolekit, $PN merely listens to
+	# consolekit's messages over dbus.
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if ! has_version x11-misc/xscreensaver; then
+		elog "${PN} can use screensavers from x11-misc/xscreensaver"
+	fi
+
+}

diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
index 831f9fd..cbf7427 100644
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
@@ -1,5 +1,5 @@
---- configure.ac~	2015-10-16 17:06:50.000000000 +0200
-+++ configure.ac	2016-01-30 13:33:07.595401835 +0100
+--- a/configure.ac~	2015-10-16 17:06:50.000000000 +0200
++++ b/configure.ac	2016-01-30 13:33:07.595401835 +0100
 @@ -58,7 +58,7 @@
          gtk+-3.0 >= $GTK_REQUIRED_VERSION
          dbus-glib-1 >= $DBUS_REQUIRED_VERSION

diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch
new file mode 100644
index 0000000..06048d5
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac~	2016-05-30 17:09:04.000000000 +0200
++++ b/configure.ac	2016-06-25 17:26:08.614205626 +0200
+@@ -580,9 +580,15 @@
+ dnl logind support
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
+-	PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
+-])
++AC_ARG_ENABLE([logind],
++  AS_HELP_STRING([--disable-logind], [Do not check for logind]),
++  [enable_logind=$enableval],
++  [enable_logind=auto])
++
++have_logind=no
++if test x$enable_logind != xno ; then
++  PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
++fi
+ 
+ if test x$have_logind = xyes ; then
+         AC_DEFINE(HAVE_LOGIND, 1, [logind support])


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

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/files/, gnome-extra/cinnamon-screensaver/
@ 2021-06-12  3:55 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-06-12  3:55 UTC (permalink / raw
  To: gentoo-commits

commit:     510b996e577f94f71f2f615422a60ef98fbabb26
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Fri Jun 11 16:43:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 12 03:55:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510b996e

gnome-extra/cinnamon-screensaver: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon-screensaver/Manifest          |  1 -
 .../cinnamon-screensaver-4.6.0.ebuild              | 78 ----------------------
 .../cinnamon-screensaver-4.6.0-python-build.patch  | 77 ---------------------
 .../cinnamon-screensaver-4.6.0-xinerama.patch      | 49 --------------
 4 files changed, 205 deletions(-)

diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 52ebb3b94a4..8023d478cd2 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,3 +1,2 @@
-DIST cinnamon-screensaver-4.6.0.tar.gz 141043 BLAKE2B ba9f1e02fb7567d269daa4eccdb39d2c73dd6ac6bd3a3a4e00e1bcec685b48394fc9247d5006f908091291748e013ae65cf7718a972ef67ed7fd11a226789d6d SHA512 c83a057ff12a22445a155d4f91a45638d922c9b2180a7655f1e34bfd8ddcd31ed901b5b038236fa0e06c6f7986547c34ee8ab61cd216b5bc75f1c202b545c28f
 DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
 DIST cinnamon-screensaver-5.0.2.tar.gz 153825 BLAKE2B cb09de296deed91b2669c008d1d266ae3a77ed3eb894d19fd1586043a568c9c48babc7518f3c0ab4c42384ee8cfd5705e99b9291b0887fc47546ffaa3893a615 SHA512 ac7c6a57307e8ba41c34337b9c0bb57efa7ab49fcb5cc6aa8eb81cd839de3c17c852e4677c35eac022638fe50966871c245510319b8fa64ed48ba56ed818e681

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
deleted file mode 100644
index e25d02acbe8..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit meson python-single-r1 xdg
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="systemd xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.22:3[introspection]
-	>=gnome-extra/cinnamon-desktop-4.6:0=
-	>=dev-libs/dbus-glib-0.78
-
-	sys-apps/dbus
-	sys-libs/pam
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-themes/adwaita-icon-theme
-
-	${PYTHON_DEPS}
-
-	xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-accessibility/caribou-0.3
-	sys-apps/accountsservice[introspection]
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	')
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( sys-auth/elogind )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-python-build.patch
-	"${FILESDIR}"/${PN}-4.6.0-xinerama.patch
-)
-
-src_prepare() {
-	default
-	python_fix_shebang install-scripts src
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use xinerama)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize "${ED}"/usr/share/cinnamon-screensaver/
-}

diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch
deleted file mode 100644
index 1e43396257f..00000000000
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From f838b2ab03af0285043d980feba9d52d96d66164 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 15 May 2020 08:34:40 -0400
-Subject: [PATCH] Build: Only generate python bytecode during builds with no
- temporary install folder.  Package managers should handle this otherwise.
-
-This eliminates a lot of warnings during the packaging portion of
-the deb build.
----
- install-scripts/meson.build             | 16 ++++++++++++++++
- install-scripts/meson_compile_python.py | 10 ++++++++++
- meson.build                             |  1 +
- src/meson.build                         |  2 --
- 4 files changed, 27 insertions(+), 2 deletions(-)
- create mode 100644 install-scripts/meson.build
- create mode 100644 install-scripts/meson_compile_python.py
-
-diff --git a/install-scripts/meson.build b/install-scripts/meson.build
-new file mode 100644
-index 0000000..667d669
---- /dev/null
-+++ b/install-scripts/meson.build
-@@ -0,0 +1,16 @@
-+# These scripts run as post-installation scripts.
-+
-+# They're designed to do nothing if DESTDIR is set, which happens
-+# during debian builds for instance - there's a fake install target
-+# so running these would be pointless.
-+
-+# When using deb packaging, these aren't needed, as these operations
-+# are run automatically by the package manager.
-+
-+# They're really only necessary in straight builds where 'ninja install'
-+# will be run directly, to install the program onto the system.
-+
-+
-+# Generate python bytecode
-+meson.add_install_script('meson_compile_python.py')
-+
-diff --git a/install-scripts/meson_compile_python.py b/install-scripts/meson_compile_python.py
-new file mode 100644
-index 0000000..9ec0f4d
---- /dev/null
-+++ b/install-scripts/meson_compile_python.py
-@@ -0,0 +1,10 @@
-+#!/usr/bin/python3
-+
-+import os
-+import subprocess
-+
-+pythondir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'cinnamon-screensaver')
-+
-+if not os.environ.get('DESTDIR'):
-+    print('Generating python bytecode...')
-+    subprocess.call(['sh', '-c', 'python3 -m compileall "%s"' % pythondir])
-diff --git a/meson.build b/meson.build
-index c508770..d7dcd31 100644
---- a/meson.build
-+++ b/meson.build
-@@ -123,6 +123,7 @@ conf_h = configure_file(
- 
- inc = include_directories('.')
- 
-+subdir('install-scripts')
- subdir('libcscreensaver')
- subdir('data')
- subdir('src')
-diff --git a/src/meson.build b/src/meson.build
-index 7e0978e..f04fda0 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -64,5 +64,3 @@ foreach script : app_scripts
-   meson.add_install_script('sh', '-c',
-     'ln -sf "@0@" "$DESTDIR/@1@"'.format(join_paths(pkgdatadir, script[0]), join_paths(bindir, script[1])))
- endforeach
--
--meson.add_install_script('sh', '-c', 'python3 -m compileall "$DESTDIR/@0@"'.format(pkgdatadir) )

diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch
deleted file mode 100644
index e3240a01001..00000000000
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 13575ae3f332e33a1952a803f2392d6d70df2028 Mon Sep 17 00:00:00 2001
-From: Sparky Bluefang <sparky@bluefang-logic.com>
-Date: Wed, 2 Sep 2020 17:59:45 -0400
-Subject: [PATCH] Fix meson syntax error when xinerama support is disabled.
-
-Fixes #346
----
- libcscreensaver/meson.build | 7 ++++++-
- meson.build                 | 3 ++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/libcscreensaver/meson.build b/libcscreensaver/meson.build
-index 1800c46..c2c3757 100644
---- a/libcscreensaver/meson.build
-+++ b/libcscreensaver/meson.build
-@@ -145,13 +145,18 @@ gir_sources = [
-   dbus_built
- ]
- 
-+libcscreensaver_deps = [gobject, gtk, gdk, x11, xrandr, xext, glib, gio, gthread, pam, m]
-+if use_xinerama
-+  libcscreensaver_deps += xinerama
-+endif
-+
- libcscreensaver = library(
-   'cscreensaver',
-   cscreensaver_sources + gir_sources,
-   version: '0.0.0',
-   include_directories: inc,
-   cpp_args: '-DG_LOG_DOMAIN="CScreensaver"',
--  dependencies: [gobject, gtk, gdk, x11, xinerama, xrandr, xext, glib, gio, gthread, pam, m],
-+  dependencies: libcscreensaver_deps,
-   install: true
- )
- 
-diff --git a/meson.build b/meson.build
-index b15c3fb..2f9a9a5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -61,7 +61,8 @@ foreach sym : [
-   endif
- endforeach
- 
--if get_option('xinerama')
-+use_xinerama = get_option('xinerama')
-+if use_xinerama
-   if host_machine.system() == 'solaris'
-     xinerama = cc.find_library('Xext')
-     xinerama_h = cc.has_header('X11/extensions/xinerama.h')


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

end of thread, other threads:[~2021-06-12  3:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-30 12:57 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/files/, gnome-extra/cinnamon-screensaver/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2016-06-25 16:53 Pacho Ramos
2021-06-12  3:55 Sam James

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