rpms/inkscape/devel inkscape-0.46-colors.patch, NONE, 1.1 inkscape.spec, 1.56, 1.57

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/inkscape/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15173

Modified Files:
	inkscape.spec 
Added Files:
	inkscape-0.46-colors.patch 
Log Message:
* Fri Oct 17 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-6
- Fix color sliders with recent GTK (#467431)


inkscape-0.46-colors.patch:

--- NEW FILE inkscape-0.46-colors.patch ---
Fix the color slider with a recent GTK, to fix #467431 [1], patch from
upstream #19816 [2].

[1] https://bugzilla.redhat.com/show_bug.cgi?id=467431
[2] http://inkscape.svn.sourceforge.net/viewvc/inkscape/inkscape/trunk/src/widgets/sp-color-slider.cpp?r1=16358&r2=19816

--- inkscape/trunk/src/widgets/sp-color-slider.cpp	2007/10/30 06:16:09	16358
+++ inkscape/trunk/src/widgets/sp-color-slider.cpp	2008/09/08 07:52:36	19816
@@ -330,8 +330,11 @@
 	g_return_if_fail (SP_IS_COLOR_SLIDER (slider));
 
 	if (!adjustment) {
-		adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.1, 0.1);
-	}
+		adjustment = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 1.0, 0.01, 0.0, 0.0);
+	} else {
+        gtk_adjustment_set_page_increment(adjustment, 0.0);
+        gtk_adjustment_set_page_size(adjustment, 0.0);
+    }
 
 	if (slider->adjustment != adjustment) {
 		if (slider->adjustment) {


Index: inkscape.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- inkscape.spec	13 Aug 2008 21:38:38 -0000	1.56
+++ inkscape.spec	17 Oct 2008 16:44:59 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.46
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -15,6 +15,7 @@
 Patch5:         inkscape-0.46-gtk2.13.3.patch
 Patch6:         inkscape-0.46-poppler-0.8.3.patch
 Patch7:         inkscape-0.46-uniconv.patch
+Patch8:         inkscape-0.46-colors.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -83,6 +84,7 @@
 %patch5 -p1 -b .gtk2.13.3
 %patch6 -p1 -b .poppler-0.8.3
 %patch7 -p1 -b .uniconv
+%patch8 -p2 -b .colors
 find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
 find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
 dos2unix -k -q share/extensions/*.py
@@ -142,6 +144,9 @@
 
 
 %changelog
+* Fri Oct 17 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-6
+- Fix color sliders with recent GTK (#467431)
+
 * Wed Aug 13 2008 Lubomir Rintel <lkundrak at v3.sk> - 0.46-5
 - Rediff patches for zero fuzz
 - Use uniconvertor to handle CDR and WMF (#458845)