rev 15708 - in kde-extras/gtk-qt-engine/trunk/debian: . patches

[Didier Raboud]

Author: odyx-guest
Date: 2009-08-21 10:24:43 +0000 (Fri, 21 Aug 2009)
New Revision: 15708

Added:
   kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch
Modified:
   kde-extras/gtk-qt-engine/trunk/debian/changelog
   kde-extras/gtk-qt-engine/trunk/debian/control
   kde-extras/gtk-qt-engine/trunk/debian/patches/series
Log:
gtk-qt-engine: Get rid of bonobo.



Modified: kde-extras/gtk-qt-engine/trunk/debian/changelog
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/changelog	2009-08-21 09:58:03 UTC (rev 15707)
+++ kde-extras/gtk-qt-engine/trunk/debian/changelog	2009-08-21 10:24:43 UTC (rev 15708)
@@ -2,6 +2,9 @@
 
   * Add patch 05_dont_set_userfont.patch to not set the user font
     (Closes: #512782).
+  * Don't compile against bonobo (Closes: #541451)
+    - Add patch 06_no_bonobo.patch.
+    - Get rid of the Build-Dependency
   * Split the systemsettings configuration part and the style itself:
     - gtk-qt-engine holds the style, systemsettings-gtk holds the configuration
       module.

Modified: kde-extras/gtk-qt-engine/trunk/debian/control
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/control	2009-08-21 09:58:03 UTC (rev 15707)
+++ kde-extras/gtk-qt-engine/trunk/debian/control	2009-08-21 10:24:43 UTC (rev 15708)
@@ -4,7 +4,7 @@
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Xavier Vello <xavier.vello at gmail.com>, Didier Raboud <didier at raboud.com>
 Build-Depends: debhelper (>= 7), cmake, quilt,
- kdelibs5-dev, libgtk2.0-dev, libbonoboui2-dev
+ kdelibs5-dev, libgtk2.0-dev
 Standards-Version: 3.8.2
 Homepage: http://code.google.com/p/gtk-qt-engine/
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/gtk-qt-engine/trunk/

Added: kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch	                        (rev 0)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/06_no_bonobo.patch	2009-08-21 10:24:43 UTC (rev 15708)
@@ -0,0 +1,28 @@
+Description: Disables the Bonobo features
+Origin: vendor
+Bug: http://bugs.debian.org/541451
+Author: Didier Raboud <didier at raboud.com>
+Last-Update: 2009-08-21
+
+Index: gtk-qt-engine-1.1+svn5.orig/CMakeLists.txt
+===================================================================
+--- gtk-qt-engine-1.1+svn5.orig.orig/CMakeLists.txt	2009-08-21 11:59:03.000000000 +0200
++++ gtk-qt-engine-1.1+svn5.orig/CMakeLists.txt	2009-08-21 12:01:13.000000000 +0200
+@@ -13,15 +13,8 @@
+ MESSAGE(STATUS "Found GTK include dir: ${GTK_INCLUDE_DIR}")
+ MESSAGE(STATUS "Found GTK library dir: ${GTK_LIB_DIR}")
+ 
+-# Find Bonobo
+-PKGCONFIG(libbonoboui-2.0 BONOBO_INCLUDE_DIR BONOBO_LIB_DIR BONOBO_LINK_FLAGS BONOBO_CFLAGS)
+-IF (NOT BONOBO_INCLUDE_DIR)
+-	MESSAGE(STATUS "bonoboui not found.  Some features of the theme engine will not work as intended.")
+-ELSE (NOT BONOBO_INCLUDE_DIR)
+-	MESSAGE(STATUS "Found Bonobo include dir: ${BONOBO_INCLUDE_DIR}")
+-	MESSAGE(STATUS "Found Bonobo library dir: ${BONOBO_LIB_DIR}")
+-	SET(BONOBO_DEFINITIONS -D HAVE_BONOBO)
+-ENDIF (NOT BONOBO_INCLUDE_DIR)
++# Don't find Bonobo
++MESSAGE(STATUS "Bonobo has been disabled on purpose for Debian because it is deprecated and pulls too much of Gnome.")
+ 
+ # Find msgfmt
+ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)

Modified: kde-extras/gtk-qt-engine/trunk/debian/patches/series
===================================================================
--- kde-extras/gtk-qt-engine/trunk/debian/patches/series	2009-08-21 09:58:03 UTC (rev 15707)
+++ kde-extras/gtk-qt-engine/trunk/debian/patches/series	2009-08-21 10:24:43 UTC (rev 15708)
@@ -3,4 +3,4 @@
 03_disable_engine_with_nspluginviewer.diff
 04_no_kde4_in_configfile.diff
 05_dont_set_userfont.patch
-
+06_no_bonobo.patch