Pull in a patch from upstream that should fix binary data clipboard items. This should fix bug #177461.

Package-Manager: portage-2.1.3.19

6 files changed, 152 insertions, 16 deletions

diff --git a/x11-misc/glipper/ChangeLog b/x11-misc/glipper/ChangeLog
index 70c525e79e15..ef9f1b3cb2bb 100644
--- a/x11-misc/glipper/ChangeLog
+++ b/x11-misc/glipper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/glipper
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/ChangeLog,v 1.9 2007/09/22 18:41:36 swegener Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/ChangeLog,v 1.10 2008/01/03 18:38:29 swegener Exp $
+
+*glipper-1.0-r1 (03 Jan 2008)
+
+  03 Jan 2008; Sven Wegener <swegener@gentoo.org>
+  +files/glipper-1.0-binary-data.patch, +glipper-1.0-r1.ebuild:
+  Pull in a patch from upstream that should fix binary data clipboard items.
+  This should fix bug #177461.
 
   22 Sep 2007; Sven Wegener <swegener@gentoo.org> -glipper-0.95.1.ebuild,
   -glipper-0.95.1-r1.ebuild:
diff --git a/x11-misc/glipper/Manifest b/x11-misc/glipper/Manifest
index bdf966c2ef18..4e38ac80e372 100644
--- a/x11-misc/glipper/Manifest
+++ b/x11-misc/glipper/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX glipper-1.0-binary-data.patch 2444 RMD160 f1ca36501fbe0b44c24b84adf86b3250e8a675c3 SHA1 989da47ffe25e57c41c3c79974961ddeca257155 SHA256 c18616a23b2953fddfba7b8cf62f238834348856e608745f23caaae78fcb27a6
+MD5 866fdda009c85ed44246ba1e7165c7f4 files/glipper-1.0-binary-data.patch 2444
+RMD160 f1ca36501fbe0b44c24b84adf86b3250e8a675c3 files/glipper-1.0-binary-data.patch 2444
+SHA256 c18616a23b2953fddfba7b8cf62f238834348856e608745f23caaae78fcb27a6 files/glipper-1.0-binary-data.patch 2444
 DIST glipper-1.0.tar.bz2 364805 RMD160 131b1c9e6ab1579b444fca47d5c3858bee8f3aef SHA1 66291124adf595bd5d53809958ac197c4f80ffb3 SHA256 6581f1ed074a98deafa492c0f4aec834b4733df8f4b6812511937ad31bf15ceb
