← Back to branch summary

~rosco2/ubuntu/wily/gramps/bug-1492304

« back to all changes in this revision

Viewing changes to debian/patches/introspection_geography.patch

  • Committer: Package Import Robot
  • Author(s): Ross Gammon
  • Date: 2015-08-11 23:03:11 UTC
  • mfrom: (1.4.3)
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20150811230311-acjr8gcfe8isx7ij
https://launchpad.net/bugs/1464845
https://launchpad.net/bugs/1451259
* New upstream release
* Drop patches applied upstream or cherry-picked from there
* Add version constraints for gtk and pygobject
* Add goocanvas dependency - available soon
* Drop webkit dpendency as HTML view has been removed
* Force removal of upstream packages when installing Debian one
  (LP: #1464845)
* Drop fixperm override as permissions fixed upstream
* Fix spelling error in changelog
* Switch to nose for unit tests
* Add build dependencies for the nose tests
* Update copyright file
* Add uversionmangle to watch file to deal with alpha/beta versions
* Add manual test cases
* Drop FAQ URL from upstream metadata - changes every release
* Add patch to fix transparent windows in Ubuntu.
  Thanks to Lance Orner (LP: #1451259)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/introspection_geography.patch
1
 
From: Serge Noiraud
2
 
Description: Bug 8612 - Introspection problem with gtk 3.16
3
 
 In debian, gtk was recently switched to 3.16 from 3.14 and this caused
4
 
 an error message and some strange behaviour when clicking on a pin in
5
 
 the Geography View. In some cases Gramps became completely unusable at
6
 
 this point. 
7
 
Origin: upstream, https://github.com/gramps-project/gramps/commit/6605d868cbf2425f5c6f9e47d19e60f760742841
8
 
Bug: https://gramps-project.org/bugs/view.php?id=8612
9
 
Bug-Debian: http://bugs.debian.org/789333
10
 
 
11
 
--- gramps.orig/gramps/plugins/lib/maps/geography.py
12
 
+++ gramps/gramps/plugins/lib/maps/geography.py
13
 
@@ -392,9 +392,7 @@
14
 
         clearmap.show()
15
 
         menu.append(clearmap)
16
 
         menu.show()
17
 
-        menu.popup(None, None,
18
 
-                   lambda menu, data: (event.get_root_coords()[0],
19
 
-                                       event.get_root_coords()[1], True),
20
 
+        menu.popup(None, None, None,
21
 
                    None, event.button, event.time)
22
 
         return 1
23
 
 
24
 
--- gramps.orig/gramps/plugins/view/geoclose.py
25
 
+++ gramps/gramps/plugins/view/geoclose.py
26
 
@@ -535,9 +535,7 @@
27
 
                                    event, lat, lon, prevmark)
28
 
                     itemoption.append(center)
29
 
                     menu.show()
30
 
-                    menu.popup(None, None,
31
 
-                               lambda menu, data: (event.get_root_coords()[0],
32
 
-                                                   event.get_root_coords()[1], True),
33
 
+                    menu.popup(None, None, None,
34
 
                                None, event.button, event.time)
35
 
         return 0
36
 
 
37
 
--- gramps.orig/gramps/plugins/view/geoevents.py
38
 
+++ gramps/gramps/plugins/view/geoevents.py
39
 
@@ -369,9 +369,7 @@
40
 
         bookm.show()
41
 
         bookm.connect("activate", self.add_bookmark_from_popup, hdle)
42
 
         itemoption.append(bookm)
43
 
-        menu.popup(None, None,
44
 
-                   lambda menu, data: (event.get_root_coords()[0],
45
 
-                                       event.get_root_coords()[1], True),
46
 
+        menu.popup(None, None, None,
47
 
                    None, event.button, event.time)
48
 
         return 1
49
 
 
50
 
--- gramps.orig/gramps/plugins/view/geofamclose.py
51
 
+++ gramps/gramps/plugins/view/geofamclose.py
52
 
@@ -678,9 +678,7 @@
53
 
                                    event, lat, lon, prevmark)
54
 
                     itemoption.append(center)
55
 
                     menu.show()
56
 
-                    menu.popup(None, None,
57
 
-                               lambda menu, data: (event.get_root_coords()[0],
58
 
-                                                   event.get_root_coords()[1], True),
59
 
+                    menu.popup(None, None, None,
60
 
                                None, event.button, event.time)
61
 
         return 0
62
 
 
63
 
--- gramps.orig/gramps/plugins/view/geofamily.py
64
 
+++ gramps/gramps/plugins/view/geofamily.py
65
 
@@ -446,9 +446,7 @@
66
 
         add_item.show()
67
 
         menu.append(add_item)
68
 
         self.add_event_bubble_message(event, lat, lon, prevmark, add_item)
69
 
-        menu.popup(None, None,
70
 
-                   lambda menu, data: (event.get_root_coords()[0],
71
 
-                                       event.get_root_coords()[1], True),
72
 
+        menu.popup(None, None, None,
73
 
                    None, event.button, event.time)
74
 
         return 1
75
 
 
76
 
--- gramps.orig/gramps/plugins/view/geomoves.py
77
 
+++ gramps/gramps/plugins/view/geomoves.py
78
 
@@ -610,9 +610,7 @@
79
 
             bookm.connect("activate", self.add_bookmark_from_popup, hdle)
80
 
             itemoption.append(bookm)
81
 
             menu.show()
82
 
-            menu.popup(None, None,
83
 
-                       lambda menu, data: (event.get_root_coords()[0],
84
 
-                                           event.get_root_coords()[1], True),
85
 
+            menu.popup(None, None, None,
86
 
                        None, event.button, event.time)
87
 
         return 1
88
 
 
89
 
--- gramps.orig/gramps/plugins/view/geoperson.py
90
 
+++ gramps/gramps/plugins/view/geoperson.py
91
 
@@ -484,9 +484,7 @@
92
 
         center.connect("activate", self.center_here, event, lat, lon, prevmark)
93
 
         itemoption.append(center)
94
 
         menu.show()
95
 
-        menu.popup(None, None,
96
 
-                   lambda menu, data: (event.get_root_coords()[0],
97
 
-                                       event.get_root_coords()[1], True),
98
 
+        menu.popup(None, None, None,
99
 
                    None, event.button, event.time)
100
 
         return 1
101
 
 
102
 
--- gramps.orig/gramps/plugins/view/geoplaces.py
103
 
+++ gramps/gramps/plugins/view/geoplaces.py
104
 
@@ -359,9 +359,7 @@
105
 
         bookm.show()
106
 
         bookm.connect("activate", self.add_bookmark_from_popup, hdle)
107
 
         itemoption.append(bookm)
108
 
-        menu.popup(None, None,
109
 
-                   lambda menu, data: (event.get_root_coords()[0],
110
 
-                                       event.get_root_coords()[1], True),
111
 
+        menu.popup(None, None, None,
112
 
                    None, event.button, event.time)
113
 
         return 1
114