diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest index 1a6b145..8e83fc8 100644 --- a/x11-misc/gpaste/Manifest +++ b/x11-misc/gpaste/Manifest @@ -1,8 +1,6 @@ -AUX gpaste-3.32.0-detect-when-images-are-growing.patch 3827 BLAKE2B fb2eabd32799e33e6d4f7f79d03cc1c2922794854278704eadd11572497102bf01d6b19a25bb5e7ad1c587ae3ba1a589656c7ac38136b8ce0ffabbdad595c5b7 SHA512 bb36d05f062dc36e04405b57a5fa50558c43d1f60c54d3e9f0ec44d93afe7f165ae1caba36e9cd4ccb2c239b34fc2027bb32c75eb8e7b053136f2049fc1082bc -AUX gpaste-3.32.0-gnome-shel-only-var-should-be-exported.patch 6299 BLAKE2B d23fcc7257c04f3ac927ac47807bd9026bdedf90d21ce40c6d69403b5fe59792338c4a7c74d56d2d5a540d2c75843742c537ddb3705a80fc68d572cf0a2adb98 SHA512 a64a858d8b5aac40e7428eda98e7d38b937f91f75d4ebb5406e5f1a0fe5f3f24ec1b25bbc112f7df709dbaf51b9f1425325c5425e7a891b393a3a2c43eda8bc0 -AUX gpaste-3.32.0-install-systemd-user-units.patch 909 BLAKE2B 3f19462980658791e44857b8a5f46033027c1a75b4a4272fb71c58339f6e205017389d7684010eb75dc7f30946a61c481a9cccc248b001e7f4150177cd205e8b SHA512 5959160824595de693117675733eaa9d8b57eb18afee859b472e0366799bc2c8b8984635bae0ff700068d2ab800935754568b0feb0224b83f981ba564b30c0a9 -DIST gpaste-3.32.0.tar.gz 181159 BLAKE2B 664151a5cb9653158ad8c137951fbfc402c400421bbd0324598804135aa654407ff0e67ccd8c4f9c025423aa609df3278e64ac50af09033933ef3f0e26d88032 SHA512 f60983c50742c05bf42347ffdaeb00ad1bb691f7d752d8773545dd59f7bf7485e095e26e799983261ee41180b66631e99fa4b6c196057c1ec47e2e138dfa8160 -DIST gpaste-3.34.1.tar.gz 184922 BLAKE2B 3498d949706d79ae59dc1dae6cf547a9c6a32d539b3ede737b243abe4eea057869d9c06ed7fa7f81741f901f80f44554502a00b1b047d957086eb86898fb0b88 SHA512 0560b7a0616eaf271d13e2db98f924894236e2714f97d80e6dce1bbb3589073b812b4c641d5fe0557a17e4e05b7506ab90418c7b45ddf953059b970fd4eac52e -EBUILD gpaste-3.32.0-r1.ebuild 1830 BLAKE2B c383b8d125694b3d5a91006b9f07189368d18918cbfd7d55fa874cb1f00e4f0adb2f559f4003b12dbda86505c28bc86ac9a89b091f8e8e8ce6a041cc925de7b2 SHA512 24ddad45b7926614c83c9ecf7e621193af7ccf2ba4b542c69e71874acb325a342685a3385f196ac2bc2ad215bd6c7c4e112dc0efee72bfc15cdc0e10b975addf -EBUILD gpaste-3.34.1.ebuild 1705 BLAKE2B d43a7edd7115fc8ed9d3200aed72779871ded663c6b235a0bad958636d154b5c9183a5f0b174ffa48c33cc104974c1041739850ca356f91d3d1eb14d7e6064db SHA512 4781febc315c701e30a667e1a65be5abe0a4c0b3105be8cc0f9a0cbfedd06d1d697b015113e02b53297ef7d623af0bbd8953975234f722c8b0ebc03e71d368a7 +AUX gpaste-3.32.1-install-systemd-user-units.patch 909 BLAKE2B 3f19462980658791e44857b8a5f46033027c1a75b4a4272fb71c58339f6e205017389d7684010eb75dc7f30946a61c481a9cccc248b001e7f4150177cd205e8b SHA512 5959160824595de693117675733eaa9d8b57eb18afee859b472e0366799bc2c8b8984635bae0ff700068d2ab800935754568b0feb0224b83f981ba564b30c0a9 +DIST gpaste-3.32.1.tar.gz 184750 BLAKE2B 04f9bf5850a562dc77c9d015137ac88f8e1cb3979a9c8081abbe239a47f54f9fb01eca15e7c0a4a35b5ed11ba35e6d60c1e7cf0ae8c0bcc228a4df2342c8b38f SHA512 c271efd82820a8ffda6289c0a9c4eaf173d2f6fcb94e5c0c5532cb345fb11ab7bcba1064938960579395d3eeecee0bc048565205059566ee9aa216f440ebac6a +DIST gpaste-3.34.4.tar.gz 185852 BLAKE2B 527f709f5361756ac48e574aa89ce4897cd34342ca5e5753ceb08d2955585ce8462278aecc7539b62669d1b6cc472f86c7ffda9758ebe02c64cd507e87e3fcf7 SHA512 53efc875973cd6cbcf6ef8e61432e2e39a62879cb7aca2251aba6f78157caa596120b37ff048f095d6266456b52192b00d2c50555f5b7d18576101a211d8fda7 +EBUILD gpaste-3.32.1.ebuild 1708 BLAKE2B 486152e5e712be535b8dd261c5f986287b6e015f2ffce9d1b8fc5c284b02ec7cd282608f9db104352886266bcf445ec2efe6df87f7df536e40e4b3f2cb0fc206 SHA512 381fd547c1dc34e1aa1464fe025ed5c125d3af64027151a5c6c6e8b8a184dee8668fba41a1eddd865eb418defd004a98e81fe62d70296aac95abcaba25d0a75f +EBUILD gpaste-3.34.4.ebuild 1705 BLAKE2B d43a7edd7115fc8ed9d3200aed72779871ded663c6b235a0bad958636d154b5c9183a5f0b174ffa48c33cc104974c1041739850ca356f91d3d1eb14d7e6064db SHA512 4781febc315c701e30a667e1a65be5abe0a4c0b3105be8cc0f9a0cbfedd06d1d697b015113e02b53297ef7d623af0bbd8953975234f722c8b0ebc03e71d368a7 MISC metadata.xml 677 BLAKE2B 79d617528e62670788eda4ba64b9698d04b3255f10f8baf2fdce7c7a3708a247b1b839bdf419053b61bc4a6a6200d79033c799c30b6aa29786e6d4b19ebf0954 SHA512 46348240699731847dbb0c55e89386c6ecd5ee9ccc32114eb41a1007cb21e9eaa25930b92a0e470083d64f854b8c5aff055af90f52e4f55dbb36299f6c8b32d2 diff --git a/x11-misc/gpaste/files/gpaste-3.32.0-detect-when-images-are-growing.patch b/x11-misc/gpaste/files/gpaste-3.32.0-detect-when-images-are-growing.patch deleted file mode 100644 index ad20b5f..0000000 --- a/x11-misc/gpaste/files/gpaste-3.32.0-detect-when-images-are-growing.patch +++ /dev/null @@ -1,83 +0,0 @@ -From d195bf0ebc2ed82b49cb83ce9cbad8a7fa492c34 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Tue, 7 May 2019 15:58:46 +0200 -Subject: [PATCH] detect when images are growing - -Signed-off-by: Marc-Antoine Perennou ---- - src/libgpaste/core/gpaste-history.c | 3 +++ - src/libgpaste/core/gpaste-image-item.c | 18 ++++++++++++++++++ - src/libgpaste/core/gpaste-image-item.h | 3 +++ - src/libgpaste/libgpaste.sym | 5 +++++ - 4 files changed, 29 insertions(+), 0 deletions(-) - -diff --git a/src/libgpaste/core/gpaste-history.c b/src/libgpaste/core/gpaste-history.c -index 7936fab1..02f2b4fa 100644 ---- a/src/libgpaste/core/gpaste-history.c -+++ b/src/libgpaste/core/gpaste-history.c -@@ -214,6 +214,9 @@ g_paste_history_private_is_growing_line (GPasteHistoryPrivate *priv, - GPasteItem *old, - GPasteItem *new) - { -+ if (_G_PASTE_IS_IMAGE_ITEM (old) && _G_PASTE_IS_IMAGE_ITEM (new)) -+ return g_paste_image_item_is_growing (_G_PASTE_IMAGE_ITEM (new), _G_PASTE_IMAGE_ITEM (old)); -+ - if (!(g_paste_settings_get_growing_lines (priv->settings) && - _G_PASTE_IS_TEXT_ITEM (old) && _G_PASTE_IS_TEXT_ITEM (new) && - !_G_PASTE_IS_PASSWORD_ITEM (old) && !_G_PASTE_IS_PASSWORD_ITEM (new))) -diff --git a/src/libgpaste/core/gpaste-image-item.c b/src/libgpaste/core/gpaste-image-item.c -index 7b3a3244..2b30a6c6 100644 ---- a/src/libgpaste/core/gpaste-image-item.c -+++ b/src/libgpaste/core/gpaste-image-item.c -@@ -80,6 +80,24 @@ g_paste_image_item_get_image (const GPasteImageItem *self) - return priv->image; - } - -+G_PASTE_VISIBLE gboolean -+g_paste_image_item_is_growing (const GPasteImageItem *self, -+ const GPasteImageItem *other) -+{ -+ g_return_val_if_fail (_G_PASTE_IS_IMAGE_ITEM (self), FALSE); -+ g_return_val_if_fail (_G_PASTE_IS_IMAGE_ITEM (other), FALSE); -+ -+ const GPasteImageItemPrivate *priv = _g_paste_image_item_get_instance_private (self); -+ const GPasteImageItemPrivate *_priv = _g_paste_image_item_get_instance_private (other); -+ -+ if (!priv->image || !_priv->image) -+ return FALSE; -+ -+ gsize len = MIN (gdk_pixbuf_get_byte_length (priv->image), gdk_pixbuf_get_byte_length (_priv->image)); -+ -+ return !memcmp (gdk_pixbuf_read_pixels (priv->image), gdk_pixbuf_read_pixels (_priv->image), len); -+} -+ - static gboolean - g_paste_image_item_equals (const GPasteItem *self, - const GPasteItem *other) -diff --git a/src/libgpaste/core/gpaste-image-item.h b/src/libgpaste/core/gpaste-image-item.h -index bfc74896..b658109b 100644 ---- a/src/libgpaste/core/gpaste-image-item.h -+++ b/src/libgpaste/core/gpaste-image-item.h -@@ -23,6 +23,9 @@ const gchar *g_paste_image_item_get_checksum (const GPasteImageItem *self); - const GDateTime *g_paste_image_item_get_date (const GPasteImageItem *self); - GdkPixbuf *g_paste_image_item_get_image (const GPasteImageItem *self); - -+gboolean g_paste_image_item_is_growing (const GPasteImageItem *self, -+ const GPasteImageItem *other); -+ - GPasteItem *g_paste_image_item_new (GdkPixbuf *img); - GPasteItem *g_paste_image_item_new_from_file (const gchar *path, - GDateTime *date); -diff --git a/src/libgpaste/libgpaste.sym b/src/libgpaste/libgpaste.sym -index daf6329e..650d2a26 100644 ---- a/src/libgpaste/libgpaste.sym -+++ b/src/libgpaste/libgpaste.sym -@@ -505,3 +505,8 @@ global: - g_paste_util_empty_with_confirmation; - g_paste_util_empty_with_confirmation_sync; - } LIBGPASTE_3_28_1; -+ -+LIBGPASTE_3_32_1 { -+global: -+ g_paste_iimage_item_is_growing; -+} LIBGPASTE_3_28_3; diff --git a/x11-misc/gpaste/files/gpaste-3.32.0-gnome-shel-only-var-should-be-exported.patch b/x11-misc/gpaste/files/gpaste-3.32.0-gnome-shel-only-var-should-be-exported.patch deleted file mode 100644 index 9a50b56..0000000 --- a/x11-misc/gpaste/files/gpaste-3.32.0-gnome-shel-only-var-should-be-exported.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 1eaed802448e5262cc4d3d7b9b95a408ff89494c Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Sun, 17 Mar 2019 14:20:10 +0100 -Subject: [PATCH] gnome-shel: only var should be exported - -Fixes part of #268 - -Signed-off-by: Marc-Antoine Perennou ---- - src/gnome-shell/aboutItem.js | 2 +- - src/gnome-shell/deleteButton.js | 2 +- - src/gnome-shell/deleteItemPart.js | 2 +- - src/gnome-shell/dummyHistoryItem.js | 2 +- - src/gnome-shell/emptyHistoryItem.js | 2 +- - src/gnome-shell/item.js | 2 +- - src/gnome-shell/pageItem.js | 2 +- - src/gnome-shell/pageSwitcher.js | 2 +- - src/gnome-shell/searchItem.js | 2 +- - src/gnome-shell/stateSwitch.js | 2 +- - src/gnome-shell/statusIcon.js | 2 +- - src/gnome-shell/uiItem.js | 2 +- - 12 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/gnome-shell/aboutItem.js b/src/gnome-shell/aboutItem.js -index b4a7ff86..6c7bd972 100644 ---- a/src/gnome-shell/aboutItem.js -+++ b/src/gnome-shell/aboutItem.js -@@ -6,7 +6,7 @@ - - const { St } = imports.gi; - --class GPasteAboutItem { -+var GPasteAboutItem = class { - constructor(client, menu) { - this.actor = new St.Button({ - reactive: true, -diff --git a/src/gnome-shell/deleteButton.js b/src/gnome-shell/deleteButton.js -index 93816a1a..3de6160e 100644 ---- a/src/gnome-shell/deleteButton.js -+++ b/src/gnome-shell/deleteButton.js -@@ -6,7 +6,7 @@ - - const { Clutter, St } = imports.gi; - --class GPasteDeleteButton { -+var GPasteDeleteButton = class { - constructor(client, index) { - this.actor = new St.Button(); - -diff --git a/src/gnome-shell/deleteItemPart.js b/src/gnome-shell/deleteItemPart.js -index 0b87abaf..b5a5add3 100644 ---- a/src/gnome-shell/deleteItemPart.js -+++ b/src/gnome-shell/deleteItemPart.js -@@ -11,7 +11,7 @@ const Me = ExtensionUtils.getCurrentExtension(); - - const DeleteButton = Me.imports.deleteButton; - --class GPasteDeleteItemPart { -+var GPasteDeleteItemPart = class { - constructor(client, index) { - this.actor = new St.Bin({ x_align: St.Align.END }); - this._deleteButton = new DeleteButton.GPasteDeleteButton(client, index); -diff --git a/src/gnome-shell/dummyHistoryItem.js b/src/gnome-shell/dummyHistoryItem.js -index 8d227fc9..38f3ea4f 100644 ---- a/src/gnome-shell/dummyHistoryItem.js -+++ b/src/gnome-shell/dummyHistoryItem.js -@@ -10,7 +10,7 @@ const PopupMenu = imports.ui.popupMenu; - - const _ = Gettext.domain('GPaste').gettext; - --class GPasteDummyHistoryItem extends PopupMenu.PopupMenuItem { -+var GPasteDummyHistoryItem = class extends PopupMenu.PopupMenuItem { - constructor() { - super(_("(Couldn't connect to GPaste daemon)")); - this.setSensitive(false); -diff --git a/src/gnome-shell/emptyHistoryItem.js b/src/gnome-shell/emptyHistoryItem.js -index 94c3df61..35bdb0c4 100644 ---- a/src/gnome-shell/emptyHistoryItem.js -+++ b/src/gnome-shell/emptyHistoryItem.js -@@ -6,7 +6,7 @@ - - const { GLib, GPaste, St } = imports.gi; - --class GPasteEmptyHistoryItem { -+var GPasteEmptyHistoryItem = class { - constructor(client, settings, menu) { - this.actor = new St.Button({ - reactive: true, -diff --git a/src/gnome-shell/item.js b/src/gnome-shell/item.js -index 99db6662..e04b8a90 100644 ---- a/src/gnome-shell/item.js -+++ b/src/gnome-shell/item.js -@@ -13,7 +13,7 @@ const Me = ExtensionUtils.getCurrentExtension(); - - const DeleteItemPart = Me.imports.deleteItemPart; - --class GPasteItem extends PopupMenu.PopupMenuItem { -+var GPasteItem = class extends PopupMenu.PopupMenuItem { - constructor(client, size, index) { - super(""); - -diff --git a/src/gnome-shell/pageItem.js b/src/gnome-shell/pageItem.js -index ca0dde3e..1606016e 100644 ---- a/src/gnome-shell/pageItem.js -+++ b/src/gnome-shell/pageItem.js -@@ -8,7 +8,7 @@ const { St } = imports.gi; - - const Signals = imports.signals; - --class GPastePageItem { -+var GPastePageItem = class { - constructor(page) { - this.actor = new St.Button({ - reactive: true, -diff --git a/src/gnome-shell/pageSwitcher.js b/src/gnome-shell/pageSwitcher.js -index 59e5c3a8..f6d09aeb 100644 ---- a/src/gnome-shell/pageSwitcher.js -+++ b/src/gnome-shell/pageSwitcher.js -@@ -15,7 +15,7 @@ const PageItem = Me.imports.pageItem; - - const MAX_PAGES = 20; - --class GPastePageSwitcher extends PopupMenu.PopupBaseMenuItem { -+var GPastePageSwitcher = class extends PopupMenu.PopupBaseMenuItem { - constructor() { - super({ - reactive: false, -diff --git a/src/gnome-shell/searchItem.js b/src/gnome-shell/searchItem.js -index 2ec35f5d..9c3daa21 100644 ---- a/src/gnome-shell/searchItem.js -+++ b/src/gnome-shell/searchItem.js -@@ -8,7 +8,7 @@ const PopupMenu = imports.ui.popupMenu; - - const { St } = imports.gi; - --class GPasteSearchItem extends PopupMenu.PopupBaseMenuItem { -+var GPasteSearchItem = class extends PopupMenu.PopupBaseMenuItem { - constructor() { - super({ - activate: false, -diff --git a/src/gnome-shell/stateSwitch.js b/src/gnome-shell/stateSwitch.js -index cd3fdba6..00a3d0f9 100644 ---- a/src/gnome-shell/stateSwitch.js -+++ b/src/gnome-shell/stateSwitch.js -@@ -10,7 +10,7 @@ const PopupMenu = imports.ui.popupMenu; - - const _ = Gettext.domain('GPaste').gettext; - --class GPasteStateSwitch extends PopupMenu.PopupSwitchMenuItem { -+var GPasteStateSwitch = class extends PopupMenu.PopupSwitchMenuItem { - constructor(client) { - super(_("Track changes"), client.is_active()); - -diff --git a/src/gnome-shell/statusIcon.js b/src/gnome-shell/statusIcon.js -index e2259fd6..c90a0978 100644 ---- a/src/gnome-shell/statusIcon.js -+++ b/src/gnome-shell/statusIcon.js -@@ -8,7 +8,7 @@ const PopupMenu = imports.ui.popupMenu; - - const { St } = imports.gi; - --class GPasteStatusIcon { -+var GPasteStatusIcon = class { - constructor() { - this.actor = new St.BoxLayout({ style_class: 'panel-status-menu-box' }); - -diff --git a/src/gnome-shell/uiItem.js b/src/gnome-shell/uiItem.js -index fff0e621..6726cf82 100644 ---- a/src/gnome-shell/uiItem.js -+++ b/src/gnome-shell/uiItem.js -@@ -6,7 +6,7 @@ - - const { GPaste, St } = imports.gi; - --class GPasteUiItem { -+var GPasteUiItem = class { - constructor(menu) { - this.actor = new St.Button({ - reactive: true, diff --git a/x11-misc/gpaste/files/gpaste-3.32.0-install-systemd-user-units.patch b/x11-misc/gpaste/files/gpaste-3.32.1-install-systemd-user-units.patch similarity index 100% rename from x11-misc/gpaste/files/gpaste-3.32.0-install-systemd-user-units.patch rename to x11-misc/gpaste/files/gpaste-3.32.1-install-systemd-user-units.patch diff --git a/x11-misc/gpaste/gpaste-3.32.0-r1.ebuild b/x11-misc/gpaste/gpaste-3.32.1.ebuild similarity index 93% rename from x11-misc/gpaste/gpaste-3.32.0-r1.ebuild rename to x11-misc/gpaste/gpaste-3.32.1.ebuild index 7527f78..6ab8fb2 100644 --- a/x11-misc/gpaste/gpaste-3.32.0-r1.ebuild +++ b/x11-misc/gpaste/gpaste-3.32.1.ebuild @@ -43,8 +43,6 @@ BDEPEND="vala? ( $(vala_depend) ) REQUIRED_USE="vala? ( introspection )" PATCHES=( - "${FILESDIR}/${P}-detect-when-images-are-growing.patch" - "${FILESDIR}/${P}-gnome-shel-only-var-should-be-exported.patch" "${FILESDIR}/${P}-install-systemd-user-units.patch" ) diff --git a/x11-misc/gpaste/gpaste-3.34.1.ebuild b/x11-misc/gpaste/gpaste-3.34.4.ebuild similarity index 100% rename from x11-misc/gpaste/gpaste-3.34.1.ebuild rename to x11-misc/gpaste/gpaste-3.34.4.ebuild