-EBUILD glipper-1.0.ebuild 1118 RMD160 b69823bf7d8e2f6585e8ca7eb5c16dedac07fd9d SHA1 7bb336c3d4a36239eea4633fb431b22aa8d00b12 SHA256 a949582b5ec8ca1e89db22bf97b1dcef0c2594476d8b7ebc973ff48e9cfd0711
-MD5 f18bdbdf608f8abe31c3923233b65c4e glipper-1.0.ebuild 1118
-RMD160 b69823bf7d8e2f6585e8ca7eb5c16dedac07fd9d glipper-1.0.ebuild 1118
-SHA256 a949582b5ec8ca1e89db22bf97b1dcef0c2594476d8b7ebc973ff48e9cfd0711 glipper-1.0.ebuild 1118
-MISC ChangeLog 1573 RMD160 da26cc438b7cc74241a395882c7a2fe325289d49 SHA1 011f72f63000e938bf0009283eae9832be44dd62 SHA256 bbb32c353c65cf4c8f6d14e3813fcf9aa897fca5a17634c068e307e1a2f4cf78
-MD5 a5fb89b5522a4a65ba72ee80665dddb0 ChangeLog 1573
-RMD160 da26cc438b7cc74241a395882c7a2fe325289d49 ChangeLog 1573
-SHA256 bbb32c353c65cf4c8f6d14e3813fcf9aa897fca5a17634c068e307e1a2f4cf78 ChangeLog 1573
+EBUILD glipper-1.0-r1.ebuild 1222 RMD160 5e5a07c61844f85d5dcf0bfdd79138b5cf44c34f SHA1 9bbc8d891f95304af65f2c2fdc7687e3e2fcee25 SHA256 e16f301885e1edb916457762e73b351bbdb9b823853079a96d07d33c460c8c55
+MD5 7612e70dbebd5eceb0758cd87db11312 glipper-1.0-r1.ebuild 1222
+RMD160 5e5a07c61844f85d5dcf0bfdd79138b5cf44c34f glipper-1.0-r1.ebuild 1222
+SHA256 e16f301885e1edb916457762e73b351bbdb9b823853079a96d07d33c460c8c55 glipper-1.0-r1.ebuild 1222
+EBUILD glipper-1.0.ebuild 1118 RMD160 a4a9deddcd78bd97e4035ff72d304ade4ba33244 SHA1 1e4dec759886066ab1773606c4f6dc716bd496f0 SHA256 7fa34bdc2f960122be83a105b33461f119215c7770db0593f0acd8c04a792b7e
+MD5 d4cb749e931089f0d8d24688f8220c20 glipper-1.0.ebuild 1118
+RMD160 a4a9deddcd78bd97e4035ff72d304ade4ba33244 glipper-1.0.ebuild 1118
+SHA256 7fa34bdc2f960122be83a105b33461f119215c7770db0593f0acd8c04a792b7e glipper-1.0.ebuild 1118
+MISC ChangeLog 1828 RMD160 9b7bb2b8df40bd945d3cecc7825ce9f0cc366fa6 SHA1 c62990bb54513cf6abb7439a625c8b9f767c2628 SHA256 82d3f1e17acabdd61be0a572469f209942ebab4ff15bbe4d0a73bb984f8e2899
+MD5 553209e1a9b70bb542eaee420a3ce129 ChangeLog 1828
+RMD160 9b7bb2b8df40bd945d3cecc7825ce9f0cc366fa6 ChangeLog 1828
+SHA256 82d3f1e17acabdd61be0a572469f209942ebab4ff15bbe4d0a73bb984f8e2899 ChangeLog 1828
 MISC metadata.xml 270 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 SHA1 6762f98354ff738ecbe57163b0bbfe9c95dabf15 SHA256 2f9cdcca7aeb9551225d2854c8b3ab2048a1a6c9424b1cceb67db2bd030d4602
 MD5 59ddc43b17320bfa384ade93c548f569 metadata.xml 270
 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 metadata.xml 270
@@ -17,10 +25,13 @@ SHA256 2f9cdcca7aeb9551225d2854c8b3ab2048a1a6c9424b1cceb67db2bd030d4602 metadata
 MD5 309b81f11579feb66d3f9c3f93538e62 files/digest-glipper-1.0 238
 RMD160 40fb052c70553ed713aa70a87b3fdcb9fba5badd files/digest-glipper-1.0 238
 SHA256 b82cc21d7cbedbfd25d55fe0e3807768de88ff6871f05143ffc5524b6e01ad0a files/digest-glipper-1.0 238
