summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2011-10-17 20:14:48 +0000
committerPacho Ramos <pacho@gentoo.org>2011-10-17 20:14:48 +0000
commit19c71463644ed50bfe3bc63cc86887f4b4c0302d (patch)
tree3ba675518a21c9dca6d91597ea5e13962c2737d8 /net-wireless/gnome-bluetooth/files
parentRemove obsolete pmask of kde-misc/kcm_gtk, see bug 369361 (diff)
downloadhistorical-19c71463644ed50bfe3bc63cc86887f4b4c0302d.tar.gz
historical-19c71463644ed50bfe3bc63cc86887f4b4c0302d.tar.bz2
historical-19c71463644ed50bfe3bc63cc86887f4b4c0302d.zip
Include more upstream patches adding PIN quirk for Magic Trackpad, set REQUIRED_USE properly to prevent people from trying to run tests with USE 'doc' as upstream doesn't support it (bug #356075 by Ago and upstream bug #573392), drop .la files.
Package-Manager: portage-2.1.10.28/cvs/Linux x86_64
Diffstat (limited to 'net-wireless/gnome-bluetooth/files')
-rw-r--r--net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch22
-rw-r--r--net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch23
-rw-r--r--net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch21
3 files changed, 66 insertions, 0 deletions
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch
new file mode 100644
index 000000000000..123e3fc08c93
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-fix-typo.patch
@@ -0,0 +1,22 @@
+From 76109d033db729252f4d47314ab69b0bf2d63711 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Mar 2011 14:23:26 +0000
+Subject: wizard: Fix typo in PIN quirks
+
+Thanks to Daniele Forsi
+---
+diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml
+index 3b4479e..e485d03 100644
+--- a/wizard/pin-code-database.xml
++++ b/wizard/pin-code-database.xml
+@@ -38,7 +38,7 @@
+ <!DOCTYPE devices [
+ <!ELEMENT devices (device)+>
+ <!ELEMENT device EMPTY>
+- <!ATTLIST device type (any|mouse|table|keyboard|headset|headphones|audio|printer|network) "any">
++ <!ATTLIST device type (any|mouse|tablet|keyboard|headset|headphones|audio|printer|network) "any">
+ <!ATTLIST device oui CDATA #IMPLIED>
+ <!ATTLIST device name CDATA #IMPLIED>
+ <!ATTLIST device pin CDATA #REQUIRED>
+--
+cgit v0.9.0.2
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch
new file mode 100644
index 000000000000..0602c95a10b3
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-pin-quirk.patch
@@ -0,0 +1,23 @@
+From f03a29b558a834cb26e9abbdc0cb94a14c57cb8f Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Mar 2011 13:03:01 +0000
+Subject: wizard: Add PIN quirk for Magic Trackpad
+
+---
+diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml
+index 8a73d65..b3e9f8d 100644
+--- a/wizard/pin-code-database.xml
++++ b/wizard/pin-code-database.xml
+@@ -61,6 +61,10 @@
+ <device oui="00:0A:95:" type="mouse" pin="0000"/>
+ <device oui="00:14:51:" type="mouse" pin="0000"/>
+
++ <!-- Apple Magic Trackpad
++ Note: same as above, tablet needs to be paired -->
++ <device oui="D8:A2:5E:" type="tablet" pin="0000"/>
++
+ <!-- Wiimote -->
+ <device oui="00:19:1D:" name="Nintendo RVL-CNT-01" pin="NULL"/>
+ <device oui="00:1F:C5:" name="Nintendo RVL-CNT-01" pin="NULL"/>
+--
+cgit v0.9.0.2
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch
new file mode 100644
index 000000000000..85f34cf35b72
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.32.0-update-dtd.patch
@@ -0,0 +1,21 @@
+From 479d1535579184f437fe3cf73f24c4e17d933ecc Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 18 Mar 2011 14:16:00 +0000
+Subject: wizard: Update DTD for latest addition
+
+---
+diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml
+index b3e9f8d..3b4479e 100644
+--- a/wizard/pin-code-database.xml
++++ b/wizard/pin-code-database.xml
+@@ -38,7 +38,7 @@
+ <!DOCTYPE devices [
+ <!ELEMENT devices (device)+>
+ <!ELEMENT device EMPTY>
+- <!ATTLIST device type (any|mouse|keyboard|headset|headphones|audio|printer|network) "any">
++ <!ATTLIST device type (any|mouse|table|keyboard|headset|headphones|audio|printer|network) "any">
+ <!ATTLIST device oui CDATA #IMPLIED>
+ <!ATTLIST device name CDATA #IMPLIED>
+ <!ATTLIST device pin CDATA #REQUIRED>
+--
+cgit v0.9.0.2