Hello community,

here is the log from the commit of package dasher for openSUSE:Factory
checked in at Thu Aug 25 14:52:03 CEST 2011.



--------
--- GNOME/dasher/dasher.changes 2011-06-27 16:18:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/dasher/dasher.changes  2011-08-25 
14:06:18.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 25 12:04:08 UTC 2011 - [email protected]
+
+- Add dasher-linkX11.patch: Remove functions that would require us
+  to link against X11: those functions have not been called for a
+  long time. See bgo#657307.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  dasher-linkX11.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dasher.spec ++++++
--- /var/tmp/diff_new_pack.jSYbqp/_old  2011-08-25 14:51:22.000000000 +0200
+++ /var/tmp/diff_new_pack.jSYbqp/_new  2011-08-25 14:51:22.000000000 +0200
@@ -19,7 +19,7 @@
 
 Name:           dasher
 Version:        4.11
-Release:        11
+Release:        13
 License:        GPLv2+
 Summary:        Zooming Predictive Text Entry System
 Url:            http://www.inference.phy.cam.ac.uk/dasher/
@@ -27,6 +27,8 @@
 Source0:        
ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/4.5/%{name}-%{version}.tar.bz2
 Source1:        dasher-data-lang.sh
 Source2:        locale-map.txt
+# PATCH-FIX-UPSTREAM dasher-linkX11.patch bgo#657306 [email protected] -- 
Remove unneded code requiring to link against libX11.
+Patch0:         dasher-linkX11.patch
 BuildRequires:  at-spi-devel
 BuildRequires:  cairo-devel
 BuildRequires:  fdupes
@@ -84,6 +86,7 @@
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 translation-update-upstream
 cp %{SOURCE2} .
 

++++++ dasher-linkX11.patch ++++++
>From ce487b694e4b019aa881b58281954bd1d49c5ed3 Mon Sep 17 00:00:00 2001
From: Patrick Welche <[email protected]>
Date: Wed, 14 Apr 2010 18:09:00 +0000
Subject: Comment out CKeyboardHelper::Grab as not used after

b4cbd3b5 "Fixing up keyboard stuff" "TODO: Sort these methods out"
yet it needs XGrab from libX11. (#615573)
---
 
diff --git a/Src/Gtk2/KeyboardHelper.cpp b/Src/Gtk2/KeyboardHelper.cpp
index 50bd18d..937db58 100644
--- a/Src/Gtk2/KeyboardHelper.cpp
+++ b/Src/Gtk2/KeyboardHelper.cpp
@@ -167,6 +167,7 @@ int CKeyboardHelper::ConvertKeycode(int iCode) {
     return -1;
 }
 
+/* Not called - commented out because of X11 lib dependence
 void CKeyboardHelper::Grab(bool bGrab) {
   for(std::map<int,int>::iterator it(m_mTable.begin()); it != m_mTable.end(); 
++it) {
     GdkKeymapKey *pKeys;
@@ -183,3 +184,4 @@ void CKeyboardHelper::Grab(bool bGrab) {
     }
   }
 }
+*/
diff --git a/Src/Gtk2/KeyboardHelper.h b/Src/Gtk2/KeyboardHelper.h
index c49e498..849088a 100644
--- a/Src/Gtk2/KeyboardHelper.h
+++ b/Src/Gtk2/KeyboardHelper.h
@@ -14,7 +14,7 @@ class CKeyboardHelper {
   void UnsetKey(int iCode);
 
   int ConvertKeycode(int iCode);
-  void Grab(bool bGrab);
+  // unused: void Grab(bool bGrab);
 
  private:
   void SetupDefaults();
--
cgit v0.9.0.2


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to