+MD5 309b81f11579feb66d3f9c3f93538e62 files/digest-glipper-1.0-r1 238
+RMD160 40fb052c70553ed713aa70a87b3fdcb9fba5badd files/digest-glipper-1.0-r1 238
+SHA256 b82cc21d7cbedbfd25d55fe0e3807768de88ff6871f05143ffc5524b6e01ad0a files/digest-glipper-1.0-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFG9WHoI1lqEGTUzyQRAg29AJoDMId74v1koqv5X7fy0jU3kt4v6ACgv3rZ
-yqvkcVx+OVtdx0DGxzrKXKo=
-=ynRF
+iEYEARECAAYFAkd9K6sACgkQI1lqEGTUzyS98wCg0Anm65uBmkFbmpzHrq7L1k/u
+7bgAnRbQbzlPG2xHBp/Cly0+B5AnQNyz
+=w/ye
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/glipper/files/digest-glipper-1.0-r1 b/x11-misc/glipper/files/digest-glipper-1.0-r1
new file mode 100644
index 000000000000..5bdb5be7ec78
--- /dev/null
+++ b/x11-misc/glipper/files/digest-glipper-1.0-r1
@@ -0,0 +1,3 @@
+MD5 95315e62b950877611d4645a0b47e1ba glipper-1.0.tar.bz2 364805
+RMD160 131b1c9e6ab1579b444fca47d5c3858bee8f3aef glipper-1.0.tar.bz2 364805
+SHA256 6581f1ed074a98deafa492c0f4aec834b4733df8f4b6812511937ad31bf15ceb glipper-1.0.tar.bz2 364805
diff --git a/x11-misc/glipper/files/glipper-1.0-binary-data.patch b/x11-misc/glipper/files/glipper-1.0-binary-data.patch
new file mode 100644
index 000000000000..8a623a53b790
--- /dev/null
+++ b/x11-misc/glipper/files/glipper-1.0-binary-data.patch
@@ -0,0 +1,64 @@
+This should fix the bug with Openoffice clipboard items
+
+Index: glipper/Clipboards.py
+===================================================================
+RCS file: /cvsroot/glipper/glipper-ng/glipper/Clipboards.py,v
+retrieving revision 1.16
+retrieving revision 1.17
+diff --unified -r1.16 -r1.17
+--- glipper/Clipboards.py	30 Sep 2007 19:10:14 -0000	1.16
++++ glipper/Clipboards.py	28 Dec 2007 17:03:31 -0000	1.17
+@@ -61,23 +61,39 @@
+    
+    def on_default_clipboard_owner_change(self, clipboard, event):
+       if self.use_default_clipboard:
+-         item = clipboard.wait_for_text()
+-         
+-         if item != None:
+-            self.default_clipboard_text = item
+-            self.emit('new-item', item)
+-         elif self.default_clipboard_text != None:
+-            clipboard.set_text(self.default_clipboard_text)
++         text = clipboard.wait_for_text()
++
++         if text != None:
++            self.default_clipboard_text = text
++            self.default_clipboard_image = None
++            self.emit('new-item', text)
++            return
++
++         targets = clipboard.wait_for_targets()
++
++         if targets == None:
++            if self.default_clipboard_text != None:
++               clipboard.set_text(self.default_clipboard_text)
++            elif self.default_clipboard_image != None:
++               clipboard.set_image(self.default_clipboard_image)
+    
+    def on_primary_clipboard_owner_change(self, clipboard, event):
+       if self.use_primary_clipboard:
+-         item = clipboard.wait_for_text()
+-         
+-         if item != None:
+-            self.primary_clipboard_text = item
+-            self.emit('new-item', item)
+-         elif self.primary_clipboard_text != None:
+-            clipboard.set_text(self.primary_clipboard_text)
++         text = clipboard.wait_for_text()
++
++         if text != None:
++            self.primary_clipboard_text = text
++            self.primary_clipboard_image = None
++            self.emit('new-item', text)
++            return
++
++         targets = clipboard.wait_for_targets()
++
++         if targets == None:
++            if self.primary_clipboard_text != None:
++               clipboard.set_text(self.primary_clipboard_text)
++            elif self.default_clipboard_image != None:
++               clipboard.set_image(self.primary_clipboard_image)
+       
+    def on_use_default_clipboard_changed (self, value):
+       if value is None or value.type != gconf.VALUE_BOOL:
diff --git a/x11-misc/glipper/glipper-1.0-r1.ebuild b/x11-misc/glipper/glipper-1.0-r1.ebuild
new file mode 100644
index 000000000000..d1ae5a29e2e7
--- /dev/null
+++ b/x11-misc/glipper/glipper-1.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/glipper-1.0-r1.ebuild,v 1.1 2008/01/03 18:38:29 swegener Exp $
+
+GCONF_DEBUG="no"
+
+inherit gnome2 python eutils
+
+DESCRIPTION="GNOME Clipboard Manager"
+HOMEPAGE="http://glipper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/python-2.4
+	>=dev-python/pygobject-2.6
+	>=dev-python/pygtk-2.6
+	>=dev-python/gnome-python-2.10
+	>=dev-python/gnome-python-desktop-2.10
+	>=dev-python/gnome-python-extras-2.10
+	>=gnome-base/gnome-desktop-2.10"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS"
+
+src_unpack() {
+	gnome2_src_unpack
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-binary-data.patch
+}
+
+src_install() {
+	gnome2_src_install py_compile=true
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_mod_optimize "${ROOT}"/usr/lib*/python*/site-packages/glipper
+
+	elog "Glipper has been completely rewritten as a panel applet. Please remove your"
+	elog "existing ~/.glipper directory and then add glipper as a new panel applet."
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup
+}
diff --git a/x11-misc/glipper/glipper-1.0.ebuild b/x11-misc/glipper/glipper-1.0.ebuild
index 063a590b5dab..8431a5e96689 100644
--- a/x11-misc/glipper/glipper-1.0.ebuild
+++ b/x11-misc/glipper/glipper-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/glipper-1.0.ebuild,v 1.5 2007/09/11 19:27:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/glipper-1.0.ebuild,v 1.6 2008/01/03 18:38:29 swegener Exp $
 
 GCONF_DEBUG="no"