[Pkg-xfce-commits] r895 - in desktop/trunk/xfce4-session/debian: . patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-10-06 14:10:45 +0000 (Fri, 06 Oct 2006)
New Revision: 895

Added:
   desktop/trunk/xfce4-session/debian/patches/
   desktop/trunk/xfce4-session/debian/patches/01_correct_shadows.patch
   desktop/trunk/xfce4-session/debian/patches/series
Modified:
   desktop/trunk/xfce4-session/debian/changelog
   desktop/trunk/xfce4-session/debian/control
   desktop/trunk/xfce4-session/debian/rules
Log:
drop shadows in simple splash engine


Modified: desktop/trunk/xfce4-session/debian/changelog
===================================================================
--- desktop/trunk/xfce4-session/debian/changelog	2006-10-02 13:57:14 UTC (rev 894)
+++ desktop/trunk/xfce4-session/debian/changelog	2006-10-06 14:10:45 UTC (rev 895)
@@ -1,3 +1,9 @@
+xfce4-session (4.3.99.1-2) UNRELEASED; urgency=low
+
+  * Add a patch to disable shadows in simple engine. 
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Fri,  6 Oct 2006 16:10:00 +0200
+
 xfce4-session (4.3.99.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/xfce4-session/debian/control
===================================================================
--- desktop/trunk/xfce4-session/debian/control	2006-10-02 13:57:14 UTC (rev 894)
+++ desktop/trunk/xfce4-session/debian/control	2006-10-06 14:10:45 UTC (rev 895)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at corsac.net>
-Build-Depends: debhelper (>= 4.0.0), xfce4-mcs-manager-dev (>= 4.3.99.1), xbase-clients, libxml-parser-perl, chrpath
+Build-Depends: debhelper (>= 4.0.0), xfce4-mcs-manager-dev (>= 4.3.99.1), xbase-clients, libxml-parser-perl, chrpath, libhal-dev, quilt
 Standards-Version: 3.7.2
 
 Package: xfce4-session

Added: desktop/trunk/xfce4-session/debian/patches/01_correct_shadows.patch
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/01_correct_shadows.patch	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/patches/01_correct_shadows.patch	2006-10-06 14:10:45 UTC (rev 895)
@@ -0,0 +1,26 @@
+--- xfce4-session/engines/simple/simple.c.orig	2006-09-02 19:27:37.000000000 +0200
++++ xfce4-session/engines/simple/simple.c	2006-10-06 15:19:59.000000000 +0200
+@@ -202,7 +202,6 @@
+ simple_next (XfsmSplashEngine *engine, const gchar *text)
+ {
+   Simple *simple = (Simple *) engine->user_data;
+-  GdkColor shcolor;
+   gint tw, th, tx, ty;
+ 
+   pango_layout_set_text (simple->layout, text, -1);
+@@ -220,15 +219,6 @@
+ 
+   gdk_gc_set_clip_rectangle (simple->gc, &simple->textbox);
+ 
+-  /* draw shadow */
+-  shcolor.red = (simple->fgcolor.red + simple->bgcolor.red) / 2;
+-  shcolor.green = (simple->fgcolor.green + simple->bgcolor.green) / 2;
+-  shcolor.blue = (simple->fgcolor.blue + simple->bgcolor.blue) / 2;
+-  shcolor.red = (shcolor.red + shcolor.green + shcolor.blue) / 3;
+-  shcolor.green = shcolor.red;
+-  shcolor.blue = shcolor.red;
+-
+-  gdk_gc_set_rgb_fg_color (simple->gc, &shcolor);
+   gdk_draw_layout (simple->pixmap, simple->gc,
+                    tx + 2, ty + 2, simple->layout);
+ 

Added: desktop/trunk/xfce4-session/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-session/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce4-session/debian/patches/series	2006-10-06 14:10:45 UTC (rev 895)
@@ -0,0 +1 @@
+01_correct_shadows.patch

Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules	2006-10-02 13:57:14 UTC (rev 894)
+++ desktop/trunk/xfce4-session/debian/rules	2006-10-06 14:10:45 UTC (rev 895)
@@ -24,10 +24,21 @@
 	INSTALL_PROGRAM += -s
 endif
 
-config.status: configure
+patch: patch-stamp
+patch-stamp:
 	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch patch-stamp
+
+unpatch:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc patch-stamp
+
+config.status: configure patch-stamp
+	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/sbin --enable-final
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/sbin --enable-final --with-shutdown-style=hal
 
 
 build: build-stamp
@@ -40,7 +51,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp