public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-screenshot/files/, media-gfx/gnome-screenshot/
@ 2015-11-15 10:30 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2015-11-15 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     dc1a2ed3fea70be71ee60e6eea6e31c3da023670
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 15 10:29:05 2015 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 15 10:30:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1a2ed3

media-gfx/gnome-screenshot: Drop old

Package-Manager: portage-2.2.24

 media-gfx/gnome-screenshot/Manifest                |  1 -
 .../files/gnome-screenshot-3.14.0-use-dash.patch   | 23 ---------
 .../gnome-screenshot-3.14.0-r1.ebuild              | 57 ----------------------
 3 files changed, 81 deletions(-)

diff --git a/media-gfx/gnome-screenshot/Manifest b/media-gfx/gnome-screenshot/Manifest
index 8d58f84..abbee8f 100644
--- a/media-gfx/gnome-screenshot/Manifest
+++ b/media-gfx/gnome-screenshot/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-screenshot-3.14.0.tar.xz 259796 SHA256 d96f108421ab04ee5d26387387df3858764e61d7718c7376cbf87890bf33912a SHA512 b8ccdc9db548824eb6e7bc7c783c429363a510921c2187d5daa3f83cfda202a3a0e447db1cb49649940add84e4e404c2a821f96ec3e895e0fc3f549362bf79a3 WHIRLPOOL a2347d6509336d9872557a6db29657d15ecb22a642b5d2c20836b4f32559f166617e620f77676a67703a939a515e2ef4d1e5e1c793ba588e8dd915300c11ea58
 DIST gnome-screenshot-3.16.2.tar.xz 279828 SHA256 5dd4bafb3deb0967866726ba89dab62bbd6dc3bda3b190474281142aa3dee948 SHA512 98092e2779cc6fa67a40a2318c1f5637ac948f0c1c933552b66483230c9b17751f88082a2812635121b09af06a6e3e98e0f6f69aba97ebc8bfd4cd55d7d50135 WHIRLPOOL fc7d5e5f88fb78e400459685b1c65dbd07f3908471368aa15714ff41825c565f02285a101dc2b3ba2cf978e9fb2247c43a3d67cb3681a711639cf99a9928944a
 DIST gnome-screenshot-3.18.0.tar.xz 281752 SHA256 eba64dbf4acf0ab8222fec549d0a4f2dd7dbd51c255e7978dedf1f5c06a98841 SHA512 82d6e958cbc485587d07454f8acccddff1b62880ce102299ae570cf436844296f0338056995a6b8242009c0106feb95b85e7b01dbe1feef9b1b74f095b857f9d WHIRLPOOL 523fb518357ff00d001e2fe9e101cb68272f3c4278ff1f4340d5ecbe82ce428089e3db8ad38b43f8973a308520e5c27e55459fd583ae36ea6595a8e479b749aa

diff --git a/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch b/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch
deleted file mode 100644
index 5a6580e..0000000
--- a/media-gfx/gnome-screenshot/files/gnome-screenshot-3.14.0-use-dash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From aa23783c39f96dd0b45f70d82557736a5b884c55 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Wed, 28 Jan 2015 12:43:58 +0000
-Subject: filename-builder: use dash for time format separator
-
-We can't use colons, but a separator here still looks nice. Use a dash.
-
-diff --git a/src/screenshot-filename-builder.c b/src/screenshot-filename-builder.c
-index 06706d6..5eade9c 100644
---- a/src/screenshot-filename-builder.c
-+++ b/src/screenshot-filename-builder.c
-@@ -130,7 +130,7 @@ build_path (AsyncExistenceJob *job)
-       GDateTime *d;
- 
-       d = g_date_time_new_now_local ();
--      origin = g_date_time_format (d, "%Y-%m-%d %H:%M:%S");
-+      origin = g_date_time_format (d, "%Y-%m-%d %H-%M-%S");
-       g_date_time_unref (d);
-     }
-   else
--- 
-cgit v0.10.1
-

diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild
deleted file mode 100644
index 9c1aeb7..0000000
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.14.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="Screenshot utility for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gnome-screenshot"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# libcanberra 0.26-r2 is needed for gtk+:3 fixes
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.1:2[dbus]
-	>=media-libs/libcanberra-0.26-r2[gtk3]
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.0.3:3
-	x11-libs/libX11
-	x11-libs/libXext
-"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xextproto
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
-	non-interactive mode when launched from a terminal. If you want to choose
-	where to save the screenshot, run 'gnome-screenshot --interactive'"
-
-src_prepare() {
-	# filename-builder: use dash for time format separator (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.14.0-use-dash.patch
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-screenshot/files/, media-gfx/gnome-screenshot/
@ 2021-06-11 21:59 Matt Turner
  0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2021-06-11 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     a77ec336240eff63f0cd10ba9e5d9d6e707d07f5
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Fri Jun 11 21:09:13 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 21:59:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a77ec336

media-gfx/gnome-screenshot: Fix X11 HiDPI support

Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../files/gnome-screenshot-40.0-fix-hidpi.patch    | 40 +++++++++++++
 .../gnome-screenshot-40.0-r1.ebuild                | 66 ++++++++++++++++++++++
 2 files changed, 106 insertions(+)

diff --git a/media-gfx/gnome-screenshot/files/gnome-screenshot-40.0-fix-hidpi.patch b/media-gfx/gnome-screenshot/files/gnome-screenshot-40.0-fix-hidpi.patch
new file mode 100644
index 00000000000..6b493ae6d26
--- /dev/null
+++ b/media-gfx/gnome-screenshot/files/gnome-screenshot-40.0-fix-hidpi.patch
@@ -0,0 +1,40 @@
+From f29aceacbd99fc905ac6d871351505e8d9aa7264 Mon Sep 17 00:00:00 2001
+From: Alexander Mikhaylenko <alexm@gnome.org>
+Date: Sun, 25 Apr 2021 20:00:58 +0000
+Subject: [PATCH] Revert "backend-x11: Use pixbuf dimensions when masking"
+
+This reverts commit f53d720c7d9199075369f085cf5a39a6b53268bc
+---
+ src/screenshot-backend-x11.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/screenshot-backend-x11.c b/src/screenshot-backend-x11.c
+index 990e715..bf32de8 100644
+--- a/src/screenshot-backend-x11.c
++++ b/src/screenshot-backend-x11.c
+@@ -206,18 +206,20 @@ mask_monitors (GdkPixbuf *pixbuf,
+                GdkWindow *root_window)
+ {
+   GdkDisplay *display;
++  GdkScreen *screen;
+   cairo_region_t *region_with_monitors;
+   cairo_region_t *invisible_region;
+   cairo_rectangle_int_t rect;
+ 
+   display = gdk_window_get_display (root_window);
++  screen = gdk_display_get_default_screen (display);
+ 
+   region_with_monitors = make_region_with_monitors (display);
+ 
+   rect.x = 0;
+   rect.y = 0;
+-  rect.width = gdk_pixbuf_get_width (pixbuf);
+-  rect.height = gdk_pixbuf_get_height (pixbuf);
++  rect.width = gdk_screen_get_width (screen);
++  rect.height = gdk_screen_get_height (screen);
+ 
+   invisible_region = cairo_region_create_rectangle (&rect);
+   cairo_region_subtract (invisible_region, region_with_monitors);
+-- 
+GitLab
+

diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild
new file mode 100644
index 00000000000..530e596f46d
--- /dev/null
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-40.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Screenshot utility for GNOME"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-screenshot"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	>=dev-libs/glib-2.35.1:2[dbus]
+	>=x11-libs/gtk+-3.12.0:3
+	>=gui-libs/libhandy-1:1=
+"
+RDEPEND="${DEPEND}
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+PATCHES=(
+	# Fix HiDPI handling in X11 fallback
+	# https://gitlab.gnome.org/GNOME/gnome-screenshot/-/issues/128
+	"${FILESDIR}"/${PN}-40.0-fix-hidpi.patch
+)
+
+DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to
+	non-interactive mode when launched from a terminal. If you want to choose
+	where to save the screenshot, run 'gnome-screenshot --interactive'"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature X x11)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}


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

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-screenshot/files/, media-gfx/gnome-screenshot/
@ 2022-01-21 16:47 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-01-21 16:47 UTC (permalink / raw
  To: gentoo-commits

commit:     1c77b4a64254da0b7dc1da5ec008049011788ab6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 16:46:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 16:46:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c77b4a6

media-gfx/gnome-screenshot: fix build with meson 0.61

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

 ...nome-screenshot-41.0-fix-meson-0.61-build.patch | 30 ++++++++++++++++++++++
 .../gnome-screenshot/gnome-screenshot-41.0.ebuild  |  4 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch b/media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch
new file mode 100644
index 000000000000..3d06a0e70388
--- /dev/null
+++ b/media-gfx/gnome-screenshot/files/gnome-screenshot-41.0-fix-meson-0.61-build.patch
@@ -0,0 +1,30 @@
+https://gitlab.gnome.org/GNOME/gnome-screenshot/-/commit/b60dad3c2536c17bd201f74ad8e40eb74385ed9f.patch
+https://bugs.gentoo.org/831745
+
+From: Jack Hill <jackhill@jackhill.us>
+Date: Thu, 18 Nov 2021 00:46:58 -0500
+Subject: [PATCH] meson: remove extraneous positional argument
+
+* data/meson.build (desktop_file)
+  (metainfo_file): Remove extraneous positional argument.
+
+Closes #186
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,7 +1,6 @@
+ gnome = import('gnome')
+ 
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: 'org.gnome.Screenshot.desktop.in',
+   output: 'org.gnome.Screenshot.desktop',
+@@ -23,7 +22,6 @@ if desktop_file_validate.found()
+ endif
+ 
+ metainfo_file = i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Screenshot.metainfo.xml.in',
+   output: 'org.gnome.Screenshot.metainfo.xml',
+   po_dir: join_paths(meson.current_source_dir(), '../po'),
+GitLab

diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
index 2ae3882d508d..9c0e2fba9bbf 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,8 @@ PATCHES=(
 	# Fix HiDPI handling in X11 fallback
 	# https://gitlab.gnome.org/GNOME/gnome-screenshot/-/issues/128
 	"${FILESDIR}"/${PN}-40.0-fix-hidpi.patch
+
+	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
 )
 
 DOC_CONTENTS="${P} saves screenshots in ~/Pictures/ and defaults to


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

end of thread, other threads:[~2022-01-21 16:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-11 21:59 [gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-screenshot/files/, media-gfx/gnome-screenshot/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2022-01-21 16:47 Sam James
2015-11-15 10: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